raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "Discard" and "Reset" button calls, pep8

Browse Source
This commit is contained in:
Ken Roberts 2014-11-07 14:44:40 -08:00
parent c89b54e4a4
commit f2cd0a9743
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
openlp/core/ui/projector/sourceselectform.py
View File

@ -152,16 +152,15 @@ def set_button_tooltip(bar):
""" """
for button in bar.buttons(): for button in bar.buttons():
if bar.standardButton(button) == QDialogButtonBox.Cancel: if bar.standardButton(button) == QDialogButtonBox.Cancel:
tip = "Ignoring current changes and return to OpenLP" button.setToolTip("Ignoring current changes and return to OpenLP")
elif bar.standardButton(button) == QDialogButtonBox.Reset: elif bar.standardButton(button) == QDialogButtonBox.Reset:
tip = "Delete all user-defined text and revert to PJLink default text" button.setToolTip("Delete all user-defined text and revert to PJLink default text")
elif bar.standardButton(button) == QDialogButtonBox.Discard: elif bar.standardButton(button) == QDialogButtonBox.Discard:
tip = "Discard changes and reset to previous user-defined text" button.setToolTip("Discard changes and reset to previous user-defined text")
elif bar.standardButton(button) == QDialogButtonBox.Ok: elif bar.standardButton(button) == QDialogButtonBox.Ok:
tip = "Save changes and return to OpenLP" button.setToolTip("Save changes and return to OpenLP")
else: else:
tip = "" log.debug('No tooltip for button {}'.format(button.text()))
button.setToolTip(tip)
class FingerTabBarWidget(QTabBar): class FingerTabBarWidget(QTabBar):
@ -286,6 +285,10 @@ class SourceSelectTabs(QDialog):
thistab = self.tabwidget.addTab(tab, PJLINK_DEFAULT_SOURCES[key]) thistab = self.tabwidget.addTab(tab, PJLINK_DEFAULT_SOURCES[key])
if buttonchecked: if buttonchecked:
self.tabwidget.setCurrentIndex(thistab) self.tabwidget.setCurrentIndex(thistab)
self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
QtGui.QDialogButtonBox.Discard |
QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Cancel)
else: else:
for key in keys: for key in keys:
(tab, button_count, buttonchecked) = Build_Tab(group=self.button_group, (tab, button_count, buttonchecked) = Build_Tab(group=self.button_group,
@ -297,10 +300,8 @@ class SourceSelectTabs(QDialog):
thistab = self.tabwidget.addTab(tab, PJLINK_DEFAULT_SOURCES[key]) thistab = self.tabwidget.addTab(tab, PJLINK_DEFAULT_SOURCES[key])
if buttonchecked: if buttonchecked:
self.tabwidget.setCurrentIndex(thistab) self.tabwidget.setCurrentIndex(thistab)
self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset | self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Discard | QtGui.QDialogButtonBox.Cancel)
QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Cancel)
self.button_box.clicked.connect(self.button_clicked) self.button_box.clicked.connect(self.button_clicked)
self.layout.addWidget(self.button_box) self.layout.addWidget(self.button_box)
set_button_tooltip(self.button_box) set_button_tooltip(self.button_box)
@ -321,9 +322,9 @@ class SourceSelectTabs(QDialog):
if self.button_box.standardButton(button) == self.button_box.Cancel: if self.button_box.standardButton(button) == self.button_box.Cancel:
self.done(0) self.done(0)
elif self.button_box.standardButton(button) == self.button_box.Reset: elif self.button_box.standardButton(button) == self.button_box.Reset:
self.delete_sources()
elif self.button_box.standardButton(button) == self.button_box.Discard:
self.done(100) self.done(100)
elif self.button_box.standardButton(button) == self.button_box.Discard:
self.delete_sources()
elif self.button_box.standardButton(button) == self.button_box.Ok: elif self.button_box.standardButton(button) == self.button_box.Ok:
return self.accept_me() return self.accept_me()
else: else:
@ -418,6 +419,10 @@ class SourceSelectSingle(QDialog):
item.setText(source_item.text) item.setText(source_item.text)
self.layout.addRow(PJLINK_DEFAULT_CODES[key], item) self.layout.addRow(PJLINK_DEFAULT_CODES[key], item)
self.button_group.append(item) self.button_group.append(item)
self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset |
QtGui.QDialogButtonBox.Discard |
QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Cancel)
else: else:
for key in keys: for key in keys:
source_text = self.projectordb.get_source_by_code(code=key, projector_id=self.projector.db_item.id) source_text = self.projectordb.get_source_by_code(code=key, projector_id=self.projector.db_item.id)
@ -427,10 +432,8 @@ class SourceSelectSingle(QDialog):
self.layout.addWidget(button) self.layout.addWidget(button)
self.button_group.addButton(button, int(key)) self.button_group.addButton(button, int(key))
button_list.append(key) button_list.append(key)
self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Reset | self.button_box = QDialogButtonBox(QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Discard | QtGui.QDialogButtonBox.Cancel)
QtGui.QDialogButtonBox.Ok |
QtGui.QDialogButtonBox.Cancel)
self.button_box.clicked.connect(self.button_clicked) self.button_box.clicked.connect(self.button_clicked)
self.layout.addWidget(self.button_box) self.layout.addWidget(self.button_box)
self.setMinimumHeight(key_count*25) self.setMinimumHeight(key_count*25)
@ -452,9 +455,9 @@ class SourceSelectSingle(QDialog):
if self.button_box.standardButton(button) == self.button_box.Cancel: if self.button_box.standardButton(button) == self.button_box.Cancel:
self.done(0) self.done(0)
elif self.button_box.standardButton(button) == self.button_box.Reset: elif self.button_box.standardButton(button) == self.button_box.Reset:
self.delete_sources()
elif self.button_box.standardButton(button) == self.button_box.Discard:
self.done(100) self.done(100)
elif self.button_box.standardButton(button) == self.button_box.Discard:
self.delete_sources()
elif self.button_box.standardButton(button) == self.button_box.Ok: elif self.button_box.standardButton(button) == self.button_box.Ok:
return self.accept_me() return self.accept_me()
else: else:

2
tests/interfaces/openlp_core_ui/test_projectorsourceform.py
View File

@ -42,6 +42,7 @@ from openlp.core.lib.projector.constants import PJLINK_DEFAULT_CODES, PJLINK_DEF
from openlp.core.ui.projector.sourceselectform import source_group from openlp.core.ui.projector.sourceselectform import source_group
def build_source_dict(): def build_source_dict():
""" """
Builds a source dictionary to verify source_group returns a valid dictionary of dictionary items Builds a source dictionary to verify source_group returns a valid dictionary of dictionary items
@ -55,6 +56,7 @@ def build_source_dict():
test_group[key[0]][key] = PJLINK_DEFAULT_CODES[key] test_group[key[0]][key] = PJLINK_DEFAULT_CODES[key]
return test_group return test_group
class ProjectorSourceFormTest(TestCase, TestMixin): class ProjectorSourceFormTest(TestCase, TestMixin):
""" """
Test class for the Projector Source Select form module Test class for the Projector Source Select form module