we_have_dependents ();
- setup_clock ();
- setup_transport();
- build_menu_bar ();
-
theme_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleThemeManager")));
#ifdef TOP_MENUBAR
HBox* status_bar_packer = manage (new HBox);
+ EventBox* status_bar_event_box = manage (new EventBox);
+ status_bar_event_box->add (status_bar_label);
+ status_bar_event_box->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
status_bar_label.set_size_request (300, -1);
- status_bar_packer->pack_start (status_bar_label, true, true, 6);
+ status_bar_packer->pack_start (*status_bar_event_box, true, true, 6);
status_bar_packer->pack_start (error_log_button, false, false);
- error_log_button.signal_clicked().connect (sigc::mem_fun (*this, &UI::toggle_errors));
+ status_bar_label.show ();
+ status_bar_event_box->show ();
+ status_bar_packer->show ();
+ error_log_button.show ();
+
+ error_log_button.signal_clicked().connect (mem_fun (*this, &UI::toggle_errors));
+ status_bar_event_box->signal_button_press_event().connect (mem_fun (*this, &ARDOUR_UI::status_bar_button_press));
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);
editor->add_toplevel_controls (top_packer);
+ setup_clock ();
+ setup_transport();
+ build_menu_bar ();
+
setup_tooltips ();
return 0;
editor->setup_tooltips ();
}
+bool
+ARDOUR_UI::status_bar_button_press (GdkEventButton* ev)
+{
+ bool handled = false;
+
+ switch (ev->button) {
+ case 1:
+ status_bar_label.set_text ("");
+ handled = true;
+ break;
+ default:
+ break;
+ }
+
+ return handled;
+}
+
void
ARDOUR_UI::display_message (const char *prefix, gint prefix_len, RefPtr<TextBuffer::Tag> ptag, RefPtr<TextBuffer::Tag> mtag, const char *msg)
{
#endif
}
-#if 0
-static bool
-null_crossing (GdkEventCrossing* /* ignored */)
+XMLNode*
+ARDOUR_UI::tearoff_settings (const char* name) const
{
- return true;
-}
+ XMLNode* ui_node = Config->extra_xml(X_("UI"));
+
+ if (ui_node) {
+ XMLNode* tearoff_node = ui_node->child (X_("Tearoffs"));
+ if (tearoff_node) {
+ XMLNode* mnode = tearoff_node->child (name);
+ return mnode;
+ }
+ }
-static void
-block_prelight (Gtk::Widget& w)
-{
- w.signal_enter_notify_event().connect (sigc::ptr_fun (null_crossing), false);
- w.signal_leave_notify_event().connect (sigc::ptr_fun (null_crossing), false);
+ return 0;
}
-#endif
void
ARDOUR_UI::setup_transport ()
/* CANNOT sigc::bind these to clicked or toggled, must use pressed or released */
solo_alert_button.set_name ("TransportSoloAlert");
- solo_alert_button.signal_pressed().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_toggle));
+ solo_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::solo_alert_press), false);
auditioning_alert_button.set_name ("TransportAuditioningAlert");
- auditioning_alert_button.signal_pressed().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_toggle));
+ auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false);
alert_box.pack_start (solo_alert_button, false, false);
alert_box.pack_start (auditioning_alert_button, false, false);
Image* img = manage (new Image ((::get_icon (X_("sae")))));
transport_tearoff_hbox.pack_end (*img, false, false, 6);
}
+
+ XMLNode* tnode = tearoff_settings ("transport");
+ if (tnode) {
+ transport_tearoff->set_state (*tnode);
+ }
}
void
void
ARDOUR_UI::auditioning_changed (bool onoff)
{
- UI::instance()->call_slot (boost::bind (&ARDOUR_UI::_auditioning_changed, this, onoff));
+ UI::instance()->call_slot (MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::_auditioning_changed, this, onoff));
}
-void
-ARDOUR_UI::audition_alert_toggle ()
+bool
+ARDOUR_UI::audition_alert_press (GdkEventButton* ev)
{
if (_session) {
_session->cancel_audition();
}
+ return true;
}
-void
-ARDOUR_UI::solo_alert_toggle ()
+bool
+ARDOUR_UI::solo_alert_press (GdkEventButton* ev)
{
- if (_session) {
- _session->set_solo (_session->get_routes(), !_session->soloing());
- }
+ if (_session) {
+ if (_session->soloing()) {
+ _session->set_solo (_session->get_routes(), false);
+ } else if (_session->listening()) {
+ _session->set_listen (_session->get_routes(), false);
+ }
+ }
+ return true;
}
void
return;
}
- if (_session->soloing()) {
+ if (_session->soloing() || _session->listening()) {
if (onoff) {
solo_alert_button.set_state (STATE_ACTIVE);
} else {
if (x != 0) {
if (Config->get_shuttle_units() == Percentage) {
- snprintf (buf, sizeof (buf), "%.2f", x);
+ snprintf (buf, sizeof (buf), "%d", (int) round (x * 100));
} else {
if (x < 0) {