Skip to content

Commit

Permalink
Add "Open attribute table (edited or new features)" to main GUI
Browse files Browse the repository at this point in the history 
(layer menu and attributes toolbar)
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Jun 8, 2021
1 parent aae2ce1 commit af7de9d
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 1 deletion.
17 changes: 17 additions & 0 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -2710,6 +2710,10 @@ void QgisApp::createActions()
{
attributeTable( QgsAttributeTableFilterModel::ShowVisible );
} );
connect( mActionOpenTableEdited, &QAction::triggered, this, [ = ]
{
attributeTable( QgsAttributeTableFilterModel::ShowEdited );
} );
connect( mActionOpenFieldCalc, &QAction::triggered, this, &QgisApp::fieldCalculator );
connect( mActionToggleEditing, &QAction::triggered, this, [ = ] { toggleEditing(); } );
connect( mActionSaveLayerEdits, &QAction::triggered, this, &QgisApp::saveActiveLayerEdits );
Expand Down Expand Up @@ -3359,6 +3363,7 @@ void QgisApp::createToolBars()
bt->addAction( mActionOpenTable );
bt->addAction( mActionOpenTableSelected );
bt->addAction( mActionOpenTableVisible );
bt->addAction( mActionOpenTableEdited );

QAction *defOpenTableAction = mActionOpenTable;
switch ( settings.value( QStringLiteral( "UI/openTableTool" ), 0 ).toInt() )
Expand All @@ -3372,6 +3377,9 @@ void QgisApp::createToolBars()
case 2:
defOpenTableAction = mActionOpenTableVisible;
break;
case 3:
defOpenTableAction = mActionOpenTableEdited;
break;
}
bt->setDefaultAction( defOpenTableAction );
QAction *openTableAction = mAttributesToolBar->insertWidget( mActionMapTips, bt );
Expand Down Expand Up @@ -4063,6 +4071,7 @@ void QgisApp::setTheme( const QString &themeName )
mActionOpenTable->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOpenTable.svg" ) ) );
mActionOpenTableSelected->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOpenTableSelected.svg" ) ) );
mActionOpenTableVisible->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOpenTableVisible.svg" ) ) );
mActionOpenTableEdited->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOpenTableEdited.svg" ) ) );
mActionOpenFieldCalc->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCalculateField.svg" ) ) );
mActionMeasure->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionMeasure.svg" ) ) );
mActionMeasureArea->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionMeasureArea.svg" ) ) );
Expand Down Expand Up @@ -14815,6 +14824,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
mActionSelectAll->setEnabled( false );
mActionReselect->setEnabled( false );
mActionInvertSelection->setEnabled( false );
Expand Down Expand Up @@ -14967,6 +14977,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( true );
mActionOpenTableSelected->setEnabled( true );
mActionOpenTableVisible->setEnabled( true );
mActionOpenTableEdited->setEnabled( true );
mActionSelectAll->setEnabled( true );
mActionReselect->setEnabled( true );
mActionInvertSelection->setEnabled( true );
Expand Down Expand Up @@ -15211,6 +15222,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
mActionSelectAll->setEnabled( false );
mActionReselect->setEnabled( false );
mActionInvertSelection->setEnabled( false );
Expand Down Expand Up @@ -15324,6 +15336,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
mActionSelectAll->setEnabled( false );
mActionReselect->setEnabled( false );
mActionInvertSelection->setEnabled( false );
Expand Down Expand Up @@ -15391,6 +15404,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
mActionSelectAll->setEnabled( false );
mActionReselect->setEnabled( false );
mActionInvertSelection->setEnabled( false );
Expand Down Expand Up @@ -15458,6 +15472,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionOpenTable->setEnabled( false );
mActionOpenTableSelected->setEnabled( false );
mActionOpenTableVisible->setEnabled( false );
mActionOpenTableEdited->setEnabled( false );
mActionSelectAll->setEnabled( false );
mActionReselect->setEnabled( false );
mActionInvertSelection->setEnabled( false );
Expand Down Expand Up @@ -16733,6 +16748,8 @@ void QgisApp::toolButtonActionTriggered( QAction *action )
settings.setValue( QStringLiteral( "UI/openTableTool" ), 1 );
else if ( action == mActionOpenTableVisible )
settings.setValue( QStringLiteral( "UI/openTableTool" ), 2 );
else if ( action == mActionOpenTableEdited )
settings.setValue( QStringLiteral( "UI/openTableTool" ), 3 );
else if ( action == mActionMeasure )
settings.setValue( QStringLiteral( "UI/measureTool" ), 0 );
else if ( action == mActionMeasureArea )
Expand Down
4 changes: 4 additions & 0 deletions src/app/qgsattributetabledialog.cpp
View file
Expand Up @@ -315,6 +315,10 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr
mFeatureFilterWidget->filterSelected();
break;

case QgsAttributeTableFilterModel::ShowEdited:
mFeatureFilterWidget->filterEdited();
break;

case QgsAttributeTableFilterModel::ShowAll:
default:
mFeatureFilterWidget->filterShowAll();
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsfeaturefilterwidget_p.h
View file
Expand Up @@ -70,6 +70,7 @@ class GUI_EXPORT QgsFeatureFilterWidget : public QWidget, private Ui::QgsFeature
void filterShowAll();
void filterSelected();
void filterVisible();
void filterEdited();


private slots:
Expand All @@ -83,7 +84,6 @@ class GUI_EXPORT QgsFeatureFilterWidget : public QWidget, private Ui::QgsFeature
void storeExpressionButtonInit();

void filterExpressionBuilder();
void filterEdited();
void filterQueryChanged( const QString &query );
void filterQueryAccepted();

Expand Down
10 changes: 10 additions & 0 deletions src/ui/qgisapp.ui
View file
Expand Up @@ -216,6 +216,7 @@
<addaction name="mActionOpenTable"/>
<addaction name="mActionOpenTableSelected"/>
<addaction name="mActionOpenTableVisible"/>
<addaction name="mActionOpenTableEdited"/>
<addaction name="mActionToggleEditing"/>
<addaction name="mActionSaveLayerEdits"/>
<addaction name="mActionAllEdits"/>
Expand Down Expand Up @@ -1707,6 +1708,15 @@ Shift+R to enable range selection.</string>
<string>Ctrl+F6</string>
</property>
</action>
<action name="mActionOpenTableEdited">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionOpenTableEdited.svg</normaloff>:/images/themes/default/mActionOpenTableEdited.svg</iconset>
</property>
<property name="text">
<string>Open Attribute Table (Edited and New Features)</string>
</property>
</action>
<action name="mActionToggleEditing">
<property name="checkable">
<bool>true</bool>
Expand Down

0 comments on commit af7de9d

Please sign in to comment.