From 1f08770f6e3b465ffd9abe9269f3d6c4f572b530 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Thu, 1 Sep 2022 16:35:21 -0500 Subject: [PATCH] Made more pythonic --- src/__builtins__.py | 24 +++- src/__init__.py | 36 +----- src/__main__.py | 19 +-- src/app.py | 43 +++++++ src/core/Main_menu_popup.py | 52 ++++++++ src/core/__init__.py | 3 + .../DrawingArea.py => core/drawing_area.py} | 101 +++++++-------- .../MainWindow.py => core/main_window.py} | 118 +++++++++--------- src/screenshot | 13 -- src/signal_classes/MainMenuPopup.py | 52 -------- src/signal_classes/__init__.py | 3 - src/utils/CrossClassSignals.py | 96 -------------- src/utils/__init__.py | 5 +- src/utils/{Settings.py => settings.py} | 24 ++-- src/utils/utils.py | 92 ++++++++++++++ .../usr/share/cornea/Main_Window.glade | 26 ++-- 16 files changed, 358 insertions(+), 349 deletions(-) create mode 100644 src/app.py create mode 100644 src/core/Main_menu_popup.py create mode 100644 src/core/__init__.py rename src/{signal_classes/DrawingArea.py => core/drawing_area.py} (61%) rename src/{signal_classes/MainWindow.py => core/main_window.py} (50%) delete mode 100755 src/screenshot delete mode 100644 src/signal_classes/MainMenuPopup.py delete mode 100644 src/signal_classes/__init__.py delete mode 100644 src/utils/CrossClassSignals.py rename src/utils/{Settings.py => settings.py} (80%) create mode 100644 src/utils/utils.py diff --git a/src/__builtins__.py b/src/__builtins__.py index ada34ef..6ed885a 100644 --- a/src/__builtins__.py +++ b/src/__builtins__.py @@ -1,7 +1,5 @@ -import builtins - # Python imports -import builtins +import builtins, threading # Lib imports @@ -9,12 +7,32 @@ import builtins +# NOTE: Threads WILL NOT die with parent's destruction. +def threaded_wrapper(fn): + def wrapper(*args, **kwargs): + threading.Thread(target=fn, args=args, kwargs=kwargs, daemon=False).start() + return wrapper + +# NOTE: Threads WILL die with parent's destruction. +def daemon_threaded_wrapper(fn): + def wrapper(*args, **kwargs): + threading.Thread(target=fn, args=args, kwargs=kwargs, daemon=True).start() + return wrapper + + + + class Builtins: """Docstring for __builtins__ extender""" def __init__(self): pass + + + # NOTE: Just reminding myself we can add to builtins two different ways... # __builtins__.update({"event_system": Builtins()}) builtins.app_name = "Cornea" +builtins.threaded = threaded_wrapper +builtins.daemon_threaded = daemon_threaded_wrapper diff --git a/src/__init__.py b/src/__init__.py index f149b9e..cd8371b 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,33 +1,3 @@ -# Python imports -import inspect -from setproctitle import setproctitle - -# Lib imports - - -# Application imports -from __builtins__ import Builtins -from utils import Settings, CrossClassSignals -from signal_classes import MainWindow, DrawingArea, MainMenuPopup - - -class Main(Builtins): - def __init__(self, args): - settings = Settings() - builder = settings.returnBuilder() - - # Gets the methods from the classes and sets to handler. - # Then, builder connects to any signals it needs. - utilsClass = CrossClassSignals(settings) - classes = [MainWindow(settings, utilsClass), - DrawingArea(settings, utilsClass), - MainMenuPopup(settings, utilsClass)] - - handlers = {} - for c in classes: - methods = inspect.getmembers(c, predicate=inspect.ismethod) - handlers.update(methods) - - builder.connect_signals(handlers) - window = settings.createWindow() - window.show() +""" + Base module +""" diff --git a/src/__main__.py b/src/__main__.py index f6a67d0..82cbd5e 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -2,31 +2,34 @@ # Python imports -import argparse +import argparse, faulthandler, traceback from setproctitle import setproctitle +import tracemalloc +tracemalloc.start() + # Lib imports import gi, faulthandler, signal gi.require_version('Gtk', '3.0') from gi.repository import Gtk -from gi.repository import GLib # Application imports -from __init__ import Main +from app import Application if __name__ == "__main__": try: setproctitle('Cornea') - GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit) faulthandler.enable() # For better debug info + parser = argparse.ArgumentParser() # Add long and short arguments parser.add_argument("--file", "-f", default="firefox", help="JUST SOME FILE ARG.") - # Read arguments (If any...) - args = parser.parse_args() - main = Main(args) + args, unknownargs = parser.parse_known_args() + + Application(args, unknownargs) Gtk.main() except Exception as e: - print( repr(e) ) + traceback.print_exc() + quit() diff --git a/src/app.py b/src/app.py new file mode 100644 index 0000000..c9966b6 --- /dev/null +++ b/src/app.py @@ -0,0 +1,43 @@ +# Python imports +import inspect, signal +from setproctitle import setproctitle + +# Lib imports +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk +from gi.repository import GLib + +# Application imports +from __builtins__ import Builtins +from utils.settings import Settings +from utils.utils import Utils +from core.main_window import MainWindow +from core.drawing_area import DrawingArea +from core.Main_menu_popup import MainMenuPopup + + +class Application(Builtins): + def __init__(self, args, unknownargs): + GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit) + + settings = Settings() + builder = settings.get_builder() + + # Gets the methods from the classes and sets to handler. + # Then, builder connects to any signals it needs. + utils = Utils(settings) + classes = [ + MainWindow(settings, utils), + DrawingArea(settings, utils), + MainMenuPopup(settings, utils) + ] + + handlers = {} + for c in classes: + methods = inspect.getmembers(c, predicate=inspect.ismethod) + handlers.update(methods) + + builder.connect_signals(handlers) + window = settings.create_window() + window.show() diff --git a/src/core/Main_menu_popup.py b/src/core/Main_menu_popup.py new file mode 100644 index 0000000..d764b28 --- /dev/null +++ b/src/core/Main_menu_popup.py @@ -0,0 +1,52 @@ +# Python imports +import os, subprocess + +# lib imports + + +# Application imports + + +class MainMenuPopup: + def __init__(self, _settings, _utils): + self.settings = _settings + self.utils = _utils + + self.builder = self.settings.get_builder() + self.file_name_entry = self.builder.get_object("fileNameEntry") + self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir() + self.backup_name = None + + + def rename_file(self, widget, data=None): + new_name = self.file_name_entry.get_text().strip() + old_file_path = f"{self.SCREENSHOTS_DIR}/{self.backup_name}" + new_file_path = f"{self.SCREENSHOTS_DIR}/{new_name}" + try: + if os.path.isfile(old_file_path) and new_name: + os.rename(old_file_path, new_file_path) + self.backup_name = new_name + self.utils.referesh_directory_list() + except Exception as e: + print(repr(e)) + + def open_file(self, widget, data=None): + file = f"{self.SCREENSHOTS_DIR}/{self.backup_name}" + subprocess.Popen(['xdg-open', file], stdout=subprocess.PIPE) + + def delete_file(self, widget, data=None): + try: + file = f"{self.SCREENSHOTS_DIR}/{self.backup_name}" + if os.path.isfile(file): + os.remove(file) + self.builder.get_object("mainMenu").popdown() + self.utils.referesh_directory_list() + except Exception as e: + print(repr(e)) + + + def reset_name(self, widget, data=None): + self.file_name_entry.set_text(self.backup_name) + + def set_backup_var(self, widget): + self.backup_name = self.file_name_entry.get_text() diff --git a/src/core/__init__.py b/src/core/__init__.py new file mode 100644 index 0000000..1509597 --- /dev/null +++ b/src/core/__init__.py @@ -0,0 +1,3 @@ +""" + Core module +""" diff --git a/src/signal_classes/DrawingArea.py b/src/core/drawing_area.py similarity index 61% rename from src/signal_classes/DrawingArea.py rename to src/core/drawing_area.py index 14baf7e..13ab53b 100644 --- a/src/signal_classes/DrawingArea.py +++ b/src/core/drawing_area.py @@ -1,5 +1,5 @@ # Python imports -import threading, html +import html, time import pyscreenshot as capture @@ -14,11 +14,6 @@ from gi.repository import GLib -def threaded(fn): - def wrapper(*args, **kwargs): - threading.Thread(target=fn, args=args, kwargs=kwargs).start() - - return wrapper class MouseButtons: LEFT_BUTTON = 1 @@ -26,21 +21,21 @@ class MouseButtons: class DrawingArea: - def __init__(self, settings, utilsClass): - self.settings = settings - self.utilsClass = utilsClass - self.builder = self.settings.returnBuilder() + def __init__(self, _settings, _utils): + self.settings = _settings + self.utils = _utils - self.mainWindow = self.builder.get_object('Main_Window') - self.regionWindow = self.builder.get_object('Region_Window') - self.regionMenu = self.builder.get_object('regionMenu') - self.messageLabel = self.builder.get_object('messageLabel') - MONITOR = self.settings.getMonitorData() + self.builder = self.settings.get_builder() + self.main_window = self.builder.get_object('Main_Window') + self.region_window = self.builder.get_object('Region_Window') + self.region_menu = self.builder.get_object('regionMenu') + self.message_label = self.builder.get_object('messageLabel') + MONITOR = self.settings.get_monitor_data() - self.settings.setWindowData(self.regionWindow) - self.regionWindow.set_default_size(MONITOR[0].width, MONITOR[0].height) - self.regionWindow.set_size_request(MONITOR[0].width, MONITOR[0].height) - self.regionWindow.set_keep_above(True) + self.settings.set_window_data(self.region_window) + self.region_window.set_default_size(MONITOR[0].width, MONITOR[0].height) + self.region_window.set_size_request(MONITOR[0].width, MONITOR[0].height) + self.region_window.set_keep_above(True) self.DRAW_AREA = self.builder.get_object("selectionArea") self.DRAW_AREA.add_events(Gdk.EventMask.BUTTON_PRESS_MASK) @@ -51,8 +46,8 @@ class DrawingArea: self.DRAW_AREA.connect("motion-notify-event", self.on_mouse_move) self.DRAW_AREA.connect("draw", self.on_draw) - area = self.settings.getMonitorData()[0] - self.SCREENSHOTS_DIR = self.settings.returnScreenshotsDir() + area = self.settings.get_monitor_data()[0] + self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir() self.WIN_REC = [area.x, area.y, area.width, area.height] self.coords = [[0.0, 0.0], [0.0, 0.0]] # point1 and point2 self.BORDER_COLOR = [255, 0, 0, 0.84] @@ -64,26 +59,25 @@ class DrawingArea: self.rec = None self.cr = None - self.regionWindow.set_default_size(area.width, area.height) - self.regionWindow.set_size_request(area.width, area.height) - self.regionWindow.move(area.x, area.y) - self.regionWindow.set_resizable(False) - self.regionWindow.set_keep_above(True) - + self.region_window.set_default_size(area.width, area.height) + self.region_window.set_size_request(area.width, area.height) + self.region_window.move(area.x, area.y) + self.region_window.set_resizable(False) + self.region_window.set_keep_above(True) def on_button_press(self, w, e): - self.messageLabel.set_markup("") + self.message_label.set_markup("") if e.type == Gdk.EventType.BUTTON_PRESS and e.button == MouseButtons.LEFT_BUTTON: self.coords[0] = [e.x, e.y] - self.regionMenu.hide() + self.region_menu.hide() # This will reset draw area initially. No further use if self.cr: self.draw(self.cr, self.WIN_REC, self.BG_COLOR) self.DRAW_AREA.queue_draw() if e.type == Gdk.EventType.BUTTON_PRESS and e.button == MouseButtons.RIGHT_BUTTON: - self.regionMenu.show() + self.region_menu.show() # Update second set of coords. def on_mouse_move(self, w, e): @@ -93,28 +87,29 @@ class DrawingArea: @threaded def on_button_release(self, w, e): if e.type == Gdk.EventType.BUTTON_RELEASE and e.button == MouseButtons.LEFT_BUTTON: - GLib.idle_add(self.regionMenu.show) + GLib.idle_add(self.region_menu.show) @threaded - def grabRegion(self, widget): - GLib.idle_add(self.grabRegionIdle) + def grab_region(self, widget): + self.main_window.hide() + self.region_menu.hide() + + GLib.idle_add(self.grab_regionIdle) @threaded - def returnToMainWindow(self, widget): - GLib.idle_add(self.returnToMainWindowIdle) + def go_to_main_window(self, widget): + GLib.idle_add(self.go_to_main_window_idle) - def grabRegionIdle(self): - self.mainWindow.hide() - self.regionMenu.hide() - self.boundingBoxGrab(self.rec[0], self.rec[1], self.rec[2], self.rec[3]) - self.regionMenu.show() - self.mainWindow.show() - self.utilsClass.refereshDirectoryList() + def grab_regionIdle(self): + self.do_bounding_box_grab(self.rec[0], self.rec[1], self.rec[2], self.rec[3]) + self.utils.referesh_directory_list() + self.region_menu.show() + self.main_window.show() - def returnToMainWindowIdle(self): - self.regionWindow.hide() - self.regionMenu.hide() - self.mainWindow.show() + def go_to_main_window_idle(self): + self.region_window.hide() + self.region_menu.hide() + self.main_window.show() def on_draw(self, wid, cr): @@ -134,7 +129,7 @@ class DrawingArea: # Rectangle information for region and screen grab self.rec = [int(x1), int(y1), int(x2), int(y2)] # Draw the new selection region - self.selectionDraw(cr, [x1, y1, w, h], self.BORDER_COLOR, self.TRANS_COLOR) + self.selection_draw(cr, [x1, y1, w, h], self.BORDER_COLOR, self.TRANS_COLOR) def draw(self, cr, x1y1wh, rgba): @@ -143,7 +138,7 @@ class DrawingArea: cr.set_operator(1); cr.fill() - def selectionDraw(self, cr, x1y1wh, brdrcol, transclr): + def selection_draw(self, cr, x1y1wh, brdrcol, transclr): # Clear the region cr.set_source_rgba(transclr[0], transclr[1], transclr[2], transclr[3]) cr.rectangle(x1y1wh[0], x1y1wh[1], x1y1wh[2], x1y1wh[3]) @@ -157,8 +152,8 @@ class DrawingArea: cr.stroke() # Actual region grab - def boundingBoxGrab(self, x1, y1, x2, y2): - self.utilsClass.sleep(0.4) + def do_bounding_box_grab(self, x1, y1, x2, y2): + self.utils.sleep(0.4) try: temp = 0; if x2 < x1: @@ -172,11 +167,11 @@ class DrawingArea: y2 = temp - self.utilsClass.boundingBoxGrab(x1, y1, x2, y2) + self.utils.do_bounding_box_grab(x1, y1, x2, y2) markup = "Grabbed region successfully..." - GLib.idle_add(self.messageLabel.set_markup, markup) + GLib.idle_add(self.message_label.set_markup, markup) except Exception as e: print(e) markup = "Oops..." + \ "\n" + html.escape( str(e) ) + "" - GLib.idle_add(self.messageLabel.set_markup, markup) + GLib.idle_add(self.message_label.set_markup, markup) diff --git a/src/signal_classes/MainWindow.py b/src/core/main_window.py similarity index 50% rename from src/signal_classes/MainWindow.py rename to src/core/main_window.py index 63656e6..9082efb 100644 --- a/src/signal_classes/MainWindow.py +++ b/src/core/main_window.py @@ -1,5 +1,5 @@ # Python imports -import threading, subprocess, os +import os import pyscreenshot as capture # Lib imports @@ -9,15 +9,11 @@ gi.require_version('Gdk', '3.0') from gi.repository import Gtk as Gtk from gi.repository import Gdk as Gdk +from gi.repository import GLib # Application imports -def threaded(fn): - def wrapper(*args, **kwargs): - threading.Thread(target=fn, args=args, kwargs=kwargs).start() - - return wrapper class MouseButtons: LEFT_BUTTON = 1 @@ -25,105 +21,107 @@ class MouseButtons: class MainWindow: - def __init__(self, settings, utilsClass): - self.settings = settings - self.utilsClass = utilsClass - self.builder = self.settings.returnBuilder() + def __init__(self, _settings, _utils): + self.settings = _settings + self.utils = _utils - self.mainWindow = self.builder.get_object('Main_Window') - self.regionWindow = self.builder.get_object('Region_Window') - self.monitorStore = self.builder.get_object("monitorStore") - self.MONITORS = self.settings.getMonitorData() + self.builder = self.settings.get_builder() + self.main_window = self.builder.get_object('Main_Window') + self.region_window = self.builder.get_object('Region_Window') + self.monitors_view = self.builder.get_object("monitorsView") + self.monitor_store = self.builder.get_object("monitorStore") + self.MONITORS = self.settings.get_monitor_data() # Not adding the reference monitor i = 0 for monitor in self.MONITORS: if i > 0: mon = str(monitor.width) + "x" + str(monitor.height) + "+" + str(monitor.x) + "+" + str(monitor.y) - self.monitorStore.append([mon]) + self.monitor_store.append([mon]) i += 1 - monitorsView = self.builder.get_object("monitorsView") - monitorsView.set_cursor(1) - - self.SCREENSHOTS_DIR = self.settings.returnScreenshotsDir() - self.utilsClass.refereshDirectoryList() + self.monitors_view.set_cursor(1) + self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir() + self.utils.referesh_directory_list() def take_screenshot(self, widget): - active_radio = self.getActiveRadio() + active_radio = self.get_active_radio() active = active_radio.get_children()[0].get_text() if "Entire screen" in active: - self.getEntireScreen() - self.utilsClass.refereshDirectoryList() + self.grab_entire_screen() if "Active window" in active: - self.getActiveWindow() - self.utilsClass.refereshDirectoryList() + self.get_active_window() if "Select a region" in active: - self.regionWindow.show_all() + self.region_window.show_all() if "Select a monitor" in active: - self.snapshotMonitor() - self.utilsClass.refereshDirectoryList() + self.snapshot_monitor() - def getEntireScreen(self): - self.utilsClass.sleep() + @threaded + def grab_entire_screen(self): + self.main_window.hide() + GLib.idle_add(self.get_entire_screen) + + def get_entire_screen(self): # childprocess=False needed to not crash program im = capture.grab(childprocess=False) - im.save(self.utilsClass.generateScreenshotName()) + im.save(self.utils.generate_screenshot_name()) + self.main_window.show() + self.utils.referesh_directory_list() - def getActiveWindow(self): - self.utilsClass.sleep() + def get_active_window(self): + self.utils.sleep() screen = Gdk.get_default_root_window().get_screen() w = screen.get_active_window() pb = Gdk.pixbuf_get_from_window(w, *w.get_geometry()) - pb.savev(self.utilsClass.generateScreenshotName(), "png", (), ()) + pb.savev(self.utils.generate_screenshot_name(), "png", (), ()) + self.utils.referesh_directory_list() - def snapshotMonitor(self): - monitorsView = self.builder.get_object("monitorsView") - iterator = monitorsView.get_selection().get_selected()[1] - path = self.monitorStore.get_path(iterator) + def snapshot_monitor(self): + iterator = self.monitors_view.get_selection().get_selected()[1] + path = self.monitor_store.get_path(iterator) # Slot 0 is ref monitor. Need to add 1 to get proper slot - monitor = self.MONITORS[int(str(path)) + 1] + monitor = self.MONITORS[int(str(path)) + 1] - self.utilsClass.sleep() + self.utils.sleep() x2 = monitor.x + monitor.width y2 = monitor.y + monitor.height - self.utilsClass.boundingBoxGrab(monitor.x, monitor.y, x2, y2) + self.utils.do_bounding_box_grab(monitor.x, monitor.y, x2, y2) + self.utils.referesh_directory_list() - def toggleRadioBttn(self, widget): - monitorsView = self.builder.get_object('monitorsView') - delayAmount = self.builder.get_object('delayAmount') - snapshotBttn = self.builder.get_object('snapshotBttn') - active = self.getActiveRadio().get_children()[0].get_text() + def toggle_radio_bttn(self, widget): + delay_amount = self.builder.get_object('delayAmount') + snapshot_bttn = self.builder.get_object('snapshotBttn') + active = self.get_active_radio().get_children()[0].get_text() - self.regionWindow.hide() - monitorsView.set_sensitive(False) - delayAmount.set_sensitive(True) - snapshotBttn.set_sensitive(True) - delayAmount.set_value(0) + self.region_window.hide() + self.monitors_view.set_sensitive(False) + delay_amount.set_sensitive(True) + snapshot_bttn.set_sensitive(True) + delay_amount.set_value(0) if "Active window" in active: - delayAmount.set_value(4) + delay_amount.set_value(4) if "Select a region" in active: - delayAmount.set_sensitive(False) + delay_amount.set_sensitive(False) if "Select a monitor" in active: - monitorsView.set_sensitive(True) + self.monitors_view.set_sensitive(True) - def setImage(self, user_data): + def set_image(self, user_data): # We need the refresh state for the files list b/c GtkTreeSelection # is calling this method b/c caling this too quickly causes issues... - if self.utilsClass.returnRefreshingState() == False: + if self.utils.get_refreshing_state() == False: selected = user_data.get_selected()[1] if selected: fileNameEntry = self.builder.get_object("fileNameEntry") imageView = self.builder.get_object("imageView") file = self.builder.get_object("fileStore").get_value(selected, 0) - fullPath = self.SCREENSHOTS_DIR + "/" + file + fullPath = f"{self.SCREENSHOTS_DIR}/{file}" try: if os.path.isfile(fullPath): @@ -134,9 +132,7 @@ class MainWindow: except Exception as e: print(e) - - - def getActiveRadio(self): + def get_active_radio(self): master_radio = self.builder.get_object('entireScrnToggle') active_radio = next(( radio for radio in master_radio.get_group() @@ -144,7 +140,7 @@ class MainWindow: )) return active_radio - def showMainMenu(self, w, e): + def show_main_menu(self, w, e): if e.type == Gdk.EventType.BUTTON_PRESS and e.button == MouseButtons.RIGHT_BUTTON: self.builder.get_object("mainMenu").popup() diff --git a/src/screenshot b/src/screenshot deleted file mode 100755 index 89eb102..0000000 --- a/src/screenshot +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# set -o xtrace ## To debug scripts -# set -o errexit ## To exit on error -# set -o errunset ## To exit if a variable is referenced but not set - - -function main() { - SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" - # source "/home/abaddon/Portable_Apps/py-venvs/flask-apps-venv/venv/bin/activate" - python "${SCRIPTPATH}" -} -main $@; diff --git a/src/signal_classes/MainMenuPopup.py b/src/signal_classes/MainMenuPopup.py deleted file mode 100644 index 7a912a0..0000000 --- a/src/signal_classes/MainMenuPopup.py +++ /dev/null @@ -1,52 +0,0 @@ -# Python imports -import os, subprocess - -# lib imports - - -# Application imports - - -class MainMenuPopup: - def __init__(self, settings, utilsClass): - self.settings = settings - self.utilsClass = utilsClass - - self.builder = self.settings.returnBuilder() - self.fileNameEntry = self.builder.get_object("fileNameEntry") - self.SCREENSHOTS_DIR = self.settings.returnScreenshotsDir() - self.backupName = None - - - def renameFile(self, widget, data=None): - newName = self.fileNameEntry.get_text().strip() - oldFilePath = self.SCREENSHOTS_DIR + '/' + self.backupName - newFilePath = self.SCREENSHOTS_DIR + '/' + newName - try: - if os.path.isfile(oldFilePath) and newName: - os.rename(oldFilePath, newFilePath) - self.backupName = newName - self.utilsClass.refereshDirectoryList() - except Exception as e: - print(str(e)) - - def openFile(self, widget, data=None): - filePath = self.SCREENSHOTS_DIR + '/' + self.backupName - subprocess.Popen(['xdg-open', filePath], stdout=subprocess.PIPE) - - def deleteFile(self, widget, data=None): - try: - filePath = self.SCREENSHOTS_DIR + '/' + self.backupName - if os.path.isfile(filePath): - os.remove(filePath) - self.builder.get_object("mainMenu").popdown() - self.utilsClass.refereshDirectoryList() - except Exception as e: - print(str(e)) - - - def resetName(self, widget, data=None): - self.fileNameEntry.set_text(self.backupName) - - def setBackupVar(self, widget): - self.backupName = self.fileNameEntry.get_text() diff --git a/src/signal_classes/__init__.py b/src/signal_classes/__init__.py deleted file mode 100644 index 4c9517c..0000000 --- a/src/signal_classes/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .MainWindow import MainWindow -from .DrawingArea import DrawingArea -from .MainMenuPopup import MainMenuPopup diff --git a/src/utils/CrossClassSignals.py b/src/utils/CrossClassSignals.py deleted file mode 100644 index e6dd1a5..0000000 --- a/src/utils/CrossClassSignals.py +++ /dev/null @@ -1,96 +0,0 @@ -# Python imports -import os, threading, time, datetime - -# Lib imports -from gi.repository import GLib -import pyscreenshot as capture - - -# Application imports - - - -def threaded(fn): - def wrapper(*args, **kwargs): - threading.Thread(target=fn, args=args, kwargs=kwargs).start() - - return wrapper - -class CrossClassSignals: - def __init__(self, settings): - self.settings = settings - self.builder = self.settings.returnBuilder() - self.SCREENSHOTS_DIR = self.settings.returnScreenshotsDir() - self.fileStore = self.builder.get_object("fileStore") - self.refreshingState = False - - - def returnRefreshingState(self): - return self.refreshingState - - def setRefreshingState(self, state): - self.refreshingState = state - - - @threaded - def refereshDirectoryList(self): - self.refreshingState = True - images = self.returnDirectoryList() - images.sort() - if len(images) != len(self.fileStore): - self.fileStore.clear() - for image in images: - GLib.idle_add(self.addToStore, (image)) - - # self.fileStore.sort() - self.refreshingState = False - - - @threaded - def addToStore(self, image): - self.fileStore.append([image]) - - def returnDirectoryList(self): - files = [] - - for file in os.listdir(self.SCREENSHOTS_DIR): - if os.path.isfile(os.path.join(self.SCREENSHOTS_DIR, file)): - files.append(file) - - return files - - - def boundingBoxGrab(self, x1, y1, x2, y2): - # childprocess=False needed to not crash program - im = capture.grab(bbox=(x1, y1, x2, y2), childprocess=False) - im.save(self.generateScreenshotName()) - - def generateScreenshotName(self): - return self.SCREENSHOTS_DIR + '/scrshot_' + self.getTime() + '.png' - - def getTime(self): - now = datetime.datetime.now() - return now.strftime("%Y-%m-%d %H:%M:%S") - - def sleep(self, wait=None): - delayAmount = self.builder.get_object("delayAmount") - if not wait: - wait = delayAmount.get_value_as_int() - - time.sleep(wait) - - - def getClipboardData(self): - proc = subprocess.Popen(['xclip','-selection', 'clipboard', '-o'], stdout=subprocess.PIPE) - retcode = proc.wait() - data = proc.stdout.read() - return data.decode("utf-8").strip() - - def setClipboardData(self, data): - proc = subprocess.Popen(['xclip','-selection','clipboard'], stdin=subprocess.PIPE) - proc.stdin.write(data) - proc.stdin.close() - retcode = proc.wait() - - def close(self, widget): - gtk.main_quit() diff --git a/src/utils/__init__.py b/src/utils/__init__.py index 6025f81..a8e5edd 100644 --- a/src/utils/__init__.py +++ b/src/utils/__init__.py @@ -1,2 +1,3 @@ -from .Settings import Settings -from .CrossClassSignals import CrossClassSignals +""" + Utils module +""" diff --git a/src/utils/Settings.py b/src/utils/settings.py similarity index 80% rename from src/utils/Settings.py rename to src/utils/settings.py index 0780644..8f8f95a 100644 --- a/src/utils/Settings.py +++ b/src/utils/settings.py @@ -43,14 +43,14 @@ class Settings: self.builder.add_from_file(self._GLADE_FILE) - def createWindow(self): + def create_window(self): # Get window and connect signals window = self.builder.get_object("Main_Window") window.connect("delete-event", Gtk.main_quit) - self.setWindowData(window) + self.set_window_data(window) return window - def setWindowData(self, window): + def set_window_data(self, window): screen = window.get_screen() visual = screen.get_rgba_visual() @@ -58,13 +58,13 @@ class Settings: window.set_visual(visual) # bind css file - cssProvider = Gtk.CssProvider() - cssProvider.load_from_path(self._CSS_FILE) - screen = Gdk.Screen.get_default() - styleContext = Gtk.StyleContext() - styleContext.add_provider_for_screen(screen, cssProvider, Gtk.STYLE_PROVIDER_PRIORITY_USER) + css_provider = Gtk.CssProvider() + css_provider.load_from_path(self._CSS_FILE) + screen = Gdk.Screen.get_default() + style_context = Gtk.StyleContext() + style_context.add_provider_for_screen(screen, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER) - def getMonitorData(self): + def get_monitor_data(self): screen = self.builder.get_object("Main_Window").get_screen() wdth = screen.get_width() hght = screen.get_height() @@ -80,8 +80,8 @@ class Settings: return monitors - def returnBuilder(self): return self.builder - def returnScreenshotsDir(self): return self.SCREENSHOTS_DIR + def get_builder(self): return self.builder + def get_screenshots_dir(self): return self.SCREENSHOTS_DIR # Filter returns - def returnImagesFilter(self): return self.images + def get_images_filter(self): return self.images diff --git a/src/utils/utils.py b/src/utils/utils.py new file mode 100644 index 0000000..af13fef --- /dev/null +++ b/src/utils/utils.py @@ -0,0 +1,92 @@ +# Python imports +import os, time, datetime + +# Lib imports +from gi.repository import GLib +import pyscreenshot as capture + + +# Application imports + + + + +class Utils: + def __init__(self, _settings): + self.settings = _settings + self.builder = self.settings.get_builder() + + self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir() + self.file_store = self.builder.get_object("fileStore") + self.refreshing_state = False + + + def get_refreshing_state(self): + return self.refreshing_state + + def set_refreshing_state(self, state): + self.refreshing_state = state + + + @threaded + def referesh_directory_list(self): + self.refreshing_state = True + images = self.get_directory_list() + images.sort() + if len(images) != len(self.file_store): + self.file_store.clear() + for image in images: + GLib.idle_add(self.add_to_store, (image)) + + # self.file_store.sort() + self.refreshing_state = False + + + @threaded + def add_to_store(self, image): + self.file_store.append([image]) + + def get_directory_list(self): + files = [] + + for file in os.listdir(self.SCREENSHOTS_DIR): + if os.path.isfile(os.path.join(self.SCREENSHOTS_DIR, file)): + files.append(file) + + return files + + + def do_bounding_box_grab(self, x1, y1, x2, y2): + # childprocess=False needed to not crash program + im = capture.grab(bbox=(x1, y1, x2, y2), childprocess=False) + im.save(self.generate_screenshot_name()) + + def generate_screenshot_name(self): + return f"{self.SCREENSHOTS_DIR}/scrshot_{self.get_time()}.png" + + def get_time(self): + now = datetime.datetime.now() + return now.strftime("%Y-%m-%d %H:%M:%S") + + def sleep(self, wait=None): + delay_amount = self.builder.get_object("delayAmount") + if not wait: + wait = delay_amount.get_value_as_int() + + time.sleep(wait) + + + def get_clipboard_data(self): + proc = subprocess.Popen(['xclip','-selection', 'clipboard', '-o'], stdout=subprocess.PIPE) + retcode = proc.wait() + data = proc.stdout.read() + return data.decode("utf-8").strip() + + def setClipboardData(self, data): + proc = subprocess.Popen(['xclip','-selection','clipboard'], stdin=subprocess.PIPE) + proc.stdin.write(data) + proc.stdin.close() + retcode = proc.wait() + + def close(self, widget): + gtk.main_quit() diff --git a/user_config/usr/share/cornea/Main_Window.glade b/user_config/usr/share/cornea/Main_Window.glade index c73008b..619fb2c 100644 --- a/user_config/usr/share/cornea/Main_Window.glade +++ b/user_config/usr/share/cornea/Main_Window.glade @@ -67,7 +67,7 @@ True grabRegionImage True - + False @@ -83,7 +83,7 @@ True True True - + False @@ -169,7 +169,7 @@ 5 True True - + False @@ -189,7 +189,7 @@ True True entireScrnToggle - + False @@ -209,7 +209,7 @@ True True entireScrnToggle - + False @@ -229,7 +229,7 @@ True True entireScrnToggle - + False @@ -400,10 +400,10 @@ True fileStore False - + - + @@ -459,7 +459,7 @@ 150 False popup_bind_area - + True @@ -489,7 +489,7 @@ True revertImage True - + False @@ -512,7 +512,7 @@ True renameImage True - + False @@ -528,7 +528,7 @@ True True True - + False @@ -544,7 +544,7 @@ True True True - + False