benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the New Window command into the new Window menu

Browse source
This commit is contained in:
Joel Holdsworth 2009-02-01 17:12:44 +00:00
parent dc99cc5841
commit 0edd7ceda3
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui/workspace/actions.cpp
View file

@ -90,10 +90,6 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
sigc::mem_fun(*this, &Actions::on_menu_view_viewer)); sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
actionGroup->add(viewerPanelAction); actionGroup->add(viewerPanelAction);
actionGroup->add(Action::create("ViewNewWindow",
Gtk::StockID("new_window")),
sigc::mem_fun(*this, &Actions::on_menu_view_new_window));
// Sequence Menu // Sequence Menu
actionGroup->add(Action::create("SequenceMenu", _("_Sequence"))); actionGroup->add(Action::create("SequenceMenu", _("_Sequence")));
actionGroup->add(Action::create("SequenceAdd", _("_Add...")), actionGroup->add(Action::create("SequenceAdd", _("_Add...")),
@ -104,6 +100,12 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
actionGroup->add(Action::create("TrackAdd", _("_Add...")), actionGroup->add(Action::create("TrackAdd", _("_Add...")),
sigc::mem_fun(*this, &Actions::on_menu_track_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 // Help Menu
actionGroup->add(Action::create("HelpMenu", _("_Help")) ); actionGroup->add(Action::create("HelpMenu", _("_Help")) );
actionGroup->add(Action::create("HelpAbout", Stock::ABOUT), actionGroup->add(Action::create("HelpAbout", Stock::ABOUT),
@ -187,13 +189,6 @@ Actions::on_menu_view_viewer()
workspaceWindow.viewerPanel->show(viewerPanelAction->get_active()); 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 ===== */ /* ===== Sequence Menu Event Handlers ===== */
void void
@ -213,6 +208,15 @@ Actions::on_menu_track_add()
g_message("Hello"); 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 ===== */ /* ===== Help Menu Event Handlers ===== */
void void

3
src/gui/workspace/actions.hpp
View file

@ -69,12 +69,13 @@ private:
void on_menu_view_resources(); void on_menu_view_resources();
void on_menu_view_timeline(); void on_menu_view_timeline();
void on_menu_view_viewer(); void on_menu_view_viewer();
void on_menu_view_new_window();
void on_menu_sequence_add(); void on_menu_sequence_add();
void on_menu_track_add(); void on_menu_track_add();
void on_menu_window_new_window();
void on_menu_help_about(); void on_menu_help_about();
// Temporary Junk // Temporary Junk

5
src/gui/workspace/workspace-window.cpp
View file

@ -120,8 +120,6 @@ WorkspaceWindow::create_ui()
" <menuitem action='ViewResources'/>" " <menuitem action='ViewResources'/>"
" <menuitem action='ViewTimeline'/>" " <menuitem action='ViewTimeline'/>"
" <menuitem action='ViewViewer'/>" " <menuitem action='ViewViewer'/>"
" <separator/>"
" <menuitem action='ViewNewWindow'/>"
" </menu>" " </menu>"
" <menu action='SequenceMenu'>" " <menu action='SequenceMenu'>"
" <menuitem action='SequenceAdd'/>" " <menuitem action='SequenceAdd'/>"
@ -129,6 +127,9 @@ WorkspaceWindow::create_ui()
" <menu action='TrackMenu'>" " <menu action='TrackMenu'>"
" <menuitem action='TrackAdd'/>" " <menuitem action='TrackAdd'/>"
" </menu>" " </menu>"
" <menu action='WindowMenu'>"
" <menuitem action='WindowNewWindow'/>"
" </menu>"
" <menu action='HelpMenu'>" " <menu action='HelpMenu'>"
" <menuitem action='HelpAbout'/>" " <menuitem action='HelpAbout'/>"
" </menu>" " </menu>"