diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/#Main_Window.glade# b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/#Main_Window.glade#
deleted file mode 100644
index 0a41cde..0000000
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/#Main_Window.glade#
+++ /dev/null
@@ -1,596 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
index 17d0a5e..f6df595 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/Main_Window.glade
@@ -2,6 +2,641 @@
+
+
+
-
-
-
-
-
-
@@ -129,52 +747,51 @@
-
-
-
@@ -589,4 +1207,9 @@
+
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/appchooserdlg.glade b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/appchooserdlg.glade
new file mode 100644
index 0000000..8d596cb
--- /dev/null
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/appchooserdlg.glade
@@ -0,0 +1,331 @@
+
+
+
+
+
+
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/file_properties.glade b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/file_properties.glade
new file mode 100644
index 0000000..aa8e891
--- /dev/null
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/file_properties.glade
@@ -0,0 +1,858 @@
+
+
+
+
+
+
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/pyfm-64x64.png b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/pyfm-64x64.png
new file mode 100644
index 0000000..1a403ae
Binary files /dev/null and b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/resources/pyfm-64x64.png differ
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
index 2336c26..fa7034b 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/Signals.py
@@ -20,7 +20,7 @@ def threaded(fn):
return wrapper
-class Signals(PaneMixin, WindowMixin):
+class Signals(WidgetFileActionMixin, PaneMixin, WindowMixin):
def __init__(self, settings):
self.settings = settings
self.builder = self.settings.builder
@@ -87,6 +87,30 @@ class Signals(PaneMixin, WindowMixin):
self.load_store(view, store)
+ def do_action_from_menu_controls(self, imagemenuitem, eventbutton):
+ action = imagemenuitem.get_name()
+ self.ctrlDown = True
+ self.hide_context_menu()
+
+ if action == "create":
+ self.create_file()
+ if action == "cut":
+ self.to_copy_files.clear()
+ self.cut_files()
+ if action == "copy":
+ self.to_cut_files.clear()
+ self.copy_files()
+ if action == "paste":
+ self.paste_files()
+ if action == "delete":
+ # self.delete_files()
+ self.trash_files()
+ if action == "trash":
+ self.trash_files()
+
+ self.ctrlDown = False
+
+
def global_key_press_controller(self, eve, user_data):
keyname = Gdk.keyval_name(user_data.keyval).lower()
if "control" in keyname or "alt" in keyname or "shift" in keyname:
@@ -110,13 +134,13 @@ class Signals(PaneMixin, WindowMixin):
if "shift" in keyname:
self.shiftDown = False
if "alt" in keyname:
- self.altDown = False
+ self.altDown = False
if (self.ctrlDown and keyname == "slash") or keyname == "home":
self.builder.get_object("go_home").released()
if self.ctrlDown and keyname == "r":
self.builder.get_object("refresh_view").released()
- if (self.ctrlDown and keyname == "up") or (self.ctrlDown and keyname == "up"):
+ if (self.ctrlDown and keyname == "up") or (self.ctrlDown and keyname == "u"):
self.builder.get_object("go_up").released()
if self.ctrlDown and keyname == "l":
self.builder.get_object("path_entry").grab_focus()
@@ -124,7 +148,6 @@ class Signals(PaneMixin, WindowMixin):
self.builder.get_object("create_tab").released()
if self.ctrlDown and keyname == "w":
self.keyboard_close_tab()
-
if self.ctrlDown and keyname == "h":
self.show_hide_hidden_files()
if self.ctrlDown and keyname == "c":
@@ -136,15 +159,18 @@ class Signals(PaneMixin, WindowMixin):
if self.ctrlDown and keyname == "v":
self.paste_files()
+ if self.ctrlDown and keyname == "o":
+ pass
+
+ if keyname == "delete":
+ self.trash_files()
+
if keyname == "f4":
wid, tid = self.window_controller.get_active_data()
view = self.get_fm_window(wid).get_view_by_id(tid)
dir = view.get_current_directory()
self.execute("terminator", dir)
- if keyname == "delete":
- self.trash_files()
-
def execute(self, option, start_dir=os.getenv("HOME")):
DEVNULL = open(os.devnull, 'w')
@@ -152,6 +178,23 @@ class Signals(PaneMixin, WindowMixin):
subprocess.Popen(command, cwd=start_dir, start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
+ def show_about_page(self, widget, eve):
+ about_page = self.builder.get_object("about_page")
+ response = about_page.run()
+ if response == -4:
+ self.hide_about_page()
+
+ def hide_about_page(self, widget=None, eve=None):
+ about_page = self.builder.get_object("about_page").hide()
+
+
+ def show_context_menu(self, widget=None, eve=None):
+ self.builder.get_object("context_menu").run()
+
+ def hide_context_menu(self, widget=None, eve=None):
+ self.builder.get_object("context_menu").hide()
+
+
def generate_windows(self, data = None):
if data:
for j, value in enumerate(data):
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/TabMixin.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/TabMixin.py
index 2b768fa..2eccfa2 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/TabMixin.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/TabMixin.py
@@ -1,8 +1,6 @@
# Python imports
# Lib imports
-from gi.repository import GObject, Gio
-
# Application imports
from . import WidgetMixin
@@ -35,39 +33,7 @@ class TabMixin(WidgetMixin):
self.set_window_title()
self.set_file_watcher(view)
- def set_file_watcher(self, view):
- if view.get_dir_watcher():
- watcher = view.get_dir_watcher()
- watcher.cancel()
- if debug:
- print(f"Watcher Is Cancelled: {watcher.is_cancelled()}")
- dir_watcher = Gio.File.new_for_path(view.get_current_directory()) \
- .monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES,
- Gio.Cancellable()
- )
-
- wid = view.get_wid()
- tid = view.get_tab_id()
- dir_watcher.connect("changed", self.dir_watch_updates, (f"{wid}|{tid}",))
- view.set_dir_watcher(dir_watcher)
-
- def dir_watch_updates(self, file_monitor, file, other_file=None, eve_type=None, data=None):
- if eve_type == Gio.FileMonitorEvent.CREATED or \
- eve_type == Gio.FileMonitorEvent.DELETED or \
- eve_type == Gio.FileMonitorEvent.RENAMED or \
- eve_type == Gio.FileMonitorEvent.MOVED_IN or \
- eve_type == Gio.FileMonitorEvent.MOVED_OUT:
- wid, tid = data[0].split("|")
- notebook = self.builder.get_object(f"window_{wid}")
- view = self.get_fm_window(wid).get_view_by_id(tid)
- iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
- store = iconview.get_model()
- _store, tab_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
-
- view.load_directory()
- self.load_store(view, store)
- tab_label.set_label(view.get_end_of_path())
def close_tab(self, button, eve=None):
@@ -154,88 +120,3 @@ class TabMixin(WidgetMixin):
view.hide_hidden = not view.hide_hidden
view.load_directory()
self.builder.get_object("refresh_view").released()
-
-
- def create_file(self):
- pass
-
- def update_file(self):
- nFile = widget.get_text().strip()
- if data and data.keyval == 65293: # Enter key event
- view.update_file(nFile)
- elif data == None: # Save button 'event'
- view.update_file(nFile)
-
- def menu_bar_copy(self, widget, eve):
- self.copy_file()
-
- def copy_files(self):
- wid, tid = self.window_controller.get_active_data()
- iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
- store = iconview.get_model()
- uris = self.format_to_uris(store, wid, tid, self.selected_files)
- self.to_copy_files = uris
-
- def cut_files(self):
- wid, tid = self.window_controller.get_active_data()
- iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
- store = iconview.get_model()
- uris = self.format_to_uris(store, wid, tid, self.selected_files)
- self.to_cut_files = uris
-
- def paste_files(self):
- wid, tid = self.window_controller.get_active_data()
- view = self.get_fm_window(wid).get_view_by_id(tid)
- to_path = f"{view.get_current_directory()}"
-
- if len(self.to_copy_files) > 0:
- self.handle_file(self.to_copy_files, "copy", to_path)
- else:
- self.handle_file(self.to_cut_files, "move", to_path)
-
-
- def move_file(self, view, fFile, tFile):
- self.handle_file([fFile], "move", tFile)
-
- def delete_files(self):
- pass
-
- def trash_files(self):
- wid, tid = self.window_controller.get_active_data()
- view = self.get_fm_window(wid).get_view_by_id(tid)
- iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
- store = iconview.get_model()
- uris = self.format_to_uris(store, wid, tid, self.selected_files)
- self.handle_file(uris, "trash")
-
-
- # NOTE: Gio moves files by generating the target file path with name in it
- # We can't just give a base target directory and run with it.
- # Also, the display name is UTF-8 safe and meant for displaying in GUIs
- def handle_file(self, paths, action, base_dir=None):
- paths = self.preprocess_paths(paths)
- target = None
-
- for path in paths:
- try:
- f = Gio.File.new_for_uri(path)
- if base_dir:
- info = f.query_info("standard::display-name", 0, cancellable=None)
- _target = f"file://{base_dir}/{info.get_display_name()}"
- target = Gio.File.new_for_uri(_target)
-
- if action == "trash":
- f.trash(cancellable=None)
- if action == "copy":
- f.copy(target, flags=Gio.FileCopyFlags.OVERWRITE, cancellable=None)
- if action == "move":
- f.move(target, flags=Gio.FileCopyFlags.OVERWRITE, cancellable=None)
- except GObject.GError as e:
- raise OSError(e.message)
-
- def preprocess_paths(self, paths):
- if not isinstance(paths, list):
- paths = [paths]
- # Convert items such as pathlib paths to strings
- paths = [path.__fspath__() if hasattr(path, "__fspath__") else path for path in paths]
- return paths
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WidgetFileActionMixin.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WidgetFileActionMixin.py
new file mode 100644
index 0000000..79fb617
--- /dev/null
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WidgetFileActionMixin.py
@@ -0,0 +1,156 @@
+# Python imports
+
+# Lib imports
+from gi.repository import GObject, Gio
+
+# Application imports
+
+
+
+class WidgetFileActionMixin:
+ def set_file_watcher(self, view):
+ if view.get_dir_watcher():
+ watcher = view.get_dir_watcher()
+ watcher.cancel()
+ if debug:
+ print(f"Watcher Is Cancelled: {watcher.is_cancelled()}")
+
+ dir_watcher = Gio.File.new_for_path(view.get_current_directory()) \
+ .monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES,
+ Gio.Cancellable()
+ )
+
+ wid = view.get_wid()
+ tid = view.get_tab_id()
+ dir_watcher.connect("changed", self.dir_watch_updates, (f"{wid}|{tid}",))
+ view.set_dir_watcher(dir_watcher)
+
+ def dir_watch_updates(self, file_monitor, file, other_file=None, eve_type=None, data=None):
+ if eve_type == Gio.FileMonitorEvent.CREATED or \
+ eve_type == Gio.FileMonitorEvent.DELETED or \
+ eve_type == Gio.FileMonitorEvent.RENAMED or \
+ eve_type == Gio.FileMonitorEvent.MOVED_IN or \
+ eve_type == Gio.FileMonitorEvent.MOVED_OUT:
+ wid, tid = data[0].split("|")
+ notebook = self.builder.get_object(f"window_{wid}")
+ view = self.get_fm_window(wid).get_view_by_id(tid)
+ iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
+ store = iconview.get_model()
+ _store, tab_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
+
+ view.load_directory()
+ self.load_store(view, store)
+ tab_label.set_label(view.get_end_of_path())
+
+ def create_file(self):
+ file_name = self.builder.get_object("context_menu_fname").get_text().strip()
+ type = self.builder.get_object("context_menu_type_toggle").get_state()
+
+ wid, tid = self.window_controller.get_active_data()
+ view = self.get_fm_window(wid).get_view_by_id(tid)
+ target = f"{view.get_current_directory()}"
+
+ if file_name != "":
+ file_name = "file://" + target + "/" + file_name
+ if type == True: # Create File
+ self.handle_file([file_name], "create_file", target)
+ else: # Create Folder
+ self.handle_file([file_name], "create_dir")
+
+ def update_file(self):
+ pass
+
+ def menu_bar_copy(self, widget, eve):
+ self.copy_file()
+
+ def copy_files(self):
+ wid, tid = self.window_controller.get_active_data()
+ iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
+ store = iconview.get_model()
+ uris = self.format_to_uris(store, wid, tid, self.selected_files)
+ self.to_copy_files = uris
+
+ def cut_files(self):
+ wid, tid = self.window_controller.get_active_data()
+ iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
+ store = iconview.get_model()
+ uris = self.format_to_uris(store, wid, tid, self.selected_files)
+ self.to_cut_files = uris
+
+ def paste_files(self):
+ wid, tid = self.window_controller.get_active_data()
+ view = self.get_fm_window(wid).get_view_by_id(tid)
+ target = f"{view.get_current_directory()}"
+
+ if len(self.to_copy_files) > 0:
+ self.handle_file(self.to_copy_files, "copy", target)
+ elif len(self.to_cut_files) > 0:
+ self.handle_file(self.to_cut_files, "move", target)
+
+
+ def move_file(self, view, files, target):
+ self.handle_file([files], "move", target)
+
+ def delete_files(self):
+ wid, tid = self.window_controller.get_active_data()
+ iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
+ view = self.get_fm_window(wid).get_view_by_id(tid)
+ store = iconview.get_model()
+ uris = self.format_to_uris(store, wid, tid, self.selected_files)
+ self.handle_file(uris, "delete")
+
+ def trash_files(self):
+ wid, tid = self.window_controller.get_active_data()
+ iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
+ view = self.get_fm_window(wid).get_view_by_id(tid)
+ store = iconview.get_model()
+ uris = self.format_to_uris(store, wid, tid, self.selected_files)
+ self.handle_file(uris, "trash")
+
+
+ # NOTE: Gio moves files by generating the target file path with name in it
+ # We can't just give a base target directory and run with it.
+ # Also, the display name is UTF-8 safe and meant for displaying in GUIs
+ def handle_file(self, paths, action, base_dir=None):
+ paths = self.preprocess_paths(paths)
+ target = None
+
+ for path in paths:
+ try:
+ f = Gio.File.new_for_uri(path)
+
+ if action == "create_file":
+ f.create(Gio.FileCreateFlags.NONE, cancellable=None)
+ break
+ if action == "create_dir":
+ f.make_directory(cancellable=None)
+ break
+
+
+ if base_dir:
+ info = f.query_info("standard::display-name", 0, cancellable=None)
+ _target = f"file://{base_dir}/{info.get_display_name()}"
+ target = Gio.File.new_for_uri(_target)
+
+ # See if dragging to same directory then break
+ if action != "trash" and action != "delete" and \
+ (f.get_parent().get_path() == target.get_parent().get_path()):
+ break
+
+ if action == "delete":
+ f.delete(cancellable=None)
+ if action == "trash":
+ f.trash(cancellable=None)
+ if action == "copy":
+ f.copy(target, flags=Gio.FileCopyFlags.OVERWRITE, cancellable=None)
+ if action == "move":
+ f.move(target, flags=Gio.FileCopyFlags.OVERWRITE, cancellable=None)
+ except GObject.GError as e:
+ raise OSError(e.message)
+
+ def preprocess_paths(self, paths):
+ if not isinstance(paths, list):
+ paths = [paths]
+ # Convert items such as pathlib paths to strings
+ paths = [path.__fspath__() if hasattr(path, "__fspath__") else path for path in paths]
+ return paths
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WindowMixin.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WindowMixin.py
index 49c9d97..caee4ef 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WindowMixin.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/WindowMixin.py
@@ -51,40 +51,14 @@ class WindowMixin(TabMixin):
try:
wid, tid = iconview.get_name().split("|")
self.window_controller.set_active_data(wid, tid)
+ self.set_path_text(wid, tid)
+ self.set_window_title()
if eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 1: # l-click
- self.set_path_text(wid, tid)
- self.set_window_title()
-
if self.single_click_open: # FIXME: need to find a way to pass the model index
self.grid_icon_double_left_click(iconview)
elif eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 3: # r-click
- pass
- # input = self.builder.get_object("filenameInput")
- # controls = self.builder.get_object("iconControlsWindow")
- # iconsButtonBox = self.builder.get_object("iconsButtonBox")
- # menuButtonBox = self.builder.get_object("menuButtonBox")
- #
- #
- # if len(self.selectedFiles) == 1:
- # parts = self.selectedFiles[0].split("/")
- # input.set_text(parts[len(parts) - 1])
- # input.show()
- # iconsButtonBox.show()
- # menuButtonBox.hide()
- # controls.show()
- # elif len(self.selectedFiles) > 1:
- # input.set_text("")
- # input.hide()
- # menuButtonBox.hide()
- # iconsButtonBox.show()
- # controls.show()
- # else:
- # input.set_text("")
- # input.show()
- # menuButtonBox.show()
- # iconsButtonBox.hide()
- # controls.show()
+ self.show_context_menu()
except Exception as e:
print(repr(e))
diff --git a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/__init__.py b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/__init__.py
index 1f74fca..cd23f8d 100644
--- a/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/__init__.py
+++ b/src/versions/pyfm-0.0.1/PyFM/new/pyfm/signal_classes/mixins/__init__.py
@@ -2,3 +2,4 @@ from .PaneMixin import PaneMixin
from .WidgetMixin import WidgetMixin
from .TabMixin import TabMixin
from .WindowMixin import WindowMixin
+from .WidgetFileActionMixin import WidgetFileActionMixin