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

4816 Commits

Author SHA1 Message Date
Andreas Preikschat
dd99c23c8c removed print statement again 2013-01-18 22:32:40 +01:00
Andreas Preikschat
bee9c96b9a song export fixes 2013-01-18 22:24:25 +01:00
Andreas Preikschat
6f3f9ce0ea fixed screen default values (-1 is also allowed as x,y); fixed syntax 2013-01-18 22:06:09 +01:00
Andreas Preikschat
2b38081b47 cough 2013-01-18 21:55:03 +01:00
Andreas Preikschat
2f3a5d1fb2 final clean ups 2013-01-18 21:43:19 +01:00
Andreas Preikschat
bf4c1dafb4 fixed up wizard 2013-01-18 21:35:30 +01:00
Andreas Preikschat
5b6326e2ac migrate settings 2013-01-18 20:24:06 +01:00
Raoul Snyman
d2819ceae1 Code style cleans to make pylint happier 
bzr-revno: 2148
 2013-01-18 19:18:27 +00:00
Arjan Schrijver
5bba7562f3 When a saved service file is loaded, images always get a black background instead of the configured background. This patch fixes that, although I'm not sure if it fits within the coding standards. 
bzr-revno: 2147
 2013-01-18 19:17:20 +00:00
Dmitriy Marmyshev
e3e8693bcc name fix 2013-01-18 23:00:13 +04:00
Andreas Preikschat
a98045e386 remove set_list and get_list from SettingsManager 2013-01-18 19:50:46 +01:00
Andreas Preikschat
254f6915ed changed keys 2013-01-18 13:25:05 +01:00
Andreas Preikschat
aa5f38624d fixed settings 2013-01-17 23:37:10 +01:00
Andreas Preikschat
b376c620bd fixed string not being used 2013-01-17 23:28:51 +01:00
Andreas Preikschat
3f31c33e74 fixed images 2013-01-17 23:22:05 +01:00
Andreas Preikschat
e55b6ce78e removed set_last_dir and get_last_dir methods 2013-01-17 23:14:06 +01:00
Dmitriy Marmyshev
5ce7ceafed fixed varaibles 2013-01-17 17:09:46 +04:00
Raoul Snyman
88272a3a6a A couple of small code cleanups to raise our code score on CI. 2013-01-16 23:03:01 +02:00
Andreas Preikschat
1ea08d42d1 corrected translate context 2013-01-16 21:23:02 +01:00
Andreas Preikschat
fd85cb66ae cleaned dict 2013-01-16 20:37:47 +01:00
Tim Bentley
9d8fc508b0 Head 2013-01-16 19:37:11 +00:00
Tim Bentley
f2ef685cf1 tidy ups 2013-01-16 19:35:44 +00:00
Andreas Preikschat
d552607f57 fixed doc 2013-01-16 20:03:41 +01:00
Andreas Preikschat
48db63e81e I better stay correct; fixed doc 2013-01-16 20:01:11 +01:00
Andreas Preikschat
0fc9c4792f tweaked 'settings migrator' 2013-01-16 19:59:34 +01:00
Andreas Preikschat
08d618c604 added fixme 2013-01-16 13:42:33 +01:00
Andreas Preikschat
15c96f8b87 fixed upper General 2013-01-16 13:26:17 +01:00
Andreas Preikschat
423edf5905 fixed default screen values 2013-01-16 13:09:39 +01:00
Andreas Preikschat
c29bbd3ca0 r2146 2013-01-16 12:29:19 +01:00
Andreas Preikschat
65d0dac3c8 set default plugin status in plugin.py instead of in the plugins 2013-01-16 12:28:38 +01:00
Dmitriy Marmyshev
ef947355c5 style fixing 2013-01-16 03:59:04 +04:00
Dmitriy Marmyshev
0c18fcad88 renaming varables 2013-01-16 02:17:55 +04:00
Andreas Preikschat
d6baae9f34 added test (not finished) 2013-01-15 23:01:15 +01:00
Andreas Preikschat
4da8580c4f removed import which shouldn't be there 
bzr-revno: 2146
 2013-01-15 23:00:12 +01:00
Andreas Preikschat
ed166ce2a6 fixed import 2013-01-15 22:52:26 +01:00
Arjan Schrijver
b6c6a7cd6d Fix line spacing 2013-01-15 22:29:56 +01:00
Andreas Preikschat
ca60c230ba r2144 + conflict 2013-01-15 22:26:45 +01:00
Tim Bentley
ca516061b5 Fix display focus for single screens 
bzr-revno: 2145
 2013-01-15 21:12:01 +00:00
Andreas Preikschat
2c2268a326 removed print statement 2013-01-15 00:43:39 +01:00
Andreas Preikschat
c58a6c801d don't overwrite build-ins 2013-01-15 00:31:02 +01:00
Andreas Preikschat
6cecfe0fb7 fixed settingsmanager bug; fixed translation bug 2013-01-15 00:26:51 +01:00
Patrick Zimmermann
5f04c934b1 Merge master. 2013-01-12 21:52:23 +01:00
Patrick Zimmermann
4af3798cd3 Fix a comment indentation. 2013-01-12 21:51:14 +01:00
Andreas Preikschat
aaafbdf2ea added ability to completely remove settings; docs 2013-01-12 10:01:58 +01:00
Andreas Preikschat
fa6703f307 fixed up remove_obsolete_settings method 2013-01-12 09:54:49 +01:00
Andreas Preikschat
cd343bd16c removed todo 2013-01-11 21:53:20 +01:00
Andreas Preikschat
095066cf19 add possibility to remove old_keys from the config 2013-01-11 21:44:30 +01:00
Dmitriy Marmyshev
024ba1aac9 Auto separating blank buttons, if width allows this. 
Fixes: https://launchpad.net/bugs/718797
 2013-01-12 00:23:06 +04:00
Andreas Preikschat
f1a8bad78e added blank lines 2013-01-11 20:36:28 +01:00
Andreas Preikschat
159e23d4c9 moved code to the top of the file 2013-01-11 20:25:57 +01:00
Andreas Preikschat
52830ee6ee changed variable names 2013-01-11 20:08:36 +01:00
Andreas Preikschat
49d61c2e59 change method name 2013-01-11 20:07:45 +01:00
Andreas Preikschat
4e2f673655 added docs 2013-01-11 19:55:42 +01:00
Andreas Preikschat
725bd7dcf6 fixed bug doing bad things 2013-01-11 19:51:45 +01:00
Tim Bentley
634246a493 set the focus to the maindisplay when it is updated. 
Fixes: https://launchpad.net/bugs/1097898
 2013-01-11 17:08:44 +00:00
Andreas Preikschat
75a86f05ee fixed removed plugin 2013-01-11 13:43:18 +01:00
Andreas Preikschat
0f042dde6f clean ups 2013-01-11 01:35:00 +01:00
Andreas Preikschat
91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat
2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Andreas Preikschat
6faf76ed5c change empty lines 2013-01-10 21:50:01 +01:00
Andreas Preikschat
98140f3598 added settings.py 2013-01-10 21:47:10 +01:00
Andreas Preikschat
2a816115bb pull in settings; renamed dict 2013-01-10 21:41:16 +01:00
Andreas Preikschat
af5995f2a1 moved shortcut settings to settings.py 2013-01-10 21:14:49 +01:00
Andreas Preikschat
306919d15f moved settings to own file 2013-01-10 20:54:45 +01:00
Andreas Preikschat
eb6bc6adbc started work to store setting in a (half) central place 2013-01-10 20:33:48 +01:00
Arjan Schrijver
2ce3f7d512 Make sure images use the configured background/border color when loaded from a saved service file 2013-01-10 11:22:01 +01:00
Tim Bentley
9f7725573d Fix tests 2013-01-09 19:56:16 +00:00
Dmitriy Marmyshev
daf1887ab9 HEAD 2013-01-09 20:12:31 +04:00
Dmitriy Marmyshev
30ea5fce9c Pause looping when blanking screen 2013-01-09 14:30:32 +04:00
Raoul Snyman
f738037d19 Change the way the version check works so that nightlies check a nightly file, dev releases a dev file, and stable releases a version file. 2013-01-08 22:44:56 +02:00
Jonathan Corwin
af541e4389 Fix import of settings. 
- QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

- Support the import of the 'players' section

- Change the setting group validation to skip those it doesn't know. Just test for an expected setting earlier instead. Also fix the error message.

bzr-revno: 2139
Fixes: https://launchpad.net/bugs/1094198
 2013-01-05 11:37:48 +00:00
Tim Bentley
7ee8d8c576 Fix crash on blank to desktop 2013-01-03 21:28:00 +00:00
Jonathan Corwin
794567b1ec Import %General, better error message, support 'players' section 2013-01-02 22:32:41 +00:00
Martin Zibricky
e7601fcea8 This fixes the related bug with QPyNullVariant 
bzr-revno: 2138
Fixes: https://launchpad.net/bugs/1095268
 2013-01-02 22:01:33 +00:00
Tim Bentley
feef9df575 Head 2013-01-02 21:50:45 +00:00
Tim Bentley
e03a265ba9 Style updates and more tests 2013-01-02 21:50:20 +00:00
Jonathan Corwin
38e580fbd7 Edit/save custom slide items in service files. 
bzr-revno: 2136
 2013-01-02 21:31:11 +00:00
Martin Zibricky
fee8ae78bb Fix bug #1095268 - issue with QPyNullVariant. 2013-01-02 12:26:21 +01:00
Patrick Zimmermann
33bad25104 Rename "workarounds" -> "display workarounds". 2013-01-01 21:03:12 +01:00
Patrick Zimmermann
cf9f55d5d2 Change blockSignals() to use True & False. Correct line length. 2013-01-01 14:38:36 +01:00
Dmitriy Marmyshev
df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley
174905b991 update tests 2012-12-30 22:10:51 +00:00
Tim Bentley
44a9f96c87 merge fixes 2012-12-30 19:49:48 +00:00
Tim Bentley
a235602acb Fix up auto start 2012-12-30 16:43:49 +00:00
Patrick Zimmermann
b5fe0139ea Merge master (including Settings() refactor). 2012-12-30 13:01:27 +01:00
Tim Bentley
e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Jonathan Corwin
4257ce2932 Attempt to load %General section, and just ignore those we don't know 2012-12-29 22:55:40 +00:00
Dmitriy Marmyshev
8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley
4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley
01de9a93df Capture key and mouse movements 2012-12-29 20:54:25 +00:00
Tim Bentley
9f28874eb5 Code fixes 2012-12-29 18:13:08 +00:00
Tim Bentley
4f2f6f73aa Completed core conversion 2012-12-29 15:25:29 +00:00
Tim Bentley
345b5638c8 Splash screen done 2012-12-29 13:35:16 +00:00
Tim Bentley
4b6292220a Main window done 2012-12-29 13:15:42 +00:00
Tim Bentley
2b6b6d5756 Start of ui 2012-12-29 09:35:24 +00:00
Jonathan Corwin
d814553924 Head + need fixings (forgot to commit head first, sorry) 2012-12-28 22:33:06 +00:00
Tim Bentley
ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat
df3a1bd100 tweaked language manager code 2012-12-27 22:56:53 +01:00
Andreas Preikschat
8fdbca8d89 fixed comment 2012-12-27 22:41:11 +01:00
Andreas Preikschat
e325affe10 fixed data path 2012-12-27 22:20:32 +01:00
Andreas Preikschat
863aa58656 final clean ups 2012-12-27 18:17:08 +01:00
Andreas Preikschat
0a57bed2f7 fixed setting import 2012-12-27 18:00:40 +01:00
Andreas Preikschat
cbd22b7141 fixed bug caused by merge 2012-12-27 17:46:27 +01:00
Andreas Preikschat
f1bdcec79d r2131 + conflicts 2012-12-27 17:33:38 +01:00
Andreas Preikschat
b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley
e54f4eec7b Interface unusable when run on XFce 2012-12-26 12:20:30 +00:00
Dmitriy Marmyshev
86d916509b deleted commented code 2012-12-26 00:22:41 +04:00
Tim Bentley
933925647b Fix unblocking of events 2012-12-24 21:04:52 +00:00
Jonathan Corwin
0092fc6960 Save any service text item as a custom slide 2012-12-23 00:00:24 +00:00
Tim Bentley
81640a9612 Fix media starting in wrong place 2012-12-21 19:19:26 +00:00
Tim Bentley
b1f80c96ea Fix media starting in wrong place 2012-12-21 19:11:00 +00:00
Andreas Preikschat
18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat
6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Arjan Schrijver
e574466ebb use unicode strings 2012-12-20 09:05:25 +01:00
Patrick Zimmermann
f156c37e90 Fix indentation. 2012-12-19 23:25:52 +01:00
Patrick Zimmermann
cf36197993 Rename stylesheetFix -> alternateRows. 2012-12-19 23:22:11 +01:00
Arjan Schrijver
e7787ddd2d fixed bug #1092121 'Interface unusable when run on XFce' 
Fixes: https://launchpad.net/bugs/1092121
 2012-12-19 17:26:53 +01:00
Dmitriy Marmyshev
3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev
770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Patrick Zimmermann
34bec28074 Merge master 2012-12-17 20:54:07 +01:00
Patrick Zimmermann
c9624ab378 Default stylesheet logic to true on Windows even without existing configuration. 2012-12-17 20:50:09 +01:00
Dmitriy Marmyshev
3e3911c133 Renamed varaibles by standard. 2012-12-16 20:45:38 +04:00
Tim Bentley
cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley
68ce73544a volume fixes 2012-12-13 18:55:11 +00:00
Patrick Zimmermann
e87fe82572 Add missing base_color. 2012-12-11 21:02:41 +01:00
Tim Bentley
0f0b8d04e7 Core Media to 120 2012-12-11 19:55:47 +00:00
Patrick Zimmermann
97ecefedff Correct an indentation. 2012-12-11 20:46:18 +01:00
Patrick Zimmermann
f239b2345d Move changes to new branch. 2012-12-11 00:35:53 +01:00
Tim Bentley
0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley
564b2e41ae Style Fixes 2012-12-10 06:15:42 +00:00
Tim Bentley
5a4a33b9b8 Updates 2012-12-09 20:57:41 +00:00
Tim Bentley
6748266fba Fix the setting for lite saves 2012-12-08 16:20:52 +00:00
Tim Bentley
5be9ba5b2c Cleanup Service Item Validation and start tests 2012-12-08 08:40:41 +00:00
Tim Bentley
d2d48da480 Cleanup ServiceItem 2012-12-07 21:57:35 +00:00
Jonathan Corwin
b03606b8a8 Transparent Theme fix 
bzr-revno: 2126
 2012-12-07 21:48:20 +00:00
Jonathan Corwin
33be405013 Transparent fix 2012-12-07 19:43:53 +00:00
Tim Bentley
f3cabebf79 Fix header 2012-12-07 19:04:13 +00:00
Tim Bentley
3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Tim Bentley
11276f6bba Ffix up icons 2012-12-07 18:56:33 +00:00
Tim Bentley
d6513f7c60 Fix blank / unblank bug 2012-12-07 17:47:32 +00:00
Jonathan Corwin
1c651abea2 Set css on specific widgets 2012-12-06 22:06:59 +00:00
Tim Bentley
0e980b6a98 resources for media 2012-12-06 19:26:50 +00:00
Andreas Preikschat
d18564f847 fixed missing arg method 2012-12-06 19:59:07 +01:00
Andreas Preikschat
7fa97b2cac fixed import order 2012-12-06 12:09:10 +01:00
Andreas Preikschat
e8178b2569 swap lines 2012-12-06 12:05:09 +01:00
Andreas Preikschat
1a80a243a8 removed not needed import 2012-12-06 12:03:27 +01:00
Tim Bentley
34275d0a5f Fix service save 2012-12-05 22:42:48 +00:00
Andreas Preikschat
cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat
6c1e303dbd fixed branch 2012-12-05 21:33:39 +01:00
Tim Bentley
ec314273b2 Move class to 120 line width 
bzr-revno: 2123
 2012-12-05 19:01:25 +00:00
Andreas Preikschat
9b1709963e Change defaults for display screen mouse hiding 
bzr-revno: 2122
 2012-12-05 06:13:34 +00:00
Andreas Preikschat
80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Tim Bentley
0c5430b925 Test 120 column diffs 2012-12-05 05:53:14 +00:00
Andreas Preikschat
fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Andreas Preikschat
c5f34a8637 'fixed' code (cough) 2012-12-04 22:22:08 +01:00
Tim Bentley
a1d3d002ef String fixes 2012-12-04 06:09:55 +00:00
Tim Bentley
fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley
b1c2cee003 Fix swf files 2012-12-03 19:18:28 +00:00
Andreas Preikschat
1ef6643e85 - when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 
bzr-revno: 2120
 2012-12-03 20:01:33 +01:00
Andreas Preikschat
ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley
580de0015f Fix background video 2012-12-02 08:06:08 +00:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
e9806f8e6b 2.0 head 2012-11-29 20:46:48 +00:00
Tim Bentley
2299290f5c fix stop 2012-11-29 20:46:16 +00:00
Tim Bentley
846d909dc3 Fix osz bug 2012-11-28 21:14:08 +00:00
Tim Bentley
cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley
d538a32f49 String clean ups 2012-11-24 08:01:10 +00:00
Tim Bentley
734c697fef Documentation 2012-11-24 07:24:30 +00:00
Tim Bentley
116c5b030f Fix media language Automatic 2012-11-22 22:02:40 +00:00
Tim Bentley
4eab1a6521 Head 2012-11-22 21:58:16 +00:00
Patrick Zimmermann
47d8bd7e5f Correct indentation. 2012-11-22 19:01:50 +01:00
Patrick Zimmermann
883a4baba3 Turn off alternating row colors on Windows. 2012-11-22 00:03:28 +01:00
Tim Bentley
6fd865635f Fix most of the review comments 2012-11-21 21:49:18 +00:00
Raoul Snyman
fed4a0adda Add additional media suffix to vlc 
bzr-revno: 2112
 2012-11-20 19:19:24 +00:00
Raoul Snyman
85920b2132 Added .m4v to list of allowed VLC extensions. 2012-11-20 15:04:46 +02:00
Tim Bentley
acadf89a34 Fix displayed preview 2012-11-18 07:56:12 +00:00
Tim Bentley
506fd80f89 Style cleanups 2012-11-17 07:59:25 +00:00
Tim Bentley
57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley
9eb3757c9f Stop indexing arrays with objects 2012-11-16 21:46:17 +00:00
Tim Bentley
fb558935ca guard against missing image files in themes 
Fixes: https://launchpad.net/bugs/1071170
 2012-11-16 19:15:36 +00:00
Dmitriy Marmyshev
2093d9829f Renamed varaibles by standard 2012-11-16 22:48:49 +04:00
Dmitriy Marmyshev
9bb9c6a629 Renamed varaibles by standard. 2012-11-16 21:06:52 +04:00
Dmitriy Marmyshev
2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Dmitriy Marmyshev
7780751807 all methods renamed by standard. 2012-11-13 12:32:09 +04:00
Dmitriy Marmyshev
4af902e74d Some fixes for autoplay 2012-11-13 12:11:49 +04:00
Tim Bentley
5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley
55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Raoul Snyman
e919c53434 Fix DB unit of work for updates 
Fix Bible identification code for BibleGateway

bzr-revno: 2109
 2012-11-11 17:25:09 +00:00
Raoul Snyman
b76be3d6b8 Fixed bug #1077654 where there were more classes in the CSS, but we were specifically looking for only one class. Made the code less brittle. 
Fixes: https://launchpad.net/bugs/1077654
 2012-11-11 18:09:23 +02:00
Erik Lundin
4c502dba9c Fixed the spelling of "Erik Lundin" 2012-11-10 21:09:09 +01:00
Tim Bentley
431a5fbb15 Fix from misalignment 2012-11-10 16:51:23 +00:00
Tim Bentley
69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Philip Ridout
e90af50fd6 Removes items with missing files prior to saving (after confirmation from user) 
bzr-revno: 2106
 2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev
d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley
47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Philip Ridout
0bc2e5b71e Simplified Validate Method 2012-11-07 21:10:38 +00:00
Tim Bentley
2295a74d5d Head 2104 - reverse some changes as not valid in this release 2012-11-07 18:47:56 +00:00
Martin Zibricky
72bb217749 This is the fix for playback with vlc on osx. It also includes fix to get media length without starting playback of a video. 
I tested it only on osx in one- and dual-screen setup so far.

Also controllersVisible is renamed to controlsVisible.

bzr-revno: 2104
 2012-11-07 18:42:21 +00:00
Tim Bentley
9e1e07c04c Head 2103 2012-11-07 18:41:07 +00:00
Philip Ridout
b47512254b fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 
bzr-revno: 2102
Fixes: https://launchpad.net/bugs/1066142
 2012-11-06 18:34:00 +00:00