Fixed Qt Dependencies that were not included in initial project.

Renamed library

app.py

@@ -1,18 +1,18 @@
 import sys
-from gergcob.window_controller import WindowController
-from gergcob.keyboard_controller import Keyboard
+from utils.window_controller import WindowController
+from utils.keyboard_controller import Keyboard
 
 import keyboard as kb
 
-from PySideSimplify import *
+from PySide2 import QtWidgets, QtGui, QtCore
 
 from threading import Thread
 from time import sleep
 
 import data
 
 
-class ApplicationWindow(QtGui.QMainWindow):
+class ApplicationWindow(QtWidgets.QMainWindow):
     def __init__(self, width, height):
         super().__init__()
 
@@ -28,17 +28,16 @@ def __init__(self, width, height):
         self.setStyleSheet("QPushButton{background-image: url(:src/sot_active.png);}")
 
         # INTERFACE
-        self.btn_afk = QtGui.QPushButton("")
+        self.btn_afk = QtWidgets.QPushButton("")
         self.btn_afk.setFlat(True)
         self.btn_afk.clicked.connect(lambda: self.afk(self.is_afk))
         self.btn_afk.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
         self.setCentralWidget(self.btn_afk)
 
-        l = Thread(target=self.hotkey_listener)
-        l.start()
+        thread = Thread(target=self.hotkey_listener)
+        thread.start()
 
         self.show()
-        self.focusWidget().clearFocus()
 
     def hotkey_listener(self):
         print('listening')
@@ -47,7 +46,7 @@ def hotkey_listener(self):
                 self.afk(self.is_afk)
                 sleep(0.5)
 
-    def afk(self, afk: bool=False):
+    def afk(self, afk: bool = False):
         try:
             if not afk:
                 self.is_afk = True
@@ -87,6 +86,6 @@ def closeEvent(self, event):
 
 
 if __name__ == "__main__":
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
     app_window = ApplicationWindow(300, 100)
     sys.exit(app.exec_())

gergcob/keyboard_controller.py → utils/keyboard_controller.py

@@ -1,103 +1,103 @@
-import ctypes
-import win32api
-
-# C Struct Redefinition
-PUL = ctypes.POINTER(ctypes.c_ulong)
-
-
-class KeyBdInput(ctypes.Structure):
-    _fields_ = [("wVk", ctypes.c_ushort),
-                ("wScan", ctypes.c_ushort),
-                ("dwFlags", ctypes.c_ulong),
-                ("time", ctypes.c_ulong),
-                ("dwExtraInfo", PUL)]
-
-
-class HardwareInput(ctypes.Structure):
-    _fields_ = [("uMsg", ctypes.c_ulong),
-                ("wParamL", ctypes.c_short),
-                ("wParamH", ctypes.c_ushort)]
-
-
-class MouseInput(ctypes.Structure):
-    _fields_ = [("dx", ctypes.c_long),
-                ("dy", ctypes.c_long),
-                ("mouseData", ctypes.c_ulong),
-                ("dwFlags", ctypes.c_ulong),
-                ("time",ctypes.c_ulong),
-                ("dwExtraInfo", PUL)]
-
-
-class InputI(ctypes.Union):
-    _fields_ = [("ki", KeyBdInput),
-                ("mi", MouseInput),
-                ("hi", HardwareInput)]
-
-
-class Input(ctypes.Structure):
-    _fields_ = [("type", ctypes.c_ulong),
-                ("ii", InputI)]
-
-
-class Keyboard(object):
-    def __init__(self):
-        self.send_input = ctypes.windll.user32.SendInput
-        self.key_list = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 123456789,.'£$/\\"
-
-        # DirectInput Keyboard Scan Codes [DirectX]
-        # Supplied by: http://www.gamespp.com/directx/directInputKeyboardScanCodes.html
-        self.inputs = {'DIK_ESCAPE': 0x01, 'DIK_1': 0x02, 'DIK_2': 0x03, 'DIK_3': 0x04, 'DIK_4': 0x05, 'DIK_5': 0x06,
-                       'DIK_6': 0x07, 'DIK_7': 0x08, 'DIK_8': 0x09, 'DIK_9': 0x0A, 'DIK_0': 0x0B, 'DIK_MINUS': 0x0C,
-                       'DIK_EQUALS': 0x0D, 'DIK_BACK': 0x0E, 'DIK_TAB': 0x0F, 'DIK_Q': 0x10, 'DIK_W': 0x11,
-                       'DIK_E': 0x12, 'DIK_R': 0x13, 'DIK_T': 0x14, 'DIK_Y': 0x15, 'DIK_U': 0x16, 'DIK_I': 0x17,
-                       'DIK_O': 0x18, 'DIK_P': 0x19, 'DIK_LBRACKET': 0x1A, 'DIK_RBRACKET': 0x1B, 'DIK_RETURN': 0x1C,
-                       'DIK_LCONTROL': 0x1D, 'DIK_A': 0x1E, 'DIK_S': 0x1F, 'DIK_D': 0x20, 'DIK_F': 0x21, 'DIK_G': 0x22,
-                       'DIK_H': 0x23, 'DIK_J': 0x24, 'DIK_K': 0x25, 'DIK_L': 0x26, 'DIK_SEMICOLON': 0x27,
-                       'DIK_APOSTROPHE': 0x28, 'DIK_GRAVE': 0x29, 'DIK_LSHIFT': 0x2A, 'DIK_BACKSLASH': 0x2B,
-                       'DIK_Z': 0x2C, 'DIK_X': 0x2D, 'DIK_C': 0x2E, 'DIK_V': 0x2F, 'DIK_B': 0x30, 'DIK_N': 0x31,
-                       'DIK_M': 0x32, 'DIK_COMMA': 0x33, 'DIK_PERIOD': 0x34, 'DIK_SLASH': 0x35, 'DIK_RSHIFT': 0x36,
-                       'DIK_MULTIPLY': 0x37, 'DIK_LMENU': 0x38, 'DIK_SPACE': 0x39, 'DIK_CAPITAL': 0x3A, 'DIK_F1': 0x3B,
-                       'DIK_F2': 0x3C, 'DIK_F3': 0x3D, 'DIK_F4': 0x3E, 'DIK_F5': 0x3F, 'DIK_F6': 0x40, 'DIK_F7': 0x41,
-                       'DIK_F8': 0x42, 'DIK_F9': 0x43, 'DIK_F10': 0x44, 'DIK_NUMLOCK': 0x45, 'DIK_SCROLL': 0x46,
-                       'DIK_NUMPAD7': 0x47, 'DIK_NUMPAD8': 0x48, 'DIK_NUMPAD9': 0x49, 'DIK_SUBTRACT': 0x4A,
-                       'DIK_NUMPAD4': 0x4B, 'DIK_NUMPAD5': 0x4C, 'DIK_NUMPAD6': 0x4D, 'DIK_ADD': 0x4E,
-                       'DIK_NUMPAD1': 0x4F, 'DIK_NUMPAD2': 0x50, 'DIK_NUMPAD3': 0x51, 'DIK_NUMPAD0': 0x52,
-                       'DIK_DECIMAL': 0x53, 'DIK_F11': 0x54, 'DIK_F12': 0x58, 'DIK_F13': 0x64, 'DIK_F14': 0x65,
-                       'DIK_F15': 0x66, 'DIK_KANA': 0x70, 'DIK_CONVERT': 0x79, 'DIK_NOCONVERT': 0x7B, 'DIK_YEN': 0x7D,
-                       'DIK_NUMPADEQUALS': 0x8D, 'DIK_CIRCUMFLEX': 0x90, 'DIK_AT': 0x91, 'DIK_COLON': 0x92,
-                       'DIK_UNDERLINE': 0x93, 'DIK_KANJI': 0x94, 'DIK_STOP': 0x95, 'DIK_AX': 0x96,'DIK_UNLABELED': 0x97,
-                       'DIK_NUMPADENTER': 0x9C, 'DIK_RCONTROL': 0x9D, 'DIK_NUMPADCOMMA': 0xB3, 'DIK_DIVIDE': 0xB5,
-                       'DIK_SYSRQ': 0xB7, 'DIK_RMENU': 0xB8, 'DIK_HOME': 0xC7, 'DIK_UP': 0xC8, 'DIK_PRIOR': 0xC9,
-                       'DIK_LEFT': 0xCB, 'DIK_RIGHT': 0xCD, 'DIK_END': 0xCF, 'DIK_DOWN': 0xD0, 'DIK_NEXT': 0xD1,
-                       'DIK_INSERT': 0xD2, 'DIK_DELETE': 0xD3, 'DIK_LWIN': 0xDB, 'DIK_RWIN': 0xDC, 'DIK_APPS': 0xDD}
-
-    def press_key(self, key_name):
-        extra = ctypes.c_ulong(0)
-        ii_ = InputI()
-        ii_.ki = KeyBdInput(0, self.key_to_code(key_name), 0x0008, 0, ctypes.pointer(extra))
-        x = Input(ctypes.c_ulong(1), ii_)
-        self.send_input(1, ctypes.pointer(x), ctypes.sizeof(x))
-
-    def release_key(self, key_name):
-        extra = ctypes.c_ulong(0)
-        ii_ = InputI()
-        ii_.ki = KeyBdInput(0, self.key_to_code(key_name), 0x0008 | 0x0002, 0, ctypes.pointer(extra))
-        x = Input(ctypes.c_ulong(1), ii_)
-        self.send_input(1, ctypes.pointer(x), ctypes.sizeof(x))
-
-    def key_to_code(self, key_name):
-        key = key_name.upper()
-        if not key.startswith('DIK_'):
-            key = 'DIK_{0}'.format(key)
-        return self.inputs[key]
-
-    def key_check(self):
-        key_data = ["\b"]
-        for char in self.key_list:
-            key_data.append(char)
-
-        keys = []
-        for key in key_data:
-            if win32api.GetAsyncKeyState(ord(key)):
-                keys.append(key)
+import ctypes
+import win32api
+
+# C Struct Redefinition
+PUL = ctypes.POINTER(ctypes.c_ulong)
+
+
+class KeyBdInput(ctypes.Structure):
+    _fields_ = [("wVk", ctypes.c_ushort),
+                ("wScan", ctypes.c_ushort),
+                ("dwFlags", ctypes.c_ulong),
+                ("time", ctypes.c_ulong),
+                ("dwExtraInfo", PUL)]
+
+
+class HardwareInput(ctypes.Structure):
+    _fields_ = [("uMsg", ctypes.c_ulong),
+                ("wParamL", ctypes.c_short),
+                ("wParamH", ctypes.c_ushort)]
+
+
+class MouseInput(ctypes.Structure):
+    _fields_ = [("dx", ctypes.c_long),
+                ("dy", ctypes.c_long),
+                ("mouseData", ctypes.c_ulong),
+                ("dwFlags", ctypes.c_ulong),
+                ("time",ctypes.c_ulong),
+                ("dwExtraInfo", PUL)]
+
+
+class InputI(ctypes.Union):
+    _fields_ = [("ki", KeyBdInput),
+                ("mi", MouseInput),
+                ("hi", HardwareInput)]
+
+
+class Input(ctypes.Structure):
+    _fields_ = [("type", ctypes.c_ulong),
+                ("ii", InputI)]
+
+
+class Keyboard(object):
+    def __init__(self):
+        self.send_input = ctypes.windll.user32.SendInput
+        self.key_list = "ABCDEFGHIJKLMNOPQRSTUVWXYZ 123456789,.'£$/\\"
+
+        # DirectInput Keyboard Scan Codes [DirectX]
+        # Supplied by: http://www.gamespp.com/directx/directInputKeyboardScanCodes.html
+        self.inputs = {'DIK_ESCAPE': 0x01, 'DIK_1': 0x02, 'DIK_2': 0x03, 'DIK_3': 0x04, 'DIK_4': 0x05, 'DIK_5': 0x06,
+                       'DIK_6': 0x07, 'DIK_7': 0x08, 'DIK_8': 0x09, 'DIK_9': 0x0A, 'DIK_0': 0x0B, 'DIK_MINUS': 0x0C,
+                       'DIK_EQUALS': 0x0D, 'DIK_BACK': 0x0E, 'DIK_TAB': 0x0F, 'DIK_Q': 0x10, 'DIK_W': 0x11,
+                       'DIK_E': 0x12, 'DIK_R': 0x13, 'DIK_T': 0x14, 'DIK_Y': 0x15, 'DIK_U': 0x16, 'DIK_I': 0x17,
+                       'DIK_O': 0x18, 'DIK_P': 0x19, 'DIK_LBRACKET': 0x1A, 'DIK_RBRACKET': 0x1B, 'DIK_RETURN': 0x1C,
+                       'DIK_LCONTROL': 0x1D, 'DIK_A': 0x1E, 'DIK_S': 0x1F, 'DIK_D': 0x20, 'DIK_F': 0x21, 'DIK_G': 0x22,
+                       'DIK_H': 0x23, 'DIK_J': 0x24, 'DIK_K': 0x25, 'DIK_L': 0x26, 'DIK_SEMICOLON': 0x27,
+                       'DIK_APOSTROPHE': 0x28, 'DIK_GRAVE': 0x29, 'DIK_LSHIFT': 0x2A, 'DIK_BACKSLASH': 0x2B,
+                       'DIK_Z': 0x2C, 'DIK_X': 0x2D, 'DIK_C': 0x2E, 'DIK_V': 0x2F, 'DIK_B': 0x30, 'DIK_N': 0x31,
+                       'DIK_M': 0x32, 'DIK_COMMA': 0x33, 'DIK_PERIOD': 0x34, 'DIK_SLASH': 0x35, 'DIK_RSHIFT': 0x36,
+                       'DIK_MULTIPLY': 0x37, 'DIK_LMENU': 0x38, 'DIK_SPACE': 0x39, 'DIK_CAPITAL': 0x3A, 'DIK_F1': 0x3B,
+                       'DIK_F2': 0x3C, 'DIK_F3': 0x3D, 'DIK_F4': 0x3E, 'DIK_F5': 0x3F, 'DIK_F6': 0x40, 'DIK_F7': 0x41,
+                       'DIK_F8': 0x42, 'DIK_F9': 0x43, 'DIK_F10': 0x44, 'DIK_NUMLOCK': 0x45, 'DIK_SCROLL': 0x46,
+                       'DIK_NUMPAD7': 0x47, 'DIK_NUMPAD8': 0x48, 'DIK_NUMPAD9': 0x49, 'DIK_SUBTRACT': 0x4A,
+                       'DIK_NUMPAD4': 0x4B, 'DIK_NUMPAD5': 0x4C, 'DIK_NUMPAD6': 0x4D, 'DIK_ADD': 0x4E,
+                       'DIK_NUMPAD1': 0x4F, 'DIK_NUMPAD2': 0x50, 'DIK_NUMPAD3': 0x51, 'DIK_NUMPAD0': 0x52,
+                       'DIK_DECIMAL': 0x53, 'DIK_F11': 0x54, 'DIK_F12': 0x58, 'DIK_F13': 0x64, 'DIK_F14': 0x65,
+                       'DIK_F15': 0x66, 'DIK_KANA': 0x70, 'DIK_CONVERT': 0x79, 'DIK_NOCONVERT': 0x7B, 'DIK_YEN': 0x7D,
+                       'DIK_NUMPADEQUALS': 0x8D, 'DIK_CIRCUMFLEX': 0x90, 'DIK_AT': 0x91, 'DIK_COLON': 0x92,
+                       'DIK_UNDERLINE': 0x93, 'DIK_KANJI': 0x94, 'DIK_STOP': 0x95, 'DIK_AX': 0x96,'DIK_UNLABELED': 0x97,
+                       'DIK_NUMPADENTER': 0x9C, 'DIK_RCONTROL': 0x9D, 'DIK_NUMPADCOMMA': 0xB3, 'DIK_DIVIDE': 0xB5,
+                       'DIK_SYSRQ': 0xB7, 'DIK_RMENU': 0xB8, 'DIK_HOME': 0xC7, 'DIK_UP': 0xC8, 'DIK_PRIOR': 0xC9,
+                       'DIK_LEFT': 0xCB, 'DIK_RIGHT': 0xCD, 'DIK_END': 0xCF, 'DIK_DOWN': 0xD0, 'DIK_NEXT': 0xD1,
+                       'DIK_INSERT': 0xD2, 'DIK_DELETE': 0xD3, 'DIK_LWIN': 0xDB, 'DIK_RWIN': 0xDC, 'DIK_APPS': 0xDD}
+
+    def press_key(self, key_name):
+        extra = ctypes.c_ulong(0)
+        ii_ = InputI()
+        ii_.ki = KeyBdInput(0, self.key_to_code(key_name), 0x0008, 0, ctypes.pointer(extra))
+        x = Input(ctypes.c_ulong(1), ii_)
+        self.send_input(1, ctypes.pointer(x), ctypes.sizeof(x))
+
+    def release_key(self, key_name):
+        extra = ctypes.c_ulong(0)
+        ii_ = InputI()
+        ii_.ki = KeyBdInput(0, self.key_to_code(key_name), 0x0008 | 0x0002, 0, ctypes.pointer(extra))
+        x = Input(ctypes.c_ulong(1), ii_)
+        self.send_input(1, ctypes.pointer(x), ctypes.sizeof(x))
+
+    def key_to_code(self, key_name):
+        key = key_name.upper()
+        if not key.startswith('DIK_'):
+            key = 'DIK_{0}'.format(key)
+        return self.inputs[key]
+
+    def key_check(self):
+        key_data = ["\b"]
+        for char in self.key_list:
+            key_data.append(char)
+
+        keys = []
+        for key in key_data:
+            if win32api.GetAsyncKeyState(ord(key)):
+                keys.append(key)
         return keys

gergcob/utilities.py → utils/utilities.py

@@ -1,42 +1,42 @@
-import sys
-import subprocess
-
-import enum
-
-
-class OperatingSystem(enum.Enum):
-    WINDOWS = 0
-    LINUX = 1
-    MACOS = 2
-
-
-def operating_system():
-    if sys.platform in ["linux", "linux2"]:
-        return OperatingSystem.LINUX
-    elif sys.platform == "darwin":
-        return OperatingSystem.MACOS
-    elif sys.platform == "win32":
-        return OperatingSystem.WINDOWS
-
-
-def is_linux():
-    return operating_system().name == "LINUX"
-
-
-def is_macos():
-    return operating_system().name == "MACOS"
-
-
-def is_unix():
-    return operating_system().name in ["LINUX", "MACOS"]
-
-
-def is_windows():
-    return operating_system().name == "WINDOWS"
-
-
-def clear_terminal():
-    if is_unix():
-        print("\033c")
-    elif is_windows():
-        subprocess.call(["cls"], shell=True)
+import sys
+import subprocess
+
+import enum
+
+
+class OperatingSystem(enum.Enum):
+    WINDOWS = 0
+    LINUX = 1
+    MACOS = 2
+
+
+def operating_system():
+    if sys.platform in ["linux", "linux2"]:
+        return OperatingSystem.LINUX
+    elif sys.platform == "darwin":
+        return OperatingSystem.MACOS
+    elif sys.platform == "win32":
+        return OperatingSystem.WINDOWS
+
+
+def is_linux():
+    return operating_system().name == "LINUX"
+
+
+def is_macos():
+    return operating_system().name == "MACOS"
+
+
+def is_unix():
+    return operating_system().name in ["LINUX", "MACOS"]
+
+
+def is_windows():
+    return operating_system().name == "WINDOWS"
+
+
+def clear_terminal():
+    if is_unix():
+        print("\033c")
+    elif is_windows():
+        subprocess.call(["cls"], shell=True)