smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix display of tool button icons.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5778 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-10-14 21:24:35 +00:00
parent 1c83f12c68
commit dcf0af853a
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/editor_actions.cc
View file

@ -675,36 +675,42 @@ Editor::register_actions ()
mouse_move_button.set_image (*(manage (new Image (::get_icon("tool_object"))))); mouse_move_button.set_image (*(manage (new Image (::get_icon("tool_object")))));
mouse_move_button.set_label (""); mouse_move_button.set_label ("");
mouse_move_button.set_name ("MouseModeButton"); 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 = 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); 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_label ("");
mouse_select_button.set_name ("MouseModeButton"); 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 = 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); act->connect_proxy (mouse_gain_button);
mouse_gain_button.set_image (*(manage (new Image (::get_icon("tool_gain"))))); mouse_gain_button.set_image (*(manage (new Image (::get_icon("tool_gain")))));
mouse_gain_button.set_label (""); mouse_gain_button.set_label ("");
mouse_gain_button.set_name ("MouseModeButton"); 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 = 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); act->connect_proxy (mouse_zoom_button);
mouse_zoom_button.set_image (*(manage (new Image (::get_icon("tool_zoom"))))); mouse_zoom_button.set_image (*(manage (new Image (::get_icon("tool_zoom")))));
mouse_zoom_button.set_label (""); mouse_zoom_button.set_label ("");
mouse_zoom_button.set_name ("MouseModeButton"); 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 = 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); act->connect_proxy (mouse_audition_button);
mouse_audition_button.set_image (*(manage (new Image (::get_icon("tool_audition"))))); mouse_audition_button.set_image (*(manage (new Image (::get_icon("tool_audition")))));
mouse_audition_button.set_label (""); mouse_audition_button.set_label ("");
mouse_audition_button.set_name ("MouseModeButton"); 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 = 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); act->connect_proxy (mouse_timefx_button);
mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch"))))); mouse_timefx_button.set_image (*(manage (new Image (::get_icon("tool_stretch")))));
mouse_timefx_button.set_label (""); mouse_timefx_button.set_label ("");
mouse_timefx_button.set_name ("MouseModeButton"); 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)); 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_image (*(manage (new Image (::get_icon("tool_note")))));
internal_edit_button.set_label (""); internal_edit_button.set_label ("");
internal_edit_button.set_name ("MouseModeButton"); internal_edit_button.set_name ("MouseModeButton");
internal_edit_button.get_image ()->show ();
RadioAction::Group edit_point_group; 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))); ActionManager::register_radio_action (editor_actions, edit_point_group, X_("edit-at-playhead"), _("Playhead"), (bind (mem_fun(*this, &Editor::edit_point_chosen), Editing::EditAtPlayhead)));

4
gtk2_ardour/editor_mouse.cc
View file

@ -2574,6 +2574,7 @@ Editor::set_internal_edit (bool yn)
if (yn) { if (yn) {
mouse_select_button.set_image (*(manage (new Image (::get_icon("midi_tool_pencil"))))); 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) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i); MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
@ -2585,7 +2586,8 @@ Editor::set_internal_edit (bool yn)
} else { } 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 (); stop_step_editing ();
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {

BIN
gtk2_ardour/icons/tool_range.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 243 B