itdominator
/
SolarFM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bringing to latest changes #3

Merged
itdominator merged 41 commits from develop into master 2022-07-16 19:14:30 +00:00
Conversation 0 Commits 41 Files Changed 168 +64 -22
5 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2622600e92 - Show all commits

10
src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/Controller.py
View File

@ -75,6 +75,11 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
data = method(*(self, *parameters)) data = method(*(self, *parameters))
self.plugins.set_message_on_plugin(type, data) 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)
def save_load_session(self, action="save_session"): def save_load_session(self, action="save_session"):
wid, tid = self.window_controller.get_active_wid_and_tid() wid, tid = self.window_controller.get_active_wid_and_tid()
@ -107,7 +112,6 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
save_load_dialog.hide() save_load_dialog.hide()
def load_session(self, session_json): def load_session(self, session_json):
if debug: if debug:
print(f"Session Data: {session_json}") print(f"Session Data: {session_json}")
@ -162,8 +166,6 @@ class Controller(UIMixin, KeyboardSignalsMixin, IPCSignalsMixin, ExceptionHookMi
self.empty_trash() self.empty_trash()
if action == "create": if action == "create":
self.create_files() self.show_new_file_menu()
if action in ["save_session", "save_session_as", "load_session"]: if action in ["save_session", "save_session_as", "load_session"]:
self.save_load_session(action) self.save_load_session(action)
self.ctrlDown = False

4
src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WidgetFileActionMixin.py
View File

@ -87,8 +87,8 @@ class WidgetFileActionMixin:
def do_file_search(self, widget, eve=None): def do_file_search(self, widget, eve=None):
query = widget.get_text() query = widget.get_text()
self.search_iconview.unselect_all() self.search_iconview.unselect_all()
for i, file in enumerate(self.search_view.files): for i, file in enumerate(self.search_view.get_files()):
if query and query in file.lower(): if query and query in file[0].lower():
path = Gtk.TreePath().new_from_indices([i]) path = Gtk.TreePath().new_from_indices([i])
self.search_iconview.select_path(path) self.search_iconview.select_path(path)

2
src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/mixins/ui/WindowMixin.py
View File

@ -182,9 +182,11 @@ class WindowMixin(TabMixin):
def grid_icon_double_click(self, iconview, item, data=None): def grid_icon_double_click(self, iconview, item, data=None):
try: try:
if self.ctrlDown and self.shiftDown: if self.ctrlDown and self.shiftDown:
self.unset_keys_and_data()
self.execute_files(in_terminal=True) self.execute_files(in_terminal=True)
return return
elif self.ctrlDown: elif self.ctrlDown:
self.unset_keys_and_data()
self.execute_files() self.execute_files()
return return

16
src/versions/solarfm-0.0.1/SolarFM/solarfm/controller/signals/KeyboardSignalsMixin.py
View File

@ -47,6 +47,7 @@ class KeyboardSignalsMixin:
if self.ctrlDown and self.shiftDown and keyname == "t": if self.ctrlDown and self.shiftDown and keyname == "t":
self.unset_keys_and_data()
self.trash_files() self.trash_files()
@ -57,6 +58,7 @@ class KeyboardSignalsMixin:
if isinstance(focused_obj, Gtk.IconView): if isinstance(focused_obj, Gtk.IconView):
self.is_searching = True self.is_searching = True
wid, tid, self.search_view, self.search_iconview, store = self.get_current_state() wid, tid, self.search_view, self.search_iconview, store = self.get_current_state()
self.unset_keys_and_data()
self.popup_search_files(wid, keyname) self.popup_search_files(wid, keyname)
return return
@ -79,26 +81,30 @@ class KeyboardSignalsMixin:
if (self.ctrlDown and keyname == "up") or (self.ctrlDown and keyname == "u"): if (self.ctrlDown and keyname == "up") or (self.ctrlDown and keyname == "u"):
self.builder.get_object("go_up").released() self.builder.get_object("go_up").released()
if self.ctrlDown and keyname == "l": if self.ctrlDown and keyname == "l":
self.unset_keys_and_data()
self.builder.get_object("path_entry").grab_focus() self.builder.get_object("path_entry").grab_focus()
if self.ctrlDown and keyname == "t": if self.ctrlDown and keyname == "t":
self.builder.get_object("create_tab").released() self.builder.get_object("create_tab").released()
if self.ctrlDown and keyname == "o": if self.ctrlDown and keyname == "o":
self.unset_keys_and_data()
self.open_files() self.open_files()
if self.ctrlDown and keyname == "w": if self.ctrlDown and keyname == "w":
self.keyboard_close_tab() self.keyboard_close_tab()
if self.ctrlDown and keyname == "h": if self.ctrlDown and keyname == "h":
self.show_hide_hidden_files() self.show_hide_hidden_files()
if (self.ctrlDown and keyname == "e"): if (self.ctrlDown and keyname == "e"):
self.unset_keys_and_data()
self.rename_files() self.rename_files()
if self.ctrlDown and keyname == "c": if self.ctrlDown and keyname == "c":
self.to_cut_files.clear()
self.copy_files() self.copy_files()
self.to_cut_files.clear()
if self.ctrlDown and keyname == "x": if self.ctrlDown and keyname == "x":
self.to_copy_files.clear() self.to_copy_files.clear()
self.cut_files() self.cut_files()
if self.ctrlDown and keyname == "v": if self.ctrlDown and keyname == "v":
self.paste_files() self.paste_files()
if self.ctrlDown and keyname == "n": if self.ctrlDown and keyname == "n":
self.unset_keys_and_data()
self.show_new_file_menu() self.show_new_file_menu()
@ -110,11 +116,11 @@ class KeyboardSignalsMixin:
else: else:
top_main_menubar.show() top_main_menubar.show()
if keyname == "delete": if keyname == "delete":
self.unset_keys_and_data()
self.delete_files() self.delete_files()
if keyname == "f2": if keyname == "f2":
self.unset_keys_and_data()
self.rename_files() self.rename_files()
if keyname == "f4": if keyname == "f4":
wid, tid = self.window_controller.get_active_wid_and_tid() self.unset_keys_and_data()
view = self.get_fm_window(wid).get_view_by_id(tid) self.open_terminal()
dir = view.get_current_directory()
view.execute(f"{view.terminal_app}", dir)

54
user_config/usr/share/solarfm/Main_Window.glade
View File

@ -1144,6 +1144,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="stock">gtk-save</property> <property name="stock">gtk-save</property>
</object> </object>
<object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkTextBuffer" id="message_buffer"/> <object class="GtkTextBuffer" id="message_buffer"/>
<object class="GtkImage" id="open_with_img"> <object class="GtkImage" id="open_with_img">
<property name="visible">True</property> <property name="visible">True</property>
@ -1459,6 +1464,16 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<property name="can-focus">False</property> <property name="can-focus">False</property>
</object> </object>
</child> </child>
<child>
<object class="GtkImageMenuItem">
<property name="label">Terminal</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="image">image5</property>
<property name="use-stock">False</property>
<signal name="button-release-event" handler="open_terminal" swapped="no"/>
</object>
</child>
<child> <child>
<object class="GtkMenuItem"> <object class="GtkMenuItem">
<property name="visible">True</property> <property name="visible">True</property>
@ -2397,6 +2412,24 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton">
<property name="label">gtk-new</property>
<property name="name">create</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">New File/Folder...</property>
<property name="margin-top">20</property>
<property name="use-stock">True</property>
<signal name="button-release-event" handler="do_action_from_menu_controls" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child> <child>
<object class="GtkButton"> <object class="GtkButton">
<property name="label" translatable="yes">Rename</property> <property name="label" translatable="yes">Rename</property>
@ -2405,7 +2438,6 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Rename...</property> <property name="tooltip-text" translatable="yes">Rename...</property>
<property name="margin-top">20</property>
<property name="image">rename_img2</property> <property name="image">rename_img2</property>
<property name="always-show-image">True</property> <property name="always-show-image">True</property>
<signal name="button-release-event" handler="do_action_from_menu_controls" swapped="no"/> <signal name="button-release-event" handler="do_action_from_menu_controls" swapped="no"/>
@ -2413,7 +2445,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2431,7 +2463,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2449,7 +2481,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">6</property> <property name="position">7</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2467,7 +2499,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">7</property> <property name="position">8</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2485,7 +2517,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">8</property> <property name="position">9</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2502,7 +2534,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">9</property> <property name="position">10</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2518,7 +2550,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">10</property> <property name="position">11</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2537,7 +2569,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">11</property> <property name="position">12</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2555,7 +2587,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">12</property> <property name="position">13</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -2574,7 +2606,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">13</property> <property name="position">14</property>
</packing> </packing>
</child> </child>
</object> </object>