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

3776 Commits

Author SHA1 Message Date
Tim Bentley 5f1db14ba4 Minor fixes 2013-03-10 20:35:14 +00:00
Tim Bentley 7d371228bc Config updates 2013-03-10 20:19:42 +00:00
Tim Bentley c62dab074e Basic Authentication now working 2013-03-08 19:15:49 +00:00
Tim Bentley 6bf07f9dce Head 2013-03-08 16:35:10 +00:00
Andreas Preikschat ca406df0a4 head 2013-03-08 09:14:39 +01:00
Raoul Snyman d6d1ecf616 Naming convention cleanups and a few merges from the upstream branch. 2013-03-07 23:04:19 +02:00
Tim Bentley 2464bef944 Head + conflicts 2013-03-07 18:22:38 +00:00
Andreas Preikschat 25919a34b2 fixed objectNames 2013-03-07 18:58:15 +01:00
Andreas Preikschat 7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +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 d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat 6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat 1031651db0 printform/dialog: code standards 2013-03-07 11:25:27 +01:00
Arjan Schrijver 68d034e877 Revert code shortening from lp:~googol/openlp/image_groups 2013-03-07 10:03:02 +01:00
Andreas Preikschat 99cdaa61ca fixed docs, and signals 2013-03-07 09:24:12 +01:00
Andreas Preikschat d2d34ed175 fixed display 2013-03-07 09:14:26 +01:00
Andreas Preikschat a27b251060 songimporters 2013-03-07 09:05:43 +01:00
Andreas Preikschat 33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Raoul Snyman e5c87ed6f2 HEAD 2013-03-07 08:47:43 +02:00
Andreas Preikschat 14b61cabf4 renamed canFolder 2013-03-07 00:00:57 +01:00
Andreas Preikschat e1f35e002a some media renames 2013-03-06 23:54:16 +01:00
Andreas Preikschat 1d9425c3b7 renamed videoBehindText 2013-03-06 23:50:49 +01:00
Andreas Preikschat 8383acf636 renamed isValid 2013-03-06 23:49:13 +01:00
Andreas Preikschat c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Andreas Preikschat 86efc5629c fixed formattigtagsform/dialog 2013-03-06 23:32:59 +01:00
Andreas Preikschat 1660fbf2f8 fixed formattigtagsform/dialog 2013-03-06 23:27:22 +01:00
Andreas Preikschat 8bb4c7e131 renamed serviceItem 2013-03-06 23:23:01 +01:00
Andreas Preikschat b864d360d3 r2201 2013-03-06 22:54:13 +01:00
Tim Bentley f1aadde13c Initial Cherrypy implementation 2013-03-06 21:53:29 +00:00
Tim Bentley ca920ff774 Merge issues 2013-03-06 21:49:46 +00:00
Tim Bentley 13f18e271b Fix review comments 2013-03-06 17:46:19 +00:00
Andreas Preikschat 555e38275a changed order 2013-03-05 18:12:40 +01:00
Tim Bentley 4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Andreas Preikschat 33db8e143b fixed maindisplay opening again 2013-03-05 18:08:15 +01:00
Andreas Preikschat 4625f1f3a1 fixed object names 2013-03-05 15:18:05 +01:00
Andreas Preikschat 11db599cb1 exception form: code standards 2013-03-05 15:14:37 +01:00
Andreas Preikschat 8fed2230d3 exception form: code standards 2013-03-05 15:05:19 +01:00
Andreas Preikschat 4f1933dcfe execptionform: code standards 2013-03-05 15:02:56 +01:00
Andreas Preikschat 5d68663c10 reverted maindisplay changes (avoid conflict) 2013-03-05 14:56:34 +01:00
Andreas Preikschat 6730d03373 fixed signal connecting 2013-03-05 14:55:50 +01:00
Andreas Preikschat 24bb3567ed r2198 2013-03-05 14:43:04 +01:00
Andreas Preikschat a835930990 renamed JS function 2013-03-05 11:36:41 +01:00
Andreas Preikschat a4f4ef0d7d r2198 2013-03-05 10:41:00 +01:00
Raoul Snyman e2c0ab3d8a HEAD 2013-03-05 08:25:16 +02:00
Raoul Snyman f1c2515502 HEAD 2013-03-04 22:40:28 +02:00
Andreas Preikschat 7c36d78ed8 r2197 2013-03-04 21:17:45 +01:00
Tim Bentley bb48e35c5f Fix theme load bug 2013-03-04 19:35:33 +00:00
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