Index: Titivillus/ui.xml
===================================================================
--- Titivillus/ui.xml	(revision 7664)
+++ Titivillus/ui.xml	(working copy)
@@ -315,6 +315,130 @@
 
   </window>
 
+  <window name="schdiff">
+
+
+    <font name="norecordfnt" base="list-active">
+      <color>#9999cc</color>
+    </font>
+
+    <font name="conflictfnt" base="list-active">
+      <color>#ffff33</color>
+    </font>
+
+    <font name="currenttitle" base="list-active">
+      <color>#ffff33</color>
+    </font>
+
+
+
+
+    <container name="background">
+      <image name="filler" draworder="0" fleximage="no">
+        <filename>conflict/cr-background.png</filename>
+        <position>0,0</position>
+      </image>
+
+
+    </container>
+
+    <container name="conflict_info">
+      <area>400,10,380,30</area>
+      <textarea name="status" align="right" draworder="4">
+        <area>0,0,380,30</area>
+        <font>info</font>
+      </textarea>
+    </container>
+
+    <container name="showlevel_info">
+      <area>20,10,280,30</area>
+      <textarea name="showing" draworder="4">
+        <area>0,0,105,30</area>
+        <font>info</font>
+        <value>Showing:</value>
+      </textarea>
+      <textarea name="showlevel" draworder="4">
+        <area>110,0,110,30</area>
+        <font>info</font>
+      </textarea>
+    </container>
+
+    <container name="selector">
+      <area>0,39,800,290</area>
+      <listarea name="conflictlist" draworder="4">
+        <area>20,12,760,265</area>
+        <fcnfont name="list-conflict" function="conflictingrecording"></fcnfont>
+        <fcnfont name="norecordfnt" function="disabledrecording"></fcnfont>
+        <fcnfont name="list-active" function="active"></fcnfont>
+        <fcnfont name="list-inactive" function="inactive"></fcnfont>
+        <fcnfont name="list-record" function="record"></fcnfont>
+        <fcnfont name="list-recording" function="recording"></fcnfont>
+        <fcnfont name="list-selected" function="selected"></fcnfont>
+        <columnpadding>10</columnpadding>
+        <column number="1" width="160" context="-1"></column>
+        <column number="2" width="134" context="-1"></column>
+        <column number="3" width="365" context="-1"></column>
+        <column number="4" width="30" context="-1"></column>
+        <column number="5" width="30" context="-1"></column>
+        <items>8</items>
+        <image function="selectionbar" filename="conflict/tit-cr-selectbar.png" location="-14,-5"></image>
+        <image function="uparrow" filename="shared/up_arrow.png" location="745,15"></image>
+        <image function="downarrow" filename="shared/down_arrow.png" location="745,243"></image>
+      </listarea>
+      <image name="showinglines" draworder="5" fleximage="no">
+        <filename>conflict/cr-lines.png</filename>
+        <position>0,0</position>
+      </image>
+    </container>
+
+    <container name="program_info">
+      <area>0,340,800,210</area>
+      <textarea name="title" draworder="6">
+        <area>20,5,800,40</area>
+        <font>title</font>
+      </textarea>
+      <textarea name="subtitle" draworder="6">
+        <area>20,38,579,30</area>
+        <font>subtitle</font>
+      </textarea>
+      <textarea name="channel" draworder="6">
+        <area>20,64,160,30</area>
+        <font>info</font>
+      </textarea>
+
+      <textarea name="timedate" draworder="6">
+        <area>170,64,440,30</area>
+        <font>info</font>
+      </textarea>
+
+      <textarea name="description" draworder="6">
+        <value>%LONGREPEAT%%STARS%%DESCRIPTION%</value>
+        <area>20, 94,760,140</area>
+        <font>info</font>
+        <multiline>yes</multiline>
+      </textarea>
+    </container>
+
+    <container name="status_info">
+      <area>20,558,480,30</area>
+      <textarea name="recordingstatus" align="left" draworder="6">
+        <area>0,0,480,30</area>
+        <font>recstatus</font>
+      </textarea>
+    </container>
+ 
+
+   <container name="norecordings_list">
+      <textarea name="msg" align="center" draworder="8">
+         <area>0,110,800,70</area>
+         <font>info</font>
+         <value>No changes to the recording schedule to show</value>
+         <multiline>yes</multiline>
+      </textarea>
+    </container>
+
+  </window>
+
   <window name="conflict">
 
 
Index: Iulius/ui.xml
===================================================================
--- Iulius/ui.xml	(revision 7664)
+++ Iulius/ui.xml	(working copy)
@@ -540,6 +540,202 @@
 
   </window>
 
+  <window name="schdiff">
+
+    <font name="active_font" face="Arial">
+      <color>#ffffff</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="inactive_font" face="Arial">
+      <color>#9999cc</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="record_font" face="Arial">
+      <color>#33FF33</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="recording_font" face="Arial">
+      <color>#FF33FF</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="norecordfnt" face="Arial">
+      <color>#999999</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="conflictfnt" face="Arial">
+      <color>#ffff33</color>
+      <size>16</size>
+      <size:small>11</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="currenttitle" face="Arial">
+      <color>#ffff33</color>
+      <size>18</size>
+      <size:small>12</size:small>
+      <bold>yes</bold>
+    </font>
+
+    <font name="title" face="Arial">
+      <color>#ffffff</color>
+      <dropcolor>#000000</dropcolor>
+      <size>27</size>
+      <size:small>13</size:small>
+      <shadow>3,3</shadow>
+      <bold>yes</bold>
+    </font>
+
+    <font name="info" face="Arial">
+      <color>#ffffff</color>
+      <size>17</size>
+      <size:small>8</size:small>
+      <shadow>1,1</shadow>
+      <bold>yes</bold>
+    </font>
+
+    <font name="message" face="Arial">
+      <color>#ffffff</color>
+      <size>16</size>
+      <size:small>10</size:small>
+      <shadow>1,1</shadow>
+      <bold>yes</bold>
+    </font>
+
+    <font name="messagegray" face="Arial">
+      <color>#999999</color>
+      <size>16</size>
+      <size:small>10</size:small>
+      <shadow>1,1</shadow>
+      <bold>yes</bold>
+    </font>
+
+    <font name="messageyellow" face="Arial">
+      <color>#ffff33</color>
+      <size>16</size>
+      <size:small>10</size:small>
+      <shadow>1,1</shadow>
+      <bold>yes</bold>
+    </font>
+
+    <container name="background">
+      <textarea name="sched" draworder="0">
+        <area>20,10,800,40</area>
+        <font>info</font>
+        <value>Scheduled Recording Changes:</value>
+      </textarea>
+      <image name="filler" draworder="0" fleximage="yes">
+        <filename>cr-background.png</filename>
+        <position>0,39</position>
+      </image>
+    </container>
+
+    <container name="conflict_info">
+      <area>400,10,380,30</area>
+      <textarea name="status" align="right" draworder="4">
+        <area>0,0,380,30</area>
+        <font>info</font>
+      </textarea>
+    </container>
+
+    <container name="showlevel_info">
+      <area>10,330,280,30</area>
+      <textarea name="showing" draworder="4">
+        <area>0,0,105,30</area>
+        <font>message</font>
+        <value>Showing:</value>
+      </textarea>
+      <textarea name="showlevel" draworder="4">
+        <area>110,0,150,30</area>
+        <font>message</font>
+      </textarea>
+    </container>
+
+    <container name="selector">
+      <area>0,39,800,290</area>
+      <listarea name="conflictlist" draworder="4">
+        <area>20,12,760,265</area>
+        <fcnfont name="conflictfnt" function="conflictingrecording"></fcnfont>
+        <fcnfont name="norecordfnt" function="disabledrecording"></fcnfont>
+        <fcnfont name="active_font" function="active"></fcnfont>
+        <fcnfont name="inactive_font" function="inactive"></fcnfont>
+        <fcnfont name="record_font" function="record"></fcnfont>
+        <fcnfont name="recording_font" function="recording"></fcnfont>
+        <fcnfont name="active_font" function="selected"></fcnfont>
+        <columnpadding>10</columnpadding>
+        <column number="1" width="160" context="-1"></column>
+        <column number="2" width="120" context="-1"></column>
+        <column number="3" width="370" context="-1"></column>
+        <column number="4" width="20" context="-1"></column>
+        <column number="5" width="20" context="-1"></column>
+        <items>9</items>
+        <image function="selectionbar" filename="cr-selectbar.png" location="-14,-5"></image>
+        <image function="uparrow" filename="uparrow.png" location="755,22"></image>
+        <image function="downarrow" filename="downarrow.png" location="755,230"></image>
+      </listarea>
+      <image name="showinglines" draworder="5" fleximage="no">
+        <filename>cr-lines.png</filename>
+        <position>0,0</position>
+      </image>
+    </container>
+
+    <container name="program_info">
+      <area>0,360,800,210</area>
+      <textarea name="title" draworder="6">
+        <area>20,0,800,40</area>
+        <font>title</font>
+      </textarea>
+      <textarea name="channel" draworder="6">
+        <area>20,40,160,30</area>
+        <font>info</font>
+      </textarea>
+      <textarea name="timedate" draworder="6">
+        <area>200,40,420,30</area>
+        <font>info</font>
+      </textarea>
+      <textarea name="subdescr" draworder="6">
+        <area>20,70,720,140</area>
+        <font>info</font>
+        <multiline>yes</multiline>
+        <value>%SUBTITLE|"|"
+%%STARS%%DESCRIPTION%</value>
+      </textarea>
+    </container>
+
+    <container name="status_info">
+      <area>300,330,480,30</area>
+      <textarea name="recordingstatus" align="right" draworder="6">
+        <area>0,0,480,30</area>
+        <font>message</font>
+      </textarea>
+    </container>
+ 
+
+   <container name="norecordings_list">
+      <textarea name="msg" align="center" draworder="8">
+         <area>0,110,800,70</area>
+         <font>info</font>
+         <value>No changes to the recording schedule to show</value>
+         <multiline>yes</multiline>
+      </textarea>
+    </container>
+
+  </window>
+
   <window name="recprioritychannels">
 
     <font name="active_font" face="Arial">
Index: Minimalist-wide/ui.xml
===================================================================
--- Minimalist-wide/ui.xml	(revision 7664)
+++ Minimalist-wide/ui.xml	(working copy)
@@ -477,6 +477,138 @@
 
   </window>
 
+  <window name="schdiff">
+    <font name="norecordfnt" base="list-active">
+      <color>#9999cc</color>
+    </font>
+
+    <font name="conflictfnt" base="list-active">
+      <color>#ffff33</color>
+    </font>
+
+    <font name="currenttitle" base="list-active">
+      <color>#ffff33</color>
+    </font>
+
+    <container name="background">
+      <image name="filler" draworder="0" fleximage="no">
+        <filename>rec_priority/trans-rk-background.png</filename>
+        <position>0,0</position>
+      </image>
+
+
+    </container>
+
+    <container name="conflict_info">
+        <area>850,10,380,30</area>
+        
+        <textarea name="status" align="right" draworder="4">
+            <area>0,0,380,30</area>
+            <font>info</font>
+        </textarea>
+    </container>
+
+    <container name="showlevel_info">
+        <area>35,10,480,32</area>
+        
+        <textarea name="showing" draworder="4">
+            <area>0,0,110,32</area>
+            <font>info</font>
+            <value>Showing:</value>
+        </textarea>
+        
+        <textarea name="showlevel" draworder="4">
+            <area>118,0,310,32</area>
+            <font>info</font>
+        </textarea>
+    </container>
+
+    <container name="selector">
+        <area>30,34,1210,395</area>
+        <listarea name="conflictlist" draworder="4">
+            <area>25,20,1210,280</area>
+            <fcnfont name="list-conflict" function="conflictingrecording"></fcnfont>
+            <fcnfont name="norecordfnt" function="disabledrecording"></fcnfont>
+            <fcnfont name="list-active" function="active"></fcnfont>
+            <fcnfont name="list-inactive" function="inactive"></fcnfont>
+            <fcnfont name="list-record" function="record"></fcnfont>
+            <fcnfont name="list-recording" function="recording"></fcnfont>
+            <fcnfont name="list-selected" function="selected"></fcnfont>
+            <columnpadding>10</columnpadding>
+            <column number="1" width="170" context="-1"></column>
+            <column number="2" width="185" context="-1"></column>
+            <column number="3" width="705" context="-1"></column>
+            <column number="4" width="30" context="-1"></column>
+            <column number="5" width="30" context="-1"></column>
+            <items>6</items>
+            <image function="selectionbar" filename="shared/very_long_bar.png" location="-14,0"></image>
+            <image function="uparrow" filename="shared/up_arrow.png" location="1170,15"></image>
+            <image function="downarrow" filename="shared/down_arrow.png" location="1170,265"></image>
+        </listarea>
+    </container>
+
+    <container name="program_info">
+        <area>50,393,1280,310</area>
+        
+        <textarea name="title" draworder="6">
+            <area>0,0,800,45</area>
+            <font>title</font>
+        </textarea>
+        
+        <textarea name="type" draworder="6" align="right">
+            <area>710,255,470,45</area>
+            <font>recstatus</font>
+        </textarea>
+        
+        <textarea name="programid" draworder="6">
+            <area>0,255,480,30</area>
+            <font>info</font>
+        </textarea>
+
+        <textarea name="subtitle" draworder="6">
+            <area>10,45,1100,45</area>
+            <font>subtitle</font>
+        </textarea>
+        
+        <textarea name="channel" draworder="6">
+            <area>10,95,160,30</area>
+            <font>info</font>
+        </textarea>
+
+        <textarea name="timedate" draworder="6">
+            <area>185,95,440,30</area>
+            <font>info</font>
+        </textarea>
+
+        <textarea name="description" draworder="6">
+            <value>%LONGREPEAT%%STARS%%DESCRIPTION%</value>
+            <area>10, 140,1160,120</area>
+            <font>metadata</font>
+            <multiline>yes</multiline>
+        </textarea>
+
+    </container>
+
+<!--    <container name="status_info">
+      <area>863,447,480,30</area>
+      <textarea name="recordingstatus" align="left" draworder="6">
+        <area>0,0,480,30</area>
+        <font>recstatus</font>
+      </textarea>
+    </container>-->
+ 
+
+   <container name="norecordings_list">
+      <textarea name="msg" align="center" draworder="8">
+         <area>0,110,800,70</area>
+         <font>info</font>
+         <value>No changes to the recording schedule to show</value>
+         <multiline>yes</multiline>
+      </textarea>
+    </container>
+
+  </window>
+
   <window name="recprioritychannels">
 
     <container name="background">
