diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-09 18:11:34 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-09 18:11:34 +0000 |
commit | 32869e2c31888ca7a1af56391ab1e3cebf374da9 (patch) | |
tree | 6a6eef35a29a917a055d90bb4710a132532ae5d4 | |
parent | 69c88d165dfd3bf373a708d19bfedaa7672acec5 (diff) |
repack transport hbox a bit
git-svn-id: svn://localhost/ardour2/branches/3.0@10511 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf | 768 | ||||
-rw-r--r-- | gtk2_ardour/ardour_button.cc | 32 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 27 | ||||
-rw-r--r-- | gtk2_ardour/canvas_vars.h | 32 |
4 files changed, 426 insertions, 433 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index ac6f7c0c45..1248e72ea4 100644 --- a/gtk2_ardour/ardour3_ui_default.conf +++ b/gtk2_ardour/ardour3_ui_default.conf @@ -143,389 +143,389 @@ <Option name="zero line" value="b5b5b525"/> <Option name="zoom rect" value="c6d1b26d"/> <Option name="monitor knob" value="329edfff"/> - <Option name="processor prefader border start" value="630a0aff"/> - <Option name="processor prefader border end" value="630a0aff"/> - <Option name="processor prefader border start selected" value="edc400ff"/> - <Option name="processor prefader border end selected" value="ffd300ff"/> - <Option name="processor prefader fill start" value="873c3cff"/> - <Option name="processor prefader fill end" value="542525ff"/> - <Option name="processor prefader fill start active" value="873c3cff"/> - <Option name="processor prefader fill end active" value="542525ff"/> - <Option name="processor prefader fill start mid" value="873c3cff"/> - <Option name="processor prefader fill end mid" value="542525ff"/> - <Option name="processor prefader led" value="26550eff"/> - <Option name="processor prefader led active" value="78cb4eff"/> - <Option name="processor prefader led mid" value="26550eff"/> - <Option name="processor prefader text" value="aaaaa3ff"/> - <Option name="processor prefader text active" value="eeeeecff"/> - <Option name="processor prefader text mid" value="aaaaa3ff"/> - <Option name="processor fader border start" value="7cb5d9ff"/> - <Option name="processor fader border end" value="6493b0ff"/> - <Option name="processor fader border start selected" value="cdfaf8ff"/> - <Option name="processor fader border end selected" value="c0ebe9ff"/> - <Option name="processor fader fill start" value="5d90b0ff"/> - <Option name="processor fader fill end" value="154c6eff"/> - <Option name="processor fader fill start active" value="5d90b0ff"/> - <Option name="processor fader fill end active" value="154d6fff"/> - <Option name="processor fader fill start mid" value="5d90b0ff"/> - <Option name="processor fader fill end mid" value="154d6fff"/> - <Option name="processor fader led" value="26550eff"/> - <Option name="processor fader led active" value="78cb4eff"/> - <Option name="processor fader led mid" value="26550eff"/> - <Option name="processor fader text" value="aaaaa3ff"/> - <Option name="processor fader text active" value="eeeeecff"/> - <Option name="processor fader text mid" value="aaaaa3ff"/> - <Option name="processor postfader border start" value="1d631dff"/> - <Option name="processor postfader border end" value="1d631dff"/> - <Option name="processor postfader border start selected" value="46f046ff"/> - <Option name="processor postfader border end selected" value="46f046ff"/> - <Option name="processor postfader fill start" value="415947ff"/> - <Option name="processor postfader fill end" value="202d23ff"/> - <Option name="processor postfader fill start active" value="415947ff"/> - <Option name="processor postfader fill end active" value="202d23ff"/> - <Option name="processor postfader fill start mid" value="415947ff"/> - <Option name="processor postfader fill end mid" value="202d23ff"/> - <Option name="processor postfader led" value="26550eff"/> - <Option name="processor postfader led active" value="78cb4eff"/> - <Option name="processor postfader led mid" value="26550eff"/> - <Option name="processor postfader text" value="aaaaa3ff"/> - <Option name="processor postfader text active" value="eeeeecff"/> - <Option name="processor postfader text mid" value="aaaaa3ff"/> - <Option name="monitor border start" value="b7b7d2ff"/> - <Option name="monitor border end" value="000000ff"/> - <Option name="monitor border start selected" value="9a908eff"/> - <Option name="monitor border end selected" value="675c5bff"/> - <Option name="monitor fill start" value="5d5856ff"/> - <Option name="monitor fill end" value="564d48ff"/> - <Option name="monitor fill start active" value="04af02ff"/> - <Option name="monitor fill end active" value="008a00ff"/> - <Option name="monitor fill start mid" value="04b002ff"/> - <Option name="monitor fill end mid" value="008900ff"/> - <Option name="monitor led" value="660000ff"/> - <Option name="monitor led active" value="ff0000ff"/> - <Option name="monitor led mid" value="660000ff"/> - <Option name="monitor text" value="aaaaa3ff"/> - <Option name="monitor text active" value="c6c6beff"/> - <Option name="monitor text mid" value="c7c7bfff"/> - <Option name="solo isolate border start" value="b7b7d2ff"/> - <Option name="solo isolate border end" value="000000ff"/> - <Option name="solo isolate border start selected" value="9a908eff"/> - <Option name="solo isolate border end selected" value="675c5bff"/> - <Option name="solo isolate fill start" value="5d5856ff"/> - <Option name="solo isolate fill end" value="564d48ff"/> - <Option name="solo isolate fill start active" value="5d5856ff"/> - <Option name="solo isolate fill end active" value="564d48ff"/> - <Option name="solo isolate fill start mid" value="5d5856ff"/> - <Option name="solo isolate fill end mid" value="564d48ff"/> - <Option name="solo isolate led" value="660000ff"/> - <Option name="solo isolate led active" value="ff0000ff"/> - <Option name="solo isolate led mid" value="660000ff"/> - <Option name="solo isolate text" value="c7c7d8ff"/> - <Option name="solo isolate text active" value="c8c8d9ff"/> - <Option name="solo isolate text mid" value="000000ff"/> - <Option name="solo safe border start" value="b7b7d2ff"/> - <Option name="solo safe border end" value="000000ff"/> - <Option name="solo safe border start selected" value="9a908eff"/> - <Option name="solo safe border end selected" value="675c5bff"/> - <Option name="solo safe fill start" value="5d5856ff"/> - <Option name="solo safe fill end" value="564d48ff"/> - <Option name="solo safe fill start active" value="5d5856ff"/> - <Option name="solo safe fill end active" value="564d48ff"/> - <Option name="solo safe fill start mid" value="5d5856ff"/> - <Option name="solo safe fill end mid" value="564d48ff"/> - <Option name="solo safe led" value="660000ff"/> - <Option name="solo safe led active" value="ff0000ff"/> - <Option name="solo safe led mid" value="660000ff"/> - <Option name="solo safe text" value="c7c7d8ff"/> - <Option name="solo safe text active" value="c8c8d9ff"/> - <Option name="solo safe text mid" value="000000ff"/> - <Option name="monitor section cut border start" value="b7b7d2ff"/> - <Option name="monitor section cut border end" value="000000ff"/> - <Option name="monitor section cut border start selected" value="9a908e00"/> - <Option name="monitor section cut border end selected" value="675c5b00"/> - <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 mid" value="00000000"/> - <Option name="monitor section cut fill end mid" value="00000000"/> - <Option name="monitor section cut led" value="473812ff"/> - <Option name="monitor section cut led active" value="78cb4eff"/> - <Option name="monitor section cut led mid" value="00000000"/> - <Option name="monitor section cut text" value="c7c7d8ff"/> - <Option name="monitor section cut text active" value="000000ff"/> - <Option name="monitor section cut text mid" value="00000000"/> - <Option name="monitor section dim border start" value="b7b7d2ff"/> - <Option name="monitor section dim border end" value="000000ff"/> - <Option name="monitor section dim border start selected" value="9a908eff"/> - <Option name="monitor section dim border end selected" value="675b5bff"/> - <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 fill start mid" value="04af0200"/> - <Option name="monitor section dim fill end mid" value="008a00ff"/> - <Option name="monitor section dim led" value="473812ff"/> - <Option name="monitor section dim led active" value="78cb4eff"/> - <Option name="monitor section dim led mid" value="00000000"/> - <Option name="monitor section dim text" value="c8c8d9ff"/> - <Option name="monitor section dim text active" value="c8c8d9ff"/> - <Option name="monitor section dim text mid" value="00000000"/> - <Option name="monitor section solo border start" value="b7b7d2ff"/> - <Option name="monitor section solo border end" value="000000ff"/> - <Option name="monitor section solo border start selected" value="9a908eff"/> - <Option name="monitor section solo border end selected" value="675c5bff"/> - <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 mid" value="f4f395ff"/> - <Option name="monitor section solo fill end mid" value="fffe1d00"/> - <Option name="monitor section solo led" value="473812ff"/> - <Option name="monitor section solo led active" value="ffa500ff"/> - <Option name="monitor section solo led mid" value="00000000"/> - <Option name="monitor section solo text" value="00000000"/> - <Option name="monitor section solo text active" value="00000000"/> - <Option name="monitor section solo text mid" value="00000000"/> - <Option name="monitor section invert border start" value="b7b7d2ff"/> - <Option name="monitor section invert border end" value="000000ff"/> - <Option name="monitor section invert border start selected" value="9a908eff"/> - <Option name="monitor section invert border end selected" value="675c5b00"/> - <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 mid" value="04af02ff"/> - <Option name="monitor section invert fill end mid" value="008a0000"/> - <Option name="monitor section invert led" value="473812ff"/> - <Option name="monitor section invert led active" value="78cb4eff"/> - <Option name="monitor section invert led mid" value="00000000"/> - <Option name="monitor section invert text" value="00000000"/> - <Option name="monitor section invert text active" value="00000000"/> - <Option name="monitor section invert text mid" value="00000000"/> - <Option name="monitor section mono border start" value="b7b7d2ff"/> - <Option name="monitor section mono border end" value="000000ff"/> - <Option name="monitor section mono border start selected" value="9a908eff"/> - <Option name="monitor section mono border end selected" value="675c5bff"/> - <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 mid" value="04af02ff"/> - <Option name="monitor section mono fill end mid" value="008a00ff"/> - <Option name="monitor section mono led" value="473812ff"/> - <Option name="monitor section mono led active" value="78cb4eff"/> - <Option name="monitor section mono led mid" value="00000000"/> - <Option name="monitor section mono text" value="c7c7d8ff"/> - <Option name="monitor section mono text active" value="c8c8d9ff"/> - <Option name="monitor section mono text mid" value="00000000"/> - <Option name="monitor section solo model border start" value="b7b7d2ff"/> - <Option name="monitor section solo model border end" value="000000ff"/> - <Option name="monitor section solo model border start selected" value="9a908eff"/> - <Option name="monitor section solo model border end selected" value="675c5bff"/> - <Option name="monitor section solo model fill start" value="5d5856ff"/> - <Option name="monitor section solo model fill end" value="564d48ff"/> - <Option name="monitor section solo model fill start active" value="5d5856ff"/> - <Option name="monitor section solo model fill end active" value="564d48ff"/> - <Option name="monitor section solo model fill start mid" value="5d5856ff"/> - <Option name="monitor section solo model fill end mid" value="564d48ff"/> - <Option name="monitor section solo model led" value="4f3300ff"/> - <Option name="monitor section solo model led active" value="ffa500ff"/> - <Option name="monitor section solo model led mid" value="b8770000"/> - <Option name="monitor section solo model text" value="c7c7d8ff"/> - <Option name="monitor section solo model text active" value="c8c8d9ff"/> - <Option name="monitor section solo model text mid" value="00000000"/> - <Option name="monitor solo override border start" value="b7b7d2ff"/> - <Option name="monitor solo override border end" value="000000ff"/> - <Option name="monitor solo override border start selected" value="9a908eff"/> - <Option name="monitor solo override border end selected" value="675c5bff"/> - <Option name="monitor solo override fill start" value="5d5856ff"/> - <Option name="monitor solo override fill end" value="564d48ff"/> - <Option name="monitor solo override fill start active" value="5d5856ff"/> - <Option name="monitor solo override fill end active" value="564d48ff"/> - <Option name="monitor solo override fill start mid" value="5d5856ff"/> - <Option name="monitor solo override fill end mid" value="564d48ff"/> - <Option name="monitor solo override led" value="4f3300ff"/> - <Option name="monitor solo override led active" value="ffa500ff"/> - <Option name="monitor solo override led mid" value="b87700ff"/> - <Option name="monitor solo override text" value="c7c7d8ff"/> - <Option name="monitor solo override text active" value="c8c8d9ff"/> - <Option name="monitor solo override text mid" value="00000000"/> - <Option name="monitor solo exclusive border start" value="b7b7d2ff"/> - <Option name="monitor solo exclusive border end" value="000000ff"/> - <Option name="monitor solo exclusive border start selected" value="9a908eff"/> - <Option name="monitor solo exclusive border end selected" value="675c5bff"/> - <Option name="monitor solo exclusive fill start" value="5d5856ff"/> - <Option name="monitor solo exclusive fill end" value="564d48ff"/> - <Option name="monitor solo exclusive fill start active" value="5d5856ff"/> - <Option name="monitor solo exclusive fill end active" value="564c47ff"/> - <Option name="monitor solo exclusive fill start mid" value="5d5856ff"/> - <Option name="monitor solo exclusive fill end mid" value="564d48ff"/> - <Option name="monitor solo exclusive led" value="4f3300ff"/> - <Option name="monitor solo exclusive led active" value="ffa500ff"/> - <Option name="monitor solo exclusive led mid" value="b77600ff"/> - <Option name="monitor solo exclusive text" value="c7c7d8ff"/> - <Option name="monitor solo exclusive text active" value="c8c8d9ff"/> - <Option name="monitor solo exclusive text mid" value="00000000"/> - <Option name="rude solo border start" value="997171ff"/> - <Option name="rude solo border end" value="000000ff"/> - <Option name="rude solo border start selected" value="000000ff"/> - <Option name="rude solo border end selected" value="00000000"/> - <Option name="rude solo fill start" value="684d4dff"/> - <Option name="rude solo fill end" value="513c3cff"/> - <Option name="rude solo fill start active" value="ff1f1fff"/> - <Option name="rude solo fill end active" value="e21b1bff"/> - <Option name="rude solo fill start mid" value="00000000"/> - <Option name="rude solo fill end mid" value="00000000"/> - <Option name="rude solo led" value="00000000"/> - <Option name="rude solo led active" value="00000000"/> - <Option name="rude solo led mid" value="00000000"/> - <Option name="rude solo text" value="969696ff"/> - <Option name="rude solo text active" value="e5e5e5ff"/> - <Option name="rude solo text mid" value="00000000"/> - <Option name="rude isolate border start" value="8da8b4ff"/> - <Option name="rude isolate border end" value="000000ff"/> - <Option name="rude isolate border start selected" value="00000000"/> - <Option name="rude isolate border end selected" value="000000ff"/> - <Option name="rude isolate fill start" value="21414fff"/> - <Option name="rude isolate fill end" value="192930ff"/> - <Option name="rude isolate fill start active" value="e5f7ffff"/> - <Option name="rude isolate fill end active" value="b6e5fdff"/> - <Option name="rude isolate fill start mid" value="00000000"/> - <Option name="rude isolate fill end mid" value="00000000"/> - <Option name="rude isolate led" value="00000000"/> - <Option name="rude isolate led active" value="000000ff"/> - <Option name="rude isolate led mid" value="00000000"/> - <Option name="rude isolate text" value="979797ff"/> - <Option name="rude isolate text active" value="000000ff"/> - <Option name="rude isolate text mid" value="00000000"/> - <Option name="rude audition border start" value="997171ff"/> - <Option name="rude audition border end" value="000000ff"/> - <Option name="rude audition border start selected" value="00000000"/> - <Option name="rude audition border end selected" value="000000ff"/> - <Option name="rude audition fill start" value="684d4dff"/> - <Option name="rude audition fill end" value="513c3cff"/> - <Option name="rude audition fill start active" value="ff1f1fff"/> - <Option name="rude audition fill end active" value="e21b1bff"/> - <Option name="rude audition fill start mid" value="00000000"/> - <Option name="rude audition fill end mid" value="000000ff"/> - <Option name="rude audition led" value="00000000"/> - <Option name="rude audition led active" value="00000000"/> - <Option name="rude audition led mid" value="00000000"/> - <Option name="rude audition text" value="979797ff"/> - <Option name="rude audition text active" value="ffffffff"/> - <Option name="rude audition text mid" value="00000000"/> - <Option name="mute button border start" value="ffcb8bff"/> - <Option name="mute button border end" value="000000ff"/> - <Option name="mute button border start selected" value="00000000"/> - <Option name="mute button border end selected" value="00000000"/> - <Option name="mute button fill start" value="ac8568ff"/> - <Option name="mute button fill end" value="383222ff"/> - <Option name="mute button fill start active" value="ffc300ff"/> - <Option name="mute button fill end active" value="ea8400ff"/> - <Option name="mute button fill start mid" value="c49600ff"/> - <Option name="mute button fill end mid" value="9b5700ff"/> - <Option name="mute button led" value="00000000"/> - <Option name="mute button led active" value="00000000"/> - <Option name="mute button led mid" value="00000000"/> - <Option name="mute button text" value="999999ff"/> - <Option name="mute button text active" value="191919ff"/> - <Option name="mute button text mid" value="262626ff"/> - <Option name="solo button border start" value="ffffffff"/> - <Option name="solo button border end" value="000000ff"/> - <Option name="solo button border start selected" value="000000ff"/> - <Option name="solo button border end selected" value="000000ff"/> - <Option name="solo button fill start" value="b7ac6cff"/> - <Option name="solo button fill end" value="575f53ff"/> - <Option name="solo button fill start active" value="fffd9bff"/> - <Option name="solo button fill end active" value="ffff00ff"/> - <Option name="solo button fill start mid" value="d7d697ff"/> - <Option name="solo button fill end mid" value="f0f09fff"/> - <Option name="solo button led" value="00000000"/> - <Option name="solo button led active" value="00000000"/> - <Option name="solo button led mid" value="00000000"/> - <Option name="solo button text" value="bfbfbfff"/> - <Option name="solo button text active" value="191919ff"/> - <Option name="solo button text mid" value="4c4c4cff"/> - <Option name="record enable button border start" value="a06969ff"/> - <Option name="record enable button border end" value="000000ff"/> - <Option name="record enable button border start selected" value="00000000"/> - <Option name="record enable button border end selected" value="00000000"/> - <Option name="record enable button fill start" value="603f3fff"/> - <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 mid" value="ffa8a8ff"/> - <Option name="record enable button fill end mid" value="fb7c7cff"/> - <Option name="record enable button led" value="00000000"/> - <Option name="record enable button led active" value="00000000"/> - <Option name="record enable button led mid" value="00000000"/> - <Option name="record enable button text" value="a5a5a5ff"/> - <Option name="record enable button text active" value="d8d8d8ff"/> - <Option name="record enable button text mid" value="333333ff"/> - <Option name="send alert button border start" value="9baa8dff"/> - <Option name="send alert button border end" value="000000ff"/> - <Option name="send alert button border start selected" value="00000000"/> - <Option name="send alert button border end selected" value="00000000"/> - <Option name="send alert button fill start" value="4e5647ff"/> - <Option name="send alert button fill end" value="43493cff"/> - <Option name="send alert button fill start active" value="91f928ff"/> - <Option name="send alert button fill end active" value="85e524ff"/> - <Option name="send alert button fill start mid" value="00000000"/> - <Option name="send alert button fill end mid" value="00000000"/> - <Option name="send alert button led" value="00000000"/> - <Option name="send alert button led active" value="00000000"/> - <Option name="send alert button led mid" value="00000000"/> - <Option name="send alert button text" value="ccccccff"/> - <Option name="send alert button text active" value="000000ff"/> - <Option name="send alert button text mid" value="00000000"/> -<Option name="transport button border start" value="727272ff"/> - <Option name="transport button border end" value="333333ff"/> - <Option name="transport button border start selected" value="00000000"/> - <Option name="transport button border end selected" value="00000000"/> - <Option name="transport button fill start" value="595959ff"/> - <Option name="transport button fill end" value="0c0c0cff"/> - <Option name="transport button fill start active" value="a1ff43ff"/> - <Option name="transport button fill end active" value="00a300ff"/> - <Option name="transport button fill start mid" value="000000ff"/> - <Option name="transport button fill end mid" value="00000000"/> - <Option name="transport button led" value="00000000"/> - <Option name="transport button led active" value="00000000"/> - <Option name="transport button led mid" value="00000000"/> - <Option name="transport button text" value="00000000"/> - <Option name="transport button text active" value="00000000"/> - <Option name="transport button text mid" value="00000000"/> - <Option name="transport recenable button border start" value="a06a6aff"/> - <Option name="transport recenable button border end" value="000000ff"/> - <Option name="transport recenable button border start selected" value="000000ff"/> - <Option name="transport recenable button border end selected" value="000000ff"/> - <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 end active" value="b50e0eff"/> - <Option name="transport recenable button fill start mid" value="ffa8a8ff"/> - <Option name="transport recenable button fill end mid" value="f87878ff"/> - <Option name="transport recenable button led" value="00000000"/> - <Option name="transport recenable button led active" value="00000000"/> - <Option name="transport recenable button led mid" value="00000000"/> - <Option name="transport recenable button text" value="00000000"/> - <Option name="transport recenable button text active" value="00000000"/> - <Option name="transport recenable button text mid" value="00000000"/> - <Option name="transport option button border start" value="00000000"/> - <Option name="transport option button border end" value="00000000"/> - <Option name="transport option button border start selected" value="00000000"/> - <Option name="transport option button border end selected" value="00000000"/> - <Option name="transport option button fill start" value="585962ff"/> - <Option name="transport option button fill end" value="4f5057ff"/> - <Option name="transport option button fill start active" value="a1fe43ff"/> - <Option name="transport option button fill end active" value="91f928ff"/> - <Option name="transport option button fill start mid" value="00000000"/> - <Option name="transport option button fill end mid" value="00000000"/> - <Option name="transport option button led" value="4a3535ff"/> - <Option name="transport option button led active" value="ba0202ff"/> - <Option name="transport option button led mid" value="00000000"/> - <Option name="transport option button text" value="e5e5e5ff"/> - <Option name="transport option button text active" value="000000ff"/> - <Option name="transport option button text mid" value="00000000"/> + <Option name="processor prefader: border start" value="630a0aff"/> + <Option name="processor prefader: border end" value="630a0aff"/> + <Option name="processor prefader: border start selected" value="edc400ff"/> + <Option name="processor prefader: border end selected" value="ffd300ff"/> + <Option name="processor prefader: fill start" value="873c3cff"/> + <Option name="processor prefader: fill end" value="542525ff"/> + <Option name="processor prefader: fill start active" value="873c3cff"/> + <Option name="processor prefader: fill end active" value="542525ff"/> + <Option name="processor prefader: fill start mid" value="873c3cff"/> + <Option name="processor prefader: fill end mid" value="542525ff"/> + <Option name="processor prefader: led" value="26550eff"/> + <Option name="processor prefader: led active" value="78cb4eff"/> + <Option name="processor prefader: led mid" value="26550eff"/> + <Option name="processor prefader: text" value="aaaaa3ff"/> + <Option name="processor prefader: text active" value="eeeeecff"/> + <Option name="processor prefader: text mid" value="aaaaa3ff"/> + <Option name="processor fader: border start" value="7cb5d9ff"/> + <Option name="processor fader: border end" value="6493b0ff"/> + <Option name="processor fader: border start selected" value="cdfaf8ff"/> + <Option name="processor fader: border end selected" value="c0ebe9ff"/> + <Option name="processor fader: fill start" value="5d90b0ff"/> + <Option name="processor fader: fill end" value="154c6eff"/> + <Option name="processor fader: fill start active" value="5d90b0ff"/> + <Option name="processor fader: fill end active" value="154d6fff"/> + <Option name="processor fader: fill start mid" value="5d90b0ff"/> + <Option name="processor fader: fill end mid" value="154d6fff"/> + <Option name="processor fader: led" value="26550eff"/> + <Option name="processor fader: led active" value="78cb4eff"/> + <Option name="processor fader: led mid" value="26550eff"/> + <Option name="processor fader: text" value="aaaaa3ff"/> + <Option name="processor fader: text active" value="eeeeecff"/> + <Option name="processor fader: text mid" value="aaaaa3ff"/> + <Option name="processor postfader: border start" value="1d631dff"/> + <Option name="processor postfader: border end" value="1d631dff"/> + <Option name="processor postfader: border start selected" value="46f046ff"/> + <Option name="processor postfader: border end selected" value="46f046ff"/> + <Option name="processor postfader: fill start" value="415947ff"/> + <Option name="processor postfader: fill end" value="202d23ff"/> + <Option name="processor postfader: fill start active" value="415947ff"/> + <Option name="processor postfader: fill end active" value="202d23ff"/> + <Option name="processor postfader: fill start mid" value="415947ff"/> + <Option name="processor postfader: fill end mid" value="202d23ff"/> + <Option name="processor postfader: led" value="26550eff"/> + <Option name="processor postfader: led active" value="78cb4eff"/> + <Option name="processor postfader: led mid" value="26550eff"/> + <Option name="processor postfader: text" value="aaaaa3ff"/> + <Option name="processor postfader: text active" value="eeeeecff"/> + <Option name="processor postfader: text mid" value="aaaaa3ff"/> + <Option name="monitor: border start" value="b7b7d2ff"/> + <Option name="monitor: border end" value="000000ff"/> + <Option name="monitor: border start selected" value="9a908eff"/> + <Option name="monitor: border end selected" value="675c5bff"/> + <Option name="monitor: fill start" value="5d5856ff"/> + <Option name="monitor: fill end" value="564d48ff"/> + <Option name="monitor: fill start active" value="04af02ff"/> + <Option name="monitor: fill end active" value="008a00ff"/> + <Option name="monitor: fill start mid" value="04b002ff"/> + <Option name="monitor: fill end mid" value="008900ff"/> + <Option name="monitor: led" value="660000ff"/> + <Option name="monitor: led active" value="ff0000ff"/> + <Option name="monitor: led mid" value="660000ff"/> + <Option name="monitor: text" value="aaaaa3ff"/> + <Option name="monitor: text active" value="c6c6beff"/> + <Option name="monitor: text mid" value="c7c7bfff"/> + <Option name="solo isolate: border start" value="b7b7d2ff"/> + <Option name="solo isolate: border end" value="000000ff"/> + <Option name="solo isolate: border start selected" value="9a908eff"/> + <Option name="solo isolate: border end selected" value="675c5bff"/> + <Option name="solo isolate: fill start" value="5d5856ff"/> + <Option name="solo isolate: fill end" value="564d48ff"/> + <Option name="solo isolate: fill start active" value="5d5856ff"/> + <Option name="solo isolate: fill end active" value="564d48ff"/> + <Option name="solo isolate: fill start mid" value="5d5856ff"/> + <Option name="solo isolate: fill end mid" value="564d48ff"/> + <Option name="solo isolate: led" value="660000ff"/> + <Option name="solo isolate: led active" value="ff0000ff"/> + <Option name="solo isolate: led mid" value="660000ff"/> + <Option name="solo isolate: text" value="c7c7d8ff"/> + <Option name="solo isolate: text active" value="c8c8d9ff"/> + <Option name="solo isolate: text mid" value="000000ff"/> + <Option name="solo safe: border start" value="b7b7d2ff"/> + <Option name="solo safe: border end" value="000000ff"/> + <Option name="solo safe: border start selected" value="9a908eff"/> + <Option name="solo safe: border end selected" value="675c5bff"/> + <Option name="solo safe: fill start" value="5d5856ff"/> + <Option name="solo safe: fill end" value="564d48ff"/> + <Option name="solo safe: fill start active" value="5d5856ff"/> + <Option name="solo safe: fill end active" value="564d48ff"/> + <Option name="solo safe: fill start mid" value="5d5856ff"/> + <Option name="solo safe: fill end mid" value="564d48ff"/> + <Option name="solo safe: led" value="660000ff"/> + <Option name="solo safe: led active" value="ff0000ff"/> + <Option name="solo safe: led mid" value="660000ff"/> + <Option name="solo safe: text" value="c7c7d8ff"/> + <Option name="solo safe: text active" value="c8c8d9ff"/> + <Option name="solo safe: text mid" value="000000ff"/> + <Option name="monitor section cut: border start" value="b7b7d2ff"/> + <Option name="monitor section cut: border end" value="000000ff"/> + <Option name="monitor section cut: border start selected" value="9a908e00"/> + <Option name="monitor section cut: border end selected" value="675c5b00"/> + <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 mid" value="00000000"/> + <Option name="monitor section cut: fill end mid" value="00000000"/> + <Option name="monitor section cut: led" value="473812ff"/> + <Option name="monitor section cut: led active" value="78cb4eff"/> + <Option name="monitor section cut: led mid" value="00000000"/> + <Option name="monitor section cut: text" value="c7c7d8ff"/> + <Option name="monitor section cut: text active" value="000000ff"/> + <Option name="monitor section cut: text mid" value="00000000"/> + <Option name="monitor section dim: border start" value="b7b7d2ff"/> + <Option name="monitor section dim: border end" value="000000ff"/> + <Option name="monitor section dim: border start selected" value="9a908eff"/> + <Option name="monitor section dim: border end selected" value="675b5bff"/> + <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: fill start mid" value="04af0200"/> + <Option name="monitor section dim: fill end mid" value="008a00ff"/> + <Option name="monitor section dim: led" value="473812ff"/> + <Option name="monitor section dim: led active" value="78cb4eff"/> + <Option name="monitor section dim: led mid" value="00000000"/> + <Option name="monitor section dim: text" value="c8c8d9ff"/> + <Option name="monitor section dim: text active" value="c8c8d9ff"/> + <Option name="monitor section dim: text mid" value="00000000"/> + <Option name="monitor section: solo border start" value="b7b7d2ff"/> + <Option name="monitor section: solo border end" value="000000ff"/> + <Option name="monitor section: solo border start selected" value="9a908eff"/> + <Option name="monitor section: solo border end selected" value="675c5bff"/> + <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 mid" value="f4f395ff"/> + <Option name="monitor section: solo fill end mid" value="fffe1d00"/> + <Option name="monitor section: solo led" value="473812ff"/> + <Option name="monitor section: solo led active" value="ffa500ff"/> + <Option name="monitor section: solo led mid" value="00000000"/> + <Option name="monitor section: solo text" value="00000000"/> + <Option name="monitor section: solo text active" value="00000000"/> + <Option name="monitor section: solo text mid" value="00000000"/> + <Option name="monitor section: invert border start" value="b7b7d2ff"/> + <Option name="monitor section: invert border end" value="000000ff"/> + <Option name="monitor section: invert border start selected" value="9a908eff"/> + <Option name="monitor section: invert border end selected" value="675c5b00"/> + <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 mid" value="04af02ff"/> + <Option name="monitor section: invert fill end mid" value="008a0000"/> + <Option name="monitor section: invert led" value="473812ff"/> + <Option name="monitor section: invert led active" value="78cb4eff"/> + <Option name="monitor section: invert led mid" value="00000000"/> + <Option name="monitor section: invert text" value="00000000"/> + <Option name="monitor section: invert text active" value="00000000"/> + <Option name="monitor section: invert text mid" value="00000000"/> + <Option name="monitor section mono: border start" value="b7b7d2ff"/> + <Option name="monitor section mono: border end" value="000000ff"/> + <Option name="monitor section mono: border start selected" value="9a908eff"/> + <Option name="monitor section mono: border end selected" value="675c5bff"/> + <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 mid" value="04af02ff"/> + <Option name="monitor section mono: fill end mid" value="008a00ff"/> + <Option name="monitor section mono: led" value="473812ff"/> + <Option name="monitor section mono: led active" value="78cb4eff"/> + <Option name="monitor section mono: led mid" value="00000000"/> + <Option name="monitor section mono: text" value="c7c7d8ff"/> + <Option name="monitor section mono: text active" value="c8c8d9ff"/> + <Option name="monitor section mono: text mid" value="00000000"/> + <Option name="monitor section solo model: border start" value="b7b7d2ff"/> + <Option name="monitor section solo model: border end" value="000000ff"/> + <Option name="monitor section solo model: border start selected" value="9a908eff"/> + <Option name="monitor section solo model: border end selected" value="675c5bff"/> + <Option name="monitor section solo model: fill start" value="5d5856ff"/> + <Option name="monitor section solo model: fill end" value="564d48ff"/> + <Option name="monitor section solo model: fill start active" value="5d5856ff"/> + <Option name="monitor section solo model: fill end active" value="564d48ff"/> + <Option name="monitor section solo model: fill start mid" value="5d5856ff"/> + <Option name="monitor section solo model: fill end mid" value="564d48ff"/> + <Option name="monitor section solo model: led" value="4f3300ff"/> + <Option name="monitor section solo model: led active" value="ffa500ff"/> + <Option name="monitor section solo model: led mid" value="b8770000"/> + <Option name="monitor section solo model: text" value="c7c7d8ff"/> + <Option name="monitor section solo model: text active" value="c8c8d9ff"/> + <Option name="monitor section solo model: text mid" value="00000000"/> + <Option name="monitor solo override: border start" value="b7b7d2ff"/> + <Option name="monitor solo override: border end" value="000000ff"/> + <Option name="monitor solo override: border start selected" value="9a908eff"/> + <Option name="monitor solo override: border end selected" value="675c5bff"/> + <Option name="monitor solo override: fill start" value="5d5856ff"/> + <Option name="monitor solo override: fill end" value="564d48ff"/> + <Option name="monitor solo override: fill start active" value="5d5856ff"/> + <Option name="monitor solo override: fill end active" value="564d48ff"/> + <Option name="monitor solo override: fill start mid" value="5d5856ff"/> + <Option name="monitor solo override: fill end mid" value="564d48ff"/> + <Option name="monitor solo override: led" value="4f3300ff"/> + <Option name="monitor solo override: led active" value="ffa500ff"/> + <Option name="monitor solo override: led mid" value="b87700ff"/> + <Option name="monitor solo override: text" value="c7c7d8ff"/> + <Option name="monitor solo override: text active" value="c8c8d9ff"/> + <Option name="monitor solo override: text mid" value="00000000"/> + <Option name="monitor solo exclusive: border start" value="b7b7d2ff"/> + <Option name="monitor solo exclusive: border end" value="000000ff"/> + <Option name="monitor solo exclusive: border start selected" value="9a908eff"/> + <Option name="monitor solo exclusive: border end selected" value="675c5bff"/> + <Option name="monitor solo exclusive: fill start" value="5d5856ff"/> + <Option name="monitor solo exclusive: fill end" value="564d48ff"/> + <Option name="monitor solo exclusive: fill start active" value="5d5856ff"/> + <Option name="monitor solo exclusive: fill end active" value="564c47ff"/> + <Option name="monitor solo exclusive: fill start mid" value="5d5856ff"/> + <Option name="monitor solo exclusive: fill end mid" value="564d48ff"/> + <Option name="monitor solo exclusive: led" value="4f3300ff"/> + <Option name="monitor solo exclusive: led active" value="ffa500ff"/> + <Option name="monitor solo exclusive: led mid" value="b77600ff"/> + <Option name="monitor solo exclusive: text" value="c7c7d8ff"/> + <Option name="monitor solo exclusive: text active" value="c8c8d9ff"/> + <Option name="monitor solo exclusive: text mid" value="00000000"/> + <Option name="rude solo: border start" value="997171ff"/> + <Option name="rude solo: border end" value="000000ff"/> + <Option name="rude solo: border start selected" value="000000ff"/> + <Option name="rude solo: border end selected" value="00000000"/> + <Option name="rude solo: fill start" value="684d4dff"/> + <Option name="rude solo: fill end" value="513c3cff"/> + <Option name="rude solo: fill start active" value="ff1f1fff"/> + <Option name="rude solo: fill end active" value="e21b1bff"/> + <Option name="rude solo: fill start mid" value="00000000"/> + <Option name="rude solo: fill end mid" value="00000000"/> + <Option name="rude solo: led" value="00000000"/> + <Option name="rude solo: led active" value="00000000"/> + <Option name="rude solo: led mid" value="00000000"/> + <Option name="rude solo: text" value="969696ff"/> + <Option name="rude solo: text active" value="e5e5e5ff"/> + <Option name="rude solo: text mid" value="00000000"/> + <Option name="rude isolate: border start" value="8da8b4ff"/> + <Option name="rude isolate: border end" value="000000ff"/> + <Option name="rude isolate: border start selected" value="00000000"/> + <Option name="rude isolate: border end selected" value="000000ff"/> + <Option name="rude isolate: fill start" value="21414fff"/> + <Option name="rude isolate: fill end" value="192930ff"/> + <Option name="rude isolate: fill start active" value="e5f7ffff"/> + <Option name="rude isolate: fill end active" value="b6e5fdff"/> + <Option name="rude isolate: fill start mid" value="00000000"/> + <Option name="rude isolate: fill end mid" value="00000000"/> + <Option name="rude isolate: led" value="00000000"/> + <Option name="rude isolate: led active" value="000000ff"/> + <Option name="rude isolate: led mid" value="00000000"/> + <Option name="rude isolate: text" value="979797ff"/> + <Option name="rude isolate: text active" value="000000ff"/> + <Option name="rude isolate: text mid" value="00000000"/> + <Option name="rude audition: border start" value="997171ff"/> + <Option name="rude audition: border end" value="000000ff"/> + <Option name="rude audition: border start selected" value="00000000"/> + <Option name="rude audition: border end selected" value="000000ff"/> + <Option name="rude audition: fill start" value="684d4dff"/> + <Option name="rude audition: fill end" value="513c3cff"/> + <Option name="rude audition: fill start active" value="ff1f1fff"/> + <Option name="rude audition: fill end active" value="e21b1bff"/> + <Option name="rude audition: fill start mid" value="00000000"/> + <Option name="rude audition: fill end mid" value="000000ff"/> + <Option name="rude audition: led" value="00000000"/> + <Option name="rude audition: led active" value="00000000"/> + <Option name="rude audition: led mid" value="00000000"/> + <Option name="rude audition: text" value="979797ff"/> + <Option name="rude audition: text active" value="ffffffff"/> + <Option name="rude audition: text mid" value="00000000"/> + <Option name="mute button: border start" value="ffcb8bff"/> + <Option name="mute button: border end" value="000000ff"/> + <Option name="mute button: border start selected" value="00000000"/> + <Option name="mute button: border end selected" value="00000000"/> + <Option name="mute button: fill start" value="ac8568ff"/> + <Option name="mute button: fill end" value="383222ff"/> + <Option name="mute button: fill start active" value="ffc300ff"/> + <Option name="mute button: fill end active" value="ea8400ff"/> + <Option name="mute button: fill start mid" value="c49600ff"/> + <Option name="mute button: fill end mid" value="9b5700ff"/> + <Option name="mute button: led" value="00000000"/> + <Option name="mute button: led active" value="00000000"/> + <Option name="mute button: led mid" value="00000000"/> + <Option name="mute button: text" value="999999ff"/> + <Option name="mute button: text active" value="191919ff"/> + <Option name="mute button: text mid" value="262626ff"/> + <Option name="solo button: border start" value="ffffffff"/> + <Option name="solo button: border end" value="000000ff"/> + <Option name="solo button: border start selected" value="000000ff"/> + <Option name="solo button: border end selected" value="000000ff"/> + <Option name="solo button: fill start" value="b7ac6cff"/> + <Option name="solo button: fill end" value="575f53ff"/> + <Option name="solo button: fill start active" value="fffd9bff"/> + <Option name="solo button: fill end active" value="ffff00ff"/> + <Option name="solo button: fill start mid" value="d7d697ff"/> + <Option name="solo button: fill end mid" value="f0f09fff"/> + <Option name="solo button: led" value="00000000"/> + <Option name="solo button: led active" value="00000000"/> + <Option name="solo button: led mid" value="00000000"/> + <Option name="solo button: text" value="bfbfbfff"/> + <Option name="solo button: text active" value="191919ff"/> + <Option name="solo button: text mid" value="4c4c4cff"/> + <Option name="record enable button: border start" value="a06969ff"/> + <Option name="record enable button: border end" value="000000ff"/> + <Option name="record enable button: border start selected" value="00000000"/> + <Option name="record enable button: border end selected" value="00000000"/> + <Option name="record enable button: fill start" value="603f3fff"/> + <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 mid" value="ffa8a8ff"/> + <Option name="record enable button: fill end mid" value="fb7c7cff"/> + <Option name="record enable button: led" value="00000000"/> + <Option name="record enable button: led active" value="00000000"/> + <Option name="record enable button: led mid" value="00000000"/> + <Option name="record enable button: text" value="a5a5a5ff"/> + <Option name="record enable button: text active" value="d8d8d8ff"/> + <Option name="record enable button: text mid" value="333333ff"/> + <Option name="send alert button: border start" value="9baa8dff"/> + <Option name="send alert button: border end" value="000000ff"/> + <Option name="send alert button: border start selected" value="00000000"/> + <Option name="send alert button: border end selected" value="00000000"/> + <Option name="send alert button: fill start" value="4e5647ff"/> + <Option name="send alert button: fill end" value="43493cff"/> + <Option name="send alert button: fill start active" value="91f928ff"/> + <Option name="send alert button: fill end active" value="85e524ff"/> + <Option name="send alert button: fill start mid" value="00000000"/> + <Option name="send alert button: fill end mid" value="00000000"/> + <Option name="send alert button: led" value="00000000"/> + <Option name="send alert button: led active" value="00000000"/> + <Option name="send alert button: led mid" value="00000000"/> + <Option name="send alert button: text" value="ccccccff"/> + <Option name="send alert button: text active" value="000000ff"/> + <Option name="send alert button: text mid" value="00000000"/> + <Option name="transport button: border start" value="727272ff"/> + <Option name="transport button: border end" value="333333ff"/> + <Option name="transport button: border start selected" value="00000000"/> + <Option name="transport button: border end selected" value="00000000"/> + <Option name="transport button: fill start" value="595959ff"/> + <Option name="transport button: fill end" value="0c0c0cff"/> + <Option name="transport button: fill start active" value="a1ff43ff"/> + <Option name="transport button: fill end active" value="00a300ff"/> + <Option name="transport button: fill start mid" value="000000ff"/> + <Option name="transport button: fill end mid" value="00000000"/> + <Option name="transport button: led" value="00000000"/> + <Option name="transport button: led active" value="00000000"/> + <Option name="transport button: led mid" value="00000000"/> + <Option name="transport button: text" value="00000000"/> + <Option name="transport button: text active" value="00000000"/> + <Option name="transport button: text mid" value="00000000"/> + <Option name="transport recenable button: border start" value="a06a6aff"/> + <Option name="transport recenable button: border end" value="000000ff"/> + <Option name="transport recenable button: border start selected" value="000000ff"/> + <Option name="transport recenable button: border end selected" value="000000ff"/> + <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 end active" value="b50e0eff"/> + <Option name="transport recenable button: fill start mid" value="ffa8a8ff"/> + <Option name="transport recenable button: fill end mid" value="f87878ff"/> + <Option name="transport recenable button: led" value="00000000"/> + <Option name="transport recenable button: led active" value="00000000"/> + <Option name="transport recenable button: led mid" value="00000000"/> + <Option name="transport recenable button: text" value="00000000"/> + <Option name="transport recenable button: text active" value="00000000"/> + <Option name="transport recenable button: text mid" value="00000000"/> + <Option name="transport option button: border start" value="00000000"/> + <Option name="transport option button: border end" value="00000000"/> + <Option name="transport option button: border start selected" value="00000000"/> + <Option name="transport option button: border end selected" value="00000000"/> + <Option name="transport option button: fill start" value="585962ff"/> + <Option name="transport option button: fill end" value="4f5057ff"/> + <Option name="transport option button: fill start active" value="a1fe43ff"/> + <Option name="transport option button: fill end active" value="91f928ff"/> + <Option name="transport option button: fill start mid" value="00000000"/> + <Option name="transport option button: fill end mid" value="00000000"/> + <Option name="transport option button: led" value="4a3535ff"/> + <Option name="transport option button: led active" value="ba0202ff"/> + <Option name="transport option button: led mid" value="00000000"/> + <Option name="transport option button: text" value="e5e5e5ff"/> + <Option name="transport option button: text active" value="000000ff"/> + <Option name="transport option button: text mid" value="00000000"/> </Canvas> </Ardour> diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index f034fef618..9d7d3aa728 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -338,11 +338,11 @@ ArdourButton::set_colors () edge_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height); if (visual_state() & Gtkmm2ext::Selected) { - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start selected", get_name())); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end selected", get_name())); + start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start selected", get_name())); + end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end selected", get_name())); } else { - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border start", get_name())); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 border end", get_name())); + start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border start", get_name())); + end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: border end", get_name())); } UINT_TO_RGBA (start_color, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgba (edge_pattern, 0, r/255.0,g/255.0,b/255.0, 0.7); @@ -362,14 +362,14 @@ ArdourButton::set_colors () fill_pattern = cairo_pattern_create_linear (0.0, 0.0, 0.0, _height); if (active_state() == Gtkmm2ext::Mid) { - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start mid", get_name())); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end mid", get_name())); + start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start mid", get_name())); + end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end mid", get_name())); } else if (active_state() == Gtkmm2ext::Active) { - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start active", get_name())); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end active", get_name())); + start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start active", get_name())); + end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end active", get_name())); } else { - start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill start", get_name())); - end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 fill end", get_name())); + start_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill start", get_name())); + end_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: fill end", get_name())); } UINT_TO_RGBA (start_color, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgba (fill_pattern, 0, r/255.0,g/255.0,b/255.0, a/255.0); @@ -398,14 +398,14 @@ ArdourButton::set_colors () /* text and LED colors depend on Active/Normal/Mid */ if (active_state() == Gtkmm2ext::Active) { - text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text active", get_name())); - led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led active", get_name())); + text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text active", get_name())); + led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led active", get_name())); } else if (active_state() == Gtkmm2ext::Mid) { - text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text mid", get_name())); - led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led mid", get_name())); + text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text mid", get_name())); + led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led mid", get_name())); } else { - text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 text", get_name())); - led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1 led", get_name())); + text_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: text", get_name())); + led_color = ARDOUR_UI::config()->color_by_name (string_compose ("%1: led", get_name())); } UINT_TO_RGBA (text_color, &r, &g, &b, &a); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index e663b149de..8dc25f0004 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -212,6 +212,9 @@ ARDOUR_UI::setup_transport () { RefPtr<Action> act; + transport_tearoff_hbox.set_border_width (3); + transport_tearoff_hbox.set_spacing (3); + transport_tearoff = manage (new TearOff (transport_tearoff_hbox)); transport_tearoff->set_name ("TransportBase"); transport_tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), &transport_tearoff->tearoff_window()), false); @@ -313,22 +316,18 @@ ARDOUR_UI::setup_transport () auditioning_alert_button.set_name ("TransportAuditioningAlert"); auditioning_alert_button.signal_button_press_event().connect (sigc::mem_fun(*this,&ARDOUR_UI::audition_alert_press), false); - alert_box.pack_start (solo_alert_button, false, false); - alert_box.pack_start (auditioning_alert_button, false, false); + alert_box.pack_start (solo_alert_button, true, false); + alert_box.pack_start (auditioning_alert_button, true, false); HBox* tbox = manage (new HBox); tbox->set_spacing (2); - transport_tearoff_hbox.set_border_width (3); - tbox->pack_start (goto_start_button, false, false); tbox->pack_start (goto_end_button, false, false); /* translators: Egternal is "External" with a descender character */ set_size_request_to_display_given_text (sync_button, X_("Egternal"), 4, 10); - // transport_tearoff_hbox.pack_start (*svbox, false, false, 3); - Glib::RefPtr<SizeGroup> transport_button_size_group1 = SizeGroup::create (SIZE_GROUP_HORIZONTAL); transport_button_size_group1->add_widget (goto_start_button); transport_button_size_group1->add_widget (goto_end_button); @@ -386,7 +385,7 @@ ARDOUR_UI::setup_transport () transport_vbox->pack_start (*tbox, true, true, 0); transport_vbox->pack_start (*shuttle_box, false, false, 0); - transport_tearoff_hbox.pack_start (*transport_vbox, false, false, 0); + transport_tearoff_hbox.pack_start (*transport_vbox, false, false); /* transport related toggle controls */ @@ -401,13 +400,7 @@ ARDOUR_UI::setup_transport () if (!Profile->get_small_screen()) { toggle_box->pack_start (*auto_box, false, false); } - //VBox* io_box = manage (new VBox); - //io_box->pack_start (auto_input_button, false, false); - //io_box->pack_start (click_button, false, false); - //if (!Profile->get_small_screen()) { - // toggle_box->pack_start (*io_box, false, false); - //} - transport_tearoff_hbox.pack_start (*toggle_box, false, false, 4); + transport_tearoff_hbox.pack_start (*toggle_box, false, false); Table* time_controls_table = manage (new Table (2, 2)); time_controls_table->set_col_spacings (6); @@ -417,20 +410,20 @@ ARDOUR_UI::setup_transport () time_controls_table->attach (click_button, 1, 2, 0, 2, Gtk::AttachOptions(FILL|EXPAND), FILL); transport_tearoff_hbox.pack_start (*clock_box, false, false); - transport_tearoff_hbox.pack_start (*time_controls_table, false, false, 4); + transport_tearoff_hbox.pack_start (*time_controls_table, false, false); time_info_box = manage (new TimeInfoBox); transport_tearoff_hbox.pack_start (*time_info_box, false, false); if (Profile->get_small_screen()) { - transport_tearoff_hbox.pack_start (_editor_transport_box, false, false, 4); + transport_tearoff_hbox.pack_start (_editor_transport_box, false, false); } transport_tearoff_hbox.pack_start (alert_box, false, false); if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); - transport_tearoff_hbox.pack_end (*img, false, false, 6); + transport_tearoff_hbox.pack_end (*img, false, false); } /* desensitize */ diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h index d9ff718639..77eb02f9ce 100644 --- a/gtk2_ardour/canvas_vars.h +++ b/gtk2_ardour/canvas_vars.h @@ -139,22 +139,22 @@ CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect") CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob") #define BUTTON_VARS(root,name) \ -CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name " border start") \ -CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name " border end") \ -CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name " border start selected") \ -CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name " border end selected") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name " fill start") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name " fill end") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name " fill start active") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name " fill end active") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name " fill start mid") \ -CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name " fill end mid") \ -CANVAS_VARIABLE(canvasvar_ ## root ## LED, name " led") \ -CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name " led active") \ -CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name " led mid") \ -CANVAS_VARIABLE(canvasvar_ ## root ## Text, name " text") \ -CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name " text active") \ -CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name " text mid") +CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \ +CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \ +CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \ +CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name ": fill end active") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name ": fill start mid") \ +CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name ": fill end mid") \ +CANVAS_VARIABLE(canvasvar_ ## root ## LED, name ": led") \ +CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name ": led active") \ +CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name ": led mid") \ +CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \ +CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name ": text active") \ +CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name ": text mid") BUTTON_VARS(ProcessorPreFader, "processor prefader") BUTTON_VARS(ProcessorFader, "processor fader") |