Browse Source

Configure alwaysOnTop as cycleable setting.

Remove the necessity to register a new host command.
Define possible values true|false as list

Plex-CLA-1.0-signed-off-by: Lukas Pitschl lukas@leftandleaving.com
Lukas Pitschl 8 years ago
parent
commit
51d58f5fea

+ 2 - 2
resources/inputmaps/keyboard.json

@@ -52,14 +52,14 @@
     "Ctrl\\+Q": "host:close",
     "Ctrl\\+Shift\\+R": "host:reload",
     "Ctrl\\+Shift\\+D": "host:toggleDebug",
-    "Ctrl\\+Shift\\+A": "host:alwaysOnTop",
+    "Ctrl\\+Shift\\+A": "host:cycle_setting main.alwaysOnTop",
 
     // emulate some of of PHT's behaviour
     "I": "host:toggleDebug",
     "W": "toggle_watched",
     "\\\\": "host:fullscreen",
     "Z": "host:cycle_setting video.aspect",
-    "T": "host:alwaysOnTop",
+    "T": "host:cycle_setting main.alwaysOnTop",
 
     // media keys from the FLIRC and on Linux keyboards
     "Toggle Media Play\\/Pause": "play_pause",

+ 5 - 1
resources/settings/settings_description.json

@@ -36,7 +36,11 @@
       },
       {
         "value": "alwaysOnTop",
-        "default": false
+        "default": false,
+        "possible_values": [
+          [ false, "Disabled" ],
+          [ true, "Enabled" ]
+        ]
       },
       {
         "value": "webserverport",

+ 0 - 1
src/ui/KonvergoWindow.cpp

@@ -35,7 +35,6 @@ KonvergoWindow::KonvergoWindow(QWindow* parent) : QQuickWindow(parent), m_debugL
   InputComponent::Get().registerHostCommand("toggleDebug", this, "toggleDebug");
   InputComponent::Get().registerHostCommand("reload", this, "reloadWeb");
   InputComponent::Get().registerHostCommand("fullscreen", this, "toggleFullscreen");
-  InputComponent::Get().registerHostCommand("alwaysOnTop", this, "toggleAlwaysOnTop");
 
 #ifdef TARGET_RPI
   // On RPI, we use dispmanx layering - the video is on a layer below Konvergo,