Bringing to latest changes #3

Merged
itdominator merged 41 commits from develop into master 2022-07-16 19:14:30 +00:00
3 changed files with 44 additions and 7 deletions
Showing only changes of commit 7534bf141e - Show all commits

View File

@ -72,6 +72,34 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
self.plugins.set_message_on_plugin(type, data) self.plugins.set_message_on_plugin(type, data)
def save_load_session(self, action="save_session"):
wid, tid = self.window_controller.get_active_data()
view = self.get_fm_window(wid).get_view_by_id(tid)
save_load_dialog = self.builder.get_object("save_load_dialog")
save_load_dialog.set_current_folder(view.get_current_directory())
save_load_dialog.set_current_name("session.json")
if action == "save_session":
save_load_dialog.set_action(Gtk.FileChooserAction.SAVE)
elif action == "load_session":
save_load_dialog.set_action(Gtk.FileChooserAction.OPEN)
response = save_load_dialog.run()
if response == Gtk.ResponseType.OK:
path = f"{save_load_dialog.get_current_folder()}/{save_load_dialog.get_current_name()}"
if action == "save_session":
self.window_controller.save_state(path)
elif action == "load_session":
session_json = self.window_controller.load_state(path)
print(session_json)
if (response == Gtk.ResponseType.CANCEL) or (response == Gtk.ResponseType.DELETE_EVENT):
pass
save_load_dialog.hide()
def do_action_from_menu_controls(self, widget, eventbutton): def do_action_from_menu_controls(self, widget, eventbutton):
action = widget.get_name() action = widget.get_name()
self.ctrlDown = True self.ctrlDown = True
@ -104,7 +132,7 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
if action == "trash": if action == "trash":
self.trash_files() self.trash_files()
if action == "go_to_trash": if action == "go_to_trash":
self.builder.get_object("path_entry").set_text(self.trash_files_path) self.path_entry.set_text(self.trash_files_path)
if action == "restore_from_trash": if action == "restore_from_trash":
self.restore_trash_files() self.restore_trash_files()
if action == "empty_trash": if action == "empty_trash":
@ -112,5 +140,7 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
if action == "create": if action == "create":
self.create_files() self.create_files()
if action in ["save_session", "load_session"]:
self.save_load_session(action)
self.ctrlDown = False self.ctrlDown = False

View File

@ -36,13 +36,14 @@ class Controller_Data:
self.message_buffer = self.builder.get_object("message_buffer") self.message_buffer = self.builder.get_object("message_buffer")
self.arc_command_buffer = self.builder.get_object("arc_command_buffer") self.arc_command_buffer = self.builder.get_object("arc_command_buffer")
self.exists_file_rename_bttn = self.builder.get_object("exists_file_rename_bttn")
self.warning_alert = self.builder.get_object("warning_alert") self.warning_alert = self.builder.get_object("warning_alert")
self.edit_file_menu = self.builder.get_object("edit_file_menu") self.edit_file_menu = self.builder.get_object("edit_file_menu")
self.file_exists_dialog = self.builder.get_object("file_exists_dialog") self.file_exists_dialog = self.builder.get_object("file_exists_dialog")
self.exists_file_label = self.builder.get_object("exists_file_label") self.exists_file_label = self.builder.get_object("exists_file_label")
self.exists_file_field = self.builder.get_object("exists_file_field") self.exists_file_field = self.builder.get_object("exists_file_field")
self.path_menu = self.builder.get_object("path_menu") self.path_menu = self.builder.get_object("path_menu")
self.exists_file_rename_bttn = self.builder.get_object("exists_file_rename_bttn") self.path_entry = self.builder.get_object("path_entry")
self.bottom_size_label = self.builder.get_object("bottom_size_label") self.bottom_size_label = self.builder.get_object("bottom_size_label")
self.bottom_file_count_label = self.builder.get_object("bottom_file_count_label") self.bottom_file_count_label = self.builder.get_object("bottom_file_count_label")

View File

@ -151,7 +151,10 @@ class WindowController:
def save_state(self): def save_state(self, session_file = None):
if not session_file:
session_file = self.session_file
windows = [] windows = []
for window in self.windows: for window in self.windows:
views = [] views = []
@ -172,10 +175,13 @@ class WindowController:
] ]
) )
with open(self.session_file, 'w') as outfile: with open(session_file, 'w') as outfile:
json.dump(windows, outfile, separators=(',', ':'), indent=4) json.dump(windows, outfile, separators=(',', ':'), indent=4)
def load_state(self): def load_state(self, session_file = None):
if path.isfile(self.session_file): if not session_file:
with open(self.session_file) as infile: session_file = self.session_file
if path.isfile(session_file):
with open(session_file) as infile:
return json.load(infile) return json.load(infile)