From dcf0af853ad6de98da7fe344c9325f379f0c29b5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 14 Oct 2009 21:24:35 +0000 Subject: Fix display of tool button icons. git-svn-id: svn://localhost/ardour2/branches/3.0@5778 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_actions.cc | 9 ++++++++- gtk2_ardour/editor_mouse.cc | 4 +++- gtk2_ardour/icons/tool_range.png | Bin 0 -> 243 bytes 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 gtk2_ardour/icons/tool_range.png (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index dea84f4789..593418a539 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -675,36 +675,42 @@ Editor::register_actions () mouse_move_button.set_image (*(manage (new Image (::get_icon("tool_object"))))); mouse_move_button.set_label (""); mouse_move_button.set_name ("MouseModeButton"); + mouse_move_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); act->connect_proxy (mouse_select_button); - mouse_select_button.set_image (*(manage (new Image (::get_xpm("tool_range.xpm"))))); + mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); mouse_select_button.set_label (""); mouse_select_button.set_name ("MouseModeButton"); + mouse_select_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); act->connect_proxy (mouse_gain_button); mouse_gain_button.set_image (*(manage (new Image (::get_icon("tool_gain"))))); mouse_gain_button.set_label (""); mouse_gain_button.set_name ("MouseModeButton"); + mouse_gain_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); act->connect_proxy (mouse_zoom_button); mouse_zoom_button.set_image (*(manage (new Image (::get_icon("tool_zoom"))))); mouse_zoom_button.set_label (""); mouse_zoom_button.set_name ("MouseModeButton"); + mouse_zoom_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); act->connect_proxy (mouse_audition_button); mouse_audition_button.set_image (*(manage (new Image (::get_icon("tool_audition"))))); mouse_audition_button.set_label (""); mouse_audition_button.set_name ("MouseModeButton"); + mouse_audition_button.get_image ()->show (); act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Timefx Tool"), bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); act->connect_proxy (mouse_timefx_button); mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch"))))); mouse_timefx_button.set_label (""); mouse_timefx_button.set_name ("MouseModeButton"); + mouse_timefx_button.get_image ()->show (); ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), bind (mem_fun(*this, &Editor::step_mouse_mode), true)); @@ -713,6 +719,7 @@ Editor::register_actions () internal_edit_button.set_image (*(manage (new Image (::get_icon("tool_note"))))); internal_edit_button.set_label (""); internal_edit_button.set_name ("MouseModeButton"); + internal_edit_button.get_image ()->show (); RadioAction::Group edit_point_group; ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-playhead"), _("Playhead"), (bind (mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead))); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 0a715e3fd4..bb41447184 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2574,6 +2574,7 @@ Editor::set_internal_edit (bool yn) if (yn) { mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil"))))); + mouse_select_button.get_image ()->show (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { MidiTimeAxisView* mtv = dynamic_cast (*i); @@ -2585,7 +2586,8 @@ Editor::set_internal_edit (bool yn) } else { - mouse_select_button.set_image (*(manage (new Image (::get_xpm("tool_range.xpm"))))); + mouse_select_button.set_image (*(manage (new Image (::get_icon("tool_range"))))); + mouse_select_button.get_image ()->show (); stop_step_editing (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { diff --git a/gtk2_ardour/icons/tool_range.png b/gtk2_ardour/icons/tool_range.png new file mode 100644 index 0000000000..10dd90aace Binary files /dev/null and b/gtk2_ardour/icons/tool_range.png differ -- cgit v1.2.3