From 0edd7ceda3f51c59627b24a9d71e13cd0059c664 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Sun, 1 Feb 2009 17:12:44 +0000
Subject: [PATCH] Moved the New Window command into the new Window menu

---
 src/gui/workspace/actions.cpp          | 26 +++++++++++++++-----------
 src/gui/workspace/actions.hpp          |  3 ++-
 src/gui/workspace/workspace-window.cpp |  5 +++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp
index f1337fc94..2b0df60ed 100644
--- a/src/gui/workspace/actions.cpp
+++ b/src/gui/workspace/actions.cpp
@@ -90,10 +90,6 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
     sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
   actionGroup->add(viewerPanelAction);
   
-  actionGroup->add(Action::create("ViewNewWindow",
-    Gtk::StockID("new_window")),
-    sigc::mem_fun(*this, &Actions::on_menu_view_new_window));
-  
   // Sequence Menu
   actionGroup->add(Action::create("SequenceMenu", _("_Sequence")));
   actionGroup->add(Action::create("SequenceAdd", _("_Add...")),
@@ -104,6 +100,12 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
   actionGroup->add(Action::create("TrackAdd", _("_Add...")),
     sigc::mem_fun(*this, &Actions::on_menu_track_add));
 
+  // Window Menu
+  actionGroup->add(Action::create("WindowMenu", _("_Window")));
+  actionGroup->add(Action::create("WindowNewWindow",
+    Gtk::StockID("new_window")),
+    sigc::mem_fun(*this, &Actions::on_menu_window_new_window));
+
   // Help Menu
   actionGroup->add(Action::create("HelpMenu", _("_Help")) );
   actionGroup->add(Action::create("HelpAbout", Stock::ABOUT),
@@ -187,13 +189,6 @@ Actions::on_menu_view_viewer()
     workspaceWindow.viewerPanel->show(viewerPanelAction->get_active());
 }
 
-void
-Actions::on_menu_view_new_window()
-{
-  application().get_window_manager().new_window(workspaceWindow.project,
-    workspaceWindow.controller); 
-}
-
 /* ===== Sequence Menu Event Handlers ===== */
 
 void
@@ -213,6 +208,15 @@ Actions::on_menu_track_add()
   g_message("Hello");
 }
 
+/* ===== Window Menu Event Handlers ===== */
+
+void
+Actions::on_menu_window_new_window()
+{
+  application().get_window_manager().new_window(workspaceWindow.project,
+    workspaceWindow.controller); 
+}
+
 /* ===== Help Menu Event Handlers ===== */
 
 void
diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp
index eb995fc02..668c71975 100644
--- a/src/gui/workspace/actions.hpp
+++ b/src/gui/workspace/actions.hpp
@@ -69,12 +69,13 @@ private:
   void on_menu_view_resources();
   void on_menu_view_timeline();
   void on_menu_view_viewer();
-  void on_menu_view_new_window();
   
   void on_menu_sequence_add();
   
   void on_menu_track_add();
 
+  void on_menu_window_new_window();
+
   void on_menu_help_about();
   
   // Temporary Junk
diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp
index d79008367..1d872c5c9 100644
--- a/src/gui/workspace/workspace-window.cpp
+++ b/src/gui/workspace/workspace-window.cpp
@@ -120,8 +120,6 @@ WorkspaceWindow::create_ui()
       "      <menuitem action='ViewResources'/>"
       "      <menuitem action='ViewTimeline'/>"
       "      <menuitem action='ViewViewer'/>"
-      "      <separator/>"
-      "      <menuitem action='ViewNewWindow'/>"
       "    </menu>"
       "    <menu action='SequenceMenu'>"
       "      <menuitem action='SequenceAdd'/>"
@@ -129,6 +127,9 @@ WorkspaceWindow::create_ui()
       "    <menu action='TrackMenu'>"
       "      <menuitem action='TrackAdd'/>"
       "    </menu>"
+      "    <menu action='WindowMenu'>"
+      "      <menuitem action='WindowNewWindow'/>"
+      "    </menu>"
       "    <menu action='HelpMenu'>"
       "      <menuitem action='HelpAbout'/>"
       "    </menu>"