brought the track/bus inspector back to life

git-svn-id: svn://localhost/trunk/ardour2@493 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index cbe4d3098517112966d5e2747981a095d9ca61e9..3c13ac8342fce442536d48159acd560e6f6d4381 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -190,6 +190,7 @@
                <menuitem action='goto-mixer'/>
                <menuitem action='ToggleOptionsEditor'/>
                <menuitem action='ToggleSoundFileBrowser'/>
+               <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleConnections'/>
                <menuitem action='ToggleLocations'/>
                <menuitem action='ToggleColorManager'/>

diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index a17521193e7700ebb52b6f7325f577113eb47a66..0e3f067b578e9ecf50125c049eb5bde84e6b3487 100644 (file)
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -678,6 +678,16 @@ style "track_list_display" = "small_bold_text"
        base[SELECTED] = { 0, 0, 0 }
 }
 
+style "inspector_track_list_display" = "track_list_display"
+{
+       text[ACTIVE] = { 0.8, 0.8, 0.8 }
+
+       base[NORMAL] = { 0, 0, 0 }
+       base[ACTIVE] = { 0.2, 0.2, 0.2 }
+       base[INSENSITIVE] = { 0, 0, 0 }
+       base[SELECTED] = { 0.3, 0.3, 0.4 }
+}
+
 style "redirect_list_display"
 {
        GtkTreeView::horizontal-separator = 0
@@ -701,6 +711,11 @@ style "redirect_list_display"
        fg[ACTIVE] = { 0.5, 1.0, 1.0 }  # used for active
 }
 
+style "inspector_redirect_list_display" = "redirect_list_display"
+{
+       base[SELECTED] = { 0.3, 0.3, 0.3 }
+}
+
 # MixerPanZone:
 #
 # the NORMAL fg color is used for the pan puck
@@ -1101,9 +1116,9 @@ widget "*ConnectionEditorPortListSelected" style "selected_io_selector_port_list
 widget "*ConnectionEditorNotebook" style "io_selector_notebook"
 widget "*ConnectionEditorNotebookTab" style "io_selector_notebook"
 widget "*ConnectionEditorFrame" style "base_frame"
-widget "*RouteParamsListDisplay" style "track_list_display"
-widget "*RouteParamsPreListDisplay" style "track_list_display"
-widget "*RouteParamsPostListDisplay" style "track_list_display"
+widget "*RouteParamsListDisplay" style "inspector_track_list_display"
+widget "*RouteParamsPreListDisplay" style "inspector_redirect_list_display"
+widget "*RouteParamsPostListDisplay" style "inspector_redirect_list_display"
 widget "*TearOffArrow" style "tearoff_arrow"
 widget "*RouteParamsTitleButton" style "medium_text"
 widget "*RouteParamsTitleLabel" style "medium_text"

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index b3726e491633f2a46daf9a7cac7ec5bc2261e0d6..77c869d276d1a3f30d205b87a5d8c21aa392a4a9 100644 (file)
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -303,7 +303,12 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
                ret = true;
 
        } 
+       else if (redirect && ev->button == 1 && selected) {
 
+               // this is purely informational but necessary
+               RedirectSelected (redirect); // emit
+       }
+       
        return ret;
 }
 

diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 906c7b5ed9517a75c0134eb140c0a864b6dc4b95..a52cf79f3fd44fc2b3ab550b679013ae09d9ca28 100644 (file)
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -125,7 +125,7 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        route_vpacker.pack_start (route_hpacker, true, true);
 
        
-       list_hpane.add1 (list_vpacker);
+       list_hpane.pack1 (list_vpacker);
        list_hpane.add2 (route_vpacker);
 
        list_hpane.set_position(110);
@@ -133,9 +133,11 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
        pre_redir_hpane.set_position(110);
        post_redir_hpane.set_position(110);
        
-       global_vpacker.pack_start (list_hpane, true, true);
+       //global_vpacker.pack_start (list_hpane, true, true);
+       //get_vbox()->pack_start (global_vpacker);
+       get_vbox()->pack_start (list_hpane);
+       
        
-       add (global_vpacker);
        set_name ("RouteParamsWindow");
        set_default_size (620,370);
        set_title (_("ardour: track/bus inspector"));
@@ -217,14 +219,16 @@ RouteParams_UI::setup_redirect_boxes()
                pre_redirect_box = new RedirectBox(PreFader, *session, *_route, *_plugin_selector, _rr_selection);
                post_redirect_box = new RedirectBox(PostFader, *session, *_route, *_plugin_selector, _rr_selection);
 
-               pre_redir_hpane.add1 (*pre_redirect_box);
-               post_redir_hpane.add1 (*post_redirect_box);
+               pre_redir_hpane.pack1 (*pre_redirect_box);
+               post_redir_hpane.pack1 (*post_redirect_box);
 
                pre_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
                pre_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
                post_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
                post_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
-               
+
+               pre_redir_hpane.show_all();
+               post_redir_hpane.show_all();
        }
        
 }
@@ -567,7 +571,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
                                _pre_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PreFader));
                                plugin_ui->start_updating (0);
                                _active_pre_view = plugin_ui;
-                               pre_redir_hpane.add2 (*_active_pre_view);
+                               pre_redir_hpane.pack2 (*_active_pre_view);
                                pre_redir_hpane.show_all();
                        }
                        else {
@@ -575,7 +579,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
                                _post_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PostFader));
                                plugin_ui->start_updating (0);
                                _active_post_view = plugin_ui;
-                               post_redir_hpane.add2 (*_active_post_view);
+                               post_redir_hpane.pack2 (*_active_post_view);
                                post_redir_hpane.show_all();
                        }
 
@@ -587,7 +591,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
                                cleanup_pre_view();
                                _pre_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
                                _active_pre_view = portinsert_ui;
-                               pre_redir_hpane.add2 (*_active_pre_view);
+                               pre_redir_hpane.pack2 (*_active_pre_view);
                                portinsert_ui->redisplay();
                                pre_redir_hpane.show_all();
                        }
@@ -595,7 +599,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
                                cleanup_post_view();
                                _post_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
                                _active_post_view = portinsert_ui;
-                               post_redir_hpane.add2 (*_active_post_view);
+                               post_redir_hpane.pack2 (*_active_post_view);
                                portinsert_ui->redisplay();
                                post_redir_hpane.show_all();
                        }