diff options
Diffstat (limited to 'nephilim/settings_wg.py')
| -rw-r--r-- | nephilim/settings_wg.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py index 2d32ea8..85a046e 100644 --- a/nephilim/settings_wg.py +++ b/nephilim/settings_wg.py @@ -17,7 +17,6 @@ # from PyQt4 import QtGui, QtCore -from PyQt4.QtCore import QVariant import os from common import Button @@ -48,12 +47,12 @@ class SettingsWidget(QtGui.QWidget): self.mpclient = mpclient self.settings.beginGroup('MPD') - self.host_txt = QtGui.QLineEdit(self.settings.value('host', QVariant('localhost')).toString()) - self.port_txt = QtGui.QLineEdit(self.settings.value('port', QVariant('6600')).toString()) + self.host_txt = QtGui.QLineEdit(self.settings.value('host', 'localhost')) + self.port_txt = QtGui.QLineEdit(self.settings.value('port', '6600')) self.port_txt.setValidator(QtGui.QIntValidator(0, 65535, self)) - self.pass_txt = QtGui.QLineEdit(self.settings.value('password').toString()) + self.pass_txt = QtGui.QLineEdit(self.settings.value('password')) self.pass_txt.setEchoMode(QtGui.QLineEdit.Password) - self.lib_txt = QtGui.QLineEdit(self.settings.value('music_dir', QVariant(os.path.expanduser('~/music/'))).toString()) + self.lib_txt = QtGui.QLineEdit(self.settings.value('music_dir', os.path.expanduser('~/music/'))) self.settings.endGroup() self.update = QtGui.QPushButton('Update MPD database') @@ -89,17 +88,17 @@ class SettingsWidget(QtGui.QWidget): reconnect = False self.settings.beginGroup('MPD') - if self.host_txt.text() != self.settings.value('host').toString(): - self.settings.setValue('host', QVariant(self.host_txt.text())) + if self.host_txt.text() != self.settings.value('host'): + self.settings.setValue('host', self.host_txt.text()) reconnect = True - if self.port_txt.text() != self.settings.value('port').toString(): - self.settings.setValue('port', QVariant(self.port_txt.text())) + if self.port_txt.text() != self.settings.value('port'): + self.settings.setValue('port', self.port_txt.text()) reconnect = True - if self.pass_txt.text() != self.settings.value('password').toString(): - self.settings.setValue('password', QVariant(self.pass_txt.text())) + if self.pass_txt.text() != self.settings.value('password'): + self.settings.setValue('password', self.pass_txt.text()) if self.pass_txt.text(): self.mpclient.password(self.pass_txt.text()) - self.settings.setValue('music_dir', QVariant(self.lib_txt.text())) + self.settings.setValue('music_dir', self.lib_txt.text()) self.settings.endGroup() if reconnect: @@ -169,7 +168,7 @@ class SettingsWidget(QtGui.QWidget): self.close() def plugin_checked(self, item): - toload = (item.checkState() == QtCore.Qt.Checked) + toload = int(item.checkState() == QtCore.Qt.Checked) name = str(item.text()[0:str(item.text()).find('\t')]) if toload: # refresh the plugin file @@ -177,7 +176,7 @@ class SettingsWidget(QtGui.QWidget): self.fill_pluginlist() else: self.plugins.unload(name) - self.settings.setValue(name + '/load', QtCore.QVariant(toload)) + self.settings.setValue(name + '/load', toload) def closeEvent(self, event): self.hide() |