diff --git a/.gitignore b/.gitignore index bf657bb..a7059ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea/ +*.zip # ---> Python # Byte-compiled / optimized / DLL files diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/Controller.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/Controller.py index b456000..3f8cf71 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/Controller.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/Controller.py @@ -127,7 +127,7 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi gc.collect() - def do_action_from_menu_controls(self, widget, eventbutton): + def do_action_from_menu_controls(self, widget, event_button): action = widget.get_name() self.hide_context_menu() self.hide_new_file_menu() diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/IPCServerMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/IPCServerMixin.py index fabc763..575f62c 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/IPCServerMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/IPCServerMixin.py @@ -48,7 +48,7 @@ class IPCServerMixin: conn.close() break - # NOTE: Not perfect but insures we don't lockup the connection for too long. + # NOTE: Not perfect but insures we don't lock up the connection for too long. end_time = time.time() if (end - start) > self.ipc_timeout: conn.close() diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ExceptionHookMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ExceptionHookMixin.py index fecab38..0efee11 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ExceptionHookMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ExceptionHookMixin.py @@ -18,9 +18,9 @@ def threaded(fn): class ExceptionHookMixin: ''' ExceptionHookMixin custom exception hook to reroute to a Gtk text area. ''' - def custom_except_hook(self, exctype, value, _traceback): + def custom_except_hook(self, exec_type, value, _traceback): trace = ''.join(traceback.format_tb(_traceback)) - data = f"Exectype: {exctype} <--> Value: {value}\n\n{trace}\n\n\n\n" + data = f"Exec Type: {exec_type} <--> Value: {value}\n\n{trace}\n\n\n\n" start_itr = self.message_buffer.get_start_iter() self.message_buffer.place_cursor(start_itr) self.display_message(self.error, data) @@ -58,5 +58,5 @@ class ExceptionHookMixin: def set_arc_buffer_text(self, widget=None, eve=None): - id = widget.get_active_id() - self.arc_command_buffer.set_text(self.arc_commands[int(id)]) + sid = widget.get_active_id() + self.arc_command_buffer.set_text(self.arc_commands[int(sid)]) diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WindowMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WindowMixin.py index 1f1b29b..89167cb 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WindowMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WindowMixin.py @@ -79,8 +79,8 @@ class WindowMixin(TabMixin): def set_bottom_labels(self, view): - _wid, _tid, _view, iconview, store = self.get_current_state() - selected_files = iconview.get_selected_items() + _wid, _tid, _view, icon_view, store = self.get_current_state() + selected_files = icon_view.get_selected_items() current_directory = view.get_current_directory() path_file = Gio.File.new_for_path(current_directory) mount_file = path_file.query_filesystem_info(attributes="filesystem::*", cancellable=None) diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/controller.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/controller.py index 449cfc7..67457b1 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/controller.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/controller.py @@ -1,5 +1,5 @@ # Python imports -import threading, subprocess, time, json +import threading, json from os import path # Lib imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/icons/mixins/desktopiconmixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/icons/mixins/desktopiconmixin.py index 2d3c30b..9f5ed2e 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/icons/mixins/desktopiconmixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/icons/mixins/desktopiconmixin.py @@ -3,9 +3,6 @@ import os, subprocess, hashlib from os.path import isfile # Gtk imports -import gi -gi.require_version('Gtk', '3.0') -from gi.repository import Gtk # Application imports from .xdg.DesktopEntry import DesktopEntry diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/utils/filehandler.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/utils/filehandler.py index d0f7396..105782a 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/utils/filehandler.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/utils/filehandler.py @@ -1,5 +1,5 @@ # Python imports -import os, shutil, subprocess, threading +import os, shutil # Lib imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/view.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/view.py index a913d67..5676659 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/view.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/views/view.py @@ -1,5 +1,5 @@ # Python imports -import os, hashlib, re +import hashlib, re from os import listdir from os.path import isdir, isfile, join diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/solarfm.zip b/src/versions/solarfm-0.0.1/SolarFM/solarfm/solarfm.zip deleted file mode 100644 index be50e3c..0000000 Binary files a/src/versions/solarfm-0.0.1/SolarFM/solarfm/solarfm.zip and /dev/null differ