From f69cd0e22263a348f64eabe9b72a0c3df6b034a4 Mon Sep 17 00:00:00 2001
From: Giacomo Caironi <giacomo.caironi@skywarder.eu>
Date: Wed, 31 Jul 2024 20:56:03 +0200
Subject: [PATCH] [Themes] Minor improvements

---
 src/entrypoints/groundstation/application.qrc | 15 +++++----
 .../groundstation/assets/styles/global.qss    | 26 ++++++++++++---
 .../assets/styles/white-mode.qss              | 33 ++++++++++++++++---
 .../Components/ErrorDisplayer/Error.cpp       | 11 +++----
 src/shared/Modules/Tabs/TabsModule.cpp        |  2 --
 5 files changed, 63 insertions(+), 24 deletions(-)

diff --git a/src/entrypoints/groundstation/application.qrc b/src/entrypoints/groundstation/application.qrc
index 9d386f86..34cc61a7 100644
--- a/src/entrypoints/groundstation/application.qrc
+++ b/src/entrypoints/groundstation/application.qrc
@@ -1,8 +1,9 @@
 <RCC>
-    <qresource prefix="/">
-        <file>assets/icons/splitter_horizontal.png</file>
-        <file>assets/icons/splitter_vertical.png</file>
-        <file>assets/styles/global.qss</file>
-        <file>assets/models/rocket.obj</file>
-    </qresource>
-</RCC>
+        <qresource prefix="/">
+                <file>assets/icons/splitter_horizontal.png</file>
+                <file>assets/icons/splitter_vertical.png</file>
+                <file>assets/styles/global.qss</file>
+                <file>assets/models/rocket.obj</file>
+                <file>assets/styles/white-mode.qss</file>
+        </qresource>
+</RCC>
\ No newline at end of file
diff --git a/src/entrypoints/groundstation/assets/styles/global.qss b/src/entrypoints/groundstation/assets/styles/global.qss
index 826f8a40..c58e1078 100644
--- a/src/entrypoints/groundstation/assets/styles/global.qss
+++ b/src/entrypoints/groundstation/assets/styles/global.qss
@@ -1050,7 +1050,21 @@ QSplitter[orientation="2"]::handle {
     max-height: 0px;
 }
 
-QListWidget {
+Error QWidget {
+    background-color: rgba(0,0,0,0); 
+    color: black; 
+    margin: 0px;
+    padding: 0px;
+} 
+
+Error QLabel {
+    margin: 0px; 
+    padding: 10px; 
+    padding-bottom: 10px; 
+    border-radius: 0px
+} 
+
+TabsModule QListWidget {
     show-decoration-selected: 1;
     color: #d7d6d6;
     border: none;
@@ -1058,7 +1072,7 @@ QListWidget {
     font-size: 16px;
 }
 
-QListWidget::item {
+TabsModule QListWidget::item {
     background-color: #494949;
     padding-top: 0;
     padding-bottom: 0;
@@ -1066,11 +1080,15 @@ QListWidget::item {
     padding-right: 10px;
 }
 
-QListWidget::item:selected {
+TabsModule QListWidget::item:selected {
     color: #d7d6d6;
     border-width: 0;
     border-top-style: solid;
     border-top-width: 5px;
     border-top-color: #a8a8a9;
     background-color: #606060;
-}
\ No newline at end of file
+}
+
+TabsModule QListWidget::item:selected:active {
+    background-color: #606060;
+}
diff --git a/src/entrypoints/groundstation/assets/styles/white-mode.qss b/src/entrypoints/groundstation/assets/styles/white-mode.qss
index 10f5a39f..5a2b8390 100644
--- a/src/entrypoints/groundstation/assets/styles/white-mode.qss
+++ b/src/entrypoints/groundstation/assets/styles/white-mode.qss
@@ -1059,8 +1059,29 @@ QSplitter[orientation="2"]::handle {
     max-height: 0px;
 }
 
+Error QWidget {
+    background-color: rgba(0,0,0,0); 
+    color: black; 
+    margin: 0px;
+    padding: 0px;
+} 
 
-QListWidget {
+Error QLabel {
+    margin: 0px; 
+    padding: 10px; 
+    padding-bottom: 10px; 
+    border-radius: 0px
+} 
+
+TabsModule QListWidget {
+    show-decoration-selected: 1;
+    color: red;
+    border: none;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+TabsModule QListWidget {
     show-decoration-selected: 1;
     color: black;
     border: none;
@@ -1068,7 +1089,7 @@ QListWidget {
     font-size: 16px;
 }
 
-QListWidget::item {
+TabsModule QListWidget::item {
     background-color: #f2f2f2;
     padding-top: 0;
     padding-bottom: 0;
@@ -1076,11 +1097,15 @@ QListWidget::item {
     padding-right: 10px;
 }
 
-QListWidget::item:selected {
+TabsModule QListWidget::item:selected {
     color: black;
     border-width: 0;
     border-top-style: solid;
     border-top-width: 5px;
     border-top-color: #f2f2f2;
     background-color: #b3b3b3;
-}
\ No newline at end of file
+}
+
+TabsModule QListWidget::item:selected:active {
+    background-color: #b3b3b3;
+}
diff --git a/src/shared/Components/ErrorDisplayer/Error.cpp b/src/shared/Components/ErrorDisplayer/Error.cpp
index 2222d2da..31622957 100644
--- a/src/shared/Components/ErrorDisplayer/Error.cpp
+++ b/src/shared/Components/ErrorDisplayer/Error.cpp
@@ -35,23 +35,20 @@ Error::Error(ErrorDisplayer* _displayer, QString _title, QString _description,
     // setMaximumHeight(100);
     setMaximumWidth(250);
 
-    QString style =
-        "QWidget {background-color: rgba(0,0,0,0); color: black; margin: 0px; "
-        "padding: 0px;} QLabel {margin: 0px; padding: 10px; padding-bottom: "
-        "10px; border-radius: 0px} ";
+    QString style;
     if (type == ErrorType::ET_ERROR)
     {
-        style.append("Error {background-color: rgba(221, 74, 55, 0.75);}");
+        style = "Error {background-color: rgba(221, 74, 55, 0.75);}";
         titlePrefix.setText("Error");
     }
     else if (type == ErrorType::ET_WARNING)
     {
-        style.append("Error {background-color: rgba(221, 204, 55, 0.75);}");
+        style = "Error {background-color: rgba(221, 204, 55, 0.75);}";
         titlePrefix.setText("Warning");
     }
     else if (type == ErrorType::ET_INFO)
     {
-        style.append("Error {background-color: rgba(55, 207, 221, 0.75);}");
+        style = "Error {background-color: rgba(55, 207, 221, 0.75);}";
         titlePrefix.setText("Info");
     }
     this->setStyleSheet(style);
diff --git a/src/shared/Modules/Tabs/TabsModule.cpp b/src/shared/Modules/Tabs/TabsModule.cpp
index 87bb7526..ea7d6c16 100644
--- a/src/shared/Modules/Tabs/TabsModule.cpp
+++ b/src/shared/Modules/Tabs/TabsModule.cpp
@@ -213,8 +213,6 @@ void TabsModule::onMenuRenameTabClick()
     tabNames->editItem(item);
 }
 
-// ---- UI
-
 void TabsModule::setupUi()
 {
     // Top component (top bar)
-- 
GitLab