Fix colors

Nighty3098 · Sep 28, 2024 · 3af3d89 · 3af3d89
1 parent 73450a6
commit 3af3d89
Show file tree

Hide file tree

Showing 62 changed files with 167 additions and 158 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -86,7 +86,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) : QMainWindow{parent}
     appName->setStyleSheet("font-size: 42px;");
 
     urlToRepo = new QLabel();
-    urlToRepo->setText("<a style='color: #84a0bf; text-decoration: none; font-size: " + font_size +
+    urlToRepo->setText("<a style='color: #a9bf85; text-decoration: none; font-size: " + font_size +
                        "' "
                        "href=\"https://github.com/DXS-GROUP/CodeKeeper\">Source</a>");
     urlToRepo->setTextFormat(Qt::RichText);

diff --git a/src/resources/about.png b/src/resources/about.png
diff --git a/src/resources/auto_sync_off.png b/src/resources/auto_sync_off.png
diff --git a/src/resources/auto_sync_on.png b/src/resources/auto_sync_on.png
diff --git a/src/resources/bold.png b/src/resources/bold.png
diff --git a/src/resources/check-mark.png b/src/resources/check-mark.png
diff --git a/src/resources/checkbox.png b/src/resources/checkbox.png
diff --git a/src/resources/connected.png b/src/resources/connected.png
diff --git a/src/resources/copy.png b/src/resources/copy.png
diff --git a/src/resources/delete.png b/src/resources/delete.png
diff --git a/src/resources/disconnected.png b/src/resources/disconnected.png
diff --git a/src/resources/document.png b/src/resources/document.png
diff --git a/src/resources/down-arrow.png b/src/resources/down-arrow.png
diff --git a/src/resources/download.png b/src/resources/download.png
diff --git a/src/resources/edit.png b/src/resources/edit.png
diff --git a/src/resources/expand.png b/src/resources/expand.png
diff --git a/src/resources/export.png b/src/resources/export.png
diff --git a/src/resources/folder-open.png b/src/resources/folder-open.png
diff --git a/src/resources/folder.png b/src/resources/folder.png
diff --git a/src/resources/h1.png b/src/resources/h1.png
diff --git a/src/resources/h2.png b/src/resources/h2.png
diff --git a/src/resources/h3.png b/src/resources/h3.png
diff --git a/src/resources/home_dir.png b/src/resources/home_dir.png
diff --git a/src/resources/italic.png b/src/resources/italic.png
diff --git a/src/resources/link.png b/src/resources/link.png
diff --git a/src/resources/list.png b/src/resources/list.png
diff --git a/src/resources/main.png b/src/resources/main.png
diff --git a/src/resources/new.png b/src/resources/new.png
diff --git a/src/resources/new_folder.png b/src/resources/new_folder.png
diff --git a/src/resources/note.png b/src/resources/note.png
diff --git a/src/resources/numList.png b/src/resources/numList.png
diff --git a/src/resources/open.png b/src/resources/open.png
diff --git a/src/resources/palette.png b/src/resources/palette.png
diff --git a/src/resources/paste.png b/src/resources/paste.png
diff --git a/src/resources/project.png b/src/resources/project.png
diff --git a/src/resources/quit.png b/src/resources/quit.png
diff --git a/src/resources/quote.png b/src/resources/quote.png
diff --git a/src/resources/read.png b/src/resources/read.png
diff --git a/src/resources/refresh.png b/src/resources/refresh.png
diff --git a/src/resources/rename.png b/src/resources/rename.png
diff --git a/src/resources/resize.png b/src/resources/resize.png
diff --git a/src/resources/resources.qrc b/src/resources/resources.qrc
@@ -39,7 +39,6 @@
         <file>main.png</file>
         <file>project.png</file>
         <file>task.png</file>
-        <file>about.png</file>
         <file>refresh.png</file>
         <file>storage.png</file>
         <file>palette.png</file>
@@ -78,5 +77,6 @@
         <file>git.png</file>
         <file>tea.svg</file>
         <file>resize.png</file>
+        <file>about.png</file>
     </qresource>
 </RCC>
diff --git a/src/resources/retry.png b/src/resources/retry.png
diff --git a/src/resources/save.png b/src/resources/save.png
diff --git a/src/resources/search.png b/src/resources/search.png
diff --git a/src/resources/settings.png b/src/resources/settings.png
diff --git a/src/resources/sorting.png b/src/resources/sorting.png
diff --git a/src/resources/storage.png b/src/resources/storage.png
diff --git a/src/resources/strikethrough.png b/src/resources/strikethrough.png
diff --git a/src/resources/sync.png b/src/resources/sync.png
diff --git a/src/resources/table.png b/src/resources/table.png
diff --git a/src/resources/task.png b/src/resources/task.png
diff --git a/src/resources/trash.png b/src/resources/trash.png
diff --git a/src/resources/up-arrow.png b/src/resources/up-arrow.png
diff --git a/src/resources/user.png b/src/resources/user.png
diff --git a/src/resources/view.png b/src/resources/view.png