[QGIS Commit] r14663 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-11-14 14:21:47 -0800 (Sun, 14 Nov 2010)
New Revision: 14663

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
   trunk/qgis/src/plugins/grass/qgsgrassselect.h
   trunk/qgis/src/plugins/grass/qgsgrassselectbase.ui
Log:
shrinked some GUIs,
used GUI guideline for Browse buttons text


Modified: trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselect.cpp	2010-11-14 22:15:39 UTC (rev 14662)
+++ trunk/qgis/src/plugins/grass/qgsgrassselect.cpp	2010-11-14 22:21:47 UTC (rev 14663)
@@ -92,30 +92,13 @@
   egisdbase->setText( lastGisdbase );
 
   setLocations();
-
-  restorePosition();
+  adjustSize();
 }
 
 QgsGrassSelect::~QgsGrassSelect()
 {
-  saveWindowLocation();
 }
 
-void QgsGrassSelect::restorePosition()
-{
-  //optionsFrame->adjustSize();
-  adjustSize();
-
-  QSettings settings;
-  restoreGeometry( settings.value( "/GRASS/windows/select/geometry" ).toByteArray() );
-}
-
-void QgsGrassSelect::saveWindowLocation()
-{
-  QSettings settings;
-  settings.setValue( "/GRASS/windows/select/geometry", saveGeometry() );
-}
-
 bool QgsGrassSelect::first = true;
 QString QgsGrassSelect::lastGisdbase;
 QString QgsGrassSelect::lastLocation;
@@ -493,8 +476,6 @@
 
 void QgsGrassSelect::on_ok_clicked()
 {
-  saveWindowLocation();
-
   gisdbase = egisdbase->text();
   lastGisdbase = QString( gisdbase );
 
@@ -558,6 +539,5 @@
 
 void QgsGrassSelect::on_cancel_clicked()
 {
-  saveWindowLocation();
   QDialog::reject();
 }

Modified: trunk/qgis/src/plugins/grass/qgsgrassselect.h
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselect.h	2010-11-14 22:15:39 UTC (rev 14662)
+++ trunk/qgis/src/plugins/grass/qgsgrassselect.h	2010-11-14 22:21:47 UTC (rev 14663)
@@ -88,9 +88,6 @@
     static QString lastRasterMap;
     static QString lastLayer; // vector layer
     static QString lastMapcalc;
-
-    void restorePosition( void );
-    void saveWindowLocation( void );
 };
 
 

Modified: trunk/qgis/src/plugins/grass/qgsgrassselectbase.ui
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselectbase.ui	2010-11-14 22:15:39 UTC (rev 14662)
+++ trunk/qgis/src/plugins/grass/qgsgrassselectbase.ui	2010-11-14 22:21:47 UTC (rev 14663)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>393</width>
+    <width>478</width>
     <height>221</height>
    </rect>
   </property>
@@ -94,7 +94,7 @@
    <item row="0" column="2">
     <widget class="QPushButton" name="GisdbaseBrowse">
      <property name="text">
-      <string>Browse</string>
+      <string>Browse...</string>
      </property>
     </widget>
    </item>