use default button action instead of adding a new one (relation refer…

…ence and editor widgets)
qgis · Oct 15, 2014 · 69fc9bb · 69fc9bb
1 parent 4ea5c80
commit 69fc9bb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 33 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -78,10 +78,8 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
 
   // open form button
   mOpenFormButton = new QToolButton( this );
-  mOpenFormAction = new QAction( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ), tr( "Open related feature form" ), this );
+  mOpenFormButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
-  mOpenFormButton->addAction( mOpenFormAction );
+  mOpenFormButton->setText( tr( "Open related feature form" ) );
-  mOpenFormButton->setDefaultAction( mOpenFormAction );
-  connect( mOpenFormButton, SIGNAL( triggered( QAction* ) ), this, SLOT( openForm() ) );
   editLayout->addWidget( mOpenFormButton );
 
   // highlight button
@@ -94,24 +92,19 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
   mHighlightFeatureButton->addAction( mScaleHighlightFeatureAction );
   mHighlightFeatureButton->addAction( mPanHighlightFeatureAction );
   mHighlightFeatureButton->setDefaultAction( mHighlightFeatureAction );
-  connect( mHighlightFeatureButton, SIGNAL( triggered( QAction* ) ), this, SLOT( highlightActionTriggered( QAction* ) ) );
   editLayout->addWidget( mHighlightFeatureButton );
 
   // map identification button
   mMapIdentificationButton = new QToolButton( this );
-  mMapIdentificationAction = new QAction( QgsApplication::getThemeIcon( "/mActionMapIdentification.svg" ), tr( "Select on map" ), this );
+  mMapIdentificationButton->setIcon( QgsApplication::getThemeIcon( "/mActionMapIdentification.svg" ) );
-  mMapIdentificationAction->setCheckable( true );
+  mMapIdentificationButton->setText( tr( "Select on map" ) );
-  mMapIdentificationButton->addAction( mMapIdentificationAction );
+  mMapIdentificationButton->setCheckable( true );
-  mMapIdentificationButton->setDefaultAction( mMapIdentificationAction );
-  connect( mMapIdentificationButton, SIGNAL( triggered( QAction* ) ), this, SLOT( mapIdentification() ) );
   editLayout->addWidget( mMapIdentificationButton );
 
   // remove foreign key button
   mRemoveFKButton = new QToolButton( this );
-  mRemoveFKAction = new QAction( QgsApplication::getThemeIcon( "/mActionRemove.svg" ), tr( "No selection" ), this );
+  mRemoveFKButton->setIcon( QgsApplication::getThemeIcon( "/mActionRemove.svg" ) );
-  mRemoveFKButton->addAction( mRemoveFKAction );
+  mRemoveFKButton->setText( tr( "No selection" ) );
-  mRemoveFKButton->setDefaultAction( mRemoveFKAction );
-  connect( mRemoveFKButton, SIGNAL( triggered( QAction* ) ), this, SLOT( deleteForeignKey() ) );
   editLayout->addWidget( mRemoveFKButton );
 
   // spacer
@@ -142,6 +135,12 @@ QgsRelationReferenceWidget::QgsRelationReferenceWidget( QWidget* parent )
   mHighlightFeatureButton->hide();
   mAttributeEditorFrame->hide();
   mInvalidLabel->hide();
+
+  // connect buttons
+  connect( mOpenFormButton, SIGNAL( clicked() ), this, SLOT( openForm() ) );
+  connect( mHighlightFeatureButton, SIGNAL( triggered( QAction* ) ), this, SLOT( highlightActionTriggered( QAction* ) ) );
+  connect( mMapIdentificationButton, SIGNAL( clicked() ), this, SLOT( mapIdentification() ) );
+  connect( mRemoveFKButton, SIGNAL( clicked() ), this, SLOT( deleteForeignKey() ) );
 }
 
 QgsRelationReferenceWidget::~QgsRelationReferenceWidget()
@@ -331,7 +330,7 @@ void QgsRelationReferenceWidget::setEditorContext( QgsAttributeEditorContext con
   if ( mMapTool )
     delete mMapTool;
   mMapTool = new QgsMapToolIdentifyFeature( mCanvas );
-  mMapTool->setAction( mMapIdentificationAction );
+  mMapTool->setAction( mMapIdentificationButton->defaultAction() );
 }
 
 void QgsRelationReferenceWidget::setEmbedForm( bool display )

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -145,9 +145,6 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     QAction* mHighlightFeatureAction;
     QAction* mScaleHighlightFeatureAction;
     QAction* mPanHighlightFeatureAction;
-    QAction* mOpenFormAction;
-    QAction* mMapIdentificationAction;
-    QAction* mRemoveFKAction;
     QComboBox* mComboBox;
     QgsCollapsibleGroupBox* mAttributeEditorFrame;
     QVBoxLayout* mAttributeEditorLayout;

diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -45,35 +45,30 @@ QgsRelationEditorWidget::QgsRelationEditorWidget( QWidget* parent )
   buttonLayout->setContentsMargins( 0, 0, 0, 0 );
   // toogle editing
   mToggleEditingButton = new QToolButton( this );
-  QAction* toggleEditingAction = new QAction( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ), tr( "Toggle editing" ), this );
+  mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
-  mToggleEditingButton->addAction( toggleEditingAction );
+  mToggleEditingButton->setText( tr( "Toggle editing" ) );
-  mToggleEditingButton->setDefaultAction( toggleEditingAction );
   mToggleEditingButton->setEnabled( false );
   mToggleEditingButton->setCheckable( true );
   buttonLayout->addWidget( mToggleEditingButton );
   // add feature
   mAddFeatureButton = new QToolButton( this );
-  QAction* addFeatureAction = new QAction( QgsApplication::getThemeIcon( "/mActionAdd.svg" ), tr( "Add feature" ), this );
+  mAddFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionAdd.svg" ) );
-  mAddFeatureButton->addAction( addFeatureAction );
+  mAddFeatureButton->setText( tr( "Add feature" ) );
-  mAddFeatureButton->setDefaultAction( addFeatureAction );
   buttonLayout->addWidget( mAddFeatureButton );
   // delete feature
   mDeleteFeatureButton = new QToolButton( this );
-  QAction* deleteFeatureAction = new QAction( QgsApplication::getThemeIcon( "/mActionRemove.svg" ), tr( "Delete feature" ), this );
+  mDeleteFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionRemove.svg" ) );
-  mDeleteFeatureButton->addAction( deleteFeatureAction );
+  mDeleteFeatureButton->setText( tr( "Delete feature" ) );
-  mDeleteFeatureButton->setDefaultAction( deleteFeatureAction );
   buttonLayout->addWidget( mDeleteFeatureButton );
   // link feature
   mLinkFeatureButton = new QToolButton( this );
-  QAction* linkFeatureAction = new QAction( QgsApplication::getThemeIcon( "/mActionLink.svg" ), tr( "Link feature" ), this );
+  mLinkFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionLink.svg" ) );
-  mLinkFeatureButton->addAction( linkFeatureAction );
+  mLinkFeatureButton->setText( tr( "Link feature" ) );
-  mLinkFeatureButton->setDefaultAction( linkFeatureAction );
   buttonLayout->addWidget( mLinkFeatureButton );
   // unlink feature
   mUnlinkFeatureButton = new QToolButton( this );
-  QAction* unlinkFeatureAction = new QAction( QgsApplication::getThemeIcon( "/mActionUnlink.svg" ), tr( "Unlink feature" ), this );
+  mUnlinkFeatureButton->setIcon( QgsApplication::getThemeIcon( "/mActionUnlink.svg" ) );
-  mUnlinkFeatureButton->addAction( unlinkFeatureAction );
+  mUnlinkFeatureButton->setText( tr( "Unlink feature" ) );
-  mUnlinkFeatureButton->setDefaultAction( unlinkFeatureAction );
   buttonLayout->addWidget( mUnlinkFeatureButton );
   // spacer
   buttonLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding ) );