From d5bcf90b1a20a55fd15ac54a17577011bd75a0ae Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 27 Jul 2015 18:05:42 -0400 Subject: [PATCH] remove all tearoffs except the monitor section. We don't need this functionality anymore as we build on 15 years experience plus the new tabbed structure --- gtk2_ardour/ardour.menus.in | 2 - gtk2_ardour/ardour_ui.h | 14 +---- gtk2_ardour/ardour_ui2.cc | 79 ++++-------------------- gtk2_ardour/ardour_ui_dialogs.cc | 12 ++-- gtk2_ardour/ardour_ui_ed.cc | 21 +------ gtk2_ardour/ardour_ui_options.cc | 18 ++---- gtk2_ardour/editor.cc | 102 ++----------------------------- gtk2_ardour/editor.h | 16 ----- gtk2_ardour/editor_actions.cc | 5 -- gtk2_ardour/editor_mouse.cc | 1 - gtk2_ardour/public_editor.h | 9 --- gtk2_ardour/ui_config_vars.h | 1 - 12 files changed, 29 insertions(+), 251 deletions(-) diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 24bd1793d6..d0d75d52eb 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -396,8 +396,6 @@ - - diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index d54063b782..c1905f322b 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -141,10 +141,6 @@ namespace ARDOUR { class ProcessThread; } -namespace Gtkmm2ext { - class TearOff; -} - namespace Gtk { class ProgressBar; } @@ -225,7 +221,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr XMLNode* mixer_settings () const; XMLNode* keyboard_settings () const; XMLNode* tearoff_settings (const char*) const; - + void save_ardour_state (); gboolean configure_handler (GdkEventConfigure* conf); @@ -305,8 +301,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr bool check_audioengine(Gtk::Window&); - void update_tearoff_visibility (); - void setup_profile (); void setup_tooltips (); @@ -428,15 +422,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr std::list _midi_tracer_windows; - void detach_tearoff (Gtk::Box* parent, Gtk::Widget* contents); - void reattach_tearoff (Gtk::Box* parent, Gtk::Widget* contents, int32_t order); - void reattach_all_tearoffs (); - /* Transport Control */ - Gtkmm2ext::TearOff* transport_tearoff; Gtk::Frame transport_frame; - Gtk::HBox transport_tearoff_hbox; Gtk::HBox transport_hbox; Gtk::Fixed transport_base; Gtk::Fixed transport_button_base; diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 2e86fc703b..0fc4c9ea59 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -36,7 +36,6 @@ #include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/click_box.h" -#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/window_title.h" #include "ardour/profile.h" @@ -231,18 +230,8 @@ ARDOUR_UI::setup_transport () { RefPtr act; - transport_tearoff_hbox.set_border_width (PX_SCALE(3)); - transport_tearoff_hbox.set_spacing (PX_SCALE(3)); - - transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); - transport_tearoff->set_name ("TransportBase"); - transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); - - if (Profile->get_sae() || Profile->get_mixbus()) { - transport_tearoff->set_can_be_torn_off (false); - } - - transport_hbox.pack_start (*transport_tearoff, true, false); + transport_hbox.set_border_width (PX_SCALE(3)); + transport_hbox.set_spacing (PX_SCALE(3)); transport_base.set_name ("TransportBase"); transport_base.add (transport_hbox); @@ -251,15 +240,6 @@ ARDOUR_UI::setup_transport () transport_frame.set_name ("BaseFrame"); transport_frame.add (transport_base); - transport_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); - transport_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::detach_tearoff), static_cast(&top_packer), - static_cast(&transport_frame))); - transport_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::reattach_tearoff), static_cast (&top_packer), - static_cast (&transport_frame), 1)); - auto_return_button.set_text(_("Auto Return")); follow_edits_button.set_text(_("Follow Edits")); @@ -433,11 +413,7 @@ ARDOUR_UI::setup_transport () time_info_box = manage (new TimeInfoBox); - if (ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*time_info_box, false, false); - } - - transport_tearoff_hbox.pack_start (*transport_vbox, false, false); + transport_hbox.pack_start (*transport_vbox, false, true); /* transport related toggle controls */ @@ -451,60 +427,35 @@ ARDOUR_UI::setup_transport () } if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); + transport_hbox.pack_start (*auto_box, false, false); } - transport_tearoff_hbox.pack_start (*clock_box, true, true); + transport_hbox.pack_start (*clock_box, true, true); if (ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*auto_box, false, false); + transport_hbox.pack_start (*auto_box, false, false); } if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (*time_info_box, false, false); + transport_hbox.pack_start (*time_info_box, false, false); } if (!ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (alert_box, false, false); - transport_tearoff_hbox.pack_start (meter_box, false, false); - transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + transport_hbox.pack_start (alert_box, false, false); + transport_hbox.pack_start (meter_box, false, false); + transport_hbox.pack_start (editor_meter_peak_display, false, false); } if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); - transport_tearoff_hbox.pack_end (*img, false, false); + transport_hbox.pack_end (*img, false, false); } /* desensitize */ set_transport_sensitivity (false); - - XMLNode* tnode = tearoff_settings ("transport"); - if (tnode) { - transport_tearoff->set_state (*tnode); - } } #undef PX_SCALE -void -ARDOUR_UI::detach_tearoff (Box* b, Widget* w) -{ - b->remove (*w); -} - -void -ARDOUR_UI::reattach_tearoff (Box* b, Widget* w, int32_t n) -{ - b->pack_start (*w); - b->reorder_child (*w, n); -} - -void -ARDOUR_UI::reattach_all_tearoffs () -{ - if (transport_tearoff) transport_tearoff->put_it_back(); - if (editor) editor->reattach_all_tearoffs (); -} - void ARDOUR_UI::soloing_changed (bool onoff) { @@ -676,14 +627,6 @@ ARDOUR_UI::editor_realized () UIConfiguration::instance().reset_dpi (); } -void -ARDOUR_UI::update_tearoff_visibility () -{ - if (editor) { - editor->update_tearoff_visibility (); - } -} - void ARDOUR_UI::maximise_editing_space () { diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 1e94f68859..ca284698d1 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -192,8 +192,8 @@ ARDOUR_UI::set_session (Session *s) update_format (); if (meter_box.get_parent()) { - transport_tearoff_hbox.remove (meter_box); - transport_tearoff_hbox.remove (editor_meter_peak_display); + transport_hbox.remove (meter_box); + transport_hbox.remove (editor_meter_peak_display); } if (editor_meter) { @@ -204,8 +204,8 @@ ARDOUR_UI::set_session (Session *s) } if (meter_box.get_parent()) { - transport_tearoff_hbox.remove (meter_box); - transport_tearoff_hbox.remove (editor_meter_peak_display); + transport_hbox.remove (meter_box); + transport_hbox.remove (editor_meter_peak_display); } if (_session && @@ -235,8 +235,8 @@ ARDOUR_UI::set_session (Session *s) editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false); if (UIConfiguration::instance().get_show_editor_meter() && !ARDOUR::Profile->get_trx()) { - transport_tearoff_hbox.pack_start (meter_box, false, false); - transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + transport_hbox.pack_start (meter_box, false, false); + transport_hbox.pack_start (editor_meter_peak_display, false, false); meter_box.show(); editor_meter_peak_display.show(); } diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index f763b313e5..1b7e103916 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -32,10 +32,10 @@ #include #include +#include "gtkmm2ext/cairo_packer.h" +#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" -#include "gtkmm2ext/tearoff.h" -#include "gtkmm2ext/cairo_packer.h" #include "pbd/file_utils.h" #include "pbd/fpu.h" @@ -240,7 +240,6 @@ ARDOUR_UI::install_actions () ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalEditor"), _("Maximise Editor Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_editing_space)); ActionManager::register_toggle_action (common_actions, X_("ToggleMaximalMixer"), _("Maximise Mixer Space"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_mixer_space)); - act = ActionManager::register_toggle_action (common_actions, X_("KeepTearoffs"), _("Show Toolbars"), mem_fun (*this, &ARDOUR_UI::toggle_keep_tearoffs)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_toggle_action (common_actions, X_("ToggleMixerList"), _("Toggle Mixer List"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_mixer_list)); @@ -254,8 +253,6 @@ if (Profile->get_mixbus()) ActionManager::register_action (common_actions, X_("toggle-meterbridge"), S_("Window|Meterbridge"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_meterbridge)); - ActionManager::register_action (common_actions, X_("reattach-all-tearoffs"), _("Reattach All Tearoffs"), sigc::mem_fun (*this, &ARDOUR_UI::reattach_all_tearoffs)); - act = ActionManager::register_action (common_actions, X_("NewMIDITracer"), _("MIDI Tracer"), sigc::mem_fun(*this, &ARDOUR_UI::new_midi_tracer_window)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::register_action (common_actions, X_("chat"), _("Chat"), sigc::mem_fun(*this, &ARDOUR_UI::launch_chat)); @@ -683,28 +680,14 @@ ARDOUR_UI::save_ardour_state () WM::Manager::instance().add_state (*window_node); - /* tearoffs */ - XMLNode* tearoff_node = new XMLNode (X_("Tearoffs")); - if (transport_tearoff) { - XMLNode* t = new XMLNode (X_("transport")); - transport_tearoff->add_state (*t); - tearoff_node->add_child_nocopy (*t); - } - if (mixer->monitor_section()) { XMLNode* t = new XMLNode (X_("monitor-section")); mixer->monitor_section()->tearoff().add_state (*t); tearoff_node->add_child_nocopy (*t); } - if (editor->mouse_mode_tearoff()) { - XMLNode* t = new XMLNode (X_("mouse-mode")); - editor->mouse_mode_tearoff ()->add_state (*t); - tearoff_node->add_child_nocopy (*t); - } - window_node->add_child_nocopy (*tearoff_node); XMLNode& enode (editor->get_state()); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 028467095b..e2a3696417 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -45,14 +45,6 @@ using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -void -ARDOUR_UI::toggle_keep_tearoffs () -{ - ActionManager::toggle_config_state ("Common", "KeepTearoffs", &UIConfiguration::set_keep_tearoffs, &UIConfiguration::get_keep_tearoffs); - - ARDOUR_UI::update_tearoff_visibility(); -} - void ARDOUR_UI::toggle_external_sync() { @@ -346,8 +338,6 @@ ARDOUR_UI::parameter_changed (std::string p) ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc); - } else if (p == "keep-tearoffs") { - ActionManager::map_some_state ("Common", "KeepTearoffs", &UIConfiguration::get_keep_tearoffs); } else if (p == "mmc-control") { ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control); } else if (p == "midi-feedback") { @@ -411,13 +401,13 @@ ARDOUR_UI::parameter_changed (std::string p) if (editor_meter) { if (meter_box.get_parent()) { - transport_tearoff_hbox.remove (meter_box); - transport_tearoff_hbox.remove (editor_meter_peak_display); + transport_hbox.remove (meter_box); + transport_hbox.remove (editor_meter_peak_display); } if (show) { - transport_tearoff_hbox.pack_start (meter_box, false, false); - transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); + transport_hbox.pack_start (meter_box, false, false); + transport_hbox.pack_start (editor_meter_peak_display, false, false); meter_box.show(); editor_meter_peak_display.show(); } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 2e4dbbb438..41d79d35e1 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -59,7 +59,6 @@ #include "gtkmm2ext/bindings.h" #include "gtkmm2ext/grouped_buttons.h" #include "gtkmm2ext/gtk_ui.h" -#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/window_title.h" #include "gtkmm2ext/choice.h" @@ -397,10 +396,7 @@ Editor::Editor () , bbt_beat_subdivision (4) , _visible_track_count (-1) , toolbar_selection_clock_table (2,3) - , _mouse_mode_tearoff (0) , automation_mode_button (_("mode")) - , _zoom_tearoff (0) - , _tools_tearoff (0) , _toolbar_viewport (*manage (new Gtk::Adjustment (0, 0, 1e10)), *manage (new Gtk::Adjustment (0, 0, 1e10))) , selection (new Selection (this)) , cut_buffer (new Selection (this)) @@ -2893,25 +2889,9 @@ Editor::setup_toolbar () if (!ARDOUR::Profile->get_trx()) { mode_box->pack_start (edit_mode_selector, false, false); } + mode_box->pack_start (*mouse_mode_box, false, false); - - _mouse_mode_tearoff = manage (new TearOff (*mode_box)); - _mouse_mode_tearoff->set_name ("MouseModeBase"); - _mouse_mode_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_mouse_mode_tearoff->tearoff_window()), false); - - if (Profile->get_sae() || Profile->get_mixbus() ) { - _mouse_mode_tearoff->set_can_be_torn_off (false); - } - - _mouse_mode_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_mouse_mode_tearoff->tearoff_window())); - _mouse_mode_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_mouse_mode_tearoff->tearoff_window(), 1)); - _mouse_mode_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_mouse_mode_tearoff->tearoff_window())); - _mouse_mode_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_mouse_mode_tearoff->tearoff_window(), 1)); - + /* Zoom */ _zoom_box.set_spacing (2); @@ -2982,23 +2962,6 @@ Editor::setup_toolbar () _zoom_box.pack_start (tav_expand_button); } - if (!ARDOUR::Profile->get_trx()) { - _zoom_tearoff = manage (new TearOff (_zoom_box)); - - _zoom_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_zoom_tearoff->tearoff_window())); - _zoom_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_zoom_tearoff->tearoff_window(), 0)); - _zoom_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_zoom_tearoff->tearoff_window())); - _zoom_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_zoom_tearoff->tearoff_window(), 0)); - } - - if (Profile->get_sae() || Profile->get_mixbus() ) { - _zoom_tearoff->set_can_be_torn_off (false); - } - snap_box.set_spacing (2); snap_box.set_border_width (2); @@ -3031,37 +2994,19 @@ Editor::setup_toolbar () HBox* hbox = manage (new HBox); hbox->set_spacing(2); - _tools_tearoff = manage (new TearOff (*hbox)); - _tools_tearoff->set_name ("MouseModeBase"); - _tools_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &_tools_tearoff->tearoff_window()), false); - - if (Profile->get_sae() || Profile->get_mixbus()) { - _tools_tearoff->set_can_be_torn_off (false); - } - - _tools_tearoff->Detach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_tools_tearoff->tearoff_window())); - _tools_tearoff->Attach.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_tools_tearoff->tearoff_window(), 0)); - _tools_tearoff->Hidden.connect (sigc::bind (sigc::mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - &_tools_tearoff->tearoff_window())); - _tools_tearoff->Visible.connect (sigc::bind (sigc::mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - &_tools_tearoff->tearoff_window(), 0)); - toolbar_hbox.set_spacing (2); toolbar_hbox.set_border_width (1); - toolbar_hbox.pack_start (*_mouse_mode_tearoff, false, false); + toolbar_hbox.pack_start (*mode_box, false, false); if (!ARDOUR::Profile->get_trx()) { - toolbar_hbox.pack_start (*_zoom_tearoff, false, false); - toolbar_hbox.pack_start (*_tools_tearoff, false, false); + toolbar_hbox.pack_start (_zoom_box, false, false); + toolbar_hbox.pack_start (*hbox, false, false); } if (!ARDOUR::Profile->get_trx()) { hbox->pack_start (snap_box, false, false); hbox->pack_start (*nudge_box, false, false); } - hbox->pack_start (panic_box, false, false); hbox->show_all (); @@ -3885,24 +3830,6 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) } } -void -Editor::detach_tearoff (Box* /*b*/, Window* /*w*/) -{ - if ((_tools_tearoff->torn_off() || !_tools_tearoff->visible()) && - (_mouse_mode_tearoff->torn_off() || !_mouse_mode_tearoff->visible()) && - (_zoom_tearoff && (_zoom_tearoff->torn_off() || !_zoom_tearoff->visible()))) { - top_hbox.remove (toolbar_frame); - } -} - -void -Editor::reattach_tearoff (Box* /*b*/, Window* /*w*/, int32_t /*n*/) -{ - if (toolbar_frame.get_parent() == 0) { - top_hbox.pack_end (toolbar_frame); - } -} - void Editor::set_show_measures (bool yn) { @@ -4182,25 +4109,6 @@ Editor::session_state_saved (string) _snapshots->redisplay (); } -void -Editor::update_tearoff_visibility() -{ - bool visible = UIConfiguration::instance().get_keep_tearoffs(); - _mouse_mode_tearoff->set_visible (visible); - _tools_tearoff->set_visible (visible); - if (_zoom_tearoff) { - _zoom_tearoff->set_visible (visible); - } -} - -void -Editor::reattach_all_tearoffs () -{ - if (_mouse_mode_tearoff) _mouse_mode_tearoff->put_it_back (); - if (_tools_tearoff) _tools_tearoff->put_it_back (); - if (_zoom_tearoff) _zoom_tearoff->put_it_back (); -} - void Editor::maximise_editing_space () { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ec7c73dddf..b9521218af 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -62,7 +62,6 @@ #include "selection_memento.h" namespace Gtkmm2ext { - class TearOff; class Bindings; } @@ -383,9 +382,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void maximise_editing_space(); void restore_editing_space(); - void update_tearoff_visibility(); - void reattach_all_tearoffs (); - double get_y_origin () const; void reset_x_origin (framepos_t); void reset_x_origin_to_follow_playhead (); @@ -441,9 +437,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD TrackViewList axis_views_from_routes (boost::shared_ptr) const; - Gtkmm2ext::TearOff* mouse_mode_tearoff () const { return _mouse_mode_tearoff; } - Gtkmm2ext::TearOff* tools_tearoff () const { return _tools_tearoff; } - void snap_to (framepos_t& first, ARDOUR::RoundMode direction = ARDOUR::RoundNearest, bool for_mark = false, @@ -1740,7 +1733,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Table toolbar_selection_clock_table; Gtk::Label toolbar_selection_cursor_label; - Gtkmm2ext::TearOff* _mouse_mode_tearoff; ArdourButton mouse_select_button; ArdourButton mouse_draw_button; ArdourButton mouse_move_button; @@ -1799,23 +1791,17 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Glib::RefPtr zoom_focus_action (Editing::ZoomFocus); Gtk::HBox _zoom_box; - Gtkmm2ext::TearOff* _zoom_tearoff; void zoom_adjustment_changed(); void setup_toolbar (); void setup_tooltips (); - Gtkmm2ext::TearOff* _tools_tearoff; Gtk::HBox toolbar_hbox; Gtk::EventBox toolbar_base; Gtk::Frame toolbar_frame; Gtk::Viewport _toolbar_viewport; - /* midi toolbar */ - - Gtk::HBox panic_box; - void setup_midi_toolbar (); /* selection process */ @@ -2034,8 +2020,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void cms_new (boost::shared_ptr); void current_mixer_strip_hidden (); - void detach_tearoff (Gtk::Box* b, Gtk::Window* w); - void reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n); #ifdef GTKOSX void ensure_all_elements_drawn (); #endif diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 9b4c29e562..3dc9be6809 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -22,7 +22,6 @@ #include "pbd/file_utils.h" -#include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/utils.h" #include "ardour/filesystem_paths.h" @@ -1730,10 +1729,6 @@ Editor::parameter_changed (std::string p) } } else if (p == "timecode-offset" || p == "timecode-offset-negative") { update_just_timecode (); - } else if (p == "show-zoom-tools") { - if (_zoom_tearoff) { - _zoom_tearoff->set_visible (UIConfiguration::instance().get_show_zoom_tools(), true); - } } else if (p == "sound-midi-notes") { Glib::RefPtr act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index a7b7059a12..48d838a1db 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -34,7 +34,6 @@ #include "gtkmm2ext/bindings.h" #include "gtkmm2ext/utils.h" -#include "gtkmm2ext/tearoff.h" #include "canvas/canvas.h" diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 8736ea4b61..e2e0e4fbc1 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -63,10 +63,6 @@ namespace Gtk { class Menu; } -namespace Gtkmm2ext { - class TearOff; -} - class AudioRegionView; class AutomationLine; class AutomationTimeAxisView; @@ -284,8 +280,6 @@ class PublicEditor : public Gtkmm2ext::Tabbable { virtual void remove_last_capture () = 0; virtual void maximise_editing_space () = 0; virtual void restore_editing_space () = 0; - virtual void update_tearoff_visibility () = 0; - virtual void reattach_all_tearoffs () = 0; virtual framepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0; virtual void toggle_meter_updating() = 0; virtual void split_regions_at (framepos_t, RegionSelection&) = 0; @@ -379,9 +373,6 @@ class PublicEditor : public Gtkmm2ext::Tabbable { virtual TrackViewList axis_views_from_routes (boost::shared_ptr) const = 0; virtual TrackViewList const & get_track_views () = 0; - virtual Gtkmm2ext::TearOff* mouse_mode_tearoff () const = 0; - virtual Gtkmm2ext::TearOff* tools_tearoff () const = 0; - virtual DragManager* drags () const = 0; virtual void maybe_autoscroll (bool, bool, bool from_headers) = 0; virtual void stop_canvas_autoscroll () = 0; diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index e512fe397b..c52820ebff 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -35,7 +35,6 @@ UI_CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi") UI_CONFIG_VARIABLE (std::string, keyboard_layout_name, "keyboard-layout-name", "ansi") UI_CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour") UI_CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", false) -UI_CONFIG_VARIABLE (bool, keep_tearoffs, "keep-tearoffs", true) UI_CONFIG_VARIABLE (bool, default_narrow_ms, "default-narrow_ms", false) UI_CONFIG_VARIABLE (bool, name_new_markers, "name-new-markers", false) UI_CONFIG_VARIABLE (bool, rubberbanding_snaps_to_grid, "rubberbanding-snaps-to-grid", false) -- 2.30.2