Nameing update, start structure changed, refactoring
This commit is contained in:
parent
bddcc8e3e6
commit
674dac5918
|
|
@ -4,15 +4,17 @@ import builtins
|
|||
# Lib imports
|
||||
|
||||
# Application imports
|
||||
from context.ipc_server_mixin import IPCServerMixin
|
||||
from ipc_server import IPCServer
|
||||
|
||||
|
||||
|
||||
|
||||
class Builtins(IPCServerMixin):
|
||||
class EventSystem(IPCServer):
|
||||
""" Inheret IPCServerMixin. Create an pub/sub systems. """
|
||||
|
||||
def __init__(self):
|
||||
super(EventSystem, self).__init__()
|
||||
|
||||
# NOTE: The format used is list of [type, target, (data,)] Where:
|
||||
# type is useful context for control flow,
|
||||
# target is the method to call,
|
||||
|
|
@ -20,11 +22,7 @@ class Builtins(IPCServerMixin):
|
|||
# Where data may be any kind of data
|
||||
self._gui_events = []
|
||||
self._module_events = []
|
||||
self.is_ipc_alive = False
|
||||
self.ipc_authkey = b'solarfm-ipc'
|
||||
self.ipc_address = '127.0.0.1'
|
||||
self.ipc_port = 4848
|
||||
self.ipc_timeout = 15.0
|
||||
|
||||
|
||||
|
||||
# Makeshift fake "events" type system FIFO
|
||||
|
|
@ -70,7 +68,7 @@ class Builtins(IPCServerMixin):
|
|||
# NOTE: Just reminding myself we can add to builtins two different ways...
|
||||
# __builtins__.update({"event_system": Builtins()})
|
||||
builtins.app_name = "SolarFM"
|
||||
builtins.event_system = Builtins()
|
||||
builtins.event_system = EventSystem()
|
||||
builtins.event_sleep_time = 0.2
|
||||
builtins.debug = False
|
||||
builtins.trace_debug = False
|
||||
|
|
|
|||
|
|
@ -1,56 +0,0 @@
|
|||
# Python imports
|
||||
import os, inspect, time
|
||||
|
||||
# Lib imports
|
||||
|
||||
# Application imports
|
||||
from utils.settings import Settings
|
||||
from context.controller import Controller
|
||||
from __builtins__ import Builtins
|
||||
|
||||
|
||||
|
||||
|
||||
class Main(Builtins):
|
||||
""" Create Settings and Controller classes. Bind signal to Builder. Inherit from Builtins to bind global methods and classes. """
|
||||
|
||||
def __init__(self, args, unknownargs):
|
||||
if not debug:
|
||||
event_system.create_ipc_server()
|
||||
|
||||
time.sleep(0.2)
|
||||
if not trace_debug and not debug:
|
||||
if not event_system.is_ipc_alive:
|
||||
if unknownargs:
|
||||
for arg in unknownargs:
|
||||
if os.path.isdir(arg):
|
||||
message = f"FILE|{arg}"
|
||||
event_system.send_ipc_message(message)
|
||||
|
||||
if args.new_tab and os.path.isdir(args.new_tab):
|
||||
message = f"FILE|{args.new_tab}"
|
||||
event_system.send_ipc_message(message)
|
||||
|
||||
raise Exception("IPC Server Exists: Will send path(s) to it and close...")
|
||||
|
||||
|
||||
settings = Settings()
|
||||
settings.create_window()
|
||||
|
||||
controller = Controller(args, unknownargs, settings)
|
||||
if not controller:
|
||||
raise Exception("Controller exited and doesn't exist...")
|
||||
|
||||
# Gets the methods from the classes and sets to handler.
|
||||
# Then, builder connects to any signals it needs.
|
||||
classes = [controller]
|
||||
handlers = {}
|
||||
for c in classes:
|
||||
methods = None
|
||||
try:
|
||||
methods = inspect.getmembers(c, predicate=inspect.ismethod)
|
||||
handlers.update(methods)
|
||||
except Exception as e:
|
||||
print(repr(e))
|
||||
|
||||
settings.builder.connect_signals(handlers)
|
||||
|
|
@ -15,7 +15,7 @@ gi.require_version('Gtk', '3.0')
|
|||
from gi.repository import Gtk
|
||||
|
||||
# Application imports
|
||||
from __init__ import Main
|
||||
from main import Main
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
|
|||
|
||||
def tear_down(self, widget=None, eve=None):
|
||||
event_system.send_ipc_message("close server")
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
time.sleep(event_sleep_time)
|
||||
Gtk.main_quit()
|
||||
|
||||
|
|
@ -78,18 +78,18 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
|
|||
self.plugins.set_message_on_plugin(type, data)
|
||||
|
||||
def open_terminal(self, widget=None, eve=None):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
dir = view.get_current_directory()
|
||||
view.execute(f"{view.terminal_app}", dir)
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
dir = tab.get_current_directory()
|
||||
tab.execute(f"{tab.terminal_app}", dir)
|
||||
|
||||
def save_load_session(self, action="save_session"):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
save_load_dialog = self.builder.get_object("save_load_dialog")
|
||||
|
||||
if action == "save_session":
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
return
|
||||
elif action == "save_session_as":
|
||||
save_load_dialog.set_action(Gtk.FileChooserAction.SAVE)
|
||||
|
|
@ -98,16 +98,16 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
|
|||
else:
|
||||
raise Exception(f"Unknown action given: {action}")
|
||||
|
||||
save_load_dialog.set_current_folder(view.get_current_directory())
|
||||
save_load_dialog.set_current_folder(tab.get_current_directory())
|
||||
save_load_dialog.set_current_name("session.json")
|
||||
response = save_load_dialog.run()
|
||||
if response == Gtk.ResponseType.OK:
|
||||
if action == "save_session":
|
||||
path = f"{save_load_dialog.get_current_folder()}/{save_load_dialog.get_current_name()}"
|
||||
self.window_controller.save_state(path)
|
||||
self.fm_controller.save_state(path)
|
||||
elif action == "load_session":
|
||||
path = f"{save_load_dialog.get_file().get_path()}"
|
||||
session_json = self.window_controller.load_state(path)
|
||||
session_json = self.fm_controller.load_state(path)
|
||||
self.load_session(session_json)
|
||||
if (response == Gtk.ResponseType.CANCEL) or (response == Gtk.ResponseType.DELETE_EVENT):
|
||||
pass
|
||||
|
|
@ -118,13 +118,13 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
|
|||
if debug:
|
||||
print(f"Session Data: {session_json}")
|
||||
|
||||
self.ctrlDown = False
|
||||
self.shiftDown = False
|
||||
self.altDown = False
|
||||
self.ctrl_down = False
|
||||
self.shift_down = False
|
||||
self.alt_down = False
|
||||
for notebook in self.notebooks:
|
||||
self.clear_children(notebook)
|
||||
|
||||
self.window_controller.unload_views_and_windows()
|
||||
self.fm_controller.unload_tabs_and_windows()
|
||||
self.generate_windows(session_json)
|
||||
gc.collect()
|
||||
|
||||
|
|
@ -165,7 +165,6 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
|
|||
self.restore_trash_files()
|
||||
if action == "empty_trash":
|
||||
self.empty_trash()
|
||||
|
||||
if action == "create":
|
||||
self.show_new_file_menu()
|
||||
if action in ["save_session", "save_session_as", "load_session"]:
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ class Controller_Data:
|
|||
|
||||
def setup_controller_data(self, _settings):
|
||||
self.trashman = XDGTrash()
|
||||
self.window_controller = WindowController()
|
||||
self.fm_controller = WindowController()
|
||||
self.plugins = Plugins(_settings)
|
||||
self.state = self.window_controller.load_state()
|
||||
self.state = self.fm_controller.load_state()
|
||||
self.trashman.regenerate()
|
||||
|
||||
self.settings = _settings
|
||||
|
|
@ -31,8 +31,8 @@ class Controller_Data:
|
|||
self.window2 = self.builder.get_object("window_2")
|
||||
self.window3 = self.builder.get_object("window_3")
|
||||
self.window4 = self.builder.get_object("window_4")
|
||||
self.message_widget = self.builder.get_object("message_widget")
|
||||
self.message_view = self.builder.get_object("message_view")
|
||||
self.message_popup_widget = self.builder.get_object("message_popup_widget")
|
||||
self.message_text_view = self.builder.get_object("message_text_view")
|
||||
self.message_buffer = self.builder.get_object("message_buffer")
|
||||
self.arc_command_buffer = self.builder.get_object("arc_command_buffer")
|
||||
|
||||
|
|
@ -78,32 +78,32 @@ class Controller_Data:
|
|||
'xz -cz %N > %O'
|
||||
]
|
||||
|
||||
self.notebooks = [self.window1, self.window2, self.window3, self.window4]
|
||||
self.selected_files = []
|
||||
self.to_copy_files = []
|
||||
self.to_cut_files = []
|
||||
self.soft_update_lock = {}
|
||||
self.notebooks = [self.window1, self.window2, self.window3, self.window4]
|
||||
self.selected_files = []
|
||||
self.to_copy_files = []
|
||||
self.to_cut_files = []
|
||||
self.soft_update_lock = {}
|
||||
|
||||
self.single_click_open = False
|
||||
self.is_pane1_hidden = False
|
||||
self.is_pane2_hidden = False
|
||||
self.is_pane3_hidden = False
|
||||
self.is_pane4_hidden = False
|
||||
self.single_click_open = False
|
||||
self.is_pane1_hidden = False
|
||||
self.is_pane2_hidden = False
|
||||
self.is_pane3_hidden = False
|
||||
self.is_pane4_hidden = False
|
||||
|
||||
self.override_drop_dest = None
|
||||
self.is_searching = False
|
||||
self.search_iconview = None
|
||||
self.search_view = None
|
||||
self.search_icon_grid = None
|
||||
self.search_tab = None
|
||||
|
||||
self.skip_edit = False
|
||||
self.cancel_edit = False
|
||||
self.ctrlDown = False
|
||||
self.shiftDown = False
|
||||
self.altDown = False
|
||||
self.skip_edit = False
|
||||
self.cancel_edit = False
|
||||
self.ctrl_down = False
|
||||
self.shift_down = False
|
||||
self.alt_down = False
|
||||
|
||||
self.success = "#88cc27"
|
||||
self.warning = "#ffa800"
|
||||
self.error = "#ff0000"
|
||||
self.success_color = self.settings.get_success_color()
|
||||
self.warning_color = self.settings.get_warning_color()
|
||||
self.error_color = self.settings.get_error_color()
|
||||
|
||||
sys.excepthook = self.custom_except_hook
|
||||
self.window.connect("delete-event", self.tear_down)
|
||||
|
|
@ -117,13 +117,13 @@ class Controller_Data:
|
|||
a (obj): self
|
||||
|
||||
Returns:
|
||||
wid, tid, view, iconview, store
|
||||
wid, tid, tab, icon_grid, store
|
||||
'''
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
|
||||
store = iconview.get_model()
|
||||
return wid, tid, view, iconview, store
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
icon_grid = self.builder.get_object(f"{wid}|{tid}|icon_grid")
|
||||
store = icon_grid.get_model()
|
||||
return wid, tid, tab, icon_grid, store
|
||||
|
||||
|
||||
def clear_console(self):
|
||||
|
|
|
|||
|
|
@ -27,14 +27,14 @@ class ExceptionHookMixin:
|
|||
|
||||
def display_message(self, type, text, seconds=None):
|
||||
self.message_buffer.insert_at_cursor(text)
|
||||
self.message_widget.popup()
|
||||
self.message_popup_widget.popup()
|
||||
if seconds:
|
||||
self.hide_message_timeout(seconds)
|
||||
|
||||
@threaded
|
||||
def hide_message_timeout(self, seconds=3):
|
||||
time.sleep(seconds)
|
||||
GLib.idle_add(self.message_widget.popdown)
|
||||
GLib.idle_add(self.message_popup_widget.popdown)
|
||||
|
||||
def save_debug_alerts(self, widget=None, eve=None):
|
||||
start_itr, end_itr = self.message_buffer.get_bounds()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from gi.repository import Gtk, Gdk
|
|||
|
||||
class ShowHideMixin:
|
||||
def show_messages_popup(self, type, text, seconds=None):
|
||||
self.message_widget.popup()
|
||||
self.message_popup_widget.popup()
|
||||
|
||||
def stop_file_searching(self, widget=None, eve=None):
|
||||
self.is_searching = False
|
||||
|
|
@ -48,7 +48,7 @@ class ShowHideMixin:
|
|||
def show_about_page(self, widget=None, eve=None):
|
||||
about_page = self.builder.get_object("about_page")
|
||||
response = about_page.run()
|
||||
if (response == Gtk.ResponseType.CANCEL) or (response == Gtk.ResponseType.DELETE_EVENT):
|
||||
if response in [Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT]:
|
||||
self.hide_about_page()
|
||||
|
||||
def hide_about_page(self, widget=None, eve=None):
|
||||
|
|
@ -56,11 +56,11 @@ class ShowHideMixin:
|
|||
|
||||
|
||||
def show_archiver_dialogue(self, widget=None, eve=None):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
archiver_dialogue = self.builder.get_object("archiver_dialogue")
|
||||
archiver_dialogue.set_action(Gtk.FileChooserAction.SAVE)
|
||||
archiver_dialogue.set_current_folder(view.get_current_directory())
|
||||
archiver_dialogue.set_current_folder(tab.get_current_directory())
|
||||
archiver_dialogue.set_current_name("arc.7z")
|
||||
|
||||
response = archiver_dialogue.run()
|
||||
|
|
@ -137,7 +137,7 @@ class ShowHideMixin:
|
|||
|
||||
def hide_edit_file_menu_enter_key(self, widget=None, eve=None):
|
||||
keyname = Gdk.keyval_name(eve.keyval).lower()
|
||||
if "return" in keyname or "enter" in keyname:
|
||||
if keyname in ["return", "enter"]:
|
||||
self.builder.get_object("edit_file_menu").hide()
|
||||
|
||||
def hide_edit_file_menu_skip(self, widget=None, eve=None):
|
||||
|
|
|
|||
|
|
@ -39,8 +39,6 @@ class PaneMixin:
|
|||
def toggle_notebook_pane(self, widget, eve=None):
|
||||
name = widget.get_name()
|
||||
pane_index = int(name[-1])
|
||||
pane = None
|
||||
|
||||
master_pane = self.builder.get_object("pane_master")
|
||||
pane = self.builder.get_object("pane_top") if pane_index in [1, 2] else self.builder.get_object("pane_bottom")
|
||||
|
||||
|
|
@ -50,16 +48,12 @@ class PaneMixin:
|
|||
self._save_state(state, pane_index)
|
||||
return
|
||||
|
||||
child = None
|
||||
if pane_index in [1, 3]:
|
||||
child = pane.get_child1()
|
||||
elif pane_index in [2, 4]:
|
||||
child = pane.get_child2()
|
||||
child = pane.get_child1() if pane_index in [1, 3] else pane.get_child2()
|
||||
|
||||
self.toggle_pane(child)
|
||||
self._save_state(state, pane_index)
|
||||
|
||||
def _save_state(self, state, pane_index):
|
||||
window = self.window_controller.get_window_by_index(pane_index - 1)
|
||||
window = self.fm_controller.get_window_by_index(pane_index - 1)
|
||||
window.set_is_hidden(state)
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
|
|
|
|||
|
|
@ -18,128 +18,128 @@ class TabMixin(WidgetMixin):
|
|||
def create_tab(self, wid, path=None):
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
path_entry = self.builder.get_object(f"path_entry")
|
||||
view = self.window_controller.add_view_for_window_by_nickname(f"window_{wid}")
|
||||
view.logger = self.logger
|
||||
tab = self.fm_controller.add_tab_for_window_by_nickname(f"window_{wid}")
|
||||
tab.logger = self.logger
|
||||
|
||||
view.set_wid(wid)
|
||||
if path: view.set_path(path)
|
||||
tab.set_wid(wid)
|
||||
if path: tab.set_path(path)
|
||||
|
||||
tab = self.create_tab_widget(view)
|
||||
scroll, store = self.create_grid_iconview_widget(view, wid)
|
||||
# scroll, store = self.create_grid_treeview_widget(view, wid)
|
||||
index = notebook.append_page(scroll, tab)
|
||||
tab_widget = self.create_tab_widget(tab)
|
||||
scroll, store = self.create_icon_grid_widget(tab, wid)
|
||||
# TODO: Fix global logic to make the below work too
|
||||
# scroll, store = self.create_icon_tree_widget(tab, wid)
|
||||
index = notebook.append_page(scroll, tab_widget)
|
||||
|
||||
self.window_controller.set__wid_and_tid(wid, view.get_id())
|
||||
path_entry.set_text(view.get_current_directory())
|
||||
self.fm_controller.set__wid_and_tid(wid, tab.get_id())
|
||||
path_entry.set_text(tab.get_current_directory())
|
||||
notebook.show_all()
|
||||
notebook.set_current_page(index)
|
||||
|
||||
ctx = notebook.get_style_context()
|
||||
ctx.add_class("notebook-unselected-focus")
|
||||
notebook.set_tab_reorderable(scroll, True)
|
||||
self.load_store(view, store)
|
||||
self.load_store(tab, store)
|
||||
self.set_window_title()
|
||||
self.set_file_watcher(view)
|
||||
self.set_file_watcher(tab)
|
||||
|
||||
|
||||
|
||||
|
||||
def close_tab(self, button, eve=None):
|
||||
notebook = button.get_parent().get_parent()
|
||||
tid = self.get_id_from_tab_box(button.get_parent())
|
||||
wid = int(notebook.get_name()[-1])
|
||||
tid = self.get_id_from_tab_box(button.get_parent())
|
||||
scroll = self.builder.get_object(f"{wid}|{tid}")
|
||||
page = notebook.page_num(scroll)
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
watcher = view.get_dir_watcher()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
watcher = tab.get_dir_watcher()
|
||||
|
||||
watcher.cancel()
|
||||
self.get_fm_window(wid).delete_view_by_id(tid)
|
||||
self.get_fm_window(wid).delete_tab_by_id(tid)
|
||||
notebook.remove_page(page)
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
self.set_window_title()
|
||||
|
||||
def on_tab_reorder(self, child, page_num, new_index):
|
||||
wid, tid = page_num.get_name().split("|")
|
||||
window = self.get_fm_window(wid)
|
||||
view = None
|
||||
tab = None
|
||||
|
||||
for i, view in enumerate(window.get_all_views()):
|
||||
if view.get_id() == tid:
|
||||
_view = window.get_view_by_id(tid)
|
||||
watcher = _view.get_dir_watcher()
|
||||
for i, tab in enumerate(window.get_all_tabs()):
|
||||
if tab.get_id() == tid:
|
||||
_tab = window.get_tab_by_id(tid)
|
||||
watcher = _tab.get_dir_watcher()
|
||||
watcher.cancel()
|
||||
window.get_all_views().insert(new_index, window.get_all_views().pop(i))
|
||||
window.get_all_tabs().insert(new_index, window.get_all_tabs().pop(i))
|
||||
|
||||
view = window.get_view_by_id(tid)
|
||||
self.set_file_watcher(view)
|
||||
self.window_controller.save_state()
|
||||
tab = window.get_tab_by_id(tid)
|
||||
self.set_file_watcher(tab)
|
||||
self.fm_controller.save_state()
|
||||
|
||||
def on_tab_switch_update(self, notebook, content=None, index=None):
|
||||
self.selected_files.clear()
|
||||
wid, tid = content.get_children()[0].get_name().split("|")
|
||||
self.window_controller.set__wid_and_tid(wid, tid)
|
||||
self.fm_controller.set__wid_and_tid(wid, tid)
|
||||
self.set_path_text(wid, tid)
|
||||
self.set_window_title()
|
||||
|
||||
def get_id_from_tab_box(self, tab_box):
|
||||
tid = tab_box.get_children()[2]
|
||||
return tid.get_text()
|
||||
return tab_box.get_children()[2].get_text()
|
||||
|
||||
def get_tab_label(self, notebook, iconview):
|
||||
return notebook.get_tab_label(iconview.get_parent()).get_children()[0]
|
||||
def get_tab_label(self, notebook, icon_grid):
|
||||
return notebook.get_tab_label(icon_grid.get_parent()).get_children()[0]
|
||||
|
||||
def get_tab_close(self, notebook, iconview):
|
||||
return notebook.get_tab_label(iconview.get_parent()).get_children()[1]
|
||||
def get_tab_close(self, notebook, icon_grid):
|
||||
return notebook.get_tab_label(icon_grid.get_parent()).get_children()[1]
|
||||
|
||||
def get_tab_iconview_from_notebook(self, notebook):
|
||||
def get_tab_icon_grid_from_notebook(self, notebook):
|
||||
return notebook.get_children()[1].get_children()[0]
|
||||
|
||||
def refresh_tab(data=None):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
view.load_directory()
|
||||
self.load_store(view, store)
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
tab.load_directory()
|
||||
self.load_store(tab, store)
|
||||
|
||||
def update_view(self, tab_label, view, store, wid, tid):
|
||||
self.load_store(view, store)
|
||||
def update_tab(self, tab_label, tab, store, wid, tid):
|
||||
self.load_store(tab, store)
|
||||
self.set_path_text(wid, tid)
|
||||
|
||||
char_width = len(view.get_end_of_path())
|
||||
char_width = len(tab.get_end_of_path())
|
||||
tab_label.set_width_chars(char_width)
|
||||
tab_label.set_label(view.get_end_of_path())
|
||||
tab_label.set_label(tab.get_end_of_path())
|
||||
self.set_window_title()
|
||||
self.set_file_watcher(view)
|
||||
self.window_controller.save_state()
|
||||
self.set_file_watcher(tab)
|
||||
self.fm_controller.save_state()
|
||||
|
||||
def do_action_from_bar_controls(self, widget, eve=None):
|
||||
action = widget.get_name()
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
store, tab_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
|
||||
if action == "go_up":
|
||||
view.pop_from_path()
|
||||
if action == "go_home":
|
||||
view.set_to_home()
|
||||
if action == "refresh_view":
|
||||
view.load_directory()
|
||||
if action == "create_tab":
|
||||
dir = view.get_current_directory()
|
||||
dir = tab.get_current_directory()
|
||||
self.create_tab(wid, dir)
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
return
|
||||
if action == "go_up":
|
||||
tab.pop_from_path()
|
||||
if action == "go_home":
|
||||
tab.set_to_home()
|
||||
if action == "refresh_tab":
|
||||
tab.load_directory()
|
||||
if action == "path_entry":
|
||||
focused_obj = self.window.get_focus()
|
||||
dir = f"{view.get_current_directory()}/"
|
||||
dir = f"{tab.get_current_directory()}/"
|
||||
path = widget.get_text()
|
||||
|
||||
if isinstance(focused_obj, Gtk.Entry):
|
||||
button_box = self.path_menu.get_children()[0].get_children()[0].get_children()[0]
|
||||
query = widget.get_text().replace(dir, "")
|
||||
files = view.get_files() + view.get_hidden()
|
||||
path_menu_buttons = self.builder.get_object("path_menu_buttons")
|
||||
query = widget.get_text().replace(dir, "")
|
||||
files = tab.get_files() + tab.get_hidden()
|
||||
|
||||
self.clear_children(button_box)
|
||||
self.clear_children(path_menu_buttons)
|
||||
show_path_menu = False
|
||||
for file, hash in files:
|
||||
if os.path.isdir(f"{dir}{file}"):
|
||||
|
|
@ -147,7 +147,7 @@ class TabMixin(WidgetMixin):
|
|||
button = Gtk.Button(label=file)
|
||||
button.show()
|
||||
button.connect("clicked", self.set_path_entry)
|
||||
button_box.add(button)
|
||||
path_menu_buttons.add(button)
|
||||
show_path_menu = True
|
||||
|
||||
if not show_path_menu:
|
||||
|
|
@ -160,11 +160,10 @@ class TabMixin(WidgetMixin):
|
|||
if path.endswith(".") or path == dir:
|
||||
return
|
||||
|
||||
traversed = view.set_path(path)
|
||||
if not traversed:
|
||||
if not tab.set_path(path):
|
||||
return
|
||||
|
||||
self.update_view(tab_label, view, store, wid, tid)
|
||||
self.update_tab(tab_label, tab, store, wid, tid)
|
||||
|
||||
try:
|
||||
widget.grab_focus_without_selecting()
|
||||
|
|
@ -173,8 +172,8 @@ class TabMixin(WidgetMixin):
|
|||
pass
|
||||
|
||||
def set_path_entry(self, button=None, eve=None):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
path = f"{view.get_current_directory()}/{button.get_label()}"
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
path = f"{tab.get_current_directory()}/{button.get_label()}"
|
||||
path_entry = self.builder.get_object("path_entry")
|
||||
path_entry.set_text(path)
|
||||
path_entry.grab_focus_without_selecting()
|
||||
|
|
@ -182,23 +181,22 @@ class TabMixin(WidgetMixin):
|
|||
self.path_menu.popdown()
|
||||
|
||||
def keyboard_close_tab(self):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
scroll = self.builder.get_object(f"{wid}|{tid}")
|
||||
page = notebook.page_num(scroll)
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
watcher = view.get_dir_watcher()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
watcher = tab.get_dir_watcher()
|
||||
watcher.cancel()
|
||||
|
||||
self.get_fm_window(wid).delete_view_by_id(tid)
|
||||
self.get_fm_window(wid).delete_tab_by_id(tid)
|
||||
notebook.remove_page(page)
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
self.set_window_title()
|
||||
|
||||
# File control events
|
||||
def show_hide_hidden_files(self):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
view.set_hiding_hidden(not view.is_hiding_hidden())
|
||||
view.load_directory()
|
||||
self.builder.get_object("refresh_view").released()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
tab.set_hiding_hidden(not tab.is_hiding_hidden())
|
||||
tab.load_directory()
|
||||
self.builder.get_object("refresh_tab").released()
|
||||
|
|
|
|||
|
|
@ -40,29 +40,24 @@ class WidgetFileActionMixin:
|
|||
return size
|
||||
|
||||
|
||||
def set_file_watcher(self, view):
|
||||
if view.get_dir_watcher():
|
||||
watcher = view.get_dir_watcher()
|
||||
def set_file_watcher(self, tab):
|
||||
if tab.get_dir_watcher():
|
||||
watcher = tab.get_dir_watcher()
|
||||
watcher.cancel()
|
||||
if debug:
|
||||
print(f"Watcher Is Cancelled: {watcher.is_cancelled()}")
|
||||
|
||||
cur_dir = view.get_current_directory()
|
||||
# Temp updating too much with current events we are checking for.
|
||||
# Seems to cause invalid iter errors in WidbetMixin > update_store
|
||||
if cur_dir == "/tmp":
|
||||
watcher = None
|
||||
return
|
||||
cur_dir = tab.get_current_directory()
|
||||
|
||||
dir_watcher = Gio.File.new_for_path(cur_dir) \
|
||||
.monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES, Gio.Cancellable())
|
||||
|
||||
wid = view.get_wid()
|
||||
tid = view.get_id()
|
||||
wid = tab.get_wid()
|
||||
tid = tab.get_id()
|
||||
dir_watcher.connect("changed", self.dir_watch_updates, (f"{wid}|{tid}",))
|
||||
view.set_dir_watcher(dir_watcher)
|
||||
tab.set_dir_watcher(dir_watcher)
|
||||
|
||||
# NOTE: Too lazy to impliment a proper update handler and so just regen store and update view.
|
||||
# NOTE: Too lazy to impliment a proper update handler and so just regen store and update tab.
|
||||
# Use a lock system to prevent too many update calls for certain instances but user can manually refresh if they have urgency
|
||||
def dir_watch_updates(self, file_monitor, file, other_file=None, eve_type=None, data=None):
|
||||
if eve_type in [Gio.FileMonitorEvent.CREATED, Gio.FileMonitorEvent.DELETED,
|
||||
|
|
@ -72,46 +67,46 @@ class WidgetFileActionMixin:
|
|||
print(eve_type)
|
||||
|
||||
if eve_type in [Gio.FileMonitorEvent.MOVED_IN, Gio.FileMonitorEvent.MOVED_OUT]:
|
||||
self.update_on_end_soft_lock(data[0])
|
||||
self.update_on_soft_lock_end(data[0])
|
||||
elif data[0] in self.soft_update_lock.keys():
|
||||
self.soft_update_lock[data[0]]["last_update_time"] = time.time()
|
||||
else:
|
||||
self.soft_lock_countdown(data[0])
|
||||
|
||||
@threaded
|
||||
def soft_lock_countdown(self, tab):
|
||||
self.soft_update_lock[tab] = { "last_update_time": time.time()}
|
||||
def soft_lock_countdown(self, tab_widget):
|
||||
self.soft_update_lock[tab_widget] = { "last_update_time": time.time()}
|
||||
|
||||
lock = True
|
||||
while lock:
|
||||
time.sleep(0.6)
|
||||
last_update_time = self.soft_update_lock[tab]["last_update_time"]
|
||||
last_update_time = self.soft_update_lock[tab_widget]["last_update_time"]
|
||||
current_time = time.time()
|
||||
if (current_time - last_update_time) > 0.6:
|
||||
lock = False
|
||||
|
||||
|
||||
self.soft_update_lock.pop(tab, None)
|
||||
GLib.idle_add(self.update_on_end_soft_lock, *(tab,))
|
||||
self.soft_update_lock.pop(tab_widget, None)
|
||||
GLib.idle_add(self.update_on_soft_lock_end, *(tab_widget,))
|
||||
|
||||
|
||||
def update_on_end_soft_lock(self, tab):
|
||||
wid, tid = tab.split("|")
|
||||
def update_on_soft_lock_end(self, tab_widget):
|
||||
wid, tid = tab_widget.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}")
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
icon_grid = self.builder.get_object(f"{wid}|{tid}|icon_grid")
|
||||
store = icon_grid.get_model()
|
||||
_store, tab_widget_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
|
||||
|
||||
view.load_directory()
|
||||
self.load_store(view, store)
|
||||
tab.load_directory()
|
||||
self.load_store(tab, store)
|
||||
|
||||
tab_label.set_label(view.get_end_of_path())
|
||||
tab_widget_label.set_label(tab.get_end_of_path())
|
||||
|
||||
_wid, _tid, _view, _iconview, _store = self.get_current_state()
|
||||
_wid, _tid, _tab, _icon_grid, _store = self.get_current_state()
|
||||
|
||||
if [wid, tid] in [_wid, _tid]:
|
||||
self.set_bottom_labels(view)
|
||||
self.set_bottom_labels(tab)
|
||||
|
||||
|
||||
def popup_search_files(self, wid, keyname):
|
||||
|
|
@ -123,43 +118,43 @@ class WidgetFileActionMixin:
|
|||
|
||||
def do_file_search(self, widget, eve=None):
|
||||
query = widget.get_text()
|
||||
self.search_iconview.unselect_all()
|
||||
for i, file in enumerate(self.search_view.get_files()):
|
||||
self.search_icon_grid.unselect_all()
|
||||
for i, file in enumerate(self.search_tab.get_files()):
|
||||
if query and query in file[0].lower():
|
||||
path = Gtk.TreePath().new_from_indices([i])
|
||||
self.search_iconview.select_path(path)
|
||||
self.search_icon_grid.select_path(path)
|
||||
|
||||
items = self.search_iconview.get_selected_items()
|
||||
items = self.search_icon_grid.get_selected_items()
|
||||
if len(items) == 1:
|
||||
self.search_iconview.scroll_to_path(items[0], True, 0.5, 0.5)
|
||||
self.search_icon_grid.scroll_to_path(items[0], True, 0.5, 0.5)
|
||||
|
||||
|
||||
def open_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
|
||||
for file in uris:
|
||||
view.open_file_locally(file)
|
||||
tab.open_file_locally(file)
|
||||
|
||||
def open_with_files(self, appchooser_widget):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
app_info = appchooser_widget.get_app_info()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files)
|
||||
|
||||
view.app_chooser_exec(app_info, uris)
|
||||
tab.app_chooser_exec(app_info, uris)
|
||||
|
||||
def execute_files(self, in_terminal=False):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
paths = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
current_dir = view.get_current_directory()
|
||||
current_dir = tab.get_current_directory()
|
||||
command = None
|
||||
|
||||
for path in paths:
|
||||
command = f"exec '{path}'" if not in_terminal else f"{view.terminal_app} -e '{path}'"
|
||||
view.execute(command, start_dir=view.get_current_directory(), use_os_system=False)
|
||||
command = f"exec '{path}'" if not in_terminal else f"{tab.terminal_app} -e '{path}'"
|
||||
tab.execute(command, start_dir=tab.get_current_directory(), use_os_system=False)
|
||||
|
||||
def archive_files(self, archiver_dialogue):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
paths = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
|
||||
save_target = archiver_dialogue.get_filename();
|
||||
|
|
@ -167,14 +162,14 @@ class WidgetFileActionMixin:
|
|||
pre_command = self.arc_command_buffer.get_text(sItr, eItr, False)
|
||||
pre_command = pre_command.replace("%o", save_target)
|
||||
pre_command = pre_command.replace("%N", ' '.join(paths))
|
||||
command = f"{view.terminal_app} -e '{pre_command}'"
|
||||
command = f"{tab.terminal_app} -e '{pre_command}'"
|
||||
|
||||
view.execute(command, start_dir=None, use_os_system=True)
|
||||
tab.execute(command, start_dir=None, use_os_system=True)
|
||||
|
||||
def rename_files(self):
|
||||
rename_label = self.builder.get_object("file_to_rename_label")
|
||||
rename_input = self.builder.get_object("new_rename_fname")
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
|
||||
for uri in uris:
|
||||
|
|
@ -191,7 +186,7 @@ class WidgetFileActionMixin:
|
|||
break
|
||||
|
||||
rname_to = rename_input.get_text().strip()
|
||||
target = f"{view.get_current_directory()}/{rname_to}"
|
||||
target = f"{tab.get_current_directory()}/{rname_to}"
|
||||
self.handle_files([uri], "rename", target)
|
||||
|
||||
|
||||
|
|
@ -201,19 +196,19 @@ class WidgetFileActionMixin:
|
|||
self.selected_files.clear()
|
||||
|
||||
def cut_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
self.to_cut_files = uris
|
||||
|
||||
def copy_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
self.to_copy_files = uris
|
||||
|
||||
def paste_files(self):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
target = f"{view.get_current_directory()}"
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
target = f"{tab.get_current_directory()}"
|
||||
|
||||
if len(self.to_copy_files) > 0:
|
||||
self.handle_files(self.to_copy_files, "copy", target)
|
||||
|
|
@ -221,7 +216,7 @@ class WidgetFileActionMixin:
|
|||
self.handle_files(self.to_cut_files, "move", target)
|
||||
|
||||
def delete_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
response = None
|
||||
|
||||
|
|
@ -236,7 +231,7 @@ class WidgetFileActionMixin:
|
|||
type = file.query_file_type(flags=Gio.FileQueryInfoFlags.NONE)
|
||||
|
||||
if type == Gio.FileType.DIRECTORY:
|
||||
view.delete_file( file.get_path() )
|
||||
tab.delete_file( file.get_path() )
|
||||
else:
|
||||
file.delete(cancellable=None)
|
||||
else:
|
||||
|
|
@ -244,13 +239,13 @@ class WidgetFileActionMixin:
|
|||
|
||||
|
||||
def trash_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
for uri in uris:
|
||||
self.trashman.trash(uri, False)
|
||||
|
||||
def restore_trash_files(self):
|
||||
wid, tid, view, iconview, store = self.get_current_state()
|
||||
wid, tid, tab, icon_grid, store = self.get_current_state()
|
||||
uris = self.format_to_uris(store, wid, tid, self.selected_files, True)
|
||||
for uri in uris:
|
||||
self.trashman.restore(filename=uri.split("/")[-1], verbose=False)
|
||||
|
|
@ -264,9 +259,9 @@ class WidgetFileActionMixin:
|
|||
file_name = fname_field.get_text().strip()
|
||||
type = self.builder.get_object("context_menu_type_toggle").get_state()
|
||||
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
target = f"{view.get_current_directory()}"
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
target = f"{tab.get_current_directory()}"
|
||||
|
||||
if file_name:
|
||||
path = f"{target}/{file_name}"
|
||||
|
|
@ -331,9 +326,9 @@ class WidgetFileActionMixin:
|
|||
type = _file.query_file_type(flags=Gio.FileQueryInfoFlags.NONE)
|
||||
|
||||
if type == Gio.FileType.DIRECTORY:
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
view.delete_file( _file.get_path() )
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
tab.delete_file( _file.get_path() )
|
||||
else:
|
||||
_file.delete(cancellable=None)
|
||||
|
||||
|
|
@ -358,16 +353,16 @@ class WidgetFileActionMixin:
|
|||
|
||||
type = file.query_file_type(flags=Gio.FileQueryInfoFlags.NONE)
|
||||
if type == Gio.FileType.DIRECTORY:
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
fPath = file.get_path()
|
||||
tPath = target.get_path()
|
||||
state = True
|
||||
|
||||
if action == "copy":
|
||||
view.copy_file(fPath, tPath)
|
||||
tab.copy_file(fPath, tPath)
|
||||
if action == "move" or action == "rename":
|
||||
view.move_file(fPath, tPath)
|
||||
tab.move_file(fPath, tPath)
|
||||
else:
|
||||
if action == "copy":
|
||||
file.copy(target, flags=Gio.FileCopyFlags.BACKUP, cancellable=None)
|
||||
|
|
|
|||
|
|
@ -22,29 +22,29 @@ def threaded(fn):
|
|||
class WidgetMixin:
|
||||
"""docstring for WidgetMixin"""
|
||||
|
||||
def load_store(self, view, store, save_state=False):
|
||||
def load_store(self, tab, store, save_state=False):
|
||||
store.clear()
|
||||
dir = view.get_current_directory()
|
||||
files = view.get_files()
|
||||
dir = tab.get_current_directory()
|
||||
files = tab.get_files()
|
||||
|
||||
for i, file in enumerate(files):
|
||||
store.append([None, file[0]])
|
||||
self.create_icon(i, view, store, dir, file[0])
|
||||
self.create_icon(i, tab, store, dir, file[0])
|
||||
|
||||
# NOTE: Not likely called often from here but it could be useful
|
||||
if save_state:
|
||||
self.window_controller.save_state()
|
||||
self.fm_controller.save_state()
|
||||
|
||||
@threaded
|
||||
def create_icon(self, i, view, store, dir, file):
|
||||
icon = view.create_icon(dir, file)
|
||||
def create_icon(self, i, tab, store, dir, file):
|
||||
icon = tab.create_icon(dir, file)
|
||||
fpath = f"{dir}/{file}"
|
||||
GLib.idle_add(self.update_store, (i, store, icon, view, fpath,))
|
||||
GLib.idle_add(self.update_store, (i, store, icon, tab, fpath,))
|
||||
|
||||
# NOTE: Might need to keep an eye on this throwing invalid iters when too
|
||||
# many updates are happening to a folder. Example: /tmp
|
||||
def update_store(self, item):
|
||||
i, store, icon, view, fpath = item
|
||||
i, store, icon, tab, fpath = item
|
||||
itr = None
|
||||
|
||||
try:
|
||||
|
|
@ -60,12 +60,12 @@ class WidgetMixin:
|
|||
return
|
||||
|
||||
if not icon:
|
||||
icon = self.get_system_thumbnail(fpath, view.SYS_ICON_WH[0])
|
||||
icon = self.get_system_thumbnail(fpath, tab.SYS_ICON_WH[0])
|
||||
if not icon:
|
||||
if fpath.endswith(".gif"):
|
||||
icon = GdkPixbuf.PixbufAnimation.get_static_image(fpath)
|
||||
else:
|
||||
icon = GdkPixbuf.Pixbuf.new_from_file(view.DEFAULT_ICON)
|
||||
icon = GdkPixbuf.Pixbuf.new_from_file(tab.DEFAULT_ICON)
|
||||
|
||||
store.set_value(itr, 0, icon)
|
||||
|
||||
|
|
@ -90,31 +90,29 @@ class WidgetMixin:
|
|||
return None
|
||||
|
||||
|
||||
|
||||
|
||||
def create_tab_widget(self, view):
|
||||
tab = Gtk.ButtonBox()
|
||||
def create_tab_widget(self, tab):
|
||||
tab_widget = Gtk.ButtonBox()
|
||||
label = Gtk.Label()
|
||||
tid = Gtk.Label()
|
||||
close = Gtk.Button()
|
||||
icon = Gtk.Image(stock=Gtk.STOCK_CLOSE)
|
||||
|
||||
label.set_label(f"{view.get_end_of_path()}")
|
||||
label.set_width_chars(len(view.get_end_of_path()))
|
||||
label.set_label(f"{tab.get_end_of_path()}")
|
||||
label.set_width_chars(len(tab.get_end_of_path()))
|
||||
label.set_xalign(0.0)
|
||||
tid.set_label(f"{view.get_id()}")
|
||||
tid.set_label(f"{tab.get_id()}")
|
||||
|
||||
close.add(icon)
|
||||
tab.add(label)
|
||||
tab.add(close)
|
||||
tab.add(tid)
|
||||
tab_widget.add(label)
|
||||
tab_widget.add(close)
|
||||
tab_widget.add(tid)
|
||||
|
||||
close.connect("released", self.close_tab)
|
||||
tab.show_all()
|
||||
tab_widget.show_all()
|
||||
tid.hide()
|
||||
return tab
|
||||
return tab_widget
|
||||
|
||||
def create_grid_iconview_widget(self, view, wid):
|
||||
def create_icon_grid_widget(self, tab, wid):
|
||||
scroll = Gtk.ScrolledWindow()
|
||||
grid = Gtk.IconView()
|
||||
store = Gtk.ListStore(GdkPixbuf.Pixbuf or GdkPixbuf.PixbufAnimation or None, str)
|
||||
|
|
@ -134,11 +132,11 @@ class WidgetMixin:
|
|||
grid.set_column_spacing(18)
|
||||
|
||||
grid.connect("button_release_event", self.grid_icon_single_click)
|
||||
grid.connect("item-activated", self.grid_icon_double_click)
|
||||
grid.connect("selection-changed", self.grid_set_selected_items)
|
||||
grid.connect("drag-data-get", self.grid_on_drag_set)
|
||||
grid.connect("drag-data-received", self.grid_on_drag_data_received)
|
||||
grid.connect("drag-motion", self.grid_on_drag_motion)
|
||||
grid.connect("item-activated", self.grid_icon_double_click)
|
||||
grid.connect("selection-changed", self.grid_set_selected_items)
|
||||
grid.connect("drag-data-get", self.grid_on_drag_set)
|
||||
grid.connect("drag-data-received", self.grid_on_drag_data_received)
|
||||
grid.connect("drag-motion", self.grid_on_drag_motion)
|
||||
|
||||
|
||||
URI_TARGET_TYPE = 80
|
||||
|
|
@ -150,17 +148,16 @@ class WidgetMixin:
|
|||
|
||||
grid.show_all()
|
||||
scroll.add(grid)
|
||||
grid.set_name(f"{wid}|{view.get_id()}")
|
||||
scroll.set_name(f"{wid}|{view.get_id()}")
|
||||
self.builder.expose_object(f"{wid}|{view.get_id()}|iconview", grid)
|
||||
self.builder.expose_object(f"{wid}|{view.get_id()}", scroll)
|
||||
grid.set_name(f"{wid}|{tab.get_id()}")
|
||||
scroll.set_name(f"{wid}|{tab.get_id()}")
|
||||
self.builder.expose_object(f"{wid}|{tab.get_id()}|icon_grid", grid)
|
||||
self.builder.expose_object(f"{wid}|{tab.get_id()}", scroll)
|
||||
return scroll, store
|
||||
|
||||
def create_grid_treeview_widget(self, view, wid):
|
||||
def create_icon_tree_widget(self, tab, wid):
|
||||
scroll = Gtk.ScrolledWindow()
|
||||
grid = Gtk.TreeView()
|
||||
store = Gtk.ListStore(GdkPixbuf.Pixbuf or GdkPixbuf.PixbufAnimation or None, str)
|
||||
# store = Gtk.TreeStore(GdkPixbuf.Pixbuf or None, str)
|
||||
store = Gtk.TreeStore(GdkPixbuf.Pixbuf or GdkPixbuf.PixbufAnimation or None, str)
|
||||
column = Gtk.TreeViewColumn("Icons")
|
||||
icon = Gtk.CellRendererPixbuf()
|
||||
name = Gtk.CellRendererText()
|
||||
|
|
@ -184,10 +181,10 @@ class WidgetMixin:
|
|||
grid.set_enable_tree_lines(False)
|
||||
|
||||
grid.connect("button_release_event", self.grid_icon_single_click)
|
||||
grid.connect("row-activated", self.grid_icon_double_click)
|
||||
grid.connect("drag-data-get", self.grid_on_drag_set)
|
||||
grid.connect("drag-data-received", self.grid_on_drag_data_received)
|
||||
grid.connect("drag-motion", self.grid_on_drag_motion)
|
||||
grid.connect("row-activated", self.grid_icon_double_click)
|
||||
grid.connect("drag-data-get", self.grid_on_drag_set)
|
||||
grid.connect("drag-data-received", self.grid_on_drag_data_received)
|
||||
grid.connect("drag-motion", self.grid_on_drag_motion)
|
||||
|
||||
URI_TARGET_TYPE = 80
|
||||
uri_target = Gtk.TargetEntry.new('text/uri-list', Gtk.TargetFlags(0), URI_TARGET_TYPE)
|
||||
|
|
@ -199,23 +196,23 @@ class WidgetMixin:
|
|||
|
||||
grid.show_all()
|
||||
scroll.add(grid)
|
||||
grid.set_name(f"{wid}|{view.get_id()}")
|
||||
scroll.set_name(f"{wid}|{view.get_id()}")
|
||||
grid.set_name(f"{wid}|{tab.get_id()}")
|
||||
scroll.set_name(f"{wid}|{tab.get_id()}")
|
||||
grid.columns_autosize()
|
||||
self.builder.expose_object(f"{wid}|{view.get_id()}", scroll)
|
||||
self.builder.expose_object(f"{wid}|{tab.get_id()}", scroll)
|
||||
return scroll, store
|
||||
|
||||
|
||||
def get_store_and_label_from_notebook(self, notebook, _name):
|
||||
icon_view = None
|
||||
icon_grid = None
|
||||
tab_label = None
|
||||
store = None
|
||||
|
||||
for obj in notebook.get_children():
|
||||
icon_view = obj.get_children()[0]
|
||||
name = icon_view.get_name()
|
||||
icon_grid = obj.get_children()[0]
|
||||
name = icon_grid.get_name()
|
||||
if name == _name:
|
||||
store = icon_view.get_model()
|
||||
store = icon_grid.get_model()
|
||||
tab_label = notebook.get_tab_label(obj).get_children()[0]
|
||||
|
||||
return store, tab_label
|
||||
|
|
|
|||
|
|
@ -10,9 +10,6 @@ from gi.repository import Gdk, Gio
|
|||
|
||||
# Application imports
|
||||
from .tab_mixin import TabMixin
|
||||
from .widget_mixin import WidgetMixin
|
||||
|
||||
|
||||
|
||||
|
||||
class WindowMixin(TabMixin):
|
||||
|
|
@ -22,47 +19,46 @@ class WindowMixin(TabMixin):
|
|||
if session_json:
|
||||
for j, value in enumerate(session_json):
|
||||
i = j + 1
|
||||
isHidden = True if value[0]["window"]["isHidden"] == "True" else False
|
||||
object = self.builder.get_object(f"tggl_notebook_{i}")
|
||||
views = value[0]["window"]["views"]
|
||||
self.window_controller.create_window()
|
||||
object.set_active(True)
|
||||
notebook_tggl_button = self.builder.get_object(f"tggl_notebook_{i}")
|
||||
is_hidden = True if value[0]["window"]["isHidden"] == "True" else False
|
||||
tabs = value[0]["window"]["tabs"]
|
||||
self.fm_controller.create_window()
|
||||
notebook_tggl_button.set_active(True)
|
||||
|
||||
for view in views:
|
||||
self.create_new_view_notebook(None, i, view)
|
||||
for tab in tabs:
|
||||
self.create_new_tab_notebook(None, i, tab)
|
||||
|
||||
if isHidden:
|
||||
self.toggle_notebook_pane(object)
|
||||
if is_hidden:
|
||||
self.toggle_notebook_pane(notebook_tggl_button)
|
||||
|
||||
try:
|
||||
if not self.is_pane4_hidden:
|
||||
icon_view = self.window4.get_children()[1].get_children()[0]
|
||||
icon_view.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
icon_grid = self.window4.get_children()[1].get_children()[0]
|
||||
elif not self.is_pane3_hidden:
|
||||
icon_view = self.window3.get_children()[1].get_children()[0]
|
||||
icon_view.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
icon_grid = self.window3.get_children()[1].get_children()[0]
|
||||
elif not self.is_pane2_hidden:
|
||||
icon_view = self.window2.get_children()[1].get_children()[0]
|
||||
icon_view.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
icon_grid = self.window2.get_children()[1].get_children()[0]
|
||||
elif not self.is_pane1_hidden:
|
||||
icon_view = self.window1.get_children()[1].get_children()[0]
|
||||
icon_view.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
icon_grid = self.window1.get_children()[1].get_children()[0]
|
||||
|
||||
icon_grid.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
icon_grid.event(Gdk.Event().new(type=Gdk.EventType.BUTTON_RELEASE))
|
||||
except Exception as e:
|
||||
print("\n: The saved session might be missing window data! :\nLocation: ~/.config/solarfm/session.json\nFix: Back it up and delete it to reset.\n")
|
||||
print(repr(e))
|
||||
else:
|
||||
for j in range(0, 4):
|
||||
i = j + 1
|
||||
self.window_controller.create_window()
|
||||
self.create_new_view_notebook(None, i, None)
|
||||
self.fm_controller.create_window()
|
||||
self.create_new_tab_notebook(None, i, None)
|
||||
|
||||
|
||||
def get_fm_window(self, wid):
|
||||
return self.window_controller.get_window_by_nickname(f"window_{wid}")
|
||||
return self.fm_controller.get_window_by_nickname(f"window_{wid}")
|
||||
|
||||
def format_to_uris(self, store, wid, tid, treePaths, use_just_path=False):
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
dir = view.get_current_directory()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
dir = tab.get_current_directory()
|
||||
uris = []
|
||||
|
||||
for path in treePaths:
|
||||
|
|
@ -80,10 +76,10 @@ class WindowMixin(TabMixin):
|
|||
return uris
|
||||
|
||||
|
||||
def set_bottom_labels(self, view):
|
||||
_wid, _tid, _view, icon_view, store = self.get_current_state()
|
||||
selected_files = icon_view.get_selected_items()
|
||||
current_directory = view.get_current_directory()
|
||||
def set_bottom_labels(self, tab):
|
||||
_wid, _tid, _tab, icon_grid, store = self.get_current_state()
|
||||
selected_files = icon_grid.get_selected_items()
|
||||
current_directory = tab.get_current_directory()
|
||||
path_file = Gio.File.new_for_path(current_directory)
|
||||
mount_file = path_file.query_filesystem_info(attributes="filesystem::*", cancellable=None)
|
||||
formatted_mount_free = self.sizeof_fmt( int(mount_file.get_attribute_as_string("filesystem::free")) )
|
||||
|
|
@ -98,7 +94,7 @@ class WindowMixin(TabMixin):
|
|||
|
||||
# If something selected
|
||||
self.bottom_size_label.set_label(f"{formatted_mount_free} free / {formatted_mount_size}")
|
||||
self.bottom_path_label.set_label(view.get_current_directory())
|
||||
self.bottom_path_label.set_label(tab.get_current_directory())
|
||||
if len(selected_files) > 0:
|
||||
uris = self.format_to_uris(store, _wid, _tid, selected_files, True)
|
||||
combined_size = 0
|
||||
|
|
@ -115,29 +111,29 @@ class WindowMixin(TabMixin):
|
|||
|
||||
|
||||
formatted_size = self.sizeof_fmt(combined_size)
|
||||
if view.get_hidden():
|
||||
self.bottom_path_label.set_label(f" {len(uris)} / {view.get_files_count()} ({formatted_size})")
|
||||
if tab.is_hiding_hidden():
|
||||
self.bottom_path_label.set_label(f" {len(uris)} / {tab.get_files_count()} ({formatted_size})")
|
||||
else:
|
||||
self.bottom_path_label.set_label(f" {len(uris)} / {view.get_not_hidden_count()} ({formatted_size})")
|
||||
self.bottom_path_label.set_label(f" {len(uris)} / {tab.get_not_hidden_count()} ({formatted_size})")
|
||||
|
||||
return
|
||||
|
||||
# If nothing selected
|
||||
if view.get_hidden():
|
||||
if view.get_hidden_count() > 0:
|
||||
self.bottom_file_count_label.set_label(f"{view.get_not_hidden_count()} visible ({view.get_hidden_count()} hidden)")
|
||||
if tab.get_hidden():
|
||||
if tab.get_hidden_count() > 0:
|
||||
self.bottom_file_count_label.set_label(f"{tab.get_not_hidden_count()} visible ({tab.get_hidden_count()} hidden)")
|
||||
else:
|
||||
self.bottom_file_count_label.set_label(f"{view.get_files_count()} items")
|
||||
self.bottom_file_count_label.set_label(f"{tab.get_files_count()} items")
|
||||
else:
|
||||
self.bottom_file_count_label.set_label(f"{view.get_files_count()} items")
|
||||
self.bottom_file_count_label.set_label(f"{tab.get_files_count()} items")
|
||||
|
||||
|
||||
|
||||
def set_window_title(self):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
dir = view.get_current_directory()
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
dir = tab.get_current_directory()
|
||||
|
||||
for _notebook in self.notebooks:
|
||||
ctx = _notebook.get_style_context()
|
||||
|
|
@ -149,73 +145,73 @@ class WindowMixin(TabMixin):
|
|||
ctx.add_class("notebook-selected-focus")
|
||||
|
||||
self.window.set_title(f"SolarFM ~ {dir}")
|
||||
self.set_bottom_labels(view)
|
||||
self.set_bottom_labels(tab)
|
||||
|
||||
def set_path_text(self, wid, tid):
|
||||
path_entry = self.builder.get_object("path_entry")
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
path_entry.set_text(view.get_current_directory())
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
path_entry.set_text(tab.get_current_directory())
|
||||
|
||||
def grid_set_selected_items(self, iconview):
|
||||
self.selected_files = iconview.get_selected_items()
|
||||
def grid_set_selected_items(self, icons_grid):
|
||||
self.selected_files = icons_grid.get_selected_items()
|
||||
|
||||
def grid_cursor_toggled(self, iconview):
|
||||
def grid_cursor_toggled(self, icons_grid):
|
||||
print("wat...")
|
||||
|
||||
def grid_icon_single_click(self, iconview, eve):
|
||||
def grid_icon_single_click(self, icons_grid, eve):
|
||||
try:
|
||||
self.path_menu.popdown()
|
||||
wid, tid = iconview.get_name().split("|")
|
||||
self.window_controller.set__wid_and_tid(wid, tid)
|
||||
wid, tid = icons_grid.get_name().split("|")
|
||||
self.fm_controller.set__wid_and_tid(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
|
||||
if self.single_click_open: # FIXME: need to find a way to pass the model index
|
||||
self.grid_icon_double_click(iconview)
|
||||
self.grid_icon_double_click(icons_grid)
|
||||
elif eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 3: # r-click
|
||||
self.show_context_menu()
|
||||
|
||||
except Exception as e:
|
||||
print(repr(e))
|
||||
self.display_message(self.error, f"{repr(e)}")
|
||||
self.display_message(self.error_color, f"{repr(e)}")
|
||||
|
||||
def grid_icon_double_click(self, iconview, item, data=None):
|
||||
def grid_icon_double_click(self, icons_grid, item, data=None):
|
||||
try:
|
||||
if self.ctrlDown and self.shiftDown:
|
||||
if self.ctrl_down and self.shift_down:
|
||||
self.unset_keys_and_data()
|
||||
self.execute_files(in_terminal=True)
|
||||
return
|
||||
elif self.ctrlDown:
|
||||
elif self.ctrl_down:
|
||||
self.unset_keys_and_data()
|
||||
self.execute_files()
|
||||
return
|
||||
|
||||
|
||||
wid, tid, view, _iconview, store = self.get_current_state()
|
||||
wid, tid, tab, _icons_grid, store = self.get_current_state()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
tab_label = self.get_tab_label(notebook, iconview)
|
||||
tab_label = self.get_tab_label(notebook, icons_grid)
|
||||
|
||||
fileName = store[item][1]
|
||||
dir = view.get_current_directory()
|
||||
dir = tab.get_current_directory()
|
||||
file = f"{dir}/{fileName}"
|
||||
|
||||
if isdir(file):
|
||||
view.set_path(file)
|
||||
self.update_view(tab_label, view, store, wid, tid)
|
||||
tab.set_path(file)
|
||||
self.update_tab(tab_label, tab, store, wid, tid)
|
||||
else:
|
||||
self.open_files()
|
||||
except Exception as e:
|
||||
self.display_message(self.error, f"{repr(e)}")
|
||||
self.display_message(self.error_color, f"{repr(e)}")
|
||||
|
||||
|
||||
|
||||
def grid_on_drag_set(self, iconview, drag_context, data, info, time):
|
||||
action = iconview.get_name()
|
||||
def grid_on_drag_set(self, icons_grid, drag_context, data, info, time):
|
||||
action = icons_grid.get_name()
|
||||
wid, tid = action.split("|")
|
||||
store = iconview.get_model()
|
||||
treePaths = iconview.get_selected_items()
|
||||
store = icons_grid.get_model()
|
||||
treePaths = icons_grid.get_selected_items()
|
||||
# NOTE: Need URIs as URI format for DnD to work. Will strip 'file://'
|
||||
# further down call chain when doing internal fm stuff.
|
||||
uris = self.format_to_uris(store, wid, tid, treePaths)
|
||||
|
|
@ -224,30 +220,30 @@ class WindowMixin(TabMixin):
|
|||
data.set_uris(uris)
|
||||
data.set_text(uris_text, -1)
|
||||
|
||||
def grid_on_drag_motion(self, iconview, drag_context, x, y, data):
|
||||
current = '|'.join(self.window_controller.get_active_wid_and_tid())
|
||||
target = iconview.get_name()
|
||||
def grid_on_drag_motion(self, icons_grid, drag_context, x, y, data):
|
||||
current = '|'.join(self.fm_controller.get_active_wid_and_tid())
|
||||
target = icons_grid.get_name()
|
||||
wid, tid = target.split("|")
|
||||
store = iconview.get_model()
|
||||
treePath = iconview.get_drag_dest_item().path
|
||||
store = icons_grid.get_model()
|
||||
treePath = icons_grid.get_drag_dest_item().path
|
||||
|
||||
if treePath:
|
||||
uri = self.format_to_uris(store, wid, tid, treePath)[0].replace("file://", "")
|
||||
self.override_drop_dest = uri if isdir(uri) else None
|
||||
|
||||
if target not in current:
|
||||
self.window_controller.set__wid_and_tid(wid, tid)
|
||||
self.fm_controller.set__wid_and_tid(wid, tid)
|
||||
|
||||
|
||||
def grid_on_drag_data_received(self, widget, drag_context, x, y, data, info, time):
|
||||
if info == 80:
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
store, tab_label = self.get_store_and_label_from_notebook(notebook, f"{wid}|{tid}")
|
||||
view = self.get_fm_window(wid).get_view_by_id(tid)
|
||||
tab = self.get_fm_window(wid).get_tab_by_id(tid)
|
||||
|
||||
uris = data.get_uris()
|
||||
dest = f"{view.get_current_directory()}" if not self.override_drop_dest else self.override_drop_dest
|
||||
dest = f"{tab.get_current_directory()}" if not self.override_drop_dest else self.override_drop_dest
|
||||
if len(uris) == 0:
|
||||
uris = data.get_text().split("\n")
|
||||
|
||||
|
|
@ -256,5 +252,5 @@ class WindowMixin(TabMixin):
|
|||
self.move_files(uris, dest)
|
||||
|
||||
|
||||
def create_new_view_notebook(self, widget=None, wid=None, path=None):
|
||||
def create_new_tab_notebook(self, widget=None, wid=None, path=None):
|
||||
self.create_tab(wid, path)
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ class IPCSignalsMixin:
|
|||
print(message)
|
||||
|
||||
def handle_file_from_ipc(self, path):
|
||||
wid, tid = self.window_controller.get_active_wid_and_tid()
|
||||
wid, tid = self.fm_controller.get_active_wid_and_tid()
|
||||
notebook = self.builder.get_object(f"window_{wid}")
|
||||
if notebook.is_visible():
|
||||
self.create_tab(wid, path)
|
||||
|
|
|
|||
|
|
@ -17,20 +17,20 @@ class KeyboardSignalsMixin:
|
|||
""" KeyboardSignalsMixin keyboard hooks controller. """
|
||||
|
||||
def unset_keys_and_data(self, widget=None, eve=None):
|
||||
self.ctrlDown = False
|
||||
self.shiftDown = False
|
||||
self.altDown = False
|
||||
self.ctrl_down = False
|
||||
self.shift_down = False
|
||||
self.alt_down = False
|
||||
self.is_searching = 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:
|
||||
if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
|
||||
if "control" in keyname:
|
||||
self.ctrlDown = True
|
||||
self.ctrl_down = True
|
||||
if "shift" in keyname:
|
||||
self.shiftDown = True
|
||||
self.shift_down = True
|
||||
if "alt" in keyname:
|
||||
self.altDown = True
|
||||
self.alt_down = True
|
||||
|
||||
# NOTE: Yes, this should actually be mapped to some key controller setting
|
||||
# file or something. Sue me.
|
||||
|
|
@ -39,84 +39,69 @@ class KeyboardSignalsMixin:
|
|||
if debug:
|
||||
print(f"global_key_release_controller > key > {keyname}")
|
||||
|
||||
if "control" in keyname or "alt" in keyname or "shift" in keyname:
|
||||
if keyname.replace("_l", "").replace("_r", "") in ["control", "alt", "shift"]:
|
||||
if "control" in keyname:
|
||||
self.ctrlDown = False
|
||||
self.ctrl_down = False
|
||||
if "shift" in keyname:
|
||||
self.shiftDown = False
|
||||
self.shift_down = False
|
||||
if "alt" in keyname:
|
||||
self.altDown = False
|
||||
self.alt_down = False
|
||||
|
||||
|
||||
if self.ctrlDown and self.shiftDown and keyname == "t":
|
||||
if self.ctrl_down and self.shift_down and keyname == "t":
|
||||
self.unset_keys_and_data()
|
||||
self.trash_files()
|
||||
|
||||
|
||||
if re.fullmatch(valid_keyvalue_pat, keyname):
|
||||
if not self.is_searching and not self.ctrlDown \
|
||||
and not self.shiftDown and not self.altDown:
|
||||
if not self.is_searching and not self.ctrl_down \
|
||||
and not self.shift_down and not self.alt_down:
|
||||
focused_obj = self.window.get_focus()
|
||||
if isinstance(focused_obj, Gtk.IconView):
|
||||
self.is_searching = True
|
||||
wid, tid, self.search_view, self.search_iconview, store = self.get_current_state()
|
||||
wid, tid, self.search_tab, self.search_icon_grid, store = self.get_current_state()
|
||||
self.unset_keys_and_data()
|
||||
self.popup_search_files(wid, keyname)
|
||||
return
|
||||
|
||||
|
||||
if (self.ctrlDown and keyname in ["1", "kp_1"]):
|
||||
self.builder.get_object("tggl_notebook_1").released()
|
||||
if (self.ctrlDown and keyname in ["2", "kp_2"]):
|
||||
self.builder.get_object("tggl_notebook_2").released()
|
||||
if (self.ctrlDown and keyname in ["3", "kp_3"]):
|
||||
self.builder.get_object("tggl_notebook_3").released()
|
||||
if (self.ctrlDown and keyname in ["4", "kp_4"]):
|
||||
self.builder.get_object("tggl_notebook_4").released()
|
||||
|
||||
if self.ctrlDown and keyname == "q":
|
||||
self.tear_down()
|
||||
if (self.ctrlDown and keyname == "slash") or keyname == "home":
|
||||
self.builder.get_object("go_home").released()
|
||||
if (self.ctrlDown and keyname == "r") or keyname == "f5":
|
||||
self.builder.get_object("refresh_view").released()
|
||||
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.unset_keys_and_data()
|
||||
self.builder.get_object("path_entry").grab_focus()
|
||||
if self.ctrlDown and keyname == "t":
|
||||
self.builder.get_object("create_tab").released()
|
||||
if self.ctrlDown and keyname == "o":
|
||||
self.unset_keys_and_data()
|
||||
self.open_files()
|
||||
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 == "e"):
|
||||
self.unset_keys_and_data()
|
||||
self.rename_files()
|
||||
if self.ctrlDown and keyname == "c":
|
||||
self.copy_files()
|
||||
self.to_cut_files.clear()
|
||||
if self.ctrlDown and keyname == "x":
|
||||
self.to_copy_files.clear()
|
||||
self.cut_files()
|
||||
if self.ctrlDown and keyname == "v":
|
||||
self.paste_files()
|
||||
if self.ctrlDown and keyname == "n":
|
||||
self.unset_keys_and_data()
|
||||
self.show_new_file_menu()
|
||||
|
||||
|
||||
|
||||
if (self.ctrl_down and keyname in ["1", "kp_1", "2", "kp_2", "3", "kp_3", "4", "kp_4"]):
|
||||
self.builder.get_object(f"tggl_notebook_{keyname.strip('kp_')}").released()
|
||||
if keyname in ["alt_l", "alt_r"]:
|
||||
top_main_menubar = self.builder.get_object("top_main_menubar")
|
||||
if top_main_menubar.is_visible():
|
||||
top_main_menubar.hide()
|
||||
else:
|
||||
top_main_menubar.show()
|
||||
top_main_menubar.hide() if top_main_menubar.is_visible() else top_main_menubar.show()
|
||||
|
||||
if self.ctrl_down and keyname == "q":
|
||||
self.tear_down()
|
||||
if (self.ctrl_down and keyname == "slash") or keyname == "home":
|
||||
self.builder.get_object("go_home").released()
|
||||
if (self.ctrl_down and keyname == "r") or keyname == "f5":
|
||||
self.builder.get_object("refresh_tab").released()
|
||||
if (self.ctrl_down and keyname == "up") or (self.ctrl_down and keyname == "u"):
|
||||
self.builder.get_object("go_up").released()
|
||||
if self.ctrl_down and keyname == "l":
|
||||
self.unset_keys_and_data()
|
||||
self.builder.get_object("path_entry").grab_focus()
|
||||
if self.ctrl_down and keyname == "t":
|
||||
self.builder.get_object("create_tab").released()
|
||||
if self.ctrl_down and keyname == "o":
|
||||
self.unset_keys_and_data()
|
||||
self.open_files()
|
||||
if self.ctrl_down and keyname == "w":
|
||||
self.keyboard_close_tab()
|
||||
if self.ctrl_down and keyname == "h":
|
||||
self.show_hide_hidden_files()
|
||||
if (self.ctrl_down and keyname == "e"):
|
||||
self.unset_keys_and_data()
|
||||
self.rename_files()
|
||||
if self.ctrl_down and keyname == "c":
|
||||
self.copy_files()
|
||||
self.to_cut_files.clear()
|
||||
if self.ctrl_down and keyname == "x":
|
||||
self.to_copy_files.clear()
|
||||
self.cut_files()
|
||||
if self.ctrl_down and keyname == "v":
|
||||
self.paste_files()
|
||||
if self.ctrl_down and keyname == "n":
|
||||
self.unset_keys_and_data()
|
||||
self.show_new_file_menu()
|
||||
if keyname == "delete":
|
||||
self.unset_keys_and_data()
|
||||
self.delete_files()
|
||||
|
|
|
|||
|
|
@ -15,8 +15,15 @@ def threaded(fn):
|
|||
|
||||
|
||||
|
||||
class IPCServerMixin:
|
||||
class IPCServer:
|
||||
""" Create a listener so that other SolarFM instances send requests back to existing instance. """
|
||||
def __init__(self):
|
||||
self.is_ipc_alive = False
|
||||
self.ipc_authkey = b'solarfm-ipc'
|
||||
self.ipc_address = '127.0.0.1'
|
||||
self.ipc_port = 4848
|
||||
self.ipc_timeout = 15.0
|
||||
|
||||
|
||||
@threaded
|
||||
def create_ipc_server(self):
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
# Python imports
|
||||
import os, inspect, time
|
||||
|
||||
# Lib imports
|
||||
|
||||
# Application imports
|
||||
from utils.settings import Settings
|
||||
from context.controller import Controller
|
||||
from __builtins__ import EventSystem
|
||||
|
||||
|
||||
|
||||
|
||||
class Main(EventSystem):
|
||||
""" Create Settings and Controller classes. Bind signal to Builder. Inherit from Builtins to bind global methods and classes. """
|
||||
|
||||
def __init__(self, args, unknownargs):
|
||||
if not trace_debug:
|
||||
event_system.create_ipc_server()
|
||||
time.sleep(0.2) # Make sure everything's up before proceeding.
|
||||
|
||||
if not event_system.is_ipc_alive:
|
||||
if unknownargs:
|
||||
for arg in unknownargs:
|
||||
if os.path.isdir(arg):
|
||||
message = f"FILE|{arg}"
|
||||
event_system.send_ipc_message(message)
|
||||
|
||||
if args.new_tab and os.path.isdir(args.new_tab):
|
||||
message = f"FILE|{args.new_tab}"
|
||||
event_system.send_ipc_message(message)
|
||||
|
||||
raise Exception("IPC Server Exists: Will send path(s) to it and close...")
|
||||
|
||||
|
||||
settings = Settings()
|
||||
settings.create_window()
|
||||
|
||||
controller = Controller(args, unknownargs, settings)
|
||||
if not controller:
|
||||
raise Exception("Controller exited and doesn't exist...")
|
||||
|
||||
# Gets the methods from the classes and sets to handler.
|
||||
# Then, builder connects to any signals it needs.
|
||||
classes = [controller]
|
||||
handlers = {}
|
||||
for c in classes:
|
||||
methods = None
|
||||
try:
|
||||
methods = inspect.getmembers(c, predicate=inspect.ismethod)
|
||||
handlers.update(methods)
|
||||
except Exception as e:
|
||||
print(repr(e))
|
||||
|
||||
settings.builder.connect_signals(handlers)
|
||||
|
|
@ -40,20 +40,20 @@ class WindowController:
|
|||
return window
|
||||
|
||||
|
||||
def add_view_for_window(self, win_id):
|
||||
def add_tab_for_window(self, win_id):
|
||||
for window in self._windows:
|
||||
if window.get_id() == win_id:
|
||||
return window.create_view()
|
||||
return window.create_tab()
|
||||
|
||||
def add_view_for_window_by_name(self, name):
|
||||
def add_tab_for_window_by_name(self, name):
|
||||
for window in self._windows:
|
||||
if window.get_name() == name:
|
||||
return window.create_view()
|
||||
return window.create_tab()
|
||||
|
||||
def add_view_for_window_by_nickname(self, nickname):
|
||||
def add_tab_for_window_by_nickname(self, nickname):
|
||||
for window in self._windows:
|
||||
if window.get_nickname() == nickname:
|
||||
return window.create_view()
|
||||
return window.create_tab()
|
||||
|
||||
def pop_window(self):
|
||||
self._windows.pop()
|
||||
|
|
@ -116,33 +116,33 @@ class WindowController:
|
|||
print(f"Name: {window.get_name()}")
|
||||
print(f"Nickname: {window.get_nickname()}")
|
||||
print(f"Is Hidden: {window.is_hidden()}")
|
||||
print(f"View Count: {window.get_views_count()}")
|
||||
print(f"Tab Count: {window.get_tabs_count()}")
|
||||
print("\n-------------------------\n")
|
||||
|
||||
|
||||
|
||||
def list_files_from_views_of_window(self, win_id):
|
||||
def list_files_from_tabs_of_window(self, win_id):
|
||||
for window in self._windows:
|
||||
if window.get_id() == win_id:
|
||||
window.list_files_from_views()
|
||||
window.list_files_from_tabs()
|
||||
break
|
||||
|
||||
def get_views_count(self, win_id):
|
||||
def get_tabs_count(self, win_id):
|
||||
for window in self._windows:
|
||||
if window.get_id() == win_id:
|
||||
return window.get_views_count()
|
||||
return window.get_tabs_count()
|
||||
|
||||
def get_views_from_window(self, win_id):
|
||||
def get_tabs_from_window(self, win_id):
|
||||
for window in self._windows:
|
||||
if window.get_id() == win_id:
|
||||
return window.get_all_views()
|
||||
return window.get_all_tabs()
|
||||
|
||||
|
||||
|
||||
|
||||
def unload_views_and_windows(self):
|
||||
def unload_tabs_and_windows(self):
|
||||
for window in self._windows:
|
||||
window.get_all_views().clear()
|
||||
window.get_all_tabs().clear()
|
||||
|
||||
self._windows.clear()
|
||||
|
||||
|
|
@ -153,9 +153,9 @@ class WindowController:
|
|||
if len(self._windows) > 0:
|
||||
windows = []
|
||||
for window in self._windows:
|
||||
views = []
|
||||
for view in window.get_all_views():
|
||||
views.append(view.get_current_directory())
|
||||
tabs = []
|
||||
for tab in window.get_all_tabs():
|
||||
tabs.append(tab.get_current_directory())
|
||||
|
||||
windows.append(
|
||||
[
|
||||
|
|
@ -165,7 +165,7 @@ class WindowController:
|
|||
"Name": window.get_name(),
|
||||
"Nickname": window.get_nickname(),
|
||||
"isHidden": f"{window.is_hidden()}",
|
||||
'views': views
|
||||
'tabs': tabs
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ from .icons.icon import Icon
|
|||
from .path import Path
|
||||
|
||||
|
||||
class View(Settings, FileHandler, Launcher, Icon, Path):
|
||||
class Tab(Settings, FileHandler, Launcher, Icon, Path):
|
||||
def __init__(self):
|
||||
self.logger = None
|
||||
self._id_length = 10
|
||||
|
|
@ -6,7 +6,7 @@ from random import randint
|
|||
|
||||
|
||||
# Application imports
|
||||
from .views.view import View
|
||||
from .tabs.tab import Tab
|
||||
|
||||
|
||||
class Window:
|
||||
|
|
@ -16,45 +16,40 @@ class Window:
|
|||
self._name = ""
|
||||
self._nickname = ""
|
||||
self._isHidden = False
|
||||
self._views = []
|
||||
self._tabs = []
|
||||
|
||||
self._generate_id()
|
||||
self._set_name()
|
||||
|
||||
|
||||
def create_view(self):
|
||||
view = View()
|
||||
self._views.append(view)
|
||||
return view
|
||||
def create_tab(self):
|
||||
tab = Tab()
|
||||
self._tabs.append(tab)
|
||||
return tab
|
||||
|
||||
def pop_view(self):
|
||||
self._views.pop()
|
||||
def pop_tab(self):
|
||||
self._tabs.pop()
|
||||
|
||||
def delete_view_by_id(self, vid):
|
||||
for view in self._views:
|
||||
if view.get_id() == vid:
|
||||
self._views.remove(view)
|
||||
def delete_tab_by_id(self, vid):
|
||||
for tab in self._tabs:
|
||||
if tab.get_id() == vid:
|
||||
self._tabs.remove(tab)
|
||||
break
|
||||
|
||||
|
||||
def get_view_by_id(self, vid):
|
||||
for view in self._views:
|
||||
if view.get_id() == vid:
|
||||
return view
|
||||
def get_tab_by_id(self, vid):
|
||||
for tab in self._tabs:
|
||||
if tab.get_id() == vid:
|
||||
return tab
|
||||
|
||||
def get_view_by_index(self, index):
|
||||
return self._views[index]
|
||||
def get_tab_by_index(self, index):
|
||||
return self._tabs[index]
|
||||
|
||||
def get_views_count(self):
|
||||
return len(self._views)
|
||||
|
||||
def get_all_views(self):
|
||||
return self._views
|
||||
|
||||
def list_files_from_views(self):
|
||||
for view in self._views:
|
||||
print(view.get_files())
|
||||
def get_tabs_count(self):
|
||||
return len(self._tabs)
|
||||
|
||||
def get_all_tabs(self):
|
||||
return self._tabs
|
||||
|
||||
def get_id(self):
|
||||
return self._id
|
||||
|
|
@ -68,7 +63,9 @@ class Window:
|
|||
def is_hidden(self):
|
||||
return self._isHidden
|
||||
|
||||
|
||||
def list_files_from_tabs(self):
|
||||
for tab in self._tabs:
|
||||
print(tab.get_files())
|
||||
|
||||
|
||||
def set_nickname(self, nickname):
|
||||
|
|
@ -80,6 +77,7 @@ class Window:
|
|||
def _set_name(self):
|
||||
self._name = "window_" + self.get_id()
|
||||
|
||||
|
||||
def _random_with_N_digits(self, n):
|
||||
range_start = 10**(n-1)
|
||||
range_end = (10**n)-1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
"""
|
||||
Utils module
|
||||
"""
|
||||
|
|
@ -7,8 +7,8 @@ import gi, cairo
|
|||
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 Gtk
|
||||
from gi.repository import Gdk
|
||||
|
||||
|
||||
# Application imports
|
||||
|
|
@ -17,36 +17,39 @@ from .logger import Logger
|
|||
|
||||
class Settings:
|
||||
def __init__(self):
|
||||
self.builder = gtk.Builder()
|
||||
self._SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
|
||||
self._USER_HOME = path.expanduser('~')
|
||||
self._CONFIG_PATH = f"{self._USER_HOME}/.config/{app_name.lower()}"
|
||||
self._PLUGINS_PATH = f"{self._CONFIG_PATH}/plugins"
|
||||
self._USR_SOLARFM = f"/usr/share/{app_name.lower()}"
|
||||
|
||||
self.SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
|
||||
self.USER_HOME = path.expanduser('~')
|
||||
self.CONFIG_PATH = f"{self.USER_HOME}/.config/{app_name.lower()}"
|
||||
self.PLUGINS_PATH = f"{self.CONFIG_PATH}/plugins"
|
||||
self.USR_SOLARFM = f"/usr/share/{app_name.lower()}"
|
||||
self._CSS_FILE = f"{self._CONFIG_PATH}/stylesheet.css"
|
||||
self._WINDOWS_GLADE = f"{self._CONFIG_PATH}/Main_Window.glade"
|
||||
self._DEFAULT_ICONS = f"{self._CONFIG_PATH}/icons"
|
||||
self._WINDOW_ICON = f"{self._DEFAULT_ICONS}/{app_name.lower()}.png"
|
||||
|
||||
self.CSS_FILE = f"{self.CONFIG_PATH}/stylesheet.css"
|
||||
self.WINDOWS_GLADE = f"{self.CONFIG_PATH}/Main_Window.glade"
|
||||
self.DEFAULT_ICONS = f"{self.CONFIG_PATH}/icons"
|
||||
self.WINDOW_ICON = f"{self.DEFAULT_ICONS}/{app_name.lower()}.png"
|
||||
self.main_window = None
|
||||
if not os.path.exists(self._CONFIG_PATH):
|
||||
os.mkdir(self._CONFIG_PATH)
|
||||
if not os.path.exists(self._PLUGINS_PATH):
|
||||
os.mkdir(self._PLUGINS_PATH)
|
||||
|
||||
if not os.path.exists(self.CONFIG_PATH):
|
||||
os.mkdir(self.CONFIG_PATH)
|
||||
if not os.path.exists(self.PLUGINS_PATH):
|
||||
os.mkdir(self.PLUGINS_PATH)
|
||||
if not os.path.exists(self._WINDOWS_GLADE):
|
||||
self._WINDOWS_GLADE = f"{self._USR_SOLARFM}/Main_Window.glade"
|
||||
if not os.path.exists(self._CSS_FILE):
|
||||
self._CSS_FILE = f"{self._USR_SOLARFM}/stylesheet.css"
|
||||
if not os.path.exists(self._WINDOW_ICON):
|
||||
self._WINDOW_ICON = f"{self._USR_SOLARFM}/icons/{app_name.lower()}.png"
|
||||
if not os.path.exists(self._DEFAULT_ICONS):
|
||||
self._DEFAULT_ICONS = f"{self._USR_SOLARFM}/icons"
|
||||
|
||||
if not os.path.exists(self.WINDOWS_GLADE):
|
||||
self.WINDOWS_GLADE = f"{self.USR_SOLARFM}/Main_Window.glade"
|
||||
if not os.path.exists(self.CSS_FILE):
|
||||
self.CSS_FILE = f"{self.USR_SOLARFM}/stylesheet.css"
|
||||
if not os.path.exists(self.WINDOW_ICON):
|
||||
self.WINDOW_ICON = f"{self.USR_SOLARFM}/icons/{app_name.lower()}.png"
|
||||
if not os.path.exists(self.DEFAULT_ICONS):
|
||||
self.DEFAULT_ICONS = f"{self.USR_SOLARFM}/icons"
|
||||
self._success_color = "#88cc27"
|
||||
self._warning_color = "#ffa800"
|
||||
self._error_color = "#ff0000"
|
||||
|
||||
self.logger = Logger(self.CONFIG_PATH).get_logger()
|
||||
self.builder.add_from_file(self.WINDOWS_GLADE)
|
||||
self.main_window = None
|
||||
self.logger = Logger(self._CONFIG_PATH).get_logger()
|
||||
self.builder = Gtk.Builder()
|
||||
self.builder.add_from_file(self._WINDOWS_GLADE)
|
||||
|
||||
|
||||
|
||||
|
|
@ -56,7 +59,7 @@ class Settings:
|
|||
self._set_window_data()
|
||||
|
||||
def _set_window_data(self):
|
||||
self.main_window.set_icon_from_file(self.WINDOW_ICON)
|
||||
self.main_window.set_icon_from_file(self._WINDOW_ICON)
|
||||
screen = self.main_window.get_screen()
|
||||
visual = screen.get_rgba_visual()
|
||||
|
||||
|
|
@ -66,11 +69,11 @@ class Settings:
|
|||
self.main_window.connect("draw", self._area_draw)
|
||||
|
||||
# bind css file
|
||||
cssProvider = gtk.CssProvider()
|
||||
cssProvider.load_from_path(self.CSS_FILE)
|
||||
screen = gdk.Screen.get_default()
|
||||
styleContext = gtk.StyleContext()
|
||||
styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
|
||||
cssProvider = Gtk.CssProvider()
|
||||
cssProvider.load_from_path(self._CSS_FILE)
|
||||
screen = Gdk.Screen.get_default()
|
||||
styleContext = Gtk.StyleContext()
|
||||
styleContext.add_provider_for_screen(screen, cssProvider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
|
||||
|
||||
def _area_draw(self, widget, cr):
|
||||
cr.set_source_rgba(0, 0, 0, 0.54)
|
||||
|
|
@ -92,4 +95,8 @@ class Settings:
|
|||
def get_builder(self): return self.builder
|
||||
def get_logger(self): return self.logger
|
||||
def get_main_window(self): return self.main_window
|
||||
def get_plugins_path(self): return self.PLUGINS_PATH
|
||||
def get_plugins_path(self): return self._PLUGINS_PATH
|
||||
|
||||
def get_success_color(self): return self._success_color
|
||||
def get_warning_color(self): return self._warning_color
|
||||
def get_error_color(self): return self._error_color
|
||||
|
|
|
|||
|
|
@ -616,7 +616,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
<property name="can-focus">False</property>
|
||||
<property name="stock">gtk-save-as</property>
|
||||
</object>
|
||||
<object class="GtkImage" id="createImage">
|
||||
<object class="GtkImage" id="create_img">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="stock">gtk-new</property>
|
||||
|
|
@ -666,7 +666,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
<property name="can-focus">True</property>
|
||||
<property name="receives-default">True</property>
|
||||
<property name="tooltip-text" translatable="yes">Create File/Folder...</property>
|
||||
<property name="image">createImage</property>
|
||||
<property name="image">create_img</property>
|
||||
<property name="always-show-image">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
|
|
@ -1417,11 +1417,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
<property name="orientation">vertical</property>
|
||||
<property name="baseline-position">top</property>
|
||||
<child>
|
||||
<object class="GtkBox" id="top_main_menubar">
|
||||
<object class="GtkBox" id="app_menu_bar">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkMenuBar" id="menubar1">
|
||||
<object class="GtkMenuBar">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
|
|
@ -1834,7 +1834,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkButton" id="refresh_view">
|
||||
<object class="GtkButton" id="refresh_tab">
|
||||
<property name="label">gtk-refresh</property>
|
||||
<property name="name">refresh_view</property>
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -2052,7 +2052,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkStatusbar">
|
||||
<object class="GtkStatusbar" id="bottom_status_info">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="margin-left">10</property>
|
||||
|
|
@ -2106,11 +2106,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="GtkPopover" id="message_widget">
|
||||
<object class="GtkPopover" id="message_popup_widget">
|
||||
<property name="width-request">320</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="hexpand">True</property>
|
||||
<property name="relative-to">top_main_menubar</property>
|
||||
<property name="relative-to">app_menu_bar</property>
|
||||
<property name="position">bottom</property>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
|
|
@ -2141,7 +2141,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
<property name="shadow-type">in</property>
|
||||
<property name="overlay-scrolling">False</property>
|
||||
<child>
|
||||
<object class="GtkTextView" id="message_view">
|
||||
<object class="GtkTextView" id="message_text_view">
|
||||
<property name="name">message_view</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">True</property>
|
||||
|
|
@ -2179,7 +2179,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
|
|||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child>
|
||||
<object class="GtkButtonBox">
|
||||
<object class="GtkButtonBox" id="path_menu_buttons">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
|
|
|
|||
Loading…
Reference in New Issue