Commit Graph

5169 Commits

Author SHA1 Message Date
Jonathan Corwin 98b43b4a61 Fix song refresh on remote browser
bzr-revno: 1520
2011-05-06 08:38:37 +01:00
Andreas Preikschat 68c1236a2a 2011-05-06 07:17:13 +02:00
Andreas Preikschat de54c419ce fixed songshowplus importer 2011-05-06 06:36:22 +02:00
Gerald Britton f85ce8dc91 Change a series of "if" into if/elif
bzr-revno: 1519
2011-05-05 22:00:12 +02:00
Jonathan Corwin de9754caf1 Well one standard learnt. Probably a few more to go... 2011-05-05 19:48:11 +01:00
Andreas Preikschat e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Gerald Britton d9afa8ec2d Change series of ifs into if/elif/elif 2011-05-05 14:23:54 -04:00
Andreas Preikschat 2a7c5bd4de names changes 2011-05-05 17:16:55 +02:00
Andreas Preikschat 0c9bea3b50 - removed obsolete code
- fixes
2011-05-05 15:02:12 +02:00
Andreas Preikschat e25145a81b 2011-05-05 13:51:47 +02:00
Jonathan Corwin 9388055376 where did that space come from? 2011-05-04 23:42:35 +01:00
Jonathan Corwin cce8556b45 remote browser: detect change of song, and Android browser ajax cache issue 2011-05-04 23:34:43 +01:00
Tim Bentley b0a0f1c877 head 2011-05-04 18:35:41 +01:00
Tim Bentley bec35e6138 Fix change of display to correct size.
Fixes: https://launchpad.net/bugs/775534
2011-05-04 18:35:24 +01:00
Andreas Preikschat cbd7ae2afc - make start up smoother by setting up the displays correct the first time
- do not pass screens as argument
2011-05-04 19:31:02 +02:00
Andreas Preikschat 307ef744dd - fixed not closed file
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
2011-05-04 09:29:16 +02:00
Andreas Preikschat f2ee6ae8eb - fixed a traceback when pressing the delete button in the theme manager when no theme has been selected
- fixed the delete button being hidden/visible although a theme was selected (using the down/up keys)

bzr-revno: 1515
2011-05-04 07:02:33 +02:00
Armin Köhler 4ee247c8b1 code cleanup
small fixes
2011-05-03 22:34:39 +02:00
Gerald Britton 37a68a4b87 Minor optimization in translate function: Save redundant lookups 2011-05-03 13:36:20 -04:00
Armin Köhler 368987bb67 code cleanup 2011-05-03 19:09:30 +02:00
Andreas Preikschat 96f4f2f747 fixed traceback when deleting theme; fixed delete button being visible/hidden 2011-05-03 19:05:17 +02:00
Armin Köhler d44b42aaff improve BookNameForm (add possibility to reduce the books in the ComboBox and try to autodetect if a bible only contains only parts of a bible, so that only a part of the bible books are displayed at startup) 2011-05-03 13:44:23 +02:00
Armin Köhler 907434c705 HEAD r1512 2011-05-03 09:43:14 +02:00
Armin Köhler 4bee8ca5f6 add a dialog at startup which inform the user that the bible format has changed and provide a possibility to upgrade
small cleanup
2011-05-03 09:41:03 +02:00
Andreas Preikschat 3dd30f5e93 also check for osx 2011-05-02 20:24:28 +02:00
Armin Köhler b9204fa62b small changes 2011-05-02 20:20:38 +02:00
Andreas Preikschat 1dd4e6e1d5 r1511 2011-05-02 19:29:39 +02:00
Andreas Preikschat 52822e119e use qm files from /usr/share/qt4/translation 2011-05-02 19:25:12 +02:00
Armin Köhler 3eca8f6b50 updated bibles_resources.sqlite with some additional apocryph books
comparing books with lower()
display only which are not added to a bible in BookNameForm
small fixes
2011-05-02 15:45:30 +02:00
Armin Köhler 5b93b821b8 HEAD r1511 2011-05-02 15:24:25 +02:00
Armin Köhler b4c3d1d5ae code cleaning 2011-05-02 06:21:18 +02:00
Andreas Preikschat a6790e60c1 - When you are capturing a shortcut, "space" won't uncheck the button (so you can use "space" as shortcut as well) (lines 8-26, 64-66)
- Now you can remove a shortcut (just abort the capturing)

bzr-revno: 1511
2011-05-01 20:03:08 +02:00
Andreas Preikschat ccdd666c72 Fixed the alignment of the Quick Search Tab. (Bug #769998)
bzr-revno: 1510
Fixes: https://launchpad.net/bugs/769998
2011-05-01 20:01:00 +02:00
Tim Bentley da996844b7 Prevent duplicate images
bzr-revno: 1509
Fixes: https://launchpad.net/bugs/772080
2011-05-01 18:55:33 +01:00
Andreas Preikschat 9a997afd81 fixed wording 2011-05-01 18:03:42 +02:00
Andreas Preikschat 76bd824114 added comment 2011-05-01 17:54:05 +02:00
Andreas Preikschat 6c1e66de99 do not check the button 2011-05-01 17:50:48 +02:00
Tim Bentley 19bd7536c3 Need Glasses 2011-05-01 16:15:08 +01:00
Tim Bentley 7436621316 Fix incorrect colour specification
Fixes: https://launchpad.net/bugs/774853
2011-05-01 14:58:28 +01:00
Andreas Preikschat 53fe9666d2 fixed long line 2011-05-01 15:27:19 +02:00
Andreas Preikschat e0b862a897 fixed alignment of the quick tab (bug #769998)
Fixes: https://launchpad.net/bugs/769998
2011-05-01 15:11:47 +02:00
Tim Bentley 8085ffee74 Remove line 2011-05-01 08:21:55 +01:00
Andreas Preikschat f8fdcf8fba allow to empty shortcuts; allow 'space' to be used as shortcut 2011-05-01 09:17:30 +02:00
Tim Bentley 54e1674803 Head push 2011-04-30 18:36:28 +01:00
Tim Bentley f6537acbf4 Updates 2011-04-30 18:36:13 +01:00
Jonathan Corwin f472807251 os.path.splitext includes the . in the extension! 2011-04-30 17:11:28 +01:00
Tim Bentley 54a3dd8412 Remove not needed var and fix 195 strings 2011-04-30 09:37:28 +01:00
Jonathan Corwin e9de9bea92 Fix Presentation bugs 773036 and 769513
bzr-revno: 1505
2011-04-30 09:13:49 +01:00
Tim Bentley 3b805f6374 Add new thread at startup time 2011-04-30 08:42:20 +01:00
Jonathan Corwin 8bec30cf9c Make Impress changes windows specific 2011-04-30 08:31:03 +01:00
Tim Bentley 9a88a7fcf7 Logging and comments 2011-04-30 06:43:41 +01:00
Jonathan Corwin 6584e6a1ed process events not required 2011-04-29 23:31:39 +01:00
Jonathan Corwin 879dfdbb16 head 2011-04-29 23:29:53 +01:00
Jonathan Corwin a9df8468aa Minimized impress troubles 2011-04-29 23:29:29 +01:00
Tim Bentley 69395170e1 minor cleanups 2011-04-29 21:08:22 +01:00
Tim Bentley ddf9c3b61b Remove Var from last merge 2011-04-29 20:24:21 +01:00
Tim Bentley 0f7f03da30 Clean up Phonon media Object creation
bzr-revno: 1503
2011-04-29 20:22:20 +01:00
Tim Bentley 9e721a4824 More improvements 2011-04-29 19:43:29 +01:00
Andreas Preikschat 15d0087a1a - fixed wrong use of strip()
- fixed soft break not working, when used within a line.
- removed redundant code

bzr-revno: 1502
2011-04-29 18:46:10 +02:00
Tim Bentley 189daad93c More improvements 2011-04-29 17:41:26 +01:00
Tim Bentley 08b6d7cee1 Fixes for Jon 2011-04-29 17:27:27 +01:00
Andreas Preikschat 0f51c47d9e fixed spelling 2011-04-29 16:36:29 +02:00
Andreas Preikschat 640815ada3 removed re 2011-04-29 16:31:17 +02:00
Tim Bentley 1eeebeda1c Add Progressbar
bzr-revno: 1501
2011-04-29 14:28:18 +01:00
Tim Bentley 4304d111f1 Live Initialisation Delayed 2011-04-29 12:55:49 +01:00
Andreas Preikschat 5dc73b6a65 started work 2011-04-29 13:33:04 +02:00
Tim Bentley e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Tim Bentley acb4f12ac9 remove comments 2011-04-29 10:07:41 +01:00
Jonathan Corwin ebf5777a02 Fix bug 773036 2011-04-29 09:58:10 +01:00
Tim Bentley e4c0d1227e Fix timer 2011-04-29 09:54:11 +01:00
Tim Bentley 7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Andreas Preikschat 547a7ac14d fix and clean up 2011-04-29 10:28:41 +02:00
Tim Bentley 45d90db949 Allow leading space in song title
bzr-revno: 1500
2011-04-29 08:42:42 +01:00
Andreas Preikschat e76421190b removed redundant code 2011-04-29 09:40:44 +02:00
Tim Bentley f83d52621a Fixes 2011-04-29 08:40:19 +01:00
Raoul Snyman 80b6135c5a Fixed bug #771529, dealing with 1.9.0 databases.
bzr-revno: 1499
2011-04-29 09:22:18 +02:00
Tim Bentley 79dc4948fa Head 2011-04-29 08:11:19 +01:00
Tim Bentley 34838aba06 Fix up Presentation and Image Imports 2011-04-29 08:10:22 +01:00
Andreas Preikschat 44b071680c - modified song <-> xml converter to consider [---] and v1a respectively
bzr-revno: 1498
2011-04-29 09:08:53 +02:00
Raoul Snyman 19d085bb3c Changed [:] notation to .startswith(). 2011-04-29 08:28:09 +02:00
Tim Bentley 188431ce37 Fix up Service Save 2011-04-29 07:21:31 +01:00
Tim Bentley b6b0819a50 fix the strip code
Fixes: https://launchpad.net/bugs/742636
2011-04-29 07:15:10 +01:00
Andreas Preikschat d478395ae0 also split when [---] is within a line 2011-04-29 08:15:09 +02:00
Andreas Preikschat 3ded22fc47 - added Start Loop and Stop Loop to the list of available shortcut actions
- added a new (hidden) action to toggle the loop

bzr-revno: 1497
Fixes: https://launchpad.net/bugs/771966
2011-04-29 07:26:20 +02:00
Raoul Snyman 7f1db15ab1 Fixed bug #771529, dealing with 1.9.0 databases. 2011-04-29 01:25:28 +02:00
Tim Bentley c7e07bdbd5 r1496 2011-04-28 21:11:11 +01:00
Tim Bentley dd597e472f Head 2011-04-28 19:13:48 +01:00
Tim Bentley 17d74a8d9a Add Load service Progress Bar 2011-04-28 19:13:19 +01:00
Tim Bentley 7cb23485ae with render 2011-04-28 17:53:27 +01:00
Tim Bentley e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Andreas Preikschat aea4909201 added missing space 2011-04-28 18:36:53 +02:00
Andreas Preikschat e9ec8aaaaf added shorcuts for start/stop/toggle loop (#771966)
Fixes: https://launchpad.net/bugs/771966
2011-04-28 18:32:37 +02:00
Raoul Snyman d7d51c614a Fix bug #744515, OSIS import fails to import certain words in ESV (at least)
bzr-revno: 1495
Fixes: https://launchpad.net/bugs/744515
2011-04-28 14:43:13 +02:00
Andreas Preikschat 9996320522 fixed verse splitting where not necessary 2011-04-28 08:44:48 +02:00
Andreas Preikschat 9aa1f580d2 fixed right/left shortcuts 2011-04-28 08:36:04 +02:00
Tim Bentley b081c20128 Fix blank line 2011-04-27 20:44:21 +01:00
Tim Bentley c9d69c55cd Fix soft break 2011-04-27 18:41:03 +01:00
Raoul Snyman d23e564539 Fixed bug #744515, funny quotes in KJV imported from OSIS. 2011-04-27 18:15:35 +02:00
Raoul Snyman f732d24f35 Fixed bug #744515, OSIS import fails to import certain words in ESV (at least). 2011-04-27 16:54:27 +02:00
Raoul Snyman 35cb2b2fa6 Fix up the multicolouredness. 2011-04-27 12:30:29 +02:00
Raoul Snyman 86a05a38b5 Fixed bug #752212. Added a revert button to revert the image to the default OpenLP image. Also moved things slightly to for the dialog to look a little better on other platforms/DEs. 2011-04-27 11:00:37 +02:00
Tim Bentley 0476fe8b27 Minor cleanups 2011-04-26 20:09:56 +01:00
Armin Köhler 2f346ee450 small changes 2011-04-26 20:55:13 +02:00
Tim Bentley 1d830ee1f0 Merged with head and Andreas 2011-04-26 19:52:46 +01:00
Tim Bentley 3923c14d0c Head 2011-04-26 19:39:32 +01:00
Tim Bentley 772c9cb2ca Chnages 2011-04-26 19:39:21 +01:00
Armin Köhler 3b99f531f3 small fixes 2011-04-26 20:39:08 +02:00
Tim Bentley a1f4d5cd2b Fix error in Theme Wizard backgrounds
bzr-revno: 1491
Fixes: https://launchpad.net/bugs/769988
2011-04-26 19:25:52 +01:00
Armin Köhler 6c23c18db5 HEAD r1490 2011-04-26 20:22:36 +02:00
Jonathan Corwin 4e6c61cc01 Fix issues when importing some OpenSong songs. Bug 759586
bzr-revno: 1490
Fixes: https://launchpad.net/bugs/759586
2011-04-26 19:18:14 +01:00
Armin Köhler d7dc4def53 change name from reimport to upgrade
fix speed problem while changing the advanced bible
change some "for" loops
2011-04-26 20:18:13 +02:00
Meinert Jordan 62d55814d2 - fix the recreation of the song order to work with single character verse references
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
2011-04-26 19:16:13 +01:00
Andreas Preikschat 68fdc7dee9 fixed virtue breaks, fixed word break 2011-04-26 19:03:19 +02:00
Andreas Preikschat 9c6a400634 merged with lp:~trb143/openlp/beta1 2011-04-26 17:34:25 +02:00
Jonathan Corwin a080552081 head 2011-04-25 23:37:58 +01:00
Jonathan Corwin 5bc0c27970 OpenSong fixes bug 759586 2011-04-25 23:15:38 +01:00
Jonathan Corwin 5887033238 Changes to the service print html/css
serviceprint.css can now be deleted and has been replaced by service-print.css. There have been changes to the css/html which will be documented on the wiki

bzr-revno: 1486
2011-04-25 17:22:16 +01:00
Tim Bentley 100fb77456 Fix double edit 2011-04-25 11:26:21 +01:00
Jonathan Corwin 504a471491 o123hallo points 2011-04-25 11:13:13 +01:00
Andreas Preikschat dd655f84b1 - mark a service as modified when item notes have been changed
bzr-revno: 1485
2011-04-25 11:54:33 +02:00
Andreas Preikschat f89e362b5d mark service as modified when item notes have been edited 2011-04-25 10:35:48 +02:00
Tim Bentley abf44320c3 Set correct field to blank 2011-04-25 08:56:13 +01:00
Andreas Preikschat 77063381d2 call set_defaults() when logging an error 2011-04-25 09:23:45 +02:00
Tim Bentley a173bce047 Minor fix 2011-04-25 08:13:17 +01:00
Tim Bentley 10fca2dd05 Remove theme image if moving from image to solid or gradient.
Fixes: https://launchpad.net/bugs/769988
2011-04-25 08:06:35 +01:00
Andreas Preikschat c12b4bc28f - improved the song importers by allowing to provide feedback to the user.
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
2011-04-25 09:06:16 +02:00
Tim Bentley 6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Jonathan Corwin 81c63146f5 remove print statement 2011-04-24 20:54:48 +01:00
Jonathan Corwin 8965e4a730 head 2011-04-24 20:50:58 +01:00
Jonathan Corwin ae874f09bf Print Service cleanups 2011-04-24 20:50:28 +01:00
Andreas Preikschat 5436328d29 - fixed wrong alternate button text (when there is no primary shortcut)
- fixed assigning a shortcut twice (when resetting an action with the clear button)

bzr-revno: 1482
2011-04-24 19:11:53 +02:00
Andreas Preikschat 393f25cd88 fixed a bug where a song's author/topic/songbooks might not be saved 2011-04-24 17:36:12 +02:00
Andreas Preikschat f7e81ad70a fixe possible bug when using the clear buttons 2011-04-24 16:44:40 +02:00
Andreas Preikschat 03e9aeda84 changed name 2011-04-23 17:40:07 +02:00
Andreas Preikschat 2167a697dd log empty default_translator 2011-04-23 17:15:01 +02:00
Andreas Preikschat 5a54a82345 r1480 2011-04-23 16:42:12 +02:00
Andreas Preikschat 70ae7d119d fixed another translation bug 2011-04-23 16:40:37 +02:00
Jonathan Corwin e352635511 Extra location checks for pptview.exe. Remove dll from bzr and change windows build to create it (without debug)
bzr-revno: 1480
2011-04-23 12:33:27 +01:00
Andreas Preikschat 500e555672 - fixed logo pixelation
- removed logo from maindisplay

bzr-revno: 1479
2011-04-23 11:15:52 +02:00
Andreas Preikschat c66ffbd725 removed import 2011-04-22 09:06:38 +02:00
Andreas Preikschat 65925efd25 fixed logo pixelation 2011-04-22 08:30:07 +02:00
Andreas Preikschat ba45d7e113 fixed names; hide/show menu entries when disabeling/enabeling the songs plugin 2011-04-21 19:14:07 +02:00
Armin Köhler 8e1ef8c890 little bug fix
add check if openlp/bibles/resources directory exists and mkdir if not
2011-04-21 16:32:04 +02:00
M2j 2582b33768 syntax fix 2011-04-21 11:02:41 +02:00
M2j 8439d1ed4f fix verse order rebuild to handle single character verse references
rename variable to avoid using the 'type' keyword
2011-04-21 10:53:48 +02:00
M2j a80a953980 Head 1477 2011-04-21 10:51:32 +02:00
M2j 073e68e8d5 translation string fixes 2011-04-21 10:47:52 +02:00
Jonathan Corwin c0b0c1a82d tabs to spaces *grr at VC++* 2011-04-21 08:35:17 +01:00
Jonathan Corwin 09d101311c head 2011-04-21 08:30:14 +01:00
Jonathan Corwin f3f1836150 remove pptviewlib.dll and build it via windows-builder.py 2011-04-21 00:21:31 +01:00