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

9546 Commits

Author SHA1 Message Date
Tim Bentley
e94643b5d1 Fix invalid code 2014-04-18 21:35:39 +01:00
Tim Bentley
25687dfd48 Complete icon and ssl change code 2014-04-18 21:29:52 +01:00
Jonathan Springer
e86539888d Fix typo 2014-04-17 20:09:31 -04:00
Jonathan Springer
ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Jonathan Springer
85fc53954d More PEP8 fixes 2014-04-16 16:49:24 -04:00
Samuel Mehrbrodt
655ebc009d binary open 2014-04-16 22:37:15 +02:00
Samuel Mehrbrodt
2c6da0603b Fix tests 2014-04-16 22:33:06 +02:00
Jonathan Springer
aa6b756956 Change how we define which menu items are included in the main menu on Mac OS X 2014-04-16 16:26:49 -04:00
Samuel Mehrbrodt
bb1af7ed00 PEP8 2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt
aa5a86fba9 Trunk 2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt
d65d1c016c Attempt to fix bug #1154467 by waiting 10ms and retrying the commit 
bzr-revno: 2365
 2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt
c3ed2c02ee Fix bug 1247493 
Fixes: https://launchpad.net/bugs/1247493
 2014-04-16 09:56:37 +02:00
Jonathan Springer
ebc4476fdd Fixes first time wizard to use url and paths in web config file 
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
 2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt
c20939215a PDF Fixes 
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
 2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt
49773de4f6 Fix transparent theme on OS X 
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
 2014-04-16 05:44:21 +01:00
Samuel Mehrbrodt
be4a654298 More tests 2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt
30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt
5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt
e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser
db955cbf96 Some enhancements for songbeamer-import 
bzr-revno: 2358
 2014-04-15 22:52:14 +02:00
Samuel Mehrbrodt
8c18659adb Update verse order when verse names change (OpenLyrics Import) 
bzr-revno: 2357
 2014-04-15 22:46:54 +02:00
Jonathan Springer
c204967304 Fixes for PEP8 2014-04-15 14:42:08 -04:00
Samuel Mehrbrodt
71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt
4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt
ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Samuel Mehrbrodt
e7af43af4a Trunk 2014-04-14 21:46:02 +02:00
Samuel Mehrbrodt
e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat
a07a97f78b strange pyqt fix 2014-04-14 21:07:01 +02:00
Andreas Preikschat
877fd135d3 head 2014-04-14 20:53:33 +02:00
Jonathan Springer
4a7b76e5ee merge trunk 2014-04-14 14:31:30 -04:00
Tim Bentley
f04c47c9c9 head 2014-04-14 19:28:28 +01:00
Raoul Snyman
ff5279d21c Cleaned up the UI of the tabs on the "Library" toolbox. 
Added a test. 
Fixed up PEP8 so that code analysis passes.

bzr-revno: 2354
 2014-04-14 19:28:04 +01:00
Tim Bentley
ce227c61f1 head 2014-04-14 19:10:05 +01:00
Tim Bentley
d681f0a059 Start to improve remote 2014-04-14 19:09:47 +01:00
Stefan Strasser
69500907c0 Songbeamer-import: added additional verse-marks for recognition (Misc,Part,Teil,$$M=), changed check_verse_marks to handle the special mark $$M=, page-break-recognition handles now also -- 2014-04-13 19:03:28 +02:00
Samuel Mehrbrodt
758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt
f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Andreas Preikschat
7e064246fb fixed counter 2014-04-13 10:21:30 +02:00
Andreas Preikschat
49ff37c530 fixed long line; use generator 2014-04-13 09:54:34 +02:00
Andreas Preikschat
4f38ae2809 head 2014-04-13 09:36:42 +02:00
Jonathan Springer
99d0ed01ab merge trunk 2014-04-12 17:31:38 -04:00
Dmitriy Marmyshev
3cf9094e5f Added ability to rename items in ServiceManager. 
bzr-revno: 2352
 2014-04-12 23:26:09 +02:00
Raoul Snyman
4b6ee2aa2d Fix an import issue 2014-04-12 22:22:31 +02:00
Raoul Snyman
b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman
672eed037c HEAD 2014-04-12 21:48:15 +02:00
Jonathan Springer
51e43a9a52 Fix getting urls for first time wirard from config file. 2014-04-12 14:21:15 -04:00
Andreas Preikschat
2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer
991eb6d004 Fix debug messages (bug #1170231) 
bzr-revno: 2351
 2014-04-12 16:43:08 +02:00
Jonathan Springer
4cb71cb5e3 Remove orphaned and unused registry execute, and fix two functions to register to the registry 
instead of executing.

Modify loading file from the command line to only load files ending with osz, or oszl.

Fix argument to pass correct type.

bzr-revno: 2350
 2014-04-12 16:40:07 +02:00
Andreas Preikschat
d16d8066ad - updated vlc.py 
bzr-revno: 2349
 2014-04-12 16:37:38 +02:00
Jonathan Springer
307f46921c Merge trunk 2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt
93fe4db118 Bug nr 2014-04-10 21:46:32 +02:00
Samuel Mehrbrodt
056a7b72ed Fix bug 1154467 2014-04-10 21:45:49 +02:00
Samuel Mehrbrodt
04b1d0ec30 Fix songbook search 2014-04-10 09:33:25 +02:00
Tomas Groth
f16a781309 Changed the clipselector gui a bit. 2014-04-09 22:24:19 +02:00
Samuel Mehrbrodt
a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02:00
Samuel Mehrbrodt
47767b02c1 Fix debug messages 
Fixes: https://launchpad.net/bugs/1170231
 2014-04-08 22:41:33 +02:00
Samuel Mehrbrodt
efad4a55fa Display 'Words and Music' type in the footer 2014-04-08 20:57:01 +02:00
Samuel Mehrbrodt
577c7321ff Add new type for 'Words and Music' 2014-04-08 20:52:05 +02:00
Samuel Mehrbrodt
1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt
1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt
ac05205a1e Trunk 2014-04-08 15:46:08 +02:00
Samuel Mehrbrodt
a49854e20b Update verse order when verse names change 2014-04-08 13:07:52 +02:00
Samuel Mehrbrodt
fb85b9858a PEP8 2014-04-08 11:29:47 +02:00
Samuel Mehrbrodt
7f8e76b8dd Restore previous delete button behavior 2014-04-08 11:21:56 +02:00
Samuel Mehrbrodt
b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Samuel Mehrbrodt
cc635e9b96 SQLite doesn't support changing a primary key 2014-04-08 11:16:14 +02:00
Tomas Groth
aefef04d97 Small fixes. Added checks of start/end times. 2014-04-07 23:08:48 +02:00
Samuel Mehrbrodt
d1ab85d2fc Trunk 2014-04-07 15:51:49 +02:00
Jonathan Springer
1945b4c380 Remove changes to platform specific code. 2014-04-06 22:07:19 -04:00
Jonathan Springer
e5d5af38c2 Move opening of files passed in via command line to function. 2014-04-06 22:03:05 -04:00
Raoul Snyman
4c3e2ac45c Trying to fix pylint 2014-04-06 01:06:37 +02:00
Tomas Groth
bc2d45fc30 Head 2014-04-05 15:27:53 +02:00
Tomas Groth
43f18ee2c9 Added some tests. 2014-04-05 09:46:35 +02:00
Tomas Groth
7dc1b8b759 PEP8 fixes 2014-04-05 09:22:24 +02:00
Tomas Groth
648e0b2290 head 2014-04-05 09:06:30 +02:00
Raoul Snyman
5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tomas Groth
232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
Tim Bentley
edb38d1255 head 2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f Fixed wrong dll load path. 
bzr-revno: 2347
 2014-04-04 21:22:12 +01:00
Tim Bentley
576ab6e1f9 head 2014-04-04 21:20:00 +01:00
Tomas Groth
7be9613bf0 Head 2014-04-04 19:57:28 +02:00
Tomas Groth
5c405050f1 Added test for ews import. 2014-04-04 19:57:03 +02:00
Jonathan Springer
bc55bcd7fa Fix argurment to pass correct type. 2014-04-03 08:38:39 -04:00
Tim Bentley
806ce25296 head 2014-04-02 19:51:36 +01:00
Tim Bentley
c38c576f94 test fixes 2014-04-02 19:51:21 +01:00
Andreas Preikschat
2a9c85c2a2 fixed a spelling mistake 
bzr-revno: 2346
 2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt
d62cd37db4 Restore comment 2014-04-02 09:07:46 +02:00
Samuel Mehrbrodt
eece90b2ec Merge trunk 2014-04-02 09:04:27 +02:00
Samuel Mehrbrodt
adedb6eaeb Fix setDefaults -> set_defaults 2014-04-02 09:04:12 +02:00
Samuel Mehrbrodt
dffee7fbc1 Restore setting a default author 2014-04-02 09:03:53 +02:00
Samuel Mehrbrodt
31b220c972 Indentation 2014-04-02 08:49:03 +02:00
Samuel Mehrbrodt
691247ffda Don't allow a song to be saved without an author 2014-04-02 08:47:27 +02:00
Raoul Snyman
73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Raoul Snyman
ce9ca0b44b Updated the look of the Library tabs 2014-04-02 01:29:23 +02:00
Samuel Mehrbrodt
830e3d6624 PEP8 2014-04-01 23:07:49 +02:00
Samuel Mehrbrodt
d064549eab Icon, indentation 2014-04-01 22:39:13 +02:00
Tomas Groth
6e90904d91 Fix for autodetection of optical devices 2014-04-01 21:48:46 +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
80284f6f8d Added 'Neue evangelistische Übersetzung' to the list of Online bible translations 2014-03-31 10:08:07 +02:00
Samuel Mehrbrodt
ad982e9fa3 Add try/catch block to upgrade function until better solution is found 2014-03-30 23:49:55 +02:00
Samuel Mehrbrodt
88c641715c Translate this string 2014-03-30 23:45:52 +02:00
Samuel Mehrbrodt
ad9717ea42 Add support for author types to OpenLyrics import and export 2014-03-30 23:42:46 +02:00
Tomas Groth
73304d7ec3 Added check to see if given path exists. 2014-03-30 21:32:41 +02:00
Tomas Groth
4b83741b36 Added autodetection of optical drives and some small fixes. 2014-03-30 20:11:39 +02:00
Samuel Mehrbrodt
c98970d0e4 Fix mediaitem tests 2014-03-30 20:01:03 +02:00
Samuel Mehrbrodt
c7358e4a9f The author_type column is part of the primary key and thus can't be NULL 2014-03-30 19:38:26 +02:00
Samuel Mehrbrodt
87051a094a Put Author types in an own enum class 2014-03-30 19:23:36 +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
Raoul Snyman
3e047b3487 Fixes for inheritance in the song importers. This should make the tests pass in Python 3.4. 
bzr-revno: 2342
 2014-03-30 07:54:35 +01:00
Samuel Mehrbrodt
0adf961b3c Fix missing arguments in event handlers 
bzr-revno: 2341
 2014-03-30 07:51:35 +01:00
Tomas Groth
0f0e09a282 Fixed wrong dll load path. 2014-03-29 20:56:20 +01:00
Raoul Snyman
98a762e86c HEAD 2014-03-29 15:58:09 +02:00
Raoul Snyman
e4c3f08a2a Fix some of the tests which were failing in Python 3.4 2014-03-29 15:31:28 +02:00
Samuel Mehrbrodt
615442063e Fix display of Author type none 2014-03-29 11:08:52 +01:00
Andreas Preikschat
7787e1a845 head 2014-03-28 21:38:38 +01:00
Samuel Mehrbrodt
dadfbcfacb Merge head 2014-03-28 17:06:37 +01:00
Samuel Mehrbrodt
71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Tomas Groth
0ee684d3a8 Added support for ews import 2014-03-26 20:49:12 +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
Tomas Groth
8ad47cb888 Fixes for windows tests and for starting OpenLP on windows. 2014-03-24 17:49:50 +01:00
Samuel Mehrbrodt
20533624e0 Fix method calls (broken with rev. 2329) 2014-03-23 23:27:07 +01:00
Andreas Preikschat
7a1825a79a tests 2014-03-23 11:49:03 +01:00
Andreas Preikschat
cc0b736ef6 condition already checked above 2014-03-22 20:35:24 +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
Andreas Preikschat
11fe2045e5 fixed tests 2014-03-22 10:24:52 +01:00
Andreas Preikschat
394e5a5be2 removed code, commment 2014-03-22 09:52:49 +01:00
Tim Bentley
bbe4169c24 Fix all formatting errors 2014-03-21 21:38:08 +00:00
Andreas Preikschat
59b00413e8 head 2014-03-21 21:12:16 +01:00
Andreas Preikschat
ed29edec3a imported duplicate check speed 2014-03-21 21:04:53 +01:00
Tim Bentley
9dfc446ebd More cleanups 2014-03-21 18:23:35 +00:00
Tomas Groth
3608ad4fcd Added first tests for mediaclipselectorform.py 2014-03-20 22:52:53 +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
Tomas Groth
fa4120a4bd Small test fixes 2014-03-18 21:58:52 +01:00
Raoul Snyman
f1be7bd698 HEAD 2014-03-18 22:47:05 +02:00
Tim Bentley
30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Raoul Snyman
79263bfea4 Try to fix bug #1136278 by detecting if the upgrade has already been run 
Fixes: https://launchpad.net/bugs/1136278
 2014-03-18 22:33:05 +02: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
4e834f6d70 Head 2014-03-14 17:37:28 +00:00
Tim Bentley
d2efa83e89 Head 2014-03-14 17:34:36 +00:00
Tomas Groth
ed03ec2195 Fixes for tests on wine/windows 2014-03-13 21:59:10 +01: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
Tim Bentley
6935adde29 Yet more tests 2014-03-11 20:10:46 +00:00
Tomas Groth
5ac6f853d0 Changed get_locale_key to only use ICU if available. 2014-03-11 20:38:47 +01:00
Raoul Snyman
5af971f723 Remove main_menu property and add an application property. 2014-03-11 21:07:58 +02: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
Tim Bentley
776724d9a2 Bibles 2014-03-09 10:26:28 +00:00
Tim Bentley
83abc63079 Bibles 2014-03-08 22:02:34 +00:00
Tim Bentley
0da1b7b5f7 Presentations 2014-03-08 21:23:47 +00: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
Tim Bentley
9773afc61c Media cleaned up 2014-03-08 20:53:22 +00:00
Tim Bentley
836886e541 Images cleaned up 2014-03-08 20:39:36 +00:00
Tim Bentley
f86c6bc77d Songs cleanned up 2014-03-08 19:58:58 +00:00
Tim Bentley
a0a2e5efbc More updates 2014-03-06 22:05:15 +00:00
Raoul Snyman
6747dec2b5 Tests! Tests! Tests! 2014-03-06 23:28:13 +02:00
Tim Bentley
3ae188c287 FoilPresenter 2014-03-06 20:56:31 +00:00
Tim Bentley
ef97095399 Importer cleanups 2014-03-06 20:40:08 +00:00
Tim Bentley
75281b5cf1 Song import cleanups 2014-03-05 18:58:22 +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
Raoul Snyman
b094d48678 Add some error handling around the getting a song. 
Add some more tests.
 2014-03-04 23:28:15 +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
Raoul Snyman
d2a5e8a4c4 Refactor SongSelect search into a separate class, and start writing some tests for that class. 2014-02-27 23:36:33 +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
21eeac70eb fixed an exception 2014-02-21 23:27:00 +01:00
Tomas Groth
e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01:00
Tomas Groth
6d21a326ed Made it possible to save a selected clip to the mediamanager. 2014-02-17 23:29:52 +01:00
Philip Ridout
150ff4e980 HEAD 2014-02-11 20:29:57 +00:00
Tomas Groth
365a4c62cf Created GUI for mediaclip selection from DVD. 2014-01-24 19:43:02 +00:00
Rafael Lerm
83e20b79b6 Changed string that caused crash on startup. Corrected bug 1269929 2014-01-16 18:34:37 -02:00
Tomas Groth
c3af8d5d14 Only allow pdf-program selection using filedialog. 2014-01-14 21:57:43 +00: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
b5c2659506 Clean up Song Usage 2014-01-11 22:01:41 +00:00
Tim Bentley
68d8f58b5c Clean up Alerts 2014-01-11 21:46:20 +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
b58abe45b2 Added WebSocket engine 2014-01-09 14:53:56 -05:00
Felipe Polo-Wood
d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Felipe Polo-Wood
2f12246301 Added WebSocket server and client 2014-01-06 18:00:27 -05:00
Tomas Groth
e958c04659 Make the PdfController reload backend if setting changes. 2014-01-06 12:06:22 +00:00
Tomas Groth
d02377f74f Moved PS script into separate file. 2014-01-06 10:51:53 +00: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
Tomas Groth
b242343d59 Added some docstring documentation. 2014-01-01 15:31:06 +00:00
Tim Bentley
8c71c96222 Fixes for Custom 2014-01-01 10:56:23 +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
e2fcd3e8cb - Fixed up an import issue 
- Removed old code no longer necessary (from 1.9.4)
- PEP8
 2014-01-01 00:56:02 +02: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
Felipe Polo-Wood
cc4e393966 Change image_manager to a property 
Fix path using appropriate function call pathname2url
 2013-12-30 02:29:33 -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
Tomas Groth
7dd3417217 Added tests for the PdfController. 2013-12-29 19:46:04 +00:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tomas Groth
82aaf11860 Fixes for the presentation setting tab 2013-12-28 18:36:33 +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
fdfb2b1294 Done in error 2013-12-24 09:24:32 +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
7e18ced2c4 Custom cleanup 2013-12-24 07:02:47 +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
Samuel Mehrbrodt
7e484086dc Merge trunk 2013-12-07 18:35:06 +01:00
Tim Bentley
d0a9423982 Head 2013-12-06 19:00:55 +00:00
Tim Bentley
f32409b5a5 format changes 2013-12-06 19:00:37 +00:00
Philip Ridout
0883eb8a5d Fixes #1184869 Ensures that there is text in the anchor tag 
bzr-revno: 2315
 2013-12-06 18:57:21 +00:00
Philip Ridout
ec87ced59b Fixes Bug 1209515 by sub classing QFileDialog and reimplementing getOpenFileNames and attempting to urlunquote and file paths which do not exist 
bzr-revno: 2314
 2013-12-06 18:56:03 +00:00
Felipe Polo-Wood
a5c195fe2b Fixed timeout back to 500 ms 
Added ItemCapabilities to httprouter.py
 2013-12-02 13:53:32 -05:00
Felipe Polo-Wood
b85b09c92c Merge back to trunk 2013-12-02 11:14:09 -05:00
Felipe Polo-Wood
e9848a2653 Fix the Http router return values 
bzr-revno: 2313
 2013-12-01 20:58:09 +00: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
Tomas Groth
ffa3cd32b3 Merged with trunk to resolve conflicts. 2013-11-20 22:42:48 +01:00
Philip Ridout
f5573502f3 HEAD 2013-11-16 21:24:18 +00: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
20ae5d13b0 some final cleanups 2013-11-16 10:16:06 +00:00
Philip Ridout
4c8f817269 HEAD 2013-11-16 10:07:38 +00:00
Philip Ridout
cc3cdf7126 added some tests for PresentationController 2013-11-16 10:05:41 +00:00
Felipe Polo-Wood
e56414e22c Fixed OS specific string 
Coding standard fixes
 2013-11-14 15:33:46 -05:00
Samuel Mehrbrodt
dd1d08749e Fix SongBeamer Import and add Testcase 
bzr-revno: 2311
 2013-11-14 21:12:52 +02:00
Arjan Schrijver
27395fcaf6 Rename 'Thurdsday' to 'Thursday' 
bzr-revno: 2310
 2013-11-14 21:07:11 +02:00
Tomas Groth
3acd18c102 Mostly code cleanup of PDF support code. 2013-11-14 17:42:21 +01:00
Andreas Preikschat
1b89900336 head 2013-11-14 10:05:59 +01:00
Felipe Polo-Wood
45bcbe9272 Moved the file_types to module level so they get processed once 2013-11-10 19:13:03 -05:00
Felipe Polo-Wood
20a1a2ad70 Fixed router so response and headers are sent correctly 
Fixed tests so they run on Windows
Added unit test for new method get_content_type
 2013-11-08 13:26:27 -05:00
Felipe Polo-Wood
768b1c77fc Code was not sending the headers back 2013-11-08 12:43:36 -05:00
Philip Ridout
61da0e8ad9 Some refactoring 2013-11-07 20:35:02 +00:00
Felipe Polo-Wood
6c3253c7c0 Added caching for thumbnail images 2013-11-07 15:13:15 -05:00
Felipe Polo-Wood
3c7102abcd Removed dependency on ppt.py and added ppinterface.py which contains the bare minimum support for events. 2013-11-06 14:42:18 -05:00
Philip Ridout
bb614d4af2 HEAD 2013-11-01 19:35:54 +00:00
Philip Ridout
4345608759 fixed issue with not all PPTS not loading correctly using PPTViewer 2013-11-01 19:30:26 +00:00
Felipe Polo-Wood
1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04:00
Felipe Polo-Wood
e882231997 Fixed internal of polling that was touched for testing 2013-11-01 06:34:35 -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
Philip Ridout
f374c58d39 Tidying up some uneeded str() 2013-10-28 21:15:16 +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
Samuel Mehrbrodt
abdc3937ef Small test for PresentationController Constructor 2013-10-27 13:39:13 +01:00
Dmitriy Marmyshev
70144c0da4 Trunk & fixes 2013-10-27 02:53:32 +04:00
Felipe Polo-Wood
e0ef84140f Added exception logging 2013-10-25 14:04:11 -04:00
Felipe Polo-Wood
5644e26a85 Improved unit tests 2013-10-24 21:15:44 -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
Felipe Polo-Wood
8072188cdf Added tests for __get_text_from_page 2013-10-22 23:12:45 -04:00
Felipe Polo-Wood
28345808da Added unit tests for the two new methods get_titles_and_notes and save_titles_and_notes 2013-10-22 14:24:56 -04:00
Samuel Mehrbrodt
43f99b81eb This variable has been renamed. 2013-10-22 17:37:56 +02:00
s.mehrbrodt@gmail.com02
c5ded493cf Merge from trunk 2013-10-22 10:42:56 +02:00
Philip Ridout
76fd5b3da0 Fixed up pptviewcontroller to work with the unicode changes to the c library 2013-10-20 21:49:39 +01:00
Philip Ridout
f6c3881d03 Unicodified C Library 2013-10-20 21:42:40 +01:00
Philip Ridout
051fa9db8f Changed logging to UTF-8 2013-10-20 21:34:46 +01:00
Felipe Polo-Wood
1f7a3e0fb3 Default ImpressController.presentation.Display to 1 in case the ScreenList() call fails, which should only happen while running tests. 2013-10-19 23:53:28 -04:00
Felipe Polo-Wood
d4d572bf80 Fixed and verified test on Ubuntu/Impress 2013-10-19 23:25:07 -04: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
3bbaff362d - Added support for titles (and improved notes) for impresscontroller.py 
- Removed \x0b and \n from the titles
 2013-10-17 19:55:17 -04: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
s.mehrbrodt@gmail.com02
c471fc79ba Add Songbeamer Import test 2013-10-07 00:07:49 +02:00
Philip Ridout
9ded4fee45 Fix decoding for SongShowPlus imports 
bzr-revno: 2304
 2013-10-05 06:30:00 +01: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
Tomas Groth
a45dfd2d1b Made branch work with python3. 2013-10-04 21:06:31 +02:00
Tomas Groth
bc3f2d3422 Merge with python3 changes. 2013-10-03 22:17:44 +02: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
a1b47f08ad fix ref 2013-09-28 21:43:00 +01:00
s.mehrbrodt@gmail.com
fb6336484b Rename variable 2013-09-28 22:24:05 +02:00
Tim Bentley
6533fb5bb0 Fix mime types for JSON 2013-09-28 06:10:44 +01:00
Tim Bentley
c05928c3d3 Fix main ui routes 2013-09-27 21:37:42 +01:00
Tim Bentley
8f47af1732 Head 2013-09-26 22:06:57 +01:00
s.mehrbrodt@gmail.com
c78a2a1103 Open Songbeamer Files in binary mode to detect the encoding 2013-09-26 18:18:04 +02:00
s.mehrbrodt@gmail.com
9dbb2e12b0 Remove now unused imports 2013-09-26 17:08:27 +02:00
s.mehrbrodt@gmail.com
285508fd2d Fix Import for SongBeamer files 2013-09-26 17:05:10 +02:00
Tim Bentley
870a232e4b Fix mime types add json debugging 2013-09-19 18:05:07 +01:00
Philip Ridout
9631c570b8 HEAD 2013-09-18 21:20:24 +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
Oliver Wieland
f4ab0b23b8 Add a Checkbox at the Bibles settings tab to show or hide the verse numbers 
bzr-revno: 2299
 2013-09-17 23:06:27 +02:00
Dmitriy Marmyshev
5d648f80c6 fixed transparent display for OS X 
Fixes: https://launchpad.net/bugs/1117098
 2013-09-17 20:23:45 +04:00
Oliver Wieland
dc03e288f8 minor changes in event handler 2013-09-16 18:30:59 +02: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
Philip Ridout
f725f8a92b filter returns an itterator in Py3 (as apposed to a list in Py2) 2013-09-14 23:22:05 +01:00
Tim Bentley
539ed55777 More cleanups 2013-09-14 22:00:58 +01:00
Tim Bentley
b868ecc57d remove reminances of cherrypy 2013-09-14 20:16:14 +01:00
Tim Bentley
2531513ec5 basic working model 2013-09-14 19:46:49 +01:00
Tim Bentley
cca76a90bd pass data to functions 2013-09-14 08:22:01 +01:00
Jeffrey Smith
2511332a9e Fix strip_rtf to handle CJK encodings 
bzr-revno: 2297
 2013-09-13 17:13:12 +02:00
Jeffrey Smith
1ef5d00d45 Fix various tests and broken code revealed by tests. 
bzr-revno: 2296
 2013-09-13 17:11:27 +02:00
Tim Bentley
448da916e9 Readonly works - next comes updates 2013-09-12 17:46:57 +01:00
Tim Bentley
d0813eddac Start to remove CherryPy 2013-09-11 22:06:17 +01:00
Tim Bentley
5295697677 fix error message 2013-09-11 20:00:30 +01:00
Oliver Wieland
00cb7b8adf fixes wrong url on the remotes tab 
separates determination of the local ip address for easier testing

bzr-revno: 2295
 2013-09-11 16:41:59 +02: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