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
Tomas Groth
d2f388bb59 Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574 
Fixes: https://launchpad.net/bugs/1296574
 2014-10-27 14:11:55 +01:00
Phill Ridout
80cdb84e4a HEAD 2014-10-26 07:51:17 +00:00
Phill Ridout
d2b6d2126e Add copyright and doc stying 2014-10-26 07:50:49 +00:00
Raoul Snyman
b34da371ba [fix #1385438] Make list widget items select tab pages via user data rather than just their position. 
Fixes: https://launchpad.net/bugs/1385438
 2014-10-25 22:26:19 +02:00
Phill Ridout
04c6e27ac5 PEP Fixes 2014-10-24 22:03:49 +01:00
Phill Ridout
8696482f39 Few tweeks, and comments 2014-10-24 21:46:14 +01:00
Phill Ridout
2f9df8cfbd HEAD 2014-10-24 21:12:48 +01:00
Ken Roberts
f81903bbcf Merge upstream 2014-10-23 15:16:38 -07:00
Ken Roberts
3cf8c0464c Fix discard/reset button calls - added button tooltips 2014-10-23 14:00:06 -07:00
Phill Ridout
c9cede9650 Implemented custom widget ColorButton OpenLP wide 2014-10-23 21:56:09 +01:00
Phill Ridout
a4f788599f add custom colorbutton widget 2014-10-23 20:50:01 +01:00
Ken Roberts
c7d36826aa Add 1.5 second delay for autoloading projectors 2014-10-22 19:40:22 -07:00
Ken Roberts
0264d57b61 Add input source edit text option 2014-10-22 19:21:26 -07:00
Raoul Snyman
108e3b6687 Forgot to catch the cancel_wizard_text refactor 2014-10-22 23:01:40 +02:00
Raoul Snyman
3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman
551a10d311 Added and updated tests: 
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests

Updated setup.py with some Python3 changes.
 2014-10-22 22:43:05 +02:00
Ken Roberts
d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Ken Roberts
6391b17b6d Fix focus to ip text widget when calling projetor edit 2014-10-21 17:49:21 -07:00
Ken Roberts
2e6556a11b Fix call to get_source_list in pjlink1 2014-10-21 17:02:37 -07:00
Ken Roberts
416c37140c Fix single dialog get_source_list() call 2014-10-21 16:51:51 -07:00
Ken Roberts
5ae48da58e Fix missing poll check 2014-10-21 16:45:15 -07:00
Ken Roberts
04ad28c106 Fixed typos in ProjectorSource 2014-10-21 15:47:25 -07:00
Ken Roberts
2b5b58379f Code cleanups 2014-10-21 14:50:35 -07:00
Ken Roberts
b38921a90b Code cleanups 2014-10-21 14:40:47 -07:00
Ken Roberts
a026633f78 Notes cleanups 2014-10-21 14:24:16 -07:00
Tomas Groth
5662f4b2af Ask the user if a backup of the data folder should be created after upgrading 
bzr-revno: 2427
 2014-10-21 22:08:26 +01:00
Tomas Groth
5ecbfa61fd Fix tests so they can run individually. 
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
 2014-10-21 22:06:02 +01:00
Ken Roberts
0fe5b9f8fe Typo in column define 2014-10-21 13:11:25 -07:00
Ken Roberts
a8cebffec0 cleanups 2014-10-21 13:05:35 -07:00
Tim Bentley
2b3e3d777e Add Test and fix more code 2014-10-21 21:05:08 +01:00
Ken Roberts
598f94f5c1 Add ProjectorSource schema for user-defined source display text 2014-10-21 13:03:58 -07:00
Ken Roberts
21f6216574 Switch PJLINK_DEFAULT_TEXT to dict 2014-10-21 13:01:07 -07:00
Tim Bentley
f5f8c1ce08 Fix start up thread timer 2014-10-21 06:13:22 +01:00
Ken Roberts
3def1baf9d pep8 2014-10-20 16:36:07 -07:00
Ken Roberts
8bb9510622 Fix tab text on mac 2014-10-20 16:25:27 -07:00
Ken Roberts
16f4fcbce3 Update settings to allow selecting source dialog layout 2014-10-20 16:17:15 -07:00
Ken Roberts
4283ff7502 Add tiled icons on toolbar for muliple-selection 2014-10-20 11:37:59 -07:00
Ken Roberts
8d4eb3b368 Fix icon for source input menu item 2014-10-20 10:07:53 -07:00
Ken Roberts
1e2cfcd7bd pep8 2014-10-20 09:50:19 -07:00
Ken Roberts
6a2f675e84 Realign tabs to left-right 2014-10-20 09:34:33 -07:00
Ken Roberts
c028353ecd Fix docstrings 2014-10-19 17:43:40 -07:00
Ken Roberts
3cb21e4c13 Set tab focus to tab with selected source 2014-10-19 17:31:09 -07:00
Ken Roberts
7fb3ca8c17 Fix misplace tabwidget addWidget 2014-10-19 17:11:06 -07:00
Ken Roberts
c42af376cc Fix tabbed source select gui size 2014-10-19 16:55:19 -07:00
Ken Roberts
4b64e24e36 Initial change to tabs for source select 2014-10-19 12:20:51 -07:00
Ken Roberts
10c415cf1a Docstrings cleanup 2014-10-17 10:28:12 -07:00
Ken Roberts
d8f94ac3df Remove extraneous imports 2014-10-17 08:23:45 -07:00
Ken Roberts
81f26dd9a3 pep8 and extra logging info 2014-10-16 20:09:42 -07:00
Ken Roberts
dfcbaa8c28 Add socket timer for lost connections 2014-10-16 19:28:51 -07:00
Ken Roberts
c1415bb891 Fix authentication send, added current source to source select dialog 2014-10-16 17:04:19 -07:00
Ken Roberts
054be0135a Add check for connect before calling connect on doubleclick 2014-10-16 14:21:01 -07:00
Ken Roberts
187dee6217 Add double-click to connect option 2014-10-16 14:11:43 -07:00
Ken Roberts
0ec753468c projector view info icon update 2014-10-16 14:01:37 -07:00
Ken Roberts
6264435acb Fix view status icon on toolbar 2014-10-16 13:48:41 -07:00
Ken Roberts
99c7566f98 Update source selection as soon as power is on 2014-10-16 13:33:29 -07:00
Ken Roberts
77040050f4 Restructure send_busy flag 2014-10-16 13:03:20 -07:00
Ken Roberts
4714cbfcf7 pep8 2014-10-16 11:30:29 -07:00
Ken Roberts
ec59abdc85 pep8 2014-10-16 11:16:08 -07:00
Ken Roberts
645f92e7d4 Change projector wizard to basic edit form 2014-10-16 11:08:44 -07:00
Ken Roberts
f60f8d211b Fix source select when sources not known yet 2014-10-15 13:53:17 -07:00
Ken Roberts
e4926416f8 Fix unlock send queue 2014-10-15 13:27:43 -07:00
Ken Roberts
c064a17ece Add toolbar separator 2014-10-15 11:45:41 -07:00
Ken Roberts
5879209627 Fix toolbar icon status on socket error 2014-10-15 11:41:12 -07:00
Ken Roberts
dc321155a0 Fix localhost connection 2014-10-15 11:18:00 -07:00
Ken Roberts
8ea0917230 pep8 2014-10-15 10:38:39 -07:00
Ken Roberts
f468fbb47d Fix bad data in process command 2014-10-15 10:34:27 -07:00
Ken Roberts
650c5007b2 Add poll_loop after send command 2014-10-15 10:29:15 -07:00
Ken Roberts
2e3391eff4 Remove blocking calls on sockets 2014-10-15 10:22:12 -07:00
Ken Roberts
4d127cd6fa Fix icon update only when status changes 2014-10-14 20:34:06 -07:00
Ken Roberts
e3439172f8 Toolbar icon enable/disable on power on/off based on projector state 2014-10-14 19:57:58 -07:00
Ken Roberts
fb51f505d5 Extra poll after command returned OK 2014-10-14 19:57:13 -07:00
Ken Roberts
03a31f9bc9 Remove extra spacers in toolbar 2014-10-14 19:30:38 -07:00
Ken Roberts
ef5b597a8b Fix missing information from view item 2014-10-14 19:18:40 -07:00
Ken Roberts
cf7756d6c7 Fix packet length check for valid command with empty data 2014-10-14 19:18:00 -07:00
Ken Roberts
7931c97698 Toolbar icons/change source icon 2014-10-14 18:40:21 -07:00
Ken Roberts
6e96851e2e Fix toolbar icons disabled state 2014-10-14 11:59:57 -07:00
Ken Roberts
ad6a8ec5ce Test cleanups and fix network error icons 2014-10-14 10:40:07 -07:00
Ken Roberts
cc43efa809 Toolbar change based on selected projector items 2014-10-14 10:12:49 -07:00
Ken Roberts
5f232ce5fd Fix wrong status on sending data 2014-10-14 08:14:16 -07:00
Tomas Groth
cbd1b7c223 Changed setting version name 2014-10-14 09:52:59 +02:00
Ken Roberts
e5743462e2 Added default socket timeout/poll time in settings 2014-10-13 17:07:54 -07:00
Ken Roberts
39e574dba7 Change timer setting based on initial connect/poll 2014-10-13 13:58:39 -07:00
Ken Roberts
713a255241 Fix authentication errors 2014-10-13 13:16:25 -07:00
Ken Roberts
5938ccc9a6 added get_projector_by_id 2014-10-13 13:16:03 -07:00
Tomas Groth
f36c8660ab Changed a variable name 2014-10-13 20:24:19 +01:00
Ken Roberts
5a1aa5c88c pep8 2014-10-13 10:09:23 -07:00
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
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
Tomas Groth
71324fc932 Forward ported fix for bug1265368 
Fixes: https://launchpad.net/bugs/1265368
 2014-09-25 11:07:31 +02:00
Tomas Groth
31a868ca61 Moved thumbnail creation to httprouter.py 2014-09-23 22:45:42 +01:00
Tomas Groth
4bacaab205 trunk 2014-09-21 20:23:40 +01: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
cf351a7af9 Fix thumbnail creating 2014-09-10 22:30:32 +01:00
Tomas Groth
8d76aeffd2 Added thumbnails for images from serviceitems 2014-09-10 07:40:12 +01:00
Tomas Groth
dab4ad7080 trunk 2014-09-08 22:08:49 +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
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
df28a6799b trunk 2014-09-02 21:17:56 +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
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
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
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
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
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
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
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
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
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
Tomas Groth
e0c8709ad1 trunk 2014-07-07 19:24:23 +02: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
b92ca3f209 Fix service up movement 
Fixes: https://launchpad.net/bugs/1338316
 2014-07-07 13:17:24 +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
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
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
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
Tomas Groth
e773d82341 Updated VLC bindings to latest build 2014-06-26 09:41:22 +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
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
340857cecc Detect languages in source code folder when running from source 
bzr-revno: 2393
 2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt
e424c33283 This has been removed in trunk 2014-06-09 10:59:52 +02:00
Tomas Groth
d832933110 Small fix for locating mudraw on windows and mac. 
Enabled presentation plugin on mac and adjusted test accordingly.

bzr-revno: 2390
 2014-06-08 21:25:32 +01:00
Tim Bentley
8d67406728 Fix a validation bug with presentations being loaded from services 
Fix range bug stopping service items being triggered unless it was the first!

bzr-revno: 2389
 2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt
5c90d7847e Merge trunk 2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt
007e18945e Various string fixes and other tidying up 
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils

bzr-revno: 2388
 2014-06-08 16:12:23 +02:00
Tim Bentley
f23e603314 Fix up interface better 2014-06-05 17:25:37 +01:00
Stewart Becker
ed295d38dd Fixed a typo: load_Last_file -> load_last_file 
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
 2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt
a6a43264da Merge trunk 2014-06-03 21:23:21 +02:00
Tim Bentley
a912db6abf new bug 2014-06-01 18:12:00 +01:00
Tim Bentley
82f97ee736 Fix suffix error in presentation 2014-05-31 21:00:10 +01:00
Tomas Groth
13cc26f26a Support for importing Zefania bible XML format 
bzr-revno: 2385
 2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt
50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly. 
bzr-revno: 2384
 2014-05-31 07:17:52 +01:00
Tomas Groth
d424270b7f Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac. 2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt
56ebf2de00 Revert change in check for language dir 2014-05-28 19:17:26 +02:00
Tomas Groth
06825e4aeb Added support for audio cds and udisks2 2014-05-23 15:39:25 +02:00
Samuel Mehrbrodt
e70a09c93e Detect language folder in source directory 2014-05-22 15:40:05 +02:00
Samuel Mehrbrodt
49a48c6463 more string fixes 2014-05-21 19:20:44 +02:00
Tomas Groth
d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt
d10507e250 Small string fixes 2014-05-21 16:47:44 +02:00
Tomas Groth
7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Samuel Mehrbrodt
de8074b00a Improve single click behavior (remove flickering) 2014-05-19 21:19:05 +02:00
Jonathan Springer
6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Jonathan Springer
60fa4c2dca Make vlcplayer stop call asynchronous to aviod a deadlock with the UI thread 2014-05-07 18:52:06 -04:00
Samuel Mehrbrodt
f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Samuel Mehrbrodt
3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Tomas Groth
0d48c09180 Added support for import of Zefania XML bibles. 2014-05-06 21:53:08 +02:00
Samuel Mehrbrodt
a6a08bcfdd Fix bug 1157938 
Fixes: https://launchpad.net/bugs/1157938
 2014-05-03 17:01:43 +02:00
Andreas Preikschat
deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat
4231692ae1 removed print 2014-05-02 08:34:57 +02:00
Andreas Preikschat
8fb086134e dead code, not used variables, docs, unused imports 2014-05-01 19:49:43 +02:00
Andreas Preikschat
2ba7fa4f44 head 2014-05-01 18:58:32 +02:00
Andreas Preikschat
3f75a913e2 removed not working tests 2014-05-01 18:57:45 +02:00
Stewart Becker
a56f00ddc0 Merge from parent 2014-04-30 21:40:33 +01:00
Andreas Preikschat
0160c583e9 Fix Renderer broken when two option breaks next to each other 
bzr-revno: 2374
 2014-04-29 17:57:07 +01:00
Andreas Preikschat
ff1bc31bfc - Fixed bug #1240037 
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts

bzr-revno: 2373
 2014-04-29 17:55:30 +01:00
Andreas Preikschat
b73d8b088c head 2014-04-29 13:04:32 +02:00
Andreas Preikschat
282ed7e1a6 fixed u' 2014-04-29 13:04:19 +02:00
Andreas Preikschat
88a3ac6216 match list behaviour 2014-04-26 19:40:26 +02:00
Andreas Preikschat
3f1e7f1912 fixes 2014-04-26 19:36:47 +02:00
Andreas Preikschat
911864a442 removed useless code 2014-04-26 19:31:59 +02:00
Andreas Preikschat
66c1f7c5da renamed variable and parameter 2014-04-26 11:35:50 +02:00
Andreas Preikschat
6bdadff334 raise exception when item not in list 2014-04-26 11:01:12 +02:00
Andreas Preikschat
aa899bfde0 fixes 2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt
20f748d608 Allow authors to be tagged by their type (words music etc) 
bzr-revno: 2371
 2014-04-26 09:42:26 +01:00
Tim Bentley
9e8f0d82de Add icons to see the state of the remote (on / SSL / authentication) 
Stop restarting the server as this crashes it and should not be common.

bzr-revno: 2370
 2014-04-26 09:38:44 +01:00
Andreas Preikschat
5a2793bc50 head 2014-04-26 10:19:12 +02:00
Tomas Groth
bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Stewart Becker
6d63a008f0 Merged in from trunk 2014-04-22 22:46:21 +01:00
Tomas Groth
817fe854e4 PEP8 fixes 2014-04-22 22:42:07 +02:00
Tomas Groth
074ab4b1bb Head 2014-04-22 22:18:58 +02:00
Andreas Preikschat
5a3aecf997 fixed bugs in class 2014-04-22 17:06:21 +02:00
Andreas Preikschat
70bce87434 head 2014-04-22 12:30:43 +02:00
Andreas Preikschat
6c08a80bfd added test; refactor 2014-04-22 12:29:15 +02:00
Jonathan Springer
05171453ea merge trunk 2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt
031868ae31 trunk 2014-04-21 11:49:17 +02:00
Raoul Snyman
dee8ed2850 Fix an exception raised when loading media players if the configuration is blank 2014-04-21 00:23:26 +02:00
Tim Bentley
ce55fd1d57 fixes 2014-04-20 21:16:08 +01:00
Andreas Preikschat
cf798e73d5 removed not needed code 2014-04-20 18:02:50 +02:00
Andreas Preikschat
df800850e1 fixed bug 1240037 (Error occured when moving directory) 
Fixes: https://launchpad.net/bugs/1240037
 2014-04-20 18:00:24 +02:00
Tomas Groth
a999e59a4f Fixes for merge 2014-04-20 16:36:56 +02:00
Tomas Groth
f6231e024a Head 2014-04-20 15:57:12 +02:00
Andreas Preikschat
51c14bdf51 fixed bug 1296104 
Fixes: https://launchpad.net/bugs/1296104
 2014-04-20 15:24:18 +02:00
Andreas Preikschat
cec47fc950 fixed bug 1146964 
Fixes: https://launchpad.net/bugs/1146964
 2014-04-20 14:06:02 +02:00
Stewart Becker
d62b92718d Fixed typo 2014-04-19 22:57:49 +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
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
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
30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt
e1a9a36ea3 Trunk 2014-04-15 22:53:47 +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
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
82dbb7d219 Trunk 2014-04-15 10:30:04 +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
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
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
49ff37c530 fixed long line; use generator 2014-04-13 09:54:34 +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
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
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
a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +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
b0d3b54f53 Trunk 2014-04-08 11:17:55 +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
Raoul Snyman
5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tim Bentley
576ab6e1f9 head 2014-04-04 21:20:00 +01: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
Andreas Preikschat
2a9c85c2a2 fixed a spelling mistake 
bzr-revno: 2346
 2014-04-02 19:51:06 +01: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
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
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