Using toInt of QVariant for sure is better than a chain of toString, str and int. Thanks to superfly.

This commit is contained in:
Mattias Põldaru 2011-12-13 23:04:16 +02:00
parent 1665c557c1
commit 13385116af

View File

@ -659,15 +659,12 @@ class SongImportForm(OpenLPWizard):
self.restart() self.restart()
self.finishButton.setVisible(False) self.finishButton.setVisible(False)
self.cancelButton.setVisible(True) self.cancelButton.setVisible(True)
try: last_import_type = QtCore.QSettings().value(
last_import_type = int(QtCore.QSettings().value( u'songs/last import type').toInt()[0]
u'songs/last import type').toString()) if last_import_type < 0 or \
if last_import_type >= self.formatComboBox.count() or \ last_import_type >= self.formatComboBox.count():
last_import_type < 0: last_import_type = 0
last_import_type = 0 self.formatComboBox.setCurrentIndex(last_import_type)
self.formatComboBox.setCurrentIndex(last_import_type)
except ValueError:
self.formatComboBox.setCurrentIndex(0)
self.openLP2FilenameEdit.setText(u'') self.openLP2FilenameEdit.setText(u'')
self.openLP1FilenameEdit.setText(u'') self.openLP1FilenameEdit.setText(u'')
self.openLyricsFileListWidget.clear() self.openLyricsFileListWidget.clear()