diff options
| author | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
| commit | 868f557f2612903f72614a2b3a317c7a528188d1 (patch) | |
| tree | 979151d7bbb25fb633adb662d386ef4df0d46158 /gtk2_ardour/panner_ui.cc | |
| parent | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (diff) | |
Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner_ui.cc')
| -rw-r--r-- | gtk2_ardour/panner_ui.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 5fc659d2f8..850070fabf 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -68,8 +68,8 @@ PannerUI::PannerUI (IO& io, Session& s) ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_state_button, _("Pan automation mode")); ARDOUR_UI::instance()->tooltips().set_tip (pan_automation_style_button, _("Pan automation type")); - set_size_request_to_display_given_text (pan_automation_state_button, X_("M"), 2, 2); - set_size_request_to_display_given_text (pan_automation_style_button, X_("M"), 2, 2); + //set_size_request_to_display_given_text (pan_automation_state_button, X_("O"), 2, 2); + //set_size_request_to_display_given_text (pan_automation_style_button, X_("0"), 2, 2); pan_bar_packer.set_size_request (-1, 61); panning_viewport.set_size_request (61, 61); @@ -106,17 +106,13 @@ PannerUI::PannerUI (IO& io, Session& s) panning_link_button.set_name (X_("PanningLinkButton")); panning_link_direction_button.set_name (X_("PanningLinkDirectionButton")); - /* the pixmap will be reset at some point, but the key thing is that - we need a pixmap in the button just to get started. - */ - - Gtk::HBox* pan_button_hbox = manage (new Gtk::HBox()); - panning_link_box.pack_start (panning_link_button, true, true); panning_link_box.pack_start (panning_link_direction_button, true, true); - pan_button_hbox->pack_start (panning_link_box, true, true); - pan_button_hbox->pack_start (pan_automation_state_button, true, true); + panning_link_box.pack_start (pan_automation_state_button, true, true); + /* the pixmap will be reset at some point, but the key thing is that + we need a pixmap in the button just to get started. + */ panning_link_direction_button.add (*(manage (new Image (get_xpm("forwardblarrow.xpm"))))); panning_link_direction_button.signal_clicked().connect @@ -138,7 +134,7 @@ PannerUI::PannerUI (IO& io, Session& s) pan_vbox.set_spacing (4); pan_vbox.pack_start (panning_viewport, Gtk::PACK_SHRINK); - pan_vbox.pack_start (*pan_button_hbox, Gtk::PACK_SHRINK); + pan_vbox.pack_start (panning_link_box, Gtk::PACK_SHRINK); pack_start (pan_vbox, true, false); @@ -500,13 +496,16 @@ PannerUI::pan_changed (void *src) switch (_io.panner().size()) { case 0: - panning_link_box.set_sensitive (false); + panning_link_direction_button.set_sensitive (false); + panning_link_button.set_sensitive (false); return; case 1: - panning_link_box.set_sensitive (false); + panning_link_direction_button.set_sensitive (false); + panning_link_button.set_sensitive (false); break; default: - panning_link_box.set_sensitive (true); + panning_link_direction_button.set_sensitive (true); + panning_link_button.set_sensitive (true); } uint32_t nouts = _io.n_outputs(); |