Commit Graph

5072 Commits

Author SHA1 Message Date
Andreas Preikschat
a54a3eb792 make first column wider; added description label back; removed Qt = Qt.QCore; fixed litte bug which left the shortcut text on the buttons 2011-04-09 20:14:51 +02:00
Andreas Preikschat
9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Andreas Preikschat
283171e296 use weight to sort categories 2011-04-09 16:50:44 +02:00
Tim Bentley
501235a695 Looking better 2011-04-09 09:11:46 +01:00
Tim Bentley
9ce234598a Humm 2011-04-08 20:40:18 +01:00
Andreas Preikschat
bea272ca7d implemented the custom/default radio button; clean ups 2011-04-08 18:53:11 +02:00
Tim Bentley
e159d87c2a r1449 2011-04-08 16:35:46 +01:00
Tim Bentley
34348c8465 More changes 2011-04-08 16:35:33 +01:00
Andreas Preikschat
9c526081d8 fixed bug #754484
Fixes: https://launchpad.net/bugs/754484
2011-04-08 15:50:54 +02:00
Andreas Preikschat
ea5e0d65cc 2011-04-08 08:25:02 +02:00
Jonathan Corwin
78a9c89025 Fix stuttering powerpoint start 2011-04-07 23:57:12 +01:00
Andreas Preikschat
c939a81cfe added basic css support, added option to add a page break after each text item 2011-04-07 21:10:19 +02:00
Andreas Preikschat
def7567933 easier check 2011-04-07 19:54:17 +02:00
Andreas Preikschat
e553cd959b do not try to load en_US when the default dictionary could not be loaded to fix bug #747206
Fixes: https://launchpad.net/bugs/747206
2011-04-07 19:34:49 +02:00
Andreas Preikschat
dab699371c integrated second button(s), clean ups 2011-04-07 17:37:07 +02:00
Andreas Preikschat
9b84319c24 added new dialog from superfly + few own changes 2011-04-07 16:26:29 +02:00
Andreas Preikschat
db616bfe1a 2011-04-07 10:45:49 +02:00
Jonathan Corwin
9b04385f34 Blanking and switching between song and ppt and back 2011-04-06 23:54:47 +01:00
Andreas Preikschat
3bfe9ec77c 2011-04-06 21:14:02 +02:00
Andreas Preikschat
626708df03 r1446 + reverted changes 2011-04-05 16:24:51 +02:00
Andreas Preikschat
38c9393624 expand categories 2011-04-04 19:33:42 +02:00
Andreas Preikschat
4a6be382ff fixed empty texts 2011-04-04 18:15:38 +02:00
Andreas Preikschat
84605fb430 fixed wrong context of shortcuts; moved functions 2011-04-04 16:38:17 +02:00
Andreas Preikschat
5589c24cbf 2011-04-04 10:27:25 +02:00
Andreas Preikschat
1c35810fa5 fixed bug #749296
Fixes: https://launchpad.net/bugs/749296
2011-04-03 19:51:10 +02:00
Andreas Preikschat
dfc2eed1f4 adapted latest merge 2011-04-03 16:20:55 +02:00
Andreas Preikschat
9c39f57d5a r1443 2011-04-03 15:37:53 +02:00
Andreas Preikschat
65f134ab1b removed fix (I'll deal with this in another branch) 2011-04-03 15:36:59 +02:00
Andreas Preikschat
94ff1a5edc added cancel button; do not save changes when cancelling; added labels and tooltip 2011-04-03 15:32:51 +02:00
Andreas Preikschat
0a5b3b2c2d 2011-04-03 15:24:51 +02:00
Andreas Preikschat
28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Tim Bentley
6445964646 r1442 2011-04-03 07:19:28 +01:00
Tim Bentley
63bfac4b7e Changes continue 2011-04-03 07:19:03 +01:00
Andreas Preikschat
61068e26a6 removed cancel button 2011-04-02 18:14:43 +02:00
Andreas Preikschat
958155e7d7 fixed alternate shortcut 2011-04-02 17:45:00 +02:00
Andreas Preikschat
e3d822f07a fixed strange save bug 2011-04-02 17:37:14 +02:00
Andreas Preikschat
7260f91825 restore butto nnow works 2011-04-02 16:22:08 +02:00
Andreas Preikschat
4badce0205 fixed actions which did not have a parent which caused the check to fail 2011-04-02 15:08:54 +02:00
Jonathan Corwin
27fbd9594b Head 2011-04-02 10:53:08 +01:00
Jonathan Corwin
db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Andreas Preikschat
1a493b1fc8 possible fix for not working 'move selection down' 2011-04-01 18:53:39 +02:00
Andreas Preikschat
df4de23df0 Added Theme, Blank, Desktop shortcuts, further clean ups
Fixes: https://launchpad.net/bugs/739779
2011-04-01 16:28:25 +02:00
Tim Bentley
fbc94dda3a 1441 2011-04-01 05:48:21 +01:00
Tim Bentley
3155bde0b2 inprogress 2011-04-01 05:48:09 +01:00
Andreas Preikschat
dee95a2f57 r1441 2011-03-31 21:06:09 +02:00
Andreas Preikschat
b17ad26672 make sure we save the default shortcut 2011-03-31 20:53:50 +02:00
Andreas Preikschat
0c9b839e91 check if shortcut is already assigned, refreshing list, double click event, started resetting the selected action 2011-03-31 14:50:38 +02:00
Andreas Preikschat
4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Mattias Põldaru
beffd0c25c Text fixes by superfly. 2011-03-31 10:31:08 +03:00
Mattias Põldaru
f73577d708 Undo 2011-03-30 21:52:58 +03:00
Andreas Preikschat
bba2f2c604 docs 2011-03-30 20:52:21 +02:00
Mattias Põldaru
df1db913cd merge 2011-03-30 21:35:48 +03:00
Andreas Preikschat
fb78350a44 added bible actions 2011-03-30 20:27:33 +02:00
Andreas Preikschat
369a539970 r1439 2011-03-30 20:12:34 +02:00
Andreas Preikschat
bf2a9d338b clean up 2011-03-30 20:12:05 +02:00
Andreas Preikschat
772bd8eb66 basic saving and loading of shortcuts 2011-03-30 19:50:36 +02:00
Andreas Preikschat
5ef0cc12c0 started working on saving/loading shortcuts 2011-03-30 18:34:40 +02:00
Andreas Preikschat
fe92842c6b added ability to remove actions 2011-03-30 12:27:27 +02:00
Andreas Preikschat
9b939bb962 fixed reloading 2011-03-30 12:12:39 +02:00
Andreas Preikschat
253087e2c6 fixed verse sorting, change ### to --- 2011-03-30 09:13:04 +02:00
Raoul Snyman
211b20486e Updated hungarian translation and fixed a translator's name. 2011-03-30 07:37:56 +02:00
Tim Bentley
ea6f90fc74 Change === and --- around 2011-03-29 21:38:10 +01:00
Tim Bentley
857756e20f Change ### to ==== 2011-03-29 21:06:18 +01:00
Andreas Preikschat
e20fd7d85d clean up 2011-03-29 21:58:04 +02:00
Andreas Preikschat
b9b0cbbe9c removed things, as this did not work 2011-03-29 21:52:21 +02:00
Andreas Preikschat
a0798b66bb changed wording 2011-03-29 20:23:01 +02:00
Andreas Preikschat
6342a2aaa0 changed --- to ### 2011-03-29 20:04:16 +02:00
Andreas Preikschat
dabf9d36fe r1437 2011-03-29 20:03:42 +02:00
Andreas Preikschat
6f3fd53419 automatically add to actionList where possible 2011-03-29 19:47:24 +02:00
Andreas Preikschat
d9c2d92c8c 2011-03-29 18:44:36 +02:00
Tim Bentley
8790f17afa Fix theme editing 2011-03-29 17:25:48 +01:00
Tim Bentley
2640decffc r1437 2011-03-29 16:49:57 +01:00
Andreas Preikschat
32240f7bbe r1437 + resolved conflict 2011-03-29 16:14:05 +02:00
Andreas Preikschat
19138cd9e5 started reworking shortcuts 2011-03-29 15:56:49 +02:00
Andreas Preikschat
d6462a56a4 - fixed forgotten applicationVersion
bzr-revno: 1437
2011-03-29 14:41:43 +02:00
Jonathan Corwin
d220669e9b head 2011-03-28 21:56:36 +01:00
Jonathan Corwin
ad25d42fb5 If I'm going to make changes, I should really start from a clean slate... 2011-03-28 21:53:26 +01:00
Jonathan Corwin
221fa3b8b6 Disable commandline parsing for Windows, it don't work 2011-03-28 21:46:31 +01:00
Jonathan Corwin
2cce748d20 Change superscript so it still works in print. Fix problem with openlp not closing 2011-03-28 21:18:55 +01:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
c8a7594685 Bye Bye RenderManager 2011-03-28 19:12:46 +01:00
Tim Bentley
9aa6bba3a2 Virtual Splits now work 2011-03-28 19:01:58 +01:00
Andreas Preikschat
3aaaa8895b fixed a bug in the exception form 2011-03-28 19:29:25 +02:00
Tim Bentley
239b62a488 Render Ester 8:9 on more than 1 page 2011-03-28 18:04:31 +01:00
Andreas Preikschat
5cae56ebb3 - import topics from usr files (txt files seem not to support topics)
- clean ups

bzr-revno: 1435
2011-03-28 16:42:38 +02:00
Jonathan Corwin
1e973c6c8d Attempt superscript without affecting line spacing 2011-03-27 23:28:20 +01:00
Matthias Hub
ea16d11011 Fix OS X language selection and update .version in OS X build
bzr-revno: 1432
2011-03-27 22:36:00 +01:00
Andreas Preikschat
1cced38067 use clicked rather than pressed to avoid inserting [---] more than once
bzr-revno: 1431
2011-03-27 19:54:47 +02:00
Tim Bentley
b84c4a0a3d r1430 2011-03-27 18:03:48 +01:00
Andreas Preikschat
c0f5191d6c clicked rather than pressed 2011-03-27 19:00:34 +02:00
Tim Bentley
d3e2fe79e9 wot not print 2011-03-27 17:39:04 +01:00
Tim Bentley
6d4792aa87 r1429 2011-03-27 17:30:54 +01:00
Tim Bentley
fc3f35f0f9 Question mark 2011-03-27 17:30:40 +01:00
Andreas Preikschat
5a4b91b37c (suggestion) added support for multiple slides 2011-03-27 15:39:43 +02:00
Tim Bentley
c93b073da8 Renderer Cleanups - started 2011-03-27 09:19:00 +01:00
Andreas Preikschat
dbefa29054 fixed mistake 2011-03-26 22:03:28 +01:00
Andreas Preikschat
f2acce4a77 missing spaces 2011-03-26 21:59:44 +01:00
Andreas Preikschat
252f316e0e missing spaces 2011-03-26 21:51:41 +01:00
Andreas Preikschat
41f0be38fb clean ups 2011-03-26 21:45:11 +01:00
Andreas Preikschat
baff5451c2 r1429 2011-03-26 21:32:10 +01:00
Tim Bentley
7cf329422b Fix minor errors 2011-03-26 20:28:05 +00:00
Tim Bentley
fef89e7b8d Add Spinbox limis 2011-03-26 20:10:12 +00:00
Andreas Preikschat
d83f14f8fb import topics from usr files, clean ups 2011-03-26 21:07:19 +01:00
Tim Bentley
70ca844473 Fix comments and errors 2011-03-26 19:50:15 +00:00
Tim Bentley
dce9a73153 Add Yes / No to Error Message 2011-03-26 19:34:01 +00:00
Raoul Snyman
98ea1c5ff9 Removed a console.log which caused older browsers to choke.
bzr-revno: 1429
2011-03-26 21:19:19 +02:00
Tim Bentley
afaf10f986 r1428 and fixes 2011-03-26 19:00:47 +00:00
Tim Bentley
623822749d Force there always to be a theme
bzr-revno: 1428
2011-03-26 18:56:36 +00:00
Matthias Hub
8b10155178 Changes did for the packaging of 1.9.5 (version 1346 contains the main changes):
- 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 (though disabled on OS X)

bzr-revno: 1427
2011-03-26 19:26:38 +01:00
Andreas Preikschat
29a013ee40 - show a dialog when a corrupted service file is opened. http://support.openlp.org/issues/65
- removed the return from the except and attempt to remove service files when saving fails.

bzr-revno: 1424
2011-03-26 19:22:28 +01:00
Andreas Preikschat
ff9f5f4566 - a little clean up to improve readability
bzr-revno: 1423
2011-03-26 19:21:44 +01:00
Raoul Snyman
2c7ec2978e Removed a console.log which caused older browsers to choke. 2011-03-26 19:51:07 +02:00
Andreas Preikschat
f082040840 r1421 2011-03-26 17:29:21 +01:00
Tim Bentley
f19baafb9c Block 2 Instances of OpenLp running at the same time.
Fixes: https://launchpad.net/bugs/742122
2011-03-26 13:45:24 +00:00
Andreas Preikschat
ad1d57faab fixed version file 2011-03-25 19:49:53 +01:00
Andreas Preikschat
8aac2f7724 fixed exception 2011-03-25 19:45:39 +01:00
Tim Bentley
be7eeb9e6a r1421 2011-03-25 17:49:53 +00:00
Tim Bentley
cc66c91569 r1421 2011-03-25 17:49:26 +00:00
Andreas Preikschat
24b58ff518 fixed application version 2011-03-25 17:29:39 +01:00
Andreas Preikschat
4c81c55918 r1420 2011-03-25 16:59:18 +01:00
Raoul Snyman
9c08726bd9 Fixed up a problem on OS X where a second configuration file was created. See bug #738642.
bzr-revno: 1420
2011-03-25 17:51:28 +02:00
Tim Bentley
2de02a0c76 Fix up verse selection correctly. 2011-03-25 06:13:42 +00:00
Tim Bentley
f83ac13f3f Allow slides to automatically unblank when added to live
Fixes: https://launchpad.net/bugs/735367
2011-03-24 21:28:03 +00:00
Jonathan Corwin
99622b5cc1 Link to online manual 2011-03-24 21:20:38 +00:00
Andreas Preikschat
2536e54677 r1418 2011-03-24 22:19:17 +01:00
Andreas Preikschat
a9cd8db787 do not show error message when file does not exist, fixed return 2011-03-24 22:13:51 +01:00
Andreas Preikschat
9376d7e965 r1418 2011-03-24 21:39:31 +01:00
Andreas Preikschat
30de0d9916 fixed ticket 65 2011-03-24 21:37:02 +01:00
Raoul Snyman
bf058430d2 Updated the copyright information and the contributors.
bzr-revno: 1418
2011-03-24 22:07:31 +02:00
Tim Bentley
8cafb536ff r1417 2011-03-24 19:51:44 +00:00
Tim Bentley
55ab5eb4e1 r1416 2011-03-24 19:51:35 +00:00
Tim Bentley
7952559205 r1417 2011-03-24 19:50:50 +00:00
Tim Bentley
5a80d5a606 remove print 2011-03-24 19:50:40 +00:00
Andreas Preikschat
22af2a32f8 - changed the hard coded version numbers
bzr-revno: 1417
2011-03-24 20:28:44 +01:00
Andreas Preikschat
67ee8394c2 moved version function 2011-03-24 20:12:27 +01:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Raoul Snyman
4bfc1ec208 Possibly found the cause of our double-config-file problems. 2011-03-24 19:23:39 +02:00
Andreas Preikschat
711c246687 clean up 2011-03-24 17:43:08 +01:00
Andreas Preikschat
682c32eaad changed hard coded version numbers 2011-03-24 17:09:05 +01:00
Tim Bentley
9836131025 Allow Preview Controller to request servicemanger to make the preview item live and add next to preview.
Fixes: https://launchpad.net/bugs/730294
2011-03-23 21:08:24 +00:00
Tim Bentley
16a445e1e7 r1415 2011-03-23 18:56:12 +00:00
Andreas Preikschat
e07e97da6c bible clean up 2011-03-22 17:21:10 +01:00
Raoul Snyman
f229146363 Fixed a bug where not all Bible versions were shown with multiple versions. 2011-03-22 08:43:31 +02:00
Andreas Preikschat
705497efd8 - update the screen list combo box when a screen was changed/added/removed
- pre select the last screen in the combo box

bzr-revno: 1414
2011-03-21 18:49:25 +01:00
Andreas Preikschat
2952e36a95 select last screen in the list 2011-03-21 12:51:14 +01:00
Andreas Preikschat
e482866ccb update screen list in first time wizard when the system detects new screens 2011-03-21 09:03:05 +01:00
Raoul Snyman
d63f76d3ff Removed unnecessary lines. 2011-03-20 23:00:41 +02:00
Raoul Snyman
3aa0aa23d3 Added smart footers to Bibles. 2011-03-20 22:50:19 +02:00
Tim Bentley
63309d4f1a head 2011-03-20 18:43:51 +00:00
Tim Bentley
caaf004f4c theme changes 2011-03-20 18:42:24 +00:00
Andreas Preikschat
cd761473b6 Bug #738706
Fixes: https://launchpad.net/bugs/738706
2011-03-20 17:56:01 +01:00
Tim Bentley
333d654905 Fix slide advance for direct selection
Fixes: https://launchpad.net/bugs/738694
2011-03-20 14:11:24 +00:00
Jonathan Corwin
60ab4cc165 Detect whether imported video/audio is valid
bzr-revno: 1409
2011-03-20 08:49:31 +00:00
Tim Bentley
f0f1a5b5e1 Text changes 2011-03-20 08:34:47 +00:00
Tim Bentley
d26c8fce86 Clean up initial theme setup 2011-03-20 07:37:44 +00:00
Jonathan Corwin
55d9e85840 tidies 2011-03-19 22:52:56 +00:00
Andreas Preikschat
d9893fdf05 Convert translated verse orders (some time ago, it was possible to add translated verse orders to the database)
bzr-revno: 1408
2011-03-19 21:17:26 +01:00
Tim Bentley
45034c1b8b Force default theme if no theme present 2011-03-19 19:45:22 +00:00
Jonathan Corwin
2fa2888112 Tidyups and fix pause problem. Still issue with media manager hanging sometimes after play starts. Perhaps missing an event? 2011-03-19 17:26:17 +00:00
Andreas Preikschat
05b699520f fixed comment 2011-03-19 17:11:52 +01:00
Andreas Preikschat
a43bd19bd9 convert verse order 2011-03-19 17:06:04 +01:00
Andreas Preikschat
a12dd5722c typo 2011-03-19 16:51:03 +01:00
Jonathan Corwin
936c77a7ea Now detects non-playable media files. Unfortunately can't stop valid ones now... 2011-03-19 15:48:26 +00:00
Andreas Preikschat
4c4dfcc6c5 fixed BadZipfile exception 2011-03-19 16:43:25 +01:00
Andreas Preikschat
aff94e1b8d fixed Bug #738207
Fixes: https://launchpad.net/bugs/738207
2011-03-19 16:38:26 +01:00
Tim Bentley
921163dbcd Media now has start and end times 2011-03-19 12:40:33 +00:00
Tim Bentley
7fc84ad2b2 Enter and save end times 2011-03-19 11:50:48 +00:00
Tim Bentley
5e7fa59407 Update the Media timer UI 2011-03-19 11:23:45 +00:00
Tim Bentley
38243af7de Add destop startup file selection 2011-03-19 10:08:05 +00:00
Andreas Preikschat
3550b77b61 - removed hard coded verse tags
- the reindex tool to convert pre 1.9.5 verse tags (this also fixes translated tags, as long as the user is running a localised version)
- now only one row/verse in the song editor can be selected

bzr-revno: 1405
2011-03-18 22:37:06 +01:00
Andreas Preikschat
9622a74467 fixed downButton being visible 2011-03-18 21:31:55 +01:00
Andreas Preikschat
d85991cdc8 changed SelectionMode 2011-03-18 20:15:45 +01:00
Tim Bentley
9def5ab3c7 Add space 2011-03-18 19:15:07 +00:00
Andreas Preikschat
3022d9cb8e fixed doc, rebuild verse tags 2011-03-18 19:43:26 +01:00
Tim Bentley
c80fe1fd50 Remove extra line 2011-03-18 18:20:58 +00:00
Tim Bentley
6951ac1fb6 Fix time for python 2.6 2011-03-18 18:19:07 +00:00
Tim Bentley
da927320c5 r1401 2011-03-18 17:10:51 +00:00
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
Andreas Preikschat
674e9713e7 serach comments 2011-03-09 19:14:50 +01:00
Mattias Põldaru
32034dea95 Just to make more sense. 2011-03-09 20:08:06 +02:00
Mattias Põldaru
f710746a55 Returns now done right. Commented out dialog part, which needs more work 2011-03-09 20:02:21 +02:00
Raoul Snyman
b609a8de03 Added a No Internet page to the wizard. 2011-03-09 19:37:25 +02:00
Raoul Snyman
6b437a120c Updated the look and feel of the language form. Fixed up the welcome page of the wizard. 2011-03-09 18:16:40 +02:00
Raoul Snyman
db3cd5c6e2 HEAD 2011-03-09 15:48:23 +02:00
Mattias Põldaru
c7a435951d Better code, as suggested and a few suggested fixes as well. 2011-03-09 09:17:58 +02:00
Raoul Snyman
ae864689c7 Make the language detection menu item part of the group. 2011-03-09 08:02:31 +02:00
Tim Bentley
b79f4fcaa0 First time wizard improvements
bzr-revno: 1364
2011-03-09 05:54:49 +00:00
Andreas Preikschat
fcadc58e75 fixed bug #730979
Fixes: https://launchpad.net/bugs/730979
2011-03-08 22:09:52 +01:00
Tim Bentley
9e66b03774 Fix combo refresh 2011-03-08 18:50:26 +00:00
Andreas Preikschat
f73b8660e0 added more debug messages 2011-03-08 17:46:53 +01:00
Mattias Põldaru
25dbf271f6 Cleanup 2011-03-08 12:16:09 +02:00
Mattias Põldaru
216cc407c6 Now able to write >2GiB service files (haven't tested opening these),\n on IOError not-saved * asterisk will remain in place,\nbefore adding >50GiB files, user is asked first. 2011-03-08 11:32:37 +02:00
Mattias Põldaru
562a88a993 Fixes #730459 and 4 unreported bugs. 2011-03-08 09:38:25 +02:00
Jonathan Corwin
ef00fcdc0b Fix ooo file open for windows 2011-03-07 23:12:31 +00:00
Tim Bentley
c3c4e85590 Fixes 2011-03-07 19:58:51 +00:00
Tim Bentley
3eb8ca476b english 2011-03-07 19:16:56 +00:00
Andreas Preikschat
32f91745ac Fixed Bug #727710
bzr-revno: 1361
Fixes: https://launchpad.net/bugs/727710
2011-03-07 19:40:19 +01:00
Tim Bentley
82cb576742 Stop Wizard eating songs databases
bzr-revno: 1360
2011-03-07 18:31:29 +00:00
Tim Bentley
15eb939d76 Fix English 2011-03-07 18:07:13 +00:00
Andreas Preikschat
e535c4e040 fixed Bug #727710
Fixes: https://launchpad.net/bugs/727710
2011-03-07 19:04:40 +01:00
Tim Bentley
faa0d2740a Stop song database overwrite 2011-03-07 17:38:04 +00:00