From c7cf905f6e7d6b768d9f520573dcd476ce17298c Mon Sep 17 00:00:00 2001 From: Wieland Hoffmann Date: Tue, 6 Jun 2017 20:15:45 +0200 Subject: [PATCH 1/2] PICARD-1105: Use QItemSelectionModel from QtCore It has been moved there from QtWidgets --- picard/ui/edittagdialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picard/ui/edittagdialog.py b/picard/ui/edittagdialog.py index f0cdf0b50..c511860bc 100644 --- a/picard/ui/edittagdialog.py +++ b/picard/ui/edittagdialog.py @@ -124,7 +124,7 @@ class EditTagDialog(PicardDialog): self.ui.add_value.setEnabled(not self.different) self._add_value_items(values) - self.value_list.setCurrentItem(self.value_list.item(0), QtWidgets.QItemSelectionModel.SelectCurrent) + self.value_list.setCurrentItem(self.value_list.item(0), QtCore.QItemSelectionModel.SelectCurrent) tag_names.editTextChanged.connect(self.tag_changed) def _add_value_items(self, values): From 6c0f18b04d2d57fe2c4d02fe96310aeb902b07df Mon Sep 17 00:00:00 2001 From: Wieland Hoffmann Date: Wed, 7 Jun 2017 19:41:08 +0200 Subject: [PATCH 2/2] PICARD-1106: Discard the second return value of QFileDialog.getOpenFileNames getOpenFileNames was previously called getOpenFileNamesAndFilter (see [0]) and returns a tuple (filenames, filter). Since we're not interested in the filter, discard it. This is similar to other fixes already done for QFileDialogs in mainwindow.py and fingerprinting.py. [0] http://pyqt.sourceforge.net/Docs/PyQt5/pyqt4_differences.html#qfiledialog --- picard/ui/options/plugins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py index 307eb852d..8aae3bc55 100644 --- a/picard/ui/options/plugins.py +++ b/picard/ui/options/plugins.py @@ -306,7 +306,7 @@ class PluginsOptionsPage(OptionsPage): self.ui.details.setText("

%s

" % "
\n".join(text)) def open_plugins(self): - files = QtWidgets.QFileDialog.getOpenFileNames( + files, _filter = QtWidgets.QFileDialog.getOpenFileNames( self, "", QtCore.QDir.homePath(),