diff options
| author | David Robillard <d@drobilla.net> | 2009-10-22 18:11:22 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-22 18:11:22 +0000 |
| commit | 7363b3cea01bd7184386858b3da5ad460848e41f (patch) | |
| tree | 0ca96d0a1a999218313a717df05516ca6ebc7014 /gtk2_ardour | |
| parent | c19c39362db7e0e1d8f7fe4eaa4513bd3edbd6cd (diff) | |
Add log window to windows menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@5861 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 1378234d9a..3234bb2fa3 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -429,6 +429,7 @@ <menuitem action='toggle-bundle-manager'/> <menuitem action='toggle-audio-connection-manager'/> <menuitem action='toggle-midi-connection-manager'/> + <menuitem action='toggle-log-window'/> <separator/> </menu> <menu name='Help' action='Help'> diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 50bb96257b..e9b037d3c4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -686,7 +686,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI void audioengine_setup (); void display_message (const char *prefix, gint prefix_len, - Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, const char *msg); + Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag, + const char *msg); Gtk::Label status_bar_label; Gtk::ToggleButton error_log_button; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 0b9ad8bcba..613da7e631 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -90,17 +90,17 @@ ARDOUR_UI::setup_windows () editor->get_status_bar_packer().pack_start (*status_bar_packer, true, true); editor->get_status_bar_packer().pack_start (menu_bar_base, false, false, 6); #else - top_packer.pack_start (menu_bar_base, false, false); + top_packer.pack_start (menu_bar_base, false, false); #endif - top_packer.pack_start (transport_frame, false, false); + top_packer.pack_start (transport_frame, false, false); editor->add_toplevel_controls (top_packer); return 0; } - void +void ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg) { ustring text; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index b750dd46f7..3a0045b6f7 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -571,6 +571,9 @@ Editor::register_actions () ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "toggle-midi-connection-manager", _("MIDI Connection Manager"), bind (mem_fun (*this, &Editor::show_global_port_matrix), ARDOUR::DataType::MIDI)); ActionManager::session_sensitive_actions.push_back (act); + act = ActionManager::register_action (editor_actions, "toggle-log-window", _("Log"), + mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::toggle_errors)); + ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "tab-to-transient-forwards", _("Move Forward to Transient"), bind (mem_fun(*this, &Editor::tab_to_transient), true)); ActionManager::session_sensitive_actions.push_back (act); |