diff options
| -rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf.in | 18 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 10 |
3 files changed, 9 insertions, 23 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ardour3_ui_default.conf.in index d9f3a26a52..4e4ea0e4d3 100644 --- a/gtk2_ardour/ardour3_ui_default.conf.in +++ b/gtk2_ardour/ardour3_ui_default.conf.in @@ -448,13 +448,13 @@ <Option name="punch button: led active" value="00000000"/> <Option name="punch button: text" value="a5a5a5ff"/> <Option name="punch button: text active" value="d8d8d8ff"/> - <Option name="mouse mode button: fill start" value="6d7ab460"/> - <Option name="mouse mode button: fill end" value="54555dff"/> + <Option name="mouse mode button: fill start" value="606b60ff"/> + <Option name="mouse mode button: fill end" value="495348ff"/> <Option name="mouse mode button: fill start active" value="1d7a05ff"/> - <Option name="mouse mode button: fill end active" value="14ae08ff"/> + <Option name="mouse mode button: fill end active" value="00a300ff"/> <Option name="mouse mode button: led" value="4f3300ff"/> <Option name="mouse mode button: led active" value="ffa500ff"/> - <Option name="mouse mode button: text" value="f2f2f2ff"/> + <Option name="mouse mode button: text" value="c7c7d8ff"/> <Option name="mouse mode button: text active" value="000000ff"/> <Option name="nudge button: fill start" value="785754dd"/> <Option name="nudge button: fill end" value="564242dd"/> @@ -472,14 +472,14 @@ <Option name="zoom menu: led active" value="ffa500ff"/> <Option name="zoom menu: text" value="c7c7d8ff"/> <Option name="zoom menu: text active" value="c8c8d9ff"/> - <Option name="zoom button: fill start" value="d4d0a090"/> - <Option name="zoom button: fill end" value="a4a07090"/> - <Option name="zoom button: fill start active" value="202025ff"/> - <Option name="zoom button: fill end active" value="404045ff"/> + <Option name="zoom button: fill start" value="606b60ff"/> + <Option name="zoom button: fill end" value="495348ff"/> + <Option name="zoom button: fill start active" value="1d7a05ff"/> + <Option name="zoom button: fill end active" value="00a300ff"/> <Option name="zoom button: led" value="4f3300ff"/> <Option name="zoom button: led active" value="ffa500ff"/> <Option name="zoom button: text" value="c7c7d8ff"/> - <Option name="zoom button: text active" value="c8c8d9ff"/> + <Option name="zoom button: text active" value="000000ff"/> <Option name="route button: fill start" value="565659ff"/> <Option name="route button: fill end" value="484853ff"/> <Option name="route button: fill start active" value="4d4d4dff"/> diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 9bd76efffb..2626cef0c5 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2844,7 +2844,6 @@ Editor::setup_toolbar () mouse_mode_box->pack_start (*mouse_mode_align, false, false); edit_mode_selector.set_name ("mouse mode button"); - edit_mode_selector.add_elements (ArdourButton::Inset); if (!ARDOUR::Profile->get_trx()) { mode_box->pack_start (edit_mode_selector, false, false); @@ -2973,13 +2972,10 @@ Editor::setup_toolbar () snap_box.set_border_width (2); snap_type_selector.set_name ("mouse mode button"); - snap_type_selector.add_elements (ArdourButton::Inset); snap_mode_selector.set_name ("mouse mode button"); - snap_mode_selector.add_elements (ArdourButton::Inset); edit_point_selector.set_name ("mouse mode button"); - edit_point_selector.add_elements (ArdourButton::Inset); snap_box.pack_start (snap_mode_selector, false, false); snap_box.pack_start (snap_type_selector, false, false); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 0d18215893..01777f46a6 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -446,58 +446,49 @@ Editor::register_actions () smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act); smart_mode_button.set_related_action (smart_mode_action); smart_mode_button.set_text (_("Smart")); - smart_mode_button.add_elements ( ArdourButton::Inset ); smart_mode_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); mouse_move_button.set_related_action (act); mouse_move_button.set_image (::get_icon("tool_object")); - mouse_move_button.add_elements ( ArdourButton::Inset ); mouse_move_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); mouse_select_button.set_related_action (act); mouse_select_button.set_image (::get_icon("tool_range")); - mouse_select_button.add_elements (ArdourButton::Inset ); mouse_select_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw)); mouse_draw_button.set_related_action (act); mouse_draw_button.set_image (::get_icon("midi_tool_pencil")); - mouse_draw_button.add_elements (ArdourButton::Inset ); mouse_draw_button.set_name ("mouse mode button"); 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)); mouse_gain_button.set_related_action (act); mouse_gain_button.set_image (::get_icon("tool_gain")); - mouse_gain_button.add_elements (ArdourButton::Inset ); mouse_gain_button.set_name ("mouse mode button"); if(!Profile->get_mixbus()) { act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); mouse_zoom_button.set_related_action (act); mouse_zoom_button.set_image (::get_icon("tool_zoom")); - mouse_zoom_button.add_elements (ArdourButton::Inset ); mouse_zoom_button.set_name ("mouse mode button"); } act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); mouse_audition_button.set_related_action (act); mouse_audition_button.set_image (::get_icon("tool_audition")); - mouse_audition_button.add_elements (ArdourButton::Inset ); mouse_audition_button.set_name ("mouse mode button"); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); mouse_timefx_button.set_related_action (act); mouse_timefx_button.set_image (::get_icon("tool_stretch")); - mouse_timefx_button.add_elements (ArdourButton::Inset ); mouse_timefx_button.set_name ("mouse mode button"); if(!Profile->get_mixbus()) { act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); mouse_cut_button.set_related_action (act); mouse_cut_button.set_image (::get_icon("tool_cut")); - mouse_cut_button.add_elements (ArdourButton::Inset ); mouse_cut_button.set_name ("mouse mode button"); } @@ -506,7 +497,6 @@ Editor::register_actions () act = ActionManager::register_toggle_action (mouse_mode_actions, "toggle-internal-edit", _("Edit MIDI"), sigc::mem_fun(*this, &Editor::toggle_internal_editing)); internal_edit_button.set_related_action (act); internal_edit_button.set_image (::get_icon("tool_note")); - internal_edit_button.add_elements ( ArdourButton::Inset ); internal_edit_button.set_name ("mouse mode button"); RadioAction::Group edit_point_group; |