From d843bae471c3634de5da2aa618ba61ff78b37449 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Tue, 24 Nov 2015 21:33:42 +0000
Subject: [PATCH] various

---
 1080i/DialogKeyboard.xml               |  27 +++-
 1080i/EventLog.xml                     | 164 +++++++++++++++++++++++++
 1080i/VideoOSD.xml                     |   4 +-
 1080i/custom_musicPlayerFullscreen.xml |  28 ++---
 changelog.txt                          |   2 +
 5 files changed, 205 insertions(+), 20 deletions(-)
 create mode 100644 1080i/EventLog.xml

diff --git a/1080i/DialogKeyboard.xml b/1080i/DialogKeyboard.xml
index b1b5a06..30e3876 100644
--- a/1080i/DialogKeyboard.xml
+++ b/1080i/DialogKeyboard.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">300</defaultcontrol>
-     
+
     <controls>
         <control type="group">
             <visible>!Window.IsVisible(numericinput)</visible>
@@ -19,6 +19,31 @@
                 <texture>colors/black.png</texture>
                 <colordiffuse>ddffffff</colordiffuse>
             </control>
+            <!--additional label controls for Chinese text input (Kodi Jarvis)-->
+            <control type="grouplist">
+                <posx>col-4-begin</posx>
+                <posy>-184</posy>
+                <width>18-col</width>
+                <height>5-row</height>
+                <control type="label" id="313">
+                    <description>text input</description>
+                    <width>18-col</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>top</aligny>
+                    <font>largeStrong</font>
+                    <textcolor>77FFFFFF</textcolor>
+                </control>
+                <control type="label" id="314">
+                    <description>list of options</description>
+                    <width>18-col</width>
+                    <height>2-row</height>
+                    <align>center</align>
+                    <aligny>top</aligny>
+                    <font>mediumStrong</font>
+                    <textcolor>99FFFFFF</textcolor>
+                </control>
+            </control>
             <!--headers-->
             <control type="group">
                 <posx>col-1-begin</posx>
diff --git a/1080i/EventLog.xml b/1080i/EventLog.xml
new file mode 100644
index 0000000..e4b07d3
--- /dev/null
+++ b/1080i/EventLog.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+    <defaultcontrol always="true">9000</defaultcontrol>
+    <views>570</views>
+    <controls>
+        <!--background-->
+        <include>globalBackground</include>
+        <control type="group">
+            <posx>col-4-begin</posx>
+            <posy>row-5-begin</posy>
+            <!--animations-->
+            <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>18-col</width>
+                <height>2-row</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>18-col</width>
+                <height>18-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>5-col</posx>
+                <posy>2-row</posy>
+                <width>13-col</width>
+                <height>18-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <!--title-->
+            <control type="label">
+                <posx>24</posx>
+                <posy>0</posy>
+                <width>18-col-gutter</width>
+                <height>2-row</height>
+                <font>dialogTitle</font>
+                <label>$LOCALIZE[14111]</label>
+                <textcolor>textActive</textcolor>
+                <shadowcolor>-</shadowcolor>
+            </control>
+            <--view options-->
+            <control type="grouplist" id="9000">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>5-col</width>
+                <height>600</height>
+                <onleft>9000</onleft>
+                <onright>570</onright>
+                <onup>9000</onup>
+                <ondown>9000</ondown>
+                <control type="button" id="21">
+                    <description>Level button</description>
+                    <width>5-col</width>
+                </control>
+                <control type="radiobutton" id="22">
+                    <description>Only show current level</description>
+                    <width>5-col</width>
+                    <textureradiofocus>-</textureradiofocus>
+                    <textureradionofocus>-</textureradionofocus>
+                    <radiowidth/>
+                    <radioheight/>
+                </control>
+                <control type="button" id="20">
+                    <description>Clear button</description>
+                    <label>192</label>
+                    <width>5-col</width>
+                </control>
+            </control>
+            <!--content listing-->
+            <control type="panel" id="570">
+                <posx>5-col</posx>
+                <posy>2-row</posy>
+                <width>13-col</width>
+                <height>23-row</height>
+                <onleft>9000</onleft>
+                <onright>60</onright>
+                <ondown>50</ondown>
+                <onup>50</onup>
+                <pagecontrol>60</pagecontrol>
+                <itemlayout width="13-col" height="2-row">
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>3</posy>
+                        <width>900</width>
+                        <height>2-row</height>
+                        <aligny>top</aligny>
+                        <font>itemSubTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>32</posy>
+                        <width>13-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>top</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>[B]$INFO[ListItem.Label][/B] - $INFO[ListItem.Property(Event.Description)]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="13-col" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>13-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/white.png</texture>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>3</posy>
+                        <width>13-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>top</aligny>
+                        <font>itemSubTitle</font>
+                        <textcolor>black</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>32</posy>
+                        <width>13-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>top</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>black</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>[B]$INFO[ListItem.Label][/B] - $INFO[ListItem.Property(Event.Description)]</label>
+                    </control>
+                </focusedlayout>
+            </control>
+            <control type="scrollbar" id="60">
+                <posx>18-col-indent</posx>
+                <posy>2-row</posy>
+                <height>18-row</height>
+                <onleft>570</onleft>
+                <onright>2</onright>
+                <orientation>vertical</orientation>
+                <visible>Control.IsVisible(570)</visible>
+            </control>
+        </control>
+        <!--debugging-->
+        <include>DebugGrid</include>
+        <control type="label">
+            <include>DialogID</include>
+            <label>EventLog.xml</label>
+        </control>
+    </controls>
+</window>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 22d3141..e72978d 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -74,8 +74,8 @@
                             <height>2-row</height>
                             <align>left</align>
                             <font>dialogTitle</font>
-                            <textcolor>black</textcolor>
-                            <label>$INFO[Videoplayer.time] / $INFO[Videoplayer.duration]</label>
+                            <textcolor>dd000000</textcolor>
+                            <label>[B]$INFO[Videoplayer.time] / $INFO[Videoplayer.duration][/B]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <!--synopsis-->
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 7d80319..5256862 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -86,22 +86,20 @@
                         <posx>3-col</posx>
                         <posy>-8</posy>
                         <width>15-col</width>
-                        <font>largeBlack</font>
-                        <textcolor>textActive</textcolor>
+                        <font>large</font>
+                        <textcolor>66FFFFFF</textcolor>
                         <scroll>false</scroll>
                         <label>$INFO[MusicPlayer.Title]</label>
-                        <shadowcolor>00000000</shadowcolor>
                    </control>
                     <control type="label">
                         <visible>!Pvr.IsPlayingRadio</visible>
                         <posx>3-col</posx>
                         <posy>52</posy>
                         <width>15-col</width>
-                        <font>regularStrong</font>
-                        <textcolor>textActive</textcolor>
+                        <font>regularLight</font>
+                        <textcolor>66FFFFFF</textcolor>
                         <scroll>false</scroll>
-                        <label>[COLOR highlight]$INFO[MusicPlayer.artist,, ][/COLOR]$INFO[MusicPlayer.Album,, ]$INFO[MusicPlayer.year,(,)]</label>
-                        <shadowcolor>00000000</shadowcolor>
+                        <label>[B]$INFO[MusicPlayer.artist,, | ][/B]$INFO[MusicPlayer.Album,, ]$INFO[MusicPlayer.year,(,)]</label>
                     </control>
                     <control type="label">
                         <visible>Pvr.IsPlayingRadio</visible>
@@ -109,10 +107,9 @@
                         <posy>48</posy>
                         <width>15-col</width>
                         <font>regularStrong</font>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>66FFFFFF</textcolor>
                         <scroll>false</scroll>
                         <label>$INFO[VideoPlayer.Plot]</label>
-                        <shadowcolor>00000000</shadowcolor>
                     </control>
                     <control type="label">
                         <posx>3-col</posx>
@@ -120,9 +117,8 @@
                         <width>12-col</width>
                         <font>pageTitle</font>
                         <align>left</align>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>66FFFFFF</textcolor>
                         <scroll>false</scroll>
-                        <shadowcolor>00000000</shadowcolor>
                         <label>$INFO[MusicPlayer.time,, / ]$INFO[MusicPlayer.duration]</label>
                     </control>
                     <control type="label">
@@ -131,20 +127,18 @@
                            <posy>104</posy>
                            <width>4-col</width>
                            <font>symbolLarge</font>
-                           <textcolor>textActive</textcolor>
+                           <textcolor>66FFFFFF</textcolor>
                            <label>$VAR[starRating]</label>
-                           <shadowcolor>00000000</shadowcolor>
                        </control>
                     <control type="label">
                         <posx>3-col</posx>
                         <posy>156</posy>
                         <width>12-col</width>
-                        <font>itemTitle</font>
+                        <font>itemSubTitle</font>
                         <align>left</align>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>66FFFFFF</textcolor>
                         <scroll>false</scroll>
-                        <shadowcolor>00000000</shadowcolor>
-                        <label>$INFO[MusicPlayer.offset(1).Artist,[COLOR highlight]$LOCALIZE[19031][/COLOR] , - ]$INFO[MusicPlayer.offset(1).Title]</label>
+                        <label>[UPPERCASE]$INFO[MusicPlayer.offset(1).Artist,$LOCALIZE[19031]: , - ]$INFO[MusicPlayer.offset(1).Title][/UPPERCASE]</label>
                     </control>
                 </control>
                 <!-- side menu-->
diff --git a/changelog.txt b/changelog.txt
index c26f2d1..a6d7e0b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -19,6 +19,8 @@
 - [REMOVED] DialogPVRGuideInfo.xml
 - [REMOVED] DialogPVRRecordingInfo.xml
 - [REMOVED] VisualisationPresetList.xml
+- [NEW] EventLog.xml
+- [MODIFIED] dialogKeyboard.xml - additional labels for BaiduPy input added
 
 - [NEW] DialogAudioDSPManager.xml
 - [NEW] DialogAudioDSPSettings.xml