diff --git a/src/CodeKeeper/accountFunc/functional.cpp b/src/CodeKeeper/accountFunc/functional.cpp index b87b7b40..dc035aa9 100644 --- a/src/CodeKeeper/accountFunc/functional.cpp +++ b/src/CodeKeeper/accountFunc/functional.cpp @@ -424,7 +424,7 @@ void AccountWindow::setTasksProgress() calculatePercentage(incompleteTasksCount, totalTasks)}; QString labels[] = {tr("Completed"), tr("Started"), tr("Not Started")}; - QColor colors[] = {QColor("#78b3ba"), QColor("#b1e032"), QColor("#c75d5e")}; + QColor colors[] = {QColor("#85b9b3"), QColor("#a9bf85"), QColor("#e08581")}; for (int i = 0; i < 3; ++i) { @@ -434,15 +434,15 @@ void AccountWindow::setTasksProgress() QColor progressColor; if (percentage < 26) { - progressColor = QColor("#c75d5e"); + progressColor = QColor("#e08581"); } else if (percentage < 51) { - progressColor = QColor("#e09132"); + progressColor = QColor("#d8bd85"); } else { - progressColor = QColor("#78b3ba"); + progressColor = QColor("#85b9b3"); } tasksStatsProgress->setProgressColor(progressColor); } @@ -477,7 +477,7 @@ void AccountWindow::setProjectsStats() float values[] = {ns_p, s_p, fl_p, f_p}; QString labels[] = {tr("Not started"), tr("In Dev"), tr("On Review"), tr("Finished")}; - QColor colors[] = {QColor("#c75d5e"), QColor("#e09132"), QColor("#b1e032"), QColor("#78b3ba")}; + QColor colors[] = {QColor("#e08581"), QColor("#d8bd85"), QColor("#a9bf85"), QColor("#85b9b3")}; for (int i = 0; i < 4; ++i) { @@ -490,10 +490,10 @@ void AccountWindow::setLangsStats(const QString langsData, CircleChart *langsCha ColorValueDisplay *langsValuesDisplay) { QStringList langsColors; - langsColors << "#c75d5e" - << "#e09132" - << "#b1e032" - << "#78b3ba" + langsColors << "#e08581" + << "#d8bd85" + << "#a9bf85" + << "#85b9b3" << "#5dc7c3" << "#c75da9" << "#c7c25d" diff --git a/src/CodeKeeper/keeperFunc/functional.cpp b/src/CodeKeeper/keeperFunc/functional.cpp index 830a3fd5..35c62845 100644 --- a/src/CodeKeeper/keeperFunc/functional.cpp +++ b/src/CodeKeeper/keeperFunc/functional.cpp @@ -105,7 +105,7 @@ void MainWindow::setConnectionStatus() QPixmap(":/connected.png") .scaled(font_size.toInt() + 1, font_size.toInt() + 1, Qt::KeepAspectRatio, Qt::SmoothTransformation)); isConnected->setToolTip(tr("Connected")); - sizeGrip2->setStyleSheet("background-color: #37d442; border-radius: 5px;"); + sizeGrip2->setStyleSheet("background-color: #a9bf85; border-radius: 6px;"); } else { @@ -121,7 +121,7 @@ void MainWindow::setConnectionStatus() QPixmap(":/auto_sync_on.png") .scaled(font_size.toInt() + 1, font_size.toInt() + 1, Qt::KeepAspectRatio, Qt::SmoothTransformation)); isAutoSync->setToolTip(tr("Auto sync on")); - sizeGrip2->setStyleSheet("background-color: #37d442; border-radius: 5px;"); + sizeGrip2->setStyleSheet("background-color: #a9bf85; border-radius: 6px;"); } else { @@ -357,13 +357,13 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) QString font_size_hello = QString::number(*font_size_int * 1.4); timeLabel->setFont(*selectedFont); - timeLabel->setStyleSheet("background: transparent; font-size: " + font_size_clock + "pt; color: #799987;"); + timeLabel->setStyleSheet("background: transparent; font-size: " + font_size_clock + "pt; color: #a9bf85;"); dateLabel->setFont(*selectedFont); - dateLabel->setStyleSheet("background: transparent; font-size: " + font_size_date + "pt; color: #799987;"); + dateLabel->setStyleSheet("background: transparent; font-size: " + font_size_date + "pt; color: #a9bf85;"); helloLabel->setFont(*selectedFont); - helloLabel->setStyleSheet("background: transparent; font-size: " + font_size_hello + "pt; color: #799987;"); + helloLabel->setStyleSheet("background: transparent; font-size: " + font_size_hello + "pt; color: #a9bf85;"); projectsMainLabel->setFont(*selectedFont); projectsMainLabel->setStyleSheet("font-size: " + font_size + "pt;"); @@ -409,8 +409,8 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(211, 102, 107, 250); color: #000000; " - "border-width: 0px; border-color: rgba(211, 102, 107, 250); " + "background-color: #e08581; color: #000000; " + "border-width: 0px; border-color: #e08581; " "border-radius: 5px;" "font-size: " + font_size + @@ -427,7 +427,7 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(231, 232, 141, 250); " + "background-color: #d8bd85; " "color: #000000; text-decoration: underline; " "border-width: 0px; " "border-radius: 5px;" @@ -446,7 +446,7 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(195, 232, 141, 250); " + "background-color: #a9bf85; " "color: #000000;" "border-radius: 5px;" "line-through; border-width: 0px; " @@ -465,7 +465,7 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(211, 102, 107, 250);" + "background-color: #e08581;" "color: #000000; border-width: 0px; " "border-radius: 5px;" "border-color: #ff757f; " @@ -484,7 +484,7 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(231, 232, 141, 250); color: #000000; " + "background-color: #d8bd85; color: #000000; " "border-radius: 5px;" "border-width: 0px; border-color: #ffc777; " "font-size: " + @@ -502,8 +502,8 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(126, 156, 216, 250 " - "); color: #000000; border-width: 0px; " + "background-color: #85b9b3; " + "color: #000000; border-width: 0px; " "border-radius: 5px;" "border-color: #82aaff; " "font-size: " + @@ -521,7 +521,7 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) "}" "QListWidget::Item {" "margin: 0px;" - "background-color: rgba(195, 232, 141, 250); color: #000000; " + "background-color: #a9bf85; color: #000000; " "border-radius: 5px;" "border-width: 0px; border-color: #c3e88d; " "font-size: " + @@ -569,8 +569,8 @@ void MainWindow::setStyle(QFont *selectedFont, int *font_size_int) windowTitle->setStyleSheet("font-size: " + font_size + "pt;"); tasksProgress->setFont(*selectedFont); - tasksProgress->setStyleSheet("background-color: rgba(211, 102, 107, 250); selection-background-color: " - "rgba(195, 232, 141, 250); color: #222436; font-size: " + + tasksProgress->setStyleSheet("background-color: #e08581; selection-background-color: " + "#a9bf85; color: #222436; font-size: " + font_size + "pt;"); menu->setStyleSheet("font-size: " + font_size + "pt;"); diff --git a/src/CodeKeeper/mainwindow.cpp b/src/CodeKeeper/mainwindow.cpp index cf316267..ba8d6ff2 100644 --- a/src/CodeKeeper/mainwindow.cpp +++ b/src/CodeKeeper/mainwindow.cpp @@ -381,15 +381,23 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) tasksMenuBtn->setMenu(tasksMenu); + projectsList = new QComboBox(); + projectsList->setFixedSize(300, 25); + projectsList->setPlaceholderText("Select your project ... "); + + projectsList->addItem("CodeKeeper"); + projectsList->addItem("SDash"); + tasksProgress = new QProgressBar(); tasksProgress->setMaximum(100); tasksProgress->setMaximumWidth(300); - tasksProgress->setFixedHeight(20); + tasksProgress->setFixedHeight(25); tasksProgress->setAlignment(Qt::AlignCenter); tasksStatsL->addItem(spacer1); tasksStatsL->addWidget(tasksMenuBtn); - tasksStatsL->addWidget(tasksProgress); + tasksStatsL->addWidget(projectsList); + // tasksStatsL->addWidget(tasksProgress); tasksStatsL->addItem(spacer2); label_1 = new QLabel(tr("Incomplete")); @@ -434,10 +442,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) taskText = new QLineEdit(); taskText->setPlaceholderText(tr(" Task...")); taskText->setFixedHeight(25); + taskText->setMaximumWidth(400); tasksGLayout->addLayout(tasksStatsL, 0, 0, 1, 3); QSplitter *tasksSplitter = new QSplitter(Qt::Horizontal); + tasksSplitter->setStyleSheet("QSplitter::handle:horizontal {background-color: transparent; color: transparent;} QSplitter::handle:vertical {background-color: transparent; color: transparent;}"); tasksSplitter->addWidget(incompleteTasks); tasksSplitter->addWidget(inprocessTasks); @@ -450,9 +460,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) tasksGLayout->addWidget(label_1, 1, 0, Qt::AlignHCenter); tasksGLayout->addWidget(label_2, 1, 1, Qt::AlignHCenter); tasksGLayout->addWidget(label_3, 1, 2, Qt::AlignHCenter); - tasksGLayout->addWidget(tasksSplitter, 2, 0, 1, 3); - tasksGLayout->addWidget(taskText, 4, 1); // ======================================================== diff --git a/src/CodeKeeper/mainwindow.h b/src/CodeKeeper/mainwindow.h index 3ee0bdc5..a40672e9 100644 --- a/src/CodeKeeper/mainwindow.h +++ b/src/CodeKeeper/mainwindow.h @@ -338,6 +338,7 @@ class MainWindow : public QMainWindow QLabel *label_3; QLineEdit *taskText; + QComboBox *projectsList; // ======================================================== diff --git a/src/CodeKeeper/settingswindow.cpp b/src/CodeKeeper/settingswindow.cpp index 18217925..51cc22b2 100644 --- a/src/CodeKeeper/settingswindow.cpp +++ b/src/CodeKeeper/settingswindow.cpp @@ -86,7 +86,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QMainWindow{parent} appName->setStyleSheet("font-size: 42px;"); urlToRepo = new QLabel(); - urlToRepo->setText("Source"); urlToRepo->setTextFormat(Qt::RichText); diff --git a/src/resources/about.png b/src/resources/about.png index b16495a2..4923bb13 100644 Binary files a/src/resources/about.png and b/src/resources/about.png differ diff --git a/src/resources/auto_sync_off.png b/src/resources/auto_sync_off.png index b7697f88..257c2293 100644 Binary files a/src/resources/auto_sync_off.png and b/src/resources/auto_sync_off.png differ diff --git a/src/resources/auto_sync_on.png b/src/resources/auto_sync_on.png index eb247111..3fcf1077 100644 Binary files a/src/resources/auto_sync_on.png and b/src/resources/auto_sync_on.png differ diff --git a/src/resources/bold.png b/src/resources/bold.png index 5145b16d..93a8ae1f 100644 Binary files a/src/resources/bold.png and b/src/resources/bold.png differ diff --git a/src/resources/check-mark.png b/src/resources/check-mark.png index e6c65596..1a3d4092 100644 Binary files a/src/resources/check-mark.png and b/src/resources/check-mark.png differ diff --git a/src/resources/checkbox.png b/src/resources/checkbox.png index 9210efbb..6c6a9cb3 100644 Binary files a/src/resources/checkbox.png and b/src/resources/checkbox.png differ diff --git a/src/resources/connected.png b/src/resources/connected.png index 143c153d..b4f4313a 100644 Binary files a/src/resources/connected.png and b/src/resources/connected.png differ diff --git a/src/resources/copy.png b/src/resources/copy.png index 3051b312..130cbc21 100644 Binary files a/src/resources/copy.png and b/src/resources/copy.png differ diff --git a/src/resources/delete.png b/src/resources/delete.png index 0a72254f..db0949c1 100644 Binary files a/src/resources/delete.png and b/src/resources/delete.png differ diff --git a/src/resources/disconnected.png b/src/resources/disconnected.png index 262f6c22..aa703f1a 100644 Binary files a/src/resources/disconnected.png and b/src/resources/disconnected.png differ diff --git a/src/resources/document.png b/src/resources/document.png index d078047d..159a9eff 100644 Binary files a/src/resources/document.png and b/src/resources/document.png differ diff --git a/src/resources/down-arrow.png b/src/resources/down-arrow.png index 027ed25b..12abc67e 100644 Binary files a/src/resources/down-arrow.png and b/src/resources/down-arrow.png differ diff --git a/src/resources/download.png b/src/resources/download.png index 60ff1949..f0b89498 100644 Binary files a/src/resources/download.png and b/src/resources/download.png differ diff --git a/src/resources/edit.png b/src/resources/edit.png index 549d22ef..f69b671f 100644 Binary files a/src/resources/edit.png and b/src/resources/edit.png differ diff --git a/src/resources/expand.png b/src/resources/expand.png index a2a66dc7..a691e0ba 100644 Binary files a/src/resources/expand.png and b/src/resources/expand.png differ diff --git a/src/resources/export.png b/src/resources/export.png index 38c68a4c..7b45a271 100644 Binary files a/src/resources/export.png and b/src/resources/export.png differ diff --git a/src/resources/folder-open.png b/src/resources/folder-open.png index 94d3e876..e28369cc 100644 Binary files a/src/resources/folder-open.png and b/src/resources/folder-open.png differ diff --git a/src/resources/folder.png b/src/resources/folder.png index 67c688c8..7f40c8f6 100644 Binary files a/src/resources/folder.png and b/src/resources/folder.png differ diff --git a/src/resources/h1.png b/src/resources/h1.png index 32912f4a..ea87da3d 100644 Binary files a/src/resources/h1.png and b/src/resources/h1.png differ diff --git a/src/resources/h2.png b/src/resources/h2.png index bd7e313b..cd0fdc27 100644 Binary files a/src/resources/h2.png and b/src/resources/h2.png differ diff --git a/src/resources/h3.png b/src/resources/h3.png index 3c4c805d..0216c576 100644 Binary files a/src/resources/h3.png and b/src/resources/h3.png differ diff --git a/src/resources/home_dir.png b/src/resources/home_dir.png index 30fee896..5dbf34e8 100644 Binary files a/src/resources/home_dir.png and b/src/resources/home_dir.png differ diff --git a/src/resources/italic.png b/src/resources/italic.png index 096afd3d..cb5253e2 100644 Binary files a/src/resources/italic.png and b/src/resources/italic.png differ diff --git a/src/resources/link.png b/src/resources/link.png index d2331084..f3d77ed6 100644 Binary files a/src/resources/link.png and b/src/resources/link.png differ diff --git a/src/resources/list.png b/src/resources/list.png index 2092fbc8..a3f3859c 100644 Binary files a/src/resources/list.png and b/src/resources/list.png differ diff --git a/src/resources/main.png b/src/resources/main.png index 5fe68325..897ad817 100644 Binary files a/src/resources/main.png and b/src/resources/main.png differ diff --git a/src/resources/new.png b/src/resources/new.png index ba6ccb1f..3f7b1588 100644 Binary files a/src/resources/new.png and b/src/resources/new.png differ diff --git a/src/resources/new_folder.png b/src/resources/new_folder.png index f14be7c9..f2924a12 100644 Binary files a/src/resources/new_folder.png and b/src/resources/new_folder.png differ diff --git a/src/resources/note.png b/src/resources/note.png index 267a3d34..eda46ae4 100644 Binary files a/src/resources/note.png and b/src/resources/note.png differ diff --git a/src/resources/numList.png b/src/resources/numList.png index 78d66067..c926a1f1 100644 Binary files a/src/resources/numList.png and b/src/resources/numList.png differ diff --git a/src/resources/open.png b/src/resources/open.png index 94d3e876..e28369cc 100644 Binary files a/src/resources/open.png and b/src/resources/open.png differ diff --git a/src/resources/palette.png b/src/resources/palette.png index ef6100f3..e0f0ca0c 100644 Binary files a/src/resources/palette.png and b/src/resources/palette.png differ diff --git a/src/resources/paste.png b/src/resources/paste.png index 9ca11796..f15ec681 100644 Binary files a/src/resources/paste.png and b/src/resources/paste.png differ diff --git a/src/resources/project.png b/src/resources/project.png index 7821a6a5..212e07af 100644 Binary files a/src/resources/project.png and b/src/resources/project.png differ diff --git a/src/resources/quit.png b/src/resources/quit.png index 651c2331..78405971 100644 Binary files a/src/resources/quit.png and b/src/resources/quit.png differ diff --git a/src/resources/quote.png b/src/resources/quote.png index 848ebc8f..216356fc 100644 Binary files a/src/resources/quote.png and b/src/resources/quote.png differ diff --git a/src/resources/read.png b/src/resources/read.png index 2be14de1..d809b486 100644 Binary files a/src/resources/read.png and b/src/resources/read.png differ diff --git a/src/resources/refresh.png b/src/resources/refresh.png index ce57cc76..c928b2af 100644 Binary files a/src/resources/refresh.png and b/src/resources/refresh.png differ diff --git a/src/resources/rename.png b/src/resources/rename.png index 549d22ef..f8e6879a 100644 Binary files a/src/resources/rename.png and b/src/resources/rename.png differ diff --git a/src/resources/resize.png b/src/resources/resize.png index a5ee9c95..861110fa 100644 Binary files a/src/resources/resize.png and b/src/resources/resize.png differ diff --git a/src/resources/resources.qrc b/src/resources/resources.qrc index d8366989..9e0e4cf1 100644 --- a/src/resources/resources.qrc +++ b/src/resources/resources.qrc @@ -39,7 +39,6 @@ main.png project.png task.png - about.png refresh.png storage.png palette.png @@ -78,5 +77,6 @@ git.png tea.svg resize.png + about.png diff --git a/src/resources/retry.png b/src/resources/retry.png index ce57cc76..c928b2af 100644 Binary files a/src/resources/retry.png and b/src/resources/retry.png differ diff --git a/src/resources/save.png b/src/resources/save.png index 3bfcb947..559324f4 100644 Binary files a/src/resources/save.png and b/src/resources/save.png differ diff --git a/src/resources/search.png b/src/resources/search.png index 67d28fbf..cb72ba59 100644 Binary files a/src/resources/search.png and b/src/resources/search.png differ diff --git a/src/resources/settings.png b/src/resources/settings.png index 7bb414a3..3f9d116f 100644 Binary files a/src/resources/settings.png and b/src/resources/settings.png differ diff --git a/src/resources/sorting.png b/src/resources/sorting.png index d5816a22..51ff98ae 100644 Binary files a/src/resources/sorting.png and b/src/resources/sorting.png differ diff --git a/src/resources/storage.png b/src/resources/storage.png index b6ae4f04..e05d0740 100644 Binary files a/src/resources/storage.png and b/src/resources/storage.png differ diff --git a/src/resources/strikethrough.png b/src/resources/strikethrough.png index 4ceac643..ddafbe42 100644 Binary files a/src/resources/strikethrough.png and b/src/resources/strikethrough.png differ diff --git a/src/resources/sync.png b/src/resources/sync.png index d061d629..be6c728b 100644 Binary files a/src/resources/sync.png and b/src/resources/sync.png differ diff --git a/src/resources/table.png b/src/resources/table.png index 17dfaad6..53286e68 100644 Binary files a/src/resources/table.png and b/src/resources/table.png differ diff --git a/src/resources/task.png b/src/resources/task.png index dafd409a..acc6e720 100644 Binary files a/src/resources/task.png and b/src/resources/task.png differ diff --git a/src/resources/trash.png b/src/resources/trash.png index 2d11b08d..522554c4 100644 Binary files a/src/resources/trash.png and b/src/resources/trash.png differ diff --git a/src/resources/up-arrow.png b/src/resources/up-arrow.png index edaf36a2..98a26037 100644 Binary files a/src/resources/up-arrow.png and b/src/resources/up-arrow.png differ diff --git a/src/resources/user.png b/src/resources/user.png index 3c0a7fcf..f31567ff 100644 Binary files a/src/resources/user.png and b/src/resources/user.png differ diff --git a/src/resources/view.png b/src/resources/view.png index fec6b56f..8ad6d610 100644 Binary files a/src/resources/view.png and b/src/resources/view.png differ diff --git a/src/stylesheet/custom_stylesheet.qss b/src/stylesheet/custom_stylesheet.qss index 666a21e3..f8985dcd 100644 --- a/src/stylesheet/custom_stylesheet.qss +++ b/src/stylesheet/custom_stylesheet.qss @@ -18,18 +18,18 @@ QTableWidget::item { QWidget { background-color: #303743; border-width: 0px; - border-color: #fff; + border-color: #FFFFFF; border-radius: 0px; } QMainWindow { border: none; background: transparent; - color: #fff; + color: #FFFFFF; border-radius: 0px; } QCheckBox { - color: #fff; + color: #FFFFFF; } QCheckBox::indicator { @@ -39,41 +39,41 @@ QCheckBox::indicator { } QCheckBox::indicator:unchecked { border-radius: 6px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QCheckBox::indicator:unchecked:hover { border-radius: 6px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QCheckBox::indicator:unchecked:pressed { border-radius: 6px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QCheckBox::indicator:checked { border-radius: 6px; - background-color: #74bbbc; + background-color: #a9bf85; } QCheckBox::indicator:checked:hover { border-radius: 6px; - background-color: #74bbbc; + background-color: #a9bf85; } QCheckBox::indicator:checked:pressed { border-radius: 6px; - background-color: #74bbbc; + background-color: #a9bf85; } QCheckBox::indicator:indeterminate:hover { border-radius: 6px; - background-color: #74bbbc; + background-color: #a9bf85; } QCheckBox::indicator:indeterminate:pressed { border-radius: 6px; - background-color: #74bbbc; + background-color: #a9bf85; } QStatusBar { @@ -107,29 +107,29 @@ QMarkdownTextEdit::lineNumber { } QMarkdownTextEdit::lineNumber:selected { - color: #fff; + color: #FFFFFF; background-color: transparent; border-radius: 10px; } QMarkdownTextEdit::lineNumber::selected:active { - color: #74bbbc; + color: #a9bf85; background-color: transparent; border-radius: 10px; } QFontComboBox { - color: #fff; + color: #FFFFFF; border-radius: 10px; - background-color: #171b22; - alternate-background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); + alternate-background-color: rgba(255, 255, 255, 0.1); } QComboBox { - color: #fff; + color: #FFFFFF; border-radius: 10px; - background-color: #171b22; - alternate-background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); + alternate-background-color: rgba(255, 255, 255, 0.1); } QComboBox::down-arrow { @@ -147,10 +147,10 @@ QComboBox::drop-down { } QSpinBox { - color: #fff; - background-color: #171b22; + color: #FFFFFF; + background-color: rgba(255, 255, 255, 0.1); border-radius: 10px; - alternate-background-color: #171b22; + alternate-background-color: rgba(255, 255, 255, 0.1); } QSpinBox::up-button { @@ -195,21 +195,21 @@ QTabWidget::pane { } QMenu { - background-color: #171b22; - color: #fff; - border: 1px solid #fff; + background-color: rgba(255, 255, 255, 0.1); + color: #FFFFFF; + border: 1px solid #FFFFFF; border-radius: 10px; } QMenu::separator { height: 3px; border-radius: 1px; - background-color: #fff; + background-color: #FFFFFF; } QMenu::item { border-radius: 0px; - color: #fff; + color: #FFFFFF; margin: 5px 10px; } @@ -226,36 +226,36 @@ QMenu::indicator { } QMenu::indicator:unchecked { border-radius: 5px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QMenu::indicator:unchecked:hover { border-radius: 5px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QMenu::indicator:unchecked:pressed { border-radius: 5px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } QMenu::indicator:checked { border-radius: 5px; - background-color: #74bbbc; + background-color: #a9bf85; } QMenu::indicator:checked:hover { border-radius: 5px; - background-color: #74bbbc; + background-color: #a9bf85; } QMenu::indicator:checked:pressed { border-radius: 5px; - background-color: #74bbbc; + background-color: #a9bf85; } QMenu::indicator:indeterminate:hover { border-radius: 5px; - background-color: #74bbbc; + background-color: #a9bf85; } QMenu::indicator:indeterminate:pressed { border-radius: 5px; - background-color: #74bbbc; + background-color: #a9bf85; } QToolButton:pressed { @@ -263,8 +263,8 @@ QToolButton:pressed { } QToolButton { background-color: transparent; - selection-background-color: #171b22; - color: #fff; + selection-background-color: rgba(255, 255, 255, 0.1); + color: #FFFFFF; border-width: 2px; border-style: solid; border-radius: 10px; @@ -279,7 +279,7 @@ QTabBar::tab { width: 100px; font-size: 10px; background: transparent; - color: #fff; + color: #FFFFFF; border: 0px solid lightgray; border-radius: 5px; margin: 5px; @@ -291,8 +291,8 @@ QTabBar::tab:selected { height: 15px; width: 100px; font-size: 10px; - color: #fff; - background: #171b22; + color: #FFFFFF; + background: rgba(255, 255, 255, 0.1); padding: 5px 5px; border-radius: 5px; margin-bottom: 1px; @@ -300,9 +300,9 @@ QTabBar::tab:selected { QPushButton { - background-color: #171b22; - selection-background-color: #171b22; - color: #fff; + background-color: rgba(255, 255, 255, 0.1); + selection-background-color: rgba(255, 255, 255, 0.1); + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; @@ -311,9 +311,9 @@ QPushButton { } QPushButton:after { - background-color: #171b22; - selection-background-color: #171b22; - color: #fff; + background-color: rgba(255, 255, 255, 0.1); + selection-background-color: rgba(255, 255, 255, 0.1); + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; @@ -322,84 +322,84 @@ QPushButton:after { } QPushButton::ToolTip { - color: #fff; + color: #FFFFFF; } QLabel { - color: #fff; + color: #FFFFFF; } QLineEdit { - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); selection-background-color: #999999; - selection-color: #fff; - color: #fff; + selection-color: #FFFFFF; + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #171b22; + alternate-background-color: rgba(255, 255, 255, 0.1); } QPlainTextEdit { background-color: transparent; selection-background-color: #999999; - selection-color: #fff; - color: #fff; + selection-color: #FFFFFF; + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #171b22; + alternate-background-color: rgba(255, 255, 255, 0.1); } QTextBrowser { line-height: 10px; background-color: transparent; selection-background-color: #999999; - selection-color: #fff; - color: #fff; + selection-color: #FFFFFF; + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #171b22; + alternate-background-color: rgba(255, 255, 255, 0.1); } QListWidget { background-color: transparent; - color: #fff; - selection-color: #fff; + color: #FFFFFF; + selection-color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 5px; border-color: #26333f; - alternate-background-color: #171b22; + alternate-background-color: rgba(255, 255, 255, 0.1); } QListWidget::item:selected { - color: #fff; - background-color: #171b22; + color: #FFFFFF; + background-color: rgba(255, 255, 255, 0.1); border-radius: 5px; } QGroupBox { - color: #fff; + color: #FFFFFF; background-color: transparent; border-radius: 10px; } QTreeView { background-color: transparent; - selection-background-color: #171b22; - selection-color: #fff; - color: #fff; + selection-background-color: rgba(255, 255, 255, 0.1); + selection-color: #FFFFFF; + color: #FFFFFF; border-width: 0px; border-style: solid; border-radius: 10px; - border-color: #171b22; - alternate-background-color: #171b22; + border-color: rgba(255, 255, 255, 0.1); + alternate-background-color: rgba(255, 255, 255, 0.1); } QTreeView::item:alternate { @@ -410,22 +410,22 @@ QTreeView::item:alternate { QTreeView::item:selected { height: 14px; - background-color: #171b22; - border: 0px solid #171b22; + background-color: rgba(255, 255, 255, 0.1); + border: 0px solid rgba(255, 255, 255, 0.1); border-radius: 0px; } QTreeView::item:selected:!active { height: 14px; background-color: transparent; - color: #fff; + color: #FFFFFF; border-radius: 0px; } QTreeView::item:selected:active { height: 14px; - background-color: #171b22; - color: #fff; + background-color: rgba(255, 255, 255, 0.1); + color: #FFFFFF; border-radius: 0px; } @@ -438,31 +438,31 @@ QTreeView::item:hover { QHeaderView { border: 1px solid #26333f; background-color: transparent; - color: #fff; + color: #FFFFFF; } QHeaderView::section { border: 1px solid #26333f; background-color: transparent; - color: #fff; + color: #FFFFFF; } QHeaderView::section:checked { border: 1px solid #26333f; background-color: transparent; - color: #fff; + color: #FFFFFF; } QHeaderView::section:checked:horizontal { border: 1px solid #26333f; background-color: transparent; - color: #fff; + color: #FFFFFF; } QHeaderView::section:checked:vertical { border: 1px solid #26333f; background-color: transparent; - color: #fff; + color: #FFFFFF; } QProgressBar { @@ -548,8 +548,8 @@ QScrollBar::add-page, QScrollBar::sub-page { } QToolTip { - color: #ffffff; - border: 10px #171b22; + color: #FFFFFF; + border: 10px rgba(255, 255, 255, 0.1); border-radius: 5px; - background-color: #171b22; + background-color: rgba(255, 255, 255, 0.1); } diff --git a/src/stylesheet/custom_stylesheet_light.qss b/src/stylesheet/custom_stylesheet_light.qss index 07cad690..ada5d5a6 100644 --- a/src/stylesheet/custom_stylesheet_light.qss +++ b/src/stylesheet/custom_stylesheet_light.qss @@ -16,13 +16,13 @@ QTableWidget::item { } QWidget { - background-color: #cfe1b9; + background-color: #fff; border: none; border-color: #000000; border-radius: 0px; } QMainWindow { - background-color: #cfe1b9; + background-color: #fff; border: none; background: transparent; color: #000000; @@ -39,41 +39,41 @@ QCheckBox::indicator { } QCheckBox::indicator:unchecked { border-radius: 6px; - background-color: #799987; + background-color: #a9bf85; } QCheckBox::indicator:unchecked:hover { border-radius: 6px; - background-color: #799987; + background-color: #a9bf85; } QCheckBox::indicator:unchecked:pressed { border-radius: 6px; - background-color: #799987; + background-color: #a9bf85; } QCheckBox::indicator:checked { border-radius: 6px; - background-color: #52b788; + background-color: #a9bf85; } QCheckBox::indicator:checked:hover { border-radius: 6px; - background-color: #52b788; + background-color: #a9bf85; } QCheckBox::indicator:checked:pressed { border-radius: 6px; - background-color: #52b788; + background-color: #a9bf85; } QCheckBox::indicator:indeterminate:hover { border-radius: 6px; - background-color: #52b788; + background-color: #a9bf85; } QCheckBox::indicator:indeterminate:pressed { border-radius: 6px; - background-color: #52b788; + background-color: #a9bf85; } QStatusBar { @@ -113,7 +113,7 @@ QMarkdownTextEdit::lineNumber:selected { } QMarkdownTextEdit::lineNumber::selected:active { - color: #52b788; + color: #a9bf85; background-color: transparent; border-radius: 10px; } @@ -121,15 +121,15 @@ QMarkdownTextEdit::lineNumber::selected:active { QFontComboBox { color: #000000; border-radius: 10px; - background-color: #799987; - alternate-background-color: #799987; + background-color: #a9bf85; + alternate-background-color: #a9bf85; } QComboBox { color: #000000; border-radius: 10px; - background-color: #799987; - alternate-background-color: #799987; + background-color: #a9bf85; + alternate-background-color: #a9bf85; } QComboBox::down-arrow { @@ -148,9 +148,9 @@ QComboBox::drop-down { QSpinBox { color: #000000; - background-color: #799987; + background-color: #a9bf85; border-radius: 10px; - alternate-background-color: #799987; + alternate-background-color: #a9bf85; } QSpinBox::up-button { @@ -195,7 +195,7 @@ QTabWidget::pane { } QMenu { - background-color: #799987; + background-color: #a9bf85; color: #000000; border: 1px solid #000000; border-radius: 10px; @@ -226,36 +226,36 @@ QMenu::indicator { } QMenu::indicator:unchecked { border-radius: 5px; - background-color: #799987; + background-color: #a9bf85; } QMenu::indicator:unchecked:hover { border-radius: 5px; - background-color: #799987; + background-color: #a9bf85; } QMenu::indicator:unchecked:pressed { border-radius: 5px; - background-color: #799987; + background-color: #a9bf85; } QMenu::indicator:checked { border-radius: 5px; - background-color: #52b788; + background-color: #a9bf85; } QMenu::indicator:checked:hover { border-radius: 5px; - background-color: #52b788; + background-color: #a9bf85; } QMenu::indicator:checked:pressed { border-radius: 5px; - background-color: #52b788; + background-color: #a9bf85; } QMenu::indicator:indeterminate:hover { border-radius: 5px; - background-color: #52b788; + background-color: #a9bf85; } QMenu::indicator:indeterminate:pressed { border-radius: 5px; - background-color: #52b788; + background-color: #a9bf85; } QToolButton:pressed { @@ -263,7 +263,7 @@ QToolButton:pressed { } QToolButton { background-color: transparent; - selection-background-color: #799987; + selection-background-color: #a9bf85; color: #000000; border-width: 2px; border-style: solid; @@ -300,8 +300,8 @@ QTabBar::tab:selected { QPushButton { - background-color: #799987; - selection-background-color: #799987; + background-color: #a9bf85; + selection-background-color: #a9bf85; color: #000000; border-width: 0px; border-style: solid; @@ -311,8 +311,8 @@ QPushButton { } QPushButton:after { - background-color: #799987; - selection-background-color: #799987; + background-color: #a9bf85; + selection-background-color: #a9bf85; color: #000000; border-width: 0px; border-style: solid; @@ -330,7 +330,7 @@ QLabel { } QLineEdit { - background-color: #799987; + background-color: #a9bf85; selection-background-color: #999999; selection-color: #000000; color: #000000; @@ -338,7 +338,7 @@ QLineEdit { border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #799987; + alternate-background-color: #a9bf85; } QPlainTextEdit { @@ -350,7 +350,7 @@ QPlainTextEdit { border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #799987; + alternate-background-color: #a9bf85; } QTextBrowser { @@ -363,7 +363,7 @@ QTextBrowser { border-style: solid; border-radius: 10px; border-color: #26333f; - alternate-background-color: #799987; + alternate-background-color: #a9bf85; } @@ -375,12 +375,12 @@ QListWidget { border-style: solid; border-radius: 5px; border-color: #26333f; - alternate-background-color: #799987; + alternate-background-color: #a9bf85; } QListWidget::item:selected { color: #000000; - background-color: #799987; + background-color: #a9bf85; border-radius: 5px; } @@ -392,14 +392,14 @@ QGroupBox { QTreeView { background-color: transparent; - selection-background-color: #799987; + selection-background-color: #a9bf85; selection-color: #000000; color: #000000; border-width: 0px; border-style: solid; border-radius: 10px; - border-color: #799987; - alternate-background-color: #799987; + border-color: #a9bf85; + alternate-background-color: #a9bf85; } QTreeView::item:alternate { @@ -412,8 +412,8 @@ QTreeView::item:alternate { QTreeView::item:selected { height: 14px; color: #000000; - background-color: #799987; - border: 0px solid #799987; + background-color: #a9bf85; + border: 0px solid #a9bf85; border-radius: 0px; } @@ -427,7 +427,7 @@ QTreeView::item:selected:!active { QTreeView::item:selected:active { height: 14px; - background-color: #799987; + background-color: #a9bf85; color: #000000; border-radius: 0px; } @@ -553,7 +553,7 @@ QScrollBar::add-page, QScrollBar::sub-page { QToolTip { color: #000000000000; - border: 10px #799987; + border: 10px #a9bf85; border-radius: 5px; - background-color: #799987; + background-color: #a9bf85; }