From 53a9515901bc1f930563e4017f832af8a9e4be9c Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sat, 22 Apr 2023 11:38:13 -0500
Subject: [PATCH] Post New Code Cleanup
---
src/{new-src => }/__builtins__.py | 0
src/{new-src => }/__init__.py | 0
src/{new-src => }/__main__.py | 0
src/{new-src => }/app.py | 0
src/{new-src => }/core/__init__.py | 0
src/{new-src => }/core/containers/__init__.py | 0
.../core/containers/core_widget.py | 0
src/{new-src => }/core/containers/left_box.py | 0
.../core/containers/right_box.py | 0
src/{new-src => }/core/controller.py | 0
src/{new-src => }/core/controller_data.py | 0
src/{new-src => }/core/mixins/__init__.py | 0
.../core/mixins/signals/__init__.py | 0
.../core/mixins/signals/ipc_signals_mixin.py | 0
.../mixins/signals/keyboard_signals_mixin.py | 0
.../core/mixins/signals_mixins.py | 0
.../core/screenshot_controller.py | 0
src/{new-src => }/core/widgets/__init__.py | 0
.../core/widgets/delay_amount.py | 0
src/{new-src => }/core/widgets/images_list.py | 0
.../core/widgets/menu_popover.py | 10 +-
.../core/widgets/monitor_list.py | 0
.../core/widgets/preview_image.py | 6 +
.../core/widgets/radio_buttons.py | 0
.../core/widgets/region/__init__.py | 0
.../core/widgets/region/body_grid.py | 0
.../core/widgets/region/window.py | 0
.../core/widgets/snapshot_button.py | 0
src/{new-src => }/core/window.py | 0
src/{new-src => }/mixins/__init__.py | 0
src/{new-src => }/mixins/tree_nixin.py | 0
src/old-src/__builtins__.py | 39 --
src/old-src/__init__.py | 3 -
src/old-src/__main__.py | 36 --
src/old-src/app.py | 35 --
src/old-src/core/__init__.py | 3 -
src/old-src/core/drawing_area.py | 177 ------
src/old-src/core/main_menu_popup.py | 49 --
src/old-src/core/main_window.py | 160 -----
src/old-src/mixins/tree_nixin.py | 38 --
src/old-src/utils/__init__.py | 3 -
src/old-src/utils/endpoint_registry.py | 22 -
src/old-src/utils/event_system.py | 30 -
src/old-src/utils/logger.py | 56 --
src/old-src/utils/settings.py | 91 ---
src/old-src/utils/utils.py | 89 ---
src/{new-src => }/plugins/__init__.py | 0
src/{new-src => }/plugins/manifest.py | 0
src/{new-src => }/plugins/plugin_base.py | 0
.../plugins/plugins_controller.py | 0
src/{new-src => }/utils/__init__.py | 0
src/{new-src => }/utils/endpoint_registry.py | 0
src/{new-src => }/utils/event_system.py | 0
src/{new-src => }/utils/ipc_server.py | 0
src/{new-src => }/utils/keybindings.py | 0
src/{new-src => }/utils/logger.py | 0
src/{new-src => }/utils/settings/__init__.py | 0
src/{new-src => }/utils/settings/settings.py | 0
.../utils/settings/start_check_mixin.py | 0
src/{new-src => }/utils/singleton.py | 0
.../usr/share/cornea/Main_Window.glade | 558 ------------------
.../usr/share/cornea/icons/archive.png | Bin 1670 -> 0 bytes
user_config/usr/share/cornea/icons/audio.png | Bin 1544 -> 0 bytes
user_config/usr/share/cornea/icons/bin.png | Bin 858 -> 0 bytes
user_config/usr/share/cornea/icons/dir.png | Bin 850 -> 0 bytes
user_config/usr/share/cornea/icons/doc.png | Bin 702 -> 0 bytes
user_config/usr/share/cornea/icons/image.png | Bin 6591 -> 0 bytes
user_config/usr/share/cornea/icons/pdf.png | Bin 925 -> 0 bytes
.../usr/share/cornea/icons/presentation.png | Bin 882 -> 0 bytes
.../usr/share/cornea/icons/spreadsheet.png | Bin 707 -> 0 bytes
user_config/usr/share/cornea/icons/text.png | Bin 798 -> 0 bytes
user_config/usr/share/cornea/icons/trash.png | Bin 989 -> 0 bytes
user_config/usr/share/cornea/icons/video.png | Bin 1313 -> 0 bytes
user_config/usr/share/cornea/icons/web.png | Bin 1845 -> 0 bytes
74 files changed, 11 insertions(+), 1394 deletions(-)
rename src/{new-src => }/__builtins__.py (100%)
rename src/{new-src => }/__init__.py (100%)
rename src/{new-src => }/__main__.py (100%)
rename src/{new-src => }/app.py (100%)
rename src/{new-src => }/core/__init__.py (100%)
rename src/{new-src => }/core/containers/__init__.py (100%)
rename src/{new-src => }/core/containers/core_widget.py (100%)
rename src/{new-src => }/core/containers/left_box.py (100%)
rename src/{new-src => }/core/containers/right_box.py (100%)
rename src/{new-src => }/core/controller.py (100%)
rename src/{new-src => }/core/controller_data.py (100%)
rename src/{new-src => }/core/mixins/__init__.py (100%)
rename src/{new-src => }/core/mixins/signals/__init__.py (100%)
rename src/{new-src => }/core/mixins/signals/ipc_signals_mixin.py (100%)
rename src/{new-src => }/core/mixins/signals/keyboard_signals_mixin.py (100%)
rename src/{new-src => }/core/mixins/signals_mixins.py (100%)
rename src/{new-src => }/core/screenshot_controller.py (100%)
rename src/{new-src => }/core/widgets/__init__.py (100%)
rename src/{new-src => }/core/widgets/delay_amount.py (100%)
rename src/{new-src => }/core/widgets/images_list.py (100%)
rename src/{new-src => }/core/widgets/menu_popover.py (96%)
rename src/{new-src => }/core/widgets/monitor_list.py (100%)
rename src/{new-src => }/core/widgets/preview_image.py (81%)
rename src/{new-src => }/core/widgets/radio_buttons.py (100%)
rename src/{new-src => }/core/widgets/region/__init__.py (100%)
rename src/{new-src => }/core/widgets/region/body_grid.py (100%)
rename src/{new-src => }/core/widgets/region/window.py (100%)
rename src/{new-src => }/core/widgets/snapshot_button.py (100%)
rename src/{new-src => }/core/window.py (100%)
rename src/{new-src => }/mixins/__init__.py (100%)
rename src/{new-src => }/mixins/tree_nixin.py (100%)
delete mode 100644 src/old-src/__builtins__.py
delete mode 100644 src/old-src/__init__.py
delete mode 100755 src/old-src/__main__.py
delete mode 100644 src/old-src/app.py
delete mode 100644 src/old-src/core/__init__.py
delete mode 100644 src/old-src/core/drawing_area.py
delete mode 100644 src/old-src/core/main_menu_popup.py
delete mode 100644 src/old-src/core/main_window.py
delete mode 100644 src/old-src/mixins/tree_nixin.py
delete mode 100644 src/old-src/utils/__init__.py
delete mode 100644 src/old-src/utils/endpoint_registry.py
delete mode 100644 src/old-src/utils/event_system.py
delete mode 100644 src/old-src/utils/logger.py
delete mode 100644 src/old-src/utils/settings.py
delete mode 100644 src/old-src/utils/utils.py
rename src/{new-src => }/plugins/__init__.py (100%)
rename src/{new-src => }/plugins/manifest.py (100%)
rename src/{new-src => }/plugins/plugin_base.py (100%)
rename src/{new-src => }/plugins/plugins_controller.py (100%)
rename src/{new-src => }/utils/__init__.py (100%)
rename src/{new-src => }/utils/endpoint_registry.py (100%)
rename src/{new-src => }/utils/event_system.py (100%)
rename src/{new-src => }/utils/ipc_server.py (100%)
rename src/{new-src => }/utils/keybindings.py (100%)
rename src/{new-src => }/utils/logger.py (100%)
rename src/{new-src => }/utils/settings/__init__.py (100%)
rename src/{new-src => }/utils/settings/settings.py (100%)
rename src/{new-src => }/utils/settings/start_check_mixin.py (100%)
rename src/{new-src => }/utils/singleton.py (100%)
delete mode 100644 user_config/usr/share/cornea/Main_Window.glade
delete mode 100644 user_config/usr/share/cornea/icons/archive.png
delete mode 100644 user_config/usr/share/cornea/icons/audio.png
delete mode 100644 user_config/usr/share/cornea/icons/bin.png
delete mode 100644 user_config/usr/share/cornea/icons/dir.png
delete mode 100644 user_config/usr/share/cornea/icons/doc.png
delete mode 100644 user_config/usr/share/cornea/icons/image.png
delete mode 100644 user_config/usr/share/cornea/icons/pdf.png
delete mode 100644 user_config/usr/share/cornea/icons/presentation.png
delete mode 100644 user_config/usr/share/cornea/icons/spreadsheet.png
delete mode 100644 user_config/usr/share/cornea/icons/text.png
delete mode 100644 user_config/usr/share/cornea/icons/trash.png
delete mode 100644 user_config/usr/share/cornea/icons/video.png
delete mode 100644 user_config/usr/share/cornea/icons/web.png
diff --git a/src/new-src/__builtins__.py b/src/__builtins__.py
similarity index 100%
rename from src/new-src/__builtins__.py
rename to src/__builtins__.py
diff --git a/src/new-src/__init__.py b/src/__init__.py
similarity index 100%
rename from src/new-src/__init__.py
rename to src/__init__.py
diff --git a/src/new-src/__main__.py b/src/__main__.py
similarity index 100%
rename from src/new-src/__main__.py
rename to src/__main__.py
diff --git a/src/new-src/app.py b/src/app.py
similarity index 100%
rename from src/new-src/app.py
rename to src/app.py
diff --git a/src/new-src/core/__init__.py b/src/core/__init__.py
similarity index 100%
rename from src/new-src/core/__init__.py
rename to src/core/__init__.py
diff --git a/src/new-src/core/containers/__init__.py b/src/core/containers/__init__.py
similarity index 100%
rename from src/new-src/core/containers/__init__.py
rename to src/core/containers/__init__.py
diff --git a/src/new-src/core/containers/core_widget.py b/src/core/containers/core_widget.py
similarity index 100%
rename from src/new-src/core/containers/core_widget.py
rename to src/core/containers/core_widget.py
diff --git a/src/new-src/core/containers/left_box.py b/src/core/containers/left_box.py
similarity index 100%
rename from src/new-src/core/containers/left_box.py
rename to src/core/containers/left_box.py
diff --git a/src/new-src/core/containers/right_box.py b/src/core/containers/right_box.py
similarity index 100%
rename from src/new-src/core/containers/right_box.py
rename to src/core/containers/right_box.py
diff --git a/src/new-src/core/controller.py b/src/core/controller.py
similarity index 100%
rename from src/new-src/core/controller.py
rename to src/core/controller.py
diff --git a/src/new-src/core/controller_data.py b/src/core/controller_data.py
similarity index 100%
rename from src/new-src/core/controller_data.py
rename to src/core/controller_data.py
diff --git a/src/new-src/core/mixins/__init__.py b/src/core/mixins/__init__.py
similarity index 100%
rename from src/new-src/core/mixins/__init__.py
rename to src/core/mixins/__init__.py
diff --git a/src/new-src/core/mixins/signals/__init__.py b/src/core/mixins/signals/__init__.py
similarity index 100%
rename from src/new-src/core/mixins/signals/__init__.py
rename to src/core/mixins/signals/__init__.py
diff --git a/src/new-src/core/mixins/signals/ipc_signals_mixin.py b/src/core/mixins/signals/ipc_signals_mixin.py
similarity index 100%
rename from src/new-src/core/mixins/signals/ipc_signals_mixin.py
rename to src/core/mixins/signals/ipc_signals_mixin.py
diff --git a/src/new-src/core/mixins/signals/keyboard_signals_mixin.py b/src/core/mixins/signals/keyboard_signals_mixin.py
similarity index 100%
rename from src/new-src/core/mixins/signals/keyboard_signals_mixin.py
rename to src/core/mixins/signals/keyboard_signals_mixin.py
diff --git a/src/new-src/core/mixins/signals_mixins.py b/src/core/mixins/signals_mixins.py
similarity index 100%
rename from src/new-src/core/mixins/signals_mixins.py
rename to src/core/mixins/signals_mixins.py
diff --git a/src/new-src/core/screenshot_controller.py b/src/core/screenshot_controller.py
similarity index 100%
rename from src/new-src/core/screenshot_controller.py
rename to src/core/screenshot_controller.py
diff --git a/src/new-src/core/widgets/__init__.py b/src/core/widgets/__init__.py
similarity index 100%
rename from src/new-src/core/widgets/__init__.py
rename to src/core/widgets/__init__.py
diff --git a/src/new-src/core/widgets/delay_amount.py b/src/core/widgets/delay_amount.py
similarity index 100%
rename from src/new-src/core/widgets/delay_amount.py
rename to src/core/widgets/delay_amount.py
diff --git a/src/new-src/core/widgets/images_list.py b/src/core/widgets/images_list.py
similarity index 100%
rename from src/new-src/core/widgets/images_list.py
rename to src/core/widgets/images_list.py
diff --git a/src/new-src/core/widgets/menu_popover.py b/src/core/widgets/menu_popover.py
similarity index 96%
rename from src/new-src/core/widgets/menu_popover.py
rename to src/core/widgets/menu_popover.py
index b8ebe45..892b68e 100644
--- a/src/new-src/core/widgets/menu_popover.py
+++ b/src/core/widgets/menu_popover.py
@@ -27,7 +27,6 @@ class MenuPopover(Gtk.Popover):
self.set_size_request(360, -1)
def _setup_signals(self):
- # self.connect("grab-focus", self.set_revert_data)
...
def _subscribe_to_events(self):
@@ -45,10 +44,10 @@ class MenuPopover(Gtk.Popover):
open_button = Gtk.Button(label = "Open")
delete_button = Gtk.Button(label = "Delete")
- revert_button.set_image( Gtk.Image.new_from_icon_name("gtk-undo", 16) )
- rename_button.set_image( Gtk.Image.new_from_icon_name("gtk-edit", 16) )
- open_button.set_image( Gtk.Image.new_from_icon_name("gtk-open", 16) )
- delete_button.set_image( Gtk.Image.new_from_icon_name("gtk-delete", 16) )
+ revert_button.set_image( Gtk.Image.new_from_icon_name("gtk-undo", 4) )
+ rename_button.set_image( Gtk.Image.new_from_icon_name("gtk-edit", 4) )
+ open_button.set_image( Gtk.Image.new_from_icon_name("gtk-open", 4) )
+ delete_button.set_image( Gtk.Image.new_from_icon_name("gtk-delete", 4) )
revert_button.set_always_show_image(True)
rename_button.set_always_show_image(True)
@@ -113,5 +112,6 @@ class MenuPopover(Gtk.Popover):
if os.path.isfile(file):
os.remove(file)
self.popdown()
+ event_system.emit("unset_image_preview")
except Exception as e:
logger.info(e)
diff --git a/src/new-src/core/widgets/monitor_list.py b/src/core/widgets/monitor_list.py
similarity index 100%
rename from src/new-src/core/widgets/monitor_list.py
rename to src/core/widgets/monitor_list.py
diff --git a/src/new-src/core/widgets/preview_image.py b/src/core/widgets/preview_image.py
similarity index 81%
rename from src/new-src/core/widgets/preview_image.py
rename to src/core/widgets/preview_image.py
index caef7b5..922d14f 100644
--- a/src/new-src/core/widgets/preview_image.py
+++ b/src/core/widgets/preview_image.py
@@ -33,9 +33,11 @@ class PreviewPane(Gtk.AspectFrame):
def _subscribe_to_events(self):
event_system.subscribe("set_image_to_view", self.set_image_to_view)
+ event_system.subscribe("unset_image_preview", self.unset_image_preview)
def _load_widgets(self):
self._preview_image = Gtk.Image()
+ self.unset_image_preview()
self.add(self._preview_image)
def set_image_to_view(self, image_file):
@@ -48,3 +50,7 @@ class PreviewPane(Gtk.AspectFrame):
pixbuf = Gtk.Image.new_from_file(path).get_pixbuf()
scaledPixBuf = pixbuf.scale_simple(480, 320, 2) # 2 = BILINEAR and is best by default
self._preview_image.set_from_pixbuf(scaledPixBuf)
+
+ def unset_image_preview(self):
+ pixbuf = Gtk.Image.new_from_icon_name("gtk-missing-image", 4).get_pixbuf()
+ self._preview_image.set_from_pixbuf(pixbuf)
diff --git a/src/new-src/core/widgets/radio_buttons.py b/src/core/widgets/radio_buttons.py
similarity index 100%
rename from src/new-src/core/widgets/radio_buttons.py
rename to src/core/widgets/radio_buttons.py
diff --git a/src/new-src/core/widgets/region/__init__.py b/src/core/widgets/region/__init__.py
similarity index 100%
rename from src/new-src/core/widgets/region/__init__.py
rename to src/core/widgets/region/__init__.py
diff --git a/src/new-src/core/widgets/region/body_grid.py b/src/core/widgets/region/body_grid.py
similarity index 100%
rename from src/new-src/core/widgets/region/body_grid.py
rename to src/core/widgets/region/body_grid.py
diff --git a/src/new-src/core/widgets/region/window.py b/src/core/widgets/region/window.py
similarity index 100%
rename from src/new-src/core/widgets/region/window.py
rename to src/core/widgets/region/window.py
diff --git a/src/new-src/core/widgets/snapshot_button.py b/src/core/widgets/snapshot_button.py
similarity index 100%
rename from src/new-src/core/widgets/snapshot_button.py
rename to src/core/widgets/snapshot_button.py
diff --git a/src/new-src/core/window.py b/src/core/window.py
similarity index 100%
rename from src/new-src/core/window.py
rename to src/core/window.py
diff --git a/src/new-src/mixins/__init__.py b/src/mixins/__init__.py
similarity index 100%
rename from src/new-src/mixins/__init__.py
rename to src/mixins/__init__.py
diff --git a/src/new-src/mixins/tree_nixin.py b/src/mixins/tree_nixin.py
similarity index 100%
rename from src/new-src/mixins/tree_nixin.py
rename to src/mixins/tree_nixin.py
diff --git a/src/old-src/__builtins__.py b/src/old-src/__builtins__.py
deleted file mode 100644
index a931b35..0000000
--- a/src/old-src/__builtins__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Python imports
-import builtins, threading
-
-# Lib imports
-
-# Application imports
-from utils.event_system import EventSystem
-from utils.endpoint_registry import EndpointRegistry
-from utils.settings import Settings
-
-
-
-# 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
-
-
-
-# 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
-
-builtins.settings = Settings()
-builtins.logger = settings.get_logger()
-builtins.event_system = EventSystem()
-builtins.endpoint_registry = EndpointRegistry()
-
-from utils.utils import Utils
-builtins.utils = Utils()
diff --git a/src/old-src/__init__.py b/src/old-src/__init__.py
deleted file mode 100644
index cd8371b..0000000
--- a/src/old-src/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
- Base module
-"""
diff --git a/src/old-src/__main__.py b/src/old-src/__main__.py
deleted file mode 100755
index 3283b7c..0000000
--- a/src/old-src/__main__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/python3
-
-
-# Python imports
-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
-
-# Application imports
-from __builtins__ import *
-from app import Application
-
-
-if __name__ == "__main__":
- try:
- setproctitle('Cornea')
- 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, unknownargs = parser.parse_known_args()
-
- Application(args, unknownargs)
- Gtk.main()
- except Exception as e:
- traceback.print_exc()
- quit()
diff --git a/src/old-src/app.py b/src/old-src/app.py
deleted file mode 100644
index 18b5ca3..0000000
--- a/src/old-src/app.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Python imports
-import inspect
-from setproctitle import setproctitle
-
-# Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
-# Application imports
-from core.main_window import MainWindow
-from core.drawing_area import DrawingArea
-from core.main_menu_popup import MainMenuPopup
-
-
-class Application:
- def __init__(self, args, unknownargs):
- builder = settings.get_builder()
-
- # Gets the methods from the classes and sets to handler.
- # Then, builder connects to any signals it needs.
- classes = [
- MainWindow(),
- DrawingArea(),
- MainMenuPopup()
- ]
-
- 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/old-src/core/__init__.py b/src/old-src/core/__init__.py
deleted file mode 100644
index 1509597..0000000
--- a/src/old-src/core/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
- Core module
-"""
diff --git a/src/old-src/core/drawing_area.py b/src/old-src/core/drawing_area.py
deleted file mode 100644
index ac4647b..0000000
--- a/src/old-src/core/drawing_area.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# Python imports
-import html, time
-
-import pyscreenshot as capture
-
-# Lib imports
-import gi, cairo
-gi.require_version('Gdk', '3.0')
-
-from gi.repository import Gdk
-from gi.repository import GLib
-
-# Application imports
-
-
-
-
-class MouseButtons:
- LEFT_BUTTON = 1
- RIGHT_BUTTON = 3
-
-
-class DrawingArea:
- 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 = settings.get_monitor_data()
-
- 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)
- self.DRAW_AREA.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK)
- self.DRAW_AREA.add_events(Gdk.EventMask.BUTTON1_MOTION_MASK)
- self.DRAW_AREA.connect("button-press-event", self.on_button_press)
- self.DRAW_AREA.connect("button-release-event", self.on_button_release)
- self.DRAW_AREA.connect("motion-notify-event", self.on_mouse_move)
- self.DRAW_AREA.connect("draw", self.on_draw)
-
- 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]
- self.TRANS_COLOR = [0, 0, 0, 0.0]
- self.BG_COLOR = [0, 0, 0, 0.4]
- self.success = "#88cc27"
- self.warning = "#ffa800"
- self.error = "#ff0000"
- self.rec = None
- self.cr = None
-
- 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.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.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.region_menu.show()
-
- # Update second set of coords.
- def on_mouse_move(self, w, e):
- self.coords[1] = [e.x, e.y]
- self.DRAW_AREA.queue_draw()
-
- def on_button_release(self, w, e):
- if e.type == Gdk.EventType.BUTTON_RELEASE and e.button == MouseButtons.LEFT_BUTTON:
- self.region_menu.show()
-
- @daemon_threaded
- def grab_region(self, widget):
- GLib.idle_add(self.main_window.hide)
- GLib.idle_add(self.region_menu.hide)
-
- while self.main_window.is_visible():
- ...
- while self.region_menu.is_visible():
- ...
-
- time.sleep(0.05)
- self.grab_region_idle()
-
- def go_to_main_window(self, widget):
- self.go_to_main_window_idle()
-
- def grab_region_idle(self):
- self.do_bounding_box_grab(self.rec[0], self.rec[1], self.rec[2], self.rec[3])
- 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()
- self.region_menu.hide()
- self.main_window.show()
-
-
- def on_draw(self, wid, cr):
- if not self.cr: self.cr = cr
- # Reset the screen with transparent view
- self.draw(cr, self.WIN_REC, self.BG_COLOR)
-
- point1 = self.coords[0]
- point2 = self.coords[1]
- x1 = point1[0]
- y1 = point1[1]
- x2 = point2[0]
- y2 = point2[1]
- w = x2 - x1
- h = y2 - y1
-
- # Rectangle information for region and screen grab
- self.rec = [int(x1), int(y1), int(x2), int(y2)]
- # Draw the new selection region
- self.selection_draw(cr, [x1, y1, w, h], self.BORDER_COLOR, self.TRANS_COLOR)
-
-
- def draw(self, cr, x1y1wh, rgba):
- cr.set_source_rgba(rgba[0], rgba[1], rgba[2], rgba[3])
- cr.rectangle(x1y1wh[0], x1y1wh[1], x1y1wh[2], x1y1wh[3])
- cr.set_operator(1);
- cr.fill()
-
- 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])
- cr.set_operator(0);
- cr.fill()
-
- # Draw a border
- cr.set_source_rgba(brdrcol[0], brdrcol[1], brdrcol[2], brdrcol[3])
- cr.rectangle(x1y1wh[0] - 2, x1y1wh[1] - 2, x1y1wh[2] + 4, x1y1wh[3] + 4)
- cr.set_operator(1);
- cr.stroke()
-
- # Actual region grab
- def do_bounding_box_grab(self, x1, y1, x2, y2):
- try:
- temp = 0;
- if x2 < x1:
- temp = x1
- x1 = x2
- x2 = temp
-
- if y2 < y1:
- temp = y1
- y1 = y2
- y2 = temp
-
-
- utils.do_bounding_box_grab(x1, y1, x2, y2)
- markup = "Grabbed region successfully..."
- 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.message_label.set_markup, markup)
diff --git a/src/old-src/core/main_menu_popup.py b/src/old-src/core/main_menu_popup.py
deleted file mode 100644
index f5a49ff..0000000
--- a/src/old-src/core/main_menu_popup.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Python imports
-import os, subprocess
-
-# lib imports
-
-
-# Application imports
-
-
-class MainMenuPopup:
- def __init__(self):
- self.builder = settings.get_builder()
- self.file_name_entry = self.builder.get_object("fileNameEntry")
- self.SCREENSHOTS_DIR = 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
- 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()
- 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/old-src/core/main_window.py b/src/old-src/core/main_window.py
deleted file mode 100644
index ace5f38..0000000
--- a/src/old-src/core/main_window.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# Python imports
-import os, signal, time
-import pyscreenshot as capture
-
-# Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-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
-
-
-
-class MouseButtons:
- LEFT_BUTTON = 1
- RIGHT_BUTTON = 3
-
-
-class MainWindow:
- 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 = 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.monitor_store.append([mon])
- i += 1
-
- self.monitors_view.set_cursor(1)
-
- 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):
- active_radio = self.get_active_radio()
- active = active_radio.get_children()[0].get_text()
-
- if "Entire screen" in active:
- self.grab_entire_screen()
- if "Active window" in active:
- self.get_active_window()
- if "Select a region" in active:
- self.region_window.show_all()
- if "Select a monitor" in active:
- self.snapshot_monitor()
-
-
- def grab_entire_screen(self):
- self.main_window.hide()
- self.get_entire_screen()
-
- def get_entire_screen(self):
- # childprocess=False needed to not crash program
- im = capture.grab(childprocess=False)
- im.save(utils.generate_screenshot_name())
- self.main_window.show()
- utils.referesh_directory_list()
-
- def get_active_window(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(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]
-
- utils.sleep()
-
- x2 = monitor.x + monitor.width
- y2 = monitor.y + monitor.height
- 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')
- snapshot_bttn = self.builder.get_object('snapshotBttn')
- active = self.get_active_radio().get_children()[0].get_text()
-
- 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:
- delay_amount.set_value(4)
- if "Select a region" in active:
- delay_amount.set_sensitive(False)
- if "Select a monitor" in active:
- self.monitors_view.set_sensitive(True)
-
- 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 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 = f"{self.SCREENSHOTS_DIR}/{file}"
-
- try:
- if os.path.isfile(fullPath):
- fileNameEntry.set_text(file)
- pixbuf = Gtk.Image.new_from_file(fullPath).get_pixbuf()
- scaledPixBuf = pixbuf.scale_simple(480, 320, 2) # 2 = BILINEAR and is best by default
- imageView.set_from_pixbuf(scaledPixBuf)
- except Exception as e:
- print(e)
-
- def get_active_radio(self):
- master_radio = self.builder.get_object('entireScrnToggle')
- active_radio = next((
- radio for radio in master_radio.get_group()
- if radio.get_active()
- ))
- return active_radio
-
- 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()
-
- def close(self, widget):
- Gtk.main_quit()
diff --git a/src/old-src/mixins/tree_nixin.py b/src/old-src/mixins/tree_nixin.py
deleted file mode 100644
index da93a84..0000000
--- a/src/old-src/mixins/tree_nixin.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Python imports
-
-# Lib imports
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
-
-# Application imports
-
-
-
-class TreeMixin:
- def _create_treeview_widget(self, title = "Not Set"):
- # scroll = Gtk.ScrolledWindow()
- grid = Gtk.TreeView()
- store = Gtk.ListStore(str)
- column = Gtk.TreeViewColumn(title)
- name = Gtk.CellRendererText()
- selec = grid.get_selection()
-
- grid.set_model(store)
- selec.set_mode(2)
- # scroll.set_size_request(145, 96)
-
- column.pack_start(name, True)
- column.add_attribute(name, "text", 0)
- column.set_expand(False)
-
- grid.append_column(column)
- grid.set_search_column(0)
- grid.set_headers_visible(True)
- grid.set_enable_tree_lines(False)
-
- grid.show_all()
- # scroll.add(grid)
- grid.columns_autosize()
- # return scroll, store
- return grid, store
diff --git a/src/old-src/utils/__init__.py b/src/old-src/utils/__init__.py
deleted file mode 100644
index a8e5edd..0000000
--- a/src/old-src/utils/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
- Utils module
-"""
diff --git a/src/old-src/utils/endpoint_registry.py b/src/old-src/utils/endpoint_registry.py
deleted file mode 100644
index 15ffa9e..0000000
--- a/src/old-src/utils/endpoint_registry.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Python imports
-
-# Lib imports
-
-# Application imports
-
-
-
-
-class EndpointRegistry():
- def __init__(self):
- self._endpoints = {}
-
- def register(self, rule, **options):
- def decorator(f):
- self._endpoints[rule] = f
- return f
-
- return decorator
-
- def get_endpoints(self):
- return self._endpoints
diff --git a/src/old-src/utils/event_system.py b/src/old-src/utils/event_system.py
deleted file mode 100644
index 25c96fc..0000000
--- a/src/old-src/utils/event_system.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Python imports
-from collections import defaultdict
-
-# Lib imports
-
-# Application imports
-
-
-
-
-class EventSystem:
- """ Create event system. """
-
- def __init__(self):
- self.subscribers = defaultdict(list)
-
-
- def subscribe(self, event_type, fn):
- self.subscribers[event_type].append(fn)
-
- def emit(self, event_type, data = None):
- if event_type in self.subscribers:
- for fn in self.subscribers[event_type]:
- if data:
- if hasattr(data, '__iter__') and not type(data) is str:
- fn(*data)
- else:
- fn(data)
- else:
- fn()
diff --git a/src/old-src/utils/logger.py b/src/old-src/utils/logger.py
deleted file mode 100644
index c33444f..0000000
--- a/src/old-src/utils/logger.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Python imports
-import os, logging
-
-# Application imports
-
-
-class Logger:
- """
- Create a new logging object and return it.
- :note:
- NOSET # Don't know the actual log level of this... (defaulting or literally none?)
- Log Levels (From least to most)
- Type Value
- CRITICAL 50
- ERROR 40
- WARNING 30
- INFO 20
- DEBUG 10
- :param loggerName: Sets the name of the logger object. (Used in log lines)
- :param createFile: Whether we create a log file or just pump to terminal
-
- :return: the logging object we created
- """
-
- def __init__(self, config_path: str, _ch_log_lvl = logging.CRITICAL, _fh_log_lvl = logging.INFO):
- self._CONFIG_PATH = config_path
- self.global_lvl = logging.DEBUG # Keep this at highest so that handlers can filter to their desired levels
- self.ch_log_lvl = _ch_log_lvl # Prety much the only one we ever change
- self.fh_log_lvl = _fh_log_lvl
-
- def get_logger(self, loggerName: str = "NO_LOGGER_NAME_PASSED", createFile: bool = True) -> logging.Logger:
- log = logging.getLogger(loggerName)
- log.setLevel(self.global_lvl)
-
- # Set our log output styles
- fFormatter = logging.Formatter('[%(asctime)s] %(pathname)s:%(lineno)d %(levelname)s - %(message)s', '%m-%d %H:%M:%S')
- cFormatter = logging.Formatter('%(pathname)s:%(lineno)d] %(levelname)s - %(message)s')
-
- ch = logging.StreamHandler()
- ch.setLevel(level=self.ch_log_lvl)
- ch.setFormatter(cFormatter)
- log.addHandler(ch)
-
- if createFile:
- folder = self._CONFIG_PATH
- file = f"{folder}/application.log"
-
- if not os.path.exists(folder):
- os.mkdir(folder)
-
- fh = logging.FileHandler(file)
- fh.setLevel(level=self.fh_log_lvl)
- fh.setFormatter(fFormatter)
- log.addHandler(fh)
-
- return log
diff --git a/src/old-src/utils/settings.py b/src/old-src/utils/settings.py
deleted file mode 100644
index 94d1574..0000000
--- a/src/old-src/utils/settings.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Python imports
-import os
-
-# Lib imports
-import gi, cairo
-gi.require_version('Gtk', '3.0')
-gi.require_version('Gdk', '3.0')
-
-from gi.repository import Gtk
-from gi.repository import Gdk
-
-
-# Application imports
-from .logger import Logger
-
-
-
-
-class Settings:
- def __init__(self):
- self._SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
- self._USER_HOME = os.path.expanduser('~')
- self._CONFIG_PATH = f"{self._USER_HOME}/.config/{app_name.lower()}"
- self._GLADE_FILE = f"{self._CONFIG_PATH}/Main_Window.glade"
- self._CSS_FILE = f"{self._CONFIG_PATH}/stylesheet.css"
- self._DEFAULT_ICONS = f"{self._CONFIG_PATH}/icons"
- self._WINDOW_ICON = f"{self._DEFAULT_ICONS}/{app_name.lower()}.png"
- self._USR_PATH = f"/usr/share/{app_name.lower()}"
- self._SCREENSHOTS_DIR = f"{self._USER_HOME}/.screenshots"
-
- if not os.path.exists(self._CONFIG_PATH):
- os.mkdir(self._CONFIG_PATH)
- if not os.path.exists(self._GLADE_FILE):
- self._GLADE_FILE = f"{self._USR_PATH}/Main_Window.glade"
- if not os.path.exists(self._CSS_FILE):
- self._CSS_FILE = f"{self._USR_PATH}/stylesheet.css"
- if not os.path.exists(self._WINDOW_ICON):
- self._WINDOW_ICON = f"{self._USR_PATH}/icons/{app_name.lower()}.png"
- if not os.path.isdir(self._SCREENSHOTS_DIR):
- os.mkdir(self._SCREENSHOTS_DIR)
-
- # 'Filters'
- self._images = ('.png', '.jpg', '.jpeg', '.gif')
-
- self._builder = Gtk.Builder()
- self._builder.add_from_file(self._GLADE_FILE)
- self._logger = Logger(self._CONFIG_PATH, _fh_log_lvl=20).get_logger()
-
- def create_window(self):
- # Get window and connect signals
- window = self._builder.get_object("Main_Window")
- window.connect("delete-event", Gtk.main_quit)
- self.set_window_data(window)
- return window
-
- def set_window_data(self, window):
- screen = window.get_screen()
- visual = screen.get_rgba_visual()
-
- if visual != None and screen.is_composited():
- window.set_visual(visual)
-
- # bind css file
- 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 get_monitor_data(self):
- screen = self._builder.get_object("Main_Window").get_screen()
- wdth = screen.get_width()
- hght = screen.get_height()
- mon0 = Gdk.Rectangle()
- mon0.width = wdth
- mon0.height = hght
- monitors = []
-
- monitors.append(mon0)
- for m in range(screen.get_n_monitors()):
- monitors.append(screen.get_monitor_geometry(m))
-
- return monitors
-
-
- def get_builder(self) -> Gtk.Builder: return self._builder
- def get_logger(self) -> Logger: return self._logger
- def get_screenshots_dir(self) -> str: return self._SCREENSHOTS_DIR
-
- # Filter returns
- def get_images_filter(self): return self._images
diff --git a/src/old-src/utils/utils.py b/src/old-src/utils/utils.py
deleted file mode 100644
index da99279..0000000
--- a/src/old-src/utils/utils.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Python imports
-import os, time, datetime
-
-# Lib imports
-from gi.repository import GLib
-import pyscreenshot as capture
-
-# Application imports
-
-
-
-
-class Utils:
- def __init__(self):
- self.builder = settings.get_builder()
-
- self.SCREENSHOTS_DIR = 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.refreshing_state = False
-
-
- 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 set_clipboard_data(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/new-src/plugins/__init__.py b/src/plugins/__init__.py
similarity index 100%
rename from src/new-src/plugins/__init__.py
rename to src/plugins/__init__.py
diff --git a/src/new-src/plugins/manifest.py b/src/plugins/manifest.py
similarity index 100%
rename from src/new-src/plugins/manifest.py
rename to src/plugins/manifest.py
diff --git a/src/new-src/plugins/plugin_base.py b/src/plugins/plugin_base.py
similarity index 100%
rename from src/new-src/plugins/plugin_base.py
rename to src/plugins/plugin_base.py
diff --git a/src/new-src/plugins/plugins_controller.py b/src/plugins/plugins_controller.py
similarity index 100%
rename from src/new-src/plugins/plugins_controller.py
rename to src/plugins/plugins_controller.py
diff --git a/src/new-src/utils/__init__.py b/src/utils/__init__.py
similarity index 100%
rename from src/new-src/utils/__init__.py
rename to src/utils/__init__.py
diff --git a/src/new-src/utils/endpoint_registry.py b/src/utils/endpoint_registry.py
similarity index 100%
rename from src/new-src/utils/endpoint_registry.py
rename to src/utils/endpoint_registry.py
diff --git a/src/new-src/utils/event_system.py b/src/utils/event_system.py
similarity index 100%
rename from src/new-src/utils/event_system.py
rename to src/utils/event_system.py
diff --git a/src/new-src/utils/ipc_server.py b/src/utils/ipc_server.py
similarity index 100%
rename from src/new-src/utils/ipc_server.py
rename to src/utils/ipc_server.py
diff --git a/src/new-src/utils/keybindings.py b/src/utils/keybindings.py
similarity index 100%
rename from src/new-src/utils/keybindings.py
rename to src/utils/keybindings.py
diff --git a/src/new-src/utils/logger.py b/src/utils/logger.py
similarity index 100%
rename from src/new-src/utils/logger.py
rename to src/utils/logger.py
diff --git a/src/new-src/utils/settings/__init__.py b/src/utils/settings/__init__.py
similarity index 100%
rename from src/new-src/utils/settings/__init__.py
rename to src/utils/settings/__init__.py
diff --git a/src/new-src/utils/settings/settings.py b/src/utils/settings/settings.py
similarity index 100%
rename from src/new-src/utils/settings/settings.py
rename to src/utils/settings/settings.py
diff --git a/src/new-src/utils/settings/start_check_mixin.py b/src/utils/settings/start_check_mixin.py
similarity index 100%
rename from src/new-src/utils/settings/start_check_mixin.py
rename to src/utils/settings/start_check_mixin.py
diff --git a/src/new-src/utils/singleton.py b/src/utils/singleton.py
similarity index 100%
rename from src/new-src/utils/singleton.py
rename to src/utils/singleton.py
diff --git a/user_config/usr/share/cornea/Main_Window.glade b/user_config/usr/share/cornea/Main_Window.glade
deleted file mode 100644
index 79088d5..0000000
--- a/user_config/usr/share/cornea/Main_Window.glade
+++ /dev/null
@@ -1,558 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- True
- False
- gtk-copy
-
-
-
-
-
-
-
-
-
- True
- False
- gtk-cancel
-
-
- True
- False
- gtk-edit
-
-
- True
- False
- gtk-undo
-
-
- 60
- 1
- 10
-
-
- False
- Cornea
- center
- 500
- 310
- cornea.png
- center
-
-
- True
- False
-
-
- True
- False
- vertical
-
-
- True
- False
-
-
- Entire screen
- True
- True
- False
- Take a screenshot of the entire screen.
- 5
- True
- True
-
-
-
- False
- True
- 0
-
-
-
-
- Active window
- True
- True
- False
- Take a screenshot of the active window.
- 5
- 5
- True
- True
- entireScrnToggle
-
-
-
- False
- True
- 1
-
-
-
-
- Select a region
- True
- True
- False
- Select a region to be captured by clicking a point of the screen without releasing the mouse, dragging you mouse to the other corner of the region, and releasing the mouse button.
- 5
- 5
- True
- True
- entireScrnToggle
-
-
-
- False
- True
- 2
-
-
-
-
- Select a monitor
- True
- True
- False
- Take a screenshot of the selected monitor.
- 5
- 5
- True
- True
- entireScrnToggle
-
-
-
- False
- True
- 3
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
- vertical
-
-
- True
- False
- 5
- 5
-
-
- True
- False
- Timeout
- right
-
-
- False
- True
- 0
-
-
-
-
- True
- True
- Delay in seconds before the screenshot is taken.
- number
- timeoutAdjustment
- True
- True
-
-
- True
- True
- 1
-
-
-
-
- False
- True
- 0
-
-
-
-
-
- False
- True
- 1
-
-
-
-
- False
- True
- 1
-
-
-
-
- 312
- 312
- True
- False
- 0
- none
-
-
- True
- False
- gtk-missing-image
-
-
-
-
- False
- True
- 2
-
-
-
-
- True
- True
- 0
-
-
-
-
- True
- False
- vertical
-
-
- Take Snapshot
- True
- True
- True
- picImage
- True
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
- True
- monitorStore
- False
-
-
-
-
-
- Monitors
-
-
-
- 0
-
-
-
-
-
-
- False
- True
- 1
-
-
-
-
- 200
- True
- True
- 15
- in
-
-
- True
- True
- fileStore
- False
-
-
-
-
-
-
-
-
- Images
- True
- descending
-
-
-
- 0
-
-
-
-
-
-
-
-
- True
- True
- 2
-
-
-
-
- gtk-close
- True
- True
- True
- True
- True
-
-
-
- False
- True
- 3
-
-
-
-
- False
- True
- 2
-
-
-
-
-
-
- 320
- 150
- False
- popup_bind_area
-
-
-
- True
- False
- vertical
-
-
- True
- False
-
-
- True
- True
- True
-
-
- True
- True
- 0
-
-
-
-
- Revert
- True
- True
- True
- revertImage
- True
-
-
-
- False
- True
- 1
-
-
-
-
- False
- True
- 0
-
-
-
-
- Rename
- True
- True
- True
- renameImage
- True
-
-
-
- False
- True
- 1
-
-
-
-
- gtk-open
- True
- True
- True
- True
- True
-
-
-
- False
- True
- 2
-
-
-
-
- gtk-delete
- True
- True
- True
- True
- True
-
-
-
- False
- True
- 3
-
-
-
-
-
-
diff --git a/user_config/usr/share/cornea/icons/archive.png b/user_config/usr/share/cornea/icons/archive.png
deleted file mode 100644
index 7943e4e39efd8fc25296d3a28da55f9919ed31a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1670
zcmX|B2~?BU68@7|3|f`OvI*4)PmiPx*dwQ<#g+iF#HTz=z$z{fF_2%fnfwq4LW0@Y
zR3H!tTNZ+Vl;9%)3?QILSyd9EfQkZAx+x%vU9_b?ZBOTXckaxc@0^)CcgYG53)!%4
z%Q^r6HV{Mik>ELIb)ZqOz85T84WPII#0WGR{c!q!Q?P5x4n4{R0GGzqfjGG(-xXeT
zhJubjWL6x+qj0DIkH_-_nF-uj3Y+T5;>4HD@7)5E99BsYAVjAE;c$e5CC0Lt*a#Yx
zLEW);YyxJyx61HOglH@dK&CLTp;R6SK~Kb4!ElhY8VqEyQ#fEe4FUoKvHlRm0Z%1D
zAd877)8NehbTEO6r9lw;b1$!04wV9dNz_;tgTZ2QR}1l?gRxX5m&)}zm4fF|y!LqR
z_Bttw>Hq-5v+x5EL2#CTrK?LdY%svC`G#qz1E%~Vj*gD5t`2`Y7!1b20Tb-!OAPSq
zYcuwlj05e)!S-f_ETc#&ER;KDzZKJl_SXBWVZME9A
zI&Du=!$3z%8hASW3^hF=PH=`QOo$UE#0%;184MV-^Dvm8C)HU
zY-;E+z|i*?^|y@rez?PJ&2ZDKckft7E%!z(_st_?7W3FB49obadBQsS@czArWA`Q}
zCubf#_;&iq-1OAk%+$jC^TmaQ7mF|!mtMSBUS2K<5&s6C;)f6^j0_;&u|cnM*zUH=
z1Bdtgc#qF#L?S;m^;~9FcJ_$bY_?de;}a7Tua=izyT^R;U-(V<5cl~<&>lZ8`t=yb
z->FX{A`Q*IY4Rq2HE@88_5G;X{vBU@xM6*BkCn6sdpghU_C{axQp}2ZZc;*}B-9GVD?J%TMEvJ0QNS;z3fL1T~^tn!*0J{uy8e=k7>{i14rbezP8=wqL;A*ANnWp
z071Uimf%6!EZlEP*zHb`?g-cw3Lt+(BG&+Q$J~rj2JkY&3GzmSUFsv+3s2k(eD7+%#EyR#PeKiIx&k$Rk3!A}W$Qv?sEa$aYMo8LUSW7C79UnlW@M(`&Yt-MR_eBnnrgtt(=QwnCUoJx+2dLXUlO6iLI
z)5O<+U_(#D8#!>~+r!axy0-eb>z%E;fgu|r(Br+&cC+IS(FBUw-Skr(aG-v-_2w>Q
zxs3W920)um?5wq{@BAZtTh0)kE1wJw1z+t%+ASe(*yL|mN~Q7+buG@N4FIz@Gi;Gq
z(`+kf>^_W~>h-r@6Y0YqT5GixMj^4mv-jgrPCfM>;uiayb`Ulh?Yv1}UBOfw-bj-M
z0wEd?=aC$dAsaEZc^K#vdYkfzT78@Pm)=+O-XiOD@qk8^YPrl)wuniPb^B
zy%!jNyj9#b!`wa~m}qpu{vuY_9t#Cp#l-y^qq>Y(xTL4t^jq3)942=h=h6R*=*-)+
zjBOx_TmU8|k_e1|UKOD`x~wN=Z0FIWFK~*=C%I-Zp3!~d;FnE&yEwbnnHx(G!To}U?63HnOl`}=c@
vLkCR>kcaNm+1dL1FZ}w{WAOd{q017TgD*%|V_I@oKTu*&*gkzg%=te7aFZ2g
diff --git a/user_config/usr/share/cornea/icons/audio.png b/user_config/usr/share/cornea/icons/audio.png
deleted file mode 100644
index c0101346b611e7495861f4efe2c511f76b51e5e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1544
zcmZuxdpOg382_1#wYlcDP%Wj4+h|9w2Q!nE80M04nOQb$)AnPKVADonltl
zL5HREOw8q+D5;PxatTMONfadx#+mciInQ&x&-;Gg=Y2n)_ws$7_xa|L{Pt@ij1d3;
zXcB$A0+lv;UEylVd;BubQE8xDPa+wvJbZX;uF~I-6K5kW&<%wn
zj+uR`M&*(DT~$eYas}1jLP%A>r5w}z6ZPsB9f^l3j7`ITF2BQLe)^b{n?>IuoIfcm
zEm5SuXS-zxN4p=-(6<8jY&HIo<9Mj%<4;>2mRqb2g_zm>W|aVtCPNHgroh!(N`nK_
zQ<~#9w=68{I*@LlaoG{u7Y6ps8f2joYdbHGQO&k>d})pwX)Z^;Ky)gLfW%p(zS;|S
zhq0bZqG5|MOKeB2ftAYB62Xfmt(YKfk!{`B;!kpKLB*r1)t#q5ui%^%MzJmM;M%13
zk}Qd+%b=65%lY8%(Y2h~IDw16)&P$VXgnJJI3Cag^}HM0Ic#M`(VmLA1Cfn;y7SWC
z?3N-Vj_#s!&k${bt9F3_rW<;B;VS&EXZ8oj526(CF_?pEUw@7qW^0`d)42!9rKq&u
z1Y*JfJF85Tp@#+%o%647;s;2GXL-;o=hc86t@f!4CIu_q@$IS5-Ags!P9W*3%CuQS
z4|mm$qaG%0klZ{e;D%hU#Y{1mZ4}pru@!GB3tYwW^SaUTwT1_0?*AGEaVBJ5b3Ik6
ze)dAQPW0J|?IKONhRS`hh?e(cf+^_MxtTMm^tH%Bfsd|CEvv#lA#=P29wT3F#X?ao
zfkhFyPfg@-mHTwON^C0b8)<7_Di8hFBCwIiQUN+w?8!ZAS__NX4(blQ{_}IrrKQ;5
z7CSQ|^vh(5B6T@`q=`D9%V2l5ZTWydwpL4@>(kDp!*b^tU$?kqPLwI;Rj19dWyh-F
zB~s1Y`s+eGX3Awxm&{O+jEjX_)E+%OQzX>rZ|H`Ru_**Wx|df7&beK-x;0trxp*$z
zZeu?Gy8Wk<@fH&EPHAPCZuAkK;W|71a&`X|8St00&W}Kkdh8GJjr6W>@!F?BS1D0SAL
zxZ;T3&N)bu{|c(QglMKWcIar;P{EA=x07mnrAy!G?UV4fsV_`~-JAB+n?!(bdXGO(
z7iyVCIW3zU*jl_-7}~9GD_y(ifg#7+7a&M}23(10r0G)fyU5@#BsY%n7xv~;)ioT1
zu^9$v*!6(K|1)hd)X2ED)qw6VK=PVLE(Uj{i?k=xTnbJu;liYBC?EEVrD$%N(6GyU
z%Fm@y_BvJQ*^kx!eUOjLzqRdl3OS?e55>5vEYC7$jhM!2S~>pOZKs}&5eShx;A6D@
zyLbP$j@}>FsXB;d4F}2O3c|nYZTZqfS#p?gxyVxAC@&7Vpa#^mUr04nA8b32D39
z!7VLJWB2(IXRl54?~Jk(DtwKKdSQ==p%L@NNS7w*_l5c|k73`|Fb||N=Ss%qr|hKp
zFcNPwoI@=KZ0n!Q419iA7#B6nT5v0>`HfkgGTQ5`MsO>O$XbkVT!UHdTL6(U;Cknq{Q{mCL=3J`#dGHam+6_rCl
di=8|}I5;?NKlFb92xL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#D>#
zOL9^f0)R3_3ZBXNc?uyJsky1DHrHsBf%ipdZ&9wFhW=V}MVHE09J8Z@~aA5*-~K
z5fM>PP>_?8^XAPPi0p+67cO4Bc=_^WAotm`XF&4#^XCu}$awMM#mt#A=gyrwZ{EE5
z^XD&EuwdP~bsINs+_GiMwQJYz-@pIh!GlMS9=(438e*XO^6L^n`(#Rj{DK+SIFyvN
zwDk>)J-vfMH*MLv|M1}tA3uHm{N?Lc&6p-z1_s79PZ!6KjC*fqlC<5TCeqS|*mRL?Kgc7(I8Vi=8|}I5;?NKlFb92xL>4nJ
z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#D>#
zOL9^f0)R3_3ZBXNc?uyJsky1DHrHsBfZYpno_di4|!2nE;;ZdJgpSz-K{;CN})=gZxe$uiHlb3Cnx_r~r6&t6n*feeBrs*p;&sep2
z#_G*8S8tiQdMnTtp!q-(xF)ho0G+E>666=mz{teP#m&ttEFvl4>6lif#XQ
z8W13Ilv$zc>xRv19^Jh6-?ox*^G&|HnMr59#~t{-#It^DV2glL{i@!-kE4TcEV%OT
z-p;}>w+z1?PA#6E70US!LfC%He;CD4G5_F<15KQ|YZz6wZP-1z`D{=_^8Ki6{avaJ
zN7k*_@#bs#uBW^^zIST;wfe&9^4sO*Om&4j>bpKNANjrI3)7R|Q=T#KpZwhZ_*dum
zPKyse-tD=U{igWAzqi#}eLQv9Y-+XEJ!hQx&W=4!!(c)y8wWhvU6w0CUnUvw{_K};>3gl1wceg9u(=*FzrTHMS*!j2>yL7`K8m_0?z;72
ikl~}S#Zrnb|3dd~^!AY~RX+CuWU8mDpUXO@geCx;cxYb$
diff --git a/user_config/usr/share/cornea/icons/doc.png b/user_config/usr/share/cornea/icons/doc.png
deleted file mode 100644
index f8388267bc53ad5b95537b2977873701ac3de87b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 702
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#>i=8|}I5;?NKlFb92xL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$
zOL9^f0)R3_3ZBXNc?uyJskx~NA*s0qIf*5ykA0+kAalscA{WaJky1SjSyc%+tR
zmXzFY>2w2127x4<^9w4AGSf3k7@VCI97{@yGLuS6GV}9vgEN3maLmcfPF2V#DJihh
z*H11=O)SYQOHIzt&CSm%2DwN-Co?%UuQ;_>KdDl;I8onN&p
zZ_9Puk?XiC-}6{u%6r8rAArhKrhnG%zo$Rxf&SbtZY#d}uKt>}<$cc94;{z8cOCoQ
zef;}`Q$J^&|26ykuVq(%{r~^}l(nx4&>f;BL4LsuGV1!hQ>M<92A`
za$u2V;P7(L&tTlTfNe{YTmTot0$~9MRfh(*0}QPUOht^WN18--M73=5e-P5pBywZE
zqa&Bf?#D-!zU*O~{q@o;^8-1PL-!t-%^{%RaKQdUf!l(-hV)bR3I~jz$_qT0S@&69
z;D^cqV^xO-=8c(K|8@#XgfTm*UyupEDR0WO-Js**PYaPZ#^2g)85_AZEX$o=90q!r
N!PC{xWt~$(69DZ(DkcB`
diff --git a/user_config/usr/share/cornea/icons/image.png b/user_config/usr/share/cornea/icons/image.png
deleted file mode 100644
index 46f1ae6db661c4c331704cf0c47134c5fc7673dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6591
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
diff --git a/user_config/usr/share/cornea/icons/pdf.png b/user_config/usr/share/cornea/icons/pdf.png
deleted file mode 100644
index 9f40122a8e9ef281901e085651fa66de960cae4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 925
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#>i=8|}I5;?NKlFb92xL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$
zOL9^f0)R3_3ZBXNc?uyJskx~NA*s0qIf*5ykA0+kAalscA{WaJky1SjSyc%+tR
zmXzFY>2w2127x4<^9w4AGSf3k7@VCI97{@yGLuS6GV}9vgEN3maLmcfPF2V#DJihh
z*H11=O)SYQOHIzt&CSm%2DwN-Co?%UuQ;_>KdDl;I8onN&pK?PTIAN%F-q_%-x$%8-V~{Ru^Jlh}&z$X_xi~y`b$XGV{4yf+
zWn?H&`^%{CSBbH&a#P=y6~8Sj`Mhk&=VePjFJJm)=79R{S`5;#W)6@7C(yckleZ
zclYMi|9-EZE1`1tA5moJqLU6Kq8j5VGvjv*QM-d>CJKja|7`e0Z0qDT7{
z@Ue=x9@zCTit+dV|C5)xEuOis`2EaGr$@H>bMLhORy~vHEa0IcWLx}nu9@QL5C7Jh
zX&z=3(1Zr%7`Gi@
z+rcECz{PMtSfD}Gfx-O%LmLBA2_x$XCeaErj?Z?Dt0hEM9Jpw!5zzSR;LT>oh)-;D
z-n^G8s(8a2u>7j+
zJjt8L#OQU^+W%$ol~c1VVm|%2De->yIiSp{$#TD@bqZhb;MWIIABs=S_AyQP;aJC9
z@7=`^``2qPQ>12fE92L^Z&7o_S!&dSSYtQ+%hYC)a9y}J+~C8l_ggjg7FAu;*!ziN
zM)gzP8CSILH(b-+-*8WRe#6G_PuBw(7%L7eyZw(>d&4WXDQgbA*>(Eg)|m(N)`VR6
iI#nofzso27&zyp}+m6{Mw{HSQ6oaR$pUXO@geCx$l#&Sm
diff --git a/user_config/usr/share/cornea/icons/presentation.png b/user_config/usr/share/cornea/icons/presentation.png
deleted file mode 100644
index 3a339af593f4932996667370db88dbdc050f86b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 882
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#>i=8|}I5;?NKlFb92xL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$
zOL9^f0)R3_3ZBXNc?uyJskx~NA*s0qIf*5ykA0+kAalscA{WaJky1SjSyc%+tR
zmXzFY>2w2127x4<^9w4AGSf3k7@VCI97{@yGLuS6GV}9vgEN3maLmcfPF2V#DJihh
z*H11=O)SYQOHIzt&CSm%2DwN-Co?%UuQ;_>KdDl;I8onN&pG({c6t+>by80{rP(O=NlPcPs@Hg1J-h0;pch9pXZf+o>%^PQTx|5
zr(f5ce_eC=b=?(Y$m7;ukK2AdZvXSF_s@$Ne_qZ6+WY6_>_4yO{&_X;U=B_xydm
z2$g7u
zy(C%^MBZ?E3;YYq@;
zP29q_Hf(L_y2CGRR%D2_ugaMC>EHP$zLTdlCB8p;vvcF`{ZEo=ISURHn)rH$X~^?&
zh(7%Ls^Ln8EX%38Wp@R3xwkT3+GD7vwS`yEq18%~fz_G)&hCqCIt-jT41yI53I>e(
z4zS)}l77Hd)1b+~;P1dNje${yky(O?;{vOQ0(Zy*GuMdCoH08VIIx~u=h(<~#qWH6
zP>XN&fu|<}v#v1|hgwf#t@C7L6$x-?{LlGi@A>yXrfLN8E%<5_DY1cji=7a2S>tsN
zu^0ZA7`pjycDFR@XDUo!JN7Z%Qf#;D<(k(Al4T^K>V2yp{_(l7vHrrm=jk?$lke2b
zU%SUt#jfn^@|Uq(d)qEN-}U)cZ)+Sh
vg(L2s-MoMEqZICF(UN^ZN^i1n34LRJ(>cXB_UJWGf@bh^^>bP0l+XkK!91hU
diff --git a/user_config/usr/share/cornea/icons/spreadsheet.png b/user_config/usr/share/cornea/icons/spreadsheet.png
deleted file mode 100644
index 710efa631bbe46a69e7d43808c675b0f5c2411c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 707
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#>i=8|}I5;?NKlFb92xL>4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U#L5e~$
zOL9^f0)R3_3ZBXNc?uyJskx~NA*s0qIf*5ykA0+kAalscA{WaJky1SjSyc%+tR
zmXzFY>2w2127x4<^9w4AGSf3k7@VCI97{@yGLuS6GV}9vgEN3maLmcfPF2V#DJihh
z*H11=O)SYQOHIzt&CSm%2DwN-Co?%UuQ;_>KdDl;I8onN&pjHh&2juQ60FprD3nqb#g8ju=dvf#l
z7rV~$aGeiCp6-jiz1R4Auk{DY`fUgbSP~q(B0PLcbk?3cpyJje?d?aq=3id8;PRq{
zmlrL)wtVfa_3LhJ*nV&4|NsBZl4mjk-62{MbP0l+XkKZ6g@<
diff --git a/user_config/usr/share/cornea/icons/text.png b/user_config/usr/share/cornea/icons/text.png
deleted file mode 100644
index 2546fcd90b78ab5752f74234520af202a6c3987b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 798
zcmXAlYe-XJ7{}kuB}=C`tC3Uis2C#YEF(%oowrN5E?>zZM=u=!!)$Hk)mC9(O>wRa
ztp}7FMumD>MN&vAS7Q~pfuQN{Z5`z>l!S*Rq_&wNlqwpPlwd-drieN{O^})_sR}Fz
z8;E)wQ_-|GPasfGxSS>$aRsSXlNw#vk)VN4;2IsS6Vx?l>Ewdk>>NQ&YxNMQKNTO7
zl|i&xt#-TJ@AuEm&3V0Ehr
zKmx%31Q;lRal74+_xJaM_|(*t&1RdPo}QVRnVp@TpPvUFFc5()%gf6EgXYT0%IfMW
z7=Vpn07O6&L}2y7b9YXF(PUauDMg&vSYE>31A3#Wwe5Px?T3%Y#>cG-&Ly`u5Dfiv
z4d-1#h`|??3T3JV|KwQ-Q^;v|mUFqm$Q!9Hd?=PZ8S}+wB(iH?XMS864LScrkDYpO
zq(^b9EU(~AbKi*BvGM%Z;IrkV9%D!xcquds+dsF6t-bHn;)u?m3SshkMqElKD#~Ft
zzKiPIl3TmOXR1P|+k|#8n7f&gJ6UlP(HXtG0n2bYC&ctdZXd8H6DQQ7=*u#$Gc`@j
zOG)MYU~KvaIr^iozD2e@aiyOuz+~qGBf=|9EOs1rC%K82rd64gp9(Qc?ox7`qifS$
zhy@>^@%xDRdtjr6wV$w*vv`E1m^CWO4=K1F!8X=g-_0UrwK;PvXzd%yk7wArTRwcf
nSXpJ**OfNuzE@@2Gn)FB={Hgt{G?7Rd?*r?RhF8IYp?zTm=%Df
diff --git a/user_config/usr/share/cornea/icons/trash.png b/user_config/usr/share/cornea/icons/trash.png
deleted file mode 100644
index c6514b98b5644a1398e5b94566627683bdf8313c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 989
zcmV<310wv1P)15yzTLCe34-$-L*zeV%iVi<#7%{pXzDkMHky2mk=z;1Ymqjw*`_
z;l=cX!@yxS)3eMo)!7q(s1S;8XDeoIfk&q@7uoI?s
zN^{=g#zud^U7~af3UN1l@tmQLOr|QHWPuroi5&@B4xE5LwSSN~G+$j==zSl}UMNQg
zyH_50>t(Oi+-x&5w89uZw-ptSj&|nuPG2fiPCt#GwwmD#Jm6oxx$^wCcxirh-cQ9a
ziluU6K|Pn5D~^E<4p7JT?N5^#IMVgKv(20OG$aWqB{-E1
z9oKKm#x_8Yf!EY3G??PhH00od3`|8Cr#dh|?Xc^Z-nF9>;EQ2fnv!5>XX9e5(~w%Q
zWxxzw@&_hiR$9Lcoc|vHx!)lO6-mr}?nq6T47i&p1j1BE6+d+ySi293cx+=BS^bPd
z2pc)RW6($#nyaDBQ#bUD)T*xo(~>w=@g&O4P0907%sO^H(WGl-(aW~-b3x1wa&{7m
zuWn2M!9yrPfv)`{h@?zgx|KUDMpnH#&O}b58kogEan(fp3IGm{0yF@Eai?E1TUpQI
zP%w=Iic?7KIfYR^3~mA204Ox%tPdgo9_IQMM*@lfDHI}T5|U27TT;IPe*mD6XwTM&
zhIg`@LxX@qgMnb0tVSaItJ7O4fL$Dd0pPc<&*3~0q)-r0(BKH6aSoNuc<)UB0GrMp
z6mp=g$)0LI{yHl_Lcst-1y5iV&y7F1{N=AVPXJ(u4pd6_>+}0v$EYsS1=O&N8hVrM
zpZ|RC94JwwF%&23;_5K`+J-nN-|HR00000
LNkvXXu0mjfZ-lz6
diff --git a/user_config/usr/share/cornea/icons/video.png b/user_config/usr/share/cornea/icons/video.png
deleted file mode 100644
index 55afa98662c7439702c4391be32151b59c65e253..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1313
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf4nJ
zNUsNB#yF{oGC)De64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UVK#D>#
zOL9^f0)R3_3ZBXNc?uyJsky1DHrHsBf%ipdZ&9wFl@+Mo$;Vkcv5P@A_uQq{heETG?y0yzC9fraSuz>xc-iKB^S-C2j9}#|+2Trc2JzJRTnfTzEQIH^v=t-uh~(
zxc^nT;G^AFyj-F_E#k~I^^GcclIec6N$|KDEZ^HL2yRXD%)^JLrNU0ZK4B(tA;`e?y7+bL3Cv<0)SasI_CAaj~N#c(YL7*x>s=RUEzB;@PrBh&
zH)D%og8`esF@{4D4id~9$qb1+3OxwHP0QHrcBOO2*;w_|95lANuJ3MPXxI5(O|0kK
zRl|QgH_Ue({_&96Vc&zq|1bC+7nk<1Yuu@Ae>qY6-K)v7Yqj^V-D!HvaJ2dMZM$~H
zu!p<&;w*k~%)4!W;alV}{X=v0Uhk~<**mx5&CKevXN-+f=bm`FyWqv#SP7|{IXP;~
zcdqPSDZPH*cNRIBH>Ot885zEOeQr=yWB#r(Ve!YC*VuRDXUi=Ow$PzK?rCL+Fg2guB&_nRD$dv!BcjdVIbiOV!A>s5L(B
z_M7webFwb`{Y$Vp;Qn~>iWvW|`+K5R742;lemwcu^H&o81xx0
uulP@kQGh{%aR*z&{2E6WF!;j1pYh0Ho3#3@qwc_>hQZU-&t;ucLK6Tg{6(q&
diff --git a/user_config/usr/share/cornea/icons/web.png b/user_config/usr/share/cornea/icons/web.png
deleted file mode 100644
index 17017ce3f5c04869fd808d91732939ea9b32b36d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1845
zcmX9-30PBC7JeZt0R&N&im4Vm5LuK(q#_nd0tCVUMu-({*@BToAxV=L*+e!GkXn@r
ziUOk+5JanpgIGYI)*&h-ERqnyl7#n?m%Ok@b?nd&oyW}mzH{$?&iTLZo^$Vi%IPuT
zRu-Er006L}MTEv;XY!g6@Yp_1EnQ3Cg%lctKp-eo`<0k$&W|`O1OVdwHNz!tzVs;;
zbOgiV!8qPAFf&EK0x~l*JvrPH!qgN#%abQayT0({W{mXN8i~OH(^&u=%LtrksXVR|
zgU!ldIWbrn{PYx%HMdbK!l)b8sALhy<_Unflnkc`Rwf4oXU~*Vv1II8GK9y^7I4zo
zAP^GbLTopXZa#0EirfR|UQfRzGrPO?&Y85umTaIGS*bWSRZ
zD`W}1nAtmpDPF#w-d>5tN4f#P=q^2q5r*9|K0dBcDCXzqr>3S*6jdsf7@nJ(TU=ax
z^X84gV89~F%gakkOIT!KVF5u9wOXxGsW2B?7{Cbs2N(x)F^*QN#qdzr=R?%L4N;wk
z!d-?UTqF@B32nP1(p3`aCW-QpM0-eLeI#+d!*tK#Sf62r@5n*Fk;8jOjs%P)QO1%f
zW6aR8RO;B#@Yly8$2rmC=?Ab4>^;QlZta9Ma9XfOQ)x*il%Eyr)$clua!?v
zPtV-AI9ppWTYp~JP^G+GgLR~8tyA6mhwA<qq?n0{jdpZeC|;T_Bc>935wYc
z?RSIdZcyw_h~Wtx^oEXn0e#~Sb>4-#9zZ=0q23Ot{|WT03#PlnhkW70eQ_glMx^$_R@Y<)VrQXIbz5PntJ0g8Rbn*LUbxsP8jj*_-Z(cX
zN{bSF%odkOt+)PVn?cJf{v^KG_!od*Z`y6_gfo9@lyz1e6<-f@N(DIgw^V+X{8VBDgh-5c#-s8%>=Ds{
zKfZ$B2p)baC-hl5^DPUkA4$M1z~aT=lsHFr2wwAQ^^hG?0?{1_9}F`e&AR*C-`<=x
z*RYSBq9v~+{b;!tNT=fS*ot>s1gZ^;zlQsQ*$T>i*<;Y?y|^T*Id-^@z$QlD35-#i
zJ2sI;MpjWp9kw)4zj?RIGhcdL7=G-=JU=#Yy(dm>A@;T}0CztyE+AaJ=M8AMMO$_|
z7Id+bi9q0dam5HecC>c_tpmQK;`iVX>Wcn}ut+z3R7*7gNk8~2Q
z1}q%HZJIat|JlfU$d-TD#L3I&q0rktK6eLt#iF1#&8Ilzqp1VwcF)ZjcT=&PXup+d
zrtYX6^88blp$1-*%0m?Q_y0cl4qR{hAfh?`YOtxbIN6Bo?^I^~=S_`RJz#u_xuM8K
zT55i|B_nE=rK5wevMuH?>Bb+{SGUyyyt<;S|E!pu1J}QO|8A5sa;v2BD^p^p&yHcv
RE^NR6T3Afz&y?h%{{oe`z-j;h