[QGIS Commit] r12199 - trunk/qgis/src/plugins/copyright_label

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Nov 19 15:13:45 EST 2009


Author: timlinux
Date: 2009-11-19 15:13:43 -0500 (Thu, 19 Nov 2009)
New Revision: 12199

Modified:
   trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
Log:
Use grid layout not form layout (preserves compatibility with older qt versions)

Modified: trunk/qgis/src/plugins/copyright_label/pluginguibase.ui
===================================================================
--- trunk/qgis/src/plugins/copyright_label/pluginguibase.ui	2009-11-19 17:22:21 UTC (rev 12198)
+++ trunk/qgis/src/plugins/copyright_label/pluginguibase.ui	2009-11-19 20:13:43 UTC (rev 12199)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>360</width>
-    <height>331</height>
+    <width>397</width>
+    <height>326</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,170 +18,133 @@
     <normaloff/>
    </iconset>
   </property>
-  <widget class="QTextEdit" name="txtCopyrightText">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>50</y>
-     <width>341</width>
-     <height>161</height>
-    </rect>
-   </property>
-   <property name="html">
-    <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;
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="cboxEnabled">
+     <property name="text">
+      <string>Enable copyright label</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>&amp;Enter your copyright label here:</string>
+     </property>
+     <property name="buddy">
+      <cstring>txtCopyrightText</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QTextEdit" name="txtCopyrightText">
+     <property name="html">
+      <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:'MS Shell Dlg 2'; font-size:8.25pt; 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:'Verdana'; font-size:10pt;&quot;&gt;© QGIS 2009&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-  </widget>
-  <widget class="QCheckBox" name="cboxEnabled">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>339</width>
-     <height>18</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>Enable copyright label</string>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>300</y>
-     <width>341</width>
-     <height>25</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>30</y>
-     <width>181</width>
-     <height>16</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&amp;Enter your copyright label here:</string>
-   </property>
-   <property name="buddy">
-    <cstring>txtCopyrightText</cstring>
-   </property>
-  </widget>
-  <widget class="QWidget" name="">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>220</y>
-     <width>341</width>
-     <height>81</height>
-    </rect>
-   </property>
-   <layout class="QFormLayout" name="formLayout">
-    <property name="fieldGrowthPolicy">
-     <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-    </property>
-    <item row="0" column="0">
-     <widget class="QLabel" name="textLabel16">
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; 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:'Verdana';&quot;&gt;© QGIS 2009&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="textLabel16">
+     <property name="text">
+      <string>&amp;Placement</string>
+     </property>
+     <property name="buddy">
+      <cstring>cboPlacement</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QComboBox" name="cboPlacement">
+     <item>
       <property name="text">
-       <string>&amp;Placement</string>
+       <string>Bottom Left</string>
       </property>
-      <property name="buddy">
-       <cstring>cboPlacement</cstring>
+     </item>
+     <item>
+      <property name="text">
+       <string>Top Left</string>
       </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QComboBox" name="cboPlacement">
-      <item>
-       <property name="text">
-        <string>Bottom Left</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Top Left</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Bottom Right</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Top Right</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="textLabel15">
+     </item>
+     <item>
       <property name="text">
-       <string>&amp;Orientation</string>
+       <string>Bottom Right</string>
       </property>
-      <property name="buddy">
-       <cstring>cboOrientation</cstring>
+     </item>
+     <item>
+      <property name="text">
+       <string>Top Right</string>
       </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QComboBox" name="cboOrientation">
-      <item>
-       <property name="text">
-        <string>Horizontal</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Vertical</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label">
+     </item>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="textLabel15">
+     <property name="text">
+      <string>&amp;Orientation</string>
+     </property>
+     <property name="buddy">
+      <cstring>cboOrientation</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QComboBox" name="cboOrientation">
+     <item>
       <property name="text">
-       <string>&amp;Color</string>
+       <string>Horizontal</string>
       </property>
-      <property name="buddy">
-       <cstring>pbnColorChooser</cstring>
+     </item>
+     <item>
+      <property name="text">
+       <string>Vertical</string>
       </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QgsColorButton" name="pbnColorChooser">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>100</width>
-        <height>0</height>
-       </size>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
+     </item>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&amp;Color</string>
+     </property>
+     <property name="buddy">
+      <cstring>pbnColorChooser</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QgsColorButton" name="pbnColorChooser">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -192,6 +155,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>cboxEnabled</tabstop>
   <tabstop>txtCopyrightText</tabstop>
   <tabstop>cboPlacement</tabstop>
   <tabstop>cboOrientation</tabstop>



More information about the QGIS-commit mailing list