From c40be842d5d2c9f6b6bf5492ddcc6a09a6909ecd Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Wed, 1 Dec 2021 21:20:31 -0600 Subject: [PATCH] Reverted glade separation --- .../signal_classes/KeyboardSignalsMixin.py | 6 +- .../SolarFM/new/solarfm/utils/Settings.py | 2 - user_config/solarfm/Main_Window.glade | 949 ++++++++++++++++- user_config/solarfm/Menu_Popups.glade | 950 ------------------ 4 files changed, 949 insertions(+), 958 deletions(-) delete mode 100644 user_config/solarfm/Menu_Popups.glade diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/KeyboardSignalsMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/KeyboardSignalsMixin.py index 6635c4c..0fc8287 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/KeyboardSignalsMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/KeyboardSignalsMixin.py @@ -35,6 +35,9 @@ class KeyboardSignalsMixin: if "alt" in keyname: self.altDown = False + if self.ctrlDown and self.shiftDown and keyname == "t": + self.trash_files() + if self.ctrlDown and keyname == "q": self.tear_down() if (self.ctrlDown and keyname == "slash") or keyname == "home": @@ -66,8 +69,7 @@ class KeyboardSignalsMixin: if self.ctrlDown and keyname == "n": self.show_new_file_menu() - if self.ctrlDown and self.shiftDown and keyname == "t": - self.trash_files() + if keyname == "delete": self.delete_files() if keyname == "f2": diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py index 93c7951..53f3d14 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py +++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/utils/Settings.py @@ -22,12 +22,10 @@ class Settings: self.CONFIG_PATH = self.USER_HOME + "/.config/solarfm" self.cssFile = self.CONFIG_PATH + '/stylesheet.css' - self.popups_glade = self.CONFIG_PATH + "/Menu_Popups.glade" self.windows_glade = self.CONFIG_PATH + "/Main_Window.glade" self.logger = Logger().get_logger() self.builder = gtk.Builder() - self.builder.add_from_file(self.popups_glade) self.builder.add_from_file(self.windows_glade) self.DEFAULT_ICONS = self.CONFIG_PATH + "/icons" diff --git a/user_config/solarfm/Main_Window.glade b/user_config/solarfm/Main_Window.glade index 9277fa6..bc6e9fc 100644 --- a/user_config/solarfm/Main_Window.glade +++ b/user_config/solarfm/Main_Window.glade @@ -2,6 +2,951 @@ + + False + mouse + splashscreen + south + + + + False + vertical + 2 + + + False + end + + + gtk-cancel + True + True + True + True + + + True + True + 0 + + + + + Select + True + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + False + True + + + + False + True + 1 + + + + + + button31 + appchooser_select_btn + + + + $(which 7za || echo 7zr) a %o %N + + + False + True + center + dialog + center + True + True + + + False + vertical + 2 + + + False + end + + + gtk-cancel + True + True + True + True + + + True + True + 0 + + + + + gtk-ok + True + True + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + vertical + + + True + False + True + + + True + False + Compress Commands: + 0.20000000298023224 + + + + + + False + True + 0 + + + + + + + + True + False + Archive Format: + 1 + + + + + + False + True + 2 + + + + + True + False + 0 + 0 + + 7Zip (*.7z) + Zip (*.zip *.ZIP) + RAR (*.rar *.RAR) + Tar (*.tar) + Tar bzip2 (*.tar.bz2) + Tar Gzip (*.tar.gz *.tgz) + Tar xz (*.tar.xz *.txz) + Gzip (*.gz) + XZ (*.xz) + + + + + False + True + 3 + + + + + False + True + 0 + + + + + 72 + True + True + arc_command_buffer + + + True + True + 1 + + + + + False + True + 2 + + + + + + button21 + button22 + + + + True + False + gtk-save-as + + + True + False + gtk-new + + + False + center + splashscreen + center + + + + False + vertical + 2 + + + False + end + + + + + + + + + False + False + 0 + + + + + True + False + vertical + + + 500 + 26 + True + True + gtk-edit + New File/Dir Name... + + + False + True + 0 + + + + + True + False + 20 + vertical + True + + + True + False + + + True + False + 15 + Folder + + + + + + True + True + 0 + + + + + True + False + 15 + File + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + True + File/Folder + True + + + False + True + 1 + + + + + Create + create + True + True + True + Create File/Folder... + createImage + True + + + + False + True + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + True + False + gtk-execute + + + + 320 + False + True + bottom + + + True + False + vertical + + + gtk-save-as + True + True + True + True + + + + False + True + 0 + + + + + 600 + True + True + True + in + False + + + message_view + True + True + True + False + False + message_buffer + + + + + False + True + 1 + + + + + + + True + False + gtk-open + + + True + False + gtk-edit + 3 + + + True + False + gtk-edit + + + True + False + gtk-media-forward + + + False + True + center + splashscreen + True + center + + + + False + vertical + 2 + + + False + end + + + Skip + True + True + True + skip_img + True + + + + True + True + 0 + + + + + gtk-cancel + True + True + True + True + + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + vertical + + + True + False + + + True + False + Rename: + + + False + True + 0 + + + + + True + False + + + True + True + 1 + + + + + False + True + 0 + + + + + 500 + 26 + True + True + gtk-edit + To: + + + False + True + 1 + + + + + Rename + rename + True + True + True + rename_img + True + + + + False + True + 2 + + + + + True + True + 1 + + + + + + + True + False + user-trash + + + True + False + user-trash + + + False + False + mouse + splashscreen + True + False + False + static + + + + False + vertical + 2 + + + False + end + + + + + + + + + False + False + 0 + + + + + True + False + vertical + + + True + False + vertical + + + gtk-delete + delete + True + True + True + Delete... + 20 + True + True + + + + False + True + 11 + + + + + gtk-open + open + True + True + True + Open... + True + + + + False + True + 0 + + + + + Open With + True + True + True + open_with_img + True + + + + False + True + 1 + + + + + gtk-execute + execute + True + True + True + True + + + + False + True + 2 + + + + + Execute in Terminal + execute_in_terminal + True + True + True + exec_in_term_img + + + + False + True + 3 + + + + + Rename + rename + True + True + True + Rename... + 20 + rename_img2 + True + + + + False + True + 4 + + + + + gtk-cut + cut + True + True + True + Cut... + True + True + + + + False + True + 5 + + + + + gtk-copy + copy + True + True + True + Copy... + True + True + + + + False + True + 6 + + + + + gtk-paste + paste + True + True + True + Paste... + True + True + + + + False + True + 7 + + + + + Go To Trash + go_to_trash + True + True + True + Go To Trash... + trash_img2 + True + + + + False + True + end + 8 + + + + + Archive + archive + True + True + True + Archive... + archive_img + True + + + + False + True + 9 + + + + + Trash + trash + True + True + True + Move to Trash... + trash_img + True + + + + False + True + end + 11 + + + + + False + True + 2 + + + + + False + True + 1 + + + + + + + False + True + center + dialog + False + center + warning + Warning! + + + False + vertical + 2 + + + False + True + end + + + gtk-no + True + True + True + True + + + True + True + 0 + + + + + gtk-yes + True + True + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + + button4 + button3 + + False 5 @@ -382,15 +1327,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe - - $(which 7za || echo 7zr) a %o %N - True False gtk-justify-center - True False diff --git a/user_config/solarfm/Menu_Popups.glade b/user_config/solarfm/Menu_Popups.glade deleted file mode 100644 index 7cfb7e5..0000000 --- a/user_config/solarfm/Menu_Popups.glade +++ /dev/null @@ -1,950 +0,0 @@ - - - - - - False - mouse - splashscreen - south - - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - True - - - True - True - 0 - - - - - Select - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - False - True - - - - False - True - 1 - - - - - - button31 - appchooser_select_btn - - - - $(which 7za || echo 7zr) a %o %N - - - False - True - center - dialog - center - True - True - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - True - - - True - True - 0 - - - - - gtk-ok - True - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - vertical - - - True - False - True - - - True - False - Compress Commands: - 0.20000000298023224 - - - - - - False - True - 0 - - - - - - - - True - False - Archive Format: - 1 - - - - - - False - True - 2 - - - - - True - False - 0 - 0 - - 7Zip (*.7z) - Zip (*.zip *.ZIP) - RAR (*.rar *.RAR) - Tar (*.tar) - Tar bzip2 (*.tar.bz2) - Tar Gzip (*.tar.gz *.tgz) - Tar xz (*.tar.xz *.txz) - Gzip (*.gz) - XZ (*.xz) - - - - - False - True - 3 - - - - - False - True - 0 - - - - - 72 - True - True - arc_command_buffer - - - True - True - 1 - - - - - False - True - 2 - - - - - - button21 - button22 - - - - True - False - gtk-save-as - - - True - False - gtk-new - - - False - center - splashscreen - center - - - - False - vertical - 2 - - - False - end - - - - - - - - - False - False - 0 - - - - - True - False - vertical - - - 500 - 26 - True - True - gtk-edit - New File/Dir Name... - - - False - True - 0 - - - - - True - False - 20 - vertical - True - - - True - False - - - True - False - 15 - Folder - - - - - - True - True - 0 - - - - - True - False - 15 - File - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - True - File/Folder - True - - - False - True - 1 - - - - - Create - create - True - True - True - Create File/Folder... - createImage - True - - - - False - True - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - True - False - gtk-execute - - - - 320 - False - True - bottom - - - True - False - vertical - - - gtk-save-as - True - True - True - True - - - - False - True - 0 - - - - - 600 - True - True - True - in - False - - - message_view - True - True - True - False - False - message_buffer - - - - - False - True - 1 - - - - - - - True - False - gtk-open - - - True - False - gtk-edit - 3 - - - True - False - gtk-edit - - - True - False - gtk-media-forward - - - False - True - center - splashscreen - True - center - - - - False - vertical - 2 - - - False - end - - - Skip - True - True - True - skip_img - True - - - - True - True - 0 - - - - - gtk-cancel - True - True - True - True - - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - vertical - - - True - False - - - True - False - Rename: - - - False - True - 0 - - - - - True - False - - - True - True - 1 - - - - - False - True - 0 - - - - - 500 - 26 - True - True - gtk-edit - To: - - - False - True - 1 - - - - - Rename - rename - True - True - True - rename_img - True - - - - False - True - 2 - - - - - True - True - 1 - - - - - - - True - False - user-trash - - - True - False - user-trash - - - False - False - mouse - splashscreen - True - False - False - static - - - - False - vertical - 2 - - - False - end - - - - - - - - - False - False - 0 - - - - - True - False - vertical - - - True - False - vertical - - - gtk-delete - delete - True - True - True - Delete... - 20 - True - True - - - - False - True - 11 - - - - - gtk-open - open - True - True - True - Open... - True - - - - False - True - 0 - - - - - Open With - True - True - True - open_with_img - True - - - - False - True - 1 - - - - - gtk-execute - execute - True - True - True - True - - - - False - True - 2 - - - - - Execute in Terminal - execute_in_terminal - True - True - True - exec_in_term_img - - - - False - True - 3 - - - - - Rename - rename - True - True - True - Rename... - 20 - rename_img2 - True - - - - False - True - 4 - - - - - gtk-cut - cut - True - True - True - Cut... - True - True - - - - False - True - 5 - - - - - gtk-copy - copy - True - True - True - Copy... - True - True - - - - False - True - 6 - - - - - gtk-paste - paste - True - True - True - Paste... - True - True - - - - False - True - 7 - - - - - Go To Trash - go_to_trash - True - True - True - Go To Trash... - trash_img2 - True - - - - False - True - end - 8 - - - - - Archive - archive - True - True - True - Archive... - archive_img - True - - - - False - True - 9 - - - - - Trash - trash - True - True - True - Move to Trash... - trash_img - True - - - - False - True - end - 11 - - - - - False - True - 2 - - - - - False - True - 1 - - - - - - - False - True - center - dialog - False - center - warning - Warning! - - - False - vertical - 2 - - - False - True - end - - - gtk-no - True - True - True - True - - - True - True - 0 - - - - - gtk-yes - True - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - - button4 - button3 - - -