- Only draw tree branches if that particular styles class is specified.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@21132 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

OMEdit/OMEditGUI/GUI/Dialogs/ModelicaClassDialog.cpp

@@ -56,11 +56,14 @@ LibraryBrowseDialog::LibraryBrowseDialog(QString title, QLineEdit *pLineEdit, Mo
   connect(mpFindClassTextBox, SIGNAL(textEdited(QString)), SLOT(findModelicaClasses()));
   connect(mpFindClassTextBox, SIGNAL(returnPressed()), SLOT(useModelicaClass()));
   mpLibraryBrowseTreeWidget = new QTreeWidget;
-  /*
-    note: this is needed to hide the icon of the tree item.
-    Since the icons of the tree items are only created when we expand the node. So its better to hide them here.
+  mpLibraryBrowseTreeWidget->setObjectName("TreeWithBranches");
+  /*! @note: this is needed to hide the icon of the tree item.
+      Since the icons of the tree items are only created when we expand the node. So its better to hide them here.
+    */
+  //mpLibraryBrowseTreeWidget->setIconSize(QSize(0,0));
+  /*! @note: Commented the above line because Qt flush too many warnings if IconSize is 0.
+      We will see icons for the expanded models otherwise default icon is shown. Fair enough!
     */
-  mpLibraryBrowseTreeWidget->setIconSize(QSize(0,0));
   mpLibraryBrowseTreeWidget->setItemDelegate(new ItemDelegate(mpLibraryBrowseTreeWidget));
   mpLibraryBrowseTreeWidget->setTextElideMode(Qt::ElideMiddle);
   mpLibraryBrowseTreeWidget->setHeaderLabel(Helper::libraries);

OMEdit/OMEditGUI/GUI/Dialogs/OptionsDialog.cpp

@@ -1133,7 +1133,6 @@ LibrariesPage::LibrariesPage(OptionsDialog *pParent)
   // system libraries tree
   mpSystemLibrariesTree = new QTreeWidget;
   mpSystemLibrariesTree->setItemDelegate(new ItemDelegate(mpSystemLibrariesTree));
-  mpSystemLibrariesTree->setObjectName("SystemLibrariesTree");
   mpSystemLibrariesTree->setIndentation(0);
   mpSystemLibrariesTree->setColumnCount(2);
   mpSystemLibrariesTree->setTextElideMode(Qt::ElideMiddle);
@@ -1173,7 +1172,6 @@ LibrariesPage::LibrariesPage(OptionsDialog *pParent)
   // user libraries tree
   mpUserLibrariesTree = new QTreeWidget;
   mpUserLibrariesTree->setItemDelegate(new ItemDelegate(mpUserLibrariesTree));
-  mpUserLibrariesTree->setObjectName("UserLibrariesTree");
   mpUserLibrariesTree->setIndentation(0);
   mpUserLibrariesTree->setColumnCount(2);
   mpUserLibrariesTree->setTextElideMode(Qt::ElideMiddle);

OMEdit/OMEditGUI/GUI/Widgets/LibraryTreeWidget.cpp

@@ -491,6 +491,7 @@ LibraryTreeWidget::LibraryTreeWidget(bool isSearchTree, MainWindow *pParent)
   : QTreeWidget(pParent)
 {
   mpMainWindow = pParent;
+  setObjectName("TreeWithBranches");
   setMinimumWidth(175);
   setItemDelegate(new ItemDelegate(this));
   setTextElideMode(Qt::ElideMiddle);

OMEdit/OMEditGUI/GUI/Widgets/MessagesWidget.cpp

@@ -262,7 +262,6 @@ MessagesTreeWidget::MessagesTreeWidget(MessagesWidget *pMessagesWidget)
   setItemDelegate(new ItemDelegate(this, true));
   setTextElideMode(Qt::ElideMiddle);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
-  setObjectName("MessagesTree");
   setIndentation(0);
   setColumnCount(4);
   setIconSize(QSize(12, 12));

OMEdit/OMEditGUI/GUI/Widgets/TransformationsWidget.cpp

@@ -403,6 +403,7 @@ TVariablesTreeView::TVariablesTreeView(TransformationsWidget *pTransformationsWi
   : QTreeView(pTransformationsWidget)
 {
   mpTransformationsWidget = pTransformationsWidget;
+  setObjectName("TreeWithBranches");
   setItemDelegate(new ItemDelegate(this));
   setTextElideMode(Qt::ElideMiddle);
   setIndentation(Helper::treeIndentation);
@@ -415,8 +416,7 @@ EquationTreeWidget::EquationTreeWidget(TransformationsWidget *pTransformationWid
   : QTreeWidget(pTransformationWidget), mpTransformationWidget(pTransformationWidget)
 {
   setItemDelegate(new ItemDelegate(this));
-  setObjectName("EquationsTree");
-  setIndentation(Helper::treeIndentation);
+  setIndentation(0);
   setColumnCount(7);
   setTextElideMode(Qt::ElideMiddle);
   setSortingEnabled(true);
@@ -535,8 +535,7 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pOperationsLabel->setObjectName("LabelWithBorder");
   mpVariableOperationsTreeWidget = new QTreeWidget;
   mpVariableOperationsTreeWidget->setItemDelegate(new ItemDelegate(mpVariableOperationsTreeWidget));
-  mpVariableOperationsTreeWidget->setObjectName("VariableOperationsTree");
-  mpVariableOperationsTreeWidget->setIndentation(Helper::treeIndentation);
+  mpVariableOperationsTreeWidget->setIndentation(0);
   mpVariableOperationsTreeWidget->setColumnCount(1);
   mpVariableOperationsTreeWidget->setTextElideMode(Qt::ElideMiddle);
   mpVariableOperationsTreeWidget->setHeaderLabel(tr("Operations"));
@@ -552,6 +551,8 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pEquationsBrowserLabel->setObjectName("LabelWithBorder");
   /* Equations tree widget */
   mpEquationsTreeWidget = new EquationTreeWidget(this);
+  mpEquationsTreeWidget->setObjectName("TreeWithBranches");
+  mpEquationsTreeWidget->setIndentation(Helper::treeIndentation);
   QGridLayout *pEquationsGridLayout = new QGridLayout;
   pEquationsGridLayout->setSpacing(1);
   pEquationsGridLayout->setContentsMargins(0, 0, 0, 0);
@@ -564,7 +565,6 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pDefinesLabel->setObjectName("LabelWithBorder");
   mpDefinesVariableTreeWidget = new QTreeWidget;
   mpDefinesVariableTreeWidget->setItemDelegate(new ItemDelegate(mpDefinesVariableTreeWidget));
-  mpDefinesVariableTreeWidget->setObjectName("DefinesTree");
   mpDefinesVariableTreeWidget->setIndentation(0);
   mpDefinesVariableTreeWidget->setColumnCount(1);
   mpDefinesVariableTreeWidget->setTextElideMode(Qt::ElideMiddle);
@@ -585,8 +585,7 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pDependsLabel->setObjectName("LabelWithBorder");
   mpDependsVariableTreeWidget = new QTreeWidget;
   mpDependsVariableTreeWidget->setItemDelegate(new ItemDelegate(mpDependsVariableTreeWidget));
-  mpDependsVariableTreeWidget->setObjectName("DependsTree");
-  mpDependsVariableTreeWidget->setIndentation(Helper::treeIndentation);
+  mpDependsVariableTreeWidget->setIndentation(0);
   mpDependsVariableTreeWidget->setColumnCount(1);
   mpDependsVariableTreeWidget->setTextElideMode(Qt::ElideMiddle);
   mpDependsVariableTreeWidget->setSortingEnabled(true);
@@ -604,8 +603,7 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pEquationOperationsLabel->setObjectName("LabelWithBorder");
   mpEquationOperationsTreeWidget = new QTreeWidget;
   mpEquationOperationsTreeWidget->setItemDelegate(new ItemDelegate(mpEquationOperationsTreeWidget));
-  mpEquationOperationsTreeWidget->setObjectName("EquationOperationsTree");
-  mpEquationOperationsTreeWidget->setIndentation(Helper::treeIndentation);
+  mpEquationOperationsTreeWidget->setIndentation(0);
   mpEquationOperationsTreeWidget->setColumnCount(1);
   mpEquationOperationsTreeWidget->setTextElideMode(Qt::ElideMiddle);
   mpEquationOperationsTreeWidget->setHeaderLabel(tr("Operations"));

OMEdit/OMEditGUI/GUI/Widgets/VariablesWidget.cpp

@@ -667,6 +667,7 @@ VariablesTreeView::VariablesTreeView(VariablesWidget *pVariablesWidget)
   : QTreeView(pVariablesWidget)
 {
   mpVariablesWidget = pVariablesWidget;
+  setObjectName("TreeWithBranches");
   setItemDelegate(new ItemDelegate(this));
   setTextElideMode(Qt::ElideMiddle);
   setIndentation(Helper::treeIndentation);

OMEdit/OMEditGUI/Resources/css/stylesheet.qss

@@ -7,46 +7,38 @@ QMainWindow::separator {
     height: 4px; /* when horizontal */
 }
 
-/* Library Widget Styles */
-QTreeWidget::branch,
-QTreeView::branch {
+/* Tree Widget Styles */
+QTreeWidget#TreeWithBranches::branch,
+QTreeView#TreeWithBranches::branch {
   border-image: url(:/Resources/icons/vline.png) 0;
 }
-QTreeWidget::branch:has-siblings:adjoins-item,
-QTreeView::branch:has-siblings:adjoins-item {
+QTreeWidget#TreeWithBranches::branch:has-siblings:adjoins-item,
+QTreeView#TreeWithBranches::branch:has-siblings:adjoins-item {
   border-image: url(:/Resources/icons/vline.png) 0;
   image: url(:/Resources/icons/branch-more.png);
 }
-QTreeWidget::branch:!has-children:!has-siblings:adjoins-item,
-QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+QTreeWidget#TreeWithBranches::branch:!has-children:!has-siblings:adjoins-item,
+QTreeView#TreeWithBranches::branch:!has-children:!has-siblings:adjoins-item {
   border-image: url(:/Resources/icons/branch-end.png) 0;
 }
-QTreeWidget::branch:has-children:!has-siblings:closed,
-QTreeWidget::branch:closed:has-children:has-siblings,
-QTreeView::branch:has-children:!has-siblings:closed,
-QTreeView::branch:closed:has-children:has-siblings {
+QTreeWidget#TreeWithBranches::branch:has-children:!has-siblings:closed,
+QTreeWidget#TreeWithBranches::branch:closed:has-children:has-siblings,
+QTreeView#TreeWithBranches::branch:has-children:!has-siblings:closed,
+QTreeView#TreeWithBranches::branch:closed:has-children:has-siblings {
   border-image: none;
   image: url(:/Resources/icons/branch-closed.png);
 }
-QTreeWidget::branch:open:has-children:!has-siblings,
-QTreeWidget::branch:open:has-children:has-siblings,
-QTreeView::branch:open:has-children:!has-siblings,
-QTreeView::branch:open:has-children:has-siblings {
+QTreeWidget#TreeWithBranches::branch:open:has-children:!has-siblings,
+QTreeWidget#TreeWithBranches::branch:open:has-children:has-siblings,
+QTreeView#TreeWithBranches::branch:open:has-children:!has-siblings,
+QTreeView#TreeWithBranches::branch:open:has-children:has-siblings {
   border-image: none;
   image: url(:/Resources/icons/branch-open.png);
 }
 QTreeWidget::item,
 QTreeView::item {
   height: 22px;
 }
-QTreeWidget#SystemLibrariesTree::branch,
-QTreeWidget#UserLibrariesTree::branch,
-QTreeWidget#MessagesTree::branch,
-QTreeWidget#SearchedItemsTree::branch,
-QTreeWidget#VariablesTree::branch {
-  border-image: none;
-  image : none;
-}
 /* End of Library Widget Styles */
 
 QLineEdit {