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

4281 Commits

Author SHA1 Message Date
Tim Bentley
2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
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
Andreas Preikschat
987cd14fbf r1564 2011-05-23 13:16:28 +02:00
Andreas Preikschat
73293c2985 removed imports 2011-05-23 13:14:05 +02:00
Andreas Preikschat
594caf0a19 fix for windows 2011-05-23 12:34:42 +02:00
Tim Bentley
b6a85d0405 Add Split items to songs and custom, improve impress error handling 
bzr-revno: 1564
 2011-05-23 05:59:35 +01:00
Tim Bentley
50a81cc3c9 png not jpg 2011-05-22 19:50:34 +01:00
Tim Bentley
b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00
Tim Bentley
37679fc1db Finish slide spltting code 2011-05-22 14:08:43 +01:00
Jonathan Corwin
ac29839151 Add items to service via the search on the web remote 
bzr-revno: 1562
 2011-05-22 12:56:22 +01:00
Stevan Pettit
08932ad664 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-21 21:29:09 -04:00
Jonathan Corwin
031525b0e6 Lose the [None] and fix jquery issue 2011-05-21 18:43:37 +01:00
Stevan Pettit
23e95892ec modified: 
openlp/plugins/songs/lib/wowimport.py
pending merges:
  Gerald Britton 2011-05-21 [merge] Words of Worship import where a file m...
    Gerald Britton 2011-05-20 Fix Words of Worship import to issue error...
 2011-05-21 10:49:25 -04:00
Jonathan Corwin
218ee2db2b tweak the jquery 2011-05-21 10:14:30 +01:00
rimach crichter@web.de
578e0fea3f cleanups, add settings dialog 2011-05-21 10:18:52 +02:00
Stevan Pettit
48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Jonathan Corwin
732f5321dd indent 2011-05-20 23:32:46 +01:00
Jonathan Corwin
bbbf0d3435 Go live/add to service via list 2011-05-20 23:30:20 +01:00
Andreas Preikschat
f753070f53 fix for windows 2011-05-20 19:06:38 +02:00
Gerald Britton
a5a8c0d6d2 Fix Words of Worship import to issue error message for files missing the expected header 2011-05-20 12:34:44 -04:00
Andreas Preikschat
5a7aa2fb9f do not override list 2011-05-20 17:18:57 +02:00
Andreas Preikschat
3359726be2 improved media item sorting 2011-05-20 17:14:10 +02:00
Jonathan Corwin
d4e83ae45a Remote web add to service 2011-05-20 00:09:42 +01:00
Stevan Pettit
af5fdcf73d modified: 
openlp/plugins/custom/lib/mediaitem.py
 2011-05-19 18:34:46 -04:00
Stevan Pettit
206ee04db6 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-19 18:20:00 -04:00
Tim Bentley
32127d51bb Add Search to Custom 
bzr-revno: 1557
 2011-05-19 17:10:49 +01:00
Stevan Pettit
fc5b72b0b4 Add the ability to double-click a slide entry in custom to edit the slide. 
bzr-revno: 1556
 2011-05-19 07:37:05 +02:00
Andreas Preikschat
f537f91939 Improved regex usage. 
bzr-revno: 1555
 2011-05-19 07:29:50 +02:00
Tim Bentley
0c2196339a Fix search order 2011-05-19 05:48:10 +01:00
Tim Bentley
cff081066f Head 2011-05-19 05:42:10 +01:00
Stevan Pettit
e3ca10b46f modified: 
openlp/plugins/custom/forms/editcustomform.py
 2011-05-18 23:19:36 -04:00
Armin Köhler
8c308ac4f8 Fixed bug #779995: FoilPresenter songs with verses without text cause a traceback. 
bzr-revno: 1554
 2011-05-18 22:56:18 +02:00
Armin Köhler
674260eadb fix bug https://bugs.launchpad.net/openlp/+bug/779995 2011-05-18 21:07:08 +02:00
Jonathan Corwin
7b534642b9 Plan B. Figure out what the code is actually meant to be doing 2011-05-18 19:59:36 +01:00
Jonathan Corwin
3add2de140 Fix song editing what I did broke. Oops 2011-05-18 19:32:18 +01:00
Armin Köhler
c51d8182a6 delete all sucessfull imported bibles by default 
remove the possibility to choose which bibles should be deleted after the upgrade
 2011-05-18 20:19:11 +02:00
Armin Köhler
236ca44105 HEAD r1552 2011-05-18 20:00:40 +02:00
Tim Bentley
d6ea529411 Fix description 2 2011-05-18 16:01:33 +01:00
Tim Bentley
67be2937be Fix description 2011-05-18 15:34:35 +01:00
Tim Bentley
509811620d Head 2011-05-18 15:27:29 +01:00
Andreas Preikschat
4cd23308b8 regex clean ups 2011-05-18 16:26:19 +02:00
Jonathan Corwin
2d5d16b40b Return filename in text for non-text types. Display verse tag in remote view 2011-05-17 23:00:50 +01:00
Jonathan Corwin
0323dfcb90 Add ability to search and go live on all media manager items via the web remote. Also tweak the web interface to fit better on a phone screen 
bzr-revno: 1550
 2011-05-17 22:22:24 +01:00
rimach crichter@web.de
43a55c7087 Sync 2011-05-17 23:11:46 +02:00
rimach crichter@web.de
aebc0e240e further progress 2011-05-17 21:50:00 +02:00
Jonathan Corwin
7a857290a6 More fixes 2011-05-17 19:48:04 +01:00
Jonathan Corwin
5fcb41bc9d fixes 2011-05-16 22:01:21 +01:00
Tim Bentley
a66b582484 Head 2011-05-16 18:59:02 +01:00
Tim Bentley
dfbf368c8a Sort images 2011-05-16 18:58:52 +01:00
Andreas Preikschat
b92d437a8d - fixed a traceback which occurred when performing a text search but no bible is available 
bzr-revno: 1549
 2011-05-16 13:13:57 +02:00
Jonathan Corwin
274c4ee87a tidies 2011-05-15 21:53:25 +01:00
Jonathan Corwin
f701eb9417 Head 2011-05-15 21:34:32 +01:00
Jonathan Corwin
2655c1b133 Remote searches presentations, media and images 2011-05-15 21:03:45 +01:00
Tim Bentley
070d719961 Fixes 2011-05-15 20:18:50 +01:00
Tim Bentley
387c911fdb Head 2011-05-15 20:07:53 +01:00
Tim Bentley
70660b7b71 Add Search to Custom and cleanups 2011-05-15 20:07:40 +01:00
Armin Köhler
fbd5349c2f small bugfixes 
hide entry in tools menu if there are no bibles to upgrade
 2011-05-15 20:42:08 +02:00
Jonathan Corwin
3f21b3e2ca Remote custom search. Revert a few remote web changes 2011-05-15 19:33:00 +01:00
Armin Köhler
b10fbf98eb HEAD r1547 2011-05-15 16:22:04 +02:00
Andreas Preikschat
cbdaf3334b fixed spelling 2011-05-15 15:10:21 +02:00
Andreas Preikschat
909cbfb176 - Move the No Search Results code. (I do not expect the code to be used by another QListWidget.) 
- Remove setUniformItemSizes

bzr-revno: 1546
 2011-05-15 15:08:16 +02:00
Andreas Preikschat
a2db0a1b5d fixed traceback when doing a text search without bible 2011-05-15 15:06:16 +02:00
Andreas Preikschat
4baaedc710 - Prevent adjusting the loop delay spin box (on the Gerneral Tab) to 0. 
- Changed title for the stage view html.

bzr-revno: 1545
 2011-05-15 14:57:25 +02:00
Andreas Preikschat
685bd32ccc r1544 2011-05-15 14:11:33 +02:00
Andreas Preikschat
c728559862 moved 'No Search Results' code 2011-05-15 14:11:08 +02:00
Andreas Preikschat
6d1ec4ae10 - prevent setting the loop delay spin box to 0 
- Changed title for the stage view html
 2011-05-15 12:38:11 +02:00
Jonathan Corwin
357d34a4d8 Remote bible search. Kludgy and probably broken something or going to conflict. Also tweaked Remote web interface 2011-05-14 22:25:22 +01:00
Raoul Snyman
3774bf2312 Added layout style to advanced tab. 
Made search edit focused on switch to quick tab.
Reordered methods to: private, inherited, slots, additional.
 2011-05-14 22:12:01 +02:00
Jonathan Corwin
75414d2ba8 Fix a couple of things 2011-05-14 13:26:05 +01:00
Andreas Preikschat
d22cacd982 Fixed a traceback which is occurs when you "lock" the search and do not select a dual bible (quick tab). 
bzr-revno: 1542
 2011-05-14 12:50:47 +02:00
Jonathan Corwin
047287950c Remote song search and go live beginnings 2011-05-14 10:48:58 +01:00
Andreas Preikschat
b04e688647 fixed attribute error 2011-05-13 22:59:14 +02:00
Andreas Preikschat
b1979857e4 complete fix 2011-05-13 21:58:05 +02:00
Andreas Preikschat
1f4bc114a9 Fixed traceback, when 'locked' and no dual bible selected. 2011-05-13 21:44:34 +02:00
Jonathan Corwin
55a5480ea4 Stage view changes: show all slides for a verse and tidy verse tags 
bzr-revno: 1540
 2011-05-13 18:43:38 +01:00
Andreas Preikschat
31cebdf4f7 added missing period 2011-05-13 17:34:56 +02:00
Jonathan Corwin
ef5c4bc7d4 Detect repeat verses 2011-05-12 22:55:45 +01:00
Armin Köhler
4ffa5c59d7 change some strings to better english 
small fixes
 2011-05-12 22:04:33 +02:00
Armin Köhler
d1f8e9f275 HEAD 1535 2011-05-12 21:17:30 +02:00
Raoul Snyman
dd68784555 Some enhancements to the Bibles media item. 
bzr-revno: 1535
 2011-05-12 20:10:09 +02:00
Raoul Snyman
d168987a9f Fixed a missing full stop in a tool tip. 2011-05-12 13:55:53 +02:00
Andreas Preikschat
01e4b8641c corrected use of VerseTags 
bzr-revno: 1534
 2011-05-12 13:10:52 +02:00
Raoul Snyman
e55e9f284a Dropped the results dropdowns in favour of a toggle button. 2011-05-12 01:59:04 +02:00
Raoul Snyman
5e954d86b6 Changed from a QTabWidget to QTabBar, giving us resizeable tabs. 2011-05-12 01:25:11 +02:00
Jonathan Corwin
e940279b34 More stageview changes 2011-05-12 00:16:53 +01:00
Jonathan Corwin
3e1bdc7475 More stageview changes 2011-05-11 23:32:25 +01:00
Andreas Preikschat
9709429261 r1532 2011-05-11 10:13:10 +02:00
Jonathan Corwin
c5656fbfd9 Remote hostname fix. Remove tags from remote text 
bzr-revno: 1532
 2011-05-10 22:17:02 +01:00
rimach crichter@web.de
2ccf6a67fa sync 2011-05-10 22:54:26 +02:00
rimach crichter@web.de
d4162e814c next steps 2011-05-10 22:39:17 +02:00
Andreas Preikschat
78c3c3ef39 clean up 2011-05-10 16:08:11 +02:00
Andreas Preikschat
a042ef1132 fix for ticket 155 
bzr-revno: 1530
 2011-05-10 13:15:54 +02:00
Gerald Britton
71818097cd Fix for bug #762856. 
bzr-revno: 1529
Fixes: https://launchpad.net/bugs/762856
 2011-05-10 13:14:56 +02:00
Andreas Preikschat
c60ebb40b2 fix for ticket 155 2011-05-09 15:58:17 +02:00
Andreas Preikschat
b04292a9c6 Display "No Search Results" if the search did not match any song/bible verse. 
bzr-revno: 1527
Fixes: https://launchpad.net/bugs/739759
 2011-05-09 10:29:32 +02:00
Jonathan Corwin
2c76faca48 u 2011-05-08 20:31:44 +01:00
Jonathan Corwin
61b3a8e19b head 2011-05-08 20:28:04 +01:00
Jonathan Corwin
a293be51e8 Local hostname fix. remote now returns just text. New html element to return html 2011-05-08 20:26:32 +01:00
Andreas Preikschat
2a0f3b272a r1522 2011-05-08 15:21:00 +02:00
Andreas Preikschat
55e4bad542 display 'No Search Results' if no song/bible verse matched the search keyword (bug #739759) 
Fixes: https://launchpad.net/bugs/739759
 2011-05-08 13:35:10 +02:00
Andreas Preikschat
a4e5d290a3 - changed a few loops to list comprehensions 
- fixed unclosed file
- attempt to reduce possible tracebacks when running two instances of the FRW

bzr-revno: 1525
 2011-05-08 13:08:28 +02:00
Jonathan Corwin
7103d98dba Just add a couple of links... 2011-05-07 23:19:42 +01:00
Andreas Preikschat
c07f2f40c5 r1522 2011-05-07 13:06:43 +02:00
Jonathan Corwin
1a3626ef13 no newline at end of file... 2011-05-07 09:54:06 +01:00
Jonathan Corwin
9715e6dd1f more refixes 2011-05-07 09:27:43 +01:00
Jonathan Corwin
547b58e7b5 remove link on remote, add /stage shortcut plus tidies and refix 2011-05-07 09:18:02 +01:00
Jonathan Corwin
03380fb40f head 2011-05-06 23:00:52 +01:00
Jonathan Corwin
5c6639e95b Fix remote bug if same item in service twice. More stage view tweaks 2011-05-06 23:00:18 +01:00
Andreas Preikschat
80f7aa2cc9 r1522 + resolved conflicts 2011-05-06 21:15:08 +02:00
Gerald Britton
2def15c12f Bug 762856: Support Bridge section and make more robust error recovery 2011-05-06 13:56:58 -04:00
Andreas Preikschat
6cb329dbc4 - fixed missing periods in tooltips 
- removed period from string

bzr-revno: 1522
 2011-05-06 11:17:16 +02:00
Andreas Preikschat
4f2740cbb0 Fixed the songshowplus importer returning when it shouldn't (as pointed out by jerryb) 
bzr-revno: 1521
 2011-05-06 10:44:52 +02:00
Andreas Preikschat
7854c664e8 added blank lines 2011-05-06 09:41:29 +02:00
Jonathan Corwin
764ca4d9c5 Stage view 2011-05-06 08:40:02 +01:00
Andreas Preikschat
82a509c012 fixed strings 2011-05-06 09:38:51 +02:00
Andreas Preikschat
68c1236a2a 2011-05-06 07:17:13 +02:00
Andreas Preikschat
de54c419ce fixed songshowplus importer 2011-05-06 06:36:22 +02:00
Jonathan Corwin
de9754caf1 Well one standard learnt. Probably a few more to go... 2011-05-05 19:48:11 +01:00
Andreas Preikschat
e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Andreas Preikschat
0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Jonathan Corwin
9388055376 where did that space come from? 2011-05-04 23:42:35 +01:00
Jonathan Corwin
cce8556b45 remote browser: detect change of song, and Android browser ajax cache issue 2011-05-04 23:34:43 +01:00
Andreas Preikschat
307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Armin Köhler
4ee247c8b1 code cleanup 
small fixes
 2011-05-03 22:34:39 +02:00
Armin Köhler
368987bb67 code cleanup 2011-05-03 19:09:30 +02:00
Armin Köhler
d44b42aaff improve BookNameForm (add possibility to reduce the books in the ComboBox and try to autodetect if a bible only contains only parts of a bible, so that only a part of the bible books are displayed at startup) 2011-05-03 13:44:23 +02:00
Armin Köhler
4bee8ca5f6 add a dialog at startup which inform the user that the bible format has changed and provide a possibility to upgrade 
small cleanup
 2011-05-03 09:41:03 +02:00
Armin Köhler
b9204fa62b small changes 2011-05-02 20:20:38 +02:00
Armin Köhler
3eca8f6b50 updated bibles_resources.sqlite with some additional apocryph books 
comparing books with lower()
display only which are not added to a bible in BookNameForm
small fixes
 2011-05-02 15:45:30 +02:00
Armin Köhler
5b93b821b8 HEAD r1511 2011-05-02 15:24:25 +02:00
Armin Köhler
b4c3d1d5ae code cleaning 2011-05-02 06:21:18 +02:00
Andreas Preikschat
ccdd666c72 Fixed the alignment of the Quick Search Tab. (Bug #769998) 
bzr-revno: 1510
Fixes: https://launchpad.net/bugs/769998
 2011-05-01 20:01:00 +02:00
Andreas Preikschat
53fe9666d2 fixed long line 2011-05-01 15:27:19 +02:00
Andreas Preikschat
e0b862a897 fixed alignment of the quick tab (bug #769998) 
Fixes: https://launchpad.net/bugs/769998
 2011-05-01 15:11:47 +02:00
Tim Bentley
8085ffee74 Remove line 2011-05-01 08:21:55 +01:00
Tim Bentley
54e1674803 Head push 2011-04-30 18:36:28 +01:00
Tim Bentley
f6537acbf4 Updates 2011-04-30 18:36:13 +01:00
Jonathan Corwin
f472807251 os.path.splitext includes the . in the extension! 2011-04-30 17:11:28 +01:00
Tim Bentley
54a3dd8412 Remove not needed var and fix 195 strings 2011-04-30 09:37:28 +01:00
Jonathan Corwin
e9de9bea92 Fix Presentation bugs 773036 and 769513 
bzr-revno: 1505
 2011-04-30 09:13:49 +01:00
Tim Bentley
3b805f6374 Add new thread at startup time 2011-04-30 08:42:20 +01:00
Jonathan Corwin
8bec30cf9c Make Impress changes windows specific 2011-04-30 08:31:03 +01:00
Tim Bentley
9a88a7fcf7 Logging and comments 2011-04-30 06:43:41 +01:00
Jonathan Corwin
6584e6a1ed process events not required 2011-04-29 23:31:39 +01:00
Jonathan Corwin
879dfdbb16 head 2011-04-29 23:29:53 +01:00
Jonathan Corwin
a9df8468aa Minimized impress troubles 2011-04-29 23:29:29 +01:00
Tim Bentley
69395170e1 minor cleanups 2011-04-29 21:08:22 +01:00
Tim Bentley
0f7f03da30 Clean up Phonon media Object creation 
bzr-revno: 1503
 2011-04-29 20:22:20 +01:00
Tim Bentley
189daad93c More improvements 2011-04-29 17:41:26 +01:00
Tim Bentley
1eeebeda1c Add Progressbar 
bzr-revno: 1501
 2011-04-29 14:28:18 +01:00
Andreas Preikschat
5dc73b6a65 started work 2011-04-29 13:33:04 +02:00
Tim Bentley
e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Jonathan Corwin
ebf5777a02 Fix bug 773036 2011-04-29 09:58:10 +01:00
Tim Bentley
7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Tim Bentley
45d90db949 Allow leading space in song title 
bzr-revno: 1500
 2011-04-29 08:42:42 +01:00
Raoul Snyman
80b6135c5a Fixed bug #771529, dealing with 1.9.0 databases. 
bzr-revno: 1499
 2011-04-29 09:22:18 +02:00
Tim Bentley
79dc4948fa Head 2011-04-29 08:11:19 +01:00
Tim Bentley
34838aba06 Fix up Presentation and Image Imports 2011-04-29 08:10:22 +01:00
Andreas Preikschat
44b071680c - modified song <-> xml converter to consider [---] and v1a respectively 
bzr-revno: 1498
 2011-04-29 09:08:53 +02:00
Raoul Snyman
19d085bb3c Changed [:] notation to .startswith(). 2011-04-29 08:28:09 +02:00
Tim Bentley
b6b0819a50 fix the strip code 
Fixes: https://launchpad.net/bugs/742636
 2011-04-29 07:15:10 +01:00
Raoul Snyman
7f1db15ab1 Fixed bug #771529, dealing with 1.9.0 databases. 2011-04-29 01:25:28 +02:00
Tim Bentley
e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Raoul Snyman
d23e564539 Fixed bug #744515, funny quotes in KJV imported from OSIS. 2011-04-27 18:15:35 +02:00
Raoul Snyman
f732d24f35 Fixed bug #744515, OSIS import fails to import certain words in ESV (at least). 2011-04-27 16:54:27 +02:00
Armin Köhler
2f346ee450 small changes 2011-04-26 20:55:13 +02:00
Tim Bentley
3923c14d0c Head 2011-04-26 19:39:32 +01:00
Armin Köhler
3b99f531f3 small fixes 2011-04-26 20:39:08 +02:00
Armin Köhler
6c23c18db5 HEAD r1490 2011-04-26 20:22:36 +02:00
Jonathan Corwin
4e6c61cc01 Fix issues when importing some OpenSong songs. Bug 759586 
bzr-revno: 1490
Fixes: https://launchpad.net/bugs/759586
 2011-04-26 19:18:14 +01:00
Armin Köhler
d7dc4def53 change name from reimport to upgrade 
fix speed problem while changing the advanced bible
change some "for" loops
 2011-04-26 20:18:13 +02:00
Meinert Jordan
62d55814d2 - fix the recreation of the song order to work with single character verse references 
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
 2011-04-26 19:16:13 +01:00
Jonathan Corwin
a080552081 head 2011-04-25 23:37:58 +01:00
Jonathan Corwin
5bc0c27970 OpenSong fixes bug 759586 2011-04-25 23:15:38 +01:00
Andreas Preikschat
77063381d2 call set_defaults() when logging an error 2011-04-25 09:23:45 +02:00
Andreas Preikschat
c12b4bc28f - improved the song importers by allowing to provide feedback to the user. 
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
 2011-04-25 09:06:16 +02:00
Tim Bentley
6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Andreas Preikschat
393f25cd88 fixed a bug where a song's author/topic/songbooks might not be saved 2011-04-24 17:36:12 +02:00
Jonathan Corwin
e352635511 Extra location checks for pptview.exe. Remove dll from bzr and change windows build to create it (without debug) 
bzr-revno: 1480
 2011-04-23 12:33:27 +01:00
Andreas Preikschat
ba45d7e113 fixed names; hide/show menu entries when disabeling/enabeling the songs plugin 2011-04-21 19:14:07 +02:00
Armin Köhler
8e1ef8c890 little bug fix 
add check if openlp/bibles/resources directory exists and mkdir if not
 2011-04-21 16:32:04 +02:00
rimach crichter@web.de
e730dc366f add vlc support 2011-04-21 15:54:44 +02:00
M2j
2582b33768 syntax fix 2011-04-21 11:02:41 +02:00
M2j
8439d1ed4f fix verse order rebuild to handle single character verse references 
rename variable to avoid using the 'type' keyword
 2011-04-21 10:53:48 +02:00
Jonathan Corwin
c0b0c1a82d tabs to spaces *grr at VC++* 2011-04-21 08:35:17 +01:00
Jonathan Corwin
09d101311c head 2011-04-21 08:30:14 +01:00
Jonathan Corwin
f3f1836150 remove pptviewlib.dll and build it via windows-builder.py 2011-04-21 00:21:31 +01:00
Jonathan Corwin
c402e5c075 non-debug version of dll 2011-04-20 19:01:25 +01:00
Andreas Preikschat
8cd3742c87 added textEdit and buttons for better feedback 2011-04-20 19:36:16 +02:00
Armin Köhler
b0b127022c bug fixes 
add some additional Apocrypha books
 2011-04-20 11:00:29 +02:00
Armin Köhler
a0643be598 HEAD r1477 2011-04-20 09:25:53 +02:00
Armin Köhler
81fe6f13e3 add attention picture 2011-04-20 09:25:16 +02:00
Armin Köhler
d508d2f415 HEAD r1477 2011-04-20 09:09:17 +02:00
Armin Köhler
e8c2d7e805 add reimportwizard for older bible databases 2011-04-19 22:25:27 +02:00
Andreas Preikschat
48d0d39a17 ask before creating an error report 
copy not imported files to a folder
 2011-04-19 17:55:36 +02:00
rimach crichter@web.de
392b5ecb47 head 2011-04-19 14:10:38 +02:00
rimach crichter@web.de
942fe8a141 further changes 2011-04-19 14:03:36 +02:00
Andreas Preikschat
d45f93b594 return where possible instead of breaking 2011-04-19 13:46:25 +02:00
Andreas Preikschat
3b98cbe0fd fixed OpenSong import 2011-04-19 13:34:04 +02:00
rimach crichter@web.de
50ff8438a0 Video reimplementations issues 2011-04-18 21:50:12 +02:00
Andreas Preikschat
0fa4bee842 r1476 2011-04-18 21:27:02 +02:00
Andreas Preikschat
974a90a173 no xml raises XMLSyntaxError, that is why this is not needed 2011-04-18 21:24:06 +02:00
Andreas Preikschat
6baefdadce more fixes 2011-04-18 20:57:58 +02:00
Andreas Preikschat
757933c448 clean ups 2011-04-18 20:03:41 +02:00
Andreas Preikschat
16fa78bbe3 fixes 2011-04-18 19:15:41 +02:00
Andreas Preikschat
a530851124 added error logger methods 2011-04-18 18:46:22 +02:00
Andreas Preikschat
0398b93f78 started clean up of song importers 2011-04-17 19:24:28 +02:00
Andreas Preikschat
2d02f3e9a0 2011-04-17 17:47:02 +02:00
Andreas Preikschat
6fb421825c r1471 2011-04-17 15:31:13 +02:00
Tim Bentley
b436c34742 Remove blank line 2011-04-17 13:53:35 +01:00
Tim Bentley
4b3d506379 Allow alerts to be sent but not saved 
Fixes: https://launchpad.net/bugs/763066
 2011-04-17 07:26:55 +01:00
Jonathan Corwin
7080e910c2 Further detection efforts 2011-04-16 22:47:54 +01:00
Jonathan Corwin
91d53b7adc Add the dll too 2011-04-16 17:15:08 +01:00
Jonathan Corwin
596c928881 Untidy the code I tided, so it functions correctly! 2011-04-16 17:14:21 +01:00
Armin Köhler
dabc4415d2 HEAD r1469 2011-04-16 14:29:49 +02:00
Armin Köhler
23c8ea8679 small cleanups 2011-04-16 13:52:20 +02:00
Tim Bentley
f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Tim Bentley
24ec1abb56 more changes 2011-04-16 12:36:20 +01:00
Raoul Snyman
8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley
7476b37ba4 Refactor the SettingsTab to be more KDE like. 
Sort out the Tabs parentage
Clean up the code paths to stop the Tab being loaded twice at startup.
Clean up the TAB Hide/Unhide code. Removed it and rebuild the UI if required.
Fix Bible Quick text to say right things.

bzr-revno: 1467
Fixes: https://launchpad.net/bugs/739762
 2011-04-15 21:47:19 +01:00
Jonathan Corwin
78b3b04afa Fix blanking between ppt and songs 
Fix stutter when timed powerpoint starts

bzr-revno: 1466
 2011-04-15 21:38:47 +01:00
Andreas Preikschat
84fdb9bb0a - remember the search type which was used before OpenLP was closed and restore it on startup (Bug #746243) 
bzr-revno: 1465
Fixes: https://launchpad.net/bugs/746243
 2011-04-15 22:32:54 +02:00
Tim Bentley
0b35701e30 Head 2011-04-15 18:14:52 +01:00
Andreas Preikschat
b8db8807fd r1464 2011-04-15 18:15:37 +02:00
Andreas Preikschat
a13cf49940 idea to improve song import feedback 2011-04-15 18:01:15 +02:00
Andreas Preikschat
237cabfeff only try to import a database when it is a v1 database, clean ups 2011-04-15 16:10:31 +02:00
Andreas Preikschat
14a2e8e4c2 finished work on restoring current search methods 2011-04-15 14:55:56 +02:00
Jonathan Corwin
4286f6389d Switching from ppt to songs now fine 2011-04-14 22:34:01 +01:00
Andreas Preikschat
77559e0210 started to implement #746243 
Fixes: https://launchpad.net/bugs/746243
 2011-04-14 23:32:21 +02:00
Armin Köhler
e8202924f7 delete unused testament stuff 2011-04-14 22:33:02 +02:00
Armin Köhler
77f43e32b9 small cleanups 2011-04-14 22:18:23 +02:00
Tim Bentley
206cd90639 Finished 2011-04-14 19:30:53 +01:00
Armin Köhler
ac120effc8 HEAD r1460 2011-04-14 10:43:09 +02:00
Armin Köhler
df0d9244eb Changed layout of AlternativeBookNamesDB from sqlalchemy to sqlite3 2011-04-14 10:40:30 +02:00
Jonathan Corwin
d45423569f Head 2011-04-13 23:11:21 +01:00
Jonathan Corwin
5f93ff657e PPT's are getting there. Going from blank ppt to song broken now 2011-04-13 23:10:41 +01:00
Tim Bentley
6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Andreas Preikschat
c62c8cbe9e r1460 2011-04-13 20:53:37 +02:00
Andreas Preikschat
9e88d0bff4 clean ups 2011-04-13 20:53:05 +02:00
Tim Bentley
3a6b1def4a r1460 2011-04-13 19:42:01 +01:00
Andreas Preikschat
747bd13b66 - fixed the advanced bible initialisation 
- append a space to the each bible book name to simplify working with the completer

bzr-revno: 1459
 2011-04-13 20:36:25 +02:00
Tim Bentley
0b4fd3c585 r1458 2011-04-13 19:20:09 +01:00
Andreas Preikschat
606287bda1 reverted change 2011-04-13 20:18:25 +02:00
Andreas Preikschat
1a4ee39767 Finished implementing shortcuts, this includes: 
- changing shortcuts,
- saving/loading them to the config, so that they will be restored
- shourtcuts can now be easily added/removed to the action list

- fixed bug #739779.
- fixed "+" shortcut in the service manager
- fixed bug #758206

bzr-revno: 1458
Fixes: https://launchpad.net/bugs/739779, https://launchpad.net/bugs/758206
 2011-04-13 20:08:37 +02:00
Andreas Preikschat
6082785b3e use map; fixed changing quickBible 2011-04-13 16:28:31 +02:00
Andreas Preikschat
2dc2304a2c fixed advanced bible book initialisation; append a space to completion suggestions 2011-04-13 15:31:23 +02:00
Tim Bentley
5f228a69d1 Minor fixes and Bible Label corrections 2011-04-13 06:12:31 +01:00
Andreas Preikschat
e72e9c8952 fixed bug #744337 
bzr-revno: 1457
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 23:20:21 +02:00
Andreas Preikschat
1968991239 r1456 + resolved conflict 2011-04-12 23:07:08 +02:00
Tim Bentley
20fbe4d28d Settings Cleanup part2 2011-04-12 20:32:17 +01:00
Tim Bentley
e00eaba884 Settings Cleanup part1 2011-04-12 18:45:32 +01:00
Armin Köhler
6c047fc83e changed content of book drop list in advanced search. If a second bible is choosen the combobox only contains books which both bibles (first and second) contains. 
changed autocomplete in quick search. If a second bible is choosen it now suggest only books which both bibles contains.
 2011-04-12 13:33:29 +02:00
Andreas Preikschat
9a1be99781 added comments; same fix for import 2011-04-12 11:55:02 +02:00
Andreas Preikschat
962f038c9b fixed bug #744337 
Fixes: https://launchpad.net/bugs/744337
 2011-04-12 11:37:59 +02:00
Armin Köhler
a1c5ece681 HEAD r1456 2011-04-11 22:57:27 +02:00
Armin Köhler
0ad2d85171 small fix 2011-04-11 22:57:00 +02:00
Tim Bentley
6657c49b04 Fix crash in last change which stopped OpenLP starting 
bzr-revno: 1456
 2011-04-11 21:27:23 +02:00
Tim Bentley
427c2a1843 oops 2011-04-11 19:27:01 +01:00
Andreas Preikschat
f24a8f1365 fixed bug #754484 
bzr-revno: 1455
Fixes: https://launchpad.net/bugs/754484
 2011-04-11 20:16:35 +02:00
Tim Bentley
7ba5497764 Improved version 2011-04-11 19:15:02 +01:00
Andreas Preikschat
b669eded5d - disable/enable the next button if a bible/song importer is not available (http://support.openlp.org/issues/113) 
- fixed song importers being available even though they should not.

bzr-revno: 1454
 2011-04-11 20:15:02 +02:00
Tim Bentley
1f91c4c82d if book 2011-04-11 19:02:24 +01:00
Tim Bentley
ad16ba8ef1 Fix missing value 2011-04-11 18:49:14 +01:00
Armin Köhler
0ca3b07ec7 HEAD r1452 2011-04-11 18:23:13 +02:00
Armin Köhler
7cdf2bc320 small cleanups 2011-04-11 18:21:54 +02:00
Andreas Preikschat
53660fe23f enable/disable next button if bible importer is not available 2011-04-11 17:01:42 +02:00
Andreas Preikschat
073d6c8403 disable 'next button' if importer is not available 2011-04-11 16:34:14 +02:00
Andreas Preikschat
de616b9d1a fixed OpenOffice import being available even if OpenOffice is not installed 2011-04-11 16:17:43 +02:00
Tim Bentley
1882c5366d Review fixes 2011-04-10 19:54:26 +01:00
Andreas Preikschat
9dbd54bf8f more fixes 2011-04-10 20:44:27 +02:00
Tim Bentley
c8d2baff7c Add bible verse layout to Quick tab. 
Not moved to Advanced tab as no real estate.

Fixes: https://launchpad.net/bugs/745218
 2011-04-10 08:32:15 +01:00
Tim Bentley
c55df2583a Remove trailing comma 
Fixes: https://launchpad.net/bugs/748960
 2011-04-10 07:27:23 +01:00
Tim Bentley
29ef34b569 Add saving of selected Bible names in Quick and Advanced. 
Clean up combo box selection code (General)

Fixes: https://launchpad.net/bugs/755687
 2011-04-10 07:18:31 +01:00
Andreas Preikschat
9011c85a6b removed static methods 2011-04-09 18:11:02 +02:00
Tim Bentley
e159d87c2a r1449 2011-04-08 16:35:46 +01:00
Jonathan Corwin
78a9c89025 Fix stuttering powerpoint start 2011-04-07 23:57:12 +01:00
Jonathan Corwin
9b04385f34 Blanking and switching between song and ppt and back 2011-04-06 23:54:47 +01:00
Andreas Preikschat
626708df03 r1446 + reverted changes 2011-04-05 16:24:51 +02:00
Armin Köhler
a9c87798eb moved get_book_ref_id_by_name() from BibleManager to BibleDB 
moved content from BookNameDialog() from bibleimport.py in BibleDB.get_book_ref_id_by_name().
 2011-04-03 22:09:18 +02:00
Armin Köhler
3d184f89a4 moved languageDialog() into BIBLEDB.get_language() 2011-04-03 20:44:08 +02:00
Andreas Preikschat
1c35810fa5 fixed bug #749296 
Fixes: https://launchpad.net/bugs/749296
 2011-04-03 19:51:10 +02:00
Andreas Preikschat
9c39f57d5a r1443 2011-04-03 15:37:53 +02:00
Andreas Preikschat
28b83aadae translate categories 2011-04-03 13:36:43 +02:00
Tim Bentley
6445964646 r1442 2011-04-03 07:19:28 +01:00
Tim Bentley
63bfac4b7e Changes continue 2011-04-03 07:19:03 +01:00
Armin Köhler
fbce21baaa new function get_language in BibleDB which ask for the language a bible is and return a language_id 2011-04-02 22:22:35 +02:00
Armin Köhler
9de33cf194 moved Dialog from mediaitem.py to bibleimportform.py 
some fixes
 2011-04-02 21:17:48 +02:00
Jonathan Corwin
27fbd9594b Head 2011-04-02 10:53:08 +01:00
Jonathan Corwin
db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Armin Köhler
c04a76e12d split BibleImportRequest in BookNameForm and LanugageForm 2011-04-01 22:26:25 +02:00
Armin Köhler
1923faf18a HEAD r1441 2011-04-01 19:56:11 +02:00
Armin Köhler
9d1c1b1fbb mark and comment out some unused code in csv import form 
bug fix
 2011-04-01 19:54:12 +02:00
Andreas Preikschat
df4de23df0 Added Theme, Blank, Desktop shortcuts, further clean ups 
Fixes: https://launchpad.net/bugs/739779
 2011-04-01 16:28:25 +02:00
Tim Bentley
fbc94dda3a 1441 2011-04-01 05:48:21 +01:00
Tim Bentley
3155bde0b2 inprogress 2011-04-01 05:48:09 +01:00
Andreas Preikschat
dee95a2f57 r1441 2011-03-31 21:06:09 +02:00
Andreas Preikschat
4ca738e9b3 staticmethod for adding/removing actions 2011-03-31 10:43:19 +02:00
Mattias Põldaru
f73577d708 Undo 2011-03-30 21:52:58 +03:00
Mattias Põldaru
df1db913cd merge 2011-03-30 21:35:48 +03:00
Andreas Preikschat
fb78350a44 added bible actions 2011-03-30 20:27:33 +02:00
Andreas Preikschat
fe92842c6b added ability to remove actions 2011-03-30 12:27:27 +02:00
Andreas Preikschat
253087e2c6 fixed verse sorting, change ### to --- 2011-03-30 09:13:04 +02:00
Tim Bentley
ea6f90fc74 Change === and --- around 2011-03-29 21:38:10 +01:00
Andreas Preikschat
b9b0cbbe9c removed things, as this did not work 2011-03-29 21:52:21 +02:00
Andreas Preikschat
a0798b66bb changed wording 2011-03-29 20:23:01 +02:00
Andreas Preikschat
6342a2aaa0 changed --- to ### 2011-03-29 20:04:16 +02:00
Andreas Preikschat
dabf9d36fe r1437 2011-03-29 20:03:42 +02:00
Andreas Preikschat
d9c2d92c8c 2011-03-29 18:44:36 +02:00
Tim Bentley
2640decffc r1437 2011-03-29 16:49:57 +01:00
Andreas Preikschat
19138cd9e5 started reworking shortcuts 2011-03-29 15:56:49 +02:00
Tim Bentley
2ba0d410fc More Cleanups 2011-03-28 19:56:39 +01:00
Tim Bentley
239b62a488 Render Ester 8:9 on more than 1 page 2011-03-28 18:04:31 +01:00
Andreas Preikschat
5cae56ebb3 - import topics from usr files (txt files seem not to support topics) 
- clean ups

bzr-revno: 1435
 2011-03-28 16:42:38 +02:00
Andreas Preikschat
1cced38067 use clicked rather than pressed to avoid inserting [---] more than once 
bzr-revno: 1431
 2011-03-27 19:54:47 +02:00
Andreas Preikschat
c0f5191d6c clicked rather than pressed 2011-03-27 19:00:34 +02:00
Tim Bentley
6d4792aa87 r1429 2011-03-27 17:30:54 +01:00
Andreas Preikschat
5a4b91b37c (suggestion) added support for multiple slides 2011-03-27 15:39:43 +02:00
Andreas Preikschat
dbefa29054 fixed mistake 2011-03-26 22:03:28 +01:00
Andreas Preikschat
f2acce4a77 missing spaces 2011-03-26 21:59:44 +01:00
Andreas Preikschat
252f316e0e missing spaces 2011-03-26 21:51:41 +01:00
Andreas Preikschat
41f0be38fb clean ups 2011-03-26 21:45:11 +01:00
Andreas Preikschat
baff5451c2 r1429 2011-03-26 21:32:10 +01:00
Andreas Preikschat
d83f14f8fb import topics from usr files, clean ups 2011-03-26 21:07:19 +01:00
Tim Bentley
70ca844473 Fix comments and errors 2011-03-26 19:50:15 +00:00
Raoul Snyman
98ea1c5ff9 Removed a console.log which caused older browsers to choke. 
bzr-revno: 1429
 2011-03-26 21:19:19 +02:00
Matthias Hub
8b10155178 Changes did for the packaging of 1.9.5 (version 1346 contains the main changes): 
- disabled presentations plugin in the first time wizard when on OS X
- converting and bundling translations during the build process
- removing presentations plugin from the dmg file during the build process
- fixed Info.plist spelling errors reported by typovar
- fixed translation in the presentations mediaitem (though disabled on OS X)

bzr-revno: 1427
 2011-03-26 19:26:38 +01:00
Andreas Preikschat
ff9f5f4566 - a little clean up to improve readability 
bzr-revno: 1423
 2011-03-26 19:21:44 +01:00
Raoul Snyman
2c7ec2978e Removed a console.log which caused older browsers to choke. 2011-03-26 19:51:07 +02:00
Andreas Preikschat
f082040840 r1421 2011-03-26 17:29:21 +01:00
Andreas Preikschat
2536e54677 r1418 2011-03-24 22:19:17 +01:00
Raoul Snyman
bf058430d2 Updated the copyright information and the contributors. 
bzr-revno: 1418
 2011-03-24 22:07:31 +02:00
Andreas Preikschat
22af2a32f8 - changed the hard coded version numbers 
bzr-revno: 1417
 2011-03-24 20:28:44 +01:00
Andreas Preikschat
67ee8394c2 moved version function 2011-03-24 20:12:27 +01:00
Raoul Snyman
efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Andreas Preikschat
682c32eaad changed hard coded version numbers 2011-03-24 17:09:05 +01:00
Armin Köhler
e2ae3025c9 fill up bibles_resources database with alternative book names in different languages (EN, DE, FR, IT, ES, PT, RU, SV, NO, NL, CS, SK, RO, HR, HU, BG, AR, TR, PL, DA, ZH) 2011-03-23 22:07:04 +01:00
Armin Köhler
27e635144d rename spelling to alternative_book_name 2011-03-23 21:08:49 +01:00
Armin Köhler
a9b1fa2f5d HEAD r1415 2011-03-23 20:28:41 +01:00
Armin Köhler
599e876955 Bug fixes 
Changed book handling from name to book_reference_id
Comment out unused function to fill the testament table in the local bible database
 2011-03-23 20:18:51 +01:00
Andreas Preikschat
e07e97da6c bible clean up 2011-03-22 17:21:10 +01:00
Raoul Snyman
f229146363 Fixed a bug where not all Bible versions were shown with multiple versions. 2011-03-22 08:43:31 +02:00
Raoul Snyman
d63f76d3ff Removed unnecessary lines. 2011-03-20 23:00:41 +02:00
Raoul Snyman
3aa0aa23d3 Added smart footers to Bibles. 2011-03-20 22:50:19 +02:00
Jonathan Corwin
60ab4cc165 Detect whether imported video/audio is valid 
bzr-revno: 1409
 2011-03-20 08:49:31 +00:00
Jonathan Corwin
55d9e85840 tidies 2011-03-19 22:52:56 +00:00
Jonathan Corwin
2fa2888112 Tidyups and fix pause problem. Still issue with media manager hanging sometimes after play starts. Perhaps missing an event? 2011-03-19 17:26:17 +00:00
Andreas Preikschat
a43bd19bd9 convert verse order 2011-03-19 17:06:04 +01:00
Jonathan Corwin
936c77a7ea Now detects non-playable media files. Unfortunately can't stop valid ones now... 2011-03-19 15:48:26 +00:00
Andreas Preikschat
3550b77b61 - removed hard coded verse tags 
- the reindex tool to convert pre 1.9.5 verse tags (this also fixes translated tags, as long as the user is running a localised version)
- now only one row/verse in the song editor can be selected

bzr-revno: 1405
 2011-03-18 22:37:06 +01:00
Andreas Preikschat
9622a74467 fixed downButton being visible 2011-03-18 21:31:55 +01:00
Andreas Preikschat
d85991cdc8 changed SelectionMode 2011-03-18 20:15:45 +01:00
Tim Bentley
9def5ab3c7 Add space 2011-03-18 19:15:07 +00:00
Andreas Preikschat
3022d9cb8e fixed doc, rebuild verse tags 2011-03-18 19:43:26 +01:00
Tim Bentley
c80fe1fd50 Remove extra line 2011-03-18 18:20:58 +00:00
Tim Bentley
6951ac1fb6 Fix time for python 2.6 2011-03-18 18:19:07 +00:00
Tim Bentley
da927320c5 r1401 2011-03-18 17:10:51 +00:00
Armin Köhler
4071daec18 add error handling if the user abort the dialog 2011-03-18 10:52:54 +01:00
Armin Köhler
9510d9713b HEAD r1401 2011-03-18 10:15:19 +01:00
Andreas Preikschat
b890158455 do not hard code verse tags 2011-03-18 06:56:18 +01:00
Andreas Preikschat
79bc31e69e - fixed adding "Verse" instead of "v" to the database. 
- add "other" if the verse_tag is unknown

bzr-revno: 1401
 2011-03-18 06:04:16 +01:00
Andreas Preikschat
57fdca06c7 - save some indents to make code more readable 
- fixed the "verse tag" column resizing after saving verses in the "Edit All" dialog.

bzr-revno: 1399
 2011-03-18 06:00:32 +01:00
Armin Köhler
9a30a4ae6a Clean up 2011-03-17 22:04:54 +01:00
Armin Köhler
a23d902fa5 adapt the second_bible searchfunction to the new book name scheme 2011-03-17 21:54:22 +01:00
Andreas Preikschat
d1542d2c2b now the right way around 2011-03-17 21:38:05 +01:00
Andreas Preikschat
6f58d7b856 imporved handling unknown verse tags 2011-03-17 21:23:26 +01:00
Tim Bentley
e19e418a56 Fix variable 2011-03-17 20:02:33 +00:00
Andreas Preikschat
6db4d5247b fixed full version of verse tag 2011-03-17 21:00:19 +01:00
Jonathan Corwin
ce9e2ad20f ppt2010 fix (part 2). pptviewer fixes and tidies 
bzr-revno: 1397
 2011-03-17 19:55:28 +00:00
Armin Köhler
7a15251ffc Clean up 
changed create_book in cscbible, openlp1, opensong and osis
 2011-03-17 20:40:01 +01:00
Tim Bentley
f51b91c02d Add timeout to loop 2011-03-17 18:40:21 +00:00
Armin Köhler
1c59fd656f add download of all books a webbible contains 
add dialog while the import of a webbible if the book could not be assign to a reference_book
add dialog while tho import of a webbible if the language is unknown
change the bible database
 2011-03-17 19:36:54 +01:00
Andreas Preikschat
e9bcab13de fixed Verse Tag' column; clean up 2011-03-17 13:32:45 +01:00
Mattias Põldaru
23ff73fa76 Additions to extensions hack to make jseagull's mediaplugin on XP happier. 2011-03-17 12:28:49 +02:00
Andreas Preikschat
e199927b97 - Added a function to clean songs before saving 
- fixed Bug #690774

bzr-revno: 1395
Fixes: https://launchpad.net/bugs/690774
 2011-03-17 06:19:54 +01:00
Raoul Snyman
a74e446129 Revamp the web interface and provide a more RESTful JSON API. 
bzr-revno: 1394
 2011-03-17 06:59:21 +02:00
Jonathan Corwin
23e178846b Fix PPT again! and remove tabs 2011-03-16 23:37:16 +00:00
Jonathan Corwin
72f445c426 pptviewer fixes and tidyups 2011-03-16 23:22:11 +00:00
Philip Ridout
5b7c909444 Fix song order in SongshowPlus import 
bzr-revno: 1393
 2011-03-16 21:37:48 +00:00
Philip Ridout
136e12eb0b Up to gushies standards hopefully! 2011-03-16 17:50:37 +00:00
Andreas Preikschat
f2cf1304ef removed old hack, updated comment, typo 2011-03-16 18:21:03 +01:00
Andreas Preikschat
044f0c88e7 fixed duplication 2011-03-16 16:37:56 +01:00
Andreas Preikschat
a031784146 try to avoid duplicates when opening an old service file 2011-03-16 14:29:13 +01:00
Raoul Snyman
bf31211216 Fixed up the documentation. 2011-03-16 14:27:52 +02:00
Raoul Snyman
60371ffa0a Fixed up some things for the merge proposal. 2011-03-16 14:04:11 +02:00
Raoul Snyman
955933237c Added in support for showing alerts. 2011-03-16 12:59:23 +02:00
Raoul Snyman
df79ab09fa Added next and previous to both service and slide controller, and added blank and unblank. 2011-03-16 08:39:25 +02:00
Raoul Snyman
a1b26df5fe Removed old unnecessary files. 2011-03-16 07:30:18 +02:00
Tim Bentley
e64e6b44fc Hide menu items no finished 2011-03-15 20:53:36 +00:00
Raoul Snyman
edc4f4d626 HEAD + some attempts at bug fixing. 2011-03-15 22:33:26 +02:00
Andreas Preikschat
e2bd77ea4d fix 2011-03-15 21:12:28 +01:00
Philip Ridout
b6d2423cb3 Fixed as appropiate according to TRB143. 2011-03-15 20:10:36 +00:00
Tim Bentley
ae25fc96df r1391 2011-03-15 20:03:25 +00:00
Tim Bentley
23bfaf1566 Old spelling bug 2011-03-15 19:55:49 +00:00
Andreas Preikschat
f339c11ccf r1391 2011-03-15 20:45:56 +01:00
Andreas Preikschat
bf1e82838a coments 2011-03-15 20:33:11 +01:00
Philip Ridout
a8c45c619e Fixed bug #735357. 
Done it as I thought best, please suggest a more appropiate way if there is.
 2011-03-15 19:31:22 +00:00
Jonathan Corwin
fcc08aff9a Alert position, genearl import, Windows QPaint error, case insensitive song order and presentation issues 
bzr-revno: 1391
 2011-03-15 19:23:05 +00:00
Andreas Preikschat
8b49c39fa5 more clean ups 2011-03-15 19:38:56 +01:00
Andreas Preikschat
bf4ecad9d1 cleanup 2011-03-15 19:24:13 +01:00
Andreas Preikschat
441283c6a0 spelling 2011-03-15 18:56:34 +01:00
Andreas Preikschat
01efe60822 continued clean up 2011-03-15 18:52:42 +01:00
Andreas Preikschat
88cfbf5d02 r1390 2011-03-15 17:38:25 +01:00
Mattias Põldaru
18f9632dda Upstream 2011-03-15 16:39:49 +02:00
Raoul Snyman
517061c261 Poll to see if the service is updated. 2011-03-15 16:38:42 +02:00
Jonathan Corwin
791c0e268e typo. Should really test before committing :) 2011-03-15 07:47:23 +00:00
Raoul Snyman
1362031d8a Re-added my documentation which got lost somewhere along the line. 2011-03-15 09:45:29 +02:00
Jonathan Corwin
23ca24cceb Revert pptviewer.dll changes for now, they can come later. Lets get the rest in 2011-03-15 07:34:04 +00:00
Tim Bentley
7fd5a1d7fe Only allow Start / End times for videos under 50Meg in size. 
Fixes: https://launchpad.net/bugs/730474
 2011-03-15 07:30:03 +00:00
Raoul Snyman
3dd7895e22 HEAD 2011-03-15 08:48:54 +02:00
Raoul Snyman
6335ceac90 Added server-side verse changing. 2011-03-15 08:46:54 +02:00
Jon Tibble
b25abc59aa Cleanups 2011-03-15 01:07:40 +00:00
Jonathan Corwin
a026189fac Head 2011-03-15 00:11:40 +00:00
Jonathan Corwin
0b827218bc ppt 2010 fix (hopefully). pptviewer tidyups 2011-03-15 00:10:40 +00:00
Mattias Põldaru
e5b664663a Fix tracebacks, if user has no internet connection and he still presses Finish. 2011-03-15 01:05:31 +02:00
Mattias Põldaru
1ce88e7a2a Prevent possible crash, if label field is empty in database. 2011-03-15 00:29:02 +02:00
Raoul Snyman
304202bbfc HEAD 2011-03-14 23:17:28 +02:00
Andreas Preikschat
220d3efb4e clean up 2011-03-14 22:02:39 +01:00
Andreas Preikschat
6634a90bd3 continued with song edit; not finished 2011-03-14 21:36:30 +01:00
Jon Tibble
e1d55575c3 Fix KJ21 on BibleGateway 2011-03-14 19:26:38 +00:00
Andreas Preikschat
76612c18c0 adjusted usage of re-index tool 2011-03-14 20:23:59 +01:00
Andreas Preikschat
100088723a r1388 + resolved conflicts 2011-03-14 20:09:41 +01:00
Andreas Preikschat
e48322ed05 fix 2011-03-14 20:04:57 +01:00
Andreas Preikschat
97bec5b93f added a song clean up function 2011-03-14 19:59:59 +01:00
Raoul Snyman
e0ea2c57a3 Fixed up a bug where the song import progress dialog would show up and not disappear if a user did not select any song databases to import. 2011-03-14 20:40:27 +02:00
Raoul Snyman
82239abb92 Used a temporary string due to string freeze, and included the song reindex as per Andreas' request. 2011-03-14 20:34:48 +02:00
Raoul Snyman
a33a13ef05 Make first time wizard import songs, rather than overwrite them. 2011-03-14 08:48:23 +02:00
Jonathan Corwin
e8de37f7b3 pptviewer mods 2011-03-13 23:18:19 +00:00
Armin Köhler
251c70fa47 HEAD r1386 2011-03-13 20:56:08 +01:00
Armin Köhler
f780ea2b1b filled tables language, testament_reference, webbibles, download_source in bibles_resources.sqlite with data and extend tables book_reference and chapters 
add method reload_spelling() in manager.py
add class SpellingDB and extend class BiblesResourcesDB
 2011-03-13 20:45:46 +01:00
Andreas Preikschat
d1592b46c7 stop adding a default verse order to OpenLyrics/service songs 
bzr-revno: 1386
 2011-03-13 19:13:20 +01:00
Andreas Preikschat
9c30635fcb remove corrupted bibles 2011-03-13 16:58:27 +01:00
Andreas Preikschat
99eba705c5 add the verse tag fix back 2011-03-13 15:39:55 +01:00
Andreas Preikschat
8cc21cef79 removed need to have a verseOrder; removed attempt to fix missing verse_numbers 2011-03-13 14:50:14 +01:00
Jonathan Corwin
363b49b490 attempt to detect end of pptviewer pre-load if ppt is set to loop until ESC 2011-03-12 17:06:26 +00:00
Armin Köhler
e52a80c9c3 rename httpbooks.sqlite to bibles_resources.sqlite and change database scheme 
moved the content of biblegateway.csv, bibleserver.csv and crosswalkbooks.csv into bibles_resources.sqlite
adapt loadWebBibles() process according to the changes above
remove class HTTPBible from http.py and add the functions to a new class BiblesResourcesDB in db.py which now handels the reading of bibles_resources.sqlite
 2011-03-12 11:23:42 +01:00
Mattias Põldaru
d65cab1d15 Sorry, guys. 2011-03-12 11:59:38 +02:00
Jonathan Corwin
bc4e4147a7 r1379 2011-03-12 08:55:52 +00:00
Jonathan Corwin
f04964e073 Song sequence, alert position and make OOo not invisible anymore 2011-03-12 00:12:52 +00:00
Mattias Põldaru
0bf2962ff3 Mediaplugin mimetypes extensions hacky fix. 2011-03-12 00:04:26 +02:00
Tim Bentley
4ad32acc82 Force path for Song Usage 
bzr-revno: 1377
Fixes: https://launchpad.net/bugs/733271
 2011-03-11 20:47:19 +00:00
Andreas Preikschat
96a54a4fe9 Hacked the song database to speed up searches and the application start 
bzr-revno: 1376
 2011-03-11 20:38:57 +01:00
Tim Bentley
b3ca0ef69a Fix text 2011-03-11 19:20:31 +00:00
Andreas Preikschat
3ba4684d55 Fixed bug #719102 
bzr-revno: 1375
 2011-03-11 20:03:34 +01:00
Tim Bentley
f1b8e53e30 Fix missing path for song usage report generation 
Fixes: https://launchpad.net/bugs/733271
 2011-03-11 19:02:36 +00:00
Andreas Preikschat
94d7f4e932 speed up application start/song search 2011-03-11 19:03:16 +01:00
Andreas Preikschat
7c7410a218 complete fixe 2011-03-11 16:53:26 +01:00
Andreas Preikschat
f0379925bc fixed bug #719102 
Fixes: https://launchpad.net/bugs/719102
 2011-03-11 16:38:22 +01:00
Andreas Preikschat
2d1ab8d449 - Moved the version to the Plugin class. If a plugin does not provide a "version" the default will be used. 
- clean ups

bzr-revno: 1371
 2011-03-11 15:13:10 +00:00
Jonathan Corwin
0d64f4e758 Songs of Fellowship and Generic Document imports work once again 
Also repair auto-insert-chorus-into-verse-order for SoF

bzr-revno: 1370
 2011-03-11 15:11:55 +00:00
Jonathan Corwin
7336575067 SOF fixes, auto add chorus to verse order again 2011-03-11 08:46:21 +00:00
Jonathan Corwin
b4e8880671 Remove static methods and re-work code to avoid creation of additional SongImport's. 2011-03-11 08:33:22 +00:00