[passepartout] get close to the HIG

[Sven Herzberg <herzi src gnome org>]

commit 8f0458eb340154053091bbc20724c32a85138ed2
Author: Sven Herzberg <herzi lanedo com>
Date:   Mon Apr 13 11:50:06 2009 +0200

    get close to the HIG
    
    * src/pptout/windowmenus.cc: a little menu reorganization to be closer to the HIG
---
 src/pptout/windowmenus.cc |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pptout/windowmenus.cc b/src/pptout/windowmenus.cc
index 6779e9a..21260b4 100644
--- a/src/pptout/windowmenus.cc
+++ b/src/pptout/windowmenus.cc
@@ -216,7 +216,7 @@ void FrameWindow::create_menus() {
                        AccelKey("Delete"),
                        bind(sigc::ptr_fun(&delete_selected), &document_view));
   
-  page_group->add(Action::create("EditSelectAll", _("Select _All")),
+  page_group->add(Action::create("EditSelectAll", Stock::SELECT_ALL),
                   AccelKey("<control>A"),
                   bind(sigc::ptr_fun(&select_all_frames), &document_view,
                        true /* select */));
@@ -281,6 +281,7 @@ void FrameWindow::create_menus() {
   main_group->add(Action::create("PageMenu", _("_Page")));
   
   page_group->add(Action::create("PageDelete", _("_Delete")),
+		  AccelKey("<Ctrl>Delete"),
                   mem_fun(document_view, &DocumentView::delete_page));
   
   doc_group->add(Action::create("PageInsertBefore", _("Insert _Before ...")),
@@ -301,7 +302,7 @@ void FrameWindow::create_menus() {
                   bind(sigc::ptr_fun(toggle_toolbar), uimanager));
   {
     Glib::RefPtr<ToggleAction> action =
-      ToggleAction::create("ViewFullScreen", _("_Full screen"), "",
+      ToggleAction::create("ViewFullScreen", Stock::FULLSCREEN, _("_Full screen"), "",
                            false /* not active */);
     main_group->add(action, AccelKey("F11"),
                     bind(sigc::ptr_fun(toggle_fullscreen), action, this));
@@ -318,7 +319,7 @@ void FrameWindow::create_menus() {
                   bind(sigc::ptr_fun(&zoom), &zoom_factor, Stock::ZOOM_100));
   
   doc_group->add(Action::create("ViewProps", Stock::PROPERTIES,
-                                _("_Properties"), _("Show Properties window")),
+                                _("Show Properties window")),
                  mem_fun(PropertiesDialog::instance(),
                          &PropertiesDialog::show_raise));
   
@@ -338,7 +339,7 @@ void FrameWindow::create_menus() {
   // *** help menu ***
   main_group->add(Action::create("HelpMenu", _("_Help")));
   
-  main_group->add(Action::create("HelpHelp", Stock::HELP, _("_User's guide")),
+  main_group->add(Action::create("HelpHelp", Stock::HELP, _("_Contents")),
                   AccelKey("F1"),
                   ptr_fun(&Programs::open_docs));
   
@@ -356,7 +357,6 @@ void FrameWindow::create_menus() {
       "  <menubar name='MenuBar'>"
       "    <menu action='FileMenu'>"
       "      <menuitem action='FileNew'/>"
-      "      <menuitem action='FileNewView'/>"
       "      <menuitem action='FileOpen'/>"
       "      <menuitem action='FileOpenRecent'/>"
       "      <separator/>"
@@ -373,8 +373,8 @@ void FrameWindow::create_menus() {
       "    </menu>"
       
       "    <menu action='EditMenu'>"
-      "      <menuitem action='EditCopy'/>"
       "      <menuitem action='EditCut'/>"
+      "      <menuitem action='EditCopy'/>"
       "      <menuitem action='EditPaste'/>"
       "      <menuitem action='EditDelete'/>"
       "      <separator/>"
@@ -404,11 +404,14 @@ void FrameWindow::create_menus() {
       "      <menuitem action='ZoomIn'/>"
       "      <menuitem action='ZoomOut'/>"
       "      <menuitem action='Zoom100'/>"
+      // FIXME: best fit
       "      <separator/>"
       "      <menuitem action='ViewProps'/>"
       "      <menuitem action='ViewStreams'/>"
       "      <separator/>"
       "      <menuitem action='ViewSnapGrid'/>"
+      "      <separator/>"
+      "      <menuitem action='FileNewView'/>"
       "    </menu>"
 
       "    <menu action='PageMenu'>"