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

6192 Commits

Author SHA1 Message Date
Raoul Snyman
ce9ca0b44b Updated the look of the Library tabs 2014-04-02 01:29:23 +02:00
Samuel Mehrbrodt
d064549eab Icon, indentation 2014-04-01 22:39:13 +02:00
Jonathan Springer
d26b34aee0 Modify loading file from the command line to only load files ending with osz, oszl, or otz. 2014-04-01 14:58:22 -04:00
Tim Bentley
3e7370c656 head 2014-04-01 18:33:13 +01:00
Tim Bentley
edd1ed849a minor fixes 2014-04-01 18:32:19 +01:00
Jonathan Springer
6ca37531a0 Remove unnecessary platform specific code, remove orphaned and unused registry execute, and fix two functions to register to the registry instead of executing. 2014-04-01 13:07:25 -04:00
Andreas Preikschat
5bc5678078 - added a script to trigger jenkins 
bzr-revno: 2345
 2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt
81a8868a5a Fix merge 2014-03-31 20:49:47 +02:00
Samuel Mehrbrodt
8b7bbb4761 Merge trunk 2014-03-31 20:48:10 +02:00
Andreas Preikschat
3db984a846 clean up: simplify code 2014-03-31 19:32:49 +02:00
Andreas Preikschat
5227924846 fix: removed stray print 2014-03-31 19:29:14 +02:00
Andreas Preikschat
c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat
b69f480dc0 head 2014-03-31 14:19:33 +02:00
Andreas Preikschat
93ff301840 cleanup: remove local variable 2014-03-31 14:13:50 +02:00
Samuel Mehrbrodt
ad9717ea42 Add support for author types to OpenLyrics import and export 2014-03-30 23:42:46 +02:00
Samuel Mehrbrodt
69c32d91a4 Merge trunk 2014-03-30 19:13:26 +02:00
Tomas Groth
bfbfcd5b15 Head 2014-03-30 13:26:13 +02:00
Raoul Snyman
6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run 
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
 2014-03-30 13:02:25 +02:00
Andreas Preikschat
7787e1a845 head 2014-03-28 21:38:38 +01:00
Samuel Mehrbrodt
71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Tomas Groth
19558e7a03 head 2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt
bf32fe164a Test 2014-03-26 13:06:48 +01:00
Samuel Mehrbrodt
a4829c62ba Add missing arguments for debug mode 
Fixes: https://launchpad.net/bugs/1296574
 2014-03-26 12:26:16 +01:00
Andreas Preikschat
7a1825a79a tests 2014-03-23 11:49:03 +01:00
Andreas Preikschat
47ad40aaac removed white spaces 2014-03-22 20:19:08 +01:00
Andreas Preikschat
d5b421aa70 updated vlc.py 2014-03-22 20:18:27 +01:00
Andreas Preikschat
91adff326d head 2014-03-22 20:18:04 +01:00
Andreas Preikschat
ad1970f27e fixed spelling 2014-03-22 10:53:55 +01:00
Tomas Groth
852ec00fd7 Head 2014-03-20 21:11:18 +01:00
Tim Bentley
5d9533947d Final set of PEP8 cleanups 2014-03-20 19:10:31 +00:00
Tomas Groth
6e46fd6a2a Revert wrong changes to settings.py 2014-03-19 19:16:03 +01:00
Tomas Groth
991661b169 Head 2014-03-19 18:49:46 +01:00
Raoul Snyman
35e3564655 Tests! 2014-03-18 23:03:53 +02:00
Tim Bentley
30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tomas Groth
258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tim Bentley
a3b1a599b2 fix bugs 2014-03-17 19:14:22 +00:00
Tim Bentley
9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tomas Groth
5b1c6d82c9 Head 2014-03-17 19:44:34 +01:00
Tim Bentley
6c80ba1c7d Full migration 2014-03-17 07:29:29 +00:00
Tim Bentley
22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley
0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley
9cf3428542 Head 2014-03-15 06:25:35 +00:00
Tim Bentley
d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Tim Bentley
68a020709a head 2014-03-13 20:24:33 +00:00
Tim Bentley
ea99cbb08d use decorator 2014-03-13 20:20:42 +00:00
Tim Bentley
5e6f97d74e fix order and comment 2014-03-13 20:08:47 +00:00
Tomas Groth
ecc1ffbd4c Fix tests. 
To avoid segfaults reuse QApplication instance.
Also use ICU when getting locale sort key.

bzr-revno: 2331
 2014-03-13 00:07:23 +02:00
Tim Bentley
31ee1b43a6 first view 2014-03-12 17:41:52 +00:00
Tim Bentley
e78dac1edf Head 2014-03-11 20:17:18 +00:00
Tomas Groth
5ac6f853d0 Changed get_locale_key to only use ICU if available. 2014-03-11 20:38:47 +01:00
Tim Bentley
a74567b9f6 Bible database tests 2014-03-11 19:01:09 +00:00
Raoul Snyman
b35de747ab Move HistoryComboBox to openlp.core.common 2014-03-11 20:58:49 +02:00
Tomas Groth
b831ebd48e Use ICU for locale sort key 2014-03-10 20:53:11 +01:00
Tomas Groth
3988aacfbd Made it possible to save and load optical clip to servicefile. Also some pep8 and general cleanup. 2014-03-08 21:14:04 +00:00
Tomas Groth
e6f23324ba Merged with trunk 2014-03-04 22:50:24 +00:00
Tomas Groth
67acb9d824 Implemented DVD clip selection and playback, still needs a lot of cleanups. 2014-03-04 22:33:50 +00:00
Raoul Snyman
c607661aee HEAD 2014-03-04 23:51:54 +02:00
Tim Bentley
43f156d9fe Update Songs forms 2014-03-04 18:49:30 +00:00
Raoul Snyman
831f2f3b69 HEAD 2014-02-27 23:39:44 +02:00
Tomas Groth
52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tim Bentley
7f58348c8c fix up pintservice form 2014-02-23 15:41:09 +00:00
Tim Bentley
3d556a9790 Head 2014-02-23 15:02:53 +00:00
Tomas Groth
e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01:00
Philip Ridout
150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Rafael Lerm
83e20b79b6 Changed string that caused crash on startup. Corrected bug 1269929 2014-01-16 18:34:37 -02:00
Tim Bentley
bc3081fd18 Remove redundent method 2014-01-13 17:31:46 +00:00
Tim Bentley
ca47293345 Fix up help link 2014-01-13 17:29:31 +00:00
Tim Bentley
5d740a7706 Removep 
bzr commit -mRemovep
 2014-01-11 22:05:38 +00:00
Tim Bentley
743ad7b44a Clean up inits 2014-01-11 21:29:01 +00:00
Tim Bentley
7fe95731f9 Fix up Main display 2014-01-11 17:52:01 +00:00
Felipe Polo-Wood
d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Tim Bentley
3a5c15a29a Migrate renderer - cleanup 2014-01-05 17:12:42 +00:00
Tim Bentley
360d9883b4 Migrate renderer 2014-01-05 17:09:51 +00:00
Tim Bentley
8038388110 head 2014-01-04 20:58:46 +00:00
Tim Bentley
60d4009261 start off 2014-01-04 20:58:18 +00:00
Tim Bentley
2dd4a9c542 Add config to service file 2014-01-04 16:33:20 +00:00
Tim Bentley
5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tim Bentley
d8ec08e020 Cleaned up Theme and Service Managers Now working the same way. 
Fixed up tests for both classes
PEP8 changes for Alerts and Custom + various other bits in passing.

bzr-revno: 2323
 2014-01-03 21:36:27 +00:00
Tim Bentley
db6ba7c780 fix alerts more 2014-01-01 09:57:06 +00:00
Tim Bentley
2755aad4c6 More PEP 8 changes 2014-01-01 09:33:07 +00:00
Raoul Snyman
1cf3140073 Reworked SongSelect branch after a major refactor in trunk. 
To recap:
- Added a standalone CCLI SongSelect importer
- Add icons to the import and export menu items
- Move Theme import and export up with Settings
 2014-01-01 00:27:27 +02:00
Tim Bentley
259b2b074f Fix widget 2013-12-31 21:02:35 +00:00
Tim Bentley
51178b2ede Fix tests 2013-12-31 20:29:03 +00:00
Tomas Groth
f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Tomas Groth
3cc69cc9fd Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8. 2013-12-31 12:15:18 +00:00
Tim Bentley
e49beeb2c4 More tests 2013-12-31 07:27:07 +00:00
Tim Bentley
c8a3b33044 Start to fix ServiceManager and extent tests 2013-12-30 19:50:34 +00:00
Felipe Polo-Wood
b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Andreas Preikschat
80c6c371df FIX: renamed qt method 
bzr-revno: 2322
 2013-12-30 12:13:40 +01:00
Felipe Polo-Wood
1a83a0a557 Merge head 2013-12-30 03:53:51 -05:00
Felipe Polo-Wood
b993b0d4a8 Style changes 2013-12-30 03:35:05 -05:00
Andreas Preikschat
8975fec06e added comment 2013-12-29 21:18:22 +01:00
Tim Bentley
27d651a129 Fix comment 2013-12-29 20:13:58 +00:00
Andreas Preikschat
4c145071af fixed method rename 2013-12-29 21:13:41 +01:00
Tim Bentley
f187d86d1e Fix comment 2013-12-29 20:13:40 +00:00
Tim Bentley
8b109a8593 Fix comment 2013-12-29 20:09:41 +00:00
Tomas Groth
84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Felipe Polo-Wood
1ef910463c Merge head 2013-12-28 12:06:29 -05:00
Tomas Groth
47ea300786 Merged with trunk 2013-12-27 17:47:40 +00:00
Tomas Groth
685258b744 Made presenting PDF from the servicemanager work 2013-12-27 17:44:12 +00:00
Tim Bentley
1d9ab33f9f Fix array tag 2013-12-26 20:19:47 +00:00
Tim Bentley
55bb0cd80f Theme wizard and fixes 2013-12-26 17:36:00 +00:00
Tim Bentley
35c5577cb7 More fixes 2013-12-26 08:56:53 +00:00
Tim Bentley
301eb06ce6 Redo ServiceManager 2013-12-24 21:24:52 +00:00
Tim Bentley
ccde045e60 More fixes 2013-12-24 20:45:29 +00:00
Tim Bentley
da08356f1c yet more clean ups 2013-12-24 15:55:01 +00:00
Tim Bentley
508d050b4c Head 2013-12-24 11:32:56 +00:00
Tim Bentley
80e818bd15 more cleanups 2013-12-24 11:32:38 +00:00
Tim Bentley
6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley
85da26684c Mediamanager and DND classes 2013-12-24 07:19:57 +00:00
Tim Bentley
b2bee17211 Few minnor fixes 2013-12-24 06:15:41 +00:00
Tim Bentley
af006d087a Mainwidow cleanup 2013-12-23 20:43:35 +00:00
Tim Bentley
49dab79ce9 ThemeManager conversion 2013-12-23 07:03:56 +00:00
Tim Bentley
a5ca17246f Fix on_slide_select bugs 2013-12-21 08:46:30 +00:00
Raoul Snyman
3204a4db72 - Specify OpenLP as the user agent when querying SF.net 
- Fix another test
- Update tests for get_web_page
 2013-12-20 21:25:42 +02:00
Tim Bentley
d4ce5489ad updates and fix up slidecontroller 2013-12-19 20:17:06 +00:00
Raoul Snyman
06d08f61a6 Fix bug #1211049: Add a list of valid user agents and a method to return an appropriate user agent for the current platform 
Fixes: https://launchpad.net/bugs/1211049
 2013-12-18 23:44:00 +02:00
Tim Bentley
e9a7850bc8 Add registry mixin and code cleanups 2013-12-15 16:50:09 +00:00
Tim Bentley
e93b825ab4 Clean up PluginManager and complete logging 2013-12-14 08:12:41 +00:00
Tim Bentley
d684359e59 Clean up exceptions used in error 2013-12-13 19:44:17 +00:00
Tim Bentley
84e90e01d1 new files 2013-12-13 18:42:26 +00:00
Tim Bentley
cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Jonathan Springer
79a2a5b1db Merge trunk 2013-12-09 07:19:36 -05:00
Jonathan Springer
2a262e4ef6 pass all keyboard events to shortcut dialog 2013-12-08 21:05:52 -05:00
Tim Bentley
d0a9423982 Head 2013-12-06 19:00:55 +00:00
Felipe Polo-Wood
b85b09c92c Merge back to trunk 2013-12-02 11:14:09 -05:00
Felipe Polo-Wood
04abbd97d0 implemented caching thru the ImageManager 
Styling issues
Merge with fix-router changes
 2013-11-22 13:21:07 -05:00
Philip Ridout
81c2f1a4b3 updated tests 2013-11-16 21:04:16 +00:00
Philip Ridout
c41842125d HEAD 2013-11-16 20:32:50 +00:00
Philip Ridout
4c8f817269 HEAD 2013-11-16 10:07:38 +00:00
Arjan Schrijver
27395fcaf6 Rename 'Thurdsday' to 'Thursday' 
bzr-revno: 2310
 2013-11-14 21:07:11 +02:00
Andreas Preikschat
1b89900336 head 2013-11-14 10:05:59 +01:00
Felipe Polo-Wood
6c3253c7c0 Added caching for thumbnail images 2013-11-07 15:13:15 -05:00
Philip Ridout
bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Felipe Polo-Wood
1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04:00
Felipe Polo-Wood
fecd56106d Removed extra line 
Made PowerpontController class compatible with Linux
 2013-10-31 22:53:52 -04:00
Felipe Polo-Wood
e958e17889 - Added settings dialog at the client (with choice for thumbnail) 
- Fixed problem Presentations at remote getting out of sync
 2013-10-31 16:54:38 -04:00
Raoul Snyman
d09747a33a Fixed the problems with the exception form. Not sure how to test it though... 2013-10-30 22:34:23 +02:00
Felipe Polo-Wood
6d464dec4b Added resizing capabilities to the thumbnails 
Fixed a problem with setting the presentation slides from the remote
 2013-10-29 11:38:28 -04:00
Philip Ridout
a69b2d86ef More uneeded str's 2013-10-28 21:23:17 +00:00
Felipe Polo-Wood
9a07d6887b style fixes 2013-10-28 11:16:22 -04:00
Felipe Polo-Wood
1aae38cb8e Merging 2013-10-27 23:40:38 -04:00
Felipe Polo-Wood
b9850e6e68 bunch of cosmetic changes 2013-10-27 22:33:28 -04:00
Arjan Schrijver
f838a49509 fixed bug #1245269 'Thursday is called Thurdsday' 
Fixes: https://launchpad.net/bugs/1245269
 2013-10-27 21:19:19 +01:00
Dmitriy Marmyshev
70144c0da4 Trunk & fixes 2013-10-27 02:53:32 +04:00
Dmitriy Marmyshev
e657a99d0b Trunk 2013-10-24 21:09:31 +04:00
Tim Bentley
63d65da6c1 Head 2013-10-23 20:26:03 +01:00
Tim Bentley
b1873016c9 Move and tests 2013-10-23 20:25:46 +01:00
Tim Bentley
1022661160 Theme cleanup start and major class restructure 
bzr-revno: 2307
 2013-10-23 19:49:39 +01:00
Philip Ridout
051fa9db8f Changed logging to UTF-8 2013-10-20 21:34:46 +01:00
Felipe Polo-Wood
dd1f556a8e Fixed formatting issues 
Added three test classes for the presentation controllers 
Fixed issue that failed load for ImpressDocument
 2013-10-19 19:15:46 -04:00
Felipe Polo-Wood
00fd7f01f7 -- General code cleanup to better match the architecture 
-- Added thumbnails to the remote display
-- Modify the service list to use the displaytitle
 2013-10-19 01:27:25 -04:00
Tim Bentley
ba0808f551 Fix up json 2013-10-18 19:10:47 +01:00
Felipe Polo-Wood
348ebee661 Read titles and notes from the presentation files and display them on the remote 2013-10-17 15:31:17 -04:00
Tim Bentley
0f183af84d Missed file 2013-10-15 20:17:53 +01:00
Tim Bentley
b9e2a2cdc1 Missed imports 2013-10-13 22:07:28 +01:00
Tim Bentley
63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley
a82c64237c Fix move of check_directory_exists 2013-10-13 18:23:52 +01:00
Tim Bentley
a013d17bdd fix tests and add basic test 2013-10-13 18:02:12 +01:00
Tim Bentley
b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley
257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Andreas Preikschat
f0be2ecc17 head + conflict 2013-10-11 11:48:35 +02:00
Tim Bentley
bd7d412cc9 Head 2013-10-04 20:28:09 +01:00
Tim Bentley
2fe31991e2 Fixes 2013-10-04 20:27:53 +01:00
Raoul Snyman
1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
Tim Bentley
c240068a6e head 2013-09-28 21:55:42 +01:00
Tim Bentley
d630b1525c fix reload 2013-09-28 21:55:25 +01:00
Tim Bentley
8f47af1732 Head 2013-09-26 22:06:57 +01:00
Dmitriy Marmyshev
1ff6f5fe20 Removes border, but not affects to OSX border and shadow 2013-09-18 10:48:25 +04:00
Dmitriy Marmyshev
3910a582c0 fixed replacing background with video unblank screen even if it blanked to theme. 
Fixes: https://launchpad.net/bugs/1225763
 2013-09-18 08:50:07 +04:00
Dmitriy Marmyshev
5d648f80c6 fixed transparent display for OS X 
Fixes: https://launchpad.net/bugs/1117098
 2013-09-17 20:23:45 +04:00
Philip Ridout
52781b9628 more Py3 fixes 2013-09-15 20:42:29 +01:00
Philip Ridout
9f5bd87a50 Py3 Fixes 2013-09-15 20:27:40 +01:00
Philip Ridout
a06469fea0 head 2013-09-15 19:36:58 +01:00
Tim Bentley
4d1ba13128 minor fixes 2013-09-15 07:37:43 +01:00
Tim Bentley
b868ecc57d remove reminances of cherrypy 2013-09-14 20:16:14 +01:00
Tim Bentley
5295697677 fix error message 2013-09-11 20:00:30 +01:00
Andreas Preikschat
4999ecb6e6 last test 2013-09-11 16:22:28 +02:00
Andreas Preikschat
f24f3a751f more tests 2013-09-11 15:51:49 +02:00
Andreas Preikschat
fea4893f40 removed pritn 2013-09-11 15:30:59 +02:00
Andreas Preikschat
0677e389c1 doc 2013-09-11 15:00:34 +02:00
Dmitriy Marmyshev
b1adce782e Fixed unicode 2013-09-11 00:29:45 +04:00
Jeffrey S. Smith
334cef478d Fix various tests and broken code revealed by tests 2013-09-09 16:10:40 -05:00
Tim Bentley
71f74a53c2 Rename class 2013-09-08 22:13:15 +01:00
Andreas Preikschat
3ab4eb36d0 head 2013-09-08 12:30:49 +02:00
Tim Bentley
ee6490dc23 Fix missing () 2013-09-07 08:52:52 +01:00
Andreas Preikschat
ff27607f9b head 2013-09-06 00:41:24 +02:00
Dmitriy Marmyshev
df56435f44 fixes 2013-09-05 11:23:59 +04:00
Dmitriy Marmyshev
473d10cf79 styling. 2013-09-04 09:40:20 +04:00
Dmitriy Marmyshev
44e5f5bf62 Trunk & fixes 2013-09-04 09:05:15 +04:00
Dmitriy Marmyshev
2900e756fd fix 2013-09-04 07:51:53 +04:00
Tim Bentley
e98657d704 Fix up controller tests 2013-09-02 21:59:19 +01:00
Tim Bentley
8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Tim Bentley
6c2c5e8e80 to python 3 2013-09-01 07:31:09 +01:00
Tim Bentley
6282b4fcb6 Tests and fixed 2013-09-01 07:21:29 +01:00
Tim Bentley
ede6adeb48 Tests added 2013-09-01 07:16:27 +01:00
Andreas Preikschat
3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Tim Bentley
e4ba5cb72a add test files and ui validation sort of works 2013-08-31 18:20:43 +01:00
Andreas Preikschat
ccf5d6535b head 2013-08-31 17:23:46 +02:00
Tim Bentley
7b82de9206 Head 2289 2013-08-31 12:43:21 +01:00
Tim Bentley
dceaaa6996 ore changes 2013-08-31 12:43:05 +01:00
Tim Bentley
aebe2d80df Remove last traces of pickle and clean up the tests 
bzr-revno: 2289
 2013-08-31 12:40:59 +01:00
Tim Bentley
b3ab68b0f5 Validation in progress 2013-08-31 09:52:44 +01:00
Tim Bentley
e1f153f4f4 Fix text 2013-08-29 17:40:07 +01:00
Tim Bentley
eb1703bcc9 fix up edit code 2013-08-26 09:11:20 +01:00
Tim Bentley
ba111776ed Remove pickle from the code now 2.0.2 is in 2013-08-25 19:31:15 +01:00
Tim Bentley
676b9133d1 formatting tags 2013-08-25 14:29:00 +01:00
Philip Ridout
49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +00:00
Andreas Preikschat
9b0b88718d head 2013-08-22 20:47:08 +02:00
Philip Ridout
2ceb165901 change string names 2013-08-22 05:33:19 +00:00
Samuel Mehrbrodt
74e2c1107c Don't allow collapsing of the Live or Preview panes. They can still be hidden via the menu. 
bzr-revno: 2285
 2013-08-16 22:45:26 +02:00
Philip Ridout
364fde73c5 Fix #120515 by reimplementing QFileDialog.getOpenFileNames 2013-08-13 19:02:04 +01:00
Andreas Preikschat
5e7bc82694 more constructors 2013-08-01 15:04:42 +02:00
Andreas Preikschat
b48fbd40a3 fixed formatting tags 2013-08-01 14:57:59 +02:00
Andreas Preikschat
4cb4a8f261 head 2013-07-31 19:36:06 +02:00
Tim Bentley
50b1ba437e cherrypy changes 2013-07-27 12:30:38 +02:00
Philip Ridout
57cf6d5445 actually changed validation this time 2013-07-26 21:17:51 +01:00
Philip Ridout
3236af354c fixed #1204629 and made the validation more robust by checking the open dialog 2013-07-25 21:11:57 +01:00
Andreas Preikschat
5ba72b4ad1 head + conflict 2013-07-21 22:34:51 +02:00
Tim Bentley
208e1c2e1e Change uno import for exception form to remove excess uno import noise 
bzr-revno: 2282
 2013-07-21 16:40:04 +01:00
Tim Bentley
72c83d444b missing blank line 2013-07-21 15:13:44 +01:00
Tim Bentley
790c9ae4f6 Add doc string 2013-07-21 15:10:21 +01:00
Andreas Preikschat
3fef52348b head 2013-07-20 11:38:24 +02:00
Tim Bentley
50f3b2b563 Fix uno import noise in python 3 2013-07-19 21:56:31 +01:00
Andreas Preikschat
d5b0f3ac9a fixed version number 2013-07-19 18:07:33 +02:00
Tim Bentley
7d081b866a head 2013-07-19 16:52:01 +01:00
Tim Bentley
dc7cb85574 Uneeded import 2013-07-19 16:51:47 +01:00
s.mehrbrodt@gmail.com
951d8964db Don't allow to collapse the Live or Preview Pane. 
They can still be hidden via the menu.
 2013-07-19 17:36:45 +02:00
Andreas Preikschat
a0f35e0d5e fixed bug 1183078 
Fixes: https://launchpad.net/bugs/1183078
 2013-07-19 15:57:19 +02:00
Andreas Preikschat
e93a59e83a spelling 2013-07-18 21:44:28 +02:00
Andreas Preikschat
cd91e4dcbf changed constructor 2013-07-18 21:42:07 +02:00
Andreas Preikschat
7f541327ca changed to 120 chars 2013-07-18 21:28:35 +02:00
Andreas Preikschat
60833923dc changed super calls 2013-07-18 21:10:19 +02:00
Andreas Preikschat
25e7df079b changed constructor 2013-07-18 21:04:38 +02:00
Tim Bentley
c6f29ca53d fixed for fedora 2013-07-18 18:42:51 +02:00
Andreas Preikschat
025e031d76 updated constructor 2013-07-18 16:34:33 +02:00
Andreas Preikschat
5fb36b5ef7 updated constructor 2013-07-18 16:32:23 +02:00
Andreas Preikschat
1571cab0cf changed constructors 2013-07-18 16:19:01 +02:00
Andreas Preikschat
13c9a69de1 changed constructors 2013-07-18 16:14:29 +02:00
Andreas Preikschat
3409c491fe changed constructors 2013-07-18 16:11:39 +02:00
Andreas Preikschat
0e480e389b changed constructor 2013-07-18 13:23:59 +02:00
Andreas Preikschat
542cdd78cb changed constructor 2013-07-18 13:19:20 +02:00
Andreas Preikschat
e8e003d6f8 changed constructor 2013-07-18 13:17:40 +02:00
Andreas Preikschat
2c167ca996 changed constructor 2013-07-18 13:15:17 +02:00
Andreas Preikschat
b04d0f42cc fixed image filter 2013-07-17 14:28:48 +02:00
Andreas Preikschat
8bec349273 fixed image filter 2013-07-17 14:22:21 +02:00
Andreas Preikschat
48d2956bdd head 2013-07-17 14:21:44 +02:00
Andreas Preikschat
0512b74f32 reverted change 2013-07-15 20:06:45 +02:00
Andreas Preikschat
ad715fec29 try to use locale.strxfrm 2013-07-15 20:02:54 +02:00
Tim Bentley
94e8b90c5d Added first test 2013-07-13 17:33:32 +01:00
Andreas Preikschat
a091fe9395 fixed service load 2013-07-12 21:35:30 +02:00
Andreas Preikschat
765a10d2ea fixed service save 2013-07-12 21:32:46 +02:00
Andreas Preikschat
53b0825a18 fixed service save 2013-07-12 21:26:46 +02:00
Tim Bentley
38eec999b7 Head 2013-07-12 19:13:21 +01:00
Tim Bentley
6062605622 make sure we have the image file for theme backgrounds 
Fixes: https://launchpad.net/bugs/1197376
 2013-07-11 21:58:15 +01:00
Tim Bentley
51ab25b716 Fix the constraints to be > 1 
Fixes: https://launchpad.net/bugs/1196926
 2013-07-11 21:54:30 +01:00
Andreas Preikschat
3a021b6804 Head 2013-07-09 21:47:12 +02:00
Dmitriy Marmyshev
25ed0ab4d7 small fixes 2013-07-09 01:26:31 +04:00
Tomas Groth
de0f5c912f Use json as services format instead of python pickle. 
bzr-revno: 2275
 2013-07-07 17:53:16 +02:00
Andreas Preikschat
3db606f653 theme import fixes 2013-07-07 16:47:04 +02:00
Andreas Preikschat
07039a4908 import clean up 2013-07-07 16:41:43 +02:00
Andreas Preikschat
90e867b797 fixed service print 2013-07-07 16:19:18 +02:00
Andreas Preikschat
1328ca62d2 print form constructor 2013-07-07 16:16:55 +02:00
Andreas Preikschat
3d803f4423 reverted not needed changes 2013-07-07 00:27:49 +02:00
Andreas Preikschat
a3b99a6a5d removed fixme 2013-07-07 00:24:27 +02:00
Andreas Preikschat
dec7cc64b3 head 2013-07-07 00:20:17 +02:00
Andreas Preikschat
bd928962bb - app data clean up 
- removed not need enumeration (qt takes care of the config dir)

bzr-revno: 2272
 2013-07-07 00:08:43 +02:00
Andreas Preikschat
e145be9873 2013-07-06 23:32:58 +02:00
Andreas Preikschat
022f899c10 added fixme 2013-07-06 23:20:46 +02:00
Andreas Preikschat
18c3574cfe more FTW fixes 2013-07-06 23:18:15 +02:00
Andreas Preikschat
04bbeead56 more fixes to the FTW 2013-07-06 23:06:45 +02:00
Andreas Preikschat
e3148f7f1a more fixes to the FTW 2013-07-06 23:04:47 +02:00
Andreas Preikschat
a2b7ebcc30 started to fix FTW 2013-07-06 22:56:13 +02:00
Andreas Preikschat
2c5eb64f6e sort fix 2013-07-06 21:49:03 +02:00
Andreas Preikschat
eb02bc659a appdata clean up 2013-07-06 21:21:21 +02:00
Andreas Preikschat
1aac52de8c do not remember when theme name is empty 2013-07-06 20:33:45 +02:00
Tomas Groth
4e1868983e Merged trunk into branch. 2013-07-06 12:27:08 +02:00
Andreas Preikschat
d038aa1d9b head 2013-07-05 21:33:16 +02:00
Andreas Preikschat
bcc8853857 fixed attribute error 
bzr-revno: 2270
 2013-07-05 21:22:24 +02:00
Andreas Preikschat
f23aafae46 head 2013-07-05 20:47:32 +02:00
Raoul Snyman
208b208412 migration to Alembic. 
bzr-revno: 2269
 2013-07-05 20:42:44 +02:00
Patrick Zimmermann
910587e81f When replacing live background with an image the preview is updated. When resetting the live background the preview was not reset. This commit fixes this. 
bzr-revno: 2268
 2013-07-05 20:41:49 +02:00
Andreas Preikschat
829d68cdd8 fixed attribute error 2013-07-05 20:39:31 +02:00
Andreas Preikschat
6bba69bf88 removed duplicate css 2013-07-05 20:35:27 +02:00
Andreas Preikschat
a18129995e head 2013-07-05 20:33:03 +02:00
Raoul Snyman
8ddca0be2b HEAD 2013-07-04 21:15:24 +02:00
Andreas Preikschat
b314b59b52 r2266 2013-07-04 08:41:31 +02:00
Andreas Preikschat
15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Andreas Preikschat
ec2f013d1d r2265 2013-07-03 19:20:53 +02:00
Andreas Preikschat
3d738616f8 updated from MASTER 2013-07-03 19:20:23 +02:00
Andreas Preikschat
08f47c4a49 fixed str.decode 2013-07-03 19:10:37 +02:00
Andreas Preikschat
97a4bdf286 reverted changes to prevent merge conflicts 2013-07-03 19:04:45 +02:00
Andreas Preikschat
e75a87c5c9 head 2013-07-03 19:03:08 +02:00
Raoul Snyman
88e1932097 HEAD 2013-07-02 22:28:06 +02:00
Andreas Preikschat
8ee3e7265c renames 2013-07-01 08:57:13 +02:00
Andreas Preikschat
9b4518467a r2265 2013-07-01 08:48:01 +02:00
Andreas Preikschat
93bd032cd9 html_builder clean up 2013-07-01 08:47:20 +02:00
Tim Bentley
988fca86a1 Fix up registry for Application exit. Remove FormattingTags pickle , Other minor cleanups 
bzr-revno: 2264
 2013-06-30 20:18:21 +01:00
Tim Bentley
f583be0c76 fix registry call 2013-06-30 19:39:38 +01:00
Tim Bentley
1d571507db remove import 2013-06-30 19:36:52 +01:00
Andreas Preikschat
143ce0015f added __hash__ methods 2013-06-30 20:33:41 +02:00
Andreas Preikschat
e99ba8a400 head 2013-06-30 19:57:21 +02:00
Andreas Preikschat
7a33b93473 - Removed the loop code and use the loop attribute. 
bzr-revno: 2261
 2013-06-30 19:55:22 +02:00
Tim Bentley
5af820b7cd more cleanups 2013-06-30 06:45:34 +01:00
Tim Bentley
74432f93e2 oops 2013-06-30 06:35:57 +01:00
Tim Bentley
96fbb5ddbb clean up tags 2013-06-30 06:30:42 +01:00
Patrick Zimmermann
92d586427d Reset preview when reseting live background. 2013-06-29 12:00:44 +02:00
Andreas Preikschat
f0693e8163 fixed bs4.__version__ 2013-06-26 20:54:21 +02:00
Tim Bentley
b6954eba0f Rename tag 2013-06-25 15:44:56 +01:00
Tim Bentley
26e80be5b7 Who forgot the return 2013-06-24 17:54:23 +01:00
Tim Bentley
32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
Dmitriy Marmyshev
ed66c5cf34 Trunk 2013-06-24 19:12:01 +04:00
Tim Bentley
d32ece04a5 add missing imports 2013-06-23 20:51:17 +01:00
Andreas Preikschat
0fee84cbb6 works now 2013-06-23 19:32:25 +02:00
Andreas Preikschat
c30748873c python3 fix 2013-06-23 19:22:44 +02:00
Andreas Preikschat
76b508848b head 2013-06-23 19:21:52 +02:00
Raoul Snyman
9bf7284b94 HEAD 2013-06-23 17:29:16 +02:00
Andreas Preikschat
8fe2aed62f bytes/str fix 2013-06-23 16:38:41 +02:00
Tim Bentley
4d1061f723 Clean up registry for application 2013-06-21 06:16:35 +01:00
Andreas Preikschat
b53ed99eea head 2013-06-21 07:06:16 +02:00
Andreas Preikschat
c851fa84f0 head 2013-06-20 20:42:45 +02:00
Andreas Preikschat
aeecc041ec removed spaces 2013-06-20 20:04:21 +02:00
Andreas Preikschat
d78d147e1d bug #645452 (increase possible line spacing) 
bzr-revno: 2256
Fixes: https://launchpad.net/bugs/645452
 2013-06-19 16:18:50 +02:00
Andreas Preikschat
658b6f89da import 2013-06-18 21:32:04 +02:00
Andreas Preikschat
1e11f4d821 true division 2013-06-18 11:12:49 +02:00
Andreas Preikschat
62c5908d85 python3 division in slidecontroller 2013-06-18 11:09:54 +02:00
Tim Bentley
ded3671a1b Clean up slide controller and add bible download tests 
bzr-revno: 2253
 2013-06-16 20:34:19 +01:00
Andreas Preikschat
f261a95a37 head 2013-06-16 18:48:37 +02:00
Andreas Preikschat
39d691d2eb fix 2013-06-16 18:46:44 +02:00
Andreas Preikschat
5cce4c9443 head 2013-06-16 18:40:47 +02:00
Patrick Zimmermann
1aeb9bef2f Duplicate Song finder merge - UI and Services. 
bzr-revno: 2252
 2013-06-16 15:53:40 +01:00
Andreas Preikschat
df493947e7 Removed some code not compatible with python 3 to help with the migration 
bzr-revno: 2251
 2013-06-16 15:36:35 +01:00
Tim Bentley
e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley
d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann
4106ecd71e Remove superfluous comment. 2013-06-15 12:56:09 +02:00
Patrick Zimmermann
d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Andreas Preikschat
6f0ea09327 increased possible min/max line spacing 
Fixes: https://launchpad.net/bugs/645452
 2013-06-14 11:56:53 +02:00
Andreas Preikschat
3c4e67545b head r2249 2013-06-13 12:52:47 +02:00
Patrick Zimmermann
4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Tomas Groth
db0e243c08 Change from osjd to osj extension. Also use json for local service file. 2013-06-09 17:50:11 +02:00
Tomas Groth
f6f93f41d1 Use json as services format instead of python pickle. 2013-06-09 14:14:25 +02:00
Andreas Preikschat
34099c5df7 if the media doc is invisible, make it visible 2013-06-06 18:07:05 +02:00
Andreas Preikschat
a6422aa58b head 2013-06-06 08:46:11 +02:00
Andreas Preikschat
43326c5781 fixed code 2013-06-06 08:40:10 +02:00
Andreas Preikschat
67d12883c1 head 2013-06-04 21:36:34 +02:00
Tim Bentley
6e5588b7cf Update settings and minor cleanups 2013-06-03 19:47:25 +01:00
Tim Bentley
9160832e0a fix error 2013-06-03 19:03:45 +01:00
Tim Bentley
512155ff68 Add css file 2013-06-03 18:19:42 +01:00
Andreas Preikschat
1f80f6c830 renames 2013-06-01 20:35:00 +02:00
Andreas Preikschat
8c3c43a11d changed shortcut category 2013-06-01 20:16:34 +02:00
Andreas Preikschat
851c667c8d head 2013-06-01 16:48:30 +02:00
Tim Bentley
6cca9d536b head 2013-05-26 18:03:14 +01:00
Tim Bentley
20bd86fbce Live works! 2013-05-25 18:05:44 +01:00
Tim Bentley
4b2868b271 Fox presentations and refactor service item 2013-05-24 21:17:47 +01:00
Tim Bentley
1113044955 Add basic Live display to remote 2013-05-19 20:56:48 +01:00
Andreas Preikschat
b99d9a7ac9 More Python 3 changes - division fixes 
bzr-revno: 2244
 2013-05-19 19:13:26 +01:00
Tim Bentley
945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Andreas Preikschat
1d110f446c head + conflict 2013-05-18 16:11:43 +02:00
Andreas Preikschat
7a42cd3769 added test 2013-05-18 10:44:03 +02:00
Andreas Preikschat
ceb8020998 head 2013-05-12 14:04:55 +02:00
Andreas Preikschat
ad8e28fbe9 renames 2013-05-11 20:11:52 +02:00
Andreas Preikschat
d9288ac267 renames 2013-05-11 19:41:26 +02:00
Andreas Preikschat
23d5df568b renames 2013-05-11 19:28:42 +02:00
Andreas Preikschat
53160fc539 added doc 2013-05-09 21:43:44 +02:00
Andreas Preikschat
32957eca0c removed dead code 2013-05-09 21:38:57 +02:00
Andreas Preikschat
7e41362ca2 completed test 2013-05-08 22:05:54 +02:00
Andreas Preikschat
6bff80ca05 head 2013-05-02 09:21:17 +02:00
Andreas Preikschat
221001b633 updated vlc.py 2013-05-02 09:21:03 +02:00
Andreas Preikschat
eae143d232 name fixes 2013-04-29 20:42:29 +02:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Andreas Preikschat
f396e07feb fixed regression 2013-04-28 20:34:04 +02:00
Andreas Preikschat
92d5fd8e19 removed dead code; fixed attribute names; fixed regression 2013-04-28 20:31:48 +02:00
Andreas Preikschat
02603eaad5 display tool tip in shortcut dialog 2013-04-28 20:22:36 +02:00
Andreas Preikschat
989b922ab9 added shortcut to jump to the search fields 2013-04-28 20:06:49 +02:00
Andreas Preikschat
2d22e8420a do not pass QImages to build_icon (if not needed) 2013-04-28 19:17:45 +02:00
Patrick Zimmermann
4c2f078bf1 Add a missing \n at EOF. Add a comment. 2013-04-27 22:59:56 +02:00
Patrick Zimmermann
154c82f5ea Rename a method and remove a non needed registry var. 2013-04-27 12:00:27 +02:00
Andreas Preikschat
9d54944ad4 use true division (py3) 2013-04-24 22:47:30 +02:00
Andreas Preikschat
22541e7297 use true division (py3) 2013-04-24 21:05:34 +02:00
Andreas Preikschat
6d414c0fdb r2240 2013-04-23 23:48:51 +02:00
Andreas Preikschat
7b7cbc588c - removed code using the sqlite package (which is not available in python 3) 
bzr-revno: 2240
 2013-04-23 23:47:02 +02:00
Andreas Preikschat
8f994b2895 - fixed short lines 
- renamed attributes and methods

bzr-revno: 2239
 2013-04-23 23:46:07 +02:00
Tim Bentley
11112e7712 Head 2013-04-23 20:08:50 +01:00
Patrick Zimmermann
edb0eab31d Remove a dev comment. Pretify a comment. 2013-04-23 19:14:35 +02:00
Patrick Zimmermann
145a1aedcb Add some docstrings and rename some methods for clarity. 2013-04-23 19:12:08 +02:00
Andreas Preikschat
ba261e76e5 - ported code to beautifulsoup 4 
- moved regular expressions to the top
- fixed regression

bzr-revno: 2238
 2013-04-23 18:56:23 +02:00
Patrick Zimmermann
1c2a5b5156 Merge trunk. 2013-04-22 23:02:12 +02:00
Patrick Zimmermann
823e7b1ec0 Change a line back to trunk state. 2013-04-22 22:51:33 +02:00
Tim Bentley
581c83e70d Final tidyups 2013-04-21 16:53:51 +01:00
Tim Bentley
2965271ada and more 2013-04-21 08:26:45 +01:00
Tim Bentley
02b1f7b78b and more 2013-04-21 08:21:29 +01:00
Tim Bentley
34180112be Fix Core from abend 2013-04-21 08:06:25 +01:00
Andreas Preikschat
4063de2700 head 2013-04-20 22:34:46 +02:00
Andreas Preikschat
3f60c34440 head 2013-04-20 22:30:51 +02:00
Andreas Preikschat
3dd05a2f4d head 2013-04-20 22:25:06 +02:00
Andreas Preikschat
ab9e0d7ba2 - removed General section and introduced a Core section 
- added test

bzr-revno: 2234
Fixes: https://launchpad.net/bugs/1133237
 2013-04-20 22:19:53 +02:00
Andreas Preikschat
76799d931e head 2013-04-20 19:37:06 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02:00
Patrick Zimmermann
1c31940650 Merge trunk. 2013-04-18 23:17:14 +02:00
Patrick Zimmermann
2b9a13ff97 Clean up PreviewWidget interface a little more. 2013-04-18 22:50:02 +02:00
Patrick Zimmermann
25db18d34c Use inheritance instead of composition. Some interface cleanup. 2013-04-18 22:15:44 +02:00
Patrick Zimmermann
9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Andreas Preikschat
098d733ad1 bible renamings 2013-04-18 19:45:14 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Andreas Preikschat
d002cb383e renaming 2013-04-18 11:27:11 +02:00
Patrick Zimmermann
d687288336 Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item. 2013-04-16 23:42:23 +02:00
Andreas Preikschat
1b447c4590 reoved whitespace 2013-04-16 19:54:40 +02:00
Andreas Preikschat
01a0ad3618 added whitespace to avoid conflict 2013-04-16 19:48:42 +02:00
Patrick Zimmermann
1bbf52c7bf Fix a logic error, an array index border was wrong. 2013-04-16 19:34:07 +02:00
Patrick Zimmermann
e4d3d8d6d2 Rename a slideno -> row for more consistency. 2013-04-16 19:33:36 +02:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +01:00
Andreas Preikschat
140178a674 added code back which should not be removed in this proposal 2013-04-16 17:55:23 +02:00
Patrick Zimmermann
0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
Andreas Preikschat
8d5aaa927d removed import from gui 2013-04-15 23:31:04 +02:00
Andreas Preikschat
b3d4be1a44 removed sqlite from exception form 2013-04-15 23:15:29 +02:00
Andreas Preikschat
ab3ee9768b remove bzrlib 2013-04-15 23:04:49 +02:00
Patrick Zimmermann
fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Patrick Zimmermann
0dbda9ee21 Accidentially removed image load logic. Readded. 2013-04-15 19:26:18 +02:00
Patrick Zimmermann
3609d2e0e1 Switch over to PreviewListWidget class. Untested. 2013-04-15 19:12:47 +02:00
Patrick Zimmermann
379a27212c Clean up preview widget interface a little. 2013-04-15 18:33:50 +02:00
Andreas Preikschat
db00c5049a fixed missing unicode 2013-04-15 17:50:59 +02:00
Andreas Preikschat
908e048d1a head 2013-04-15 17:43:18 +02:00
Patrick Zimmermann
9220beba78 Pull preview_list_widget out into separate file. Not yet changed calls to this new class. 2013-04-14 23:38:40 +02:00
Andreas Preikschat
4bb4cd080a r2230 2013-04-14 21:51:35 +02:00
Meinert Jordan
571934e166 Fix Natural Sorting so works with Python3 
bzr-revno: 2230
 2013-04-14 19:19:33 +01:00
Tim Bentley
220681c900 Comment fixes 2013-04-14 16:59:57 +01:00
Dmitriy Marmyshev
ce807f57b6 returned old code 2013-04-12 19:12:20 +04:00
Andreas Preikschat
352d8da185 head 2013-04-08 20:24:46 +02:00
Tim Bentley
2345d59e6f Head 2013-04-08 17:53:26 +01:00
Tim Bentley
31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
Dmitriy Marmyshev
eca016c21d Added capability to edit title of service_item 2013-04-08 09:03:55 +04:00
Patrick Zimmermann
97c6899a31 Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score. 2013-04-06 13:53:00 +02:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Andreas Preikschat
69009970c0 replaced BeautifulSoup3 by BeautifulSoup4 2013-04-05 21:58:13 +02:00
Tim Bentley
e36706e3ec Head 2013-04-05 20:37:56 +01:00
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
Dmitriy Marmyshev
637cb09e74 removed commented code 2013-04-05 19:13:00 +04:00
Andreas Preikschat
07d6fa63c5 introduced constant 2013-04-05 15:41:42 +02:00
Andreas Preikschat
42f52cc300 Separate blank buttons don't hide on resizing (bug #1164925) 
Fixes: https://launchpad.net/bugs/1164925
 2013-04-05 12:50:10 +02:00
Andreas Preikschat
d0cbe5a56a r2227 2013-04-05 11:05:39 +02:00
Andreas Preikschat
131b46edef - use QActionGroup instead of Checkboxes (Bug #1103906 'Auto Play Slides menu should use radioboxes') 
bzr-revno: 2227
Fixes: https://launchpad.net/bugs/1103906
 2013-04-05 11:04:38 +02:00
Andreas Preikschat
0fbbf29cfa added pickle fixme 2013-04-04 13:54:19 +02:00
Andreas Preikschat
3e53ea9376 fixed formatting tags rename error 2013-04-04 13:18:49 +02:00
Raoul Snyman
9430e569f4 Fix one small issue with the songs upgrade scripts. 2013-04-04 10:02:47 +02:00
Raoul Snyman
d88e8a0b02 Migrated to Alembic (if you'll excuse the pun) 2013-04-03 21:46:41 +02:00
Andreas Preikschat
72ba94d390 replaced cPickle by pickle 2013-04-03 16:53:30 +02:00
Andreas Preikschat
4b76db7ad7 convert bytes to str 2013-04-03 12:54:11 +02:00
Andreas Preikschat
a6d966d1d2 changed comment 2013-04-03 12:40:09 +02:00
Andreas Preikschat
74eb0b59fb fixed LooseVersion not working 2013-04-03 12:39:42 +02:00
Andreas Preikschat
440876eff7 reverted fix: fix available for trunk 2013-04-03 12:33:15 +02:00
Andreas Preikschat
2c94f0df83 fixed #FIXME: constructor 2013-04-03 12:23:52 +02:00
Andreas Preikschat
8761117d34 fixed fixme: constructor 2013-04-03 12:19:15 +02:00
Andreas Preikschat
d9f8025042 r2225 2013-04-03 12:16:48 +02:00
M2j
2598674d2a Add ICU version string to exception form. 2013-04-02 22:52:31 +02:00
Dmitriy Marmyshev
c443a6702e changed image add behavior for title 2013-04-02 23:28:56 +04:00
Andreas Preikschat
ffb2350f62 fix *cough* 2013-04-02 19:42:01 +02:00
Andreas Preikschat
7f111b31a7 use unicode instead of QDateTime 2013-04-02 17:24:27 +02:00
Andreas Preikschat
5e3563ceda added two tests 2013-04-02 17:08:46 +02:00
Andreas Preikschat
e3afbefd27 use QDate instead of python datetime object 2013-04-02 16:42:33 +02:00
Dmitriy Marmyshev
6209ad8bb5 style fix 2013-04-02 15:54:18 +04:00
Dmitriy Marmyshev
4f915d363f HEAD 2013-04-02 14:20:53 +04:00
Dmitriy Marmyshev
1dc22fc912 fix 2013-04-02 14:19:33 +04:00
Andreas Preikschat
6c4b282d20 updated vly.pc 2013-04-02 09:32:58 +02:00
Andreas Preikschat
ceb175e372 head 2013-03-31 19:21:12 +02:00
Andreas Preikschat
29d7b3411e - fixed auto preview of next service item 
- added test

bzr-revno: 2225
 2013-03-31 19:13:56 +02:00
M2j
b3bb9bc0c0 Python 3 transition comment 2013-03-31 18:43:08 +02:00
M2j
8696db9f75 - use list compression in get_natural_key 
- define DIGIT_OR_NONDIGIT
 2013-03-31 18:30:22 +02:00
M2j
118f295204 Precompute the whole comparision key for song sorting. 2013-03-31 12:31:54 +02:00
Andreas Preikschat
aa7d56c4bc added fixmes 2013-03-31 10:53:34 +02:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Andreas Preikschat
2a28094937 fixed encoding 2013-03-30 17:31:29 +01:00
Andreas Preikschat
c5e11ff558 head 2013-03-30 17:05:49 +01:00
Andreas Preikschat
bbf2ad3b4b head + conflict 2013-03-30 10:53:01 +01:00
Andreas Preikschat
947c9a7346 removed old code 
bzr-revno: 2224
 2013-03-30 10:41:40 +01:00
Andreas Preikschat
8b4b7a6d0f use QActionGroup instead of checkboxes 
Fixes: https://launchpad.net/bugs/1103906
 2013-03-30 10:33:21 +01:00
Andreas Preikschat
d67a697e1e r2223 2013-03-30 09:49:19 +01:00
Andreas Preikschat
fd3cad1c7c r2223 2013-03-30 09:40:49 +01:00
Tim Bentley
efa7d8c8c0 minor fixes and move certificate location 2013-03-29 20:58:06 +00:00
Andreas Preikschat
2182f9c13c fixed short lines 2013-03-29 13:53:07 +01:00
Andreas Preikschat
a69323ea89 fixed auto preview of next service item 2013-03-29 13:40:04 +01:00
Tim Bentley
31847abf2a Head and confilicts 2013-03-29 08:25:33 +00:00
Tim Bentley
8cf886971c Refactor http server 2013-03-29 07:48:55 +00:00
Andreas Preikschat
a437ef0d3c r2219 2013-03-28 21:17:03 +01:00
Andreas Preikschat
4ffd25e1ae r2219 2013-03-28 21:16:16 +01:00
Andreas Preikschat
3b88c1341b removed broken code 2013-03-28 21:15:59 +01:00
Andreas Preikschat
85856cc717 head + conflict 2013-03-28 21:08:07 +01:00
Andreas Preikschat
6c7d608fbb fixed FTW regression 2013-03-28 21:05:46 +01:00
Andreas Preikschat
297b47fca3 added comment 2013-03-28 15:57:47 +01:00
Andreas Preikschat
6908577b54 fixed image display 2013-03-27 10:41:01 +01:00
Andreas Preikschat
0b2dc71f28 fixed not needed decode 2013-03-27 10:25:39 +01:00
Andreas Preikschat
4bd7c139f5 fixed settings tabs 2013-03-27 10:23:09 +01:00
Andreas Preikschat
bf60aa148e fixed settings tabs 2013-03-27 10:20:54 +01:00
Andreas Preikschat
8bf76a7baa fixed start time form 2013-03-27 10:14:24 +01:00
Andreas Preikschat
7476ff27ff fixed service item edit form 2013-03-27 10:12:54 +01:00
Andreas Preikschat
6127da074b fixed service note form 2013-03-27 10:11:16 +01:00
Andreas Preikschat
60c1a4e9f4 removed contains method 2013-03-26 21:33:49 +01:00
Andreas Preikschat
37b7de22a5 removed encoding from calls 2013-03-26 21:31:48 +01:00
Andreas Preikschat
60cf33f23c fixed vlc.py not working 2013-03-26 21:22:15 +01:00
Andreas Preikschat
7790442240 fixed vlc.py not working 2013-03-26 21:19:19 +01:00
Andreas Preikschat
4f46e578e1 updated vlc.py 2013-03-26 21:18:50 +01:00
Andreas Preikschat
f0da7465e8 initial changes 2013-03-26 19:13:21 +01:00
Andreas Preikschat
3fef841bb2 fixed FTW shown again 2013-03-26 12:45:18 +01:00
Andreas Preikschat
e708140d13 head 2013-03-26 12:35:29 +01:00
Andreas Preikschat
2f6a1a37a2 r2218 2013-03-26 12:15:55 +01:00
Andreas Preikschat
e6e9dec396 updated vlc.py 2013-03-26 12:15:31 +01:00
Tim Bentley
4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley
b3d453c9b8 More code cleanups and bug fixes from previous cleanups 
bzr-revno: 2218
 2013-03-26 07:48:38 +00:00
Tim Bentley
b9a5ee28a9 Fix missing string converstion 2013-03-26 07:34:42 +00:00
Andreas Preikschat
fa43759d8d more regression fixes 2013-03-25 08:27:54 +01:00
Andreas Preikschat
4283742081 fixed settingsTab rename 2013-03-25 08:13:40 +01:00
Tim Bentley
12058ebf8c fix typo 2013-03-23 07:45:08 +00:00
Tim Bentley
90d0d3c133 More updates 2013-03-23 07:28:24 +00:00
Tim Bentley
decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Andreas Preikschat
d77efd63d2 fixed double space 2013-03-22 21:35:59 +01:00
Andreas Preikschat
e6e57b6c03 updated comments and docs to 120 characters per line 2013-03-22 21:29:52 +01:00
Tim Bentley
729c93b70b More changes 2013-03-20 20:17:00 +00:00
Tim Bentley
79524dfbf4 Head + conflict 2013-03-20 19:38:20 +00:00
Tim Bentley
38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Arjan Schrijver
7237ad0c62 - Fixed small bug that removed the path from newly added media and presentations 
- Fixed keyboard shortcuts in images treeview
 2013-03-20 10:24:34 +01:00
Tim Bentley
90ac714c0d Mediamanageritem converted 2013-03-19 22:00:50 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley
861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver
ce528140ae This branch implements the 'images groups' feature. It has the following features: 
- convert old 'images files' setting to SQLite database
- existing images are loaded as top-level items to minimize the change for users
- groups can be nested
- images can be moved between groups by drag&drop
- new images can be added directly to a group by drag&drop, or by clicking the 'Add images' button
- image groups can be used as service items with multiple images

bzr-revno: 2214
 2013-03-19 09:38:01 +02:00
Arjan Schrijver
ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Arjan Schrijver
47c48618bc Fixed a traceback that occurred when calling critical_error_message_box and friends while the splashscreen is disabled in the settings. 2013-03-18 14:30:31 +01:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Raoul Snyman
a3f1769818 HEAD 2013-03-18 12:16:50 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
6ce33e0ec3 Settings cleanups and removal of config_updated 
bzr-revno: 2212
 2013-03-17 21:04:03 +00:00
Tim Bentley
5e6ec9d269 fix missed events 2013-03-17 20:40:47 +00:00
Tim Bentley
df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley
9f8b236f90 With tests 2013-03-17 17:37:19 +00:00
Tim Bentley
af76c3f6b9 config_update removed 2013-03-17 09:21:18 +00:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00
Tim Bentley
04bc47cb52 All Tabs converted 2013-03-16 19:57:15 +00:00
Tim Bentley
19c05a7fc0 Half plugin tabs done 2013-03-16 16:59:10 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Andreas Preikschat
e35c11874c - fixed spelling 
- added vlc version to bug report

bzr-revno: 2211
 2013-03-15 11:40:00 +01:00
Tim Bentley
1c76353cba head 2013-03-15 08:40:16 +00:00
Raoul Snyman
1a37d306a9 More cleanups 2013-03-15 00:22:18 +02:00
Tim Bentley
8c7bfc2bb7 Head 2013-03-14 20:21:19 +00:00
Tim Bentley
9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Andreas Preikschat
eeb3061cce fixed spelling 2013-03-14 13:15:43 +01:00
Arjan Schrijver
2cb47f6040 Merge HEAD 2013-03-14 12:39:04 +01:00
Arjan Schrijver
5c15585413 Added more docstrings 2013-03-14 12:32:58 +01:00
Andreas Preikschat
59a06905fc added vlc version to exception form 2013-03-14 11:46:19 +01:00
Arjan Schrijver
441296d808 - Fixed cursor staying busy when adding images 
- Added documentation to methods
- Fixed traceback when adding media files
 2013-03-14 11:36:59 +01:00
Tim Bentley
919f86789f Head 2013-03-13 19:18:41 +00:00
Tim Bentley
669da85b2b Config cleanup and bug fixes from previous cleanups 
bzr-revno: 2209
 2013-03-13 19:08:44 +00:00
Andreas Preikschat
3a9e6c8ec0 do not continue when an invalid service is loaded 2013-03-13 14:43:28 +01:00
Andreas Preikschat
6c98df064f I/we figured out, that transitions which end/start at a opacity of 0.2 do not look fluent. When set to 0.1 the transition look smoother. 
bzr-revno: 2205
 2013-03-13 10:33:22 +01:00
Tim Bentley
7efe1320fb Fix theme handling 2013-03-12 09:09:42 +00:00
Andreas Preikschat
841549ad59 make transitions a bit more fluent 2013-03-12 10:00:22 +01:00
Andreas Preikschat
2d26110f22 fixed regression bugs 2013-03-12 09:00:48 +01:00
Tim Bentley
dcec6ebbac review corrections 2013-03-12 07:17:14 +00:00
Tim Bentley
5c79832bcc More updates to authentication 2013-03-11 21:00:00 +00:00
Tim Bentley
46fe786f8b More fixes 2013-03-11 19:11:46 +00:00
Arjan Schrijver
043c35a985 Merge HEAD 2013-03-11 16:23:43 +01:00
Tim Bentley
5f1db14ba4 Minor fixes 2013-03-10 20:35:14 +00:00
Tim Bentley
7d371228bc Config updates 2013-03-10 20:19:42 +00:00
Andreas Preikschat
5acac7976c reduced overlap time; renamed variable 2013-03-09 15:46:57 +01:00
Andreas Preikschat
c016067a4f HEAD 2013-03-09 15:40:02 +01:00
Tim Bentley
c62dab074e Basic Authentication now working 2013-03-08 19:15:49 +00:00
Tim Bentley
6bf07f9dce Head 2013-03-08 16:35:10 +00:00
Andreas Preikschat
7ee4d94e2e reverted indent change 2013-03-08 09:22:24 +01:00
Andreas Preikschat
ca406df0a4 head 2013-03-08 09:14:39 +01:00
Raoul Snyman
d6d1ecf616 Naming convention cleanups and a few merges from the upstream branch. 2013-03-07 23:04:19 +02:00
Tim Bentley
2464bef944 Head + conflicts 2013-03-07 18:22:38 +00:00
Andreas Preikschat
25919a34b2 fixed objectNames 2013-03-07 18:58:15 +01:00
Andreas Preikschat
3a33e1e6bf spelling 2013-03-07 17:35:08 +01:00
Andreas Preikschat
e19161e039 use loop video attribute; fixed regression prevent media adding 2013-03-07 16:05:17 +01:00
Andreas Preikschat
0c4df23a19 converted while to for loop 2013-03-07 14:44:19 +01:00
Andreas Preikschat
bf02c4af34 fixed short lines 2013-03-07 14:37:50 +01:00
Andreas Preikschat
5f67e4f149 removed not needed icon parameter 2013-03-07 14:14:31 +01:00
Andreas Preikschat
7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat
ceeaa0c359 renamed constant 2013-03-07 13:43:06 +01:00
Raoul Snyman
87212e5d1c More cleanups and more tests 2013-03-07 14:34:35 +02:00
Andreas Preikschat
a70ef917fc cleaned core/lib/init 2013-03-07 13:30:24 +01:00
Arjan Schrijver
52523224ec Merge HEAD 2013-03-07 12:23:52 +01:00
Andreas Preikschat
d916bad0c8 fixed bug (thanks to our tests) 2013-03-07 12:20:57 +01:00
Andreas Preikschat
7e8b21b99f progress bar fix 2013-03-07 12:11:35 +01:00
Andreas Preikschat
d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat
6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat
1031651db0 printform/dialog: code standards 2013-03-07 11:25:27 +01:00
Andreas Preikschat
b0f7e34271 log a warning, when a shortcut cannot be used 2013-03-07 11:07:02 +01:00
Arjan Schrijver
68d034e877 Revert code shortening from lp:~googol/openlp/image_groups 2013-03-07 10:03:02 +01:00
Andreas Preikschat
580baf76f4 fixed refactoring errors 2013-03-07 10:01:42 +01:00
Andreas Preikschat
cbb7de3928 spelltextedit: code standards 2013-03-07 09:58:12 +01:00
Andreas Preikschat
32ab855eb1 changed a few signals 2013-03-07 09:52:58 +01:00
Andreas Preikschat
99cdaa61ca fixed docs, and signals 2013-03-07 09:24:12 +01:00
Andreas Preikschat
d2d34ed175 fixed display 2013-03-07 09:14:26 +01:00
Andreas Preikschat
a27b251060 songimporters 2013-03-07 09:05:43 +01:00
Andreas Preikschat
33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Raoul Snyman
e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Andreas Preikschat
14b61cabf4 renamed canFolder 2013-03-07 00:00:57 +01:00
Andreas Preikschat
e1f35e002a some media renames 2013-03-06 23:54:16 +01:00
Andreas Preikschat
1d9425c3b7 renamed videoBehindText 2013-03-06 23:50:49 +01:00
Andreas Preikschat
8383acf636 renamed isValid 2013-03-06 23:49:13 +01:00
Andreas Preikschat
c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Andreas Preikschat
86efc5629c fixed formattigtagsform/dialog 2013-03-06 23:32:59 +01:00
Andreas Preikschat
1660fbf2f8 fixed formattigtagsform/dialog 2013-03-06 23:27:22 +01:00
Andreas Preikschat
8bb4c7e131 renamed serviceItem 2013-03-06 23:23:01 +01:00
Andreas Preikschat
0eaa3aa5f4 renamed forgotten methods 2013-03-06 23:11:30 +01:00
Andreas Preikschat
b864d360d3 r2201 2013-03-06 22:54:13 +01:00
Tim Bentley
f1aadde13c Initial Cherrypy implementation 2013-03-06 21:53:29 +00:00
Tim Bentley
ca920ff774 Merge issues 2013-03-06 21:49:46 +00:00
Tim Bentley
13f18e271b Fix review comments 2013-03-06 17:46:19 +00:00
Andreas Preikschat
d4a41180cf updated doc 2013-03-06 14:21:27 +01:00
Patrick Zimmermann
d390fff811 Merge trunk. 2013-03-05 20:55:20 +01:00
Andreas Preikschat
555e38275a changed order 2013-03-05 18:12:40 +01:00
Tim Bentley
4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Andreas Preikschat
33db8e143b fixed maindisplay opening again 2013-03-05 18:08:15 +01:00
Andreas Preikschat
4625f1f3a1 fixed object names 2013-03-05 15:18:05 +01:00
Andreas Preikschat
11db599cb1 exception form: code standards 2013-03-05 15:14:37 +01:00
Andreas Preikschat
8fed2230d3 exception form: code standards 2013-03-05 15:05:19 +01:00
Andreas Preikschat
4f1933dcfe execptionform: code standards 2013-03-05 15:02:56 +01:00
Andreas Preikschat
5d68663c10 reverted maindisplay changes (avoid conflict) 2013-03-05 14:56:34 +01:00
Andreas Preikschat
6730d03373 fixed signal connecting 2013-03-05 14:55:50 +01:00
Andreas Preikschat
24bb3567ed r2198 2013-03-05 14:43:04 +01:00
Andreas Preikschat
a835930990 renamed JS function 2013-03-05 11:36:41 +01:00
Andreas Preikschat
fee7797be1 removed not needed --webkit-transition 2013-03-05 11:32:20 +01:00
Andreas Preikschat
02335f6ef6 added comment 2013-03-05 11:09:15 +01:00
Andreas Preikschat
31abd72474 minimize the time 'nothing' is shown on the screen 2013-03-05 11:02:41 +01:00
Andreas Preikschat
a4f4ef0d7d r2198 2013-03-05 10:41:00 +01:00
Andreas Preikschat
92a0d5d7ab make transition a little faster 2013-03-05 10:40:00 +01:00
Raoul Snyman
e2c0ab3d8a HEAD 2013-03-05 08:25:16 +02:00
Raoul Snyman
f1c2515502 HEAD 2013-03-04 22:40:28 +02:00
Andreas Preikschat
7c36d78ed8 r2197 2013-03-04 21:17:45 +01:00
Tim Bentley
bb48e35c5f Fix theme load bug 2013-03-04 19:35:33 +00:00
Andreas Preikschat
2ed067ea0c enable OpenGL again 2013-03-04 20:22:43 +01:00
Andreas Preikschat
6d66e6b957 fixed preview 2013-03-04 20:14:36 +01:00
Tim Bentley
5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley
847eb4d910 remove print 2013-03-04 16:56:41 +00:00
Tim Bentley
3a44717acf Head and conflict 2013-03-04 16:55:13 +00:00
Arjan Schrijver
91ad9ae9cc Merge HEAD 2013-03-04 14:48:42 +01:00
Arjan Schrijver
2561f995ac Fixed manual import of configuration file with a list of images 2013-03-04 14:37:19 +01:00
Andreas Preikschat
b7448518d2 renamed variable/function 2013-03-04 12:04:15 +01:00
Andreas Preikschat
ac50ae1553 head 2013-03-04 11:55:02 +01:00
Andreas Preikschat
557c90129a started to work on transitions 2013-03-04 11:52:38 +01:00
Tim Bentley
07a1dc9485 - Implementation of a two phase bootstrap. 
- Some minor code cleanups as well.
- Removed unneeded tests

bzr-revno: 2197
 2013-03-04 11:32:05 +01:00
Andreas Preikschat
f52f4fac26 - fixed bug #902964 (Libreoffice deprecated commandline args) 
bzr-revno: 2196
Fixes: https://launchpad.net/bugs/902964
 2013-03-04 11:23:43 +01:00