Remove unused controls_hbox.

Use shorter labels for zoom box to avoid wasted/ugly horizontal space to the right of track controls (present on high DPI screens?  best I could come up with, controls refuse to horizontally expand :/)

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

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ddf724e7a0eb6977d146cf23d265ca3b32297c20..ffda84e2f695e5c6eb0fc7d08226cde932b05f3b 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -137,8 +137,8 @@ static const gchar *_zoom_focus_strings[] = {
        N_("Left"),
        N_("Right"),
        N_("Center"),
-       N_("Playhead"),
-       N_("Edit Cursor"),
+       N_("Play"),
+       N_("Edit"),
        0
 };
 
@@ -2419,7 +2419,7 @@ Editor::setup_toolbar ()
        ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
 
        zoom_focus_selector.set_name ("ZoomFocusSelector");
-       Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edit Cursor", FUDGE, 0);
+       Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Center", FUDGE, 0);
        set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
        zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
        ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
@@ -2887,9 +2887,9 @@ Editor::zoom_focus_selection_done ()
                focus_type = ZoomFocusRight;
        } else if (choice == _("Center")) {
                focus_type = ZoomFocusCenter;
-       } else if (choice == _("Playhead")) {
+       } else if (choice == _("Play")) {
                focus_type = ZoomFocusPlayhead;
-       } else if (choice == _("Edit Cursor")) {
+       } else if (choice == _("Edit")) {
                focus_type = ZoomFocusEdit;
        } 
        

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index eee7c701cb09f7a56b15ca7483837fac89a600e7..b9a4f29ceca704815b80d414d7e987a4c5ed9314 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -665,7 +665,6 @@ class Editor : public PublicEditor
        Gtk::VBox           track_canvas_vbox;
        Gtk::VBox           time_canvas_vbox;
        Gtk::VBox           edit_controls_vbox;
-       Gtk::HBox           edit_controls_hbox;
 
        void control_scroll (float);
        bool deferred_control_scroll (nframes_t);