Commit Graph

7511 Commits

Author SHA1 Message Date
Martin Zibricky
7b33bc3c4a [merge] Merge with trunk 2011-08-25 13:18:48 +02:00
Martin Zibricky
1dc05c0f66 Add ability to run openlp without app.exec_() method (needed to run gui tests) 2011-08-25 13:16:04 +02:00
Martin Zibricky
7fae06483a Move main() from openlp.pyw to openlp.core.__init__ 2011-08-25 12:04:17 +02:00
Martin Zibricky
68facbf2b5 Move class OpenLP from openlp.pyw to openlp.core.__init__ 2011-08-25 11:04:41 +02:00
Andreas Preikschat
2cf0743222 - use urllib.urlretrieve to download ts files
bzr-revno: 1719
2011-08-24 15:50:54 +02:00
Martin Zibricky
a85e83d162 [merge] merge with trunk 2011-08-24 12:10:16 +02:00
Andreas Preikschat
1483c2035e use urllib to download ts files + r1717 2011-08-22 10:55:22 +02:00
Andreas Preikschat
652b1b86ea use urllib to download file 2011-08-22 10:45:03 +02:00
Andreas Preikschat
b0df1bdd94 - changed menu shortcut letter
bzr-revno: 1718
2011-08-21 21:15:36 +02:00
Andreas Preikschat
ea0940874c - updated i18n files
bzr-revno: 1717
2011-08-21 21:14:36 +02:00
Andreas Preikschat
79f5163113 updated i18n files 2011-08-20 21:40:49 +02:00
Andreas Preikschat
8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +02:00
Andreas Preikschat
d1e9a1a32e r1715 2011-08-20 21:22:36 +02:00
Andreas Preikschat
418802b735 r1715 2011-08-20 20:50:29 +02: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
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
3fef17b9c7 r1711 2011-08-17 14:21:24 +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
48497c8105 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.
bzr-revno: 1711
Fixes: https://launchpad.net/bugs/802146
2011-08-17 11:47:55 +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
Andreas Preikschat
0abab89636 r1710 2011-08-15 11:44:58 +02:00
Andreas Preikschat
9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat
d46eecd96d - added spellchecker to service notes dialog (bug #825979); - escape texts in various places (bug #825983)
bzr-revno: 1710
Fixes: https://launchpad.net/bugs/825979, https://launchpad.net/bugs/825983
2011-08-15 11:28:49 +02:00
Andreas Preikschat
d229b67a0c Auto-completer does not work immediately after importing/upgrading a bible (bug #825181)
bzr-revno: 1709
Fixes: https://launchpad.net/bugs/825181
2011-08-15 11:23:24 +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
41b3bde919 changed underscore varialbe to camelCase 2011-08-14 15:11:41 +02:00
Andreas Preikschat
17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983)
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
2011-08-14 15:05:39 +02:00
Andreas Preikschat
3f489ddbaf fixed song meta data to include application name 2011-08-14 12:56:05 +02:00
Andreas Preikschat
8dd8e876ea r1708 2011-08-14 12:55:14 +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
ec93173891 r1708 2011-08-13 12:41:57 +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