parent
85d9912d98
commit
8ab94128c1
|
@ -1,5 +1,4 @@
|
|||
Pillow==10.3.0
|
||||
pynput==1.7.6
|
||||
pynput==1.7.7
|
||||
pystray==0.19.5
|
||||
Requests==2.32.0
|
||||
win10toast==0.9
|
|
@ -35,6 +35,11 @@ class Macro:
|
|||
self.mouse_listener = None
|
||||
self.time = None
|
||||
|
||||
self.keyboard_listener = keyboard.Listener(
|
||||
on_press=self.__on_press, on_release=self.__on_release
|
||||
)
|
||||
self.keyboard_listener.start()
|
||||
|
||||
def start_record(self, by_hotkey=False):
|
||||
if self.main_app.prevent_record:
|
||||
return
|
||||
|
@ -73,11 +78,6 @@ class Macro:
|
|||
self.mouse_listener.start()
|
||||
self.mouseBeingListened = True
|
||||
if userSettings["Recordings"]["Keyboard"]:
|
||||
self.keyboard_listener = keyboard.Listener(
|
||||
on_press=self.__on_press, on_release=self.__on_release
|
||||
)
|
||||
sleep(0.05)
|
||||
self.keyboard_listener.start()
|
||||
self.keyboardBeingListened = True
|
||||
self.main_menu.file_menu.entryconfig("Load", state=DISABLED)
|
||||
self.main_app.recordBtn.configure(
|
||||
|
@ -101,7 +101,7 @@ class Macro:
|
|||
if self.mouseBeingListened:
|
||||
self.mouse_listener.stop()
|
||||
if self.keyboardBeingListened:
|
||||
self.keyboard_listener.stop()
|
||||
self.keyboardBeingListened = False
|
||||
self.main_app.recordBtn.configure(
|
||||
image=self.main_app.recordImg, command=self.start_record
|
||||
)
|
||||
|
|
|
@ -82,7 +82,8 @@ class MainApp(Window):
|
|||
self.bind('<Control-n>', record_management.new_macro)
|
||||
|
||||
self.protocol("WM_DELETE_WINDOW", self.quit_software)
|
||||
Thread(target=self.systemTray).start()
|
||||
if platform.lower() != "darwin":
|
||||
Thread(target=self.systemTray).start()
|
||||
|
||||
self.attributes("-topmost", 0)
|
||||
|
||||
|
@ -122,7 +123,8 @@ class MainApp(Window):
|
|||
RecordFileManagement(self, self.menu).save_macro()
|
||||
elif wantToSave == None:
|
||||
return
|
||||
self.icon.stop()
|
||||
if platform.lower() != "darwin":
|
||||
self.icon.stop()
|
||||
if platform.lower() == "linux":
|
||||
self.destroy()
|
||||
self.quit()
|
||||
|
|
Loading…
Reference in New Issue