smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

make F11 take us fullscreen (bug remains in edit pane position restore); reduce track controls area width

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@281 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-01-20 03:03:15 +00:00
parent e1ad4e0a53
commit 06d3bd1cb0
4 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/audio_time_axis.cc
View file

@ -169,12 +169,12 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt
hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click)); hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click));
if (is_audio_track()) { if (is_audio_track()) {
controls_table.attach (*rec_enable_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
} }
controls_table.attach (*mute_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (*solo_button, 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0);
controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); controls_table.attach (edit_group_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record")); ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo")); ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo"));
@ -194,7 +194,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt
controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
if (is_audio_track()) { if (is_audio_track()) {
controls_table.attach (playlist_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} }

32
gtk2_ardour/automation_time_axis.cc
View file

@ -131,9 +131,9 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
plugname->set_alignment (1.0, 0.5); plugname->set_alignment (1.0, 0.5);
name_label.set_name (X_("TrackParameterName")); name_label.set_name (X_("TrackParameterName"));
controls_table.remove (name_hbox); controls_table.remove (name_hbox);
controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
plugname_packed = true; plugname_packed = true;
controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} else { } else {
plugname = 0; plugname = 0;
plugname_packed = false; plugname_packed = false;
@ -152,8 +152,8 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEdit
controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (height_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.attach (auto_button, 7, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (auto_button, 6, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.attach (clear_button, 7, 9, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (clear_button, 6, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.show_all (); controls_table.show_all ();
@ -319,11 +319,11 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.remove (*plugname); controls_table.remove (*plugname);
plugname_packed = false; plugname_packed = false;
} }
controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
plugname_packed = true; plugname_packed = true;
controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} else { } else {
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} }
controls_table.show_all (); controls_table.show_all ();
hide_name_entry (); hide_name_entry ();
@ -338,10 +338,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.remove (*plugname); controls_table.remove (*plugname);
plugname_packed = false; plugname_packed = false;
} }
controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
plugname_packed = true; plugname_packed = true;
} else { } else {
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} }
controls_table.show_all (); controls_table.show_all ();
hide_name_entry (); hide_name_entry ();
@ -356,10 +356,10 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.remove (*plugname); controls_table.remove (*plugname);
plugname_packed = false; plugname_packed = false;
} }
controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
plugname_packed = true; plugname_packed = true;
} else { } else {
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} }
controls_table.show_all (); controls_table.show_all ();
hide_name_entry (); hide_name_entry ();
@ -374,11 +374,11 @@ AutomationTimeAxisView::set_height (TrackHeight h)
controls_table.remove (*plugname); controls_table.remove (*plugname);
plugname_packed = false; plugname_packed = false;
} }
controls_table.attach (*plugname, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (*plugname, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
plugname_packed = true; plugname_packed = true;
controls_table.attach (name_hbox, 1, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} else { } else {
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
} }
controls_table.show_all (); controls_table.show_all ();
hide_name_entry (); hide_name_entry ();
@ -394,7 +394,7 @@ AutomationTimeAxisView::set_height (TrackHeight h)
plugname_packed = false; plugname_packed = false;
} }
} }
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.hide_all (); controls_table.hide_all ();
hide_name_entry (); hide_name_entry ();
show_name_label (); show_name_label ();
@ -411,7 +411,7 @@ AutomationTimeAxisView::set_height (TrackHeight h)
plugname_packed = false; plugname_packed = false;
} }
} }
controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.hide_all (); controls_table.hide_all ();
hide_name_entry (); hide_name_entry ();
show_name_label (); show_name_label ();

11
gtk2_ardour/editor.cc
View file

@ -675,7 +675,7 @@ Editor::Editor (AudioEngine& eng)
notebook_tearoff->tearoff_window().set_size_request (200, 400); notebook_tearoff->tearoff_window().set_size_request (200, 400);
edit_pane.pack1 (edit_frame, true, true); edit_pane.pack1 (edit_frame, true, true);
edit_pane.pack2 (*notebook_tearoff, true, true); edit_pane.pack2 (*notebook_tearoff, false, true);
edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane))); edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
@ -2872,7 +2872,6 @@ Editor::convert_drop_to_paths (vector<string>& paths,
if ((*i).substr (0,7) == "file://") { if ((*i).substr (0,7) == "file://") {
string p = *i; string p = *i;
url_decode (p); url_decode (p);
cerr << "adding " << p << endl;
paths.push_back (p.substr (7)); paths.push_back (p.substr (7));
} }
} }
@ -3920,12 +3919,8 @@ Editor::snapshot_display_selection_changed ()
TreeModel::iterator i = snapshot_display.get_selection()->get_selected(); TreeModel::iterator i = snapshot_display.get_selection()->get_selected();
cerr << "snapshot selected\n";
Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name]; Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name];
cerr << "name is " << snap_name << endl;
if (snap_name.length() == 0) { if (snap_name.length() == 0) {
return; return;
} }
@ -3984,6 +3979,8 @@ Editor::maximise_editing_space ()
pre_maximal_pane_position = edit_pane.get_position(); pre_maximal_pane_position = edit_pane.get_position();
edit_pane.set_position (edit_pane.get_width()); edit_pane.set_position (edit_pane.get_width());
fullscreen();
} }
void void
@ -3992,4 +3989,6 @@ Editor::restore_editing_space ()
mouse_mode_tearoff->set_visible (true); mouse_mode_tearoff->set_visible (true);
tools_tearoff->set_visible (true); tools_tearoff->set_visible (true);
edit_pane.set_position (pre_maximal_pane_position); edit_pane.set_position (pre_maximal_pane_position);
unfullscreen();
} }

16
gtk2_ardour/time_axis_view.cc
View file

@ -71,7 +71,7 @@ bool TimeAxisView::need_size_info = true;
TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas) TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* rent, Canvas& canvas)
: AxisView (sess), : AxisView (sess),
editor (ed), editor (ed),
controls_table (2, 9) controls_table (2, 8)
{ {
if (need_size_info) { if (need_size_info) {
compute_controls_size_info (); compute_controls_size_info ();
@ -125,7 +125,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
controls_table.set_col_spacings (0); controls_table.set_col_spacings (0);
controls_table.set_homogeneous (true); controls_table.set_homogeneous (true);
controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (name_hbox, 0, 4, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
controls_table.show_all (); controls_table.show_all ();
controls_vbox.pack_start (controls_table, false, false); controls_vbox.pack_start (controls_table, false, false);
@ -903,8 +903,8 @@ void
TimeAxisView::compute_controls_size_info () TimeAxisView::compute_controls_size_info ()
{ {
Gtk::Window window (Gtk::WINDOW_TOPLEVEL); Gtk::Window window (Gtk::WINDOW_TOPLEVEL);
Gtk::Table two_row_table (2, 9); Gtk::Table two_row_table (2, 8);
Gtk::Table one_row_table (1, 9); Gtk::Table one_row_table (1, 8);
Button* buttons[5]; Button* buttons[5];
window.add (one_row_table); window.add (one_row_table);
@ -938,10 +938,10 @@ TimeAxisView::compute_controls_size_info ()
window.remove (); window.remove ();
window.add (two_row_table); window.add (two_row_table);
two_row_table.attach (*buttons[1], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); two_row_table.attach (*buttons[1], 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
two_row_table.attach (*buttons[2], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); two_row_table.attach (*buttons[2], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
two_row_table.attach (*buttons[3], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); two_row_table.attach (*buttons[3], 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
two_row_table.attach (*buttons[4], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
two_row_table.show_all (); two_row_table.show_all ();
two_row_table.size_request (req); two_row_table.size_request (req);