Remove OK button and add CLOSE

Yes, it's one more click to quit, but more intuitive UI
qgis · Nov 13, 2017 · 79c8f96 · 79c8f96
1 parent 1ab20bd
commit 79c8f96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/python/gui/qgsabstractdatasourcewidget.sip b/python/gui/qgsabstractdatasourcewidget.sip
@@ -53,11 +53,6 @@ Destructor
  being added.
 %End
 
-    virtual void okButtonClicked();
-%Docstring
- Triggered when the dialog is accepted, call addButtonClicked() and
- emit the accepted() signal
-%End
 
   signals:
 

diff --git a/src/gui/qgsabstractdatasourcewidget.cpp b/src/gui/qgsabstractdatasourcewidget.cpp
@@ -52,12 +52,10 @@ void QgsAbstractDataSourceWidget::setupButtons( QDialogButtonBox *buttonBox )
   connect( mAddButton, &QPushButton::clicked, this, &QgsAbstractDataSourceWidget::addButtonClicked );
   connect( this, &QgsAbstractDataSourceWidget::enableButtons, mAddButton, &QPushButton::setEnabled );
 
-  QPushButton *okButton = new QPushButton( tr( "&Ok" ) );
-  okButton->setToolTip( tr( "Add selected layers to map and close this dialog" ) );
-  okButton->setEnabled( false );
-  buttonBox->addButton( okButton, QDialogButtonBox::AcceptRole );
-  connect( okButton, &QPushButton::clicked, this, &QgsAbstractDataSourceWidget::okButtonClicked );
-  connect( this, &QgsAbstractDataSourceWidget::enableButtons, okButton, &QPushButton::setEnabled );
+  QPushButton *closeButton = new QPushButton( tr( "&Close" ) );
+  closeButton->setToolTip( tr( "Close this dialog without adding any layer" ) );
+  buttonBox->addButton( closeButton, QDialogButtonBox::RejectRole );
+  connect( closeButton, &QPushButton::clicked, this, &QgsAbstractDataSourceWidget::reject );
 
 }
 
@@ -67,8 +65,3 @@ void QgsAbstractDataSourceWidget::setMapCanvas( const QgsMapCanvas *mapCanvas )
   mMapCanvas = mapCanvas;
 }
 
-void QgsAbstractDataSourceWidget::okButtonClicked()
-{
-  addButtonClicked();
-  emit accepted();
-}
diff --git a/src/gui/qgsabstractdatasourcewidget.h b/src/gui/qgsabstractdatasourcewidget.h
@@ -69,11 +69,6 @@ class GUI_EXPORT QgsAbstractDataSourceWidget : public QDialog
      */
     virtual void addButtonClicked() { }
 
-    /**
-     * Triggered when the dialog is accepted, call addButtonClicked() and
-     * emit the accepted() signal
-     */
-    virtual void okButtonClicked();
 
   signals: