[fTools] homogenize UI (contributed by Salvatore Larosa)

python/plugins/fTools/tools/doGeometry.py

@@ -281,14 +281,13 @@ class GeometryDialog( QDialog, Ui_Dialog ):
       QObject.disconnect( self.cancel_close, SIGNAL( "clicked()" ), self.cancelThread )
       if success:
         if ( self.myFunction == 5 and self.chkWriteShapefile.isChecked() ) or self.myFunction != 5:
-          addToTOC = QMessageBox.question( self, self.tr("Geometry"),
+          if self.addToCanvasCheck.isChecked():
-                       self.tr( "Created output shapefile:\n{0}\n{1}\n\nWould you like to add the new layer to the TOC?" ).format( self.shapefileName, extra ),
+            addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(self.shapefileName))
-                       QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton )
+            if not addCanvasCheck:
-          if addToTOC == QMessageBox.Yes:
+              QMessageBox.warning( self, self.tr("Geometry"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( self.shapefileName ) ))
-            if not ftools_utils.addShapeToCanvas( unicode( self.shapefileName ) ):
-              QMessageBox.warning( self, self.tr( "Geometry"),
-                                   self.tr( "Error loading output shapefile:\n{0}" ).format( self.shapefileName ) )
             self.populateLayers()
+          else:
+            QMessageBox.information(self, self.tr("Geometry"),self.tr("Created output shapefile:\n%s\n%s" ) % ( unicode( self.shapefileName ), extra ))
         else:
           QMessageBox.information( self, self.tr( "Geometry" ),
                                    self.tr( "Layer '{0}' updated" ).format( self.inShape.currentText() ) )

python/plugins/fTools/tools/doGeoprocessing.py

@@ -247,8 +247,8 @@ class GeoprocessingDialog( QDialog, Ui_Dialog ):
       out_text = self.tr( "\nWarnings:" )
       end_text = self.tr( "\nSome output geometries may be missing or invalid.\n\nWould you like to add the new layer anyway?" )
     else:
-      out_text = "\n"
+      out_text = ""
-      end_text = self.tr( "\n\nWould you like to add the new layer to the TOC?" )
+      end_text = ""
     if not results[2] is None:
       if not results[2]:
         out_text = out_text + self.tr( "\nInput CRS error: Different input coordinate reference systems detected, results may not be as expected.")
@@ -258,11 +258,13 @@ class GeoprocessingDialog( QDialog, Ui_Dialog ):
       out_text = out_text + self.tr( "\nFeature geometry error: One or more output features ignored due to invalid geometry.")
     if not results[0]:
       out_text = out_text + self.tr( "\nGEOS geoprocessing error: One or more input features have invalid geometry.")
-    addToTOC = QMessageBox.question( self, self.tr("Geoprocessing"), self.tr( "Created output shapefile:\n%s\n%s%s" ) % ( unicode( self.shapefileName ), out_text, end_text ), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton )
+    if self.addToCanvasCheck.isChecked():
-    if addToTOC == QMessageBox.Yes:
+      addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(self.shapefileName))
-      if not ftools_utils.addShapeToCanvas( unicode( self.shapefileName ) ):
+      if not addCanvasCheck:
         QMessageBox.warning( self, self.tr("Geoprocessing"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( self.shapefileName ) ))
       self.populateLayers()
+    else:
+      QMessageBox.information(self, self.tr("Geoprocessing"),self.tr("Created output shapefile:\n%s\n%s%s" ) % ( unicode( self.shapefileName ), out_text, end_text ))
 
   def runStatusFromThread( self, status ):
     self.progressBar.setValue( status )

python/plugins/fTools/tools/doIntersectLines.py

@@ -95,11 +95,13 @@ class Dialog(QDialog, Ui_Dialog):
             self.outShape.clear()
             self.compute(line1, line2, field1, field2, outPath, self.progressBar)
             self.progressBar.setValue(100)
-            addToTOC = QMessageBox.question(self, self.tr("Generate Centroids"), self.tr("Created output point shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % ( outPath ), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+            if self.addToCanvasCheck.isChecked():
-            if addToTOC == QMessageBox.Yes:
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(outPath))
-                if not ftools_utils.addShapeToCanvas( unicode( outPath ) ):
+                if not addCanvasCheck:
                     QMessageBox.warning( self, self.tr("Geoprocessing"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
                 self.populateLayers()
+            else:
+                QMessageBox.information(self, self.tr("Generate Centroids"),self.tr("Created output shapefile:\n%s" ) % ( unicode( outPath )))
         self.progressBar.setValue(0)
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doMeanCoords.py

@@ -90,11 +90,13 @@ class Dialog(QDialog, Ui_Dialog):
             self.compute(inName, outPath, self.weightField.currentText(), self.sizeValue.value(), self.uniqueField.currentText())
             self.progressBar.setValue(100)
             self.outShape.clear()
-            addToTOC = QMessageBox.question(self, self.tr("Coordinate statistics"), self.tr("Created output point shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % ( outPath ), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+            if self.addToCanvasCheck.isChecked():
-            if addToTOC == QMessageBox.Yes:
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(outPath))
-                vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
+                if not addCanvasCheck:
-                QgsMapLayerRegistry.instance().addMapLayers([vlayer])
+                    QMessageBox.warning( self, self.tr("Coordinate statistics"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
                 self.populateLayers()
+            else:
+                QMessageBox.information(self, self.tr("Coordinate statistics"),self.tr("Created output shapefile:\n%s" ) % ( unicode( outPath )))
         self.progressBar.setValue(0)
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doPointsInPolygon.py

@@ -112,16 +112,13 @@ class Dialog(QDialog, Ui_Dialog):
 
     def processFinished(self):
         self.stopProcessing()
-
+        if self.addToCanvasCheck.isChecked():
-        addToTOC = QMessageBox.question(self, self.tr("Count Points in Polygon"),
+            addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(self.outShape.text()))
-                                        self.tr("Created output shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % (self.outShape.text()),
+            if not addCanvasCheck:
-                                        QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+                QMessageBox.warning( self, self.tr("Count Points in Polygon"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
-        if addToTOC == QMessageBox.Yes:
-            fileInfo = QFileInfo( self.outShape.text() )
-            layerName = fileInfo.completeBaseName()
-            layer = QgsVectorLayer(self.outShape.text(), layerName, "ogr")
-            QgsMapLayerRegistry.instance().addMapLayers([layer])
             self.populateLayers()
+        else:
+            QMessageBox.information(self, self.tr("Count Points in Polygon"),self.tr("Created output shapefile:\n%s" ) % ( unicode( self.outShape.text() )))
 
         self.restoreGui()
 

python/plugins/fTools/tools/doRandPoints.py

@@ -119,12 +119,13 @@ class Dialog(QDialog, Ui_Dialog):
             if self.randomize(inLayer, outPath, minimum, design, value):
               self.progressBar.setValue(100)
               self.outShape.clear()
-              addToTOC = QMessageBox.question(self, self.tr("Random Points"),
+              if self.addToCanvasCheck.isChecked():
-              self.tr("Created output point shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % (outPath), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(outPath))
-              if addToTOC == QMessageBox.Yes:
+                if not addCanvasCheck:
-                  self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
+                    QMessageBox.warning( self, self.tr("Random Points"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
-                  QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
                 self.populateLayers()
+              else:
+                QMessageBox.information(self, self.tr("Random Points"),self.tr("Created output shapefile:\n%s" ) % ( unicode( outPath )))
         self.progressBar.setValue(0)
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doRegPoints.py

@@ -84,11 +84,13 @@ class Dialog(QDialog, Ui_Dialog):
                 print crs.isValid()
                 if not crs.isValid(): crs = None
             self.regularize(boundBox, outPath, offset, value, self.rdoSpacing.isChecked(), self.spnInset.value(), crs)
-            addToTOC = QMessageBox.question(self, self.tr("Generate Regular Points"), self.tr("Created output point shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % ( outPath ), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+            if self.addToCanvasCheck.isChecked():
-            if addToTOC == QMessageBox.Yes:
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(outPath))
-                self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
+                if not addCanvasCheck:
-                QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
+                    QMessageBox.warning( self, self.tr("Generate Regular Points"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
                 self.populateLayers()
+            else:
+                QMessageBox.information(self, self.tr("Generate Regular Points"),self.tr("Created output shapefile:\n%s" ) % ( unicode( outPath )))
         self.progressBar.setValue(0)
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doSumLines.py

@@ -73,11 +73,13 @@ class Dialog(QDialog, Ui_Dialog):
             outName = ftools_utils.getShapefileName( outPath )
             self.compute(inPoly, inLns, inField, outPath, self.progressBar)
             self.outShape.clear()
-            addToTOC = QMessageBox.question(self, self.tr("Sum line lengths"), self.tr("Created output shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % (unicode(outPath)), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+            if self.addToCanvasCheck.isChecked():
-            if addToTOC == QMessageBox.Yes:
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(outPath))
-                self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
+                if not addCanvasCheck:
-                QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
+                    QMessageBox.warning( self, self.tr("Sum line lengths"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( outPath ) ))
                 self.populateLayers()
+            else:
+                QMessageBox.information(self, self.tr("Sum line lengths"),self.tr("Created output shapefile:\n%s" ) % ( unicode( outPath )))
         self.progressBar.setValue(0)
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doValidate.py

@@ -135,6 +135,7 @@ class ValidateDialog( QDialog, Ui_Dialog ):
     if self.ckBoxShpError.isChecked():
       self.lineEditShpError.setEnabled( True )
       self.browseShpError.setEnabled( True )
+      self.addToCanvasCheck.setEnabled(True)
       self.tblUnique.setEnabled( False )
       self.lstCount.setEnabled( False )
       self.label_2.setEnabled( False )
@@ -143,6 +144,7 @@ class ValidateDialog( QDialog, Ui_Dialog ):
     else:
       self.lineEditShpError.setEnabled( False )
       self.browseShpError.setEnabled( False )
+      self.addToCanvasCheck.setEnabled(False)
       self.tblUnique.setEnabled( True )
       self.lstCount.setEnabled( True )
       self.label_2.setEnabled( True )
@@ -227,13 +229,12 @@ class ValidateDialog( QDialog, Ui_Dialog ):
     self.buttonOk.setEnabled( True )
     if success == "writeShape":
       extra = ""
-      addToTOC = QMessageBox.question( self, self.tr("Geometry"),
+      if self.addToCanvasCheck.isChecked():
-                 self.tr( "Created output shapefile:\n%s\n%s\n\nWould you like to add the new layer to the TOC?" ) % ( unicode( self.shapefileName ), extra ),
+        addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(self.shapefileName))
-                 QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton )
+        if not addCanvasCheck:
-      if addToTOC == QMessageBox.Yes:
+          QMessageBox.warning( self, self.tr("Geometry"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( self.shapefileName ) ))
-        if not ftools_utils.addShapeToCanvas( unicode( self.shapefileName ) ):
+      else:
-          QMessageBox.warning( self, self.tr( "Geometry"),
+        QMessageBox.information(self, self.tr("Geometry"),self.tr("Created output shapefile:\n%s\n%s" ) % ( unicode( self.shapefileName ), extra))
-                               self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( self.shapefileName ) ) )
     else:
       self.tblUnique.setColumnCount( 2 )
       count = 0

python/plugins/fTools/tools/doVectorGrid.py

@@ -146,10 +146,13 @@ class Dialog(QDialog, Ui_Dialog):
             QApplication.setOverrideCursor(Qt.WaitCursor)
             self.compute( boundBox, xSpace, ySpace, polygon )
             QApplication.restoreOverrideCursor()
-            addToTOC = QMessageBox.question(self, self.tr("Generate Vector Grid"), self.tr("Created output shapefile:\n%s\n\nWould you like to add the new layer to the TOC?") % (unicode(self.shapefileName)), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
+            if self.addToCanvasCheck.isChecked():
-            if addToTOC == QMessageBox.Yes:
+                addCanvasCheck = ftools_utils.addShapeToCanvas(unicode(self.shapefileName))
-                ftools_utils.addShapeToCanvas( self.shapefileName )
+                if not addCanvasCheck:
+                    QMessageBox.warning( self, self.tr("Generate Vector Grid"), self.tr( "Error loading output shapefile:\n%s" ) % ( unicode( self.shapefileName ) ))
                 self.populateLayers()
+            else:
+                QMessageBox.information(self, self.tr("Generate Vector Grid"),self.tr("Created output shapefile:\n%s" ) % ( unicode( self.shapefileName )))
         self.progressBar.setValue( 0 )
         self.buttonOk.setEnabled( True )
 

python/plugins/fTools/tools/doVisual.py

@@ -48,6 +48,7 @@ class VisualDialog( QDialog, Ui_Dialog ):
     self.lineEditShpError.hide()
     self.label_6.hide()
     self.line.hide()
+    self.addToCanvasCheck.hide()
     self.buttonBox_2.setOrientation(Qt.Horizontal)
 
     if self.myFunction == 2 or self.myFunction == 3:

python/plugins/fTools/tools/frmEliminate.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>436</width>
-    <height>218</height>
+    <height>242</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -38,7 +38,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut">
+      <widget class="QPushButton" name="toolOut">
        <property name="text">
         <string>Browse</string>
        </property>

python/plugins/fTools/tools/frmGeometry.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>390</width>
-    <height>331</height>
+    <height>420</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_3">
@@ -34,105 +34,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0">
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QLabel" name="lblField">
-      <property name="text">
-       <string>Unique ID field</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="cmbField"/>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="0" colspan="2">
-    <layout class="QVBoxLayout">
-     <item>
-      <widget class="QCheckBox" name="chkWriteShapefile">
-       <property name="text">
-        <string>Save to new shapefile</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lblOutputShapefile">
-       <property name="text">
-        <string>Output point shapefile</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout">
-       <item>
-        <widget class="QLineEdit" name="outShape">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="toolOut">
-         <property name="text">
-          <string>Browse</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-   <item row="8" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="9" column="0">
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>0</number>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textVisible">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1">
-    <widget class="QDialogButtonBox" name="buttonBox_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="label">
@@ -175,7 +77,20 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="2" column="0">
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QLabel" name="lblField">
+      <property name="text">
+       <string>Unique ID field</string>
+      </property>
+     </widget>
+     <widget class="QComboBox" name="cmbField"/>
+    </widget>
+   </item>
+   <item row="3" column="0">
     <layout class="QHBoxLayout" name="_2">
      <item>
       <widget class="QLabel" name="lblCalcType">
@@ -189,20 +104,116 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="0" colspan="2">
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="chkUseSelection">
+     <property name="text">
+      <string>Use only selected features</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
     <widget class="QCheckBox" name="chkByFeatures">
      <property name="text">
       <string>Calculate extent for each feature separately</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="6" column="0">
-    <widget class="QCheckBox" name="chkUseSelection">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="0">
+    <layout class="QVBoxLayout">
+     <item>
+      <widget class="QCheckBox" name="chkWriteShapefile">
        <property name="text">
-      <string>Use only selected features</string>
+        <string>Save to new shapefile</string>
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QLabel" name="lblOutputShapefile">
+       <property name="text">
+        <string>Output point shapefile</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout">
+       <item>
+        <widget class="QLineEdit" name="outShape">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="toolOut">
+         <property name="text">
+          <string>Browse</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="8" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="9" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="value">
+        <number>0</number>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="textVisible">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>

python/plugins/fTools/tools/frmGeoprocessing.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>422</width>
-    <height>448</height>
+    <height>497</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,7 +20,7 @@
    <string>Geoprocessing</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_1">
@@ -41,7 +41,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QCheckBox" name="useSelectedA">
@@ -52,7 +52,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="2" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -73,7 +73,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="3" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QCheckBox" name="useSelectedB">
@@ -84,7 +84,28 @@
      </item>
     </layout>
    </item>
-   <item row="7" column="0" colspan="2">
+   <item row="4" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="lblSegments">
+       <property name="text">
+        <string>Segments to approximate</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="spnSegments">
+       <property name="minimum">
+        <number>5</number>
+       </property>
+       <property name="value">
+        <number>5</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="5" column="0">
     <layout class="QHBoxLayout">
      <item>
       <layout class="QHBoxLayout">
@@ -124,7 +145,7 @@
      </item>
     </layout>
    </item>
-   <item row="9" column="0" colspan="2">
+   <item row="6" column="0">
     <layout class="QVBoxLayout">
      <item>
       <layout class="QHBoxLayout">
@@ -172,7 +193,7 @@
      </item>
     </layout>
    </item>
-   <item row="10" column="0">
+   <item row="7" column="0">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -192,7 +213,7 @@
      </item>
     </layout>
    </item>
-   <item row="11" column="0">
+   <item row="8" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -205,7 +226,7 @@
      </property>
     </spacer>
    </item>
-   <item row="12" column="0" colspan="2">
+   <item row="9" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_5">
@@ -234,7 +255,16 @@
      </item>
     </layout>
    </item>
-   <item row="13" column="0">
+   <item row="10" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -247,32 +277,13 @@
        </property>
       </widget>
      </item>
-   <item row="13" column="1">
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="standardButtons">
         <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
-   <item row="6" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="lblSegments">
-       <property name="text">
-        <string>Segments to approximate</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="spnSegments">
-       <property name="minimum">
-        <number>5</number>
-       </property>
-       <property name="value">
-        <number>5</number>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>

python/plugins/fTools/tools/frmIntersectLines.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -9,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>382</width>
-    <height>369</height>
+    <height>411</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_4">
@@ -33,7 +34,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2" >
+   <item row="1" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_6">
@@ -47,7 +48,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2" >
+   <item row="2" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_3">
@@ -61,7 +62,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="3" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_5">
@@ -75,7 +76,7 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="4" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -88,7 +89,7 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="2" >
+   <item row="5" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -107,7 +108,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="toolOut" >
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -118,6 +119,15 @@
     </layout>
    </item>
    <item row="6" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -130,7 +140,7 @@
        </property>
       </widget>
      </item>
-   <item row="6" column="1" >
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -141,6 +151,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmMeanCoords.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -9,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>374</width>
-    <height>346</height>
+    <height>390</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_3">
@@ -33,7 +34,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2" >
+   <item row="1" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_weight">
@@ -47,7 +48,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2" >
+   <item row="2" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_unique">
@@ -61,7 +62,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="3" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="label_size">
@@ -85,7 +86,20 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="4" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="0">
     <layout class="QVBoxLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -104,7 +118,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="toolOut" >
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -114,7 +128,16 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="0" >
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -127,7 +150,7 @@
        </property>
       </widget>
      </item>
-   <item row="5" column="1" >
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -138,6 +161,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmPointDistance.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -9,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>382</width>
-    <height>529</height>
+    <height>497</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -160,7 +161,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="btnFile" >
+        <widget class="QPushButton" name="btnFile">
          <property name="text">
           <string>Browse</string>
          </property>

python/plugins/fTools/tools/frmPointsInPolygon.ui

@@ -7,14 +7,14 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>351</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Count Points In Polygons</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QLabel" name="label_3">
@@ -28,7 +28,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
       <widget class="QLabel" name="label_4">
@@ -42,7 +42,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="2" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="label_5">
@@ -76,7 +76,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="4" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -95,7 +95,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="toolOut">
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -106,6 +106,15 @@
     </layout>
    </item>
    <item row="5" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -118,7 +127,7 @@
        </property>
       </widget>
      </item>
-   <item row="5" column="1">
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -129,6 +138,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmRandPoints.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>384</width>
-    <height>435</height>
+    <height>470</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -33,10 +33,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <widget class="QComboBox" name="inShape"/>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Sample Size</string>
@@ -176,6 +176,19 @@
     </widget>
    </item>
    <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0">
     <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -188,7 +201,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="5" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLineEdit" name="outShape">
@@ -198,7 +211,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut">
+      <widget class="QPushButton" name="toolOut">
        <property name="text">
         <string>Browse</string>
        </property>
@@ -206,7 +219,16 @@
      </item>
     </layout>
    </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>24</number>
@@ -219,7 +241,7 @@
        </property>
       </widget>
      </item>
-   <item row="5" column="1">
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -230,6 +252,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmRandom.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>374</width>
-    <height>287</height>
+    <height>233</height>
    </rect>
   </property>
   <property name="windowTitle">

python/plugins/fTools/tools/frmReProject.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -9,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>377</width>
-    <height>473</height>
+    <height>476</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,31 +20,39 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2" >
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Input vector layer</string>
        </property>
       </widget>
      </item>
-   <item row="1" column="0" colspan="2" >
+     <item>
       <widget class="QComboBox" name="inShape"/>
      </item>
-   <item row="2" column="0" colspan="2" >
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Input spatial reference system</string>
        </property>
       </widget>
      </item>
-   <item row="3" column="0" colspan="2" >
+     <item>
       <widget class="QLineEdit" name="inRef">
        <property name="readOnly">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-   <item row="4" column="0" colspan="2" >
+    </layout>
+   </item>
+   <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Output spatial reference system</string>
@@ -69,7 +78,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QToolButton" name="btnProjection" >
+         <widget class="QPushButton" name="btnProjection">
           <property name="text">
            <string>Choose</string>
           </property>
@@ -114,14 +123,16 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2" >
+   <item row="4" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Output Shapefile</string>
        </property>
       </widget>
      </item>
-   <item row="6" column="0" colspan="2" >
+     <item>
       <layout class="QHBoxLayout">
        <item>
         <widget class="QLineEdit" name="outShape">
@@ -131,7 +142,7 @@
         </widget>
        </item>
        <item>
-      <widget class="QToolButton" name="toolOut" >
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -139,7 +150,11 @@
        </item>
       </layout>
      </item>
-   <item row="7" column="0" >
+    </layout>
+   </item>
+   <item row="6" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -152,7 +167,7 @@
        </property>
       </widget>
      </item>
-   <item row="7" column="1" >
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -163,6 +178,21 @@
       </widget>
      </item>
     </layout>
+   </item>
+   <item row="3" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>
@@ -214,22 +244,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>rdoProjection</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>btnProjection</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>228</x>
-     <y>170</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>355</x>
-     <y>204</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>radioButton_2</sender>
    <signal>toggled(bool)</signal>

python/plugins/fTools/tools/frmRegPoints.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>373</width>
-    <height>451</height>
+    <height>485</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Area</string>
@@ -105,7 +105,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <widget class="QGroupBox" name="gridBox">
      <property name="title">
       <string>Grid Spacing</string>
@@ -208,7 +208,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="3" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLineEdit" name="outShape">
@@ -218,7 +218,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut">
+      <widget class="QPushButton" name="toolOut">
        <property name="text">
         <string>Browse</string>
        </property>
@@ -227,6 +227,15 @@
     </layout>
    </item>
    <item row="4" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -239,7 +248,7 @@
        </property>
       </widget>
      </item>
-   <item row="4" column="1">
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -250,6 +259,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmSpatialJoin.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>439</width>
-    <height>466</height>
+    <height>525</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -172,7 +172,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="toolOut">
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -208,6 +208,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>

python/plugins/fTools/tools/frmSumLines.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
  <widget class="QDialog" name="Dialog">
@@ -9,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>382</width>
-    <height>303</height>
+    <height>335</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +20,35 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0" colspan="2" >
+   <item row="0" column="0">
+    <layout class="QVBoxLayout">
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Input polygon vector layer</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="inPolygon"/>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <layout class="QVBoxLayout">
+     <item>
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Input line vector layer</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="inPoint"/>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLabel" name="label_5">
@@ -40,7 +69,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="3" column="0">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -53,7 +82,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2" >
+   <item row="4" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QLabel" name="label_2">
@@ -72,7 +101,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QToolButton" name="toolOut" >
+        <widget class="QPushButton" name="toolOut">
          <property name="text">
           <string>Browse</string>
          </property>
@@ -82,31 +111,16 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0" colspan="2" >
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Input polygon vector layer</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="inPolygon" />
-     </item>
-    </layout>
-   </item>
-   <item row="5" column="1" >
-    <widget class="QDialogButtonBox" name="buttonBox_2" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="5" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>24</number>
@@ -119,18 +133,16 @@
        </property>
       </widget>
      </item>
-   <item row="1" column="0" colspan="2" >
-    <layout class="QVBoxLayout" >
      <item>
-      <widget class="QLabel" name="label_4" >
+      <widget class="QDialogButtonBox" name="buttonBox_2">
-       <property name="text" >
+       <property name="orientation">
-        <string>Input line vector layer</string>
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QComboBox" name="inPoint" />
-     </item>
     </layout>
    </item>
   </layout>
@@ -138,6 +150,7 @@
   <zorder>progressBar</zorder>
   <zorder></zorder>
   <zorder></zorder>
+  <zorder>addToCanvasCheck</zorder>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmVectorGrid.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>489</width>
-    <height>475</height>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0" colspan="2">
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Grid extent</string>
@@ -173,7 +173,7 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0">
     <widget class="QGroupBox" name="gridBox">
      <property name="title">
       <string>Parameters</string>
@@ -304,6 +304,19 @@
     </widget>
    </item>
    <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
     <widget class="QLabel" name="label_2">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -316,7 +329,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="4" column="0">
     <layout class="QHBoxLayout">
      <item>
       <widget class="QLineEdit" name="outShape">
@@ -326,7 +339,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut">
+      <widget class="QPushButton" name="toolOut">
        <property name="text">
         <string>Browse</string>
        </property>
@@ -334,7 +347,16 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
       <widget class="QProgressBar" name="progressBar">
        <property name="value">
         <number>0</number>
@@ -347,7 +369,7 @@
        </property>
       </widget>
      </item>
-   <item row="4" column="1">
+     <item>
       <widget class="QDialogButtonBox" name="buttonBox_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -358,6 +380,8 @@
       </widget>
      </item>
     </layout>
+   </item>
+  </layout>
  </widget>
  <resources/>
  <connections>

python/plugins/fTools/tools/frmVectorSplit.ui

@@ -30,7 +30,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolOut">
+      <widget class="QPushButton" name="toolOut">
        <property name="text">
         <string>Browse</string>
        </property>
@@ -88,7 +88,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="6" column="0" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>

python/plugins/fTools/tools/frmVisual.ui

@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>370</width>
-    <height>484</height>
+    <height>531</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,6 +34,17 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QCheckBox" name="useSelected">
+       <property name="text">
+        <string>Use only selected features</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="2" column="0">
     <layout class="QVBoxLayout">
      <item>
@@ -114,6 +125,20 @@
      </item>
     </layout>
    </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Press Ctrl+C to copy results to the clipboard</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item row="7" column="0">
     <widget class="QCheckBox" name="ckBoxShpError">
      <property name="text">
@@ -121,10 +146,10 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="8" column="0">
-    <widget class="QLabel" name="label_5">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Press Ctrl+C to copy results to the clipboard</string>
+      <string>Output point shapefile</string>
      </property>
     </widget>
    </item>
@@ -146,25 +171,14 @@
      </item>
     </layout>
    </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Output point shapefile</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="QCheckBox" name="useSelected">
-       <property name="text">
-        <string>Use only selected features</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="10" column="0">
+    <widget class="QCheckBox" name="addToCanvasCheck">
+     <property name="text">
+      <string>Add result to canvas</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -199,13 +213,6 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>