Skip to content

Commit 776aba5

Browse files
author
timlinux
committed
Updated tab bars to use 22x22 icons and updated HIG guideline accordingly
git-svn-id: http://svn.osgeo.org/qgis/trunk@14695 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e3180bc commit 776aba5

6 files changed

+48
-47
lines changed

CODING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ guidelines are followed in layout and design of GUIs.
14011401
environment that the user is using.
14021402
6. Tabs should not be nested. If you use tabs, follow the style of the
14031403
tabs used in QgsVectorLayerProperties / QgsProjectProperties etc.
1404-
i.e. tabs at top with icons at 32x32.
1404+
i.e. tabs at top with icons at 22x22.
14051405
7. Widget stacks should be avoided if at all possible. They cause problems with
14061406
layouts and inexplicable (to the user) resizing of dialogs to accommodate
14071407
widgets that are not visible.

doc/CODING.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ guidelines are followed in layout and design of GUIs.
12821282
environment that the user is using.
12831283
+ Tabs should not be nested. If you use tabs, follow the style of the
12841284
tabs used in QgsVectorLayerProperties / QgsProjectProperties etc.
1285-
i.e. tabs at top with icons at 32x32.
1285+
i.e. tabs at top with icons at 22x22.
12861286
+ Widget stacks should be avoided if at all possible. They cause problems with
12871287
layouts and inexplicable (to the user) resizing of dialogs to accommodate
12881288
widgets that are not visible.

src/ui/qgsoptionsbase.ui

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
</property>
3838
<property name="iconSize">
3939
<size>
40-
<width>32</width>
41-
<height>32</height>
40+
<width>22</width>
41+
<height>22</height>
4242
</size>
4343
</property>
4444
<widget class="QWidget" name="tabWidgetPage1">
@@ -60,8 +60,8 @@
6060
<rect>
6161
<x>0</x>
6262
<y>0</y>
63-
<width>749</width>
64-
<height>558</height>
63+
<width>746</width>
64+
<height>545</height>
6565
</rect>
6666
</property>
6767
<layout class="QGridLayout" name="gridLayout_12">
@@ -344,8 +344,8 @@
344344
<rect>
345345
<x>0</x>
346346
<y>0</y>
347-
<width>749</width>
348-
<height>470</height>
347+
<width>596</width>
348+
<height>466</height>
349349
</rect>
350350
</property>
351351
<layout class="QGridLayout" name="gridLayout_8">
@@ -515,8 +515,8 @@
515515
<rect>
516516
<x>0</x>
517517
<y>0</y>
518-
<width>749</width>
519-
<height>487</height>
518+
<width>507</width>
519+
<height>480</height>
520520
</rect>
521521
</property>
522522
<layout class="QGridLayout" name="gridLayout_4">
@@ -795,8 +795,8 @@
795795
<rect>
796796
<x>0</x>
797797
<y>0</y>
798-
<width>277</width>
799-
<height>87</height>
798+
<width>264</width>
799+
<height>86</height>
800800
</rect>
801801
</property>
802802
<layout class="QGridLayout" name="gridLayout_10">
@@ -870,8 +870,8 @@
870870
<rect>
871871
<x>0</x>
872872
<y>0</y>
873-
<width>744</width>
874-
<height>446</height>
873+
<width>724</width>
874+
<height>438</height>
875875
</rect>
876876
</property>
877877
<layout class="QGridLayout" name="gridLayout_13">
@@ -1200,8 +1200,8 @@
12001200
<rect>
12011201
<x>0</x>
12021202
<y>0</y>
1203-
<width>390</width>
1204-
<height>563</height>
1203+
<width>371</width>
1204+
<height>557</height>
12051205
</rect>
12061206
</property>
12071207
<layout class="QGridLayout" name="gridLayout_15">
@@ -1296,8 +1296,8 @@
12961296
<rect>
12971297
<x>0</x>
12981298
<y>0</y>
1299-
<width>749</width>
1300-
<height>548</height>
1299+
<width>519</width>
1300+
<height>545</height>
13011301
</rect>
13021302
</property>
13031303
<layout class="QGridLayout" name="gridLayout_17">
@@ -1387,8 +1387,8 @@
13871387
<rect>
13881388
<x>0</x>
13891389
<y>0</y>
1390-
<width>353</width>
1391-
<height>535</height>
1390+
<width>329</width>
1391+
<height>531</height>
13921392
</rect>
13931393
</property>
13941394
<layout class="QGridLayout" name="gridLayout_20">

src/ui/qgsprojectpropertiesbase.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<item row="0" column="0">
2424
<widget class="QTabWidget" name="tabWidget">
2525
<property name="currentIndex">
26-
<number>0</number>
26+
<number>1</number>
2727
</property>
2828
<property name="iconSize">
2929
<size>
30-
<width>32</width>
31-
<height>32</height>
30+
<width>22</width>
31+
<height>22</height>
3232
</size>
3333
</property>
3434
<widget class="QWidget" name="tab1">

src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<item row="0" column="0" colspan="4">
2929
<widget class="QTabWidget" name="tabBar">
3030
<property name="currentIndex">
31-
<number>1</number>
31+
<number>0</number>
3232
</property>
3333
<property name="iconSize">
3434
<size>
35-
<width>32</width>
36-
<height>32</height>
35+
<width>22</width>
36+
<height>22</height>
3737
</size>
3838
</property>
3939
<widget class="QWidget" name="tabPageSymbology">
@@ -1771,20 +1771,21 @@
17711771
<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;
17721772
&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;
17731773
p, li { white-space: pre-wrap; }
1774-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
1774+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
17751775
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
17761776
&lt;tr&gt;
17771777
&lt;td style=&quot;border: none;&quot;&gt;
1778-
&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:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;/p&gt;
1779-
&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;&quot;&gt;&lt;/p&gt;
1780-
&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;&quot;&gt;&lt;/p&gt;
1781-
&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;&quot;&gt;&lt;/p&gt;
1782-
&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;&quot;&gt;&lt;/p&gt;
1783-
&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;&quot;&gt;&lt;/p&gt;
1784-
&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;&quot;&gt;&lt;/p&gt;
1785-
&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;&quot;&gt;&lt;/p&gt;
1786-
&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;&quot;&gt;&lt;/p&gt;
1787-
&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;&quot;&gt;&lt;/p&gt;
1778+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1779+
&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-size:11pt;&quot;&gt;&lt;/p&gt;
1780+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1781+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1782+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1783+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1784+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1785+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1786+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1787+
&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:'Sans';&quot;&gt;&lt;/p&gt;
1788+
&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:'Sans';&quot;&gt;&lt;/p&gt;
17881789
&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:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
17891790
</property>
17901791
</widget>

src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@
7070
</property>
7171
<property name="iconSize">
7272
<size>
73-
<width>32</width>
74-
<height>32</height>
73+
<width>22</width>
74+
<height>22</height>
7575
</size>
7676
</property>
77-
<widget class="QWidget" name="tabWidgetPage1" native="true">
77+
<widget class="QWidget" name="tabWidgetPage1">
7878
<attribute name="icon">
7979
<iconset resource="../../images/images.qrc">
8080
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
@@ -186,7 +186,7 @@
186186
</item>
187187
</layout>
188188
</widget>
189-
<widget class="QWidget" name="tabWidgetPage2" native="true">
189+
<widget class="QWidget" name="tabWidgetPage2">
190190
<attribute name="icon">
191191
<iconset resource="../../images/images.qrc">
192192
<normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
@@ -229,7 +229,7 @@
229229
</item>
230230
</layout>
231231
</widget>
232-
<widget class="QWidget" name="tabWidgetPage3" native="true">
232+
<widget class="QWidget" name="tabWidgetPage3">
233233
<attribute name="icon">
234234
<iconset resource="../../images/images.qrc">
235235
<normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
@@ -344,7 +344,7 @@
344344
</item>
345345
</layout>
346346
</widget>
347-
<widget class="QWidget" name="tabWidgetPage4" native="true">
347+
<widget class="QWidget" name="tabWidgetPage4">
348348
<attribute name="icon">
349349
<iconset resource="../../images/images.qrc">
350350
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
@@ -372,8 +372,8 @@
372372
<rect>
373373
<x>0</x>
374374
<y>0</y>
375-
<width>624</width>
376-
<height>412</height>
375+
<width>384</width>
376+
<height>408</height>
377377
</rect>
378378
</property>
379379
<layout class="QGridLayout" name="gridLayout_3">
@@ -563,7 +563,7 @@
563563
</item>
564564
</layout>
565565
</widget>
566-
<widget class="QWidget" name="tabWidgetPage5" native="true">
566+
<widget class="QWidget" name="tabWidgetPage5">
567567
<attribute name="icon">
568568
<iconset resource="../../images/images.qrc">
569569
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
@@ -584,7 +584,7 @@
584584
</item>
585585
</layout>
586586
</widget>
587-
<widget class="QWidget" name="tabWidgetPage6" native="true">
587+
<widget class="QWidget" name="tabWidgetPage6">
588588
<attribute name="icon">
589589
<iconset resource="../../images/images.qrc">
590590
<normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>

0 commit comments

Comments
 (0)