[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325102 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Review: Approve Approved -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325102 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Review: Approve Nicely done Olli! -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325102 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Azaziah has proposed merging
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Tim Bentley (trb143)
Related bugs:
Bug #1639860 in OpenLP: "Close button is disabled in numerous windows"
https://bugs.launchpad.net/openlp/+bug/1639860
Bug #1652559 in OpenLP: "Find duplicates wizard does not reset cursor if
closed from "x" instead of "cancel" button and causes traceback on exit"
https://bugs.launchpad.net/openlp/+bug/1652559
Bug #1666272 in OpenLP: "Linked audio "next" button results in traceback"
https://bugs.launchpad.net/openlp/+bug/1666272
Bug #1678292 in OpenLP: "Space after Bible book name auto-completion is
missing"
https://bugs.launchpad.net/openlp/+bug/1678292
Bug #1694732 in OpenLP: "wizard sub title does not wrap"
https://bugs.launchpad.net/openlp/+bug/1694732
Bug #1695268 in OpenLP: "Bibles plugin fails to load due to invalid "last
search type" value"
https://bugs.launchpad.net/openlp/+bug/1695268
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325102
Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x"
instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot after number, the reference search
does not work.
Improvements
- Increased song maintanance window size.
- Removed "?" from all Wizard windows.
Add this to your merge proposal:
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2765)
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/2075/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1985/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1901/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1279/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1129/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/258/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/104/
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-03-15 19:51:10 +
+++ openlp/core/common/settings.py 2017-06-05 19:21:48 +
@@ -219,7 +219,11 @@
('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('shortcuts/onlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('bibles/advanced bible', '', []), # Common bible search widgets combined in 2.6
-('bibles/quick bible', 'bibles/primary bible', []) # Common bible search widgets combined in 2.6
+('bibles/quick bible', 'bibles/primary bible', []), # Common bible search widgets combined in 2.6
+# Last search type was renamed to last used search type in 2.6 since Bible search value type changed in 2.6.
+('songs/last search type', 'songs/last used search type', []),
+('bibles/last search type', '', []),
+('custom/last search type', 'custom/last used search type', [])
]
@staticmethod
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/searchedit.py 2017-06-05 19:21:48 +
@@ -105,7 +105,7 @@
self.setPlaceholderText(action.placeholder_text)
self.menu_button.setDefaultAction(action)
self._current_search_type = identifier
-Settings().setValue('{section}/last search type'.format(section=self.settings_section), identifier)
+Settings().setValue('{section}/last used search type'.format(section=self.settings_section), identifier)
self.searchTypeChanged.emit(identifier)
return True
@@ -141,7 +141,7 @@
self.menu_button.resize(QtCore.QSize(28, 18))
self.menu_button.setMenu(menu)
self.set_current_search_type(
-Settings().value('{section}/last search type'.format(section=self.settings_section)))
+Settings().value('{section}/last used search type'.format(section=self.settings_section)))
self.menu_button.show()
self._update_style_sheet()
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/ui.py 2017-06-05 19:21:48 +
@@ -49,6 +49,7 @@
parent.title_label = QtWidgets.QLabel(parent.welcome_page)
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325101 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
> Please rerun CI with new test and resubmit. > > Thanks I did re-run it, just forgot to copy-paste the new results. I've updated them to the description. Sorry for the delay. -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325101 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Description changed to: Fixed bugs: Bug #1639860: Close button is disabled in numerous windows Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit Bug #1666272: Linked audio "next" button results in traceback Bug #1678292: Space after Bible book name auto-completion is missing Bug #1694732: wizard sub title does not wrap Bug #1695268: Bibles plugin fails to load due to invalid "last search type" Bug: If Bible book name contains dot after number, the reference search does not work. Improvements - Increased song maintanance window size. - Removed "?" from all Wizard windows. Add this to your merge proposal: lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2765) [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/2075/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1985/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1901/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1279/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1129/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/258/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/104/ For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325101 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Review: Needs Fixing Please rerun CI with new test and resubmit. Thanks -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325101 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Azaziah has proposed merging
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Tim Bentley (trb143)
Related bugs:
Bug #1639860 in OpenLP: "Close button is disabled in numerous windows"
https://bugs.launchpad.net/openlp/+bug/1639860
Bug #1652559 in OpenLP: "Find duplicates wizard does not reset cursor if
closed from "x" instead of "cancel" button and causes traceback on exit"
https://bugs.launchpad.net/openlp/+bug/1652559
Bug #1666272 in OpenLP: "Linked audio "next" button results in traceback"
https://bugs.launchpad.net/openlp/+bug/1666272
Bug #1678292 in OpenLP: "Space after Bible book name auto-completion is
missing"
https://bugs.launchpad.net/openlp/+bug/1678292
Bug #1694732 in OpenLP: "wizard sub title does not wrap"
https://bugs.launchpad.net/openlp/+bug/1694732
Bug #1695268 in OpenLP: "Bibles plugin fails to load due to invalid "last
search type" value"
https://bugs.launchpad.net/openlp/+bug/1695268
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325101
Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x"
instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot after number, the reference search
does not work.
Improvements
- Increased song maintanance window size.
- Removed "?" from all Wizard windows.
Add this to your merge proposal:
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2762)
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/2071/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1981/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1898/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1277/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1127/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/256/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/102/
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-03-15 19:51:10 +
+++ openlp/core/common/settings.py 2017-06-05 18:42:50 +
@@ -219,7 +219,11 @@
('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('shortcuts/onlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('bibles/advanced bible', '', []), # Common bible search widgets combined in 2.6
-('bibles/quick bible', 'bibles/primary bible', []) # Common bible search widgets combined in 2.6
+('bibles/quick bible', 'bibles/primary bible', []), # Common bible search widgets combined in 2.6
+# Last search type was renamed to last used search type in 2.6 since Bible search value type changed in 2.6.
+('songs/last search type', 'songs/last used search type', []),
+('bibles/last search type', '', []),
+('custom/last search type', 'custom/last used search type', [])
]
@staticmethod
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/searchedit.py 2017-06-05 18:42:50 +
@@ -105,7 +105,7 @@
self.setPlaceholderText(action.placeholder_text)
self.menu_button.setDefaultAction(action)
self._current_search_type = identifier
-Settings().setValue('{section}/last search type'.format(section=self.settings_section), identifier)
+Settings().setValue('{section}/last used search type'.format(section=self.settings_section), identifier)
self.searchTypeChanged.emit(identifier)
return True
@@ -141,7 +141,7 @@
self.menu_button.resize(QtCore.QSize(28, 18))
self.menu_button.setMenu(menu)
self.set_current_search_type(
-Settings().value('{section}/last search type'.format(section=self.settings_section)))
+Settings().value('{section}/last used search type'.format(section=self.settings_section)))
self.menu_button.show()
self._update_style_sheet()
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/ui.py 2017-06-05 18:42:50 +
@@ -49,6 +49,7 @@
parent.title_label = QtWidgets.QLabel(parent.welcome_page)
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325053 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Review: Needs Fixing This needs checking on MAC as from memory there were issues with dialog closing and mac os. This is goin back a number of years in the 2.0 dev period. I have tried to find the changs nut no luck. -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325053 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
I'll test it out on my Mac. -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325053 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Review: Needs Fixing Just some minor things. Also, I really would prefer to see 1 new test, not just updates to tests. Diff comments: > > === modified file 'openlp/plugins/bibles/lib/mediaitem.py' > --- openlp/plugins/bibles/lib/mediaitem.py2017-05-07 18:39:17 + > +++ openlp/plugins/bibles/lib/mediaitem.py2017-06-05 03:11:16 + > @@ -414,7 +414,7 @@ > if self.bible: > book_data = self.get_common_books(self.bible, > self.second_bible) > language_selection = > self.plugin.manager.get_language_selection(self.bible.name) > -books = [book.get_name(language_selection) for book in > book_data] > +books = [book.get_name(language_selection) + ' ' for book in > book_data] Someone is probably going to come and delete this again, so maybe just put a comment above this line explaining why there's a space here? > books.sort(key=get_locale_key) > set_case_insensitive_completer(books, self.search_edit) > > > === modified file 'openlp/plugins/songs/forms/duplicatesongremovalform.py' > --- openlp/plugins/songs/forms/duplicatesongremovalform.py2016-12-31 > 11:01:36 + > +++ openlp/plugins/songs/forms/duplicatesongremovalform.py2017-06-05 > 03:11:16 + > @@ -82,6 +82,9 @@ > self.finish_button.clicked.connect(self.on_wizard_exit) > self.cancel_button.clicked.connect(self.on_wizard_exit) > > +def closeEvent(self, event): > +self.on_wizard_exit() Indented too far > + > def add_custom_pages(self): > """ > Add song wizard specific pages. -- https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325053 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Azaziah has proposed merging
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1639860 in OpenLP: "Close button is disabled in numerous windows"
https://bugs.launchpad.net/openlp/+bug/1639860
Bug #1652559 in OpenLP: "Find duplicates wizard does not reset cursor if
closed from "x" instead of "cancel" button and causes traceback on exit"
https://bugs.launchpad.net/openlp/+bug/1652559
Bug #1666272 in OpenLP: "Linked audio "next" button results in traceback"
https://bugs.launchpad.net/openlp/+bug/1666272
Bug #1678292 in OpenLP: "Space after Bible book name auto-completion is
missing"
https://bugs.launchpad.net/openlp/+bug/1678292
Bug #1694732 in OpenLP: "wizard sub title does not wrap"
https://bugs.launchpad.net/openlp/+bug/1694732
Bug #1695268 in OpenLP: "Bibles plugin fails to load due to invalid "last
search type" value"
https://bugs.launchpad.net/openlp/+bug/1695268
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325053
Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x"
instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot after number, the reference search
does not work.
Improvements
- Increased song maintanance window size.
- Removed "?" from all Wizard windows.
Add this to your merge proposal:
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2762)
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/2071/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1981/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1898/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1277/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1127/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/256/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/102/
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-03-15 19:51:10 +
+++ openlp/core/common/settings.py 2017-06-05 03:11:16 +
@@ -219,7 +219,11 @@
('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('shortcuts/onlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('bibles/advanced bible', '', []), # Common bible search widgets combined in 2.6
-('bibles/quick bible', 'bibles/primary bible', []) # Common bible search widgets combined in 2.6
+('bibles/quick bible', 'bibles/primary bible', []), # Common bible search widgets combined in 2.6
+# Last search type was renamed to last used search type in 2.6 since Bible search value type changed in 2.6.
+('songs/last search type', 'songs/last used search type', []),
+('bibles/last search type', 'bibles/last used search type', []),
+('custom/last search type', 'custom/last used search type', [])
]
@staticmethod
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/searchedit.py 2017-06-05 03:11:16 +
@@ -105,7 +105,7 @@
self.setPlaceholderText(action.placeholder_text)
self.menu_button.setDefaultAction(action)
self._current_search_type = identifier
-Settings().setValue('{section}/last search type'.format(section=self.settings_section), identifier)
+Settings().setValue('{section}/last used search type'.format(section=self.settings_section), identifier)
self.searchTypeChanged.emit(identifier)
return True
@@ -141,7 +141,7 @@
self.menu_button.resize(QtCore.QSize(28, 18))
self.menu_button.setMenu(menu)
self.set_current_search_type(
-Settings().value('{section}/last search type'.format(section=self.settings_section)))
+Settings().value('{section}/last used search type'.format(section=self.settings_section)))
self.menu_button.show()
self._update_style_sheet()
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/ui.py 2017-06-05 03:11:16 +
@@ -49,6 +49,7 @@
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325049 -- Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
Azaziah has proposed merging
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1639860 in OpenLP: "Close button is disabled in numerous windows"
https://bugs.launchpad.net/openlp/+bug/1639860
Bug #1652559 in OpenLP: "Find duplicates wizard does not reset cursor if
closed from "x" instead of "cancel" button and causes traceback on exit"
https://bugs.launchpad.net/openlp/+bug/1652559
Bug #1666272 in OpenLP: "Linked audio "next" button results in traceback"
https://bugs.launchpad.net/openlp/+bug/1666272
Bug #1678292 in OpenLP: "Space after Bible book name auto-completion is
missing"
https://bugs.launchpad.net/openlp/+bug/1678292
Bug #1694732 in OpenLP: "wizard sub title does not wrap"
https://bugs.launchpad.net/openlp/+bug/1694732
Bug #1695268 in OpenLP: "Bibles plugin fails to load due to invalid "last
search type" value"
https://bugs.launchpad.net/openlp/+bug/1695268
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325049
Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x"
instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot after number, the reference search
does not work.
Improvements
- Increased song maintanance window size.
- Removed "?" from all Wizard windows.
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements (revision 2761)
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/2069/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1979/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1896/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1275/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1125/
[[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/254/
[[1;31mFAILURE[1;m] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/100/
Stopping after failure
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp.
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-03-15 19:51:10 +
+++ openlp/core/common/settings.py 2017-06-04 22:12:26 +
@@ -219,7 +219,11 @@
('shortcuts/offlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('shortcuts/onlineHelpItem', 'shortcuts/userManualItem', []), # Online and Offline help were combined in 2.6.
('bibles/advanced bible', '', []), # Common bible search widgets combined in 2.6
-('bibles/quick bible', 'bibles/primary bible', []) # Common bible search widgets combined in 2.6
+('bibles/quick bible', 'bibles/primary bible', []), # Common bible search widgets combined in 2.6
+# Last search type was renamed to last used search type in 2.6 since Bible search value type changed in 2.6.
+('songs/last search type', 'songs/last used search type', []),
+('bibles/last search type', 'bibles/last used search type', []),
+('custom/last search type', 'custom/last used search type', [])
]
@staticmethod
=== modified file 'openlp/core/lib/searchedit.py'
--- openlp/core/lib/searchedit.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/searchedit.py 2017-06-04 22:12:26 +
@@ -105,7 +105,7 @@
self.setPlaceholderText(action.placeholder_text)
self.menu_button.setDefaultAction(action)
self._current_search_type = identifier
-Settings().setValue('{section}/last search type'.format(section=self.settings_section), identifier)
+Settings().setValue('{section}/last used search type'.format(section=self.settings_section), identifier)
self.searchTypeChanged.emit(identifier)
return True
@@ -141,7 +141,7 @@
self.menu_button.resize(QtCore.QSize(28, 18))
self.menu_button.setMenu(menu)
self.set_current_search_type(
-Settings().value('{section}/last search type'.format(section=self.settings_section)))
+Settings().value('{section}/last used search type'.format(section=self.settings_section)))
self.menu_button.show()
self._update_style_sheet()
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2016-12-31 11:01:36 +
+++ openlp/core/lib/ui.py 2017-06-04 22:12:26 +
@@ -49,6 +49,7 @@
parent.title_label = QtWidgets.QLabel(parent.welcome_page)
[Openlp-core] [Merge] lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp
The proposal to merge lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp has been updated. Status: Work in progress => Superseded For more details, see: https://code.launchpad.net/~suutari-olli/openlp/azaziah-fixes-and-improvements/+merge/325041 -- Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/azaziah-fixes-and-improvements into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
