Update Mac menu code to match r9731. Also move remaining tool tip def…

…initions from cpp to ui file so that all tool tips are defined in the same file and in the same place as the corresponding actions.

git-svn-id: http://svn.osgeo.org/qgis/trunk@9735 c8812cc2-4d05-0410-92ff-de0c093fc19c

src/app/composer/qgscomposer.cpp

@@ -70,22 +70,6 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
 
   QString myIconPath = QgsApplication::activeThemePath();
 
-  // Actions defined in qgscomposerbase.ui:
-  // mActionAddNewMap
-  // mActionAddNewLegend
-  // mActionAddNewLabel
-  // mActionAddNewScalebar
-  // mActionAddImage
-  // mActionSelectMoveItem
-
-  mActionMoveItemContent->setToolTip( tr( "Move item content" ) );
-  mActionGroupItems->setToolTip( tr( "Group items" ) );
-  mActionUngroupItems->setToolTip( tr( "Ungroup items" ) );
-  mActionRaiseItems->setToolTip( tr( "Raise selected items" ) );
-  mActionLowerItems->setToolTip( tr( "Lower selected items" ) );
-  mActionMoveItemsToTop->setToolTip( tr( "Move selected items to top" ) );
-  mActionMoveItemsToBottom->setToolTip( tr( "Move selected items to bottom" ) );
-
   QActionGroup* toggleActionGroup = new QActionGroup( this );
   toggleActionGroup->addAction( mActionMoveItemContent);
   toggleActionGroup->addAction( mActionAddNewMap );
@@ -96,7 +80,6 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
   toggleActionGroup->addAction( mActionSelectMoveItem );
   toggleActionGroup->setExclusive( true );
 
-
   setWindowTitle( tr( "QGIS - print composer" ) );
 
   mActionAddNewMap->setCheckable( true );
@@ -146,14 +129,14 @@ QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
   layoutMenu->addAction( mActionAddNewLegend );
   layoutMenu->addAction( mActionAddImage );
   layoutMenu->addAction( mActionSelectMoveItem );
-  layoutMenu->addAction( moveItemContentAction );
+  layoutMenu->addAction( mActionMoveItemContent );
   layoutMenu->addSeparator();
-  layoutMenu->addAction( groupItemsAction );
-  layoutMenu->addAction( ungroupItemsAction );
-  layoutMenu->addAction( raiseItemsAction );
-  layoutMenu->addAction( lowerItemsAction );
-  layoutMenu->addAction( moveItemsToTopAction );
-  layoutMenu->addAction( moveItemsToBottomAction );
+  layoutMenu->addAction( mActionGroupItems );
+  layoutMenu->addAction( mActionUngroupItems );
+  layoutMenu->addAction( mActionRaiseItems );
+  layoutMenu->addAction( mActionLowerItems );
+  layoutMenu->addAction( mActionMoveItemsToTop );
+  layoutMenu->addAction( mActionMoveItemsToBottom );
 
 #ifndef Q_WS_MAC64 /* assertion failure in NSMenuItem setSubmenu (Qt 4.5.0-snapshot-20080830) */
   menuBar()->addMenu( QgisApp::instance()->windowMenu() );

src/ui/qgscomposerbase.ui

@@ -376,37 +376,58 @@
   </action>
   <action name="mActionMoveItemContent" >
    <property name="text" >
-    <string>moveItemContent</string>
+    <string>Move Content</string>
+   </property>
+   <property name="toolTip" >
+    <string>Move item content</string>
    </property>
   </action>
   <action name="mActionGroupItems" >
    <property name="text" >
-    <string>Group Items</string>
+    <string>Group</string>
+   </property>
+   <property name="toolTip" >
+    <string>Group items</string>
    </property>
   </action>
   <action name="mActionUngroupItems" >
    <property name="text" >
     <string>Ungroup</string>
    </property>
+   <property name="toolTip" >
+    <string>Ungroup items</string>
+   </property>
   </action>
   <action name="mActionRaiseItems" >
    <property name="text" >
     <string>Raise</string>
    </property>
+   <property name="toolTip" >
+    <string>Raise selected items</string>
+   </property>
   </action>
   <action name="mActionLowerItems" >
    <property name="text" >
     <string>Lower</string>
    </property>
+   <property name="toolTip" >
+    <string>Lower selected items</string>
+   </property>
   </action>
   <action name="mActionMoveItemsToTop" >
    <property name="text" >
-    <string>Bring to front</string>
+    <string>Bring to Front</string>
+   </property>
+   <property name="toolTip" >
+    <string>Move selected items to top</string>
    </property>
   </action>
   <action name="mActionMoveItemsToBottom" >
    <property name="text" >
-    <string>Send to back</string>
+    <string>Send to Back</string>
+   </property>
+   <property name="toolTip" >
+    <string>Move selected items to bottom</string>
    </property>
   </action>
  </widget>