Skip to content

Commit 271e6f1

Browse files
nyalldawsonnyalldawson
committedApr 13, 2017
Make search box in options pages blend in better
·
ltr-3_40final-3_0_0
1 parent 7f065c7 commit 271e6f1

File tree

2 files changed

+60
-57
lines changed

2 files changed

+60
-57
lines changed
 

‎src/app/qgisappstylesheet.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,12 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant> &opts )
147147

148148
//sidebar style
149149
QString style = "QListWidget#mOptionsListWidget {"
150-
" background-color: rgb(69, 69, 69, 220);"
150+
" background-color: rgb(69, 69, 69, 0);"
151151
" outline: 0;"
152152
"}"
153+
"QFrame#mOptionsListFrame {"
154+
" background-color: rgb(69, 69, 69, 220);"
155+
"}"
153156
"QListWidget#mOptionsListWidget::item {"
154157
" color: white;"
155158
" padding: 3px;"

‎src/ui/qgsoptionsbase.ui

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</property>
4444
<layout class="QVBoxLayout" name="verticalLayout_15">
4545
<property name="spacing">
46-
<number>0</number>
46+
<number>6</number>
4747
</property>
4848
<property name="leftMargin">
4949
<number>0</number>
@@ -340,8 +340,8 @@
340340
<rect>
341341
<x>0</x>
342342
<y>0</y>
343-
<width>856</width>
344-
<height>679</height>
343+
<width>691</width>
344+
<height>702</height>
345345
</rect>
346346
</property>
347347
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1026,8 +1026,8 @@
10261026
<rect>
10271027
<x>0</x>
10281028
<y>0</y>
1029-
<width>839</width>
1030-
<height>1009</height>
1029+
<width>579</width>
1030+
<height>1110</height>
10311031
</rect>
10321032
</property>
10331033
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -1556,8 +1556,8 @@
15561556
<rect>
15571557
<x>0</x>
15581558
<y>0</y>
1559-
<width>856</width>
1560-
<height>679</height>
1559+
<width>843</width>
1560+
<height>787</height>
15611561
</rect>
15621562
</property>
15631563
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -1924,8 +1924,8 @@
19241924
<rect>
19251925
<x>0</x>
19261926
<y>0</y>
1927-
<width>839</width>
1928-
<height>827</height>
1927+
<width>713</width>
1928+
<height>1110</height>
19291929
</rect>
19301930
</property>
19311931
<layout class="QGridLayout" name="gridLayout_22">
@@ -2675,8 +2675,8 @@
26752675
<rect>
26762676
<x>0</x>
26772677
<y>0</y>
2678-
<width>112</width>
2679-
<height>219</height>
2678+
<width>151</width>
2679+
<height>239</height>
26802680
</rect>
26812681
</property>
26822682
<layout class="QHBoxLayout" name="horizontalLayout_46">
@@ -2826,8 +2826,8 @@
28262826
<rect>
28272827
<x>0</x>
28282828
<y>0</y>
2829-
<width>453</width>
2830-
<height>281</height>
2829+
<width>523</width>
2830+
<height>370</height>
28312831
</rect>
28322832
</property>
28332833
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -3169,8 +3169,8 @@
31693169
<rect>
31703170
<x>0</x>
31713171
<y>0</y>
3172-
<width>506</width>
3173-
<height>533</height>
3172+
<width>640</width>
3173+
<height>660</height>
31743174
</rect>
31753175
</property>
31763176
<layout class="QVBoxLayout" name="verticalLayout_30">
@@ -3613,8 +3613,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
36133613
<rect>
36143614
<x>0</x>
36153615
<y>0</y>
3616-
<width>393</width>
3617-
<height>530</height>
3616+
<width>509</width>
3617+
<height>623</height>
36183618
</rect>
36193619
</property>
36203620
<layout class="QVBoxLayout" name="verticalLayout_39">
@@ -3882,8 +3882,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
38823882
<rect>
38833883
<x>0</x>
38843884
<y>0</y>
3885-
<width>488</width>
3886-
<height>612</height>
3885+
<width>572</width>
3886+
<height>828</height>
38873887
</rect>
38883888
</property>
38893889
<layout class="QVBoxLayout" name="verticalLayout_31">
@@ -4460,8 +4460,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
44604460
<rect>
44614461
<x>0</x>
44624462
<y>0</y>
4463-
<width>345</width>
4464-
<height>350</height>
4463+
<width>435</width>
4464+
<height>402</height>
44654465
</rect>
44664466
</property>
44674467
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -4599,8 +4599,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
45994599
<rect>
46004600
<x>0</x>
46014601
<y>0</y>
4602-
<width>332</width>
4603-
<height>499</height>
4602+
<width>437</width>
4603+
<height>584</height>
46044604
</rect>
46054605
</property>
46064606
<layout class="QGridLayout" name="gridLayout_15">
@@ -4812,8 +4812,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
48124812
<rect>
48134813
<x>0</x>
48144814
<y>0</y>
4815-
<width>221</width>
4816-
<height>201</height>
4815+
<width>292</width>
4816+
<height>258</height>
48174817
</rect>
48184818
</property>
48194819
<layout class="QVBoxLayout" name="verticalLayout_32">
@@ -4921,8 +4921,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
49214921
<rect>
49224922
<x>0</x>
49234923
<y>0</y>
4924-
<width>856</width>
4925-
<height>679</height>
4924+
<width>534</width>
4925+
<height>790</height>
49264926
</rect>
49274927
</property>
49284928
<layout class="QVBoxLayout" name="verticalLayout_33">
@@ -5441,32 +5441,16 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54415441
<header>qgsscrollarea.h</header>
54425442
<container>1</container>
54435443
</customwidget>
5444-
<customwidget>
5445-
<class>QgsPasswordLineEdit</class>
5446-
<extends>QLineEdit</extends>
5447-
<header>qgspasswordlineedit.h</header>
5448-
</customwidget>
5449-
<customwidget>
5450-
<class>QgsFilterLineEdit</class>
5451-
<extends>QLineEdit</extends>
5452-
<header>qgsfilterlineedit.h</header>
5453-
</customwidget>
5454-
<customwidget>
5455-
<class>QgsColorButton</class>
5456-
<extends>QToolButton</extends>
5457-
<header>qgscolorbutton.h</header>
5458-
<container>1</container>
5459-
</customwidget>
54605444
<customwidget>
54615445
<class>QgsCollapsibleGroupBox</class>
54625446
<extends>QGroupBox</extends>
54635447
<header>qgscollapsiblegroupbox.h</header>
54645448
<container>1</container>
54655449
</customwidget>
54665450
<customwidget>
5467-
<class>QgsColorSchemeList</class>
5451+
<class>QgsProjectionSelectionWidget</class>
54685452
<extends>QWidget</extends>
5469-
<header location="global">qgscolorschemelist.h</header>
5453+
<header>qgsprojectionselectionwidget.h</header>
54705454
<container>1</container>
54715455
</customwidget>
54725456
<customwidget>
@@ -5475,17 +5459,38 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54755459
<header location="global">qgsvariableeditorwidget.h</header>
54765460
<container>1</container>
54775461
</customwidget>
5478-
<customwidget>
5479-
<class>QgsProjectionSelectionWidget</class>
5480-
<extends>QWidget</extends>
5481-
<header>qgsprojectionselectionwidget.h</header>
5482-
<container>1</container>
5483-
</customwidget>
54845462
<customwidget>
54855463
<class>QgsScaleComboBox</class>
54865464
<extends>QComboBox</extends>
54875465
<header>qgsscalecombobox.h</header>
54885466
</customwidget>
5467+
<customwidget>
5468+
<class>QgsFilterLineEdit</class>
5469+
<extends>QLineEdit</extends>
5470+
<header>qgsfilterlineedit.h</header>
5471+
</customwidget>
5472+
<customwidget>
5473+
<class>QgsColorButton</class>
5474+
<extends>QToolButton</extends>
5475+
<header>qgscolorbutton.h</header>
5476+
<container>1</container>
5477+
</customwidget>
5478+
<customwidget>
5479+
<class>QgsSpinBox</class>
5480+
<extends>QSpinBox</extends>
5481+
<header>qgsspinbox.h</header>
5482+
</customwidget>
5483+
<customwidget>
5484+
<class>QgsPasswordLineEdit</class>
5485+
<extends>QLineEdit</extends>
5486+
<header>qgspasswordlineedit.h</header>
5487+
</customwidget>
5488+
<customwidget>
5489+
<class>QgsColorSchemeList</class>
5490+
<extends>QWidget</extends>
5491+
<header location="global">qgscolorschemelist.h</header>
5492+
<container>1</container>
5493+
</customwidget>
54895494
<customwidget>
54905495
<class>QgsSettingsTree</class>
54915496
<extends>QWidget</extends>
@@ -5498,11 +5503,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
54985503
<header>qgsautheditorwidgets.h</header>
54995504
<container>1</container>
55005505
</customwidget>
5501-
<customwidget>
5502-
<class>QgsSpinBox</class>
5503-
<extends>QSpinBox</extends>
5504-
<header>qgsspinbox.h</header>
5505-
</customwidget>
55065506
</customwidgets>
55075507
<tabstops>
55085508
<tabstop>mOptionsListWidget</tabstop>

1 commit comments

Comments
 (1)

nirvn commented on Apr 16, 2017

@nirvn
nirvn
on Apr 16, 2017
Contributor

@nyalldawson , I think this commit might have led to a visual regression with the plugin manager's side bar:
reg

Please sign in to comment.