ardour/livetrax
13
0
Fork 0
Code

Use new Tabbable API

Browse Source
This commit is contained in:
Robin Gareus 2024-11-15 04:40:39 +01:00
parent 5c8bd6e977
commit 0b933127e9
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk2_ardour/mixer_ui.cc
View File

@ -133,7 +133,7 @@ Mixer_UI::instance ()
} }
Mixer_UI::Mixer_UI () Mixer_UI::Mixer_UI ()
: Tabbable (_("Mixer"), X_("mixer")) : Tabbable (_("Mixer"), X_("mixer"), NULL, true, Profile->get_mixbus () ? Tabbable::PaneRightBtm : Tabbable::PaneLeft)
, plugin_search_clear_button (X_("Clear")) , plugin_search_clear_button (X_("Clear"))
, _mixer_scene_release (0) , _mixer_scene_release (0)
, no_track_list_redisplay (false) , no_track_list_redisplay (false)
@ -164,13 +164,6 @@ Mixer_UI::Mixer_UI ()
contents().set_data ("ardour-bindings", bindings); contents().set_data ("ardour-bindings", bindings);
if (!Profile->get_mixbus ()) {
right_attachment_button.set_sensitive(false);
} else {
left_attachment_button.set_sensitive(false);
}
bottom_attachment_button.set_sensitive(false);
PresentationInfo::Change.connect (*this, invalidator (*this), std::bind (&Mixer_UI::presentation_info_changed, this, _1), gui_context()); PresentationInfo::Change.connect (*this, invalidator (*this), std::bind (&Mixer_UI::presentation_info_changed, this, _1), gui_context());
Route::FanOut.connect (*this, invalidator (*this), std::bind (&Mixer_UI::fan_out, this, _1, false, true), gui_context()); Route::FanOut.connect (*this, invalidator (*this), std::bind (&Mixer_UI::fan_out, this, _1, false, true), gui_context());
@ -415,7 +408,7 @@ Mixer_UI::Mixer_UI ()
favorite_plugins_scroller.show(); favorite_plugins_scroller.show();
group_display_vbox.show(); group_display_vbox.show();
group_display_frame.show(); group_display_frame.show();
favorite_plugins_frame.show(); favorite_plugins_frame.show_all();
rhs_pane1.show(); rhs_pane1.show();
rhs_pane2.show(); rhs_pane2.show();
strip_packer.show(); strip_packer.show();
@ -3717,7 +3710,6 @@ Mixer_UI::register_actions ()
act = ActionManager::register_toggle_action (group, "ToggleMixerList", _("(Mixer) Show Sidebar List"), sigc::mem_fun (*this, &Tabbable::att_left_button_toggled)); act = ActionManager::register_toggle_action (group, "ToggleMixerList", _("(Mixer) Show Sidebar List"), sigc::mem_fun (*this, &Tabbable::att_left_button_toggled));
left_attachment_button.set_related_action (act); left_attachment_button.set_related_action (act);
act = ActionManager::register_toggle_action (group, "ToggleMixerStrip", _("(Mixer) Show Sidebar Strip"), []{}); act = ActionManager::register_toggle_action (group, "ToggleMixerStrip", _("(Mixer) Show Sidebar Strip"), []{});
content_right_pane.remove(content_right_vbox);
} else { } else {
act = ActionManager::register_toggle_action (group, "ToggleMixerList", _("(Mixer) Show Sidebar List"), sigc::mem_fun (*this, &Tabbable::att_right_button_toggled)); act = ActionManager::register_toggle_action (group, "ToggleMixerList", _("(Mixer) Show Sidebar List"), sigc::mem_fun (*this, &Tabbable::att_right_button_toggled));
right_attachment_button.set_related_action (act); right_attachment_button.set_related_action (act);

2
gtk2_ardour/public_editor.cc
View File

@ -33,7 +33,7 @@ ARDOUR::DataType PublicEditor::pbdid_dragged_dt = ARDOUR::DataType::NIL;
PublicEditor::PublicEditor () PublicEditor::PublicEditor ()
: EditingContext (X_("Editor")) : EditingContext (X_("Editor"))
, Tabbable (_("Editor"), X_("editor")) , Tabbable (_("Editor"), X_("editor"), NULL, true, Tabbable::PaneLayout (Tabbable::AttLeft | Tabbable::PaneRightBtm))
{ {
_suspend_route_redisplay_counter.store (0); _suspend_route_redisplay_counter.store (0);
} }

7
gtk2_ardour/recorder_ui.cc
View File

@ -78,7 +78,7 @@ using namespace Menu_Helpers;
#define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ())) #define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ()))
RecorderUI::RecorderUI () RecorderUI::RecorderUI ()
: Tabbable (_("Recorder"), X_("recorder")) : Tabbable (_("Recorder"), X_("recorder"), NULL, true, Tabbable::NoPanes)
, _toolbar_sep (1.0) , _toolbar_sep (1.0)
, _btn_rec_all (_("All")) , _btn_rec_all (_("All"))
, _btn_rec_none (_("None")) , _btn_rec_none (_("None"))
@ -101,11 +101,6 @@ RecorderUI::RecorderUI ()
load_bindings (); load_bindings ();
register_actions (); register_actions ();
content_right_pane.remove(content_right_vbox);
left_attachment_button.set_sensitive(false);
bottom_attachment_button.set_sensitive(false);
right_attachment_button.set_sensitive(false);
/* monitoring */ /* monitoring */
_auto_input_button.set_related_action (ActionManager::get_action ("Transport", "ToggleAutoInput")); _auto_input_button.set_related_action (ActionManager::get_action ("Transport", "ToggleAutoInput"));
_auto_input_button.set_name ("transport option button"); _auto_input_button.set_name ("transport option button");

2
gtk2_ardour/trigger_page.cc
View File

@ -77,8 +77,6 @@ TriggerPage::TriggerPage ()
load_bindings (); load_bindings ();
register_actions (); register_actions ();
left_attachment_button.set_sensitive(false);
/* Match TriggerStrip::_name_button height */ /* Match TriggerStrip::_name_button height */
ArdourButton* spacer = manage (new ArdourButton (ArdourButton::Text)); ArdourButton* spacer = manage (new ArdourButton (ArdourButton::Text));
spacer->set_name ("mixer strip button"); spacer->set_name ("mixer strip button");