Converted dupeguru to the new automated QVariant conversion protocol introduced in PyQt (which is the default protocol when running under python 3).

This commit is contained in:
Virgil Dupras 2012-03-16 14:07:29 -04:00
parent 04a547656e
commit d0bfa2a6ca
2 changed files with 2 additions and 5 deletions

View File

@ -52,11 +52,10 @@ class ResultsModel(Table):
def _setData(self, row, column, value, role): def _setData(self, row, column, value, role):
if role == Qt.CheckStateRole: if role == Qt.CheckStateRole:
if column.name == 'name': if column.name == 'name':
self.model.app.mark_dupe(row._dupe, value.toBool()) self.model.app.mark_dupe(row._dupe, bool(value))
return True return True
elif role == Qt.EditRole: elif role == Qt.EditRole:
if column.name == 'name': if column.name == 'name':
value = value.toString()
return self.model.rename_selected(value) return self.model.rename_selected(value)
return False return False

View File

@ -7,8 +7,6 @@
import sys import sys
import os.path as op import os.path as op
import sip
sip.setapi('QVariant', 1)
from PyQt4.QtCore import QCoreApplication, QSettings from PyQt4.QtCore import QCoreApplication, QSettings
from PyQt4.QtGui import QApplication, QIcon, QPixmap from PyQt4.QtGui import QApplication, QIcon, QPixmap
@ -29,7 +27,7 @@ if __name__ == "__main__":
QCoreApplication.setApplicationName(__appname__) QCoreApplication.setApplicationName(__appname__)
QCoreApplication.setApplicationVersion(__version__) QCoreApplication.setApplicationVersion(__version__)
settings = QSettings() settings = QSettings()
lang = settings.value('Language').toString() lang = settings.value('Language')
locale_folder = op.join(BASE_PATH, 'locale') locale_folder = op.join(BASE_PATH, 'locale')
install_gettext_trans_under_qt(locale_folder, lang) install_gettext_trans_under_qt(locale_folder, lang)
# Many strings are translated at import time, so this is why we only import after the translator # Many strings are translated at import time, so this is why we only import after the translator