[QGIS Commit] r15140 - in trunk/qgis/src: app ui

[svn_qgis at osgeo.org]

Author: alexbruy
Date: 2011-02-08 04:00:20 -0800 (Tue, 08 Feb 2011)
New Revision: 15140

Modified:
   trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp
   trunk/qgis/src/app/qgsmanageconnectionsdialog.h
   trunk/qgis/src/ui/qgsmanageconnectionsdialogbase.ui
Log:
don't close Manage connections dialog after processing selected file.
Allow user select another file and run save/load operation again


Modified: trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp	2011-02-08 10:00:09 UTC (rev 15139)
+++ trunk/qgis/src/app/qgsmanageconnectionsdialog.cpp	2011-02-08 12:00:20 UTC (rev 15140)
@@ -20,7 +20,6 @@
 #include <QMessageBox>
 #include <QSettings>
 #include <QTextStream>
-#include <QDebug>
 
 #include "qgsmanageconnectionsdialog.h"
 
@@ -39,10 +38,14 @@
     populateConnections();
   }
 
+  connect( btnBrowse, SIGNAL( clicked() ), this, SLOT( selectFile() ) );
+  // use Ok button for starting import and export operations
+  disconnect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
+  connect( buttonBox, SIGNAL( accepted() ), this, SLOT( doSaveLoad() ) );
   buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
 }
 
-void QgsManageConnectionsDialog::on_btnBrowse_clicked()
+void QgsManageConnectionsDialog::selectFile()
 {
   QString fileName;
   if ( mDialogMode == Save )
@@ -67,7 +70,6 @@
 
   mFileName = fileName;
   leFileName->setText( mFileName );
-  //buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
 
   if ( mDialogMode == Load )
   {
@@ -77,7 +79,7 @@
   buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
 }
 
-void QgsManageConnectionsDialog::on_buttonBox_accepted()
+void QgsManageConnectionsDialog::doSaveLoad()
 {
   QList<QListWidgetItem *> selection = listConnections->selectedItems();
   if ( selection.isEmpty() )
@@ -150,11 +152,12 @@
     {
       loadPgConnections( doc, items );
     }
+    // clear connections list
+    listConnections->clear();
   }
 
   mFileName = "";
   leFileName->clear();
-  listConnections->clear();
   buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
 }
 

Modified: trunk/qgis/src/app/qgsmanageconnectionsdialog.h
===================================================================
--- trunk/qgis/src/app/qgsmanageconnectionsdialog.h	2011-02-08 10:00:09 UTC (rev 15139)
+++ trunk/qgis/src/app/qgsmanageconnectionsdialog.h	2011-02-08 12:00:20 UTC (rev 15140)
@@ -46,8 +46,8 @@
     QgsManageConnectionsDialog( QWidget *parent = NULL, Mode mode = Save, Type type = WMS );
 
   public slots:
-    void on_btnBrowse_clicked();
-    void on_buttonBox_accepted();
+    void selectFile();
+    void doSaveLoad();
 
     void populateConnections();
 

Modified: trunk/qgis/src/ui/qgsmanageconnectionsdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsmanageconnectionsdialogbase.ui	2011-02-08 10:00:09 UTC (rev 15139)
+++ trunk/qgis/src/ui/qgsmanageconnectionsdialogbase.ui	2011-02-08 12:00:20 UTC (rev 15140)
@@ -54,7 +54,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>