[QGIS Commit] r14019 - in trunk/qgis/python/plugins/GdalTools: . tools

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-08-06 16:15:15 +0000 (Fri, 06 Aug 2010)
New Revision: 14019

Modified:
   trunk/qgis/python/plugins/GdalTools/__init__.py
   trunk/qgis/python/plugins/GdalTools/tools/dialogBase.ui
   trunk/qgis/python/plugins/GdalTools/tools/doContour.py
   trunk/qgis/python/plugins/GdalTools/tools/doPolygonize.py
   trunk/qgis/python/plugins/GdalTools/tools/optionsTable.ui
   trunk/qgis/python/plugins/GdalTools/tools/widgetContour.ui
   trunk/qgis/python/plugins/GdalTools/tools/widgetConvert.ui
   trunk/qgis/python/plugins/GdalTools/tools/widgetGrid.ui
   trunk/qgis/python/plugins/GdalTools/tools/widgetInfo.ui
   trunk/qgis/python/plugins/GdalTools/tools/widgetOverview.ui
Log:
aligned to GdalTools v1.2.8

Modified: trunk/qgis/python/plugins/GdalTools/__init__.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/__init__.py	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/__init__.py	2010-08-06 16:15:15 UTC (rev 14019)
@@ -22,7 +22,7 @@
 def description():
   return "Integrate gdal tools into qgis"
 def version(): 
-  return "Version 1.2.0" 
+  return "Version 1.2.8" 
 def qgisMinimumVersion():
   return "1.0"
 def classFactory(iface): 

Modified: trunk/qgis/python/plugins/GdalTools/tools/dialogBase.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/dialogBase.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/dialogBase.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>285</width>
-    <height>170</height>
+    <height>179</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,9 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QVBoxLayout" name="pluginLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetNoConstraint</enum>
-     </property>
      <property name="margin">
       <number>0</number>
      </property>

Modified: trunk/qgis/python/plugins/GdalTools/tools/doContour.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doContour.py	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/doContour.py	2010-08-06 16:15:15 UTC (rev 14019)
@@ -81,4 +81,5 @@
   def addLayerIntoCanvas(self, fileInfo):
       vl = self.iface.addVectorLayer(fileInfo.filePath(), "contour", "ogr")
       if vl.isValid():
-        vl.setProviderEncoding(self.lastEncoding)
+        if hasattr(self, 'lastEncoding'):
+          vl.setProviderEncoding(self.lastEncoding)

Modified: trunk/qgis/python/plugins/GdalTools/tools/doPolygonize.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doPolygonize.py	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/doPolygonize.py	2010-08-06 16:15:15 UTC (rev 14019)
@@ -82,4 +82,5 @@
   def addLayerIntoCanvas(self, fileInfo):
       vl = self.iface.addVectorLayer(fileInfo.filePath(), fileInfo.baseName(), "ogr")
       if vl.isValid():
-        vl.setProviderEncoding(self.lastEncoding)
+        if hasattr(self, 'lastEncoding'):
+          vl.setProviderEncoding(self.lastEncoding)

Modified: trunk/qgis/python/plugins/GdalTools/tools/optionsTable.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/optionsTable.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/optionsTable.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -40,6 +40,12 @@
         <attribute name="horizontalHeaderStretchLastSection">
          <bool>true</bool>
         </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderMinimumSectionSize">
+         <number>30</number>
+        </attribute>
         <column>
          <property name="text">
           <string>Name</string>

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetContour.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetContour.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetContour.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -115,9 +115,6 @@
      </item>
      <item row="3" column="0">
       <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="sizeConstraint">
-        <enum>QLayout::SetFixedSize</enum>
-       </property>
        <item>
         <widget class="QCheckBox" name="attributeCheck">
          <property name="text">
@@ -127,12 +124,6 @@
        </item>
        <item>
         <widget class="QLabel" name="label_5">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="font">
           <font>
            <pointsize>8</pointsize>

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetConvert.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetConvert.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetConvert.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>362</width>
+    <width>356</width>
     <height>181</height>
    </rect>
   </property>

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetGrid.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetGrid.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetGrid.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>333</width>
-    <height>444</height>
+    <height>450</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -278,6 +278,19 @@
            </property>
           </widget>
          </item>
+         <item row="8" column="0">
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_2">

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetInfo.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetInfo.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetInfo.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>

Modified: trunk/qgis/python/plugins/GdalTools/tools/widgetOverview.ui
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/widgetOverview.ui	2010-08-06 13:29:03 UTC (rev 14018)
+++ trunk/qgis/python/plugins/GdalTools/tools/widgetOverview.ui	2010-08-06 16:15:15 UTC (rev 14019)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
+    <width>376</width>
     <height>205</height>
    </rect>
   </property>