diff --git a/core/src/scopypreferencespage.cpp b/core/src/scopypreferencespage.cpp index ec103c763c..2824856cef 100644 --- a/core/src/scopypreferencespage.cpp +++ b/core/src/scopypreferencespage.cpp @@ -65,7 +65,7 @@ void ScopyPreferencesPage::initUI() this->setLayout(layout); layout->addWidget(tabWidget); - Style::setStyle(tabWidget, style::properties::widget::backgroundPage, true, true); + Style::setBackgroundColor(tabWidget, json::theme::background_primary); StyleHelper::TabWidgetEastMenu(tabWidget, "preferencesTable"); } diff --git a/gui/src/widgets/menulineedit.cpp b/gui/src/widgets/menulineedit.cpp index 5e088176a6..e562f57659 100644 --- a/gui/src/widgets/menulineedit.cpp +++ b/gui/src/widgets/menulineedit.cpp @@ -46,7 +46,7 @@ QLineEdit *MenuLineEdit::edit() { return m_edit; } void MenuLineEdit::applyStylesheet() { Style::setStyle(m_edit, style::properties::lineedit::menuLineEdit); - Style::setStyle(this, style::properties::lineedit::menuLineEditWidget); + Style::setBackgroundColor(this, "transparent"); } #include "moc_menulineedit.cpp" diff --git a/gui/src/widgets/popupwidget.cpp b/gui/src/widgets/popupwidget.cpp index 0cd64f334e..58de163347 100644 --- a/gui/src/widgets/popupwidget.cpp +++ b/gui/src/widgets/popupwidget.cpp @@ -75,7 +75,8 @@ void PopupWidget::initUI() backgroundWidget->setLayout(backgroundLayout); - Style::setStyle(m_titleLabel, style::properties::label::tutorialChapterTitle); + Style::setStyle(m_titleLabel, style::properties::label::tutorialChapter); + Style::setStyle(m_descriptionTextBrowser, style::properties::label::tutorialChapter); Style::setStyle(m_continueButton, style::properties::button::basicButton, true, true); Style::setStyle(m_exitButton, style::properties::button::basicButton, true, true); Style::setStyle(this, style::properties::widget::overlayMenu); diff --git a/gui/style/qss/properties/combo/menuCombo.qss b/gui/style/qss/properties/combo/menuCombo.qss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gui/style/qss/properties/label/iioCompactLabel.qss b/gui/style/qss/properties/label/iioCompactLabel.qss index 3e90bbc43b..14673951cd 100644 --- a/gui/style/qss/properties/label/iioCompactLabel.qss +++ b/gui/style/qss/properties/label/iioCompactLabel.qss @@ -1,4 +1,4 @@ -QLabel { +QLabel[&&property&&=true] { color: &content_default&; background-color: rgba(255,255,255,0); font-weight: 500; @@ -7,6 +7,6 @@ QLabel { font-style: normal; } -QLabel:disabled { +QLabel[&&property&&=true]:disabled { color: grey; } diff --git a/gui/style/qss/properties/label/tutorialChapter.qss b/gui/style/qss/properties/label/tutorialChapter.qss new file mode 100644 index 0000000000..a8aa94e47e --- /dev/null +++ b/gui/style/qss/properties/label/tutorialChapter.qss @@ -0,0 +1,4 @@ +*[&&property&&=true] { + font-weight: bold; + color: &white&; +} diff --git a/gui/style/qss/properties/label/tutorialChapterTitle.qss b/gui/style/qss/properties/label/tutorialChapterTitle.qss deleted file mode 100644 index 2c51dfef3f..0000000000 --- a/gui/style/qss/properties/label/tutorialChapterTitle.qss +++ /dev/null @@ -1,4 +0,0 @@ -QLabel { - font-weight: bold; - color: &content_default&; -} diff --git a/gui/style/qss/properties/lineedit/menuLineEdit.qss b/gui/style/qss/properties/lineedit/menuLineEdit.qss index f16246f32f..ad7e63c813 100644 --- a/gui/style/qss/properties/lineedit/menuLineEdit.qss +++ b/gui/style/qss/properties/lineedit/menuLineEdit.qss @@ -1,4 +1,4 @@ -QLineEdit { +QLineEdit[&&property&&=true] { background-color: transparent; color: &content_default&; font-size: 15px; @@ -9,6 +9,6 @@ QLineEdit { padding-bottom: 4px; } -QLineEdit:disabled { +QLineEdit[&&property&&=true]:disabled { color: &content_subtle&; } diff --git a/gui/style/qss/properties/lineedit/menuLineEditWidget.qss b/gui/style/qss/properties/lineedit/menuLineEditWidget.qss deleted file mode 100644 index b736ffc126..0000000000 --- a/gui/style/qss/properties/lineedit/menuLineEditWidget.qss +++ /dev/null @@ -1,3 +0,0 @@ -scopy--MenuLineEdit { - background-color: transparent; -} diff --git a/gui/style/qss/properties/widget/backgroundPage.qss b/gui/style/qss/properties/widget/backgroundPage.qss deleted file mode 100644 index fb1b7abd39..0000000000 --- a/gui/style/qss/properties/widget/backgroundPage.qss +++ /dev/null @@ -1,3 +0,0 @@ -.QWidget { - background-color: &background_primary&; -} diff --git a/gui/style/qss/properties/widget/overlayMenu.qss b/gui/style/qss/properties/widget/overlayMenu.qss index 7f11a4dfee..7d069f180f 100644 --- a/gui/style/qss/properties/widget/overlayMenu.qss +++ b/gui/style/qss/properties/widget/overlayMenu.qss @@ -1,4 +1,4 @@ -.QWidget { +QWidget[&&property&&=true] { background-color: &background_primary&; border-radius: 4px; } diff --git a/gui/style/qss/properties/widget/tableViewWidget.qss b/gui/style/qss/properties/widget/tableViewWidget.qss index c7d69a2ee8..804871257e 100644 --- a/gui/style/qss/properties/widget/tableViewWidget.qss +++ b/gui/style/qss/properties/widget/tableViewWidget.qss @@ -1,10 +1,10 @@ -QHeaderView::section { +QHeaderView::section[&&property&&=true] { font: 11pt; border: 1px solid &content_default&; background-color: &background_primary&; } -QTableWidget::item { +QTableWidget::item[&&property&&=true] { border-right: 1px dashed &content_default&; border-bottom: 1px dashed &content_default&; } diff --git a/gui/style/qss/properties/widget/treeView.qss b/gui/style/qss/properties/widget/treeView.qss deleted file mode 100644 index f293cd12ea..0000000000 --- a/gui/style/qss/properties/widget/treeView.qss +++ /dev/null @@ -1,5 +0,0 @@ -*[&&property&&=true] { - border: &border_width& solid &interactive_subtle_disabled&; - border-radius: &radius_1&; - background-color: &background_subtle&; -} diff --git a/plugins/debugger/style/qss/properties/debugger/treeView.qss b/plugins/debugger/style/qss/properties/debugger/treeView.qss index 99704c3cc0..adeaabe855 100644 --- a/plugins/debugger/style/qss/properties/debugger/treeView.qss +++ b/plugins/debugger/style/qss/properties/debugger/treeView.qss @@ -5,7 +5,7 @@ QTreeView[&&property&&=true] { show-decoration-selected: 0; } -QTreeView::item:selected { +QTreeView::item[&&property&&=true]:selected { background-color: &interactive_primary_idle&; }