diff --git a/src/entrypoints/groundstation/application.qrc b/src/entrypoints/groundstation/application.qrc index 9d386f86e12f38fa57a07bfabe45ae7a0d215c1d..34cc61a7efd09b587545f80dda3eeb52e2d56a28 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 826f8a401ce41d68052b5de98b0c11057a92ddcc..c58e107864f4766804bef61dcf6a0dd31b134899 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 10f5a39f4a6c3598182c5b0e8c70eef3d41d4374..5a2b8390d8839d4c51b9a808081513971e15874c 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 2222d2da56dcab1e2c1fefd2a53bc0079d874de2..3162295745cd221c9e9016307db2aa10ac3a84bc 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 87bb752683afa3e44dcb6c3fa37b5069eb40bea0..ea7d6c16566d9f82a40cac8a009050f2d87952cf 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)