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

9682 Commits

Author SHA1 Message Date
Ken Roberts
e7e53501df Fix authentication error processing 2014-10-13 09:40:58 -07:00
Ken Roberts
498ecb5b6a increase pin length to allow test pin 2014-10-13 08:11:55 -07:00
Ken Roberts
72cca86208 Refactor pjlink/remove db id in view projector/add pjlink command to constants 2014-10-13 07:51:23 -07:00
Tomas Groth
5091b3de37 Added a test 2014-10-13 16:08:06 +02:00
Tomas Groth
e1fde7f6a5 Ask the user if a backup of the data folder should be created after upgrading 2014-10-13 12:26:23 +02:00
Samuel Mehrbrodt
7fa80e5cfd Use the same jquery versions that Debian Wheezy has 2014-10-13 11:52:52 +02:00
Ken Roberts
26db1f16ad pep8 2014-10-10 12:14:15 -07:00
Ken Roberts
89800c1a7d Relocate second toolbar to top 2014-10-10 10:29:52 -07:00
Ken Roberts
a58cf9754b Merge new toolbar 2014-10-10 10:07:31 -07:00
Ken Roberts
91ab6a64bf Tiled icons for toolbar 2014-10-10 09:54:35 -07:00
Ken Roberts
fcd14a12cd tranlate strings and cleanups 2014-10-10 08:58:48 -07:00
Ken Roberts
5da20ec01d pep8 cleanups 2014-10-09 20:31:51 -07:00
Ken Roberts
cbb995c4c6 More single character cleanups 2014-10-09 20:28:24 -07:00
Ken Roberts
d6bb5aad52 More single character cleanups 2014-10-09 20:16:46 -07:00
Jonathan Springer
859ae13eb3 More work for top and bottom toolbars for the projector manager 2014-10-09 22:49:18 -04:00
Jonathan Springer
857a1d06f6 Intial changes for multiple toolbars for projector manager 2014-10-09 22:08:59 -04:00
Ken Roberts
c0169bb762 Test for MacOSX for wizard buttons 2014-10-09 15:12:08 -07:00
Ken Roberts
66a674c8de more wizard text updates 2014-10-09 15:00:29 -07:00
Ken Roberts
303eabdfa6 Wizard text updates 2014-10-09 14:46:05 -07:00
Ken Roberts
b8f84f79eb Fix previous reviews 2014-10-09 13:30:07 -07:00
Ken Roberts
842898aaf9 Remove extraneous imports 2014-10-09 07:41:32 -07:00
Ken Roberts
6c4b8e5b91 Revert multiselection 2014-10-08 19:05:53 -07:00
Ken Roberts
0feca36ede Add multi-selection to projector item widgets 2014-10-08 18:56:45 -07:00
Ken Roberts
853826a501 Icon/tranlate fixes 2014-10-08 18:43:34 -07:00
Ken Roberts
d4b6c067ef Fix issue with source select being None 2014-10-08 15:36:23 -07:00
Ken Roberts
db2d2ca3b3 Missed import for is_macosx 2014-10-08 13:21:59 -07:00
Ken Roberts
1eee08ff6b pep8 on wizard.py 2014-10-08 13:04:50 -07:00
Ken Roberts
06da940310 Update wizard setup for Mac OSX on wizard pages 2014-10-08 13:03:33 -07:00
Ken Roberts
6a75726eed Update wizard setup for Mac OSX 2014-10-08 13:01:47 -07:00
Raoul Snyman
53905dec21 Fix up the look and feel of the wizards after I messed it up with my changes for OS X 2014-10-08 21:42:30 +02:00
Ken Roberts
c789d1c0ed Missed db reference in edit page 2014-10-07 12:37:55 -07:00
Ken Roberts
0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Phill Ridout
ddec0e00cd Patch changes from botched branch 2014-10-06 19:09:47 +01:00
Tomas Groth
9dbbe9d5be Fixed console popping up on windows when running mudraw.exe 2014-10-03 11:57:35 +02:00
Tomas Groth
2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +01:00
Tomas Groth
60dc075e3b pep8 fix 2014-09-25 21:46:09 +01:00
Tomas Groth
3e66b4aa98 Fix for importing custom tags from openlyricsxml + test in progress 2014-09-25 17:01:11 +02:00
Tomas Groth
71324fc932 Forward ported fix for bug1265368 
Fixes: https://launchpad.net/bugs/1265368
 2014-09-25 11:07:31 +02:00
Tomas Groth
a7156460b0 Fixes to thumbnail creation 2014-09-24 10:09:11 +02:00
Tomas Groth
31a868ca61 Moved thumbnail creation to httprouter.py 2014-09-23 22:45:42 +01:00
Tomas Groth
78d9da5c26 Fix comments and typos 2014-09-22 22:19:02 +01:00
Tomas Groth
4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Tomas Groth
5dceb1a0e6 Fixes for DVD 
bzr-revno: 2421
 2014-09-17 21:43:53 +01:00
Samuel Mehrbrodt
b24ba5322b Merge trunk 2014-09-14 15:44:32 +02:00
Samuel Mehrbrodt
48abd1793b Fix loading authors 
Fixes: https://launchpad.net/bugs/1366198
 2014-09-14 15:35:55 +02:00
Raoul Snyman
efe030b020 Update the UI on Mac OS to make it look and feel more like a first-class Mac app. 
* Removed the icons from the menus (thanks to Jonathan S. for that)
* Use Mac OS X wizards instead of our Windows-style wizards when on OS X

bzr-revno: 2419
 2014-09-14 15:07:31 +02:00
Samuel Mehrbrodt
3426fc37d2 Fix author->songs relation 
Fixes: https://launchpad.net/bugs/1369139
 2014-09-14 00:00:28 +02:00
Tomas Groth
15624e20ef Fixed typo and removed unused import 2014-09-11 12:08:44 +02:00
Tomas Groth
5c4be05fc1 Went back to to the load-into-imagemanager-on-demand approach 2014-09-11 11:52:32 +02:00
Tomas Groth
5dc722e017 Fix pep8 2014-09-10 22:41:36 +01:00
Tomas Groth
cf351a7af9 Fix thumbnail creating 2014-09-10 22:30:32 +01:00
Samuel Mehrbrodt
41de0ba9ea Update e jQuery, jQuery Mobile; Use compressed versions 2014-09-10 20:23:25 +02:00
Tomas Groth
8d76aeffd2 Added thumbnails for images from serviceitems 2014-09-10 07:40:12 +01:00
Tomas Groth
2fbbc85679 Fix for http server not started correctly 2014-09-09 14:55:56 +02:00
Tomas Groth
3769a01682 Small fixes 2014-09-08 22:48:49 +01:00
Tomas Groth
dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Tomas Groth
79ef9315d5 Added a test 2014-09-08 21:49:33 +01:00
Tomas Groth
58f517b4d6 More DVD fixes 2014-09-08 20:16:31 +01:00
Raoul Snyman
40edebdab0 Style fixes 2014-09-08 00:30:21 +02:00
Raoul Snyman
bf488da516 Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm. 2014-09-08 00:17:20 +02:00
Tomas Groth
3eeda06075 Use the RegistryProperties class 2014-09-06 21:10:44 +01:00
Tomas Groth
6be3e0a816 Tried to fixed some DVD issues. Made the mouse cursor look busy. 2014-09-06 20:33:01 +01:00
Tomas Groth
98d5ed7acf Fix the OSIS bible importer 
bzr-revno: 2418
 2014-09-06 07:44:08 +01:00
Raoul Snyman
09be73cc26 HEAD 2014-09-05 22:15:44 +02:00
Raoul Snyman
1a573315db Make tabbed docks look better by using document mode 2014-09-04 23:38:39 +02:00
Raoul Snyman
1f9c0a31f8 Made wizard image bigger, and made Theme wizard bigger 2014-09-04 22:25:23 +02:00
Raoul Snyman
496c12b2db Reformatted a comment; Renamed NT to WIN; Made OpenLPMixin constructor slightly more robust. 2014-09-04 22:10:34 +02:00
Jonathan Springer
ceeb1b0118 Removed icons from menu items on Mac OS X 2014-09-04 20:27:21 +02:00
Raoul Snyman
cf8f15964c Move to use the new is_macosx() method, and tweak the theme wizard a little more. 2014-09-02 23:15:58 +02:00
Raoul Snyman
184a397970 HEAD 2014-09-02 22:38:36 +02:00
Tomas Groth
3b4ce374f2 pep8 fix 2014-09-02 21:24:57 +01:00
Tomas Groth
df28a6799b trunk 2014-09-02 21:17:56 +01:00
Tomas Groth
25608fd672 Fixed signals. 2014-09-02 21:15:18 +01:00
Tomas Groth
a2710553d9 Implemented a workaround for bug1251437 / http://bugs.python.org/issue22248 
The problem is the urllib.request.urlopen cannot handle redirect urls with non-ascii chars, so I've added url-encoding of the redirect url.

bzr-revno: 2416
 2014-08-29 17:37:25 +01:00
Jonathan Springer
f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Tomas Groth
7fecaa1d70 Added language detection when importing 
Fixes: https://launchpad.net/bugs/1214875
 2014-08-27 15:10:33 +02:00
Tomas Groth
1adeb175ae trunk 2014-08-27 10:44:04 +02:00
Tomas Groth
62811d660f Implemented a workaround for bug1251437 
Fixes: https://launchpad.net/bugs/1251437
 2014-08-27 10:43:18 +02:00
Tomas Groth
36326085f8 trunk 2014-08-26 22:19:08 +01:00
Tomas Groth
11a19fbd32 Merged Raouls GUI changes 2014-08-26 22:11:29 +01:00
Phill Ridout
0b93faf7b9 PEP fixes 2014-08-26 18:38:07 +01:00
Phill Ridout
34a1ab3b3e HEAD 2014-08-26 17:51:52 +01:00
Tomas Groth
91f7b2d615 Added a few comments. 2014-08-25 21:52:12 +01:00
Tomas Groth
c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth
a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tomas Groth
d48bf08094 Remove a few debug prints and move a few lines... 2014-08-24 16:04:42 +01:00
Tomas Groth
3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00
Tomas Groth
43d3823bfb trunk 2014-08-24 15:38:17 +01:00
Tomas Groth
254acf4601 trunk 2014-08-24 15:37:51 +01:00
Tim Bentley
2f8d8f912e Fix conversion error and add tests for service manager context menu 
bzr-revno: 2412
 2014-08-24 15:37:47 +01:00
Samuel Mehrbrodt
c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tim Bentley
565c2312d0 head 2014-08-24 10:37:49 +01:00
Tim Bentley
516fd30bc7 fix conversion bug 2014-08-23 21:42:10 +01:00
Raoul Snyman
948eecb6a0 HEAD 2014-08-23 00:13:02 +02:00
Raoul Snyman
8065649158 Make the wizards look right on OS X 2014-08-23 00:12:35 +02:00
Tomas Groth
3b092319c9 trunk 2014-08-21 11:24:40 +02:00
Raoul Snyman
7b25295c7f Remove some debugging prints... oops 2014-08-21 01:49:22 +02:00
Raoul Snyman
554ce81dd3 Added some padding and make the contents of the dialog expand out. 2014-08-21 01:45:55 +02:00
Raoul Snyman
86291d0c41 Round 1 of media clip dialog refresh 2014-08-21 01:35:24 +02:00
Raoul Snyman
4fc6025f1a Removed styled frame - looks ugly in KDE and is unnecessary 2014-08-20 23:33:30 +02:00
Raoul Snyman
4e6561b9c2 Minor syntactic sugar 2014-08-20 22:09:07 +02:00
Samuel Mehrbrodt
ce26493dac We only support v4 files 2014-08-19 07:57:54 +02:00
Samuel Mehrbrodt
0bf256070a Add test 2014-08-18 21:04:46 +02:00
Samuel Mehrbrodt
63f08f0c4a Fix ProPresenter import 
Fixes: https://launchpad.net/bugs/1358418
 2014-08-18 20:45:15 +02:00
Tomas Groth
db477f8d9c trunk 2014-08-04 18:12:03 +01:00
Stewart Becker
04bafa62fa Added an option to wrap footer text 
bzr-revno: 2409
 2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt
16399e2ea5 This prevents updates from running (which should only run on outdated databases that existed before) 
bzr-revno: 2408
 2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt
82b3c00863 Add importer for PresentationManager 
bzr-revno: 2407
 2014-08-04 06:01:41 +01:00
Samuel Mehrbrodt
933ec66efc Fix theme export and add unit test. 
bzr-revno: 2406
 2014-08-04 06:00:34 +01:00
Stewart Becker
d90fcface2 Style fixes for Tim 2014-07-24 20:28:57 +01:00
Stewart Becker
73ec92ae13 Added option to wrap footer text 2014-07-21 07:37:41 +01:00
Samuel Mehrbrodt
2613ad3076 Don't run upgrades on an up to date database 2014-07-17 23:04:58 +02:00
Tomas Groth
a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth
00693b8cce trunk 2014-07-15 15:41:34 +02:00
Tomas Groth
b6cd13fc91 pep8 fixes 2014-07-15 12:02:56 +02:00
Tomas Groth
597e06153c Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes 2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt
5e349c6c24 Merge conflict 2014-07-14 18:50:50 +02:00
Samuel Mehrbrodt
d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt
b2afbd688d Add an importer for PowerPraise 
bzr-revno: 2404
 2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt
6c40962afb Allow editing of author types and fix bug in servicemanager 
bzr-revno: 2403
 2014-07-14 17:25:59 +01:00
Tomas Groth
8fa23ac95d Added support for showing thumbnails of images in webinterface 2014-07-14 14:41:27 +02:00
Samuel Mehrbrodt
0ce859c2cd Fix import 2014-07-14 13:36:33 +02:00
Tomas Groth
06110df08b Add notes and titles to presentation-serviceitem when creating it, and updated stageview to show title+thumbnail+notes. 2014-07-14 11:58:05 +02:00
Tomas Groth
29f8eedeaf Merged with trunk and reverted changes to the tag test 2014-07-14 09:19:47 +02:00
Tomas Groth
022ac9bfac trunk 2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt
af64bece26 Improve Song Copyright 
bzr-revno: 2402
 2014-07-13 21:57:05 +01:00
Raoul Snyman
f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Tomas Groth
542fe4e887 small changes 2014-07-11 23:45:01 +02:00
Tomas Groth
3edabb268e removed websockets 2014-07-11 22:35:23 +02:00
Samuel Mehrbrodt
53cb11e03e EOF; verse order fixed 2014-07-11 16:19:53 +02:00
Tomas Groth
98a58d45bf pep8 fixes 2014-07-11 15:35:44 +02:00
Tomas Groth
406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt
7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt
6d5e6f0faf Remove debug output 2014-07-09 14:45:54 +02:00
Samuel Mehrbrodt
383f7ef6e2 Option for displaying copyright symbol 2014-07-09 14:33:26 +02:00
Tomas Groth
e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Samuel Mehrbrodt
b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt
df6669220a Space 2014-07-07 18:17:54 +02:00
Samuel Mehrbrodt
2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Tomas Groth
695079dd00 Improve powerpoint error handling. 
bzr-revno: 2399
 2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt
520c251923 Cleanup: Move song import plugins into subfolder 
bzr-revno: 2398
 2014-07-07 17:08:32 +01:00
Tim Bentley
2770c76895 Fix setup.py for python3 to remove binary strings. 
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.

bzr-revno: 2397
 2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt
398508f49b Gui entry 2014-07-07 15:36:07 +02:00
Samuel Mehrbrodt
b7a141f75c Add Presentation Manager import 
Fixes: https://launchpad.net/bugs/957017
 2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt
201cfad9c4 Remove unused imports 2014-07-07 14:25:00 +02:00
Tomas Groth
bec0071e7c Small adjustments 2014-07-07 13:30:03 +02:00
Samuel Mehrbrodt
b92ca3f209 Fix service up movement 
Fixes: https://launchpad.net/bugs/1338316
 2014-07-07 13:17:24 +02:00
Tomas Groth
32ff9cdeb7 Patch by Samuel 2014-07-06 21:48:23 +02:00
Samuel Mehrbrodt
8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt
5d7b60f714 Changing Author type functional 2014-07-05 21:56:32 +02:00
Samuel Mehrbrodt
cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt
aec5a8546b Merge trunk 2014-07-04 16:16:14 +02:00
Samuel Mehrbrodt
7f9ae1374e Started authortype editing 
Fixes: https://launchpad.net/bugs/1336933
 2014-07-04 16:16:02 +02:00
Samuel Mehrbrodt
f089e7522e Cleanups 2014-07-04 11:35:10 +02:00
Samuel Mehrbrodt
686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Tomas Groth
33e104d57d Tried to fix some linux vs windows issues. Also added a test. 2014-07-04 10:45:17 +02:00
Samuel Mehrbrodt
953adf7145 A blank line! 2014-07-04 10:35:24 +02:00
Samuel Mehrbrodt
87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt
7112356c21 Parse verse order 2014-07-03 23:48:52 +02:00
Samuel Mehrbrodt
9f34552364 PowerPraise importer 
Fixes: https://launchpad.net/bugs/1336929
 2014-07-03 23:30:41 +02:00
Tomas Groth
9d87fa46ca Try to fix playing-when-loading 2014-07-03 20:43:35 +02:00
Samuel Mehrbrodt
3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt
d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Tomas Groth
8a545ceaf7 Try to fix some timing issues 2014-07-03 16:19:11 +02:00
Tomas Groth
79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Tomas Groth
d19e7bf3aa Fix disc loading for windows 2014-07-03 11:27:54 +02:00
Tomas Groth
6f7f3be3ff Fix optical drive detection on windows 2014-07-03 09:09:55 +02:00
Samuel Mehrbrodt
046f661d37 Add an importer for Worship Assistant 
bzr-revno: 2396
 2014-07-03 05:42:47 +01:00
Tomas Groth
d402bf86cb trunk 2014-07-02 22:48:56 +02:00
Tim Bentley
f649f0af3c Fix initialisation 2014-07-02 19:13:23 +01:00
Tim Bentley
b3041a5287 Fix version 2014-07-01 22:11:13 +01:00
Tim Bentley
7d2f8fa6cd Fix setup.py 2014-07-01 22:10:26 +01:00
Tomas Groth
3c91a6bbfd Fixed seeking when playing mediaclip 2014-07-01 22:06:55 +02:00
Tomas Groth
154334a332 Fix for dvd loading 2014-07-01 19:48:36 +02:00
Phill Ridout
9b6979b840 Changed log.warn to log.warning 2014-06-30 21:59:22 +01:00
Samuel Mehrbrodt
af6537116c Close file also on success 2014-06-30 14:36:35 +02:00
Samuel Mehrbrodt
9702870afa Close and delete zip in case of exception 2014-06-30 09:30:19 +02:00
Samuel Mehrbrodt
7364d4962f Small fixes 2014-06-30 09:18:26 +02:00
Samuel Mehrbrodt
78f1756380 Fix biblegateway url 2014-06-26 10:35:53 +02:00
Samuel Mehrbrodt
a52dc69c89 Remove debug output 2014-06-26 10:04:33 +02:00
Samuel Mehrbrodt
66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Tomas Groth
e773d82341 Updated VLC bindings to latest build 2014-06-26 09:41:22 +02:00
Samuel Mehrbrodt
5eb0ac618e PEP8 2014-06-25 17:04:13 +02:00
Samuel Mehrbrodt
c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt
4ebfa33aac Parse verse names 2014-06-25 15:49:03 +02:00
Samuel Mehrbrodt
f92afc296b First go at an importer for Worship Assistant 2014-06-25 14:23:31 +02:00
Tomas Groth
248e703345 Fixed loading of libvlc.dll on windows 2014-06-24 19:46:23 +02:00
Samuel Mehrbrodt
39fbbf779d Move this line out of try/catch block 2014-06-23 15:54:13 +02:00
Samuel Mehrbrodt
aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Samuel Mehrbrodt
e174365051 Fix theme export 
Fixes: https://launchpad.net/bugs/1332990
 2014-06-23 13:38:17 +02:00
Tomas Groth
49342f4a69 Improve Powerpoint error handling 2014-06-22 22:12:59 +02:00
Tomas Groth
956af8706b Small suggested changes 2014-06-17 09:27:12 +02:00
Tomas Groth
44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Tomas Groth
7a47e5cb67 fixed bug #719514 ' Themes: <file> and <otherfile> are the same file' 
Fixes: https://launchpad.net/bugs/719514
 2014-06-15 22:35:31 +02:00
Tomas Groth
2a1a93d319 Made it possible to name optical clips, and fixed some issues. 2014-06-14 23:48:07 +02:00
Samuel Mehrbrodt
d61111ab89 Add proper error messages to EasyWorship import. 
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
 2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt
50a226d51b Better wording 2014-06-11 07:18:32 +02:00
Samuel Mehrbrodt
340857cecc Detect languages in source code folder when running from source 
bzr-revno: 2393
 2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt
543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt
6e9bba3a74 Rename file 2014-06-09 11:08:27 +02:00