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
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