aligned to GdalTools v1.2.8

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14019 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 6, 2010 · da53198 · da53198
1 parent f6c132a
commit da53198
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 20 deletions.
diff --git a/python/plugins/GdalTools/__init__.py b/python/plugins/GdalTools/__init__.py
@@ -22,7 +22,7 @@ def name():
 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): 

diff --git a/python/plugins/GdalTools/tools/dialogBase.ui b/python/plugins/GdalTools/tools/dialogBase.ui
@@ -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>

diff --git a/python/plugins/GdalTools/tools/doContour.py b/python/plugins/GdalTools/tools/doContour.py
@@ -81,4 +81,5 @@ def getOutputFileName(self):
   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)
diff --git a/python/plugins/GdalTools/tools/doPolygonize.py b/python/plugins/GdalTools/tools/doPolygonize.py
@@ -82,4 +82,5 @@ def getOutputFileName(self):
   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)
diff --git a/python/plugins/GdalTools/tools/optionsTable.ui b/python/plugins/GdalTools/tools/optionsTable.ui
@@ -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>

diff --git a/python/plugins/GdalTools/tools/widgetContour.ui b/python/plugins/GdalTools/tools/widgetContour.ui
@@ -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>

diff --git a/python/plugins/GdalTools/tools/widgetConvert.ui b/python/plugins/GdalTools/tools/widgetConvert.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>362</width>
+    <width>356</width>
     <height>181</height>
    </rect>
   </property>

diff --git a/python/plugins/GdalTools/tools/widgetGrid.ui b/python/plugins/GdalTools/tools/widgetGrid.ui
@@ -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">

diff --git a/python/plugins/GdalTools/tools/widgetInfo.ui b/python/plugins/GdalTools/tools/widgetInfo.ui
@@ -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>

diff --git a/python/plugins/GdalTools/tools/widgetOverview.ui b/python/plugins/GdalTools/tools/widgetOverview.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>391</width>
+    <width>376</width>
     <height>205</height>
    </rect>
   </property>