[QGIS Commit] r13197 - trunk/qgis/src/ui

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2010-03-29 15:20:50 -0400 (Mon, 29 Mar 2010)
New Revision: 13197

Modified:
   trunk/qgis/src/ui/qgsannotationwidgetbase.ui
   trunk/qgis/src/ui/qgstextannotationdialogbase.ui
Log:
HIG compliance updates for annotation dialogs

Modified: trunk/qgis/src/ui/qgsannotationwidgetbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsannotationwidgetbase.ui	2010-03-29 17:33:20 UTC (rev 13196)
+++ trunk/qgis/src/ui/qgsannotationwidgetbase.ui	2010-03-29 19:20:50 UTC (rev 13197)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>213</width>
-    <height>150</height>
+    <height>152</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -26,8 +26,11 @@
      <item>
       <widget class="QLabel" name="mMapMarkerLabel">
        <property name="text">
-        <string>Map marker:</string>
+        <string>Map marker</string>
        </property>
+       <property name="buddy">
+        <cstring>mMapMarkerButton</cstring>
+       </property>
       </widget>
      </item>
      <item>
@@ -44,8 +47,11 @@
      <item>
       <widget class="QLabel" name="mFrameWidthLabel">
        <property name="text">
-        <string>Frame width:</string>
+        <string>Frame width</string>
        </property>
+       <property name="buddy">
+        <cstring>mFrameWidthSpinBox</cstring>
+       </property>
       </widget>
      </item>
      <item>
@@ -58,8 +64,11 @@
      <item>
       <widget class="QLabel" name="mFrameColorLabel">
        <property name="text">
-        <string>Frame color:</string>
+        <string>Frame color</string>
        </property>
+       <property name="buddy">
+        <cstring>mFrameColorButton</cstring>
+       </property>
       </widget>
      </item>
      <item>

Modified: trunk/qgis/src/ui/qgstextannotationdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgstextannotationdialogbase.ui	2010-03-29 17:33:20 UTC (rev 13196)
+++ trunk/qgis/src/ui/qgstextannotationdialogbase.ui	2010-03-29 19:20:50 UTC (rev 13197)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>419</width>
+    <width>517</width>
     <height>364</height>
    </rect>
   </property>
@@ -78,8 +78,11 @@
      <item>
       <widget class="QLabel" name="mBackgroundColorLabel">
        <property name="text">
-        <string>Background color: </string>
+        <string>Background color</string>
        </property>
+       <property name="buddy">
+        <cstring>mBackgroundColorButton</cstring>
+       </property>
       </widget>
      </item>
      <item>
@@ -99,6 +102,9 @@
    </item>
    <item row="3" column="0">
     <widget class="QStackedWidget" name="mStackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
      <widget class="QWidget" name="page"/>
      <widget class="QWidget" name="page_2"/>
     </widget>
@@ -122,6 +128,16 @@
    <header>qgscolorbutton.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>mFontComboBox</tabstop>
+  <tabstop>mFontSizeSpinBox</tabstop>
+  <tabstop>mBoldPushButton</tabstop>
+  <tabstop>mItalicsPushButton</tabstop>
+  <tabstop>mFontColorButton</tabstop>
+  <tabstop>mTextEdit</tabstop>
+  <tabstop>mBackgroundColorButton</tabstop>
+  <tabstop>mButtonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>