M2j
5ee446f694
Head 1933
2012-04-03 19:59:34 +02:00
M2j
7175902e6d
removed whitespaces
2012-04-03 19:58:42 +02:00
Meinert Jordan
6a4edea071
Change default theme level to song level.
...
String fixes.
Fix missalignment of theme level selection labels.
bzr-revno: 1933
Fixes: https://launchpad.net/bugs/960386
2012-04-03 18:15:52 +01:00
Meinert Jordan
b2abc5a060
Remove control characters from song copyright string
...
bzr-revno: 1932
Fixes: https://launchpad.net/bugs/969282
2012-04-03 17:24:52 +01:00
M2j
9a68ce898a
string fix: behaviour > behavior
2012-04-03 18:15:17 +02:00
Meinert Jordan
93a9b62abb
Bug #959116 : Split slide button inserts tag on its own line
...
bzr-revno: 1931
Fixes: https://launchpad.net/bugs/959116
2012-04-03 09:38:27 +02:00
Meinert Jordan
3374ad21d9
Bug #953240 : Merging subverse entries (e.g. v1a) at OpenSong import
...
bzr-revno: 1930
Fixes: https://launchpad.net/bugs/953240
2012-04-03 09:37:07 +02:00
Meinert Jordan
a57289da8c
Bug #967522 : Don't drag from empty service manager area
...
bzr-revno: 1929
Fixes: https://launchpad.net/bugs/967522
2012-04-02 23:12:51 +02:00
Meinert Jordan
1128b424e5
Bug #795068 : Verse List in Song Editor did not resize properly
...
bzr-revno: 1928
Fixes: https://launchpad.net/bugs/795068
2012-04-02 23:11:41 +02:00
M2j
5dd334370d
Head
2012-04-02 23:06:55 +02:00
Meinert Jordan
22d29e7d62
Bug #959760 : Change theme manager delete button visibility on default theme change.
...
bzr-revno: 1927
Fixes: https://launchpad.net/bugs/959760
2012-04-02 23:06:16 +02:00
Meinert Jordan
a686cf9209
Bug #923500 : Do not mark service changed when accepting settings dialog.
...
bzr-revno: 1926
Fixes: https://launchpad.net/bugs/923500
2012-04-02 23:05:03 +02:00
M2j
dded8ee569
Bring back NextTrack
2012-04-02 23:00:24 +02:00
M2j
1c9d92bf2e
Bug #953240 : Merging subverse entries (e.g. v1a) at OpenSong import
2012-04-02 22:53:21 +02:00
M2j
45e4d2c77d
string changes
2012-04-02 21:52:47 +02:00
M2j
41ff5b04df
small fixes
2012-04-02 21:34:49 +02:00
M2j
b97445eaab
string changed
2012-04-02 20:44:07 +02:00
M2j
40774f6375
Bug #923500 : Do not mark service changed when accepting settings dialog.
2012-04-02 17:33:54 +02:00
M2j
36fc1b5339
Bug #959116 : Split slide button inserts tag on its own line
2012-04-02 16:23:25 +02:00
M2j
f876898033
Bug #959760 : Change theme manager delete button visibility on default theme change.
2012-04-02 15:46:41 +02:00
M2j
84ee153fec
Bug #795068 : Verse List in Song Editor did not resize properly
2012-04-02 15:27:08 +02:00
M2j
3fc81ea230
Bug #967522 : Don't drag from empty service manager area
2012-04-02 14:25:55 +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
3136ee475c
remove not needed import
2012-03-25 23:36:09 +02:00
Andreas Preikschat
9a53a8211e
removed not needed import
2012-03-25 23:34:02 +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
Andreas Preikschat
384d61b302
use try instead of version sting checking
2012-03-24 12:26:37 +01:00
Andreas Preikschat
8dca5b4647
add placeholder text to the search edit
2012-03-24 12:08:30 +01: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
Philip Ridout
cb38c0acd7
corrected the raw strings and back slashes
2012-03-23 06:36:24 +00:00
Raoul Snyman
c152cde3b7
Actually, the else should not be there.
2012-03-22 23:31:01 +02:00
Philip Ridout
61ecf629cd
added +
2012-03-22 21:09:20 +00:00
Jonathan Corwin
d6e3ed6ae1
Fixed bug #891775 : When the theme is bottom-aligned, stop the tails of y and g from being chopped off.
...
bzr-revno: 1914
Fixes: https://launchpad.net/bugs/891775
2012-03-22 23:02:23 +02:00
Philip Ridout
77f283c182
added the plus
2012-03-22 20:37:38 +00: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
Jonathan Corwin
6eff57d17b
Fix missing tails for bottom alignment
2012-03-21 22:27:04 +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
rimach
527f4cc00c
change camelcase variables
2012-03-19 20:27:02 +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
Jon Tibble
086a32d7b1
Head r1908
2012-03-17 16:42:53 +00:00
Jon Tibble
a9d70a2d2e
Bugs #888815 #941966
2012-03-17 14:44:23 +00:00
Tim Bentley
bc4cc7adb9
Remove print
2012-03-17 10:54:33 +00:00
Tim Bentley
83629a1b22
Get it working this time
2012-03-17 10:51:04 +00:00
Tim Bentley
9cdec0e3d3
Minor fixes
2012-03-17 10:46:08 +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
Jonathan Corwin
7872ea03b1
Fix the next slide keypress action to call its own routine, since the interface is different to the other next slide event.
...
bzr-revno: 1908
Fixes: https://launchpad.net/bugs/957129
2012-03-17 08:59:45 +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
Jonathan Corwin
8bca20a48c
Create wrapper routine due to incorrect parameter to slidenext
2012-03-16 23:05:06 +00:00
Christian Richter
2d18402e0b
Fixed bug 900038. Corrected signal names. Corrected pause/stop check.
...
bzr-revno: 1907
Fixes: https://launchpad.net/bugs/900038
2012-03-17 01:03:05 +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
rimach
7464d0f9fc
correct pause check, correct signal names
2012-03-16 22:09:27 +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
Jon Tibble
1882ea59f2
Head r1904
2012-03-13 22:19:14 +00:00
Raoul Snyman
44dc84c3cb
Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly.
...
bzr-revno: 1904
Fixes: https://launchpad.net/bugs/888815
2012-03-13 22:47:42 +02:00
rimach
09e7e16b12
fix issue, that video slider doesnt go back at video end
2012-03-13 20:54:16 +01: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
Raoul Snyman
ccba9e7df5
Fixed bug #888815 where the files were not being loaded into the audio player because their paths were not absolute. Now when the files are loaded from the saved service file, the paths recreated properly.
...
Fixes: https://launchpad.net/bugs/888815
2012-03-12 23:05:39 +02: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
Philip Ridout
0dd0a9b821
Warn before importing a theme with a name that already exists
...
bzr-revno: 1900
2012-03-11 16:41:24 +00:00
Philip Ridout
2c5fa20154
Disable monitor selection drop down list when "Override display postition" is checked
...
bzr-revno: 1899
2012-03-11 16:37:59 +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
Philip Ridout
bad057e725
Added Raouls fix
2012-03-10 22:59:38 +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
Philip Ridout
8f0e2ba8ec
Fixed mainwindow bug
2012-03-10 22:18:52 +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
f8021d315e
fixed mainWindow this time!
2012-03-10 17:13:19 +00:00
Philip Ridout
df54470988
Few more minor fixes
2012-03-10 16:44:58 +00:00
Philip Ridout
24b817cccf
More minor fixes
2012-03-10 16:14:07 +00:00
Philip Ridout
7d7e76fd9b
renaming variables, if your going to open a can of worms, might as well eat them all!
2012-03-10 16:03:58 +00:00
Philip Ridout
a40717c16f
Fixed up to Raouls guidelines
2012-03-10 08:22:52 +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
e9caa194f5
Adds a dialouge asking if the user wants to replace an existing theme when importing.
...
It works, but I dont know, it just feels like my code is a little bit "rough 'n' ready" let me know what you think!
2012-03-09 21:43:27 +00:00
Philip Ridout
8289084423
changed indentation on the strings
2012-03-09 21:42:29 +00:00