Commit Graph

3861 Commits

Author SHA1 Message Date
rimach
3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Christian Richter
b2349d892b For newer versions of webkit playing videos doesnt work anymore.
bzr-revno: 1807
2011-11-29 19:49:33 +02:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j
047477c236 layout fix in exceptionform
bug fix triggerd by searching for nonexistend book numbers
2011-11-26 20:13:51 +01:00
rimach
65ce3c84d2 fix video play problem with newer webkit version and webkit player 2011-11-24 22:25:38 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach
dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT.
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
2011-11-23 06:05:42 +00:00
Andreas Preikschat
0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3 Amend check for files and delete if not used any more
Fixes: https://launchpad.net/bugs/891781
2011-11-18 19:34:04 +00: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
acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01: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
a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
c0cc590c71 sync 2011-11-11 17:42:01 +01:00
Raoul Snyman
46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Andreas Preikschat
48354ec8ef - fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller)
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
2011-11-05 20:39:51 +01:00
Tim Bentley
d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach
4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01: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
3d316a802b Head 2011-11-02 19:06:23 +00:00
Tim Bentley
3bd0ad9181 Fix crash with two soft breaks 2011-11-02 18:58:46 +00:00
Tim Bentley
d4eeb4136a stop alerts crashing with splash screen
bzr-revno: 1793
2011-11-01 06:09:21 +00:00
Tim Bentley
14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat
71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat
94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat
e856fa9aed r1790 2011-10-31 09:56:48 +01:00
Andreas Preikschat
5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat
cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat
f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat
ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat
2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
Andreas Preikschat
eb7b7a19d8 r1790 2011-10-31 08:09:48 +01:00
Andreas Preikschat
d1030a7c2d Corrected comment 2011-10-31 08:08:51 +01:00
Tim Bentley
c37ffbe3e2 Pass in plugins 2011-10-31 06:03:03 +00:00
Tim Bentley
c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley
ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01: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
01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat
360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat
c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat
33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach
a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat
ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat
a42940b6bb - shortcuts only for live controller
- removed v shortcut
2011-10-24 17:36:59 +02:00
Andreas Preikschat
cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat
b603017b1c started work on shortcuts allowing jumping between different verses
Fixes: https://launchpad.net/bugs/827862
2011-10-23 19:47:15 +02:00
Tim Bentley
5f9ed32bfe Fix assignment error 2011-10-23 18:22:11 +01:00
Meinert Jordan
f25cd069ab add version information for mako, migrate and uno to exceptionform
bzr-revno: 1784
2011-10-22 15:32:04 +02:00
M2j
5a415311a5 Correction for Migrate version smaller than 0.7 2011-10-22 14:30:21 +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
M2j
aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +02:00
Andreas Preikschat
e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background")
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
2011-10-19 19:30:32 +01: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
2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach
dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +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
406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat
004472baa8 reverted alert change 2011-10-16 16:53:39 +02: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
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j
525658ae8b better readable coding style 2011-10-15 23:21:22 +02: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
Andreas Preikschat
a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat
ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
17ec218529 Fix wonky footer
bzr-revno: 1775
Fixes: https://launchpad.net/bugs/863841
2011-10-13 19:02:39 +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
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley
9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat
76f47a4f62 - clean ups
- only display alert when the screen is not hidden
2011-10-10 18:54:01 +02:00
Andreas Preikschat
658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat
6883427cbd fixed bug 871441
Fixes: https://launchpad.net/bugs/871441
2011-10-10 18:22:41 +02:00
Andreas Preikschat
06068eedce fixed bug 863846
Fixes: https://launchpad.net/bugs/863846
2011-10-08 15:29:35 +02: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
Tim Bentley
575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat
45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley
159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat
1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02: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
Tim Bentley
6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley
297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley
9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley
128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach
3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach
c299efab1a update 2011-09-28 22:54:43 +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
Tim Bentley
632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley
3e2e87bb2c Initial stab
Fixes: https://launchpad.net/bugs/814201
2011-09-27 20:37:34 +01:00
Tim Bentley
276d4045e3 Fix edit for tags loaded for song which is not saved
bzr-revno: 1765
2011-09-27 18:23:21 +01:00
Tim Bentley
90cc812592 Head 2011-09-27 05:59:50 +01:00
Tim Bentley
695e08a63a get the right field 2011-09-26 19:56:52 +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
Tim Bentley
7fe57a9a5d Make Int 2011-09-26 19:12:27 +01: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
6631c2fcbb r1761 2011-09-26 18:26:47 +02:00
Andreas Preikschat
3a2be026f5 reverted some changes 2011-09-26 18:25:22 +02:00
Tim Bentley
8c6fcfcd4a Fix typing error 2011-09-26 17:12:40 +01: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
Tim Bentley
682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +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
Raoul Snyman
0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-24 00:14:23 +02:00
Martin Zibricky
3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky
7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +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
81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +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
Raoul Snyman
e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-21 22:47:30 +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
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
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
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
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
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
Tim Bentley
6a901f2de9 Add justify to theme options
Fixes: https://launchpad.net/bugs/802252
2011-09-16 18:23:39 +01:00
Tim Bentley
52c63d9665 Undo fix 2011-09-14 21:35:32 +01: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
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
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
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
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
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
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
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