Merge branch 'mehah:main' into browser

README.md

@@ -468,6 +468,7 @@ Beyond of it's flexibility with scripts, otclient comes with tons of other featu
 - Module Oufit
 - Placeholder
 - UIGraph
+- keybinds
   
 ## <a name="themobileproject"><img height="32" src="https://raw.githubusercontent.com/github/explore/80688e429a7d4ef2fca1e82350fe8e3517d3494d/topics/android/android.png" alt="Android"> The Mobile Project </a>
 The Mobile Project

data/styles/10-scrollbars.otui

@@ -186,3 +186,23 @@ HorizontalQtScrollBar < UIScrollBar
       image-clip: 54 10 12 12
 
   HorizontalScrollBarQtSlider
+
+SmallButton < UIButton
+  size: 106 20
+  font: cipsoftFont
+  text-offset: 0 2
+  image-source: /images/ui/button
+  image-clip: 0 0 22 23
+  image-border: 3
+  padding: 5 10 5 10
+  change-cursor-image: true
+  cursor: pointer
+  color: #ffffff
+  $hover !disabled:
+    image-clip: 0 23 22 23
+  $pressed:
+    image-clip: 0 46 22 23
+    text-offset: 1 2
+  $disabled:
+    color: #ffffff88
+    change-cursor-image: false

modules/client_debug_info/debug_info.lua

@@ -11,7 +11,13 @@ function init()
     debugInfoWindow = g_ui.displayUI('debug_info')
     debugInfoWindow:hide()
 
-    g_keyboard.bindKeyDown('Ctrl+Alt+D', toggle)
+    Keybind.new("Debug", "Toggle Stats", "Ctrl+Alt+D", "")
+    Keybind.bind("Debug", "Toggle Stats", {
+      {
+        type = KEY_DOWN,
+        callback = toggle,
+      }
+    })
 
     updateEvent = scheduleEvent(update, 2000)
 end
@@ -20,7 +26,7 @@ function terminate()
     debugInfoWindow:destroy()
     debugInfoButton:destroy()
 
-    g_keyboard.unbindKeyDown('Ctrl+Alt+D')
+    Keybind.delete("Debug", "Toggle Stats")
 
     removeEvent(updateEvent)
 end

modules/client_entergame/entergame.lua

@@ -127,7 +127,13 @@ end
 -- public functions
 function EnterGame.init()
     enterGame = g_ui.displayUI('entergame')
-    g_keyboard.bindKeyDown('Ctrl+G', EnterGame.openWindow)
+    Keybind.new("Misc.", "Change Character", "Ctrl+G", "")
+    Keybind.bind("Misc.", "Change Character", {
+      {
+        type = KEY_DOWN,
+        callback = EnterGame.openWindow,
+      }
+    })
 
     local account = g_settings.get('account')
     local password = g_settings.get('password')
@@ -259,7 +265,7 @@ function EnterGame.firstShow()
 end
 
 function EnterGame.terminate()
-    g_keyboard.unbindKeyDown('Ctrl+G')
+    Keybind.delete("Misc.", "Change Character")
 
     disconnect(clientBox, {
         onOptionChange = EnterGame.onClientVersionChange

modules/client_options/data_options.lua

@@ -444,4 +444,10 @@ return {
             end, 100)
         end
     },
+    autoSwitchPreset                    = false,
+    listKeybindsPanel                   = {
+        action = function(value, options, controller, panels, extraWidgets)
+            listKeybindsComboBox(value)
+        end
+    },
 }