From 56c36f355d7c737bc0774fca062335e59e7356c6 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Thu, 17 May 2012 18:35:58 +0200 Subject: [PATCH] More clean ups and fixes --- openlp/core/lib/__init__.py | 1 + openlp/core/lib/searchedit.py | 2 +- openlp/core/lib/settingsmanager.py | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 695825e56..e359b0047 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -82,6 +82,7 @@ class Settings(QtCore.QSettings): return setting.toStringList() if isinstance(defaultValue, QtCore.QPoint): return setting.toPoint() + # TODO: add print u'No!', type(defaultValue) return setting diff --git a/openlp/core/lib/searchedit.py b/openlp/core/lib/searchedit.py index a885e1ecd..22d628dbb 100644 --- a/openlp/core/lib/searchedit.py +++ b/openlp/core/lib/searchedit.py @@ -185,7 +185,7 @@ class SearchEdit(QtGui.QLineEdit): A :class:`~PyQt4.QtCore.QString` instance which represents the text in the line edit. """ - self.clearButton.setVisible(not text.isEmpty()) + self.clearButton.setVisible(bool(text)) def _onClearButtonClicked(self): """ diff --git a/openlp/core/lib/settingsmanager.py b/openlp/core/lib/settingsmanager.py index 1c1aef4db..475458f2c 100644 --- a/openlp/core/lib/settingsmanager.py +++ b/openlp/core/lib/settingsmanager.py @@ -98,7 +98,6 @@ class SettingsManager(object): """ settings = Settings() settings.beginGroup(section) - #TODO: check if [0] is needed. old_count = settings.value(u'%s count' % name, 0) new_count = len(list) settings.setValue(u'%s count' % name, new_count) @@ -127,8 +126,7 @@ class SettingsManager(object): list = [] if list_count: for counter in range(list_count): - # TODO: Check - item = settings.value(u'%s %d' % (name, counter)) + item = settings.value(u'%s %d' % (name, counter), u'') if item: list.append(item) settings.endGroup()