[QGIS Commit] r14695 - in trunk/qgis: . doc src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Nov 17 04:09:55 EST 2010
Author: timlinux
Date: 2010-11-17 01:09:55 -0800 (Wed, 17 Nov 2010)
New Revision: 14695
Modified:
trunk/qgis/CODING
trunk/qgis/doc/CODING.t2t
trunk/qgis/src/ui/qgsoptionsbase.ui
trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
Log:
Updated tab bars to use 22x22 icons and updated HIG guideline accordingly
Modified: trunk/qgis/CODING
===================================================================
--- trunk/qgis/CODING 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/CODING 2010-11-17 09:09:55 UTC (rev 14695)
@@ -1401,7 +1401,7 @@
environment that the user is using.
6. Tabs should not be nested. If you use tabs, follow the style of the
tabs used in QgsVectorLayerProperties / QgsProjectProperties etc.
- i.e. tabs at top with icons at 32x32.
+ i.e. tabs at top with icons at 22x22.
7. Widget stacks should be avoided if at all possible. They cause problems with
layouts and inexplicable (to the user) resizing of dialogs to accommodate
widgets that are not visible.
Modified: trunk/qgis/doc/CODING.t2t
===================================================================
--- trunk/qgis/doc/CODING.t2t 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/doc/CODING.t2t 2010-11-17 09:09:55 UTC (rev 14695)
@@ -1282,7 +1282,7 @@
environment that the user is using.
+ Tabs should not be nested. If you use tabs, follow the style of the
tabs used in QgsVectorLayerProperties / QgsProjectProperties etc.
- i.e. tabs at top with icons at 32x32.
+ i.e. tabs at top with icons at 22x22.
+ Widget stacks should be avoided if at all possible. They cause problems with
layouts and inexplicable (to the user) resizing of dialogs to accommodate
widgets that are not visible.
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2010-11-17 09:09:55 UTC (rev 14695)
@@ -37,8 +37,8 @@
</property>
<property name="iconSize">
<size>
- <width>32</width>
- <height>32</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<widget class="QWidget" name="tabWidgetPage1">
@@ -60,8 +60,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>749</width>
- <height>558</height>
+ <width>746</width>
+ <height>545</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_12">
@@ -344,8 +344,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>749</width>
- <height>470</height>
+ <width>596</width>
+ <height>466</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
@@ -515,8 +515,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>749</width>
- <height>487</height>
+ <width>507</width>
+ <height>480</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
@@ -795,8 +795,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>277</width>
- <height>87</height>
+ <width>264</width>
+ <height>86</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_10">
@@ -870,8 +870,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>744</width>
- <height>446</height>
+ <width>724</width>
+ <height>438</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_13">
@@ -1200,8 +1200,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>390</width>
- <height>563</height>
+ <width>371</width>
+ <height>557</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
@@ -1296,8 +1296,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>749</width>
- <height>548</height>
+ <width>519</width>
+ <height>545</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_17">
@@ -1387,8 +1387,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>353</width>
- <height>535</height>
+ <width>329</width>
+ <height>531</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_20">
Modified: trunk/qgis/src/ui/qgsprojectpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsprojectpropertiesbase.ui 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/src/ui/qgsprojectpropertiesbase.ui 2010-11-17 09:09:55 UTC (rev 14695)
@@ -23,12 +23,12 @@
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<property name="iconSize">
<size>
- <width>32</width>
- <height>32</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<widget class="QWidget" name="tab1">
Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2010-11-17 09:09:55 UTC (rev 14695)
@@ -28,12 +28,12 @@
<item row="0" column="0" colspan="4">
<widget class="QTabWidget" name="tabBar">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<property name="iconSize">
<size>
- <width>32</width>
- <height>32</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
<widget class="QWidget" name="tabPageSymbology">
@@ -1771,20 +1771,21 @@
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;">
<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
<tr>
<td style="border: none;">
-<p style="-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;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style="-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';"></p>
+<p style="-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;"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
+<p style="-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';"></p>
<p style="-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;"></p></td></tr></table></body></html></string>
</property>
</widget>
Modified: trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2010-11-17 08:33:09 UTC (rev 14694)
+++ trunk/qgis/src/ui/qgsvectorlayerpropertiesbase.ui 2010-11-17 09:09:55 UTC (rev 14695)
@@ -70,11 +70,11 @@
</property>
<property name="iconSize">
<size>
- <width>32</width>
- <height>32</height>
+ <width>22</width>
+ <height>22</height>
</size>
</property>
- <widget class="QWidget" name="tabWidgetPage1" native="true">
+ <widget class="QWidget" name="tabWidgetPage1">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/symbology.png</normaloff>:/images/themes/default/propertyicons/symbology.png</iconset>
@@ -186,7 +186,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabWidgetPage2" native="true">
+ <widget class="QWidget" name="tabWidgetPage2">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/labels.png</normaloff>:/images/themes/default/propertyicons/labels.png</iconset>
@@ -229,7 +229,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabWidgetPage3" native="true">
+ <widget class="QWidget" name="tabWidgetPage3">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/attributes.png</normaloff>:/images/themes/default/propertyicons/attributes.png</iconset>
@@ -344,7 +344,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabWidgetPage4" native="true">
+ <widget class="QWidget" name="tabWidgetPage4">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
@@ -372,8 +372,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>624</width>
- <height>412</height>
+ <width>384</width>
+ <height>408</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@@ -563,7 +563,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabWidgetPage5" native="true">
+ <widget class="QWidget" name="tabWidgetPage5">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
@@ -584,7 +584,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tabWidgetPage6" native="true">
+ <widget class="QWidget" name="tabWidgetPage6">
<attribute name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/action.png</normaloff>:/images/themes/default/propertyicons/action.png</iconset>
More information about the QGIS-commit
mailing list