raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
8,885 Commits 5 Branches 0 Tags 296 MiB
76de0f0c60
Commit Graph

6895 Commits

Author SHA1 Message Date
Tim Bentley
0e2d6cb45f Replace u'' for None 
bzr-revno: 1755
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:48:22 +01:00
Tim Bentley
58695ac6f6 Change None to u'' for printing 
Fixes: https://launchpad.net/bugs/855368
 2011-09-21 18:23:04 +01:00
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Martin Zibricky
6e4c619cbd Add openlyrics export with formatting tags support. 2011-09-21 01:06:43 +02:00
Raoul Snyman
854cdf2c83 Fixed bug #803342. 
bzr-revno: 1754
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 20:03:42 +02:00
Raoul Snyman
b0dc146043 Added the default background colour back in so that the rest of the app that is not expecting to have to supply a background colour doesn't have to be changed. 
Fixes: https://launchpad.net/bugs/803342
 2011-09-20 19:53:09 +02:00
Andreas Preikschat
9cab0f223c Fixed bug 805088 (Display tags do not work on second slide when slide is split) 
bzr-revno: 1753
 2011-09-20 18:34:33 +02:00
Raoul Snyman
bd3961eb50 Reverted a change for deprecated options (for now). 2011-09-20 18:26:04 +02:00
Raoul Snyman
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02:00
Tim Bentley
3cec8cbb17 Fix crash on service load of some people. 
Fix loop on config exit under extreme activities!

bzr-revno: 1752
Fixes: https://launchpad.net/bugs/854171
 2011-09-20 17:11:49 +01:00
Martin Zibricky
74c5669194 Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag 2011-09-20 17:52:19 +02:00
Andreas Preikschat
920a65b4e1 fix detection when tag exists more than once 2011-09-20 17:50:43 +02:00
Tim Bentley
47b7379967 Fix spelling and remove print statement 2011-09-20 16:41:04 +01:00
Tim Bentley
834ed570ce Fix bug where string is added to image instead of QColor. 
Fix issue where queue has records to process but it is not running.

Fixes: https://launchpad.net/bugs/854171
 2011-09-20 16:23:29 +01:00
Raoul Snyman
429a1a4541 Remove reference to the non-existent __del__ method. 
Fixes: https://launchpad.net/bugs/854125
 2011-09-19 20:55:34 +02:00
Andreas Preikschat
240d612948 fixed doc 2011-09-19 18:13:38 +02:00
Andreas Preikschat
724e2be04f close tags 2011-09-19 18:00:27 +02:00
Martin Zibricky
039115c7f4 Fix issue with more new lines when having more <lines> element in openlyrics document. 2011-09-19 14:59:37 +02:00
Martin Zibricky
b27784e838 Add comments to some new functions 2011-09-19 01:00:55 +02:00
Martin Zibricky
fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Martin Zibricky
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Andreas Preikschat
734c868223 removed semicolon 2011-09-18 17:39:12 +02:00
Stevan Pettit
0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard. 
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
 2011-09-18 14:09:32 +01:00
Tim Bentley
f19db2e5dc Fix lists to sort if new items are added for Images, Media and Presentations 
bzr-revno: 1748
Fixes: https://launchpad.net/bugs/827027
 2011-09-18 14:07:27 +01:00
Andreas Preikschat
ceec3d6f3a reverted not necessary change 2011-09-18 12:32:27 +02:00
Andreas Preikschat
d856e957b4 removed FIXME 2011-09-18 12:30:14 +02:00
Andreas Preikschat
2dad85f4c5 r1749 2011-09-18 12:28:53 +02:00
Andreas Preikschat
d62876b411 r1749 2011-09-18 12:28:27 +02:00
Andreas Preikschat
cd33d807fc removed test code 2011-09-18 12:28:10 +02:00
Andreas Preikschat
3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Stevan Pettit
c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley
d47189e904 Remove unneeded timer logger . Was from old renderer 2011-09-17 14:05:28 +01:00
Tim Bentley
11424c8a7a Only load list if changed 2011-09-17 09:28:33 +01:00
Tim Bentley
62979a0062 Sort for added items in Images, Media and Presentations 
Fixes: https://launchpad.net/bugs/827027
 2011-09-17 09:20:03 +01:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02:00
Tim Bentley
6a901f2de9 Add justify to theme options 
Fixes: https://launchpad.net/bugs/802252
 2011-09-16 18:23:39 +01:00
Martin Zibricky
614ad790ae Fix spelling mistake 2011-09-16 13:31:11 +02:00
Raoul Snyman
f6927ef5b7 Fixed bug #851653, where deleting a song without audio files raised an exception. 
bzr-revno: 1747
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 13:20:44 +02:00
Raoul Snyman
1afcbbc837 Fixed bug #851653, added an if statement, and fixed the orphaned variable. 
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 10:15:37 +02:00
Martin Zibricky
a7cd6c8a17 fix typo in comment 2011-09-15 19:44:03 +02:00
Martin Zibricky
82163867fe Add docstrings to some new openlyrics methods. 2011-09-15 14:23:40 +02:00
Tim Bentley
52c63d9665 Undo fix 2011-09-14 21:35:32 +01:00
Tim Bentley
53b3b394e9 Turn off autopreview when deleting images. 
Stops images being deleted trying to preview themselves.

Fixes: https://launchpad.net/bugs/835033
 2011-09-14 21:27:30 +01:00
Martin Zibricky
526365153f rename in xml.py only_process_format_tags to parse_and_not_save 2011-09-13 22:40:34 +02:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Tim Bentley
7469c08674 Head 2011-09-13 19:13:25 +01:00
Stevan Pettit
1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Stevan Pettit
25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky
50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00
Martin Zibricky
fb664bed0c Remove openlyrics tests for easier merging. They will be merged later. 2011-09-12 22:35:39 +02:00
Raoul Snyman
2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Raoul Snyman
807aac95ee Delete audio files when you delete a song. 2011-09-12 19:09:11 +02:00
Raoul Snyman
017359ff5c Fixed up audio file import from version 1.2, plus a few bits I missed from renaming things. 2011-09-12 18:35:32 +02:00
Raoul Snyman
906b0fe67e Added support for copying files from openlp.org 1.2.x. 2011-09-12 08:29:58 +02:00
Raoul Snyman
75fda95339 HEAD 2011-09-12 06:59:07 +02:00
Martin Zibricky
50e1964795 Remove the db_file_path option from db.Manager init function 2011-09-11 22:39:33 +02:00
Martin Zibricky
606e19734c Allow to override data dir for tests 2011-09-11 22:29:25 +02:00
Stevan Pettit
c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky
5c13123cef Delete print statement 2011-09-10 22:15:23 +02:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Tim Bentley
b3cb4a21f4 fixes 2011-09-09 20:14:19 +01:00
Tim Bentley
ea7c5c4b9e Head 2011-09-09 19:19:48 +01:00
Stevan Pettit
e560371e53 Added code to allow canceling of downloads and to completely bypass any downloads is there is no internet access in the First Time Wizard 
bzr-revno: 1742
Fixes: https://launchpad.net/bugs/836980, https://launchpad.net/bugs/836611
 2011-09-09 07:45:43 +02:00
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Stevan Pettit
2c589f8b0e Added code to allow canceling of file downloads. Fixed aparent hang if no internet connection. 2011-09-08 09:14:51 -04:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Tim Bentley
e93a1d2687 Hide the screen on startup if only 1 screen 
Fixes: https://launchpad.net/bugs/800156
 2011-09-06 20:32:30 +01:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Andreas Preikschat
c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky
46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
14ffb6d3c1 HEAD 2011-09-06 07:05:34 +02:00
Stevan Pettit
796e779300 Fixed various issues around the exporting and importing of settings. 
bzr-revno: 1740
Fixes: https://launchpad.net/bugs/838831
 2011-09-05 19:21:12 +02:00
Stevan Pettit
b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman
11f5a29b6d Added some openlp_process_events signals and move the hiding of the finish button higher up in the code. 
Fixes: https://launchpad.net/bugs/837319
 2011-09-04 23:00:37 +02:00
Raoul Snyman
3a87f3dff1 Songs can now have attached audio files, which are stored in services, and imported if the song needs to be imported. 
bzr-revno: 1738
Fixes: https://launchpad.net/bugs/739770
 2011-09-04 22:00:10 +02:00
Raoul Snyman
79bb94c6b0 Removed empty directories. 2011-09-04 14:04:44 +02:00
Raoul Snyman
a32e2b9d1b Hopefully fixed the problem where existing audio files are deleted. 2011-09-04 11:26:13 +02:00
Stevan Pettit
30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Martin Zibricky
4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02:00
Martin Zibricky
0de5d5e09a [merge] merge with trunk r1736 2011-09-03 10:35:47 +02:00
Stevan Pettit
50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
Martin Zibricky
9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Martin Zibricky
e4f3041802 Add pytest to optional dependencies in check_dependecies.py 2011-09-02 13:10:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman
2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman
abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman
4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman
0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman
c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
Raoul Snyman
8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Andreas Preikschat
d85128829e Fix Renderer - again 
bzr-revno: 1735
 2011-08-30 19:10:52 +01:00
Mattias Põldaru
af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach
709037ccca review changes part 2 and Head 2011-08-30 18:58:12 +02:00
rimach
38e08a5c8b Head 2011-08-30 18:56:52 +02:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
Andreas Preikschat
71bdaf0708 comments 2011-08-30 17:15:39 +02:00
Andreas Preikschat
25ce484fb1 hopefully fixed it now completely 2011-08-30 17:12:16 +02:00
Andreas Preikschat
88704fbc68 fix soft break 2011-08-30 15:35:06 +02:00
rimach
169f8a2942 review changes 2011-08-29 23:52:26 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
Andreas Preikschat
6c7527349d do not use the same name twice 2011-08-29 22:58:32 +02:00
Andreas Preikschat
ccd0a46e2b do not expand the tags 2011-08-29 22:56:07 +02:00
Raoul Snyman
540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
Martin Zibricky
1d05abbe04 Necessary changes for automated gui tests to work. 
bzr-revno: 1732
 2011-08-29 22:05:06 +02:00
rimach
d7f4298fbb bugfixing and Head 2011-08-29 21:59:12 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman
bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit
7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru
44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Andreas Preikschat
d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Andreas Preikschat
f046edc615 - fixed bug #796528 (Renderer splits slides twice even when the there is enough space) 
- fixed method confusion

bzr-revno: 1729
Fixes: https://launchpad.net/bugs/796528
 2011-08-29 08:21:24 +02:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +02:00
Raoul Snyman
532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00
Andreas Preikschat
fc71905735 append text to the last slide (if more than one) 2011-08-28 19:46:52 +02:00
Raoul Snyman
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
bf1d8c239f Added code to mainwindow.py to allow exporting/importing of OpenLP settings to an INI file. 
During importing, the selected file is checked to insure it is an OpenLP settings file.
The user is warned prior to the import that changes will be made.

I also changed the settings section of an entry in servicemanager from "service" to "servicemanager".

I changed my nick in about.

Changed the import restart message.
Removed need for "import string".
Fixed the Try:

Changed filetype of export settings file from .ini to .conf

bzr-revno: 1728
 2011-08-28 18:41:07 +01:00
Andreas Preikschat
bc1f2d2977 removed wrong line 2011-08-28 18:59:09 +02:00
Andreas Preikschat
2acd1ae2ad added comments 2011-08-28 18:04:18 +02:00
Andreas Preikschat
2364ea72c2 hopefully completed the fix 2011-08-28 17:53:27 +02:00
Stevan Pettit
9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Stevan Pettit
d4e6c44d21 Fixed signal name 2011-08-27 16:42:22 -04:00
Tim Bentley
67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +01:00
Tim Bentley
3f078a553f Head 2011-08-27 16:04:11 +01:00
Tim Bentley
c1a648900f Fix initial setup bug 2011-08-27 16:02:45 +01:00
Andreas Preikschat
f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Andreas Preikschat
65630c6853 r1726 2011-08-27 13:24:24 +02:00
Andreas Preikschat
8020869dec - added some hints that the exporter export OpenLyrics files 
bzr-revno: 1726
 2011-08-27 13:19:55 +02:00
Tim Bentley
9949fba4ae Update songusage database to add plugin and what type of access. 
Amend triggers to record the correct data
Update report to output the new data items.

Apply fix in bug to allow Meda_data tables to be defined in core

bzr-revno: 1725
 2011-08-27 09:15:55 +01:00
Tim Bentley
611577577f Remove extra imports 2 2011-08-27 07:12:03 +01:00
Tim Bentley
9de4c0c118 Remove extra imports 2011-08-27 07:07:30 +01:00
Stevan Pettit
3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman
c81117991a HEAD 2011-08-26 22:59:27 +02:00
Tim Bentley
ed57b9bfbd Record timestamps of changes in songs database 
bzr-revno: 1724
 2011-08-26 20:51:14 +01:00
Tim Bentley
01128d4dc7 Fix report and triggers 2011-08-26 20:31:02 +01:00
Tim Bentley
1e4b922bfa DB Fixed 2011-08-26 20:09:25 +01:00
Tim Bentley
2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
Tim Bentley
f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fa85525a68 r1723 2011-08-26 17:32:37 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +02:00
Andreas Preikschat
6c3d156363 fixed inversion :-D 2011-08-26 17:22:57 +02:00
Andreas Preikschat
407b342f45 changed 'switch' name 2011-08-26 17:15:17 +02:00
Andreas Preikschat
953ff87ff5 do not delete temporary tags when resetting the list; preparations 2011-08-26 17:06:22 +02:00
Andreas Preikschat
627b9429aa documented formatting tags; added infrastructure to allow temporary formatting tags 2011-08-26 16:27:53 +02:00
Andreas Preikschat
dd00f95f64 r1723 2011-08-26 15:18:06 +02:00
Stevan Pettit
24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04:00
Tim Bentley
4f0c7716bc Fix default value 2011-08-26 14:13:32 +01:00
Tim Bentley
dec8ce3a8d Add ability to set colours around borders of images and in themes. 
May not be to all tastes ;-)

bzr-revno: 1722
 2011-08-26 13:20:49 +01:00
Tim Bentley
1adac78588 Add date fields to songs 2011-08-26 13:02:06 +01:00
Raoul Snyman
2c0df18f35 - Implemented a seamless database upgrade system. 
- Added the first upgrade as a demonstration.
- Added database version check so that newer version databases are not loaded.

bzr-revno: 1721
 2011-08-26 13:39:32 +02:00
Martin Zibricky
eef0af11ac Fix error msg with corrupted file 2011-08-26 13:04:56 +02:00
Tim Bentley
61feddd34e Fix method call 2011-08-26 11:21:47 +01:00
Tim Bentley
869bc9bb20 Fix field name 2011-08-26 09:21:27 +01:00
Raoul Snyman
4b1ce7102e A few more tweaks as requested by Andreas. 2011-08-25 22:14:02 +02:00
Raoul Snyman
bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Tim Bentley
d5717a486e Head 2011-08-25 20:53:37 +01:00
Tim Bentley
5f6b315c4a fix trace 2011-08-25 20:52:07 +01:00
Stevan Pettit
d927adbe5a Changed import re-start message. Removed need for "import string" 2011-08-25 14:40:44 -04:00
Tim Bentley
803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Tim Bentley
ba3fb9221e Head 2011-08-25 19:22:38 +01:00
Martin Zibricky
20c431a6e5 - Remove darwin specific dead code 
- Move app.setOrganization and app.setApplication to orgininal place
 2011-08-25 17:33:21 +02:00
Stevan Pettit
215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Raoul Snyman
ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Martin Zibricky
1dc05c0f66 Add ability to run openlp without app.exec_() method (needed to run gui tests) 2011-08-25 13:16:04 +02:00
Martin Zibricky
7fae06483a Move main() from openlp.pyw to openlp.core.__init__ 2011-08-25 12:04:17 +02:00
Raoul Snyman
923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00
Martin Zibricky
68facbf2b5 Move class OpenLP from openlp.pyw to openlp.core.__init__ 2011-08-25 11:04:41 +02:00
Raoul Snyman
7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +02:00
Stevan Pettit
9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04:00
Raoul Snyman
cdcfeaece8 Keeping things tidy: Actually save to DB now, and delete removed files. 2011-08-24 14:22:39 +02:00
Raoul Snyman
122c2226bd Now copying files too\! 2011-08-24 13:53:22 +02:00
Andreas Preikschat
50b820af4e try to fix gradient when using html5 doctype 2011-08-24 10:34:15 +02:00
Raoul Snyman
d5e92c0d35 Added a media files form and populated it from the media plugin, if the media plugin is enabled. 2011-08-23 23:48:46 +02:00
rimach
d64d22533f preview issue fixed, sync with trunk 2011-08-23 22:29:11 +02:00
rimach
229fe56305 Head 2011-08-23 22:28:09 +02:00
rimach
565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
Andreas Preikschat
0d99f5be96 hopefully fixed bug #796528 (to be cleaned up 
Fixes: https://launchpad.net/bugs/796528
 2011-08-23 21:57:29 +02:00
Raoul Snyman
6a60ece204 Added Up, Down, Remove and Remove All buttons. Reworked the UI to make use of the buttons better. 2011-08-23 15:44:50 +02:00
Stevan Pettit
131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Raoul Snyman
409a16eb35 Added the tab, list and buttons for linked audio. 2011-08-23 08:38:02 +02:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01:00
Andreas Preikschat
e209c81fed simplification 2011-08-22 16:11:37 +02:00
Andreas Preikschat
650dc83aeb do not use re with xml 2011-08-22 15:39:02 +02:00
Stevan Pettit
b36a4f74d3 Fixed traceback error when adding ini to filename 2011-08-21 19:15:16 -04:00
Andreas Preikschat
b0df1bdd94 - changed menu shortcut letter 
bzr-revno: 1718
 2011-08-21 21:15:36 +02:00
Tim Bentley
d1f823d864 More fixes 2 2011-08-21 19:02:58 +01:00
Tim Bentley
6c55362eee More fixes 2011-08-21 17:59:03 +01:00
Tim Bentley
62cffbb3b6 Review fixes and improvements 2011-08-21 17:13:45 +01:00
Stevan Pettit
79ab8cc1c0 Added code to always create a filename.INI file. 2011-08-21 10:05:24 -04:00
Tim Bentley
21bf34c436 Theme fix 2011-08-21 06:33:07 +01:00
Tim Bentley
76c0881559 Head 1716 2011-08-21 05:51:19 +01:00
Tim Bentley
d660d1d5ae Add missing file 2011-08-21 05:51:03 +01:00
Andreas Preikschat
8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +02:00
Raoul Snyman
8957c5e4bf Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
bzr-revno: 1716
Fixes: https://launchpad.net/bugs/825809
 2011-08-20 20:48:27 +02:00
Andreas Preikschat
c7d875a67f compatibility for OpenLyrics files created with OpenLP 1.9.6 and OpenLyrics 0.7 2011-08-20 19:39:38 +02:00
Andreas Preikschat
0ab092e56e removed _get method 2011-08-20 19:15:31 +02:00
Andreas Preikschat
23733608ef adapted virtual breaks in OpenLyrics implementation for the upcomming 0.8 release 2011-08-20 19:06:48 +02:00
Tim Bentley
3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Tim Bentley
cc1e174d62 Updates 2011-08-20 14:21:25 +01:00
Tim Bentley
9e6d05098b 1715 2011-08-20 12:46:18 +01:00
Tim Bentley
ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00
Andreas Preikschat
d668f2d87c - changed instance varaibles to camelCase 
bzr-revno: 1715
 2011-08-20 10:24:17 +02:00
Andreas Preikschat
9363177e9d - Fixed bug #804747 (Bible disappear after upgrade)\n- Fixed bug Bug #824129 (Bibles plugin does not always delete corrupted bibles from falied imports)\n- Removed not needed or redundant variables.\n- Removed not needed code.\n- When upgrading bibles move the files to the temp directory.\n- clean ups 
bzr-revno: 1714
Fixes: https://launchpad.net/bugs/804747, https://launchpad.net/bugs/824129
 2011-08-20 10:23:18 +02:00
Andreas Preikschat
5b28d384fe Fixed bug #826483 (NIV 2010 web bible missing chapters) 
bzr-revno: 1713
Fixes: https://launchpad.net/bugs/826483
 2011-08-20 10:21:42 +02:00
Andreas Preikschat
a69705ccd3 Fixed song meta data in OpenLyrics files to contain the application version 
bzr-revno: 1712
 2011-08-20 10:20:28 +02:00
Stevan Pettit
9f284d9ab2 Moved export/import settings menu items from tools to file menu. Added status-tips 2011-08-18 22:43:08 -04:00
Andreas Preikschat
9baa1374b6 changed instance varaibles to camelCase 2011-08-17 18:16:43 +02:00
Andreas Preikschat
d7ae55f733 improved deletion of corrupted files on windows (bug #824129) 
Fixes: https://launchpad.net/bugs/824129
 2011-08-17 14:08:33 +02:00
Andreas Preikschat
7159559eaa removed not needed code (this case should never occur and if it does, the manager instance should delete the file) 2011-08-17 13:08:32 +02:00
Andreas Preikschat
29b67efed6 close connection to database when the upgrade failed, to prevent errors on windows 2011-08-17 12:47:01 +02:00
Stevan Pettit
b95924ae74 Added code to export/import settings via an ini file 2011-08-16 22:58:07 -04:00
Raoul Snyman
ca5c8d9a0b Fixed bug #802146: Couldn't import some SongShowPlus files. Rearranged the file menu as well to be in a more logical order, and to look a little nicer. 
Fixes: https://launchpad.net/bugs/802146
 2011-08-16 23:19:57 +02:00
Raoul Snyman
301993a3ea Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
Fixes: https://launchpad.net/bugs/825809
 2011-08-16 21:53:52 +02:00
Mattias Põldaru
da758fbb89 Removed wrong comment 2011-08-16 11:46:55 +03:00
Mattias Põldaru
509bc9e704 Two last importers, which did not stop on cancel. 2011-08-16 03:59:45 +03:00
Mattias Põldaru
bbba7203e3 Fix #249 on tracker, exception on opensong files with verse name containing only number [1] 2011-08-16 03:08:16 +03:00
Mattias Põldaru
a3ddb50479 Now we do not read several GB video files entirely into memory when opening service, this also fixes #257 in tracker. 2011-08-16 01:46:31 +03:00
Mattias Põldaru
bdde2a4fb4 String fix. 2011-08-16 01:44:02 +03:00
Mattias Põldaru
aca0a86915 Fix comparison of always unequal unicode and non-unicode string on drag-and-drop. 2011-08-16 01:42:48 +03:00
Mattias Põldaru
7ab1538460 Supposed to fix #819271, crash when downloading some chapters. 2011-08-15 12:54:07 +03:00
Andreas Preikschat
9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat
d46eecd96d - added spellchecker to service notes dialog (bug #825979); - escape texts in various places (bug #825983) 
bzr-revno: 1710
Fixes: https://launchpad.net/bugs/825979, https://launchpad.net/bugs/825983
 2011-08-15 11:28:49 +02:00
Andreas Preikschat
cdec32f706 remove print 2011-08-15 11:05:28 +02:00
Andreas Preikschat
07e9e3fe93 fix failure dectection 2011-08-15 10:55:36 +02:00
Andreas Preikschat
5607f025f6 fixed bug #826483 
Fixes: https://launchpad.net/bugs/826483
 2011-08-15 10:53:51 +02:00
Andreas Preikschat
da1db9994d removed not needed code 2011-08-15 09:35:37 +02:00
Andreas Preikschat
c70ac5e656 create temp directory name in constructor 2011-08-15 08:31:36 +02:00
Andreas Preikschat
928467847e do not call postWizard twice 2011-08-14 16:35:36 +02:00
Andreas Preikschat
924482ac51 prevent closing an already closed database 2011-08-14 15:49:03 +02:00
Andreas Preikschat
41b3bde919 changed underscore varialbe to camelCase 2011-08-14 15:11:41 +02:00
Andreas Preikschat
17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983) 
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
 2011-08-14 15:05:39 +02:00
Andreas Preikschat
3f489ddbaf fixed song meta data to include application name 2011-08-14 12:56:05 +02:00
Andreas Preikschat
8a926b01e1 Auto-completer does not work immediately after importing/upgrading a bible (bug #825181) 
Fixes: https://launchpad.net/bugs/825181
 2011-08-13 12:49:53 +02:00
Andreas Preikschat
ec93173891 r1708 2011-08-13 12:41:57 +02:00
Andreas Preikschat
259b57badd added try/except 2011-08-13 12:41:21 +02:00
Andreas Preikschat
b72b538893 removed variable; hopefully fixed windows crahes 2011-08-13 12:14:20 +02:00
Andreas Preikschat
6c96794af1 restore not upgraded bibles; clean ups 2011-08-12 17:31:16 +02:00
Andreas Preikschat
11f3a9e13a removed code; moved clean_filename method to utils 2011-08-12 16:54:16 +02:00
Andreas Preikschat
3f3ab71eeb more clean ups 2011-08-12 15:38:05 +02:00
Andreas Preikschat
4831cf0a7c more clean ups 2011-08-12 15:16:06 +02:00
Andreas Preikschat
0924bfc246 fixed bug #804747; clean ups 
Fixes: https://launchpad.net/bugs/804747
 2011-08-12 15:11:30 +02:00
Andreas Preikschat
cb16463d99 moved recent files to a menu (bug #818794) 
bzr-revno: 1708
Fixes: https://launchpad.net/bugs/818794
 2011-08-11 13:40:52 +02:00
Stevan Pettit
f92552735f fixed bug 802150 (Attempt to save a service causes a crash when image/media/presentation files do not exist) 
bzr-revno: 1707
Fixes: https://launchpad.net/bugs/802150
 2011-08-11 11:20:29 +02:00
Andreas Preikschat
ba02eb6a98 moved recent files to a menu (bug #818794) 
Fixes: https://launchpad.net/bugs/818794
 2011-08-11 11:01:25 +02:00
Stevan Pettit
c0978d8e22 Added code to skip-all missing files during service save 2011-08-10 17:29:44 -04:00
Chris Blake
95f75ce266 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 15:15:45 -04:00
Chris Blake
e75631d7f5 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 13:30:45 -04:00
Chris Blake
2c6d14cfc8 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 12:59:56 -04:00
Andreas Preikschat
f2090100a1 Fixed link to 'Contributing' site. 
bzr-revno: 1705
 2011-08-08 10:46:07 +02:00
Andreas Preikschat
c27d50bdda fixed link to 'Contributing' site 2011-08-08 08:30:25 +02:00
Andreas Preikschat
ffbfd1efe9 - improved code readability 
- updated docstrings

bzr-revno: 1704
 2011-08-07 16:37:40 +02:00
Stevan Pettit
392c103476 Fixed bug #818791 ("Reorder Service Item" does not manage two instances of the same image) 
bzr-revno: 1703
Fixes: https://launchpad.net/bugs/818791
 2011-08-06 16:06:28 +02:00
Stevan Pettit
271e5341f8 modified code to delete/move item selected, not first match in list 2011-08-05 18:09:51 -04:00
Stevan Pettit
a66f7f3365 removed un-needed commented code. fixed dialog "no" answer 2011-08-05 17:53:56 -04:00
Andreas Preikschat
6c7c27a7c9 fixed bug #816186; fixed comments; fixed list comprehension 
Fixes: https://launchpad.net/bugs/816186
 2011-08-05 13:21:39 +02:00
Tim Bentley
4e043e1dcf Add DnD to Openlp form outside 
bzr-revno: 1701
 2011-08-05 09:55:37 +01:00
Andreas Preikschat
6ce4e7beab changed varialbe name 2011-08-05 10:47:31 +02:00
Andreas Preikschat
d8008df902 do not pass instance variable as argument 2011-08-05 10:43:32 +02:00
Andreas Preikschat
f4eb21eb05 more docstrings, clean ups 2011-08-05 10:10:53 +02:00
Andreas Preikschat
8876a12deb updated docstring 2011-08-05 09:41:20 +02:00
Andreas Preikschat
383d512c22 r1700 2011-08-05 09:26:48 +02:00
Stevan Pettit
5e6c60da88 Modified firsttimeform to include existing themes in the set default theme list, if the wizard is being re-run. 
bzr-revno: 1700
 2011-08-05 07:52:44 +02:00
Stevan Pettit
b4e776b92c removed un-needed code 2011-08-04 09:43:05 -04:00
Tim Bentley
ecd7a197de Fix conflict 2011-08-04 05:51:41 +01:00
Stevan Pettit
7f440527f8 modified servicemanager to check for missing files during service save 2011-08-03 14:49:47 -04:00
Tim Bentley
5ff39a7d83 Fix missing() 2011-08-03 16:52:29 +01:00
Stevan Pettit
af7ff7c6be changed some comments, removed a variable using functioin inline 2011-08-03 09:19:43 -04:00
Andreas Preikschat
dd3daa0576 - changed "Customize Shortcuts" to "Configure Shortcuts" 
- fixed bug #816382 (Formatting Tags or Display Tags?)

bzr-revno: 1699
Fixes: https://launchpad.net/bugs/816382
 2011-08-02 21:18:44 +02:00
Tim Bentley
0b46165429 Last set of fixes 2011-08-02 19:17:07 +01:00
Stevan Pettit
af8a89dfd4 fixed come comments 2011-08-02 08:51:41 -04:00
Tim Bentley
644706a62a Fix review comments and cleanups 2011-08-02 06:07:09 +01:00
Stevan Pettit
c608a0750d Modified firsttimeform to include existing themes when wizard is re-run 2011-08-01 21:58:10 -04:00
Tim Bentley
c9c0904c31 Head 2011-07-30 17:00:11 +01:00
Stevan Pettit
4db1e54023 Added the ability to re-run the First Time Wizard (bug #801325) 
bzr-revno: 1698
Fixes: https://launchpad.net/bugs/801325
 2011-07-30 14:24:08 +02:00
Andreas Preikschat
5e91aa7aee fixed long lines 2011-07-30 10:07:48 +02:00
Andreas Preikschat
4f195a4721 changed translate context 2011-07-30 09:43:19 +02:00
Andreas Preikschat
b3896d880b spelling 2011-07-30 09:40:34 +02:00
Andreas Preikschat
c0976a4690 moved files and changed code to reflect string changes 
Fixes: https://launchpad.net/bugs/816382
 2011-07-30 09:34:37 +02:00
Andreas Preikschat
06d32e5108 change 'Display Tag' strings to 'Formatting Tag' 
Fixes: https://launchpad.net/bugs/816382
 2011-07-30 09:19:16 +02:00
Andreas Preikschat
77f7581d22 change 'Display Tag' strings to 'Formatting Tag' 
Fixes: https://launchpad.net/bugs/816382
 2011-07-30 09:14:39 +02:00
Andreas Preikschat
f0d4afaaf6 improved code readability 2011-07-30 08:33:51 +02:00
rimach crichter@web.de
2e69c00cf1 resolve volume settings problem in phononapi 2011-07-28 22:50:20 +02:00
rimach crichter@web.de
f1d7284e8d resolve volume settings problem in phononapi 2011-07-28 22:49:43 +02:00
rimach crichter@web.de
9af26bac34 fix media loading in Service bug, sync with trunk 2011-07-28 22:36:19 +02:00
rimach crichter@web.de
0c4ae8d3c8 Head 2011-07-28 22:35:22 +02:00
rimach crichter@web.de
ea7e03406c fix loading media in Service bug 2011-07-28 22:34:20 +02:00
Stevan Pettit
7c13fcfaad Minor text change to FTW message in mainwindow 2011-07-27 16:38:23 -04:00
Tim Bentley
f1902ade5a Fix up drag and drop code 2011-07-27 19:28:35 +01:00
Andreas Preikschat
746001c485 corrections 2011-07-27 20:12:54 +02:00
Andreas Preikschat
6aec735be4 corrections 2011-07-27 19:05:43 +02:00
Stevan Pettit
e40f561976 minor changes to text in mainwindow.py 2011-07-27 13:04:31 -04:00
Stevan Pettit
1ffe0e961d Added status tips for FTW menu item. Removed some continuation characters 2011-07-26 20:30:56 -04:00
Andreas Preikschat
0bd821aaa5 docstrings clean ups 2011-07-26 17:44:24 +02:00
rimach crichter@web.de
4cb65187e7 add Starttime to phonon api and sync with trunk 2011-07-25 23:10:25 +02:00
rimach crichter@web.de
ed9d704db9 Head 2011-07-25 23:06:43 +02:00
rimach crichter@web.de
1c63ef3ea1 add starttime for python and vlc 2011-07-25 22:56:39 +02:00
Stevan Pettit
c84c69645e added docstring to FTW section. changed menu text, changed default button to No 2011-07-25 15:24:35 -04:00
Stevan Pettit
0d9f6a946e modified slidecontroller to "reset" the loop button when new item is sent live 2011-07-24 15:41:33 -04:00
Andreas Preikschat
187bb647c0 - improved rendering speed by checking if the text fits as a whole (to save time figuring out that it fits as a whole) 
- use binary chop to find the number of lines which will fit on a slide (if it does not fit as a whole)
- do not use instance variables as arguments
- renamed image_manager to imageManager and theme_manager to themeManager as the classes are derived of Qt

Some changes to html (html5):
- added doctype
- removed obsolete language attribute

bzr-revno: 1694
 2011-07-24 19:52:53 +02:00
Tim Bentley
0b44825d0c Allow the up and down selection to step over collapsed service items 
bzr-revno: 1693
Fixes: https://launchpad.net/bugs/805084
 2011-07-24 18:47:54 +01:00
Stevan Pettit
90c18b6bfd changed plugin names to lowercase, removed .lower() from appropriate code 2011-07-23 17:29:24 -04:00
Stevan Pettit
8800b41749 Added confirmation message prior to re-start of FTW 2011-07-23 14:09:13 -04:00
Stevan Pettit
f7a222da6c modified mainwindow.py code to make first time wizard re-run inline code 2011-07-23 08:52:43 -04:00
Tim Bentley
c813b31427 Correct up and down selection for service manage panel 
Fixes: https://launchpad.net/bugs/805084
 2011-07-23 06:48:55 +01:00
Stevan Pettit
b15fd4df49 modified mainwondow.py to allow first time wizard to be re-run 2011-07-22 09:39:49 -04:00
rimach crichter@web.de
f1463a4467 bugfixing 2011-07-20 23:17:05 +02:00
rimach crichter@web.de
c61f23370c bugfixing 2011-07-20 23:16:36 +02:00
rimach crichter@web.de
6881dd95c3 bugfixing 2011-07-20 22:48:33 +02:00
rimach crichter@web.de
210926867f bugfixing 2011-07-20 22:47:29 +02:00
Andreas Preikschat
823831e075 removed doctype for now 2011-07-20 15:05:30 +02:00
rimach crichter@web.de
58f7ab3dbc Head 2011-07-19 22:06:29 +02:00
rimach crichter@web.de
146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de
45dfb28c54 update 2011-07-19 22:04:32 +02:00
rimach crichter@web.de
65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Andreas Preikschat
1214706d2a removed debug help 2011-07-18 18:20:40 +02:00
Andreas Preikschat
baec0f5c69 added margin back; added missing spaces 2011-07-18 18:01:42 +02:00
Andreas Preikschat
988e632676 possible fix for not working gradient 2011-07-18 17:34:38 +02:00
Andreas Preikschat
7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Jon Tibble
4ae1a12b59 Unused function: string_is_unicode 2011-07-17 16:09:30 +01:00
Andreas Preikschat
f869b047ad changed spaces 2011-07-17 15:15:13 +02:00
Andreas Preikschat
46fa64b43d reverted some changes 2011-07-17 15:01:28 +02:00
Jon Tibble
0f89b9f771 Unused import 2011-07-17 13:59:26 +01:00
Jon Tibble
60b286ca3e Head r1689 2011-07-17 12:56:17 +01:00
Andreas Preikschat
1da64528f5 removed the ZIP support for the OpenSong importer (bug #795027) 
bzr-revno: 1688
Fixes: https://launchpad.net/bugs/795027
 2011-07-17 13:34:33 +02:00
Andreas Preikschat
47e43404aa - added doctype to html 
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
 2011-07-16 11:00:30 +02:00
Andreas Preikschat
b51f9b2a0c - do not set a service modified when using the up/down arrows to change the selected service item 
- only set the service modified when an item is selected while using the 'move button' and 'delete button'
 2011-07-16 09:20:13 +02:00
Andreas Preikschat
69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Andreas Preikschat
bc5d2cce46 removed zip support for OpenSong importer 
Fixes: https://launchpad.net/bugs/795027
 2011-07-15 20:18:11 +02:00
Jon Tibble
40d31106b3 Head r1686 2011-07-14 19:42:38 +01:00
Andreas Preikschat
822db59c4f - use map instead of list comprehension 
- make some instance variables (in connection with re) constants
- removed some blank lines

bzr-revno: 1686
 2011-07-14 17:20:25 +01:00
Tim Bentley
72cd870e48 Fix 1.9.6 String errors 
bzr-revno: 1685
 2011-07-14 17:18:23 +01:00
Jon Tibble
42acff98ab Unused import 2011-07-13 22:00:35 +01:00
Tim Bentley
f1cf256d99 Fix 2011-07-13 18:41:37 +01:00
Andreas Preikschat
b98e36aff2 regex clean ups 2011-07-13 15:32:19 +02:00
Jon Tibble
8d4369adb8 Head r1684 2011-07-12 20:06:37 +01:00
Andreas Preikschat
84d1a0d35d - Fixed bug #805082 
- Removed trailing "Help"

bzr-revno: 1684
 2011-07-12 16:49:19 +02:00
Jon Tibble
a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
Tim Bentley
b83048ff4e Fix outstanding strings in Error for translations 
Fixes: https://launchpad.net/bugs/796440
 2011-07-11 17:32:25 +01:00
rimach crichter@web.de
98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley
d58ed2da56 Add visual button to status bar for Song usage active / inactive and connect to F4 button. 
Code cleanups

bzr-revno: 1682
 2011-07-10 16:04:55 +01:00
Tim Bentley
2bf6dbafeb Improve ServiceManager tool tips to include theme. 
Fix change of theme in servicemanager to allow live to be updated.

bzr-revno: 1681
Fixes: https://launchpad.net/bugs/806829, https://launchpad.net/bugs/806834
 2011-07-10 16:03:47 +01:00
Tim Bentley
77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley
7d21d45764 missing : 2011-07-10 13:02:58 +01:00
Tim Bentley
4651ec35b6 Fixes 2011-07-10 12:59:23 +01:00
Andreas Preikschat
50bc672f59 removed the trailing 'help' 2011-07-10 12:52:30 +02:00
Andreas Preikschat
3c63ffd4a6 fixed bug 805082 
Fixes: https://launchpad.net/bugs/805082
 2011-07-10 12:45:52 +02:00
Tim Bentley
dd302537ec Fix code 2011-07-10 07:58:15 +01:00
Tim Bentley
e9fb8e59c1 Allow service item themes to change and be added back to slide controller 
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
 2011-07-09 08:43:35 +01:00
Tim Bentley
cf9355d725 Add some formatting 2011-07-09 07:03:52 +01:00
Tim Bentley
b94115d4b2 Amend tooltips so show theme for service item if present. 
Fixes: https://launchpad.net/bugs/806834
 2011-07-08 21:55:18 +01:00
Tim Bentley
f264cc4c4e correct tooltip text 2011-07-08 16:07:53 +01:00
Andreas Preikschat
2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Raoul Snyman
b4358a2005 Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects. 
bzr-revno: 1679
 2011-07-08 14:53:36 +02:00
Raoul Snyman
2ddcd717bf Fixed bug #803031: If UTF-8 decoding fails, try the standard Windows codepage. 
bzr-revno: 1678
 2011-07-08 14:52:36 +02:00
Andreas Preikschat
5ff8d9d326 - small image queue fix 
- refactoring

bzr-revno: 1677
 2011-07-08 14:41:44 +02:00
Tim Bentley
5efe717137 Head 2011-07-08 08:46:25 +01:00
Stevan Pettit
6a612ee107 Modified slidecontroller to change loop button icons and captions when user select a loop to run. 
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)

Added the translated button captions to ui.py

in slidecontroller, changed Qicon to build_icon

bzr-revno: 1676
 2011-07-08 07:41:30 +01:00
Raoul Snyman
5581a74034 Changed typecast to rather check for buffer. 2011-07-08 08:40:50 +02:00
Raoul Snyman
897f7a7dbb Fixed bug #794971: Typecast the buffer object to a unicode object. 2011-07-08 08:31:34 +02:00
Tim Bentley
1a611dcd60 Add tooltip 2011-07-08 07:03:09 +01:00
Raoul Snyman
ce1abaf332 Fixed bug #803031: If UTF-8 decoding fails, try the standard Windows codepage. 2011-07-08 07:57:39 +02:00
Jon Tibble
1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble
1899961965 Long lines 2011-07-07 22:22:41 +01:00
Tim Bentley
d02ee451f2 Add ability to clone a song with a full copy of it. 
Add missing build_icon and line wrap error.

Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.

Changes for 795980 also included

bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980, https://launchpad.net/bugs/752374, https://launchpad.net/bugs/763583
 2011-07-07 21:14:12 +01:00
Jon Tibble
3ab1c606e5 Head r1674 2011-07-07 19:04:26 +01:00
Jon Tibble
623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Stevan Pettit
856d44270f Changed use of Qicon to build_icon in slidecontroller 2011-07-07 13:38:13 -04:00
Tim Bentley
37fdcc62a4 Fix comment 2011-07-07 18:03:38 +01:00
Andreas Preikschat
f7ab82518b doc 2011-07-07 17:37:43 +02:00
Stevan Pettit
1ffd5713b0 Modified slide controller to change loop button icons when selecting slide loops 2011-07-07 11:23:55 -04:00
Andreas Preikschat
2b419d8a4e implementation fix: set priority to low instead of lowerest when the image was requested 2011-07-07 17:15:48 +02:00
Andreas Preikschat
3e8c91cbd5 refactor some code 2011-07-07 16:53:05 +02:00
Andreas Preikschat
b68751835f r1673 2011-07-06 16:00:32 +02:00
Benny
1876d520ae review fixes 2011-07-05 14:00:34 +02:00
Benny
6436b05240 changes from review (cosmetic & regex performance) 2011-07-05 12:50:55 +02:00
Benny
ae8ac35d2c merge head 2011-07-05 01:02:49 +02:00
Benny
3c0c9c5b78 EasyWorship importer: some work to create more reasonable verse numbers if EW tags are missing or without numbers 2011-07-05 00:55:57 +02:00
Benny
4bf45ad2de ewimport: workaround for RTF stripping bug 2011-07-04 22:51:43 +02:00
Tim Bentley
b2b8dd1d4d Extra fix 2011-07-03 19:33:04 +01:00
Tim Bentley
4d82e55ca0 Correct code 2011-07-03 18:45:48 +01:00
Tim Bentley
1c454b606f Fix fullstop and add icon 2011-07-03 13:43:31 +01:00
Tim Bentley
2a73f1b188 Prevent Images and Media backgrounds being added when No service Item is present in the live controller. 
Fixes: https://launchpad.net/bugs/795980
 2011-07-03 09:13:48 +01:00
Tim Bentley
222d4c228c Method fix 2011-07-03 06:43:32 +01:00
Tim Bentley
091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Tim Bentley
6a259e0489 Correct build icon 2011-07-02 06:51:03 +01:00
Benny
bc808ade93 EasyWorshipSongImport: use tag from previous slide for slides without tag, fix regex for notes 2011-07-02 00:45:27 +02:00
Tim Bentley
219218161b 6am spelling fix 2011-07-01 17:59:56 +01:00
Tim Bentley
bddf91ddcb Add ability to clone songs 
Amend framework for plugins to add  non toolbar context items

Fixes: https://launchpad.net/bugs/763583
 2011-07-01 17:55:07 +01:00
Andreas Preikschat
418c3b9c18 - use the functions context_menu_action and context_menu_separator from core/lib/ui 
bzr-revno: 1672
 2011-07-01 10:26:26 +02:00
Raoul Snyman
dcd10f0b8f A couple of minor UI tweaks. 
bzr-revno: 1671
 2011-07-01 10:09:36 +02:00
Tim Bentley
43f4b30d02 Head 2011-06-30 20:00:03 +01:00
Tim Bentley
0b41274f8e Fix up button 2011-06-30 19:59:51 +01:00
Andreas Preikschat
a60fc8ea23 - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification

bzr-revno: 1670
 2011-06-30 16:59:30 +02:00
Andreas Preikschat
54f8ae82e7 - improved collapse/expand all buttons in the service manager 
bzr-revno: 1669
 2011-06-30 16:57:42 +02:00
Andreas Preikschat
deddee5668 - fixed theme copy 
bzr-revno: 1668
 2011-06-30 16:56:55 +02:00
Stevan Pettit
ab993842ff Added code to create a main window menu item to display the Windows help file (openlp.chm) if it exists on the users machine: 
- If it exists, F1 will display the local file, Alt-F1 will display the online help.
- If the help file does not exist, F1 will display the Online help (as it currently does).

bzr-revno: 1667
 2011-06-30 09:48:20 +02:00
Tim Bentley
870d0b51e9 Move SongUsage active to toolbar 2011-06-29 22:04:08 +01:00
Benny
306826bbeb merge with trunk 2011-06-29 21:33:48 +02:00
Benny
5df77e4ed6 Easyworship importer: improved recognition of slide divisions 
merged with trunk
 2011-06-29 21:26:14 +02:00
Stevan Pettit
97a76369bf Changed Windows test to os.name 2011-06-29 13:30:53 -04:00
Tim Bentley
b77094beb6 Head 2011-06-29 17:11:37 +01:00
Tim Bentley
143e697281 Add middle splitter 2011-06-29 17:11:19 +01:00
Stevan Pettit
0612a93964 Changed helpfile check to Windows condition check. Modified build script to create OpenLP.chm 2011-06-29 10:42:14 -04:00
Andreas Preikschat
c2fb73dde6 do not regenerate all service items when collapsing/expanding all items 2011-06-29 16:28:10 +02:00
Andreas Preikschat
6980299697 use help function 2011-06-29 11:23:42 +02:00
Andreas Preikschat
6e3343c606 fixed theme copy 2011-06-29 11:08:53 +02:00
Andreas Preikschat
bb5d8f74c4 r1665 2011-06-29 10:04:55 +02:00
Andreas Preikschat
8bb96b97bf - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification
 2011-06-29 10:04:14 +02:00
Andreas Preikschat
95743de19f more html fixes 2011-06-29 09:38:04 +02:00
Andreas Preikschat
795aae2277 r1665 2011-06-29 09:27:38 +02:00
Stevan Pettit
a0e0746ed8 - Ask for delete confirmation when attempting to delete custom slide(s) 
- Changed dialog heading to "Confirm Delete"

bzr-revno: 1665
 2011-06-29 08:53:15 +02:00
Tim Bentley
30df723358 Fixes 2011-06-29 07:12:32 +01:00
Stevan Pettit
da45d09e48 Moved delete dialog heading translate to ui.py 2011-06-28 16:35:28 -04:00
Raoul Snyman
486a427794 Minor UI tweaks. 2011-06-28 21:24:29 +02:00
Stevan Pettit
334bf4ab44 Changed dialog heading. Changed Songs delete confirm to match Custom Slides 2011-06-28 15:05:05 -04:00
Tim Bentley
a167f6ef86 Make progressbar smaller 2011-06-28 17:40:17 +01:00
Tim Bentley
75550b505b Save Controller Toolbars 
Fixes: https://launchpad.net/bugs/765239
 2011-06-28 17:35:50 +01:00
Tim Bentley
70709e9b12 Add ability to lock toolbar 
bzr-revno: 1664
 2011-06-28 17:12:41 +01:00
Stevan Pettit
f14fa78081 Modified delete message and dialog buttons 2011-06-28 09:29:36 -04:00
Stevan Pettit
c363165925 Removed some whitespace 2011-06-28 00:59:26 -04:00
Stevan Pettit
231c47db53 Remove settings for confirm delete 2011-06-28 00:52:46 -04:00
Tim Bentley
2d60f3842a review comment 2011-06-27 16:56:48 +01:00
Tim Bentley
372dcedb88 Head 2011-06-27 16:54:21 +01:00
Andreas Preikschat
86c0eea473 changed theme_manager to themeManager as it is Qt based 2011-06-27 13:51:25 +02:00
Andreas Preikschat
74d2b2d25c replaced <br> by <br /> 2011-06-27 13:44:57 +02:00
Andreas Preikschat
e50ca971d6 change queue name; remove image from queue when deleted from cache 2011-06-27 13:28:58 +02:00
Andreas Preikschat
efe256c42a r1662 2011-06-27 10:57:19 +02:00
Andreas Preikschat
c1e4ff0231 - removed not needed lists 
- some translation fixes
- remove close button on print dialog

bzr-revno: 1662
 2011-06-27 10:32:41 +02:00
Andreas Preikschat
7ac53156fb When you copy a theme the suggested theme name will be 'Copy of <theme name>' 
bzr-revno: 1661
 2011-06-27 10:31:16 +02:00
Andreas Preikschat
c92e292518 - now you can resize the display tag dialog 
- changed the column widths
- make sure we always use the space available
- scroll to the bottom when adding a new tag

bzr-revno: 1659
 2011-06-27 10:26:15 +02:00
Stevan Pettit
f7f20f9722 Add link to Windows help file from main window 2011-06-27 00:05:25 -04:00
Andreas Preikschat
943f2e1cb2 rearranged lines 2011-06-26 21:34:01 +02:00
Andreas Preikschat
f2a243cfb4 change theme name to 'Copy of <theme name>' when copying a theme 2011-06-26 19:33:22 +02:00
Andreas Preikschat
a05d9098ef - removed not needed code 
- some translation fixes
- remove close button on print dialog
 2011-06-26 18:15:13 +02:00
Andreas Preikschat
ee985fde7d fixed margin; scroll to the bottom when adding a new tag 2011-06-26 16:37:38 +02:00
Andreas Preikschat
cd3798573a improved display tag dialog resizing 2011-06-26 16:12:19 +02:00
Tim Bentley
217510281c Fix comments 2011-06-26 07:49:10 +01:00
Andreas Preikschat
a077d83000 fixed saving 'Setup' mode shortcut 2011-06-26 07:58:29 +02:00
Andreas Preikschat
f979233787 renamed method 2011-06-25 21:37:23 +02:00
Andreas Preikschat
4f955f25d7 refactoring 2011-06-25 15:47:46 +02:00
Andreas Preikschat
14e2ce6b64 better comment 2011-06-25 15:23:49 +02:00
Andreas Preikschat
b1b29e9abf comment fix 2011-06-25 08:20:02 +02:00
Andreas Preikschat
b12fd94f6e moved image queue changes to an own branch 2011-06-25 07:35:24 +02:00
Andreas Preikschat
1730f5a99f added new priority and fixed comments 2011-06-25 07:34:07 +02:00
Andreas Preikschat
356ea8fff8 - added an 'intelligent' image queue with priorities 
- resize image in the thread
- change instances variables (based on qt)
 2011-06-25 06:42:49 +02:00
Andreas Preikschat
1ff42f59de - added comments 
- qt name change
- remove test lines
 2011-06-25 06:36:43 +02:00
Tim Bentley
94aae25333 1.9.6 2011-06-24 20:15:16 +01:00
Andreas Preikschat
929301b2e8 removed test lines 2011-06-24 18:12:04 +02:00
Raoul Snyman
e6cab2ce84 Fixed bug #791050 by hiding and then showing the toolbar. 
bzr-revno: 1657
 2011-06-24 14:25:31 +02:00
Raoul Snyman
509f739684 Fixed bug #791050 by hiding and then showing the toolbar. 2011-06-24 08:53:56 +02:00
Jonathan Corwin
4e216bdd13 Indent 2011-06-24 00:05:06 +01:00
Jonathan Corwin
d58682ad6b SOF UNO constants too 2011-06-23 23:53:24 +01:00
Jonathan Corwin
e1dc332be4 Trap meta key combinations for bug 743273. (Tested with Win key on Windows, don't have OS-X to test CMD key) 2011-06-23 23:30:56 +01:00
Jonathan Corwin
212103ce7b Some uno constants missing on some systems 2011-06-23 23:26:36 +01:00
Raoul Snyman
fd1f4265ed Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error. 
bzr-revno: 1655
Fixes: https://launchpad.net/bugs/801000
 2011-06-23 22:04:40 +02:00
Raoul Snyman
fb320569cf Half of bug #795068 fixed. Just figured I might as well get this in before the release. 
bzr-revno: 1654
Fixes: https://launchpad.net/bugs/795068
 2011-06-23 22:02:03 +02:00
Andreas Preikschat
39caaca8d9 comment fixes 2011-06-23 16:34:43 +02:00
Andreas Preikschat
4d20334cce changed instance variable to camelCase as the class is Qt based 2011-06-23 15:32:32 +02:00
Raoul Snyman
1d648f9df6 Removed commented line. 2011-06-23 15:27:06 +02:00
Raoul Snyman
114412e169 Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error. 2011-06-23 07:26:20 +02:00
Andreas Preikschat
25fcdc2600 r1652 2011-06-22 21:23:21 +02:00
Andreas Preikschat
95d24f68b0 fixed forgotten lines 2011-06-22 19:06:35 +02:00
Andreas Preikschat
63242b4191 more simplifications 2011-06-22 18:13:07 +02:00
Andreas Preikschat
99da6e48f2 r1652 2011-06-22 10:41:23 +02:00
Andreas Preikschat
87e6a61f19 clean ups 2011-06-22 10:25:49 +02:00
Andreas Preikschat
7996bb914d removed not needed code 2011-06-22 10:14:04 +02:00
Andreas Preikschat
b984f61e98 clean ups 2011-06-22 10:04:01 +02:00
Andreas Preikschat
9a58a0eca5 improved/fixed queue order 2011-06-22 09:56:08 +02:00
Andreas Preikschat
bf1c643caa use qt variable instead 2011-06-21 23:24:27 +02:00
Andreas Preikschat
e268b96351 fixed crash 2011-06-21 23:19:29 +02:00
Jonathan Corwin
cb60e6e9ef 1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled. 
2. Check for missing attributes in the easislides import XML

bzr-revno: 1652
 2011-06-21 22:09:33 +01:00
Jonathan Corwin
6be7a1e06e When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay. 
bzr-revno: 1651
 2011-06-21 22:08:30 +01:00
Jonathan Corwin
488fc4831c 1. For openlyrics export, restrict the length of the filename to ensure it isn't too long for the filesystem. 
2. When adding a song from a loaded service file, the author list string was being split by comma and the count compared to the number of authors against the db song. This gave a false negative if one of the individual authors contained a comma. Change the author comparison technique.

bzr-revno: 1650
 2011-06-21 22:07:21 +01:00
Andreas Preikschat
6f88ccb006 some fixes 2011-06-21 23:03:58 +02:00
Andreas Preikschat
67a3a6dc08 added missing line 2011-06-21 22:31:46 +02:00
Andreas Preikschat
47f5332bc3 Initial work on new image queuing (not working) 2011-06-21 22:28:22 +02:00
Andreas Preikschat
11cb39d2dc resize image in the thread not when adding the image 2011-06-21 13:37:28 +02:00
Andreas Preikschat
dbef87021c minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly 2011-06-21 12:10:53 +02:00
Raoul Snyman
faa9aca78b Fixed bug #800047 where the Preferences menu item in OS X was incorrect. 2011-06-21 08:10:03 +02:00
Benny
31dd4945ba fixed line endings 2011-06-21 07:55:11 +02:00
Benny
2939151ff1 EasyWorship importer: added conversion of Tags - basically working, but some issues remain 2011-06-21 07:40:53 +02:00
Jonathan Corwin
6c3190528d Fix easislides import when xml elements are missing 2011-06-20 23:11:05 +01:00
Jonathan Corwin
59280d10b7 Preserve greyed out of next button in import wizard 2011-06-20 22:57:34 +01:00
Jonathan Corwin
cd75b33a4d Partial fix for the Unity top panel showing problem. However this doesn't fully fix it, since it appears the only way for a window to cover that bar is for it to have focus. This isn't possible in OpenLP, since the controlling window will have focus. 
bzr-revno: 1647
 2011-06-20 21:14:30 +01:00
Jonathan Corwin
d692b11254 Fixing main display kerning problem for qtwebkit v534.3 
bzr-revno: 1646
 2011-06-20 21:13:20 +01:00
Andreas Preikschat
3616554a17 r1645 2011-06-20 21:57:08 +02:00
Andreas Preikschat
5f8087bb0d use function in presntation plugin 2011-06-20 21:56:01 +02:00
Jonathan Corwin
5082091426 Remove parent from live maindisplay, so videos work. Also means the display won't minimize when the main window is, or when the Windows show desktop facility is used 2011-06-20 20:44:56 +01:00
Jonathan Corwin
f3b7e609e9 Don't duplicate songs if a single author contains a comma 2011-06-19 23:18:06 +01:00
Jonathan Corwin
099b62f233 Filename too long in openlyrics export 2011-06-19 22:11:29 +01:00
Jonathan Corwin
20522740f9 Shadow 2011-06-18 19:35:53 +01:00
Jonathan Corwin
fe3278146d Kerning problems on maindisplay 2011-06-18 19:27:04 +01:00
Jonathan Corwin
658d4c2ecf Preserve service item notes between edits 2011-06-18 14:36:29 +01:00
Jonathan Corwin
f3c83a19e1 maindisplay on top of X11 taskbar 2011-06-18 12:44:40 +01:00
Stevan Pettit
6f24d50316 Fixed problem with preview edit button not working for custom slides. 
Also restores backwards compatability with custom plugin settings with 1.9.5

bzr-revno: 1644
 2011-06-18 09:59:03 +01:00
Jonathan Corwin
38fb5e54fe Prevent error if attempt to keep going off the end of a presentation. 
Reduce memory usage by not resizing small thumbnails back up to full monitor size in the slidecontroller.

bzr-revno: 1643
 2011-06-18 09:56:14 +01:00
Simon Scudder
18d6f4f9b9 Import Song Book Number correctly from OpenLyrics files 
bzr-revno: 1642
 2011-06-18 09:54:34 +01:00
Stevan Pettit
314b365270 Changed Custom plugin name to 'Custom' to match folder name, changed mediaitem.py signal receiver back to 'custom_edit' to match the plugin name change 2011-06-17 10:15:07 -04:00
Stevan Pettit
64d5318dd7 Changed name of Custom plugin to 'Custom_Slide', changed mediaitem Receiver to 
'custom_slide_edit'
 2011-06-16 21:36:33 -04:00
Jonathan Corwin
8cd128ddfe We don't want to resize 320x240 thumbnails back up to 1400x900 resolution just to display them in the slide controller! 2011-06-16 23:03:59 +01:00
Tim Bentley
440b5eee77 Head 2011-06-16 21:11:12 +01:00
Simon Scudder
1d2415808d Fixed Bug 707605 - Losing song book number on OpenLyrics import 2011-06-16 15:11:49 -03:00
Stevan Pettit
3c1f79f094 Fixed preview edit button not working for custom slides 2011-06-16 00:17:26 -04:00
Jonathan Corwin
f5e619584a Fix error if go next off end of powerpoint 2011-06-15 23:34:40 +01:00
rimach crichter@web.de
f0b03daa78 Head 2011-06-14 22:51:55 +02:00
rimach crichter@web.de
d84098348b Head 2011-06-14 22:51:29 +02:00
rimach crichter@web.de
a4c46723a9 Head 2011-06-14 22:43:02 +02:00
Raoul Snyman
5901f959ce Half of bug #795068 fixed. 2011-06-14 21:55:17 +02:00
Raoul Snyman
487b007e49 Fixed bug #763064: Empty line in first verse prevents saving a song. 
bzr-revno: 1641
 2011-06-14 18:39:36 +02:00
rimach crichter@web.de
cbb6b8d405 bugfixing 2011-06-14 18:12:39 +02:00
rimach crichter@web.de
9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
Andreas Preikschat
bd6733eef1 we can replace before splitting 2011-06-14 08:58:49 +02:00
Raoul Snyman
45d992e956 Fixed bug #763064: Empty line in first verse prevents saving a song. 2011-06-14 08:18:44 +02:00
Raoul Snyman
75d89d22b7 Fixed bug #792204: SongShow Plus importer fails to import song. 2011-06-14 07:45:23 +02:00
Andreas Preikschat
18cbfe6f53 Correct Focus on entry to dialog 
bzr-revno: 1639
 2011-06-14 05:55:44 +01:00
rimach crichter@web.de
ec9162995f Head 2011-06-13 23:20:46 +02:00
rimach crichter@web.de
2c62a819b3 Head 2011-06-13 23:20:20 +02:00
Andreas Preikschat
79c0ef15e0 give text edit focus 2011-06-13 22:49:14 +02:00
Tim Bentley
c6afbec849 Fix names 2011-06-13 19:10:06 +01:00
Andreas Preikschat
7d5e349602 removed test lines 2011-06-13 17:19:49 +02:00
Andreas Preikschat
254cf20b9f fixed non sense 2011-06-13 16:41:52 +02:00
Andreas Preikschat
24e737fa99 fixed long line 2011-06-13 16:36:18 +02:00
Andreas Preikschat
9b10c81e7b comments 2011-06-13 14:59:52 +02:00
Andreas Preikschat
f22e1385be _paginate_slide_words detects long verses itself 2011-06-13 13:26:06 +02:00
Andreas Preikschat
f4c00009ed made _binary_shop less 'word by word' specific 2011-06-13 13:20:47 +02:00
Andreas Preikschat
772c36ed19 more clean ups, doc 2011-06-13 11:47:18 +02:00
Andreas Preikschat
ded49f74a3 clean ups 2011-06-13 11:05:22 +02:00
Andreas Preikschat
d7ea218342 clean ups 2011-06-13 10:16:50 +02:00
Tim Bentley
eef44f0174 Use a method call instead of a signal as the signal does other things as well 
Fixes: https://launchpad.net/bugs/796324
 2011-06-13 08:29:58 +01:00
Andreas Preikschat
062e52c6db r1636 2011-06-12 21:34:19 +02:00
Andreas Preikschat
3c29367223 started improving renderer speed 2011-06-12 21:27:19 +02:00
Andreas Preikschat
445c63ce8b 2011-06-12 20:38:04 +02:00
Tim Bentley
a0319d127c One and only Simon Scudder 
bzr-revno: 1636
 2011-06-12 18:56:11 +01:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Andreas Preikschat
900a817cbf asdf 2011-06-12 17:59:46 +02:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat
1cc95fddb6 general thumb clean ups 2011-06-12 17:17:01 +02:00
Andreas Preikschat
81c89e97f1 - fixed crash attempting to add a non existent image to the service 
- fixed display of full presentation path in remote search
- fixed names
- fixed use of 'settingsSection' (the second argument is not a sections, rather a value name <-> using settingsSection is misleading)

bzr-revno: 1635
 2011-06-12 17:00:21 +02:00
Simon Scudder
8c12b7d912 Function showtext in the html javascript was altered, so that the shadow layer (if present) will ignore all the font color settings. This is done using a regular expression replace, that searches for -webkit-text-fill-color and erases up to the first ; or " 
If there is only a colour formatting command in the span tag, an empty class attribute is left behind, which shouldn't be a problem.

bzr-revno: 1634
 2011-06-12 15:55:21 +01:00
Tim Bentley
1550239f5e Add Lock Toolbar feature - Beta 3 2011-06-12 15:19:32 +01:00
Simon Scudder
9aa9952609 Fixed bug #795945 "Text colour appearing in shadow" 2011-06-12 11:13:01 -03:00
Raoul Snyman
9e99146725 Fixed various strings. 
bzr-revno: 1633
 2011-06-12 15:41:58 +02:00
Andreas Preikschat
08a3a7aba6 hard coded misleading arguments 2011-06-12 15:01:46 +02:00
Andreas Preikschat
dc2bafaab9 removed not needed variable, removed obsolete comments 2011-06-12 14:13:04 +02:00
Andreas Preikschat
869ab41cad - fixed crash attempting to add a non existent image to the service 
- fixed display of full presentation path in remote search
- fixed names
- fixed hard coded 'setting section'
 2011-06-12 13:51:23 +02:00
Raoul Snyman
facbcfcbfc Fixed grammar. 2011-06-12 09:51:50 +02:00
Raoul Snyman
8bc3d9bc62 Fixed 789046 and minor cleanups 
bzr-revno: 1632
Fixes: https://launchpad.net/bugs/789046
 2011-06-12 08:13:18 +01:00
Raoul Snyman
4014267300 Fixed various strings. 2011-06-11 23:43:08 +02:00
Raoul Snyman
d337ecacb6 Fixed bug #789046 and cleaned up one or two other things. 2011-06-11 23:04:52 +02:00
Simon Scudder
0b2f446856 Fixed bug #795945 "Text colour appearing in shadow" now within 80 columns 2011-06-11 15:14:20 -03:00
Tim Bentley
26419d8f18 Speed up edit by not calling render until there is a match 2011-06-11 18:17:13 +01:00
Simon Scudder
335e276d6d Fixed bug #795945 "Text colour appearing in shadow" 2011-06-11 12:18:58 -03:00
Stevan Pettit
30b56d6fee Moved signals to end of SetupUI 2011-06-11 08:48:11 -04:00
Tim Bentley
0c549e33e5 Only mark the service as changed if it has changed 
Fixes: https://launchpad.net/bugs/795890
 2011-06-11 12:22:40 +01:00
Jonathan Corwin
d26c1b20f8 A few more from IRC 2011-06-11 09:41:32 +01:00
Jonathan Corwin
0c6049917a Head 2011-06-11 09:32:36 +01:00
Jonathan Corwin
b73a8a86a7 End times should be finished 2011-06-11 09:02:43 +01:00
Tim Bentley
8b331af6f7 Fix mediamanager bug 
bzr-revno: 1628
 2011-06-11 08:45:11 +01:00
Andreas Preikschat
76c1cbf4db fixed 'split' string 
bzr-revno: 1627
 2011-06-11 09:39:53 +02:00
Gerald Britton
b068128dfd Add LibreOffice to error messages. 
Standardise error messages.

bzr-revno: 1626
 2011-06-11 09:23:31 +02:00
Tim Bentley
0292d89bf4 Head 2011-06-11 08:05:39 +01:00
Tim Bentley
7ba44af92a Fix parentage bug 
Fixes: https://launchpad.net/bugs/794380
 2011-06-11 08:04:21 +01:00
Jonathan Corwin
ee8b11e4e9 More strings 2011-06-10 22:50:44 +01:00
Andreas Preikschat
c3cb264d93 fixed string 2011-06-10 21:51:51 +02:00
Stevan Pettit
317a12751f Added code to openlp/plugins/bibles/lib/manager.py to skip old_databases during load. (Would we want to delete them)?-----> Removed this change, reverted back to original code. 
Added a routine to openlp/plugins/bibles/lib/db.py to close the DB "Cursor" and "Connection"

Added code to openlp/plugins/bibles/forms/bibleupgradeform.py to "close" the DB so the old DB file can be deleted afrter use.

bzr-revno: 1625
Fixes: https://launchpad.net/bugs/793552
 2011-06-10 20:35:41 +01:00
Gerald Britton
430861030e fix indentation 2011-06-10 15:29:26 -04:00
Jonathan Corwin
865ccd867a Fix outstanding strings prior to string freeze 
bzr-revno: 1624
 2011-06-10 20:25:57 +01:00
Gerald Britton
f5980ecfc1 merging changes from trunk 2011-06-10 15:25:38 -04:00
Andreas Preikschat
2ceea5d72e - Improved image resizing speed 
bzr-revno: 1623
 2011-06-10 10:24:29 +02:00
Stevan Pettit
f0dde73530 Remove previous change to skip old_database bibles 2011-06-09 22:55:43 -04:00
Jonathan Corwin
dfd2468c4c String fixes 2011-06-09 23:03:30 +01:00
Stevan Pettit
729f38f158 Added code to close the oldBibleDB so it can be deleted after conversion 2011-06-09 17:17:04 -04:00
Stevan Pettit
1bdfd60d52 Skip old-database's during bible loading 2011-06-09 11:26:13 -04:00
Andreas Preikschat
c298146b1f give the title edit focus when creating a new customs 2011-06-09 17:14:41 +02:00
Andreas Preikschat
8fc4305b43 removed test lines 2011-06-09 12:41:02 +02:00
Andreas Preikschat
2b1cf6cb54 r1621 2011-06-09 12:09:05 +02:00
Jonathan Corwin
cff560a665 Close and delete old MainDisplay windows when a new one is created due to a screen change. 
bzr-revno: 1621
 2011-06-09 08:24:08 +01:00
Jonathan Corwin
7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
Jonathan Corwin
56783d8a41 Fix Bible error message if search from remote 2011-06-08 21:03:32 +01:00
rimach crichter@web.de
81ebf05b8f Head 2011-06-08 20:11:39 +02:00
rimach crichter@web.de
99079b1c95 Head 2011-06-08 20:11:20 +02:00
rimach crichter@web.de
beaa25c9ba bugfixing 2011-06-08 16:50:21 +02:00
rimach crichter@web.de
34144b36d8 bugfixing 2011-06-08 16:50:10 +02:00
rimach crichter@web.de
c628b3aa09 bugfixing 2011-06-08 16:49:48 +02:00
rimach crichter@web.de
592af0e181 bugfixing 2011-06-08 15:18:05 +02:00
Stevan Pettit
4213dad51c Confirm delete of Custom item 2011-06-07 21:37:07 -04:00
Tim Bentley
c6166453bb Correct the line count in theme wizard 
bzr-revno: 1619
 2011-06-07 17:33:46 +01:00
Andreas Preikschat
f263dfa0c8 2011-06-07 09:30:50 +02:00
rimach crichter@web.de
805821b13c initiation 2011-06-06 21:39:16 +02:00
rimach crichter@web.de
ac7126d929 head 2011-06-06 21:20:19 +02:00
rimach crichter@web.de
cd1bf815d1 corrections 2011-06-06 21:19:35 +02:00
rimach crichter@web.de
43fe38c129 sync 2011-06-06 21:12:14 +02:00
Andreas Preikschat
5d426b5cca Improved thumbnail creation speed in the media manager 
bzr-revno: 1618
 2011-06-06 20:09:56 +02:00
Tim Bentley
6b73c842cb Head 2011-06-06 18:36:02 +01:00
Tim Bentley
b2bb583fb0 Fixes 2011-06-06 18:35:47 +01:00
Andreas Preikschat
5d9e6acfbf better comment 2011-06-06 16:58:14 +02:00
Andreas Preikschat
6047dd9f5b fixed bug 793537 
Fixes: https://launchpad.net/bugs/793537
 2011-06-06 16:17:39 +02:00
Andreas Preikschat
98e731ee9a fallback if thumb was not created 2011-06-06 09:05:10 +02:00
Andreas Preikschat
b5810b271e fixed bug #788770 2011-06-06 08:03:06 +02:00
rimach crichter@web.de
dbce448da1 update 2011-06-05 23:10:49 +02:00
Armin Köhler
e82a4e0972 Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup now is called 
bzr-revno: 1615
Fixes: https://launchpad.net/bugs/793091
 2011-06-05 20:18:59 +01:00
Armin Köhler
d89b60a96f - Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible 
- If upgrade fails new bible databases which are failed now should be deleted always. If upgrade was successfull the old database is deleted immediately. So never should stay an old and a new version from one bible.
- changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog.
- Fix Bug #792831 - now the right parent is used for dialogs and error messages
- Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing the booklist of a bible from biblegateway to the new html layout.
- changed log usage
- remove unnecessary code
- small fixes

bzr-revno: 1614
Fixes: https://launchpad.net/bugs/792811, https://launchpad.net/bugs/792831
 2011-06-05 20:17:09 +01:00
Armin Köhler
17209fcc29 define appStartup() in plugin.py 
remove hassattr(plugin, appStartup)
 2011-06-05 20:46:00 +02:00
Armin Köhler
5505644176 Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup is called 2011-06-05 20:19:44 +02:00
Armin Köhler
c85e953d4e remove unnecessary code 2011-06-05 19:39:13 +02:00
Armin Köhler
1b2956a9e6 remove unnecessary code 2011-06-05 19:33:46 +02:00
Andreas Preikschat
e08c65aa45 fixed ratio 2011-06-05 18:33:28 +02:00
Armin Köhler
346bf24267 changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog 2011-06-05 14:40:26 +02:00
Tim Bentley
a652c8ef59 Fix selection in ServiceManager over theme change 
bzr-revno: 1613
 2011-06-05 08:44:04 +01:00
Armin Köhler
52bab3e415 Fix right parent for all used dialogs 
small fixes
 2011-06-04 22:35:24 +02:00
Armin Köhler
522e68c38c Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing booklist of a bible from biblegateway 
changed log usage
 2011-06-04 21:34:36 +02:00
Armin Köhler
937cfd2260 Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible 
If upgrade fails new bible databases now should be deleted always
 2011-06-04 20:43:59 +02:00
Tim Bentley
b6d0f2243d Fix error if cnp 2011-06-04 19:14:32 +01:00
Tim Bentley
0841802ddc Fix state for service items 2011-06-04 19:08:48 +01:00
Jonathan Corwin
9230fbb116 In a song, replace apostrophes with an empty string instead of a space. This allows the searcher to find words containing "it's" and "Lord's" should they type "its" or "Lords" (and vice versa). 
Also reinstate the setting of search_lyrics by clean_song.

bzr-revno: 1612
 2011-06-04 17:07:42 +01:00
Armin Köhler
7e519464f6 Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles. 
bzr-revno: 1611
 2011-06-04 14:52:26 +01:00
Andreas Preikschat
47936e34a7 improved thumbnail creation speed 2011-06-03 17:57:56 +02:00
Armin Köhler
c4e6e91c81 change log usage 2011-06-03 14:43:54 +02:00
Jonathan Corwin
9aed776186 Change presentation log.exceptions to log.warn's 2011-06-03 07:52:16 +01:00
Armin Köhler
59f520ab6c - Fix bug #788762: only show the "No matching book" dialog once. 
- If a second Bible is chosen, text search results will only contain passages which are in both Bibles.

bzr-revno: 1608
 2011-06-03 07:43:02 +02:00
Stevan Pettit
a10038991b Fixed bug-789102. "Editing song via service and saving it, highlights it in media manager" 
bzr-revno: 1607
Fixes: https://launchpad.net/bugs/789102
 2011-06-03 07:20:56 +02:00
Stevan Pettit
4b20a3571f Song add clears search 2011-06-02 23:39:28 -04:00
Jonathan Corwin
604394a2eb head 2011-06-02 22:17:14 +01:00
Jonathan Corwin
d4031a62d3 More apostrophes 2011-06-02 22:13:32 +01:00
Andreas Preikschat
0b8fe770d5 Do not show qm files which start with qt_ 
Fixes: https://launchpad.net/bugs/791814
 2011-06-02 15:58:49 +02:00
Andreas Preikschat
847d69cd2f - removed dangling list 
- added debug message
- do not show an error message when the directory does not exist, instead create one
- do not override the file class
- clean ups

bzr-revno: 1605
 2011-06-02 15:09:37 +02:00
Armin Köhler
eda3e9ebe0 change log usage 2011-06-02 13:52:06 +02:00
Armin Köhler
6bce97895d - Fix problems with non-ascii book names on Biblegateway 
- Fix download problem with first verse on Biblegateway
- Remove unnecessary whitespace

bzr-revno: 1604
 2011-06-02 13:04:39 +02:00
Armin Köhler
0b2cd7d936 Change string 2011-06-02 13:01:41 +02:00
Armin Köhler
877ea4e13d Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles. 2011-06-02 12:42:42 +02:00
Jonathan Corwin
596123dd06 Fix problems with remembering blank/hidden state when starting up, and with the startup logo flashing briefly on the screen. Also fix the Show blank warning box. 
Fix toolbox appearing on the media manager when it's associated plugin is inactive.
Make the override display act like a dual display on startup. I.e. it appears.

bzr-revno: 1603
 2011-06-02 07:16:45 +01:00
Armin Köhler
cbfa51ea73 Fix Bug 788762 - error " No matching book" is now only shown once. 
If a Second Bible is choosen Text Search Results contains now only passages which are in both bibles
 2011-06-02 07:57:11 +02:00
Armin Köhler
8067f669b1 Fix Bug 788762 - error "No matching book" is now only shown once 
If a Second Bible is choosen Text Search Results contains now only Passages which are in both bibles.
 2011-06-02 07:45:02 +02:00
Jonathan Corwin
364de1af86 aphrostrophe fix for song searching 2011-06-01 23:47:42 +01:00
Stevan Pettit
0969f4ffc3 Removed repeated calls to self.initalize() 2011-06-01 17:06:45 -04:00
Gerald Britton
8760f54674 Change messages to refer to OpenOffice or LibreOffice 2011-06-01 15:53:14 -04:00
Armin Köhler
975808d11e fix Traceback with appStartup() if plugin is disabled 2011-06-01 21:25:26 +02:00
Jonathan Corwin
40f2b4d138 Fix unhidden toolbox that appears in the media manager 2011-06-01 19:58:27 +01:00
Gerald Britton
7459255b65 Add robustness to Generic document and Songs of Fellowship importers. 
bzr-revno: 1601
 2011-06-01 17:43:29 +02:00
Andreas Preikschat
b9dfd1f7d2 more spelling fixes 2011-06-01 14:08:40 +02:00
Andreas Preikschat
6b1f8f36f2 fixed spelling 2011-06-01 11:35:08 +02:00
Jonathan Corwin
c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Andreas Preikschat
91718326ea removed dangling list 2011-06-01 08:47:19 +02:00
Andreas Preikschat
5494b20805 added more debug 2011-06-01 08:31:22 +02:00
Andreas Preikschat
d7ebb73fd1 - do not show an error message when the directory does not exist, instead create items 
- trivial clean ups
 2011-06-01 08:24:35 +02:00
Andreas Preikschat
9a81e8dbe6 added blank line 2011-06-01 07:46:34 +02:00
Andreas Preikschat
4c81ac295d r1600 2011-06-01 07:43:41 +02:00
Andreas Preikschat
4ce960d0cc do not override the file class 2011-06-01 07:42:56 +02:00
Gerald Britton
6856e3ef44 Ensure exception is raised if all attempts to connect with uno fail 2011-05-31 16:05:47 -04:00
Gerald Britton
6a6d0aa64d Log failing imports 
bzr-revno: 1600
 2011-05-31 21:01:49 +02:00
Raoul Snyman
d4a75148b8 Fixed bug #790382 by using the Mako template engine to pass Python variables into the template and tweaking a few things in the JS. 
bzr-revno: 1599
 2011-05-31 20:57:59 +02:00
Raoul Snyman
6572e7a225 Removed the int typecast and removed executable permissions from the json2.js file. 2011-05-31 20:20:23 +02:00
Raoul Snyman
09d63871d8 Converted the impromptu page to a dialog for better usability and more translation flexibility. 2011-05-31 19:36:32 +02:00
Gerald Britton
367dfa4585 Merging trunk changes 2011-05-31 10:58:03 -04:00
Stevan Pettit
227cd75b5c Cleanup whitespace, remove debug prints 2011-05-31 10:02:44 -04:00
Raoul Snyman
de56462c8f Pull the translated plugin names through. 2011-05-31 14:30:21 +02:00
Stevan Pettit
b52d00a623 Update local branch from trunk 2011-05-31 08:17:23 -04:00
Raoul Snyman
5c943ff1eb Fixed up another missing translation. 2011-05-31 13:58:18 +02:00
Raoul Snyman
2df9e6a55a Fixed up some more missing translations. 2011-05-31 13:30:04 +02:00
Raoul Snyman
9f7a96c315 Fixed up some missing translations. 2011-05-31 13:25:35 +02:00
Raoul Snyman
ee151cde2a Fixed bug #790382 by using the Mako template engine to pass Python variables into the template. 2011-05-31 12:59:05 +02:00
Andreas Preikschat
79b107138a - fixed bug #789618 "Large gap between two parts of a verse in Service Order Print" 
bzr-revno: 1598
Fixes: https://launchpad.net/bugs/789618
 2011-05-31 12:53:35 +02:00
Armin Köhler
63102855e8 remove unnecessary whitespace 2011-05-31 09:31:38 +02:00
Armin Köhler
efc678d518 bug fix 2011-05-31 09:26:44 +02:00
Stevan Pettit
729fe2cfa3 bug-789102, moved mediaitem list updates out of editforms into mediaitems 2011-05-30 23:52:17 -04:00
Gerald Britton
cde0eb5ab5 Only import uno exceptions if not running Windoes 2011-05-30 17:15:34 -04:00
Armin Köhler
8a8580f359 Fix unicode bookname handling on Biblegateway 2011-05-30 22:58:30 +02:00
Armin Köhler
77281d3142 Change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search if a second bible is choosen the lists refresh and contain only books which are in both bibles. 
bzr-revno: 1597
 2011-05-30 21:53:47 +01:00
Gerald Britton
934a70b955 Relocate import logging statement 2011-05-30 16:14:36 -04:00
Raoul Snyman
3683e99152 Fix bug #714510 by removing the unnecessary indexes and defaulting the song_book_id on the songs table to NULL instead of 0. 
bzr-revno: 1596
 2011-05-30 22:03:09 +02:00
Armin Köhler
e356c5a4a1 HEAD r1595 2011-05-30 22:00:36 +02:00
Armin Köhler
ab3896ce6f removed unnecessary code 2011-05-30 21:41:02 +02:00
Gerald Britton
27b8ec3deb Add exception logging to import.py 2011-05-30 15:19:16 -04:00
Gerald Britton
c8a896cedd Merge changes from trunk 2011-05-30 13:41:56 -04:00
Andreas Preikschat
ed3a608b8d fixed tag deletion (bug #789929 
Fixes: https://launchpad.net/bugs/789929
 2011-05-30 17:07:49 +02:00
Raoul Snyman
99ae60aba3 Fixed up loading a song from a service. 2011-05-30 13:17:23 +02:00
Raoul Snyman
30ec309ff8 Fixed up various index errors on InnoDB tables. 2011-05-30 08:45:58 +02:00
Andreas Preikschat
0a2d97021c added spaces 2011-05-30 07:03:46 +02:00
Jonathan Corwin
3da3dd9869 Head 2011-05-29 21:47:12 +01:00
Jonathan Corwin
9cd536e137 Fix the parent that whydoubt sneaked in 2011-05-29 21:46:13 +01:00
Armin Köhler
17b97e87a8 HEAD r1593 2011-05-29 19:03:48 +02:00
Andreas Preikschat
571765c84f - changed a few camelCase names 
- changed object names

bzr-revno: 1593
 2011-05-29 18:00:37 +02:00
Andreas Preikschat
fd4d316097 - fixed bug #789143 
bzr-revno: 1592
Fixes: https://launchpad.net/bugs/789143
 2011-05-29 17:59:47 +02:00
Jonathan Corwin
02da22c349 Head 2011-05-29 16:33:09 +01:00
Armin Köhler
f701ae71bd Monster change to Bibles: 
- Web Bibles import their books on registration
- Added a book_reference_id to the books table of Bibles
- Moved various sqlite and csv resources into a single sqlite database
- Added an upgrade wizard to upgrade existing Bibles
- Check on startup if a user has older Bibles
- Various other bug fixes and cleanups

bzr-revno: 1591
 2011-05-29 17:18:17 +02:00
Andreas Preikschat
22ad88d3ee fix for bug #789618 
Fixes: https://launchpad.net/bugs/789618
 2011-05-29 08:26:14 +02:00
Andreas Preikschat
b56f93aad5 camelCase fixes and shortcut fixes 2011-05-29 08:23:12 +02:00
Jonathan Corwin
975dd3cb00 mediaitem() -> mediaitem 2011-05-28 22:23:07 +01:00
Armin Köhler
81fca6bedb change layout of backup page 
change some strings
 2011-05-28 23:01:27 +02:00
Gerald Britton
caa6639c7b Uglification to conform to weird standards :) 2011-05-28 16:43:33 -04:00
Gerald Britton
336adb7461 Merged updates from trunk 2011-05-28 16:36:46 -04:00
Jonathan Corwin
ddf11d4681 Live dangerously, and pass parent None to MainDisplay 2011-05-28 21:12:32 +01:00
Jonathan Corwin
147c41e16f Fix a couple of parents so the form opens in the right place 2011-05-28 20:38:19 +01:00
Jeffrey S. Smith
f80eb74e62 Merge changes from trunk 2011-05-28 14:03:31 -05:00
Jonathan Corwin
82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Andreas Preikschat
64b9b42321 better solution 2011-05-28 19:01:41 +02:00
Andreas Preikschat
5bedf62ec4 added more code back 2011-05-28 18:30:16 +02:00
Andreas Preikschat
6507b431b0 fix for older versions 2011-05-28 18:25:11 +02:00
Jeffrey S. Smith
88f1f4065e Make 'continuous loop' button into a selection ('loop' or 'play to end') 2011-05-28 08:45:44 -05:00
Armin Köhler
9b9f47a5be small fix 2011-05-28 15:33:15 +02:00
Armin Köhler
8caece6af0 HEAD r1588 2011-05-28 14:50:29 +02:00
Armin Köhler
6a1ee02cdd add Backup page to the wizard 
remove blank item on Combobox in BookNameForm
 2011-05-28 14:48:10 +02:00
Jonathan Corwin
01a89abe52 merge fixes 2011-05-28 11:15:10 +01:00
Jonathan Corwin
500ce5f720 head 2011-05-28 11:06:34 +01:00
Jonathan Corwin
4138d6fbd0 Change lots of parents 2011-05-28 10:53:37 +01:00
Stevan Pettit
86a077b353 Fixed bug #788335: Modified slidecontroller to properly blank the display when OpenLP is started and no item has been sent to live. 
bzr-revno: 1588
 2011-05-28 09:01:05 +02:00
Raoul Snyman
12bb7b4e25 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 
bzr-revno: 1587
 2011-05-28 08:48:01 +02:00
Stevan Pettit
7ed1be6612 Fixed bug #788335 - Changed slidecontroller to correctly blank screen 2011-05-28 00:05:33 -04:00
Armin Köhler
e550665b23 bug fix 2011-05-27 23:11:53 +02:00
Armin Köhler
5f9b23f8e7 remove unnecessary line 2011-05-27 22:53:46 +02:00
Armin Köhler
b4303195c3 HEAD 2011-05-27 22:50:57 +02:00
Armin Köhler
8699e36b37 HEAD r1586 2011-05-27 22:38:06 +02:00
Armin Köhler
010373b798 Fixed Traceback if BookNameDialog was canceled while upgrading non webbibles 
Replace LineEdit in BookNameDialog with Label
 2011-05-27 22:33:23 +02:00
Jonathan Corwin
37377b959d Change timed slide button tooltip to remove reference to looping, and add a few full stops to a few others. 
bzr-revno: 1586
 2011-05-27 21:14:41 +01:00
Raoul Snyman
665fc82c94 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 2011-05-27 21:25:03 +02:00
Jonathan Corwin
cd4942657d Change timed slide tooltip to remove reference to looping, and fix periods on others 2011-05-27 18:42:54 +01:00
Andreas Preikschat
42a8a4407e fixed bug 789143 
Fixes: https://launchpad.net/bugs/789143
 2011-05-27 16:28:38 +02:00
Jonathan Corwin
41601b9ec1 Make the slide loop/slide delay settings labels less misleading 
bzr-revno: 1585
 2011-05-27 14:34:01 +01:00
Andreas Preikschat
8ffb05bae3 - Improved 'Auto Select' feature 
- Fixed a traceback which occurs when you click the "Add" button in the slidecontroller when you are not previewing an item.
- Improved parentage
- clean ups

bzr-revno: 1584
 2011-05-27 13:59:19 +02:00
Jonathan Corwin
f1b778fb24 Change loop and timed slide settings labels 2011-05-27 12:54:52 +01:00
Andreas Preikschat
78404882d9 - Hide the theme menu when theme level is not 'Song'. 
- clean ups

bzr-revno: 1583
 2011-05-27 13:44:04 +02:00
Andreas Preikschat
c63382e41c - hide the theme menu when theme level is not 'Song' 
- clean ups
 2011-05-27 12:17:59 +02:00
Andreas Preikschat
62fe00cc13 - Themes in service item theme menu are checkable. 
- Allow the user to reset the theme to the (global/service) default theme.

bzr-revno: 1582
 2011-05-27 12:17:01 +02:00
Armin Köhler
8eb261ee88 bug fixes 
setFocus to the Combobox in booknameform
 2011-05-27 11:39:58 +02:00
Andreas Preikschat
59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Armin Köhler
e5231aba41 change using old bible databases in bibleupgradeform 2011-05-27 11:23:46 +02:00
Jonathan Corwin
ee00c84dba Remove the index from the search_lyrics column to allow OpenLP to work with a MySQL MyISAM database 
bzr-revno: 1581
 2011-05-27 09:21:23 +01:00
Armin Köhler
d3148f90f8 fix Traceback like Jonathan recommand 2011-05-27 09:54:49 +02:00
Andreas Preikschat
18e3cb0232 removed not needed import 2011-05-27 09:02:02 +02:00
Andreas Preikschat
8a38c0b766 do not hide the menu 2011-05-27 08:45:42 +02:00
Andreas Preikschat
0d443c3691 r1580 2011-05-27 08:39:32 +02:00
Andreas Preikschat
b890b52a8d finished the theme menu 2011-05-27 08:29:14 +02:00
Stevan Pettit
35e6d2f97e Fix bug #788084, modified code to use object id instead of title. 
bzr-revno: 1580
 2011-05-27 07:52:45 +02:00
Armin Köhler
af38bf7cc8 HEAD r1578 2011-05-26 22:41:19 +02:00
Armin Köhler
f29830b98e change BookNameDialog like Raoul want. 2011-05-26 22:38:07 +02:00
Andreas Preikschat
39537f9ef7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 22:17:52 +02:00
Armin Köhler
b5c392112b test close database 2011-05-26 22:15:38 +02:00
Armin Köhler
c435127585 some fixes in relation with the extened LanguageForm 
close cursor from OldBibleDB
 2011-05-26 21:13:11 +02:00
Andreas Preikschat
6aca4600b7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 20:52:05 +02:00
Gerald Britton
dc2a304b16 Merge changes from trunk 2011-05-26 14:20:40 -04:00
Gerald Britton
74e47dcbc7 Add specific error messages for file problems. 
Remove unicode strings in calls to translate()
 2011-05-26 14:20:14 -04:00
Andreas Preikschat
8aef6f3c8e r1576 2011-05-26 20:13:50 +02:00
Andreas Preikschat
af961afa78 removed the 'default' button 2011-05-26 20:00:25 +02:00
Andreas Preikschat
7ec12f15ea r1576 2011-05-26 19:56:08 +02:00
Tim Bentley
3ff2aa8006 Copyright updates 
bzr-revno: 1576
 2011-05-26 18:25:59 +01:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Jonathan Corwin
40222b23c8 Remove index from search_lyrics for mysql - myisam 2011-05-26 17:35:44 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Joshua Miller
93ec7f52a1 Enable or disable looping of slides based on a checkbox in the general settings 
bzr-revno: 1575
Fixes: https://launchpad.net/bugs/739777
 2011-05-26 16:52:02 +01:00
Tim Bentley
fe4b5fb147 More busy and sort changes 
bzr-revno: 1574
 2011-05-26 16:44:25 +01:00
Gerald Britton
e70ba41373 Add specific error messages if OoO open fails. Use a lambda to avoid repetition 2011-05-26 09:35:01 -04:00
Gerald Britton
c70c1a7c1a Merge changes from trunk 2011-05-26 09:10:46 -04:00
Josh Miller
6b90adea6e Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py and changes can_loop directly to the setting required 2011-05-26 07:01:48 -04:00
Josh Miller
254bac86d4 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py 2011-05-26 06:56:21 -04:00
Josh Miller
9221c8cb60 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too 2011-05-26 06:37:36 -04:00
Andreas Preikschat
98614f629c make themes in menu checkable 2011-05-26 10:15:56 +02:00
Armin Köhler
24d7b7b038 small spelling change 2011-05-26 09:34:29 +02:00
Armin Köhler
f3864cb4aa HEAD r1572 2011-05-26 09:27:50 +02:00
Armin Köhler
6486d41b8c correct some words and code 
changed behaviour if the "cancel" button is pressed while upgrading
 2011-05-26 09:25:17 +02:00
Armin Köhler
2930510461 change languageform like Raoul suggest 2011-05-26 09:00:40 +02:00
Andreas Preikschat
6e4b15833e r1572 2011-05-26 08:47:06 +02:00
Andreas Preikschat
aae9724f34 allow html tags to be translated 
Fixes: https://launchpad.net/bugs/787552
 2011-05-26 08:45:22 +02:00
Raoul Snyman
38000b5e56 Give the media items the ability to do something when they are "focused". 
Make the search edits on the Songs, Bibles and Custom media items focus when the item is selected.
 2011-05-26 08:23:22 +02:00
Meinert Jordan
548e41f15c Localized sorting for various lists. 
bzr-revno: 1572
 2011-05-26 07:37:52 +02:00
Tim Bentley
3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Stevan Pettit
4f857f8921 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-25 23:34:42 -04:00
Josh Miller
0a5155b822 Final changes to enabling looping of slides now it works 2011-05-25 20:11:56 -04:00
Gerald Britton
4399fc108f Fixed a silent error when OpenOffice fails to open a file.\ 
Also, added the file name to the exception log and made the exception explicit
 2011-05-25 17:38:32 -04:00
Andreas Preikschat
6e235f6bff - Fixed bug #786896 
- New display tag {br}
- Better regex usage in the SongBeamer import

bzr-revno: 1571
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 23:11:15 +02:00
Gerald Britton
3b7debfe81 merged with trunk 2011-05-25 16:41:23 -04:00
Armin Köhler
0f98c4fd8f change behaviour if "Cancel" button is pushed. 2011-05-25 22:20:17 +02:00
Armin Köhler
175d6cebb2 add Bible Name to LanguageDialog 
renamed "Importing" to "Upgrading" and "Choose" to "Select"
fixed traceback while textsearch
removed unnecessary code
 2011-05-25 21:13:37 +02:00
M2j
6f0bdad784 all lower() for theme sorting to consider Windows 2011-05-25 20:47:13 +02:00
M2j
7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Armin Köhler
e8cdba44be small clean up 2011-05-25 16:52:46 +02:00
Armin Köhler
dd4543ad2d HEAD r1569 2011-05-25 16:29:16 +02:00
Armin Köhler
0c83471ee4 move some code 
stop moving bibles to subfolders
some fixes
 2011-05-25 16:18:03 +02:00
Andreas Preikschat
3a91365e5a fixed space 
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 15:14:59 +02:00
Andreas Preikschat
cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Andreas Preikschat
638a72301c mention the need of an object name in the doc string 2011-05-25 13:26:18 +02:00
Andreas Preikschat
98d7cb5fe5 fixed object name 2011-05-25 11:10:57 +02:00
Andreas Preikschat
981c2f8c5b more name fixes 2011-05-25 10:32:37 +02:00
Andreas Preikschat
10f59d0313 started to fix camelCase names 2011-05-25 09:59:51 +02:00
Raoul Snyman
1797848d6e Updated online help action to use utility functions, and added an icon needed by the utility functions. 2011-05-25 08:56:33 +02:00
Gerald Britton
de7b7a072a fix up error messages in ooimport.py 2011-05-24 19:14:49 -04:00
Josh Miller
b92b733828 corrections and enable slide loop updates 2011-05-24 18:32:30 -04:00
Raoul Snyman
8c9728c3b2 HEAD 2011-05-24 22:53:41 +02:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Gerald Britton
36e5406b14 Merge trunk changes 2011-05-24 16:41:56 -04:00
Gerald Britton
d05c349f41 Catch common errors during import and report to user 2011-05-24 16:41:14 -04:00
rimach crichter@web.de
4ab7f93044 Sync 2011-05-24 22:05:02 +02:00
rimach crichter@web.de
82a14745e3 cleanup, correct settings tab 2011-05-24 22:03:57 +02:00
Andreas Preikschat
0db69c93ed Implemented the binary chop algorithm to speed up 'word by word' rendering. 
bzr-revno: 1567
 2011-05-24 21:33:12 +02:00
Raoul Snyman
becbff524b More translation updates. 2011-05-24 21:29:02 +02:00
Raoul Snyman
8d1d642c06 More translation updates. 2011-05-24 20:38:06 +02:00
Raoul Snyman
55dfd67a5c More translation updates. 2011-05-24 19:42:30 +02:00
Raoul Snyman
da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Andreas Preikschat
b9bcd98716 removed not need line 2011-05-24 18:51:40 +02:00
Andreas Preikschat
d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Josh Miller
541feef8ea Another try at the code for enabling loop through a checkbox, seems to work as far as i see 2011-05-24 07:23:55 -04:00
Andreas Preikschat
2377a5f5ff fix for Esther 8:7 2011-05-24 09:02:13 +02:00
Andreas Preikschat
5473d3c817 added windows comment 2011-05-24 07:23:28 +02:00
Josh Miller
6b046d9afb Another try at the code for enabling loop through a checkbox in general settings as the signal but ignores it in slidecontroller for some odd reason acting like it's not there... 2011-05-23 19:23:00 -04:00
M2j
06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
rimach crichter@web.de
d39ecb8e8e Sync 2011-05-23 21:42:10 +02:00
rimach crichter@web.de
d54ef615b4 cleanup, add settings tab 2011-05-23 21:37:44 +02:00
Andreas Preikschat
5b7dc62112 comments 2011-05-23 20:41:49 +02:00
Andreas Preikschat
84999905bd r1564 2011-05-23 20:24:38 +02:00
Andreas Preikschat
8602345491 removed print 2011-05-23 20:23:45 +02:00
Andreas Preikschat
ffd017799f new 'word by word' algorithm 2011-05-23 19:28:52 +02:00
Andreas Preikschat
ce5c354e06 fix for head 2011-05-23 13:49:14 +02:00
Andreas Preikschat
987cd14fbf r1564 2011-05-23 13:16:28 +02:00
Andreas Preikschat
73293c2985 removed imports 2011-05-23 13:14:05 +02:00
Andreas Preikschat
594caf0a19 fix for windows 2011-05-23 12:34:42 +02:00
Tim Bentley
b6a85d0405 Add Split items to songs and custom, improve impress error handling 
bzr-revno: 1564
 2011-05-23 05:59:35 +01:00
Josh Miller
6d577395a4 A switch of code to see if it worked and doesn't for the enable loop 2011-05-22 17:39:37 -04:00
Tim Bentley
50a81cc3c9 png not jpg 2011-05-22 19:50:34 +01:00
Josh Miller
33dcf7c439 This is a run of the 'enable slide loop' code that gushie showed me plus my checkbox code for it 2011-05-22 14:49:16 -04:00
Tim Bentley
b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00
Tim Bentley
37679fc1db Finish slide spltting code 2011-05-22 14:08:43 +01:00
Jonathan Corwin
64b08da271 Open a service file via the command line or by double clicking on the file on Windows systems 
bzr-revno: 1563
 2011-05-22 12:57:27 +01:00
Jonathan Corwin
ac29839151 Add items to service via the search on the web remote 
bzr-revno: 1562
 2011-05-22 12:56:22 +01:00
Stevan Pettit
ecb188dfdd Amend Song and Custom to remember the item on exit from edit. 
bzr-revno: 1561
 2011-05-22 09:45:57 +01:00
Stevan Pettit
08932ad664 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-21 21:29:09 -04:00
Jonathan Corwin
0c365e2a59 Windows command line 2011-05-21 23:16:28 +01:00
Andreas Preikschat
95b9abc78e - Changed the order the live screen/preview screen are set up. 
- Added a menu entry to update the theme preview images.

bzr-revno: 1560
 2011-05-21 23:50:04 +02:00
Stevan Pettit
c9481e034e modified: 
openlp/core/lib/mediamanageritem.py
 2011-05-21 16:29:43 -04:00
Stevan Pettit
cfe1903883 modified: 
openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
 2011-05-21 16:21:05 -04:00
Josh Miller
eedecf6434 testing 2011-05-21 15:01:40 -04:00
Jonathan Corwin
031525b0e6 Lose the [None] and fix jquery issue 2011-05-21 18:43:37 +01:00
Stevan Pettit
23e95892ec modified: 
openlp/plugins/songs/lib/wowimport.py
pending merges:
  Gerald Britton 2011-05-21 [merge] Words of Worship import where a file m...
    Gerald Britton 2011-05-20 Fix Words of Worship import to issue error...
 2011-05-21 10:49:25 -04:00
Jonathan Corwin
218ee2db2b tweak the jquery 2011-05-21 10:14:30 +01:00
Gerald Britton
8872d146a6 Words of Worship import where a file missing the WoW header information would be silently ignored 
bzr-revno: 1559
 2011-05-21 09:19:14 +01:00
rimach crichter@web.de
578e0fea3f cleanups, add settings dialog 2011-05-21 10:18:52 +02:00
Stevan Pettit
48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Jonathan Corwin
732f5321dd indent 2011-05-20 23:32:46 +01:00
Jonathan Corwin
bbbf0d3435 Go live/add to service via list 2011-05-20 23:30:20 +01:00