Commit Graph

9776 Commits

Author SHA1 Message Date
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
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
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
Tim Bentley
f9bd71f3b3 Cleanup plugins 2013-01-01 16:33:41 +00: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
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
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
54b9dfc01c Remove .replaceServiceItem call which doesn't appear to do what I thought it did 2012-12-28 23:19:42 +00:00
Jonathan Corwin
d1eca2d4c4 Missed a QVariant 2012-12-28 22:46:27 +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
Tim Bentley
ef24580493 Head 2012-12-28 20:32:52 +00:00
Andreas Preikschat
11310511ab QString and QVariant auto-conversion (bug #779201)
bzr-revno: 2132
Fixes: https://launchpad.net/bugs/779201
2012-12-28 21:15:56 +01:00
Andreas Preikschat
e92deb94d2 fixed presentation bug (bug #1094340)
Fixes: https://launchpad.net/bugs/1094340
2012-12-28 21:03:59 +01:00
Arjan Schrijver
29a27d029c Fix display to work with XFCE correctly
Fixes: https://launchpad.net/bugs/1092121
2012-12-28 07:13:02 +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
be2c62baf4 fixed song import 2012-12-27 18:06:11 +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
Tim Bentley
2d12dbec76 Fix media seek sliders from starting at wrong position 2012-12-24 20:18:14 +00:00
Erik Lundin
fd3898282c HEAD 2012-12-24 02:39:40 +01:00
Jonathan Corwin
35d4cb2590 Ability to editexisting customs in saved service 2012-12-23 19:56:19 +00:00
Jonathan Corwin
0092fc6960 Save any service text item as a custom slide 2012-12-23 00:00:24 +00:00
Jonathan Corwin
9f5c5f7133 Add missing customs in service to media manager 2012-12-22 22:40:58 +00:00
Arjan Schrijver
38a9641b16 Fix bug #1092121: Interface unusable when run on XFce
bzr-revno: 2131
Fixes: https://launchpad.net/bugs/1092121
2012-12-23 00:30:25 +02:00
Erik Lundin
9366872c37 HEAD 2012-12-22 17:41:41 +01:00
Meinert Jordan
d007aae886 Minor fix for initial disabling of up and down arrow.
bzr-revno: 2130
2012-12-21 19:29:01 +00:00
Meinert Jordan
f9f6fe950f Minor fix for initial disabling of up and down arrow. 2012-12-21 19:27:27 +00:00
Tim Bentley
81640a9612 Fix media starting in wrong place 2012-12-21 19:19:26 +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