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

3830 Commits

Author SHA1 Message Date
Tim Bentley
f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Andreas Preikschat
d88a268c5c removed 'again' 2011-08-26 17:48:58 +02:00
Andreas Preikschat
fa85525a68 r1723 2011-08-26 17:32:37 +02:00
Andreas Preikschat
fbb32a0278 added hints that exported files are OpenLyrics files 2011-08-26 17:30:51 +02:00
Andreas Preikschat
407b342f45 changed 'switch' name 2011-08-26 17:15:17 +02:00
Andreas Preikschat
953ff87ff5 do not delete temporary tags when resetting the list; preparations 2011-08-26 17:06:22 +02:00
Andreas Preikschat
dd00f95f64 r1723 2011-08-26 15:18:06 +02:00
Tim Bentley
4f0c7716bc Fix default value 2011-08-26 14:13:32 +01:00
Tim Bentley
dec8ce3a8d Add ability to set colours around borders of images and in themes. 
May not be to all tastes ;-)

bzr-revno: 1722
 2011-08-26 13:20:49 +01:00
Tim Bentley
1adac78588 Add date fields to songs 2011-08-26 13:02:06 +01:00
Raoul Snyman
2c0df18f35 - Implemented a seamless database upgrade system. 
- Added the first upgrade as a demonstration.
- Added database version check so that newer version databases are not loaded.

bzr-revno: 1721
 2011-08-26 13:39:32 +02:00
Tim Bentley
869bc9bb20 Fix field name 2011-08-26 09:21:27 +01:00
Raoul Snyman
4b1ce7102e A few more tweaks as requested by Andreas. 2011-08-25 22:14:02 +02:00
Raoul Snyman
bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Tim Bentley
5f6b315c4a fix trace 2011-08-25 20:52:07 +01:00
Tim Bentley
803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Raoul Snyman
ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Raoul Snyman
923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00
Raoul Snyman
7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +02:00
Raoul Snyman
cdcfeaece8 Keeping things tidy: Actually save to DB now, and delete removed files. 2011-08-24 14:22:39 +02:00
Raoul Snyman
122c2226bd Now copying files too\! 2011-08-24 13:53:22 +02:00
Raoul Snyman
d5e92c0d35 Added a media files form and populated it from the media plugin, if the media plugin is enabled. 2011-08-23 23:48:46 +02:00
rimach
229fe56305 Head 2011-08-23 22:28:09 +02:00
Raoul Snyman
6a60ece204 Added Up, Down, Remove and Remove All buttons. Reworked the UI to make use of the buttons better. 2011-08-23 15:44:50 +02:00
Raoul Snyman
409a16eb35 Added the tab, list and buttons for linked audio. 2011-08-23 08:38:02 +02:00
Tim Bentley
957a86b11e fexes 2011-08-22 18:32:18 +01:00
Andreas Preikschat
e209c81fed simplification 2011-08-22 16:11:37 +02:00
Andreas Preikschat
650dc83aeb do not use re with xml 2011-08-22 15:39:02 +02:00
Tim Bentley
76c0881559 Head 1716 2011-08-21 05:51:19 +01:00
Tim Bentley
d660d1d5ae Add missing file 2011-08-21 05:51:03 +01:00
Raoul Snyman
8957c5e4bf Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
bzr-revno: 1716
Fixes: https://launchpad.net/bugs/825809
 2011-08-20 20:48:27 +02:00
Andreas Preikschat
c7d875a67f compatibility for OpenLyrics files created with OpenLP 1.9.6 and OpenLyrics 0.7 2011-08-20 19:39:38 +02:00
Andreas Preikschat
0ab092e56e removed _get method 2011-08-20 19:15:31 +02:00
Andreas Preikschat
23733608ef adapted virtual breaks in OpenLyrics implementation for the upcomming 0.8 release 2011-08-20 19:06:48 +02:00
Tim Bentley
3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Tim Bentley
cc1e174d62 Updates 2011-08-20 14:21:25 +01:00
Tim Bentley
9e6d05098b 1715 2011-08-20 12:46:18 +01:00
Tim Bentley
ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00
Andreas Preikschat
d668f2d87c - changed instance varaibles to camelCase 
bzr-revno: 1715
 2011-08-20 10:24:17 +02:00
Andreas Preikschat
9363177e9d - Fixed bug #804747 (Bible disappear after upgrade)\n- Fixed bug Bug #824129 (Bibles plugin does not always delete corrupted bibles from falied imports)\n- Removed not needed or redundant variables.\n- Removed not needed code.\n- When upgrading bibles move the files to the temp directory.\n- clean ups 
bzr-revno: 1714
Fixes: https://launchpad.net/bugs/804747, https://launchpad.net/bugs/824129
 2011-08-20 10:23:18 +02:00
Andreas Preikschat
5b28d384fe Fixed bug #826483 (NIV 2010 web bible missing chapters) 
bzr-revno: 1713
Fixes: https://launchpad.net/bugs/826483
 2011-08-20 10:21:42 +02:00
Andreas Preikschat
a69705ccd3 Fixed song meta data in OpenLyrics files to contain the application version 
bzr-revno: 1712
 2011-08-20 10:20:28 +02:00
Andreas Preikschat
9baa1374b6 changed instance varaibles to camelCase 2011-08-17 18:16:43 +02:00
Andreas Preikschat
d7ae55f733 improved deletion of corrupted files on windows (bug #824129) 
Fixes: https://launchpad.net/bugs/824129
 2011-08-17 14:08:33 +02:00
Andreas Preikschat
7159559eaa removed not needed code (this case should never occur and if it does, the manager instance should delete the file) 2011-08-17 13:08:32 +02:00
Andreas Preikschat
29b67efed6 close connection to database when the upgrade failed, to prevent errors on windows 2011-08-17 12:47:01 +02:00
Raoul Snyman
ca5c8d9a0b Fixed bug #802146: Couldn't import some SongShowPlus files. Rearranged the file menu as well to be in a more logical order, and to look a little nicer. 
Fixes: https://launchpad.net/bugs/802146
 2011-08-16 23:19:57 +02:00
Raoul Snyman
301993a3ea Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
Fixes: https://launchpad.net/bugs/825809
 2011-08-16 21:53:52 +02:00
Mattias Põldaru
da758fbb89 Removed wrong comment 2011-08-16 11:46:55 +03:00
Mattias Põldaru
509bc9e704 Two last importers, which did not stop on cancel. 2011-08-16 03:59:45 +03:00
Mattias Põldaru
bbba7203e3 Fix #249 on tracker, exception on opensong files with verse name containing only number [1] 2011-08-16 03:08:16 +03:00
Mattias Põldaru
7ab1538460 Supposed to fix #819271, crash when downloading some chapters. 2011-08-15 12:54:07 +03:00
Andreas Preikschat
9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat
cdec32f706 remove print 2011-08-15 11:05:28 +02:00
Andreas Preikschat
07e9e3fe93 fix failure dectection 2011-08-15 10:55:36 +02:00
Andreas Preikschat
5607f025f6 fixed bug #826483 
Fixes: https://launchpad.net/bugs/826483
 2011-08-15 10:53:51 +02:00
Andreas Preikschat
da1db9994d removed not needed code 2011-08-15 09:35:37 +02:00
Andreas Preikschat
c70ac5e656 create temp directory name in constructor 2011-08-15 08:31:36 +02:00
Andreas Preikschat
928467847e do not call postWizard twice 2011-08-14 16:35:36 +02:00
Andreas Preikschat
924482ac51 prevent closing an already closed database 2011-08-14 15:49:03 +02:00
Andreas Preikschat
3f489ddbaf fixed song meta data to include application name 2011-08-14 12:56:05 +02:00
Andreas Preikschat
8a926b01e1 Auto-completer does not work immediately after importing/upgrading a bible (bug #825181) 
Fixes: https://launchpad.net/bugs/825181
 2011-08-13 12:49:53 +02:00
Andreas Preikschat
259b57badd added try/except 2011-08-13 12:41:21 +02:00
Andreas Preikschat
b72b538893 removed variable; hopefully fixed windows crahes 2011-08-13 12:14:20 +02:00
Andreas Preikschat
6c96794af1 restore not upgraded bibles; clean ups 2011-08-12 17:31:16 +02:00
Andreas Preikschat
11f3a9e13a removed code; moved clean_filename method to utils 2011-08-12 16:54:16 +02:00
Andreas Preikschat
3f3ab71eeb more clean ups 2011-08-12 15:38:05 +02:00
Andreas Preikschat
4831cf0a7c more clean ups 2011-08-12 15:16:06 +02:00
Andreas Preikschat
0924bfc246 fixed bug #804747; clean ups 
Fixes: https://launchpad.net/bugs/804747
 2011-08-12 15:11:30 +02:00
Chris Blake
95f75ce266 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 15:15:45 -04:00
Chris Blake
e75631d7f5 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 13:30:45 -04:00
Chris Blake
2c6d14cfc8 fixed bug #817674 'Export Song - Song list appears to be random order ' 
Fixes: https://launchpad.net/bugs/817674
 2011-08-08 12:59:56 -04:00
Andreas Preikschat
6c7c27a7c9 fixed bug #816186; fixed comments; fixed list comprehension 
Fixes: https://launchpad.net/bugs/816186
 2011-08-05 13:21:39 +02:00
Tim Bentley
0b46165429 Last set of fixes 2011-08-02 19:17:07 +01:00
Tim Bentley
644706a62a Fix review comments and cleanups 2011-08-02 06:07:09 +01:00
Tim Bentley
c9c0904c31 Head 2011-07-30 17:00:11 +01:00
rimach crichter@web.de
0c4ae8d3c8 Head 2011-07-28 22:35:22 +02:00
rimach crichter@web.de
ea7e03406c fix loading media in Service bug 2011-07-28 22:34:20 +02:00
Tim Bentley
f1902ade5a Fix up drag and drop code 2011-07-27 19:28:35 +01:00
Andreas Preikschat
746001c485 corrections 2011-07-27 20:12:54 +02:00
Andreas Preikschat
6aec735be4 corrections 2011-07-27 19:05:43 +02:00
Andreas Preikschat
0bd821aaa5 docstrings clean ups 2011-07-26 17:44:24 +02:00
rimach crichter@web.de
ed9d704db9 Head 2011-07-25 23:06:43 +02:00
rimach crichter@web.de
1c63ef3ea1 add starttime for python and vlc 2011-07-25 22:56:39 +02:00
Andreas Preikschat
187bb647c0 - improved rendering speed by checking if the text fits as a whole (to save time figuring out that it fits as a whole) 
- use binary chop to find the number of lines which will fit on a slide (if it does not fit as a whole)
- do not use instance variables as arguments
- renamed image_manager to imageManager and theme_manager to themeManager as the classes are derived of Qt

Some changes to html (html5):
- added doctype
- removed obsolete language attribute

bzr-revno: 1694
 2011-07-24 19:52:53 +02:00
Stevan Pettit
90c18b6bfd changed plugin names to lowercase, removed .lower() from appropriate code 2011-07-23 17:29:24 -04:00
rimach crichter@web.de
210926867f bugfixing 2011-07-20 22:47:29 +02:00
rimach crichter@web.de
146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de
65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Andreas Preikschat
7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Jon Tibble
0f89b9f771 Unused import 2011-07-17 13:59:26 +01:00
Jon Tibble
60b286ca3e Head r1689 2011-07-17 12:56:17 +01:00
Andreas Preikschat
69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Andreas Preikschat
bc5d2cce46 removed zip support for OpenSong importer 
Fixes: https://launchpad.net/bugs/795027
 2011-07-15 20:18:11 +02:00
Jon Tibble
40d31106b3 Head r1686 2011-07-14 19:42:38 +01:00
Andreas Preikschat
822db59c4f - use map instead of list comprehension 
- make some instance variables (in connection with re) constants
- removed some blank lines

bzr-revno: 1686
 2011-07-14 17:20:25 +01:00
Tim Bentley
f1cf256d99 Fix 2011-07-13 18:41:37 +01:00
Andreas Preikschat
b98e36aff2 regex clean ups 2011-07-13 15:32:19 +02:00
Jon Tibble
a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
Tim Bentley
b83048ff4e Fix outstanding strings in Error for translations 
Fixes: https://launchpad.net/bugs/796440
 2011-07-11 17:32:25 +01:00
rimach crichter@web.de
98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley
d58ed2da56 Add visual button to status bar for Song usage active / inactive and connect to F4 button. 
Code cleanups

bzr-revno: 1682
 2011-07-10 16:04:55 +01:00
Tim Bentley
f264cc4c4e correct tooltip text 2011-07-08 16:07:53 +01:00
Andreas Preikschat
2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Raoul Snyman
b4358a2005 Fixed bug #794971 by typecasting the title and lyrics fields to unicode objects if they are buffer objects. 
bzr-revno: 1679
 2011-07-08 14:53:36 +02:00
Tim Bentley
5efe717137 Head 2011-07-08 08:46:25 +01:00
Raoul Snyman
5581a74034 Changed typecast to rather check for buffer. 2011-07-08 08:40:50 +02:00
Raoul Snyman
897f7a7dbb Fixed bug #794971: Typecast the buffer object to a unicode object. 2011-07-08 08:31:34 +02:00
Tim Bentley
1a611dcd60 Add tooltip 2011-07-08 07:03:09 +01:00
Raoul Snyman
ce1abaf332 Fixed bug #803031: If UTF-8 decoding fails, try the standard Windows codepage. 2011-07-08 07:57:39 +02:00
Jon Tibble
1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble
1899961965 Long lines 2011-07-07 22:22:41 +01:00
Tim Bentley
d02ee451f2 Add ability to clone a song with a full copy of it. 
Add missing build_icon and line wrap error.

Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.

Changes for 795980 also included

bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980, https://launchpad.net/bugs/752374, https://launchpad.net/bugs/763583
 2011-07-07 21:14:12 +01:00
Jon Tibble
3ab1c606e5 Head r1674 2011-07-07 19:04:26 +01:00
Jon Tibble
623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Tim Bentley
37fdcc62a4 Fix comment 2011-07-07 18:03:38 +01:00
Andreas Preikschat
b68751835f r1673 2011-07-06 16:00:32 +02:00
Benny
1876d520ae review fixes 2011-07-05 14:00:34 +02:00
Benny
6436b05240 changes from review (cosmetic & regex performance) 2011-07-05 12:50:55 +02:00
Benny
ae8ac35d2c merge head 2011-07-05 01:02:49 +02:00
Benny
3c0c9c5b78 EasyWorship importer: some work to create more reasonable verse numbers if EW tags are missing or without numbers 2011-07-05 00:55:57 +02:00
Benny
4bf45ad2de ewimport: workaround for RTF stripping bug 2011-07-04 22:51:43 +02:00
Tim Bentley
b2b8dd1d4d Extra fix 2011-07-03 19:33:04 +01:00
Tim Bentley
4d82e55ca0 Correct code 2011-07-03 18:45:48 +01:00
Tim Bentley
1c454b606f Fix fullstop and add icon 2011-07-03 13:43:31 +01:00
Tim Bentley
2a73f1b188 Prevent Images and Media backgrounds being added when No service Item is present in the live controller. 
Fixes: https://launchpad.net/bugs/795980
 2011-07-03 09:13:48 +01:00
Tim Bentley
222d4c228c Method fix 2011-07-03 06:43:32 +01:00
Tim Bentley
091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Tim Bentley
6a259e0489 Correct build icon 2011-07-02 06:51:03 +01:00
Benny
bc808ade93 EasyWorshipSongImport: use tag from previous slide for slides without tag, fix regex for notes 2011-07-02 00:45:27 +02:00
Tim Bentley
219218161b 6am spelling fix 2011-07-01 17:59:56 +01:00
Tim Bentley
bddf91ddcb Add ability to clone songs 
Amend framework for plugins to add  non toolbar context items

Fixes: https://launchpad.net/bugs/763583
 2011-07-01 17:55:07 +01:00
Tim Bentley
43f4b30d02 Head 2011-06-30 20:00:03 +01:00
Tim Bentley
0b41274f8e Fix up button 2011-06-30 19:59:51 +01:00
Tim Bentley
870d0b51e9 Move SongUsage active to toolbar 2011-06-29 22:04:08 +01:00
Benny
306826bbeb merge with trunk 2011-06-29 21:33:48 +02:00
Benny
5df77e4ed6 Easyworship importer: improved recognition of slide divisions 
merged with trunk
 2011-06-29 21:26:14 +02:00
Andreas Preikschat
bb5d8f74c4 r1665 2011-06-29 10:04:55 +02:00
Andreas Preikschat
8bb96b97bf - When creating/editing a custom slide give the title edit the focus (and not only when creating a new) 
- fixed long lines
- simplification
 2011-06-29 10:04:14 +02:00
Andreas Preikschat
795aae2277 r1665 2011-06-29 09:27:38 +02:00
Stevan Pettit
a0e0746ed8 - Ask for delete confirmation when attempting to delete custom slide(s) 
- Changed dialog heading to "Confirm Delete"

bzr-revno: 1665
 2011-06-29 08:53:15 +02:00
Stevan Pettit
da45d09e48 Moved delete dialog heading translate to ui.py 2011-06-28 16:35:28 -04:00
Stevan Pettit
334bf4ab44 Changed dialog heading. Changed Songs delete confirm to match Custom Slides 2011-06-28 15:05:05 -04:00
Stevan Pettit
f14fa78081 Modified delete message and dialog buttons 2011-06-28 09:29:36 -04:00
Stevan Pettit
c363165925 Removed some whitespace 2011-06-28 00:59:26 -04:00
Stevan Pettit
231c47db53 Remove settings for confirm delete 2011-06-28 00:52:46 -04:00
Andreas Preikschat
86c0eea473 changed theme_manager to themeManager as it is Qt based 2011-06-27 13:51:25 +02:00
Andreas Preikschat
4f955f25d7 refactoring 2011-06-25 15:47:46 +02:00
Jonathan Corwin
4e216bdd13 Indent 2011-06-24 00:05:06 +01:00
Jonathan Corwin
d58682ad6b SOF UNO constants too 2011-06-23 23:53:24 +01:00
Jonathan Corwin
212103ce7b Some uno constants missing on some systems 2011-06-23 23:26:36 +01:00
Raoul Snyman
fb320569cf Half of bug #795068 fixed. Just figured I might as well get this in before the release. 
bzr-revno: 1654
Fixes: https://launchpad.net/bugs/795068
 2011-06-23 22:02:03 +02:00
Raoul Snyman
1d648f9df6 Removed commented line. 2011-06-23 15:27:06 +02:00
Andreas Preikschat
99da6e48f2 r1652 2011-06-22 10:41:23 +02:00
Jonathan Corwin
cb60e6e9ef 1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled. 
2. Check for missing attributes in the easislides import XML

bzr-revno: 1652
 2011-06-21 22:09:33 +01:00
Andreas Preikschat
dbef87021c minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly 2011-06-21 12:10:53 +02:00
Benny
31dd4945ba fixed line endings 2011-06-21 07:55:11 +02:00
Benny
2939151ff1 EasyWorship importer: added conversion of Tags - basically working, but some issues remain 2011-06-21 07:40:53 +02:00
Jonathan Corwin
6c3190528d Fix easislides import when xml elements are missing 2011-06-20 23:11:05 +01:00
Jonathan Corwin
59280d10b7 Preserve greyed out of next button in import wizard 2011-06-20 22:57:34 +01:00
Andreas Preikschat
3616554a17 r1645 2011-06-20 21:57:08 +02:00
Andreas Preikschat
5f8087bb0d use function in presntation plugin 2011-06-20 21:56:01 +02:00
Jonathan Corwin
f3b7e609e9 Don't duplicate songs if a single author contains a comma 2011-06-19 23:18:06 +01:00
Jonathan Corwin
099b62f233 Filename too long in openlyrics export 2011-06-19 22:11:29 +01:00
Stevan Pettit
6f24d50316 Fixed problem with preview edit button not working for custom slides. 
Also restores backwards compatability with custom plugin settings with 1.9.5

bzr-revno: 1644
 2011-06-18 09:59:03 +01:00
Jonathan Corwin
38fb5e54fe Prevent error if attempt to keep going off the end of a presentation. 
Reduce memory usage by not resizing small thumbnails back up to full monitor size in the slidecontroller.

bzr-revno: 1643
 2011-06-18 09:56:14 +01:00
Simon Scudder
18d6f4f9b9 Import Song Book Number correctly from OpenLyrics files 
bzr-revno: 1642
 2011-06-18 09:54:34 +01:00
Stevan Pettit
314b365270 Changed Custom plugin name to 'Custom' to match folder name, changed mediaitem.py signal receiver back to 'custom_edit' to match the plugin name change 2011-06-17 10:15:07 -04:00
Stevan Pettit
64d5318dd7 Changed name of Custom plugin to 'Custom_Slide', changed mediaitem Receiver to 
'custom_slide_edit'
 2011-06-16 21:36:33 -04:00
Simon Scudder
1d2415808d Fixed Bug 707605 - Losing song book number on OpenLyrics import 2011-06-16 15:11:49 -03:00
Stevan Pettit
3c1f79f094 Fixed preview edit button not working for custom slides 2011-06-16 00:17:26 -04:00
Jonathan Corwin
f5e619584a Fix error if go next off end of powerpoint 2011-06-15 23:34:40 +01:00
rimach crichter@web.de
d84098348b Head 2011-06-14 22:51:29 +02:00
rimach crichter@web.de
a4c46723a9 Head 2011-06-14 22:43:02 +02:00
Raoul Snyman
5901f959ce Half of bug #795068 fixed. 2011-06-14 21:55:17 +02:00
Raoul Snyman
487b007e49 Fixed bug #763064: Empty line in first verse prevents saving a song. 
bzr-revno: 1641
 2011-06-14 18:39:36 +02:00
rimach crichter@web.de
9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
Raoul Snyman
45d992e956 Fixed bug #763064: Empty line in first verse prevents saving a song. 2011-06-14 08:18:44 +02:00
Raoul Snyman
75d89d22b7 Fixed bug #792204: SongShow Plus importer fails to import song. 2011-06-14 07:45:23 +02:00
rimach crichter@web.de
2c62a819b3 Head 2011-06-13 23:20:20 +02:00
Tim Bentley
a0319d127c One and only Simon Scudder 
bzr-revno: 1636
 2011-06-12 18:56:11 +01:00
Tim Bentley
608910a098 Fix name 2011-06-12 17:02:52 +01:00
Andreas Preikschat
900a817cbf asdf 2011-06-12 17:59:46 +02:00
Tim Bentley
c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat
1cc95fddb6 general thumb clean ups 2011-06-12 17:17:01 +02:00
Andreas Preikschat
81c89e97f1 - fixed crash attempting to add a non existent image to the service 
- fixed display of full presentation path in remote search
- fixed names
- fixed use of 'settingsSection' (the second argument is not a sections, rather a value name <-> using settingsSection is misleading)

bzr-revno: 1635
 2011-06-12 17:00:21 +02:00
Andreas Preikschat
08a3a7aba6 hard coded misleading arguments 2011-06-12 15:01:46 +02:00
Andreas Preikschat
dc2bafaab9 removed not needed variable, removed obsolete comments 2011-06-12 14:13:04 +02:00
Andreas Preikschat
869ab41cad - fixed crash attempting to add a non existent image to the service 
- fixed display of full presentation path in remote search
- fixed names
- fixed hard coded 'setting section'
 2011-06-12 13:51:23 +02:00
Raoul Snyman
facbcfcbfc Fixed grammar. 2011-06-12 09:51:50 +02:00
Raoul Snyman
4014267300 Fixed various strings. 2011-06-11 23:43:08 +02:00
Stevan Pettit
30b56d6fee Moved signals to end of SetupUI 2011-06-11 08:48:11 -04:00
Jonathan Corwin
d26c1b20f8 A few more from IRC 2011-06-11 09:41:32 +01:00
Jonathan Corwin
0c6049917a Head 2011-06-11 09:32:36 +01:00
Andreas Preikschat
76c1cbf4db fixed 'split' string 
bzr-revno: 1627
 2011-06-11 09:39:53 +02:00
Gerald Britton
b068128dfd Add LibreOffice to error messages. 
Standardise error messages.

bzr-revno: 1626
 2011-06-11 09:23:31 +02:00
Jonathan Corwin
ee8b11e4e9 More strings 2011-06-10 22:50:44 +01:00
Andreas Preikschat
c3cb264d93 fixed string 2011-06-10 21:51:51 +02:00
Stevan Pettit
317a12751f Added code to openlp/plugins/bibles/lib/manager.py to skip old_databases during load. (Would we want to delete them)?-----> Removed this change, reverted back to original code. 
Added a routine to openlp/plugins/bibles/lib/db.py to close the DB "Cursor" and "Connection"

Added code to openlp/plugins/bibles/forms/bibleupgradeform.py to "close" the DB so the old DB file can be deleted afrter use.

bzr-revno: 1625
Fixes: https://launchpad.net/bugs/793552
 2011-06-10 20:35:41 +01:00
Gerald Britton
430861030e fix indentation 2011-06-10 15:29:26 -04:00
Gerald Britton
f5980ecfc1 merging changes from trunk 2011-06-10 15:25:38 -04:00
Stevan Pettit
f0dde73530 Remove previous change to skip old_database bibles 2011-06-09 22:55:43 -04:00
Stevan Pettit
729f38f158 Added code to close the oldBibleDB so it can be deleted after conversion 2011-06-09 17:17:04 -04:00
Stevan Pettit
1bdfd60d52 Skip old-database's during bible loading 2011-06-09 11:26:13 -04:00
Andreas Preikschat
c298146b1f give the title edit focus when creating a new customs 2011-06-09 17:14:41 +02:00
Jonathan Corwin
56783d8a41 Fix Bible error message if search from remote 2011-06-08 21:03:32 +01:00
rimach crichter@web.de
c628b3aa09 bugfixing 2011-06-08 16:49:48 +02:00
rimach crichter@web.de
592af0e181 bugfixing 2011-06-08 15:18:05 +02:00
Stevan Pettit
4213dad51c Confirm delete of Custom item 2011-06-07 21:37:07 -04:00
rimach crichter@web.de
ac7126d929 head 2011-06-06 21:20:19 +02:00
rimach crichter@web.de
cd1bf815d1 corrections 2011-06-06 21:19:35 +02:00
rimach crichter@web.de
43fe38c129 sync 2011-06-06 21:12:14 +02:00
Andreas Preikschat
b5810b271e fixed bug #788770 2011-06-06 08:03:06 +02:00
rimach crichter@web.de
dbce448da1 update 2011-06-05 23:10:49 +02:00
Armin Köhler
c85e953d4e remove unnecessary code 2011-06-05 19:39:13 +02:00
Armin Köhler
1b2956a9e6 remove unnecessary code 2011-06-05 19:33:46 +02:00
Armin Köhler
346bf24267 changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog 2011-06-05 14:40:26 +02:00
Armin Köhler
52bab3e415 Fix right parent for all used dialogs 
small fixes
 2011-06-04 22:35:24 +02:00
Armin Köhler
522e68c38c Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing booklist of a bible from biblegateway 
changed log usage
 2011-06-04 21:34:36 +02:00
Armin Köhler
937cfd2260 Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible 
If upgrade fails new bible databases now should be deleted always
 2011-06-04 20:43:59 +02:00
Jonathan Corwin
9230fbb116 In a song, replace apostrophes with an empty string instead of a space. This allows the searcher to find words containing "it's" and "Lord's" should they type "its" or "Lords" (and vice versa). 
Also reinstate the setting of search_lyrics by clean_song.

bzr-revno: 1612
 2011-06-04 17:07:42 +01:00
Armin Köhler
7e519464f6 Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles. 
bzr-revno: 1611
 2011-06-04 14:52:26 +01:00
Armin Köhler
c4e6e91c81 change log usage 2011-06-03 14:43:54 +02:00
Jonathan Corwin
9aed776186 Change presentation log.exceptions to log.warn's 2011-06-03 07:52:16 +01:00
Armin Köhler
59f520ab6c - Fix bug #788762: only show the "No matching book" dialog once. 
- If a second Bible is chosen, text search results will only contain passages which are in both Bibles.

bzr-revno: 1608
 2011-06-03 07:43:02 +02:00
Stevan Pettit
a10038991b Fixed bug-789102. "Editing song via service and saving it, highlights it in media manager" 
bzr-revno: 1607
Fixes: https://launchpad.net/bugs/789102
 2011-06-03 07:20:56 +02:00
Stevan Pettit
4b20a3571f Song add clears search 2011-06-02 23:39:28 -04:00
Jonathan Corwin
604394a2eb head 2011-06-02 22:17:14 +01:00
Jonathan Corwin
d4031a62d3 More apostrophes 2011-06-02 22:13:32 +01:00
Andreas Preikschat
847d69cd2f - removed dangling list 
- added debug message
- do not show an error message when the directory does not exist, instead create one
- do not override the file class
- clean ups

bzr-revno: 1605
 2011-06-02 15:09:37 +02:00
Armin Köhler
eda3e9ebe0 change log usage 2011-06-02 13:52:06 +02:00
Armin Köhler
6bce97895d - Fix problems with non-ascii book names on Biblegateway 
- Fix download problem with first verse on Biblegateway
- Remove unnecessary whitespace

bzr-revno: 1604
 2011-06-02 13:04:39 +02:00
Armin Köhler
0b2cd7d936 Change string 2011-06-02 13:01:41 +02:00
Armin Köhler
877ea4e13d Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles. 2011-06-02 12:42:42 +02:00
Armin Köhler
8067f669b1 Fix Bug 788762 - error "No matching book" is now only shown once 
If a Second Bible is choosen Text Search Results contains now only Passages which are in both bibles.
 2011-06-02 07:45:02 +02:00
Jonathan Corwin
364de1af86 aphrostrophe fix for song searching 2011-06-01 23:47:42 +01:00
Stevan Pettit
0969f4ffc3 Removed repeated calls to self.initalize() 2011-06-01 17:06:45 -04:00
Gerald Britton
8760f54674 Change messages to refer to OpenOffice or LibreOffice 2011-06-01 15:53:14 -04:00
Gerald Britton
7459255b65 Add robustness to Generic document and Songs of Fellowship importers. 
bzr-revno: 1601
 2011-06-01 17:43:29 +02:00
Andreas Preikschat
b9dfd1f7d2 more spelling fixes 2011-06-01 14:08:40 +02:00
Andreas Preikschat
6b1f8f36f2 fixed spelling 2011-06-01 11:35:08 +02:00
Andreas Preikschat
91718326ea removed dangling list 2011-06-01 08:47:19 +02:00
Andreas Preikschat
d7ebb73fd1 - do not show an error message when the directory does not exist, instead create items 
- trivial clean ups
 2011-06-01 08:24:35 +02:00
Andreas Preikschat
9a81e8dbe6 added blank line 2011-06-01 07:46:34 +02:00
Andreas Preikschat
4c81ac295d r1600 2011-06-01 07:43:41 +02:00
Andreas Preikschat
4ce960d0cc do not override the file class 2011-06-01 07:42:56 +02:00
Gerald Britton
6856e3ef44 Ensure exception is raised if all attempts to connect with uno fail 2011-05-31 16:05:47 -04:00
Gerald Britton
6a6d0aa64d Log failing imports 
bzr-revno: 1600
 2011-05-31 21:01:49 +02:00
Raoul Snyman
6572e7a225 Removed the int typecast and removed executable permissions from the json2.js file. 2011-05-31 20:20:23 +02:00
Raoul Snyman
09d63871d8 Converted the impromptu page to a dialog for better usability and more translation flexibility. 2011-05-31 19:36:32 +02:00
Gerald Britton
367dfa4585 Merging trunk changes 2011-05-31 10:58:03 -04:00
Stevan Pettit
227cd75b5c Cleanup whitespace, remove debug prints 2011-05-31 10:02:44 -04:00
Raoul Snyman
de56462c8f Pull the translated plugin names through. 2011-05-31 14:30:21 +02:00
Stevan Pettit
b52d00a623 Update local branch from trunk 2011-05-31 08:17:23 -04:00
Raoul Snyman
5c943ff1eb Fixed up another missing translation. 2011-05-31 13:58:18 +02:00
Raoul Snyman
2df9e6a55a Fixed up some more missing translations. 2011-05-31 13:30:04 +02:00
Raoul Snyman
9f7a96c315 Fixed up some missing translations. 2011-05-31 13:25:35 +02:00
Raoul Snyman
ee151cde2a Fixed bug #790382 by using the Mako template engine to pass Python variables into the template. 2011-05-31 12:59:05 +02:00
Armin Köhler
63102855e8 remove unnecessary whitespace 2011-05-31 09:31:38 +02:00
Armin Köhler
efc678d518 bug fix 2011-05-31 09:26:44 +02:00
Stevan Pettit
729fe2cfa3 bug-789102, moved mediaitem list updates out of editforms into mediaitems 2011-05-30 23:52:17 -04:00
Gerald Britton
cde0eb5ab5 Only import uno exceptions if not running Windoes 2011-05-30 17:15:34 -04:00
Armin Köhler
8a8580f359 Fix unicode bookname handling on Biblegateway 2011-05-30 22:58:30 +02:00
Armin Köhler
77281d3142 Change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search if a second bible is choosen the lists refresh and contain only books which are in both bibles. 
bzr-revno: 1597
 2011-05-30 21:53:47 +01:00
Gerald Britton
934a70b955 Relocate import logging statement 2011-05-30 16:14:36 -04:00
Raoul Snyman
3683e99152 Fix bug #714510 by removing the unnecessary indexes and defaulting the song_book_id on the songs table to NULL instead of 0. 
bzr-revno: 1596
 2011-05-30 22:03:09 +02:00
Armin Köhler
e356c5a4a1 HEAD r1595 2011-05-30 22:00:36 +02:00
Armin Köhler
ab3896ce6f removed unnecessary code 2011-05-30 21:41:02 +02:00
Gerald Britton
27b8ec3deb Add exception logging to import.py 2011-05-30 15:19:16 -04:00
Gerald Britton
c8a896cedd Merge changes from trunk 2011-05-30 13:41:56 -04:00
Raoul Snyman
99ae60aba3 Fixed up loading a song from a service. 2011-05-30 13:17:23 +02:00
Raoul Snyman
30ec309ff8 Fixed up various index errors on InnoDB tables. 2011-05-30 08:45:58 +02:00
Jonathan Corwin
3da3dd9869 Head 2011-05-29 21:47:12 +01:00
Armin Köhler
17b97e87a8 HEAD r1593 2011-05-29 19:03:48 +02:00
Andreas Preikschat
571765c84f - changed a few camelCase names 
- changed object names

bzr-revno: 1593
 2011-05-29 18:00:37 +02:00
Andreas Preikschat
fd4d316097 - fixed bug #789143 
bzr-revno: 1592
Fixes: https://launchpad.net/bugs/789143
 2011-05-29 17:59:47 +02:00
Jonathan Corwin
02da22c349 Head 2011-05-29 16:33:09 +01:00
Andreas Preikschat
b56f93aad5 camelCase fixes and shortcut fixes 2011-05-29 08:23:12 +02:00
Jonathan Corwin
975dd3cb00 mediaitem() -> mediaitem 2011-05-28 22:23:07 +01:00
Armin Köhler
81fca6bedb change layout of backup page 
change some strings
 2011-05-28 23:01:27 +02:00
Gerald Britton
caa6639c7b Uglification to conform to weird standards :) 2011-05-28 16:43:33 -04:00
Gerald Britton
336adb7461 Merged updates from trunk 2011-05-28 16:36:46 -04:00
Jonathan Corwin
147c41e16f Fix a couple of parents so the form opens in the right place 2011-05-28 20:38:19 +01:00
Jonathan Corwin
82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Andreas Preikschat
64b9b42321 better solution 2011-05-28 19:01:41 +02:00
Andreas Preikschat
5bedf62ec4 added more code back 2011-05-28 18:30:16 +02:00
Andreas Preikschat
6507b431b0 fix for older versions 2011-05-28 18:25:11 +02:00
Armin Köhler
9b9f47a5be small fix 2011-05-28 15:33:15 +02:00
Armin Köhler
6a1ee02cdd add Backup page to the wizard 
remove blank item on Combobox in BookNameForm
 2011-05-28 14:48:10 +02:00
Jonathan Corwin
01a89abe52 merge fixes 2011-05-28 11:15:10 +01:00
Jonathan Corwin
500ce5f720 head 2011-05-28 11:06:34 +01:00
Jonathan Corwin
4138d6fbd0 Change lots of parents 2011-05-28 10:53:37 +01:00
Armin Köhler
e550665b23 bug fix 2011-05-27 23:11:53 +02:00
Armin Köhler
5f9b23f8e7 remove unnecessary line 2011-05-27 22:53:46 +02:00
Armin Köhler
b4303195c3 HEAD 2011-05-27 22:50:57 +02:00
Armin Köhler
8699e36b37 HEAD r1586 2011-05-27 22:38:06 +02:00
Armin Köhler
010373b798 Fixed Traceback if BookNameDialog was canceled while upgrading non webbibles 
Replace LineEdit in BookNameDialog with Label
 2011-05-27 22:33:23 +02:00
Andreas Preikschat
42a8a4407e fixed bug 789143 
Fixes: https://launchpad.net/bugs/789143
 2011-05-27 16:28:38 +02:00
Andreas Preikschat
8ffb05bae3 - Improved 'Auto Select' feature 
- Fixed a traceback which occurs when you click the "Add" button in the slidecontroller when you are not previewing an item.
- Improved parentage
- clean ups

bzr-revno: 1584
 2011-05-27 13:59:19 +02:00
Armin Köhler
8eb261ee88 bug fixes 
setFocus to the Combobox in booknameform
 2011-05-27 11:39:58 +02:00
Andreas Preikschat
59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Armin Köhler
e5231aba41 change using old bible databases in bibleupgradeform 2011-05-27 11:23:46 +02:00
Jonathan Corwin
ee00c84dba Remove the index from the search_lyrics column to allow OpenLP to work with a MySQL MyISAM database 
bzr-revno: 1581
 2011-05-27 09:21:23 +01:00
Armin Köhler
d3148f90f8 fix Traceback like Jonathan recommand 2011-05-27 09:54:49 +02:00
Stevan Pettit
35e6d2f97e Fix bug #788084, modified code to use object id instead of title. 
bzr-revno: 1580
 2011-05-27 07:52:45 +02:00
Armin Köhler
af38bf7cc8 HEAD r1578 2011-05-26 22:41:19 +02:00
Armin Köhler
f29830b98e change BookNameDialog like Raoul want. 2011-05-26 22:38:07 +02:00
Andreas Preikschat
39537f9ef7 fixed bug 788770 
Fixes: https://launchpad.net/bugs/788770
 2011-05-26 22:17:52 +02:00
Armin Köhler
b5c392112b test close database 2011-05-26 22:15:38 +02:00
Armin Köhler
c435127585 some fixes in relation with the extened LanguageForm 
close cursor from OldBibleDB
 2011-05-26 21:13:11 +02:00
Gerald Britton
dc2a304b16 Merge changes from trunk 2011-05-26 14:20:40 -04:00
Gerald Britton
74e47dcbc7 Add specific error messages for file problems. 
Remove unicode strings in calls to translate()
 2011-05-26 14:20:14 -04:00
Tim Bentley
acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Jonathan Corwin
40222b23c8 Remove index from search_lyrics for mysql - myisam 2011-05-26 17:35:44 +01:00
Tim Bentley
8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Gerald Britton
e70ba41373 Add specific error messages if OoO open fails. Use a lambda to avoid repetition 2011-05-26 09:35:01 -04:00
Gerald Britton
c70c1a7c1a Merge changes from trunk 2011-05-26 09:10:46 -04:00
Armin Köhler
24d7b7b038 small spelling change 2011-05-26 09:34:29 +02:00
Armin Köhler
f3864cb4aa HEAD r1572 2011-05-26 09:27:50 +02:00
Armin Köhler
6486d41b8c correct some words and code 
changed behaviour if the "cancel" button is pressed while upgrading
 2011-05-26 09:25:17 +02:00
Armin Köhler
2930510461 change languageform like Raoul suggest 2011-05-26 09:00:40 +02:00
Raoul Snyman
38000b5e56 Give the media items the ability to do something when they are "focused". 
Make the search edits on the Songs, Bibles and Custom media items focus when the item is selected.
 2011-05-26 08:23:22 +02:00
Meinert Jordan
548e41f15c Localized sorting for various lists. 
bzr-revno: 1572
 2011-05-26 07:37:52 +02:00
Tim Bentley
3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Stevan Pettit
4f857f8921 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-25 23:34:42 -04:00
Gerald Britton
4399fc108f Fixed a silent error when OpenOffice fails to open a file.\ 
Also, added the file name to the exception log and made the exception explicit
 2011-05-25 17:38:32 -04:00
Andreas Preikschat
6e235f6bff - Fixed bug #786896 
- New display tag {br}
- Better regex usage in the SongBeamer import

bzr-revno: 1571
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 23:11:15 +02:00
Gerald Britton
3b7debfe81 merged with trunk 2011-05-25 16:41:23 -04:00
Armin Köhler
0f98c4fd8f change behaviour if "Cancel" button is pushed. 2011-05-25 22:20:17 +02:00
Armin Köhler
175d6cebb2 add Bible Name to LanguageDialog 
renamed "Importing" to "Upgrading" and "Choose" to "Select"
fixed traceback while textsearch
removed unnecessary code
 2011-05-25 21:13:37 +02:00
M2j
7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Armin Köhler
e8cdba44be small clean up 2011-05-25 16:52:46 +02:00
Armin Köhler
dd4543ad2d HEAD r1569 2011-05-25 16:29:16 +02:00
Armin Köhler
0c83471ee4 move some code 
stop moving bibles to subfolders
some fixes
 2011-05-25 16:18:03 +02:00
Andreas Preikschat
cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Andreas Preikschat
10f59d0313 started to fix camelCase names 2011-05-25 09:59:51 +02:00
Gerald Britton
de7b7a072a fix up error messages in ooimport.py 2011-05-24 19:14:49 -04:00
Raoul Snyman
8c9728c3b2 HEAD 2011-05-24 22:53:41 +02:00
Raoul Snyman
7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Gerald Britton
36e5406b14 Merge trunk changes 2011-05-24 16:41:56 -04:00
Gerald Britton
d05c349f41 Catch common errors during import and report to user 2011-05-24 16:41:14 -04:00
rimach crichter@web.de
4ab7f93044 Sync 2011-05-24 22:05:02 +02:00
rimach crichter@web.de
82a14745e3 cleanup, correct settings tab 2011-05-24 22:03:57 +02:00
Raoul Snyman
da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Andreas Preikschat
d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +02:00
Andreas Preikschat
5473d3c817 added windows comment 2011-05-24 07:23:28 +02:00
M2j
06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
rimach crichter@web.de
d39ecb8e8e Sync 2011-05-23 21:42:10 +02:00
rimach crichter@web.de
d54ef615b4 cleanup, add settings tab 2011-05-23 21:37:44 +02:00
Andreas Preikschat
ce5c354e06 fix for head 2011-05-23 13:49:14 +02:00