Skip to content
Permalink
Browse files
Fix broken widget filter box in layer/project properties
  • Loading branch information
nyalldawson committed Mar 24, 2017
1 parent 9d5f289 commit 83db0fbe7988df2d96e05297923fc2d815fac24e
Showing with 66 additions and 51 deletions.
  1. +24 −19 src/ui/qgsprojectpropertiesbase.ui
  2. +29 −24 src/ui/qgsrasterlayerpropertiesbase.ui
  3. +13 −8 src/ui/qgsvectorlayerpropertiesbase.ui
43 src/ui/qgsprojectpropertiesbase.ui 100644 → 100755
@@ -55,7 +55,7 @@
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="mSearchLineEdit"/>
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
</item>
<item>
<widget class="QListWidget" name="mOptionsListWidget">
@@ -259,8 +259,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>455</width>
<height>563</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -749,8 +749,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>684</width>
<height>783</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -808,8 +808,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>109</width>
<height>100</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -894,8 +894,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>685</width>
<height>778</height>
<width>331</width>
<height>483</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1361,8 +1361,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>671</width>
<height>2451</height>
<width>474</width>
<height>2039</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2441,8 +2441,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>165</width>
<height>57</height>
<width>127</width>
<height>43</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
@@ -2591,12 +2591,6 @@
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
@@ -2609,6 +2603,17 @@
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
@@ -55,7 +55,7 @@
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="mSearchLineEdit"/>
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
</item>
<item>
<widget class="QListWidget" name="mOptionsListWidget">
@@ -241,7 +241,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>266</width>
<width>355</width>
<height>233</height>
</rect>
</property>
@@ -512,8 +512,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>617</width>
<height>547</height>
<width>616</width>
<height>546</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
@@ -1143,8 +1143,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>455</width>
<height>384</height>
<width>358</width>
<height>354</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1559,8 +1559,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>559</width>
<height>189</height>
<width>457</width>
<height>169</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1623,7 +1623,7 @@
<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;
&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;
p, li { white-space: pre-wrap; }
&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;
&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;
&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>
</property>
</widget>
@@ -1729,8 +1729,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>41</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1788,8 +1788,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>325</width>
<height>613</height>
<width>297</width>
<height>556</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
@@ -2249,23 +2249,12 @@ p, li { white-space: pre-wrap; }
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsBlendModeComboBox</class>
<extends>QComboBox</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsProjectionSelectionWidget</class>
<extends>QWidget</extends>
@@ -2283,6 +2272,22 @@ p, li { white-space: pre-wrap; }
<header>qgslayertreeembeddedconfigwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsBlendModeComboBox</class>
<extends>QComboBox</extends>
<header>qgsblendmodecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mOptionsListWidget</tabstop>
@@ -59,7 +59,7 @@
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="mSearchLineEdit"/>
<widget class="QgsFilterLineEdit" name="mSearchLineEdit"/>
</item>
<item>
<widget class="QListWidget" name="mOptionsListWidget">
@@ -311,8 +311,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>653</width>
<height>542</height>
<width>652</width>
<height>541</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -777,8 +777,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>652</width>
<height>216</height>
<width>523</width>
<height>222</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -1161,7 +1161,7 @@
<x>0</x>
<y>0</y>
<width>104</width>
<height>102</height>
<height>103</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_23">
@@ -1329,8 +1329,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>325</width>
<height>613</height>
<width>297</width>
<height>556</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -1927,6 +1927,11 @@
<extends>QWidget</extends>
<header>qgscodeeditorhtml.h</header>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mOptionsListWidget</tabstop>

0 comments on commit 83db0fb

Please sign in to comment.