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

extra track header buttons are now ArdourButtons

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10550 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-11 17:24:05 +00:00
parent 84bb14efdc
commit 702cca1c93
6 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gtk2_ardour/ardour3_ui_default.conf
View file

@ -607,21 +607,37 @@
<Option name="mouse mode button: text" value="c7c7d8ff"/> <Option name="mouse mode button: text" value="c7c7d8ff"/>
<Option name="mouse mode button: text active" value="000000ff"/> <Option name="mouse mode button: text active" value="000000ff"/>
<Option name="mouse mode button: text mid" value="000000ff"/> <Option name="mouse mode button: text mid" value="000000ff"/>
<Option name="zoom button: border start" value="32baaeff"/> <Option name="zoom button: border start" value="b7b7d2ff"/>
<Option name="zoom button: border end" value="268e85ff"/> <Option name="zoom button: border end" value="000000ff"/>
<Option name="zoom button: border start selected" value="9a908eff"/> <Option name="zoom button: border start selected" value="9a908eff"/>
<Option name="zoom button: border end selected" value="675c5bff"/> <Option name="zoom button: border end selected" value="675c5bff"/>
<Option name="zoom button: fill start" value="216b84ff"/> <Option name="zoom button: fill start" value="5d5856ff"/>
<Option name="zoom button: fill end" value="13404fff"/> <Option name="zoom button: fill end" value="564d48ff"/>
<Option name="zoom button: fill start active" value="3fceffff"/> <Option name="zoom button: fill start active" value="4d4d4dff"/>
<Option name="zoom button: fill end active" value="27809eff"/> <Option name="zoom button: fill end active" value="121212ff"/>
<Option name="zoom button: fill start mid" value="5d5856ff"/> <Option name="zoom button: fill start mid" value="5d5856ff"/>
<Option name="zoom button: fill end mid" value="564d48ff"/> <Option name="zoom button: fill end mid" value="564d48ff"/>
<Option name="zoom button: led" value="4f3300ff"/> <Option name="zoom button: led" value="4f3300ff"/>
<Option name="zoom button: led active" value="ffa500ff"/> <Option name="zoom button: led active" value="ffa500ff"/>
<Option name="zoom button: led mid" value="b87700ff"/> <Option name="zoom button: led mid" value="b87700ff"/>
<Option name="zoom button: text" value="c7c7d8ff"/> <Option name="zoom button: text" value="c7c7d8ff"/>
<Option name="zoom button: text active" value="000000ff"/> <Option name="zoom button: text active" value="c8c8d9ff"/>
<Option name="zoom button: text mid" value="000000ff"/> <Option name="zoom button: text mid" value="000000ff"/>
<Option name="route button: border start" value="b7b7d2ff"/>
<Option name="route button: border end" value="000000ff"/>
<Option name="route button: border start selected" value="9a908eff"/>
<Option name="route button: border end selected" value="675c5bff"/>
<Option name="route button: fill start" value="5d5856ff"/>
<Option name="route button: fill end" value="564d48ff"/>
<Option name="route button: fill start active" value="4d4d4dff"/>
<Option name="route button: fill end active" value="121212ff"/>
<Option name="route button: fill start mid" value="5d5856ff"/>
<Option name="route button: fill end mid" value="564d48ff"/>
<Option name="route button: led" value="4f3300ff"/>
<Option name="route button: led active" value="ffa500ff"/>
<Option name="route button: led mid" value="b87700ff"/>
<Option name="route button: text" value="c7c7d8ff"/>
<Option name="route button: text active" value="c8c8d9ff"/>
<Option name="route button: text mid" value="000000ff"/>
</Canvas> </Canvas>
</Ardour> </Ardour>

2
gtk2_ardour/ardour_button.cc
View file

@ -473,6 +473,8 @@ ArdourButton::on_button_release_event (GdkEventButton *ev)
unset_active_state (); unset_active_state ();
} }
signal_clicked ();
if (_act_on_release) { if (_act_on_release) {
if (_action) { if (_action) {
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);

1
gtk2_ardour/ardour_button.h
View file

@ -78,6 +78,7 @@ class ArdourButton : public CairoWidget
void set_distinct_led_click (bool yn); void set_distinct_led_click (bool yn);
sigc::signal<void> signal_led_clicked; sigc::signal<void> signal_led_clicked;
sigc::signal<void> signal_clicked;
boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); } boost::shared_ptr<PBD::Controllable> get_controllable() { return binding_proxy.get_controllable(); }
void set_controllable (boost::shared_ptr<PBD::Controllable> c); void set_controllable (boost::shared_ptr<PBD::Controllable> c);

1
gtk2_ardour/canvas_vars.h
View file

@ -186,4 +186,5 @@ BUTTON_VARS(PluginBypassButton, "plugin bypass button")
BUTTON_VARS(PunchButton, "punch button") BUTTON_VARS(PunchButton, "punch button")
BUTTON_VARS(MouseModeButton, "mouse mode button") BUTTON_VARS(MouseModeButton, "mouse mode button")
BUTTON_VARS(ZoomButton, "zoom button") BUTTON_VARS(ZoomButton, "zoom button")
BUTTON_VARS(RouteButton, "route button")

14
gtk2_ardour/route_time_axis.cc
View file

@ -159,17 +159,13 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
ignore_toggle = false; ignore_toggle = false;
route_group_button.set_name ("TrackGroupButton"); route_group_button.set_name ("route button");
playlist_button.set_name ("TrackPlaylistButton"); playlist_button.set_name ("route button");
automation_button.set_name ("TrackAutomationButton"); automation_button.set_name ("route button");
route_group_button.unset_flags (Gtk::CAN_FOCUS);
playlist_button.unset_flags (Gtk::CAN_FOCUS);
automation_button.unset_flags (Gtk::CAN_FOCUS);
route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false); route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click)); playlist_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click)); automation_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
if (is_track()) { if (is_track()) {

8
gtk2_ardour/route_time_axis.h
View file

@ -38,6 +38,7 @@
#include "ardour/playlist.h" #include "ardour/playlist.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour_button.h"
#include "ardour_dialog.h" #include "ardour_dialog.h"
#include "route_ui.h" #include "route_ui.h"
#include "enums.h" #include "enums.h"
@ -254,10 +255,9 @@ protected:
Gtk::HBox other_button_hbox; Gtk::HBox other_button_hbox;
Gtk::Table button_table; Gtk::Table button_table;
Gtk::Button processor_button; ArdourButton route_group_button;
Gtk::Button route_group_button; ArdourButton playlist_button;
Gtk::Button playlist_button; ArdourButton automation_button;
Gtk::Button automation_button;
Gtk::Menu subplugin_menu; Gtk::Menu subplugin_menu;
Gtk::Menu* automation_action_menu; Gtk::Menu* automation_action_menu;