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

6207 Commits

Author SHA1 Message Date
Patrick Zimmermann
145a1aedcb Add some docstrings and rename some methods for clarity. 2013-04-23 19:12:08 +02:00
Andreas Preikschat
ba261e76e5 - ported code to beautifulsoup 4 
- moved regular expressions to the top
- fixed regression

bzr-revno: 2238
 2013-04-23 18:56:23 +02:00
Patrick Zimmermann
1c2a5b5156 Merge trunk. 2013-04-22 23:02:12 +02:00
Patrick Zimmermann
823e7b1ec0 Change a line back to trunk state. 2013-04-22 22:51:33 +02:00
Tim Bentley
581c83e70d Final tidyups 2013-04-21 16:53:51 +01:00
Tim Bentley
2965271ada and more 2013-04-21 08:26:45 +01:00
Tim Bentley
02b1f7b78b and more 2013-04-21 08:21:29 +01:00
Tim Bentley
34180112be Fix Core from abend 2013-04-21 08:06:25 +01:00
Andreas Preikschat
4063de2700 head 2013-04-20 22:34:46 +02:00
Andreas Preikschat
3f60c34440 head 2013-04-20 22:30:51 +02:00
Andreas Preikschat
3dd05a2f4d head 2013-04-20 22:25:06 +02:00
Andreas Preikschat
ab9e0d7ba2 - removed General section and introduced a Core section 
- added test

bzr-revno: 2234
Fixes: https://launchpad.net/bugs/1133237
 2013-04-20 22:19:53 +02:00
Andreas Preikschat
76799d931e head 2013-04-20 19:37:06 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02:00
Patrick Zimmermann
1c31940650 Merge trunk. 2013-04-18 23:17:14 +02:00
Patrick Zimmermann
2b9a13ff97 Clean up PreviewWidget interface a little more. 2013-04-18 22:50:02 +02:00
Patrick Zimmermann
25db18d34c Use inheritance instead of composition. Some interface cleanup. 2013-04-18 22:15:44 +02:00
Patrick Zimmermann
9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Andreas Preikschat
098d733ad1 bible renamings 2013-04-18 19:45:14 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Andreas Preikschat
d002cb383e renaming 2013-04-18 11:27:11 +02:00
Patrick Zimmermann
d687288336 Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item. 2013-04-16 23:42:23 +02:00
Andreas Preikschat
1b447c4590 reoved whitespace 2013-04-16 19:54:40 +02:00
Andreas Preikschat
01a0ad3618 added whitespace to avoid conflict 2013-04-16 19:48:42 +02:00
Patrick Zimmermann
1bbf52c7bf Fix a logic error, an array index border was wrong. 2013-04-16 19:34:07 +02:00
Patrick Zimmermann
e4d3d8d6d2 Rename a slideno -> row for more consistency. 2013-04-16 19:33:36 +02:00
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +01:00
Andreas Preikschat
140178a674 added code back which should not be removed in this proposal 2013-04-16 17:55:23 +02:00
Patrick Zimmermann
0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
Andreas Preikschat
8d5aaa927d removed import from gui 2013-04-15 23:31:04 +02:00
Andreas Preikschat
b3d4be1a44 removed sqlite from exception form 2013-04-15 23:15:29 +02:00
Andreas Preikschat
ab3ee9768b remove bzrlib 2013-04-15 23:04:49 +02:00
Patrick Zimmermann
fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Patrick Zimmermann
0dbda9ee21 Accidentially removed image load logic. Readded. 2013-04-15 19:26:18 +02:00
Patrick Zimmermann
3609d2e0e1 Switch over to PreviewListWidget class. Untested. 2013-04-15 19:12:47 +02:00
Patrick Zimmermann
379a27212c Clean up preview widget interface a little. 2013-04-15 18:33:50 +02:00
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
Andreas Preikschat
4bb4cd080a r2230 2013-04-14 21:51:35 +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
Dmitriy Marmyshev
ce807f57b6 returned old code 2013-04-12 19:12:20 +04: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
Dmitriy Marmyshev
eca016c21d Added capability to edit title of service_item 2013-04-08 09:03:55 +04: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
Dmitriy Marmyshev
637cb09e74 removed commented code 2013-04-05 19:13:00 +04: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
d0cbe5a56a r2227 2013-04-05 11:05:39 +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
Andreas Preikschat
0fbbf29cfa added pickle fixme 2013-04-04 13:54:19 +02:00
Andreas Preikschat
3e53ea9376 fixed formatting tags rename error 2013-04-04 13:18:49 +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
Andreas Preikschat
72ba94d390 replaced cPickle by pickle 2013-04-03 16:53:30 +02:00
Andreas Preikschat
4b76db7ad7 convert bytes to str 2013-04-03 12:54:11 +02:00
Andreas Preikschat
a6d966d1d2 changed comment 2013-04-03 12:40:09 +02:00
Andreas Preikschat
74eb0b59fb fixed LooseVersion not working 2013-04-03 12:39:42 +02:00
Andreas Preikschat
440876eff7 reverted fix: fix available for trunk 2013-04-03 12:33:15 +02:00
Andreas Preikschat
2c94f0df83 fixed #FIXME: constructor 2013-04-03 12:23:52 +02:00
Andreas Preikschat
8761117d34 fixed fixme: constructor 2013-04-03 12:19:15 +02:00
Andreas Preikschat
d9f8025042 r2225 2013-04-03 12:16:48 +02:00
M2j
2598674d2a Add ICU version string to exception form. 2013-04-02 22:52:31 +02:00
Dmitriy Marmyshev
c443a6702e changed image add behavior for title 2013-04-02 23:28:56 +04: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
Dmitriy Marmyshev
6209ad8bb5 style fix 2013-04-02 15:54:18 +04:00
Dmitriy Marmyshev
4f915d363f HEAD 2013-04-02 14:20:53 +04:00
Dmitriy Marmyshev
1dc22fc912 fix 2013-04-02 14:19:33 +04: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
Andreas Preikschat
aa7d56c4bc added fixmes 2013-03-31 10:53:34 +02:00
M2j
76ea812629 - switch to Python3 style sorting 
- use ICU for string sorting
 2013-03-30 22:54:42 +01:00
Andreas Preikschat
2a28094937 fixed encoding 2013-03-30 17:31:29 +01:00
Andreas Preikschat
c5e11ff558 head 2013-03-30 17:05:49 +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
297b47fca3 added comment 2013-03-28 15:57:47 +01:00
Andreas Preikschat
6908577b54 fixed image display 2013-03-27 10:41:01 +01:00
Andreas Preikschat
0b2dc71f28 fixed not needed decode 2013-03-27 10:25:39 +01:00
Andreas Preikschat
4bd7c139f5 fixed settings tabs 2013-03-27 10:23:09 +01:00
Andreas Preikschat
bf60aa148e fixed settings tabs 2013-03-27 10:20:54 +01:00
Andreas Preikschat
8bf76a7baa fixed start time form 2013-03-27 10:14:24 +01:00
Andreas Preikschat
7476ff27ff fixed service item edit form 2013-03-27 10:12:54 +01:00
Andreas Preikschat
6127da074b fixed service note form 2013-03-27 10:11:16 +01:00
Andreas Preikschat
60c1a4e9f4 removed contains method 2013-03-26 21:33:49 +01:00
Andreas Preikschat
37b7de22a5 removed encoding from calls 2013-03-26 21:31:48 +01:00
Andreas Preikschat
60cf33f23c fixed vlc.py not working 2013-03-26 21:22:15 +01:00
Andreas Preikschat
7790442240 fixed vlc.py not working 2013-03-26 21:19:19 +01:00
Andreas Preikschat
4f46e578e1 updated vlc.py 2013-03-26 21:18:50 +01:00
Andreas Preikschat
f0da7465e8 initial changes 2013-03-26 19:13:21 +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
Tim Bentley
83fe10361a For minor fixes 2013-03-01 17:29:09 +00:00
Andreas Preikschat
7d0b2e9785 fixed bug #1116528 (Song Import Wizzard does not work in trunk) 
fixed exception form not being displayed
Always log exceptions
fixed/extended tes

bzr-revno: 2195
 2013-03-01 17:27:03 +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
ec56f5ff01 registry: code standards 2013-03-01 11:56:39 +01:00
Andreas Preikschat
d6a57aa5cf image manager: code standards 2013-03-01 11:55:14 +01:00
Andreas Preikschat
a6617825ef htmlbuilder: code standards 2013-03-01 11:50:41 +01:00
Andreas Preikschat
0086d102bd updated renderer comments/docs 2013-03-01 11:46:46 +01:00
Andreas Preikschat
daed497a9e made searchedit conform to our standards 2013-03-01 11:39:38 +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
Patrick Zimmermann
9bcdb79e7b Merge master. 2013-02-28 22:55:36 +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
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
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
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
cfc1b5f84d sorted entries; fix 2013-02-20 09:15:34 +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
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
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
b6f6cc916e added listView shortkeys 2013-02-19 10:56: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
Patrick Zimmermann
0df1f3932a Replace QObject.connect calls with a smarter more pythonic syntax. Courtesy of TRB143++. 2013-02-18 23:26:27 +01:00
Patrick Zimmermann
92b42a6bb5 Merge master. 2013-02-18 23:04:38 +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
Raoul Snyman
c0653676e7 HEAD 2013-02-18 22:59:44 +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
b7c43aa65e Minor code clean up and add more tests 
bzr-revno: 2187
 2013-02-18 20:39:48 +00:00
Tim Bentley
e8b123925f Bootstrap cleanup 2013-02-18 19:59:35 +00:00
Patrick Zimmermann
570b8e1f45 Merge master. 2013-02-18 19:56:26 +01:00
Patrick Zimmermann
10d9b506a6 Even more variables adapted to PEP8. Sentencify lots of comments. 2013-02-18 19:46:50 +01: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
Tim Bentley
2fab6cfb39 Head 2013-02-16 20:45:36 +00:00
Tim Bentley
e921e63e35 Head 2013-02-16 20:43:47 +00:00
Andreas Preikschat
ead6da8cbf Added UiStrings test 
Added FormattingTags test

bzr-revno: 2183
 2013-02-16 20:41:33 +00:00
Andreas Preikschat
73cce9ad13 r2182 2013-02-16 19:50:55 +01:00
Tim Bentley
a463314b7a Add Service Item Tests 2013-02-16 18:24:31 +00: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
Andreas Preikschat
a40defdeab r2181 2013-02-16 12:46:12 +01:00
Tim Bentley
616684d9ad Merge and fixes 2013-02-16 10:40:05 +00:00
Andreas Preikschat
7c9506af4a - fixed Bug #1100277 (Songs don't load with latest build) 
- added nose to check_dependencies.py
- fixed version number compare in create_separated_list

bzr-revno: 2178
 2013-02-16 06:48:52 +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
Patrick Zimmermann
ab88b77f9c Merge master. 2013-02-14 22:04:12 +01:00
Patrick Zimmermann
f7c19f599c Move customInit to wizard. So dummy implementations are not required in the deriving classes. 2013-02-14 22:01:10 +01:00
Andreas Preikschat
6b2274645a added test for UiStrings, started with FormattingTags tests 2013-02-14 15:54:45 +01:00
Arjan Schrijver
cc9464ea74 Merge HEAD 2013-02-13 20:27:10 +01:00
Patrick Zimmermann
e16a3c6dea Merge trunk. 2013-02-12 22:51:04 +01:00
Patrick Zimmermann
d8cfc4f28a Fix wizard after trunk merge and fix a minor display bug. 2013-02-12 22:44:33 +01: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
Raoul Snyman
b5f3e46ad4 Pedantics. 2013-02-11 19:41:32 +02:00
Raoul Snyman
42e0eea6e7 Tidy up a little. 2013-02-11 15:46:08 +02:00
Raoul Snyman
f822aed40f Add some tests around the PluginManager class. 2013-02-11 15:22:13 +02:00
Raoul Snyman
a2125e0954 Add some comments to make things clearer. 2013-02-11 11:43:26 +02:00
Raoul Snyman
230c06c83c Change the importing of plugins to use the "imp" module in an effort to get around the UNO import errors. 2013-02-11 11:34:24 +02:00
Arjan Schrijver
0ca05faa5e Merge HEAD 2013-02-11 10:21:46 +01:00
Andreas Preikschat
6eba926a70 improved hide menu behaviour 2013-02-10 20:08:37 +01:00
Arjan Schrijver
3717e7fa20 - Enhanced 'choose group' dialog layout (thanks Raoul) 
- Revert back to old QListWidget and use QTreeWidget only for images plugin
- Renamed dialogs to comply to coding standards
- Added image group icon
- Enabled animation on image groups
- Removed special 'Imported' folder and allow toplevel images instead
 2013-02-10 17:11:12 +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
f669032fc9 Comment updates 2013-02-09 17:30:46 +00:00
Tim Bentley
f92adad31d Comment fixes 2013-02-09 17:23:35 +00: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
1576a2c1d4 Config update conversion 2013-02-07 07:08:35 +00:00
Tim Bentley
1430559205 More Receiver to Registry migrations 2013-02-06 21:52:15 +00:00
Andreas Preikschat
818bd4a435 fixed version number compare 2013-02-06 20:49:39 +01:00
Tim Bentley
d491997ca7 old test code 2013-02-06 19:25:16 +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
ede9bb70d9 attempt to fix bug #1100277 
Fixes: https://launchpad.net/bugs/1100277
 2013-02-05 18:36:43 +01: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
7cf10df7e8 converted print statements 2013-02-04 23:05:19 +01:00
Andreas Preikschat
8f5fe64d3e fixed short lines 2013-02-04 22:39:44 +01:00
Andreas Preikschat
a72b4283bf removed mutable as parameters 2013-02-04 22:27:50 +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
Arjan Schrijver
adb7aac7cf Merge HEAD 2013-02-03 20:34:53 +01: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
Arjan Schrijver
3f4df4f22c Merge HEAD 2013-02-01 13:01:24 +01: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
c7aa0cd0f1 removed commented line 2013-01-31 19:46:19 +01:00
Patrick Zimmermann
2fbcd321cc Merge trunk. 2013-01-31 19:18:19 +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
Arjan Schrijver
d95aef4b97 - Scroll images list automatically when dragging 
- Expand group where new images were added
- Select dropped images
- More code style fixes
- Reverted earlier change to validateAndLoad
 2013-01-30 20:33:22 +01:00
Andreas Preikschat
827f978970 moved setting 2013-01-30 20:16:51 +01:00
Andreas Preikschat
f7e44c4563 fixed spelling 2013-01-30 20:14:39 +01:00
Andreas Preikschat
8b037d16d7 fixed moved setting 2013-01-30 20:11:58 +01:00
Andreas Preikschat
f048abe326 fixed old missing setting 2013-01-30 20:05:52 +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
af1000bc4d fixed data path missing 2013-01-30 19:05:56 +01:00
Andreas Preikschat
6822834c86 r2160 2013-01-30 18:56:00 +01:00
Arjan Schrijver
260a6815c2 Lots of code style fixes 2013-01-30 11:57:06 +01:00
Tim Bentley
0a1f91af8b Review fixes 2013-01-29 17:19:19 +00:00
Arjan Schrijver
42a75e545e Implemented drag&drop from external directly into an image group 2013-01-29 14:21:07 +01:00
Arjan Schrijver
34455239ef Implemented drag&drop between image groups 2013-01-29 13:02:20 +01:00
Arjan Schrijver
d09b9edcc9 Fixed two comments 2013-01-28 20:52:26 +01: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
9719645edd Fix up tests and amened Register 2013-01-27 20:59:02 +00:00
Tim Bentley
80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley
96c9c5679d Fix settings 2013-01-27 13:58:29 +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
Arjan Schrijver
150fe6e15f Removed ListWidgetWithDnD and fixed some rebasing bugs 2013-01-25 16:30:18 +01:00
Arjan Schrijver
a770f90320 Implemented adding image groups 2013-01-25 15:06:49 +01:00
Arjan Schrijver
9b707d2351 Moved images filenames storage from configfile to sqlite db 2013-01-25 12:52:32 +01:00
Arjan Schrijver
5631a68c40 Fixes for QTreeWidget 2013-01-25 12:38:48 +01:00
Arjan Schrijver
32a77e8313 Two more fixes for QTreeWidget 2013-01-25 12:30:22 +01:00
Arjan Schrijver
dbce056688 Change QListWidget to QTreeWidget in media manager 2013-01-25 12:29:32 +01:00
Tim Bentley
c0aca32660 Head 2013-01-24 20:08:52 +00:00
Tim Bentley
0e6b7c705d fix up testing bugs 2013-01-24 20:04:18 +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
3e3ec476f0 head 2013-01-23 21:01:45 +00:00
Tim Bentley
25eb8ae8e8 Head 2013-01-23 20:32:49 +00:00
Andreas Preikschat
67ac6bcb90 Bug 1086987 (Log system does not log all exceptions) 
bzr-revno: 2157
 2013-01-23 20:30:59 +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
9067b16e0e fix up some tests 2013-01-22 21:59:45 +00:00
Patrick Zimmermann
33c6633dbb More documentation. 2013-01-22 22:35:53 +01: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
Patrick Zimmermann
f9207819e0 Merge master. 2013-01-22 21:16:13 +01:00
Tim Bentley
f9e138612c missed file 2013-01-22 19:35:29 +00:00
Tim Bentley
f759191614 Move to properties 2013-01-22 19:34:15 +00:00
Tim Bentley
5051b9a177 Forgot the new file 2013-01-22 18:56:38 +00:00
Tim Bentley
502a7c2c2e Kernel start 2013-01-22 18:54:59 +00:00
Tim Bentley
59bb9efdf3 demo of singleton 2013-01-21 20:56:27 +00:00
Andreas Preikschat
5e09dc5f81 fixed 'last files' missing 2013-01-21 20:50:19 +01: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
78cc77f0b3 fixed parameter name 2013-01-20 21:54:06 +01:00
Andreas Preikschat
dd8f35e58a fixed bug 1086987 
Fixes: https://launchpad.net/bugs/1086987
 2013-01-20 18:14:42 +01:00
Tim Bentley
3681ef911c Updates 2013-01-20 17:12:33 +00:00
Andreas Preikschat
8acbdebd2e removed print 2013-01-20 13:43:19 +01:00
Andreas Preikschat
9e2ae12ad0 fixed bug 2013-01-20 13:37:34 +01: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
Andreas Preikschat
662d5d284d sort iteams a bit 2013-01-20 12:58:37 +01:00
Andreas Preikschat
c57d3f8372 fixed offlinehelp shortcut missing 2013-01-20 12:48:40 +01:00
Andreas Preikschat
df55fb1ebb improved screen list settings 2013-01-20 12:46:19 +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
Andreas Preikschat
bd4abf7655 removed not needed parameter 2013-01-19 00:01:16 +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
dd99c23c8c removed print statement again 2013-01-18 22:32:40 +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
2f3a5d1fb2 final clean ups 2013-01-18 21:43:19 +01:00
Andreas Preikschat
bf4c1dafb4 fixed up wizard 2013-01-18 21:35:30 +01:00
Andreas Preikschat
5b6326e2ac migrate settings 2013-01-18 20:24:06 +01:00
Raoul Snyman
d2819ceae1 Code style cleans to make pylint happier 
bzr-revno: 2148
 2013-01-18 19:18:27 +00:00
Arjan Schrijver
5bba7562f3 When a saved service file is loaded, images always get a black background instead of the configured background. This patch fixes that, although I'm not sure if it fits within the coding standards. 
bzr-revno: 2147
 2013-01-18 19:17:20 +00:00
Dmitriy Marmyshev
e3e8693bcc name fix 2013-01-18 23:00:13 +04:00
Andreas Preikschat
a98045e386 remove set_list and get_list from SettingsManager 2013-01-18 19:50:46 +01:00
Andreas Preikschat
254f6915ed changed keys 2013-01-18 13:25:05 +01:00
Andreas Preikschat
aa5f38624d fixed settings 2013-01-17 23:37:10 +01:00
Andreas Preikschat
b376c620bd fixed string not being used 2013-01-17 23:28:51 +01:00
Andreas Preikschat
3f31c33e74 fixed images 2013-01-17 23:22:05 +01: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
Andreas Preikschat
1ea08d42d1 corrected translate context 2013-01-16 21:23:02 +01:00
Andreas Preikschat
fd85cb66ae cleaned dict 2013-01-16 20:37:47 +01: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
d552607f57 fixed doc 2013-01-16 20:03:41 +01:00
Andreas Preikschat
48db63e81e I better stay correct; fixed doc 2013-01-16 20:01:11 +01:00
Andreas Preikschat
0fc9c4792f tweaked 'settings migrator' 2013-01-16 19:59:34 +01:00
Andreas Preikschat
08d618c604 added fixme 2013-01-16 13:42:33 +01:00
Andreas Preikschat
15c96f8b87 fixed upper General 2013-01-16 13:26:17 +01:00
Andreas Preikschat
423edf5905 fixed default screen values 2013-01-16 13:09:39 +01:00
Andreas Preikschat
c29bbd3ca0 r2146 2013-01-16 12:29:19 +01:00
Andreas Preikschat
65d0dac3c8 set default plugin status in plugin.py instead of in the plugins 2013-01-16 12:28:38 +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
Andreas Preikschat
d6baae9f34 added test (not finished) 2013-01-15 23:01:15 +01:00
Andreas Preikschat
4da8580c4f removed import which shouldn't be there 
bzr-revno: 2146
 2013-01-15 23:00:12 +01:00
Andreas Preikschat
ed166ce2a6 fixed import 2013-01-15 22:52:26 +01:00
Arjan Schrijver
b6c6a7cd6d Fix line spacing 2013-01-15 22:29:56 +01:00
Andreas Preikschat
ca60c230ba r2144 + conflict 2013-01-15 22:26:45 +01:00
Tim Bentley
ca516061b5 Fix display focus for single screens 
bzr-revno: 2145
 2013-01-15 21:12:01 +00:00
Andreas Preikschat
2c2268a326 removed print statement 2013-01-15 00:43:39 +01:00
Andreas Preikschat
c58a6c801d don't overwrite build-ins 2013-01-15 00:31:02 +01:00
Andreas Preikschat
6cecfe0fb7 fixed settingsmanager bug; fixed translation bug 2013-01-15 00:26:51 +01:00
Patrick Zimmermann
5f04c934b1 Merge master. 2013-01-12 21:52:23 +01:00
Patrick Zimmermann
4af3798cd3 Fix a comment indentation. 2013-01-12 21:51:14 +01:00
Andreas Preikschat
aaafbdf2ea added ability to completely remove settings; docs 2013-01-12 10:01:58 +01:00
Andreas Preikschat
fa6703f307 fixed up remove_obsolete_settings method 2013-01-12 09:54:49 +01:00
Andreas Preikschat
cd343bd16c removed todo 2013-01-11 21:53:20 +01:00
Andreas Preikschat
095066cf19 add possibility to remove old_keys from the config 2013-01-11 21:44:30 +01:00
Dmitriy Marmyshev
024ba1aac9 Auto separating blank buttons, if width allows this. 
Fixes: https://launchpad.net/bugs/718797
 2013-01-12 00:23:06 +04:00
Andreas Preikschat
f1a8bad78e added blank lines 2013-01-11 20:36:28 +01:00
Andreas Preikschat
159e23d4c9 moved code to the top of the file 2013-01-11 20:25:57 +01:00
Andreas Preikschat
52830ee6ee changed variable names 2013-01-11 20:08:36 +01:00
Andreas Preikschat
49d61c2e59 change method name 2013-01-11 20:07:45 +01:00
Andreas Preikschat
4e2f673655 added docs 2013-01-11 19:55:42 +01:00
Andreas Preikschat
725bd7dcf6 fixed bug doing bad things 2013-01-11 19:51:45 +01:00
Tim Bentley
634246a493 set the focus to the maindisplay when it is updated. 
Fixes: https://launchpad.net/bugs/1097898
 2013-01-11 17:08:44 +00:00
Andreas Preikschat
75a86f05ee fixed removed plugin 2013-01-11 13:43:18 +01:00
Andreas Preikschat
0f042dde6f clean ups 2013-01-11 01:35:00 +01:00
Andreas Preikschat
91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat
2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Andreas Preikschat
6faf76ed5c change empty lines 2013-01-10 21:50:01 +01:00
Andreas Preikschat
98140f3598 added settings.py 2013-01-10 21:47:10 +01:00
Andreas Preikschat
2a816115bb pull in settings; renamed dict 2013-01-10 21:41:16 +01:00
Andreas Preikschat
af5995f2a1 moved shortcut settings to settings.py 2013-01-10 21:14:49 +01:00
Andreas Preikschat
306919d15f moved settings to own file 2013-01-10 20:54:45 +01:00
Andreas Preikschat
eb6bc6adbc started work to store setting in a (half) central place 2013-01-10 20:33:48 +01:00
Arjan Schrijver
2ce3f7d512 Make sure images use the configured background/border color when loaded from a saved service file 2013-01-10 11:22:01 +01:00
Tim Bentley
9f7725573d Fix tests 2013-01-09 19:56:16 +00:00
Dmitriy Marmyshev
daf1887ab9 HEAD 2013-01-09 20:12:31 +04:00
Dmitriy Marmyshev
30ea5fce9c Pause looping when blanking screen 2013-01-09 14:30:32 +04:00
Raoul Snyman
f738037d19 Change the way the version check works so that nightlies check a nightly file, dev releases a dev file, and stable releases a version file. 2013-01-08 22:44:56 +02:00
Patrick Zimmermann
d85ede45b8 Added a wizard. Non functional yet. Changed OpenLPWizard to allow for no 
progressPage to be added.
 2013-01-08 21:06:57 +01:00
Jonathan Corwin
af541e4389 Fix import of settings. 
- QSettings exports the 'general' group as '%General' but appears in some circumstances (Linux?) to struggle to import this again. Try and compensate.

- Support the import of the 'players' section

- Change the setting group validation to skip those it doesn't know. Just test for an expected setting earlier instead. Also fix the error message.

bzr-revno: 2139
Fixes: https://launchpad.net/bugs/1094198
 2013-01-05 11:37:48 +00:00
Tim Bentley
7ee8d8c576 Fix crash on blank to desktop 2013-01-03 21:28:00 +00:00
Jonathan Corwin
794567b1ec Import %General, better error message, support 'players' section 2013-01-02 22:32:41 +00:00
Martin Zibricky
e7601fcea8 This fixes the related bug with QPyNullVariant 
bzr-revno: 2138
Fixes: https://launchpad.net/bugs/1095268
 2013-01-02 22:01:33 +00:00
Tim Bentley
feef9df575 Head 2013-01-02 21:50:45 +00:00
Tim Bentley
e03a265ba9 Style updates and more tests 2013-01-02 21:50:20 +00:00
Jonathan Corwin
38e580fbd7 Edit/save custom slide items in service files. 
bzr-revno: 2136
 2013-01-02 21:31:11 +00:00
Martin Zibricky
fee8ae78bb Fix bug #1095268 - issue with QPyNullVariant. 2013-01-02 12:26:21 +01:00
Patrick Zimmermann
33bad25104 Rename "workarounds" -> "display workarounds". 2013-01-01 21:03:12 +01:00
Patrick Zimmermann
cf9f55d5d2 Change blockSignals() to use True & False. Correct line length. 2013-01-01 14:38:36 +01:00
Dmitriy Marmyshev
df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley
174905b991 update tests 2012-12-30 22:10:51 +00:00
Tim Bentley
44a9f96c87 merge fixes 2012-12-30 19:49:48 +00:00
Tim Bentley
a235602acb Fix up auto start 2012-12-30 16:43:49 +00:00
Patrick Zimmermann
b5fe0139ea Merge master (including Settings() refactor). 2012-12-30 13:01:27 +01:00
Tim Bentley
e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Jonathan Corwin
4257ce2932 Attempt to load %General section, and just ignore those we don't know 2012-12-29 22:55:40 +00:00
Dmitriy Marmyshev
8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley
4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley
01de9a93df Capture key and mouse movements 2012-12-29 20:54:25 +00:00
Tim Bentley
9f28874eb5 Code fixes 2012-12-29 18:13:08 +00:00
Tim Bentley
4f2f6f73aa Completed core conversion 2012-12-29 15:25:29 +00:00
Tim Bentley
345b5638c8 Splash screen done 2012-12-29 13:35:16 +00:00
Tim Bentley
4b6292220a Main window done 2012-12-29 13:15:42 +00:00
Tim Bentley
2b6b6d5756 Start of ui 2012-12-29 09:35:24 +00:00
Jonathan Corwin
d814553924 Head + need fixings (forgot to commit head first, sorry) 2012-12-28 22:33:06 +00:00
Tim Bentley
ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat
df3a1bd100 tweaked language manager code 2012-12-27 22:56:53 +01:00
Andreas Preikschat
8fdbca8d89 fixed comment 2012-12-27 22:41:11 +01:00
Andreas Preikschat
e325affe10 fixed data path 2012-12-27 22:20:32 +01:00
Andreas Preikschat
863aa58656 final clean ups 2012-12-27 18:17:08 +01:00
Andreas Preikschat
0a57bed2f7 fixed setting import 2012-12-27 18:00:40 +01:00
Andreas Preikschat
cbd22b7141 fixed bug caused by merge 2012-12-27 17:46:27 +01:00
Andreas Preikschat
f1bdcec79d r2131 + conflicts 2012-12-27 17:33:38 +01:00
Andreas Preikschat
b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley
e54f4eec7b Interface unusable when run on XFce 2012-12-26 12:20:30 +00:00
Dmitriy Marmyshev
86d916509b deleted commented code 2012-12-26 00:22:41 +04:00
Tim Bentley
933925647b Fix unblocking of events 2012-12-24 21:04:52 +00:00
Jonathan Corwin
0092fc6960 Save any service text item as a custom slide 2012-12-23 00:00:24 +00:00
Tim Bentley
81640a9612 Fix media starting in wrong place 2012-12-21 19:19:26 +00:00
Tim Bentley
b1f80c96ea Fix media starting in wrong place 2012-12-21 19:11:00 +00:00
Andreas Preikschat
18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat
6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Arjan Schrijver
e574466ebb use unicode strings 2012-12-20 09:05:25 +01:00
Patrick Zimmermann
f156c37e90 Fix indentation. 2012-12-19 23:25:52 +01:00
Patrick Zimmermann
cf36197993 Rename stylesheetFix -> alternateRows. 2012-12-19 23:22:11 +01:00
Arjan Schrijver
e7787ddd2d fixed bug #1092121 'Interface unusable when run on XFce' 
Fixes: https://launchpad.net/bugs/1092121
 2012-12-19 17:26:53 +01:00
Dmitriy Marmyshev
3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev
770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Patrick Zimmermann
34bec28074 Merge master 2012-12-17 20:54:07 +01:00
Patrick Zimmermann
c9624ab378 Default stylesheet logic to true on Windows even without existing configuration. 2012-12-17 20:50:09 +01:00
Dmitriy Marmyshev
3e3911c133 Renamed varaibles by standard. 2012-12-16 20:45:38 +04:00
Tim Bentley
cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley
68ce73544a volume fixes 2012-12-13 18:55:11 +00:00
Patrick Zimmermann
e87fe82572 Add missing base_color. 2012-12-11 21:02:41 +01:00
Tim Bentley
0f0b8d04e7 Core Media to 120 2012-12-11 19:55:47 +00:00
Patrick Zimmermann
97ecefedff Correct an indentation. 2012-12-11 20:46:18 +01:00
Patrick Zimmermann
f239b2345d Move changes to new branch. 2012-12-11 00:35:53 +01:00
Tim Bentley
0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley
564b2e41ae Style Fixes 2012-12-10 06:15:42 +00:00
Tim Bentley
5a4a33b9b8 Updates 2012-12-09 20:57:41 +00:00
Tim Bentley
6748266fba Fix the setting for lite saves 2012-12-08 16:20:52 +00:00
Tim Bentley
5be9ba5b2c Cleanup Service Item Validation and start tests 2012-12-08 08:40:41 +00:00
Tim Bentley
d2d48da480 Cleanup ServiceItem 2012-12-07 21:57:35 +00:00
Jonathan Corwin
b03606b8a8 Transparent Theme fix 
bzr-revno: 2126
 2012-12-07 21:48:20 +00:00
Jonathan Corwin
33be405013 Transparent fix 2012-12-07 19:43:53 +00:00
Tim Bentley
f3cabebf79 Fix header 2012-12-07 19:04:13 +00:00
Tim Bentley
3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Tim Bentley
11276f6bba Ffix up icons 2012-12-07 18:56:33 +00:00
Tim Bentley
d6513f7c60 Fix blank / unblank bug 2012-12-07 17:47:32 +00:00
Jonathan Corwin
1c651abea2 Set css on specific widgets 2012-12-06 22:06:59 +00:00
Tim Bentley
0e980b6a98 resources for media 2012-12-06 19:26:50 +00:00
Andreas Preikschat
d18564f847 fixed missing arg method 2012-12-06 19:59:07 +01:00
Andreas Preikschat
7fa97b2cac fixed import order 2012-12-06 12:09:10 +01:00
Andreas Preikschat
e8178b2569 swap lines 2012-12-06 12:05:09 +01:00
Andreas Preikschat
1a80a243a8 removed not needed import 2012-12-06 12:03:27 +01:00
Tim Bentley
34275d0a5f Fix service save 2012-12-05 22:42:48 +00:00
Andreas Preikschat
cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat
6c1e303dbd fixed branch 2012-12-05 21:33:39 +01:00
Tim Bentley
ec314273b2 Move class to 120 line width 
bzr-revno: 2123
 2012-12-05 19:01:25 +00:00
Andreas Preikschat
9b1709963e Change defaults for display screen mouse hiding 
bzr-revno: 2122
 2012-12-05 06:13:34 +00:00
Andreas Preikschat
80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Tim Bentley
0c5430b925 Test 120 column diffs 2012-12-05 05:53:14 +00:00
Andreas Preikschat
fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Andreas Preikschat
c5f34a8637 'fixed' code (cough) 2012-12-04 22:22:08 +01:00
Tim Bentley
a1d3d002ef String fixes 2012-12-04 06:09:55 +00:00
Tim Bentley
fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley
b1c2cee003 Fix swf files 2012-12-03 19:18:28 +00:00
Andreas Preikschat
1ef6643e85 - when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 
bzr-revno: 2120
 2012-12-03 20:01:33 +01:00
Andreas Preikschat
ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley
580de0015f Fix background video 2012-12-02 08:06:08 +00:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
e9806f8e6b 2.0 head 2012-11-29 20:46:48 +00:00
Tim Bentley
2299290f5c fix stop 2012-11-29 20:46:16 +00:00
Tim Bentley
846d909dc3 Fix osz bug 2012-11-28 21:14:08 +00:00
Tim Bentley
cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley
d538a32f49 String clean ups 2012-11-24 08:01:10 +00:00
Tim Bentley
734c697fef Documentation 2012-11-24 07:24:30 +00:00
Tim Bentley
116c5b030f Fix media language Automatic 2012-11-22 22:02:40 +00:00
Tim Bentley
4eab1a6521 Head 2012-11-22 21:58:16 +00:00
Patrick Zimmermann
47d8bd7e5f Correct indentation. 2012-11-22 19:01:50 +01:00
Patrick Zimmermann
883a4baba3 Turn off alternating row colors on Windows. 2012-11-22 00:03:28 +01:00
Tim Bentley
6fd865635f Fix most of the review comments 2012-11-21 21:49:18 +00:00
Raoul Snyman
fed4a0adda Add additional media suffix to vlc 
bzr-revno: 2112
 2012-11-20 19:19:24 +00:00
Raoul Snyman
85920b2132 Added .m4v to list of allowed VLC extensions. 2012-11-20 15:04:46 +02:00
Tim Bentley
acadf89a34 Fix displayed preview 2012-11-18 07:56:12 +00:00
Tim Bentley
506fd80f89 Style cleanups 2012-11-17 07:59:25 +00:00
Tim Bentley
57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley
9eb3757c9f Stop indexing arrays with objects 2012-11-16 21:46:17 +00:00
Tim Bentley
fb558935ca guard against missing image files in themes 
Fixes: https://launchpad.net/bugs/1071170
 2012-11-16 19:15:36 +00:00
Dmitriy Marmyshev
2093d9829f Renamed varaibles by standard 2012-11-16 22:48:49 +04:00
Dmitriy Marmyshev
9bb9c6a629 Renamed varaibles by standard. 2012-11-16 21:06:52 +04:00
Dmitriy Marmyshev
2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Dmitriy Marmyshev
7780751807 all methods renamed by standard. 2012-11-13 12:32:09 +04:00
Dmitriy Marmyshev
4af902e74d Some fixes for autoplay 2012-11-13 12:11:49 +04:00
Tim Bentley
5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley
55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Raoul Snyman
e919c53434 Fix DB unit of work for updates 
Fix Bible identification code for BibleGateway

bzr-revno: 2109
 2012-11-11 17:25:09 +00:00
Raoul Snyman
b76be3d6b8 Fixed bug #1077654 where there were more classes in the CSS, but we were specifically looking for only one class. Made the code less brittle. 
Fixes: https://launchpad.net/bugs/1077654
 2012-11-11 18:09:23 +02:00
Erik Lundin
4c502dba9c Fixed the spelling of "Erik Lundin" 2012-11-10 21:09:09 +01:00
Tim Bentley
431a5fbb15 Fix from misalignment 2012-11-10 16:51:23 +00:00
Tim Bentley
69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Philip Ridout
e90af50fd6 Removes items with missing files prior to saving (after confirmation from user) 
bzr-revno: 2106
 2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev
d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley
47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Philip Ridout
0bc2e5b71e Simplified Validate Method 2012-11-07 21:10:38 +00:00
Tim Bentley
2295a74d5d Head 2104 - reverse some changes as not valid in this release 2012-11-07 18:47:56 +00:00
Martin Zibricky
72bb217749 This is the fix for playback with vlc on osx. It also includes fix to get media length without starting playback of a video. 
I tested it only on osx in one- and dual-screen setup so far.

Also controllersVisible is renamed to controlsVisible.

bzr-revno: 2104
 2012-11-07 18:42:21 +00:00
Tim Bentley
9e1e07c04c Head 2103 2012-11-07 18:41:07 +00:00
Philip Ridout
b47512254b fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 
bzr-revno: 2102
Fixes: https://launchpad.net/bugs/1066142
 2012-11-06 18:34:00 +00:00
Martin Zibricky
5c82a0c3dd Bug #963955 : Rename controllersVisible to controlsVisible. 2012-11-06 12:58:32 +01:00
Martin Zibricky
54fac2266e Merge with trunk. 2012-11-06 12:54:51 +01:00
Philip Ridout
4f78c5e5bc fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 2012-11-04 20:45:31 +00:00
Tim Bentley
751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Tim Bentley
f155b51467 Head 2099 2012-11-03 20:53:30 +00:00
Philip Ridout
443ad478c1 Added validate function to serviceitem 2012-11-02 18:54:42 +00:00
Tim Bentley
8cd8d07d2c missing rename 2012-11-01 18:57:07 +00:00
Tim Bentley
6047657741 cleanups and minor fixes 2012-11-01 18:45:12 +00:00
Raoul Snyman
61b505f1bd Updated the image in the About dialog to the one from the new web site. 
Fixes: https://launchpad.net/bugs/1069109
 2012-11-01 19:41:22 +02:00
Tim Bentley
a91dc027d2 Documentation 2012-11-01 16:54:37 +00:00
Tim Bentley
b01fd0b293 SaveAs lite validation 2012-11-01 16:36:45 +00:00
Andreas Preikschat
3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Philip Ridout
d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Tim Bentley
1145d661a5 more tidyups 2012-10-31 18:27:24 +00:00
Tim Bentley
6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley
29ec487d58 Remove old controller stack 2012-10-30 19:38:48 +00:00
Philip Ridout
713f742a3a fixed indentation. 2012-10-30 18:36:39 +00:00
Tim Bentley
5b7b2ecfb9 Api clean up 2012-10-29 16:54:39 +00:00
Tim Bentley
a1bd9013cb Reference tidy up 2012-10-29 17:25:08 +00:00
Erik Lundin
48e2ac108d Fixed bug #1072498 'VLC: Add webm as supported format' 
Fixes: https://launchpad.net/bugs/1072498
 2012-10-29 00:08:54 +01:00
Tim Bentley
a106244aba Zeoo Vol for preview and fix start / stop buttons 2012-10-28 22:00:28 +00:00
Martin Zibricky
b414177fc3 Merge with trunk. 2012-10-27 20:14:01 +02:00
Martin Zibricky
064a318f9a Bug #963955: Disable audio for video preview. 2012-10-27 19:32:56 +02:00
Martin Zibricky
e6cc675207 Bug #963955: Fix the video progress bar. 2012-10-27 19:04:54 +02:00
Martin Zibricky
b5de3c2828 Bug #963955: Avoid the need to start video twice to just get media length. 2012-10-27 16:52:51 +02:00
Philip Ridout
fafe262adc Fixes bug1065423 "Missing image in service causes traceback when opening" 
Fixes bug1065420 ""missing files" dialog opens more then once when more files are missing"
 2012-10-27 10:06:33 +01:00
Tim Bentley
f645ab962c Api cleanup 2012-10-26 21:20:23 +01:00
Tim Bentley
a5fc3ea3f7 Fix bug 2012-10-25 22:03:12 +01:00
Tim Bentley
90a3493d89 Clean up video api 2012-10-25 21:33:28 +01:00
Tim Bentley
34b4828c30 convert video api to registered controller 2012-10-25 20:38:12 +01:00
Tim Bentley
e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley
a997bfa001 Fix player selection and simplify media_length 2012-10-25 20:16:56 +01:00
Tim Bentley
b901236a7f fix irc name 2012-10-24 17:35:41 +01:00
Tim Bentley
bb3561c18a Fixes 2012-10-23 18:35:23 +01:00
Martin Zibricky
e1cd3bdd8b Allow .mov videos in phonon backend. 2012-10-21 22:42:51 +02:00
Tim Bentley
01c537d965 contribute 2012-10-21 19:23:50 +01:00
Tim Bentley
3eca286a08 Yet More updates 2012-10-21 15:42:49 +01:00
Tim Bentley
716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley
cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley
8e5dafb715 Fix bugs and more simplifications 2012-10-20 20:52:04 +01:00
Tim Bentley
cf635c1459 Stop service item generation running media twice 2012-10-20 09:20:11 +01:00
Tim Bentley
464480fc34 fix up settings tab 2012-10-18 21:38:01 +01:00
Andreas Preikschat
57e844cc12 r2093 2012-10-18 20:13:54 +02:00
Martin Zibricky
fa7d3142db Merge with trunk. 2012-10-18 00:20:22 +02:00
Martin Zibricky
bd9a1e550b Bug #1067703 fixed. 2012-10-18 00:00:44 +02:00
Martin Zibricky
8e125fb604 This change disables presentation plugin on osx and hides it in menu and fristtimewizard to be not visible for users. 
This also removes the line disabling presentation plugin.

bzr-revno: 2092
Fixes: https://launchpad.net/bugs/1002038
 2012-10-16 16:07:07 +02:00
Andreas Preikschat
f84c089938 fixed bug #1066296 (Renaming theme keeps old/new theme in Theme manager) 
Fixes: https://launchpad.net/bugs/1066296
 2012-10-16 10:25:54 +02:00
Tim Bentley
057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Tim Bentley
8fb1ede03f Media Players help text 2012-10-15 18:35:14 +01:00
Tim Bentley
a5824120c3 Lite save works 2012-10-15 17:20:23 +01:00
Martin Zibricky
16c0ec482e Bug #1002038: Fix enabling presentation plugin if no osx os. 2012-10-15 10:25:42 +02:00
Martin Zibricky
869d1c6fd7 Merge with trunk. 2012-10-14 20:53:07 +02:00
Martin Zibricky
7321f5fb2d Bug #1002038: Disable and hide presentation plugin on osx. 2012-10-14 20:42:20 +02:00
Tim Bentley
c29cf8ce70 Lite Save for Media working 2012-10-14 17:21:47 +01:00
Tim Bentley
aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Martin Zibricky
1408e6620d Merge: merge with trunk. 2012-10-14 13:14:37 +02:00
Martin Zibricky
0f18ec43a0 Bug #687638: improved performance of local aware sorting. 2012-10-14 13:11:48 +02:00
Raoul Snyman
14fec54927 Song import dialog now shows individual songs being imported. 
Improve the progress page of the FTW.

bzr-revno: 2088
 2012-10-14 08:01:46 +01:00
Tim Bentley
7ce17e99f8 Head 2087 2012-10-13 21:55:41 +01:00
Tim Bentley
77ddd4f385 Fixes 2012-10-13 21:54:56 +01:00
Raoul Snyman
43e41b2688 Try to lessen the number of superfluous process events signals 2012-10-13 19:05:55 +02:00
Raoul Snyman
83de6bb99f Fixed bug #851706: The song import dialog now shows individual songs being imported. Also tried to make the progress page of the FTW work better, pity it is only slightly... 
Fixes: https://launchpad.net/bugs/851706
 2012-10-12 20:51:47 +02:00
Martin Zibricky
4427d4168e Bug #687638: use locale aware comparison in other places too. 2012-10-12 15:00:56 +02:00
Martin Zibricky
2cc18a8fb4 Bug #687638: use locale aware comparison for songs by default. 2012-10-12 13:55:06 +02:00
Martin Zibricky
0836306f1b Bug 687638: add function locale_compare. 2012-10-12 00:55:21 +02:00
Andreas Preikschat
638b95f62c fixed shortcut dialog 2012-10-11 12:53:39 +02:00
Andreas Preikschat
6553dda038 reverted fix 2012-10-11 12:42:37 +02:00
Andreas Preikschat
cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Andreas Preikschat
a5b456a374 Fix bypass of X11 for Gnome Shell 
bzr-revno: 2081
 2012-10-10 20:49:31 +01:00
Tim Bentley
c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Tim Bentley
f52859c2f8 Fix the icons for the media plugin so they are shown. 
bzr-revno: 2078
 2012-10-10 17:48:33 +02:00
Tim Bentley
f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01:00
Olivier Aubert
4a5b845cd0 updated from master 2012-10-08 17:44:42 +02:00
Andreas Preikschat
5d3269e907 fixed bug 1014422 ('X11 Over ride being on by default causes gnome-shell to become unusable') 
Fixes: https://launchpad.net/bugs/1014422
 2012-10-08 16:14:38 +02:00
Tim Bentley
34284ea8ae Clean up media extension lists and move the controller. Fix reload of suffixes to happen after media or presentaions changes 2012-10-07 08:25:55 +01:00
Tim Bentley
56501b69f7 Head 2074 2012-10-06 09:37:40 +01:00
Tim Bentley
66728c52cd Renames 2012-10-06 09:35:37 +01:00
Tim Bentley
2dadfbd17a More Code cleanups 2012-10-06 09:10:28 +01:00
Tim Bentley
e141ff1c24 Cleanups 2012-10-04 21:12:09 +01:00
Tim Bentley
45849803aa Cleanups 2012-10-04 18:28:49 +01:00
Andreas Preikschat
802de6d241 fix 2012-10-03 22:11:54 +02:00
Andreas Preikschat
43af89f70f fix 2012-10-03 20:52:52 +02:00
Andreas Preikschat
99e4786ab6 fix 2012-10-03 20:44:00 +02:00
Andreas Preikschat
c4bdea7edd fixes 2012-10-03 19:55:39 +02:00
Andreas Preikschat
4a7a7e9050 fixes 2012-10-03 19:09:56 +02:00
Andreas Preikschat
159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat
f375d4b0b8 fixed bug 1050081 'display screen - hide mouse by default' 
Fixes: https://launchpad.net/bugs/1050081
 2012-10-03 13:27:28 +02:00
Andreas Preikschat
b226364559 when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 2012-10-02 19:35:10 +02:00
Andreas Preikschat
afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +02:00
Tim Bentley
d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Tim Bentley
ee126c9924 Change background color of video 2012-09-29 19:36:30 +01:00
Tim Bentley
a3e41b1ee7 Fix video injection and have black backgrounds 2012-09-29 17:27:55 +01:00
Andreas Preikschat
5eeab86db9 removed not needed parameters 2012-09-26 16:13:42 +02:00
Raoul Snyman
b71043f37d Fixed bug #1051971 where we weren't validating that a user had actually selected a file. 
bzr-revno: 2070
Fixes: https://launchpad.net/bugs/1051971
 2012-09-24 18:07:48 +02:00
Andreas Preikschat
88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Andreas Preikschat
4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
ElderP
3855b28d40 Added [crashreport] as a valid section for settings import 2012-09-21 16:35:42 -04:00
Raoul Snyman
657beb727c Made changes to keep others happy. 2012-09-21 08:42:31 +02:00
Andreas Preikschat
ea88f94e85 - do not reload theme list twice when renaming a theme 
- fixed not reloading list after adding a new theme [regression]

bzr-revno: 2068
 2012-09-20 07:21:17 +02:00
Andreas Preikschat
e1707c4203 updated vlc.py from master 
bzr-revno: 2067
 2012-09-20 07:19:56 +02:00
Martin Zibricky
906f259d8e Fixed bug #963894 for the moment by dynamically removing VLC support from OpenLP on Mac OS X. 
bzr-revno: 2066
Fixes: https://launchpad.net/bugs/963894
 2012-09-19 23:59:26 +02:00
Andreas Preikschat
8545e04228 r2065 2012-09-19 20:44:19 +02:00
Andreas Preikschat
195608f39e do not reload theme list twice when renaming a theme; fixed not reloading list after adding a new theme 2012-09-19 20:43:02 +02:00
Andreas Preikschat
0a98901ab2 updated vlc.py 2012-09-19 08:34:45 +02:00
ElderP
86465f349d Added code to fix (normalize) the custom data path 2012-09-17 18:20:38 -04:00
Raoul Snyman
2591d24a41 Fixed bug #1051971 where we were not validating that a background image was being selected. 
Fixes: https://launchpad.net/bugs/1051971
 2012-09-17 23:30:10 +02:00
Tim Bentley
1d881e426a Fix service date formats 2012-09-16 16:33:05 +01:00
Martin Zibricky
ba37730538 Remove cheching for non-existing file in media player code. 2012-09-15 18:47:14 +02:00
Tim Bentley
436063b1ec Head 1.9.12 2012-09-15 15:27:28 +01:00
Tim Bentley
c8f54a44ae Titles 2012-09-15 15:27:09 +01:00
Martin Zibricky
35bed5d11b Fix #963894: Put warning about disabled vlc to openlp.log. 2012-09-15 13:29:55 +02:00
Martin Zibricky
292bae6924 Fix #963894: Put message about disabled vlc to openlp.log. 2012-09-15 13:26:42 +02:00
Martin Zibricky
803d6bbe98 Add some more comments. 2012-09-15 13:18:47 +02:00
Martin Zibricky
41980a3a46 Fix #963894: disable vlc backend completely for osx. 2012-09-15 13:16:58 +02:00
Martin Zibricky
f51f19e2b9 Fix #963894: expect also OSError while checking for media backends. 2012-09-15 13:09:59 +02:00
Tim Bentley
795d11849d Local save works 2012-09-15 06:57:03 +01:00
Martin Zibricky
a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Tim Bentley
a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Martin Zibricky
7089e6980a Fixed bug #1049036 in singlescreen mode set full screen mode instead of StaysOnTopHint. 2012-09-12 23:43:31 +02:00
Martin Zibricky
c0a165d818 Fixed bug #1049036 where on osx openlp exited incorrectly with modified service. 2012-09-12 23:06:26 +02:00
Tim Bentley
1df6934bda Refactor video length 2012-09-09 07:54:09 +01:00
Tim Bentley
6ef5fa88d2 Split media tabs, update ServiceItem and add auto start feature 2012-09-09 07:27:53 +01:00
Tim Bentley
a9dd3336fb Move media files around 2012-09-09 07:06:44 +01:00
Tim Bentley
0a65493ce0 Fix video autoplay options 
bzr-revno: 2056
 2012-09-08 20:32:51 +01:00
Tim Bentley
51893b8052 tabs 2012-09-08 19:39:15 +01:00
Tim Bentley
77f49258f9 Fix duplicate ifs 2012-09-08 19:29:05 +01:00
Raoul Snyman
d943707fbf Added *.ogv to VLC. 
bzr-revno: 2055
 2012-09-08 20:14:30 +02:00
Raoul Snyman
ad39fa11e5 Reformatted the list of extensions, and added *.ogv (which is actually usually used for libtheora videos in the OGG container format) 2012-09-08 19:15:08 +02:00
Erik Lundin
dd001e15ab Corrected width of the default main output area (was wider than the screen). 2012-09-08 00:17:53 +02:00
Tim Bentley
59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley
4986fbdce8 Head 2012-09-07 10:28:15 +01:00
Tim Bentley
6d53ed904b Fix extra line 2012-09-06 18:12:02 +01:00
Tim Bentley
9d692af5b9 Head 2012-09-06 17:38:54 +01:00
Tim Bentley
ed2d670f18 fix ups 2012-09-06 17:38:31 +01:00
Martin Zibricky
9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Martin Zibricky
1a1f4f9743 Merge with trunk r2052. 2012-09-06 11:33:34 +02:00
Martin Zibricky
9736707e5b Fixed bug #1046599: String substitution cannot be done for translate() funciton and for QString type. 2012-09-06 11:31:27 +02:00
Andreas Preikschat
5792f8405f fixed bug #1046508 
Fixes: https://launchpad.net/bugs/1046508
 2012-09-06 00:00:26 +02:00
Tim Bentley
67931d6d00 Head 2012-09-04 21:22:42 +01:00
Tim Bentley
4390c13901 Auto start media 2012-09-04 21:22:27 +01:00
Raoul Snyman
dcaf1f0934 typo 2012-09-02 16:53:51 +02:00
Raoul Snyman
9f6b6b99f3 Fixed a regression introduced by my previous bug fix. 2012-09-02 16:37:43 +02:00
Raoul Snyman
b1f7f3b623 Meh. 2012-08-31 10:39:38 +02:00
Raoul Snyman
b8a8995fdc Fixed bug #1018855: Set the WM_CLASS property in X11. 2012-08-30 21:28:38 +02:00
Jonathan Corwin
f10f28aed6 Fixed bug #1041366 
bzr-revno: 2048
Fixes: https://launchpad.net/bugs/1041366
 2012-08-30 20:11:00 +02:00
Jonathan Corwin
7a5041536d Fix comment 2012-08-27 21:00:09 +01:00
Jonathan Corwin
eade26690d Cleanups 2012-08-27 20:12:06 +01:00
Jonathan Corwin
d8e5226b20 Next attempt 2012-08-27 20:04:53 +01:00
Philip Ridout
f4b9cfd727 Fixed bug #1011286 and removed the constraint of no blank verses. 
bzr-revno: 2047
Fixes: https://launchpad.net/bugs/1011286
 2012-08-25 21:23:40 +02:00
Jonathan Corwin
4be69969fd Add comment 2012-08-25 17:50:26 +01:00
Jonathan Corwin
c965905a30 Only renderer maindisplay 2012-08-25 17:36:48 +01:00
Jonathan Corwin
9b378fbea5 Fix 2012-08-25 17:29:17 +01:00
Jonathan Corwin
9864bf9084 update text on main event thread 2012-08-25 17:15:30 +01:00
Tim Bentley
72bfc662f7 fix Media detection on saved services 
bzr-revno: 2046
 2012-08-25 08:28:10 +01:00
Raoul Snyman
eb6704cf01 Force the garbage collector to run. 2012-08-25 00:19:15 +02:00
Raoul Snyman
72d842a2aa Fix bug #1041366: Specified size display area not working. 
Fixes: https://launchpad.net/bugs/1041366
 2012-08-24 22:52:42 +02:00
Tim Bentley
d003ff9009 Allow saved media to be played 2012-08-24 21:06:56 +01:00
Martin Zibricky
15d031eec1 Fix playback of videos with vlc in preview window on OSX. 2012-08-18 19:26:54 +02:00
Philip Ridout
dcc4608f3c fixes issue 1045 and bug 1037076 "Short cut keys do not work for background audio" 2012-08-18 11:55:57 +01:00
Philip Ridout
96b787ff49 removed unecessary if statment 2012-08-13 20:25:28 +01:00
Philip Ridout
943cac3f7f a fix for bug 1022038 2012-08-09 22:48:05 +01:00
Brian T. Meyer
9b48175ab5 Addresses bug 995427 which results in About, Preferences and Quit menu items not moving to the right Application Menu when translated, by adding hints so Qt knows how to handle them. 
bzr-revno: 2043
Fixes: https://launchpad.net/bugs/995427
 2012-08-06 13:21:26 +02:00
Tim Bentley
8b6c2d0024 VLC plays wma files 
bzr-revno: 2042
 2012-08-05 22:10:31 +01:00
Tim Bentley
9813e45bde VLC does support wva 2012-08-05 19:17:52 +01:00
Brian T. Meyer briantmeyer@cox.net
c14a4f4e8d fixed spaces around brackets to match style guidelines 2012-08-04 10:09:12 -07:00
Philip Ridout
d8589c4a6e A few UI tweeks and updates. 
Changed Contribute button and icon to Volunteer (As discussed with Roaul on IRC)
Changed and resized the remote QR code for better recoginition on some phones (BrianMayerDesign)
Updated the link and text to the Android Market, as it is now know as Google Play
Set the window title for the ProcessDialog when importing songs using the first run wizard.
 2012-08-04 15:43:44 +01:00
Brian T. Meyer briantmeyer@cox.net
8100a66622 Contains fix to allow QT to move place About, Exit and Preference Menu 
Items into the Application menu per Apple UI guidelines.
 2012-08-03 21:34:13 -07:00
Philip Ridout
c6d85d3ab8 Implemented gushies changes 2012-07-22 21:20:53 +01:00
Philip Ridout
1d4e5c9430 I have actually fixed the entering of verses with no text! 2012-07-22 09:50:37 +01:00
Andreas Preikschat
08c258a9f1 Fixed bug 1023585 (No handlers could be found for logger 'openlp.core.lib') 
bzr-revno: 2035
Fixes: https://launchpad.net/bugs/1023585
 2012-07-20 09:45:05 +02:00
Andreas Preikschat
a10c56e976 fixed bug 1023585 (No handlers could be found for logger 'openlp.core.lib') 
Fixes: https://launchpad.net/bugs/1023585
 2012-07-19 19:26:04 +02:00
ElderP
cf1a0b27ea Added code to hide data location wizard if running portable 2012-07-15 07:59:55 -04:00
Andreas Preikschat
978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Andreas Preikschat
0a89ddbc86 fixed traceback when deleting last formatting tag form the list 2012-07-11 23:05:28 +02:00
Andreas Preikschat
fc5fbea624 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
bzr-revno: 2031
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 22:09:02 +02:00
Andreas Preikschat
60f08438b3 fixed bug 1022837 (Configure Formatting Tags has inconsistent control labels) 
bzr-revno: 2030
Fixes: https://launchpad.net/bugs/1022837
 2012-07-11 21:56:17 +02:00
Andreas Preikschat
b743abac83 fixed bug 1022831 (Configure Formatting Tags listview keyboard navigation) 
Fixes: https://launchpad.net/bugs/1022831
 2012-07-11 20:28:05 +02:00
Andreas Preikschat
a2a19675f9 changed labels (bug 1022837) 
Fixes: https://launchpad.net/bugs/1022837
 2012-07-11 20:16:51 +02:00
Andreas Preikschat
ef49432548 fixed bug 1023522 (OpenLP does not start in debug mode) 
Fixes: https://launchpad.net/bugs/1023522
 2012-07-11 20:06:33 +02:00
Stevan Pettit
2e693c0d52 Added code to put logfile into portableapp-dir/other if running portable. 
bzr-revno: 2028
Fixes: https://launchpad.net/bugs/1020068
 2012-07-11 13:13:03 +02:00
ElderP
746eb094e7 Removed comment 2012-07-08 18:11:20 -04:00
Raoul Snyman
c1d5831887 Fixed up some issues with the FreeBSD port. 
bzr-revno: 2024
 2012-07-08 22:58:05 +02:00
Samuel Findlay
6d9cc62ab4 Various tidy-ups: 
* themeform: spelling
* easyslidesimport: old code, comment copied from elsewhere
* importer: clarify docstring
* zionworximport: module constant, variable names

bzr-revno: 2023
 2012-07-08 21:37:05 +02:00
ElderP
cc5da47886 Fixed proc name 2012-07-08 15:32:56 -04:00
Raoul Snyman
6d236e9671 Fixed two issues in FreeBSD. Firstly, the translation files were never being picked up, and secondly, OpenLP is installed into /usr/local, so we need to make provision for that. 2012-07-08 21:27:43 +02:00
ElderP
8ad5fdad4a Added code to put logfile into appdir/other if running portable 2012-07-08 08:53:06 -04:00
Samuel Findlay
efdc1126b1 Various tidy-ups 2012-07-08 18:23:56 +10:00
Andreas Preikschat
bbc6b0d7b6 r2019 2012-07-07 16:55:23 +02:00
Andreas Preikschat
3c69631b59 clean ups 2012-07-07 16:54:14 +02:00
Samuel Findlay
f9eab33dd9 Comment typo 2012-07-06 16:25:21 +10:00
Andreas Preikschat
4b6769f9b2 fixed bug 1021272 (Exporting settings fails with traceback in Build 2014) 
Fixes: https://launchpad.net/bugs/1021272
 2012-07-05 17:25:23 +02:00
Andreas Preikschat
d604d6b07f fixed spelling 2012-07-02 20:47:12 +02:00
Andreas Preikschat
25177adce6 - update the image cache when the image timestamp changes 
- reworked image manager's _cache

bzr-revno: 2013
 2012-07-02 20:45:03 +02:00
Andreas Preikschat
4e158ed8f0 fixed variable name 
bzr-revno: 2012
 2012-07-02 19:38:00 +02:00
Andreas Preikschat
44161ebee9 Clean ups 
bzr-revno: 2011
 2012-07-02 19:32:41 +02:00
Andreas Preikschat
c6e7a297ad Variable fixes 
bzr-revno: 2010
 2012-07-02 19:31:12 +02:00
Samuel Findlay
cba8ae36c4 Theme Wizard: updated final page's subtitle to match behaviour 
bzr-revno: 2009
Fixes: https://launchpad.net/bugs/1019696
 2012-07-02 19:27:51 +02:00
Jonathan Corwin
886963b7cb Reduce the number of times a new QWebView is created, which seems to prevent OpenLP from crashing when creating a new theme and there are a lot of items in the service. 
bzr-revno: 2008
Fixes: https://launchpad.net/bugs/1016843
 2012-07-02 19:22:56 +02:00
Andreas Preikschat
b409bacca3 final fix for Trb143 2012-07-01 22:44:40 +02:00
Andreas Preikschat
6869ea41f6 updated doc 2012-07-01 21:41:12 +02:00
Andreas Preikschat
e31ac2cdde fixed variables 2012-07-01 21:22:11 +02:00
Andreas Preikschat
584aedb308 fixed doc 2012-07-01 21:22:10 +02:00
Andreas Preikschat
fb59eab8e7 removed fix because another branch fixes this differently 2012-07-01 20:45:51 +02:00
Andreas Preikschat
6f353ab01d fixed variable name 2012-07-01 20:45:14 +02:00
Andreas Preikschat
978045a845 r2007 2012-07-01 20:44:03 +02:00
Andreas Preikschat
bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat
f74c16b03b reverted parent() change 2012-07-01 19:58:58 +02:00
Samuel Findlay
3f7efd32c9 Updated Theme Wizard final page's subtitle to match behaviour that changed in r1176 2012-07-01 13:25:59 +10:00
Jonathan Corwin
65beb6ccda move webview to init and use %s 2012-06-30 23:20:16 +01:00
Martin Barrett
d2d129deb3 fixes bug #986699: Print Service not separating verses 2012-06-30 19:51:53 +01:00
Andreas Preikschat
3fc52181a5 make code more readable 2012-06-30 20:41:15 +02:00
Martin Barrett
30e760dbe3 fixes bug #986699: Print Service not separating verses 2012-06-30 18:25:49 +01:00
Martin Barrett
d9037de8f2 fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:44 +01:00
Martin Barrett
620b8d519b fixes bug #986699: Print Service not separating verses 2012-06-30 18:16:26 +01:00
Martin Barrett
ac769b96f9 fixes bug #986699: Print Service not separating verses 2012-06-30 17:15:42 +01:00
Martin Barrett
d86a94b3c0 fixes bug #986699: Print Service not separating verses 2012-06-30 17:11:49 +01:00
Andreas Preikschat
9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Andreas Preikschat
78753d03dc r2005 2012-06-30 12:46:24 +02:00
Martin Barrett
c73a57afd3 fixed bug #986688 'PrintService copy not separating verses 
Fixes: https://launchpad.net/bugs/986688
 2012-06-29 00:17:17 +01:00
Andreas Preikschat
0f8054c1fd removed fixmes 2012-06-27 19:00:02 +02:00
Andreas Preikschat
894c6c2868 fixed 1014684 (OpenLP doesn't start on Windows XP) 
bzr-revno: 2005
 2012-06-26 17:14:42 +01:00
Jonathan Corwin
2518a340ae Well only creating the QWebView just the once fixes it. But I'm sure we used to do that and there was a good reason why we started recreating it for each render... 2012-06-25 23:14:53 +01:00
Andreas Preikschat
39916e4232 fixed code, fixed long lines 2012-06-23 19:21:27 +02:00
Andreas Preikschat
d3e8950db8 fixed long line 2012-06-22 22:18:50 +02:00
Andreas Preikschat
ab8e6ee30a use get_filesystem_encoding 2012-06-22 22:12:43 +02:00
Samuel Findlay
4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Andreas Preikschat
155e99d307 fixed other occurrences 2012-06-19 18:09:59 +02:00
Raoul Snyman
6a688ab845 Catch a previously uncaught NotImplementedError. 
bzr-revno: 2000
Fixes: https://launchpad.net/bugs/1013215
 2012-06-19 15:03:24 +02:00
Andreas Preikschat
bb814eacb9 Fixed non existing variable under certain conditions. 
bzr-revno: 1999
 2012-06-19 15:02:10 +02:00
Jonathan Corwin
ef134c2ea7 Release the application reference 2012-06-18 23:05:11 +01:00
Andreas Preikschat
826f83e8bf fixed 1014684 (OpenLP doesn't start on Windows XP) 
Fixes: https://launchpad.net/bugs/1014684
 2012-06-18 19:00:27 +02:00
Andreas Preikschat
d1f1113851 use the update mechanism to reset images instead of deleting them (leading to a time advantage when the image did not change) 2012-06-18 14:27:04 +02:00
Andreas Preikschat
f2884f0593 update image in cache when timestamp changed; docs 2012-06-18 14:07:26 +02:00
Andreas Preikschat
2095a6d0d0 fixed wrong image being kept in cache when aborting the themeform 2012-06-17 18:25:56 +02:00
Andreas Preikschat
87722c9579 fixed non existing variable under certain conditions 2012-06-17 17:41:36 +02:00
Andreas Preikschat
84332702a5 r1994 + conflict 2012-06-16 17:22:18 +02:00
Andreas Preikschat
de8e22f630 - updated vlc.py 
bzr-revno: 1993
 2012-06-16 10:22:26 +02:00
Andreas Preikschat
8eacb2c50b - fixed ticket 695 2012-06-15 18:19:46 +02:00
Andreas Preikschat
9496c68fa7 r1990 2012-06-15 17:34:57 +02:00
Andreas Preikschat
08adb54679 updated vlc.py 2012-06-15 17:31:24 +02:00
Raoul Snyman
0ad713407b Fixed bug #1013215: Catch a previously uncaught NotImplementedError and do nothing so that OpenLP realises that VLC is not available. 
Fixes: https://launchpad.net/bugs/1013215
 2012-06-14 23:20:55 +02:00
Andreas Preikschat
6a23b75b8c reverted changes 2012-06-14 17:46:47 +02:00
Andreas Preikschat
21fc0f9533 fixed docstring 2012-06-13 17:53:54 +02:00
Andreas Preikschat
1f5ac7f483 fixed ticket 729 and fixed variables to camelCase 2012-06-13 17:44:33 +02:00
Dave Warnock
e0c5fabc5a Amend DB Error OperationError 
bzr-revno: 1988
 2012-06-11 18:33:57 +01:00
Dave Warnock
b9b0d83a00 renamed tryCount local variable to try_count 2012-06-11 15:11:53 +01:00
Dave Warnock
913b0433f6 This update is a tidy up of the code that fixed bug #927473 
Changes are made due to the following issues:

- the code assumed that exception OperationalError would only be thrown by  mySQL temporarily disappearing. However, other dbms can throw this exception and usually for errors that mean a retry will also fail.

- the code repeated the actual code of the method within the exception handler. This means code duplication and also that any new exceptions  are not handled by the same exception handler so for example their transaction will not get rolled back.

- not all potential dbms exceptions were caught and so in some cases the database transaction was not rolled back

The solution is to retry transactions where an OperationalError is thrown. Currently these are retried up to 3 times before the error is logged and the method returns false. By retrying the transaction we ensure that the same transaction code with the same exception handlers is used each time.

An additional catchall exception has been added where there is a transaction to ensure that it is rolled back. As with the OperationError this throws the exception back up the stack.
 2012-06-10 22:45:02 +01:00
Stevan Pettit
c306573309 Minor changes to logging, variable name 2012-06-10 15:53:46 -04:00
Stevan Pettit
8365d6f589 Fixed some cosmedics 2012-06-10 10:29:50 -04:00
Andreas Preikschat
7281f44603 removed argument 2012-06-10 15:39:45 +02:00
Stevan Pettit
245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Samuel Findlay
f1afae1813 Added ZionWorx importer. Added descriptionLabel to song import wizard. 
bzr-revno: 1986
 2012-06-09 19:58:56 +01:00
Stevan Pettit
24bcc54d68 Provides the ability to change the data path storing the config files and databases. 
bzr-revno: 1985
 2012-06-09 19:50:56 +01:00
Andreas Preikschat
6c981afedc - clean ups 
bzr-revno: 1984
 2012-06-09 20:28:07 +02:00
Andreas Preikschat
fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat
e8eb2e317d updated vlc.py 2012-06-09 15:46:34 +02:00
Stevan Pettit
67093ed65f Added code to call superclass cancel 2012-06-09 08:03:47 -04:00
Stevan Pettit
c4d3ba5559 Fixed indenting 2012-06-09 00:32:28 -04:00
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit
d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Stevan Pettit
b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Andreas Preikschat
f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay
0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay
a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay
2fb09b2462 Working ZionWorxImport 2012-06-05 19:16:24 +10:00
Stevan Pettit
1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Andreas Preikschat
ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Andreas Preikschat
8f0ddfac9d r1979 2012-06-04 11:53:34 +02:00
Samuel Findlay
6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay
501107c840 r1979 2012-06-03 23:53:20 +10:00
Edwin Lunando
b05774e672 Fixed bug #902492: the theme wizard now uses the current output display geometry when creating a thumbnail for a theme. 
bzr-revno: 1979
Fixes: https://launchpad.net/bugs/902492
 2012-06-03 00:01:52 +02:00
Stevan Pettit
de15cf85a3 Changed some labels. Fixed GUI buttons 2012-06-01 14:36:53 -04:00
Samuel Findlay
78c4906b55 2012-06-01 17:32:58 +10:00
Samuel Findlay
5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay
d86caecbbf Refactored sourcePage validation: reimplemented QWizardPage.isComplete() so that Next button is disabled until source(s) are selected. validateCurrentPage gives each song format class chance to validate its input. 2012-05-31 19:15:45 +10:00
Tim Bentley
ab0be0006a Cache theme backgrounds earlier 
bzr-revno: 1978
 2012-05-30 20:58:33 +01:00
Tim Bentley
cdb6859edf Add space 2012-05-30 20:50:24 +01:00
Samuel Findlay
2b51e7fcdc r1977 2012-05-31 01:01:25 +10:00
Samuel Findlay
e882607360 Completed refactor of importer.py 2012-05-30 19:11:44 +10:00
Tim Bentley
14bdc5ca7a Remove blank lines 2012-05-29 20:13:02 +01:00
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Edwin Lunando
faebbc1f5d comment reformatting 2012-05-28 09:43:00 +07:00
Andreas Preikschat
4943e6681d - fixed crash on chancel if thread is still running in FTW 
bzr-revno: 1977
 2012-05-27 19:58:58 +02:00
Andreas Preikschat
d5f1c54669 do some of the clean ups even when we just imported settings 2012-05-27 12:58:10 +02:00
Edwin Lunando
749a90b9da merge with trunk. 2012-05-27 17:02:03 +07:00
Edwin Lunando
32ee1ec343 refactor code 2012-05-27 16:41:53 +07:00
Tim Bentley
3bc0fc7de5 cache images sooner 2012-05-27 07:06:18 +01:00
Andreas Preikschat
612500c677 r1976 2012-05-26 19:53:03 +02:00
Andreas Preikschat
51d69a28ce stop imageManager thread on shutdown 2012-05-26 19:51:27 +02:00
Andreas Preikschat
56b02b02b1 attribute instead of method 2012-05-26 19:12:01 +02:00
Andreas Preikschat
f96073000f fixed crash on cancel when thread is still running 2012-05-26 18:52:34 +02:00
Andreas Preikschat
fc577afda2 little clean up, doc string 2012-05-24 21:05:15 +02:00
Andreas Preikschat
71e8a7a2eb fixes and doc string 2012-05-24 20:00:43 +02:00
Stevan Pettit
ec27884d39 Removed last Qtcore.Qsetting usage 2012-05-24 07:02:01 -04:00
Andreas Preikschat
45a9b5f615 clean ups 2012-05-23 23:02:34 +02:00
Stevan Pettit
7bc4c5f318 Settings to set default as ini format 2012-05-23 13:13:22 -04:00
Andreas Preikschat
0517f3d8d7 renamed attribute 2012-05-23 18:59:28 +02:00
Andreas Preikschat
28930a9c32 added missing docstring 2012-05-23 18:55:41 +02:00
Andreas Preikschat
8a90476f89 added missing line 2012-05-23 18:53:08 +02:00
Andreas Preikschat
45c05e700d clean ups 2012-05-23 18:53:04 +02:00
Andreas Preikschat
ded1e82659 r1975 2012-05-23 18:49:24 +02:00
Andreas Preikschat
1604d863eb clean ups 2012-05-23 18:46:54 +02:00
Andreas Preikschat
4a6697f5a1 r1975 2012-05-23 18:31:25 +02:00
Andreas Preikschat
2745406038 removed test code 2012-05-23 18:28:35 +02:00
Samuel Findlay
bda1a0c420 Changes PowerSong importer to import a folder, rather than a selection of files. This involved implementing a getFolder method in core.ui.OpenLPWizard. 
bzr-revno: 1975
 2012-05-23 18:26:47 +02:00
Andreas Preikschat
c15ac3a84e last fixes 2012-05-23 18:14:03 +02:00
Stevan Pettit
357f876331 Removed unused import qtcore 2012-05-21 08:41:33 -04:00