Add log window to windows menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@5861 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c19c39362d
commit
7363b3cea0
|
@ -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'>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -458,7 +458,7 @@ UI::process_error_message (Transmitter::Channel chn, const char *str)
|
|||
#endif
|
||||
break;
|
||||
case Transmitter::Info:
|
||||
#if OLD_STYLE_ERRORS
|
||||
#if OLD_STYLE_ERRORS
|
||||
prefix = "[INFO]: ";
|
||||
ptag = info_ptag;
|
||||
mtag = info_mtag;
|
||||
|
@ -489,15 +489,15 @@ UI::process_error_message (Transmitter::Channel chn, const char *str)
|
|||
cerr << "programmer error in UI::check_error_messages (channel = " << chn << ")\n";
|
||||
::exit (1);
|
||||
}
|
||||
|
||||
|
||||
errors->text().get_buffer()->begin_user_action();
|
||||
|
||||
if (fatal_received) {
|
||||
handle_fatal (str);
|
||||
} else {
|
||||
|
||||
|
||||
display_message (prefix, prefix_len, ptag, mtag, str);
|
||||
|
||||
|
||||
if (!errors->is_visible()) {
|
||||
toggle_errors();
|
||||
}
|
||||
|
@ -527,7 +527,7 @@ UI::display_message (const char *prefix, gint /*prefix_len*/, RefPtr<TextBuffer:
|
|||
buffer->insert_with_tag(buffer->end(), "\n", mtag);
|
||||
|
||||
errors->scroll_to_bottom ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
UI::handle_fatal (const char *message)
|
||||
|
@ -538,7 +538,7 @@ UI::handle_fatal (const char *message)
|
|||
HBox hpacker;
|
||||
|
||||
win.set_default_size (400, 100);
|
||||
|
||||
|
||||
string title;
|
||||
title = name();
|
||||
title += ": Fatal Error";
|
||||
|
@ -552,12 +552,12 @@ UI::handle_fatal (const char *message)
|
|||
win.get_vbox()->pack_start (hpacker, false, false);
|
||||
|
||||
quit.signal_clicked().connect(mem_fun(*this,&UI::quit));
|
||||
|
||||
|
||||
win.show_all ();
|
||||
win.set_modal (true);
|
||||
|
||||
theMain->run ();
|
||||
|
||||
|
||||
_exit (1);
|
||||
}
|
||||
|
||||
|
|
|
@ -137,13 +137,12 @@ class UI : public Receiver, public AbstractUI<UIRequest>
|
|||
static bool just_hide_it (GdkEventAny *, Gtk::Window *);
|
||||
|
||||
static pthread_t the_gui_thread() { return gui_thread; }
|
||||
|
||||
|
||||
protected:
|
||||
virtual void handle_fatal (const char *);
|
||||
virtual void display_message (const char *prefix, gint prefix_len,
|
||||
Glib::RefPtr<Gtk::TextBuffer::Tag> ptag,
|
||||
Glib::RefPtr<Gtk::TextBuffer::Tag> mtag,
|
||||
const char *msg);
|
||||
virtual void display_message (const char *prefix, gint prefix_len,
|
||||
Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag,
|
||||
const char *msg);
|
||||
|
||||
private:
|
||||
static UI *theGtkUI;
|
||||
|
|
Loading…
Reference in New Issue
Block a user