From 4ce44d9add9fa9dec8af69eed86dd11ddea42142 Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Fri, 21 Jun 2019 00:43:47 -0500 Subject: [PATCH] Changed settings stuff --- .../pytop-0-0-1-x64/opt/Pytop/utils/Grid.py | 12 +++---- .../pytop-0-0-1-x64/opt/Pytop/utils/Icon.py | 11 +++---- .../opt/Pytop/utils/Settings.py | 31 +++++++++++-------- src/versions/pytop-0.0.1/Pytop/utils/Grid.py | 12 +++---- src/versions/pytop-0.0.1/Pytop/utils/Icon.py | 11 +++---- .../pytop-0.0.1/Pytop/utils/Settings.py | 31 +++++++++++-------- 6 files changed, 56 insertions(+), 52 deletions(-) diff --git a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Grid.py b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Grid.py index 52e4c80..392de55 100644 --- a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Grid.py +++ b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Grid.py @@ -31,8 +31,8 @@ class Grid: self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str) self.usrHome = settings.returnUserHome() - self.builder = self.settings.returnBuilder() - self.ColumnSize = self.settings.returnColumnSize() + self.builder = settings.returnBuilder() + self.ColumnSize = settings.returnColumnSize() self.currentPath = "" self.selectedFile = "" @@ -43,15 +43,13 @@ class Grid: self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,)) self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,)) - self.vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') - self.imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') - self.copyCutArry = [] - - + self.vidsList = settings.returnVidsExtensionList() + self.imagesList = settings.returnImagesExtensionList() self.gtkLock = False # Thread checks for gtkLock self.threadLock = False # Gtk checks for thread lock self.helperThread = None # Helper thread object self.toWorkPool = [] # Thread fills pool and gtk empties it + self.copyCutArry = [] self.setIconViewDir(newPath) diff --git a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Icon.py b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Icon.py index d62d28c..826e408 100644 --- a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Icon.py +++ b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Icon.py @@ -24,8 +24,9 @@ def threaded(fn): class Icon: def __init__(self, settings): self.settings = settings - self.thubnailGen = self.settings.getThumbnailGenerator() - + self.thubnailGen = settings.getThumbnailGenerator() + self.vidsList = settings.returnVidsExtensionList() + self.imagesList = settings.returnImagesExtensionList() self.GTK_ORIENTATION = settings.returnIconImagePos() self.usrHome = settings.returnUserHome() self.iconContainerWH = settings.returnContainerWH() @@ -41,11 +42,9 @@ class Icon: def getIconImage(self, file, fullPath): try: thumbnl = None - vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') - imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') # Video thumbnail - if file.lower().endswith(vidsList): + if file.lower().endswith(self.vidsList): fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest() hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png" @@ -54,7 +53,7 @@ class Icon: thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH) # Image Icon - elif file.lower().endswith(imagesList): + elif file.lower().endswith(self.imagesList): thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH) # .desktop file parsing elif fullPath.lower().endswith( ('.desktop',) ): diff --git a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Settings.py b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Settings.py index 9c6b60f..6c612f5 100644 --- a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Settings.py +++ b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Settings.py @@ -12,19 +12,22 @@ class Settings: self.builder = None self.hideHiddenFiles = True + self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) self.THUMB_GENERATOR = "ffmpegthumbnailer" self.DEFAULTCOLOR = gdk.RGBA(0.0, 0.0, 0.0, 0.0) # ~#00000000 self.MOUSEOVERCOLOR = gdk.RGBA(0.0, 0.9, 1.0, 0.64) # ~#00e8ff self.SELECTEDCOLOR = gdk.RGBA(0.4, 0.5, 0.1, 0.84) - self.webHome = 'http://webfm.com/' + self.ColumnSize = 8 self.usrHome = os.path.expanduser('~') self.desktopPath = self.usrHome + "/Desktop" + self.webHome = 'http://webfm.com/' self.iconContainerWxH = [128, 128] self.systemIconImageWxH = [72, 72] self.viIconWxH = [256, 128] - self.ColumnSize = 8 + self.vidsExtensionList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') + self.imagesExtensionList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') def attachBuilder(self, builder): @@ -66,17 +69,19 @@ class Settings: return monitors - def returnBuilder(self): return self.builder - def returnUserHome(self): return self.usrHome - def returnDesktopPath(self): return self.usrHome + "/Desktop" - def returnIconImagePos(self): return self.GTK_ORIENTATION - def getThumbnailGenerator(self): return self.THUMB_GENERATOR - def returnColumnSize(self): return self.ColumnSize - def returnContainerWH(self): return self.iconContainerWxH - def returnSystemIconImageWH(self): return self.systemIconImageWxH - def returnVIIconWH(self): return self.viIconWxH - def returnWebHome(self): return self.webHome - def isHideHiddenFiles(self): return self.hideHiddenFiles + def returnBuilder(self): return self.builder + def returnUserHome(self): return self.usrHome + def returnDesktopPath(self): return self.usrHome + "/Desktop" + def returnIconImagePos(self): return self.GTK_ORIENTATION + def getThumbnailGenerator(self): return self.THUMB_GENERATOR + def returnColumnSize(self): return self.ColumnSize + def returnContainerWH(self): return self.iconContainerWxH + def returnSystemIconImageWH(self): return self.systemIconImageWxH + def returnVIIconWH(self): return self.viIconWxH + def returnWebHome(self): return self.webHome + def isHideHiddenFiles(self): return self.hideHiddenFiles + def returnVidsExtensionList(self): return self.vidsExtensionList + def returnImagesExtensionList(self): return self.imagesExtensionList def setDefaultWebviewSettings(self, widget, settings=None): # Usability diff --git a/src/versions/pytop-0.0.1/Pytop/utils/Grid.py b/src/versions/pytop-0.0.1/Pytop/utils/Grid.py index 52e4c80..392de55 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Grid.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Grid.py @@ -31,8 +31,8 @@ class Grid: self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str) self.usrHome = settings.returnUserHome() - self.builder = self.settings.returnBuilder() - self.ColumnSize = self.settings.returnColumnSize() + self.builder = settings.returnBuilder() + self.ColumnSize = settings.returnColumnSize() self.currentPath = "" self.selectedFile = "" @@ -43,15 +43,13 @@ class Grid: self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,)) self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,)) - self.vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') - self.imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') - self.copyCutArry = [] - - + self.vidsList = settings.returnVidsExtensionList() + self.imagesList = settings.returnImagesExtensionList() self.gtkLock = False # Thread checks for gtkLock self.threadLock = False # Gtk checks for thread lock self.helperThread = None # Helper thread object self.toWorkPool = [] # Thread fills pool and gtk empties it + self.copyCutArry = [] self.setIconViewDir(newPath) diff --git a/src/versions/pytop-0.0.1/Pytop/utils/Icon.py b/src/versions/pytop-0.0.1/Pytop/utils/Icon.py index d62d28c..826e408 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Icon.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Icon.py @@ -24,8 +24,9 @@ def threaded(fn): class Icon: def __init__(self, settings): self.settings = settings - self.thubnailGen = self.settings.getThumbnailGenerator() - + self.thubnailGen = settings.getThumbnailGenerator() + self.vidsList = settings.returnVidsExtensionList() + self.imagesList = settings.returnImagesExtensionList() self.GTK_ORIENTATION = settings.returnIconImagePos() self.usrHome = settings.returnUserHome() self.iconContainerWH = settings.returnContainerWH() @@ -41,11 +42,9 @@ class Icon: def getIconImage(self, file, fullPath): try: thumbnl = None - vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') - imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') # Video thumbnail - if file.lower().endswith(vidsList): + if file.lower().endswith(self.vidsList): fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest() hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png" @@ -54,7 +53,7 @@ class Icon: thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH) # Image Icon - elif file.lower().endswith(imagesList): + elif file.lower().endswith(self.imagesList): thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH) # .desktop file parsing elif fullPath.lower().endswith( ('.desktop',) ): diff --git a/src/versions/pytop-0.0.1/Pytop/utils/Settings.py b/src/versions/pytop-0.0.1/Pytop/utils/Settings.py index 9c6b60f..6c612f5 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Settings.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Settings.py @@ -12,19 +12,22 @@ class Settings: self.builder = None self.hideHiddenFiles = True + self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) self.THUMB_GENERATOR = "ffmpegthumbnailer" self.DEFAULTCOLOR = gdk.RGBA(0.0, 0.0, 0.0, 0.0) # ~#00000000 self.MOUSEOVERCOLOR = gdk.RGBA(0.0, 0.9, 1.0, 0.64) # ~#00e8ff self.SELECTEDCOLOR = gdk.RGBA(0.4, 0.5, 0.1, 0.84) - self.webHome = 'http://webfm.com/' + self.ColumnSize = 8 self.usrHome = os.path.expanduser('~') self.desktopPath = self.usrHome + "/Desktop" + self.webHome = 'http://webfm.com/' self.iconContainerWxH = [128, 128] self.systemIconImageWxH = [72, 72] self.viIconWxH = [256, 128] - self.ColumnSize = 8 + self.vidsExtensionList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm') + self.imagesExtensionList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga') def attachBuilder(self, builder): @@ -66,17 +69,19 @@ class Settings: return monitors - def returnBuilder(self): return self.builder - def returnUserHome(self): return self.usrHome - def returnDesktopPath(self): return self.usrHome + "/Desktop" - def returnIconImagePos(self): return self.GTK_ORIENTATION - def getThumbnailGenerator(self): return self.THUMB_GENERATOR - def returnColumnSize(self): return self.ColumnSize - def returnContainerWH(self): return self.iconContainerWxH - def returnSystemIconImageWH(self): return self.systemIconImageWxH - def returnVIIconWH(self): return self.viIconWxH - def returnWebHome(self): return self.webHome - def isHideHiddenFiles(self): return self.hideHiddenFiles + def returnBuilder(self): return self.builder + def returnUserHome(self): return self.usrHome + def returnDesktopPath(self): return self.usrHome + "/Desktop" + def returnIconImagePos(self): return self.GTK_ORIENTATION + def getThumbnailGenerator(self): return self.THUMB_GENERATOR + def returnColumnSize(self): return self.ColumnSize + def returnContainerWH(self): return self.iconContainerWxH + def returnSystemIconImageWH(self): return self.systemIconImageWxH + def returnVIIconWH(self): return self.viIconWxH + def returnWebHome(self): return self.webHome + def isHideHiddenFiles(self): return self.hideHiddenFiles + def returnVidsExtensionList(self): return self.vidsExtensionList + def returnImagesExtensionList(self): return self.imagesExtensionList def setDefaultWebviewSettings(self, widget, settings=None): # Usability