Commit Graph

1178 Commits

Author SHA1 Message Date
Tim Bentley
1ea5d72d1e fix formatting tags and move SpellText Edit 2016-05-21 06:02:31 +01:00
Chris Hill
a5cd1e15bc resolve pep8 W293 warning 2016-04-25 12:01:32 +01:00
Chris Hill
bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Chris Hill
1e9b7148f5 Resolve pep8 errors - separate def, two line split 2016-04-25 11:53:20 +01:00
Tim Bentley
071a4438e9 Finish moving things around
bzr-revno: 2649
2016-04-23 14:46:59 +01:00
Tim Bentley
38996c81cc more files 2016-04-22 19:25:57 +01:00
Chris Hill
4b088acc93 Coding standards fix - E731 do not assign a lambda expression, use a def for pep8 2016-04-19 20:32:23 +01:00
Chris Hill
d76965f8fd Extracted lambdas from sorts in song plugin - improve performance 2016-04-19 20:00:45 +01:00
Chris Hill
a38daf9779 natural sort for theme in edit song form 2016-04-17 22:41:29 +01:00
Chris Hill
2dd3cdc5ea Remove theme natural sort - already done by filename 2016-04-17 22:32:42 +01:00
Gabriel Loo
3bca28fa0f fixed bug #1570228 'App crashes on SongSelect Importer search'
Fixes: https://launchpad.net/bugs/1570228
2016-04-14 04:18:53 -04:00
Chris Hill
743a916292 merge w/ trunk 2016-04-08 12:53:54 +01:00
Chris Hill
74497b9229 Implement natural sort for authors, topics, songbooks, themes in Edit Song comboboxen, Song Maintenance form 2016-04-05 18:55:22 +01:00
Tim Bentley
abd2c16ccd fix links 2016-04-01 18:02:14 +01:00
s.mehrbrodt@gmail.com
8fbd431bed Fix entering Songbooks with keyboard
Also clear songbook entry field when editing another song

lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure

bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt
a409306d0d Fix bug 1537212
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 09:33:31 +01:00
Tomas Groth
4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth
692a08f888 When setting the verseorder to uppercase, remember the cursor position. Fixes bug 1536411.
Fixes: https://launchpad.net/bugs/1536411
2016-01-22 21:04:31 +01:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Simon Hanna
4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna
faff2b7da4 Undo changes to instance variables 2016-01-09 23:35:56 +01:00
s.mehrbrodt@gmail.com
ad37560ecd lp:~sam92/openlp/multiple-songbooks (revision 2607)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure

bzr-revno: 2600
2016-01-09 19:53:09 +00:00
a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Simon Hanna
afaf54a142 Fix pep8 errors 2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
1e5c187552 PEP8 2016-01-09 16:30:27 +01:00
Samuel Mehrbrodt
ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +01:00
Simon Hanna
21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt
da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
s.mehrbrodt@gmail.com
859288f172 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)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
2016-01-08 17:28:47 +00:00
simon.hanna@serve-me.info
e8e553b663 Modify all forms to remove the help button from their status bar.
I don't think I missed a form. The Wizards remain untouched as the help button works there

bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
Simon Hanna
d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
Simon Hanna
5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Samuel Mehrbrodt
860f596dde Only trigger this method by user input
Else we will have infinite loop by using setText in that method
2016-01-05 17:10:16 +01:00
Samuel Mehrbrodt
0cd2bbff36 Convert lowercase verse order to uppercase automatically
Fixes: https://launchpad.net/bugs/1530354
2016-01-05 16:42:07 +01:00
6714df645e [song select] Stop search on viewing a song. 2016-01-04 22:28:41 +02:00
Samuel Mehrbrodt
245e374171 Fix removing a songbook 2016-01-04 19:50:42 +01:00
Samuel Mehrbrodt
4706ff4af8 Merge trunk 2016-01-04 19:47:03 +01:00
Samuel Mehrbrodt
e4ecc3e763 Fix searching with multiple songbooks 2016-01-04 19:46:00 +01:00
Samuel Mehrbrodt
a106245d8b Display multiple songbooks in the footer 2016-01-04 13:48:47 +01:00
Simon Hanna
c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt
d2ab4862b4 Initial support for multiple songbooks 2016-01-04 13:11:24 +01:00
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna
bf9420a781 Update forms to remove the help button in the statusbar
Fixes: https://launchpad.net/bugs/1490184
2015-12-30 16:03:35 +01:00
9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Jonathan Springer
285e12bc9d PEP8 2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley
375884b1bb Songs 2015-10-16 17:58:22 +01:00
Jonathan Springer
eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Tim Bentley
1cfd33df30 Fix Jenkins, tests and spellings 2015-05-25 21:03:31 +01:00
02128c85f0 Fix bug #1437771: Clear the song after every import
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
2015-03-31 22:58:51 +02:00
Oliver Wieland
408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
2015-02-28 20:46:31 +02:00
7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs.
Fixes: https://launchpad.net/bugs/1423699
2015-02-28 00:28:24 +02:00
Oliver Wieland
4e96db4010 fixes bug#1424555 2015-02-23 18:40:56 +01:00
b65e592df9 Bug #1412216: Detect when a song has a problem, show a message to the user, and flip back to the previous screen. 2015-02-21 11:59:37 +02:00
Tomas Groth
bab5e90e20 Adjust error messages. 2015-02-10 22:25:30 +00:00
Tomas Groth
d8e6f35694 Handle OSError exception when creating files in various places. Fixes bug 1416888.
Fixes: https://launchpad.net/bugs/1416888
2015-02-06 22:17:24 +00:00
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
e89558da39 Fix label text for CCLI
bzr-revno: 2463
2014-12-31 10:26:50 +00:00
Ken Roberts
3be4f10833 Change edit song ccli label to "CCLI song number" 2014-12-22 12:19:05 -08:00
Tim Bentley
93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
e9ec5d202c [bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
Tomas Groth
b6e0036383 Re-re-fix duplicate song check on windows, and now it actually works in builds. 2014-11-06 10:34:07 +01:00
Tomas Groth
992ac3bbb8 Second attempt to fix duplicate-song-detection on windows 2014-11-05 21:44:45 +00:00
Tomas Groth
77c7da2d20 Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth
3d387cb296 Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog 2014-10-27 13:58:59 +01:00
Tomas Groth
df28a6799b trunk 2014-09-02 21:17:56 +01:00
Jonathan Springer
f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Tomas Groth
11a19fbd32 Merged Raouls GUI changes 2014-08-26 22:11:29 +01:00
86291d0c41 Round 1 of media clip dialog refresh 2014-08-21 01:35:24 +02:00
Samuel Mehrbrodt
7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt
5d7b60f714 Changing Author type functional 2014-07-05 21:56:32 +02:00
Samuel Mehrbrodt
7f9ae1374e Started authortype editing
Fixes: https://launchpad.net/bugs/1336933
2014-07-04 16:16:02 +02:00
Samuel Mehrbrodt
d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Samuel Mehrbrodt
f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Samuel Mehrbrodt
a9e620c175 Remove direct usage of AuthorSong 2014-05-07 12:30:55 +02:00
Samuel Mehrbrodt
ef2a03d510 Fix bug 1316979 by making the authors relation viewonly
Fixes: https://launchpad.net/bugs/1316979
2014-05-07 11:51:59 +02:00
Samuel Mehrbrodt
7a1741258a Typo 2014-05-03 17:25:45 +02:00
Samuel Mehrbrodt
a6a08bcfdd Fix bug 1157938
Fixes: https://launchpad.net/bugs/1157938
2014-05-03 17:01:43 +02:00
Samuel Mehrbrodt
afaf9480c3 Rename variable 2014-05-03 15:58:31 +02:00
Samuel Mehrbrodt
a7bdb9dfa0 Fix bug 1310523
Fixes: https://launchpad.net/bugs/1310523
2014-05-03 15:56:32 +02:00
Samuel Mehrbrodt
938f59416d Fix bug 1199639
Fixes: https://launchpad.net/bugs/1199639
2014-05-03 15:46:48 +02:00
Andreas Preikschat
deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat
8fb086134e dead code, not used variables, docs, unused imports 2014-05-01 19:49:43 +02:00
Andreas Preikschat
53d830b737 removed old code 2014-05-01 19:06:47 +02:00
Samuel Mehrbrodt
70a5795cd2 Remove min width 2014-04-21 11:58:53 +02:00
Samuel Mehrbrodt
ac44396a40 2 row layout for author add widgets 2014-04-21 11:58:09 +02:00
Samuel Mehrbrodt
031868ae31 trunk 2014-04-21 11:49:17 +02:00
Samuel Mehrbrodt
82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Andreas Preikschat
877fd135d3 head 2014-04-14 20:53:33 +02:00
Andreas Preikschat
7e064246fb fixed counter 2014-04-13 10:21:30 +02:00
Andreas Preikschat
49ff37c530 fixed long line; use generator 2014-04-13 09:54:34 +02:00
b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Andreas Preikschat
2c93a5840b head 2014-04-12 18:05:27 +02:00
Samuel Mehrbrodt
577c7321ff Add new type for 'Words and Music' 2014-04-08 20:52:05 +02:00
Samuel Mehrbrodt
fb85b9858a PEP8 2014-04-08 11:29:47 +02:00
Samuel Mehrbrodt
7f8e76b8dd Restore previous delete button behavior 2014-04-08 11:21:56 +02:00
Samuel Mehrbrodt
cc635e9b96 SQLite doesn't support changing a primary key 2014-04-08 11:16:14 +02:00
Samuel Mehrbrodt
adedb6eaeb Fix setDefaults -> set_defaults 2014-04-02 09:04:12 +02:00
Samuel Mehrbrodt
31b220c972 Indentation 2014-04-02 08:49:03 +02:00