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

5285 Commits

Author SHA1 Message Date
Andreas Preikschat
db00c5049a fixed missing unicode 2013-04-15 17:50:59 +02:00
Andreas Preikschat
908e048d1a head 2013-04-15 17:43:18 +02:00
Patrick Zimmermann
9220beba78 Pull preview_list_widget out into separate file. Not yet changed calls to this new class. 2013-04-14 23:38:40 +02:00
Meinert Jordan
571934e166 Fix Natural Sorting so works with Python3 
bzr-revno: 2230
 2013-04-14 19:19:33 +01:00
Tim Bentley
220681c900 Comment fixes 2013-04-14 16:59:57 +01:00
Andreas Preikschat
352d8da185 head 2013-04-08 20:24:46 +02:00
Tim Bentley
2345d59e6f Head 2013-04-08 17:53:26 +01:00
Tim Bentley
31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
Patrick Zimmermann
97c6899a31 Post merge fixups: Fix a typo in wizard.py, correct some camelCase -> under_score. 2013-04-06 13:53:00 +02:00
Patrick Zimmermann
974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Andreas Preikschat
69009970c0 replaced BeautifulSoup3 by BeautifulSoup4 2013-04-05 21:58:13 +02:00
Tim Bentley
e36706e3ec Head 2013-04-05 20:37:56 +01:00
Tim Bentley
fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
M2j
042bf4ed2d rename openlp.core.utils.get_local_key to openlp.core.utils.get_locale_key 2013-04-05 19:41:01 +02:00
Andreas Preikschat
07d6fa63c5 introduced constant 2013-04-05 15:41:42 +02:00
Andreas Preikschat
42f52cc300 Separate blank buttons don't hide on resizing (bug #1164925) 
Fixes: https://launchpad.net/bugs/1164925
 2013-04-05 12:50:10 +02:00
Andreas Preikschat
131b46edef - use QActionGroup instead of Checkboxes (Bug #1103906 'Auto Play Slides menu should use radioboxes') 
bzr-revno: 2227
Fixes: https://launchpad.net/bugs/1103906
 2013-04-05 11:04:38 +02:00
Raoul Snyman
9430e569f4 Fix one small issue with the songs upgrade scripts. 2013-04-04 10:02:47 +02:00
Raoul Snyman
d88e8a0b02 Migrated to Alembic (if you'll excuse the pun) 2013-04-03 21:46:41 +02:00
M2j
2598674d2a Add ICU version string to exception form. 2013-04-02 22:52:31 +02:00
Andreas Preikschat
ffb2350f62 fix *cough* 2013-04-02 19:42:01 +02:00
Andreas Preikschat
7f111b31a7 use unicode instead of QDateTime 2013-04-02 17:24:27 +02:00
Andreas Preikschat
5e3563ceda added two tests 2013-04-02 17:08:46 +02:00
Andreas Preikschat
e3afbefd27 use QDate instead of python datetime object 2013-04-02 16:42:33 +02:00
Andreas Preikschat
6c4b282d20 updated vly.pc 2013-04-02 09:32:58 +02:00
Andreas Preikschat
ceb175e372 head 2013-03-31 19:21:12 +02:00
Andreas Preikschat
29d7b3411e - fixed auto preview of next service item 
- added test

bzr-revno: 2225
 2013-03-31 19:13:56 +02:00
M2j
b3bb9bc0c0 Python 3 transition comment 2013-03-31 18:43:08 +02:00
M2j
8696db9f75 - use list compression in get_natural_key 
- define DIGIT_OR_NONDIGIT
 2013-03-31 18:30:22 +02:00
M2j
118f295204 Precompute the whole comparision key for song sorting. 2013-03-31 12:31:54 +02:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Andreas Preikschat
bbf2ad3b4b head + conflict 2013-03-30 10:53:01 +01:00
Andreas Preikschat
947c9a7346 removed old code 
bzr-revno: 2224
 2013-03-30 10:41:40 +01:00
Andreas Preikschat
8b4b7a6d0f use QActionGroup instead of checkboxes 
Fixes: https://launchpad.net/bugs/1103906
 2013-03-30 10:33:21 +01:00
Andreas Preikschat
d67a697e1e r2223 2013-03-30 09:49:19 +01:00
Andreas Preikschat
fd3cad1c7c r2223 2013-03-30 09:40:49 +01:00
Tim Bentley
efa7d8c8c0 minor fixes and move certificate location 2013-03-29 20:58:06 +00:00
Andreas Preikschat
2182f9c13c fixed short lines 2013-03-29 13:53:07 +01:00
Andreas Preikschat
a69323ea89 fixed auto preview of next service item 2013-03-29 13:40:04 +01:00
Tim Bentley
31847abf2a Head and confilicts 2013-03-29 08:25:33 +00:00
Tim Bentley
8cf886971c Refactor http server 2013-03-29 07:48:55 +00:00
Andreas Preikschat
a437ef0d3c r2219 2013-03-28 21:17:03 +01:00
Andreas Preikschat
4ffd25e1ae r2219 2013-03-28 21:16:16 +01:00
Andreas Preikschat
3b88c1341b removed broken code 2013-03-28 21:15:59 +01:00
Andreas Preikschat
85856cc717 head + conflict 2013-03-28 21:08:07 +01:00
Andreas Preikschat
6c7d608fbb fixed FTW regression 2013-03-28 21:05:46 +01:00
Andreas Preikschat
3fef841bb2 fixed FTW shown again 2013-03-26 12:45:18 +01:00
Andreas Preikschat
e708140d13 head 2013-03-26 12:35:29 +01:00
Andreas Preikschat
2f6a1a37a2 r2218 2013-03-26 12:15:55 +01:00
Andreas Preikschat
e6e9dec396 updated vlc.py 2013-03-26 12:15:31 +01:00
Tim Bentley
4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley
b3d453c9b8 More code cleanups and bug fixes from previous cleanups 
bzr-revno: 2218
 2013-03-26 07:48:38 +00:00
Tim Bentley
b9a5ee28a9 Fix missing string converstion 2013-03-26 07:34:42 +00:00
Andreas Preikschat
fa43759d8d more regression fixes 2013-03-25 08:27:54 +01:00
Andreas Preikschat
4283742081 fixed settingsTab rename 2013-03-25 08:13:40 +01:00
Tim Bentley
12058ebf8c fix typo 2013-03-23 07:45:08 +00:00
Tim Bentley
90d0d3c133 More updates 2013-03-23 07:28:24 +00:00
Tim Bentley
decdf96ce1 More update 2013-03-23 07:07:06 +00:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Andreas Preikschat
d77efd63d2 fixed double space 2013-03-22 21:35:59 +01:00
Andreas Preikschat
e6e57b6c03 updated comments and docs to 120 characters per line 2013-03-22 21:29:52 +01:00
Tim Bentley
729c93b70b More changes 2013-03-20 20:17:00 +00:00
Tim Bentley
79524dfbf4 Head + conflict 2013-03-20 19:38:20 +00:00
Tim Bentley
38ed9bdc35 missed bits 2013-03-20 18:35:28 +00:00
Arjan Schrijver
7237ad0c62 - Fixed small bug that removed the path from newly added media and presentations 
- Fixed keyboard shortcuts in images treeview
 2013-03-20 10:24:34 +01:00
Tim Bentley
90ac714c0d Mediamanageritem converted 2013-03-19 22:00:50 +00:00
Tim Bentley
f99e22fd4a Plugins 3 - global var removal 2013-03-19 20:05:13 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00: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
ce528140ae This branch implements the 'images groups' feature. It has the following features: 
- convert old 'images files' setting to SQLite database
- existing images are loaded as top-level items to minimize the change for users
- groups can be nested
- images can be moved between groups by drag&drop
- new images can be added directly to a group by drag&drop, or by clicking the 'Add images' button
- image groups can be used as service items with multiple images

bzr-revno: 2214
 2013-03-19 09:38:01 +02: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
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Raoul Snyman
a3f1769818 HEAD 2013-03-18 12:16:50 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
6ce33e0ec3 Settings cleanups and removal of config_updated 
bzr-revno: 2212
 2013-03-17 21:04:03 +00: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
9f8b236f90 With tests 2013-03-17 17:37:19 +00:00
Tim Bentley
af76c3f6b9 config_update removed 2013-03-17 09:21:18 +00:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00
Tim Bentley
04bc47cb52 All Tabs converted 2013-03-16 19:57:15 +00:00
Tim Bentley
19c05a7fc0 Half plugin tabs done 2013-03-16 16:59:10 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Andreas Preikschat
e35c11874c - fixed spelling 
- added vlc version to bug report

bzr-revno: 2211
 2013-03-15 11:40:00 +01:00
Tim Bentley
1c76353cba head 2013-03-15 08:40:16 +00:00
Raoul Snyman
1a37d306a9 More cleanups 2013-03-15 00:22:18 +02:00
Tim Bentley
8c7bfc2bb7 Head 2013-03-14 20:21:19 +00:00
Tim Bentley
9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Andreas Preikschat
eeb3061cce fixed spelling 2013-03-14 13:15:43 +01:00
Arjan Schrijver
2cb47f6040 Merge HEAD 2013-03-14 12:39:04 +01:00
Arjan Schrijver
5c15585413 Added more docstrings 2013-03-14 12:32:58 +01:00
Andreas Preikschat
59a06905fc added vlc version to exception form 2013-03-14 11:46:19 +01:00
Arjan Schrijver
441296d808 - Fixed cursor staying busy when adding images 
- Added documentation to methods
- Fixed traceback when adding media files
 2013-03-14 11:36:59 +01:00
Tim Bentley
919f86789f Head 2013-03-13 19:18:41 +00:00
Tim Bentley
669da85b2b Config cleanup and bug fixes from previous cleanups 
bzr-revno: 2209
 2013-03-13 19:08:44 +00:00
Andreas Preikschat
3a9e6c8ec0 do not continue when an invalid service is loaded 2013-03-13 14:43:28 +01:00
Andreas Preikschat
6c98df064f I/we figured out, that transitions which end/start at a opacity of 0.2 do not look fluent. When set to 0.1 the transition look smoother. 
bzr-revno: 2205
 2013-03-13 10:33:22 +01:00
Tim Bentley
7efe1320fb Fix theme handling 2013-03-12 09:09:42 +00:00
Andreas Preikschat
841549ad59 make transitions a bit more fluent 2013-03-12 10:00:22 +01:00
Andreas Preikschat
2d26110f22 fixed regression bugs 2013-03-12 09:00:48 +01:00
Tim Bentley
dcec6ebbac review corrections 2013-03-12 07:17:14 +00:00
Tim Bentley
5c79832bcc More updates to authentication 2013-03-11 21:00:00 +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
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
Andreas Preikschat
5acac7976c reduced overlap time; renamed variable 2013-03-09 15:46:57 +01:00
Andreas Preikschat
c016067a4f HEAD 2013-03-09 15:40:02 +01: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
7ee4d94e2e reverted indent change 2013-03-08 09:22:24 +01: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
3a33e1e6bf spelling 2013-03-07 17:35:08 +01:00
Andreas Preikschat
e19161e039 use loop video attribute; fixed regression prevent media adding 2013-03-07 16:05:17 +01:00
Andreas Preikschat
0c4df23a19 converted while to for loop 2013-03-07 14:44:19 +01:00
Andreas Preikschat
bf02c4af34 fixed short lines 2013-03-07 14:37:50 +01:00
Andreas Preikschat
5f67e4f149 removed not needed icon parameter 2013-03-07 14:14:31 +01:00
Andreas Preikschat
7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat
ceeaa0c359 renamed constant 2013-03-07 13:43:06 +01:00
Raoul Snyman
87212e5d1c More cleanups and more tests 2013-03-07 14:34:35 +02:00
Andreas Preikschat
a70ef917fc cleaned core/lib/init 2013-03-07 13:30:24 +01:00
Arjan Schrijver
52523224ec Merge HEAD 2013-03-07 12:23:52 +01:00
Andreas Preikschat
d916bad0c8 fixed bug (thanks to our tests) 2013-03-07 12:20:57 +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
Andreas Preikschat
b0f7e34271 log a warning, when a shortcut cannot be used 2013-03-07 11:07:02 +01:00
Arjan Schrijver
68d034e877 Revert code shortening from lp:~googol/openlp/image_groups 2013-03-07 10:03:02 +01:00
Andreas Preikschat
580baf76f4 fixed refactoring errors 2013-03-07 10:01:42 +01:00
Andreas Preikschat
cbb7de3928 spelltextedit: code standards 2013-03-07 09:58:12 +01:00
Andreas Preikschat
32ab855eb1 changed a few signals 2013-03-07 09:52:58 +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
0eaa3aa5f4 renamed forgotten methods 2013-03-06 23:11:30 +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
d4a41180cf updated doc 2013-03-06 14:21:27 +01:00
Patrick Zimmermann
d390fff811 Merge trunk. 2013-03-05 20:55:20 +01: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
fee7797be1 removed not needed --webkit-transition 2013-03-05 11:32:20 +01:00
Andreas Preikschat
02335f6ef6 added comment 2013-03-05 11:09:15 +01:00
Andreas Preikschat
31abd72474 minimize the time 'nothing' is shown on the screen 2013-03-05 11:02:41 +01:00
Andreas Preikschat
a4f4ef0d7d r2198 2013-03-05 10:41:00 +01:00
Andreas Preikschat
92a0d5d7ab make transition a little faster 2013-03-05 10:40: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
b7448518d2 renamed variable/function 2013-03-04 12:04:15 +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
Tim Bentley
07a1dc9485 - Implementation of a two phase bootstrap. 
- Some minor code cleanups as well.
- Removed unneeded tests

bzr-revno: 2197
 2013-03-04 11:32:05 +01:00
Andreas Preikschat
f52f4fac26 - fixed bug #902964 (Libreoffice deprecated commandline args) 
bzr-revno: 2196
Fixes: https://launchpad.net/bugs/902964
 2013-03-04 11:23:43 +01:00
Raoul Snyman
6c1a0aa5e7 HEAD 2013-03-04 10:53:43 +02:00
Arjan Schrijver
a5e6cc358b Moved initial images list conversion to app_startup 2013-03-03 20:35:11 +01: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
Andreas Preikschat
c2794b6355 test new libreoffice arg 2013-03-02 10:30:36 +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