Skip to content

Commit

Permalink
gui / style: qss cleanup
Browse files Browse the repository at this point in the history
Signed-off-by: Andrei Popa <[email protected]>
  • Loading branch information
andrei47w committed Nov 8, 2024
1 parent 139f186 commit 302b9ce
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 26 deletions.
2 changes: 1 addition & 1 deletion core/src/scopypreferencespage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion gui/src/widgets/menulineedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 2 additions & 1 deletion gui/src/widgets/popupwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Empty file.
4 changes: 2 additions & 2 deletions gui/style/qss/properties/label/iioCompactLabel.qss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
QLabel {
QLabel[&&property&&=true] {
color: &content_default&;
background-color: rgba(255,255,255,0);
font-weight: 500;
Expand All @@ -7,6 +7,6 @@ QLabel {
font-style: normal;
}

QLabel:disabled {
QLabel[&&property&&=true]:disabled {
color: grey;
}
4 changes: 4 additions & 0 deletions gui/style/qss/properties/label/tutorialChapter.qss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*[&&property&&=true] {
font-weight: bold;
color: &white&;
}
4 changes: 0 additions & 4 deletions gui/style/qss/properties/label/tutorialChapterTitle.qss

This file was deleted.

4 changes: 2 additions & 2 deletions gui/style/qss/properties/lineedit/menuLineEdit.qss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
QLineEdit {
QLineEdit[&&property&&=true] {
background-color: transparent;
color: &content_default&;
font-size: 15px;
Expand All @@ -9,6 +9,6 @@ QLineEdit {
padding-bottom: 4px;
}

QLineEdit:disabled {
QLineEdit[&&property&&=true]:disabled {
color: &content_subtle&;
}
3 changes: 0 additions & 3 deletions gui/style/qss/properties/lineedit/menuLineEditWidget.qss

This file was deleted.

3 changes: 0 additions & 3 deletions gui/style/qss/properties/widget/backgroundPage.qss

This file was deleted.

2 changes: 1 addition & 1 deletion gui/style/qss/properties/widget/overlayMenu.qss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.QWidget {
QWidget[&&property&&=true] {
background-color: &background_primary&;
border-radius: 4px;
}
4 changes: 2 additions & 2 deletions gui/style/qss/properties/widget/tableViewWidget.qss
Original file line number Diff line number Diff line change
@@ -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&;
}
5 changes: 0 additions & 5 deletions gui/style/qss/properties/widget/treeView.qss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ QTreeView[&&property&&=true] {
show-decoration-selected: 0;
}

QTreeView::item:selected {
QTreeView::item[&&property&&=true]:selected {
background-color: &interactive_primary_idle&;
}

0 comments on commit 302b9ce

Please sign in to comment.