Skip to content

Commit

Permalink
Improve toolbar appearance of QgsMeshDatasetGroupTreeWidget
Browse files Browse the repository at this point in the history
By making it behave/appear more like standard QGIS toolbars
  • Loading branch information
nyalldawson committed Oct 19, 2020
1 parent a0ac94a commit 6a3cf9d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 25 deletions.
12 changes: 6 additions & 6 deletions src/gui/mesh/qgsmeshdatasetgrouptreewidget.cpp
Expand Up @@ -32,12 +32,12 @@ QgsMeshDatasetGroupTreeWidget::QgsMeshDatasetGroupTreeWidget( QWidget *parent ):
{
setupUi( this );

connect( mAddDatasetButton, &QPushButton::clicked, this, &QgsMeshDatasetGroupTreeWidget::addDataset );
connect( mCollapseButton, &QPushButton::clicked, mDatasetGroupTreeView, &QTreeView::collapseAll );
connect( mExpandButton, &QPushButton::clicked, mDatasetGroupTreeView, &QTreeView::expandAll );
connect( mCheckAllButton, &QPushButton::clicked, mDatasetGroupTreeView, &QgsMeshDatasetGroupTreeView::selectAllGroups );
connect( mUnCheckAllButton, &QPushButton::clicked, mDatasetGroupTreeView, &QgsMeshDatasetGroupTreeView::deselectAllGroups );
connect( mResetDefaultButton, &QPushButton::clicked, this, [this]
connect( mAddDatasetButton, &QToolButton::clicked, this, &QgsMeshDatasetGroupTreeWidget::addDataset );
connect( mCollapseButton, &QToolButton::clicked, mDatasetGroupTreeView, &QTreeView::collapseAll );
connect( mExpandButton, &QToolButton::clicked, mDatasetGroupTreeView, &QTreeView::expandAll );
connect( mCheckAllButton, &QToolButton::clicked, mDatasetGroupTreeView, &QgsMeshDatasetGroupTreeView::selectAllGroups );
connect( mUnCheckAllButton, &QToolButton::clicked, mDatasetGroupTreeView, &QgsMeshDatasetGroupTreeView::deselectAllGroups );
connect( mResetDefaultButton, &QToolButton::clicked, this, [this]
{
this->mDatasetGroupTreeView->resetDefault( this->mMeshLayer );
} );
Expand Down
50 changes: 31 additions & 19 deletions src/ui/mesh/qgsmeshdatasetgrouptreewidgetbase.ui
Expand Up @@ -32,28 +32,19 @@
<string>Available Datasets</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="mAddDatasetButton">
<widget class="QToolButton" name="mAddDatasetButton">
<property name="toolTip">
<string>Assign Extra Dataset to Mesh</string>
</property>
Expand All @@ -70,10 +61,13 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mCollapseButton">
<widget class="QToolButton" name="mCollapseButton">
<property name="toolTip">
<string>Collapse All</string>
</property>
Expand All @@ -90,10 +84,13 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mExpandButton">
<widget class="QToolButton" name="mExpandButton">
<property name="toolTip">
<string>Expand All</string>
</property>
Expand All @@ -110,10 +107,13 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mCheckAllButton">
<widget class="QToolButton" name="mCheckAllButton">
<property name="toolTip">
<string>Check All</string>
</property>
Expand All @@ -130,10 +130,16 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mUnCheckAllButton">
<widget class="QToolButton" name="mUnCheckAllButton">
<property name="toolTip">
<string>Uncheck All</string>
</property>
<property name="text">
<string/>
</property>
Expand All @@ -147,12 +153,15 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mResetDefaultButton">
<widget class="QToolButton" name="mResetDefaultButton">
<property name="toolTip">
<string>Reset Default</string>
<string>Reset to Defaults</string>
</property>
<property name="text">
<string/>
Expand All @@ -167,6 +176,9 @@
<height>20</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
Expand Down

0 comments on commit 6a3cf9d

Please sign in to comment.