Skip to content

Commit 504ae2f

Browse files
author
brushtyler
committed
aligned to GdalTools v1.2.8
git-svn-id: http://svn.osgeo.org/qgis/trunk@14019 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1a72da7 commit 504ae2f

File tree

10 files changed

+29
-20
lines changed

10 files changed

+29
-20
lines changed

python/plugins/GdalTools/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def name():
2222
def description():
2323
return "Integrate gdal tools into qgis"
2424
def version():
25-
return "Version 1.2.0"
25+
return "Version 1.2.8"
2626
def qgisMinimumVersion():
2727
return "1.0"
2828
def classFactory(iface):

python/plugins/GdalTools/tools/dialogBase.ui

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>285</width>
10-
<height>170</height>
10+
<height>179</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -16,9 +16,6 @@
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
1818
<layout class="QVBoxLayout" name="pluginLayout">
19-
<property name="sizeConstraint">
20-
<enum>QLayout::SetNoConstraint</enum>
21-
</property>
2219
<property name="margin">
2320
<number>0</number>
2421
</property>

python/plugins/GdalTools/tools/doContour.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,5 @@ def getOutputFileName(self):
8181
def addLayerIntoCanvas(self, fileInfo):
8282
vl = self.iface.addVectorLayer(fileInfo.filePath(), "contour", "ogr")
8383
if vl.isValid():
84-
vl.setProviderEncoding(self.lastEncoding)
84+
if hasattr(self, 'lastEncoding'):
85+
vl.setProviderEncoding(self.lastEncoding)

python/plugins/GdalTools/tools/doPolygonize.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,5 @@ def getOutputFileName(self):
8282
def addLayerIntoCanvas(self, fileInfo):
8383
vl = self.iface.addVectorLayer(fileInfo.filePath(), fileInfo.baseName(), "ogr")
8484
if vl.isValid():
85-
vl.setProviderEncoding(self.lastEncoding)
85+
if hasattr(self, 'lastEncoding'):
86+
vl.setProviderEncoding(self.lastEncoding)

python/plugins/GdalTools/tools/optionsTable.ui

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@
4040
<attribute name="horizontalHeaderStretchLastSection">
4141
<bool>true</bool>
4242
</attribute>
43+
<attribute name="horizontalHeaderStretchLastSection">
44+
<bool>true</bool>
45+
</attribute>
46+
<attribute name="horizontalHeaderMinimumSectionSize">
47+
<number>30</number>
48+
</attribute>
4349
<column>
4450
<property name="text">
4551
<string>Name</string>

python/plugins/GdalTools/tools/widgetContour.ui

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@
115115
</item>
116116
<item row="3" column="0">
117117
<layout class="QVBoxLayout" name="verticalLayout">
118-
<property name="sizeConstraint">
119-
<enum>QLayout::SetFixedSize</enum>
120-
</property>
121118
<item>
122119
<widget class="QCheckBox" name="attributeCheck">
123120
<property name="text">
@@ -127,12 +124,6 @@
127124
</item>
128125
<item>
129126
<widget class="QLabel" name="label_5">
130-
<property name="sizePolicy">
131-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
132-
<horstretch>0</horstretch>
133-
<verstretch>0</verstretch>
134-
</sizepolicy>
135-
</property>
136127
<property name="font">
137128
<font>
138129
<pointsize>8</pointsize>

python/plugins/GdalTools/tools/widgetConvert.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>362</width>
9+
<width>356</width>
1010
<height>181</height>
1111
</rect>
1212
</property>

python/plugins/GdalTools/tools/widgetGrid.ui

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>333</width>
10-
<height>444</height>
10+
<height>450</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -278,6 +278,19 @@
278278
</property>
279279
</widget>
280280
</item>
281+
<item row="8" column="0">
282+
<spacer name="verticalSpacer_4">
283+
<property name="orientation">
284+
<enum>Qt::Vertical</enum>
285+
</property>
286+
<property name="sizeHint" stdset="0">
287+
<size>
288+
<width>20</width>
289+
<height>0</height>
290+
</size>
291+
</property>
292+
</spacer>
293+
</item>
281294
</layout>
282295
</widget>
283296
<widget class="QWidget" name="page_2">

python/plugins/GdalTools/tools/widgetInfo.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
14+
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>

python/plugins/GdalTools/tools/widgetOverview.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>391</width>
9+
<width>376</width>
1010
<height>205</height>
1111
</rect>
1212
</property>

0 commit comments

Comments
 (0)