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

1703 Commits

Author SHA1 Message Date
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