get the notebook back again (or rather, realize that it can now be toggled and that...

git-svn-id: svn://localhost/ardour2/branches/3.0@3720 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 8e316de05cf2c37ad995681192b80968d7642163..eb8e4dace16c5fa38ed9697c8ad13786fea8f0ae 100644 (file)
--- 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 f8209b8a5644a8d5fc1dc3d5d61b5e4283a89ec3..3eb8a86db17d0a6ddee871052a9b4ba1028cc623 100644 (file)
--- 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 2decb03099cfa15cb0f0dc69f615c86a5c90cdf7..f31d5b8b901048d2bf07e12ec2f457bfc37f7bc3 100644 (file)
--- 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 db93f9ffeb9dc09cb7687fb8ad0f3c500a301b6f..984a0649ac63b59c0f332ac37b20efdb1a2ac569 100644 (file)
--- 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 f5e1a82a10957a1677acfdf6f84ba4dff87c6d85..b3a988fd927318660ae47e787d2a44698eedc192 100644 (file)
--- 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) {