From cf32bf81b81b79250ade5cdae9f79dda6c0eee41 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 9 Feb 2010 03:17:02 +0000 Subject: [PATCH] Move object+range button up with the rest of the tool buttons (bringing edit toolbar back to correct height). git-svn-id: svn://localhost/ardour2/branches/3.0@6660 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor.cc | 39 +++++++++--------------- gtk2_ardour/editor_actions.cc | 5 +-- gtk2_ardour/icons/tool_object_range.png | Bin 0 -> 362 bytes 3 files changed, 17 insertions(+), 27 deletions(-) create mode 100644 gtk2_ardour/icons/tool_object_range.png diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ecefc1f3d1..69a2a0bc37 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2749,37 +2749,26 @@ Editor::setup_toolbar () /* table containing mode buttons */ - Table* mouse_mode_button_table = manage (new Table (Profile->get_sae() ? 4 : 6, 2)); - - int c = 0; + HBox* mouse_mode_button_box = manage (new HBox ()); if (Profile->get_sae()) { - mouse_mode_button_table->attach (mouse_move_button, c, c + 1, 0, 1); - ++c; + mouse_mode_button_box->pack_start (mouse_move_button); } else { - mouse_mode_button_table->attach (mouse_move_button, c, c + 1, 0, 1); - mouse_mode_button_table->attach (mouse_select_button, c + 1, c + 2, 0, 1); - mouse_mode_button_table->attach (join_object_range_button, c, c + 2, 1, 2); - c += 2; + mouse_mode_button_box->pack_start (mouse_move_button); + mouse_mode_button_box->pack_start (join_object_range_button); + mouse_mode_button_box->pack_start (mouse_select_button); } - mouse_mode_button_table->attach (mouse_zoom_button, c, c + 1, 0, 1); - ++c; - + mouse_mode_button_box->pack_start (mouse_zoom_button); + if (!Profile->get_sae()) { - mouse_mode_button_table->attach (mouse_gain_button, c, c + 1, 0, 1); - ++c; + mouse_mode_button_box->pack_start (mouse_gain_button); } - - mouse_mode_button_table->attach (mouse_timefx_button, c, c + 1, 0, 1); - ++c; - - mouse_mode_button_table->attach (mouse_audition_button, c, c + 1, 0, 1); - ++c; - - mouse_mode_button_table->attach (internal_edit_button, c, c + 1, 0, 1); - ++c; - + + mouse_mode_button_box->pack_start (mouse_timefx_button); + mouse_mode_button_box->pack_start (mouse_audition_button); + mouse_mode_button_box->pack_start (internal_edit_button); + vector edit_mode_strings; edit_mode_strings.push_back (edit_mode_to_string (Slide)); if (!Profile->get_sae()) { @@ -2792,7 +2781,7 @@ Editor::setup_toolbar () edit_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_mode_selection_done)); mode_box->pack_start (edit_mode_selector); - mode_box->pack_start (*mouse_mode_button_table); + mode_box->pack_start (*mouse_mode_button_box); mouse_mode_tearoff = manage (new TearOff (*mode_box)); mouse_mode_tearoff->set_name ("MouseModeBase"); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index fbfd500495..b46b44b3eb 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -626,9 +626,10 @@ Editor::register_actions () mouse_select_button.set_name ("MouseModeButton"); mouse_select_button.get_image ()->show (); - join_object_range_button.set_image (*(manage (new Image (::get_icon ("join_tools"))))); + join_object_range_button.set_image (*(manage (new Image (::get_icon ("tool_object_range"))))); + join_object_range_button.set_label (""); join_object_range_button.set_name ("MouseModeButton"); - join_object_range_button.get_image()->show (); + join_object_range_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); act->connect_proxy (mouse_gain_button); diff --git a/gtk2_ardour/icons/tool_object_range.png b/gtk2_ardour/icons/tool_object_range.png new file mode 100644 index 0000000000000000000000000000000000000000..cd3732eb40eb24b41fd7cb3c18d72b7d20b18b5c GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~e!3HF=pW8M9DaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#7855kpPBZteqW%FWQl7;iF1B# zZfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyv_QBN1g5RLO|gADVI81PKy-_V$GDv7_c z$2R)^f2U;?ClxAuB_u) z(Y2-qpG_EzA6xKUiPHBB$ZnnK7%G@7b9&PQKEq=RR~U1Z*&R(9^}5%G7Wyh=^?tV2XKmmWN`!`Uly#j6*4on6-1cARim z-FB_6W4_u_k&5@r+3rzopr0Prh_ A*8l(j literal 0 HcmV?d00001