Commit Graph

1178 Commits

Author SHA1 Message Date
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
Samuel Mehrbrodt
691247ffda Don't allow a song to be saved without an author 2014-04-02 08:47:27 +02:00
Samuel Mehrbrodt
c7358e4a9f The author_type column is part of the primary key and thus can't be NULL 2014-03-30 19:38:26 +02:00
Samuel Mehrbrodt
87051a094a Put Author types in an own enum class 2014-03-30 19:23:36 +02:00
Samuel Mehrbrodt
dadfbcfacb Merge head 2014-03-28 17:06:37 +01:00
Samuel Mehrbrodt
71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Samuel Mehrbrodt
20533624e0 Fix method calls (broken with rev. 2329) 2014-03-23 23:27:07 +01:00
Andreas Preikschat
11fe2045e5 fixed tests 2014-03-22 10:24:52 +01:00
Andreas Preikschat
394e5a5be2 removed code, commment 2014-03-22 09:52:49 +01:00
Tim Bentley
bbe4169c24 Fix all formatting errors 2014-03-21 21:38:08 +00:00
Andreas Preikschat
59b00413e8 head 2014-03-21 21:12:16 +01:00
Andreas Preikschat
ed29edec3a imported duplicate check speed 2014-03-21 21:04:53 +01:00
Tim Bentley
30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tim Bentley
9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley
22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley
0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley
e78dac1edf Head 2014-03-11 20:17:18 +00:00
5af971f723 Remove main_menu property and add an application property. 2014-03-11 21:07:58 +02:00
b35de747ab Move HistoryComboBox to openlp.core.common 2014-03-11 20:58:49 +02:00
Tim Bentley
ef97095399 Importer cleanups 2014-03-06 20:40:08 +00:00
Tim Bentley
75281b5cf1 Song import cleanups 2014-03-05 18:58:22 +00:00
c607661aee HEAD 2014-03-04 23:51:54 +02:00
b094d48678 Add some error handling around the getting a song.
Add some more tests.
2014-03-04 23:28:15 +02:00
Tim Bentley
43f156d9fe Update Songs forms 2014-03-04 18:49:30 +00:00
d2a5e8a4c4 Refactor SongSelect search into a separate class, and start writing some tests for that class. 2014-02-27 23:36:33 +02:00
1cf3140073 Reworked SongSelect branch after a major refactor in trunk.
To recap:
- Added a standalone CCLI SongSelect importer
- Add icons to the import and export menu items
- Move Theme import and export up with Settings
2014-01-01 00:27:27 +02:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tim Bentley
6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley
cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Philip Ridout
c41842125d HEAD 2013-11-16 20:32:50 +00:00
Tim Bentley
63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley
a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley
b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley
257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Philip Ridout
a06469fea0 head 2013-09-15 19:36:58 +01:00
Tim Bentley
8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Andreas Preikschat
3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat
ccf5d6535b head 2013-08-31 17:23:46 +02:00
4a86d55a00 Fix song edit form to clear previous used fields
bzr-revno: 2288
2013-08-31 09:56:21 +01:00
Philip Ridout
49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +00:00
Andreas Preikschat
9b0b88718d head 2013-08-22 20:47:08 +02:00
c83dbe7f63 Fix bug #1212801 where the song edit form did not clear a previously set theme.
Fixes: https://launchpad.net/bugs/1212801
2013-08-15 21:49:51 +02:00
Philip Ridout
364fde73c5 Fix #120515 by reimplementing QFileDialog.getOpenFileNames 2013-08-13 19:02:04 +01:00
s.mehrbrodt@gmail.com
a52ffdb483 Fix indentation 2013-07-22 22:27:51 +02:00
s.mehrbrodt@gmail.com
4894ad6dc2 Improve message when an invalid order was entered
It mentions that the delimiter has to be a space.

Fixes: https://launchpad.net/bugs/1094809
2013-07-19 18:52:16 +02:00
Andreas Preikschat
5fe64a1d39 super calls 2013-07-18 21:49:44 +02:00
Andreas Preikschat
25e7df079b changed constructor 2013-07-18 21:04:38 +02:00
Andreas Preikschat
59be78f20a changed constructors 2013-07-18 16:28:03 +02:00
Andreas Preikschat
c4ead1185a head 2013-07-18 08:09:19 +02:00
Andreas Preikschat
8363979040 fixed duplicate finder 2013-07-07 16:00:14 +02:00
Andreas Preikschat
414d9bb914 fixed song import wizard 2013-07-06 22:35:20 +02:00
Andreas Preikschat
b0f0fb554f python3 does not have buffer 2013-07-06 20:15:44 +02:00
phill-ridout
15153ace9c HEAD 2013-07-06 15:27:11 +01:00
Tim Bentley
988fca86a1 Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups
bzr-revno: 2264
2013-06-30 20:18:21 +01:00
phill-ridout
0c8a13a087 HEAD 2013-06-27 09:30:34 +01:00
Tim Bentley
26e80be5b7 Who forgot the return 2013-06-24 17:54:23 +01:00
Tim Bentley
d32ece04a5 add missing imports 2013-06-23 20:51:17 +01:00
Andreas Preikschat
4f8d93638b fixes 2013-06-21 20:13:59 +02:00
Andreas Preikschat
6265ce93de fixed tests 2013-06-21 12:16:50 +02:00
Tim Bentley
4d1061f723 Clean up registry for application 2013-06-21 06:16:35 +01:00
Andreas Preikschat
6b881e312f added second error message 2013-06-16 19:28:44 +02:00
Andreas Preikschat
45313cb450 head 2013-06-16 19:20:51 +02:00
Patrick Zimmermann
b18d96b3c9 Keep GUI responsive during search. Allow aborting the search. 2013-06-15 12:46:00 +02:00
Patrick Zimmermann
2f55624977 Extract method to delete a song. 2013-06-14 22:20:26 +02:00
Patrick Zimmermann
b172153b15 Use future division. 2013-06-11 22:27:30 +02:00
Patrick Zimmermann
4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Patrick Zimmermann
570aebb72b Correct the naming of preWizard -> pre_wizard resulting in the method not being called anymore.
bzr-revno: 2248
2013-05-25 19:07:00 +01:00
Tim Bentley
945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Patrick Zimmermann
d7eb6b20c3 Correct the naming of the preWizard -> pre_wizard. 2013-04-25 19:58:37 +02:00
Tim Bentley
0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley
fba86c5552 Add tests 2013-04-23 20:08:07 +01:00
Andreas Preikschat
4063de2700 head 2013-04-20 22:34:46 +02:00
Andreas Preikschat
7682698cf1 media code standards 2013-04-19 21:15:12 +02:00
Andreas Preikschat
31aaafa254 clean ups 2013-04-18 20:27:54 +02:00
Andreas Preikschat
e7f553afb1 added test 2013-04-18 20:27:22 +02:00
Patrick Zimmermann
ae5869e366 Add waiting cursor while searching. 2013-04-18 20:19:43 +02:00
Andreas Preikschat
b71d3e9e53 fixed bug-1170435
Fixes: https://launchpad.net/bugs/1170435
2013-04-18 19:50:39 +02:00
Andreas Preikschat
c13c0a0474 renaming 2013-04-18 11:22:20 +02:00
Patrick Zimmermann
0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
Patrick Zimmermann
789439dd6b Make wizard a little wider to fit at least two review widgets. 2013-04-09 23:32:19 +02:00
Patrick Zimmermann
97c6899a31 Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score. 2013-04-06 13:53:00 +02:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
M2j
118f295204 Precompute the whole comparision key for song sorting. 2013-03-31 12:31:54 +02:00
M2j
76ea812629 - switch to Python3 style sorting
- use ICU for string sorting
2013-03-30 22:54:42 +01:00
phill-ridout
68f26d1151 HEAD 2013-03-29 21:39:37 +00:00
Andreas Preikschat
643fa9436c fixed song editor regression 2013-03-28 22:36:18 +01:00
Patrick Zimmermann
4831fb29fa Translate verse tags. 2013-03-26 22:31:46 +01:00
Tim Bentley
38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
1a37d306a9 More cleanups 2013-03-15 00:22:18 +02:00
27f13d8f98 Fix up some object names 2013-03-14 23:12:26 +02:00
Raoul Snyman
211bd38bbf Some minor PyLint cleanups 2013-03-13 22:44:06 +02:00
Raoul Snyman
9383f2a4af HEAD 2013-03-11 15:55:06 +02:00
Raoul Snyman
837118bf07 Cleanup EditVerseForm and friends, and expand the test. 2013-03-11 10:07:17 +02:00
Andreas Preikschat
ca406df0a4 head 2013-03-08 09:14:39 +01:00
d6d1ecf616 Naming convention cleanups and a few merges from the upstream branch. 2013-03-07 23:04:19 +02:00
Andreas Preikschat
25919a34b2 fixed objectNames 2013-03-07 18:58:15 +01:00