Skip to content

Commit

Permalink
reduce height of some dialogs to make them fit into small screens (fix …
Browse files Browse the repository at this point in the history 
…#32021)
  • Loading branch information
@alexbruy @nyalldawson
alexbruy authored and nyalldawson committed Dec 28, 2019
1 parent c242856 commit e8d3b4e
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 110 deletions.
52 changes: 26 additions & 26 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1029</width>
<height>878</height>
<height>730</height>
</rect>
</property>
<property name="minimumSize">
Expand Down Expand Up @@ -361,8 +361,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>848</width>
<height>943</height>
<width>843</width>
<height>861</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -1078,8 +1078,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>545</width>
<height>1114</height>
<width>541</width>
<height>1072</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
Expand Down Expand Up @@ -1614,8 +1614,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>857</width>
<height>827</height>
<width>552</width>
<height>509</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
Expand Down Expand Up @@ -1827,8 +1827,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>533</width>
<height>678</height>
<width>499</width>
<height>642</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
Expand Down Expand Up @@ -2143,8 +2143,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>702</width>
<height>1139</height>
<width>674</width>
<height>1057</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
Expand Down Expand Up @@ -2929,8 +2929,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>532</width>
<height>309</height>
<width>501</width>
<height>293</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
Expand Down Expand Up @@ -3240,8 +3240,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>611</width>
<height>652</height>
<width>604</width>
<height>600</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_30">
Expand Down Expand Up @@ -3684,8 +3684,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>181</width>
<height>318</height>
<width>157</width>
<height>265</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_46">
Expand Down Expand Up @@ -3852,8 +3852,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>574</width>
<height>827</height>
<width>543</width>
<height>801</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
Expand Down Expand Up @@ -4461,8 +4461,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>472</width>
<height>572</height>
<width>480</width>
<height>538</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_39">
Expand Down Expand Up @@ -4730,8 +4730,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>509</width>
<height>367</height>
<width>412</width>
<height>372</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -4899,8 +4899,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>753</height>
<width>613</width>
<height>688</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_33">
Expand Down Expand Up @@ -5401,7 +5401,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<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:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&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;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Noto Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
Expand Down
16 changes: 8 additions & 8 deletions src/ui/qgsprojectpropertiesbase.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>857</width>
<height>830</height>
<height>730</height>
</rect>
</property>
<property name="minimumSize">
Expand Down Expand Up @@ -1575,7 +1575,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-793</y>
<y>0</y>
<width>671</width>
<height>2614</height>
</rect>
Expand Down Expand Up @@ -2906,12 +2906,6 @@
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorSchemeList</class>
<extends>QWidget</extends>
Expand All @@ -2936,6 +2930,12 @@
<header>qgsdatumtransformtablewidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCodeEditorPython</class>
<extends>QWidget</extends>
Expand Down
64 changes: 32 additions & 32 deletions src/ui/qgsrasterlayerpropertiesbase.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>815</width>
<height>777</height>
<height>730</height>
</rect>
</property>
<property name="minimumSize">
Expand Down Expand Up @@ -275,8 +275,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>263</width>
<height>98</height>
<width>261</width>
<height>92</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
Expand Down Expand Up @@ -381,8 +381,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>488</width>
<height>532</height>
<width>512</width>
<height>502</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">
Expand Down Expand Up @@ -639,7 +639,7 @@ border-radius: 2px;</string>
<height>16777215</height>
</size>
</property>
<property name="text" stdset="0">
<property name="text">
<string/>
</property>
</widget>
Expand Down Expand Up @@ -969,8 +969,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>350</width>
<height>477</height>
<width>348</width>
<height>446</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
Expand Down Expand Up @@ -1316,8 +1316,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>86</width>
<height>45</height>
<width>98</width>
<height>42</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_16">
Expand Down Expand Up @@ -1481,8 +1481,8 @@ border-radius: 2px;</string>
<rect>
<x>0</x>
<y>0</y>
<width>643</width>
<height>727</height>
<width>553</width>
<height>193</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
Expand Down Expand Up @@ -1545,7 +1545,7 @@ border-radius: 2px;</string>
<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:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&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;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>
Expand Down Expand Up @@ -1681,8 +1681,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>643</width>
<height>727</height>
<width>324</width>
<height>634</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
Expand Down Expand Up @@ -2120,18 +2120,18 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsColorButton</class>
<extends>QFrame</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>QgsColorButton</class>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsFilterLineEdit</class>
<extends>QLineEdit</extends>
Expand All @@ -2143,17 +2143,23 @@ p, li { white-space: pre-wrap; }
<header>qgsprojectionselectionwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleRangeWidget</class>
<extends>QWidget</extends>
<header>qgsscalerangewidget.h</header>
</customwidget>
<customwidget>
<class>QgsLayerTreeEmbeddedConfigWidget</class>
<extends>QWidget</extends>
Expand All @@ -2170,12 +2176,6 @@ p, li { white-space: pre-wrap; }
<extends>QComboBox</extends>
<header>raster/qgsrasterbandcombobox.h</header>
</customwidget>
<customwidget>
<class>QgsOpacityWidget</class>
<extends>QWidget</extends>
<header>qgsopacitywidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsWebView</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit e8d3b4e

Please sign in to comment.