main window (__mwind__) isn't global anymore!

Author: ericoporto

src/fgmk/Editor.py

@@ -4,7 +4,6 @@
 import sys
 import json
 import tarfile
-import types
 from time import time, sleep
 from PIL import Image
 from PIL.ImageQt import ImageQt
@@ -31,20 +30,6 @@
 firstClickX = None
 firstClickY = None
 
-def selfChangeTileCurrent(self, changeTo):
-    changeTileCurrent(changeTo)
-
-def changeTileCurrent(changeTo):
-    __mwind__.myMapWidget.currentTile = changeTo
-    __mwind__.myPaletteWidget.setImageCurrent(changeTo)
-
-def changeEventCurrent(changeTo):
-    __mwind__.myMapWidget.currentEvent = changeTo
-
-def changeLayerCurrent(changeTo):
-    __mwind__.myMapWidget.currentLayer = changeTo
-
-
 class MapWidget(QWidget):
 
     def __init__(self, parent=None, **kwargs):
@@ -142,7 +127,7 @@ def ClickedATileinMap(self, theClickedTool):
                 self.currentEvent = self.sender().tileType[EVENTSLAYER]
                 self.parent.myEventsWidget.updateEventsList()
             else:
-                changeTileCurrent(self.sender().tileType[self.currentLayer])
+                self.parent.changeTileCurrent(self.sender().tileType[self.currentLayer])
 
         elif theClickedTool == 2:
             # bucket
@@ -222,7 +207,7 @@ def wheelScrolledTileInMap(self, scrollAmount):
             else:
                 changeTypeTo = abs(self.sender().tileType[
                                    self.currentLayer] + scrollAmount - 2)
-            changeTileCurrent(changeTypeTo)
+            self.parent.changeTileCurrent(changeTypeTo)
         self.changeTileType(changeTypeTo)
         if(self.currentLayer == EVENTSLAYER):
             self.parent.myEventsWidget.updateEventsList()
@@ -383,7 +368,7 @@ def __init__(self, pMap, parent=None, **kwargs):
         self.eventSelectSpinbox.setMinimum(1)
         self.eventSelectSpinbox.setMaximum(100)
         self.eventSelectSpinbox.setSingleStep(1)
-        self.eventSelectSpinbox.valueChanged.connect(changeEventCurrent)
+        self.eventSelectSpinbox.valueChanged.connect(self.parent.changeEventCurrent)
 
         self.addActionButton = QPushButton("Add Action", self)
         self.editActionButton = QPushButton("Edit Action", self)
@@ -614,6 +599,8 @@ class LayerWidget(QWidget):
     def __init__(self, parent=None, **kwargs):
         super().__init__(parent, **kwargs)
 
+        self.parent=parent
+
         self.VBox = QVBoxLayout(self)
         self.VBox.setAlignment(Qt.AlignTop)
 
@@ -646,7 +633,7 @@ def changeLayerTo(self):
 
         self.LabelLayer.setText("Current: %s" %
                                 str(self.sender().objectName()))
-        changeLayerCurrent(layerNumber)
+        self.parent.changeLayerCurrent(layerNumber)
 
 class CharasPalWidget(QtWidgets.QWidget):
 
@@ -755,6 +742,15 @@ def ExitFS(self):
 
 
 class MainWindow(QMainWindow):
+    def changeLayerCurrent(self, changeTo):
+        self.myMapWidget.currentLayer = changeTo
+
+    def changeEventCurrent(self, changeTo):
+        self.myMapWidget.currentEvent = changeTo
+
+    def changeTileCurrent(self, changeTo):
+        self.myMapWidget.currentTile = changeTo
+        self.myPaletteWidget.setImageCurrent(changeTo)
 
     def __init__(self, parent=None, **kwargs):
         global sSettings
@@ -783,7 +779,7 @@ def __init__(self, parent=None, **kwargs):
 
         self.setCentralWidget(self.scrollArea)
 
-        self.FancyWindow()
+        self.FancyWindow(self)
 
     def selectStartPosition(self):
         result = gameInit.selectStartingPosition(self, sSettings)
@@ -804,7 +800,7 @@ def selectStartPosition(self):
         if(doSave):
             TXWdgt.saveInitFile(sSettings["gamefolder"], result[0])
 
-    def FancyWindow(self):
+    def FancyWindow(self, parent=None):
         global sSettings
 
         self.menubar = QtWidgets.QMenuBar(self)
@@ -836,7 +832,6 @@ def FancyWindow(self):
         self.viewMenu = self.menubar.addMenu('&View')
 
         self.myPaletteWidget = paletteWdgt.PaletteWidget(self, self.myTileSet)
-        self.myPaletteWidget.changeTileCurrent = types.MethodType( selfChangeTileCurrent, self.myPaletteWidget )
         self.paletteDockWdgt = QDockWidget("Palette", self)
         self.paletteDockWdgt.setWidget(self.myPaletteWidget)
         self.addDockWidget(Qt.RightDockWidgetArea, self.paletteDockWdgt)
@@ -972,7 +967,7 @@ def __newFile(self, returnedNFD):
         self.myTileSet = TileXtra.TileSet(os.path.join(
             sSettings["gamefolder"], self.myMap.tileImage), self.myMap.palette)
         self.myMapWidget.DrawMap(self)
-        __mwind__.gridViewAction.setChecked(False)  # gambiarra
+        self.gridViewAction.setChecked(False)  # gambiarra
         self.myPaletteWidget.drawPalette(self.myTileSet)
         self.myEventsWidget.updateEventsList()
         self.myCharasPalWidget.reinit()
@@ -1015,7 +1010,7 @@ def openFile(self):
             self.myTileSet = TileXtra.TileSet(os.path.join(
                 sSettings["gamefolder"], self.myMap.tileImage), self.myMap.palette)
             self.myMapWidget.DrawMap(self)
-            __mwind__.gridViewAction.setChecked(False)  # gambiarra
+            self.gridViewAction.setChecked(False)  # gambiarra
             self.undoStack.clear()
             self.myPaletteWidget.drawPalette(self.myTileSet)
             self.myEventsWidget.updateEventsList()
@@ -1038,14 +1033,16 @@ def closeEvent(self, event):
         else:
             event.ignore()
 
+def Icon():
+    return QPixmap('icon.png')
 
 def Editor():
     from sys import argv, exit
     global __mwind__
 
     a = QApplication(argv)
     start = time()
-    splash_pix = QPixmap('icon.png')
+    splash_pix = Icon()
     splash = QSplashScreen(splash_pix, Qt.WindowStaysOnTopHint)
     splash.setMask(splash_pix.mask())
     splash.show()

src/fgmk/paletteWdgt.py

@@ -6,6 +6,8 @@ class PaletteWidget(QtWidgets.QWidget):
     def __init__(self, parent=None, tileSetInstance=None, **kwargs):
         super().__init__(parent, **kwargs)
 
+        self.parent=parent
+
         self.VBox = QtWidgets.QVBoxLayout(self)
 
         self.tileSetInstance = tileSetInstance
@@ -57,7 +59,7 @@ def drawPalette(self, tileSetInstance):
             len(tileSetInstance.tileset), 6) * tileSetInstance.boxsize)
 
     def setTileCurrent(self):
-        self.changeTileCurrent(self.sender().tileType[0])
+        self.parent.changeTileCurrent(self.sender().tileType[0])
 
     def setImageCurrent(self, imageIndex):
         self.CurrentTT.initTile(self.tileSetInstance.tileset, 0, 0,