Merge branch 'AllKeysKeyboard' into develop

Conflicts:
	Vocaluxe/Website/js/main.js

ServerLib/CServer.cs

@@ -33,6 +33,7 @@ namespace ServerLib
         private bool _Encrypted;
 
         public static SendKeyEventDelegate SendKeyEvent { internal get; set; }
+        public static SendKeyStringEventDelegate SendKeyStringEvent { internal get; set; }
 
         #region profile
         public static GetProfileDataDelegate GetProfileData { internal get; set; }

ServerLib/CWebservice.cs

@@ -58,6 +58,23 @@ namespace ServerLib
                 CServer.SendKeyEvent(key);
         }
 
+        public void SendKeyStringEvent(string keyString, bool isShiftPressed = false, bool isAltPressed = false, bool isCtrlPressed = false)
+        {
+            if (!_CheckRight(EUserRights.UseKeyboard))
+                return;
+
+            if (CServer.SendKeyStringEvent == null)
+            {
+                if (WebOperationContext.Current != null)
+                {
+                    WebOperationContext.Current.OutgoingResponse.StatusCode = HttpStatusCode.NotFound;
+                    WebOperationContext.Current.OutgoingResponse.StatusDescription = "Not found";
+                }
+            }
+            else
+                CServer.SendKeyStringEvent(keyString, isShiftPressed, isAltPressed, isCtrlPressed);
+        }
+
         #region profile
         public int GetOwnProfileId()
         {

ServerLib/DataStructs.cs

@@ -26,6 +26,7 @@ using System.Text.RegularExpressions;
 namespace ServerLib
 {
     public delegate bool SendKeyEventDelegate(string key);
+    public delegate bool SendKeyStringEventDelegate(string keyString, bool isShiftPressed , bool isAltPressed , bool isCtrlPressed);
 
     #region profile
     public delegate SProfileData GetProfileDataDelegate(int profileId, bool isReadonly);

ServerLib/ICWebservice.cs

@@ -30,6 +30,11 @@ namespace ServerLib
             UriTemplate = "/sendKeyEvent?key={key}")]
         void SendKeyEvent(string key);
 
+        [OperationContract, WebInvoke(Method = "GET",
+            ResponseFormat = WebMessageFormat.Json,
+            UriTemplate = "/sendKeyStringEvent?keyString={keyString}&shift={isShiftPressed}&alt={isAltPressed}&ctrl={isCtrlPressed}")]
+        void SendKeyStringEvent(string keyString, bool isShiftPressed = false, bool isAltPressed = false, bool isCtrlPressed = false);
+
         #region profile
         [OperationContract, WebInvoke(Method = "GET",
             ResponseFormat = WebMessageFormat.Json,

Vocaluxe/Base/Server/CVocaluxeServer.cs

@@ -64,6 +64,7 @@ namespace Vocaluxe.Base.Server
             _Server = new CServer(CConfig.ServerPort, CConfig.ServerEncryption == EOffOn.TR_CONFIG_ON);
 
             CServer.SendKeyEvent = _SendKeyEvent;
+            CServer.SendKeyStringEvent = _sendKeyStringEvent;
             CServer.GetProfileData = _GetProfileData;
             CServer.SendProfileData = _SendProfileData;
             CServer.GetProfileList = _GetProfileList;
@@ -125,9 +126,11 @@ namespace Vocaluxe.Base.Server
         private static bool _SendKeyEvent(string key)
         {
             bool result = false;
-            if (!string.IsNullOrEmpty(key))
+            var lowerKey = key.ToLower();
+
+            if (!string.IsNullOrEmpty(lowerKey))
             {
-                switch (key.ToLower())
+                switch (lowerKey)
                 {
                     case "up":
                         Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Up));
@@ -157,25 +160,22 @@ namespace Vocaluxe.Base.Server
                         Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Tab));
                         result = true;
                         break;
+                    case "backspace":
+                        Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, Keys.Back));
+                        result = true;
+                        break;
                     default:
-                        foreach (char c in key)
+                        if (lowerKey.StartsWith("f"))
                         {
-                            bool shift = true;
-                            char keyChar;
-                            if (char.ToUpper(c) != c)
-                            {
-                                keyChar = char.ToUpper(c);
-                                shift = false;
-                            }
-                            else
-                                keyChar = c;
+                            var numberString = lowerKey.Substring(1);
+                            int number;
+                            Keys fKey;
 
-                            if ((keyChar >= '0' && keyChar <= '9') || (keyChar >= 'A' && keyChar <= 'Z'))
+                            if (Int32.TryParse(numberString, out number) && number >= 1 
+                                && number <= 12 
+                                && Enum.TryParse("F" + number, true, out fKey))
                             {
-                                Keys keys = (Keys)keyChar;
-                                if (shift)
-                                    keys |= Keys.Shift;
-                                Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, keys));
+                                Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, false, false, false, false, Char.MinValue, fKey));
                                 result = true;
                             }
                         }
@@ -186,6 +186,43 @@ namespace Vocaluxe.Base.Server
             return result;
         }
 
+        private static bool _sendKeyStringEvent(string keyString, bool isShiftPressed , bool isAltPressed , bool isCtrlPressed )
+        {
+            bool result = false;
+
+            foreach (var key in keyString.ToCharArray())
+            {
+                Controller.AddKeyEvent(new SKeyEvent(ESender.Keyboard, isAltPressed, 
+                    Char.IsUpper(key) || isShiftPressed,
+                    isCtrlPressed, true,
+                    isShiftPressed?Char.ToUpper(key) :key,
+                    _ParseKeys(key)));
+                result = true;
+            }
+
+            return result;
+        }
+
+        private static Keys _ParseKeys(char keyText)
+        {
+            Keys key;
+
+            if (!Enum.TryParse(keyText.ToString(), true, out key))
+            {
+                switch (keyText)
+                {
+                    case ' ':
+                        key = Keys.Space;
+                        break;
+                    default:
+                        key = Keys.None;
+                        break;
+                }
+            }
+
+            return key;
+        }
+
         #region profile
         private static SProfileData _GetProfileData(int profileId, bool isReadonly)
         {

Vocaluxe/Website/index.html

@@ -297,14 +297,31 @@
                 <div class="ui-block-c">
                     <a data-role="button" id="keyboardButtonReturn" data-i18n="keyboardButtonReturn"></a>
                 </div>
+                <div class="ui-block-a">
+                    <!--
+                     <fieldset data-role="controlgroup" data-type="horizontal">
+                         <input type="checkbox" name="keyboardButtonFunct" id="keyboardButtonFunct" />
+                         <label data-i18n="keyboardButtonFunct" for="keyboardButtonFunct"></label>
+                     </fieldset>-->
+                </div>
+                <div class="ui-block-b">
+                    <fieldset data-role="controlgroup" data-type="horizontal">
+                        <input type="checkbox" name="keyboardButtonShift" id="keyboardButtonShift" />
+                        <label data-i18n="keyboardButtonShift" for="keyboardButtonShift"></label>
+                        <input type="checkbox" name="keyboardButtonAlt" id="keyboardButtonAlt" />
+                        <label data-i18n="keyboardButtonAlt" for="keyboardButtonAlt"></label>
+                        <input type="checkbox" name="keyboardButtonCtrl" id="keyboardButtonCtrl" />
+                        <label data-i18n="keyboardButtonCtrl" for="keyboardButtonCtrl"></label>
+                    </fieldset>
+                </div>
                 <div class="ui-block-c">
-                    <a data-role="button" id="keyboardButtonP">P</a>
+                    <a data-role="button" id="keyboardButtonBackspace" data-i18n="keyboardButtonBackspace"></a>
                 </div>
             </div>
-            <!--  <div style>
+            <div>
                 <label for="keyboardButtonKeys" data-i18n="keyboardButtonKeys"></label>
                 <input type="text" id="keyboardButtonKeys" data-mini="true">
-            </div> -->
+            </div>
         </div>
         <!-- /content -->
     </div>

Vocaluxe/Website/js/main.js

@@ -688,24 +688,45 @@
                     });
                 });
 
-                $('#keyboardButtonP').click(function () {
+                $('#keyboardButtonBackspace').click(function () {
                     request({
-                        url: "sendKeyEvent?key=p"
+                        url: "sendKeyEvent?key=backspace"
                     });
                 });
 
+
                 $('#keyboardButtonKeys').keyup(function (e) {
-                    var c = String.fromCharCode(e.keyCode);
-                    if (c.match(/\w/)) {
-                        c = e.keyCode >= 65 ? c.toLowerCase() : c;
+                    var text = $('#keyboardButtonKeys')[0].value;
+
+                    $('#keyboardButtonKeys')[0].value = "";
+                    if (text.length <= 0) {
+                        return;
+                    }
+
+
+                   /* if ($('#keyboardButtonFunct').is(':checked')) {
+                        $('#keyboardButtonKeys')[0].value = text.splice(1) + $('#keyboardButtonKeys')[0].value;
+                        var numericElements = /^[0-9][0-9]?/.exec(text.charAt(0));
+                        if (parseInt(numericElements)) {
                         request({
-                            url: "sendKeyEvent?key=" + c
+                                url: "sendKeyEvent?key=F" + numericElements
                         });
                     }
-                    var oldText = $('#keyboardButtonKeys')[0].value;
-                    if (oldText.length > 0) {
-                        $('#keyboardButtonKeys')[0].value = oldText.slice(1);
-                    }
+                        $("#keyboardButtonFunct").attr("checked", false).checkboxradio("refresh");
+                    }*/
+
+                    request({
+                        contentType: "application/json;charset=utf-8",
+                        type: "GET",
+                        url: "sendKeyStringEvent?keyString=" + text
+                            + "&shift=" + $('#keyboardButtonShift').is(':checked')
+                            + "&alt=" + $('#keyboardButtonAlt').is(':checked')
+                            + "&ctrl=" + $('#keyboardButtonCtrl').is(':checked')
+
+                    }).fail(function () {
+                        $('#keyboardButtonKeys')[0].value = text + $('#keyboardButtonKeys')[0].value;
+                    });
+
                 });
             };
 

Vocaluxe/Website/locales/de.json

@@ -76,5 +76,10 @@
     "discoverConnectServerAddress": "Serveradresse:",
     "discoverConnectButton": "Verbinden",
     "Checking...": "Prüfen...",
-    "timeout": "Zeitüberschreitung"
+    "timeout": "Zeitüberschreitung",
+    "keyboardButtonShift":  "Umschalt",
+    "keyboardButtonAlt":  "Alt",
+    "keyboardButtonCtrl": "Steuerung",
+    "keyboardButtonFunct": "Funktion",
+    "keyboardButtonBackspace":  "Rücktaste"
 }

Vocaluxe/Website/locales/en.json

@@ -76,5 +76,10 @@
     "discoverConnectServerAddress": "Serveraddress:",
     "discoverConnectButton": "Connect",
     "Checking...": "Checking...",
-    "timeout": "Timeout"
+    "timeout": "Timeout",
+    "keyboardButtonShift":  "Shift",
+    "keyboardButtonAlt":  "Alt",
+    "keyboardButtonCtrl": "Control",
+    "keyboardButtonFunct": "Function",
+    "keyboardButtonBackspace":  "Backspace"
 }