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

svn_qgis at osgeo.org svn_qgis at osgeo.org
Fri Mar 20 10:05:51 EDT 2009


Author: jef
Date: 2009-03-20 10:05:51 -0400 (Fri, 20 Mar 2009)
New Revision: 10318

Modified:
   trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui
Log:
fix layout of add vector dialog

Modified: trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui	2009-03-20 14:05:19 UTC (rev 10317)
+++ trunk/qgis/src/ui/qgsopenvectorlayerdialogbase.ui	2009-03-20 14:05:51 UTC (rev 10318)
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>500</width>
-    <height>569</height>
+    <width>930</width>
+    <height>635</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -29,10 +29,11 @@
   </property>
   <property name="windowIcon" >
    <iconset>
-    <normaloff>../../../../../Documents and Settings/freddy/.designer/plugins/ogr_converter</normaloff>../../../../../Documents and Settings/freddy/.designer/plugins/ogr_converter</iconset>
+    <normaloff/>
+   </iconset>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3" >
-   <item>
+  <layout class="QGridLayout" name="gridLayout_5" >
+   <item row="0" column="0" >
     <widget class="QGroupBox" name="srcGroupBox_2" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -40,312 +41,286 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize" >
-      <size>
-       <width>482</width>
-       <height>80</height>
-      </size>
-     </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>70</height>
-      </size>
-     </property>
      <property name="title" >
       <string>Source type</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4" >
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3" >
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="radioSrcFile" >
+        <property name="text" >
+         <string>File</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QRadioButton" name="radioSrcDirectory" >
+        <property name="text" >
+         <string>Directory</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QRadioButton" name="radioSrcDatabase" >
+        <property name="text" >
+         <string>Database</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <widget class="QRadioButton" name="radioSrcProtocol" >
+        <property name="text" >
+         <string>Protocol</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Encoding :</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="3" >
+       <widget class="QComboBox" name="cmbEncodings" >
+        <property name="minimumSize" >
+         <size>
+          <width>380</width>
+          <height>0</height>
+         </size>
+        </property>
         <item>
-         <widget class="QRadioButton" name="radioSrcFile" >
-          <property name="text" >
-           <string>File</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>BIG5</string>
+         </property>
         </item>
         <item>
-         <widget class="QRadioButton" name="radioSrcDirectory" >
-          <property name="text" >
-           <string>Directory</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>BIG5-HKSCS</string>
+         </property>
         </item>
         <item>
-         <widget class="QRadioButton" name="radioSrcDatabase" >
-          <property name="text" >
-           <string>Database</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>EUCJP</string>
+         </property>
         </item>
         <item>
-         <widget class="QRadioButton" name="radioSrcProtocol" >
-          <property name="text" >
-           <string>Protocol</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>EUCKR</string>
+         </property>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4" >
         <item>
-         <widget class="QLabel" name="label_3" >
-          <property name="text" >
-           <string>Encoding :</string>
-          </property>
-         </widget>
+         <property name="text" >
+          <string>GB2312</string>
+         </property>
         </item>
         <item>
-         <widget class="QComboBox" name="cmbEncodings" >
-          <property name="minimumSize" >
-           <size>
-            <width>380</width>
-            <height>0</height>
-           </size>
-          </property>
-          <item>
-           <property name="text" >
-            <string>BIG5</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>BIG5-HKSCS</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>EUCJP</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>EUCKR</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>GB2312</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>GBK</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>GB18030</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>JIS7</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>SHIFT-JIS</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>TSCII</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>UTF-8</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>UTF-16</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>KOI8-R</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>KOI8-U</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-1</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-2</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-3</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-4</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-5</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-6</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-7</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-8</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-8-I</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-9</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-10</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-11</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-12</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-13</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-14</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>ISO8859-15</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>IBM 850</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>IBM 866</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP874</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1250</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1251</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1252</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1253</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1254</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1255</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1256</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1257</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>CP1258</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>Apple Roman</string>
-           </property>
-          </item>
-          <item>
-           <property name="text" >
-            <string>TIS-620</string>
-           </property>
-          </item>
-         </widget>
+         <property name="text" >
+          <string>GBK</string>
+         </property>
         </item>
-       </layout>
+        <item>
+         <property name="text" >
+          <string>GB18030</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>JIS7</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>SHIFT-JIS</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>TSCII</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>UTF-8</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>UTF-16</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>KOI8-R</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>KOI8-U</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-1</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-2</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-3</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-4</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-5</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-6</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-7</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-8</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-8-I</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-9</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-10</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-11</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-12</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-13</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-14</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>ISO8859-15</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>IBM 850</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>IBM 866</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP874</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1250</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1251</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1252</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1253</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1254</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1255</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1256</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1257</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>CP1258</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>Apple Roman</string>
+         </property>
+        </item>
+        <item>
+         <property name="text" >
+          <string>TIS-620</string>
+         </property>
+        </item>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0" >
     <widget class="QGroupBox" name="protocolGroupBox" >
      <property name="minimumSize" >
       <size>
-       <width>482</width>
-       <height>90</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>90</height>
-      </size>
-     </property>
      <property name="title" >
       <string>Protocol</string>
      </property>
@@ -373,7 +348,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0" >
     <widget class="QGroupBox" name="fileGroupBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -383,16 +358,10 @@
      </property>
      <property name="minimumSize" >
       <size>
-       <width>482</width>
-       <height>90</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>90</height>
-      </size>
-     </property>
      <property name="title" >
       <string>Source</string>
      </property>
@@ -437,7 +406,14 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
     <widget class="QGroupBox" name="dbGroupBox" >
      <property name="sizePolicy" >
       <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
@@ -447,113 +423,77 @@
      </property>
      <property name="minimumSize" >
       <size>
-       <width>482</width>
-       <height>240</height>
+       <width>0</width>
+       <height>0</height>
       </size>
      </property>
-     <property name="maximumSize" >
-      <size>
-       <width>16777215</width>
-       <height>240</height>
-      </size>
-     </property>
      <property name="title" >
       <string>Database</string>
      </property>
-     <widget class="QGroupBox" name="groupBox_2" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>30</y>
-        <width>454</width>
-        <height>61</height>
-       </rect>
-      </property>
-      <property name="title" >
-       <string>Type</string>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout_2" >
-       <item>
-        <widget class="QComboBox" name="cmbDatabaseTypes" />
-       </item>
-      </layout>
-     </widget>
-     <widget class="QGroupBox" name="groupBox" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>90</y>
-        <width>454</width>
-        <height>126</height>
-       </rect>
-      </property>
-      <property name="title" >
-       <string>Connections</string>
-      </property>
-      <layout class="QVBoxLayout" name="verticalLayout" >
-       <item>
-        <widget class="QComboBox" name="cmbConnections" />
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout" >
-         <item>
+     <layout class="QGridLayout" name="gridLayout_6" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Type</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="cmbDatabaseTypes" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QGroupBox" name="groupBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="title" >
+         <string>Connections</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout_4" >
+         <item row="1" column="0" >
           <widget class="QPushButton" name="btnNew" >
            <property name="text" >
             <string>New</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="1" >
           <widget class="QPushButton" name="btnEdit" >
            <property name="text" >
             <string>Edit</string>
            </property>
           </widget>
          </item>
-         <item>
+         <item row="1" column="2" >
           <widget class="QPushButton" name="btnDelete" >
            <property name="text" >
             <string>Delete</string>
            </property>
           </widget>
          </item>
+         <item row="0" column="0" colspan="3" >
+          <widget class="QComboBox" name="cmbConnections" />
+         </item>
         </layout>
-       </item>
-      </layout>
-     </widget>
+        <zorder>btnNew</zorder>
+        <zorder>btnEdit</zorder>
+        <zorder>btnDelete</zorder>
+        <zorder>cmbConnections</zorder>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
-     <item>
-      <widget class="QPushButton" name="btnHelp" >
-       <property name="text" >
-        <string>Help</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>228</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox" >
-       <property name="standardButtons" >
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />



More information about the QGIS-commit mailing list