diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py index 3105637..0979bdc 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__main__.py @@ -11,7 +11,7 @@ tracemalloc.start() # Lib imports import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') from gi.repository import Gtk # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/view/icons/mixins/DesktopIconMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/view/icons/mixins/DesktopIconMixin.py index 2d3c30b..e75c406 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/view/icons/mixins/DesktopIconMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/view/icons/mixins/DesktopIconMixin.py @@ -4,7 +4,7 @@ from os.path import isfile # Gtk imports import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') from gi.repository import Gtk # Application imports @@ -21,7 +21,7 @@ class DesktopIconMixin: if "steam" in icon: name = xdgObj.getName() file_hash = hashlib.sha256(str.encode(name)).hexdigest() - hash_img_pth = self.STEAM_ICONS_PTH + "/" + file_hash + ".jpg" + hash_img_pth = f"{self.STEAM_ICONS_PTH}/{file_hash}.jpg" if isfile(hash_img_pth) == True: # Use video sizes since headers are bigger @@ -30,7 +30,7 @@ class DesktopIconMixin: exec_str = xdgObj.getExec() parts = exec_str.split("steam://rungameid/") id = parts[len(parts) - 1] - imageLink = self.STEAM_BASE_URL + id + "/header.jpg" + imageLink = f"{self.STEAM_BASE_URL}{id}/header.jpg" proc = subprocess.Popen(["wget", "-O", hash_img_pth, imageLink]) proc.wait() @@ -57,9 +57,9 @@ class DesktopIconMixin: for (dirpath, dirnames, filenames) in os.walk(path): for file in filenames: - appNM = "application-x-" + icon + appNM = f"application-x-{icon}" if icon in file or appNM in file: - alt_icon_path = dirpath + "/" + file + alt_icon_path = "{dirpath}/{file}" break return alt_icon_path diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/Controller.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/Controller.py index 5354c5e..bd5e077 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/Controller.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/Controller.py @@ -3,7 +3,7 @@ import sys, traceback, threading, signal, inspect, os, time # Lib imports import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') from gi.repository import Gtk, GLib # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/KeyboardSignalsMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/KeyboardSignalsMixin.py index b397027..1c8420c 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/KeyboardSignalsMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/KeyboardSignalsMixin.py @@ -3,8 +3,8 @@ import re # Lib imports import gi -gi.require_version('Gtk', '3.0') -gi.require_version('Gdk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Gdk', '4.0') from gi.repository import Gtk, Gdk # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/ShowHideMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/ShowHideMixin.py index 49b29d8..9981a18 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/ShowHideMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/ShowHideMixin.py @@ -2,8 +2,8 @@ # Gtk imports import gi -gi.require_version('Gtk', '3.0') -gi.require_version('Gdk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Gdk', '4.0') from gi.repository import Gtk, Gdk, Gio # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/TabMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/TabMixin.py index 51960dd..7e341aa 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/TabMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/TabMixin.py @@ -3,8 +3,8 @@ import os # Lib imports import gi -gi.require_version('Gtk', '3.0') -gi.require_version('Gdk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Gdk', '4.0') from gi.repository import Gtk, Gdk # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetFileActionMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetFileActionMixin.py index 96f503d..16bdc69 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetFileActionMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetFileActionMixin.py @@ -3,7 +3,7 @@ import os # Lib imports import gi -gi.require_version('Gtk', '3.0') +gi.require_version('Gtk', '4.0') from gi.repository import Gtk, GObject, Gio # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetMixin.py index 52b9a0d..d40f044 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WidgetMixin.py @@ -4,8 +4,8 @@ import os, threading, subprocess # Lib imports import gi -gi.require_version("Gtk", "3.0") -gi.require_version('Gdk', '3.0') +gi.require_version("Gtk", "4.0") +gi.require_version('Gdk', '4.0') from gi.repository import Gtk, Gdk, GLib, Gio, GdkPixbuf # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WindowMixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WindowMixin.py index aa8687f..16e5614 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WindowMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/signal_classes/mixins/WindowMixin.py @@ -5,7 +5,7 @@ from os.path import isdir, isfile # Lib imports import gi -gi.require_version('Gdk', '3.0') +gi.require_version('Gdk', '4.0') from gi.repository import Gdk, Gio # Application imports diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/IMG_20210603_222549659.jpg b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/IMG_20210603_222549659.jpg new file mode 100644 index 0000000..4a4a959 Binary files /dev/null and b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/IMG_20210603_222549659.jpg differ diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/Settings.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/Settings.py index 3dc368f..245c31d 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/Settings.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/Settings.py @@ -4,8 +4,8 @@ from os import path # Gtk imports import gi, cairo -gi.require_version('Gtk', '3.0') -gi.require_version('Gdk', '3.0') +gi.require_version('Gtk', '4.0') +gi.require_version('Gdk', '4.0') from gi.repository import Gtk as gtk from gi.repository import Gdk as gdk diff --git a/user_config/usr/share/solarfm/Main_Window.glade b/user_config/usr/share/solarfm/Main_Window.glade index 9878a5a..def90a7 100644 --- a/user_config/usr/share/solarfm/Main_Window.glade +++ b/user_config/usr/share/solarfm/Main_Window.glade @@ -1,7 +1,7 @@ - + False 5