From f32769ba30e1df13f36ce937df4a0a016696b612 Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Sun, 9 Jun 2019 16:33:47 -0500 Subject: [PATCH] Changed settings calls --- bin/pytop-0-0-1-x64.deb | Bin 18724 -> 18800 bytes src/debs/pytop-0-0-1-x64/opt/Pytop/PyTop.py | 6 ++-- .../pytop-0-0-1-x64/opt/Pytop/utils/Events.py | 10 +++--- .../pytop-0-0-1-x64/opt/Pytop/utils/Grid.py | 2 +- .../pytop-0-0-1-x64/opt/Pytop/utils/Icon.py | 13 ++++---- .../opt/Pytop/utils/Settings.py | 31 ++++++++---------- src/versions/pytop-0.0.1/Pytop/PyTop.py | 6 ++-- .../pytop-0.0.1/Pytop/utils/Events.py | 10 +++--- src/versions/pytop-0.0.1/Pytop/utils/Grid.py | 2 +- src/versions/pytop-0.0.1/Pytop/utils/Icon.py | 13 ++++---- .../pytop-0.0.1/Pytop/utils/Settings.py | 31 ++++++++---------- 11 files changed, 56 insertions(+), 68 deletions(-) diff --git a/bin/pytop-0-0-1-x64.deb b/bin/pytop-0-0-1-x64.deb index 6e9f1beb0d311d4fed1acf8599e88dbf8b350633..7d319658ec1ab786c37d814b45c3aba183cc58ed 100644 GIT binary patch delta 16728 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 b00Fj)0f2x72WhZrvBYQl0ssI200dcDdT}xI 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)