Skip to content

Commit

Permalink
Make search box in options pages blend in better
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 13, 2017
1 parent 7f065c7 commit 271e6f1
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 57 deletions.
5 changes: 4 additions & 1 deletion src/app/qgisappstylesheet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ void QgisAppStyleSheet::buildStyleSheet( const QMap<QString, QVariant> &opts )

//sidebar style
QString style = "QListWidget#mOptionsListWidget {"
" background-color: rgb(69, 69, 69, 220);"
" background-color: rgb(69, 69, 69, 0);"
" outline: 0;"
"}"
"QFrame#mOptionsListFrame {"
" background-color: rgb(69, 69, 69, 220);"
"}"
"QListWidget#mOptionsListWidget::item {"
" color: white;"
" padding: 3px;"
Expand Down
112 changes: 56 additions & 56 deletions src/ui/qgsoptionsbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
<property name="spacing">
<number>0</number>
<number>6</number>
</property>
<property name="leftMargin">
<number>0</number>
Expand Down Expand Up @@ -340,8 +340,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>856</width>
<height>679</height>
<width>691</width>
<height>702</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -1026,8 +1026,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>839</width>
<height>1009</height>
<width>579</width>
<height>1110</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
Expand Down Expand Up @@ -1556,8 +1556,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>856</width>
<height>679</height>
<width>843</width>
<height>787</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
Expand Down Expand Up @@ -1924,8 +1924,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>839</width>
<height>827</height>
<width>713</width>
<height>1110</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
Expand Down Expand Up @@ -2675,8 +2675,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>112</width>
<height>219</height>
<width>151</width>
<height>239</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_46">
Expand Down Expand Up @@ -2826,8 +2826,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>453</width>
<height>281</height>
<width>523</width>
<height>370</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
Expand Down Expand Up @@ -3169,8 +3169,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>506</width>
<height>533</height>
<width>640</width>
<height>660</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_30">
Expand Down Expand Up @@ -3613,8 +3613,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>393</width>
<height>530</height>
<width>509</width>
<height>623</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_39">
Expand Down Expand Up @@ -3882,8 +3882,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>488</width>
<height>612</height>
<width>572</width>
<height>828</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
Expand Down Expand Up @@ -4460,8 +4460,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>345</width>
<height>350</height>
<width>435</width>
<height>402</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -4599,8 +4599,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>332</width>
<height>499</height>
<width>437</width>
<height>584</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
Expand Down Expand Up @@ -4812,8 +4812,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>221</width>
<height>201</height>
<width>292</width>
<height>258</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
Expand Down Expand Up @@ -4921,8 +4921,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>856</width>
<height>679</height>
<width>534</width>
<height>790</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_33">
Expand Down Expand Up @@ -5441,32 +5441,16 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPasswordLineEdit</class>
<extends>QLineEdit</extends>
<header>qgspasswordlineedit.h</header>
</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>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<class>QgsProjectionSelectionWidget</class>
<extends>QWidget</extends>
<header location="global">qgscolorschemelist.h</header>
<header>qgsprojectionselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
Expand All @@ -5475,17 +5459,38 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsProjectionSelectionWidget</class>
<extends>QWidget</extends>
<header>qgsprojectionselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleComboBox</class>
<extends>QComboBox</extends>
<header>qgsscalecombobox.h</header>
</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>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsPasswordLineEdit</class>
<extends>QLineEdit</extends>
<header>qgspasswordlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
<header location="global">qgscolorschemelist.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSettingsTree</class>
<extends>QWidget</extends>
Expand All @@ -5498,11 +5503,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<header>qgsautheditorwidgets.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mOptionsListWidget</tabstop>
Expand Down

1 comment on commit 271e6f1

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 271e6f1 Apr 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.