From 1fc1609b0a38b857116b61919f7a21e3ea7aff93 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Sun, 13 Mar 2022 18:42:00 -0500 Subject: [PATCH] Renamed file, cleanup --- .../ui/{widget_mixin.py => grid_mixin.py} | 17 ++++------------- .../solarfm/context/mixins/ui/tab_mixin.py | 4 ++-- .../solarfm/shellfm/windows/tabs/icons/icon.py | 12 ++++++------ 3 files changed, 12 insertions(+), 21 deletions(-) rename src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/{widget_mixin.py => grid_mixin.py} (92%) diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/widget_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/grid_mixin.py similarity index 92% rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/widget_mixin.py rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/grid_mixin.py index 2fa3d0c..c9135ee 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/widget_mixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/grid_mixin.py @@ -19,7 +19,7 @@ def threaded(fn): -class WidgetMixin: +class GridMixin: """docstring for WidgetMixin""" def load_store(self, tab, store, save_state=False): @@ -27,14 +27,8 @@ class WidgetMixin: dir = tab.get_current_directory() files = tab.get_files() - # NOTE: We insure all indecies exist before calling threads that update - # icon positions. In addition, adding the name allows us to see - # the "file" during long or heavy number of icon updates. - for file in files: - store.append([None, file[0]]) - - # Now we update as fast as possible the icons. for i, file in enumerate(files): + store.append([None, file[0]]) self.create_icon(i, tab, store, dir, file[0]) # NOTE: Not likely called often from here but it could be useful @@ -48,15 +42,12 @@ class WidgetMixin: def update_store(self, i, store, icon, tab, dir, file): fpath = f"{dir}/{file}" - itr = store.get_iter(i) + itr = store.get_iter(i) if not icon: icon = self.get_system_thumbnail(fpath, tab.SYS_ICON_WH[0]) if not icon: - if fpath.endswith(".gif"): - icon = GdkPixbuf.PixbufAnimation.get_static_image(fpath) - else: - icon = GdkPixbuf.Pixbuf.new_from_file(tab.DEFAULT_ICON) + icon = GdkPixbuf.Pixbuf.new_from_file(tab.DEFAULT_ICON) store.set_value(itr, 0, icon) diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py index 819ae43..24e2b56 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py @@ -7,12 +7,12 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk # Application imports -from .widget_mixin import WidgetMixin +from .grid_mixin import GridMixin -class TabMixin(WidgetMixin): +class TabMixin(GridMixin): """docstring for TabMixin""" def create_tab(self, wid=None, tid=None, path=None): diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/tabs/icons/icon.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/tabs/icons/icon.py index 6afa0e5..4ff9c4e 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/tabs/icons/icon.py +++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/shellfm/windows/tabs/icons/icon.py @@ -59,12 +59,12 @@ class Icon(DesktopIconMixin, VideoIconMixin): def create_scaled_image(self, path, wxh): try: - if path.lower().endswith(".gif"): - return GdkPixbuf.PixbufAnimation.new_from_file(path) \ - .get_static_image() \ - .scale_simple(wxh[0], wxh[1], GdkPixbuf.InterpType.BILINEAR) - else: - return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, wxh[0], wxh[1], True) + if path.lower().endswith(".gif"): + return GdkPixbuf.PixbufAnimation.new_from_file(path) \ + .get_static_image() \ + .scale_simple(wxh[0], wxh[1], GdkPixbuf.InterpType.BILINEAR) + else: + return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, wxh[0], wxh[1], True) except Exception as e: print("Image Scaling Issue:") print( repr(e) )