Skip to content

Commit 83db0fb

Browse files
nyalldawsonnyalldawson
committedMar 24, 2017
Fix broken widget filter box in layer/project properties
·
ltr-3_40final-3_0_0
1 parent 9d5f289 commit 83db0fb

File tree

3 files changed

+66
-51
lines changed

3 files changed

+66
-51
lines changed
 

‎src/ui/qgsprojectpropertiesbase.ui

100644100755
Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<number>0</number>
5656
</property>
5757
<item>
58-
<widget class="QLineEdit" name="mSearchLineEdit"/>
58+
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
5959
</item>
6060
<item>
6161
<widget class="QListWidget" name="mOptionsListWidget">
@@ -259,8 +259,8 @@
259259
<rect>
260260
<x>0</x>
261261
<y>0</y>
262-
<width>685</width>
263-
<height>778</height>
262+
<width>455</width>
263+
<height>563</height>
264264
</rect>
265265
</property>
266266
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -749,8 +749,8 @@
749749
<rect>
750750
<x>0</x>
751751
<y>0</y>
752-
<width>685</width>
753-
<height>778</height>
752+
<width>684</width>
753+
<height>783</height>
754754
</rect>
755755
</property>
756756
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -808,8 +808,8 @@
808808
<rect>
809809
<x>0</x>
810810
<y>0</y>
811-
<width>685</width>
812-
<height>778</height>
811+
<width>109</width>
812+
<height>100</height>
813813
</rect>
814814
</property>
815815
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -894,8 +894,8 @@
894894
<rect>
895895
<x>0</x>
896896
<y>0</y>
897-
<width>685</width>
898-
<height>778</height>
897+
<width>331</width>
898+
<height>483</height>
899899
</rect>
900900
</property>
901901
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1361,8 +1361,8 @@
13611361
<rect>
13621362
<x>0</x>
13631363
<y>0</y>
1364-
<width>671</width>
1365-
<height>2451</height>
1364+
<width>474</width>
1365+
<height>2039</height>
13661366
</rect>
13671367
</property>
13681368
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2441,8 +2441,8 @@
24412441
<rect>
24422442
<x>0</x>
24432443
<y>0</y>
2444-
<width>165</width>
2445-
<height>57</height>
2444+
<width>127</width>
2445+
<height>43</height>
24462446
</rect>
24472447
</property>
24482448
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2591,12 +2591,6 @@
25912591
<header>qgsscrollarea.h</header>
25922592
<container>1</container>
25932593
</customwidget>
2594-
<customwidget>
2595-
<class>QgsColorButton</class>
2596-
<extends>QToolButton</extends>
2597-
<header>qgscolorbutton.h</header>
2598-
<container>1</container>
2599-
</customwidget>
26002594
<customwidget>
26012595
<class>QgsCollapsibleGroupBox</class>
26022596
<extends>QGroupBox</extends>
@@ -2609,6 +2603,17 @@
26092603
<header location="global">qgsvariableeditorwidget.h</header>
26102604
<container>1</container>
26112605
</customwidget>
2606+
<customwidget>
2607+
<class>QgsFilterLineEdit</class>
2608+
<extends>QLineEdit</extends>
2609+
<header>qgsfilterlineedit.h</header>
2610+
</customwidget>
2611+
<customwidget>
2612+
<class>QgsColorButton</class>
2613+
<extends>QToolButton</extends>
2614+
<header>qgscolorbutton.h</header>
2615+
<container>1</container>
2616+
</customwidget>
26122617
<customwidget>
26132618
<class>QgsColorSchemeList</class>
26142619
<extends>QWidget</extends>

‎src/ui/qgsrasterlayerpropertiesbase.ui

100644100755
Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<number>0</number>
5656
</property>
5757
<item>
58-
<widget class="QLineEdit" name="mSearchLineEdit"/>
58+
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
5959
</item>
6060
<item>
6161
<widget class="QListWidget" name="mOptionsListWidget">
@@ -241,7 +241,7 @@
241241
<rect>
242242
<x>0</x>
243243
<y>0</y>
244-
<width>266</width>
244+
<width>355</width>
245245
<height>233</height>
246246
</rect>
247247
</property>
@@ -512,8 +512,8 @@
512512
<rect>
513513
<x>0</x>
514514
<y>0</y>
515-
<width>617</width>
516-
<height>547</height>
515+
<width>616</width>
516+
<height>546</height>
517517
</rect>
518518
</property>
519519
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1143,8 +1143,8 @@
11431143
<rect>
11441144
<x>0</x>
11451145
<y>0</y>
1146-
<width>455</width>
1147-
<height>384</height>
1146+
<width>358</width>
1147+
<height>354</height>
11481148
</rect>
11491149
</property>
11501150
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1559,8 +1559,8 @@
15591559
<rect>
15601560
<x>0</x>
15611561
<y>0</y>
1562-
<width>559</width>
1563-
<height>189</height>
1562+
<width>457</width>
1563+
<height>169</height>
15641564
</rect>
15651565
</property>
15661566
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1623,7 +1623,7 @@
16231623
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
16241624
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
16251625
p, li { white-space: pre-wrap; }
1626-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
1626+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
16271627
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
16281628
</property>
16291629
</widget>
@@ -1729,8 +1729,8 @@ p, li { white-space: pre-wrap; }
17291729
<rect>
17301730
<x>0</x>
17311731
<y>0</y>
1732-
<width>98</width>
1733-
<height>41</height>
1732+
<width>100</width>
1733+
<height>30</height>
17341734
</rect>
17351735
</property>
17361736
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1788,8 +1788,8 @@ p, li { white-space: pre-wrap; }
17881788
<rect>
17891789
<x>0</x>
17901790
<y>0</y>
1791-
<width>325</width>
1792-
<height>613</height>
1791+
<width>297</width>
1792+
<height>556</height>
17931793
</rect>
17941794
</property>
17951795
<layout class="QGridLayout" name="gridLayout_12">
@@ -2249,23 +2249,12 @@ p, li { white-space: pre-wrap; }
22492249
<header>qgsscrollarea.h</header>
22502250
<container>1</container>
22512251
</customwidget>
2252-
<customwidget>
2253-
<class>QgsColorButton</class>
2254-
<extends>QToolButton</extends>
2255-
<header>qgscolorbutton.h</header>
2256-
<container>1</container>
2257-
</customwidget>
22582252
<customwidget>
22592253
<class>QgsCollapsibleGroupBox</class>
22602254
<extends>QGroupBox</extends>
22612255
<header>qgscollapsiblegroupbox.h</header>
22622256
<container>1</container>
22632257
</customwidget>
2264-
<customwidget>
2265-
<class>QgsBlendModeComboBox</class>
2266-
<extends>QComboBox</extends>
2267-
<header>qgsblendmodecombobox.h</header>
2268-
</customwidget>
22692258
<customwidget>
22702259
<class>QgsProjectionSelectionWidget</class>
22712260
<extends>QWidget</extends>
@@ -2283,6 +2272,22 @@ p, li { white-space: pre-wrap; }
22832272
<header>qgslayertreeembeddedconfigwidget.h</header>
22842273
<container>1</container>
22852274
</customwidget>
2275+
<customwidget>
2276+
<class>QgsFilterLineEdit</class>
2277+
<extends>QLineEdit</extends>
2278+
<header>qgsfilterlineedit.h</header>
2279+
</customwidget>
2280+
<customwidget>
2281+
<class>QgsColorButton</class>
2282+
<extends>QToolButton</extends>
2283+
<header>qgscolorbutton.h</header>
2284+
<container>1</container>
2285+
</customwidget>
2286+
<customwidget>
2287+
<class>QgsBlendModeComboBox</class>
2288+
<extends>QComboBox</extends>
2289+
<header>qgsblendmodecombobox.h</header>
2290+
</customwidget>
22862291
</customwidgets>
22872292
<tabstops>
22882293
<tabstop>mOptionsListWidget</tabstop>

‎src/ui/qgsvectorlayerpropertiesbase.ui

100644100755
Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<number>0</number>
6060
</property>
6161
<item>
62-
<widget class="QLineEdit" name="mSearchLineEdit"/>
62+
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
6363
</item>
6464
<item>
6565
<widget class="QListWidget" name="mOptionsListWidget">
@@ -311,8 +311,8 @@
311311
<rect>
312312
<x>0</x>
313313
<y>0</y>
314-
<width>653</width>
315-
<height>542</height>
314+
<width>652</width>
315+
<height>541</height>
316316
</rect>
317317
</property>
318318
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -777,8 +777,8 @@
777777
<rect>
778778
<x>0</x>
779779
<y>0</y>
780-
<width>652</width>
781-
<height>216</height>
780+
<width>523</width>
781+
<height>222</height>
782782
</rect>
783783
</property>
784784
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -1161,7 +1161,7 @@
11611161
<x>0</x>
11621162
<y>0</y>
11631163
<width>104</width>
1164-
<height>102</height>
1164+
<height>103</height>
11651165
</rect>
11661166
</property>
11671167
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1329,8 +1329,8 @@
13291329
<rect>
13301330
<x>0</x>
13311331
<y>0</y>
1332-
<width>325</width>
1333-
<height>613</height>
1332+
<width>297</width>
1333+
<height>556</height>
13341334
</rect>
13351335
</property>
13361336
<layout class="QGridLayout" name="gridLayout_3">
@@ -1927,6 +1927,11 @@
19271927
<extends>QWidget</extends>
19281928
<header>qgscodeeditorhtml.h</header>
19291929
</customwidget>
1930+
<customwidget>
1931+
<class>QgsFilterLineEdit</class>
1932+
<extends>QLineEdit</extends>
1933+
<header>qgsfilterlineedit.h</header>
1934+
</customwidget>
19301935
</customwidgets>
19311936
<tabstops>
19321937
<tabstop>mOptionsListWidget</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.