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
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
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
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
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
36fc1b5339 Bug #959116: Split slide button inserts tag on its own line 2012-04-02 16:23:25 +02:00
M2j
84ee153fec Bug #795068: Verse List in Song Editor did not resize properly 2012-04-02 15:27:08 +02:00
M2j
1b056a74ec Bug #969282: Remove control characters from song copyright string 2012-04-02 13:38:22 +02:00
M2j
352ee8e041 Bug #960386: string fixes 
fix missalignment of theme level selection labels
change default theme level to song level
 2012-04-02 12:32:52 +02:00
M2j
c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
M2j
6657e27694 add objectName parameter to create_button_box method 
remove QMetaObject.connectSlotsByName() calls as they do nothing in our code
 2012-04-02 00:44:09 +02:00
M2j
d7ab06cc7e - reorganisation of methods in openlp.core.lib.ui to make them more comprehensive 
- some small restatements of some code in bibles parse_reference() method
 2012-04-01 23:19:56 +02:00
Andreas Preikschat
a9a40f7a47 clean up 2012-04-01 16:22:32 +02:00
Andreas Preikschat
dbe9fc51aa clean ups 2012-04-01 13:16:08 +02:00
Andreas Preikschat
152bd850eb r1924 2012-04-01 12:55:14 +02:00
Armin Köhler
770fe855ee HEAD r1924 2012-03-31 21:03:35 +02:00
Andreas Preikschat
9d3093a99f speed up bible loading 
bzr-revno: 1924
 2012-03-31 18:42:06 +02:00
Andreas Preikschat
651de89cfa speed up bible loading 2012-03-31 18:24:25 +02:00
Philip Ridout
75212def12 Fixes bug #946581 'Prevent users from importing the wrong files' 
bzr-revno: 1922
 2012-03-31 15:38:35 +02:00
Armin Köhler
a47b12f8ec fix a bug in the bible autocompleter when set to application language 
bzr-revno: 1921
 2012-03-31 15:30:06 +02:00
Andreas Preikschat
2e587131f3 fixed bug-969909 ('Missing verse tag' warning is not updated after adding a new verse 
Fixes: https://launchpad.net/bugs/969909
 2012-03-31 11:58:34 +02:00
Philip Ridout
4ce95e9d56 Made changes as per Andreas comments. 2012-03-30 22:52:50 +01:00
Philip Ridout
e2e63767f3 Change EasySlides DocString 2012-03-29 20:03:01 +01:00
Philip Ridout
e6af8d8bef Remove constructor as per Raouls comment. 2012-03-29 19:37:05 +01:00
Philip Ridout
7260dee1d6 Made changes as to Jonathan's requests 2012-03-27 21:09:01 +01:00
Philip Ridout
4aaf6695d4 Changed spacing at Tims Request 2012-03-27 21:07:52 +01:00
Armin Köhler
8f21fdfad5 fix bug in autocompleter from bible quicksearch. The option Application language now shows the correct language and not only English. 2012-03-27 21:48:10 +02:00
Andreas Preikschat
390def1f61 fixed 'Search Themes...' string 2012-03-26 11:41:59 +02:00
Andreas Preikschat
7f4664b69b each search 'type' has its own place holder text instead of the generic 'Search...' place holder 2012-03-25 23:09:44 +02:00
Philip Ridout
5925fb624e Changed Restructured text layout 2012-03-25 18:25:08 +01:00
Philip Ridout
a08a244084 Fixes bug #946581 "Prevent users from importing the wrong files" 
Checks for the song tag in OpenSong (as Gushie said it has no extensions)
Addes file extension filters for CCLI, EasyWorship & EasySlides

Fixes: https://launchpad.net/bugs/946581
 2012-03-24 18:35:09 +00:00
Philip Ridout
a75102a868 Removed errant print statment 2012-03-24 18:20:19 +00:00
Philip Ridout
b68300bdc6 New importer for DreamBeam song files. 
One small fix to SongShowPlus importer
 2012-03-24 16:41:29 +00:00
Philip Ridout
b4e8b48c6d Fixed bug #952533: Invalid file name characters in song name causes OpenLyrics to crash. 
bzr-revno: 1916
Fixes: https://launchpad.net/bugs/952533
 2012-03-23 13:09:51 +02:00
Raoul Snyman
744b3f89e5 Fixed bug #812628 by manually checking to see if the author name text was in the list of authors. 
bzr-revno: 1915
Fixes: https://launchpad.net/bugs/812628
 2012-03-23 09:16:49 +02:00
Raoul Snyman
c152cde3b7 Actually, the else should not be there. 2012-03-22 23:31:01 +02:00
Raoul Snyman
58c2cd34b1 Added an else statement just to make sure we are setting the item index. 2012-03-22 22:26:14 +02:00
Raoul Snyman
591d70cde6 Added a comment referencing bug #812628 so that we know why we added a seemingly redundant if statement. 2012-03-22 22:25:11 +02:00
Raoul Snyman
5a42c87a92 Whoops, forgot about the first item being blank. Now the correct author is added. 2012-03-22 22:16:49 +02:00
Raoul Snyman
d62fde1237 A potential fix for bug #812628. 2012-03-22 22:03:11 +02:00
Philip Ridout
d4bfda2ade Made modifications according to merge request 2012-03-22 17:22:01 +00:00
Philip Ridout
1fd08401bf Fix for bug 952533 2012-03-22 06:50:54 +00:00
Armin Köhler
60c9c80cd9 HEAD r1912 2012-03-21 22:03:17 +01:00
Armin Köhler
0e34ed3a94 fixes 2012-03-21 22:00:44 +01:00
Armin Köhler
12458c0d31 add possibility to switch book names for each bible 2012-03-21 21:57:07 +01:00
rimach
210f0e693b little corrections 2012-03-21 20:30:18 +01:00
rimach
a0769ce544 insert missing spaces 2012-03-20 22:25:53 +01:00
rimach
8a029daf11 Head 2012-03-20 22:21:47 +01:00
Jon Tibble
50f3f2c9b8 Various code cleanups and fix bugs #888815 and #941966 
bzr-revno: 1912
Fixes: https://launchpad.net/bugs/888815, https://launchpad.net/bugs/941966
 2012-03-19 06:10:37 +00:00
Mattias Põldaru
348d7514d6 Fix bug #908226 where a traceback would occur when sending invalid characters from the web remote or the Android remote. 
bzr-revno: 1911
Fixes: https://launchpad.net/bugs/908226
 2012-03-18 23:41:46 +02:00
Jon Tibble
a21ab3859b Head r1910 2012-03-18 21:20:58 +00:00
Raoul Snyman
aa9ab19e38 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.

bzr-revno: 1910
 2012-03-18 17:33:36 +02:00
Jon Tibble
025a81d553 Head r1909 2012-03-18 09:33:05 +00:00
Mattias Põldaru
03d837b534 Merge. 2012-03-18 11:31:41 +02:00
Tim Bentley
f5a5c641b1 Remove extra blank line 2012-03-18 08:14:51 +00:00
Tim Bentley
a22907d639 Remove blank line 2012-03-18 08:06:13 +00:00
Mattias Põldaru
06ff33ac96 Style fix. Thanks to trb for nice example on he's branch. 2012-03-18 02:15:31 +02:00
Mattias Põldaru
5710e2aefd Drop received alerts if alerts plugin is disabled. 
Prevent tracebacks when url does not contain data= element.
 2012-03-18 01:44:16 +02:00
Raoul Snyman
7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.
 2012-03-17 23:30:53 +02:00
Tim Bentley
83629a1b22 Get it working this time 2012-03-17 10:51:04 +00:00
Tim Bentley
d00840d1e0 Make plugin config updates generic 
Fix up some copyright issues missed
 2012-03-17 10:40:06 +00:00
Tim Bentley
283d85fbd9 Fix remote search to not use display errors on the main UI 2012-03-17 10:23:52 +00:00
Mattias Põldaru
5cd7162cec Let's catch also all errors when response from remote is not correct JSON or it does not contain required item. 2012-03-17 10:11:42 +02:00
Mattias Põldaru
4ed5c33584 Better fix for the encoding and related issue, less doube-encoding. Now we unquote the characters after JSON has decoded it's bits. 2012-03-17 09:55:59 +02:00
Mattias Põldaru
00390ed688 Alphabetic import order, remove old catcher from python 2.5. 2012-03-17 08:55:12 +02:00
Mattias Põldaru
103d38d016 Fix double loading of songs when using remote's search and setting the song live after. 2012-03-17 08:24:42 +02:00
Mattias Põldaru
76221b4f52 Fix JS event not found error when being called from poll response. 2012-03-17 08:19:52 +02:00
Mattias Põldaru
081f9b04c2 Fix 404 not found errors. 2012-03-17 08:18:59 +02:00
Mattias Põldaru
dc69eb087d Merge. 2012-03-17 08:16:36 +02:00
Jon Tibble
5ded814527 Head r1906 2012-03-16 22:56:06 +00:00
rimach
360df826e1 correct overridden media option 2012-03-16 22:52:15 +01:00
Jonathan Corwin
3c2fa992b8 Fix a few songselect import file format issues 
bzr-revno: 1906
 2012-03-16 18:59:21 +00:00
Jonathan Corwin
a16fbda8d3 Handle more songselect formats 2012-03-15 22:38:03 +00:00
Tim Bentley
b092f19606 Fix remote Search displaying errors on UI 2012-03-15 06:15:21 +00:00
Tim Bentley
ccfa08d93c Head 2012-03-14 20:58:54 +00:00
Tim Bentley
5b4ab7ce7c Head 2012-03-14 20:58:45 +00:00
Mattias Põldaru
f8a559c633 + is restricted as well. 2012-03-13 12:08:24 +02:00
Mattias Põldaru
c599a1785d Make escaping function a one-liner. 2012-03-13 11:11:36 +02:00
Mattias Põldaru
f7752255b0 Encode characters using URL encoding not JSON unicode markup. 2012-03-13 11:05:07 +02:00
Mattias Põldaru
8bd4ad02fd Fixes traceback when sending # or ; from web remote search or alert field. 
Fixes: https://launchpad.net/bugs/908226
 2012-03-13 02:58:30 +02:00
Jon Tibble
8e7eca36c7 Head r1903 2012-03-12 22:16:52 +00:00
Jon Tibble
6133e6a840 Unused variables 2012-03-12 22:12:16 +00:00
Jon Tibble
fd8af8691e Head r1902 2012-03-12 19:36:25 +00:00
Jon Tibble
9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Mattias Põldaru
83341b704c Revert string changes. 2012-03-12 12:53:17 +02:00
Mattias Põldaru
9e4cdf1a74 Merge. 2012-03-12 10:25:48 +02:00
Mattias Põldaru
f188e21391 Fix mediaPlayer override ComboBox items case. 2012-03-12 10:17:20 +02:00
Armin Köhler
40aa2a4765 HEAD r1901 2012-03-12 06:49:39 +01:00
Armin Köhler
6d98d4b125 add possibility to change bible meta data and the possibility to change the preferred bible language per bible - including first steps to edit the book names of the bible 2012-03-12 06:48:14 +01:00
Raoul Snyman
ca1cbfa1e6 HEAD 2012-03-11 23:44:44 +02:00
Raoul Snyman
03f22ae150 Refactored things a bit so that I don't rewrite too much code, and fixed up some issues with invalid verses. 2012-03-11 23:32:43 +02:00
Jon Tibble
e487ca46fa Head r1901 2012-03-11 21:25:15 +00:00
Jon Tibble
68a4372994 Unused imports 2012-03-11 21:24:22 +00:00
Armin Köhler
6606dfd3f7 Use the correct language for Bible booknames if the user requests it 
bzr-revno: 1901
 2012-03-11 20:15:16 +00:00
Jonathan Corwin
530ac62f32 Pick a new variable name 2012-03-11 16:03:18 +00:00
Jonathan Corwin
e3d523042b Fix a couple of spelling mistakes 
bzr-revno: 1897
 2012-03-10 23:00:14 +00:00
Mattias Põldaru
4129887f93 Inform user when openlyric errors occur 
bzr-revno: 1896
 2012-03-10 22:59:00 +00:00
Christian Richter
69d961666c Media player configuration changes: 
Change the layout of the up/down buttons
Fix issue: if choose down button without selecting any item before the settings dialog were broken

bzr-revno: 1895
 2012-03-10 22:56:57 +00:00
Meinert Jordan
77b8f84ed2 Tidyups: 
Unify all QAction creation methods.
Derive OpenLPToolbar().actions keys from object names.
Use Python methods instead of Qt for file path manipulations.
Bug #943919: Shortcuts for "Move to Previous/Next" in live slide controller.

bzr-revno: 1894
 2012-03-10 22:50:38 +00:00
Armin Köhler
06cce54788 fix some mission spaces and addapt some strings 2012-03-10 20:12:03 +01:00
Jonathan Corwin
e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Philip Ridout
bb4c6a4e16 A few minor fixes, and modifications to Wowimport: 
Fixes 439 on the support tracker

Remove .encode hopefully to fix http://support.openlp.org/issues/442

Revisited Words of Worship importer. A few tweeks, some to make it more robust, and to provide more information to the user.

bzr-revno: 1893
 2012-03-10 07:03:46 +00:00
Philip Ridout
8289084423 changed indentation on the strings 2012-03-09 21:42:29 +00:00
Mattias Põldaru
9be2fef0c8 Added error type back the right way, shorter error messages. 2012-03-09 08:19:39 +02:00
Mattias Põldaru
67cd90d5bf Don't translate player names. Added some keyboard shortcuts. 2012-03-09 08:09:19 +02:00
rimach
499f51bd2b change Button layout, fix issue if no item selected and choose down button 2012-03-08 23:14:59 +01:00
Armin Köhler
905fc6d91f adapt regex and some variable names 2012-03-07 20:15:38 +01:00
Philip Ridout
247114c656 Revisited Words of Worship importer. A few tweeks, some to make it more robust, and to provide more information to the user. 2012-03-07 17:25:39 +00:00
Mattias Põldaru
2b28482b8b Forgot to import translate function. 2012-03-06 22:03:18 +02:00
Mattias Põldaru
1488eb8244 Merge. 2012-03-06 21:58:51 +02:00
Mattias Põldaru
14e9f76304 Make user strings more specific and translatable. 2012-03-06 21:56:49 +02:00
M2j
b0099c30f4 Head 1891 2012-03-06 20:06:41 +01:00
Mattias Põldaru
0c391385d0 Capitalize error messages. 2012-03-06 21:02:26 +02:00
Mattias Põldaru
17233f2d90 Use another alias for the same content. 2012-03-06 20:46:08 +02:00
Mattias Põldaru
e0766fa018 Extended QCheckBox class to contan an extra data bit so we don't rely on translations to be different. 2012-03-06 20:42:59 +02:00
Mattias Põldaru
1600e002cb Make media backend names translatable. 
Fixes: https://launchpad.net/bugs/903683
 2012-03-05 23:09:31 +02:00
Raoul Snyman
8e54dcb1ee The message appears when your verse list is incomplete, and disappears when it is complete. 2012-03-05 22:34:23 +02:00
Raoul Snyman
442fed1bd7 HEAD 2012-03-05 21:47:04 +02:00
Raoul Snyman
5823bfbed5 Added label to warn of missing verses. 2012-03-05 21:45:32 +02:00
Raoul Snyman
fc8e01ddd9 Fixed bug #845692 by adding the missing features, including the ability to repeat the list of tracks, and the ability to move to a particular track via a convenient menu option. 
bzr-revno: 1891
Fixes: https://launchpad.net/bugs/845692
 2012-03-05 21:17:37 +02:00
M2j
9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
Armin Köhler
5391301b97 change BibleStrings object 2012-03-04 22:50:32 +01:00
Armin Köhler
c850d4fecd remove unnecessary code 2012-03-04 21:39:52 +01:00
Armin Köhler
3cf48b4eab HEAD r1890 2012-03-04 21:11:43 +01:00
Armin Köhler
371e624ea2 improve possibility to switch booknames - fix some bugs - move translation string to a dict 2012-03-04 21:10:17 +01:00
Armin Köhler
3f0b607553 add additional language auto detection for osis bible files 
bzr-revno: 1890
 2012-03-04 20:26:41 +02:00
Raoul Snyman
d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
M2j
b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
M2j
587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
M2j
277de83b68 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:38:20 +01:00
Samuel Findlay
0b15238245 fixed bug #944510 'web remote doesn't scale to screen' 
Fixes: https://launchpad.net/bugs/944510
 2012-03-03 16:13:48 +11:00
M2j
6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
Armin Köhler
ee5c8f93d0 HEAD r1887 2012-03-01 19:13:21 +01:00
Armin Köhler
45e0d83600 fix and improve auto detecting language in osis bible files 2012-03-01 19:09:47 +01:00
Armin Köhler
16d1125e84 small fix 2012-02-29 13:05:27 +01:00
Armin Köhler
299b807345 add language auto detection for osis bible files 2012-02-29 13:00:05 +01:00
Armin Köhler
e359f764b4 HEAD r1887 2012-02-29 12:51:11 +01:00
Armin Köhler
3ed9dcaae3 add possibility to switch the booknames of bibles - fix bug #822363 2012-02-29 12:47:21 +01:00
Armin Köhler
d32b2208a9 Add the ability to search for songbook and/or songnumber in the songlist. 
bzr-revno: 1886
Fixes: https://launchpad.net/bugs/789666
 2012-02-28 23:35:55 +02:00
M2j
d13ec2184a concentrate action creation in slide controller 2012-02-28 10:24:42 +01:00
M2j
95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
Armin Köhler
2592d6f698 add possibility to search for songbook and songnumber 2012-02-26 22:27:05 +01:00
Tim Bentley
c1c1de5472 Fix Impress and OpenLP so it now starts . 
Fix Spelling
Remove QLocale code for now as not supported by PyQt

Fixes: https://launchpad.net/bugs/902115
 2012-02-25 13:01:47 +00:00
Raoul Snyman
d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Meinert Jordan
5b4b48a61c Displayed listed items are shown more natural type (Jack, René and Maria) 
bzr-revno: 1881
 2012-02-19 22:53:41 +02:00
Raoul Snyman
d14a316309 Added repeating of the background audio track list. 
Migrated the songs plugin configuration tab to use the proper camelCase names.
 2012-02-16 23:08:30 +02:00
M2j
ce7029776a localize separated item list format 2012-02-16 21:36:35 +01:00
Meinert Jordan
5cf9a83657 i18n for scripture references. 
bzr-revno: 1879
 2012-02-16 20:51:27 +02:00
M2j
ec4b78ccb2 replace placeholderText as it is not included in supported platform. 2012-02-05 20:20:01 +01:00
Meinert Jordan
5b95a33eb7 Bug #910860: Strip spaces from author name on CCLI import 
bzr-revno: 1872
Fixes: https://launchpad.net/bugs/910860
 2012-01-30 22:43:20 +02:00
Philip Ridout
addc049c5b Set word wrap on qrDescriptionLabel so that it doesn't cause the groupbox to resize. 2012-01-30 17:44:37 +00:00
M2j
c0197d1af6 Bug #910860: Strip spaces from author name on CCLI import 2012-01-28 17:08:01 +01:00
Philip Ridout
b77b0d18d7 Added QR Code and link to download android app to settings tab 2012-01-25 22:04:36 +00:00
M2j
d6ecab7a04 - remove FIXME: comment 
- change scripture reference configuration tooltip strings to allow separate translation
- fix RegEx for scripture references with trailing list separator
 2012-01-21 16:47:38 +01:00
M2j
cac10059f3 update the 'scripture reference invalid' message 2012-01-18 21:20:05 +01:00
M2j
9ef317db2a - i18n for scripture references and custom configuration settings 2012-01-18 18:52:48 +01:00
M2j
1757436853 purge ICU integration from this branch 2012-01-18 14:50:06 +01:00
M2j
7491023005 Head 1868 2012-01-17 21:37:57 +01:00
M2j
ac22a6014d - make i18n of bible references available through translate 
- accept different hypens for bible references
 2012-01-17 21:21:28 +01:00
Jonathan Corwin
3ebe38f7e1 Setting for X11 bypass flag. Don't open Impress unnecessarily if not enabled 2012-01-07 11:22:53 +00:00
Mattias Põldaru
14dde1f0c4 Rename EasiSlides to EasySlides 
bzr-revno: 1863
 2011-12-31 19:17:54 +00:00
Mattias Põldaru
011e963751 Wiki page is renamed as well. 2011-12-31 21:00:27 +02:00
Jon Tibble
fb34a3e86d Fix crashes in media settings (Bug #908252) 2011-12-31 17:37:56 +00:00
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Jon Tibble
89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Jon Tibble
4280e03c47 Head r1859 2011-12-29 18:47:39 +00:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jon Tibble
b25fe75070 Fix unused imports 2011-12-26 16:33:11 +00:00
Mattias Põldaru
173915f956 Made search function's replace greedy as well. Thanks to gushie the world is better place now :). 2011-12-23 18:03:37 +02:00
Mattias Põldaru
514773abe8 Make replace work for two or more occurrences. 2011-12-23 17:47:36 +02:00
Mattias Põldaru
e94ab832eb Escape \ and " characters first, to prevent traceback when sending such an alert from remote. 2011-12-23 17:23:32 +02:00
Mattias Põldaru
7f6edda463 Add a missing pair of quotes to fix #354. 2011-12-23 16:54:53 +02:00
Mattias Põldaru
706fa7ff49 Revert previous change. 2011-12-23 16:54:08 +02:00
Mattias Põldaru
2508e71a44 Supposedly fix for #354 in support.openlp.org, a traceback when JSON response from remote cannot be decoded. 2011-12-23 15:15:19 +02:00
Raoul Snyman
5bcfbb9433 Fixed bug #907164: Exclude footnotes div and the comment after it. 
bzr-revno: 1851
Fixes: https://launchpad.net/bugs/907164
 2011-12-21 12:30:16 +02:00
Mattias Põldaru
40783e1a3b Fixes error when trying to import an openlp.org songs or bibles database with non-ascii filename. Also some in-code notes about error handling. 
bzr-revno: 1850
 2011-12-21 12:29:08 +02:00
Mattias Põldaru
b80e2ffa5b Enable searching in web remote by pressing enter when search bar is focused. 
bzr-revno: 1849
 2011-12-21 12:27:54 +02:00
Mattias Põldaru
c1d1d38eba Such precision would not be needed in user errors, I suppose. The ones who would benefit from this can read log anyway. 2011-12-21 10:21:37 +02:00
Mattias Põldaru
5f9f87e8fa Style fixed. 2011-12-21 10:15:07 +02:00
Raoul Snyman
4e94986aa8 Fixed bug #907164: Exclude footnotes div and the comment after it. 
Fixes: https://launchpad.net/bugs/907164
 2011-12-21 07:22:49 +02:00
Mattias Põldaru
35665ff336 Fixes error when trying to import openlp.org v1 bible or songs db from a file with non-ascii characters. Also some notes about error handling. 2011-12-21 00:44:35 +02:00
Mattias Põldaru
b721559419 This line created a warning since codecs returns unicode strings. 2011-12-21 00:09:52 +02:00
Mattias Põldaru
72521be196 Merge trunk changes. 2011-12-20 23:00:20 +02:00
Mattias Põldaru
bfd0708f3a Enable search by pressing enter in web remote. 2011-12-20 22:43:57 +02:00
M2j
15449372e1 use ICU collator on Windows systems 2011-12-19 01:20:39 +01:00
Raoul Snyman
2033ecb71c Converted the back button to a home button, as that was its original intention. 2011-12-18 23:02:06 +02:00
Raoul Snyman
9cc7412852 Removed the dependency on json2.js, and removed json2.js 2011-12-18 22:49:31 +02:00
Raoul Snyman
2c7ee7ba20 Upgraded jQuery Mobile to 1.0 final. 
Fixed an issue where the search options were getting called too early. Now they are called on page load.
Fixed up bug #905367: The values were being sent through to the server unquoted.

Fixes: https://launchpad.net/bugs/905367
 2011-12-18 22:42:28 +02:00
Mattias Põldaru
dca74bd144 Style, no "is" to compare strings. 2011-12-17 23:17:53 +02:00
Mattias Põldaru
86df7d9734 Name it rather OpenLyricsError 2011-12-17 19:47:08 +02:00
Mattias Põldaru
28fa03b7cd Use OpenLyricsException instead. 2011-12-17 19:26:59 +02:00
Raoul Snyman
d701316923 Fix bug #900387: Converted a user's old Phonon setting to the new media players format. 
bzr-revno: 1842
Fixes: https://launchpad.net/bugs/900387
 2011-12-17 08:43:36 +02:00
Tim Bentley
0a9ea54bf8 Fix remote hiding of screen and updating UI buttons 
bzr-revno: 1841
 2011-12-16 15:06:14 +00:00
Raoul Snyman
d800951800 Actually read directly from the media controller, and then update the settings tab. 2011-12-15 23:06:50 +02:00
Raoul Snyman
19fac1e84a Cleaned up some code to conform to our coding standards. 
Added an appStartup() method to the media plugin to detect the settings of an older version of the media plugin, and update the settings.
 2011-12-15 22:13:45 +02:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Mattias Põldaru
235e8c6fcf Use generated exceptions instead to make more specific errors. 2011-12-15 13:53:51 +02:00
Tim Bentley
e141419cdc Fix method names and add to poll event 2011-12-15 06:10:35 +00:00
Mattias Põldaru
95147c996b Fix #304, catch AttributeError together with XML syntax error (which is true in wider meaning of syntax, I think). 2011-12-15 05:45:30 +02:00
Mattias Põldaru
ac557714ef Fix for 860876, a bug where web remote returns wrongly decoded alert message. It also fixes no search results when searching words with non-ascii characters. 
Fixes: https://launchpad.net/bugs/860876
 2011-12-15 00:39:52 +02:00
Tim Bentley
a06a1dd24c Fix url messages 2011-12-14 20:26:23 +00:00
Tim Bentley
fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
Mattias Põldaru
c10f73144d Fix for bug #828385, song import plugins order more alphabetical, but OpenLP related ones in front. It saves last used item's index. Saving of last used simply saves item's index in list, so if the order of import types changes (or one is added before the one), wrong item is selected for once. 
bzr-revno: 1837
Fixes: https://launchpad.net/bugs/828385
 2011-12-14 12:50:04 +02:00
Mattias Põldaru
3d278d51a7 Fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have (they really shouldn't since BOM is used to detect unicode on Windows and at least by wiki nobody is opposed). 
bzr-revno: 1836
 2011-12-14 12:47:52 +02:00
Mattias Põldaru
13385116af Using toInt of QVariant for sure is better than a chain of toString, str and int. Thanks to superfly. 2011-12-13 23:04:16 +02:00
Mattias Põldaru
1665c557c1 I always forget something :( 2011-12-13 22:20:17 +02:00
Mattias Põldaru
143d87cc88 One more list which needs right order. 2011-12-13 22:01:21 +02:00
Mattias Põldaru
57d78d00df Make loading of variable slightly more bulletproof. 2011-12-13 21:52:57 +02:00
Mattias Põldaru
4f603d7353 Previous change of order was not enough, now is actually works. It also saves the type of import last time used and uses that value as default (as suggested), otherwise defaults to OpenLyrics. 2011-12-13 21:33:49 +02:00
Mattias Põldaru
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +02:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jonathan Corwin
318484dc29 SOF5 capitalized words 2011-12-11 17:32:18 +00:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Mattias Põldaru
ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Jonathan Corwin
6bf2354d1a Fix Songs of Fellowship import and support book 5 
bzr-revno: 1828
 2011-12-09 19:13:30 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jonathan Corwin
6a17d55484 Songs of Fellowship 5 import 2011-12-09 00:08:59 +00:00
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
Tim Bentley
149a660dad Head 2011-12-05 19:47:59 +00:00
Tim Bentley
d05c6b8d70 Fix up song import code 2011-12-05 19:47:50 +00:00
Raoul Snyman
06570a9941 Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error. 2011-12-04 22:50:13 +02:00
Tim Bentley
17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley
f751ae092a fix exit code 2011-12-04 16:19:45 +00:00
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02:00
Raoul Snyman
2016ce61ca Sometimes the song_id column doesn't exist on the model, so we use the table instead. 2011-12-04 00:30:22 +02:00
Raoul Snyman
def18307cc Avoid an error about something not being a Boolean. 
Fixes: https://launchpad.net/bugs/899532
 2011-12-03 23:49:40 +02:00
Tim Bentley
6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Raoul Snyman
76d10b094f HEAD 2011-12-03 20:33:12 +02:00
Raoul Snyman
5b67d36b3c Fix problem where importing new song databases now does not work. 
Fixes: https://launchpad.net/bugs/863845
 2011-12-03 20:23:46 +02:00
Tim Bentley
add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley
8c4397d380 Head 2011-12-03 17:01:57 +00:00
Tim Bentley
13ec25eef5 Fix the plugin Disabled route as it has never been tested 
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
 2011-12-03 14:42:44 +00:00
Tim Bentley
b37c41d7a8 minor fixes 2011-12-03 13:32:19 +00:00
Tim Bentley
1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley
624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
Raoul Snyman
f8ea1349f4 Fix importing of newer songs databases. 
bzr-revno: 1811
Fixes: https://launchpad.net/bugs/863845
 2011-12-02 11:50:20 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
Raoul Snyman
d558cb080c Fix importing of newer songs databases. 2011-12-01 21:01:57 +02:00
rimach
e627960391 bugfixing 2011-12-01 19:07:15 +01:00
rimach
af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
Raoul Snyman
87f5d7843c Removed 'populate_default' arguments as they are not supported in older versions of migrate. 
Fixes: https://launchpad.net/bugs/896977
 2011-11-27 23:24:35 +02:00
Jérémie Nau
8e86f21cbd Service notes are not displayed on stage remote view when the current service item is the last. 2011-11-27 21:39:39 +02:00
Meinert Jordan
fee0f79a73 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.

bzr-revno: 1805
 2011-11-27 16:44:39 +00:00
Jon Tibble
5b4e8826ec Fix undefined variables 2011-11-26 21:59:21 +00:00
Jon Tibble
ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
M2j
047477c236 layout fix in exceptionform 
bug fix triggerd by searching for nonexistend book numbers
 2011-11-26 20:13:51 +01:00
Andreas Preikschat
d4e9968a4f Fix Song Select Import 
- applied patch from http://support.openlp.org/issues/330

bzr-revno: 1803
 2011-11-25 16:18:16 +00:00
M2j
ebcf7a5dd2 corrected function comment 2011-11-24 23:49:21 +01:00
M2j
286ec88fc4 make VerseType.Other default for VerseType encodings 2011-11-24 23:34:27 +01:00
rimach
7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
Jérémie Nau
0d1f843584 fixed method names 2011-11-24 20:28:03 +01:00
Raoul Snyman
a579725cd7 HEAD 2011-11-21 23:05:56 +02:00
M2j
b2067bef43 Bug #875286 
use VerseType.Other if it is not recogniced during OpenSong import.
 2011-11-18 11:53:56 +01:00
Tim Bentley
04b965d166 Fix incorrect signal 2011-11-13 16:31:08 +00:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
Raoul Snyman
3a62438ef1 Upgraded jQuery, jQuery Mobile; added a top toolbar. 2011-11-04 23:17:03 -07:00
rimach
1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Andreas Preikschat
1bf1ffc848 fixed bug 884826 
Fixes: https://launchpad.net/bugs/884826
 2011-11-01 18:32:31 +01:00
Andreas Preikschat
dad7e86f06 added/fixed comments 2011-10-31 15:18:22 +01:00
Andreas Preikschat
e402b72d58 - fixed bug #872975 (Importing from v1 fails with error about missing 'settings' table) 
Fixes: https://launchpad.net/bugs/872975
 2011-10-31 15:11:54 +01:00
Andreas Preikschat
482c741665 r1789 2011-10-30 22:38:42 +01:00
Andreas Preikschat
15e19f9700 fixed rename errors 2011-10-30 22:38:02 +01:00
Andreas Preikschat
0ed66b6a9c fixed alert position not being recalculated properly when changing options 2011-10-30 21:24:04 +01:00
Tim Bentley
c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley
ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01:00
Tim Bentley
8e853f10b1 Fix crash with alerts over video 
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
 2011-10-29 10:33:48 +01:00
rimach
dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
rimach
1f84c4c685 bugfixing 2011-10-24 22:07:10 +02:00
Andreas Preikschat
05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
Andreas Preikschat
e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background") 
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
 2011-10-19 19:30:32 +01:00
Tim Bentley
9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide 
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
 2011-10-19 19:25:08 +01:00
Tim Bentley
4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach
599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley
bdcf15d87b Fix comments 2011-10-17 19:01:07 +01:00
Andreas Preikschat
13ff2faf18 fixed ticket 299 2011-10-16 22:32:50 +02:00
Tim Bentley
bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat
406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat
004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Tim Bentley
2f36c33f62 Review fixes 2011-10-16 09:25:27 +01:00
Tim Bentley
8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
Andreas Preikschat
9259eed4a6 -fixed bug 871272 
-clean ups

Fixes: https://launchpad.net/bugs/871272
 2011-10-15 13:30:39 +02:00
Tim Bentley
9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Tim Bentley
bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley
e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Andreas Preikschat
76f47a4f62 - clean ups 
- only display alert when the screen is not hidden
 2011-10-10 18:54:01 +02:00
Andreas Preikschat
658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat
e6751bd043 fixed string 2011-10-09 21:51:44 +02:00
Andreas Preikschat
3c8cc5c532 removed comment + fixed regex 2011-10-09 21:45:50 +02:00
Andreas Preikschat
2591854fdd fixed bug 863376 
- clean ups

Fixes: https://launchpad.net/bugs/863376
 2011-10-08 15:20:57 +02:00
Stevan Pettit
0b4259ffba fixed Bug #832345 
bzr-revno: 1771
Fixes: https://launchpad.net/bugs/832345
 2011-10-08 10:59:13 +02:00
Stevan Pettit
2a1d0009a8 Removed whitespace 2011-10-05 18:17:57 -04:00
Stevan Pettit
5dfa0c95ce Modified code so new Openlyrics song import description will appear for translate 2011-10-05 15:50:17 -04:00
Tim Bentley
161300fe73 Number of changes 
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
 2011-10-05 19:20:54 +01:00
Andreas Preikschat
947b31d2c4 fixed name 2011-10-03 22:28:17 +02:00
Andreas Preikschat
91c20c4271 more clean ups 2011-10-03 22:26:51 +02:00
Andreas Preikschat
d3bfffa4b1 removed not used imports 2011-10-03 22:12:57 +02:00
Tim Bentley
5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Andreas Preikschat
42d15a53c7 suggest web bible name when registering 2011-10-03 14:32:45 +02:00
Stevan Pettit
dc41fa4318 Added coded to translate the modified OpenLyrics import description 2011-10-01 10:34:30 -04:00
Tim Bentley
648c5159a1 Allow the stageview time to be formatted between 12 and 24 hours 
Fixes: https://launchpad.net/bugs/863841
 2011-10-01 17:34:09 +05:30
Andreas Preikschat
8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Stevan Pettit
d8fc6cd4dd Added additional desctiption to OpenLyrics import selection and added code to select xml files for import 2011-09-30 17:45:59 -04:00
rimach
33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
Tim Bentley
ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley
88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Tim Bentley
c058c774fc revert 1757 2011-09-24 16:18:48 +01:00
Martin Zibricky
b66e07e98b Fixed bug #745636: Added export to openlyrics format with formatting tags. 
bzr-revno: 1758
Fixes: https://launchpad.net/bugs/745636
 2011-09-23 08:43:06 +02:00
Martin Zibricky
1ef223b4a3 Fix issues with ignoring comments and chords 2011-09-23 02:12:55 +02:00
Raoul Snyman
a6821c0b7d Removed some unnecessary experimental code. 2011-09-22 22:39:27 +02:00
Martin Zibricky
354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
Raoul Snyman
77e4e376c6 Fixed bug #812289. Forced the mediaitem to get the QListWidgetItem from the list again. 
Fixes: https://launchpad.net/bugs/812289
 2011-09-22 22:07:31 +02:00
rimach
d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach
11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach
2284cee517 little corrections 2011-09-22 20:27:04 +02:00
rimach
18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky
8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Martin Zibricky
c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Martin Zibricky
6e4c619cbd Add openlyrics export with formatting tags support. 2011-09-21 01:06:43 +02:00
Raoul Snyman
54a1e25cb7 Trying to fix bug #803342 2011-09-20 18:24:07 +02:00
Martin Zibricky
74c5669194 Dropped <line> element for openlyrics parsing and allow to import formatting tags over multiple lines and tags with only starting tag 2011-09-20 17:52:19 +02:00
Martin Zibricky
039115c7f4 Fix issue with more new lines when having more <lines> element in openlyrics document. 2011-09-19 14:59:37 +02:00
Martin Zibricky
b27784e838 Add comments to some new functions 2011-09-19 01:00:55 +02:00
Martin Zibricky
2b7f51d4e9 Code cleanup of openlyrics import with formatting tags 2011-09-19 00:43:12 +02:00
Martin Zibricky
14e94f8758 RAW code for OpenLyrics import with formatting tags 2011-09-18 01:22:16 +02:00
Martin Zibricky
8a11e790e5 [merge] merge with trunk r1747 2011-09-17 09:37:04 +02:00
Martin Zibricky
614ad790ae Fix spelling mistake 2011-09-16 13:31:11 +02:00
Raoul Snyman
f6927ef5b7 Fixed bug #851653, where deleting a song without audio files raised an exception. 
bzr-revno: 1747
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 13:20:44 +02:00
Raoul Snyman
1afcbbc837 Fixed bug #851653, added an if statement, and fixed the orphaned variable. 
Fixes: https://launchpad.net/bugs/851653
 2011-09-16 10:15:37 +02:00
Martin Zibricky
a7cd6c8a17 fix typo in comment 2011-09-15 19:44:03 +02:00
Martin Zibricky
82163867fe Add docstrings to some new openlyrics methods. 2011-09-15 14:23:40 +02:00
Tim Bentley
53b3b394e9 Turn off autopreview when deleting images. 
Stops images being deleted trying to preview themselves.

Fixes: https://launchpad.net/bugs/835033
 2011-09-14 21:27:30 +01:00
Martin Zibricky
526365153f rename in xml.py only_process_format_tags to parse_and_not_save 2011-09-13 22:40:34 +02:00
Martin Zibricky
8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Raoul Snyman
807aac95ee Delete audio files when you delete a song. 2011-09-12 19:09:11 +02:00
Raoul Snyman
017359ff5c Fixed up audio file import from version 1.2, plus a few bits I missed from renaming things. 2011-09-12 18:35:32 +02:00
Raoul Snyman
906b0fe67e Added support for copying files from openlp.org 1.2.x. 2011-09-12 08:29:58 +02:00
Martin Zibricky
5c13123cef Delete print statement 2011-09-10 22:15:23 +02:00
Martin Zibricky
a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Raoul Snyman
d1ae7a7f28 HEAD 2011-09-08 21:04:38 +02:00
Martin Zibricky
c8c8c7e654 code to expand <format> tag for openlyrics export 2011-09-08 01:16:14 +02:00
Martin Zibricky
9fb6936263 code to add formatting tags to openlyrics lyrics 2011-09-07 22:54:53 +02:00
Tim Bentley
a328d1c7c7 Bypass message if requested from remote plugin 
Fixes: https://launchpad.net/bugs/796195
 2011-09-06 18:53:43 +01:00
Martin Zibricky
6163bc99c3 Do not use depracated dict.has_key() function in openlyrics code 2011-09-06 15:22:17 +02:00
Martin Zibricky
5d2bde01c2 For openlyrics export skip adding format tags if not used. 2011-09-06 15:14:57 +02:00
Raoul Snyman
9659834430 Finished fixing variable names. 2011-09-06 07:47:33 +02:00
Raoul Snyman
564c7e4a5a Coding standards clean up. 2011-09-05 14:51:16 +02:00
Martin Zibricky
bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman
79bb94c6b0 Removed empty directories. 2011-09-04 14:04:44 +02:00
Raoul Snyman
a32e2b9d1b Hopefully fixed the problem where existing audio files are deleted. 2011-09-04 11:26:13 +02:00
Martin Zibricky
9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman
e8aae98e09 Fixed up a few things. 2011-09-02 21:04:07 +02:00
Raoul Snyman
79123e7df3 Tidied up some method and variable names. 2011-09-01 21:45:36 +02:00
Raoul Snyman
2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman
4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman
8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Mattias Põldaru
af10011c0c This seems to fix 
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
 2011-08-30 19:06:45 +01:00
rimach
2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach
c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach
20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach
c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman
bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit
7cbccb6b70 Added code to reload Bible list after first time wizard is rerun 
bzr-revno: 1731
 2011-08-29 17:54:09 +01:00
Mattias Põldaru
44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Stevan Pettit
96076a4bac Removed import receiver 2011-08-29 08:59:19 -04:00
Stevan Pettit
7e48256534 Removed need for signal to run appStartup 2011-08-29 08:47:32 -04:00
Raoul Snyman
2658c94520 Add audio file support to updating songs from the service. 2011-08-28 22:58:21 +02:00
Raoul Snyman
532ad84b87 - Bundle audio files with the song when adding it to the service 
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
 2011-08-28 22:51:44 +02:00
Raoul Snyman
0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman
015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit
d4e6c44d21 Fixed signal name 2011-08-27 16:42:22 -04:00
Andreas Preikschat
f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Andreas Preikschat
65630c6853 r1726 2011-08-27 13:24:24 +02:00
Andreas Preikschat
8020869dec - added some hints that the exporter export OpenLyrics files 
bzr-revno: 1726
 2011-08-27 13:19:55 +02:00
Tim Bentley
9949fba4ae Update songusage database to add plugin and what type of access. 
Amend triggers to record the correct data
Update report to output the new data items.

Apply fix in bug to allow Meda_data tables to be defined in core

bzr-revno: 1725
 2011-08-27 09:15:55 +01:00
Tim Bentley
611577577f Remove extra imports 2 2011-08-27 07:12:03 +01:00
Tim Bentley
9de4c0c118 Remove extra imports 2011-08-27 07:07:30 +01:00
Stevan Pettit
3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Raoul Snyman
f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Raoul Snyman
c81117991a HEAD 2011-08-26 22:59:27 +02:00
Tim Bentley
ed57b9bfbd Record timestamps of changes in songs database 
bzr-revno: 1724
 2011-08-26 20:51:14 +01:00
Tim Bentley
01128d4dc7 Fix report and triggers 2011-08-26 20:31:02 +01:00