diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-25 15:56:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:38 -0400 |
| commit | 99b0712be451bf16ce9266ebe622c3ed38bf412f (patch) | |
| tree | 3795ef944bfda95aa879da71dda17476ffc53af7 /gtk2_ardour/ardour_ui_dialogs.cc | |
| parent | f4032599f207ecb1e0994088bbffe687c4a90693 (diff) | |
remove the entire idea of a tabbable for VCA master faders
Conflicts:
gtk2_ardour/master_faders.cc
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 302f52b503..b96ae22075 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -52,7 +52,6 @@ #include "lua_script_manager.h" #include "luawindow.h" #include "main_clock.h" -#include "master_faders.h" #include "meterbridge.h" #include "meter_patterns.h" #include "monitor_section.h" @@ -551,7 +550,6 @@ ARDOUR_UI::tabs_page_added (Widget*,guint) editor_visibility_button.drag_source_set (drag_target_entries); mixer_visibility_button.drag_source_set (drag_target_entries); prefs_visibility_button.drag_source_set (drag_target_entries); - masters_visibility_button.drag_source_set (drag_target_entries); editor_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (editor->name(), Pango::FontDescription ("Sans 24"), @@ -565,10 +563,6 @@ ARDOUR_UI::tabs_page_added (Widget*,guint) Pango::FontDescription ("Sans 24"), 0, 0, Gdk::Color ("red"))); - masters_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (masters->name(), - Pango::FontDescription ("Sans 24"), - 0, 0, - Gdk::Color ("red"))); } } @@ -579,7 +573,6 @@ ARDOUR_UI::tabs_page_removed (Widget*, guint) editor_visibility_button.drag_source_unset (); mixer_visibility_button.drag_source_unset (); prefs_visibility_button.drag_source_unset (); - masters_visibility_button.drag_source_unset (); } } @@ -608,10 +601,6 @@ ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page) prefs_visibility_button.set_active_state (Gtkmm2ext::Off); } - if (masters && (masters->tabbed() || masters->tabbed_by_default())) { - masters_visibility_button.set_active_state (Gtkmm2ext::Off); - } - } else if (page == (guint) _tabs.page_num (rc_option_editor->contents())) { if (editor && (editor->tabbed() || editor->tabbed_by_default())) { @@ -623,26 +612,6 @@ ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page) } prefs_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive); - - if (masters && (masters->tabbed() || masters->tabbed_by_default())) { - masters_visibility_button.set_active_state (Gtkmm2ext::Off); - } - - } else if (page == (guint) _tabs.page_num (masters->contents())) { - - if (editor && (editor->tabbed() || editor->tabbed_by_default())) { - editor_visibility_button.set_active_state (Gtkmm2ext::Off); - } - - if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) { - mixer_visibility_button.set_active_state (Gtkmm2ext::Off); - } - - if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) { - prefs_visibility_button.set_active_state (Gtkmm2ext::Off); - } - - masters_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive); } } @@ -731,22 +700,14 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) vis_button = &editor_visibility_button; other_vis_buttons.push_back (&mixer_visibility_button); other_vis_buttons.push_back (&prefs_visibility_button); - other_vis_buttons.push_back (&masters_visibility_button); } else if (&t == mixer) { vis_button = &mixer_visibility_button; other_vis_buttons.push_back (&editor_visibility_button); other_vis_buttons.push_back (&prefs_visibility_button); - other_vis_buttons.push_back (&masters_visibility_button); } else if (&t == rc_option_editor) { vis_button = &prefs_visibility_button; other_vis_buttons.push_back (&editor_visibility_button); - other_vis_buttons.push_back (&masters_visibility_button); other_vis_buttons.push_back (&mixer_visibility_button); - } else if (&t == masters) { - vis_button = &masters_visibility_button; - other_vis_buttons.push_back (&editor_visibility_button); - other_vis_buttons.push_back (&mixer_visibility_button); - other_vis_buttons.push_back (&prefs_visibility_button); } if (!vis_button) { |