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

10597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Bentley
b96304253e Fix merge comments 2013-02-27 21:11:43 +00:00
Andreas Preikschat
5cad5d5435 Merged lp:~googol/openlp/image_groups 2013-02-27 17:12:00 +01:00
Andreas Preikschat
c3e01dd719 fixed docs 2013-02-27 14:01:42 +01:00
Andreas Preikschat
20e26e7ea1 attempt to fix test; naming errors 2013-02-27 13:41:04 +01:00
Andreas Preikschat
51eb93fe75 added test 2013-02-27 13:03:17 +01:00
Andreas Preikschat
25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +01:00
Andreas Preikschat
5b6f6ddee1 removed not needed lines 2013-02-27 12:31:06 +01:00
Andreas Preikschat
0f8836ac54 removed not needed imports 2013-02-27 12:29:24 +01:00
Andreas Preikschat
4d1d912aaa merged settingsmanager with applocation; moved applocation 2013-02-27 12:24:50 +01:00
Andreas Preikschat
00451ebfe0 moved SettingsManager 2013-02-27 12:04:05 +01:00
Tim Bentley
26ba57456f Head + conflicts 2013-02-26 17:27:30 +00:00
Andreas Preikschat
7b0b14f962 Central Settings clean-up and tidy up 
bzr-revno: 2191
 2013-02-26 17:20:32 +00:00
Andreas Preikschat
5a5845ccd1 added commented line 2013-02-26 16:41:36 +01:00
Andreas Preikschat
78d7dacd4b clean up 2013-02-26 16:39:39 +01:00
Andreas Preikschat
25373944b2 started work on converting old image settings 2013-02-26 12:23:57 +01:00
Andreas Preikschat
31f28a7570 fixed same short lines 2013-02-24 19:13:50 +01:00
Andreas Preikschat
44ebc1fe27 Update vendor vlc.py 
bzr-revno: 2190
 2013-02-22 17:22:47 +00:00
Tim Bentley
8c29f8d4e5 minor changes 2013-02-22 07:15:07 +00:00
Tim Bentley
0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Andreas Preikschat
db2b4ccd61 head + conflicts 2013-02-21 22:26:24 +01:00
Tim Bentley
fb466d25a2 Head 2013-02-21 21:21:33 +00:00
Tim Bentley
3b9fe00e0a Add tests for Settings, Clean up Alerts and SongUsage plugins, More Event conversions (UI's). 
bzr-revno: 2189
 2013-02-21 21:19:59 +00:00
Tim Bentley
d0f36bb2e3 Head 2013-02-21 21:18:39 +00:00
Tim Bentley
4bc2c301e2 Stage renames 2013-02-21 21:18:26 +00:00
Tim Bentley
2516417ee5 fix conflict 2013-02-21 19:16:05 +00:00
Tim Bentley
197a423c29 fix cursor busy off 2013-02-21 17:30:18 +00:00
Tim Bentley
20c3157d6d final fixes 2013-02-21 17:05:56 +00:00
Tim Bentley
d6274d817a fix tests 2013-02-21 14:23:33 +00:00
Raoul Snyman
fe0f4d74b2 HEAD 2013-02-21 10:54:37 +02:00
Raoul Snyman
59a694b24c Add another few tests 2013-02-21 10:54:16 +02:00
Tim Bentley
3da378a7b7 Fixes 2013-02-21 07:33:21 +00:00
Tim Bentley
ffb10c0149 More cleanups of slide controller and friends 2013-02-20 20:43:20 +00:00
Tim Bentley
ad7d78ff26 More cleanups 2013-02-20 19:31:51 +00:00
Andreas Preikschat
c8a84969cc fixed log verbosity 2013-02-20 10:03:53 +01:00
Andreas Preikschat
cfc1b5f84d sorted entries; fix 2013-02-20 09:15:34 +01:00
Andreas Preikschat
477f5cefd0 renamed actions 2013-02-20 08:35:55 +01:00
Andreas Preikschat
26599b0f73 clean up 2013-02-20 08:29:03 +01:00
Andreas Preikschat
b6efe5393d do not react on ESC/Enter/Return event when closing the dialog 2013-02-20 08:27:51 +01:00
Andreas Preikschat
8d164cd21e clean up 2013-02-20 08:02:48 +01:00
Andreas Preikschat
4e3a4f1e59 changed doc for can_shortcuts 2013-02-20 07:45:00 +01:00
Andreas Preikschat
d84ccff2f3 Fix bug #1112587 ('Display verses on live tool bar' ignored); improve hide menu behaviour when resizing 
bzr-revno: 2188
Fixes: https://launchpad.net/bugs/1112587
 2013-02-20 08:19:01 +02:00
Tim Bentley
5ca6d36935 Clean up custom plugin 2013-02-19 21:23:56 +00:00
Tim Bentley
6d732cf3ba Cleanups 2013-02-19 19:50:14 +00:00
Andreas Preikschat
c2b5c65756 fixed up _is_shortcut_available method 2013-02-19 19:36:43 +01:00
Andreas Preikschat
269e5f5901 added actionList tests; removed useless test 2013-02-19 19:29:32 +01:00
Tim Bentley
b9a0458200 Minor updates 2013-02-19 18:27:17 +00:00
Raoul Snyman
9f70bf8e30 Write some more tests, and fix some potential bugs. 2013-02-19 16:07:34 +02:00
Andreas Preikschat
d30cc33f86 fixed bug #1128376 (Configure shortcuts has two items called settings) 
Fixes: https://launchpad.net/bugs/1128376
 2013-02-19 15:02:04 +01: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