diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 18:19:11 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-08 22:02:38 -0500 |
| commit | 9ac551abab0fd80d3e61cb084d2e70c4ecc78310 (patch) | |
| tree | 5b6bfc2b7d7cb3f765577d5161ee178b4adce8ae /gtk2_ardour | |
| parent | 624a86c39d0a22439c797d88c6defe28e55ab806 (diff) | |
another metric ton of color work
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/dark.colors | 593 | ||||
| -rw-r--r-- | gtk2_ardour/default_ui_config.in | 485 | ||||
| -rw-r--r-- | gtk2_ardour/editor_route_groups.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/theme_manager.cc | 66 | ||||
| -rw-r--r-- | gtk2_ardour/theme_manager.h | 6 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 225 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config.h | 76 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config_vars.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/wscript | 1 |
11 files changed, 777 insertions, 687 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 70ff7a6081..a94e77acc4 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -572,9 +572,7 @@ ARDOUR_UI::post_engine () ARDOUR_UI::~ARDOUR_UI () { - if (ui_config->dirty()) { - ui_config->save_state(); - } + ui_config->save_state(); stop_video_server(); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index e442e8dda4..7e426fa40e 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -615,9 +615,7 @@ ARDOUR_UI::save_ardour_state () Config->save_state(); - if (ui_config->dirty()) { - ui_config->save_state (); - } + ui_config->save_state (); XMLNode& enode (static_cast<Stateful*>(editor)->get_state()); XMLNode& mnode (mixer->get_state()); diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors new file mode 100644 index 0000000000..76dc06f8cc --- /dev/null +++ b/gtk2_ardour/dark.colors @@ -0,0 +1,593 @@ +<!-- The Dark Theme for Ardour --> + +<Ardour> + <BaseColors> + <BaseColor name="colorA" value="0xff0000ff"/> + <BaseColor name="colorAlight" value="0xff00e6ff"/> + <BaseColor name="colorAB" value="0xff4d00ff"/> + <BaseColor name="colorABlight" value="0xff9900ff"/> + <BaseColor name="colorB" value="0xffe600ff"/> + <BaseColor name="colorC" value="0x00ff1aff"/> + <BaseColor name="colorClight" value="0x80ff00ff"/> + <BaseColor name="colorCD" value="0x00ffb3ff"/> + <BaseColor name="colorD" value="0x00ffffff"/> + <BaseColor name="colorDdark" value="0x001affff"/> + <BaseColor name="colorDlight" value="0x00b3ffff"/> + <BaseColor name="colorDA" value="0x8000ffff"/> + <BaseColor name="meterColor0" value="0x008800FF"/> + <BaseColor name="meterColor1" value="0x00AA00FF"/> + <BaseColor name="meterColor2" value="0x00FF00FF"/> + <BaseColor name="meterColor3" value="0x00FF00FF"/> + <BaseColor name="meterColor4" value="0xFFF000ff"/> + <BaseColor name="meterColor5" value="0xFFF000ff"/> + <BaseColor name="meterColor6" value="0xFF8800ff"/> + <BaseColor name="meterColor7" value="0xFF8800ff"/> + <BaseColor name="meterColor8" value="0xFF0000ff"/> + <BaseColor name="meterColor9" value="0xFF0000ff"/> + </BaseColors> + <RelativeColors> + <RelativeColor name="color 1" base="colorD" modifier="0 -0.179775 -0.301961 -0.819608"/> + <RelativeColor name="color 10" base="colorLightest" modifier="0 0 -0.0588235 1"/> + <RelativeColor name="color 100" base="colorA" modifier="0 -0.684211 -0.105882 -0.211765"/> + <RelativeColor name="color 101" base="colorABlight" modifier="0 0 -0.372549 1"/> + <RelativeColor name="color 102" base="colorDdark" modifier="0 -0.88189 -0.501961 -0.2"/> + <RelativeColor name="color 103" base="colorC" modifier="0 -0.252101 -0.533333 -0.023529"/> + <RelativeColor name="color 104" base="colorLightGray" modifier="0 0 0 1"/> + <RelativeColor name="color 105" base="colorB" modifier="0 -0.79085 -0.4 -0.686275"/> + <RelativeColor name="color 11" base="colorDdark" modifier="0 -0.907975 -0.360784 -0.2"/> + <RelativeColor name="color 12" base="colorClight" modifier="0 -0.175824 -0.286275 0"/> + <RelativeColor name="color 13" base="colorLightest" modifier="0 0 0 1"/> + <RelativeColor name="color 14" base="colorD" modifier="0 -0.416667 -0.2 0"/> + <RelativeColor name="color 15" base="colorDdark" modifier="0 -0.547945 -0.713725 0"/> + <RelativeColor name="color 16" base="colorDlight" modifier="0 0 -0.180392 1"/> + <RelativeColor name="color 17" base="colorC" modifier="0 0 0 1"/> + <RelativeColor name="color 18" base="colorDdark" modifier="0 0 0 1"/> + <RelativeColor name="color 19" base="colorA" modifier="0 -0.447964 -0.133333 0"/> + <RelativeColor name="color 2" base="colorLightGray" modifier="0 0 -0.14902 1"/> + <RelativeColor name="color 20" base="colorA" modifier="0 -0.740385 -0.592157 0"/> + <RelativeColor name="color 21" base="colorLightGray" modifier="0 0 0.0901961 1"/> + <RelativeColor name="color 22" base="colorLightest" modifier="0 0 -0.101961 1"/> + <RelativeColor name="color 23" base="colorDA" modifier="0 0 0 1"/> + <RelativeColor name="color 24" base="colorC" modifier="0 -0.845745 -0.262745 -0.227451"/> + <RelativeColor name="color 25" base="colorDdark" modifier="0 -0.932692 -0.592157 0"/> + <RelativeColor name="color 26" base="colorDdark" modifier="0 -0.921296 -0.152941 0"/> + <RelativeColor name="color 27" base="colorDarkGray" modifier="0 0 0.00784314 1"/> + <RelativeColor name="color 28" base="colorDA" modifier="0 -0.5 -0.513725 -0.223529"/> + <RelativeColor name="color 29" base="colorMidGray" modifier="0 0 -0.00784314 1"/> + <RelativeColor name="color 3" base="colorDdark" modifier="342 -0.751634 -0.4 -0.592157"/> + <RelativeColor name="color 30" base="colorAlight" modifier="0 0 -0.101961 1"/> + <RelativeColor name="color 31" base="colorB" modifier="0 -0.977376 -0.133333 0"/> + <RelativeColor name="color 32" base="colorB" modifier="0 -0.257384 -0.0705882 -0.533333"/> + <RelativeColor name="color 33" base="colorLightGray" modifier="0 0 0.235294 1"/> + <RelativeColor name="color 34" base="colorMidGray" modifier="0 0 0.129412 1"/> + <RelativeColor name="color 35" base="colorDdark" modifier="0 -0.317308 -0.184314 0"/> + <RelativeColor name="color 36" base="colorABlight" modifier="0 -0.253521 -0.721569 0"/> + <RelativeColor name="color 37" base="colorC" modifier="342 -0.384236 -0.203922 0"/> + <RelativeColor name="color 38" base="colorCD" modifier="0 -0.12931 -0.0901961 0"/> + <RelativeColor name="color 39" base="colorCD" modifier="342 -0.353333 -0.411765 0"/> + <RelativeColor name="color 4" base="colorDarkGray" modifier="0 0 -0.0901961 0"/> + <RelativeColor name="color 40" base="colorA" modifier="0 -0.467742 -0.513725 0"/> + <RelativeColor name="color 41" base="colorCD" modifier="342 -0.598361 -0.521569 0"/> + <RelativeColor name="color 42" base="colorDdark" modifier="0 -0.927536 -0.729412 0"/> + <RelativeColor name="color 43" base="colorDdark" modifier="0 0 -0.858824 1"/> + <RelativeColor name="color 44" base="colorC" modifier="0 0 -0.690196 1"/> + <RelativeColor name="color 45" base="colorA" modifier="0 -0.975309 -0.364706 -0.537255"/> + <RelativeColor name="color 46" base="colorMidGray" modifier="0 0 0.0666667 1"/> + <RelativeColor name="color 47" base="colorC" modifier="0 0 -0.466667 1"/> + <RelativeColor name="color 48" base="colorC" modifier="0 0 -0.333333 1"/> + <RelativeColor name="color 49" base="colorC" modifier="0 0 -0.6 1"/> + <RelativeColor name="color 5" base="colorDlight" modifier="18 -0.80102 -0.231373 -0.592157"/> + <RelativeColor name="color 50" base="colorB" modifier="0 -0.991597 -0.0666667 0"/> + <RelativeColor name="color 51" base="colorC" modifier="342 -0.901639 -0.760784 -0.6"/> + <RelativeColor name="color 52" base="colorClight" modifier="342 -0.644 -0.0196078 0"/> + <RelativeColor name="color 53" base="colorABlight" modifier="0 -0.516529 -0.0509804 0"/> + <RelativeColor name="color 54" base="colorAB" modifier="0 -0.336066 -0.0431373 0"/> + <RelativeColor name="color 55" base="colorAB" modifier="0 -0.0766129 -0.027451 0"/> + <RelativeColor name="color 56" base="colorC" modifier="0 -0.713568 -0.219608 0"/> + <RelativeColor name="color 57" base="colorClight" modifier="0 -0.5 -0.341176 0"/> + <RelativeColor name="color 58" base="colorClight" modifier="0 -0.5 -0.670588 0"/> + <RelativeColor name="color 59" base="colorDdark" modifier="0 -0.698039 0 0"/> + <RelativeColor name="color 6" base="colorC" modifier="0 -0.361702 -0.262745 0"/> + <RelativeColor name="color 60" base="colorDdark" modifier="342 -0.888889 -0.647059 -0.372549"/> + <RelativeColor name="color 61" base="colorDdark" modifier="342 -0.761905 -0.835294 -0.247059"/> + <RelativeColor name="color 62" base="colorDdark" modifier="0 -0.533333 0 -0.466667"/> + <RelativeColor name="color 63" base="colorDdark" modifier="0 -0.333333 0 0"/> + <RelativeColor name="color 64" base="colorDdark" modifier="0 -0.787736 -0.168627 0"/> + <RelativeColor name="color 65" base="colorClight" modifier="0 -0.79902 -0.2 -0.627451"/> + <RelativeColor name="color 66" base="colorABlight" modifier="0 0 -0.690196 1"/> + <RelativeColor name="color 67" base="colorDarkGray" modifier="0 0 -0.0196078 1"/> + <RelativeColor name="color 68" base="colorABlight" modifier="0 -0.0253807 -0.227451 0"/> + <RelativeColor name="color 69" base="colorA" modifier="0 0 -0.6 1"/> + <RelativeColor name="color 7" base="colorMidGray" modifier="0 0 0.0235294 1"/> + <RelativeColor name="color 70" base="colorDlight" modifier="0 -0.190909 -0.568627 0"/> + <RelativeColor name="color 71" base="colorAB" modifier="0 -0.926316 -0.627451 0"/> + <RelativeColor name="color 72" base="colorABlight" modifier="0 -0.0218341 -0.101961 0"/> + <RelativeColor name="color 73" base="colorDdark" modifier="0 -0.260417 -0.247059 0"/> + <RelativeColor name="color 74" base="colorDlight" modifier="18 -0.598039 -0.2 -0.211765"/> + <RelativeColor name="color 75" base="colorB" modifier="0 0 -0.266667 1"/> + <RelativeColor name="color 76" base="colorClight" modifier="0 -0.963636 -0.568627 -0.580392"/> + <RelativeColor name="color 77" base="colorDdark" modifier="342 -0.48996 -0.0235294 0"/> + <RelativeColor name="color 78" base="colorDlight" modifier="0 -0.258741 -0.439216 0"/> + <RelativeColor name="color 79" base="colorC" modifier="0 -0.536232 -0.729412 0"/> + <RelativeColor name="color 8" base="colorABlight" modifier="0 0 0 1"/> + <RelativeColor name="color 80" base="colorA" modifier="0 -0.552083 -0.623529 0"/> + <RelativeColor name="color 81" base="colorLightGray" modifier="0 0 0.14902 1"/> + <RelativeColor name="color 82" base="colorLightest" modifier="0 0 -0.152941 1"/> + <RelativeColor name="color 83" base="colorA" modifier="0 0 -0.341176 1"/> + <RelativeColor name="color 84" base="colorAlight" modifier="36 -0.430894 -0.517647 0"/> + <RelativeColor name="color 85" base="colorAlight" modifier="36 -0.639216 0 0"/> + <RelativeColor name="color 86" base="colorA" modifier="0 -0.196078 -0.2 0"/> + <RelativeColor name="color 87" base="colorMidGray" modifier="0 0 0.180392 1"/> + <RelativeColor name="color 88" base="colorLightest" modifier="0 0 -0.223529 1"/> + <RelativeColor name="color 89" base="colorDlight" modifier="0 -0.719368 -0.00784314 0"/> + <RelativeColor name="color 9" base="colorA" modifier="0 0 -0.054902 1"/> + <RelativeColor name="color 90" base="colorA" modifier="0 -0.75 -0.827451 0"/> + <RelativeColor name="color 91" base="colorClight" modifier="0 -0.141129 -0.027451 0"/> + <RelativeColor name="color 92" base="colorDlight" modifier="0 -0.564516 -0.027451 0"/> + <RelativeColor name="color 93" base="colorDdark" modifier="0 -0.586957 -0.458824 0"/> + <RelativeColor name="color 94" base="colorLightGray" modifier="0 0 -0.109804 1"/> + <RelativeColor name="color 95" base="colorClight" modifier="0 -0.864754 -0.0431373 -0.533333"/> + <RelativeColor name="color 96" base="colorClight" modifier="0 -0.157205 -0.101961 0"/> + <RelativeColor name="color 97" base="colorLightest" modifier="0 0 -0.2 1"/> + <RelativeColor name="color 98" base="colorD" modifier="0 -0.619608 0 -0.521569"/> + <RelativeColor name="color 99" base="colorDdark" modifier="18 -0.0555556 -0.576471 0"/> + </RelativeColors> + <ColorAliases> + <ColorAlias name="active crossfade" alias="color 1"/> + <ColorAlias name="arrange base" alias="color 2"/> + <ColorAlias name="audio bus base" alias="color 3"/> + <ColorAlias name="audio master bus base" alias="color 4"/> + <ColorAlias name="audio track base" alias="color 5"/> + <ColorAlias name="automation line" alias="color 6"/> + <ColorAlias name="automation track fill" alias="color 5"/> + <ColorAlias name="automation track outline" alias="color 7"/> + <ColorAlias name="big clock active: background" alias="color 4"/> + <ColorAlias name="big clock active: cursor" alias="color 8"/> + <ColorAlias name="big clock active: edited text" alias="color 8"/> + <ColorAlias name="big clock active: text" alias="color 9"/> + <ColorAlias name="big clock: background" alias="color 4"/> + <ColorAlias name="big clock: cursor" alias="color 8"/> + <ColorAlias name="big clock: edited text" alias="color 8"/> + <ColorAlias name="big clock: text" alias="color 10"/> + <ColorAlias name="border color" alias="color 4"/> + <ColorAlias name="cd marker bar" alias="color 11"/> + <ColorAlias name="clipped waveform" alias="color 9"/> + <ColorAlias name="clock: background" alias="color 4"/> + <ColorAlias name="clock: cursor" alias="color 8"/> + <ColorAlias name="clock: edited text" alias="color 8"/> + <ColorAlias name="clock: text" alias="color 12"/> + <ColorAlias name="control point fill" alias="color 13"/> + <ColorAlias name="control point outline" alias="color 9"/> + <ColorAlias name="control point selected" alias="color 14"/> + <ColorAlias name="crossfade editor base" alias="color 15"/> + <ColorAlias name="crossfade editor line" alias="color 4"/> + <ColorAlias name="crossfade editor line shading" alias="color 16"/> + <ColorAlias name="crossfade editor point fill" alias="color 17"/> + <ColorAlias name="crossfade editor point outline" alias="color 18"/> + <ColorAlias name="crossfade editor wave" alias="color 13"/> + <ColorAlias name="crossfade line" alias="color 4"/> + <ColorAlias name="edit point" alias="color 18"/> + <ColorAlias name="entered automation line" alias="color 19"/> + <ColorAlias name="entered gain line" alias="color 19"/> + <ColorAlias name="entered marker" alias="color 19"/> + <ColorAlias name="feedback alert: fill" alias="color 20"/> + <ColorAlias name="feedback alert: fill active" alias="color 9"/> + <ColorAlias name="feedback alert: led" alias="color 4"/> + <ColorAlias name="feedback alert: led active" alias="color 4"/> + <ColorAlias name="feedback alert: text" alias="color 21"/> + <ColorAlias name="feedback alert: text active" alias="color 22"/> + <ColorAlias name="frame handle" alias="color 23"/> + <ColorAlias name="gain line" alias="color 6"/> + <ColorAlias name="gain line inactive" alias="color 24"/> + <ColorAlias name="generic button: fill" alias="color 25"/> + <ColorAlias name="generic button: fill active" alias="color 9"/> + <ColorAlias name="generic button: led" alias="color 15"/> + <ColorAlias name="generic button: led active" alias="color 18"/> + <ColorAlias name="ghost track base" alias="color 28"/> + <ColorAlias name="ghost track midi outline" alias="color 4"/> + <ColorAlias name="ghost track wave" alias="color 29"/> + <ColorAlias name="ghost track wave clip" alias="color 29"/> + <ColorAlias name="ghost track wave fill" alias="color 29"/> + <ColorAlias name="ghost track zero line" alias="color 30"/> + <ColorAlias name="gtk_arm" alias="color 9"/> + <ColorAlias name="gtk_audio_bus" alias="color 61"/> + <ColorAlias name="gtk_audio_track" alias="color 70"/> + <ColorAlias name="gtk_automation_track_header" alias="color 42"/> + <ColorAlias name="gtk_background" alias="color 34"/> + <ColorAlias name="gtk_bases" alias="color 27"/> + <ColorAlias name="gtk_bg_selected" alias="color 99"/> + <ColorAlias name="gtk_bg_tooltip" alias="color 52"/> + <ColorAlias name="gtk_bright_color" alias="color 74"/> + <ColorAlias name="gtk_bright_indicator" alias="color 9"/> + <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> + <ColorAlias name="gtk_control_base" alias="color 61"/> + <ColorAlias name="gtk_control_text" alias="color 26"/> + <ColorAlias name="gtk_control_text2" alias="color 83"/> + <ColorAlias name="gtk_darkest" alias="color 29"/> + <ColorAlias name="gtk_fg_selected" alias="color 18"/> + <ColorAlias name="gtk_fg_tooltip" alias="color 29"/> + <ColorAlias name="gtk_foreground" alias="color 50"/> + <ColorAlias name="gtk_light_text_on_dark" alias="color 31"/> + <ColorAlias name="gtk_lightest" alias="color 13"/> + <ColorAlias name="gtk_midi_channel_selector" alias="color 44"/> + <ColorAlias name="gtk_midi_track" alias="color 58"/> + <ColorAlias name="gtk_monitor" alias="color 8"/> + <ColorAlias name="gtk_mono" alias="color 95"/> + <ColorAlias name="gtk_mute" alias="color 52"/> + <ColorAlias name="gtk_not_so_bright_indicator" alias="color 32"/> + <ColorAlias name="gtk_processor_fader" alias="color 94"/> + <ColorAlias name="gtk_processor_fader_frame" alias="color 104"/> + <ColorAlias name="gtk_processor_frame_selected" alias="color 32"/> + <ColorAlias name="gtk_processor_postfader" alias="color 79"/> + <ColorAlias name="gtk_processor_postfader_frame" alias="color 103"/> + <ColorAlias name="gtk_processor_prefader" alias="color 69"/> + <ColorAlias name="gtk_processor_prefader_frame" alias="color 69"/> + <ColorAlias name="gtk_send_bg" alias="color 38"/> + <ColorAlias name="gtk_send_fg" alias="color 24"/> + <ColorAlias name="gtk_solo" alias="color 91"/> + <ColorAlias name="gtk_somewhat_bright_indicator" alias="color 89"/> + <ColorAlias name="gtk_texts" alias="color 50"/> + <ColorAlias name="gtk_track_header_inactive" alias="color 84"/> + <ColorAlias name="gtk_track_header_selected" alias="color 93"/> + <ColorAlias name="image track" alias="color 31"/> + <ColorAlias name="inactive crossfade" alias="color 32"/> + <ColorAlias name="inactive fade handle" alias="color 33"/> + <ColorAlias name="inactive group tab" alias="color 34"/> + <ColorAlias name="invert button: fill" alias="color 25"/> + <ColorAlias name="invert button: fill active" alias="color 35"/> + <ColorAlias name="invert button: led" alias="color 36"/> + <ColorAlias name="invert button: led active" alias="color 37"/> + <ColorAlias name="location cd marker" alias="color 38"/> + <ColorAlias name="location loop" alias="color 39"/> + <ColorAlias name="location marker" alias="color 32"/> + <ColorAlias name="location punch" alias="color 40"/> + <ColorAlias name="location range" alias="color 41"/> + <ColorAlias name="lock button: fill" alias="color 25"/> + <ColorAlias name="lock button: fill active" alias="color 42"/> + <ColorAlias name="lock button: led" alias="color 4"/> + <ColorAlias name="lock button: led active" alias="color 4"/> + <ColorAlias name="marker bar" alias="color 11"/> + <ColorAlias name="marker bar separator" alias="color 2"/> + <ColorAlias name="marker drag line" alias="color 44"/> + <ColorAlias name="marker label" alias="color 4"/> + <ColorAlias name="marker track" alias="color 31"/> + <ColorAlias name="measure line bar" alias="color 13"/> + <ColorAlias name="measure line beat" alias="color 45"/> + <ColorAlias name="meter background: bottom" alias="color 46"/> + <ColorAlias name="meter background: top" alias="color 34"/> + <ColorAlias name="meter bar" alias="color 25"/> + <ColorAlias name="meter color BBC" alias="color 8"/> + <ColorAlias name="meter marker" alias="color 19"/> + <ColorAlias name="meterbridge label: fill" alias="color 34"/> + <ColorAlias name="meterbridge label: fill active" alias="color 46"/> + <ColorAlias name="meterbridge label: led" alias="color 9"/> + <ColorAlias name="meterbridge label: led active" alias="color 9"/> + <ColorAlias name="meterbridge peakindicator: fill" alias="color 34"/> + <ColorAlias name="meterbridge peakindicator: fill active" alias="color 9"/> + <ColorAlias name="meterbridge peakindicator: led" alias="color 9"/> + <ColorAlias name="meterbridge peakindicator: led active" alias="color 9"/> + <ColorAlias name="meterbridge peaklabel" alias="color 9"/> + <ColorAlias name="meterstrip dpm fg" alias="color 9"/> + <ColorAlias name="meterstrip ppm fg" alias="color 13"/> + <ColorAlias name="meterstrip vu fg" alias="color 4"/> + <ColorAlias name="meterstrip dpm bg" alias="color 9"/> + <ColorAlias name="meterstrip ppm bg" alias="color 27"/> + <ColorAlias name="meterstrip vu bg" alias="color 32"/> + <ColorAlias name="midi bus base" alias="color 4"/> + <ColorAlias name="midi device: fill" alias="color 25"/> + <ColorAlias name="midi device: fill active" alias="color 42"/> + <ColorAlias name="midi device: led" alias="color 49"/> + <ColorAlias name="midi device: led active" alias="color 17"/> + <ColorAlias name="midi device: text" alias="color 26"/> + <ColorAlias name="midi device: text active" alias="color 50"/> + <ColorAlias name="midi frame base" alias="color 51"/> + <ColorAlias name="midi input button: fill" alias="color 25"/> + <ColorAlias name="midi input button: fill active" alias="color 48"/> + <ColorAlias name="midi input button: led" alias="color 4"/> + <ColorAlias name="midi input button: led active" alias="color 4"/> + <ColorAlias name="midi meter fill: 0" alias="color 52"/> + <ColorAlias name="midi meter fill: 1" alias="color 53"/> + <ColorAlias name="midi meter fill: 2" alias="color 53"/> + <ColorAlias name="midi meter fill: 3" alias="color 54"/> + <ColorAlias name="midi meter fill: 4" alias="color 54"/> + <ColorAlias name="midi meter fill: 5" alias="color 55"/> + <ColorAlias name="midi meter fill: 6" alias="color 55"/> + <ColorAlias name="midi meter fill: 7" alias="color 56"/> + <ColorAlias name="midi meter fill: 8" alias="color 56"/> + <ColorAlias name="midi meter fill: 9" alias="color 17"/> + <ColorAlias name="midi note color max" alias="color 52"/> + <ColorAlias name="midi note color mid" alias="color 57"/> + <ColorAlias name="midi note color min" alias="color 58"/> + <ColorAlias name="midi note inactive channel" alias="color 4"/> + <ColorAlias name="midi note selected" alias="color 59"/> + <ColorAlias name="midi note velocity text" alias="color 32"/> + <ColorAlias name="midi patch change fill" alias="color 60"/> + <ColorAlias name="midi patch change inactive channel fill" alias="color 60"/> + <ColorAlias name="midi patch change inactive channel outline" alias="color 61"/> + <ColorAlias name="midi patch change outline" alias="color 26"/> + <ColorAlias name="midi select rect fill" alias="color 62"/> + <ColorAlias name="midi select rect outline" alias="color 63"/> + <ColorAlias name="midi sysex fill" alias="color 32"/> + <ColorAlias name="midi sysex outline" alias="color 64"/> + <ColorAlias name="midi track base" alias="color 65"/> + <ColorAlias name="mixer strip button: fill" alias="color 25"/> + <ColorAlias name="mixer strip button: fill active" alias="color 8"/> + <ColorAlias name="mixer strip button: led" alias="color 66"/> + <ColorAlias name="mixer strip button: led active" alias="color 8"/> + <ColorAlias name="mixer strip name button: fill" alias="color 25"/> + <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> + <ColorAlias name="mixer strip name button: led" alias="color 66"/> + <ColorAlias name="mixer strip name button: led active" alias="color 8"/> + <ColorAlias name="monitor button: fill" alias="color 25"/> + <ColorAlias name="monitor button: fill active" alias="color 68"/> + <ColorAlias name="monitor button: led" alias="color 69"/> + <ColorAlias name="monitor button: led active" alias="color 9"/> + <ColorAlias name="monitor knob" alias="color 60"/> + <ColorAlias name="monitor knob: arc end" alias="color 70"/> + <ColorAlias name="monitor knob: arc start" alias="color 16"/> + <ColorAlias name="monitor section cut: fill" alias="color 71"/> + <ColorAlias name="monitor section cut: fill active" alias="color 8"/> + <ColorAlias name="monitor section cut: led" alias="color 36"/> + <ColorAlias name="monitor section cut: led active" alias="color 37"/> + <ColorAlias name="monitor section cut: text" alias="color 26"/> + <ColorAlias name="monitor section cut: text active" alias="color 4"/> + <ColorAlias name="monitor section dim: fill" alias="color 71"/> + <ColorAlias name="monitor section dim: fill active" alias="color 72"/> + <ColorAlias name="monitor section dim: led" alias="color 4"/> + <ColorAlias name="monitor section dim: led active" alias="color 37"/> + <ColorAlias name="monitor section dim: text" alias="color 26"/> + <ColorAlias name="monitor section dim: text active" alias="color 26"/> + <ColorAlias name="monitor section invert: fill" alias="color 71"/> + <ColorAlias name="monitor section invert: fill active" alias="color 35"/> + <ColorAlias name="monitor section invert: led" alias="color 36"/> + <ColorAlias name="monitor section invert: led active" alias="color 37"/> + <ColorAlias name="monitor section invert: text" alias="color 4"/> + <ColorAlias name="monitor section invert: text active" alias="color 4"/> + <ColorAlias name="monitor section mono: fill" alias="color 71"/> + <ColorAlias name="monitor section mono: fill active" alias="color 73"/> + <ColorAlias name="monitor section mono: led" alias="color 36"/> + <ColorAlias name="monitor section mono: led active" alias="color 37"/> + <ColorAlias name="monitor section mono: text" alias="color 26"/> + <ColorAlias name="monitor section mono: text active" alias="color 26"/> + <ColorAlias name="monitor section solo model: fill" alias="color 71"/> + <ColorAlias name="monitor section solo model: fill active" alias="color 42"/> + <ColorAlias name="monitor section solo model: led" alias="color 66"/> + <ColorAlias name="monitor section solo model: led active" alias="color 8"/> + <ColorAlias name="monitor section solo model: text" alias="color 26"/> + <ColorAlias name="monitor section solo model: text active" alias="color 26"/> + <ColorAlias name="monitor section solo: fill" alias="color 71"/> + <ColorAlias name="monitor section solo: fill active" alias="color 12"/> + <ColorAlias name="monitor section solo: led" alias="color 36"/> + <ColorAlias name="monitor section solo: led active" alias="color 8"/> + <ColorAlias name="monitor section solo: text" alias="color 4"/> + <ColorAlias name="monitor section solo: text active" alias="color 4"/> + <ColorAlias name="monitor solo exclusive: fill" alias="color 71"/> + <ColorAlias name="monitor solo exclusive: fill active" alias="color 20"/> + <ColorAlias name="monitor solo exclusive: led" alias="color 66"/> + <ColorAlias name="monitor solo exclusive: led active" alias="color 8"/> + <ColorAlias name="monitor solo exclusive: text" alias="color 26"/> + <ColorAlias name="monitor solo exclusive: text active" alias="color 26"/> + <ColorAlias name="monitor solo override: fill" alias="color 71"/> + <ColorAlias name="monitor solo override: fill active" alias="color 42"/> + <ColorAlias name="monitor solo override: led" alias="color 66"/> + <ColorAlias name="monitor solo override: led active" alias="color 8"/> + <ColorAlias name="monitor solo override: text" alias="color 26"/> + <ColorAlias name="monitor solo override: text active" alias="color 26"/> + <ColorAlias name="mono panner bg" alias="color 61"/> + <ColorAlias name="mono panner fill" alias="color 74"/> + <ColorAlias name="mono panner outline" alias="color 70"/> + <ColorAlias name="mono panner position fill" alias="color 11"/> + <ColorAlias name="mono panner position outline" alias="color 70"/> + <ColorAlias name="mono panner text" alias="color 4"/> + <ColorAlias name="mouse mode button: fill" alias="color 25"/> + <ColorAlias name="mouse mode button: fill active" alias="color 12"/> + <ColorAlias name="mouse mode button: led" alias="color 66"/> + <ColorAlias name="mouse mode button: led active" alias="color 8"/> + <ColorAlias name="mute button: fill" alias="color 25"/> + <ColorAlias name="mute button: fill active" alias="color 75"/> + <ColorAlias name="mute button: led" alias="color 4"/> + <ColorAlias name="mute button: led active" alias="color 4"/> + <ColorAlias name="name highlight fill" alias="color 18"/> + <ColorAlias name="name highlight outline" alias="color 23"/> + <ColorAlias name="nudge button: fill" alias="color 20"/> + <ColorAlias name="nudge button: fill active" alias="color 42"/> + <ColorAlias name="nudge button: led" alias="color 66"/> + <ColorAlias name="nudge button: led active" alias="color 8"/> + <ColorAlias name="nudge clock: background" alias="color 7"/> + <ColorAlias name="nudge clock: cursor" alias="color 8"/> + <ColorAlias name="nudge clock: edited text" alias="color 8"/> + <ColorAlias name="nudge clock: text" alias="color 12"/> + <ColorAlias name="piano roll black" alias="color 76"/> + <ColorAlias name="piano roll black outline" alias="color 10"/> + <ColorAlias name="piano roll white" alias="color 45"/> + <ColorAlias name="play head" alias="color 9"/> + <ColorAlias name="plugin bypass button: fill" alias="color 71"/> + <ColorAlias name="plugin bypass button: fill active" alias="color 42"/> + <ColorAlias name="plugin bypass button: led" alias="color 69"/> + <ColorAlias name="plugin bypass button: led active" alias="color 9"/> + <ColorAlias name="processor automation line" alias="color 77"/> + <ColorAlias name="processor control button: fill" alias="color 29"/> + <ColorAlias name="processor control button: fill active" alias="color 46"/> + <ColorAlias name="processor control button: led" alias="color 67"/> + <ColorAlias name="processor control button: led active" alias="color 16"/> + <ColorAlias name="processor fader: fill" alias="color 16"/> + <ColorAlias name="processor fader: fill active" alias="color 78"/> + <ColorAlias name="processor fader: led" alias="color 44"/> + <ColorAlias name="processor fader: led active" alias="color 37"/> + <ColorAlias name="processor fader: text" alias="color 45"/> + <ColorAlias name="processor fader: text active" alias="color 50"/> + <ColorAlias name="processor postfader: fill" alias="color 58"/> + <ColorAlias name="processor postfader: fill active" alias="color 79"/> + <ColorAlias name="processor postfader: led" alias="color 44"/> + <ColorAlias name="processor postfader: led active" alias="color 37"/> + <ColorAlias name="processor postfader: text" alias="color 45"/> + <ColorAlias name="processor postfader: text active" alias="color 50"/> + <ColorAlias name="processor prefader: fill" alias="color 40"/> + <ColorAlias name="processor prefader: fill active" alias="color 80"/> + <ColorAlias name="processor prefader: led" alias="color 44"/> + <ColorAlias name="processor prefader: led active" alias="color 37"/> + <ColorAlias name="processor prefader: text" alias="color 45"/> + <ColorAlias name="processor prefader: text active" alias="color 50"/> + <ColorAlias name="punch button: fill" alias="color 20"/> + <ColorAlias name="punch button: fill active" alias="color 9"/> + <ColorAlias name="punch button: led" alias="color 4"/> + <ColorAlias name="punch button: led active" alias="color 4"/> + <ColorAlias name="punch clock: background" alias="color 4"/> + <ColorAlias name="punch clock: cursor" alias="color 9"/> + <ColorAlias name="punch clock: edited text" alias="color 9"/> + <ColorAlias name="punch clock: text" alias="color 12"/> + <ColorAlias name="punch line" alias="color 83"/> + <ColorAlias name="range drag bar rect" alias="color 21"/> + <ColorAlias name="range drag rect" alias="color 56"/> + <ColorAlias name="range marker bar" alias="color 3"/> + <ColorAlias name="record enable button: fill" alias="color 25"/> + <ColorAlias name="record enable button: fill active" alias="color 83"/> + <ColorAlias name="record enable button: led" alias="color 84"/> + <ColorAlias name="record enable button: led active" alias="color 85"/> + <ColorAlias name="recorded waveform fill" alias="color 13"/> + <ColorAlias name="recorded waveform outline" alias="color 43"/> + <ColorAlias name="recording rect" alias="color 86"/> + <ColorAlias name="region list automatic" alias="color 53"/> + <ColorAlias name="region list missing source" alias="color 9"/> + <ColorAlias name="region list whole file" alias="color 1"/> + <ColorAlias name="region area covered by another region" alias="color 87"/> + <ColorAlias name="region base" alias="color 11"/> + <ColorAlias name="route button: fill" alias="color 25"/> + <ColorAlias name="route button: fill active" alias="color 67"/> + <ColorAlias name="route button: led" alias="color 66"/> + <ColorAlias name="route button: led active" alias="color 8"/> + <ColorAlias name="rubber band rect" alias="color 88"/> + <ColorAlias name="rude audition: fill" alias="color 20"/> + <ColorAlias name="rude audition: fill active" alias="color 86"/> + <ColorAlias name="rude audition: led" alias="color 4"/> + <ColorAlias name="rude audition: led active" alias="color 4"/> + <ColorAlias name="rude audition: text" alias="color 21"/> + <ColorAlias name="rude audition: text active" alias="color 13"/> + <ColorAlias name="rude isolate: fill" alias="color 42"/> + <ColorAlias name="rude isolate: fill active" alias="color 89"/> + <ColorAlias name="rude isolate: led" alias="color 4"/> + <ColorAlias name="rude isolate: led active" alias="color 4"/> + <ColorAlias name="rude isolate: text" alias="color 21"/> + <ColorAlias name="rude isolate: text active" alias="color 4"/> + <ColorAlias name="rude solo: fill" alias="color 20"/> + <ColorAlias name="rude solo: fill active" alias="color 86"/> + <ColorAlias name="rude solo: led" alias="color 4"/> + <ColorAlias name="rude solo: led active" alias="color 4"/> + <ColorAlias name="rude solo: text" alias="color 21"/> + <ColorAlias name="rude solo: text active" alias="color 22"/> + <ColorAlias name="ruler base" alias="color 90"/> + <ColorAlias name="ruler text" alias="color 22"/> + <ColorAlias name="secondary clock: background" alias="color 7"/> + <ColorAlias name="secondary clock: cursor" alias="color 8"/> + <ColorAlias name="secondary clock: edited text" alias="color 8"/> + <ColorAlias name="secondary clock: text" alias="color 91"/> + <ColorAlias name="secondary delta clock: background" alias="color 4"/> + <ColorAlias name="secondary delta clock: cursor" alias="color 9"/> + <ColorAlias name="secondary delta clock: edited text" alias="color 9"/> + <ColorAlias name="secondary delta clock: text" alias="color 92"/> + <ColorAlias name="selected crossfade editor line" alias="color 14"/> + <ColorAlias name="selected crossfade editor wave" alias="color 32"/> + <ColorAlias name="selected crossfade editor wave fill" alias="color 4"/> + <ColorAlias name="selected midi note color max" alias="color 62"/> + <ColorAlias name="selected midi note color mid" alias="color 93"/> + <ColorAlias name="selected midi note color min" alias="color 61"/> + <ColorAlias name="selected region base" alias="color 25"/> + <ColorAlias name="selected time axis frame" alias="color 86"/> + <ColorAlias name="selected waveform fill" alias="color 8"/> + <ColorAlias name="selected waveform outline" alias="color 67"/> + <ColorAlias name="selection" alias="color 94"/> + <ColorAlias name="selection clock: background" alias="color 4"/> + <ColorAlias name="selection clock: cursor" alias="color 9"/> + <ColorAlias name="selection clock: edited text" alias="color 9"/> + <ColorAlias name="selection clock: text" alias="color 12"/> + <ColorAlias name="selection rect" alias="color 95"/> + <ColorAlias name="send bg" alias="color 38"/> + <ColorAlias name="send alert button: fill" alias="color 71"/> + <ColorAlias name="send alert button: fill active" alias="color 38"/> + <ColorAlias name="send alert button: led" alias="color 4"/> + <ColorAlias name="send alert button: led active" alias="color 4"/> + <ColorAlias name="shuttle" alias="color 12"/> + <ColorAlias name="silence" alias="color 98"/> + <ColorAlias name="silence text" alias="color 99"/> + <ColorAlias name="solo button: fill" alias="color 25"/> + <ColorAlias name="solo button: fill active" alias="color 12"/> + <ColorAlias name="solo button: led" alias="color 4"/> + <ColorAlias name="solo button: led active" alias="color 4"/> + <ColorAlias name="solo isolate: fill" alias="color 25"/> + <ColorAlias name="solo isolate: fill active" alias="color 42"/> + <ColorAlias name="solo isolate: led" alias="color 69"/> + <ColorAlias name="solo isolate: led active" alias="color 9"/> + <ColorAlias name="solo isolate: text" alias="color 26"/> + <ColorAlias name="solo isolate: text active" alias="color 26"/> + <ColorAlias name="solo safe: fill" alias="color 25"/> + <ColorAlias name="solo safe: fill active" alias="color 42"/> + <ColorAlias name="solo safe: led" alias="color 69"/> + <ColorAlias name="solo safe: led active" alias="color 9"/> + <ColorAlias name="solo safe: text" alias="color 26"/> + <ColorAlias name="solo safe: text active" alias="color 26"/> + <ColorAlias name="stereo panner bg" alias="color 61"/> + <ColorAlias name="stereo panner fill" alias="color 74"/> + <ColorAlias name="stereo panner inverted bg" alias="color 61"/> + <ColorAlias name="stereo panner inverted fill" alias="color 100"/> + <ColorAlias name="stereo panner inverted outline" alias="color 83"/> + <ColorAlias name="stereo panner inverted text" alias="color 4"/> + <ColorAlias name="stereo panner mono bg" alias="color 61"/> + <ColorAlias name="stereo panner mono fill" alias="color 54"/> + <ColorAlias name="stereo panner mono outline" alias="color 101"/> + <ColorAlias name="stereo panner mono text" alias="color 4"/> + <ColorAlias name="stereo panner outline" alias="color 70"/> + <ColorAlias name="stereo panner rule" alias="color 70"/> + <ColorAlias name="stereo panner text" alias="color 4"/> + <ColorAlias name="tempo bar" alias="color 102"/> + <ColorAlias name="tempo marker" alias="color 19"/> + <ColorAlias name="time axis frame" alias="color 4"/> + <ColorAlias name="time stretch fill" alias="color 26"/> + <ColorAlias name="time stretch outline" alias="color 94"/> + <ColorAlias name="tracknumber label: fill" alias="color 34"/> + <ColorAlias name="tracknumber label: fill active" alias="color 46"/> + <ColorAlias name="tracknumber label: led" alias="color 9"/> + <ColorAlias name="tracknumber label: led active" alias="color 9"/> + <ColorAlias name="tracknumber label: text" alias="color 26"/> + <ColorAlias name="tracknumber label: text active" alias="color 9"/> + <ColorAlias name="transport active option button: fill" alias="color 25"/> + <ColorAlias name="transport active option button: fill active" alias="color 48"/> + <ColorAlias name="transport active option button: led" alias="color 66"/> + <ColorAlias name="transport active option button: led active" alias="color 8"/> + <ColorAlias name="transport button: fill" alias="color 25"/> + <ColorAlias name="transport button: fill active" alias="color 48"/> + <ColorAlias name="transport button: led" alias="color 4"/> + <ColorAlias name="transport button: led active" alias="color 4"/> + <ColorAlias name="transport clock: background" alias="color 7"/> + <ColorAlias name="transport clock: cursor" alias="color 8"/> + <ColorAlias name="transport clock: edited text" alias="color 8"/> + <ColorAlias name="transport clock: text" alias="color 91"/> + <ColorAlias name="transport delta clock: background" alias="color 4"/> + <ColorAlias name="transport delta clock: cursor" alias="color 9"/> + <ColorAlias name="transport delta clock: edited text" alias="color 9"/> + <ColorAlias name="transport delta clock: text" alias="color 92"/> + <ColorAlias name="transport drag rect" alias="color 21"/> + <ColorAlias name="transport loop rect" alias="color 103"/> + <ColorAlias name="transport marker bar" alias="color 11"/> + <ColorAlias name="transport option button: fill" alias="color 25"/> + <ColorAlias name="transport option button: fill active" alias="color 42"/> + <ColorAlias name="transport option button: led" alias="color 66"/> + <ColorAlias name="transport option button: led active" alias="color 8"/> + <ColorAlias name="transport punch rect" alias="color 80"/> + <ColorAlias name="transport recenable button: fill" alias="color 20"/> + <ColorAlias name="transport recenable button: fill active" alias="color 83"/> + <ColorAlias name="transport recenable button: led" alias="color 4"/> + <ColorAlias name="transport recenable button: led active" alias="color 4"/> + <ColorAlias name="trim handle" alias="color 18"/> + <ColorAlias name="trim handle locked" alias="color 86"/> + <ColorAlias name="verbose canvas cursor" alias="color 32"/> + <ColorAlias name="vestigial frame" alias="color 4"/> + <ColorAlias name="video timeline bar" alias="color 46"/> + <ColorAlias name="waveform fill" alias="color 13"/> + <ColorAlias name="waveform outline" alias="color 4"/> + <ColorAlias name="zero line" alias="color 104"/> + <ColorAlias name="zoom button: fill" alias="color 25"/> + <ColorAlias name="zoom button: fill active" alias="color 48"/> + <ColorAlias name="zoom button: led" alias="color 66"/> + <ColorAlias name="zoom button: led active" alias="color 8"/> + </ColorAliases> +</Ardour> diff --git a/gtk2_ardour/default_ui_config.in b/gtk2_ardour/default_ui_config.in index 9cc771c70e..bd8cf934c7 100644 --- a/gtk2_ardour/default_ui_config.in +++ b/gtk2_ardour/default_ui_config.in @@ -3,6 +3,7 @@ <UI> <Option name="icon-set" value="default"/> <Option name="ui-rc-file" value="clearlooks.rc"/> + <Option name="color-file" value="dark"/> <Option name="flat-buttons" value="0"/> <Option name="blink-rec-arm" value="0"/> <Option name="waveform-gradient-depth" value="0"/> @@ -14,31 +15,6 @@ <Option name="draggable-playhead" value="1"/> </UI> <Canvas> - - <Option name="colorA" value="0xff0000ff"/> - <Option name="colorAlight" value="0xff00e6ff"/> - <Option name="colorAB" value="0xff4d00ff"/> - <Option name="colorABlight" value="0xff9900ff"/> - <Option name="colorB" value="0xffe600ff"/> - <Option name="colorC" value="0x00ff1aff"/> - <Option name="colorClight" value="0x80ff00ff"/> - <Option name="colorCD" value="0x00ffb3ff"/> - <Option name="colorD" value="0x00ffffff"/> - <Option name="colorDdark" value="0x001affff"/> - <Option name="colorDlight" value="0x00b3ffff"/> - <Option name="colorDA" value="0x8000ffff"/> - - <Option name="meterColor0" value="0x008800FF"/> - <Option name="meterColor1" value="0x00AA00FF"/> - <Option name="meterColor2" value="0x00FF00FF"/> - <Option name="meterColor3" value="0x00FF00FF"/> - <Option name="meterColor4" value="0xFFF000ff"/> - <Option name="meterColor5" value="0xFFF000ff"/> - <Option name="meterColor6" value="0xFF8800ff"/> - <Option name="meterColor7" value="0xFF8800ff"/> - <Option name="meterColor8" value="0xFF0000ff"/> - <Option name="meterColor9" value="0xFF0000ff"/> - <Option name="small font" value="@FONT_SMALL@"/> <Option name="smaller font" value="@FONT_SMALLER@"/> <Option name="normal font" value="@FONT_NORMAL@"/> @@ -80,463 +56,4 @@ <Option name="huger bold monospace font" value="bold @MONOSPACE@ @FONT_HUGER@"/> <Option name="massive bold monospace font" value="bold @MONOSPACE@ @FONT_MASSIVE@"/> </Canvas> - - <ColorAliases> - <ColorAlias name="active crossfade" alias="color 1"/> - <ColorAlias name="arrange base" alias="color 2"/> - <ColorAlias name="audio bus base" alias="color 3"/> - <ColorAlias name="audio master bus base" alias="color 4"/> - <ColorAlias name="audio track base" alias="color 5"/> - <ColorAlias name="automation line" alias="color 6"/> - <ColorAlias name="automation track fill" alias="color 5"/> - <ColorAlias name="automation track outline" alias="color 7"/> - <ColorAlias name="big clock active: background" alias="color 4"/> - <ColorAlias name="big clock active: cursor" alias="color 8"/> - <ColorAlias name="big clock active: edited text" alias="color 8"/> - <ColorAlias name="big clock active: text" alias="color 9"/> - <ColorAlias name="big clock: background" alias="color 4"/> - <ColorAlias name="big clock: cursor" alias="color 8"/> - <ColorAlias name="big clock: edited text" alias="color 8"/> - <ColorAlias name="big clock: text" alias="color 10"/> - <ColorAlias name="border color" alias="color 4"/> - <ColorAlias name="cd marker bar" alias="color 11"/> - <ColorAlias name="clipped waveform" alias="color 9"/> - <ColorAlias name="clock: background" alias="color 4"/> - <ColorAlias name="clock: cursor" alias="color 8"/> - <ColorAlias name="clock: edited text" alias="color 8"/> - <ColorAlias name="clock: text" alias="color 12"/> - <ColorAlias name="control point fill" alias="color 13"/> - <ColorAlias name="control point outline" alias="color 9"/> - <ColorAlias name="control point selected" alias="color 14"/> - <ColorAlias name="crossfade editor base" alias="color 15"/> - <ColorAlias name="crossfade editor line" alias="color 4"/> - <ColorAlias name="crossfade editor line shading" alias="color 16"/> - <ColorAlias name="crossfade editor point fill" alias="color 17"/> - <ColorAlias name="crossfade editor point outline" alias="color 18"/> - <ColorAlias name="crossfade editor wave" alias="color 13"/> - <ColorAlias name="crossfade line" alias="color 4"/> - <ColorAlias name="edit point" alias="color 18"/> - <ColorAlias name="entered automation line" alias="color 19"/> - <ColorAlias name="entered gain line" alias="color 19"/> - <ColorAlias name="entered marker" alias="color 19"/> - <ColorAlias name="feedback alert: fill" alias="color 20"/> - <ColorAlias name="feedback alert: fill active" alias="color 9"/> - <ColorAlias name="feedback alert: led" alias="color 4"/> - <ColorAlias name="feedback alert: led active" alias="color 4"/> - <ColorAlias name="feedback alert: text" alias="color 21"/> - <ColorAlias name="feedback alert: text active" alias="color 22"/> - <ColorAlias name="frame handle" alias="color 23"/> - <ColorAlias name="gain line" alias="color 6"/> - <ColorAlias name="gain line inactive" alias="color 24"/> - <ColorAlias name="generic button: fill" alias="color 25"/> - <ColorAlias name="generic button: fill active" alias="color 9"/> - <ColorAlias name="generic button: led" alias="color 15"/> - <ColorAlias name="generic button: led active" alias="color 18"/> - <ColorAlias name="ghost track base" alias="color 28"/> - <ColorAlias name="ghost track midi outline" alias="color 4"/> - <ColorAlias name="ghost track wave" alias="color 29"/> - <ColorAlias name="ghost track wave clip" alias="color 29"/> - <ColorAlias name="ghost track wave fill" alias="color 29"/> - <ColorAlias name="ghost track zero line" alias="color 30"/> - <ColorAlias name="gtk_arm" alias="color 9"/> - <ColorAlias name="gtk_audio_bus" alias="color 61"/> - <ColorAlias name="gtk_audio_track" alias="color 70"/> - <ColorAlias name="gtk_automation_track_header" alias="color 42"/> - <ColorAlias name="gtk_background" alias="color 34"/> - <ColorAlias name="gtk_bases" alias="color 27"/> - <ColorAlias name="gtk_bg_selected" alias="color 99"/> - <ColorAlias name="gtk_bg_tooltip" alias="color 52"/> - <ColorAlias name="gtk_bright_color" alias="color 74"/> - <ColorAlias name="gtk_bright_indicator" alias="color 9"/> - <ColorAlias name="gtk_contrasting_indicator" alias="color 91"/> - <ColorAlias name="gtk_control_base" alias="color 61"/> - <ColorAlias name="gtk_control_text" alias="color 26"/> - <ColorAlias name="gtk_control_text2" alias="color 83"/> - <ColorAlias name="gtk_darkest" alias="color 29"/> - <ColorAlias name="gtk_fg_selected" alias="color 18"/> - <ColorAlias name="gtk_fg_tooltip" alias="color 29"/> - <ColorAlias name="gtk_foreground" alias="color 50"/> - <ColorAlias name="gtk_light_text_on_dark" alias="color 31"/> - <ColorAlias name="gtk_lightest" alias="color 13"/> - <ColorAlias name="gtk_midi_channel_selector" alias="color 44"/> - <ColorAlias name="gtk_midi_track" alias="color 58"/> - <ColorAlias name="gtk_monitor" alias="color 8"/> - <ColorAlias name="gtk_mono" alias="color 95"/> - <ColorAlias name="gtk_mute" alias="color 52"/> - <ColorAlias name="gtk_not_so_bright_indicator" alias="color 32"/> - <ColorAlias name="gtk_processor_fader" alias="color 94"/> - <ColorAlias name="gtk_processor_fader_frame" alias="color 104"/> - <ColorAlias name="gtk_processor_frame_selected" alias="color 32"/> - <ColorAlias name="gtk_processor_postfader" alias="color 79"/> - <ColorAlias name="gtk_processor_postfader_frame" alias="color 103"/> - <ColorAlias name="gtk_processor_prefader" alias="color 69"/> - <ColorAlias name="gtk_processor_prefader_frame" alias="color 69"/> - <ColorAlias name="gtk_send_bg" alias="color 38"/> - <ColorAlias name="gtk_send_fg" alias="color 24"/> - <ColorAlias name="gtk_solo" alias="color 91"/> - <ColorAlias name="gtk_somewhat_bright_indicator" alias="color 89"/> - <ColorAlias name="gtk_texts" alias="color 50"/> - <ColorAlias name="gtk_track_header_inactive" alias="color 84"/> - <ColorAlias name="gtk_track_header_selected" alias="color 93"/> - <ColorAlias name="image track" alias="color 31"/> - <ColorAlias name="inactive crossfade" alias="color 32"/> - <ColorAlias name="inactive fade handle" alias="color 33"/> - <ColorAlias name="inactive group tab" alias="color 34"/> - <ColorAlias name="invert button: fill" alias="color 25"/> - <ColorAlias name="invert button: fill active" alias="color 35"/> - <ColorAlias name="invert button: led" alias="color 36"/> - <ColorAlias name="invert button: led active" alias="color 37"/> - <ColorAlias name="location cd marker" alias="color 38"/> - <ColorAlias name="location loop" alias="color 39"/> - <ColorAlias name="location marker" alias="color 32"/> - <ColorAlias name="location punch" alias="color 40"/> - <ColorAlias name="location range" alias="color 41"/> - <ColorAlias name="lock button: fill" alias="color 25"/> - <ColorAlias name="lock button: fill active" alias="color 42"/> - <ColorAlias name="lock button: led" alias="color 4"/> - <ColorAlias name="lock button: led active" alias="color 4"/> - <ColorAlias name="marker bar" alias="color 11"/> - <ColorAlias name="marker bar separator" alias="color 2"/> - <ColorAlias name="marker drag line" alias="color 44"/> - <ColorAlias name="marker label" alias="color 4"/> - <ColorAlias name="marker track" alias="color 31"/> - <ColorAlias name="measure line bar" alias="color 13"/> - <ColorAlias name="measure line beat" alias="color 45"/> - <ColorAlias name="meter background: bottom" alias="color 46"/> - <ColorAlias name="meter background: top" alias="color 34"/> - <ColorAlias name="meter bar" alias="color 25"/> - <ColorAlias name="meter color BBC" alias="color 8"/> - <ColorAlias name="meter marker" alias="color 19"/> - <ColorAlias name="meterbridge label: fill" alias="color 34"/> - <ColorAlias name="meterbridge label: fill active" alias="color 46"/> - <ColorAlias name="meterbridge label: led" alias="color 9"/> - <ColorAlias name="meterbridge label: led active" alias="color 9"/> - <ColorAlias name="meterbridge peakindicator: fill" alias="color 34"/> - <ColorAlias name="meterbridge peakindicator: fill active" alias="color 9"/> - <ColorAlias name="meterbridge peakindicator: led" alias="color 9"/> - <ColorAlias name="meterbridge peakindicator: led active" alias="color 9"/> - <ColorAlias name="meterbridge peaklabel" alias="color 9"/> - <ColorAlias name="meterstrip dpm fg" alias="color 9"/> - <ColorAlias name="meterstrip ppm fg" alias="color 13"/> - <ColorAlias name="meterstrip vu fg" alias="color 4"/> - <ColorAlias name="meterstrip dpm bg" alias="color 9"/> - <ColorAlias name="meterstrip ppm bg" alias="color 27"/> - <ColorAlias name="meterstrip vu bg" alias="color 32"/> - <ColorAlias name="midi bus base" alias="color 4"/> - <ColorAlias name="midi device: fill" alias="color 25"/> - <ColorAlias name="midi device: fill active" alias="color 42"/> - <ColorAlias name="midi device: led" alias="color 49"/> - <ColorAlias name="midi device: led active" alias="color 17"/> - <ColorAlias name="midi device: text" alias="color 26"/> - <ColorAlias name="midi device: text active" alias="color 50"/> - <ColorAlias name="midi frame base" alias="color 51"/> - <ColorAlias name="midi input button: fill" alias="color 25"/> - <ColorAlias name="midi input button: fill active" alias="color 48"/> - <ColorAlias name="midi input button: led" alias="color 4"/> - <ColorAlias name="midi input button: led active" alias="color 4"/> - <ColorAlias name="midi meter fill: 0" alias="color 52"/> - <ColorAlias name="midi meter fill: 1" alias="color 53"/> - <ColorAlias name="midi meter fill: 2" alias="color 53"/> - <ColorAlias name="midi meter fill: 3" alias="color 54"/> - <ColorAlias name="midi meter fill: 4" alias="color 54"/> - <ColorAlias name="midi meter fill: 5" alias="color 55"/> - <ColorAlias name="midi meter fill: 6" alias="color 55"/> - <ColorAlias name="midi meter fill: 7" alias="color 56"/> - <ColorAlias name="midi meter fill: 8" alias="color 56"/> - <ColorAlias name="midi meter fill: 9" alias="color 17"/> - <ColorAlias name="midi note color max" alias="color 52"/> - <ColorAlias name="midi note color mid" alias="color 57"/> - <ColorAlias name="midi note color min" alias="color 58"/> - <ColorAlias name="midi note inactive channel" alias="color 4"/> - <ColorAlias name="midi note selected" alias="color 59"/> - <ColorAlias name="midi note velocity text" alias="color 32"/> - <ColorAlias name="midi patch change fill" alias="color 60"/> - <ColorAlias name="midi patch change inactive channel fill" alias="color 60"/> - <ColorAlias name="midi patch change inactive channel outline" alias="color 61"/> - <ColorAlias name="midi patch change outline" alias="color 26"/> - <ColorAlias name="midi select rect fill" alias="color 62"/> - <ColorAlias name="midi select rect outline" alias="color 63"/> - <ColorAlias name="midi sysex fill" alias="color 32"/> - <ColorAlias name="midi sysex outline" alias="color 64"/> - <ColorAlias name="midi track base" alias="color 65"/> - <ColorAlias name="mixer strip button: fill" alias="color 25"/> - <ColorAlias name="mixer strip button: fill active" alias="color 8"/> - <ColorAlias name="mixer strip button: led" alias="color 66"/> - <ColorAlias name="mixer strip button: led active" alias="color 8"/> - <ColorAlias name="mixer strip name button: fill" alias="color 25"/> - <ColorAlias name="mixer strip name button: fill active" alias="color 67"/> - <ColorAlias name="mixer strip name button: led" alias="color 66"/> - <ColorAlias name="mixer strip name button: led active" alias="color 8"/> - <ColorAlias name="monitor button: fill" alias="color 25"/> - <ColorAlias name="monitor button: fill active" alias="color 68"/> - <ColorAlias name="monitor button: led" alias="color 69"/> - <ColorAlias name="monitor button: led active" alias="color 9"/> - <ColorAlias name="monitor knob" alias="color 60"/> - <ColorAlias name="monitor knob: arc end" alias="color 70"/> - <ColorAlias name="monitor knob: arc start" alias="color 16"/> - <ColorAlias name="monitor section cut: fill" alias="color 71"/> - <ColorAlias name="monitor section cut: fill active" alias="color 8"/> - <ColorAlias name="monitor section cut: led" alias="color 36"/> - <ColorAlias name="monitor section cut: led active" alias="color 37"/> - <ColorAlias name="monitor section cut: text" alias="color 26"/> - <ColorAlias name="monitor section cut: text active" alias="color 4"/> - <ColorAlias name="monitor section dim: fill" alias="color 71"/> - <ColorAlias name="monitor section dim: fill active" alias="color 72"/> - <ColorAlias name="monitor section dim: led" alias="color 4"/> - <ColorAlias name="monitor section dim: led active" alias="color 37"/> - <ColorAlias name="monitor section dim: text" alias="color 26"/> - <ColorAlias name="monitor section dim: text active" alias="color 26"/> - <ColorAlias name="monitor section invert: fill" alias="color 71"/> - <ColorAlias name="monitor section invert: fill active" alias="color 35"/> - <ColorAlias name="monitor section invert: led" alias="color 36"/> - <ColorAlias name="monitor section invert: led active" alias="color 37"/> - <ColorAlias name="monitor section invert: text" alias="color 4"/> - <ColorAlias name="monitor section invert: text active" alias="color 4"/> - <ColorAlias name="monitor section mono: fill" alias="color 71"/> - <ColorAlias name="monitor section mono: fill active" alias="color 73"/> - <ColorAlias name="monitor section mono: led" alias="color 36"/> - <ColorAlias name="monitor section mono: led active" alias="color 37"/> - <ColorAlias name="monitor section mono: text" alias="color 26"/> - <ColorAlias name="monitor section mono: text active" alias="color 26"/> - <ColorAlias name="monitor section solo model: fill" alias="color 71"/> - <ColorAlias name="monitor section solo model: fill active" alias="color 42"/> - <ColorAlias name="monitor section solo model: led" alias="color 66"/> - <ColorAlias name="monitor section solo model: led active" alias="color 8"/> - <ColorAlias name="monitor section solo model: text" alias="color 26"/> - <ColorAlias name="monitor section solo model: text active" alias="color 26"/> - <ColorAlias name="monitor section solo: fill" alias="color 71"/> - <ColorAlias name="monitor section solo: fill active" alias="color 12"/> - <ColorAlias name="monitor section solo: led" alias="color 36"/> - <ColorAlias name="monitor section solo: led active" alias="color 8"/> - <ColorAlias name="monitor section solo: text" alias="color 4"/> - <ColorAlias name="monitor section solo: text active" alias="color 4"/> - <ColorAlias name="monitor solo exclusive: fill" alias="color 71"/> - <ColorAlias name="monitor solo exclusive: fill active" alias="color 20"/> - <ColorAlias name="monitor solo exclusive: led" alias="color 66"/> - <ColorAlias name="monitor solo exclusive: led active" alias="color 8"/> - <ColorAlias name="monitor solo exclusive: text" alias="color 26"/> - <ColorAlias name="monitor solo exclusive: text active" alias="color 26"/> - <ColorAlias name="monitor solo override: fill" alias="color 71"/> - <ColorAlias name="monitor solo override: fill active" alias="color 42"/> - <ColorAlias name="monitor solo override: led" alias="color 66"/> - <ColorAlias name="monitor solo override: led active" alias="color 8"/> - <ColorAlias name="monitor solo override: text" alias="color 26"/> - <ColorAlias name="monitor solo override: text active" alias="color 26"/> - <ColorAlias name="mono panner bg" alias="color 61"/> - <ColorAlias name="mono panner fill" alias="color 74"/> - <ColorAlias name="mono panner outline" alias="color 70"/> - <ColorAlias name="mono panner position fill" alias="color 11"/> - <ColorAlias name="mono panner position outline" alias="color 70"/> - <ColorAlias name="mono panner text" alias="color 4"/> - <ColorAlias name="mouse mode button: fill" alias="color 25"/> - <ColorAlias name="mouse mode button: fill active" alias="color 12"/> - <ColorAlias name="mouse mode button: led" alias="color 66"/> - <ColorAlias name="mouse mode button: led active" alias="color 8"/> - <ColorAlias name="mute button: fill" alias="color 25"/> - <ColorAlias name="mute button: fill active" alias="color 75"/> - <ColorAlias name="mute button: led" alias="color 4"/> - <ColorAlias name="mute button: led active" alias="color 4"/> - <ColorAlias name="name highlight fill" alias="color 18"/> - <ColorAlias name="name highlight outline" alias="color 23"/> - <ColorAlias name="nudge button: fill" alias="color 20"/> - <ColorAlias name="nudge button: fill active" alias="color 42"/> - <ColorAlias name="nudge button: led" alias="color 66"/> - <ColorAlias name="nudge button: led active" alias="color 8"/> - <ColorAlias name="nudge clock: background" alias="color 7"/> - <ColorAlias name="nudge clock: cursor" alias="color 8"/> - <ColorAlias name="nudge clock: edited text" alias="color 8"/> - <ColorAlias name="nudge clock: text" alias="color 12"/> - <ColorAlias name="piano roll black" alias="color 76"/> - <ColorAlias name="piano roll black outline" alias="color 10"/> - <ColorAlias name="piano roll white" alias="color 45"/> - <ColorAlias name="play head" alias="color 9"/> - <ColorAlias name="plugin bypass button: fill" alias="color 71"/> - <ColorAlias name="plugin bypass button: fill active" alias="color 42"/> - <ColorAlias name="plugin bypass button: led" alias="color 69"/> - <ColorAlias name="plugin bypass button: led active" alias="color 9"/> - <ColorAlias name="processor automation line" alias="color 77"/> - <ColorAlias name="processor control button: fill" alias="color 29"/> - <ColorAlias name="processor control button: fill active" alias="color 46"/> - <ColorAlias name="processor control button: led" alias="color 67"/> - <ColorAlias name="processor control button: led active" alias="color 16"/> - <ColorAlias name="processor fader: fill" alias="color 16"/> - <ColorAlias name="processor fader: fill active" alias="color 78"/> - <ColorAlias name="processor fader: led" alias="color 44"/> - <ColorAlias name="processor fader: led active" alias="color 37"/> - <ColorAlias name="processor fader: text" alias="color 45"/> - <ColorAlias name="processor fader: text active" alias="color 50"/> - <ColorAlias name="processor postfader: fill" alias="color 58"/> - <ColorAlias name="processor postfader: fill active" alias="color 79"/> - <ColorAlias name="processor postfader: led" alias="color 44"/> - <ColorAlias name="processor postfader: led active" alias="color 37"/> - <ColorAlias name="processor postfader: text" alias="color 45"/> - <ColorAlias name="processor postfader: text active" alias="color 50"/> - <ColorAlias name="processor prefader: fill" alias="color 40"/> - <ColorAlias name="processor prefader: fill active" alias="color 80"/> - <ColorAlias name="processor prefader: led" alias="color 44"/> - <ColorAlias name="processor prefader: led active" alias="color 37"/> - <ColorAlias name="processor prefader: text" alias="color 45"/> - <ColorAlias name="processor prefader: text active" alias="color 50"/> - <ColorAlias name="punch button: fill" alias="color 20"/> - <ColorAlias name="punch button: fill active" alias="color 9"/> - <ColorAlias name="punch button: led" alias="color 4"/> - <ColorAlias name="punch button: led active" alias="color 4"/> - <ColorAlias name="punch clock: background" alias="color 4"/> - <ColorAlias name="punch clock: cursor" alias="color 9"/> - <ColorAlias name="punch clock: edited text" alias="color 9"/> - <ColorAlias name="punch clock: text" alias="color 12"/> - <ColorAlias name="punch line" alias="color 83"/> - <ColorAlias name="range drag bar rect" alias="color 21"/> - <ColorAlias name="range drag rect" alias="color 56"/> - <ColorAlias name="range marker bar" alias="color 3"/> - <ColorAlias name="record enable button: fill" alias="color 25"/> - <ColorAlias name="record enable button: fill active" alias="color 83"/> - <ColorAlias name="record enable button: led" alias="color 84"/> - <ColorAlias name="record enable button: led active" alias="color 85"/> - <ColorAlias name="recorded waveform fill" alias="color 13"/> - <ColorAlias name="recorded waveform outline" alias="color 43"/> - <ColorAlias name="recording rect" alias="color 86"/> - <ColorAlias name="region list automatic" alias="color 53"/> - <ColorAlias name="region list missing source" alias="color 9"/> - <ColorAlias name="region list whole file" alias="color 1"/> - <ColorAlias name="region area covered by another region" alias="color 87"/> - <ColorAlias name="region base" alias="color 11"/> - <ColorAlias name="route button: fill" alias="color 25"/> - <ColorAlias name="route button: fill active" alias="color 67"/> - <ColorAlias name="route button: led" alias="color 66"/> - <ColorAlias name="route button: led active" alias="color 8"/> - <ColorAlias name="rubber band rect" alias="color 88"/> - <ColorAlias name="rude audition: fill" alias="color 20"/> - <ColorAlias name="rude audition: fill active" alias="color 86"/> - <ColorAlias name="rude audition: led" alias="color 4"/> - <ColorAlias name="rude audition: led active" alias="color 4"/> - <ColorAlias name="rude audition: text" alias="color 21"/> - <ColorAlias name="rude audition: text active" alias="color 13"/> - <ColorAlias name="rude isolate: fill" alias="color 42"/> - <ColorAlias name="rude isolate: fill active" alias="color 89"/> - <ColorAlias name="rude isolate: led" alias="color 4"/> - <ColorAlias name="rude isolate: led active" alias="color 4"/> - <ColorAlias name="rude isolate: text" alias="color 21"/> - <ColorAlias name="rude isolate: text active" alias="color 4"/> - <ColorAlias name="rude solo: fill" alias="color 20"/> - <ColorAlias name="rude solo: fill active" alias="color 86"/> - <ColorAlias name="rude solo: led" alias="color 4"/> - <ColorAlias name="rude solo: led active" alias="color 4"/> - <ColorAlias name="rude solo: text" alias="color 21"/> - <ColorAlias name="rude solo: text active" alias="color 22"/> - <ColorAlias name="ruler base" alias="color 90"/> - <ColorAlias name="ruler text" alias="color 22"/> - <ColorAlias name="secondary clock: background" alias="color 7"/> - <ColorAlias name="secondary clock: cursor" alias="color 8"/> - <ColorAlias name="secondary clock: edited text" alias="color 8"/> - <ColorAlias name="secondary clock: text" alias="color 91"/> - <ColorAlias name="secondary delta clock: background" alias="color 4"/> - <ColorAlias name="secondary delta clock: cursor" alias="color 9"/> - <ColorAlias name="secondary delta clock: edited text" alias="color 9"/> - <ColorAlias name="secondary delta clock: text" alias="color 92"/> - <ColorAlias name="selected crossfade editor line" alias="color 14"/> - <ColorAlias name="selected crossfade editor wave" alias="color 32"/> - <ColorAlias name="selected crossfade editor wave fill" alias="color 4"/> - <ColorAlias name="selected midi note color max" alias="color 62"/> - <ColorAlias name="selected midi note color mid" alias="color 93"/> - <ColorAlias name="selected midi note color min" alias="color 61"/> - <ColorAlias name="selected region base" alias="color 25"/> - <ColorAlias name="selected time axis frame" alias="color 86"/> - <ColorAlias name="selected waveform fill" alias="color 8"/> - <ColorAlias name="selected waveform outline" alias="color 67"/> - <ColorAlias name="selection" alias="color 94"/> - <ColorAlias name="selection clock: background" alias="color 4"/> - <ColorAlias name="selection clock: cursor" alias="color 9"/> - <ColorAlias name="selection clock: edited text" alias="color 9"/> - <ColorAlias name="selection clock: text" alias="color 12"/> - <ColorAlias name="selection rect" alias="color 95"/> - <ColorAlias name="send bg" alias="color 38"/> - <ColorAlias name="send alert button: fill" alias="color 71"/> - <ColorAlias name="send alert button: fill active" alias="color 38"/> - <ColorAlias name="send alert button: led" alias="color 4"/> - <ColorAlias name="send alert button: led active" alias="color 4"/> - <ColorAlias name="shuttle" alias="color 12"/> - <ColorAlias name="silence" alias="color 98"/> - <ColorAlias name="silence text" alias="color 99"/> - <ColorAlias name="solo button: fill" alias="color 25"/> - <ColorAlias name="solo button: fill active" alias="color 12"/> - <ColorAlias name="solo button: led" alias="color 4"/> - <ColorAlias name="solo button: led active" alias="color 4"/> - <ColorAlias name="solo isolate: fill" alias="color 25"/> - <ColorAlias name="solo isolate: fill active" alias="color 42"/> - <ColorAlias name="solo isolate: led" alias="color 69"/> - <ColorAlias name="solo isolate: led active" alias="color 9"/> - <ColorAlias name="solo isolate: text" alias="color 26"/> - <ColorAlias name="solo isolate: text active" alias="color 26"/> - <ColorAlias name="solo safe: fill" alias="color 25"/> - <ColorAlias name="solo safe: fill active" alias="color 42"/> - <ColorAlias name="solo safe: led" alias="color 69"/> - <ColorAlias name="solo safe: led active" alias="color 9"/> - <ColorAlias name="solo safe: text" alias="color 26"/> - <ColorAlias name="solo safe: text active" alias="color 26"/> - <ColorAlias name="stereo panner bg" alias="color 61"/> - <ColorAlias name="stereo panner fill" alias="color 74"/> - <ColorAlias name="stereo panner inverted bg" alias="color 61"/> - <ColorAlias name="stereo panner inverted fill" alias="color 100"/> - <ColorAlias name="stereo panner inverted outline" alias="color 83"/> - <ColorAlias name="stereo panner inverted text" alias="color 4"/> - <ColorAlias name="stereo panner mono bg" alias="color 61"/> - <ColorAlias name="stereo panner mono fill" alias="color 54"/> - <ColorAlias name="stereo panner mono outline" alias="color 101"/> - <ColorAlias name="stereo panner mono text" alias="color 4"/> - <ColorAlias name="stereo panner outline" alias="color 70"/> - <ColorAlias name="stereo panner rule" alias="color 70"/> - <ColorAlias name="stereo panner text" alias="color 4"/> - <ColorAlias name="tempo bar" alias="color 102"/> - <ColorAlias name="tempo marker" alias="color 19"/> - <ColorAlias name="time axis frame" alias="color 4"/> - <ColorAlias name="time stretch fill" alias="color 26"/> - <ColorAlias name="time stretch outline" alias="color 94"/> - <ColorAlias name="tracknumber label: fill" alias="color 34"/> - <ColorAlias name="tracknumber label: fill active" alias="color 46"/> - <ColorAlias name="tracknumber label: led" alias="color 9"/> - <ColorAlias name="tracknumber label: led active" alias="color 9"/> - <ColorAlias name="tracknumber label: text" alias="color 26"/> - <ColorAlias name="tracknumber label: text active" alias="color 9"/> - <ColorAlias name="transport active option button: fill" alias="color 25"/> - <ColorAlias name="transport active option button: fill active" alias="color 48"/> - <ColorAlias name="transport active option button: led" alias="color 66"/> - <ColorAlias name="transport active option button: led active" alias="color 8"/> - <ColorAlias name="transport button: fill" alias="color 25"/> - <ColorAlias name="transport button: fill active" alias="color 48"/> - <ColorAlias name="transport button: led" alias="color 4"/> - <ColorAlias name="transport button: led active" alias="color 4"/> - <ColorAlias name="transport clock: background" alias="color 7"/> - <ColorAlias name="transport clock: cursor" alias="color 8"/> - <ColorAlias name="transport clock: edited text" alias="color 8"/> - <ColorAlias name="transport clock: text" alias="color 91"/> - <ColorAlias name="transport delta clock: background" alias="color 4"/> - <ColorAlias name="transport delta clock: cursor" alias="color 9"/> - <ColorAlias name="transport delta clock: edited text" alias="color 9"/> - <ColorAlias name="transport delta clock: text" alias="color 92"/> - <ColorAlias name="transport drag rect" alias="color 21"/> - <ColorAlias name="transport loop rect" alias="color 103"/> - <ColorAlias name="transport marker bar" alias="color 11"/> - <ColorAlias name="transport option button: fill" alias="color 25"/> - <ColorAlias name="transport option button: fill active" alias="color 42"/> - <ColorAlias name="transport option button: led" alias="color 66"/> - <ColorAlias name="transport option button: led active" alias="color 8"/> - <ColorAlias name="transport punch rect" alias="color 80"/> - <ColorAlias name="transport recenable button: fill" alias="color 20"/> - <ColorAlias name="transport recenable button: fill active" alias="color 83"/> - <ColorAlias name="transport recenable button: led" alias="color 4"/> - <ColorAlias name="transport recenable button: led active" alias="color 4"/> - <ColorAlias name="trim handle" alias="color 18"/> - <ColorAlias name="trim handle locked" alias="color 86"/> - <ColorAlias name="verbose canvas cursor" alias="color 32"/> - <ColorAlias name="vestigial frame" alias="color 4"/> - <ColorAlias name="video timeline bar" alias="color 46"/> - <ColorAlias name="waveform fill" alias="color 13"/> - <ColorAlias name="waveform outline" alias="color 4"/> - <ColorAlias name="zero line" alias="color 104"/> - <ColorAlias name="zoom button: fill" alias="color 25"/> - <ColorAlias name="zoom button: fill active" alias="color 48"/> - <ColorAlias name="zoom button: led" alias="color 66"/> - <ColorAlias name="zoom button: led active" alias="color 8"/> - </ColorAliases> </Ardour> diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 6d56b7d8c0..dbf7173082 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -272,7 +272,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) case RESPONSE_ACCEPT: c = color_dialog.get_colorsel()->get_current_color(); GroupTabs::set_group_color (group, gdk_color_to_rgba (c)); - ARDOUR_UI::config()->set_dirty (); break; default: diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index d7749030af..1f333058ed 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -59,7 +59,6 @@ using namespace ARDOUR_UI_UTILS; namespace ARDOUR_UI_UTILS { sigc::signal<void> ColorsChanged; - sigc::signal<void,uint32_t> ColorChanged; } ThemeManager::ThemeManager() @@ -230,15 +229,25 @@ ThemeManager::ThemeManager() /* no need to call setup_palette() here, it will be done when its size is allocated */ setup_aliases (); - /* Trigger setting up the GTK color scheme and loading the RC file */ - cerr << "Load RC file\n"; - UIConfiguration::load_rc_file (ARDOUR_UI::config()->get_ui_rc_file(), false); + /* Trigger setting up the color scheme and loading the GTK RC file */ + + ARDOUR_UI::config()->load_rc_file (false); + + ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ThemeManager::colors_changed)); } ThemeManager::~ThemeManager() { } +void +ThemeManager::colors_changed () +{ + setup_basic_color_display (); + setup_palette (); + setup_aliases (); +} + int ThemeManager::save (string /*path*/) { @@ -266,16 +275,11 @@ ThemeManager::basic_color_button_press_event (GdkEventButton* ev) case 1: /* color */ if ((iter = basic_color_list->get_iter (path))) { - ColorVariable<ArdourCanvas::Color>* var = (*iter)[basic_color_columns.color_variable]; - if (!var) { - /* parent row, do nothing */ - return false; - } - + string color_name = (*iter)[basic_color_columns.name]; Gdk::Color color; double r, g, b, a; - ArdourCanvas::color_to_rgba (var->get(), r, g, b, a); + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->base_color_by_name (color_name), r, g, b, a); color.set_rgb_p (r, g, b); color_dialog.get_colorsel()->set_previous_color (color); color_dialog.get_colorsel()->set_current_color (color); @@ -283,7 +287,7 @@ ThemeManager::basic_color_button_press_event (GdkEventButton* ev) color_dialog.get_colorsel()->set_current_alpha ((guint16) (a * 65535.0)); color_dialog_connection.disconnect (); - color_dialog_connection = color_dialog.signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ThemeManager::basic_color_response), var)); + color_dialog_connection = color_dialog.signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ThemeManager::basic_color_response), color_name)); color_dialog.present (); } } @@ -292,7 +296,7 @@ ThemeManager::basic_color_button_press_event (GdkEventButton* ev) } void -ThemeManager::basic_color_response (int result, ColorVariable<ArdourCanvas::Color>* color_variable) +ThemeManager::basic_color_response (int result, string name) { Gdk::Color color; double a; @@ -307,14 +311,10 @@ ThemeManager::basic_color_response (int result, ColorVariable<ArdourCanvas::Colo color = color_dialog.get_colorsel()->get_current_color(); a = color_dialog.get_colorsel()->get_current_alpha() / 65535.0; - color_variable->set (ArdourCanvas::rgba_to_color (color.get_red_p(), - color.get_green_p(), - color.get_blue_p(), - a)); - setup_basic_color_display (); - setup_palette (); - setup_aliases (); - ColorsChanged(); //EMIT SIGNAL + ARDOUR_UI::config()->set_base (name, ArdourCanvas::rgba_to_color (color.get_red_p(), + color.get_green_p(), + color.get_blue_p(), + a)); break; default: @@ -329,7 +329,6 @@ void ThemeManager::on_flat_buttons_toggled () { ARDOUR_UI::config()->set_flat_buttons (flat_buttons.get_active()); - ARDOUR_UI::config()->set_dirty (); ArdourButton::set_flat_buttons (flat_buttons.get_active()); /* force a redraw */ gtk_rc_reset_styles (gtk_settings_get_default()); @@ -339,7 +338,6 @@ void ThemeManager::on_blink_rec_arm_toggled () { ARDOUR_UI::config()->set_blink_rec_arm (blink_rec_button.get_active()); - ARDOUR_UI::config()->set_dirty (); ARDOUR::Config->ParameterChanged("blink-rec-arm"); } @@ -347,21 +345,18 @@ void ThemeManager::on_region_color_toggled () { ARDOUR_UI::config()->set_color_regions_using_track_color (region_color_button.get_active()); - ARDOUR_UI::config()->set_dirty (); } void ThemeManager::on_show_clip_toggled () { ARDOUR_UI::config()->set_show_waveform_clipping (show_clipping_button.get_active()); - ARDOUR_UI::config()->set_dirty (); } void ThemeManager::on_all_dialogs_toggled () { ARDOUR_UI::config()->set_all_floating_windows_are_dialogs (all_dialogs.get_active()); - ARDOUR_UI::config()->set_dirty (); } void @@ -370,7 +365,6 @@ ThemeManager::on_waveform_gradient_depth_change () double v = waveform_gradient_depth.get_value(); ARDOUR_UI::config()->set_waveform_gradient_depth (v); - ARDOUR_UI::config()->set_dirty (); ArdourCanvas::WaveView::set_global_gradient_depth (v); } @@ -380,7 +374,6 @@ ThemeManager::on_timeline_item_gradient_depth_change () double v = timeline_item_gradient_depth.get_value(); ARDOUR_UI::config()->set_timeline_item_gradient_depth (v); - ARDOUR_UI::config()->set_dirty (); } void @@ -397,7 +390,7 @@ ThemeManager::on_dark_theme_button_toggled() UIConfiguration* uic (ARDOUR_UI::config()); - uic->set_ui_rc_file("ui_dark.rc"); + uic->set_color_file("dark"); } void @@ -407,7 +400,7 @@ ThemeManager::on_light_theme_button_toggled() UIConfiguration* uic (ARDOUR_UI::config()); - uic->set_ui_rc_file("ui_light.rc"); + uic->set_color_file("light"); } void @@ -419,10 +412,9 @@ ThemeManager::setup_basic_color_display () TreeModel::Row row; row = *(basic_color_list->append()); - row[basic_color_columns.name] = i->second->name(); - row[basic_color_columns.color_variable] = i->second; + row[basic_color_columns.name] = i->first; - ArdourCanvas::Color c = i->second->get(); + ArdourCanvas::Color c = i->second; /* Gdk colors don't support alpha */ @@ -448,7 +440,6 @@ ThemeManager::reset_canvas_colors() { ARDOUR_UI::config()->load_defaults(); setup_basic_color_display (); - ARDOUR_UI::config()->set_dirty (); ARDOUR_UI::config()->save_state (); } @@ -621,12 +612,7 @@ ThemeManager::palette_color_response (int result, std::string name) b = gdkcolor.get_blue_p(); rhsv = uic->color_as_relative_hsv (rgba_to_color (r, g, b, a)); - uic->reset_relative (name, rhsv); - - /* rebuild */ - - setup_palette (); - ColorsChanged(); //EMIT SIGNAL + uic->set_relative (name, rhsv); break; default: diff --git a/gtk2_ardour/theme_manager.h b/gtk2_ardour/theme_manager.h index 18044a7812..dee3f5d151 100644 --- a/gtk2_ardour/theme_manager.h +++ b/gtk2_ardour/theme_manager.h @@ -71,12 +71,10 @@ class ThemeManager : public ArdourWindow BasicColorDisplayModelColumns() { add (name); add (gdkcolor); - add (color_variable); } Gtk::TreeModelColumn<std::string> name; Gtk::TreeModelColumn<Gdk::Color> gdkcolor; - Gtk::TreeModelColumn<ColorVariable<ArdourCanvas::Color> *> color_variable; }; BasicColorDisplayModelColumns basic_color_columns; @@ -109,7 +107,7 @@ class ThemeManager : public ArdourWindow /* handles response from color dialog when it used to edit a basic color */ - void basic_color_response (int, ColorVariable<ArdourCanvas::Color>*); + void basic_color_response (int, std::string); /* handls response from color dialog when it is used to edit a derived color. @@ -175,6 +173,8 @@ class ThemeManager : public ArdourWindow void setup_aliases (); void setup_palette (); + + void colors_changed (); }; #endif /* __ardour_gtk_color_manager_h__ */ diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index ece4d7ac50..e39336491f 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -64,22 +64,10 @@ UIConfiguration::UIConfiguration () #undef UI_CONFIG_VARIABLE #undef CANVAS_FONT_VARIABLE - /* initialize all the base colors using default - colors for now. these will be reset when/if - we load the UI config file. - */ - -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) var (name,quantized (val)), -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - _dirty (false), + base_modified (false), aliases_modified (false), - derived_modified (false), - _saved_state_node (""), - _saved_state_version (-1) - + derived_modified (false) { _instance = this; @@ -88,7 +76,7 @@ UIConfiguration::UIConfiguration () */ #undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,color) base_colors.insert (make_pair (name,&var)); +#define CANVAS_BASE_COLOR(var,name,color) base_colors.insert (make_pair (name,color)); #include "base_colors.h" #undef CANVAS_BASE_COLOR @@ -110,7 +98,7 @@ UIConfiguration::UIConfiguration () /* force GTK theme setting, so that loading an RC file will work */ - reset_gtk_theme (); + load_color_theme (); } UIConfiguration::~UIConfiguration () @@ -120,8 +108,6 @@ UIConfiguration::~UIConfiguration () void UIConfiguration::colors_changed () { - _dirty = true; - reset_gtk_theme (); /* In theory, one of these ought to work: @@ -142,7 +128,12 @@ UIConfiguration::parameter_changed (string param) _dirty = true; if (param == "ui-rc-file") { - load_rc_file (get_ui_rc_file(), true); + load_rc_file (true); + } else if (param == "color-file") { + load_color_theme (); + } else if (param == "base-color") { /* one of many */ + base_modified = true; + ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ } save_state (); @@ -179,16 +170,16 @@ UIConfiguration::color_as_relative_hsv (Color c) double shortest_distance = DBL_MAX; string closest_name; - map<string,ColorVariable<Color>*>::iterator f; + BaseColors::iterator f; std::map<std::string,HSV> palette; for (f = base_colors.begin(); f != base_colors.end(); ++f) { /* Do not include any specialized base colors in the palette - we use to do comparisons + we use to do comparisons (e.g. meter colors) */ if (f->first.find ("color") == 0) { - palette.insert (make_pair (f->first, HSV (f->second->get()))); + palette.insert (make_pair (f->first, HSV (f->second))); } } @@ -287,7 +278,6 @@ UIConfiguration::load_defaults () _dirty = false; - ARDOUR_UI_UTILS::ColorsChanged (); } else { warning << string_compose (_("Could not find default UI configuration file %1"), default_ui_config_file_name) << endmsg; } @@ -296,6 +286,76 @@ UIConfiguration::load_defaults () } int +UIConfiguration::load_color_theme () +{ + std::string cfile; + string basename = color_file.get(); + + basename += ".colors"; + + if (find_file (ardour_config_search_path(), basename, cfile)) { + XMLTree tree; + + info << string_compose (_("Loading color file %1"), cfile) << endmsg; + + if (!tree.read (cfile.c_str())) { + error << string_compose(_("cannot read color file \"%1\""), cfile) << endmsg; + return -1; + } + + if (set_state (*tree.root(), Stateful::loading_state_version)) { + error << string_compose(_("color file \"%1\" not loaded successfully."), cfile) << endmsg; + return -1; + } + + ARDOUR_UI_UTILS::ColorsChanged (); + } else { + warning << string_compose (_("Color file %1 not found"), basename) << endmsg; + } + + return 0; +} + +int +UIConfiguration::store_color_theme (string const& path) +{ + XMLNode* root; + LocaleGuard lg (X_("POSIX")); + + root = new XMLNode("Ardour"); + + XMLNode* parent = new XMLNode (X_("RelativeColors")); + for (RelativeColors::const_iterator i = relative_colors.begin(); i != relative_colors.end(); ++i) { + XMLNode* node = new XMLNode (X_("RelativeColor")); + node->add_property (X_("name"), i->first); + node->add_property (X_("base"), i->second.base_color); + node->add_property (X_("modifier"), i->second.modifier.to_string()); + parent->add_child_nocopy (*node); + } + root->add_child_nocopy (*parent); + + + parent = new XMLNode (X_("ColorAliases")); + for (ColorAliases::const_iterator i = color_aliases.begin(); i != color_aliases.end(); ++i) { + XMLNode* node = new XMLNode (X_("ColorAlias")); + node->add_property (X_("name"), i->first); + node->add_property (X_("alias"), i->second); + parent->add_child_nocopy (*node); + } + root->add_child_nocopy (*parent); + + XMLTree tree; + + tree.set_root (root); + if (!tree.write (path.c_str())){ + error << string_compose (_("Color file %1 not saved"), path) << endmsg; + return -1; + } + + return 0; +} + +int UIConfiguration::load_state () { bool found = false; @@ -317,8 +377,6 @@ UIConfiguration::load_state () error << string_compose(_("default ui configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; return -1; } - - /* make a copy */ } if (find_file (ardour_config_search_path(), ui_config_file_name, rcfile)) { @@ -344,32 +402,42 @@ UIConfiguration::load_state () error << _("could not find any ui configuration file, canvas will look broken.") << endmsg; } - ARDOUR_UI_UTILS::ColorsChanged (); - return 0; } int UIConfiguration::save_state() { - XMLTree tree; - if (!dirty()) { - return 0; - } - - std::string rcfile(user_config_directory()); - rcfile = Glib::build_filename (rcfile, ui_config_file_name); + if (_dirty) { + std::string rcfile = Glib::build_filename (user_config_directory(), ui_config_file_name); + + XMLTree tree; - if (rcfile.length()) { tree.set_root (&get_state()); + if (!tree.write (rcfile.c_str())){ error << string_compose (_("Config file %1 not saved"), rcfile) << endmsg; return -1; } + + _dirty = false; } - _dirty = false; + if (base_modified || aliases_modified || derived_modified) { + std::string colorfile = Glib::build_filename (user_config_directory(), (color_file.get() + ".colors")); + + cerr << "Save colors to " << colorfile << endl; + if (store_color_theme (colorfile)) { + error << string_compose (_("Color file %1 not saved"), color_file.get()) << endmsg; + return -1; + } + + base_modified = false; + aliases_modified = false; + derived_modified = false; + } + return 0; } @@ -385,26 +453,6 @@ UIConfiguration::get_state () root->add_child_nocopy (get_variables ("UI")); root->add_child_nocopy (get_variables ("Canvas")); - XMLNode* parent = new XMLNode (X_("RelativeColors")); - for (RelativeColors::const_iterator i = relative_colors.begin(); i != relative_colors.end(); ++i) { - XMLNode* node = new XMLNode (X_("RelativeColor")); - node->add_property (X_("name"), i->first); - node->add_property (X_("base"), i->second.base_color); - node->add_property (X_("modifier"), i->second.modifier.to_string()); - parent->add_child_nocopy (*node); - } - root->add_child_nocopy (*parent); - - - parent = new XMLNode (X_("ColorAliases")); - for (ColorAliases::const_iterator i = color_aliases.begin(); i != color_aliases.end(); ++i) { - XMLNode* node = new XMLNode (X_("ColorAlias")); - node->add_property (X_("name"), i->first); - node->add_property (X_("alias"), i->second); - parent->add_child_nocopy (*node); - } - root->add_child_nocopy (*parent); - if (_extra_xml) { root->add_child_copy (*_extra_xml); } @@ -435,6 +483,8 @@ UIConfiguration::get_variables (std::string which_node) int UIConfiguration::set_state (const XMLNode& root, int /*version*/) { + /* this can load a generic UI configuration file or a colors file */ + if (root.name() != "Ardour") { return -1; } @@ -455,6 +505,13 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/) } } + XMLNode* base = find_named_node (root, X_("BaseColors")); + + if (base) { + load_base_colors (*base); + } + + XMLNode* relative = find_named_node (root, X_("RelativeColors")); if (relative) { @@ -472,6 +529,12 @@ UIConfiguration::set_state (const XMLNode& root, int /*version*/) } void +UIConfiguration::load_base_colors (XMLNode const &) +{ + +} + +void UIConfiguration::load_color_aliases (XMLNode const & node) { XMLNodeList const nlist = node.children(); @@ -531,35 +594,15 @@ UIConfiguration::set_variables (const XMLNode& node) #include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_FONT_VARIABLE - - /* Reset base colors */ - -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) var.set_from_node (node); /* we don't care about ParameterChanged here */ -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - -} - -void -UIConfiguration::set_dirty () -{ - _dirty = true; -} - -bool -UIConfiguration::dirty () const -{ - return _dirty || aliases_modified || derived_modified; } ArdourCanvas::Color UIConfiguration::base_color_by_name (const std::string& name) const { - map<std::string,ColorVariable<Color>* >::const_iterator i = base_colors.find (name); + BaseColors::const_iterator i = base_colors.find (name); if (i != base_colors.end()) { - return i->second->get(); + return i->second; } cerr << string_compose (_("Base Color %1 not found"), name) << endl; @@ -620,7 +663,20 @@ UIConfiguration::quantized (Color c) const } void -UIConfiguration::reset_relative (const string& name, const RelativeHSV& rhsv) +UIConfiguration::set_base (string const& name, ArdourCanvas::Color color) +{ + BaseColors::iterator i = base_colors.find (name); + if (i == base_colors.end()) { + return; + } + i->second = color; + base_modified = true; + + ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ +} + +void +UIConfiguration::set_relative (const string& name, const RelativeHSV& rhsv) { RelativeColors::iterator i = relative_colors.find (name); @@ -632,8 +688,6 @@ UIConfiguration::reset_relative (const string& name, const RelativeHSV& rhsv) derived_modified = true; ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ - - save_state (); } void @@ -648,18 +702,17 @@ UIConfiguration::set_alias (string const & name, string const & alias) aliases_modified = true; ARDOUR_UI_UTILS::ColorsChanged (); /* EMIT SIGNAL */ - - save_state (); } void -UIConfiguration::load_rc_file (const string& filename, bool themechange) +UIConfiguration::load_rc_file (bool themechange) { + string basename = ui_rc_file.get(); std::string rc_file_path; - if (!find_file (ardour_config_search_path(), filename, rc_file_path)) { + if (!find_file (ardour_config_search_path(), basename, rc_file_path)) { warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"), - filename, ardour_config_search_path().to_string(), PROGRAM_NAME) + basename, ardour_config_search_path().to_string(), PROGRAM_NAME) << endmsg; return; } diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index bcfb1092e6..dc7d93e5e1 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -35,51 +35,6 @@ #include "utils.h" -/* This is very similar to ARDOUR::ConfigVariable but expects numeric values to - * be in hexadecimal. This is because it is intended for use with color - * specifications which are easier to scan for issues in "rrggbbaa" format than - * as decimals. - */ -template<class T> -class ColorVariable : public ARDOUR::ConfigVariableBase -{ - public: - ColorVariable (std::string str) : ARDOUR::ConfigVariableBase (str) {} - ColorVariable (std::string str, T val) : ARDOUR::ConfigVariableBase (str), value (val) {} - - bool set (T val) { - if (val == value) { - return false; - } - value = val; - return true; - } - - T get() const { - return value; - } - - std::string get_as_string () const { - std::stringstream ss; - ss << std::hex; - ss.fill('0'); - ss.width(8); - ss << value; - return ss.str (); - } - - void set_from_string (std::string const & s) { - std::stringstream ss; - ss << std::hex; - ss << s; - ss >> value; - } - - protected: - T get_for_save() { return value; } - T value; -}; - class UIConfiguration : public PBD::Stateful { public: @@ -93,21 +48,18 @@ class UIConfiguration : public PBD::Stateful double quantized_hue; ArdourCanvas::HSV get() const; -}; + }; UIConfiguration(); ~UIConfiguration(); static UIConfiguration* instance() { return _instance; } - bool dirty () const; - void set_dirty (); - int load_state (); int save_state (); int load_defaults (); - static void load_rc_file (std::string const &, bool themechange); + void load_rc_file (bool themechange); int set_state (const XMLNode&, int version); XMLNode& get_state (void); @@ -116,15 +68,15 @@ class UIConfiguration : public PBD::Stateful typedef std::map<std::string,RelativeHSV> RelativeColors; typedef std::map<std::string,std::string> ColorAliases; - typedef std::map<std::string,ColorVariable<ArdourCanvas::Color> *> BaseColors; + typedef std::map<std::string,ArdourCanvas::Color> BaseColors; BaseColors base_colors; RelativeColors relative_colors; ColorAliases color_aliases; void set_alias (std::string const & name, std::string const & alias); - - void reset_relative (const std::string& name, const RelativeHSV& new_value); + void set_relative (const std::string& name, const RelativeHSV& new_value); + void set_base (const std::string& name, ArdourCanvas::Color); RelativeHSV color_as_relative_hsv (ArdourCanvas::Color c); std::string color_as_alias (ArdourCanvas::Color c); @@ -153,9 +105,7 @@ class UIConfiguration : public PBD::Stateful #undef CANVAS_BASE_COLOR #define CANVAS_BASE_COLOR(var,name,val) \ - ArdourCanvas::Color get_##var() const { return var.get(); } \ - bool set_##var (ArdourCanvas::Color v) { bool ret = var.set (v); if (ret) { ParameterChanged (name); } return ret; } \ - bool set_##var(const ArdourCanvas::HSV& v) const { return set_##var (v.color()); } + ArdourCanvas::Color get_##var() const { return base_color_by_name (name); } #include "base_colors.h" #undef CANVAS_BASE_COLOR @@ -176,27 +126,21 @@ class UIConfiguration : public PBD::Stateful #include "canvas_vars.h" #undef CANVAS_FONT_VARIABLE - /* declare base color variables (these are modifiable by the user) */ - -#undef CANVAS_BASE_COLOR -#define CANVAS_BASE_COLOR(var,name,val) ColorVariable<ArdourCanvas::Color> var; -#include "base_colors.h" -#undef CANVAS_BASE_COLOR - XMLNode& state (); bool _dirty; + bool base_modified; bool aliases_modified; bool derived_modified; static UIConfiguration* _instance; + int store_color_theme (std::string const &); + void load_base_colors (XMLNode const &); void load_color_aliases (XMLNode const &); void load_relative_colors (XMLNode const &); void reset_gtk_theme (); void colors_changed (); - - XMLNode _saved_state_node; - int _saved_state_version; + int load_color_theme (); }; std::ostream& operator<< (std::ostream& o, const UIConfiguration::RelativeHSV& rhsv); diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 91bb75a761..b6e9595174 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -18,7 +18,8 @@ */ UI_CONFIG_VARIABLE(std::string, icon_set, "icon-set", "default") -UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ui_dark.rc") +UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "clearlooks.rc") +UI_CONFIG_VARIABLE(std::string, color_file, "color-file", "dark") UI_CONFIG_VARIABLE(bool, flat_buttons, "flat-buttons", false) UI_CONFIG_VARIABLE(bool, blink_rec_arm, "blink-rec-arm", false) UI_CONFIG_VARIABLE(float, waveform_gradient_depth, "waveform-gradient-depth", 0) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index ab04d7b7d3..f9c0ba6c5c 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -650,6 +650,7 @@ def build(bld): obj.install_path = bld.env['CONFDIR'] # not modified at present + bld.install_files(bld.env['CONFDIR'], 'dark.colors') bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings') bld.install_files(bld.env['CONFDIR'], 'mixer.bindings') |