Patrick Zimmermann
2f21ea2f46
Add can_shortcuts=True to menu entry action.
2013-02-28 23:01:05 +01:00
Patrick Zimmermann
9bcdb79e7b
Merge master.
2013-02-28 22:55:36 +01:00
Patrick Zimmermann
ab565ae3e9
Cosmetic comment fixes in testing functions.
2013-02-28 22:46:36 +01:00
Andreas Preikschat
6ab1cc3c4b
added mock to check_dependencies
2013-02-28 22:36:55 +01:00
Tim Bentley
5da93e1f15
Fix tests to work
2013-02-28 21:19:01 +00:00
Andreas Preikschat
40de8647cf
renamed general settings to core
...
Fixes: https://launchpad.net/bugs/1133237
2013-02-28 21:47:59 +01:00
phill-ridout
b61cfce03f
Started on test
2013-02-28 20:45:57 +00:00
Andreas Preikschat
43874d0090
fixed bug #902964 (Libreoffice deprecated commandline args)
...
Fixes: https://launchpad.net/bugs/902964
2013-02-28 20:55:33 +01:00
Andreas Preikschat
7feab25c3f
always log the exception
2013-02-28 15:43:14 +01:00
Andreas Preikschat
dfa2eb1afe
fixed exception form not shown
2013-02-28 15:15:17 +01:00
Andreas Preikschat
66a6502cdf
fixed bug #1116528 (Song Import Wizzard does not work in trunk)
...
Fixes: https://launchpad.net/bugs/1116528
2013-02-28 12:25:05 +01:00
Andreas Preikschat
469d8b05c4
- renamed a few variables
...
- fixed same short lines
- merged get_files method from SettingsManager into AppLocation
- added get_files test
- fixed actionList test
bzr-revno: 2192
2013-02-28 12:15:35 +01:00
Tim Bentley
8ddfd194c3
Remove unneeded tests
2013-02-28 05:45:34 +00:00
Tim Bentley
73aafdb62c
failing tests
2013-02-27 21:42:21 +00:00
Andreas Preikschat
e61d76ecff
fixed grammar
2013-02-27 22:40:55 +01:00
Tim Bentley
c564b05f36
Fix merge comments
2013-02-27 21:27:32 +00:00
Tim Bentley
e5c371feb5
Fix merge comments
2013-02-27 21:23:46 +00:00
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
Patrick Zimmermann
2cf15f3b69
Add a lot more test functions.
2013-02-21 00:29:54 +01:00
Tim Bentley
ffb10c0149
More cleanups of slide controller and friends
2013-02-20 20:43:20 +00:00