[QGIS Commit] r14832 - in trunk/qgis/src: app/composer ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Dec 3 08:49:34 EST 2010
Author: mhugent
Date: 2010-12-03 05:49:34 -0800 (Fri, 03 Dec 2010)
New Revision: 14832
Modified:
trunk/qgis/src/app/composer/qgscomposer.cpp
trunk/qgis/src/ui/qgscomposerbase.ui
Log:
Move composer undo buttons to layout menu
Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp 2010-12-03 12:53:22 UTC (rev 14831)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp 2010-12-03 13:49:34 UTC (rev 14832)
@@ -151,12 +151,13 @@
viewMenu->addAction( mActionZoomIn );
viewMenu->addAction( mActionZoomOut );
viewMenu->addAction( mActionZoomAll );
- viewMenu->addAction( mActionUndo );
- viewMenu->addAction( mActionRedo );
viewMenu->addSeparator();
viewMenu->addAction( mActionRefreshView );
QMenu *layoutMenu = menuBar()->addMenu( tr( "Layout" ) );
+ layoutMenu->addAction( mActionUndo );
+ layoutMenu->addAction( mActionRedo );
+ layoutMenu->addSeparator();
layoutMenu->addAction( mActionAddNewMap );
layoutMenu->addAction( mActionAddNewLabel );
layoutMenu->addAction( mActionAddNewScalebar );
Modified: trunk/qgis/src/ui/qgscomposerbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscomposerbase.ui 2010-12-03 12:53:22 UTC (rev 14831)
+++ trunk/qgis/src/ui/qgscomposerbase.ui 2010-12-03 13:49:34 UTC (rev 14832)
@@ -163,9 +163,9 @@
<addaction name="mActionZoomIn"/>
<addaction name="mActionZoomOut"/>
<addaction name="mActionRefreshView"/>
+ <addaction name="separator"/>
<addaction name="mActionUndo"/>
<addaction name="mActionRedo"/>
- <addaction name="separator"/>
<addaction name="mActionAddNewMap"/>
<addaction name="mActionAddImage"/>
<addaction name="mActionAddNewLabel"/>
@@ -493,6 +493,9 @@
<property name="toolTip">
<string>Revert last change</string>
</property>
+ <property name="shortcut">
+ <string>Ctrl+Z</string>
+ </property>
</action>
<action name="mActionRedo">
<property name="icon">
@@ -505,6 +508,9 @@
<property name="toolTip">
<string>Restore last change</string>
</property>
+ <property name="shortcut">
+ <string>Ctrl+Shift+Z</string>
+ </property>
</action>
</widget>
<tabstops>
More information about the QGIS-commit
mailing list