Skip to content

Commit c6caa29

Browse files
committed
improved UX
* checkbox placement * capitalize text in buttns * place holder for line edit * enable/disable buttons depending on selection
1 parent 9cefd3a commit c6caa29

File tree

2 files changed

+50
-28
lines changed

2 files changed

+50
-28
lines changed

src/app/qgsprojectproperties.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,19 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
363363
mLayerCapabilitiesTree->setSelectionBehavior( QAbstractItemView::SelectItems );
364364
mLayerCapabilitiesTree->setSelectionMode( QAbstractItemView::MultiSelection );
365365
mLayerCapabilitiesTree->expandAll();
366+
connect( mLayerCapabilitiesTree->selectionModel(), &QItemSelectionModel::selectionChanged, this,
367+
[ = ]( const QItemSelection & selected, const QItemSelection & deselected )
368+
{
369+
Q_UNUSED( selected );
370+
Q_UNUSED( deselected );
371+
bool hasSelection = !mLayerCapabilitiesTree->selectionModel()->selectedIndexes().isEmpty();
372+
mLayerCapabilitiesCheckButton->setEnabled( hasSelection );
373+
mLayerCapabilitiesUncheckButton->setEnabled( hasSelection );
374+
} );
366375

367376
mLayerCapabilitiesTreeFilterLineEdit->setShowClearButton( true );
368377
mLayerCapabilitiesTreeFilterLineEdit->setShowSearchIcon( true );
378+
mLayerCapabilitiesTreeFilterLineEdit->setPlaceholderText( tr( "Filter layers…" ) );
369379
connect( mLayerCapabilitiesTreeFilterLineEdit, &QgsFilterLineEdit::textChanged, this, [ = ]( const QString & filterText )
370380
{
371381
mLayerCapabilitiesModel->setFilterText( filterText );

src/ui/qgsprojectpropertiesbase.ui

+40-28
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
<rect>
278278
<x>0</x>
279279
<y>0</y>
280-
<width>563</width>
280+
<width>676</width>
281281
<height>833</height>
282282
</rect>
283283
</property>
@@ -875,8 +875,8 @@
875875
<rect>
876876
<x>0</x>
877877
<y>0</y>
878-
<width>547</width>
879-
<height>152</height>
878+
<width>676</width>
879+
<height>764</height>
880880
</rect>
881881
</property>
882882
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -950,8 +950,8 @@
950950
<rect>
951951
<x>0</x>
952952
<y>0</y>
953-
<width>271</width>
954-
<height>597</height>
953+
<width>676</width>
954+
<height>764</height>
955955
</rect>
956956
</property>
957957
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1411,8 +1411,31 @@
14111411
<string>Project Layers</string>
14121412
</property>
14131413
<layout class="QGridLayout" name="gridLayout_20">
1414-
<item row="3" column="3">
1415-
<widget class="QgsFilterLineEdit" name="mLayerCapabilitiesTreeFilterLineEdit"/>
1414+
<property name="verticalSpacing">
1415+
<number>0</number>
1416+
</property>
1417+
<item row="1" column="0" colspan="4">
1418+
<widget class="QTreeView" name="mLayerCapabilitiesTree"/>
1419+
</item>
1420+
<item row="3" column="1">
1421+
<widget class="QPushButton" name="mLayerCapabilitiesCheckButton">
1422+
<property name="enabled">
1423+
<bool>false</bool>
1424+
</property>
1425+
<property name="text">
1426+
<string>Check Selected</string>
1427+
</property>
1428+
</widget>
1429+
</item>
1430+
<item row="3" column="0">
1431+
<widget class="QPushButton" name="mLayerCapabilitiesUncheckButton">
1432+
<property name="enabled">
1433+
<bool>false</bool>
1434+
</property>
1435+
<property name="text">
1436+
<string>Uncheck Selected</string>
1437+
</property>
1438+
</widget>
14161439
</item>
14171440
<item row="3" column="2">
14181441
<spacer name="horizontalSpacer_5">
@@ -1427,30 +1450,19 @@
14271450
</property>
14281451
</spacer>
14291452
</item>
1430-
<item row="3" column="0">
1431-
<widget class="QPushButton" name="mLayerCapabilitiesUncheckButton">
1432-
<property name="text">
1433-
<string>uncheck selection</string>
1434-
</property>
1435-
</widget>
1436-
</item>
1437-
<item row="3" column="1">
1438-
<widget class="QPushButton" name="mLayerCapabilitiesCheckButton">
1439-
<property name="text">
1440-
<string>check selection</string>
1441-
</property>
1442-
</widget>
1453+
<item row="3" column="3">
1454+
<widget class="QgsFilterLineEdit" name="mLayerCapabilitiesTreeFilterLineEdit"/>
14431455
</item>
1444-
<item row="2" column="3">
1456+
<item row="4" column="3">
14451457
<widget class="QCheckBox" name="mShowSpatialLayersCheckBox">
1458+
<property name="layoutDirection">
1459+
<enum>Qt::LeftToRight</enum>
1460+
</property>
14461461
<property name="text">
1447-
<string>show spatial layers only</string>
1462+
<string>Show spatial layers only</string>
14481463
</property>
14491464
</widget>
14501465
</item>
1451-
<item row="1" column="0" colspan="4">
1452-
<widget class="QTreeView" name="mLayerCapabilitiesTree"/>
1453-
</item>
14541466
</layout>
14551467
</widget>
14561468
</item>
@@ -1579,8 +1591,8 @@
15791591
<rect>
15801592
<x>0</x>
15811593
<y>0</y>
1582-
<width>157</width>
1583-
<height>59</height>
1594+
<width>676</width>
1595+
<height>764</height>
15841596
</rect>
15851597
</property>
15861598
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -1641,7 +1653,7 @@
16411653
<rect>
16421654
<x>0</x>
16431655
<y>0</y>
1644-
<width>603</width>
1656+
<width>676</width>
16451657
<height>2666</height>
16461658
</rect>
16471659
</property>

0 commit comments

Comments
 (0)