diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-12 11:03:51 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-12 11:03:51 +0000 |
commit | da6e0a95bbcf8d1883633c6a6f4c221effde12cc (patch) | |
tree | 37533d7748bf732990fb589d0db02f7704dabf49 /gtk2_ardour | |
parent | b0424889b32e136ca25186037b032b229824ac79 (diff) |
get the notebook back again (or rather, realize that it can now be toggled and that the default is to hide it)
git-svn-id: svn://localhost/ardour2/branches/3.0@3720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour.menus | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 13 | ||||
-rw-r--r-- | gtk2_ardour/editor_canvas.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_route_list.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 2 |
5 files changed, 5 insertions, 18 deletions
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 8e316de05c..eb8e4dace1 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -369,6 +369,7 @@ <menuitem action='ToggleMaximalEditor'/> <menuitem action='show-editor-mixer'/> + <menuitem action='show-editor-list'/> <menuitem action='ToggleMeasureVisibility'/> <menuitem action='toggle-waveform-visible'/> <menuitem action='ToggleWaveformsWhileRecording'/> diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index f8209b8a56..3eb8a86db1 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -717,6 +717,7 @@ Editor::Editor () the_notebook.set_scrollable (true); the_notebook.popup_enable (); the_notebook.set_tab_pos (Gtk::POS_RIGHT); + the_notebook.show_all (); post_maximal_editor_width = 0; post_maximal_pane_position = 0; @@ -744,10 +745,6 @@ Editor::Editor () vpacker.pack_end (status_bar_hpacker, false, false); vpacker.pack_end (global_hpacker, true, true); - edit_controls_vbox.show (); - controls_layout.show (); - the_notebook.show_all (); - /* register actions now so that set_state() can find them and set toggles/checks etc */ register_actions (); @@ -3879,7 +3876,7 @@ Editor::pane_allocation_handler (Allocation &alloc, Paned* which) } else { pos = atoi (prop->value()); } - + if ((done = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) { edit_pane.set_position (pos); pre_maximal_pane_position = pos; @@ -4302,6 +4299,7 @@ Editor::restore_editing_space () initial_ruler_update_required = true; // user changed width of pane during fullscreen + if(post_maximal_pane_position != edit_pane.get_position()) { post_maximal_pane_position = edit_pane.get_position(); } @@ -4312,10 +4310,7 @@ Editor::restore_editing_space () tools_tearoff->set_visible (true); post_maximal_editor_width = this->get_width(); - - edit_pane.set_position ( - pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width) - ); + edit_pane.set_position (pre_maximal_pane_position + abs(this->get_width() - pre_maximal_editor_width)); } /** diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 2decb03099..f31d5b8b90 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -428,8 +428,6 @@ Editor::controls_layout_size_request (Requisition* req) } else { vertical_adjustment.set_upper (pos + canvas_timebars_vsize); } - - cerr << "sizes = " << req->width << " " << edit_controls_vbox.get_width() << " " << controls_layout.get_width() << " " << zoom_box.get_width() << " " << endl;//DEBUG } bool diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc index db93f9ffeb..984a0649ac 100644 --- a/gtk2_ardour/editor_route_list.cc +++ b/gtk2_ardour/editor_route_list.cc @@ -323,8 +323,6 @@ Editor::redisplay_route_list () uint32_t order; int n; - cerr << "RRL, nrld = " << no_route_list_redisplay << " with " << rows.size() << endl; - if (no_route_list_redisplay) { return; } @@ -352,12 +350,9 @@ Editor::redisplay_route_list () bool visible = (*i)[route_display_columns.visible]; - cerr << "\tvisible = " << visible << endl; - if (visible) { tv->set_marked_for_display (true); position += tv->show_at (position, n, &edit_controls_vbox); - cerr << "packed tv for " << tv->name() << " @ " << position << endl; } else { tv->hide (); } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index f5e1a82a10..b3a988fd92 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1816,8 +1816,6 @@ RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<Autom } } - cerr << "with show = " << show << " Adding automation child for " << _route->name() << " hideit = " << hideit << " prop = " << prop << endl; - _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track))); if (hideit) { |