Commit Graph

812 Commits

Author SHA1 Message Date
Arjan Schrijver
47c48618bc Fixed a traceback that occurred when calling critical_error_message_box and friends while the splashscreen is disabled in the settings. 2013-03-18 14:30:31 +01:00
Tim Bentley
5e6ec9d269 fix missed events 2013-03-17 20:40:47 +00:00
Tim Bentley
df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Arjan Schrijver
2cb47f6040 Merge HEAD 2013-03-14 12:39:04 +01:00
Tim Bentley
7efe1320fb Fix theme handling 2013-03-12 09:09:42 +00:00
Tim Bentley
46fe786f8b More fixes 2013-03-11 19:11:46 +00:00
Arjan Schrijver
043c35a985 Merge HEAD 2013-03-11 16:23:43 +01:00
Andreas Preikschat
ca406df0a4 head 2013-03-08 09:14:39 +01:00
Arjan Schrijver
52523224ec Merge HEAD 2013-03-07 12:23:52 +01:00
Andreas Preikschat
7e8b21b99f progress bar fix 2013-03-07 12:11:35 +01:00
Andreas Preikschat
6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Arjan Schrijver
68d034e877 Revert code shortening from lp:~googol/openlp/image_groups 2013-03-07 10:03:02 +01:00
Raoul Snyman
e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Tim Bentley
4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Raoul Snyman
e2c0ab3d8a HEAD 2013-03-05 08:25:16 +02:00
Tim Bentley
5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley
3a44717acf Head and conflict 2013-03-04 16:55:13 +00:00
Arjan Schrijver
91ad9ae9cc Merge HEAD 2013-03-04 14:48:42 +01:00
Arjan Schrijver
2561f995ac Fixed manual import of configuration file with a list of images 2013-03-04 14:37:19 +01:00
Raoul Snyman
6c1a0aa5e7 HEAD 2013-03-04 10:53:43 +02:00
Arjan Schrijver
97184a9ea1 Moved conversion code. Doesn't work yet. 2013-03-03 18:24:32 +01:00
Arjan Schrijver
c02098faa8 Merge HEAD 2013-03-03 17:53:33 +01:00
Tim Bentley
188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Andreas Preikschat
40de8647cf renamed general settings to core
Fixes: https://launchpad.net/bugs/1133237
2013-02-28 21:47:59 +01:00
Tim Bentley
26ba57456f Head + conflicts 2013-02-26 17:27:30 +00:00
Andreas Preikschat
5a5845ccd1 added commented line 2013-02-26 16:41:36 +01:00
Andreas Preikschat
25373944b2 started work on converting old image settings 2013-02-26 12:23:57 +01:00
Tim Bentley
0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Tim Bentley
20c3157d6d final fixes 2013-02-21 17:05:56 +00:00
Andreas Preikschat
8d164cd21e clean up 2013-02-20 08:02:48 +01:00
Tim Bentley
6d732cf3ba Cleanups 2013-02-19 19:50:14 +00:00
Andreas Preikschat
29194b5e1e fixed bug #1128376 (Configure shortcuts has two items called settings)
Fixes: https://launchpad.net/bugs/112837
2013-02-19 14:57:14 +01:00
Andreas Preikschat
20d687524a fixed missing items 2013-02-19 14:09:00 +01:00
Andreas Preikschat
38c2c2db5e make diff more readable 2013-02-19 10:33:07 +01:00
Andreas Preikschat
53f93d6342 r2187 + conflicts 2013-02-19 10:16:54 +01:00
Andreas Preikschat
781da422b6 started to remove forgotten shortcut kwargs 2013-02-19 10:13:49 +01:00
Tim Bentley
4b30d6cd29 Openup servicemanager again 2013-02-18 21:36:36 +00:00
74fc1d3988 HEAD 2013-02-18 23:05:08 +02:00
Tim Bentley
4cb0b33fca Cleanup pluginmanager 2013-02-18 20:57:14 +00:00
Tim Bentley
7b03764a4a code cleanups 2013-02-18 20:41:08 +00:00
Tim Bentley
e8b123925f Bootstrap cleanup 2013-02-18 19:59:35 +00:00
Tim Bentley
de6ce12092 Mark 1 2013-02-17 21:28:45 +00:00
Andreas Preikschat
480b666918 cleaned pluginmanager constructor 2013-02-17 13:57:52 +01:00
f4a2855094 Removed an unecessary variable. 2013-02-16 14:11:51 +02:00
a8fafc3363 HEAD 2013-02-16 14:01:10 +02:00
98311d9ad1 Add an interface test for the find_plugins method.
Not sure if this should be an interface test or a scenario test, but it does very little mocking, tries to let the bits of OpenLP run for real, and checks that all the plugins are imported.

Remove the superfluous argument to the find_plugins method.
2013-02-11 23:16:30 +02:00
1dacaf2487 HEAD 2013-02-11 21:52:07 +02:00
Tim Bentley
064a4bad20 Merge fixes 2013-02-10 16:05:52 +00:00
0f7f17f79c Various code cleanups.
- Renamed variables to python_style
- Renamed some functions to python_style
- PEP8 compliance cleanup
2013-02-10 12:39:28 +02:00
Andreas Preikschat
5739536d8c fixed more regression 2013-02-09 16:27:35 +01:00
Tim Bentley
3063526430 Fix problems with start up thread 2013-02-07 10:16:08 +00:00
Tim Bentley
c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Tim Bentley
fae34b1b4d Head + fix merge problems 2013-02-07 07:17:19 +00:00
Tim Bentley
1430559205 More Receiver to Registry migrations 2013-02-06 21:52:15 +00:00
Tim Bentley
eac2ce39b3 More Receiver removals 2013-02-05 21:42:15 +00:00
Andreas Preikschat
b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat
f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat
3df730db09 used += instead 2013-02-04 22:26:27 +01:00
Andreas Preikschat
9aa7cf7b29 r2169 + conflict 2013-02-04 22:07:38 +01:00
Tim Bentley
b7b19a4180 Fix up Registry function processing 2013-02-04 19:25:12 +00:00
Tim Bentley
ca5e46a2b1 Add test idea for the registry 2013-02-03 21:46:56 +00:00
Tim Bentley
a9a4c7938e Fix name and other bugs 2013-02-03 19:23:12 +00:00
Tim Bentley
28aeed815f Minor fixes 2013-02-03 17:42:31 +00:00
Tim Bentley
ad438ba4b2 Remove rogue print 2013-02-03 16:56:19 +00:00
Tim Bentley
b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Tim Bentley
123f460f7e Fix up Receiver code changes 2013-02-03 15:06:17 +00:00
12fc795c9c Fix up some issues caused by my refactor and some apparent merge conflict somewhere. 2013-02-03 16:40:48 +02:00
Tim Bentley
27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
327711d0ef HEAD 2013-02-02 23:16:42 +02:00
922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Tim Bentley
aa14303003 standards for thememanager and more Registry 2013-02-01 21:48:06 +00:00
Tim Bentley
4c26ff8f80 Cleaned up ServiceManager 2013-02-01 20:40:23 +00:00
439fc9b8f0 More cleanups 2013-02-01 22:36:27 +02:00
Andreas Preikschat
9bc317532c r2162 + conflict 2013-01-31 19:47:53 +01:00
Andreas Preikschat
16ba742d1d sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting 2013-01-31 08:56:34 +01:00
Tim Bentley
72920494a6 Head and merge fixes 2013-01-30 22:01:52 +00:00
Andreas Preikschat
d7472876c7 change wording 2013-01-30 21:34:54 +01:00
Andreas Preikschat
cc5776c7d3 fixed 'song/ccli number' setting; do not change setting.ini when IMPORTING 2013-01-30 21:29:33 +01:00
Andreas Preikschat
94be547550 removed not needed return 2013-01-30 19:29:10 +01:00
Andreas Preikschat
320b692db7 fixed lower case on some settings 2013-01-30 19:24:41 +01:00
Tim Bentley
bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley
1e3590a152 Clean up complete for now 2013-01-24 06:00:51 +00:00
Tim Bentley
e519e1b435 remove main window code in service manager 2013-01-23 21:47:23 +00:00
Tim Bentley
be6977a1a3 remove plugin helpers 2013-01-23 21:05:25 +00:00
Tim Bentley
aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley
76d259264d More cleanups 2013-01-23 19:53:40 +00:00
Tim Bentley
3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley
a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Andreas Preikschat
bee9c96b9a song export fixes 2013-01-18 22:24:25 +01:00
Andreas Preikschat
0fc9c4792f tweaked 'settings migrator' 2013-01-16 19:59:34 +01:00
Andreas Preikschat
15c96f8b87 fixed upper General 2013-01-16 13:26:17 +01:00
Andreas Preikschat
6cecfe0fb7 fixed settingsmanager bug; fixed translation bug 2013-01-15 00:26:51 +01:00
Andreas Preikschat
fa6703f307 fixed up remove_obsolete_settings method 2013-01-12 09:54:49 +01:00
Andreas Preikschat
095066cf19 add possibility to remove old_keys from the config 2013-01-11 21:44:30 +01: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
306919d15f moved settings to own file 2013-01-10 20:54:45 +01:00