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
Samuel Findlay
598ef7fff3 Merge refactor-song-import 2012-06-09 06:31:15 +10:00
Samuel Findlay
6bf5f6d56f Change attributes from enumeration to strings. Double underscore class attributes 2012-06-09 05:30:33 +10:00
Samuel Findlay
f02e886976 Clean import strings of ASCII control chars (user's db had x07 chars) 2012-06-09 04:30:34 +10:00
Andreas Preikschat
f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay
398ac5afdf String correction 2012-06-07 22:49:33 +10:00
Samuel Findlay
c219665e1c Formatting 2012-06-07 22:30:41 +10:00
Samuel Findlay
cc90096534 Added optional descriptionLabel for song format to import wizard 2012-06-07 22:11:47 +10:00
Samuel Findlay
837fc1c726 Merge refactor-song-import r1994 2012-06-07 00:55:42 +10:00
Samuel Findlay
818e46fba7 Formatting and comments 2012-06-06 19:14:53 +10:00
Samuel Findlay
0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay
a79419d715 Formatting 2012-06-06 00:14:50 +10:00
Samuel Findlay
34de12040f Refactor exception handling 2012-06-06 00:12:19 +10:00
Samuel Findlay
a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay
2ccf92f543 Improved isComplete() validation for single file/folder. 2012-06-05 19:20:07 +10:00
Samuel Findlay
2fb09b2462 Working ZionWorxImport 2012-06-05 19:16:24 +10:00
Andreas Preikschat
ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
d16e64f11a fixed ticket 502 and another fix 
bzr-revno: 1981
 2012-06-04 12:39:38 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Andreas Preikschat
c4e8935392 fixed other variable names 2012-06-04 12:05:55 +02:00
Andreas Preikschat
770d245534 fixed non camelCase attributes 2012-06-04 11:57:45 +02:00
Andreas Preikschat
b02ea132f6 r1979 2012-06-04 11:54:02 +02:00
Samuel Findlay
676b0223b8 Tidy up 2012-06-04 01:32:21 +10:00
Samuel Findlay
6dba01ea23 2012-06-04 01:13:23 +10:00
Samuel Findlay
a07a81d851 Formatting 2012-06-03 23:52:45 +10:00
Samuel Findlay
7b97c15fc7 Refactor SongFormatAttr into SongFormat. PascalCase for enumeration. 2012-06-03 23:50:57 +10:00
Samuel Findlay
78c4906b55 2012-06-01 17:32:58 +10:00
Samuel Findlay
d9ed9aaa5c Removed obj_prefix (old code from r1055 and even < r990) 2012-06-01 00:24:24 +10:00
Samuel Findlay
606da7ab76 Typo 2012-05-31 23:58:10 +10:00
Samuel Findlay
5b7bc879ac r1978 2012-05-31 22:45:00 +10:00
Samuel Findlay
dddd883ede Fixed alignment of filepathEdit widget by adjusting spacer size according to label width. 2012-05-31 22:42:44 +10:00
Samuel Findlay
d86caecbbf Refactored sourcePage validation: reimplemented QWizardPage.isComplete() so that Next button is disabled until source(s) are selected. validateCurrentPage gives each song format class chance to validate its input. 2012-05-31 19:15:45 +10:00
Samuel Findlay
c4060dc04b First working rev. Completed basic testing. 2012-05-31 00:59:54 +10:00
Samuel Findlay
504145d454 Completed refactor of songimportform.py 2012-05-30 23:53:31 +10:00
Samuel Findlay
e882607360 Completed refactor of importer.py 2012-05-30 19:11:44 +10:00
Samuel Findlay
465aecc61c Mostly complete attempt at refactor. Tidy ups needed. 2012-05-30 02:26:50 +10:00
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Tim Bentley
0a16d41aef Head 2012-05-27 06:46:20 +01:00
Tim Bentley
577e39bdee Fix typing 2012-05-27 06:46:08 +01:00
Andreas Preikschat
8241808d65 fixed traceback when deleting an author/topic which has just been added to an unsaved song 2012-05-26 22:06:19 +02:00
Andreas Preikschat
cf59d89afa fixed ticket 502 2012-05-26 21:56:12 +02:00
Samuel Findlay
fc87e58a3c Changed ZionWorxImport to parse CSV database dump (XML had invalid syntax) 2012-05-24 22:12:48 +10:00
Samuel Findlay
4fd9855b69 Added ZionWorxImport class, xml version 2012-05-24 19:58:05 +10:00
Andreas Preikschat
4a6697f5a1 r1975 2012-05-23 18:31:25 +02:00
Stevan Pettit
357f876331 Removed unused import qtcore 2012-05-21 08:41:33 -04:00
Stevan Pettit
968674a659 Merged with trunk, fixed conflicts and other changes 2012-05-20 23:06:17 -04:00
Andreas Preikschat
060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Samuel Findlay
e01995eafd Tidy up 2012-05-20 11:42:07 +10:00
Samuel Findlay
e28f654b0f r1972 2012-05-19 20:49:05 +10:00
Samuel Findlay
cdd867a755 Added static method isValidSource so importers can validate their input. Also tidyup: removed SongImport.errorLog 2012-05-19 20:43:19 +10:00
Raoul Snyman
f5cba00ca9 Fixed a small bug left over from a previous refactoring. 
Fixes: https://launchpad.net/bugs/997174
 2012-05-16 18:42:33 +02:00
Raoul Snyman
bfcb6a50b0 Reworked according to Andreas' specifications. 2012-05-15 23:06:09 +02:00
Raoul Snyman
8436d9d8c0 Fixed a super-annoying bug where any newly imported Bibles would throw an exception. 2012-05-11 21:09:12 +02:00
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Samuel Findlay
a03af240df Minor fixes 2012-05-07 23:38:02 +10:00
Samuel Findlay
31debbe238 Improved PowerSong import wizard validation 2012-05-07 23:26:52 +10:00
Samuel Findlay
3483231a32 Adapted PowerSongImport class to receive a folder 2012-05-07 23:10:26 +10:00
Samuel Findlay
28d9a05731 Adapted all PowerSong import widgets for select folder 2012-05-07 21:24:46 +10:00
Samuel Findlay
bf4dcdde92 Added getFolder to OpenLPWizard 2012-05-07 20:36:39 +10:00
Samuel Findlay
fc8c5598aa Changed 'PowerSong' to 'PowerSong 1.0 and Code tidy ups. 
bzr-revno: 1967
 2012-05-05 19:51:31 +01:00
Andreas Preikschat
2680cc7cda - fixed regression which I have introduced in r1962 (user defined formatting tags were not considered any longer); - reworked staticmethods (merged functions etc); - changed saveButton behaviour to reflect the internal things happening (the button is now only enabled when you can save a change) 
bzr-revno: 1966
 2012-05-05 20:38:59 +02:00
Andreas Preikschat
5959ee5158 fixed regression, reworked staticmethods, changed button behaviour to reflect the internal actions 2012-05-05 18:03:40 +02:00
Andreas Preikschat
b3f733233a fixed two extra new lines being added 2012-05-05 16:25:55 +02:00
Andreas Preikschat
f658c741eb renamed method 2012-05-05 16:12:11 +02:00
Andreas Preikschat
74ff2f92ee added comment 2012-05-05 16:08:07 +02:00
Andreas Preikschat
75f1041d27 removed occurrences of 'virtual' split 2012-05-05 16:03:48 +02:00
Andreas Preikschat
a9c1443cc5 r1963 2012-05-05 15:59:27 +02:00
Andreas Preikschat
34b3173988 fixed bug 885874 (Song with mis matched formatting tags abends on render) 
Fixes: https://launchpad.net/bugs/885874
 2012-05-05 15:59:04 +02: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
Samuel Findlay
416cbe465e Changed 'PowerSong' to 'PowerSong 1.0' 2012-05-03 22:50:10 +10:00
Samuel Findlay
45c180308a Implemented BinaryReader.Read7BitEncodedInt from .NET. Tidy code. 2012-05-03 22:41:49 +10:00
Samuel Findlay
76de0f0c60 Merge trunk r1961 2012-05-03 14:25:31 +10:00
Raoul Snyman
10dbb5ee16 Changed some things to comply with Debian's packaging policies. 2012-05-02 22:57:12 +02:00
Samuel Findlay
8877484aea Tidy up code, stonger error checking. 2012-05-02 19:14:30 +10:00
Andreas Preikschat
63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Samuel Findlay
ecc943ae20 Update to trunk r1960 2012-05-02 00:00:53 +10:00
Samuel Findlay
63b71802ab Rewrote PowerSongImport class to read variable-length strings directly from file, rather than searching for them. Other minor fixes. 2012-05-01 23:51:46 +10: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
Andreas Preikschat
a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
Samuel Findlay
1184e9219d Small fixes for comments typos in songs.lib modules 2012-04-30 22:19:36 +10:00
Samuel Findlay
370603c779 PowerSong importer working. Successful on test set of 1057 songs 2012-04-30 20:57:44 +10:00
Samuel Findlay
ea9bfb160d Integrated module openlp.plugins.songs.lib.powersongimport 2012-04-30 16:24:04 +10: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
Samuel Findlay
21a88085e3 First attempt at class openlp.plugins.songs.lib.PowerSongImport 2012-04-30 00:08:25 +10: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
Philip Ridout
52e23a2eeb removed import that sliped in! 2012-04-24 20:39:40 +01: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
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
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
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
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
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