Changed settings stuff
This commit is contained in:
parent
fbf6b24389
commit
4ce44d9add
@ -31,8 +31,8 @@ class Grid:
|
|||||||
|
|
||||||
self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str)
|
self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str)
|
||||||
self.usrHome = settings.returnUserHome()
|
self.usrHome = settings.returnUserHome()
|
||||||
self.builder = self.settings.returnBuilder()
|
self.builder = settings.returnBuilder()
|
||||||
self.ColumnSize = self.settings.returnColumnSize()
|
self.ColumnSize = settings.returnColumnSize()
|
||||||
self.currentPath = ""
|
self.currentPath = ""
|
||||||
self.selectedFile = ""
|
self.selectedFile = ""
|
||||||
|
|
||||||
@ -43,15 +43,13 @@ class Grid:
|
|||||||
self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,))
|
self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,))
|
||||||
self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,))
|
self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,))
|
||||||
|
|
||||||
self.vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm')
|
self.vidsList = settings.returnVidsExtensionList()
|
||||||
self.imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga')
|
self.imagesList = settings.returnImagesExtensionList()
|
||||||
self.copyCutArry = []
|
|
||||||
|
|
||||||
|
|
||||||
self.gtkLock = False # Thread checks for gtkLock
|
self.gtkLock = False # Thread checks for gtkLock
|
||||||
self.threadLock = False # Gtk checks for thread lock
|
self.threadLock = False # Gtk checks for thread lock
|
||||||
self.helperThread = None # Helper thread object
|
self.helperThread = None # Helper thread object
|
||||||
self.toWorkPool = [] # Thread fills pool and gtk empties it
|
self.toWorkPool = [] # Thread fills pool and gtk empties it
|
||||||
|
self.copyCutArry = []
|
||||||
|
|
||||||
self.setIconViewDir(newPath)
|
self.setIconViewDir(newPath)
|
||||||
|
|
||||||
|
@ -24,8 +24,9 @@ def threaded(fn):
|
|||||||
class Icon:
|
class Icon:
|
||||||
def __init__(self, settings):
|
def __init__(self, settings):
|
||||||
self.settings = 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.GTK_ORIENTATION = settings.returnIconImagePos()
|
||||||
self.usrHome = settings.returnUserHome()
|
self.usrHome = settings.returnUserHome()
|
||||||
self.iconContainerWH = settings.returnContainerWH()
|
self.iconContainerWH = settings.returnContainerWH()
|
||||||
@ -41,11 +42,9 @@ class Icon:
|
|||||||
def getIconImage(self, file, fullPath):
|
def getIconImage(self, file, fullPath):
|
||||||
try:
|
try:
|
||||||
thumbnl = None
|
thumbnl = None
|
||||||
vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm')
|
|
||||||
imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga')
|
|
||||||
|
|
||||||
# Video thumbnail
|
# Video thumbnail
|
||||||
if file.lower().endswith(vidsList):
|
if file.lower().endswith(self.vidsList):
|
||||||
fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest()
|
fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest()
|
||||||
hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png"
|
hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png"
|
||||||
|
|
||||||
@ -54,7 +53,7 @@ class Icon:
|
|||||||
|
|
||||||
thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH)
|
thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH)
|
||||||
# Image Icon
|
# Image Icon
|
||||||
elif file.lower().endswith(imagesList):
|
elif file.lower().endswith(self.imagesList):
|
||||||
thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH)
|
thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH)
|
||||||
# .desktop file parsing
|
# .desktop file parsing
|
||||||
elif fullPath.lower().endswith( ('.desktop',) ):
|
elif fullPath.lower().endswith( ('.desktop',) ):
|
||||||
|
@ -12,19 +12,22 @@ class Settings:
|
|||||||
self.builder = None
|
self.builder = None
|
||||||
self.hideHiddenFiles = True
|
self.hideHiddenFiles = True
|
||||||
|
|
||||||
|
|
||||||
self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1)
|
self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1)
|
||||||
self.THUMB_GENERATOR = "ffmpegthumbnailer"
|
self.THUMB_GENERATOR = "ffmpegthumbnailer"
|
||||||
self.DEFAULTCOLOR = gdk.RGBA(0.0, 0.0, 0.0, 0.0) # ~#00000000
|
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.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.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.usrHome = os.path.expanduser('~')
|
||||||
self.desktopPath = self.usrHome + "/Desktop"
|
self.desktopPath = self.usrHome + "/Desktop"
|
||||||
|
self.webHome = 'http://webfm.com/'
|
||||||
self.iconContainerWxH = [128, 128]
|
self.iconContainerWxH = [128, 128]
|
||||||
self.systemIconImageWxH = [72, 72]
|
self.systemIconImageWxH = [72, 72]
|
||||||
self.viIconWxH = [256, 128]
|
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):
|
def attachBuilder(self, builder):
|
||||||
@ -66,17 +69,19 @@ class Settings:
|
|||||||
return monitors
|
return monitors
|
||||||
|
|
||||||
|
|
||||||
def returnBuilder(self): return self.builder
|
def returnBuilder(self): return self.builder
|
||||||
def returnUserHome(self): return self.usrHome
|
def returnUserHome(self): return self.usrHome
|
||||||
def returnDesktopPath(self): return self.usrHome + "/Desktop"
|
def returnDesktopPath(self): return self.usrHome + "/Desktop"
|
||||||
def returnIconImagePos(self): return self.GTK_ORIENTATION
|
def returnIconImagePos(self): return self.GTK_ORIENTATION
|
||||||
def getThumbnailGenerator(self): return self.THUMB_GENERATOR
|
def getThumbnailGenerator(self): return self.THUMB_GENERATOR
|
||||||
def returnColumnSize(self): return self.ColumnSize
|
def returnColumnSize(self): return self.ColumnSize
|
||||||
def returnContainerWH(self): return self.iconContainerWxH
|
def returnContainerWH(self): return self.iconContainerWxH
|
||||||
def returnSystemIconImageWH(self): return self.systemIconImageWxH
|
def returnSystemIconImageWH(self): return self.systemIconImageWxH
|
||||||
def returnVIIconWH(self): return self.viIconWxH
|
def returnVIIconWH(self): return self.viIconWxH
|
||||||
def returnWebHome(self): return self.webHome
|
def returnWebHome(self): return self.webHome
|
||||||
def isHideHiddenFiles(self): return self.hideHiddenFiles
|
def isHideHiddenFiles(self): return self.hideHiddenFiles
|
||||||
|
def returnVidsExtensionList(self): return self.vidsExtensionList
|
||||||
|
def returnImagesExtensionList(self): return self.imagesExtensionList
|
||||||
|
|
||||||
def setDefaultWebviewSettings(self, widget, settings=None):
|
def setDefaultWebviewSettings(self, widget, settings=None):
|
||||||
# Usability
|
# Usability
|
||||||
|
@ -31,8 +31,8 @@ class Grid:
|
|||||||
|
|
||||||
self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str)
|
self.store = gtk.ListStore(GdkPixbuf.Pixbuf, str)
|
||||||
self.usrHome = settings.returnUserHome()
|
self.usrHome = settings.returnUserHome()
|
||||||
self.builder = self.settings.returnBuilder()
|
self.builder = settings.returnBuilder()
|
||||||
self.ColumnSize = self.settings.returnColumnSize()
|
self.ColumnSize = settings.returnColumnSize()
|
||||||
self.currentPath = ""
|
self.currentPath = ""
|
||||||
self.selectedFile = ""
|
self.selectedFile = ""
|
||||||
|
|
||||||
@ -43,15 +43,13 @@ class Grid:
|
|||||||
self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,))
|
self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,))
|
||||||
self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,))
|
self.desktop.connect("selection-changed", self.setIconSelectionArray, (self.desktop,))
|
||||||
|
|
||||||
self.vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm')
|
self.vidsList = settings.returnVidsExtensionList()
|
||||||
self.imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga')
|
self.imagesList = settings.returnImagesExtensionList()
|
||||||
self.copyCutArry = []
|
|
||||||
|
|
||||||
|
|
||||||
self.gtkLock = False # Thread checks for gtkLock
|
self.gtkLock = False # Thread checks for gtkLock
|
||||||
self.threadLock = False # Gtk checks for thread lock
|
self.threadLock = False # Gtk checks for thread lock
|
||||||
self.helperThread = None # Helper thread object
|
self.helperThread = None # Helper thread object
|
||||||
self.toWorkPool = [] # Thread fills pool and gtk empties it
|
self.toWorkPool = [] # Thread fills pool and gtk empties it
|
||||||
|
self.copyCutArry = []
|
||||||
|
|
||||||
self.setIconViewDir(newPath)
|
self.setIconViewDir(newPath)
|
||||||
|
|
||||||
|
@ -24,8 +24,9 @@ def threaded(fn):
|
|||||||
class Icon:
|
class Icon:
|
||||||
def __init__(self, settings):
|
def __init__(self, settings):
|
||||||
self.settings = 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.GTK_ORIENTATION = settings.returnIconImagePos()
|
||||||
self.usrHome = settings.returnUserHome()
|
self.usrHome = settings.returnUserHome()
|
||||||
self.iconContainerWH = settings.returnContainerWH()
|
self.iconContainerWH = settings.returnContainerWH()
|
||||||
@ -41,11 +42,9 @@ class Icon:
|
|||||||
def getIconImage(self, file, fullPath):
|
def getIconImage(self, file, fullPath):
|
||||||
try:
|
try:
|
||||||
thumbnl = None
|
thumbnl = None
|
||||||
vidsList = ('.mkv', '.avi', '.flv', '.mov', '.m4v', '.mpg', '.wmv', '.mpeg', '.mp4', '.webm')
|
|
||||||
imagesList = ('.png', '.jpg', '.jpeg', '.gif', '.ico', '.tga')
|
|
||||||
|
|
||||||
# Video thumbnail
|
# Video thumbnail
|
||||||
if file.lower().endswith(vidsList):
|
if file.lower().endswith(self.vidsList):
|
||||||
fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest()
|
fileHash = hashlib.sha256(str.encode(fullPath)).hexdigest()
|
||||||
hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png"
|
hashImgPth = self.usrHome + "/.thumbnails/normal/" + fileHash + ".png"
|
||||||
|
|
||||||
@ -54,7 +53,7 @@ class Icon:
|
|||||||
|
|
||||||
thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH)
|
thumbnl = self.createIconImageBuffer(hashImgPth, self.viIconWH)
|
||||||
# Image Icon
|
# Image Icon
|
||||||
elif file.lower().endswith(imagesList):
|
elif file.lower().endswith(self.imagesList):
|
||||||
thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH)
|
thumbnl = self.createIconImageBuffer(fullPath, self.viIconWH)
|
||||||
# .desktop file parsing
|
# .desktop file parsing
|
||||||
elif fullPath.lower().endswith( ('.desktop',) ):
|
elif fullPath.lower().endswith( ('.desktop',) ):
|
||||||
|
@ -12,19 +12,22 @@ class Settings:
|
|||||||
self.builder = None
|
self.builder = None
|
||||||
self.hideHiddenFiles = True
|
self.hideHiddenFiles = True
|
||||||
|
|
||||||
|
|
||||||
self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1)
|
self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1)
|
||||||
self.THUMB_GENERATOR = "ffmpegthumbnailer"
|
self.THUMB_GENERATOR = "ffmpegthumbnailer"
|
||||||
self.DEFAULTCOLOR = gdk.RGBA(0.0, 0.0, 0.0, 0.0) # ~#00000000
|
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.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.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.usrHome = os.path.expanduser('~')
|
||||||
self.desktopPath = self.usrHome + "/Desktop"
|
self.desktopPath = self.usrHome + "/Desktop"
|
||||||
|
self.webHome = 'http://webfm.com/'
|
||||||
self.iconContainerWxH = [128, 128]
|
self.iconContainerWxH = [128, 128]
|
||||||
self.systemIconImageWxH = [72, 72]
|
self.systemIconImageWxH = [72, 72]
|
||||||
self.viIconWxH = [256, 128]
|
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):
|
def attachBuilder(self, builder):
|
||||||
@ -66,17 +69,19 @@ class Settings:
|
|||||||
return monitors
|
return monitors
|
||||||
|
|
||||||
|
|
||||||
def returnBuilder(self): return self.builder
|
def returnBuilder(self): return self.builder
|
||||||
def returnUserHome(self): return self.usrHome
|
def returnUserHome(self): return self.usrHome
|
||||||
def returnDesktopPath(self): return self.usrHome + "/Desktop"
|
def returnDesktopPath(self): return self.usrHome + "/Desktop"
|
||||||
def returnIconImagePos(self): return self.GTK_ORIENTATION
|
def returnIconImagePos(self): return self.GTK_ORIENTATION
|
||||||
def getThumbnailGenerator(self): return self.THUMB_GENERATOR
|
def getThumbnailGenerator(self): return self.THUMB_GENERATOR
|
||||||
def returnColumnSize(self): return self.ColumnSize
|
def returnColumnSize(self): return self.ColumnSize
|
||||||
def returnContainerWH(self): return self.iconContainerWxH
|
def returnContainerWH(self): return self.iconContainerWxH
|
||||||
def returnSystemIconImageWH(self): return self.systemIconImageWxH
|
def returnSystemIconImageWH(self): return self.systemIconImageWxH
|
||||||
def returnVIIconWH(self): return self.viIconWxH
|
def returnVIIconWH(self): return self.viIconWxH
|
||||||
def returnWebHome(self): return self.webHome
|
def returnWebHome(self): return self.webHome
|
||||||
def isHideHiddenFiles(self): return self.hideHiddenFiles
|
def isHideHiddenFiles(self): return self.hideHiddenFiles
|
||||||
|
def returnVidsExtensionList(self): return self.vidsExtensionList
|
||||||
|
def returnImagesExtensionList(self): return self.imagesExtensionList
|
||||||
|
|
||||||
def setDefaultWebviewSettings(self, widget, settings=None):
|
def setDefaultWebviewSettings(self, widget, settings=None):
|
||||||
# Usability
|
# Usability
|
||||||
|
Loading…
Reference in New Issue
Block a user