ardour/livetrax
13
0
Fork 0
Code

Remove unused region-property-editor widgets, for now

Browse Source
This commit is contained in:
Ben Loftis 2022-01-17 13:02:30 -06:00
parent fef4c2aba0
commit 2f0e8e4cd7
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor.cc
View File

@ -677,10 +677,9 @@ Editor::Editor ()
Location::end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); Location::end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
Location::changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context()); Location::changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
#if 0 #if SELECTION_PROPERTIES_BOX_TODO
add_notebook_page (_("Selection"), *_properties_box); add_notebook_page (_("Selection"), *_properties_box);
#else #warning Fix Properties Sidebar Layout to fit < 720px height
#warning @Ben Fix Properties Sidebar Layout to fit < 720px height
#endif #endif
add_notebook_page (_("Tracks & Busses"), _routes->widget ()); add_notebook_page (_("Tracks & Busses"), _routes->widget ());
add_notebook_page (_("Sources"), _sources->widget ()); add_notebook_page (_("Sources"), _sources->widget ());
@ -738,8 +737,8 @@ Editor::Editor ()
editor_summary_pane.add (_summary_hbox); editor_summary_pane.add (_summary_hbox);
edit_pane.set_check_divider_position (true); edit_pane.set_check_divider_position (true);
edit_pane.add (editor_summary_pane); edit_pane.add (editor_summary_pane);
_editor_list_vbox.pack_start (*_properties_box, false, false, 0);
_editor_list_vbox.pack_start (_the_notebook); _editor_list_vbox.pack_start (_the_notebook);
// _editor_list_vbox.pack_start (*_properties_box, false, false, 0);
edit_pane.add (_editor_list_vbox); edit_pane.add (_editor_list_vbox);
edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */ edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */

17
gtk2_ardour/selection_properties_box.cc
View File

@ -65,6 +65,7 @@ SelectionPropertiesBox::SelectionPropertiesBox ()
_time_info_box = new TimeInfoBox ("EditorTimeInfo", true); _time_info_box = new TimeInfoBox ("EditorTimeInfo", true);
pack_start(*_time_info_box, false, false, 0); pack_start(*_time_info_box, false, false, 0);
#if SELECTION_PROPERTIES_BOX_TODO
/* Region ops (mute/unmute), for multiple-Region selections */ /* Region ops (mute/unmute), for multiple-Region selections */
_mregions_prop_box = new MultiRegionPropertiesBox (); _mregions_prop_box = new MultiRegionPropertiesBox ();
pack_start(*_mregions_prop_box, false, false, 0); pack_start(*_mregions_prop_box, false, false, 0);
@ -91,7 +92,7 @@ SelectionPropertiesBox::SelectionPropertiesBox ()
/* SLOT properties, for Trigger slot selections */ /* SLOT properties, for Trigger slot selections */
_slot_prop_box = new SlotPropertiesBox (); _slot_prop_box = new SlotPropertiesBox ();
pack_start(*_slot_prop_box, false, false, 0); pack_start(*_slot_prop_box, false, false, 0);
#endif
/* watch for any change in our selection, so we can show an appropriate property editor */ /* watch for any change in our selection, so we can show an appropriate property editor */
Editor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &SelectionPropertiesBox::selection_changed)); Editor::instance().get_selection().TracksChanged.connect (sigc::mem_fun (*this, &SelectionPropertiesBox::selection_changed));
@ -114,6 +115,7 @@ SelectionPropertiesBox::~SelectionPropertiesBox ()
{ {
delete _time_info_box; delete _time_info_box;
#if SELECTION_PROPERTIES_BOX_TODO
delete _mregions_prop_box; delete _mregions_prop_box;
delete _slot_prop_box; delete _slot_prop_box;
@ -123,6 +125,7 @@ SelectionPropertiesBox::~SelectionPropertiesBox ()
delete _midi_prop_box; delete _midi_prop_box;
delete _audio_prop_box; delete _audio_prop_box;
#endif
} }
void void
@ -131,6 +134,8 @@ SelectionPropertiesBox::set_session (Session* s)
SessionHandlePtr::set_session (s); SessionHandlePtr::set_session (s);
_time_info_box->set_session(s); _time_info_box->set_session(s);
#if SELECTION_PROPERTIES_BOX_TODO
_mregions_prop_box->set_session(s); _mregions_prop_box->set_session(s);
_midi_prop_box->set_session(s); _midi_prop_box->set_session(s);
@ -140,6 +145,7 @@ SelectionPropertiesBox::set_session (Session* s)
_audio_ops_box->set_session(s); _audio_ops_box->set_session(s);
_slot_prop_box->set_session(s); _slot_prop_box->set_session(s);
#endif
} }
void void
@ -155,6 +161,7 @@ SelectionPropertiesBox::selection_changed ()
_time_info_box->hide(); _time_info_box->hide();
#if SELECTION_PROPERTIES_BOX_TODO
_mregions_prop_box->hide(); _mregions_prop_box->hide();
_midi_ops_box->hide(); _midi_ops_box->hide();
@ -164,17 +171,20 @@ SelectionPropertiesBox::selection_changed ()
_audio_prop_box->hide(); _audio_prop_box->hide();
_slot_prop_box->hide(); _slot_prop_box->hide();
#endif
if (selection.empty()) { if (selection.empty()) {
_header_label.set_text(_("Nothing Selected")); _header_label.hide();
} else { } else {
_header_label.set_text(_("Selection Properties (ESC = Deselect All)")); _header_label.set_text(_("Range Properties (Press ESC to Deselect All)"));
_header_label.show();
} }
if (!selection.time.empty()) { if (!selection.time.empty()) {
_time_info_box->show(); _time_info_box->show();
} }
#if SELECTION_PROPERTIES_BOX_TODO
/* one or more regions, show the multi-region operations box (just MUTE? kinda boring) */ /* one or more regions, show the multi-region operations box (just MUTE? kinda boring) */
if (!selection.regions.empty()) { if (!selection.regions.empty()) {
_mregions_prop_box->show(); _mregions_prop_box->show();
@ -233,4 +243,5 @@ SelectionPropertiesBox::selection_changed ()
_audio_ops_box->show(); _audio_ops_box->show();
} }
} }
#endif
} }