several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults

git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 72 insertions, 65 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index b6678035ad..f74f293fea 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -179,66 +179,65 @@
     <Option name="processor control button: led active" value="ff0000ff"/>
     <Option name="processor control button: text" value="ffffffff"/>
     <Option name="processor control button: text active" value="ffffffff"/>
-    <Option name="monitor button: fill start" value="5d5856ff"/>
-    <Option name="monitor button: fill end" value="564d48ff"/>
-    <Option name="monitor button: fill start active" value="46a344ff"/>
-    <Option name="monitor button: fill end active" value="3c723bff"/>
+    <Option name="monitor button: fill start" value="5f5a58ff"/>
+    <Option name="monitor button: fill end" value="3f3a38ff"/>
+    <Option name="monitor button: fill start active" value="553500ff"/>
+    <Option name="monitor button: fill end active" value="e58505ff"/>
     <Option name="monitor button: led" value="660000ff"/>
     <Option name="monitor button: led active" value="ff0000ff"/>
     <Option name="monitor button: text" value="aaaaa3ff"/>
     <Option name="monitor button: text active" value="1a1a1aff"/>
-    <Option name="solo isolate: fill start" value="5d5856ff"/>
-    <Option name="solo isolate: fill end" value="564d48ff"/>
+    <Option name="solo isolate: fill start" value="5f5a58ff"/>
+    <Option name="solo isolate: fill end" value="504442ff"/>
     <Option name="solo isolate: fill start active" value="5d5856ff"/>
     <Option name="solo isolate: fill end active" value="564d48ff"/>
     <Option name="solo isolate: led" value="660000ff"/>
     <Option name="solo isolate: led active" value="ff0000ff"/>
     <Option name="solo isolate: text" value="c7c7d8ff"/>
     <Option name="solo isolate: text active" value="c8c8d9ff"/>
-    <Option name="solo safe: fill start" value="5d5856ff"/>
-    <Option name="solo safe: fill end" value="564d48ff"/>
+    <Option name="solo safe: fill start" value="5f5a58ff"/>
+    <Option name="solo safe: fill end" value="504442ff"/>
     <Option name="solo safe: fill start active" value="5d5856ff"/>
     <Option name="solo safe: fill end active" value="564d48ff"/>
     <Option name="solo safe: led" value="660000ff"/>
     <Option name="solo safe: led active" value="ff0000ff"/>
     <Option name="solo safe: text" value="c7c7d8ff"/>
     <Option name="solo safe: text active" value="c8c8d9ff"/>
-    <Option name="monitor section cut: fill start" value="5d5856ff"/>
-    <Option name="monitor section cut: fill end" value="564d48ff"/>
-    <Option name="monitor section cut: fill start active" value="f7bb0aff"/>
-    <Option name="monitor section cut: fill end active" value="ed8f00ff"/>
+    <Option name="monitor section cut: fill start" value="5f5a58ff"/>
+    <Option name="monitor section cut: fill end" value="3f3a38ff"/>
+    <Option name="monitor section cut: fill start active" value="5f4943ff"/>
+    <Option name="monitor section cut: fill end active" value="ffa500ff"/>
     <Option name="monitor section cut: led" value="473812ff"/>
     <Option name="monitor section cut: led active" value="78cb4eff"/>
     <Option name="monitor section cut: text" value="c7c7d8ff"/>
     <Option name="monitor section cut: text active" value="000000ff"/>
-    <Option name="monitor section dim: fill start" value="5d5856ff"/>
-    <Option name="monitor section dim: fill end" value="564d48ff"/>
-    <Option name="monitor section dim: fill start active" value="04af02ff"/>
-    <Option name="monitor section dim: fill end active" value="008a00ff"/>
-    <Option name="monitor section dim: led" value="473812ff"/>
+    <Option name="monitor section dim: fill start" value="5f5a58ff"/>
+    <Option name="monitor section dim: fill end" value="3f3a38ff"/>
+    <Option name="monitor section dim: fill start active" value="553500ff"/>
+    <Option name="monitor section dim: fill end active" value="e58505ff"/>
     <Option name="monitor section dim: led active" value="78cb4eff"/>
     <Option name="monitor section dim: text" value="c8c8d9ff"/>
     <Option name="monitor section dim: text active" value="c8c8d9ff"/>
-    <Option name="monitor section solo: fill start" value="5d5856ff"/>
-    <Option name="monitor section solo: fill end" value="564d48ff"/>
-    <Option name="monitor section solo: fill start active" value="f4f395ff"/>
-    <Option name="monitor section solo: fill end active" value="fffe1dff"/>
+    <Option name="monitor section solo: fill start" value="5f5a58ff"/>
+    <Option name="monitor section solo: fill end" value="3f3a38ff"/>
+    <Option name="monitor section solo: fill start active" value="104506ff"/>
+    <Option name="monitor section solo: fill end active" value="4dbb00ff"/>
     <Option name="monitor section solo: led" value="473812ff"/>
     <Option name="monitor section solo: led active" value="ffa500ff"/>
     <Option name="monitor section solo: text" value="00000000"/>
     <Option name="monitor section solo: text active" value="00000000"/>
-    <Option name="monitor section invert: fill start" value="5d5856ff"/>
-    <Option name="monitor section invert: fill end" value="564d48ff"/>
-    <Option name="monitor section invert: fill start active" value="03af01ff"/>
-    <Option name="monitor section invert: fill end active" value="008a00ff"/>
+    <Option name="monitor section invert: fill start" value="5f5a58ff"/>
+    <Option name="monitor section invert: fill end" value="3f3a38ff"/>
+    <Option name="monitor section invert: fill start active" value="222260ff"/>
+    <Option name="monitor section invert: fill end active" value="4242d0ff"/>
     <Option name="monitor section invert: led" value="473812ff"/>
     <Option name="monitor section invert: led active" value="78cb4eff"/>
     <Option name="monitor section invert: text" value="00000000"/>
     <Option name="monitor section invert: text active" value="00000000"/>
-    <Option name="monitor section mono: fill start" value="5d5856ff"/>
-    <Option name="monitor section mono: fill end" value="564d48ff"/>
-    <Option name="monitor section mono: fill start active" value="04af02ff"/>
-    <Option name="monitor section mono: fill end active" value="008a00ff"/>
+    <Option name="monitor section mono: fill start" value="5f5a58ff"/>
+    <Option name="monitor section mono: fill end" value="3f3a38ff"/>
+    <Option name="monitor section mono: fill start active" value="222260ff"/>
+    <Option name="monitor section mono: fill end active" value="3232c0ff"/>
     <Option name="monitor section mono: led" value="473812ff"/>
     <Option name="monitor section mono: led active" value="78cb4eff"/>
     <Option name="monitor section mono: text" value="c7c7d8ff"/>
@@ -299,26 +298,34 @@
     <Option name="feedback alert: led active" value="00000000"/>
     <Option name="feedback alert: text" value="969696ff"/>
     <Option name="feedback alert: text active" value="e5e5e5ff"/>
-    <Option name="mute button: fill start" value="af8a14ff"/>
-    <Option name="mute button: fill end" value="745127ff"/>
-    <Option name="mute button: fill start active" value="ffc300ff"/>
-    <Option name="mute button: fill end active" value="ea8400ff"/>
+    <Option name="mute button: fill start" value="565659ff"/>
+    <Option name="mute button: fill end" value="484853ff"/>
+    <Option name="mute button: fill start active" value="5f4943ff"/>
+    <Option name="mute button: fill end active" value="ffa500ff"/>
     <Option name="mute button: led" value="00000000"/>
     <Option name="mute button: led active" value="00000000"/>
     <Option name="mute button: text" value="bfbfbfff"/>
     <Option name="mute button: text active" value="191919ff"/>
-    <Option name="solo button: fill start" value="a09865ff"/>
-    <Option name="solo button: fill end" value="4c5b2aff"/>
-    <Option name="solo button: fill start active" value="fffd9bff"/>
-    <Option name="solo button: fill end active" value="ffff00ff"/>
+    <Option name="solo button: fill start" value="565659ff"/>
+    <Option name="solo button: fill end" value="484853ff"/>
+    <Option name="solo button: fill start active" value="104506ff"/>
+    <Option name="solo button: fill end active" value="4dbb00ff"/>
     <Option name="solo button: led" value="00000000"/>
     <Option name="solo button: led active" value="00000000"/>
     <Option name="solo button: text" value="bfbfbfff"/>
     <Option name="solo button: text active" value="191919ff"/>
-    <Option name="record enable button: fill start" value="603f3fff"/>
+    <Option name="invert button: fill start" value="565659ff"/>
+    <Option name="invert button: fill end" value="484853ff"/>
+    <Option name="invert button: fill start active" value="222260ff"/>
+    <Option name="invert button: fill end active" value="4242d0ff"/>
+    <Option name="invert button: led" value="473812ff"/>
+    <Option name="invert button: led active" value="78cb4eff"/>
+    <Option name="invert button: text" value="bfbfbfff"/>
+    <Option name="invert button: text active" value="bfbfbfff"/>
+    <Option name="record enable button: fill start" value="5f3f3fff"/>
     <Option name="record enable button: fill end" value="3d2828ff"/>
-    <Option name="record enable button: fill start active" value="fb0c0cff"/>
-    <Option name="record enable button: fill end active" value="b50f0fff"/>
+    <Option name="record enable button: fill start active" value="280b0bff"/>
+    <Option name="record enable button: fill end active" value="b50e0eff"/>
     <Option name="record enable button: led" value="00000000"/>
     <Option name="record enable button: led active" value="00000000"/>
     <Option name="record enable button: text" value="a5a5a5ff"/>
@@ -331,9 +338,9 @@
     <Option name="send alert button: led active" value="00000000"/>
     <Option name="send alert button: text" value="ccccccff"/>
     <Option name="send alert button: text active" value="000000ff"/>
-    <Option name="transport button: fill start" value="656867ff"/>
-    <Option name="transport button: fill end" value="333333ff"/>
-    <Option name="transport button: fill start active" value="a1ff43ff"/>
+    <Option name="transport button: fill start" value="616268ff"/>
+    <Option name="transport button: fill end" value="505159ff"/>
+    <Option name="transport button: fill start active" value="145409ff"/>
     <Option name="transport button: fill end active" value="00a300ff"/>
     <Option name="transport button: led" value="00000000"/>
     <Option name="transport button: led active" value="00000000"/>
@@ -341,14 +348,14 @@
     <Option name="transport button: text active" value="00000000"/>
     <Option name="transport recenable button: fill start" value="5f3f3fff"/>
     <Option name="transport recenable button: fill end" value="3d2828ff"/>
-    <Option name="transport recenable button: fill start active" value="f80b0bff"/>
+    <Option name="transport recenable button: fill start active" value="280b0bff"/>
     <Option name="transport recenable button: fill end active" value="b50e0eff"/>
     <Option name="transport recenable button: led" value="00000000"/>
     <Option name="transport recenable button: led active" value="00000000"/>
     <Option name="transport recenable button: text" value="00000000"/>
     <Option name="transport recenable button: text active" value="00000000"/>
     <Option name="transport option button: fill start" value="636470ff"/>
-    <Option name="transport option button: fill end" value="4a4b51ff"/>
+    <Option name="transport option button: fill end" value="54555dff"/>
     <Option name="transport option button: fill start active" value="636470ff"/>
     <Option name="transport option button: fill end active" value="4a4b51ff"/>
     <Option name="transport option button: led" value="4f3300ff"/>
@@ -356,9 +363,9 @@
     <Option name="transport option button: text" value="c7c7d8ff"/>
     <Option name="transport option button: text active" value="c8c8d9ff"/>
     <Option name="transport active option button: fill start" value="606b60ff"/>
-    <Option name="transport active option button: fill end" value="555d54ff"/>
-    <Option name="transport active option button: fill start active" value="a1ff43ff"/>
-    <Option name="transport active option button: fill end active" value="00a300ff"/>
+    <Option name="transport active option button: fill end" value="495348ff"/>
+    <Option name="transport active option button: fill start active" value="154515ff"/>
+    <Option name="transport active option button: fill end active" value="20a320ff"/>
     <Option name="transport active option button: led" value="4f3300ff"/>
     <Option name="transport active option button: led active" value="ffa500ff"/>
     <Option name="transport active option button: text" value="c7c7d8ff"/>
@@ -373,46 +380,46 @@
     <Option name="plugin bypass button: text active" value="c8c8d9ff"/>
     <Option name="punch button: fill start" value="603f3fff"/>
     <Option name="punch button: fill end" value="3d2828ff"/>
-    <Option name="punch button: fill start active" value="fb0c0cff"/>
-    <Option name="punch button: fill end active" value="b50f0fff"/>
+    <Option name="punch button: fill start active" value="503010ff"/>
+    <Option name="punch button: fill end active" value="f03020ff"/>
     <Option name="punch button: led" value="00000000"/>
     <Option name="punch button: led active" value="00000000"/>
     <Option name="punch button: text" value="a5a5a5ff"/>
     <Option name="punch button: text active" value="d8d8d8ff"/>
-    <Option name="mouse mode button: fill start" value="6e8755ff"/>
-    <Option name="mouse mode button: fill end" value="274e00ff"/>
-    <Option name="mouse mode button: fill start active" value="c5ff95ff"/>
+    <Option name="mouse mode button: fill start" value="636470ff"/>
+    <Option name="mouse mode button: fill end" value="54555dff"/>
+    <Option name="mouse mode button: fill start active" value="145409ff"/>
     <Option name="mouse mode button: fill end active" value="14ae08ff"/>
     <Option name="mouse mode button: led" value="4f3300ff"/>
     <Option name="mouse mode button: led active" value="ffa500ff"/>
-    <Option name="mouse mode button: text" value="c7c7d8ff"/>
+    <Option name="mouse mode button: text" value="f2f2f2ff"/>
     <Option name="mouse mode button: text active" value="000000ff"/>
     <Option name="zoom button: fill start" value="626370ff"/>
-    <Option name="zoom button: fill end" value="4a4b51ff"/>
-    <Option name="zoom button: fill start active" value="4d4d4dff"/>
-    <Option name="zoom button: fill end active" value="121212ff"/>
+    <Option name="zoom button: fill end" value="54555dff"/>
+    <Option name="zoom button: fill start active" value="202025ff"/>
+    <Option name="zoom button: fill end active" value="404045ff"/>
     <Option name="zoom button: led" value="4f3300ff"/>
     <Option name="zoom button: led active" value="ffa500ff"/>
     <Option name="zoom button: text" value="c7c7d8ff"/>
     <Option name="zoom button: text active" value="c8c8d9ff"/>
-    <Option name="route button: fill start" value="56565dff"/>
-    <Option name="route button: fill end" value="484856ff"/>
+    <Option name="route button: fill start" value="565659ff"/>
+    <Option name="route button: fill end" value="484853ff"/>
     <Option name="route button: fill start active" value="4d4d4dff"/>
     <Option name="route button: fill end active" value="121212ff"/>
     <Option name="route button: led" value="4f3300ff"/>
     <Option name="route button: led active" value="ffa500ff"/>
     <Option name="route button: text" value="c7c7d8ff"/>
     <Option name="route button: text active" value="c8c8d9ff"/>
-    <Option name="mixer strip button: fill start" value="56565dff"/>
-    <Option name="mixer strip button: fill end" value="484856ff"/>
-    <Option name="mixer strip button: fill start active" value="ffd993ff"/>
+    <Option name="mixer strip button: fill start" value="565659ff"/>
+    <Option name="mixer strip button: fill end" value="484853ff"/>
+    <Option name="mixer strip button: fill start active" value="5f4943ff"/>
     <Option name="mixer strip button: fill end active" value="ffa500ff"/>
     <Option name="mixer strip button: led" value="4f3300ff"/>
     <Option name="mixer strip button: led active" value="ffa500ff"/>
-    <Option name="mixer strip button: text" value="c7c7d7ff"/>
+    <Option name="mixer strip button: text" value="c7c7d8ff"/>
     <Option name="mixer strip button: text active" value="000000ff"/>
-    <Option name="mixer strip name button: fill start" value="56565dff"/>
-    <Option name="mixer strip name button: fill end" value="484856ff"/>
+    <Option name="mixer strip name button: fill start" value="565659ff"/>
+    <Option name="mixer strip name button: fill end" value="484853ff"/>
     <Option name="mixer strip name button: fill start active" value="4d4d4dff"/>
     <Option name="mixer strip name button: fill end active" value="121212ff"/>
     <Option name="mixer strip name button: led" value="4f3300ff"/>