Commit Graph

765 Commits

Author SHA1 Message Date
Andreas Preikschat 6c7d608fbb fixed FTW regression 2013-03-28 21:05:46 +01:00
Tim Bentley 611dbdf044 Head 2013-03-19 17:53:51 +00:00
Tim Bentley 861e64ee83 plugin 1 2013-03-19 17:53:32 +00:00
Arjan Schrijver ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
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
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
Raoul Snyman 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
Raoul Snyman f4a2855094 Removed an unecessary variable. 2013-02-16 14:11:51 +02:00
Raoul Snyman a8fafc3363 HEAD 2013-02-16 14:01:10 +02:00
Raoul Snyman 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