From 701c91ecd55a229614262bcf152ed391a07f79ef Mon Sep 17 00:00:00 2001 From: Maxim Stewart Date: Fri, 5 Jul 2019 01:44:16 -0500 Subject: [PATCH] Renamed controller class and split signals to other file(s) --- src/pytop-0.0.1/Pytop/PyTop.py | 8 +++++--- src/pytop-0.0.1/Pytop/__init__.py | 0 .../Pytop/signal_classes/CrossClassSignals.py | 15 +++++++++++++++ .../GridSignals.py} | 16 ++++------------ .../Pytop/signal_classes/__init__.py | 2 ++ src/pytop-0.0.1/Pytop/widgets/Grid.py | 2 -- src/pytop-0.0.1/pytop | Bin 6168 -> 0 bytes 7 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 src/pytop-0.0.1/Pytop/__init__.py create mode 100644 src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py rename src/pytop-0.0.1/Pytop/{Controller.py => signal_classes/GridSignals.py} (88%) delete mode 100755 src/pytop-0.0.1/pytop diff --git a/src/pytop-0.0.1/Pytop/PyTop.py b/src/pytop-0.0.1/Pytop/PyTop.py index dcd80c6..c696c51 100755 --- a/src/pytop-0.0.1/Pytop/PyTop.py +++ b/src/pytop-0.0.1/Pytop/PyTop.py @@ -15,8 +15,7 @@ import inspect # Application imports from utils import Settings -from signal_classes import WebviewSignals -from Controller import Controller +from signal_classes import CrossClassSignals, WebviewSignals, GridSignals class Main: @@ -31,7 +30,10 @@ class Main: # Gets the methods from the classes and sets to handler. # Then, builder connects to any signals it needs. - classes = [WebviewSignals(settings), Controller(settings)] + classes = [CrossClassSignals(settings), + WebviewSignals(settings), + GridSignals(settings)] + handlers = {} for c in classes: methods = inspect.getmembers(c, predicate=inspect.ismethod) diff --git a/src/pytop-0.0.1/Pytop/__init__.py b/src/pytop-0.0.1/Pytop/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py b/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py new file mode 100644 index 0000000..08614af --- /dev/null +++ b/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py @@ -0,0 +1,15 @@ +# Gtk imports + +# Python imports + +# Application imports + + +class CrossClassSignals: + def __init__(self, settings): + self.settings = settings + self.builder = self.settings.returnBuilder() + + + def closePopup(self, widget, data=None): + widget.hide() diff --git a/src/pytop-0.0.1/Pytop/Controller.py b/src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py similarity index 88% rename from src/pytop-0.0.1/Pytop/Controller.py rename to src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py index b520d01..1b2226a 100644 --- a/src/pytop-0.0.1/Pytop/Controller.py +++ b/src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py @@ -8,19 +8,20 @@ from utils import Dragging from utils import FileHandler -class Controller: +class GridSignals: def __init__(self, settings): self.filehandler = FileHandler() self.settings = settings + self.builder = self.settings.returnBuilder() self.desktop = self.builder.get_object("Desktop") + selectedDirDialog = self.builder.get_object("selectedDirDialog") + filefilter = self.builder.get_object("Folders") self.desktopPath = self.settings.returnDesktopPath() self.grid = None # Add filter to allow only folders to be selected - selectedDirDialog = self.builder.get_object("selectedDirDialog") - filefilter = self.builder.get_object("Folders") selectedDirDialog.add_filter(filefilter) selectedDirDialog.set_filename(self.desktopPath) @@ -31,15 +32,6 @@ class Controller: self.grid = Grid(self.desktop, self.settings) self.grid.setIconViewDir(newPath) - def getWindowsOnScreen(self): - screen = self.settings.returnScren() - windowButtons = self.builder.get_object("windowButtons") - - - def closePopup(self, widget, data=None): - widget.hide() - - # File control events def createFile(arg): diff --git a/src/pytop-0.0.1/Pytop/signal_classes/__init__.py b/src/pytop-0.0.1/Pytop/signal_classes/__init__.py index 4990db3..0250d0d 100644 --- a/src/pytop-0.0.1/Pytop/signal_classes/__init__.py +++ b/src/pytop-0.0.1/Pytop/signal_classes/__init__.py @@ -1 +1,3 @@ +from signal_classes.CrossClassSignals import CrossClassSignals from signal_classes.WebviewSignals import WebviewSignals +from signal_classes.GridSignals import GridSignals diff --git a/src/pytop-0.0.1/Pytop/widgets/Grid.py b/src/pytop-0.0.1/Pytop/widgets/Grid.py index 2bc1761..d60f7fb 100644 --- a/src/pytop-0.0.1/Pytop/widgets/Grid.py +++ b/src/pytop-0.0.1/Pytop/widgets/Grid.py @@ -49,8 +49,6 @@ class Grid: self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,)) - - def setIconViewDir(self, path): self.store.clear() diff --git a/src/pytop-0.0.1/pytop b/src/pytop-0.0.1/pytop deleted file mode 100755 index 50311e98112f448e84624fec80c68f097338c08f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6168 zcmeHLUu;uV7(ea);^3|-f9kem7lmYCcGtleRsP*}Fz(32iK~#n=(??=HEX-Hw{tZH zrvs9zQyzTSlP)Iu?2E}Bh_cLp4?c{9Xrd4&VaY(JOF$qdtbX6Q-?x@BjPbz-v(w!3 zJKvw*`M&e#-rjrO+}GM{x7h?2yVxyIYAe*G%BqDp^0*X9=N2o3E-FQZCn&uzC9Zo4iUj8&FeFmi^7MP#!;C&@y+gtUZ0s8WGE%+;Yt5wKG> z7;7jG7a{XdM4n1Km3WL(lo%tA566aAJN4IY*Fi#AM-Y2uokjG;(l%rENG=A2Qdq1% zfIFom1S9ia0v=Jw+`HxE( zcs{X&H*Vjh^v*}<8$qwa^-zIvcjGV{MR%wt92bdH!VE@)-;V}=!VJVseC&{mKyIC&6TObIDOu(DQ)8E`(=+C}aWr9St2(|yWoBCPIwpH1eu+At@z!rdFeVlX zjP$%QF}ugGT`(>!m}?e$D9iRBm_M|u9&!=Mbv`3KGkX$7aG|IgG`5aO$`7;3=7??` zzoZe2kzJoaZnHNQG8t~qL0iV-{ym31ue7AU_xL>Rts@&hDpeubky^x;J?Z-`={v2P zX5<=7+%K4oVNa*$Ott<;o|D$}pRMUTd(*#rGOMo`!;?1SxvR;WxJE}iJjXm8p5q?> zezUGEWybpJM1RT*#iCo)wp4qpU+Yid?Aj^|cDMm?k5xem z9|E=lwgbKaI0U#AX678=F~BQ;-vVxcRmb}ni|zG8!ZzrzRjw>4J!>m*;C`-xYyN&F z^DH_*S=!gy`{;Wce0gtf0NDlC5aCw)iZ|2G!4|FMvXp*(8W5f;DoTm_cQ-#FuT zOMVP|uUOO`bJf-- zrBr{i-mSSBwE9h!UI;A_N|=e{Vbx3Hn1lz-7r|_yh5HAZ0PQ4IKv};ckc;gTA2BWB{wPu0%p;-LXg{7&Y@J z>tD#Yk8zLi{&d@Qkh13`eBVeVRJ@;9ei9nESDD{#*FnmjN2pTDR)yK7Y^{enmv7p2 zsW+)Zd_T`E`TPbj-hsW%@ki~tbRQ)J=g((3d>=_CsCL7JbHMy@yAF~N6H-A!#SD}G(%KWhcU7E&-&(9lnp%Rt7JTygCqajKVScjk zbAT3_pNorTZV=*!WiDSOzDj(~pJ@(iFrLce^Lb<&@!!VIa|-iV^$s+0ikBZOT z&OihE;{5S=3X7YF97igl%3DrxlXNb2AY?wDsj!*(xyZ5E2eF&t-^x`&n|ZAM3mTL9 Ai~s-t