itdominator/Cornea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
itdominator
2022-10-23 02:08:53 -05:00
parent 1f08770f6e
commit 8f2c202393
12 changed files with 216 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/drawing_area.py
View File

@@ -21,18 +21,15 @@ class MouseButtons:
class DrawingArea:
def __init__(self, _settings, _utils):
self.settings = _settings
self.utils = _utils
self.builder = self.settings.get_builder()
def __init__(self):
self.builder = 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()
MONITOR = settings.get_monitor_data()
self.settings.set_window_data(self.region_window)
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)
@@ -46,8 +43,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.get_monitor_data()[0]
self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir()
area = settings.get_monitor_data()[0]
self.SCREENSHOTS_DIR = 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]
@@ -84,27 +81,31 @@ class DrawingArea:
self.coords[1] = [e.x, e.y]
self.DRAW_AREA.queue_draw()
@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.region_menu.show)
self.region_menu.show()
@threaded
@daemon_threaded
def grab_region(self, widget):
self.main_window.hide()
self.region_menu.hide()
GLib.idle_add(self.main_window.hide)
GLib.idle_add(self.region_menu.hide)
GLib.idle_add(self.grab_regionIdle)
while self.main_window.is_visible():
...
while self.region_menu.is_visible():
...
time.sleep(0.05)
self.grab_region_idle()
@threaded
def go_to_main_window(self, widget):
GLib.idle_add(self.go_to_main_window_idle)
self.go_to_main_window_idle()
def grab_regionIdle(self):
def grab_region_idle(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()
GLib.idle_add(utils.referesh_directory_list)
GLib.idle_add(self.main_window.show)
GLib.idle_add(self.region_menu.show)
def go_to_main_window_idle(self):
self.region_window.hide()
@@ -153,7 +154,6 @@ class DrawingArea:
# Actual region grab
def do_bounding_box_grab(self, x1, y1, x2, y2):
self.utils.sleep(0.4)
try:
temp = 0;
if x2 < x1:
@@ -167,7 +167,7 @@ class DrawingArea:
y2 = temp
self.utils.do_bounding_box_grab(x1, y1, x2, y2)
utils.do_bounding_box_grab(x1, y1, x2, y2)
markup = "<span foreground='" + self.success + "'>Grabbed region successfully...</span>"
GLib.idle_add(self.message_label.set_markup, markup)
except Exception as e:

13
src/core/Main_menu_popup.py → src/core/main_menu_popup.py
View File

@@ -8,13 +8,10 @@ import os, subprocess
class MainMenuPopup:
def __init__(self, _settings, _utils):
self.settings = _settings
self.utils = _utils
self.builder = self.settings.get_builder()
def __init__(self):
self.builder = settings.get_builder()
self.file_name_entry = self.builder.get_object("fileNameEntry")
self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir()
self.SCREENSHOTS_DIR = settings.get_screenshots_dir()
self.backup_name = None
@@ -26,7 +23,7 @@ class MainMenuPopup:
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()
utils.referesh_directory_list()
except Exception as e:
print(repr(e))
@@ -40,7 +37,7 @@ class MainMenuPopup:
if os.path.isfile(file):
os.remove(file)
self.builder.get_object("mainMenu").popdown()
self.utils.referesh_directory_list()
utils.referesh_directory_list()
except Exception as e:
print(repr(e))

52
src/core/main_window.py
View File

@@ -1,5 +1,5 @@
# Python imports
import os
import os, signal, time
import pyscreenshot as capture
# Lib imports
@@ -21,16 +21,13 @@ class MouseButtons:
class MainWindow:
def __init__(self, _settings, _utils):
self.settings = _settings
self.utils = _utils
self.builder = self.settings.get_builder()
def __init__(self):
self.builder = 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()
self.MONITORS = settings.get_monitor_data()
# Not adding the reference monitor
i = 0
@@ -42,8 +39,10 @@ class MainWindow:
self.monitors_view.set_cursor(1)
self.SCREENSHOTS_DIR = self.settings.get_screenshots_dir()
self.utils.referesh_directory_list()
self.SCREENSHOTS_DIR = settings.get_screenshots_dir()
utils.referesh_directory_list()
GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, Gtk.main_quit)
def take_screenshot(self, widget):
@@ -60,39 +59,52 @@ class MainWindow:
self.snapshot_monitor()
@threaded
def grab_entire_screen(self):
self.main_window.hide()
GLib.idle_add(self.get_entire_screen)
self.get_entire_screen()
def get_entire_screen(self):
# childprocess=False needed to not crash program
im = capture.grab(childprocess=False)
im.save(self.utils.generate_screenshot_name())
im.save(utils.generate_screenshot_name())
self.main_window.show()
self.utils.referesh_directory_list()
utils.referesh_directory_list()
def get_active_window(self):
self.utils.sleep()
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.utils.generate_screenshot_name(), "png", (), ())
self.utils.referesh_directory_list()
pb.savev(utils.generate_screenshot_name(), "png", (), ())
utils.referesh_directory_list()
@daemon_threaded
def snapshot_monitor(self):
GLib.idle_add(self.main_window.hide)
while self.main_window.is_visible():
...
time.sleep(0.05)
GLib.idle_add(self.do_snapshot_monitor)
def do_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]
self.utils.sleep()
utils.sleep()
x2 = monitor.x + monitor.width
y2 = monitor.y + monitor.height
self.utils.do_bounding_box_grab(monitor.x, monitor.y, x2, y2)
self.utils.referesh_directory_list()
utils.do_bounding_box_grab(monitor.x, monitor.y, x2, y2)
utils.referesh_directory_list()
self.main_window.show()
def toggle_radio_bttn(self, widget):
delay_amount = self.builder.get_object('delayAmount')
@@ -115,7 +127,7 @@ class MainWindow:
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.utils.get_refreshing_state() == False:
if utils.get_refreshing_state() == False:
selected = user_data.get_selected()[1]
if selected:
fileNameEntry = self.builder.get_object("fileNameEntry")