Commit Graph

2952 Commits

Author SHA1 Message Date
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
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 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
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
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 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 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
Jonathan Corwin a2e40543ea Fix phonon video for opaque themes
bzr-revno: 1892
2012-03-06 19:37:27 +00:00
Philip Ridout 0e95ffe55f remove .encode hopefully to fix http://support.openlp.org/issues/442 2012-03-05 22:22:36 +00:00
Mattias Põldaru 1600e002cb Make media backend names translatable.
Fixes: https://launchpad.net/bugs/903683
2012-03-05 23:09:31 +02:00
Jonathan Corwin e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00:00
M2j 9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
M2j 970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
Raoul Snyman d6b14b39f8 HEAD 2012-03-04 20:05:29 +02:00
Raoul Snyman e59e717480 Hopefully fix the next button when things are on repeat. 2012-03-04 20:05:15 +02:00
M2j b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +01:00
rimach 5d6db957e1 fix 2012-03-03 23:36:46 +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
rimach 87e70fa2dc fix 2012-03-03 00:08:24 +01:00
M2j 45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in
case translators translate different strings same.
2012-03-02 13:11:13 +01:00
M2j 6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
M2j fe2966ac9e make slideShortcutActivated private 2012-02-28 10:47:34 +01: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
M2j 3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
Raoul Snyman ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02:00
Raoul Snyman 476ba8eb1b Fixed the copyright in the patch file which someone else missed.
Regenerated the resource file.
Fixed the copyright in the translation_utils.py script which someone else missed.
Removed an unnecessary comment.
2012-02-25 13:11:59 +02:00
Raoul Snyman d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Raoul Snyman d681afb2b4 Added an icon in for the Next button, and added in direct-to-track skipping too.
Fixes: https://launchpad.net/bugs/845692
2012-02-25 02:01:24 +02:00
Raoul Snyman 8fa7dcf080 Add the last two remaining outstanding items, the "next track" and the time remaining.
Fixes: https://launchpad.net/bugs/845692
2012-02-25 01:26:10 +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
Jonathan Stafford 4016038d33 Fixes bug 932610 where OpenLP crashes if the "Service Item Slide Limits" was set to "Next Item" and the user tries to advance beyond the ends of a service item in the preview pane using the up/down arrow keys.
bzr-revno: 1880
Fixes: https://launchpad.net/bugs/932610
2012-02-16 19:02:11 +00:00
Jonathan Stafford d57905f9d8 Fixed Preview Crash Bug 932610
Fixes: https://launchpad.net/bugs/932610
2012-02-15 18:37:42 +08:00
Mattias Põldaru d4efbfe122 Moved two items over to right columns. 2012-02-13 13:10:27 +02:00
Mattias Põldaru d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00