[Mp-plugins-svn] SF.net SVN: mp-plugins: [148] trunk/plugins/ETVNet/ETVNet

[<se...@us...>]

Revision: 148
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=148&view=rev
Author:   sergem1
Date:     2007-02-28 21:58:20 -0800 (Wed, 28 Feb 2007)

Log Message:
-----------
back button in keyboard dialog

Modified Paths:
--------------
    trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs
    trunk/plugins/ETVNet/ETVNet/Plugin.cs
    trunk/plugins/ETVNet/ETVNet/TODO.txt
    trunk/plugins/ETVNet/ETVNet/skinfiles/DialogRuKeyboard.xml
    trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogRuKeyboard.xml

Modified: trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs
===================================================================
--- trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs	2007-02-28 21:05:55 UTC (rev 147)
+++ trunk/plugins/ETVNet/ETVNet/DialogRuKeyboard.cs	2007-03-01 05:58:20 UTC (rev 148)
@@ -37,13 +37,13 @@
     /// </summary> 
     public class DialogRuKeyboard : GUIWindow, IRenderLayer
     {
-        #region keyButtons
 
         [SkinControlAttribute(20)]
         protected GUILabelControl inputLabel = null;
         [SkinControlAttribute(21)]
         protected GUIButtonControl doneButton = null;
-        #endregion
+        [SkinControlAttribute(22)]
+        protected GUIButtonControl backButton = null;
 
         public string inputString;
         public bool done;
@@ -122,7 +122,7 @@
             }
             if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
             {
-                if (doneButton.Focus)
+                if (doneButton.Focus || backButton.Focus)
                 {
                     Close();
                     return;
@@ -214,7 +214,11 @@
             {
                 done = true;
                 Close();
+            } else if (control == backButton)
+            {
+                Close();
             }
+
             if (keyTable.ContainsKey(controlId))
             {
                 inputString += (string)keyTable[controlId];

Modified: trunk/plugins/ETVNet/ETVNet/Plugin.cs
===================================================================
--- trunk/plugins/ETVNet/ETVNet/Plugin.cs	2007-02-28 21:05:55 UTC (rev 147)
+++ trunk/plugins/ETVNet/ETVNet/Plugin.cs	2007-03-01 05:58:20 UTC (rev 148)
@@ -287,6 +287,7 @@
             DialogRuKeyboard ruKeyboard = (DialogRuKeyboard)GUIWindowManager.GetWindow(7767);
             if (null != ruKeyboard)
             {
+                ruKeyboard.inputString = "";
                 ruKeyboard.DoModal(GetID);
                 if (ruKeyboard.done)
                 {
@@ -305,6 +306,7 @@
             DialogRuKeyboard ruKeyboard = (DialogRuKeyboard)GUIWindowManager.GetWindow(7767);
             if (null != ruKeyboard)
             {
+                ruKeyboard.inputString = "";
                 ruKeyboard.DoModal(GetID);
                 if (ruKeyboard.done)
                 {

Modified: trunk/plugins/ETVNet/ETVNet/TODO.txt
===================================================================
--- trunk/plugins/ETVNet/ETVNet/TODO.txt	2007-02-28 21:05:55 UTC (rev 147)
+++ trunk/plugins/ETVNet/ETVNet/TODO.txt	2007-03-01 05:58:20 UTC (rev 148)
@@ -1,14 +1,14 @@
-search keyboard - left arrow to be backspace, instead of back
-osd
- aspect ratio
-support hardware keyboard input
 automatic web browser connection refresh on no activity
-
 error reporting on data access errors 
  (no login - no date/time, invalid media url)
  add info screen when there is no info
 primary streaming link/alternative streaming link
+osd
+ aspect ratio
+support hardware keyboard input
+demo link playback
 
+
 localization
 balance page
 search keyboard page - animation

Modified: trunk/plugins/ETVNet/ETVNet/skinfiles/DialogRuKeyboard.xml
===================================================================
--- trunk/plugins/ETVNet/ETVNet/skinfiles/DialogRuKeyboard.xml	2007-02-28 21:05:55 UTC (rev 147)
+++ trunk/plugins/ETVNet/ETVNet/skinfiles/DialogRuKeyboard.xml	2007-03-01 05:58:20 UTC (rev 148)
@@ -33,6 +33,16 @@
       <width>80</width>
       <onright>9011</onright>
     </control>
+
+    <control>
+      <type>button</type>
+      <id>22</id>
+      <posX>470</posX>
+      <posY>212</posY>
+      <label>Back</label>
+      <width>80</width>
+      <onright>9021</onright>
+    </control>
     
     <control>
       <type>group</type>
@@ -89,7 +99,7 @@
         <id>9021</id>
         <label>Ё</label>
         <width>40</width>
-        <onleft>9026</onleft>
+        <onleft>22</onleft>
       </control>
       <control>
         <type>button</type>
@@ -121,7 +131,7 @@
         <label>К</label>
         <width>40</width>
         <onup>9016</onup>
-        <onright>9021</onright>
+        <onright>22</onright>
       </control>
       <!-- row 3 -->
       <control>

Modified: trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogRuKeyboard.xml
===================================================================
--- trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogRuKeyboard.xml	2007-02-28 21:05:55 UTC (rev 147)
+++ trunk/plugins/ETVNet/ETVNet/skinfiles/wide/DialogRuKeyboard.xml	2007-03-01 05:58:20 UTC (rev 148)
@@ -33,6 +33,16 @@
       <width>152</width>
       <onright>9011</onright>
     </control>
+
+    <control>
+      <type>button</type>
+      <id>22</id>
+      <posX>891</posX>
+      <posY>287</posY>
+      <label>Back</label>
+      <width>152</width>
+      <onright>9021</onright>
+    </control>
     
     <control>
       <type>group</type>
@@ -89,7 +99,7 @@
         <id>9021</id>
         <label>Ё</label>
         <width>76</width>
-        <onleft>9026</onleft>
+        <onleft>22</onleft>
       </control>
       <control>
         <type>button</type>
@@ -121,7 +131,7 @@
         <label>К</label>
         <width>76</width>
         <onup>9016</onup>
-        <onright>9021</onright>
+        <onright>22</onright>
       </control>
       <!-- row 3 -->
       <control>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.