Commit Graph

1979 Commits

Author SHA1 Message Date
Tim Bentley 17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley 456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Tim Bentley 6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Tim Bentley add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley 8c4397d380 Head 2011-12-03 17:01:57 +00:00
Tim Bentley 13ec25eef5 Fix the plugin Disabled route as it has never been tested
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
2011-12-03 14:42:44 +00:00
Tim Bentley 1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley 624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
Jon Tibble bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Jon Tibble ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
rimach dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
Tim Bentley 516dda5ec3 Fixes 2011-11-13 08:57:29 +00:00
rimach 870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach 7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach 087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
Raoul Snyman 46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Tim Bentley d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach 2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley 0304057e00 remove # 2011-11-02 20:09:06 +00:00
Tim Bentley 3bd0ad9181 Fix crash with two soft breaks 2011-11-02 18:58:46 +00:00
Tim Bentley 8e853f10b1 Fix crash with alerts over video
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
2011-10-29 10:33:48 +01:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat acac723b09 copy error 2011-10-22 13:28:47 +02:00
Andreas Preikschat 49569746ea fixed doc 2011-10-22 13:16:25 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
Tim Bentley 9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
2011-10-19 19:25:08 +01:00
Tim Bentley 4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley bdcf15d87b Fix comments 2011-10-17 19:01:07 +01:00
Meinert Jordan 972d917c8a Remove mailto code and use QT code
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
2011-10-17 17:46:35 +01:00
Tim Bentley bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat a75e0156cc fixed docstrings 2011-10-16 16:40:46 +02:00
Tim Bentley 2f36c33f62 Review fixes 2011-10-16 09:25:27 +01:00
M2j 1527704c03 - exception dialog uses Qt call instead of external library
- unicode support in report and attached filename was broken
2011-10-15 22:18:49 +02:00
Andreas Preikschat 9259eed4a6 -fixed bug 871272
-clean ups

Fixes: https://launchpad.net/bugs/871272
2011-10-15 13:30:39 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley 0e1361b533 Fix footer position 2011-10-12 05:51:03 +01:00
Tim Bentley 9176911810 Try 1 2011-10-11 19:10:53 +01:00
Tim Bentley 161300fe73 Number of changes
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
2011-10-05 19:20:54 +01:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview
Fixes: https://launchpad.net/bugs/856296
2011-10-03 19:27:34 +02:00
Tim Bentley 5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley 9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley c5a7127aec Copy theme during remote edit.
Fixes: https://launchpad.net/bugs/864822
2011-10-02 20:49:29 +01:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
rimach 33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
Tim Bentley 9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Andreas Preikschat 0a7ba097a8 shorter code 2011-09-26 20:48:47 +02:00
Andreas Preikschat d27a75287f - improved render performance for service items with the CanSoftBreak capability
- added HTML5 doctype

bzr-revno: 1763
2011-09-26 20:28:23 +02:00
Andreas Preikschat 70a7f1bf9f r1763 2011-09-26 20:26:40 +02:00
Andreas Preikschat 947a58dbbe improved line counting 2011-09-26 20:26:13 +02:00
Andreas Preikschat 9a40b27672 fix for theme editing 2011-09-26 18:57:32 +02:00
Andreas Preikschat c9b7b55a87 reverted some changes 2011-09-26 18:46:11 +02:00
Andreas Preikschat 3a2be026f5 reverted some changes 2011-09-26 18:25:22 +02:00
Tim Bentley fb3f001c26 Add Justify theme option
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
2011-09-26 17:07:30 +01:00
Andreas Preikschat 9841406071 minor improvement for such cases where [---] was used 2011-09-24 14:54:27 +02:00
Andreas Preikschat b776015ae9 r1759 2011-09-24 14:19:28 +02:00
Martin Zibricky 3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach 18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky 8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
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
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
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
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 fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Andreas Preikschat 734c868223 removed semicolon 2011-09-18 17:39:12 +02: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 3c3339f114 final fixes and clean ups 2011-09-18 12:26:47 +02: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
Tim Bentley 6a901f2de9 Add justify to theme options
Fixes: https://launchpad.net/bugs/802252
2011-09-16 18:23:39 +01: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 a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02: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
Andreas Preikschat c7ab79f987 fixed bug 805088 2011-09-06 13:56:52 +02:00
Martin Zibricky bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Martin Zibricky 4cf750ce9d Wrap db.Manager to a function arg for automated tests 2011-09-03 16:21:36 +02: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
Raoul Snyman 79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +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 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 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 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
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
Mattias Põldaru 44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03: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
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
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
Tim Bentley 67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +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
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 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 6c3d156363 fixed inversion :-D 2011-08-26 17:22:57 +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
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
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
Raoul Snyman ddf148449d Now with exception handling. 2011-08-25 13:47:07 +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
Raoul Snyman 7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +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 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
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
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 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 ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01: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 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
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 ffbfd1efe9 - improved code readability
- updated docstrings

bzr-revno: 1704
2011-08-07 16:37:40 +02: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
Tim Bentley ecd7a197de Fix conflict 2011-08-04 05:51:41 +01:00
Tim Bentley 5ff39a7d83 Fix missing() 2011-08-03 16:52:29 +01:00
Tim Bentley 0b46165429 Last set of fixes 2011-08-02 19:17:07 +01:00
Tim Bentley 644706a62a Fix review comments and cleanups 2011-08-02 06:07:09 +01:00
Andreas Preikschat 5e91aa7aee fixed long lines 2011-07-30 10:07:48 +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 f0d4afaaf6 improved code readability 2011-07-30 08:33:51 +02:00
Tim Bentley f1902ade5a Fix up drag and drop code 2011-07-27 19:28:35 +01:00
rimach crichter@web.de ed9d704db9 Head 2011-07-25 23:06:43 +02: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
Stevan Pettit 90c18b6bfd changed plugin names to lowercase, removed .lower() from appropriate code 2011-07-23 17:29:24 -04: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 146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de 65e6d45eff further changes 2011-07-18 23:25:10 +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
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
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 69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Jon Tibble 42acff98ab Unused import 2011-07-13 22:00:35 +01:00
Jon Tibble a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
rimach crichter@web.de 98e1028705 update 2011-07-10 23:43:07 +02: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 4651ec35b6 Fixes 2011-07-10 12:59:23 +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
Andreas Preikschat 2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Andreas Preikschat 5ff8d9d326 - small image queue fix
- refactoring

bzr-revno: 1677
2011-07-08 14:41:44 +02: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
Jon Tibble 1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble 623b56742c Cleanups 2011-07-07 19:03:12 +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
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 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
Stevan Pettit da45d09e48 Moved delete dialog heading translate to ui.py 2011-06-28 16:35:28 -04:00
Tim Bentley 70709e9b12 Add ability to lock toolbar
bzr-revno: 1664
2011-06-28 17:12:41 +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 a05d9098ef - removed not needed code
- some translation fixes
- remove close button on print dialog
2011-06-26 18:15:13 +02:00
Andreas Preikschat f979233787 renamed method 2011-06-25 21:37:23 +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
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 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
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
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 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
Tim Bentley 440b5eee77 Head 2011-06-16 21:11:12 +01: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
rimach crichter@web.de 2c62a819b3 Head 2011-06-13 23:20:20 +02: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
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 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
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
Simon Scudder 0b2f446856 Fixed bug #795945 "Text colour appearing in shadow" now within 80 columns 2011-06-11 15:14:20 -03:00
Simon Scudder 335e276d6d Fixed bug #795945 "Text colour appearing in shadow" 2011-06-11 12:18:58 -03:00
Jonathan Corwin 0c6049917a Head 2011-06-11 09:32:36 +01:00
Tim Bentley 8b331af6f7 Fix mediamanager bug
bzr-revno: 1628
2011-06-11 08:45:11 +01: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
Jonathan Corwin 865ccd867a Fix outstanding strings prior to string freeze
bzr-revno: 1624
2011-06-10 20:25:57 +01:00
Jonathan Corwin dfd2468c4c String fixes 2011-06-09 23:03:30 +01: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 7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
rimach crichter@web.de 99079b1c95 Head 2011-06-08 20:11:20 +02:00
rimach crichter@web.de 592af0e181 bugfixing 2011-06-08 15:18:05 +02: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 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 98e731ee9a fallback if thumb was not created 2011-06-06 09:05:10 +02:00
rimach crichter@web.de dbce448da1 update 2011-06-05 23:10:49 +02:00
Armin Köhler 17209fcc29 define appStartup() in plugin.py
remove hassattr(plugin, appStartup)
2011-06-05 20:46:00 +02:00
Andreas Preikschat e08c65aa45 fixed ratio 2011-06-05 18:33:28 +02: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
Andreas Preikschat 47936e34a7 improved thumbnail creation speed 2011-06-03 17:57:56 +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
Jonathan Corwin 604394a2eb head 2011-06-02 22:17:14 +01:00
Jonathan Corwin 364de1af86 aphrostrophe fix for song searching 2011-06-01 23:47:42 +01:00
Jonathan Corwin 40f2b4d138 Fix unhidden toolbox that appears in the media manager 2011-06-01 19:58:27 +01:00
Jonathan Corwin c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Stevan Pettit 729fe2cfa3 bug-789102, moved mediaitem list updates out of editforms into mediaitems 2011-05-30 23:52:17 -04:00
Jonathan Corwin 02da22c349 Head 2011-05-29 16:33:09 +01:00
Jonathan Corwin 82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Armin Köhler 8caece6af0 HEAD r1588 2011-05-28 14:50:29 +02: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
Armin Köhler 8699e36b37 HEAD r1586 2011-05-27 22:38:06 +02:00
Raoul Snyman 665fc82c94 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 2011-05-27 21:25:03 +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 d3148f90f8 fix Traceback like Jonathan recommand 2011-05-27 09:54:49 +02:00
Andreas Preikschat 6aca4600b7 fixed bug 788770
Fixes: https://launchpad.net/bugs/788770
2011-05-26 20:52:05 +02:00
Andreas Preikschat 7ec12f15ea r1576 2011-05-26 19:56:08 +02:00
Tim Bentley acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley 8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01: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
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
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
rimach crichter@web.de 4ab7f93044 Sync 2011-05-24 22:05:02 +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
Andreas Preikschat 2377a5f5ff fix for Esther 8:7 2011-05-24 09:02:13 +02:00
rimach crichter@web.de d39ecb8e8e Sync 2011-05-23 21:42:10 +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
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 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
Stevan Pettit c9481e034e modified:
openlp/core/lib/mediamanageritem.py
2011-05-21 16:29:43 -04:00
Jonathan Corwin 031525b0e6 Lose the [None] and fix jquery issue 2011-05-21 18:43:37 +01: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
Stevan Pettit 31c1d23070 modified:
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
2011-05-20 17:30:28 -04:00
Stevan Pettit 00a2a7b771 modified:
openlp/core/lib/mediamanageritem.py
2011-05-20 01:19:26 -04:00
Stevan Pettit c4b0862979 modified:
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
2011-05-20 01:01:49 -04:00
Jonathan Corwin d4e83ae45a Remote web add to service 2011-05-20 00:09:42 +01:00
Tim Bentley 32127d51bb Add Search to Custom
bzr-revno: 1557
2011-05-19 17:10:49 +01:00
Tim Bentley 509811620d Head 2011-05-18 15:27:29 +01:00
Andreas Preikschat 4cd23308b8 regex clean ups 2011-05-18 16:26:19 +02:00
Andreas Preikschat 30a6d46cd8 Added missing html tag.
bzr-revno: 1552
2011-05-18 12:48:21 +02:00
rimach crichter@web.de 43a55c7087 Sync 2011-05-17 23:11:46 +02:00
rimach crichter@web.de aebc0e240e further progress 2011-05-17 21:50:00 +02:00
Andreas Preikschat 957f4accb0 fixed broken html head 2011-05-17 20:55:45 +02:00
Jonathan Corwin 274c4ee87a tidies 2011-05-15 21:53:25 +01:00
Jonathan Corwin f701eb9417 Head 2011-05-15 21:34:32 +01:00