Skip to content

Commit 48ebef2

Browse files
committed
[browser] small ui reworking for consistency
1 parent 13eb726 commit 48ebef2

File tree

2 files changed

+6
-53
lines changed

2 files changed

+6
-53
lines changed

src/app/qgsbrowserdockwidget.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,8 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QString name, QWidget * parent ) :
244244
mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.png" ) );
245245

246246
mWidgetFilter->hide();
247+
mLeFilter->setPlaceholderText( tr( "Type here to filter current item..." ) );
247248
// icons from http://www.fatcow.com/free-icons License: CC Attribution 3.0
248-
mBtnFilterShow->setIcon( QgsApplication::getThemeIcon( "mActionFilter.png" ) );
249-
mBtnFilter->setIcon( QgsApplication::getThemeIcon( "mActionFilter.png" ) );
250249

251250
QMenu* menu = new QMenu( this );
252251
menu->setSeparatorsCollapsible( false );
@@ -279,10 +278,9 @@ QgsBrowserDockWidget::QgsBrowserDockWidget( QString name, QWidget * parent ) :
279278
connect( mBtnAddLayers, SIGNAL( clicked() ), this, SLOT( addSelectedLayers() ) );
280279
connect( mBtnCollapse, SIGNAL( clicked() ), mBrowserView, SLOT( collapseAll() ) );
281280
connect( mBtnFilterShow, SIGNAL( toggled( bool ) ), this, SLOT( showFilterWidget( bool ) ) );
282-
connect( mBtnFilter, SIGNAL( clicked() ), this, SLOT( setFilter() ) );
283281
connect( mLeFilter, SIGNAL( returnPressed() ), this, SLOT( setFilter() ) );
284282
connect( mLeFilter, SIGNAL( cleared() ), this, SLOT( setFilter() ) );
285-
// connect( mLeFilter, SIGNAL( textChanged( const QString & ) ), this, SLOT( setFilter() ) );
283+
connect( mLeFilter, SIGNAL( textChanged( const QString & ) ), this, SLOT( setFilter() ) );
286284
connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( setFilterSyntax( QAction * ) ) );
287285

288286
connect( mBrowserView, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );

src/ui/qgsbrowserdockwidgetbase.ui

Lines changed: 4 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
<string>Add Selected Layers</string>
5959
</property>
6060
<property name="text">
61-
<string>Add</string>
61+
<string/>
6262
</property>
6363
<property name="icon">
6464
<iconset resource="../../images/images.qrc">
6565
<normaloff>:/images/themes/default/mActionAdd.svg</normaloff>:/images/themes/default/mActionAdd.svg</iconset>
6666
</property>
6767
<property name="toolButtonStyle">
68-
<enum>Qt::ToolButtonTextBesideIcon</enum>
68+
<enum>Qt::ToolButtonIconOnly</enum>
6969
</property>
7070
<property name="autoRaise">
7171
<bool>true</bool>
@@ -148,7 +148,7 @@
148148
</sizepolicy>
149149
</property>
150150
<property name="frameShape">
151-
<enum>QFrame::StyledPanel</enum>
151+
<enum>QFrame::NoFrame</enum>
152152
</property>
153153
<property name="frameShadow">
154154
<enum>QFrame::Raised</enum>
@@ -192,33 +192,10 @@
192192
</property>
193193
</widget>
194194
</item>
195-
<item>
196-
<widget class="QToolButton" name="mBtnFilter">
197-
<property name="maximumSize">
198-
<size>
199-
<width>16777215</width>
200-
<height>16777215</height>
201-
</size>
202-
</property>
203-
<property name="toolTip">
204-
<string>Filter files</string>
205-
</property>
206-
<property name="text">
207-
<string/>
208-
</property>
209-
<property name="icon">
210-
<iconset resource="../../images/images.qrc">
211-
<normaloff>:/images/themes/default/mActionFilter.png</normaloff>:/images/themes/default/mActionFilter.png</iconset>
212-
</property>
213-
<property name="autoRaise">
214-
<bool>true</bool>
215-
</property>
216-
</widget>
217-
</item>
218195
<item>
219196
<widget class="QgsFilterLineEdit" name="mLeFilter">
220197
<property name="sizePolicy">
221-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
198+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
222199
<horstretch>0</horstretch>
223200
<verstretch>0</verstretch>
224201
</sizepolicy>
@@ -229,12 +206,6 @@
229206
<height>0</height>
230207
</size>
231208
</property>
232-
<property name="maximumSize">
233-
<size>
234-
<width>200</width>
235-
<height>16777215</height>
236-
</size>
237-
</property>
238209
<property name="baseSize">
239210
<size>
240211
<width>0</width>
@@ -246,22 +217,6 @@
246217
</layout>
247218
</widget>
248219
</item>
249-
<item>
250-
<spacer name="horizontalSpacer_3">
251-
<property name="orientation">
252-
<enum>Qt::Horizontal</enum>
253-
</property>
254-
<property name="sizeType">
255-
<enum>QSizePolicy::MinimumExpanding</enum>
256-
</property>
257-
<property name="sizeHint" stdset="0">
258-
<size>
259-
<width>0</width>
260-
<height>20</height>
261-
</size>
262-
</property>
263-
</spacer>
264-
</item>
265220
</layout>
266221
</widget>
267222
</item>

0 commit comments

Comments
 (0)