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

5285 Commits

Author SHA1 Message Date
Andreas Preikschat
eae143d232 name fixes 2013-04-29 20:42:29 +02:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Andreas Preikschat
f396e07feb fixed regression 2013-04-28 20:34:04 +02:00
Andreas Preikschat
92d5fd8e19 removed dead code; fixed attribute names; fixed regression 2013-04-28 20:31:48 +02:00
Andreas Preikschat
02603eaad5 display tool tip in shortcut dialog 2013-04-28 20:22:36 +02:00
Andreas Preikschat
989b922ab9 added shortcut to jump to the search fields 2013-04-28 20:06:49 +02:00
Andreas Preikschat
2d22e8420a do not pass QImages to build_icon (if not needed) 2013-04-28 19:17:45 +02:00
Patrick Zimmermann
4c2f078bf1 Add a missing \n at EOF. Add a comment. 2013-04-27 22:59:56 +02:00
Patrick Zimmermann
154c82f5ea Rename a method and remove a non needed registry var. 2013-04-27 12:00:27 +02:00
Andreas Preikschat
9d54944ad4 use true division (py3) 2013-04-24 22:47:30 +02:00
Andreas Preikschat
22541e7297 use true division (py3) 2013-04-24 21:05:34 +02:00
Andreas Preikschat
7b7cbc588c - removed code using the sqlite package (which is not available in python 3) 
bzr-revno: 2240
 2013-04-23 23:47:02 +02:00
Andreas Preikschat
8f994b2895 - fixed short lines 
- renamed attributes and methods

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

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

bzr-revno: 2214
 2013-03-19 09:38:01 +02:00
Arjan Schrijver
ec12b36665 Merge HEAD 2013-03-18 15:11:58 +01:00
Arjan Schrijver
47c48618bc Fixed a traceback that occurred when calling critical_error_message_box and friends while the splashscreen is disabled in the settings. 2013-03-18 14:30:31 +01:00
Raoul Snyman
e06d26e743 HEAD 2013-03-18 13:23:29 +02:00
Raoul Snyman
a3f1769818 HEAD 2013-03-18 12:16:50 +02:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
6ce33e0ec3 Settings cleanups and removal of config_updated 
bzr-revno: 2212
 2013-03-17 21:04:03 +00:00
Tim Bentley
5e6ec9d269 fix missed events 2013-03-17 20:40:47 +00:00
Tim Bentley
df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley
9f8b236f90 With tests 2013-03-17 17:37:19 +00:00
Tim Bentley
af76c3f6b9 config_update removed 2013-03-17 09:21:18 +00:00
Tim Bentley
bdad091ff0 Fix change typos 2013-03-16 21:18:05 +00:00
Tim Bentley
6a99a9e140 Changes made 2013-03-16 20:52:59 +00:00
Tim Bentley
04bc47cb52 All Tabs converted 2013-03-16 19:57:15 +00:00
Tim Bentley
19c05a7fc0 Half plugin tabs done 2013-03-16 16:59:10 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Andreas Preikschat
e35c11874c - fixed spelling 
- added vlc version to bug report

bzr-revno: 2211
 2013-03-15 11:40:00 +01:00
Tim Bentley
1c76353cba head 2013-03-15 08:40:16 +00:00
Raoul Snyman
1a37d306a9 More cleanups 2013-03-15 00:22:18 +02:00
Tim Bentley
8c7bfc2bb7 Head 2013-03-14 20:21:19 +00:00
Tim Bentley
9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Andreas Preikschat
eeb3061cce fixed spelling 2013-03-14 13:15:43 +01:00
Arjan Schrijver
2cb47f6040 Merge HEAD 2013-03-14 12:39:04 +01:00
Arjan Schrijver
5c15585413 Added more docstrings 2013-03-14 12:32:58 +01:00
Andreas Preikschat
59a06905fc added vlc version to exception form 2013-03-14 11:46:19 +01:00
Arjan Schrijver
441296d808 - Fixed cursor staying busy when adding images 
- Added documentation to methods
- Fixed traceback when adding media files
 2013-03-14 11:36:59 +01:00
Tim Bentley
919f86789f Head 2013-03-13 19:18:41 +00:00