diff --git a/bin/pytop-0-0-1-x64.deb b/bin/pytop-0-0-1-x64.deb index 6e9f1be..7d31965 100644 Binary files a/bin/pytop-0-0-1-x64.deb and b/bin/pytop-0-0-1-x64.deb differ diff --git a/src/debs/pytop-0-0-1-x64/opt/Pytop/PyTop.py b/src/debs/pytop-0-0-1-x64/opt/Pytop/PyTop.py index f3d859c..1cfdbc3 100755 --- a/src/debs/pytop-0-0-1-x64/opt/Pytop/PyTop.py +++ b/src/debs/pytop-0-0-1-x64/opt/Pytop/PyTop.py @@ -14,16 +14,14 @@ from utils import Settings, Events class Main: def __init__(self): - # Needed for glade file load to work right... - webkit.WebView() + webkit.WebView() # Needed for glade file to load... self.builder = gtk.Builder() self.settings = Settings() self.settings.attachBuilder(self.builder) - self.builder.connect_signals(Events(self.builder, self.settings)) + self.builder.connect_signals(Events(self.settings)) window = self.settings.createWindow() - window.fullscreen() window.show_all() diff --git a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Events.py b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Events.py index c0d17b2..b9f721e 100644 --- a/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Events.py +++ b/src/debs/pytop-0-0-1-x64/opt/Pytop/utils/Events.py @@ -6,21 +6,21 @@ gi.require_version('Gdk', '3.0') from gi.repository import Gdk as gdk # Python imports -import os, threading -from .Grid import Grid +import threading +from .Grid import Grid from .Dragging import Dragging from threading import Thread gdk.threads_init() class Events: - def __init__(self, builder, settings): - self.builder = builder + def __init__(self, settings): self.settings = settings + self.builder = self.settings.returnBuilder() self.desktop = self.builder.get_object("Desktop") + self.webview = self.builder.get_object("webview") self.desktopPath = self.settings.returnDesktopPath() - self.webview = self.builder.get_object("webview") self.settings.setDefaultWebviewSettings(self.webview, self.webview.get_settings()) self.webview.load_uri(self.settings.returnWebHome()) 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 b33edf9..204bc9b 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 @@ -63,7 +63,7 @@ class Grid: loadProgress.set_fraction(0.0) self.clearGrid(self.desktop) for file in files: - eveBox = Icon().createIcon(dirPath, file) + eveBox = Icon(self.settings).createIcon(dirPath, file) # self.drag.connectEvents(self.desktop, eveBox) eveBox.connect("button_press_event", self.iconClickEventManager, (eveBox,)) eveBox.connect("enter_notify_event", self.settings.mouseOver, ()) 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 69cf464..3288169 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 @@ -13,13 +13,12 @@ from os.path import isdir, isfile, join class Icon: - def __init__(self): - self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) - self.iconContainerWxH = [128, -1] - self.systemIconImageWxH = [72, 72] - self.viIconWxH = [128, -1] - self.usrHome = os.path.expanduser('~') - + def __init__(self, settings): + self.usrHome = settings.returnUserHome() + self.GTK_ORIENTATION = settings.returnIconImagePos() + self.iconContainerWxH = settings.returnContainerWH() + self.systemIconImageWxH = settings.returnSystemIconImageWH() + self.viIconWxH = settings.returnVIIconWH() def createIcon(self, dir, file): fullPathFile = dir + "/" + file 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 e0d2f3a..7d3fd0f 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 @@ -22,6 +22,10 @@ class Settings: self.desktopPath = self.usrHome + "/Desktop" self.ColumnSize = 10 self.webHome = 'http://webfm.com/' + self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) + self.iconContainerWxH = [128, -1] + self.systemIconImageWxH = [72, 72] + self.viIconWxH = [128, -1] def attachBuilder(self, builder): @@ -63,23 +67,16 @@ class Settings: return monitors - def returnBuilder(self): - return self.builder - - def returnUserHome(self): - return self.usrHome - - def returnDesktopPath(self): - return self.usrHome + "/Desktop" - - def returnColumnSize(self): - return self.ColumnSize - - 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 returnColumnSize(self): return self.ColumnSize + def returnIconImagePos(self): return self.GTK_ORIENTATION + 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 mouseOver(self, widget, eve, args): hand_cursor = gdk.Cursor(gdk.CursorType.HAND2) diff --git a/src/versions/pytop-0.0.1/Pytop/PyTop.py b/src/versions/pytop-0.0.1/Pytop/PyTop.py index f3d859c..1cfdbc3 100755 --- a/src/versions/pytop-0.0.1/Pytop/PyTop.py +++ b/src/versions/pytop-0.0.1/Pytop/PyTop.py @@ -14,16 +14,14 @@ from utils import Settings, Events class Main: def __init__(self): - # Needed for glade file load to work right... - webkit.WebView() + webkit.WebView() # Needed for glade file to load... self.builder = gtk.Builder() self.settings = Settings() self.settings.attachBuilder(self.builder) - self.builder.connect_signals(Events(self.builder, self.settings)) + self.builder.connect_signals(Events(self.settings)) window = self.settings.createWindow() - window.fullscreen() window.show_all() diff --git a/src/versions/pytop-0.0.1/Pytop/utils/Events.py b/src/versions/pytop-0.0.1/Pytop/utils/Events.py index c0d17b2..b9f721e 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Events.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Events.py @@ -6,21 +6,21 @@ gi.require_version('Gdk', '3.0') from gi.repository import Gdk as gdk # Python imports -import os, threading -from .Grid import Grid +import threading +from .Grid import Grid from .Dragging import Dragging from threading import Thread gdk.threads_init() class Events: - def __init__(self, builder, settings): - self.builder = builder + def __init__(self, settings): self.settings = settings + self.builder = self.settings.returnBuilder() self.desktop = self.builder.get_object("Desktop") + self.webview = self.builder.get_object("webview") self.desktopPath = self.settings.returnDesktopPath() - self.webview = self.builder.get_object("webview") self.settings.setDefaultWebviewSettings(self.webview, self.webview.get_settings()) self.webview.load_uri(self.settings.returnWebHome()) 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 b33edf9..204bc9b 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Grid.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Grid.py @@ -63,7 +63,7 @@ class Grid: loadProgress.set_fraction(0.0) self.clearGrid(self.desktop) for file in files: - eveBox = Icon().createIcon(dirPath, file) + eveBox = Icon(self.settings).createIcon(dirPath, file) # self.drag.connectEvents(self.desktop, eveBox) eveBox.connect("button_press_event", self.iconClickEventManager, (eveBox,)) eveBox.connect("enter_notify_event", self.settings.mouseOver, ()) 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 69cf464..3288169 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Icon.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Icon.py @@ -13,13 +13,12 @@ from os.path import isdir, isfile, join class Icon: - def __init__(self): - self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) - self.iconContainerWxH = [128, -1] - self.systemIconImageWxH = [72, 72] - self.viIconWxH = [128, -1] - self.usrHome = os.path.expanduser('~') - + def __init__(self, settings): + self.usrHome = settings.returnUserHome() + self.GTK_ORIENTATION = settings.returnIconImagePos() + self.iconContainerWxH = settings.returnContainerWH() + self.systemIconImageWxH = settings.returnSystemIconImageWH() + self.viIconWxH = settings.returnVIIconWH() def createIcon(self, dir, file): fullPathFile = dir + "/" + file 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 e0d2f3a..7d3fd0f 100644 --- a/src/versions/pytop-0.0.1/Pytop/utils/Settings.py +++ b/src/versions/pytop-0.0.1/Pytop/utils/Settings.py @@ -22,6 +22,10 @@ class Settings: self.desktopPath = self.usrHome + "/Desktop" self.ColumnSize = 10 self.webHome = 'http://webfm.com/' + self.GTK_ORIENTATION = 1 # HORIZONTAL (0) VERTICAL (1) + self.iconContainerWxH = [128, -1] + self.systemIconImageWxH = [72, 72] + self.viIconWxH = [128, -1] def attachBuilder(self, builder): @@ -63,23 +67,16 @@ class Settings: return monitors - def returnBuilder(self): - return self.builder - - def returnUserHome(self): - return self.usrHome - - def returnDesktopPath(self): - return self.usrHome + "/Desktop" - - def returnColumnSize(self): - return self.ColumnSize - - 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 returnColumnSize(self): return self.ColumnSize + def returnIconImagePos(self): return self.GTK_ORIENTATION + 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 mouseOver(self, widget, eve, args): hand_cursor = gdk.Cursor(gdk.CursorType.HAND2)