OpenLP

Merge lp:~sam92/openlp/bugs into lp:openlp

  1. bugs
  2. Merge into trunk
Proposed by Samuel Mehrbrodt
Status: Merged
Merged at revision: 2592
Proposed branch: lp:~sam92/openlp/bugs
Merge into: lp:openlp
Diff against target: 80 lines (+21/-1)
5 files modified
openlp/plugins/bibles/lib/mediaitem.py (+1/-0)
openlp/plugins/custom/lib/mediaitem.py (+1/-0)
openlp/plugins/songs/forms/editsongform.py (+3/-1)
openlp/plugins/songs/lib/mediaitem.py (+1/-0)
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py (+15/-0)
To merge this branch: bzr merge lp:~sam92/openlp/bugs
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Tomas Groth Approve
Review via email: mp+281688@code.launchpad.net

Description of the change

Usability improvements

* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
2--- openlp/plugins/bibles/lib/mediaitem.py 2015-12-31 22:46:06 +0000
3+++ openlp/plugins/bibles/lib/mediaitem.py 2016-01-05 19:20:42 +0000
4@@ -254,6 +254,7 @@
5 def on_focus(self):
6 if self.quickTab.isVisible():
7 self.quick_search_edit.setFocus()
8+ self.quick_search_edit.selectAll()
9 else:
10 self.advanced_book_combo_box.setFocus()
11
12
13=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
14--- openlp/plugins/custom/lib/mediaitem.py 2015-12-31 22:46:06 +0000
15+++ openlp/plugins/custom/lib/mediaitem.py 2016-01-05 19:20:42 +0000
16@@ -208,6 +208,7 @@
17 Set the focus
18 """
19 self.search_text_edit.setFocus()
20+ self.search_text_edit.selectAll()
21
22 def generate_slide_data(self, service_item, item=None, xml_version=False,
23 remote=False, context=ServiceItemContext.Service):
24
25=== modified file 'openlp/plugins/songs/forms/editsongform.py'
26--- openlp/plugins/songs/forms/editsongform.py 2015-12-31 22:46:06 +0000
27+++ openlp/plugins/songs/forms/editsongform.py 2016-01-05 19:20:42 +0000
28@@ -76,7 +76,7 @@
29 self.verse_edit_all_button.clicked.connect(self.on_verse_edit_all_button_clicked)
30 self.verse_delete_button.clicked.connect(self.on_verse_delete_button_clicked)
31 self.verse_list_widget.itemClicked.connect(self.on_verse_list_view_clicked)
32- self.verse_order_edit.textChanged.connect(self.on_verse_order_text_changed)
33+ self.verse_order_edit.textEdited.connect(self.on_verse_order_text_changed)
34 self.theme_add_button.clicked.connect(self.theme_manager.on_add_theme)
35 self.maintenance_button.clicked.connect(self.on_maintenance_button_clicked)
36 self.from_file_button.clicked.connect(self.on_audio_add_from_file_button_clicked)
37@@ -803,6 +803,8 @@
38
39 :param text: The text of the verse order edit (ignored).
40 """
41+ # First make sure that all letters entered in the verse order field are uppercase
42+ self.verse_order_edit.setText(text.upper())
43 # Extract all verses which were used in the order.
44 verses_in_order = self._extract_verse_order(self.verse_order_edit.text())
45 # Find the verses which were not used in the order.
46
47=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
48--- openlp/plugins/songs/lib/mediaitem.py 2015-12-31 22:46:06 +0000
49+++ openlp/plugins/songs/lib/mediaitem.py 2016-01-05 19:20:42 +0000
50@@ -112,6 +112,7 @@
51
52 def on_focus(self):
53 self.search_text_edit.setFocus()
54+ self.search_text_edit.selectAll()
55
56 def config_update(self):
57 """
58
59=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py'
60--- tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py 2015-12-31 22:46:06 +0000
61+++ tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py 2016-01-05 19:20:42 +0000
62@@ -142,3 +142,18 @@
63 'CCLI label should not be "{}"'.format(UiStrings().CCLINumberLabel))
64 self.assertEquals(form.ccli_label.text(), UiStrings().CCLISongNumberLabel,
65 'CCLI label text should be "{}"'.format(UiStrings().CCLISongNumberLabel))
66+
67+ def verse_order_lowercase_test(self):
68+ """
69+ Test that entering a verse order in lowercase automatically converts to uppercase
70+ """
71+ # GIVEN; Mocked methods
72+ form = self.form
73+
74+ # WHEN: We enter a verse order in lowercase
75+ form.verse_order_edit.setText('v1 v2 c1 v3 c1 v4 c1')
76+ # Need to manually trigger this method as it is only triggered by manual input
77+ form.on_verse_order_text_changed(form.verse_order_edit.text())
78+
79+ # THEN: The verse order should be converted to uppercase
80+ self.assertEqual(form.verse_order_edit.text(), 'V1 V2 C1 V3 C1 V4 C1')