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

9816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Zimmermann
a8041466ad Merge master. 2013-01-18 22:45:36 +01:00
Patrick Zimmermann
768b27101e Reverse option logic. Now it's "enable alternating row colors". 2013-01-18 22:41:11 +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
Raoul Snyman
5a008c3910 Some more code cleanups to raise our code score on CI. 2013-01-17 23:58:38 +02: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
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
Raoul Snyman
684fef9d8b Expand the version checking to include nightlies, development releases and stable releases. 
bzr-revno: 2144
 2013-01-15 22:12:10 +01:00
Tim Bentley
ca516061b5 Fix display focus for single screens 
bzr-revno: 2145
 2013-01-15 21:12:01 +00:00
Raoul Snyman
6ad518fa30 SIP version 2 rewrite broke automated test (Bug #1094346) 
bzr-revno: 2143
Fixes: https://launchpad.net/bugs/1094346
 2013-01-15 22:05:17 +01:00
Arjan Schrijver
eb9756389b check_dependencies.py fails on version numbers with letters (bug #1095699) 
bzr-revno: 2142
Fixes: https://launchpad.net/bugs/1095699
 2013-01-15 21:56:41 +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
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
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
1f436534d3 Head 2013-01-09 20:49:08 +00: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
Raoul Snyman
6531224cec Fix an erroneous and unused import in a test. 2013-01-08 08:20:49 +02:00
Raoul Snyman
da9f388c70 HEAD 2013-01-08 08:19:29 +02:00
Tim Bentley
14430e3a56 Final plugins to 120 line length 
bzr-revno: 2141
 2013-01-07 16:41:26 +00:00
Raoul Snyman
14bc31e446 Fix failing tests 
bzr-revno: 2140
 2013-01-07 16:40:26 +00:00
Raoul Snyman
69daaa3d5d Fix failing get_data_path_with_custom_location_test() 
Fix the test that fails after our upgrade to use SIP API version 2 and the changes to the Settings class. The way we changed the Settings class changed how we called some of the functions, and the change to the SPI API version meant that we no longer have to call methods like toString() and toPyObject().

Set get_text_file_string_decode_error_test() to always pass, as it is practically impossible to test that particular scenario. Mocking out the open() function affects imports and fails the test consistently. Perhaps we can come back to this test at a later stage.
 2013-01-07 14:05:19 +02:00
Raoul Snyman
e0e267086e HEAD 2013-01-07 13:28:55 +02:00
Arjan Schrijver
5a26443681 fixed bug #1095699 'check_dependencies.py fails on version numbers with letters' 
Fixes: https://launchpad.net/bugs/1095699
 2013-01-07 10:18:29 +01:00
Tim Bentley
a10e33918d Final 120 files 2013-01-06 17:25:49 +00:00
Tim Bentley
0e5a3aa045 More 120 cleanups 2013-01-05 22:17:30 +00:00
Tim Bentley
df7324693c Head 2013-01-05 19:52:43 +00: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
Jonathan Corwin
794567b1ec Import %General, better error message, support 'players' section 2013-01-02 22:32:41 +00:00
Tim Bentley
d6ad079a0b Head 2013-01-02 22:05:54 +00:00
Tim Bentley
b8ebf1d8a1 Fixes 2013-01-02 22:05:42 +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
Erik Lundin
a884bfdfee Fixed bug #841752 'song editor: increment verse number automatically'. 
bzr-revno: 2137
Fixes: https://launchpad.net/bugs/841752
 2013-01-02 21:32:49 +00:00
Jonathan Corwin
38e580fbd7 Edit/save custom slide items in service files. 
bzr-revno: 2136
 2013-01-02 21:31:11 +00:00
Tim Bentley
941b427fa6 Plugin cleanups 
bzr-revno: 2135
 2013-01-02 21:23:39 +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
Tim Bentley
f9bd71f3b3 Cleanup plugins 2013-01-01 16:33:41 +00:00
Patrick Zimmermann
cf9f55d5d2 Change blockSignals() to use True & False. Correct line length. 2013-01-01 14:38:36 +01:00
Erik Lundin
d0a0cddc96 HEAD 2013-01-01 04:25:43 +01:00
Tim Bentley
39be72c151 Another year passes by 
bzr-revno: 2134
 2012-12-31 06:47:17 +00:00
Patrick Zimmermann
b5fe0139ea Merge master (including Settings() refactor). 2012-12-30 13:01:27 +01: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
Tim Bentley
4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley
e1f8d06f54 Core migrated to 120 format 
bzr-revno: 2133
 2012-12-29 20:06:10 +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