ardour/livetrax
13
0
Fork 0
Code

L: more layout changes

Browse Source
This commit is contained in:
Ben Loftis 2024-05-10 10:25:44 -05:00
parent 5f0c2a4d32
commit baa29b8bf1
5 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View File

@ -651,7 +651,6 @@ private:
Gtk::Table livetrax_top_table_l;
Gtk::Table livetrax_top_table_c;
Gtk::Table livetrax_top_table_r;
Gtk::Table livetrax_edit_table;
Gtk::HBox livetrax_meter_bar;
Gtk::HBox livetrax_editor_bar;
Gtk::HBox livetrax_prefs_bar;
@ -678,6 +677,7 @@ private:
ArdourWidgets::ArdourButton* livetrax_view_in_folder_button;
ArdourWidgets::ArdourDropdown* livetrax_ff_dropdown;
ArdourWidgets::ArdourButton* livetrax_sr_button;
ArdourWidgets::ArdourButton* livetrax_tc_button;
Gtk::HScrollbar* livetrax_edit_hscrollbar;
Gtk::VScrollbar* livetrax_edit_vscrollbar;
Gtk::HScrollbar* livetrax_mix_hscrollbar;

67
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -410,8 +410,8 @@ ARDOUR_UI::livetrax_setup_windows ()
Image* icon = manage (new Image (ARDOUR_UI_UTILS::get_icon ("harrison")));
livetrax_top_table_c.set_border_width(4);
livetrax_top_table_c.attach(*icon, 0,1, 0,1, FILL, FILL, 4, 4 );
livetrax_top_table_c.attach(*primary_clock, 0,1, 1,2, FILL, FILL, 4, 4 );
livetrax_top_table_c.attach(transport_ctrl, 0,1, 0,1, FILL, FILL, 4, 4 );
livetrax_top_table_c.attach(*primary_clock, 0,1, 1,2, FILL, FILL, 4, 4 );
VBox* vb;
HBox* hb;
@ -434,13 +434,15 @@ ARDOUR_UI::livetrax_setup_windows ()
items.push_back (MenuElem (_("24 bit WAV/RF64"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::livetrax_set_file_format), LiveTraxFileFormat (ARDOUR::FormatInt24, ARDOUR::RF64_WAV))));
items.push_back (MenuElem (_("24 bit FLAC"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::livetrax_set_file_format), LiveTraxFileFormat (ARDOUR::FormatInt24, ARDOUR::FLAC))));
livetrax_sr_button = manage (new ArdourButton (""));
CairoWidget* cw = new LiveTraxTCWidget;
cw->show ();
livetrax_multi_out_button = manage (new ArdourButton (_("Multi Out")));
livetrax_stereo_out_button = manage (new ArdourButton (_("Stereo Out")));
livetrax_multi_out_button->set_name ("transport option button");
livetrax_stereo_out_button->set_name ("transport option button");
act = ActionManager::get_action (X_("Common"), X_("disable-virtual-soundcheck"));
livetrax_stereo_out_button->set_related_action (act);
act = ActionManager::get_action (X_("Common"), X_("enable-virtual-soundcheck"));
@ -453,26 +455,38 @@ ARDOUR_UI::livetrax_setup_windows ()
livetrax_editor_view_button->set_icon (ArdourWidgets::ArdourIcon::TrackWaveform);
act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-editor"));
livetrax_editor_view_button->set_related_action (act);
livetrax_editor_view_button->set_name ("transport option button");
livetrax_prefs_view_button = manage (new ArdourButton (_("PREFS"), ArdourButton::Element (ArdourButton::Text|ArdourButton::Body), true));
livetrax_prefs_view_button->set_icon (ArdourWidgets::ArdourIcon::Config);
act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-prefs"));
livetrax_prefs_view_button->set_related_action (act);
livetrax_prefs_view_button->set_name ("transport option button");
livetrax_meter_view_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Body), true));;
livetrax_meter_view_button->set_icon (ArdourWidgets::ArdourIcon::Meters);
act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-meter"));
livetrax_meter_view_button->set_related_action (act);
livetrax_meter_view_button->set_name ("transport option button");
livetrax_mixer_view_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Body), true));
livetrax_mixer_view_button->set_icon (ArdourWidgets::ArdourIcon::Mixer);
act = ActionManager::get_action (X_("Common"), X_("livetrax-toggle-mixer"));
livetrax_mixer_view_button->set_related_action (act);
livetrax_mixer_view_button->set_name ("transport option button");
livetrax_sr_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
act = ActionManager::get_action (X_("Window"), X_("toggle-audio-midi-setup"));
livetrax_sr_button->set_related_action (act);
livetrax_tc_button = manage (new ArdourButton (ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body), true));
act = ActionManager::get_action (X_("Window"), X_("toggle-transport-masters"));
livetrax_tc_button->set_related_action (act);
livetrax_tc_button->set_text ("Select Sync"); //TODO: fill with tc info
solo_alert_button.set_text(_("Clear Solos"));
solo_alert_button.set_elements(ArdourButton::Element (ArdourButton::Text|ArdourButton::Edge|ArdourButton::Body));
livetrax_lock_button = manage (new ArdourButton (elements, true));
livetrax_lock_button->set_icon (ArdourWidgets::ArdourIcon::Lock);
act = ActionManager::get_action (X_("Editor"), X_("lock"));
@ -483,34 +497,38 @@ ARDOUR_UI::livetrax_setup_windows ()
int TCOL = 0;
livetrax_top_table_l.attach (transport_ctrl, TCOL, TCOL+4, 1, 2, FILL, FILL, 4, 4); TCOL+=4;
livetrax_top_table_l.attach (sync_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (*icon, TCOL, TCOL+4, 0, 2, FILL, EXPAND, 4, 4); TCOL+=4;
livetrax_top_table_l.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (*livetrax_ff_dropdown, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (*livetrax_sr_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (_livetrax_btn_peak_reset, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (solo_alert_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (sync_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (*livetrax_tc_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (*manage(new Label("Source: MTC")), TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (*manage(new Label("Lock: 00:01:00:00")), TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
// livetrax_top_table.attach (*cw, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_l.attach (*livetrax_stereo_out_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_l.attach (*livetrax_multi_out_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
TCOL = 0;
livetrax_top_table_r.attach (*editor->mouse_mode_hbox, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (editor->_zoom_box, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (disk_space_label, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (*ev_dsp, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*livetrax_ff_dropdown, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (*livetrax_sr_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (_livetrax_btn_peak_reset, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*livetrax_stereo_out_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (*livetrax_multi_out_button, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*manage(new Label("")), TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*ev_dsp, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (disk_space_label, TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_top_table_r.attach (*livetrax_lock_button, TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (*livetrax_view_in_folder_button, TCOL+1, TCOL+2, 0, 1, FILL, FILL, 4, 4);
livetrax_top_table_r.attach (*livetrax_prefs_view_button, TCOL+2, TCOL+3, 0, 1, FILL, FILL, 4, 4);
@ -523,18 +541,20 @@ ARDOUR_UI::livetrax_setup_windows ()
_livetrax_centering_sizegroup->add_widget(livetrax_top_table_r);
//group a few items in each row of the left and right tables, to sync the heights
_livetrax_toolbar_sizegroup->add_widget(*livetrax_ff_dropdown);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_sr_button);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_tc_button);
_livetrax_toolbar_sizegroup->add_widget(solo_alert_button);
_livetrax_toolbar_sizegroup->add_widget(_livetrax_btn_peak_reset);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_stereo_out_button);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_multi_out_button);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_lock_button);
_livetrax_toolbar_sizegroup->add_widget(*livetrax_mixer_view_button);
_livetrax_toolbar_sizegroup->add_widget(*icon);
_livetrax_toolbar_sizegroup->add_widget(*primary_clock);
//sync all the view buttons so they look squarer
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_lock_button);
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_view_in_folder_button);
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_prefs_view_button);
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_meter_view_button);
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_editor_view_button);
_livetrax_viewbutton_sizegroup->add_widget(*livetrax_mixer_view_button);
@ -552,8 +572,6 @@ ARDOUR_UI::livetrax_setup_windows ()
livetrax_time_info_box = new TimeInfoBox ("LiveTraxTimeInfo", false);
// livetrax_edit_table.attach (*livetrax_time_info_box, TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4); TCOL++;
livetrax_edit_table.show_all ();
/* meter display */
livetrax_meters = manage (new LiveTraxMeters);
@ -570,7 +588,6 @@ ARDOUR_UI::livetrax_setup_windows ()
livetrax_edit_vscrollbar->show ();
hb->pack_start (editor->contents(), true, true);
hb->pack_start (*livetrax_edit_vscrollbar, false, false);
// hb->pack_start (livetrax_edit_table, false, false);
livetrax_section_pane.set_child_minsize(_livetrax_sections->widget(), 30);
livetrax_section_pane.set_divider(0, 0.99);
@ -794,12 +811,10 @@ ARDOUR_UI::livetrax_visibility_change ()
}
if (_livetrax_visibility & LiveTraxEditorVisible) {
livetrax_edit_table.show ();
livetrax_editor_bar.show ();
_livetrax_spacer2.show();
livetrax_editor_view_button->set_active_state (Gtkmm2ext::ExplicitActive);
} else {
livetrax_edit_table.hide ();
livetrax_editor_bar.hide ();
_livetrax_spacer2.hide();
livetrax_editor_view_button->set_active_state (Gtkmm2ext::Off);

10
gtk2_ardour/editor.cc
View File

@ -700,6 +700,8 @@ Editor::Editor ()
marker_hbox->pack_start (_livetrax_btn_next_marker, false, false, 2);
marker_hbox->pack_start (_livetrax_btn_new_section, false, false, 2);
marker_hbox->pack_start (_livetrax_btn_new_location, false, false, 2);
marker_hbox->pack_start (*manage(new Label()), false, false);
marker_hbox->pack_start (_zoom_box, false, false);
Table *tsizer = manage(new Table);
tsizer->set_homogeneous(false);
@ -707,12 +709,14 @@ Editor::Editor ()
tsizer->set_spacings(4);
tsizer->attach(*marker_hbox, 0,6, 0,1, FILL, EXPAND);
tsizer->attach(_track_box, 0,2, 1,2, FILL, FILL);
tsizer->attach(*manage(new Label()), 2,3, 0,1, EXPAND, SHRINK);
tsizer->attach(solo_btn, 3,4, 1,2, FILL, FILL);
tsizer->attach(*manage(new Label()), 2,4, 0,1, EXPAND, SHRINK);
// tsizer->attach(solo_btn, 3,4, 1,2, FILL, FILL);
tsizer->attach(_livetrax_btn_rec_all, 4,5, 1,2, FILL, FILL);
tsizer->attach(*spcr, 5,6, 1,2, SHRINK, SHRINK); //approx offset
time_bars_event_box.add (*tsizer);
VBox *btm_packer = manage(new VBox());
btm_packer->pack_end(*tsizer, true, true);
time_bars_event_box.add (*btm_packer);
#else
time_bars_event_box.add (time_bars_vbox);
#endif

BIN
gtk2_ardour/icons/harrison.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 486 B

After

Width:  |  Height:  |  Size: 937 B

4
gtk2_ardour/themes/dark-livetrax.colors
View File

@ -385,7 +385,7 @@
<ColorAlias name="rude solo: led active" alias="alert:red"/>
<ColorAlias name="ruler base" alias="neutral:background"/>
<ColorAlias name="ruler text" alias="neutral:midground"/>
<ColorAlias name="scene marker bar" alias="neutral:background2"/>
<ColorAlias name="scene marker bar" alias="neutral:background"/>
<ColorAlias name="scroomer" alias="alert:red"/>
<ColorAlias name="secondary clock: background" alias="theme:bg2"/>
<ColorAlias name="secondary clock: cursor" alias="theme:contrasting less"/>
@ -474,7 +474,7 @@
<ColorAlias name="transport loop rect" alias="widget:blue"/>
<ColorAlias name="transport marker bar" alias="neutral:backgroundest"/>
<ColorAlias name="transport option button: fill" alias="widget:bg"/>
<ColorAlias name="transport option button: fill active" alias="widget:bg"/>
<ColorAlias name="transport option button: fill active" alias="theme:contrasting less"/>
<ColorAlias name="transport option button: led active" alias="alert:orange"/>
<ColorAlias name="transport punch rect" alias="widget:ruddy"/>
<ColorAlias name="transport recenable button: fill" alias="widget:bg"/>