diff --git a/README.md b/README.md index d796660..1931e24 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ sudo apt-get install xclip python3.8 python3-setproctitle python3-gi wget ffmpeg # Known Issues diff --git a/src/debs/build.sh b/debs/build.sh similarity index 100% rename from src/debs/build.sh rename to debs/build.sh diff --git a/debs/chown_all.sh b/debs/chown_all.sh new file mode 100644 index 0000000..2c3d7c8 --- /dev/null +++ b/debs/chown_all.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +function main() { + sudo chown -R "${USER}":"${USER}" . +} +main; \ No newline at end of file diff --git a/src/debs/solarfm-0-0-1-x64/DEBIAN/control b/debs/solarfm-0-0-1-x64/DEBIAN/control similarity index 100% rename from src/debs/solarfm-0-0-1-x64/DEBIAN/control rename to debs/solarfm-0-0-1-x64/DEBIAN/control diff --git a/src/debs/solarfm-0-0-1-x64/DEBIAN/postrm b/debs/solarfm-0-0-1-x64/DEBIAN/postrm similarity index 100% rename from src/debs/solarfm-0-0-1-x64/DEBIAN/postrm rename to debs/solarfm-0-0-1-x64/DEBIAN/postrm diff --git a/src/debs/solarfm-0-0-1-x64/bin/solarfm b/debs/solarfm-0-0-1-x64/bin/solarfm similarity index 100% rename from src/debs/solarfm-0-0-1-x64/bin/solarfm rename to debs/solarfm-0-0-1-x64/bin/solarfm diff --git a/debs/solarfm-0-0-1-x64/opt/DELETE_ME.txt b/debs/solarfm-0-0-1-x64/opt/DELETE_ME.txt new file mode 100644 index 0000000..913acd6 --- /dev/null +++ b/debs/solarfm-0-0-1-x64/opt/DELETE_ME.txt @@ -0,0 +1 @@ +Place the zipped up solarfm zip here amnd run the build script. \ No newline at end of file diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/applications/solarfm.desktop b/debs/solarfm-0-0-1-x64/usr/share/applications/solarfm.desktop similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/applications/solarfm.desktop rename to debs/solarfm-0-0-1-x64/usr/share/applications/solarfm.desktop diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/doc/solarfm/copyright b/debs/solarfm-0-0-1-x64/usr/share/doc/solarfm/copyright similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/doc/solarfm/copyright rename to debs/solarfm-0-0-1-x64/usr/share/doc/solarfm/copyright diff --git a/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade new file mode 100644 index 0000000..e604e38 --- /dev/null +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade @@ -0,0 +1,968 @@ + + + + + + True + False + gtk-save-as + + + True + False + gtk-file + + + True + False + gtk-justify-center + + + True + False + gtk-save + + + True + False + gtk-execute + + + True + False + gtk-redo + + + True + False + gtk-justify-center + + + True + False + gtk-stop + + + True + False + gtk-apply + 3 + + + True + False + gtk-apply + 3 + + + True + False + gtk-apply + 3 + + + True + False + gtk-apply + 3 + + + True + False + vertical + top + + + True + False + + + True + False + + + True + False + _File + True + + + True + False + + + gtk-new + create + True + False + New File/Folder... + True + True + + + + + + gtk-open + open + True + False + Open... + True + True + + + + + + True + False + + + + + Reload Plugins + True + False + image6 + False + + + + + + Terminal + True + False + image5 + False + + + + + + True + False + Session + + + True + False + + + Save Session + save_session + True + False + New File/Folder... + image4 + False + + + + + + Save Session As + save_session_as + True + False + New File/Folder... + image1 + False + + + + + + Load Session + load_session + True + False + New File/Folder... + image2 + False + + + + + + + + + + True + False + Debug + + + True + False + + + Show Errors + messages_popup + True + False + image3 + False + + + + + + Show Interactive Debugger + ui_debug + True + False + image7 + False + + + + + + + + + + gtk-quit + tear_down + True + False + True + True + + + + + + + + + + True + False + _Edit + True + + + True + False + + + gtk-cut + cut + True + False + True + True + + + + + + gtk-copy + copy + True + False + True + True + + + + + + gtk-paste + paste + True + False + True + True + + + + + + + + + + True + False + _Help + True + + + True + False + + + gtk-about + about_page + True + False + True + True + + + + + + + + + + True + True + 0 + + + + + True + False + 5 + start + + + Plugins + plugins_popup + True + True + True + + + + True + True + 0 + + + + + tggl_notebook_1 + True + True + True + tggl_notebook_1_img + True + + + + True + True + 1 + + + + + tggl_notebook_2 + True + True + True + tggl_notebook_2_img + True + + + + True + True + 2 + + + + + tggl_notebook_3 + True + True + True + tggl_notebook_3_img + True + + + + True + True + 3 + + + + + tggl_notebook_4 + True + True + True + tggl_notebook_4_img + True + + + + True + True + 4 + + + + + I/O + io_popup + True + True + True + io_img + True + + + + True + True + 5 + + + + + False + True + 1 + + + + + + True + False + False + False + False + False + + + True + True + 2 + + + + + False + True + 0 + + + + + True + False + + + gtk-home + go_home + True + True + True + True + True + + + + False + True + 0 + + + + + gtk-add + create_tab + True + True + True + True + True + + + + False + True + 1 + + + + + gtk-go-up + go_up + True + True + True + True + True + + + + False + True + 2 + + + + + path_entry + True + True + True + Path... + + + + True + True + 3 + + + + + gtk-refresh + refresh_view + True + True + True + True + True + + + + False + True + 4 + + + + + False + True + 1 + + + + + True + True + True + True + vertical + True + + + True + True + 5 + True + True + True + + + notebook1 + True + True + True + 5 + 5 + 5 + 5 + False + True + sfm_windows + + + + + + + + + + + + + + + + + + + + + + + + False + start + + + gtk-go-back + True + True + True + True + True + + + True + True + 0 + + + + + gtk-go-forward + True + True + True + True + True + + + True + True + 1 + + + + + False + + + + + window_1 + True + True + edit-find-symbolic + False + False + Search... + + + + False + + + + + False + False + + + + + notebook2 + True + True + True + 5 + 5 + 5 + 5 + False + True + sfm_windows + + + + + + + + + + + + + + + + + + + + + + + + False + start + + + gtk-go-back + True + True + True + True + True + + + True + True + 0 + + + + + gtk-go-forward + True + True + True + True + True + + + True + True + 1 + + + + + False + + + + + window_2 + True + True + edit-find-symbolic + False + False + Search... + + + + False + + + + + False + False + + + + + True + True + + + + + True + True + 5 + True + True + True + + + notebook3 + True + True + True + 5 + 5 + 5 + 5 + False + True + sfm_windows + + + + + + + + + + + + + + + + + + + + + + + + False + start + + + gtk-go-back + True + True + True + True + True + + + True + True + 0 + + + + + gtk-go-forward + True + True + True + True + True + + + True + True + 1 + + + + + False + + + + + window_3 + True + True + edit-find-symbolic + False + False + Search... + + + + False + + + + + False + False + + + + + notebook4 + True + True + True + 5 + 5 + 5 + False + True + sfm_windows + + + + + + + + + + + + + + + + + + + + + + + + False + start + + + gtk-go-back + True + True + True + True + True + + + True + True + 0 + + + + + gtk-go-forward + True + True + True + True + True + + + True + True + 1 + + + + + False + + + + + window_4 + True + True + edit-find-symbolic + False + False + Search... + + + + False + + + + + False + False + + + + + True + True + + + + + True + True + 2 + + + + + + + diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json b/debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json similarity index 83% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json index 9e9323b..c17be4c 100644 --- a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/contexct_menu.json @@ -11,6 +11,8 @@ "Cut": ["STOCK_CUT", "cut"], "Copy": ["STOCK_COPY", "copy"], "Copy Name": ["STOCK_COPY", "copy_name"], + "Copy Path": ["STOCK_COPY", "copy_path"], + "Copy Path+Name": ["STOCK_COPY", "copy_path_name"], "Paste": ["STOCK_PASTE", "paste"] }, "Plugins": {} diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3g2.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3g2.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3g2.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3g2.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3gp.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3gp.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3gp.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/3gp.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ai.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ai.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ai.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ai.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/air.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/air.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/air.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/air.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/asf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/asf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/asf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/asf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/avi.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/avi.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/avi.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/avi.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/bib.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/bib.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/bib.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/bib.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/cls.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/cls.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/cls.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/cls.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/csv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/csv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/csv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/csv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/deb.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/deb.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/deb.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/deb.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/djvu.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/djvu.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/djvu.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/djvu.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dmg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dmg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dmg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dmg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/doc.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/doc.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/doc.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/doc.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/docx.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/docx.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/docx.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/docx.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/dwg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/eps.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/eps.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/eps.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/eps.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/epub.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/epub.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/epub.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/epub.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/exe.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/exe.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/exe.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/exe.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f77.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f77.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f77.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f77.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f90.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f90.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f90.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/f90.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flac.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flac.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flac.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flac.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/flv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gif.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gif.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gif.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gif.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gz.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gz.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gz.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/gz.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ico.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ico.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ico.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ico.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/indd.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/indd.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/indd.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/indd.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/iso.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/iso.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/iso.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/iso.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpeg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpeg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpeg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpeg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/jpg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/log.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/log.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/log.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/log.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4a.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4a.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4a.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4a.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4v.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4v.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4v.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/m4v.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/midi.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/midi.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/midi.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/midi.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mkv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mkv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mkv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mkv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mov.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mov.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mov.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mov.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp3.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp3.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp3.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp3.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp4.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp4.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp4.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mp4.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpeg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpeg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpeg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpeg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/mpg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/msi.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/msi.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/msi.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/msi.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odp.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odp.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odp.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odp.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ods.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ods.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ods.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ods.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odt.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odt.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odt.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/odt.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/oga.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/oga.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/oga.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/oga.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogg.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogg.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogg.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogg.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ogv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pdf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pdf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pdf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pdf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/png.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/png.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/png.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/png.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pps.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pps.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pps.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pps.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppsx.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppsx.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppsx.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppsx.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppt.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppt.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppt.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ppt.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pptx.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pptx.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pptx.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pptx.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/psd.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/psd.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/psd.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/psd.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pub.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pub.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pub.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/pub.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/py.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/py.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/py.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/py.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/qt.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/qt.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/qt.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/qt.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ra.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ra.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ra.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ra.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ram.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ram.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ram.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ram.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rar.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rar.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rar.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rar.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rm.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rm.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rm.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rm.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rpm.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rpm.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rpm.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rpm.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rtf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rtf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rtf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rtf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/rv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/skp.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/skp.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/skp.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/skp.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/spx.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/spx.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/spx.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/spx.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sql.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sql.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sql.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sql.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sty.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sty.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sty.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/sty.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tar.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tar.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tar.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tar.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tex.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tex.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tex.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tex.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tgz.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tgz.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tgz.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tgz.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tiff.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tiff.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tiff.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/tiff.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ttf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ttf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ttf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/ttf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/txt.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/txt.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/txt.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/txt.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/vob.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/vob.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/vob.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/vob.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wav.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wav.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wav.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wav.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wmv.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wmv.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wmv.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/wmv.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xls.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xls.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xls.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xls.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xlsx.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xlsx.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xlsx.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xlsx.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xml.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xml.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xml.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xml.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xpi.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xpi.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xpi.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/xpi.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/zip.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/zip.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/zip.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/fileicons/zip.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/archive.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/archive.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/archive.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/archive.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/audio.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/audio.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/audio.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/audio.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/bin.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/bin.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/bin.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/bin.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/dir.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/dir.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/dir.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/dir.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/doc.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/doc.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/doc.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/doc.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/pdf.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/pdf.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/pdf.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/pdf.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/presentation.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/presentation.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/presentation.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/presentation.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm-64x64.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm-64x64.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm-64x64.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm-64x64.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/solarfm.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/spreadsheet.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/spreadsheet.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/spreadsheet.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/spreadsheet.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/text.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/text.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/text.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/text.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/trash.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/trash.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/trash.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/trash.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/video.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/video.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/video.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/video.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/web.png b/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/web.png similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/web.png rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/icons/web.png diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json b/debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json similarity index 94% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json index f3b10a0..83e0081 100644 --- a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/key-bindings.json @@ -6,7 +6,7 @@ "open_terminal" : "F4", "refresh_tab" : ["F5", "r"], - "tggl_top_main_menubar" : "h", + "tggl_top_main_menubar" : "0", "tear_down" : "q", "go_up" : "Up", "go_home" : "slash", diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json b/debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json similarity index 87% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json index 5b9f096..a67c142 100644 --- a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/settings.json @@ -13,7 +13,7 @@ "image_app": "mirage2", "office_app": "libreoffice", "pdf_app": "evince", - "code_app": "atom", + "code_app": "newton", "text_app": "mousepad", "terminal_app": "terminator", "container_icon_wh": [128, 128], @@ -32,6 +32,14 @@ "text": [".txt", ".text", ".sh", ".cfg", ".conf", ".log"], "music": [".psf", ".mp3", ".ogg", ".flac", ".m4a"], "pdf": [".pdf"] - + }, + "theming":{ + "success_color": "#88cc27", + "warning_color": "#ffa800", + "error_color": "#ff0000" + }, + "debugging": { + "ch_log_lvl": 20, + "fh_log_lvl": 10 } -} +} \ No newline at end of file diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css b/debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css similarity index 56% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css index c0383f6..e802040 100644 --- a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/stylesheet.css @@ -1,4 +1,10 @@ /* Set fm to have transparent window */ + +/* * {*/ +/* background: rgba(39, 43, 52, 0.24);*/ +/* color: rgba(255, 255, 255, 1);*/ +/* }*/ + box, iconview, notebook, @@ -9,9 +15,47 @@ treeview.view, .content-view, .view { background: rgba(19, 21, 25, 0.14); + /* background: rgba(39, 43, 52, 0.14); */ color: rgba(255, 255, 255, 1); } +button:hover { + background-color: rgba(255, 185, 25, 0.34); +} + +/* ---- top controls ---- */ +window > box > box > button, +window > box > box > buttonbox > button { + background: rgba(39, 43, 52, 0.64); +} + +buttonbox > button * { + background: rgba(116, 0, 0, 0.0); + color: rgba(255, 255, 255, 1.0); +} + + +buttonbox > button:checked { + background-color: rgba(255, 125, 25, 0.34); +} + +buttonbox > button:hover { + background-color: rgba(255, 185, 25, 0.34); +} + +/* ---- notebook headers ---- */ +notebook > header { + background: rgba(39, 43, 52, 0.46); +} + +notebook > header > tabs > tab { + color: rgba(255, 255, 255, 1); +} + +notebook > header > tabs > tab:active { + background: rgba(0, 0, 0, 0.0); +} + notebook > header > tabs > tab:checked { /* Neon Blue 00e8ff */ background-color: rgba(0, 232, 255, 0.2); @@ -21,6 +65,41 @@ notebook > header > tabs > tab:checked { color: rgba(255, 255, 255, 0.8); } +popover { + background: rgba(39, 43, 52, 0.86); + color: rgba(255, 255, 255, 1); +} + +/* ---- make text selection slightly transparent ---- */ +* selection { + background-color: rgba(0, 115, 115, 0.34); + /* Bergundy */ + /* background-color: rgba(116, 0, 0, 0.64); */ + color: rgba(255, 255, 255, 0.5); +} + + +/* ---- notebook tab buttons ---- */ +tab > box > button { + background: rgba(116, 0, 0, 0.64); +} + +tab > box > button:hover { + background: rgba(256, 0, 0, 0.64); +} + + + + + + + + + + + + + #message_view { font: 16px "Monospace"; } @@ -83,4 +162,4 @@ XfdesktopIconView.view .rubberband { XfdesktopIconView.view:active { background-color: rgba(172, 102, 21, 1); -} */ +} */ \ No newline at end of file diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/about_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/about_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/about_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/about_ui.glade diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/appchooser_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/appchooser_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/appchooser_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/appchooser_ui.glade diff --git a/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/bottom_status_info_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/bottom_status_info_ui.glade new file mode 100644 index 0000000..b2dd13d --- /dev/null +++ b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/bottom_status_info_ui.glade @@ -0,0 +1,50 @@ + + + + + + True + False + 10 + 10 + 10 + 10 + 6 + 6 + 15 + top + + + True + False + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + False + + + False + True + 2 + + + + diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/file_exists_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/file_exists_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/file_exists_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/file_exists_ui.glade diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/new_file_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/new_file_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/new_file_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/new_file_ui.glade diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/rename_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/rename_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/rename_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/rename_ui.glade diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/save_load_ui.glade b/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/save_load_ui.glade similarity index 100% rename from src/debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/save_load_ui.glade rename to debs/solarfm-0-0-1-x64/usr/share/solarfm/ui_widgets/save_load_ui.glade diff --git a/images/pic1.png b/images/pic1.png index 8c1bb08..b072a28 100644 Binary files a/images/pic1.png and b/images/pic1.png differ diff --git a/images/pic2.png b/images/pic2.png index 5162d66..785723f 100644 Binary files a/images/pic2.png and b/images/pic2.png differ diff --git a/images/pic3.png b/images/pic3.png index d77ba46..2b488bb 100644 Binary files a/images/pic3.png and b/images/pic3.png differ diff --git a/images/pic4.png b/images/pic4.png index 4f8645a..4c257e3 100644 Binary files a/images/pic4.png and b/images/pic4.png differ diff --git a/plugins/searcher/mixins/file_search_mixin.py b/plugins/searcher/mixins/file_search_mixin.py index cb9f537..21ed0bf 100644 --- a/plugins/searcher/mixins/file_search_mixin.py +++ b/plugins/searcher/mixins/file_search_mixin.py @@ -43,6 +43,50 @@ class FileSearchMixin: self.reset_file_list_box() self.run_fsearch_watcher(query=widget) + + + + + + + +# Need to implement this over the threaded stuffs.... + + + def cancel_timer(self): + if self.timer: + self.timer.cancel() + GLib.idle_remove_by_data(None) + + def delay_search_Glib(self): + GLib.idle_add(self._do_highlight) + + def delay_search(self): + wait_time = self.search_time / len(self.search_text) + wait_time = max(wait_time, 0.05) + + self.timer = threading.Timer(wait_time, self.delay_search_Glib) + self.timer.daemon = True + self.timer.start() + + + + + + + + + + + + + + + + + + + @daemon_threaded def run_fsearch_watcher(self, query): while True: @@ -104,4 +148,4 @@ class FileSearchMixin: file = jdata[1] widget = FilePreviewWidget(target, file) - self._file_list.add(widget) + self._file_list.add(widget) \ No newline at end of file diff --git a/src/versions/solarfm-0.0.1/create-binary.sh b/src/create-binary.sh similarity index 100% rename from src/versions/solarfm-0.0.1/create-binary.sh rename to src/create-binary.sh diff --git a/src/versions/solarfm-0.0.1/create-standalone.sh b/src/create-standalone.sh similarity index 100% rename from src/versions/solarfm-0.0.1/create-standalone.sh rename to src/create-standalone.sh diff --git a/src/versions/solarfm-0.0.1/create-stubs.sh b/src/create-stubs.sh similarity index 100% rename from src/versions/solarfm-0.0.1/create-stubs.sh rename to src/create-stubs.sh diff --git a/src/debs/chown_all.sh b/src/debs/chown_all.sh deleted file mode 100644 index 44bef62..0000000 --- a/src/debs/chown_all.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -function main() { - sudo chown -R abaddon:abaddon . -} -main; diff --git a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade b/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade deleted file mode 100644 index 597d9be..0000000 --- a/src/debs/solarfm-0-0-1-x64/usr/share/solarfm/Main_Window.glade +++ /dev/null @@ -1,859 +0,0 @@ - - - - - - True - False - gtk-save-as - - - True - False - gtk-file - - - True - False - gtk-justify-center - - - True - False - gtk-save - - - True - False - gtk-execute - - - True - False - gtk-redo - - - True - False - gtk-stop - - - True - False - gtk-apply - 3 - - - True - False - gtk-apply - 3 - - - True - False - gtk-apply - 3 - - - True - False - gtk-apply - 3 - - - 800 - 600 - False - center - 1670 - 830 - icons/solarfm.png - center - - - - - - True - False - vertical - top - - - True - False - - - True - False - - - True - False - _File - True - - - True - False - - - gtk-new - create - True - False - New File/Folder... - True - True - - - - - - gtk-open - open - True - False - Open... - True - True - - - - - - True - False - - - - - Reload Plugins - True - False - image6 - False - - - - - - Terminal - True - False - image5 - False - - - - - - True - False - Session - - - True - False - - - Save Session - save_session - True - False - New File/Folder... - image4 - False - - - - - - Save Session As - save_session_as - True - False - New File/Folder... - image1 - False - - - - - - Load Session - load_session - True - False - New File/Folder... - image2 - False - - - - - - - - - - True - False - Debug - - - True - False - - - Show Errors - messages_popup - True - False - image3 - False - - - - - - - - - - gtk-quit - True - False - True - True - - - - - - - - - - True - False - _Edit - True - - - True - False - - - gtk-cut - cut - True - False - True - True - - - - - - gtk-copy - copy - True - False - True - True - - - - - - gtk-paste - paste - True - False - True - True - - - - - - - - - - True - False - _Help - True - - - True - False - - - gtk-about - about_page - True - False - True - True - - - - - - - - - - True - True - 0 - - - - - True - False - 5 - start - - - Plugins - plugins_popup - True - True - True - - - - True - True - 0 - - - - - tggl_notebook_1 - True - True - True - tggl_notebook_1_img - True - - - - True - True - 1 - - - - - tggl_notebook_2 - True - True - True - tggl_notebook_2_img - True - - - - True - True - 2 - - - - - tggl_notebook_3 - True - True - True - tggl_notebook_3_img - True - - - - True - True - 3 - - - - - tggl_notebook_4 - True - True - True - tggl_notebook_4_img - True - - - - True - True - 4 - - - - - I/O - io_popup - True - True - True - io_img - True - - - - True - True - 5 - - - - - False - True - 1 - - - - - - True - False - False - False - False - False - - - True - True - 2 - - - - - False - True - 0 - - - - - True - False - - - gtk-home - go_home - True - True - True - True - True - - - - False - True - 0 - - - - - gtk-add - create_tab - True - True - True - True - True - - - - False - True - 1 - - - - - gtk-go-up - go_up - True - True - True - True - True - - - - False - True - 2 - - - - - path_entry - True - True - True - Path... - - - - True - True - 3 - - - - - gtk-refresh - refresh_view - True - True - True - True - True - - - - False - True - 4 - - - - - False - True - 1 - - - - - True - True - True - True - vertical - True - - - True - True - 5 - True - True - True - - - notebook1 - True - True - True - 5 - 5 - 5 - 5 - False - True - sfm_windows - - - - - - - - - - - - - - - - - - - - - - - - window_1 - True - True - edit-find-symbolic - False - False - Search... - - - - False - - - - - False - False - - - - - notebook2 - True - True - True - 5 - 5 - 5 - 5 - False - True - sfm_windows - - - - - - - - - - - - - - - - - - - - - - - - window_2 - True - True - edit-find-symbolic - False - False - Search... - - - - False - - - - - False - False - - - - - True - True - - - - - True - True - 5 - True - True - True - - - notebook3 - True - True - True - 5 - 5 - 5 - 5 - False - True - sfm_windows - - - - - - - - - - - - - - - - - - - - - - - - window_3 - True - True - edit-find-symbolic - False - False - Search... - - - - False - - - - - False - False - - - - - notebook4 - True - True - True - 5 - 5 - 5 - False - True - sfm_windows - - - - - - - - - - - - - - - - - - - - - - - - window_4 - True - True - edit-find-symbolic - False - False - Search... - - - - False - - - - - False - False - - - - - True - True - - - - - True - True - 2 - - - - - True - False - 10 - 10 - 10 - 10 - 6 - 6 - 15 - top - - - True - False - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - False - True - 3 - - - - - - diff --git a/src/versions/solarfm-0.0.1/debugger.sh b/src/debugger.sh similarity index 100% rename from src/versions/solarfm-0.0.1/debugger.sh rename to src/debugger.sh diff --git a/src/versions/solarfm-0.0.1/setup.py b/src/setup.py similarity index 100% rename from src/versions/solarfm-0.0.1/setup.py rename to src/setup.py diff --git a/src/versions/solarfm-0.0.1/solarfm.toml b/src/solarfm.toml similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm.toml rename to src/solarfm.toml diff --git a/src/versions/solarfm-0.0.1/solarfm/__builtins__.py b/src/solarfm/__builtins__.py similarity index 93% rename from src/versions/solarfm-0.0.1/solarfm/__builtins__.py rename to src/solarfm/__builtins__.py index b1d9d84..6ead649 100644 --- a/src/versions/solarfm-0.0.1/solarfm/__builtins__.py +++ b/src/solarfm/__builtins__.py @@ -7,12 +7,12 @@ import sys # Application imports from utils.event_system import EventSystem -from utils.endpoint_registry import EndpointRegistry from utils.keybindings import Keybindings from utils.logger import Logger from utils.settings_manager.manager import SettingsManager + # NOTE: Threads WILL NOT die with parent's destruction. def threaded_wrapper(fn): def wrapper(*args, **kwargs): @@ -39,7 +39,6 @@ def sizeof_fmt_def(num, suffix="B"): builtins.app_name = "SolarFM" builtins.keybindings = Keybindings() builtins.event_system = EventSystem() -builtins.endpoint_registry = EndpointRegistry() builtins.settings_manager = SettingsManager() settings_manager.load_settings() @@ -52,7 +51,7 @@ builtins.logger = Logger(settings_manager.get_home_config_path(), \ builtins.threaded = threaded_wrapper builtins.daemon_threaded = daemon_threaded_wrapper builtins.sizeof_fmt = sizeof_fmt_def -builtins.event_sleep_time = 0.05 + def custom_except_hook(exc_type, exc_value, exc_traceback): @@ -62,5 +61,4 @@ def custom_except_hook(exc_type, exc_value, exc_traceback): logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback)) - sys.excepthook = custom_except_hook diff --git a/src/versions/solarfm-0.0.1/solarfm/__init__.py b/src/solarfm/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/__init__.py rename to src/solarfm/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/__main__.py b/src/solarfm/__main__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/__main__.py rename to src/solarfm/__main__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/app.py b/src/solarfm/app.py similarity index 76% rename from src/versions/solarfm-0.0.1/solarfm/app.py rename to src/solarfm/app.py index e80ab92..209e350 100644 --- a/src/versions/solarfm-0.0.1/solarfm/app.py +++ b/src/solarfm/app.py @@ -22,10 +22,7 @@ class Application(IPCServer): super(Application, self).__init__() if not settings_manager.is_trace_debug(): - try: - self.create_ipc_listener() - except Exception: - ... + self.socket_realization_check() if not self.is_ipc_alive: for arg in unknownargs + [args.new_tab,]: @@ -35,6 +32,22 @@ class Application(IPCServer): raise AppLaunchException(f"{app_name} IPC Server Exists: Will send path(s) to it and close...") + self.setup_debug_hook() + Window(args, unknownargs) + + + def socket_realization_check(self): + try: + self.create_ipc_listener() + except Exception: + self.send_test_ipc_message() + + try: + self.create_ipc_listener() + except Exception as e: + ... + + def setup_debug_hook(self): try: # kill -SIGUSR2 from Linux/Unix or SIGBREAK signal from Windows signal.signal( @@ -44,5 +57,3 @@ class Application(IPCServer): except ValueError: # Typically: ValueError: signal only works in main thread ... - - Window(args, unknownargs) diff --git a/src/versions/solarfm-0.0.1/solarfm/core/__init__.py b/src/solarfm/core/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/__init__.py rename to src/solarfm/core/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/controller.py b/src/solarfm/core/controller.py similarity index 94% rename from src/versions/solarfm-0.0.1/solarfm/core/controller.py rename to src/solarfm/core/controller.py index b07fb5f..ce10937 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/controller.py +++ b/src/solarfm/core/controller.py @@ -65,9 +65,11 @@ class Controller(UIMixin, SignalsMixins, Controller_Data): FileSystemActions() def _subscribe_to_events(self): + event_system.subscribe("shutting_down", self._shutting_down) event_system.subscribe("handle_file_from_ipc", self.handle_file_from_ipc) event_system.subscribe("generate_file_views", self._generate_file_views) event_system.subscribe("clear_notebooks", self.clear_notebooks) + event_system.subscribe("set_window_title", self._set_window_title) event_system.subscribe("unset_selected_files_views", self._unset_selected_files_views) event_system.subscribe("get_current_state", self.get_current_state) @@ -107,6 +109,10 @@ class Controller(UIMixin, SignalsMixins, Controller_Data): FileExistsWidget() SaveLoadWidget() + def _shutting_down(self): + if not settings_manager.is_trace_debug(): + self.fm_controller.save_state() + def reload_plugins(self, widget=None, eve=None): self.plugins.reload_plugins() @@ -158,36 +164,32 @@ class Controller(UIMixin, SignalsMixins, Controller_Data): event_system.emit("show_plugins_popup") if action == "messages_popup": event_system.emit("show_messages_popup") + if action == "ui_debug": + event_system.emit("load_interactive_debug") if action == "tear_down": event_system.emit("tear_down") - @endpoint_registry.register(rule="go_home") def go_home(self, widget=None, eve=None): self.builder.get_object("go_home").released() - @endpoint_registry.register(rule="refresh_tab") def refresh_tab(self, widget=None, eve=None): self.builder.get_object("refresh_tab").released() - @endpoint_registry.register(rule="go_up") def go_up(self, widget=None, eve=None): self.builder.get_object("go_up").released() - @endpoint_registry.register(rule="grab_focus_path_entry") def grab_focus_path_entry(self, widget=None, eve=None): self.builder.get_object("path_entry").grab_focus() - @endpoint_registry.register(rule="tggl_top_main_menubar") def tggl_top_main_menubar(self, widget=None, eve=None): top_main_menubar = self.builder.get_object("top_main_menubar") top_main_menubar.hide() if top_main_menubar.is_visible() else top_main_menubar.show() - @endpoint_registry.register(rule="open_terminal") def open_terminal(self, widget=None, eve=None): wid, tid = self.fm_controller.get_active_wid_and_tid() tab = self.get_fm_window(wid).get_tab_by_id(tid) tab.execute([f"{tab.terminal_app}"], start_dir=tab.get_current_directory()) def go_to_path(self, path: str): - self.builder.get_object("path_entry").set_text(path) + self.builder.get_object("path_entry").set_text(path) \ No newline at end of file diff --git a/src/versions/solarfm-0.0.1/solarfm/core/controller_data.py b/src/solarfm/core/controller_data.py similarity index 83% rename from src/versions/solarfm-0.0.1/solarfm/core/controller_data.py rename to src/solarfm/core/controller_data.py index 2605c64..89961ac 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/controller_data.py +++ b/src/solarfm/core/controller_data.py @@ -1,7 +1,6 @@ # Python imports import os import subprocess -from dataclasses import dataclass # Lib imports import gi @@ -9,55 +8,13 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk # Application imports +from .sfm_builder import SFMBuilder from .widgets.dialogs.message_widget import MessageWidget from .widgets.dialogs.user_pass_widget import UserPassWidget -from shellfm.windows.controller import WindowController +from utils.types.state import State from plugins.plugins_controller import PluginsController - - - -@dataclass(slots=True) -class State: - fm_controller: any = None - notebooks: any = None - wid: int = None - tid: int = None - tab: type = None - icon_grid: gi.overrides.Gtk.IconView = None - store: gi.overrides.Gtk.ListStore = None - uris: [] = None - uris_raw: [] = None - selected_files: [] = None - to_copy_files: [] = None - to_cut_files: [] = None - message_dialog: type = None - user_pass_dialog: type = None - - - -class SFMBuilder(Gtk.Builder): - """docstring for SFMBuilder.""" - - def __init__(self): - super(SFMBuilder, self).__init__() - - self.objects = {} - - def get_object(self, id: str, use_gtk: bool = True) -> any: - if not use_gtk: - return self.objects[id] - - return super(SFMBuilder, self).get_object(id) - - def expose_object(self, id: str, object: any, use_gtk: bool = True) -> None: - if not use_gtk: - self.objects[id] = object - else: - super(SFMBuilder, self).expose_object(id, object) - - def dereference_object(self, id: str) -> None: - del self.objects[id] +from shellfm.windows.controller import WindowController @@ -98,6 +55,10 @@ class Controller_Data: self.shift_down = False self.alt_down = False + self._state = State() + self.message_dialog = MessageWidget() + self.user_pass_dialog = UserPassWidget() + def get_current_state(self) -> State: ''' @@ -109,7 +70,8 @@ class Controller_Data: Returns: state (obj): State ''' - state = State() + # state = State() + state = self._state state.fm_controller = self.fm_controller state.notebooks = self.notebooks state.wid, state.tid = self.fm_controller.get_active_wid_and_tid() @@ -117,8 +79,14 @@ class Controller_Data: state.icon_grid = self.builder.get_object(f"{state.wid}|{state.tid}|icon_grid", use_gtk = False) # state.icon_grid = event_system.emit_and_await("get_files_view_icon_grid", (state.wid, state.tid)) state.store = state.icon_grid.get_model() - state.message_dialog = MessageWidget() - state.user_pass_dialog = UserPassWidget() + + # NOTE: Need to watch this as I thought we had issues with just using single reference upon closing it. + # But, I found that not doing it this way caused objects to generate upon every click... (Because we're getting state info, duh) + # Yet interactive debug view shows them just pilling on and never clearing... + state.message_dialog = self.message_dialog + state.user_pass_dialog = self.user_pass_dialog + # state.message_dialog = MessageWidget() + # state.user_pass_dialog = UserPassWidget() selected_files = state.icon_grid.get_selected_items() if selected_files: diff --git a/src/versions/solarfm-0.0.1/solarfm/core/fs_actions/__init__.py b/src/solarfm/core/fs_actions/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/fs_actions/__init__.py rename to src/solarfm/core/fs_actions/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/fs_actions/crud_mixin.py b/src/solarfm/core/fs_actions/crud_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/fs_actions/crud_mixin.py rename to src/solarfm/core/fs_actions/crud_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/fs_actions/file_system_actions.py b/src/solarfm/core/fs_actions/file_system_actions.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/fs_actions/file_system_actions.py rename to src/solarfm/core/fs_actions/file_system_actions.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/fs_actions/handler_mixin.py b/src/solarfm/core/fs_actions/handler_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/fs_actions/handler_mixin.py rename to src/solarfm/core/fs_actions/handler_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/__init__.py b/src/solarfm/core/mixins/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/__init__.py rename to src/solarfm/core/mixins/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/__init__.py b/src/solarfm/core/mixins/signals/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/__init__.py rename to src/solarfm/core/mixins/signals/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py b/src/solarfm/core/mixins/signals/file_action_signals_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py rename to src/solarfm/core/mixins/signals/file_action_signals_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/ipc_signals_mixin.py b/src/solarfm/core/mixins/signals/ipc_signals_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/ipc_signals_mixin.py rename to src/solarfm/core/mixins/signals/ipc_signals_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/keyboard_signals_mixin.py b/src/solarfm/core/mixins/signals/keyboard_signals_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/keyboard_signals_mixin.py rename to src/solarfm/core/mixins/signals/keyboard_signals_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals_mixins.py b/src/solarfm/core/mixins/signals_mixins.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/signals_mixins.py rename to src/solarfm/core/mixins/signals_mixins.py index eb79f46..db044e8 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals_mixins.py +++ b/src/solarfm/core/mixins/signals_mixins.py @@ -1,12 +1,12 @@ # Python imports # Lib imports + +# Application imports from .signals.file_action_signals_mixin import FileActionSignalsMixin from .signals.ipc_signals_mixin import IPCSignalsMixin from .signals.keyboard_signals_mixin import KeyboardSignalsMixin -# Application imports - diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/__init__.py b/src/solarfm/core/mixins/ui/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/__init__.py rename to src/solarfm/core/mixins/ui/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/grid_mixin.py b/src/solarfm/core/mixins/ui/grid_mixin.py similarity index 97% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/grid_mixin.py rename to src/solarfm/core/mixins/ui/grid_mixin.py index 85772b3..31881ef 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/grid_mixin.py +++ b/src/solarfm/core/mixins/ui/grid_mixin.py @@ -26,14 +26,15 @@ class GridMixin: store.append([None, file[0]]) Gtk.main_iteration() + # for i, file in enumerate(files): + # self.create_icon(i, tab, store, dir, file[0]) + if use_generator: # NOTE: tab > icon > _get_system_thumbnail_gtk_thread must not be used # as the attempted promotion back to gtk threading stalls the generator. (We're already in main gtk thread) for i, icon in enumerate( self.create_icons_generator(tab, dir, files) ): self.load_icon(i, store, icon) else: - # for i, file in enumerate(files): - # self.create_icon(i, tab, store, dir, file[0]) try: loop = asyncio.get_running_loop() except RuntimeError: diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/pane_mixin.py b/src/solarfm/core/mixins/ui/pane_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/pane_mixin.py rename to src/solarfm/core/mixins/ui/pane_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/tab_mixin.py b/src/solarfm/core/mixins/ui/tab_mixin.py similarity index 98% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/tab_mixin.py rename to src/solarfm/core/mixins/ui/tab_mixin.py index ed79fcd..aab38bd 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/tab_mixin.py +++ b/src/solarfm/core/mixins/ui/tab_mixin.py @@ -73,13 +73,9 @@ class TabMixin(GridMixin): self.builder.dereference_object(f"{wid}|{tid}") store.clear() - # store.run_dispose() icon_grid.destroy() - # icon_grid.run_dispose() scroll.destroy() - #scroll.run_dispose() tab_box.destroy() - # tab_box.run_dispose() del store del icon_grid diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/window_mixin.py b/src/solarfm/core/mixins/ui/window_mixin.py similarity index 99% rename from src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/window_mixin.py rename to src/solarfm/core/mixins/ui/window_mixin.py index 34ffb8b..3d1d577 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/mixins/ui/window_mixin.py +++ b/src/solarfm/core/mixins/ui/window_mixin.py @@ -85,7 +85,7 @@ class WindowMixin(TabMixin): self.set_window_title() if eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 1: # l-click - if self.ctrl_down: + if eve.state & Gdk.ModifierType.CONTROL_MASK: self.dnd_left_primed = 0 if self.single_click_open: # FIXME: need to find a way to pass the model index diff --git a/src/solarfm/core/sfm_builder.py b/src/solarfm/core/sfm_builder.py new file mode 100644 index 0000000..6077bdf --- /dev/null +++ b/src/solarfm/core/sfm_builder.py @@ -0,0 +1,33 @@ +# Python imports + +# Lib imports +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk + +# Application imports + + + +class SFMBuilder(Gtk.Builder): + """docstring for SFMBuilder.""" + + def __init__(self): + super(SFMBuilder, self).__init__() + + self.objects = {} + + def get_object(self, id: str, use_gtk: bool = True) -> any: + if not use_gtk: + return self.objects[id] + + return super(SFMBuilder, self).get_object(id) + + def expose_object(self, id: str, object: any, use_gtk: bool = True) -> None: + if not use_gtk: + self.objects[id] = object + else: + super(SFMBuilder, self).expose_object(id, object) + + def dereference_object(self, id: str) -> None: + del self.objects[id] diff --git a/src/versions/solarfm-0.0.1/solarfm/core/ui_mixin.py b/src/solarfm/core/ui_mixin.py similarity index 98% rename from src/versions/solarfm-0.0.1/solarfm/core/ui_mixin.py rename to src/solarfm/core/ui_mixin.py index 4c44c33..406f1fa 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/ui_mixin.py +++ b/src/solarfm/core/ui_mixin.py @@ -85,4 +85,4 @@ class UIMixin(PaneMixin, WindowMixin): for j in range(0, 4): i = j + 1 self.fm_controller.create_window() - self.create_new_tab_notebook(None, i, None) + self.create_new_tab_notebook(None, i, None) \ No newline at end of file diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/__init__.py b/src/solarfm/core/widgets/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/__init__.py rename to src/solarfm/core/widgets/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py b/src/solarfm/core/widgets/bottom_status_info_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py rename to src/solarfm/core/widgets/bottom_status_info_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/context_menu_widget.py b/src/solarfm/core/widgets/context_menu_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/context_menu_widget.py rename to src/solarfm/core/widgets/context_menu_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/__init__.py b/src/solarfm/core/widgets/dialogs/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/__init__.py rename to src/solarfm/core/widgets/dialogs/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/about_widget.py b/src/solarfm/core/widgets/dialogs/about_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/about_widget.py rename to src/solarfm/core/widgets/dialogs/about_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/appchooser_widget.py b/src/solarfm/core/widgets/dialogs/appchooser_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/appchooser_widget.py rename to src/solarfm/core/widgets/dialogs/appchooser_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/file_exists_widget.py b/src/solarfm/core/widgets/dialogs/file_exists_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/file_exists_widget.py rename to src/solarfm/core/widgets/dialogs/file_exists_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/message_widget.py b/src/solarfm/core/widgets/dialogs/message_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/message_widget.py rename to src/solarfm/core/widgets/dialogs/message_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/new_file_widget.py b/src/solarfm/core/widgets/dialogs/new_file_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/new_file_widget.py rename to src/solarfm/core/widgets/dialogs/new_file_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/rename_widget.py b/src/solarfm/core/widgets/dialogs/rename_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/rename_widget.py rename to src/solarfm/core/widgets/dialogs/rename_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/save_load_widget.py b/src/solarfm/core/widgets/dialogs/save_load_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/save_load_widget.py rename to src/solarfm/core/widgets/dialogs/save_load_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/user_pass_widget.py b/src/solarfm/core/widgets/dialogs/user_pass_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/dialogs/user_pass_widget.py rename to src/solarfm/core/widgets/dialogs/user_pass_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/__init__.py b/src/solarfm/core/widgets/files_view/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/__init__.py rename to src/solarfm/core/widgets/files_view/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/files_widget.py b/src/solarfm/core/widgets/files_view/files_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/files_widget.py rename to src/solarfm/core/widgets/files_view/files_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/grid_mixin.py b/src/solarfm/core/widgets/files_view/grid_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/grid_mixin.py rename to src/solarfm/core/widgets/files_view/grid_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/tab_mixin.py b/src/solarfm/core/widgets/files_view/tab_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/tab_mixin.py rename to src/solarfm/core/widgets/files_view/tab_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/window_mixin.py b/src/solarfm/core/widgets/files_view/window_mixin.py similarity index 99% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/window_mixin.py rename to src/solarfm/core/widgets/files_view/window_mixin.py index e8ad629..59a33dc 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/widgets/files_view/window_mixin.py +++ b/src/solarfm/core/widgets/files_view/window_mixin.py @@ -80,7 +80,7 @@ class WindowMixin(TabMixin): self.set_window_title() if eve.type == Gdk.EventType.BUTTON_RELEASE and eve.button == 1: # l-click - if self.ctrl_down: + if eve.state & Gdk.ModifierType.CONTROL_MASK: self.dnd_left_primed = 0 if self.single_click_open: # FIXME: need to find a way to pass the model index diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/icon_grid_widget.py b/src/solarfm/core/widgets/icon_grid_widget.py similarity index 98% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/icon_grid_widget.py rename to src/solarfm/core/widgets/icon_grid_widget.py index 368319d..51088b3 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/widgets/icon_grid_widget.py +++ b/src/solarfm/core/widgets/icon_grid_widget.py @@ -20,8 +20,6 @@ class IconGridWidget(Gtk.IconView): def __init__(self): super(IconGridWidget, self).__init__() - # self._store = None - self._setup_styling() self._setup_signals() self._set_up_dnd() diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/icon_tree_widget.py b/src/solarfm/core/widgets/icon_tree_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/icon_tree_widget.py rename to src/solarfm/core/widgets/icon_tree_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/io_widget.py b/src/solarfm/core/widgets/io_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/io_widget.py rename to src/solarfm/core/widgets/io_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/__init__.py b/src/solarfm/core/widgets/popups/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/__init__.py rename to src/solarfm/core/widgets/popups/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/io_popup_widget.py b/src/solarfm/core/widgets/popups/io_popup_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/io_popup_widget.py rename to src/solarfm/core/widgets/popups/io_popup_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/message_popup_widget.py b/src/solarfm/core/widgets/popups/message_popup_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/message_popup_widget.py rename to src/solarfm/core/widgets/popups/message_popup_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/path_menu_popup_widget.py b/src/solarfm/core/widgets/popups/path_menu_popup_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/path_menu_popup_widget.py rename to src/solarfm/core/widgets/popups/path_menu_popup_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/plugins_popup_widget.py b/src/solarfm/core/widgets/popups/plugins_popup_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/popups/plugins_popup_widget.py rename to src/solarfm/core/widgets/popups/plugins_popup_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/tab_header_widget.py b/src/solarfm/core/widgets/tab_header_widget.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/core/widgets/tab_header_widget.py rename to src/solarfm/core/widgets/tab_header_widget.py diff --git a/src/versions/solarfm-0.0.1/solarfm/core/window.py b/src/solarfm/core/window.py similarity index 90% rename from src/versions/solarfm-0.0.1/solarfm/core/window.py rename to src/solarfm/core/window.py index 8829ef8..4bce515 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/window.py +++ b/src/solarfm/core/window.py @@ -53,6 +53,7 @@ class Window(Gtk.ApplicationWindow): def _subscribe_to_events(self): event_system.subscribe("tear_down", self._tear_down) + event_system.subscribe("load_interactive_debug", self._load_interactive_debug) def _load_widgets(self, args, unknownargs): if settings_manager.is_debug(): @@ -86,13 +87,12 @@ class Window(Gtk.ApplicationWindow): cr.set_operator(cairo.OPERATOR_SOURCE) cr.paint() cr.set_operator(cairo.OPERATOR_OVER) + + def _load_interactive_debug(self): + self.set_interactive_debugging(True) - def _tear_down(self, widget=None, eve=None): - if not settings_manager.is_trace_debug(): - self._controller.fm_controller.save_state() - + def _tear_down(self, widget = None, eve = None): + event_system.emit("shutting_down") settings_manager.clear_pid() - time.sleep(event_sleep_time) - - Gtk.main_quit() + Gtk.main_quit() \ No newline at end of file diff --git a/src/versions/solarfm-0.0.1/solarfm/plugins/__init__.py b/src/solarfm/plugins/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/plugins/__init__.py rename to src/solarfm/plugins/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/plugins/manifest.py b/src/solarfm/plugins/manifest.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/plugins/manifest.py rename to src/solarfm/plugins/manifest.py diff --git a/src/versions/solarfm-0.0.1/solarfm/plugins/plugin_base.py b/src/solarfm/plugins/plugin_base.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/plugins/plugin_base.py rename to src/solarfm/plugins/plugin_base.py index 1c1613f..4eef833 100644 --- a/src/versions/solarfm-0.0.1/solarfm/plugins/plugin_base.py +++ b/src/solarfm/plugins/plugin_base.py @@ -24,32 +24,12 @@ class PluginBase: self._event_system = None - def set_fm_event_system(self, fm_event_system): + def run(self): """ - Requests Key: 'pass_fm_events': "true" - Must define in plugin if "pass_fm_events" is set to "true" string. + Must define regardless if needed and can 'pass' if plugin doesn't need it. + Is intended to be used to setup internal signals or custom Gtk Builders/UI logic. """ - self._event_system = fm_event_system - - def set_ui_object_collection(self, ui_objects): - """ - Requests Key: "pass_ui_objects": [""] - Request reference to a UI component. Will be passed back as array to plugin. - Must define in plugin if set and an array of valid glade UI IDs is given. - """ - self._ui_objects = ui_objects - - - def clear_children(self, widget: type) -> None: - """ Clear children of a gtk widget. """ - for child in widget.get_children(): - widget.remove(child) - - def subscribe_to_events(self): - self._event_system.subscribe("update_state_info_plugins", self._update_fm_state_info) - - def _update_fm_state_info(self, state): - self._fm_state = state + raise PluginBaseException("Method hasn't been overriden...") def generate_reference_ui_element(self): """ @@ -59,12 +39,26 @@ class PluginBase: """ raise PluginBaseException("Method hasn't been overriden...") - def run(self): + def set_ui_object_collection(self, ui_objects): """ - Must define regardless if needed and can 'pass' if plugin doesn't need it. - Is intended to be used to setup internal signals or custom Gtk Builders/UI logic. + Requests Key: "pass_ui_objects": [""] + Request reference to a UI component. Will be passed back as array to plugin. + Must define in plugin if set and an array of valid glade UI IDs is given. """ - raise PluginBaseException("Method hasn't been overriden...") + self._ui_objects = ui_objects + + def set_fm_event_system(self, fm_event_system): + """ + Requests Key: 'pass_fm_events': "true" + Must define in plugin if "pass_fm_events" is set to "true" string. + """ + self._event_system = fm_event_system + + def subscribe_to_events(self): + self._event_system.subscribe("update_state_info_plugins", self._update_fm_state_info) + + def _update_fm_state_info(self, state): + self._fm_state = state def _connect_builder_signals(self, caller_class, builder): classes = [caller_class] @@ -94,3 +88,9 @@ class PluginBase: reload_package_recursive(path, module_dict[path.stem].__dict__) reload_package_recursive(Path(plugin_path).parent, module_dict_main["module_dict_main"]) + + + def clear_children(self, widget: type) -> None: + """ Clear children of a gtk widget. """ + for child in widget.get_children(): + widget.remove(child) diff --git a/src/versions/solarfm-0.0.1/solarfm/plugins/plugins_controller.py b/src/solarfm/plugins/plugins_controller.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/plugins/plugins_controller.py rename to src/solarfm/plugins/plugins_controller.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/__init__.py b/src/solarfm/shellfm/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/__init__.py rename to src/solarfm/shellfm/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/__init__.py b/src/solarfm/shellfm/windows/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/__init__.py rename to src/solarfm/shellfm/windows/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/controller.py b/src/solarfm/shellfm/windows/controller.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/controller.py rename to src/solarfm/shellfm/windows/controller.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/__init__.py b/src/solarfm/shellfm/windows/tabs/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/__init__.py rename to src/solarfm/shellfm/windows/tabs/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/__init__.py b/src/solarfm/shellfm/windows/tabs/icons/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/__init__.py rename to src/solarfm/shellfm/windows/tabs/icons/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/icon.py b/src/solarfm/shellfm/windows/tabs/icons/icon.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/icon.py rename to src/solarfm/shellfm/windows/tabs/icons/icon.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/desktopiconmixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/meshsiconmixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/videoiconmixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/BaseDirectory.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Config.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/DesktopEntry.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Exceptions.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IconTheme.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/IniFile.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Locale.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Menu.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/MenuEditor.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/Mime.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/RecentFiles.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py b/src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py rename to src/solarfm/shellfm/windows/tabs/icons/mixins/xdg/util.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/path.py b/src/solarfm/shellfm/windows/tabs/path.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/path.py rename to src/solarfm/shellfm/windows/tabs/path.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/tab.py b/src/solarfm/shellfm/windows/tabs/tab.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/tab.py rename to src/solarfm/shellfm/windows/tabs/tab.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/__init__.py b/src/solarfm/shellfm/windows/tabs/utils/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/__init__.py rename to src/solarfm/shellfm/windows/tabs/utils/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/filehandler.py b/src/solarfm/shellfm/windows/tabs/utils/filehandler.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/filehandler.py rename to src/solarfm/shellfm/windows/tabs/utils/filehandler.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/launcher.py b/src/solarfm/shellfm/windows/tabs/utils/launcher.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/launcher.py rename to src/solarfm/shellfm/windows/tabs/utils/launcher.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/settings.py b/src/solarfm/shellfm/windows/tabs/utils/settings.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/tabs/utils/settings.py rename to src/solarfm/shellfm/windows/tabs/utils/settings.py diff --git a/src/versions/solarfm-0.0.1/solarfm/shellfm/windows/window.py b/src/solarfm/shellfm/windows/window.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/shellfm/windows/window.py rename to src/solarfm/shellfm/windows/window.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/__init__.py b/src/solarfm/utils/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/__init__.py rename to src/solarfm/utils/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/debugging.py b/src/solarfm/utils/debugging.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/debugging.py rename to src/solarfm/utils/debugging.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/event_system.py b/src/solarfm/utils/event_system.py similarity index 72% rename from src/versions/solarfm-0.0.1/solarfm/utils/event_system.py rename to src/solarfm/utils/event_system.py index 9d876cf..cd6975f 100644 --- a/src/versions/solarfm-0.0.1/solarfm/utils/event_system.py +++ b/src/solarfm/utils/event_system.py @@ -13,7 +13,20 @@ class EventSystem(Singleton): def __init__(self): self.subscribers = defaultdict(list) + self._is_paused = False + self._subscribe_to_events() + + + def _subscribe_to_events(self): + self.subscribe("pause_event_processing", self._pause_processing_events) + self.subscribe("resume_event_processing", self._resume_processing_events) + + def _pause_processing_events(self): + self._is_paused = True + + def _resume_processing_events(self): + self._is_paused = False def subscribe(self, event_type, fn): self.subscribers[event_type].append(fn) @@ -25,6 +38,9 @@ class EventSystem(Singleton): self.subscribers.pop(event_type, None) def emit(self, event_type, data = None): + if self._is_paused and event_type != "resume_event_processing": + return + if event_type in self.subscribers: for fn in self.subscribers[event_type]: if data: @@ -36,6 +52,9 @@ class EventSystem(Singleton): fn() def emit_and_await(self, event_type, data = None): + if self._is_paused and event_type != "resume_event_processing": + return + """ NOTE: Should be used when signal has only one listener and vis-a-vis """ if event_type in self.subscribers: response = None diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py b/src/solarfm/utils/ipc_server.py similarity index 73% rename from src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py rename to src/solarfm/utils/ipc_server.py index 563b086..7ce42e1 100644 --- a/src/versions/solarfm-0.0.1/solarfm/utils/ipc_server.py +++ b/src/solarfm/utils/ipc_server.py @@ -40,16 +40,16 @@ class IPCServer(Singleton): def create_ipc_listener(self) -> None: if self._conn_type == "socket": - if os.path.exists(self._ipc_address) and settings.is_dirty_start(): + if os.path.exists(self._ipc_address) and settings_manager.is_dirty_start(): os.unlink(self._ipc_address) - listener = Listener(address=self._ipc_address, family="AF_UNIX", authkey=self._ipc_authkey) + listener = Listener(address = self._ipc_address, family = "AF_UNIX", authkey = self._ipc_authkey) + elif "unsecured" not in self._conn_type: - listener = Listener((self._ipc_address, self._ipc_port), authkey=self._ipc_authkey) + listener = Listener((self._ipc_address, self._ipc_port), authkey = self._ipc_authkey) else: listener = Listener((self._ipc_address, self._ipc_port)) - self.is_ipc_alive = True self._run_ipc_loop(listener) @@ -61,15 +61,14 @@ class IPCServer(Singleton): start_time = time.perf_counter() GLib.idle_add(self._handle_ipc_message, *(conn, start_time,)) except Exception as e: - ... + logger.debug( repr(e) ) listener.close() def _handle_ipc_message(self, conn, start_time) -> None: while True: msg = conn.recv() - if settings_manager.is_debug(): - print(msg) + logger.debug(msg) if "FILE|" in msg: file = msg.split("FILE|")[1].strip() @@ -103,6 +102,25 @@ class IPCServer(Singleton): conn.send(message) conn.close() except ConnectionRefusedError as e: - print("Connection refused...") + logger.error("Connection refused...") except Exception as e: - print(repr(e)) \ No newline at end of file + logger.error( repr(e) ) + + + def send_test_ipc_message(self, message: str = "Empty Data...") -> None: + try: + if self._conn_type == "socket": + conn = Client(address=self._ipc_address, family="AF_UNIX", authkey=self._ipc_authkey) + elif "unsecured" not in self._conn_type: + conn = Client((self._ipc_address, self._ipc_port), authkey=self._ipc_authkey) + else: + conn = Client((self._ipc_address, self._ipc_port)) + + conn.send(message) + conn.close() + except ConnectionRefusedError as e: + if self._conn_type == "socket": + logger.error("IPC Socket no longer valid.... Removing.") + os.unlink(self._ipc_address) + except Exception as e: + logger.error( repr(e) ) diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/keybindings.py b/src/solarfm/utils/keybindings.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/keybindings.py rename to src/solarfm/utils/keybindings.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/logger.py b/src/solarfm/utils/logger.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/logger.py rename to src/solarfm/utils/logger.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/__init__.py b/src/solarfm/utils/settings_manager/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/__init__.py rename to src/solarfm/utils/settings_manager/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/manager.py b/src/solarfm/utils/settings_manager/manager.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/manager.py rename to src/solarfm/utils/settings_manager/manager.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/__init__.py b/src/solarfm/utils/settings_manager/options/__init__.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/__init__.py rename to src/solarfm/utils/settings_manager/options/__init__.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/config.py b/src/solarfm/utils/settings_manager/options/config.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/config.py rename to src/solarfm/utils/settings_manager/options/config.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/debugging.py b/src/solarfm/utils/settings_manager/options/debugging.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/debugging.py rename to src/solarfm/utils/settings_manager/options/debugging.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/filters.py b/src/solarfm/utils/settings_manager/options/filters.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/filters.py rename to src/solarfm/utils/settings_manager/options/filters.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/settings.py b/src/solarfm/utils/settings_manager/options/settings.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/settings.py rename to src/solarfm/utils/settings_manager/options/settings.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/theming.py b/src/solarfm/utils/settings_manager/options/theming.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/options/theming.py rename to src/solarfm/utils/settings_manager/options/theming.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/start_check_mixin.py b/src/solarfm/utils/settings_manager/start_check_mixin.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/settings_manager/start_check_mixin.py rename to src/solarfm/utils/settings_manager/start_check_mixin.py diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/singleton.py b/src/solarfm/utils/singleton.py similarity index 100% rename from src/versions/solarfm-0.0.1/solarfm/utils/singleton.py rename to src/solarfm/utils/singleton.py diff --git a/src/solarfm/utils/types/__init__.py b/src/solarfm/utils/types/__init__.py new file mode 100644 index 0000000..cb82cc2 --- /dev/null +++ b/src/solarfm/utils/types/__init__.py @@ -0,0 +1,3 @@ +""" + Types module +""" \ No newline at end of file diff --git a/src/solarfm/utils/types/state.py b/src/solarfm/utils/types/state.py new file mode 100644 index 0000000..ebd6d81 --- /dev/null +++ b/src/solarfm/utils/types/state.py @@ -0,0 +1,27 @@ +# Python imports +from dataclasses import dataclass + +# Lib imports +from gi.overrides.Gtk import IconView +from gi.overrides.Gtk import ListStore + +# Application imports + + + +@dataclass(slots=True) +class State: + fm_controller: any = None + notebooks: any = None + wid: int = None + tid: int = None + tab: type = None + icon_grid: IconView = None + store: ListStore = None + uris: list = None + uris_raw: list = None + selected_files: list = None + to_copy_files: list = None + to_cut_files: list = None + message_dialog: type = None + user_pass_dialog: type = None diff --git a/src/versions/solarfm-0.0.1/solarfm/utils/endpoint_registry.py b/src/versions/solarfm-0.0.1/solarfm/utils/endpoint_registry.py deleted file mode 100644 index 86e4295..0000000 --- a/src/versions/solarfm-0.0.1/solarfm/utils/endpoint_registry.py +++ /dev/null @@ -1,22 +0,0 @@ -# Python imports - -# Lib imports - -# Application imports -from .singleton import Singleton - - - -class EndpointRegistry(Singleton): - def __init__(self): - self._endpoints = {} - - def register(self, rule, **options): - def decorator(f): - self._endpoints[rule] = f - return f - - return decorator - - def get_endpoints(self): - return self._endpoints diff --git a/user_config/bin/solarfm b/user_config/bin/solarfm index 8cca2db..e833ed3 100755 --- a/user_config/bin/solarfm +++ b/user_config/bin/solarfm @@ -12,6 +12,14 @@ function main() { cd "${call_path}" echo "Working Dir: " $(pwd) - python /opt/solarfm.zip "$@" + files=() + for f in "$@"; do + target=$(readlink -f "${f}") + i="${#files[@]}" + size=$(($i + 1)) + files[$size]="${target}" + done + + python /opt/solarfm.zip "${files[@]}" } main "$@"; diff --git a/user_config/usr/share/solarfm/Main_Window.glade b/user_config/usr/share/solarfm/Main_Window.glade index 9bcb55c..e604e38 100644 --- a/user_config/usr/share/solarfm/Main_Window.glade +++ b/user_config/usr/share/solarfm/Main_Window.glade @@ -32,6 +32,11 @@ False gtk-redo + + True + False + gtk-justify-center + True False @@ -203,6 +208,17 @@ + + + Show Interactive Debugger + ui_debug + True + False + image7 + False + + + @@ -579,7 +595,6 @@ - True False start @@ -674,7 +689,6 @@ - True False start @@ -783,7 +797,6 @@ - True False start @@ -877,7 +890,6 @@ - True False start diff --git a/user_config/usr/share/solarfm/key-bindings.json b/user_config/usr/share/solarfm/key-bindings.json index b788b8b..83e0081 100644 --- a/user_config/usr/share/solarfm/key-bindings.json +++ b/user_config/usr/share/solarfm/key-bindings.json @@ -6,7 +6,7 @@ "open_terminal" : "F4", "refresh_tab" : ["F5", "r"], - "tggl_top_main_menubar" : "Alt_L", + "tggl_top_main_menubar" : "0", "tear_down" : "q", "go_up" : "Up", "go_home" : "slash", diff --git a/user_config/usr/share/solarfm/stylesheet.css b/user_config/usr/share/solarfm/stylesheet.css index c0383f6..e802040 100644 --- a/user_config/usr/share/solarfm/stylesheet.css +++ b/user_config/usr/share/solarfm/stylesheet.css @@ -1,4 +1,10 @@ /* Set fm to have transparent window */ + +/* * {*/ +/* background: rgba(39, 43, 52, 0.24);*/ +/* color: rgba(255, 255, 255, 1);*/ +/* }*/ + box, iconview, notebook, @@ -9,9 +15,47 @@ treeview.view, .content-view, .view { background: rgba(19, 21, 25, 0.14); + /* background: rgba(39, 43, 52, 0.14); */ color: rgba(255, 255, 255, 1); } +button:hover { + background-color: rgba(255, 185, 25, 0.34); +} + +/* ---- top controls ---- */ +window > box > box > button, +window > box > box > buttonbox > button { + background: rgba(39, 43, 52, 0.64); +} + +buttonbox > button * { + background: rgba(116, 0, 0, 0.0); + color: rgba(255, 255, 255, 1.0); +} + + +buttonbox > button:checked { + background-color: rgba(255, 125, 25, 0.34); +} + +buttonbox > button:hover { + background-color: rgba(255, 185, 25, 0.34); +} + +/* ---- notebook headers ---- */ +notebook > header { + background: rgba(39, 43, 52, 0.46); +} + +notebook > header > tabs > tab { + color: rgba(255, 255, 255, 1); +} + +notebook > header > tabs > tab:active { + background: rgba(0, 0, 0, 0.0); +} + notebook > header > tabs > tab:checked { /* Neon Blue 00e8ff */ background-color: rgba(0, 232, 255, 0.2); @@ -21,6 +65,41 @@ notebook > header > tabs > tab:checked { color: rgba(255, 255, 255, 0.8); } +popover { + background: rgba(39, 43, 52, 0.86); + color: rgba(255, 255, 255, 1); +} + +/* ---- make text selection slightly transparent ---- */ +* selection { + background-color: rgba(0, 115, 115, 0.34); + /* Bergundy */ + /* background-color: rgba(116, 0, 0, 0.64); */ + color: rgba(255, 255, 255, 0.5); +} + + +/* ---- notebook tab buttons ---- */ +tab > box > button { + background: rgba(116, 0, 0, 0.64); +} + +tab > box > button:hover { + background: rgba(256, 0, 0, 0.64); +} + + + + + + + + + + + + + #message_view { font: 16px "Monospace"; } @@ -83,4 +162,4 @@ XfdesktopIconView.view .rubberband { XfdesktopIconView.view:active { background-color: rgba(172, 102, 21, 1); -} */ +} */ \ No newline at end of file