Skip to content

[Customization] Reload user defined toolbar actions only one time #66620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troopa81 merged 3 commits into from
Jul 2, 2026
Merged

[Customization] Reload user defined toolbar actions only one time #66620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c55085
fix(Customization): Reload action ref only one time
troopa81 Jun 16, 2026
4767d25
remove TODO
troopa81 Jul 2, 2026
1db7c42
fix(Customization): Remove unrelated action setIcon
troopa81 Jul 2, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/app/qgscustomization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,17 +1731,6 @@ void QgsCustomization::applyToToolBars() const
QgisApp::instance()->addToolBar( toolBar );
}

for ( const std::unique_ptr<QgsCustomization::QgsItem> &actionRefItem : userToolBar->childItemList() )
{
if ( QgsCustomization::QgsActionRefItem *actionRef = dynamic_cast<QgsCustomization::QgsActionRefItem *>( actionRefItem.get() ) )
{
if ( QAction *action = findQAction( actionRef->actionRefPath() ) )
{
toolBar->addAction( action );
}
}
}

updateActionVisibility( userToolBar, toolBar );
}
}
Expand Down
41 changes: 41 additions & 0 deletions tests/src/app/testqgscustomization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,16 @@ void TestQgsCustomization::testModel()

QCOMPARE( model.rowCount(), 5 );

QgsCustomizationDialog::QgsCustomizationModel modelActionSelector( mQgisApp.get(), QgsCustomizationDialog::QgsCustomizationModel::Mode::ActionSelector );
QAbstractItemModelTester modelActionSelectorTester( &modelActionSelector, QAbstractItemModelTester::FailureReportingMode::Fatal );

const QModelIndexList addPartActionIndexes
= modelActionSelector.match( modelActionSelector.index( 0, 0 ), Qt::ItemDataRole::DisplayRole, u"mActionAddPart"_s, -1, Qt::MatchRecursive | Qt::MatchFixedString );
QCOMPARE( addPartActionIndexes.count(), 2 );

std::unique_ptr<QMimeData> mimeData( modelActionSelector.mimeData( QModelIndexList() << addPartActionIndexes.at( 0 ) ) );
QVERIFY( mimeData );

// Uncheck ToolBars/mLayerToolBar/mActionAddRasterLayer item
{
QModelIndex toolBarsIndex = model.index( 4, 0 );
Expand Down Expand Up @@ -815,6 +825,37 @@ void TestQgsCustomization::testModel()
actions = findQActions( mQgisApp->toolBarMenu(), u"UserToolBar_1"_s );
QCOMPARE( actions.count(), 1 );

// drop an action ref in the toolbar

QVERIFY( model.canDropMimeData( mimeData.get(), Qt::DropAction::LinkAction, 0, 0, newItemIndex ) );
QCOMPARE( model.rowCount( newItemIndex ), 0 );
QVERIFY( modelActionSelector.dropMimeData( mimeData.get(), Qt::DropAction::LinkAction, 0, 0, newItemIndex ) );
QCOMPARE( model.rowCount( newItemIndex ), 1 );

QModelIndex actionIndex = model.index( 0, 0, newItemIndex );
QCOMPARE( model.data( actionIndex, Qt::ItemDataRole::DisplayRole ), u"ActionRef_mActionAddPart_1"_s );
QCOMPARE( model.data( model.index( 0, 1, newItemIndex ), Qt::ItemDataRole::DisplayRole ), u"Add Part"_s );

QVERIFY( getItem<QgsCustomization::QgsUserToolBarItem>( "ToolBars/UserToolBar_1" ) );
QCOMPARE( getItem<QgsCustomization::QgsUserToolBarItem>( "ToolBars/UserToolBar_1" )->childrenCount(), 0 );

model.apply();

QVERIFY( getItem<QgsCustomization::QgsActionRefItem>( "ToolBars/UserToolBar_1/ActionRef_mActionAddPart_1" ) );
QVERIFY( getItem<QgsCustomization::QgsActionRefItem>( "ToolBars/UserToolBar_1/ActionRef_mActionAddPart_1" )->isVisible() );
QVERIFY( findQAction( u"ToolBars/UserToolBar_1/mActionAddPart"_s ) );

// hide new added action ref
model.setData( actionIndex, Qt::CheckState::Unchecked, Qt::ItemDataRole::CheckStateRole );
QCOMPARE( model.data( actionIndex, Qt::ItemDataRole::CheckStateRole ), Qt::CheckState::Unchecked );
model.apply();

QVERIFY( getItem<QgsCustomization::QgsActionRefItem>( "ToolBars/UserToolBar_1/ActionRef_mActionAddPart_1" ) );
QVERIFY( !getItem<QgsCustomization::QgsActionRefItem>( "ToolBars/UserToolBar_1/ActionRef_mActionAddPart_1" )->isVisible() );
QVERIFY( !findQAction( u"ToolBars/UserToolBar_1/mActionAddPart"_s ) );

// delete tool bar

model.deleteUserItems( QList<QModelIndex>() << newItemIndex );

model.apply();
Expand Down
Loading