raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
6,012 Commits 5 Branches 0 Tags 296 MiB
1042db64be
Commit Graph

4695 Commits

Author SHA1 Message Date
Andreas Preikschat
b890158455 do not hard code verse tags 2011-03-18 06:56:18 +01:00
Andreas Preikschat
79bc31e69e - fixed adding "Verse" instead of "v" to the database. 
- add "other" if the verse_tag is unknown

bzr-revno: 1401
 2011-03-18 06:04:16 +01:00
Andreas Preikschat
2831609458 reworked the screen override setting 
bzr-revno: 1400
 2011-03-18 06:02:08 +01:00
Andreas Preikschat
57fdca06c7 - save some indents to make code more readable 
- fixed the "verse tag" column resizing after saving verses in the "Edit All" dialog.

bzr-revno: 1399
 2011-03-18 06:00:32 +01:00
Raoul Snyman
ef223df462 Update the wizard to show actual downloading of files on the progress page. 
bzr-revno: 1398
 2011-03-17 23:23:45 +02:00
Andreas Preikschat
d1542d2c2b now the right way around 2011-03-17 21:38:05 +01:00
Andreas Preikschat
6f58d7b856 imporved handling unknown verse tags 2011-03-17 21:23:26 +01:00
Tim Bentley
e19e418a56 Fix variable 2011-03-17 20:02:33 +00:00
Andreas Preikschat
6db4d5247b fixed full version of verse tag 2011-03-17 21:00:19 +01:00
Jonathan Corwin
ce9e2ad20f ppt2010 fix (part 2). pptviewer fixes and tidies 
bzr-revno: 1397
 2011-03-17 19:55:28 +00:00
Andreas Preikschat
f340d06085 r1396 2011-03-17 20:02:12 +01:00
Andreas Preikschat
b057612a5e only save custom values, and not default values 2011-03-17 20:01:15 +01:00
Tim Bentley
f51b91c02d Add timeout to loop 2011-03-17 18:40:21 +00:00
Raoul Snyman
8e27f69382 Fixed up the left-over anti-caching, and fixed a bug with the themes. 2011-03-17 18:12:59 +02:00
Raoul Snyman
3fc666d095 Added download feedback. 2011-03-17 15:03:57 +02:00
Andreas Preikschat
e9bcab13de fixed Verse Tag' column; clean up 2011-03-17 13:32:45 +01:00
Mattias Põldaru
23ff73fa76 Additions to extensions hack to make jseagull's mediaplugin on XP happier. 2011-03-17 12:28:49 +02:00
Andreas Preikschat
e199927b97 - Added a function to clean songs before saving 
- fixed Bug #690774

bzr-revno: 1395
Fixes: https://launchpad.net/bugs/690774
 2011-03-17 06:19:54 +01:00
Raoul Snyman
a74e446129 Revamp the web interface and provide a more RESTful JSON API. 
bzr-revno: 1394
 2011-03-17 06:59:21 +02:00
Jonathan Corwin
23e178846b Fix PPT again! and remove tabs 2011-03-16 23:37:16 +00:00
Jonathan Corwin
72f445c426 pptviewer fixes and tidyups 2011-03-16 23:22:11 +00:00
Philip Ridout
5b7c909444 Fix song order in SongshowPlus import 
bzr-revno: 1393
 2011-03-16 21:37:48 +00:00
Philip Ridout
136e12eb0b Up to gushies standards hopefully! 2011-03-16 17:50:37 +00:00
Andreas Preikschat
30e5cee13a 2011-03-16 18:30:02 +01:00
Andreas Preikschat
f2cf1304ef removed old hack, updated comment, typo 2011-03-16 18:21:03 +01:00
Andreas Preikschat
044f0c88e7 fixed duplication 2011-03-16 16:37:56 +01:00
Andreas Preikschat
a031784146 try to avoid duplicates when opening an old service file 2011-03-16 14:29:13 +01:00
Raoul Snyman
bf31211216 Fixed up the documentation. 2011-03-16 14:27:52 +02:00
Andreas Preikschat
ec9fa35599 fixed loading the wrong values 2011-03-16 13:15:12 +01:00
Raoul Snyman
60371ffa0a Fixed up some things for the merge proposal. 2011-03-16 14:04:11 +02:00
Raoul Snyman
955933237c Added in support for showing alerts. 2011-03-16 12:59:23 +02:00
Mattias Põldaru
b502ad549c Differentiated error message for zero sized service. 2011-03-16 09:55:08 +02:00
Raoul Snyman
df79ab09fa Added next and previous to both service and slide controller, and added blank and unblank. 2011-03-16 08:39:25 +02:00
Raoul Snyman
a1b26df5fe Removed old unnecessary files. 2011-03-16 07:30:18 +02:00
Tim Bentley
e64e6b44fc Hide menu items no finished 2011-03-15 20:53:36 +00:00
Raoul Snyman
edc4f4d626 HEAD + some attempts at bug fixing. 2011-03-15 22:33:26 +02:00
Andreas Preikschat
e2bd77ea4d fix 2011-03-15 21:12:28 +01:00
Philip Ridout
b6d2423cb3 Fixed as appropiate according to TRB143. 2011-03-15 20:10:36 +00:00
Tim Bentley
ae25fc96df r1391 2011-03-15 20:03:25 +00:00
Tim Bentley
23bfaf1566 Old spelling bug 2011-03-15 19:55:49 +00:00
Andreas Preikschat
f339c11ccf r1391 2011-03-15 20:45:56 +01:00
Andreas Preikschat
bf1e82838a coments 2011-03-15 20:33:11 +01:00
Philip Ridout
a8c45c619e Fixed bug #735357. 
Done it as I thought best, please suggest a more appropiate way if there is.
 2011-03-15 19:31:22 +00:00
Jonathan Corwin
fcc08aff9a Alert position, genearl import, Windows QPaint error, case insensitive song order and presentation issues 
bzr-revno: 1391
 2011-03-15 19:23:05 +00:00
Andreas Preikschat
8b49c39fa5 more clean ups 2011-03-15 19:38:56 +01:00
Andreas Preikschat
bf4ecad9d1 cleanup 2011-03-15 19:24:13 +01:00
Andreas Preikschat
441283c6a0 spelling 2011-03-15 18:56:34 +01:00
Andreas Preikschat
01efe60822 continued clean up 2011-03-15 18:52:42 +01:00
Andreas Preikschat
88cfbf5d02 r1390 2011-03-15 17:38:25 +01:00
Mattias Põldaru
18f9632dda Upstream 2011-03-15 16:39:49 +02:00
Raoul Snyman
517061c261 Poll to see if the service is updated. 2011-03-15 16:38:42 +02:00
Mattias Põldaru
0773370662 Fix for #65 2011-03-15 16:38:16 +02:00
Tim Bentley
040738718c Allow cursor keys to work in service manager again. 
Add Expand / Collapse all to the keyboard.

Fixes: https://launchpad.net/bugs/707725
 2011-03-15 09:12:53 +00:00
Tim Bentley
7cf0a582ca Add checking of Display on Screen Flag for single screen outputs. 
Fixes: https://launchpad.net/bugs/730160
 2011-03-15 08:34:27 +00:00
Jonathan Corwin
791c0e268e typo. Should really test before committing :) 2011-03-15 07:47:23 +00:00
Raoul Snyman
1362031d8a Re-added my documentation which got lost somewhere along the line. 2011-03-15 09:45:29 +02:00
Jonathan Corwin
23ca24cceb Revert pptviewer.dll changes for now, they can come later. Lets get the rest in 2011-03-15 07:34:04 +00:00
Tim Bentley
7fd5a1d7fe Only allow Start / End times for videos under 50Meg in size. 
Fixes: https://launchpad.net/bugs/730474
 2011-03-15 07:30:03 +00:00
Raoul Snyman
3dd7895e22 HEAD 2011-03-15 08:48:54 +02:00
Raoul Snyman
6335ceac90 Added server-side verse changing. 2011-03-15 08:46:54 +02:00
Jon Tibble
b25abc59aa Cleanups 2011-03-15 01:07:40 +00:00
Jonathan Corwin
a026189fac Head 2011-03-15 00:11:40 +00:00
Jonathan Corwin
0b827218bc ppt 2010 fix (hopefully). pptviewer tidyups 2011-03-15 00:10:40 +00:00
Mattias Põldaru
e5b664663a Fix tracebacks, if user has no internet connection and he still presses Finish. 2011-03-15 01:05:31 +02:00
Mattias Põldaru
1ce88e7a2a Prevent possible crash, if label field is empty in database. 2011-03-15 00:29:02 +02:00
Raoul Snyman
304202bbfc HEAD 2011-03-14 23:17:28 +02:00
Andreas Preikschat
220d3efb4e clean up 2011-03-14 22:02:39 +01:00
Andreas Preikschat
6634a90bd3 continued with song edit; not finished 2011-03-14 21:36:30 +01:00
Jon Tibble
e1d55575c3 Fix KJ21 on BibleGateway 2011-03-14 19:26:38 +00:00
Andreas Preikschat
76612c18c0 adjusted usage of re-index tool 2011-03-14 20:23:59 +01:00
Andreas Preikschat
100088723a r1388 + resolved conflicts 2011-03-14 20:09:41 +01:00
Andreas Preikschat
e48322ed05 fix 2011-03-14 20:04:57 +01:00
Raoul Snyman
78c539e1d8 Fix a potential problem with the First Time Wizard where people would overwrite their song databases by being too eager to click 'next' and 'yes'. 
bzr-revno: 1388
 2011-03-14 21:02:48 +02:00
Andreas Preikschat
97bec5b93f added a song clean up function 2011-03-14 19:59:59 +01:00
Raoul Snyman
e0ea2c57a3 Fixed up a bug where the song import progress dialog would show up and not disappear if a user did not select any song databases to import. 2011-03-14 20:40:27 +02:00
Raoul Snyman
82239abb92 Used a temporary string due to string freeze, and included the song reindex as per Andreas' request. 2011-03-14 20:34:48 +02:00
Tim Bentley
e109475154 Blank display at end of Video. 
bzr-revno: 1387
Fixes: https://launchpad.net/bugs/657860
 2011-03-14 14:46:04 +00:00
Tim Bentley
63d60ce231 Update comments 2011-03-14 10:10:10 +00:00
Tim Bentley
ffe7e838db Add Blank at end of video 
Add comments for background override code.
Add Hook for setting video stop time (post beta 1)

Fixes: https://launchpad.net/bugs/657860
 2011-03-14 08:27:25 +00:00
Raoul Snyman
3bb7f556c9 Post-development cleanup. 2011-03-14 08:54:18 +02:00
Raoul Snyman
b3aa2bfdd1 Removed some unnecessary comments. 2011-03-14 08:49:54 +02:00
Raoul Snyman
a33a13ef05 Make first time wizard import songs, rather than overwrite them. 2011-03-14 08:48:23 +02:00
Jonathan Corwin
e8de37f7b3 pptviewer mods 2011-03-13 23:18:19 +00:00
Andreas Preikschat
d1592b46c7 stop adding a default verse order to OpenLyrics/service songs 
bzr-revno: 1386
 2011-03-13 19:13:20 +01:00
Andreas Preikschat
7e0430cdca Fixed a traceback when opening an old service file. Once an invalid service order is opened and saved the footer is corrected. 
bzr-revno: 1385
 2011-03-13 19:11:56 +01:00
Andreas Preikschat
9c30635fcb remove corrupted bibles 2011-03-13 16:58:27 +01:00
Andreas Preikschat
0ae31ce861 fixed old service files 2011-03-13 16:01:01 +01:00
Andreas Preikschat
99eba705c5 add the verse tag fix back 2011-03-13 15:39:55 +01:00
Andreas Preikschat
8cc21cef79 removed need to have a verseOrder; removed attempt to fix missing verse_numbers 2011-03-13 14:50:14 +01:00
Raoul Snyman
6743e3151f Updated translations. 
bzr-revno: 1383
 2011-03-13 15:48:27 +02:00
Raoul Snyman
94d33313bd HEAD plus updated translations. 2011-03-13 08:36:32 +02:00
Raoul Snyman
96ad03e753 HEAD 2011-03-12 22:31:35 +02:00
Jonathan Corwin
23b9884775 soffice -nodefault 2011-03-12 19:00:23 +00:00
Tim Bentley
598fc33d2c Remove unneeded opjects and add log methods 
bzr-revno: 1381
 2011-03-12 18:39:35 +00:00
Tim Bentley
6cab8c1a90 comments corrected 2011-03-12 17:35:27 +00:00
Tim Bentley
490ea57a87 r1379 2011-03-12 17:32:34 +00:00
Jonathan Corwin
363b49b490 attempt to detect end of pptviewer pre-load if ppt is set to loop until ESC 2011-03-12 17:06:26 +00:00
Tim Bentley
0fe62c3591 Memory improvements and additional logging 2011-03-12 17:02:24 +00:00
Mattias Põldaru
d65cab1d15 Sorry, guys. 2011-03-12 11:59:38 +02:00
Jonathan Corwin
bc4e4147a7 r1379 2011-03-12 08:55:52 +00:00
Tim Bentley
21679d6a1a comment fixes 2011-03-12 08:12:02 +00:00
Raoul Snyman
48f007d1c7 Last few bugs and tweaks fixed. 
bzr-revno: 1379
 2011-03-12 09:42:06 +02:00
Jonathan Corwin
f04964e073 Song sequence, alert position and make OOo not invisible anymore 2011-03-12 00:12:52 +00:00
Raoul Snyman
192a3de2ad Moved the translation files to their proper place on Linux/BSD/*nix. 2011-03-12 01:41:44 +02:00
Mattias Põldaru
0bf2962ff3 Mediaplugin mimetypes extensions hacky fix. 2011-03-12 00:04:26 +02:00
Raoul Snyman
aa1d7ee30e HEAD 2011-03-11 22:52:23 +02:00
Raoul Snyman
18004c3968 Fixed some of the last bugs in the first time wizard. 2011-03-11 22:51:29 +02:00
Tim Bentley
4ad32acc82 Force path for Song Usage 
bzr-revno: 1377
Fixes: https://launchpad.net/bugs/733271
 2011-03-11 20:47:19 +00:00
Andreas Preikschat
96a54a4fe9 Hacked the song database to speed up searches and the application start 
bzr-revno: 1376
 2011-03-11 20:38:57 +01:00
Tim Bentley
b3ca0ef69a Fix text 2011-03-11 19:20:31 +00:00
Andreas Preikschat
3ba4684d55 Fixed bug #719102 
bzr-revno: 1375
 2011-03-11 20:03:34 +01:00
Tim Bentley
f1b8e53e30 Fix missing path for song usage report generation 
Fixes: https://launchpad.net/bugs/733271
 2011-03-11 19:02:36 +00:00
Andreas Preikschat
94d7f4e932 speed up application start/song search 2011-03-11 19:03:16 +01:00
Raoul Snyman
648d33688a Fixed some things from my last merge proposal. 2011-03-11 18:36:34 +02:00
Raoul Snyman
b1b7b631fb HEAD 2011-03-11 18:15:08 +02:00
Andreas Preikschat
7c7410a218 complete fixe 2011-03-11 16:53:26 +01:00
Andreas Preikschat
f0379925bc fixed bug #719102 
Fixes: https://launchpad.net/bugs/719102
 2011-03-11 16:38:22 +01:00
Raoul Snyman
b7aa0e4c70 Fix up issues with merge proposal. 2011-03-11 17:18:51 +02:00
Raoul Snyman
5e16f0fb12 Change the "autodetect" item into a radio button and stop disabling the language items. This is a more sane and less irritating approach to selecting a language. 
bzr-revno: 1372
 2011-03-11 15:14:47 +00:00
Andreas Preikschat
2d1ab8d449 - Moved the version to the Plugin class. If a plugin does not provide a "version" the default will be used. 
- clean ups

bzr-revno: 1371
 2011-03-11 15:13:10 +00:00
Jonathan Corwin
0d64f4e758 Songs of Fellowship and Generic Document imports work once again 
Also repair auto-insert-chorus-into-verse-order for SoF

bzr-revno: 1370
 2011-03-11 15:11:55 +00:00
Raoul Snyman
6448ac5092 Last few changes to the wizard. 2011-03-11 12:20:09 +02:00
Jonathan Corwin
7336575067 SOF fixes, auto add chorus to verse order again 2011-03-11 08:46:21 +00:00
Jonathan Corwin
b4e8880671 Remove static methods and re-work code to avoid creation of additional SongImport's. 2011-03-11 08:33:22 +00:00
Raoul Snyman
0d0e76601d HEAD 2011-03-11 07:16:21 +02:00
Raoul Snyman
a151262280 HEAD 2011-03-11 07:15:54 +02:00
Raoul Snyman
21d59235ac Stop signal from running twice and set 'Autodetect' text after language names have been set. 2011-03-11 07:15:41 +02:00
Andreas Preikschat
f8e9bd3525 - Fixed bug #730979 
- Include the author(s) in the file name, to prevent overwriting songs with the same name

bzr-revno: 1368
 2011-03-11 07:02:26 +02:00
Raoul Snyman
c4e64dce8d HEAD 2011-03-11 06:51:12 +02:00
Raoul Snyman
e77ced2e64 Removed unnecessary comments. 2011-03-11 06:50:32 +02:00
Jonathan Corwin
b522247094 Fix SoF/OOo imports 2011-03-10 22:25:58 +00:00
Andreas Preikschat
f07797f88f fixed copyright 2011-03-10 21:49:53 +01:00
Jonathan Corwin
31d2ca5a2b Head 2011-03-10 20:12:35 +00:00
Raoul Snyman
462f80dc66 HEAD 2011-03-10 21:49:02 +02:00
Raoul Snyman
71dc6d77b7 More changes to the wizard. 2011-03-10 21:48:15 +02:00
Mattias Põldaru
c6b28c61cf A few fixes for mediamanager file handling and service file saving, most notably for #730459, also >2GiB service files are possible, but user is asked if he wants to include >50Mib files. 
bzr-revno: 1367
 2011-03-10 20:29:44 +01:00
Andreas Preikschat
8e6566639e clean up bibles 2011-03-10 20:18:39 +01:00
Andreas Preikschat
8374c2d449 redundant code 2011-03-10 20:17:05 +01:00
Mattias Põldaru
010adf3f25 Improve readability a bit, as Meths suggested. 2011-03-10 20:31:34 +02:00
Andreas Preikschat
0070488784 clean up 2011-03-10 18:56:42 +01:00
Andreas Preikschat
3298fa1e15 reverted changed, due to database problems 2011-03-10 17:05:12 +01:00
Raoul Snyman
8d33f6d360 Some more updates to the wizard. 2011-03-10 15:15:49 +02:00
Raoul Snyman
fd1f983753 HEAD 2011-03-10 06:57:44 +02:00
Matthias Hub
1312e0c913 fixed the language configuration save/load bug on OS X 2011-03-10 03:13:05 +01:00
Matthias Hub
659e3719f0 - disabled presentations plugin in the first time wizard when on OS X 
- converting and bundling translations during the build process
- removing presentations plugin from the dmg file during the build process
- fixed Info.plist spelling errors reported by typovar
- fixed translation in the presentations mediaitem
 2011-03-10 02:45:45 +01:00
Raoul Snyman
fbb15aae91 More updates. 2011-03-09 23:24:06 +02:00
Andreas Preikschat
262b179d07 r1366 2011-03-09 20:58:26 +01:00
Mattias Põldaru
f117446954 I hope it finally is right. 2011-03-09 21:22:52 +02:00
Andreas Preikschat
d668060cf9 fixed search_length 2011-03-09 19:43:50 +01:00
Mattias Põldaru
89187ffade Neater again. 2011-03-09 20:22:07 +02:00