ardour/livetrax
13
0
Fork 0
Code

remove explicit VectorIcon Element

Browse Source
This commit is contained in:
Robin Gareus 2015-05-24 20:28:24 +02:00
parent 0604910a2a
commit db7d0c59b5
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk2_ardour/ardour_ui2.cc
View File

@ -258,7 +258,6 @@ ARDOUR_UI::setup_transport ()
// auto_input_button.set_text (_("Auto Input"));
click_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
click_button.set_icon (ArdourButton::TransportMetronom);
act = ActionManager::get_action ("Transport", "ToggleClick");
@ -276,23 +275,13 @@ ARDOUR_UI::setup_transport ()
stop_button.set_active (true);
goto_start_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
goto_start_button.set_icon (ArdourButton::TransportStart);
goto_end_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
goto_end_button.set_icon (ArdourButton::TransportEnd);
roll_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
roll_button.set_icon (ArdourButton::TransportPlay);
stop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
stop_button.set_icon (ArdourButton::TransportStop);
play_selection_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
play_selection_button.set_icon (ArdourButton::TransportRange);
auto_loop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
auto_loop_button.set_icon (ArdourButton::TransportLoop);
rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
rec_button.set_icon (ArdourButton::RecButton);
midi_panic_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
midi_panic_button.set_icon (ArdourButton::TransportPanic);
act = ActionManager::get_action (X_("Transport"), X_("Stop"));

1
gtk2_ardour/automation_time_axis.cc
View File

@ -149,7 +149,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (
_base_rect->lower_to_bottom();
}
hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
hide_button.set_icon (ArdourButton::CloseCross);
hide_button.set_tweaks(ArdourButton::TrackHeader);

4
gtk2_ardour/editor.cc
View File

@ -695,10 +695,10 @@ Editor::Editor ()
/* nudge stuff */
nudge_forward_button.set_name ("nudge button");
nudge_forward_button.set_image(::get_icon("nudge_right"));
nudge_forward_button.set_icon(ArdourButton::NudgeRight);
nudge_backward_button.set_name ("nudge button");
nudge_backward_button.set_image(::get_icon("nudge_left"));
nudge_backward_button.set_icon(ArdourButton::NudgeLeft);
fade_context_menu.set_name ("ArdourContextMenu");

2
gtk2_ardour/mixer_strip.cc
View File

@ -154,11 +154,9 @@ MixerStrip::init ()
t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
}
width_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
width_button.set_icon (ArdourButton::StripWidth);
ARDOUR_UI::instance()->set_tip (width_button, t);
hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
hide_button.set_icon (ArdourButton::CloseCross);
ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));

1
gtk2_ardour/route_ui.cc
View File

@ -148,7 +148,6 @@ RouteUI::init ()
rec_enable_button = manage (new ArdourButton);
rec_enable_button->set_name ("record enable button");
rec_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
rec_enable_button->set_icon (ArdourButton::RecButton);
UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");