Python clean

example/dynamicList/main.py

@@ -1,8 +1,5 @@
 import sys
-sys.path.append("../..")
-
 from quickmamba.models import QObjectListModel
-
 from PyQt5 import QtCore, QtWidgets, QtQuick
 
 

example/dynamicRepeater/main.py

@@ -1,8 +1,6 @@
 import sys
-sys.path.append("../..")
-
-from PyQt5 import QtCore, QtWidgets, QtQuick
 from quickmamba.models import QObjectListModel
+from PyQt5 import QtCore, QtWidgets, QtQuick
 
 
 class ClipWrapper(QtCore.QObject):

example/instantCoding/main.py

@@ -1,10 +1,6 @@
 import sys
-sys.path.append("../..")
-
-from quickmamba.utils import QmlInstantCoding
-
-from PyQt5 import QtCore, QtWidgets, QtQuick
-
+from quickmamba.utils.instantcoding import QmlInstantCoding, ReloadComponent
+from PyQt5 import QtCore, QtWidgets, QtQuick, QtQml
 import os
 
 
@@ -14,9 +10,14 @@ def main():
     view.setResizeMode(QtQuick.QQuickView.SizeRootObjectToView)
 
     # Create a declarative view
-    view.setSource(QtCore.QUrl("source.qml"))
+    component = QtQml.QQmlComponent(view)
+    topLevelItem = component.create()
+    qmlFile = QtCore.QUrl("source.qml")
+    view.setSource(qmlFile)
+
     # Declare we are using instant coding tool on this view
-    qic = QmlInstantCoding(view, verbose=True)
+    qic = QmlInstantCoding(view, ReloadComponent(qmlFile, component, topLevelItem), verbose=True)
+
     # Add any source file (.qml and .js by default) in current working directory
     qic.addFilesFromDirectory(os.getcwd())
 

example/screenPicker/main.py

@@ -1,17 +1,9 @@
 import sys
 from PyQt5 import QtCore, QtWidgets, QtQuick
-#Fix execution shader bug
-from OpenGL import GL
-
-
-import os
-
-currentFilePath = os.path.dirname(os.path.abspath(__file__))
-quickmambaPath = os.path.join(currentFilePath, '../QuickMamba')
-sys.path.append(quickmambaPath)
-
+from OpenGL import GL  # Fix execution shader bug
 import quickmamba
 
+
 if __name__ == '__main__':
     quickmamba.qmlRegister()
     app = QtWidgets.QApplication(sys.argv)

example/signal/main.py

@@ -1,8 +1,6 @@
-import sys
-sys.path.append("../..")
-
 from quickmamba.patterns import Signal
 
+
 # Sample usage:
 class Model(object):
     def __init__(self, value):
@@ -11,7 +9,7 @@ def __init__(self, value):
 
     def set_value(self, value):
         self.__value = value
-        self.changed() # Emit signal
+        self.changed()  # Emit signal
 
     def get_value(self):
         return self.__value

quickmamba/gui/__init__.py

@@ -5,6 +5,7 @@
 
 from PyQt5 import QtQml
 
+
 def qmlRegister():
     QtQml.qmlRegisterType(WheelArea, "QuickMamba", 1, 0, "WheelAreaImpl")
     QtQml.qmlRegisterType(ExternDropArea, "QuickMamba", 1, 0, "ExternDropAreaImpl")

quickmamba/gui/colorPicker.py

@@ -3,15 +3,16 @@
 from PyQt5 import QtQuick
 from PyQt5.QtGui import QCursor, QColor, QGuiApplication
 
+
 class ColorPickingEventFilter(QtCore.QObject):
     def __init__(self, screenpicker):
         QtCore.QObject.__init__(self, screenpicker)
         self._screenpicker = screenpicker
 
     def eventFilter(self, obj, event):
-        if(event.type() == QtCore.QEvent.MouseMove):
+        if event.type() == QtCore.QEvent.MouseMove:
             self._screenpicker.updateCurrentColor()
-        elif(event.type() == QtCore.QEvent.MouseButtonRelease):
+        elif event.type() == QtCore.QEvent.MouseButtonRelease:
             self._screenpicker.setGrabbing(False)
             self._screenpicker.accepted.emit()
 
@@ -20,20 +21,16 @@ def eventFilter(self, obj, event):
 
 class ColorPicker(QtQuick.QQuickItem):
     """
-        Define the common methods and fields for screenPicker.
+    Define the common methods and fields for screenPicker.
     """
 
-    def __init__(self, parent = None):
+    def __init__(self, parent=None):
         QtQuick.QQuickItem.__init__(self, parent)
         self._currentColor = QColor("#FFFFFF")
         self._grabbing = False
         self._desktop = QtWidgets.QDesktopWidget()
         self._colorPickingEventFilter = ColorPickingEventFilter(self)
 
-    # ######################################## Methods private to this class ####################################### #
-
-    # ## Getters ## #
-
     def getCurrentColor(self):
         return self._currentColor
 
@@ -45,19 +42,19 @@ def isGrabbing(self):
         return self._grabbing
 
     def setGrabbing(self, grabbing):
-        if(self._grabbing != grabbing):
-            self._grabbing = grabbing
-            if(self._grabbing):
-                self.installEventFilter(self._colorPickingEventFilter)
-                QGuiApplication.setOverrideCursor(QCursor(QtCore.Qt.CrossCursor))
-                self.grabMouse()
-            else:
-                self.ungrabMouse()
-                self.removeEventFilter(self._colorPickingEventFilter)
-                QGuiApplication.restoreOverrideCursor()
-            self.grabbingChanged.emit()
-
-    # ## Others ## #
+        if self._grabbing == grabbing:
+            return
+
+        self._grabbing = grabbing
+        if self._grabbing:
+            self.installEventFilter(self._colorPickingEventFilter)
+            QGuiApplication.setOverrideCursor(QCursor(QtCore.Qt.CrossCursor))
+            self.grabMouse()
+        else:
+            self.ungrabMouse()
+            self.removeEventFilter(self._colorPickingEventFilter)
+            QGuiApplication.restoreOverrideCursor()
+        self.grabbingChanged.emit()
 
     def updateCurrentColor(self):
         cursorPos = QCursor.pos()
@@ -67,12 +64,8 @@ def updateCurrentColor(self):
         qColor = QColor(qImage.pixel(0, 0))
         self.setCurrentColor(qColor)
 
-# ############################################# Data exposed to QML ############################################## #
-
     accepted = QtCore.pyqtSignal()
-
     currentColorChanged = QtCore.pyqtSignal()
     currentColor = QtCore.pyqtProperty(QColor, getCurrentColor, setCurrentColor, notify=currentColorChanged)
-
     grabbingChanged = QtCore.pyqtSignal()
     grabbing = QtCore.pyqtProperty(bool, isGrabbing, setGrabbing, notify=grabbingChanged)

quickmamba/gui/externDropArea.py

@@ -1,51 +1,53 @@
 from PyQt5 import QtCore, QtGui
 from PyQt5 import QtQuick
 
+
 class ExternDropArea(QtQuick.QQuickItem):
     # QGraphicsSceneDragDropEvent:
-    #Qt::MouseButtons buttons, Qt::DropAction dropAction, const QMimeData mimeData, Qt::KeyboardModifiers modifiers, QPointF pos, Qt::DropActions possibleActions, Qt::DropAction proposedAction, QWidget source
+    # Qt::MouseButtons buttons, Qt::DropAction dropAction,
+    # const QMimeData mimeData, Qt::KeyboardModifiers modifiers,
+    # QPointF pos, Qt::DropActions possibleActions, Qt::DropAction proposedAction, QWidget source
     internDragEnter = QtCore.pyqtSignal(
-        bool, str, # text
-        bool, str, # html
-        bool, str, # urls
+        bool, str,  # text
+        bool, str,  # html
+        bool, str,  # urls
         QtCore.Qt.MouseButtons, QtCore.Qt.DropAction,
         QtCore.Qt.KeyboardModifiers, QtCore.QPointF,
         QtCore.Qt.DropActions, QtCore.Qt.DropAction,
         str)
     internDragMove = QtCore.pyqtSignal(
-        bool, str, # text
-        bool, str, # html
-        bool, str, # urls
+        bool, str,  # text
+        bool, str,  # html
+        bool, str,  # urls
         QtCore.Qt.MouseButtons, QtCore.Qt.DropAction,
         QtCore.Qt.KeyboardModifiers, QtCore.QPointF,
         QtCore.Qt.DropActions, QtCore.Qt.DropAction,
         str)
     internDragLeave = QtCore.pyqtSignal(
-        bool, str, # text
-        bool, str, # html
-        bool, str, # urls
+        bool, str,  # text
+        bool, str,  # html
+        bool, str,  # urls
         QtCore.Qt.MouseButtons, QtCore.Qt.DropAction,
         QtCore.Qt.KeyboardModifiers, QtCore.QPointF,
         QtCore.Qt.DropActions, QtCore.Qt.DropAction,
         str)
     internDrop = QtCore.pyqtSignal(
-        bool, str, # text
-        bool, str, # html
-        bool, str, # urls
+        bool, str,  # text
+        bool, str,  # html
+        bool, str,  # urls
         QtCore.Qt.MouseButtons, QtCore.Qt.DropAction,
         QtCore.Qt.KeyboardModifiers, QtCore.QPointF,
         QtCore.Qt.DropActions, QtCore.Qt.DropAction,
         str)
 
-    def __init__(self, parent = None):
+    def __init__(self, parent=None):
         super(ExternDropArea, self).__init__(parent)
         #self.setAcceptDrops(True)
 
     def dragEnterEvent(self, event):
-        #print 'dragEnterEvent'
-
         urls = event.mimeData().urls()
-        firstUrl = urls[0].toLocalFile() if len(urls) else ""
+        firstUrl = urls[0].toLocalFile() if len(urls) else '' \
+                                                           ''
         self.internDragEnter.emit(
             event.mimeData().hasText(), event.mimeData().text(),
             event.mimeData().hasHtml(), event.mimeData().html(),
@@ -66,10 +68,9 @@ def dragEnterEvent(self, event):
         event.setAccepted(self._acceptDropValue)
 
     def dragMoveEvent(self, event):
-        #print 'dragMoveEvent'
-
         urls = event.mimeData().urls()
-        firstUrl = urls[0].toLocalFile() if len(urls) else ""
+        firstUrl = urls[0].toLocalFile() if len(urls) else ''
+
         self.internDragMove.emit(
             event.mimeData().hasText(), event.mimeData().text(),
             event.mimeData().hasHtml(), event.mimeData().html(),
@@ -86,10 +87,9 @@ def dragMoveEvent(self, event):
         event.setAccepted(self._acceptDropValue)
 
     def dragLeaveEvent(self, event):
-        #print 'dragLeaveEvent'
-
         urls = event.mimeData().urls()
         firstUrl = urls[0].toLocalFile() if len(urls) else ""
+
         self.internDragLeave.emit(
             event.mimeData().hasText(), event.mimeData().text(),
             event.mimeData().hasHtml(), event.mimeData().html(),
@@ -107,8 +107,6 @@ def dragLeaveEvent(self, event):
         self.unsetCursor()
 
     def dropEvent(self, event):
-        #print 'dropEvent'
-
         # hasText()  text()      text/plain
         # hasHtml()  html()      text/html
         # hasUrls()  urls()      text/uri-list
@@ -134,7 +132,6 @@ def dropEvent(self, event):
             event.possibleActions(), event.proposedAction(),
             "")
             #event.source().accessibleName() if event.source() else "")
-
 
         if self._acceptDropValue:
             event.acceptProposedAction()
@@ -154,7 +151,6 @@ def setAcceptDrop(self, acceptDrop):
         self.acceptDropChanged.emit()
 
     acceptDropChanged = QtCore.pyqtSignal()
-
     _acceptDropValue = True
     acceptDrop = QtCore.pyqtProperty(bool, getAcceptDrop, setAcceptDrop, notify=acceptDropChanged)
 

quickmamba/gui/wheelArea.py

@@ -1,12 +1,13 @@
 from PyQt5 import QtCore
 from PyQt5 import QtQuick
 
+
 class WheelArea(QtQuick.QQuickItem):
-    #QPointF pos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
+    # QPointF pos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
     internVerticalWheel = QtCore.pyqtSignal(QtCore.QPointF, int, QtCore.Qt.MouseButtons, QtCore.Qt.KeyboardModifiers)
     internHorizontalWheel = QtCore.pyqtSignal(QtCore.QPointF, int, QtCore.Qt.MouseButtons, QtCore.Qt.KeyboardModifiers)
 
-    def __init__(self, parent = None):
+    def __init__(self, parent=None):
         QtQuick.QQuickItem.__init__(self, parent)
 
     def wheelEvent(self, event):