Don't show the attribute action popup menu if there are no actions defined

g_j_m · g_j_m · commit 743889cdac4d · 2006-06-01T10:57:40.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5503 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsattributetable.cpp b/src/gui/qgsattributetable.cpp
@@ -316,7 +316,8 @@ void QgsAttributeTable::popupMenu(int row, int col, const QPoint& pos)
   // mActionValues vector.
   mClickedOnValue = col;
 
-  mActionPopup->popup(pos);  
+  if (mActions.size() > 0)
+    mActionPopup->popup(pos);  
 }
 
 void QgsAttributeTable::popupItemSelected(QAction* menuAction)
diff --git a/src/gui/qgsidentifyresults.cpp b/src/gui/qgsidentifyresults.cpp
@@ -82,10 +82,6 @@ void QgsIdentifyResults::popupContextMenu(Q3ListViewItem* item,
   {
     mActionPopup = new QMenu();
     QAction *a = mActionPopup->addAction( tr("Run action") );
-    QFont f = a->font();
-    f.setBold(true);
-    a->setFont(f);
-
     mActionPopup->addSeparator();
 
     QgsAttributeAction::aIter iter = mActions.begin();
@@ -132,7 +128,8 @@ void QgsIdentifyResults::popupContextMenu(Q3ListViewItem* item,
     child = child->nextSibling();
   }
 
-  mActionPopup->popup(p);
+  if (mActions.size() > 0)
+    mActionPopup->popup(p);
 }
 // Restore last window position/size and show the window
 void QgsIdentifyResults::restorePosition()

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,8 @@ void QgsAttributeTable::popupMenu(int row, int col, const QPoint& pos)`
`316`	`316`	`// mActionValues vector.`
`317`	`317`	`mClickedOnValue = col;`
`318`	`318`
`319`		`- mActionPopup->popup(pos);`
	`319`	`+ if (mActions.size() > 0)`
	`320`	`+ mActionPopup->popup(pos);`
`320`	`321`	`}`
`321`	`322`
`322`	`323`	`void QgsAttributeTable::popupItemSelected(QAction* menuAction)`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,6 @@ void QgsIdentifyResults::popupContextMenu(Q3ListViewItem* item,`
`82`	`82`	`{`
`83`	`83`	`mActionPopup = new QMenu();`
`84`	`84`	`QAction *a = mActionPopup->addAction( tr("Run action") );`
`85`		`- QFont f = a->font();`
`86`		`- f.setBold(true);`
`87`		`- a->setFont(f);`
`88`		`-`
`89`	`85`	`mActionPopup->addSeparator();`
`90`	`86`
`91`	`87`	`QgsAttributeAction::aIter iter = mActions.begin();`
`@@ -132,7 +128,8 @@ void QgsIdentifyResults::popupContextMenu(Q3ListViewItem* item,`
`132`	`128`	`child = child->nextSibling();`
`133`	`129`	`}`
`134`	`130`
`135`		`- mActionPopup->popup(p);`
	`131`	`+ if (mActions.size() > 0)`
	`132`	`+ mActionPopup->popup(p);`
`136`	`133`	`}`
`137`	`134`	`// Restore last window position/size and show the window`
`138`	`135`	`void QgsIdentifyResults::restorePosition()`