show icon if exist for menus in customization dialog

3nids · 3nids · commit 1e166805ffed · 2018-11-06T06:43:49.000-09:00
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
@@ -491,7 +491,7 @@ void QgsCustomizationDialog::showHelp()
 
 void QgsCustomization::addTreeItemActions( QTreeWidgetItem *parentItem, const QList<QAction *> &actions )
 {
-  Q_FOREACH ( QAction *action, actions )
+  for ( const QAction *action : actions )
   {
     if ( action->isSeparator() )
     {
@@ -500,27 +500,29 @@ void QgsCustomization::addTreeItemActions( QTreeWidgetItem *parentItem, const QL
     if ( action->menu() )
     {
       // it is a submenu
-      addTreeItemMenu( parentItem, action->menu() );
+      addTreeItemMenu( parentItem, action->menu(), action );
     }
     else
     {
       // it is an ordinary action
       QStringList strs;
       strs << action->objectName() << action->text();
-      QTreeWidgetItem *myItem = new QTreeWidgetItem( parentItem, strs );
-      myItem->setIcon( 0, action->icon() );
-      myItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable );
-      myItem->setCheckState( 0, Qt::Checked );
+      QTreeWidgetItem *item = new QTreeWidgetItem( parentItem, strs );
+      item->setIcon( 0, action->icon() );
+      item->setFlags( Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable );
+      item->setCheckState( 0, Qt::Checked );
     }
   }
 }
 
-void QgsCustomization::addTreeItemMenu( QTreeWidgetItem *parentItem, QMenu *menu )
+void QgsCustomization::addTreeItemMenu( QTreeWidgetItem *parentItem, const QMenu *menu, const QAction *action )
 {
   QStringList menustrs;
   // remove '&' which are used to mark shortcut key
   menustrs << menu->objectName() << menu->title().remove( '&' );
   QTreeWidgetItem *menuItem = new QTreeWidgetItem( parentItem, menustrs );
+  if ( action )
+    menuItem->setIcon( 0, action->icon() );
   menuItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsSelectable );
   menuItem->setCheckState( 0, Qt::Checked );
 
@@ -921,7 +923,7 @@ void QgsCustomization::preNotify( QObject *receiver, QEvent *event, bool *done )
   }
 }
 
-QString QgsCustomization::splashPath()
+QString QgsCustomization::splashPath() const
 {
   if ( isEnabled() )
   {
diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
@@ -133,15 +133,15 @@ class APP_EXPORT QgsCustomization : public QObject
     void setSettings( QSettings *settings ) { mSettings = settings ;}
 
     // Return the path to the splash screen
-    QString splashPath();
+    QString splashPath() const;
 
     // Load and set default customization
     void loadDefault();
 
     // Internal Qt widget which has to bes kipped in paths
     static QStringList sInternalWidgets;
 
-    QString statusPath() { return mStatusPath; }
+    QString statusPath() const { return mStatusPath; }
 
   public slots:
     void preNotify( QObject *receiver, QEvent *event, bool *done );
@@ -160,7 +160,7 @@ class APP_EXPORT QgsCustomization : public QObject
     void createTreeItemToolbars();
     void createTreeItemDocks();
     void createTreeItemStatus();
-    void addTreeItemMenu( QTreeWidgetItem *parentItem, QMenu *menu );
+    void addTreeItemMenu( QTreeWidgetItem *parentItem, const QMenu *menu, const QAction *action = nullptr );
     void addTreeItemActions( QTreeWidgetItem *parentItem, const QList<QAction *> &actions );
     QList<QTreeWidgetItem *> mMainWindowItems;
     friend class QgsCustomizationDialog; // in order to access mMainWindowItems

Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ void QgsCustomizationDialog::showHelp()`
`491`	`491`
`492`	`492`	`void QgsCustomization::addTreeItemActions( QTreeWidgetItem parentItem, const QList<QAction > &actions )`
`493`	`493`	`{`
`494`		`- Q_FOREACH ( QAction *action, actions )`
	`494`	`+ for ( const QAction *action : actions )`
`495`	`495`	`{`
`496`	`496`	`if ( action->isSeparator() )`
`497`	`497`	`{`
`@@ -500,27 +500,29 @@ void QgsCustomization::addTreeItemActions( QTreeWidgetItem *parentItem, const QL`
`500`	`500`	`if ( action->menu() )`
`501`	`501`	`{`
`502`	`502`	`// it is a submenu`
`503`		`- addTreeItemMenu( parentItem, action->menu() );`
	`503`	`+ addTreeItemMenu( parentItem, action->menu(), action );`
`504`	`504`	`}`
`505`	`505`	`else`
`506`	`506`	`{`
`507`	`507`	`// it is an ordinary action`
`508`	`508`	`QStringList strs;`
`509`	`509`	`strs << action->objectName() << action->text();`
`510`		`- QTreeWidgetItem *myItem = new QTreeWidgetItem( parentItem, strs );`
`511`		`- myItem->setIcon( 0, action->icon() );`
`512`		`- myItem->setFlags( Qt::ItemIsEnabled \| Qt::ItemIsUserCheckable \| Qt::ItemIsSelectable );`
`513`		`- myItem->setCheckState( 0, Qt::Checked );`
	`510`	`+ QTreeWidgetItem *item = new QTreeWidgetItem( parentItem, strs );`
	`511`	`+ item->setIcon( 0, action->icon() );`
	`512`	`+ item->setFlags( Qt::ItemIsEnabled \| Qt::ItemIsUserCheckable \| Qt::ItemIsSelectable );`
	`513`	`+ item->setCheckState( 0, Qt::Checked );`
`514`	`514`	`}`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`
`518`		`-void QgsCustomization::addTreeItemMenu( QTreeWidgetItem parentItem, QMenu menu )`
	`518`	`+void QgsCustomization::addTreeItemMenu( QTreeWidgetItem parentItem, const QMenu menu, const QAction *action )`
`519`	`519`	`{`
`520`	`520`	`QStringList menustrs;`
`521`	`521`	`// remove '&' which are used to mark shortcut key`
`522`	`522`	`menustrs << menu->objectName() << menu->title().remove( '&' );`
`523`	`523`	`QTreeWidgetItem *menuItem = new QTreeWidgetItem( parentItem, menustrs );`
	`524`	`+ if ( action )`
	`525`	`+ menuItem->setIcon( 0, action->icon() );`
`524`	`526`	`menuItem->setFlags( Qt::ItemIsEnabled \| Qt::ItemIsUserCheckable \| Qt::ItemIsSelectable );`
`525`	`527`	`menuItem->setCheckState( 0, Qt::Checked );`
`526`	`528`
`@@ -921,7 +923,7 @@ void QgsCustomization::preNotify( QObject receiver, QEvent event, bool *done )`
`921`	`923`	`}`
`922`	`924`	`}`
`923`	`925`
`924`		`-QString QgsCustomization::splashPath()`
	`926`	`+QString QgsCustomization::splashPath() const`
`925`	`927`	`{`
`926`	`928`	`if ( isEnabled() )`
`927`	`929`	`{`