Skip to content

Commit

Permalink
aligned to GdalTools v1.2.8
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14019 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
brushtyler committed Aug 6, 2010
1 parent 1a72da7 commit 504ae2f
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 20 deletions.
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 1 addition & 4 deletions python/plugins/GdalTools/tools/dialogBase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>285</width>
<height>170</height>
<height>179</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/GdalTools/tools/doContour.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 2 additions & 1 deletion python/plugins/GdalTools/tools/doPolygonize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 6 additions & 0 deletions python/plugins/GdalTools/tools/optionsTable.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 0 additions & 9 deletions python/plugins/GdalTools/tools/widgetContour.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/widgetConvert.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>362</width>
<width>356</width>
<height>181</height>
</rect>
</property>
Expand Down
15 changes: 14 additions & 1 deletion python/plugins/GdalTools/tools/widgetGrid.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>333</width>
<height>444</height>
<height>450</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/widgetInfo.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/tools/widgetOverview.ui
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>391</width>
<width>376</width>
<height>205</height>
</rect>
</property>
Expand Down

0 comments on commit 504ae2f

Please sign in to comment.