use QgsRasterFormatSaveOptionsWidget in gdaltools merge widget

Author: etiennesky

python/plugins/GdalTools/tools/doMerge.py

@@ -33,8 +33,7 @@ def __init__(self, iface):
           (self.recurseCheck, SIGNAL("stateChanged(int)"), self.inputDirCheck),
           ( self.separateCheck, SIGNAL( "stateChanged( int )" ) ),
           ( self.pctCheck, SIGNAL( "stateChanged( int )" ) ),
-          ( self.intersectCheck, SIGNAL( "stateChanged( int )" ) ),
-          (self.creationOptionsTable, [SIGNAL("cellValueChanged(int, int)"), SIGNAL("rowRemoved()")], self.creationGroupBox)
+          ( self.intersectCheck, SIGNAL( "stateChanged( int )" ) )
         ]
       )
 

python/plugins/GdalTools/tools/widgetMerge.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>345</width>
-    <height>276</height>
+    <width>371</width>
+    <height>284</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -117,11 +117,11 @@
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="bottomMargin">
+      <property name="margin">
        <number>0</number>
       </property>
       <item>
-       <widget class="GdalToolsOptionsTable" name="creationOptionsTable" native="true"/>
+       <widget class="QgsRasterFormatSaveOptionsWidget" name="creationOptionsTable" native="true"/>
       </item>
      </layout>
     </widget>
@@ -136,9 +136,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>GdalToolsOptionsTable</class>
+   <class>QgsRasterFormatSaveOptionsWidget</class>
    <extends>QWidget</extends>
-   <header>optionsTable</header>
+   <header>qgis.gui</header>
    <container>1</container>
   </customwidget>
  </customwidgets>