Commit Graph

6925 Commits

Author SHA1 Message Date
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 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
Raoul Snyman 4452d4834c Refactored various variable names.
Refactored the names of the fields in the "metadata" table of Bibles, and provided an upgrade script to upgrade the Bibles seamlessly.
Refactored the name of a setting, and wrote some code to migrate it seamlessly.
2012-04-22 00:29:08 +02:00
Armin Köhler a9fea228ee Use localized booknames instead of English in BookNameForm (used by BibleImportWizard and BibleUpgradeWizard)
bzr-revno: 1948
2012-04-21 18:35:14 +02:00
Armin Köhler e4687e4d68 Fixed bug #941683: Add support for non-English book names in OSIS files.
bzr-revno: 1947
Fixes: https://launchpad.net/bugs/941683
2012-04-21 18:33:40 +02:00
Andreas Preikschat 69b616a3ec added favicon to remote pages 2012-04-21 09:03:32 +02:00
Raoul Snyman b4538541f9 Updated libraries and made some UI and usability improvements to the web remote.
bzr-revno: 1946
2012-04-20 21:36:10 +02:00
Andreas Preikschat e8cbf8e3f0 more clean ups + fix error message shown when remote is being used 2012-04-20 21:33:43 +02:00
Raoul Snyman 7d5d7d7116 Changed the 'Split' button to say 'Optional Split' instead.
bzr-revno: 1945
2012-04-20 21:32:34 +02:00
Armin Köhler d4eac06935 refer localized booknames to the corresponding english one 2012-04-20 21:14:23 +02:00
Armin Köhler 83ff347bc9 HEAD r1944 2012-04-20 19:54:27 +02:00
Andreas Preikschat 0038f4fa31 capitalisation fix 2012-04-20 17:51:58 +02:00
Tim Bentley 44a7c32baf Updates to web to allow Android to poll
bzr-revno: 1944
2012-04-19 21:19:02 +01:00
Armin Köhler 93a72fd4d5 Added a dialog to edit metadata of Bibles, and additional language options.
bzr-revno: 1943
Fixes: https://launchpad.net/bugs/738697, https://launchpad.net/bugs/822363
2012-04-19 08:45:37 +02:00
Andreas Preikschat 6f3b0f337a trivial clean ups
bzr-revno: 1942
2012-04-19 08:41:57 +02:00
Raoul Snyman 489f19cf39 Renamed all instances (i.e. comments) of 'virtual' to 'optional' 2012-04-18 23:55:44 +02:00
Raoul Snyman 4810bce920 Removed animations due to rendering issues on some browsers.
Removed the "close dialog" call since it was being called after the "go to" in some browsers (instead of before).
2012-04-18 22:44:47 +02:00
Armin Köhler ef957caf55 show list to choose a bookname in selected application language 2012-04-18 22:44:09 +02:00
Armin Köhler 4c24ba59fa add support for non english booknames in OSIS files, additional improve the detection of progressbar maximum 2012-04-18 22:07:38 +02:00
Tim Bentley 33e6fc328e Fix default 2012-04-17 18:28:35 +01:00
Tim Bentley d27c8f2f89 Head 2012-04-17 18:27:15 +01:00
Raoul Snyman aae1d3753b Updated jQuery.
Updated jQuery Mobile.
Fixed headers at the top.
Fixed toolbars at the bottom.
Removed top toolbars.
Added navigation to the top of most screens.
Added a "Add & Go to Service" button on the search result options dialog.
Implemented Theme and Desktop blank types.
Changed "back" button to say "Home" instead, and actually added the text.
2012-04-16 23:57:10 +02:00
Andreas Preikschat 0fdf3b7f7c trivial clean ups 2012-04-16 09:02:24 +02:00
Philip Ridout 89e0b0b00c Implements the progress bar for all media items for which it is possible. This shows OpenLP is doing 'something' rather than just hung.
bzr-revno: 1941
2012-04-16 07:59:45 +02:00
Andreas Preikschat 3414763fff fixed spelling 2012-04-15 12:16:01 +02:00
Philip Ridout cf069afe92 Implements the progress bar for all media items for which it is possible. This shows OpenLP is doing 'something' rather than just hung. 2012-04-13 22:47:15 +01:00
Philip Ridout be3da3368e changed file version handeling.
Added check for (c) symbol if not use it for the author
2012-04-13 21:22:55 +01:00
Raoul Snyman 70d75b0f80 Removed an unused import.
Changed the "Split" button to say "Optional Split" instead.
2012-04-13 22:08:05 +02:00
Armin Köhler 665c27c785 fixes 2012-04-12 22:58:11 +02:00
Andreas Preikschat 620d858d68 clean ups 2012-04-12 16:16:12 +02:00
Andreas Preikschat d53f7b6511 fixed bug 977835 (Advanced search of Bibles is not working.)
Fixes: https://launchpad.net/bugs/977835
2012-04-12 12:48:54 +02:00
Armin Köhler 5f16ddc73c fixes 2012-04-11 19:39:15 +02:00
Armin Köhler 35c3c1ce5a HEAD r1939 2012-04-11 19:19:17 +02:00
Tim Bentley 2052387a91 head 2012-04-10 20:39:20 +01:00
Tim Bentley 04b4a34c68 Add service count for remotes 2012-04-10 20:38:25 +01:00
Andreas Preikschat cb2e2b3248 fixed bug 970436 ('Display if a single screen' always in effect) and clean ups
bzr-revno: 1939
Fixes: https://launchpad.net/bugs/970436
2012-04-09 21:26:57 +01:00
Andreas Preikschat 3aa2161095 fixed bug 2012-04-09 13:36:26 +02:00
Andreas Preikschat 268e808b8d swapped flags, do not import Qt 2012-04-09 12:52:24 +02:00
Andreas Preikschat 4ec49627db fixed comments, simplification, removed not needed attribute 2012-04-09 12:22:47 +02:00
Andreas Preikschat aa8457dd6e reverted changes and fixed the bug differently 2012-04-09 12:01:06 +02:00
Andreas Preikschat 6ad7a867cc fixed bug 970436 ('Display if a single screen' always in effect)
Fixes: https://launchpad.net/bugs/970436
2012-04-08 14:53:11 +02:00
Andreas Preikschat a89b4f5931 fixed bug 803602 (Quick Tab for Bibles does not resize correctly)
Fixes: https://launchpad.net/bugs/803602
2012-04-08 13:43:14 +02:00
Philip Ridout 20eab8b917 Fixed case when there is no version information 2012-04-07 20:47:41 +01:00
Philip Ridout 9c11494364 Added support for ALL DreamBeam file formats. 2012-04-07 17:41:03 +01:00
Armin Köhler e310c20ccc fixes 2012-04-06 20:14:38 +02:00
Armin Köhler 06033df8ad adapt editbibleform - some fixes 2012-04-05 20:31:15 +02:00
Armin Köhler 33dcda419a HEAD r1936 2012-04-05 19:04:17 +02:00
Andreas Preikschat c0cae670ef bible clean ups
bzr-revno: 1936
2012-04-05 18:21:29 +02:00
Andreas Preikschat b335beae45 r1934 2012-04-05 17:17:40 +02:00
Andreas Preikschat 704795830d use filter instead of list comprehension 2012-04-05 17:16:47 +02:00
M2j bca06c4a7a fix: wrong method name 2012-04-05 00:41:18 +02:00
Armin Köhler 5f88f49754 some fixes 2012-04-04 21:34:14 +02:00
M2j 3185e0b101 removed whitespaces at line ends 2012-04-04 09:26:51 +02:00
Armin Köhler 0b246275b2 adapt to run with HEAD r1934 2012-04-03 21:51:20 +02:00
Armin Köhler 06b63954a0 HEAD r1934 2012-04-03 21:30:30 +02:00
Armin Köhler 02e36ba641 bookname in list view and shown in footer now uses the choosen language 2012-04-03 21:23:26 +02:00
Armin Köhler d7496056d8 HEAD r1933 2012-04-03 20:43:48 +02:00
Armin Köhler 800510f2f8 some fixes - improve error handling with duplicate book names 2012-04-03 20:42:21 +02:00
M2j 5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
M2j 7175902e6d removed whitespaces 2012-04-03 19:58:42 +02:00
Meinert Jordan 6a4edea071 Change default theme level to song level.
String fixes.
Fix missalignment of theme level selection labels.

bzr-revno: 1933
Fixes: https://launchpad.net/bugs/960386
2012-04-03 18:15:52 +01:00
Meinert Jordan b2abc5a060 Remove control characters from song copyright string
bzr-revno: 1932
Fixes: https://launchpad.net/bugs/969282
2012-04-03 17:24:52 +01:00
M2j 9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
Meinert Jordan 93a9b62abb Bug #959116: Split slide button inserts tag on its own line
bzr-revno: 1931
Fixes: https://launchpad.net/bugs/959116
2012-04-03 09:38:27 +02:00
Meinert Jordan 3374ad21d9 Bug #953240: Merging subverse entries (e.g. v1a) at OpenSong import
bzr-revno: 1930
Fixes: https://launchpad.net/bugs/953240
2012-04-03 09:37:07 +02:00
Meinert Jordan a57289da8c Bug #967522: Don't drag from empty service manager area
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
2012-04-02 23:12:51 +02:00
Meinert Jordan 1128b424e5 Bug #795068: Verse List in Song Editor did not resize properly
bzr-revno: 1928
Fixes: https://launchpad.net/bugs/795068
2012-04-02 23:11:41 +02:00
M2j 5dd334370d Head 2012-04-02 23:06:55 +02:00
Meinert Jordan 22d29e7d62 Bug #959760: Change theme manager delete button visibility on default theme change.
bzr-revno: 1927
Fixes: https://launchpad.net/bugs/959760
2012-04-02 23:06:16 +02:00
Meinert Jordan a686cf9209 Bug #923500: Do not mark service changed when accepting settings dialog.
bzr-revno: 1926
Fixes: https://launchpad.net/bugs/923500
2012-04-02 23:05:03 +02:00
M2j dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
M2j 1c9d92bf2e Bug #953240: Merging subverse entries (e.g. v1a) at OpenSong import 2012-04-02 22:53:21 +02:00
M2j 45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j 41ff5b04df small fixes 2012-04-02 21:34:49 +02:00
M2j b97445eaab string changed 2012-04-02 20:44:07 +02:00
M2j 40774f6375 Bug #923500: Do not mark service changed when accepting settings dialog. 2012-04-02 17:33:54 +02:00
M2j 36fc1b5339 Bug #959116: Split slide button inserts tag on its own line 2012-04-02 16:23:25 +02:00
M2j f876898033 Bug #959760: Change theme manager delete button visibility on default theme change. 2012-04-02 15:46:41 +02:00