qt5 geçişi. container.py ve thread.py de anlamadığım bir sinyal kodu var. FIXME notu düşüldü.

Author: mthnzbk

pds/container.py

@@ -15,6 +15,7 @@
 # Qt Libraries
 from PyQt5 import Qt
 
+# x11embedcontainer sınıfı qt5 de mevcut değil.
 class PApplicationContainer(Qt.QX11EmbedContainer):
     def __init__(self, parent = None, process = None, args = ()):
         Qt.QX11EmbedContainer.__init__(self, parent)

pds/gui.py

@@ -16,7 +16,7 @@
 import copy
 
 # Qt Libraries
-from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 from PyQt5 import QtCore
 
 # PREDEFINED POSITIONS
@@ -32,18 +32,18 @@
 (IN, OUT, FINISHED) = range(3)
 # --------------------
 
-class PAbstractBox(QtGui.QWidget):
+class PAbstractBox(QtWidgets.QWidget):
     def __init__(self, parent):
 
         # Overlay widget, it should be initialized at first
-        self.__overlay = QtGui.QWidget(parent)
+        self.__overlay = QtWidgets.QWidget(parent)
         self.__overlay.hide()
         self.__overlay_enabled = False
         self.__overlay_animated = False
         self.__overlay_styled = False
 
         # Main widget initializing on parent widget
-        QtGui.QWidget.__init__(self, parent)
+        QtWidgets.QWidget.__init__(self, parent)
         self.hide()
 
         # Pre-defined states
@@ -124,7 +124,7 @@ def _initializeTimeLines(self):
 
     def enableShadow(self, offset = 3, radius = 9, color = 'black'):
         # Enable shadow for mainwidget with given features
-        self.__effect = QtGui.QGraphicsDropShadowEffect(self)
+        self.__effect = QtWidgets.QGraphicsDropShadowEffect(self)
         self.__effect.setBlurRadius(radius)
         self.__effect.setOffset(offset)
         self.__effect.setColor(QtGui.QColor(color))
@@ -328,17 +328,17 @@ class PMessageBox(PAbstractBox):
     def __init__(self, parent):
         PAbstractBox.__init__(self, parent)
 
-        self.layout = QtGui.QHBoxLayout(self)
+        self.layout = QtWidgets.QHBoxLayout(self)
 
-        self.icon = QtGui.QLabel(self)
+        self.icon = QtWidgets.QLabel(self)
         self.icon.hide()
         self.layout.addWidget(self.icon)
 
         self.busy = QProgressIndicator(self, "white")
         self.busy.hide()
         self.layout.addWidget(self.busy)
 
-        self.label = QtGui.QLabel(self)
+        self.label = QtWidgets.QLabel(self)
         self.layout.addWidget(self.label)
 
         self._animation = 2

pds/qnetworkmanager.py

@@ -12,10 +12,10 @@
 
 # D-Bus
 import dbus
-from dbus.mainloop.qt import DBusQtMainLoop
+from dbus.mainloop.pyqt5 import DBusQtMainLoop
 
 # Qt Libraries
-from PyQt5 import QtGui
+from PyQt5 import QtWidgets
 from PyQt5.QtCore import *
 
 # UI
@@ -52,10 +52,10 @@ def get_icon(conn_type, state = False):
     return CONN_TYPES.get(conn_type,
                 QIconLoader.loadOverlayed("network-wired", state, 32, position = QIconLoader.TopLeft))
 
-class ConnectionItem(QtGui.QWidget, Ui_ConnectionItem):
+class ConnectionItem(QtWidgets.QWidget, Ui_ConnectionItem):
 
     def __init__(self, parent, connection):
-        QtGui.QWidget.__init__(self, parent)
+        QtWidgets.QWidget.__init__(self, parent)
         self.setupUi(self)
 
         self.available = True
@@ -73,7 +73,7 @@ def __init__(self, parent, connection):
         self.mainLayout.insertWidget(0, self.busy)
         self.busy.hide()
 
-        self.connect(parent, SIGNAL("stateChanged()"), self.updateState)
+        parent.stateChanged.connect(self.updateState)
         self.button.clicked.connect(lambda: self.parent.setState(self))
 
         self.updateState()
@@ -122,10 +122,10 @@ def leaveEvent(self, event):
     def toggleButtons(self, toggle=False):
         self.button.setVisible(toggle)
 
-class QNetworkManager(QtGui.QListWidget):
+class QNetworkManager(QtWidgets.QListWidget):
 
     def __init__(self, parent = None):
-        QtGui.QListWidget.__init__(self, parent)
+        QtWidgets.QListWidget.__init__(self, parent)
         self.setAlternatingRowColors(True)
 
         self.nm = NetworkManager()
@@ -138,7 +138,7 @@ def __init__(self, parent = None):
         nm_interface.connect_to_signal("DeviceAdded", self.fillConnections)
         nm_interface.connect_to_signal("DeviceRemoved", lambda *args: self.showMessage("A device removed.", True))
         nm_interface.connect_to_signal("DeviceRemoved", self.fillConnections)
-        nm_interface.connect_to_signal("PropertiesChanged", lambda *args: self.emit(SIGNAL("stateChanged()")))
+        nm_interface.connect_to_signal("PropertiesChanged", lambda *args: self.stateChanged.emit())
 
         nm_settings_bus = self.bus.get_object(NM_BUS_NAME, NM_SETTINGS_OBJECT_PATH)
         nm_settings = dbus.Interface(nm_settings_bus, NM_SETTINGS)
@@ -170,7 +170,7 @@ def fillConnections(self, *args):
         self.clearList()
         actives = self.nm.active_connections
         for connection in self.nm.connections:
-            item = QtGui.QListWidgetItem()
+            item = QtWidgets.QListWidgetItem()
             item.setSizeHint(QSize(200, 38))
             self.addItem(item)
             self.setItemWidget(item, ConnectionItem(self, connection))
@@ -218,7 +218,7 @@ def connect(self, connection):
 # Basic test app
 if __name__ == "__main__":
     import sys
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
     DBusQtMainLoop(set_as_default = True)
     nm = QNetworkManager()
     nm.show()

pds/qpagewidget.py

@@ -13,15 +13,15 @@
 from PyQt5.QtCore import QTimeLine
 from PyQt5.QtCore import QEasingCurve
 
-# QtGui Libraries
-from PyQt5.QtGui import QFrame
-from PyQt5.QtGui import QLabel
-from PyQt5.QtGui import QWidget
-from PyQt5.QtGui import QLineEdit
-from PyQt5.QtGui import QBoxLayout
-from PyQt5.QtGui import QScrollArea
-from PyQt5.QtGui import QPushButton
-from PyQt5.QtGui import QMessageBox
+# QtWidgets Libraries
+from PyQt5.QtWidgets import QFrame
+from PyQt5.QtWidgets import QLabel
+from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QLineEdit
+from PyQt5.QtWidgets import QBoxLayout
+from PyQt5.QtWidgets import QScrollArea
+from PyQt5.QtWidgets import QPushButton
+from PyQt5.QtWidgets import QMessageBox
 from PyQt5.QtGui import QResizeEvent
 
 __author__      = "Gökmen Göksel"
@@ -144,7 +144,7 @@ def _animateFinished(self):
         self.__scrollBar.setValue(self.__current * self.__base_value())
 
         # Emit currentChanged SIGNAL
-        self.emit(SIGNAL("currentChanged()"))
+        self.currentChanged.emit()
 
     def event(self, event):
         """ Overrides the main event handler to catch resize events """
@@ -200,9 +200,9 @@ def addPage(self, page):
         self.layout.addWidget(self.__tmp_page.widget)
 
         # Create connections for page navigation signals from new page
-        self.connect(page.widget, SIGNAL("pageNext()"), self.next)
-        self.connect(page.widget, SIGNAL("pagePrevious()"), self.prev)
-        self.connect(page.widget, SIGNAL("setCurrent(int)"), self.setCurrent)
+        page.widget.pageNext.connect(self.next)
+        page.widget.pagePrevious.connect(self.prev)
+        page.widget.setCurrent.connect(self.setCurrent)
 
     def __setCurrent(self, pageNumber):
         """ Internal method to set current page index. """

pds/qprogressindicator.py

@@ -19,7 +19,7 @@
 from PyQt5.QtCore import QSize
 
 from PyQt5.QtGui import QColor
-from PyQt5.QtGui import QWidget
+from PyQt5.QtWidgets import QWidget
 from PyQt5.QtGui import QPainter
 from PyQt5.QtGui import QPalette
 

pds/quniqueapp.py

@@ -27,7 +27,7 @@ class QUniqueApplication(QApplication):
     def __init__(self, argv, catalog):
         QApplication.__init__(self, argv)
         self.aboutToQuit.connect(self.cleanup)
-        self.control = QtNetwork.QLocalServer(self)
+        self.control = QLocalServer(self)
         self.control.newConnection.connect(self.onControlConnect)
         self.mainwindow = None
         self.catalog = '%s-pds.socket' % catalog
@@ -62,7 +62,7 @@ def cleanup(self):
         self.control.removeServer(self.catalog)
 
     def sendToInstance(self, data = ''):
-        socket = QtNetwork.QLocalSocket()
+        socket = QLocalSocket()
         socket.connectToServer(self.catalog, QIODevice.WriteOnly)
         if socket.waitForConnected( 500 ):
             if len(data) > 0:

pds/tests/test-busy.py

@@ -14,18 +14,18 @@
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version.
 
-from PyQt5 import QtCore, QtGui
+from PyQt5 import QtCore, QtWidgets, QtWidgets
 from pds.qprogressindicator import QProgressIndicator
 
-class UI(QtGui.QWidget):
+class UI(QtWidgets.QWidget):
 
     def __init__(self, parent = None):
-        QtGui.QWidget.__init__(self, parent)
+        QtWidgets.QWidget.__init__(self, parent)
 
-        self.gl = QtGui.QGridLayout(self)
+        self.gl = QtWidgets.QGridLayout(self)
 
-        butonh = QtGui.QPushButton("click to hide", self)
-        butons = QtGui.QPushButton("click to show", self)
+        butonh = QtWidgets.QPushButton("click to hide", self)
+        butons = QtWidgets.QPushButton("click to show", self)
         self.busy = QProgressIndicator(self)
 
         self.gl.addWidget(butonh)
@@ -38,7 +38,7 @@ def __init__(self, parent = None):
 
 if __name__ == "__main__":
     import sys
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
     ui = UI()
     ui.show()
     sys.exit(app.exec_())

pds/tests/test-container-mplayer.py

@@ -12,7 +12,7 @@
 # any later version.
 
 # Qt Libraries
-from PyQt5 import Qt
+from PyQt5 import QtWidgets
 
 # PDS Container
 from pds.container import PApplicationContainer
@@ -32,12 +32,12 @@ def openMedia(self, path):
 
         return ret
 
-class TestUI(Qt.QWidget):
+class TestUI(QtWidgets.QWidget):
     def __init__(self, parent=None):
-        Qt.QWidget.__init__(self, parent)
-        self.layout = Qt.QGridLayout(self)
+        QtWidgets.QWidget.__init__(self, parent)
+        self.layout = QtWidgets.QGridLayout(self)
 
-        self.pushbutton = Qt.QPushButton("Open Media", self)
+        self.pushbutton = QtWidgets.QPushButton("Open Media", self)
         self.layout.addWidget(self.pushbutton)
 
         self.mplayer = PMplayer(self)
@@ -47,13 +47,13 @@ def __init__(self, parent=None):
 
     def getMedia(self):
         self.mplayer.openMedia(
-                Qt.QFileDialog.getOpenFileName(self,
+                QtWidgets.QFileDialog.getOpenFileName(self,
                     "Open Media", "/", "Media Files (*.ogv *.mov *.avi)"))
 
 if __name__ == "__main__":
     import sys
 
-    app = Qt.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
     ui = TestUI()
     ui.show()

pds/tests/test-container-nm.py

@@ -12,7 +12,7 @@
 # any later version.
 
 # Qt Libraries
-from PyQt5 import Qt
+from PyQt5 import QtCore, QtWidgets
 
 # PDS Container
 from pds.container import PApplicationContainer
@@ -25,15 +25,15 @@ def startNetworkManager(self):
         ret = self.start("nm-connection-editor", ("--winid", str(self.winId())))
 
         if ret[0]:
-            self.setMinimumSize(Qt.QSize(450, 200))
+            self.setMinimumSize(QtCore.QSize(450, 200))
             self.show()
 
         return ret
 
 if __name__ == "__main__":
     import sys
 
-    app = Qt.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
 
     ui = PNetworkManager()
     ui.startNetworkManager()

pds/tests/test-gui.py

@@ -9,11 +9,11 @@
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version.
 
-from PyQt5 import QtCore, QtGui
+from PyQt5 import QtCore, QtWidgets, QtWidgets
 from pds.gui import *
 from pds.tests.ui_gui import Ui_PdsTest
 
-class PTestUI(QtGui.QWidget):
+class PTestUI(QtWidgets.QWidget):
 
     STYLE = """color:white;
                font-size:16pt;
@@ -22,7 +22,7 @@ class PTestUI(QtGui.QWidget):
                border-radius:4px;"""
 
     def __init__(self, parent = None):
-        QtGui.QWidget.__init__(self, parent)
+        QtWidgets.QWidget.__init__(self, parent)
 
         self.ui = Ui_PdsTest()
         self.ui.setupUi(self)
@@ -47,7 +47,7 @@ def resizeEvent(self, event):
         if self.msg:
             self.msg._resizeCallBacks(event)
 
-        QtGui.QWidget.resizeEvent(self, event)
+        QtWidgets.QWidget.resizeEvent(self, event)
 
     def showClicked(self):
         if self.msg:
@@ -73,7 +73,7 @@ def hideClicked(self):
 
 if __name__ == "__main__":
     import sys
-    app = QtGui.QApplication(sys.argv)
+    app = QtWidgets.QApplication(sys.argv)
     PdsTest = PTestUI()
     PdsTest.show()
     sys.exit(app.exec_())

pds/tests/test-pages.py

@@ -9,7 +9,7 @@
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version.
 
-from PyQt5.QtGui import *
+from PyQt5.QtWidgets import *
 from PyQt5.QtCore import *
 
 from pds.qpagewidget import QPageWidget
@@ -27,11 +27,11 @@ def __init__(self, parent = None, text = '', line_edit = ''):
 
         btnNext = QPushButton("Next", self)
         self.layout.addWidget(btnNext)
-        btnNext.clicked.connect(lambda: self.emit(SIGNAL("pageNext()")))
+        btnNext.clicked.connect(lambda: self.pageNext.emit())
 
         btnPrev = QPushButton("Previous", self)
         self.layout.addWidget(btnPrev)
-        btnPrev.clicked.connect(lambda: self.emit(SIGNAL("pagePrevious()")))
+        btnPrev.clicked.connect(lambda: self.pagePrevious.emit())
 
     def text(self):
         return self.line.text()
@@ -61,7 +61,7 @@ def __init__(self, parent = None):
         button = QPushButton("Click Me !", self)
         button.clicked.connect(lambda: QMessageBox.information(self,
                                 "QPageWidget Information", line.text()))
-        button.clicked.connect(lambda: button.emit(SIGNAL("setCurrent(int)"), 2))
+        button.clicked.connect(lambda: button.emit(SIGNAL("setCurrent(int)"), 2)) # ???
 
         pageWidget.createPage(button, inMethod=lambda: QMessageBox.information(self, "QPageWidget Information",
                                                         "You reached the last page, after click the page button it goes back to the Green page."))