diff --git a/src/python/samples/recollgui/Makefile b/src/python/samples/recollgui/Makefile index 7e8529c6..cf1f5803 100644 --- a/src/python/samples/recollgui/Makefile +++ b/src/python/samples/recollgui/Makefile @@ -1,7 +1,8 @@ +PYUIC = pyuic5 all: rclmain.py rclmain.py: rclmain.ui - pyuic4 -o rclmain.py rclmain.ui + $(PYUIC) -o rclmain.py rclmain.ui clean: rm -f rclmain.py rclmain.pyc diff --git a/src/python/samples/recollgui/qrecoll.py b/src/python/samples/recollgui/qrecoll.py index 1e85e720..f71e2122 100755 --- a/src/python/samples/recollgui/qrecoll.py +++ b/src/python/samples/recollgui/qrecoll.py @@ -13,8 +13,10 @@ except: import rclmain from getopt import getopt -from PyQt4 import QtCore, QtGui -from PyQt4.QtCore import pyqtSlot +from PyQt5 import QtCore +from PyQt5.QtCore import pyqtSlot +from PyQt5.QtGui import QKeySequence +from PyQt5.QtWidgets import * #################### # Highlighting methods. Just for showing the groups usage, we add the @@ -146,15 +148,15 @@ class RecollQuery(QtCore.QAbstractTableModel): ### # UI interaction code -class RclGui_Main(QtGui.QMainWindow): +class RclGui_Main(QMainWindow): def __init__(self, db, parent=None): - QtGui.QWidget.__init__(self, parent) + QMainWindow.__init__(self, parent) self.ui = rclmain.Ui_MainWindow() self.ui.setupUi(self) self.db = db self.qmodel = RecollQuery() - scq = QtGui.QShortcut(QtGui.QKeySequence("Ctrl+Q"), self); - self.connect(scq, QtCore.SIGNAL("activated()"), self.onexit) + scq = QShortcut(QKeySequence("Ctrl+Q"), self); + scq.activated.connect(self.onexit) header = self.ui.resTable.horizontalHeader(); header.setSortIndicatorShown(True); header.setSortIndicator(-1, QtCore.Qt.AscendingOrder); @@ -213,7 +215,7 @@ class RclGui_Main(QtGui.QMainWindow): ipath = doc.ipath if not ipath: return - fn = QtGui.QFileDialog.getSaveFileName(self) + fn = QFileDialog.getSaveFileName(self) if fn: docitems = doc.items() fn = extractofile(doc, str(fn.toLocal8Bit())) @@ -236,7 +238,7 @@ def Usage(): def main(args): - app = QtGui.QApplication(args) + app = QApplication(args) confdir="" extra_dbs = [] diff --git a/src/python/samples/recollgui/rclmain.ui b/src/python/samples/recollgui/rclmain.ui index 6eaa34a9..50e8e1e1 100644 --- a/src/python/samples/recollgui/rclmain.ui +++ b/src/python/samples/recollgui/rclmain.ui @@ -109,7 +109,7 @@ actionExit - activated() + triggered() MainWindow close()