Index: src/gui/qgisapp.cpp
===================================================================
--- src/gui/qgisapp.cpp	(revision 5232)
+++ src/gui/qgisapp.cpp	(working copy)
@@ -374,7 +374,7 @@
   connect(mActionFileOpen, SIGNAL(triggered()), this, SLOT(fileOpen()));
   //
   mActionFileSave= new QAction(QIcon(myIconPath+"/mActionFileSave.png"), tr("&Save Project"), this);
-  mActionFileSave->setShortcut(tr("Ctrl+O"));
+  mActionFileSave->setShortcut(tr("Ctrl+S"));
   mActionFileSave->setStatusTip(tr("Open a Project"));
   connect(mActionFileSave, SIGNAL(triggered()), this, SLOT(fileSave()));
   //
@@ -389,7 +389,7 @@
   connect(mActionFilePrint, SIGNAL(triggered()), this, SLOT(filePrint()));
   //
   mActionSaveMapAsImage= new QAction(QIcon(myIconPath+"/mActionSaveMapAsImage.png"), tr("Save as Image..."), this);
-  mActionSaveMapAsImage->setShortcut(tr("I"));
+  mActionSaveMapAsImage->setShortcut(tr("Ctrl+I"));
   mActionSaveMapAsImage->setStatusTip(tr("Save map as image"));
   connect(mActionSaveMapAsImage, SIGNAL(triggered()), this, SLOT(saveMapAsImage()));
   //
@@ -460,17 +460,17 @@
   // Settings Menu Related Items
   //
   mActionProjectProperties= new QAction(QIcon(myIconPath+"/mActionProjectProperties.png"), tr("Project Properties..."), this);
-  mActionProjectProperties->setShortcut(tr("Alt+P"));
+  mActionProjectProperties->setShortcut(tr("P"));
   mActionProjectProperties->setStatusTip(tr("Set project properties"));
   connect(mActionProjectProperties, SIGNAL(triggered()), this, SLOT(projectProperties()));
   //
   mActionOptions= new QAction(QIcon(myIconPath+"/mActionOptions.png"), tr("Options..."), this);
-  mActionOptions->setShortcut(tr("Alt+O"));
+  // mActionOptions->setShortcut(tr("Alt+O"));
   mActionOptions->setStatusTip(tr("Change various QGIS options"));
   connect(mActionOptions, SIGNAL(triggered()), this, SLOT(options()));
   //
   mActionCustomProjection= new QAction(QIcon(myIconPath+"/mActionCustomProjection.png"), tr("Custom Projection..."), this);
-  mActionCustomProjection->setShortcut(tr("Alt+I"));
+  // mActionCustomProjection->setShortcut(tr("Alt+I"));
   mActionCustomProjection->setStatusTip(tr("Manage custom projections"));
   connect(mActionCustomProjection, SIGNAL(triggered()), this, SLOT(customProjection()));
   //
@@ -487,7 +487,7 @@
   connect(mActionQgisHomePage, SIGNAL(triggered()), this, SLOT(helpQgisHomePage()));
   //
   mActionQgisSourceForgePage= new QAction(QIcon(myIconPath+"/mActionQgisSourceForgePage.png"), tr("Qgis Sourceforge"), this);
-  mActionQgisSourceForgePage->setShortcut(tr("Alt+H"));
+  // mActionQgisSourceForgePage->setShortcut(tr("Alt+H"));
   mActionQgisSourceForgePage->setStatusTip(tr("Visit QGIS SourceForge page"));
   connect(mActionQgisSourceForgePage, SIGNAL(triggered()), this, SLOT(helpQgisSourceForge()));
   //
@@ -507,22 +507,22 @@
   connect(mActionDraw, SIGNAL(triggered()), this, SLOT(refreshMapCanvas()));
   //
   mActionZoomIn= new QAction(QIcon(myIconPath+"/mActionZoomIn.png"), tr("Zoom In"), this);
-  mActionZoomIn->setShortcut(tr("z"));
+  mActionZoomIn->setShortcut(tr("Ctrl++"));
   mActionZoomIn->setStatusTip(tr("Zoom In"));
   connect(mActionZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn()));
   //
   mActionZoomOut= new QAction(QIcon(myIconPath+"/mActionZoomOut.png"), tr("Zoom Out"), this);
-  mActionZoomOut->setShortcut(tr("Z"));
+  mActionZoomOut->setShortcut(tr("Ctrl+-"));
   mActionZoomOut->setStatusTip(tr("Zoom Out"));
   connect(mActionZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut()));
   //
   mActionZoomFullExtent= new QAction(QIcon(myIconPath+"/mActionZoomFullExtent.png"), tr("Zoom Full"), this);
-  mActionZoomFullExtent->setShortcut(tr("f"));
+  mActionZoomFullExtent->setShortcut(tr("F"));
   mActionZoomFullExtent->setStatusTip(tr("Zoom to Full Extents"));
   connect(mActionZoomFullExtent, SIGNAL(triggered()), this, SLOT(zoomFull()));
   //
   mActionZoomToSelected= new QAction(QIcon(myIconPath+"/mActionZoomToSelected.png"), tr("Zoom To Selection"), this);
-  mActionZoomToSelected->setShortcut(tr("F"));
+  mActionZoomToSelected->setShortcut(tr("Ctrl+F"));
   mActionZoomToSelected->setStatusTip(tr("Zoom to selection"));
   connect(mActionZoomToSelected, SIGNAL(triggered()), this, SLOT(zoomToSelected()));
   //
@@ -560,34 +560,34 @@
   connect(mActionMeasure, SIGNAL(triggered()), this, SLOT(measure()));
   //
   mActionMeasureArea= new QAction(QIcon(myIconPath+"/mActionMeasureArea.png"), tr("Measure Area"), this);
-  mActionMeasureArea->setShortcut(tr("Alt+M"));
+  mActionMeasureArea->setShortcut(tr("Ctrl+J"));
   mActionMeasureArea->setStatusTip(tr("Measure an Area"));
   connect(mActionMeasureArea, SIGNAL(triggered()), this, SLOT(measureArea()));
   //
   mActionShowBookmarks= new QAction(QIcon(myIconPath+"/mActionShowBookmarks.png"), tr("Show Bookmarks"), this);
-  mActionShowBookmarks->setShortcut(tr("Ctrl+B"));
+  mActionShowBookmarks->setShortcut(tr("B"));
   mActionShowBookmarks->setStatusTip(tr("Show Bookmarks"));
   connect(mActionShowBookmarks, SIGNAL(triggered()), this, SLOT(showBookmarks()));
   //
   mActionNewBookmark= new QAction(QIcon(myIconPath+"/mActionNewBookmark.png"), tr("New Bookmark..."), this);
-  mActionNewBookmark->setShortcut(tr("Alt+B"));
+  mActionNewBookmark->setShortcut(tr("Ctrl+B"));
   mActionNewBookmark->setStatusTip(tr("New Bookmark"));
   connect(mActionNewBookmark, SIGNAL(triggered()), this, SLOT(newBookmark()));
   //
   mActionAddWmsLayer= new QAction(QIcon(myIconPath+"/mActionAddWmsLayer.png"), tr("Add WMS Layer..."), this);
-  mActionAddWmsLayer->setShortcut(tr("Ctrl+M"));
+  mActionAddWmsLayer->setShortcut(tr("W"));
   mActionAddWmsLayer->setStatusTip(tr("Add Web Mapping Server Layer"));
   connect(mActionAddWmsLayer, SIGNAL(triggered()), this, SLOT(addWmsLayer()));
   //
   mActionInOverview= new QAction(QIcon(myIconPath+"/mActionInOverview.png"), tr("In Overview"), this);
-  mActionInOverview->setShortcut(tr("Alt+O"));
+  mActionInOverview->setShortcut(tr("O"));
   mActionInOverview->setStatusTip(tr("Add current layer to overview map"));
   connect(mActionInOverview, SIGNAL(triggered()), this, SLOT(inOverview()));
   //
   // Plugin Menu Related Items
   //
   mActionShowPluginManager= new QAction(QIcon(myIconPath+"/mActionShowPluginManager.png"), tr("Plugin Manager..."), this);
-  mActionShowPluginManager->setShortcut(tr("Ctrl+P"));
+  // mActionShowPluginManager->setShortcut(tr("Ctrl+P"));
   mActionShowPluginManager->setStatusTip(tr("Open the plugin manager"));
   connect(mActionShowPluginManager, SIGNAL(triggered()), this, SLOT(showPluginManager()));
   //