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

3778 Commits

Author SHA1 Message Date
Andreas Preikschat
2ed067ea0c enable OpenGL again 2013-03-04 20:22:43 +01:00
Andreas Preikschat
6d66e6b957 fixed preview 2013-03-04 20:14:36 +01:00
Tim Bentley
5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley
847eb4d910 remove print 2013-03-04 16:56:41 +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
Andreas Preikschat
ac50ae1553 head 2013-03-04 11:55:02 +01:00
Andreas Preikschat
557c90129a started to work on transitions 2013-03-04 11:52:38 +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
73fb71b4ce Head + conflicts 2013-03-01 17:45:17 +00:00
Tim Bentley
188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Tim Bentley
83fe10361a For minor fixes 2013-03-01 17:29:09 +00:00
Andreas Preikschat
3a9908345a fileRenameForm/Dialog: code standards 2013-03-01 12:12:23 +01:00
Andreas Preikschat
9add95d2a5 aboutform: code standards 2013-03-01 12:02:18 +01:00
Andreas Preikschat
1fe2e31c1d aboutform/dialog: code standards 2013-03-01 12:01:14 +01:00
Andreas Preikschat
1ef6cde4e4 fixed short lines; some other trivial fixes 2013-03-01 10:20:26 +01:00
Andreas Preikschat
2c02420bee fixed AttributErrors (regressio) 2013-03-01 09:38:25 +01:00
Andreas Preikschat
40de8647cf renamed general settings to core 
Fixes: https://launchpad.net/bugs/1133237
 2013-02-28 21:47:59 +01:00
Andreas Preikschat
25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +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
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
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
Raoul Snyman
fe0f4d74b2 HEAD 2013-02-21 10:54:37 +02: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
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
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
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
0f44fb3dd5 added actions test file (not started yet); fixed short lines 2013-02-19 13:53:24 +01:00
Andreas Preikschat
ca23aedb5d fixed shortcut dialog 2013-02-19 11:50:36 +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
Andreas Preikschat
fe11fd9365 r2187 2013-02-19 08:21:39 +01:00
Andreas Preikschat
cc97b4d127 updated vlc.py 2013-02-19 08:16:56 +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
89b7083a69 Head 2013-02-18 20:40:40 +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
Andreas Preikschat
73cce9ad13 r2182 2013-02-16 19:50:55 +01:00
Tim Bentley
8dc7c6ae65 Head 2013-02-16 13:25:18 +00:00
Tim Bentley
310f6032ed tidy ups 2013-02-16 13:24:56 +00:00
Andreas Preikschat
a20f309824 r2181 2013-02-16 13:44:47 +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
Tim Bentley
616684d9ad Merge and fixes 2013-02-16 10:40:05 +00:00
Philip Ridout
53beeed257 Fix bug #1067251: Correct focus of theme manager's dialogs 
- Fix a bug where the line edit in certain dialogs was not focused on show.
- Add a test

bzr-revno: 2177
Fixes: https://launchpad.net/bugs/1067251
 2013-02-15 21:24:01 +02:00
Tim Bentley
c6ad115b10 More Signal removals 2013-02-14 21:50:10 +00:00
Tim Bentley
bd0ff619a9 Clean up settings and alerts 2013-02-14 21:31:17 +00: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
Raoul Snyman
1dacaf2487 HEAD 2013-02-11 21:52:07 +02:00
Andreas Preikschat
6eba926a70 improved hide menu behaviour 2013-02-10 20:08:37 +01:00
Tim Bentley
159e14c987 Head 2013-02-10 16:10:32 +00:00
Andreas Preikschat
203eb315b7 Fixed regression in theme manager / first time wizard 
bzr-revno: 2175
 2013-02-10 16:10:08 +00:00
Tim Bentley
064a4bad20 Merge fixes 2013-02-10 16:05:52 +00:00
Andreas Preikschat
8bb88f3c9f fixed bug 1112587 
Fixes: https://launchpad.net/bugs/1112587
 2013-02-10 13:29:42 +01:00
Raoul Snyman
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
Tim Bentley
f9dc608984 Review fixes 2013-02-09 17:13:27 +00:00
Andreas Preikschat
5739536d8c fixed more regression 2013-02-09 16:27:35 +01:00
Andreas Preikschat
b0065d808c removed not needed call 2013-02-09 15:45:07 +01:00
Andreas Preikschat
d6128a4f06 fixed first time wizard 2013-02-09 15:13:38 +01:00
phill-ridout
589d335d39 Changed filerenamefor to registry. 
Started on test for filerenameform
 2013-02-07 21:55:22 +00:00
Tim Bentley
d1f7900ed4 fixes 2013-02-07 21:50:25 +00:00
Andreas Preikschat
28ea251866 fixed servicemanager bugs preventing saving/opening a service 2013-02-07 19:00:40 +01:00
Tim Bentley
cae39247d9 Final cleanup of variables 2013-02-07 11:33:47 +00: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
phill-ridout
6e17ff9d9e Set lineEdit focus when displaying form 2013-02-05 19:57:08 +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
86912ec2c3 removed not needed imports; removed not needed script 2013-02-04 22:22:12 +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
084da9c1bd Minor fixes 2013-02-03 16:44:03 +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
Raoul Snyman
12fc795c9c Fix up some issues caused by my refactor and some apparent merge conflict somewhere. 2013-02-03 16:40:48 +02:00
Raoul Snyman
00039fbdef Removed an accidental commit 2013-02-03 15:31:05 +02:00
Tim Bentley
27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman
327711d0ef HEAD 2013-02-02 23:16:42 +02:00
Raoul Snyman
922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Tim Bentley
e61bb30d75 missed one 2013-02-02 20:21:14 +00:00
Raoul Snyman
2f8bc1e2bb More cleanups 2013-02-02 22:18:34 +02:00
Tim Bentley
4f2b21ddfa Fix review comments 2013-02-02 19:49:56 +00:00
Raoul Snyman
b0d96aa932 HEAD 2013-02-02 20:43:34 +02:00
Tim Bentley
42ff12dc48 more tweeks 2013-02-02 07:34:42 +00:00
Tim Bentley
345b0fcd12 Fix up merge request issues 2013-02-02 07:08:28 +00:00
Raoul Snyman
e25326512d Now all the media players are looking better 2013-02-02 08:32:29 +02:00
Tim Bentley
8c0144d1fc Merge errors 2013-02-01 22:14:30 +00:00
Tim Bentley
aa14303003 standards for thememanager and more Registry 2013-02-01 21:48:06 +00:00
Raoul Snyman
c891edc40c Last of the dialogs 2013-02-01 23:34:23 +02:00
Raoul Snyman
4bd77075f3 Slowly making progress. 2013-02-01 22:52:42 +02:00
Tim Bentley
4c26ff8f80 Cleaned up ServiceManager 2013-02-01 20:40:23 +00:00
Raoul Snyman
439fc9b8f0 More cleanups 2013-02-01 22:36:27 +02:00
Tim Bentley
3b6f897f6e Cleanup Advance Tab 2013-02-01 20:09:47 +00:00
Raoul Snyman
18034a2f6a Linting cleanups. 2013-02-01 21:58:18 +02:00
Andreas Preikschat
9d2fc38717 r2164 + conflict 2013-01-31 20:22:56 +01:00
Patrick Zimmermann
27a6fbdc86 Proper fix for line striping with config setting 
bzr-revno: 2164
 2013-01-31 19:09:52 +00:00
Dmitriy Marmyshev
235d1c8b79 Make slide controller buttons width aware 
bzr-revno: 2163
 2013-01-31 19:06:53 +00: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
Patrick Zimmermann
bc93e5e3e2 Merge trunk. 2013-01-31 00:31:57 +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
Andreas Preikschat
6822834c86 r2160 2013-01-30 18:56:00 +01:00
Tim Bentley
0a1f91af8b Review fixes 2013-01-29 17:19:19 +00:00
Patrick Zimmermann
cd89c4de9a Enable -> Use and British spelling. 2013-01-27 23:10:03 +01:00
Patrick Zimmermann
6e1f9cd3c1 Adapt code for new Settings() infrastructure. 2013-01-27 23:07:30 +01:00
Patrick Zimmermann
85810cc7f5 Merge master. 2013-01-27 22:55:24 +01:00
Tim Bentley
80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley
91a959a490 More name cleanups 2013-01-27 10:18:06 +00:00
Tim Bentley
eb3e5b8642 Remote Edit cleanup and simplification 2013-01-27 09:57:03 +00:00
Tim Bentley
bdb9089409 Cleanup ServiceManager code 2013-01-27 07:36:04 +00:00
Tim Bentley
183c0c700d More Registry cleanups and bug fixes 2013-01-26 07:39:07 +00:00
Tim Bentley
96afb2a737 Fix tests so they work better. Pylint fixes and bug fixex 2013-01-25 20:50:18 +00:00
Tim Bentley
c0aca32660 Head 2013-01-24 20:08:52 +00:00
Tim Bentley
34b4d5c97e Add ability for media to use the slider to see time and set position. 
More Tests
Fix pylint issues

bzr-revno: 2159
 2013-01-24 20:03:54 +00:00
Andreas Preikschat
2f69520db8 - fixed traceback in service manager 2013-01-24 10:18:38 +01:00
Tim Bentley
1e3590a152 Clean up complete for now 2013-01-24 06:00:51 +00:00
Dmitriy Marmyshev
6e92547398 styling fix 2013-01-24 07:07:41 +04:00
Tim Bentley
e519e1b435 remove main window code in service manager 2013-01-23 21:47:23 +00:00
Andreas Preikschat
7efb44b219 fixed traceback 2013-01-23 22:18:38 +01: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
9a107e627b Head 2013-01-23 19:53:02 +00:00
Tim Bentley
3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley
064ca583ca Live and Preview Moved 2013-01-22 21:25:16 +00:00
Tim Bentley
a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Tim Bentley
59bb9efdf3 demo of singleton 2013-01-21 20:56:27 +00:00
Andreas Preikschat
d0c9c35deb r2154 + fixed trunk 2013-01-21 20:47:53 +01:00
Tim Bentley
895215715c Move text changes 2013-01-21 17:22:10 +00:00
Tim Bentley
aabc55b4dd For code cleanups 2013-01-21 11:11:47 +00:00
Tim Bentley
4224d8befe Spelling 2013-01-21 07:34:50 +00:00
Tim Bentley
b04a6bba79 Code tidy ups to make pylint happier 2013-01-21 07:29:43 +00:00
Tim Bentley
a54d02f81c Fix merges 2013-01-21 06:52:55 +00:00
Tim Bentley
5f6e9f7c28 Fix more tests 2013-01-21 06:46:38 +00:00
Dmitriy Marmyshev
a20c077698 Add Autoplay feature to Service items and Service Manager 
bzr-revno: 2152
 2013-01-21 06:45:00 +00:00
Andreas Preikschat
e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Andreas Preikschat
aef944dc8e removed not used imports 
bzr-revno: 2151
 2013-01-20 13:14:34 +01:00
Tim Bentley
d4db88d2a4 More Service item tests 2013-01-20 10:01:51 +00:00
Tim Bentley
4224e2441a Lets use the value as it has been set 2013-01-19 13:46:28 +00:00
Tim Bentley
47d391457c Head 2013-01-19 12:51:29 +00:00
Tim Bentley
edb7660bc0 Fix rougue events being generated 2013-01-19 12:50:52 +00:00
Andreas Preikschat
b91177f00b removed not needed imports 2013-01-19 00:31:02 +01:00
Patrick Zimmermann
a8041466ad Merge master. 2013-01-18 22:45:36 +01:00
Patrick Zimmermann
768b27101e Reverse option logic. Now it's "enable alternating row colors". 2013-01-18 22:41:11 +01:00
Andreas Preikschat
3bf4f401b1 r2148 2013-01-18 22:36:15 +01:00
Andreas Preikschat
bee9c96b9a song export fixes 2013-01-18 22:24:25 +01:00
Andreas Preikschat
6f3f9ce0ea fixed screen default values (-1 is also allowed as x,y); fixed syntax 2013-01-18 22:06:09 +01:00
Andreas Preikschat
2b38081b47 cough 2013-01-18 21:55:03 +01:00
Andreas Preikschat
bf4c1dafb4 fixed up wizard 2013-01-18 21:35:30 +01:00
Dmitriy Marmyshev
e3e8693bcc name fix 2013-01-18 23:00:13 +04:00
Andreas Preikschat
e55b6ce78e removed set_last_dir and get_last_dir methods 2013-01-17 23:14:06 +01:00
Dmitriy Marmyshev
5ce7ceafed fixed varaibles 2013-01-17 17:09:46 +04:00
Raoul Snyman
88272a3a6a A couple of small code cleanups to raise our code score on CI. 2013-01-16 23:03:01 +02:00
Tim Bentley
9d8fc508b0 Head 2013-01-16 19:37:11 +00:00
Tim Bentley
f2ef685cf1 tidy ups 2013-01-16 19:35:44 +00: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
c29bbd3ca0 r2146 2013-01-16 12:29:19 +01:00
Dmitriy Marmyshev
ef947355c5 style fixing 2013-01-16 03:59:04 +04:00
Dmitriy Marmyshev
0c18fcad88 renaming varables 2013-01-16 02:17:55 +04:00