From 1b2122f6cf3865e20e03815c978e37592d5f7b78 Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Wed, 1 Nov 2023 14:58:38 +0100 Subject: [PATCH] rm style settings from GUI::Style --- GUI/Support/Util/Style.cpp | 33 ---------------------- GUI/Support/Util/Style.h | 9 +----- GUI/View/Import/RealDataSelectorWidget.cpp | 2 -- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/GUI/Support/Util/Style.cpp b/GUI/Support/Util/Style.cpp index e1d70ad64a7..cf65ea39525 100644 --- a/GUI/Support/Util/Style.cpp +++ b/GUI/Support/Util/Style.cpp @@ -42,39 +42,6 @@ QSize DefaultSizeOfLetterM() } // namespace -void GUI::Style::setPropertyStyle(QTreeView* tree) -{ - ASSERT(tree); - tree->setStyleSheet(GUI::Style::propertyTreeStyle()); - tree->setAlternatingRowColors(true); -} - -QString GUI::Style::propertyTreeStyle() -{ - QString result; - - // lines arount cell content - result += "QTreeView::item {" - " border-bottom: 1px solid #c7c8c9; " - " border-right: 1px solid #c7c8c9;}" - "QTreeView::branch {border-bottom: 1px solid #c7c8c9;}"; - - // styling of branch to restore open/closed signs eliminated by previous styling - result += "QTreeView::branch:has-children:!has-siblings:closed," - "QTreeView::branch:closed:has-children:has-siblings {" - "padding:2px 2px 2px 2px;border-image: none;" - "image: url(:/images/caret-right.svg);}" - "QTreeView::branch:open:has-children:!has-siblings," - "QTreeView::branch:open:has-children:has-siblings {" - "padding:2px 2px 2px 2px;border-image: none; image: url(:/images/caret-down.svg);" - "}"; - - // background of selected rows restored - result += "QTreeView::item:selected{background:#3daee9;}"; - - return result; -} - QFont GUI::Style::sectionFont(bool bold) { QFont result; diff --git a/GUI/Support/Util/Style.h b/GUI/Support/Util/Style.h index cac5b952e60..a147a5a8ae8 100644 --- a/GUI/Support/Util/Style.h +++ b/GUI/Support/Util/Style.h @@ -18,19 +18,12 @@ #include <QFont> #include <QString> -class QTreeView; -class QWidget; class QLayout; +class QTreeView; class QWidget; namespace GUI::Style { -//! Sets style for the tree to use in property editors. -void setPropertyStyle(QTreeView* tree); - -//! Returns string representing the style of QTreeView intended for property editor. -QString propertyTreeStyle(); - //! Returns font for sections. QFont sectionFont(bool bold = false); diff --git a/GUI/View/Import/RealDataSelectorWidget.cpp b/GUI/View/Import/RealDataSelectorWidget.cpp index d66f4f9eda4..03cc141d4a6 100644 --- a/GUI/View/Import/RealDataSelectorWidget.cpp +++ b/GUI/View/Import/RealDataSelectorWidget.cpp @@ -19,7 +19,6 @@ #include "GUI/Model/Data/DataItem.h" #include "GUI/Model/Device/RealItem.h" #include "GUI/Model/Model/RealTreeModel.h" -#include "GUI/Support/Util/Style.h" #include "GUI/View/Import/Legacy1dDialog.h" #include "GUI/View/Import/RealDataPropertiesWidget.h" #include "GUI/View/Info/MessageBox.h" @@ -108,7 +107,6 @@ RealDataSelectorWidget::RealDataSelectorWidget(QWidget* parent, ProjectDocument* m_itemTree->setHeaderHidden(true); m_itemTree->setContextMenuPolicy(Qt::CustomContextMenu); m_itemTree->setModel(m_treeModel); - GUI::Style::setPropertyStyle(m_itemTree); auto* splitter = new QSplitter; splitter->setOrientation(Qt::Vertical); -- GitLab