Commit Graph

8889 Commits

Author SHA1 Message Date
Stevan Pettit 3f62cc16bb Merged with trunk. Resolved a conflict 2012-05-03 20:19:11 -04:00
Raoul Snyman cc3243d8bd Fixed up some things so that our source is Debian-compliant and moved some of the packaging stuff to it's own branches.
bzr-revno: 1963
2012-05-03 22:52:17 +02:00
Andreas Preikschat 554df1e363 Improved renderer performance: 0.11 vs. 0.29 (average time needed)
bzr-revno: 1962
Fixes: https://launchpad.net/bugs/856296
2012-05-03 22:51:04 +02:00
Stevan Pettit e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Raoul Snyman b8f556678d Moved OS X stuff to its own repository. 2012-05-02 23:19:02 +02:00
Raoul Snyman 7b737a69f2 Moved Windows stuff into its own repository. 2012-05-02 23:02:27 +02:00
Raoul Snyman 10dbb5ee16 Changed some things to comply with Debian's packaging policies. 2012-05-02 22:57:12 +02:00
Andreas Preikschat 6915fb9d0d improved renderer performance 2012-05-02 20:25:37 +02:00
Andreas Preikschat 63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range()
bzr-revno: 1961
2012-05-01 22:35:42 +02:00
Raoul Snyman c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Andreas Preikschat 3255b9d492 r1960 2012-05-01 17:54:31 +02:00
Andreas Preikschat dbe85abb84 updated vlc.py
bzr-revno: 1960
2012-05-01 15:11:24 +02:00
Andreas Preikschat 99314e762d refactor version comparison code; removed dead code
bzr-revno: 1959
2012-05-01 14:58:22 +02:00
Armin Köhler 43e5d7a9ee fix bug 825205 - Keep/restore selected book, chapters and verses when changing the bible translation in advanced search
bzr-revno: 1958
Fixes: https://launchpad.net/bugs/825205
2012-05-01 13:28:49 +02:00
Meinert Jordan da46ec470a pythonifying code:
bzr-revno: 1957
2012-05-01 12:21:57 +01:00
Andreas Preikschat 017abbb801 fixed bug #966086 (Enabling VLC causes stack trace and prevents OpenLP from starting); various clean ups
bzr-revno: 1956
Fixes: https://launchpad.net/bugs/966086
2012-05-01 13:03:55 +02:00
M2j eafd3a20ae revert openlp/core/ui/media/mediacontroller.py to prevent merge conflict 2012-05-01 13:03:31 +02:00
Andreas Preikschat a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Andreas Preikschat bab9b33a7f r1955 2012-05-01 12:45:43 +02:00
Andreas Preikschat bd4cded398 updated vlc.py 2012-05-01 12:38:19 +02:00
M2j 41402ab078 add a space character 2012-04-29 18:01:15 +02:00
M2j c6c62bdcad pythonifying code:
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
2012-04-29 17:31:56 +02:00
M2j ac3655135e Head 1955 2012-04-29 14:18:19 +02:00
Andreas Preikschat f6177c62b2 fixed LooseVersion usage 2012-04-28 18:22:37 +02:00
Andreas Preikschat 76c004bb9a fixed LooseVersion usage 2012-04-28 18:19:02 +02:00
Andreas Preikschat 69affcc059 removed dead code, refactor version comparison code 2012-04-28 15:51:05 +02:00
Andreas Preikschat 38e5635901 r1955 2012-04-28 15:19:26 +02:00
Andreas Preikschat 9668b22f85 shorter solution 2012-04-28 15:10:54 +02:00
Andreas Preikschat 9dc7d1a795 fixed cap 2012-04-28 14:28:38 +02:00
Andreas Preikschat 42bc12f3fb try to prevent traceback when vlc too old
Fixes: https://launchpad.net/bugs/966086
2012-04-28 14:27:18 +02:00
Andreas Preikschat 1869fd7593 fixed clean up mistake 2012-04-28 13:37:39 +02:00
Andreas Preikschat f01252c23b fixed missing word 2012-04-28 13:31:42 +02:00
Andreas Preikschat cbbfa8c23b clean ups 2012-04-28 13:13:16 +02:00
Philip Ridout 7b99c97174 Adds DreamBeam song importer.
Small fix for SongShowPlus importer.

bzr-revno: 1955
2012-04-25 20:50:08 +02:00
Raoul Snyman 2a7e5fc781 Fixed bug #986827: Exception doesn't exist on Windows.
bzr-revno: 1954
Fixes: https://launchpad.net/bugs/986827
2012-04-25 20:46:23 +02:00
Raoul Snyman 948186c45c A bunch of refactoring, including more sensible naming conventions.
bzr-revno: 1953
2012-04-25 20:43:57 +02:00
Philip Ridout 52e23a2eeb removed import that sliped in! 2012-04-24 20:39:40 +01:00
Raoul Snyman 8e12cbabb4 Fix bug #987568: Added a generic except to catch other UNO problems.
bzr-revno: 1952
Fixes: https://launchpad.net/bugs/987568
2012-04-24 21:31:12 +02:00
Raoul Snyman ad84097547 Added a generic except to catch other UNO problems.
Fixes: https://launchpad.net/bugs/987568
2012-04-24 18:50:12 +02:00
Armin Köhler 19ea43ead8 fixes 2012-04-23 22:21:38 +02:00
Raoul Snyman 640e12d85e Some more refactoring and renaming.
Changed the Bible upgrade to leave the old values behind so that older versions of OpenLP don't delete the "corrupted" databases.
2012-04-23 21:19:13 +02:00
Raoul Snyman 85d48705fc Try to prevent older versions of OpenLP from deleting newer Bibles due to a change in the metadata names. 2012-04-22 23:07:39 +02:00
Raoul Snyman 0f1bca77b4 Some small coding standards things. 2012-04-22 21:50:18 +02:00
Raoul Snyman 070ed7fcb5 Merged HEAD from trunk and fixed a conflict.
Some more refactoring.
2012-04-22 21:37:11 +02:00
Raoul Snyman b6cf925bd8 Removed "dbversion" as it is not actually used.
Renamed some other variables.
Removed one use of "proxy_url" which was pretty much invalid.
2012-04-22 20:19:36 +02:00
Armin Köhler 4ce8d3710a HEAD r1951 2012-04-22 20:02:28 +02:00
Armin Köhler 7e9c30dfaf fix bug 825205 - Keep/restore selected book, chapters and verses when changing the bible translation in advanced search 2012-04-22 19:53:48 +02:00
Raoul Snyman 9d2b730634 Try to fix bug #986827, an exception is thrown on Windows when opening an imported presentation.
Fixes: https://launchpad.net/bugs/986827
2012-04-22 14:25:39 +02:00
Andreas Preikschat 715e9b50a7 trivial cleanups part
bzr-revno: 1951
2012-04-22 08:32:43 +01:00
Andreas Preikschat baf758e45d trivial cleanups part 2
bzr-revno: 1950
2012-04-22 08:32:13 +01:00