Merge lp:~kubuntu-packagers/apport/qt5 into lp:~apport-hackers/apport/trunk

[Harald Sitter]

port apport-kde to qt5 (in fact it's qt-only now)

[Dmitry Shachnev (mitya57)]

review: Needs Fixing

[Dmitry Shachnev (mitya57)]

Also, the code still uses things like KMessageBox and KStandardGuiItem, even as they are no longer imported.

[lp:~kubuntu-packagers/apport/qt5]

2933. By Harald Sitter on 2015-03-25

fix kmessagebox usage, load translations for qmessagebox, use explicit import

2934. By Harald Sitter on 2015-03-25

repair broken annotation

[Martin Pitt (pitti)]

LGTM, thank you! Merged.

review: Approve

=== modified file 'kde/apport-kde'
--- kde/apport-kde	2015-02-06 07:42:03 +0000
+++ kde/apport-kde	2015-03-25 15:37:32 +0000
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 
-'''KDE 4 Apport User Interface'''
+'''Qt 5 Apport User Interface'''
 
+# Copyright (C) 2015 Harald Sitter <[e-mail]>
 # Copyright (C) 2007 - 2009 Canonical Ltd.
 # Author: Richard A. Johnson <[e-mail]>
 #
@@ -17,16 +18,29 @@
 
 try:
     import apport
-    from PyQt4.QtCore import *
-    from PyQt4.QtGui import (QDialog, QLabel, QCheckBox, QRadioButton,
-                             QTreeWidget, QTreeWidgetItem, QFileDialog,
-                             QDialogButtonBox, QProgressBar, QLineEdit,
-                             QPushButton, QIcon, QPainter, QMovie)
-    from PyQt4 import uic
-    from PyKDE4.kdecore import (ki18n, KAboutData, KCmdLineArgs,
-                                KLocalizedString)
-    from PyKDE4.kdeui import (KApplication, KMessageBox, KIcon,
-                              KStandardGuiItem)
+    from PyQt5.QtCore import (QByteArray,
+                              QLibraryInfo,
+                              QLocale,
+                              Qt,
+                              QTimer,
+                              QTranslator)
+    from PyQt5.QtGui import (QIcon,
+                             QMovie,
+                             QPainter)
+    from PyQt5.QtWidgets import (QApplication,
+                                 QCheckBox,
+                                 QDialog,
+                                 QDialogButtonBox,
+                                 QLabel,
+                                 QLineEdit,
+                                 QMessageBox,
+                                 QProgressBar,
+                                 QPushButton,
+                                 QRadioButton,
+                                 QTreeWidget,
+                                 QTreeWidgetItem,
+                                 QFileDialog)
+    from PyQt5 uic
     import apport.ui
     from apport import unicode_gettext as _
     import sip
@@ -372,10 +386,10 @@
         return return_value
 
     def ui_info_message(self, title, text):
-        KMessageBox.information(None, _(text), _(title))
+        QMessageBox.information(None, _(title), _(text))
 
     def ui_error_message(self, title, text):
-        KMessageBox.information(None, _(text), _(title))
+        QMessageBox.information(None, _(title), _(text))
 
     def ui_start_info_collection_progress(self):
         # show a spinner if we already have the main window
@@ -396,13 +410,13 @@
             self.progress.set()
             self.progress.show()
 
-        KApplication.processEvents()
+        QApplication.processEvents()
 
     def ui_pulse_info_collection_progress(self):
         if self.progress:
             self.progress.set()
         # for a spinner we just need to handle events
-        KApplication.processEvents()
+        QApplication.processEvents()
 
     def ui_stop_info_collection_progress(self):
         if self.progress:
@@ -412,7 +426,7 @@
             self.dialog.movie.stop()
             self.dialog.spinner.hide()
 
-        KApplication.processEvents()
+        QApplication.processEvents()
 
     def ui_start_upload_progress(self):
         self.progress = ProgressDialog(
@@ -427,18 +441,17 @@
             self.progress.set(progress)
         else:
             self.progress.set()
-        KApplication.processEvents()
+        QApplication.processEvents()
 
     def ui_stop_upload_progress(self):
         self.progress.hide()
 
     def ui_question_yesno(self, text):
-        response = KMessageBox.questionYesNoCancel(
-            None, _(text), '', KStandardGuiItem.yes(), KStandardGuiItem.no(),
-            KStandardGuiItem.cancel())
-        if response == KMessageBox.Yes:
+        response = QMessageBox.question(None, '', 'text',
+                                        QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel)
+        if response == QMessageBox.Yes:
             return True
-        if response == KMessageBox.No:
+        if response == QMessageBox.No:
             return False
         return None
 
@@ -504,27 +517,14 @@
     if not os.environ.get('DISPLAY'):
         apport.fatal('This program needs a running X session. Please see "man apport-cli" for a command line version of Apport.')
 
-    appName = 'apport-kde'
-    catalog = 'apport'
-    programName = ki18n(b'Apport KDE')
-    version = '1.0'
-    description = ki18n(b'KDE 4 frontend for the apport crash report system')
-    license = KAboutData.License_GPL
-    copyright = ki18n(b'2009 Canonical Ltd.')
-    text = KLocalizedString()
-    homePage = 'https://wiki.ubuntu.com/Apport'
-    bugEmail = '[e-mail]'
-
-    aboutData = KAboutData(appName, catalog, programName, version, description,
-                           license, copyright, text, homePage, bugEmail)
-
-    aboutData.addAuthor(ki18n(b'Richard A. Johnson'), ki18n(b'Author'))
-    aboutData.addAuthor(ki18n(b'Michael Hofmann'), ki18n(b'Original Qt4 Author'))
-
-    KCmdLineArgs.init([''], aboutData)
-
-    app = KApplication()
-    app.setWindowIcon(KIcon('apport'))
+    app = QApplication(sys.argv)
+    app.setApplicationName('apport-kde')
+    app.setApplicationDisplayName(_('Apport'))
+    app.setWindowIcon(QIcon.fromTheme('apport'))
+    translator = QTranslator()
+    translator.load("qtbase_" + QLocale.system().name(),
+                    QLibraryInfo.location(QLibraryInfo.TranslationsPath))
+    app.installTranslator(translator)
 
     UserInterface = MainUserInterface()
     sys.exit(UserInterface.run_argv())

=== modified file 'test/test_ui_kde.py'
--- test/test_ui_kde.py	2013-08-30 10:40:19 +0000
+++ test/test_ui_kde.py	2015-03-25 15:37:32 +0000
@@ -1,5 +1,6 @@
-'''KDE 4 Apport User Interface tests'''
+'''Qt 5 Apport User Interface tests'''
 
+# Copyright (C) 2015 Harald Sitter <[e-mail]>
 # Copyright (C) 2012 Canonical Ltd.
 # Author: Evan Dandrea <[e-mail]>
 #
@@ -17,10 +18,8 @@
 
 from mock import patch
 try:
-    from PyQt4.QtCore import QTimer, QCoreApplication
-    from PyQt4.QtGui import QTreeWidget
-    from PyKDE4.kdecore import ki18n, KCmdLineArgs, KAboutData, KLocalizedString
-    from PyKDE4.kdeui import KApplication
+    from PyQt5.QtCore import QTimer, QCoreApplication
+    from PyQt5.QtGui import QApplication, QTreeWidget, QIcon
 except ImportError as e:
     sys.stderr.write('SKIP: PyQt/PyKDE not available: %s\n' % str(e))
     sys.exit(0)
@@ -592,20 +591,9 @@
         self.assertFalse(self.app.dialog.send_error_report.isVisible())
         self.assertFalse(self.app.dialog.send_error_report.isChecked())
 
-appName = 'apport-kde'
-catalog = 'apport'
-programName = ki18n(b'Apport KDE')
-version = '1.0'
-description = ki18n(b'KDE 4 frontend tests for the apport')
-license = KAboutData.License_GPL
-copyright = ki18n(b'2012 Canonical Ltd.')
-text = KLocalizedString()
-homePage = 'https://wiki.ubuntu.com/AutomatedProblemReports'
-bugEmail = '[e-mail]'
-
-aboutData = KAboutData(appName, catalog, programName, version, description,
-                       license, copyright, text, homePage, bugEmail)
-
-KCmdLineArgs.init([''], aboutData)
-app = KApplication()
+app = QApplication(sys.argv)
+app.applicationName = 'apport-kde'
+app.applicationDisplayName = _('Apport')
+app.windowIcon = QIcon.fromTheme('apport')
+
 unittest.main()