Commit Graph

9283 Commits

Author SHA1 Message Date
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
Raoul Snyman
83bf85208e Added a label to the bottom of the dialog warning of missing verses. Also added all the invalid verses together to show a single dialog rather than one per invalid verse.
bzr-revno: 1902
Fixes: https://launchpad.net/bugs/716405
2012-03-12 06:01:15 +00: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
eb903a131b Fix the error introduced in r1896 which prevents services being loaded.
bzr-revno: 1898
2012-03-11 16:34:52 +00:00
Jonathan Corwin
530ac62f32 Pick a new variable name 2012-03-11 16:03:18 +00:00
Jon Tibble
82f0050778 Head r1897 2012-03-11 14:01:54 +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
Philip Ridout
74db5acaa3 Re-ordered group boxes as per Raouls request, and applied his radiobox code 2012-03-09 21:41:13 +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
Philip Ridout
5d8c2aae17 Fixes bug https://bugs.launchpad.net/openlp/+bug/883056
Adds radio buttons, and disables monitor selection when override display is on.
2012-03-07 22:14:58 +00: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
Jonathan Corwin
a2e40543ea Fix phonon video for opaque themes
bzr-revno: 1892
2012-03-06 19:37:27 +00: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