Sort various things to reduce merge hell. No functional changes.

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

1 files changed, 77 insertions, 80 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index aed0f07bca..aff521db37 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -1,111 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Ardour>
-  <UI>
-    <Option name="ui-rc-file" value="ardour3_ui_dark.rc"/>
-  </UI>
   <Canvas>
-    <Option name="waveform outline" value="0f0f0fc8"/>
-    <Option name="waveform fill" value="3d4753dc"/>
-    <Option name="selected waveform outline" value="0f0f0fcc"/>
-    <Option name="selected waveform fill" value="51518ac8"/>
-    <Option name="clipped waveform" value="ff0000e5"/>
-    <Option name="region base" value="99a7b5a0"/>
-    <Option name="selected region base" value="51518aa0"/>
-    <Option name="midi frame base" value="698f9d6d"/>
-    <Option name="audio track base" value="c6d3d868"/>
+    <Option name="active crossfade" value="e8ed3d77"/>
     <Option name="audio bus base" value="dbd1ea68"/>
-    <Option name="midi track base" value="c67e7e5f"/>
-    <Option name="midi bus base" value="ffceea40"/>
-    <Option name="time stretch fill" value="e2b5b596"/>
-    <Option name="time stretch outline" value="63636396"/>
+    <Option name="audio track base" value="c6d3d868"/>
     <Option name="automation line" value="44bc59ff"/>
-    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="automation track fill" value="a0a0ce68"/>
+    <Option name="automation track outline" value="282828ff"/>
+    <Option name="cd marker bar" value="9898a3ff"/>
+    <Option name="clipped waveform" value="ff0000e5"/>
     <Option name="control point fill" value="ffffff66"/>
     <Option name="control point outline" value="ffffffaa"/>
-    <Option name="entered control point outline" value="ff0000ee"/>
-    <Option name="entered control point selected" value="ff3535ff"/>
-    <Option name="entered control point" value="ffffffaa"/>
     <Option name="control point selected" value="00ff00ff"/>
     <Option name="control point" value="ff0000ff"/>
-    <Option name="automation track fill" value="a0a0ce68"/>
-    <Option name="automation track outline" value="282828ff"/>
     <Option name="crossfade editor base" value="282d49ff"/>
-    <Option name="crossfade editor line" value="000000ff"/>
-    <Option name="selected crossfade editor line" value="00dbdbff"/>
     <Option name="crossfade editor line shading" value="00a0d154"/>
+    <Option name="crossfade editor line" value="000000ff"/>
     <Option name="crossfade editor point fill" value="00ff00ff"/>
     <Option name="crossfade editor point outline" value="0000ffff"/>
     <Option name="crossfade editor wave" value="ffffff28"/>
-    <Option name="selected crossfade editor wave" value="f9ea14a0"/>
     <Option name="crossfade line" value="000000ff"/>
-    <Option name="active crossfade" value="e8ed3d77"/>
+    <Option name="edit point" value="0000ffff"/>
+    <Option name="entered automation line" value="dd6363ff"/>
+    <Option name="entered control point outline" value="ff0000ee"/>
+    <Option name="entered control point selected" value="ff3535ff"/>
+    <Option name="entered control point" value="ffffffaa"/>
+    <Option name="entered gain line" value="dd6363ff"/>
+    <Option name="entered marker" value="dd6363ff"/>
+    <Option name="frame handle" value="7c00ff96"/>
+    <Option name="gain line inactive" value="9fbca4c5"/>
+    <Option name="gain line" value="00bc20ff"/>
+    <Option name="ghost track base" value="44007c7f"/>
+    <Option name="ghost track wave clip" value="ff000000"/>
+    <Option name="ghost track wave" value="02fd004c"/>
+    <Option name="ghost track zero line" value="e500e566"/>
+    <Option name="image track" value="ddddd8ff"/>
     <Option name="inactive crossfade" value="e8ed3d77"/>
-    <Option name="location marker" value="c4f411ff"/>
-    <Option name="location range" value="497a59ff"/>
     <Option name="location cd marker" value="1ee8c4ff"/>
     <Option name="location loop" value="35964fff"/>
+    <Option name="location marker" value="c4f411ff"/>
     <Option name="location punch" value="7c3a3aff"/>
-    <Option name="verbose canvas cursor" value="f4f214bc"/>
-    <Option name="marker label" value="000000ff"/>
+    <Option name="location range" value="497a59ff"/>
     <Option name="marker bar separator" value="aaaaaa77"/>
-    <Option name="tempo bar" value="72727fff"/>
-    <Option name="meter bar" value="666672ff"/>
     <Option name="marker bar" value="a1a1adff"/>
-    <Option name="cd marker bar" value="9898a3ff"/>
-    <Option name="range marker bar" value="7f7f8cff"/>
-    <Option name="transport marker bar" value="8c8c96ff"/>
-    <Option name="range drag bar rect" value="969696c6"/>
-    <Option name="range drag rect" value="82c696c6"/>
-    <Option name="transport drag rect" value="969696c6"/>
     <Option name="marker drag line" value="004f00f9"/>
-    <Option name="transport loop rect" value="1e7728f9"/>
-    <Option name="transport punch rect" value="6d2828e5"/>
-    <Option name="punch line" value="a80000ff"/>
-    <Option name="zoom rect" value="c6d1b26d"/>
-    <Option name="rubber band rect" value="c6c6c659"/>
-    <Option name="entered gain line" value="dd6363ff"/>
-    <Option name="entered automation line" value="dd6363ff"/>
-    <Option name="entered marker" value="dd6363ff"/>
-    <Option name="meter marker" value="f2425bff"/>
-    <Option name="tempo marker" value="f2425bff"/>
-    <Option name="measure line beat" value="b5b5b576"/>
-    <Option name="measure line bar" value="d9d9d99c"/>
-    <Option name="ghost track base" value="44007c7f"/>
-    <Option name="ghost track wave" value="02fd004c"/>
-    <Option name="ghost track wave clip" value="ff000000"/>
-    <Option name="ghost track zero line" value="e500e566"/>
-    <Option name="image track" value="ddddd8ff"/>
+    <Option name="marker label" value="000000ff"/>
     <Option name="marker track" value="ddddd8ff"/>
-    <Option name="zero line" value="b5b5b5ff"/>
-    <Option name="gain line" value="00bc20ff"/>
-    <Option name="gain line inactive" value="9fbca4c5"/>
+    <Option name="measure line bar" value="d9d9d99c"/>
+    <Option name="measure line beat" value="b5b5b576"/>
+    <Option name="meter bar" value="666672ff"/>
+    <Option name="meter fill clip" value="ff0000ff"/>
+    <Option name="meter fill max" value="ee3333ff"/>
+    <Option name="meter fill mid" value="eeee33ff"/>
+    <Option name="meter fill min" value="33dd33ff"/>
+    <Option name="meter marker" value="f2425bff"/>
+    <Option name="midi bus base" value="ffceea40"/>
+    <Option name="midi frame base" value="698f9d6d"/>
+    <Option name="midi note fill max" value="ee33338a"/>
+    <Option name="midi note fill mid" value="eeee338a"/>
+    <Option name="midi note fill min" value="33ee338a"/>
+    <Option name="midi note outline max" value="ff2222b0"/>
+    <Option name="midi note outline mid" value="ffff22b0"/>
+    <Option name="midi note outline min" value="22ff22b0"/>
+    <Option name="midi note selected outline" value="5566ffee"/>
+    <Option name="midi select rect fill" value="8888ff88"/>
+    <Option name="midi select rect outline" value="5555ffff"/>
+    <Option name="midi track base" value="c67e7e5f"/>
+    <Option name="name highlight fill" value="0000ffff"/>
+    <Option name="name highlight outline" value="7c00ff96"/>
+    <Option name="piano roll black outline" value="b5b5b576"/>
+    <Option name="piano roll black" value="88393b6b"/>
+    <Option name="piano roll white" value="aa585865"/>
+    <Option name="play head" value="ff0000ff"/>
+    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="punch line" value="a80000ff"/>
+    <Option name="range drag bar rect" value="969696c6"/>
+    <Option name="range drag rect" value="82c696c6"/>
+    <Option name="range marker bar" value="7f7f8cff"/>
     <Option name="recording rect" value="e5c6c6ff"/>
+    <Option name="region base" value="99a7b5a0"/>
+    <Option name="rubber band rect" value="c6c6c659"/>
+    <Option name="selected crossfade editor line" value="00dbdbff"/>
+    <Option name="selected crossfade editor wave" value="f9ea14a0"/>
+    <Option name="selected region base" value="51518aa0"/>
+    <Option name="selected waveform fill" value="51518ac8"/>
+    <Option name="selected waveform outline" value="0f0f0fcc"/>
     <Option name="selection rect" value="e8f4d377"/>
     <Option name="selection" value="636363b2"/>
-    <Option name="vestigial frame" value="0000000f"/>
+    <Option name="tempo bar" value="72727fff"/>
+    <Option name="tempo marker" value="f2425bff"/>
     <Option name="time axis frame" value="0000000f"/>
-    <Option name="name highlight fill" value="0000ffff"/>
-    <Option name="name highlight outline" value="7c00ff96"/>
-    <Option name="frame handle" value="7c00ff96"/>
+    <Option name="time stretch fill" value="e2b5b596"/>
+    <Option name="time stretch outline" value="63636396"/>
+    <Option name="transport drag rect" value="969696c6"/>
+    <Option name="transport loop rect" value="1e7728f9"/>
+    <Option name="transport marker bar" value="8c8c96ff"/>
+    <Option name="transport punch rect" value="6d2828e5"/>
     <Option name="trim handle locked" value="ea0f0f28"/>
     <Option name="trim handle" value="1900ff44"/>
-    <Option name="edit point" value="0000ffff"/>
-    <Option name="play head" value="ff0000ff"/>
-    <Option name="meter fill min" value="33dd33ff"/>
-    <Option name="meter fill mid" value="eeee33ff"/>
-    <Option name="meter fill max" value="ee3333ff"/>
-    <Option name="meter fill clip" value="ff0000ff"/>
-    <Option name="midi select rect outline" value="5555ffff"/>
-    <Option name="midi select rect fill" value="8888ff88"/>
-    <Option name="midi note outline min" value="22ff22b0"/>
-    <Option name="midi note outline mid" value="ffff22b0"/>
-    <Option name="midi note outline max" value="ff2222b0"/>
-    <Option name="midi note fill min" value="33ee338a"/>
-    <Option name="midi note fill mid" value="eeee338a"/>
-    <Option name="midi note fill max" value="ee33338a"/>
-    <Option name="midi note selected outline" value="5566ffee"/>
-    <Option name="piano roll white" value="aa585865"/>
-    <Option name="piano roll black" value="88393b6b"/>
-    <Option name="piano roll black outline" value="b5b5b576"/>
+    <Option name="verbose canvas cursor" value="f4f214bc"/>
+    <Option name="vestigial frame" value="0000000f"/>
+    <Option name="waveform fill" value="3d4753dc"/>
+    <Option name="waveform outline" value="0f0f0fc8"/>
+    <Option name="zero line" value="b5b5b5ff"/>
+    <Option name="zoom rect" value="c6d1b26d"/>
   </Canvas>
 </Ardour>