raster save as dialog minor improvements

qgis · Aug 16, 2012 · cc217e1 · cc217e1
1 parent 6b9eaf9
commit cc217e1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 22 deletions.
diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -387,6 +387,7 @@ void QgsRasterLayerSaveAsDialog::on_mChangeCrsPushButton_clicked()
   if ( selector->exec() )
   {
     mUserCrs.createFromId( selector->selectedCrsId(), QgsCoordinateReferenceSystem::InternalCrsId );
+    mCrsComboBox->setCurrentIndex( mCrsComboBox->findData( UserCrs ) );
   }
   delete selector;
   crsChanged();
@@ -454,8 +455,6 @@ void QgsRasterLayerSaveAsDialog::updateCrsGroup()
 
   mCrsComboBox->setItemText( mCrsComboBox->findData( UserCrs ),
                              tr( "Selected" ) + " (" + mUserCrs.description() + ", " + mUserCrs.authid() + ")" );
-
-  mChangeCrsPushButton->setEnabled( mCrsComboBox->findData( UserCrs ) == mCrsComboBox->currentIndex() );
 }
 
 QgsCoordinateReferenceSystem QgsRasterLayerSaveAsDialog::outputCrs()

diff --git a/src/ui/qgsrasterlayersaveasdialogbase.ui b/src/ui/qgsrasterlayersaveasdialogbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>518</width>
-    <height>588</height>
+    <height>580</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -31,7 +31,7 @@
         <x>0</x>
         <y>0</y>
         <width>510</width>
-        <height>551</height>
+        <height>543</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -147,7 +147,7 @@
             <item row="1" column="0">
              <widget class="QLabel" name="mXMinLabel">
               <property name="text">
-               <string>X min</string>
+               <string>West</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -160,7 +160,7 @@
             <item row="1" column="2">
              <widget class="QLabel" name="mXMaxLabel">
               <property name="text">
-               <string>X max</string>
+               <string>East</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -173,7 +173,7 @@
             <item row="0" column="1">
              <widget class="QLabel" name="mYMaxLabel">
               <property name="text">
-               <string>Y max</string>
+               <string>North</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -190,7 +190,7 @@
             <item row="2" column="1">
              <widget class="QLabel" name="mYMinLabel">
               <property name="text">
-               <string>Y min</string>
+               <string>South</string>
               </property>
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -319,37 +319,49 @@
            <number>0</number>
           </property>
           <item row="0" column="0">
-           <widget class="QgsRasterFormatSaveOptionsWidget" name="mOptionsWidget" native="true">
-            <zorder></zorder>
-           </widget>
+           <widget class="QgsRasterFormatSaveOptionsWidget" name="mOptionsWidget" native="true"/>
           </item>
           <item row="1" column="0">
            <widget class="QGroupBox" name="mTilesGroupBox">
             <property name="title">
              <string>Tiles</string>
             </property>
-            <layout class="QGridLayout" name="gridLayout">
-             <item row="0" column="1">
-              <widget class="QLineEdit" name="mMaximumSizeXLineEdit"/>
-             </item>
-             <item row="0" column="0">
+            <layout class="QHBoxLayout" name="horizontalLayout_5">
+             <item>
               <widget class="QLabel" name="mMaximumSizeXLabel">
+               <property name="toolTip">
+                <string>Maximum number of columns in one tile.</string>
+               </property>
                <property name="text">
-                <string>Maximum Size X:</string>
+                <string>Max columns</string>
                </property>
               </widget>
              </item>
-             <item row="1" column="1">
-              <widget class="QLineEdit" name="mMaximumSizeYLineEdit"/>
+             <item>
+              <widget class="QLineEdit" name="mMaximumSizeXLineEdit">
+               <property name="toolTip">
+                <string>Maximum number of columns in one tile.</string>
+               </property>
+              </widget>
              </item>
-             <item row="1" column="0">
+             <item>
               <widget class="QLabel" name="mMaximumSizeYLabel">
+               <property name="toolTip">
+                <string>Maximum number of rows in one tile.</string>
+               </property>
                <property name="text">
-                <string>Maximum size Y:</string>
+                <string>Max rows</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="mMaximumSizeYLineEdit">
+               <property name="toolTip">
+                <string>Maximum number of rows in one tile.</string>
                </property>
               </widget>
              </item>
-             <item row="2" column="0" colspan="2">
+             <item>
               <widget class="QCheckBox" name="mTileModeCheckBox">
                <property name="text">
                 <string>Create VRT</string>