Only in mnemosyne-next/: build diff -r mnemosyne-2.2.1/debian/changelog mnemosyne-next/debian/changelog 0a1,6 > mnemosyne (2.2.1-4ubuntu1) yakkety; urgency=high > > * something > > -- Jeff Cliff Sat, 17 Oct 2015 01:10:20 +0100 > diff -r mnemosyne-2.2.1/debian/control mnemosyne-next/debian/control 12,13c12,13 < Depends: python, python-qt4, python-qt4-sql, python-matplotlib, < python-cherrypy3, libqt4-sql-sqlite --- > Depends: python, python3-pyqt5, python-pyqt5.qtsql, python-matplotlib, > python-cherrypy3, libqt5sql5-sqlite Only in mnemosyne-next/debian: debhelper-build-stamp Only in mnemosyne-next/debian: files Only in mnemosyne-next/debian: mnemosyne Only in mnemosyne-next/debian: mnemosyne.debhelper.log Only in mnemosyne-next/debian: mnemosyne.postinst.debhelper Only in mnemosyne-next/debian: mnemosyne.postrm.debhelper Only in mnemosyne-next/debian: mnemosyne.substvars diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/add_menu_item.py mnemosyne-next/mnemosyne/example_plugins/add_menu_item.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/configuration.py mnemosyne-next/mnemosyne/example_plugins/configuration.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/grades_criterion.py mnemosyne-next/mnemosyne/example_plugins/grades_criterion.py 49c49 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/hide_toolbar.py mnemosyne-next/mnemosyne/example_plugins/hide_toolbar.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/lock_down.py mnemosyne-next/mnemosyne/example_plugins/lock_down.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/example_plugins/new_card_type_widget.py mnemosyne-next/mnemosyne/example_plugins/new_card_type_widget.py 7c7 < from PyQt4 import QtGui --- > from PyQt5 import QtGui Only in mnemosyne-next/mnemosyne: __init__.pyc diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/about_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/about_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class AboutDlg(QtGui.QDialog, Ui_AboutDlg, AboutDialog): --- > class AboutDlg(QtWidgets.QDialog, Ui_AboutDlg, AboutDialog): 17c17 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/activate_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/activate_cards_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class ActivateCardsDlg(QtGui.QDialog, Ui_ActivateCardsDlg, --- > class ActivateCardsDlg(QtWidgets.QDialog, Ui_ActivateCardsDlg, 18c18 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 94c94 < menu = QtGui.QMenu() --- > menu = QtWidgets.QMenu() 221c221 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/add_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/add_cards_dlg.py 7c7 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 37c37 < return (status == QtGui.QDialog.Accepted) --- > return (status == QtWidgets.QDialog.Accepted) 149c149 < if dlg.exec_() != QtGui.QDialog.Accepted: --- > if dlg.exec_() != QtWidgets.QDialog.Accepted: 172c172 < class AddCardsDlg(QtGui.QDialog, Ui_AddCardsDlg, AddEditCards, AddCardsDialog): --- > class AddCardsDlg(QtWidgets.QDialog, Ui_AddCardsDlg, AddEditCards, AddCardsDialog): 176c176 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 232c232 < QtGui.QDialog.keyPressEvent(self, event) --- > QtWidgets.QDialog.keyPressEvent(self, event) 261c261 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) 264c264 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) 278c278 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/add_tags_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/add_tags_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/browse_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/browse_cards_dlg.py 9c9 < from PyQt4 import QtCore, QtGui, QtSql --- > from PyQt5 import QtCore, QtGui, QtSql, QtWidgets 142c142 < class QA_Delegate(QtGui.QStyledItemDelegate, Component): --- > class QA_Delegate(QtWidgets.QStyledItemDelegate, Component): 149c149 < QtGui.QStyledItemDelegate.__init__(self, parent) --- > QtWidgets.QStyledItemDelegate.__init__(self, parent) 216c216 < optionV4 = QtGui.QStyleOptionViewItemV4(option) --- > optionV4 = QtWidgets.QStyleOptionViewItemV4(option) 221c221 < style = QtGui.QApplication.style() --- > style = QtWidgets.QApplication.style() 225c225 < ignore_text_colour = bool(optionV4.state & QtGui.QStyle.State_Selected) --- > ignore_text_colour = bool(optionV4.state & QtWidgets.QStyle.State_Selected) 238c238 < style.drawControl(QtGui.QStyle.CE_ItemViewItem, optionV4, painter) --- > style.drawControl(QtWidgets.QStyle.CE_ItemViewItem, optionV4, painter) 241c241 < if optionV4.state & QtGui.QStyle.State_Selected: --- > if optionV4.state & QtWidgets.QStyle.State_Selected: 246c246 < style.subElementRect(QtGui.QStyle.SE_ItemViewItemText, optionV4) --- > style.subElementRect(QtWidgets.QStyle.SE_ItemViewItemText, optionV4) 262c262 < class BrowseCardsDlg(QtGui.QDialog, Ui_BrowseCardsDlg, BrowseCardsDialog, --- > class BrowseCardsDlg(QtWidgets.QDialog, Ui_BrowseCardsDlg, BrowseCardsDialog, 277c277 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 286c286 < self.container_1 = QtGui.QWidget(self.splitter_1) --- > self.container_1 = QtWidgets.QWidget(self.splitter_1) 355,356c355,356 < menu = QtGui.QMenu(self) < edit_action = QtGui.QAction(_("&Edit"), menu) --- > menu = QtWidgets.QMenu(self) > edit_action = QtWidgets.QAction(_("&Edit"), menu) 360c360 < preview_action = QtGui.QAction(_("&Preview"), menu) --- > preview_action = QtWidgets.QAction(_("&Preview"), menu) 364c364 < delete_action = QtGui.QAction(_("&Delete"), menu) --- > delete_action = QtWidgets.QAction(_("&Delete"), menu) 369c369 < change_card_type_action = QtGui.QAction(_("Change card &type"), menu) --- > change_card_type_action = QtWidgets.QAction(_("Change card &type"), menu) 373c373 < add_tags_action = QtGui.QAction(_("&Add tags"), menu) --- > add_tags_action = QtWidgets.QAction(_("&Add tags"), menu) 376c376 < remove_tags_action = QtGui.QAction(_("&Remove tags"), menu) --- > remove_tags_action = QtWidgets.QAction(_("&Remove tags"), menu) 388c388 < QtGui.QDialog.keyPressEvent(self, event) --- > QtWidgets.QDialog.keyPressEvent(self, event) 403c403 < QtGui.QDialog.keyPressEvent(self, event) --- > QtWidgets.QDialog.keyPressEvent(self, event) 448c448 < if self.edit_dlg.exec_() == QtGui.QDialog.Accepted: --- > if self.edit_dlg.exec_() == QtWidgets.QDialog.Accepted: 529c529 < if dlg.exec_() != QtGui.QDialog.Accepted: --- > if dlg.exec_() != QtWidgets.QDialog.Accepted: 537c537 < if dlg.exec_() != QtGui.QDialog.Accepted: --- > if dlg.exec_() != QtWidgts.QDialog.Accepted: 554c554 < if dlg.exec_() != QtGui.QDialog.Accepted: --- > if dlg.exec_() != QtWidgets.QDialog.Accepted: 576c576 < if dlg.exec_() != QtGui.QDialog.Accepted: --- > if dlg.exec_() != QtWidgets.QDialog.Accepted: 773c773 < return QtGui.QDialog.reject(self) --- > return QtWidgets.QDialog.reject(self) 779c779 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/card_set_name_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/card_set_name_dlg.py 1d0 < # 3d1 < # 5c3 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c10 < class CardSetNameDlg(QtGui.QDialog, Ui_CardSetNameDlg, UiComponent): --- > class CardSetNameDlg(QtWidgets.QDialog, Ui_CardSetNameDlg, UiComponent): 16c14 < QtGui.QDialog.__init__(self, parent) --- > QtWidgets.QDialog.__init__(self, parent) 36c34 < return QtGui.QDialog.reject(self) --- > return QtWidgets.QDialog.reject(self) 40c38 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/card_type_tree_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/card_type_tree_wdgt.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 204c204 < self.wakeup() \ No newline at end of file --- > self.wakeup() diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/card_type_wdgt_generic.py mnemosyne-next/mnemosyne/pyqt_ui/card_type_wdgt_generic.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class GenericCardTypeWdgt(QtGui.QWidget, GenericCardTypeWidget): --- > class GenericCardTypeWdgt(QtWidgets.QWidget, GenericCardTypeWidget): 16c16 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/change_card_type_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/change_card_type_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/clone_card_type_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/clone_card_type_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c12 < class CloneCardTypeDlg(QtGui.QDialog, Ui_CloneCardTypeDlg, Component): --- > class CloneCardTypeDlg(QtWidgets.QDialog, Ui_CloneCardTypeDlg, Component): 16c16 < QtGui.QDialog.__init__(self, parent) --- > QtWidgets.QDialog.__init__(self, parent) 38c38 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/compact_database_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/compact_database_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 36c36 < class CompactDatabaseDlg(QtGui.QDialog, Ui_CompactDatabaseDlg, --- > class CompactDatabaseDlg(QtWidgets.QDialog, Ui_CompactDatabaseDlg, 41c41 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 61c61 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) 74c74 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) 79c79 < QtGui.QDialog.accept(self) \ No newline at end of file --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/configuration_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/configuration_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c12 < class ConfigurationDlg(QtGui.QDialog, Ui_ConfigurationDlg, ConfigurationDialog): --- > class ConfigurationDlg(QtWidgets.QDialog, Ui_ConfigurationDlg, ConfigurationDialog): 21c21 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 57c57 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) 63c63 < return QtGui.QDialog.reject(self) --- > return QtWidgets.QDialog.reject(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/configuration_wdgt_card_appearance.py mnemosyne-next/mnemosyne/pyqt_ui/configuration_wdgt_card_appearance.py 7c7 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 19c19 < class ConfigurationWdgtCardAppearance(QtGui.QWidget, --- > class ConfigurationWdgtCardAppearance(QtWidgets.QWidget, 26c26 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/configuration_wdgt_cramming.py mnemosyne-next/mnemosyne/pyqt_ui/configuration_wdgt_cramming.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 16c16 < class ConfigurationWdgtCramming(QtGui.QWidget, --- > class ConfigurationWdgtCramming(QtWidgets.QWidget, diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/configuration_wdgt_main.py mnemosyne-next/mnemosyne/pyqt_ui/configuration_wdgt_main.py 7c7 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 17c17 < class ConfigurationWdgtMain(QtGui.QWidget, Ui_ConfigurationWdgtMain, --- > class ConfigurationWdgtMain(QtWidgets.QWidget, Ui_ConfigurationWdgtMain, diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/configuration_wdgt_sync_server.py mnemosyne-next/mnemosyne/pyqt_ui/configuration_wdgt_sync_server.py 7c7 < from PyQt4 import QtGui --- > from PyQt5 import QtGui, QtWidgets 21c21,22 < s.connect(("google.com", 8000)) --- > # better a non-PRISM company like pornhub than google. > s.connect(("pornhub.com", 8000)) 25c26 < class ConfigurationWdgtSyncServer(QtGui.QWidget, --- > class ConfigurationWdgtSyncServer(QtWidgets.QWidget, diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/convert_card_type_keys_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/convert_card_type_keys_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c12 < class ConvertCardTypeKeysDlg(QtGui.QDialog, Ui_ConvertCardTypeKeysDlg): --- > class ConvertCardTypeKeysDlg(QtWidgets.QDialog, Ui_ConvertCardTypeKeysDlg): 16c16 < QtGui.QDialog.__init__(self, parent) --- > QtWidgets.QDialog.__init__(self, parent) 87c87 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/criterion_wdgt_default.py mnemosyne-next/mnemosyne/pyqt_ui/criterion_wdgt_default.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 16c16 < class DefaultCriterionWdgt(QtGui.QWidget, Ui_DefaultCriterionWdgt, --- > class DefaultCriterionWdgt(QtWidgets.QWidget, Ui_DefaultCriterionWdgt, 28c28 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/delete_unused_media_files_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/delete_unused_media_files_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c12 < class DeleteUnusedMediaFilesDlg(QtGui.QDialog, Ui_DeleteUnusedMediaFilesDlg, --- > class DeleteUnusedMediaFilesDlg(QtWidgets.QDialog, Ui_DeleteUnusedMediaFilesDlg, 17c17 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 31c31 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/edit_card_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/edit_card_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class EditCardDlg(QtGui.QDialog, Ui_EditCardDlg, AddEditCards, --- > class EditCardDlg(QtWidgets.QDialog, Ui_EditCardDlg, AddEditCards, 40c40 < QtGui.QDialog.__init__(self, parent) --- > QtWidgets.QDialog.__init__(self, parent) 121c121 < QtGui.QDialog.keyPressEvent(self, event) --- > QtWidgets.QDialog.keyPressEvent(self, event) 138c138 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) 150c150 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) 164c164 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) 167c167 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/export_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/export_dlg.py 6c6 < from PyQt4 import QtGui, QtCore --- > from PyQt5 import QtGui, QtCore, QtWidgets 13c13 < class ExportDlg(QtGui.QDialog, Ui_ExportDlg, ExportDialog): --- > class ExportDlg(QtWidgets.QDialog, Ui_ExportDlg, ExportDialog): 17c17 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 59c59 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) 66c66 < return QtGui.QDialog.reject(self) --- > return QtWidgets.QDialog.reject(self) 71c71 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/export_metadata_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/export_metadata_dlg.py 5c5 < from PyQt4 import QtGui, QtCore --- > from PyQt5 import QtGui, QtCore, QtWidgets 12c12 < class ExportMetadataDlg(QtGui.QDialog, Ui_ExportMetadataDlg, --- > class ExportMetadataDlg(QtWidgets.QDialog, Ui_ExportMetadataDlg, 17c17 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 80c80 < QtGui.QDialog.keyPressEvent(self, event) --- > QtWidgets.QDialog.keyPressEvent(self, event) 84c84 < return QtGui.QDialog.reject(self) --- > return QtWidgets.QDialog.reject(self) 99c99 < return metadata \ No newline at end of file --- > return metadata diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/getting_started_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/getting_started_dlg.py 5c5 < from PyQt4 import QtGui, QtCore --- > from PyQt5 import QtGui, QtCore, QtWidgets 10c10 < class GettingStartedDlg(QtGui.QWizard, Ui_GettingStartedDlg, --- > class GettingStartedDlg(QtWidgets.QWizard, Ui_GettingStartedDlg, 15c15 < QtGui.QWizard.__init__(self, self.main_widget()) --- > QtWidgets.QWizard.__init__(self, self.main_widget()) 25c25 < self.setPixmap(QtGui.QWizard.WatermarkPixmap, watermark) --- > self.setPixmap(QtWidgets.QWizard.WatermarkPixmap, watermark) 33c33 < QtGui.QWizard.accept(self) --- > QtWidgets.QWizard.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/import_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/import_dlg.py 6c6 < from PyQt4 import QtGui, QtCore --- > from PyQt5 import QtGui, QtCore, QtWidgets 13c13 < class ImportDlg(QtGui.QDialog, Ui_ImportDlg, ImportDialog): --- > class ImportDlg(QtWidgets.QDialog, Ui_ImportDlg, ImportDialog): 17c17 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 79c79 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/main_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/main_wdgt.py 6c6 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class MainWdgt(QtGui.QMainWindow, Ui_MainWdgt, MainWidget): --- > class MainWdgt(QtWidgets.QMainWindow, Ui_MainWdgt, MainWidget): 17c17 < QtGui.QMainWindow.__init__(self) --- > QtWidgets.QMainWindow.__init__(self) 34c34 < QtGui.QMainWindow.changeEvent(self, event) --- > QtWidgets.QMainWindow.changeEvent(self, event) 63c63 < for widget in QtGui.QApplication.topLevelWidgets(): --- > for widget in QtWidgets.QApplication.topLevelWidgets(): 71c71 < QtGui.QMessageBox.information(self.top_window(), _("Mnemosyne"), --- > QtWidgets.QMessageBox.information(self.top_window(), _("Mnemosyne"), 75c75 < return QtGui.QMessageBox.question(self.top_window(), _("Mnemosyne"), --- > return QtWidgets.QMessageBox.question(self.top_window(), _("Mnemosyne"), 79c79 < QtGui.QMessageBox.critical(self.top_window(), _("Mnemosyne"), text, --- > QtWidgets.QMessageBox.critical(self.top_window(), _("Mnemosyne"), text, diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/manage_card_types_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/manage_card_types_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 14c14 < class ManageCardTypesDlg(QtGui.QDialog, Ui_ManageCardTypesDlg, --- > class ManageCardTypesDlg(QtWidgets.QDialog, Ui_ManageCardTypesDlg, 19c19 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 76c76 < class RenameDlg(QtGui.QDialog, Ui_RenameCardTypeDlg): --- > class RenameDlg(QtWidgets.QDialog, Ui_RenameCardTypeDlg): 78c78 < QtGui.QDialog.__init__(self) --- > QtWidgets.QDialog.__init__(self) 85c85 < if dlg.exec_() == QtGui.QDialog.Accepted: --- > if dlg.exec_() == QtWidgets.QDialog.Accepted: diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/manage_plugins_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/manage_plugins_dlg.py 6c6 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class ManagePluginsDlg(QtGui.QDialog, Ui_ManagePluginsDlg, --- > class ManagePluginsDlg(QtWidgets.QDialog, Ui_ManagePluginsDlg, 18c18 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 89c89 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/mnemosyne mnemosyne-next/mnemosyne/pyqt_ui/mnemosyne 30c30 < from PyQt4.QtGui import QApplication --- > from PyQt5.QtWidgets import QApplication diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/mnemosyne_rc.py mnemosyne-next/mnemosyne/pyqt_ui/mnemosyne_rc.py 10c10 < from PyQt4 import QtCore --- > from PyQt5 import QtCore diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/prefill_tag_behaviour_plugin.py mnemosyne-next/mnemosyne/pyqt_ui/prefill_tag_behaviour_plugin.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/preview_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/preview_cards_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class PreviewCardsDlg(QtGui.QDialog, Ui_PreviewCardsDlg, Component, --- > class PreviewCardsDlg(QtWidgets.QDialog, Ui_PreviewCardsDlg, Component, 30c30 < QtGui.QDialog.__init__(self, parent) --- > QtWidgets.QDialog.__init__(self, parent) 100c100 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/qpushbutton2.py mnemosyne-next/mnemosyne/pyqt_ui/qpushbutton2.py 5c5 < from PyQt4 import QtGui --- > from PyQt5 import QtWidgets 8c8 < class QPushButton2(QtGui.QPushButton): --- > class QPushButton2(QtWidgets.QPushButton): 14c14 < return QtGui.QPushButton.keyPressEvent(self, event) --- > return QtWidgets.QPushButton.keyPressEvent(self, event) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/qtextedit2.py mnemosyne-next/mnemosyne/pyqt_ui/qtextedit2.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 10c10 < class QTextEdit2(QtGui.QTextEdit): --- > class QTextEdit2(QtWidgets.QTextEdit): 22c22 < QtGui.QTextEdit.__init__(self, parent) --- > QtWidgets.QTextEdit.__init__(self, parent) 39c39 < self.hide_action = QtGui.QAction(\ --- > self.hide_action = QtWidgets.QAction(\ 62c62 < QtGui.QTextEdit.keyPressEvent(self, event) --- > QtWidgets.QTextEdit.keyPressEvent(self, event) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/qt_sync_server.py mnemosyne-next/mnemosyne/pyqt_ui/qt_sync_server.py 9c9 < from PyQt4 import QtCore --- > from PyQt5 import QtCore 54,58c54,58 < information_signal = QtCore.pyqtSignal(QtCore.QString) < error_signal = QtCore.pyqtSignal(QtCore.QString) < question_signal = QtCore.pyqtSignal(QtCore.QString, QtCore.QString, < QtCore.QString, QtCore.QString) < set_progress_text_signal = QtCore.pyqtSignal(QtCore.QString) --- > information_signal = QtCore.pyqtSignal(str) > error_signal = QtCore.pyqtSignal(str) > question_signal = QtCore.pyqtSignal(str, str, > str, str) > set_progress_text_signal = QtCore.pyqtSignal(str) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/qt_translator.py mnemosyne-next/mnemosyne/pyqt_ui/qt_translator.py 8c8,9 < from PyQt4.QtCore import QTranslator, QCoreApplication, QLocale --- > from PyQt5.QtCore import QTranslator, QLocale > from PyQt5.QtCore import QCoreApplication 29c30 < self.qt_dir = os.path.join(sys.exec_prefix, "share", "qt4") --- > self.qt_dir = os.path.join(sys.exec_prefix, "share", "qt5") 31c32 < self.qt_dir = os.path.join("/usr", "share", "qt4") --- > self.qt_dir = os.path.join("/usr", "share", "qt5") diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/qwebview2.py mnemosyne-next/mnemosyne/pyqt_ui/qwebview2.py 5c5 < from PyQt4 import QtWebKit, QtGui --- > from PyQt5 import QtWebKit, QtGui, QtWidgets, QtWebKitWidgets 10c10 < class QWebView2(QtWebKit.QWebView): --- > class QWebView2(QtWebKitWidgets.QWebView): 20c20 < QtWebKit.QWebView.focusInEvent(self, event) --- > QtWebKitWidgets.QWebView.focusInEvent(self, event) 23c23 < menu = QtGui.QMenu(self) --- > menu = QtWidgets.QMenu(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/remove_tags_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/remove_tags_dlg.py 5c5 < from PyQt4 import QtGui, QtCore --- > from PyQt5 import QtGui, QtCore diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/review_wdgt_cramming.py mnemosyne-next/mnemosyne/pyqt_ui/review_wdgt_cramming.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/review_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/review_wdgt.py 5c5 < from PyQt4 import QtCore, QtGui, QtWebKit --- > from PyQt5 import QtCore, QtGui, QtWebKit, QtWidgets 66c66 < return QtGui.QWidget.resizeEvent(self, event) --- > return QtWidgets.QWidget.resizeEvent(self, event) 180c180 < class ReviewWdgt(QtGui.QWidget, QAOptimalSplit, Ui_ReviewWdgt, ReviewWidget): --- > class ReviewWdgt(QtWidgets.QWidget, QAOptimalSplit, Ui_ReviewWdgt, ReviewWidget): 187c187 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) 199a200 > # remove what? 226c227 < QtGui.QWidget.changeEvent(self, event) --- > QtWidgets.QWidget.changeEvent(self, event) 253c254 < QtGui.QWidget.keyPressEvent(self, event) --- > QtWidgets.QWidget.keyPressEvent(self, event) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/statistics_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/statistics_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 13c13 < class StatisticsDlg(QtGui.QDialog, Ui_StatisticsDlg, StatisticsDialog): --- > class StatisticsDlg(QtWidgets.QDialog, Ui_StatisticsDlg, StatisticsDialog): 22c22 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 60c60 < return QtGui.QDialog.accept(self) --- > return QtWidgets.QDialog.accept(self) 75c75 < class StatisticsPageWdgt(QtGui.QWidget, Component): --- > class StatisticsPageWdgt(QtWidgets.QWidget, Component): 86c86 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/statistics_wdgt_html.py mnemosyne-next/mnemosyne/pyqt_ui/statistics_wdgt_html.py 5c5 < from PyQt4 import QtCore, QtWebKit --- > from PyQt5 import QtCore, QtWebKit, QtWidgets, QtWebKitWidgets 12c12 < class HtmlStatisticsWdgt(QtWebKit.QWebView, StatisticsWidget): --- > class HtmlStatisticsWdgt(QtWebKitWidgets.QWebView, StatisticsWidget): 18c18 < QtWebKit.QWebView.__init__(self, parent) --- > QtWebKitWidgets.QWebView.__init__(self, parent) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/statistics_wdgts_plotting.py mnemosyne-next/mnemosyne/pyqt_ui/statistics_wdgts_plotting.py 5c5 < from PyQt4 import QtGui --- > from PyQt5 import QtGui, QtWidgets 9c9 < from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas --- > from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas 20c20 < class PlotStatisticsWdgt(QtGui.QWidget, StatisticsWidget): --- > class PlotStatisticsWdgt(QtWidgets.QWidget, StatisticsWidget): 28c28 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) 46,47c46,47 < self.canvas.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding, < QtGui.QSizePolicy.MinimumExpanding) --- > self.canvas.setSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, > QtWidgets.QSizePolicy.MinimumExpanding) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/sync_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/sync_dlg.py 7c7 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 34,38c34,38 < information_signal = QtCore.pyqtSignal(QtCore.QString) < error_signal = QtCore.pyqtSignal(QtCore.QString) < question_signal = QtCore.pyqtSignal(QtCore.QString, QtCore.QString, < QtCore.QString, QtCore.QString) < set_progress_text_signal = QtCore.pyqtSignal(QtCore.QString) --- > information_signal = QtCore.pyqtSignal(str) > error_signal = QtCore.pyqtSignal(str) > question_signal = QtCore.pyqtSignal(str, str, > str, str) > set_progress_text_signal = QtCore.pyqtSignal(str) 120c120 < class SyncDlg(QtGui.QDialog, Ui_SyncDlg, SyncDialog): --- > class SyncDlg(QtWidgets.QDialog, Ui_SyncDlg, SyncDialog): 124c124 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) 192c192 < QtGui.QDialog.reject(self) --- > QtWidgets.QDialog.reject(self) 195c195 < QtGui.QDialog.accept(self) --- > QtWidgets.QDialog.accept(self) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/tag_tree_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/tag_tree_wdgt.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 21c21 < class TagDelegate(QtGui.QStyledItemDelegate): --- > class TagDelegate(QtWidgets.QStyledItemDelegate): 27c27 < QtGui.QStyledItemDelegate.__init__(self, parent) --- > QtWidgets.QStyledItemDelegate.__init__(self, parent) 48c48 < editor = QtGui.QStyledItemDelegate.createEditor\ --- > editor = QtWidgets.QStyledItemDelegate.createEditor\ 70c70 < class TagsTreeWdgt(QtGui.QWidget, Component): --- > class TagsTreeWdgt(QtWidgets.QWidget, Component): 88c88 < QtGui.QWidget.__init__(self, parent) --- > QtWidgets.QWidget.__init__(self, parent) 131c131 < menu = QtGui.QMenu(self) --- > menu = QtWidgets.QMenu(self) 134c134 < rename_action = QtGui.QAction(_("&Rename"), menu) --- > rename_action = QtWidgets.QAction(_("&Rename"), menu) 142c142 < delete_action = QtGui.QAction(_("&Delete"), menu) --- > delete_action = QtWidgets.QAction(_("&Delete"), menu) 155c155 < QtGui.QWidget.keyPressEvent(self, event) --- > QtWidgets.QWidget.keyPressEvent(self, event) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/tip_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/tip_dlg.py 5c5 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 12c12 < class TipDlg(QtGui.QDialog, Ui_TipDlg, TipDialog): --- > class TipDlg(QtWidgets.QDialog, Ui_TipDlg, TipDialog): 16c16 < QtGui.QDialog.__init__(self, self.main_widget()) --- > QtWidgets.QDialog.__init__(self, self.main_widget()) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_about_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_about_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 30c30 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) 43c43 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) 55c55 < spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) --- > spacerItem = QtGui.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) 66c66 < spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_activate_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_activate_cards_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 27c27 < self.layoutWidget = QtGui.QWidget(self.splitter) --- > self.layoutWidget = QtWidgets.QWidget(self.splitter) 39c39 < self.layoutWidget1 = QtGui.QWidget(self.splitter) --- > self.layoutWidget1 = QtWidgets.QWidget(self.splitter) 54c54 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 60c60 < spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_add_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_add_cards_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 43c43 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 92c92 < spacerItem = QtGui.QSpacerItem(101, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(101, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_add_tags_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_add_tags_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 48c48 < spacerItem = QtGui.QSpacerItem(101, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(101, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_browse_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_browse_cards_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui, QtWidgets 30c30 < self.layoutWidget = QtGui.QWidget(self.splitter_2) --- > self.layoutWidget = QtWidgets.QWidget(self.splitter_2) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_card_set_name_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_card_set_name_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_change_card_type_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_change_card_type_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 46c46 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_clone_card_type_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_clone_card_type_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 49c49 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_compact_database_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_compact_database_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 40c40 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_configuration_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_configuration_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 36c36 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 41c41 < spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_configuration_wdgt_card_appearance.py mnemosyne-next/mnemosyne/pyqt_ui/ui_configuration_wdgt_card_appearance.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 47c47 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 49c49 < spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 51c51 < spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem2 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 67c67 < spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem3 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 98c98 < spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem4 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 105c105 < spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) --- > spacerItem5 = QtGui.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) 109c109 < spacerItem6 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem6 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 115c115 < spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem7 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_configuration_wdgt_cramming.py mnemosyne-next/mnemosyne/pyqt_ui/ui_configuration_wdgt_cramming.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 43c43 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 49c49 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) 59c59 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) 67c67 < spacerItem1 = QtGui.QSpacerItem(1, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(1, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 70c70 < spacerItem2 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) --- > spacerItem2 = QtGui.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_configuration_wdgt_main.py mnemosyne-next/mnemosyne/pyqt_ui/ui_configuration_wdgt_main.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 40c40 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 53c53 < spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 69c69 < spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem2 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 86c86 < spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem3 = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_configuration_wdgt_sync_server.py mnemosyne-next/mnemosyne/pyqt_ui/ui_configuration_wdgt_sync_server.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 52c52 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 58c58 < spacerItem1 = QtGui.QSpacerItem(20, 124, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) --- > spacerItem1 = QtGui.QSpacerItem(20, 124, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_convert_card_type_keys_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_convert_card_type_keys_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 55c55 < spacerItem = QtGui.QSpacerItem(208, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(208, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_criterion_wdgt_default.py mnemosyne-next/mnemosyne/pyqt_ui/ui_criterion_wdgt_default.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_delete_unused_media_files_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_delete_unused_media_files_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 38c38 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_edit_card_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_edit_card_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 32c32 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 43c43 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed) 58c58 < spacerItem = QtGui.QSpacerItem(70, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(70, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 64c64 < spacerItem1 = QtGui.QSpacerItem(70, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem1 = QtGui.QSpacerItem(70, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_export_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_export_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 60c60 < spacerItem = QtGui.QSpacerItem(201, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(201, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_export_metadata_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_export_metadata_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 78c78 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_getting_started_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_getting_started_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_import_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_import_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 66c66 < spacerItem = QtGui.QSpacerItem(201, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(201, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_main_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/ui_main_wdgt.py 11c11,14 < from PyQt4 import QtCore, QtGui --- > > from PyQt5 import QtCore, QtGui, QtWidgets > from PyQt5.QtCore import QObject, pyqtSignal, Qt > 17c20 < --- > 18a22,25 > > # http://stackoverflow.com/questions/17578428/pyqt5-signals-and-slots-qobject-has-no-attribute-error ??? > trigger = pyqtSignal(); > 22c29 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) 30c37 < self.centralwidget = QtGui.QWidget(MainWdgt) --- > self.centralwidget = QtWidgets.QWidget(MainWdgt) 33c40 < self.menu_bar = QtGui.QMenuBar(MainWdgt) --- > self.menu_bar = QtWidgets.QMenuBar(MainWdgt) 36c43 < self.menu_Settings = QtGui.QMenu(self.menu_bar) --- > self.menu_Settings = QtWidgets.QMenu(self.menu_bar) 38c45 < self.menu_Help = QtGui.QMenu(self.menu_bar) --- > self.menu_Help = QtWidgets.QMenu(self.menu_bar) 40c47 < self.menuFile = QtGui.QMenu(self.menu_bar) --- > self.menuFile = QtWidgets.QMenu(self.menu_bar) 42c49 < self.menu_Cards = QtGui.QMenu(self.menu_bar) --- > self.menu_Cards = QtWidgets.QMenu(self.menu_bar) 45c52 < self.status_bar = QtGui.QStatusBar(MainWdgt) --- > self.status_bar = QtWidgets.QStatusBar(MainWdgt) 48c55 < self.tool_bar = QtGui.QToolBar(MainWdgt) --- > self.tool_bar = QtWidgets.QToolBar(MainWdgt) 54c61 < self.actionActivateCards = QtGui.QAction(MainWdgt) --- > self.actionActivateCards = QtWidgets.QAction(MainWdgt) 56c63 < self.actionAddCards = QtGui.QAction(MainWdgt) --- > self.actionAddCards = QtWidgets.QAction(MainWdgt) 61c68 < self.actionConfigure = QtGui.QAction(MainWdgt) --- > self.actionConfigure = QtWidgets.QAction(MainWdgt) 66c73 < self.actionDeleteCurrentCard = QtGui.QAction(MainWdgt) --- > self.actionDeleteCurrentCard = QtWidgets.QAction(MainWdgt) 71c78 < self.actionEditCurrentCard = QtGui.QAction(MainWdgt) --- > self.actionEditCurrentCard = QtWidgets.QAction(MainWdgt) 76c83 < self.actionBrowseCards = QtGui.QAction(MainWdgt) --- > self.actionBrowseCards = QtWidgets.QAction(MainWdgt) 81c88 < self.actionExport = QtGui.QAction(MainWdgt) --- > self.actionExport = QtWidgets.QAction(MainWdgt) 83c90 < self.actionFileExit = QtGui.QAction(MainWdgt) --- > self.actionFileExit = QtWidgets.QAction(MainWdgt) 88c95 < self.actionFileNew = QtGui.QAction(MainWdgt) --- > self.actionFileNew = QtWidgets.QAction(MainWdgt) 93c100 < self.actionFileOpen = QtGui.QAction(MainWdgt) --- > self.actionFileOpen = QtWidgets.QAction(MainWdgt) 98c105 < self.actionFileSave = QtGui.QAction(MainWdgt) --- > self.actionFileSave = QtWidgets.QAction(MainWdgt) 103c110 < self.actionFileSaveAs = QtGui.QAction(MainWdgt) --- > self.actionFileSaveAs = QtWidgets.QAction(MainWdgt) 108c115 < self.actionAbout = QtGui.QAction(MainWdgt) --- > self.actionAbout = QtWidgets.QAction(MainWdgt) 110c117 < self.actionImport = QtGui.QAction(MainWdgt) --- > self.actionImport = QtWidgets.QAction(MainWdgt) 112c119 < self.actionGettingStarted = QtGui.QAction(MainWdgt) --- > self.actionGettingStarted = QtWidgets.QAction(MainWdgt) 114c121 < self.actionShowStatistics = QtGui.QAction(MainWdgt) --- > self.actionShowStatistics = QtWidgets.QAction(MainWdgt) 119c126 < self.actionTip = QtGui.QAction(MainWdgt) --- > self.actionTip = QtWidgets.QAction(MainWdgt) 121c128 < self.actionManagePlugins = QtGui.QAction(MainWdgt) --- > self.actionManagePlugins = QtWidgets.QAction(MainWdgt) 123c130 < self.actionManageTypes = QtGui.QAction(MainWdgt) --- > self.actionManageTypes = QtWidgets.QAction(MainWdgt) 125c132 < self.actionSync = QtGui.QAction(MainWdgt) --- > self.actionSync = QtWidgets.QAction(MainWdgt) 127c134 < self.actionCompact = QtGui.QAction(MainWdgt) --- > self.actionCompact = QtWidgets.QAction(MainWdgt) 129c136 < self.actionFindDuplicates = QtGui.QAction(MainWdgt) --- > self.actionFindDuplicates = QtWidgets.QAction(MainWdgt) 169,190c176,205 < QtCore.QObject.connect(self.actionAddCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.add_cards) < QtCore.QObject.connect(self.actionFileNew, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_new) < QtCore.QObject.connect(self.actionFileOpen, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_open) < QtCore.QObject.connect(self.actionFileSave, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_save) < QtCore.QObject.connect(self.actionFileSaveAs, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_save_as) < QtCore.QObject.connect(self.actionFileExit, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.close) < QtCore.QObject.connect(self.actionEditCurrentCard, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.edit_current_card) < QtCore.QObject.connect(self.actionDeleteCurrentCard, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.delete_current_card) < QtCore.QObject.connect(self.actionManagePlugins, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.manage_plugins) < QtCore.QObject.connect(self.actionManageTypes, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.manage_card_types) < QtCore.QObject.connect(self.actionShowStatistics, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_statistics) < QtCore.QObject.connect(self.actionImport, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.import_file) < QtCore.QObject.connect(self.actionExport, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.export_file) < QtCore.QObject.connect(self.actionConfigure, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.configure) < QtCore.QObject.connect(self.actionActivateCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.activate_cards) < QtCore.QObject.connect(self.actionSync, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.sync) < QtCore.QObject.connect(self.actionBrowseCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.browse_cards) < QtCore.QObject.connect(self.actionTip, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_tip) < QtCore.QObject.connect(self.actionGettingStarted, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_getting_started) < QtCore.QObject.connect(self.actionAbout, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_about) < QtCore.QObject.connect(self.actionCompact, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.compact_database) < QtCore.QObject.connect(self.actionFindDuplicates, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.find_duplicates) --- > > # @TODO Qt5 changed the way these 'slot connections' work apparently. > # We're going to have to figure out what this does, and make it do it. > # https://wiki.qt.io/New_Signal_Slot_Syntax > > # QtCore.QObject.connect(self.actionAddCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.add_cards) > self.trigger.connect(self.handle_trigger) > > # QtCore.QObject.connect(self.actionFileNew, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_new) > # QtCore.QObject.connect(self.actionFileOpen, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_open) > # QtCore.QObject.connect(self.actionFileSave, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_save) > # QtCore.QObject.connect(self.actionFileSaveAs, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.file_save_as) > # QtCore.QObject.connect(self.actionFileExit, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.close) > # QtCore.QObject.connect(self.actionEditCurrentCard, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.edit_current_card) > # QtCore.QObject.connect(self.actionDeleteCurrentCard, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.delete_current_card) > # QtCore.QObject.connect(self.actionManagePlugins, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.manage_plugins) > # QtCore.QObject.connect(self.actionManageTypes, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.manage_card_types) > # QtCore.QObject.connect(self.actionShowStatistics, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_statistics) > # QtCore.QObject.connect(self.actionImport, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.import_file) > # QtCore.QObject.connect(self.actionExport, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.export_file) > # QtCore.QObject.connect(self.actionConfigure, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.configure) > # QtCore.QObject.connect(self.actionActivateCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.activate_cards) > # QtCore.QObject.connect(self.actionSync, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.sync) > # QtCore.QObject.connect(self.actionBrowseCards, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.browse_cards) > # QtCore.QObject.connect(self.actionTip, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_tip) > # QtCore.QObject.connect(self.actionGettingStarted, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_getting_started) > # QtCore.QObject.connect(self.actionAbout, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.show_about) > # QtCore.QObject.connect(self.actionCompact, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.compact_database) > # QtCore.QObject.connect(self.actionFindDuplicates, QtCore.SIGNAL(_fromUtf8("triggered()")), MainWdgt.find_duplicates) > 192a208,210 > def handle_trigger(self): > print "triggered()" > diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_manage_card_types_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_manage_card_types_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_manage_plugins_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_manage_plugins_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_preview_cards_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_preview_cards_dlg.py 13c13 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 43c43 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) 60c60 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) 79c79 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) 103c103 < from PyQt4 import QtWebKit --- > from PyQt5 import QtWebKit diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_remove_tags_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_remove_tags_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 39c39 < spacerItem = QtGui.QSpacerItem(101, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(101, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_rename_card_type_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_rename_card_type_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 38c38 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_rename_tag_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_rename_tag_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 38c38 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_review_wdgt.py mnemosyne-next/mnemosyne/pyqt_ui/ui_review_wdgt.py 13c13 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 37c37 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) 54c54 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) 124c124 < from PyQt4 import QtWebKit --- > from PyQt5 import QtWebKit diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_statistics_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_statistics_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 31c31 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_sync_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_sync_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 72c72 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) diff -r mnemosyne-2.2.1/mnemosyne/pyqt_ui/ui_tip_dlg.py mnemosyne-next/mnemosyne/pyqt_ui/ui_tip_dlg.py 11c11 < from PyQt4 import QtCore, QtGui --- > from PyQt5 import QtCore, QtGui 30c30 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed) 43c43 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Minimum) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum) 52c52 < sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding) --- > sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) 76c76 < spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) --- > spacerItem = QtGui.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) Only in mnemosyne-next/mnemosyne: version.pyc diff -r mnemosyne-2.2.1/Mnemosyne.egg-info/SOURCES.txt mnemosyne-next/Mnemosyne.egg-info/SOURCES.txt 4a5 > setup.cfg diff -r mnemosyne-2.2.1/README mnemosyne-next/README 8c8 < -PyQt 4.5 or later --- > -PyQt 5.0 or later 20,22c20,22 < python-qt4-dev python-sip python-sip-dev pyqt4-dev-tools qt4-designer < libqt4-sql python-qt4-sql libqt4-sql-sqlite python-matplotlib < python-qt4-phonon python-sphinx --- > python-qt5-dev python-sip python-sip-dev pyqt5-dev-tools qt5-designer > libqt5-sql python-qt5-sql libqt5-sql-sqlite python-matplotlib > python-qt5-phonon python-sphinx 49c49 < -sudo port install bzr python27 qt4-mac py27-pyqt4 py27-sip py27-matplotlib py27-virtualenv py27-distribute py-cherrypy3 python_select py-virtualenvwrapper --- > -sudo port install bzr python27 qt5-mac py27-pyqt5 py27-sip py27-matplotlib py27-virtualenv py27-distribute py-cherrypy3 python_select py-virtualenvwrapper diff -r mnemosyne-2.2.1/setup.py mnemosyne-next/setup.py 146c146 < data_files.append((os.path.join("share", "qt4", "translations"), --- > data_files.append((os.path.join("share", "qt5", "translations"), 226c226 < "includes": ["numpy", "sip", "xml.sax", "xml.etree", "PyQt4.QtNetwork"], --- > "includes": ["numpy", "sip", "xml.sax", "xml.etree", "PyQt5.QtNetwork"],