raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
8,885 Commits 5 Branches 0 Tags 296 MiB
76de0f0c60
Commit Graph

6895 Commits

Author SHA1 Message Date
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
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
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
Jonathan Corwin
e5a316ba2d Transparency fixes 2012-03-05 19:40:16 +00: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
M2j
970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +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
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
c7d3b6e082 Display VLC disabled when not installed 
bzr-revno: 1889
Fixes: https://launchpad.net/bugs/927816
 2012-03-04 14:45:56 +00: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
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
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
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
Rastislav Pecik
4812c9e497 Fixed bug 941692 by adding the ability to specify an encoding. 
bzr-revno: 1887
Fixes: https://launchpad.net/bugs/941692
 2012-02-28 23:39:30 +02: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
Rastislav Pecik
8818256b2a Fixed code according to mrege proposal comments 2012-02-28 15:06:14 +01:00
Rastislav Pecik
271c4ef1a4 using QtCore.QVariant object as a second argument in settings.value method 2012-02-28 12:30:30 +01:00
Rastislav Pecik
6ec167ed83 QSettings.value() now uses second argument for default value, which is utf8 2012-02-28 12:12: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
fe5f3c8874 make use of **kwargs in action creation methods 2012-02-27 19:58:34 +01:00
Philip Ridout
d77534dc34 Fixes 439 on the support tracker 2012-02-27 18:41:24 +00:00
Rastislav Pecik
c024e9e47d Exported mysql charset settings to configuration files and cleaned up the code 2012-02-27 19:18:52 +01:00
Rastislav Pecik
b56d8d2a06 Fixed connection to mysql to use UTF8 encoding. 
Fixes: https://launchpad.net/bugs/941692
 2012-02-27 01:42:35 +01:00
Armin Köhler
2592d6f698 add possibility to search for songbook and songnumber 2012-02-26 22:27:05 +01:00
M2j
3a6a402b56 use Python methods instead of Qt 2012-02-26 22:09:22 +01:00
M2j
44a5784315 Merge all QAction creation methods in openlp.core.lib.ui 2012-02-26 21:43:59 +01:00
M2j
ee3da31682 Check for Qt version before calling QtCore.QLocale().createSeparatedList 2012-02-26 16:15:00 +01:00
Tim Bentley
025fe7e145 Correct brackets 2012-02-25 18:31:02 +00:00
Tim Bentley
3e1ba89a41 Fix locale test 2012-02-25 17:44:21 +00:00
Raoul Snyman
ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02: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
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
3e726f453f Attempted to fix bug #927473 by catching operational errors and redoing the action. 
bzr-revno: 1883
Fixes: https://launchpad.net/bugs/927473
 2012-02-19 22:56:06 +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
M2j
9e03cf0715 use Qt method if available 2012-02-17 19:51:01 +01: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
Raoul Snyman
bcad2c171f Added exception logging in case we need to confirm that we are actually getting the exception we think we are. 2012-02-16 21:05:16 +02:00
Raoul Snyman
2644de0d01 HEAD 2012-02-16 21:04:20 +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
Meinert Jordan
5cf9a83657 i18n for scripture references. 
bzr-revno: 1879
 2012-02-16 20:51:27 +02: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
Raoul Snyman
f8a8185eb0 Attempt to catch the OperationalError which is thrown when MySQL closes the connection without telling us. 2012-02-12 11:24:06 +02:00
Mattias Põldaru
d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00
Mattias Põldaru
62e2616ace Code cleanup. 2012-02-07 12:54:13 +02:00
Jonathan Stafford
13ab688518 Changing the "Wrap Slide" option into a three-way radio button selection to allow the option of the up/down arrow keys to jump between service items at the end of each song, etc. 
bzr-revno: 1876
 2012-02-06 17:35:41 +00:00
Jonathan Stafford
e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
M2j
ec4b78ccb2 replace placeholderText as it is not included in supported platform. 2012-02-05 20:20:01 +01:00
Andreas Preikschat
f9fb2bea5b fix ZeroDivisionError 
bzr-revno: 1875
 2012-02-05 16:22:21 +01:00
Christian Richter
863a9f9129 Added VLC support to OpenLP 
bzr-revno: 1874
 2012-02-05 16:39:46 +02:00
Andreas Preikschat
bedb2d833d fix ZeroDivisionError 2012-02-04 18:11:35 +01:00
Mattias Põldaru
dedb85b0cf Merge trunk. 2012-02-04 09:48:55 +02:00
Mattias Põldaru
51ee117a48 More function name changes. 2012-02-04 09:46:10 +02:00
Mattias Põldaru
6f219e175f Name changes to camelCase where appropriate. 2012-02-02 14:42:52 +02:00
Mattias Põldaru
7fca26dd0e Remove a leftover line which causes trouble on OSX. 2012-02-01 01:47:33 +02: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
2ea54182a6 Added a QR code to the remote plugin for Android users to download the Android app. 
bzr-revno: 1871
 2012-01-30 22:32:51 +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
Mattias Põldaru
6da181834c Meinert's suggestions taken into account about syntax and removed unnecessary variables. 2012-01-30 01:16:12 +02:00
Jonathan Stafford
21d0e93505 Tidied up blank lines between class definitions (again) 2012-01-30 06:13:51 +08:00
Jonathan Stafford
d26de263f3 Fixed missing u and tidied up blank lines between class definitions 2012-01-30 06:07:06 +08:00
Mattias Põldaru
90332e60d3 Prevent several updates to service name example when launching OpenLP. 2012-01-29 23:14:27 +02:00
Mattias Põldaru
01d42e0f11 Use note text as tooltip. 2012-01-29 18:47:15 +02:00
M2j
c0197d1af6 Bug #910860: Strip spaces from author name on CCLI import 2012-01-28 17:08:01 +01:00
Jonathan Stafford
02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Mattias Põldaru
b03295584b Addresses Meinert's concern about a hidden exception. 2012-01-28 01:13:35 +02:00
Mattias Põldaru
83155d45ea Text changes, thanks to Raoul. 2012-01-28 00:10:12 +02:00
Jonathan Stafford
312a02f14b Fixed typo 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:51:25 +08:00
Jonathan Stafford
7b180a4c67 Fixed bug #900727: Phonon backend no longer plays .mp4 video files 
Fixes: https://launchpad.net/bugs/900727
 2012-01-26 10:46:17 +08:00
Philip Ridout
b77b0d18d7 Added QR Code and link to download android app to settings tab 2012-01-25 22:04:36 +00:00
Jonathan Stafford
6487a3248a Moved Service Item Advance enumeration to slidecontroller 2012-01-25 20:34:13 +08:00
Jonathan Stafford
d686799035 Created Service Item Advance enumeration class 2012-01-25 18:03:57 +08:00
Mattias Põldaru
8c483a58b3 Added checkbox for to disable default service name, just as suggested. 2012-01-25 11:32:20 +02:00
Jonathan Stafford
2c472ff38e Small Fixes 2012-01-23 17:33:12 +08:00
Jonathan Stafford
4f0cd62f63 Fix typo 2012-01-22 17:14:50 +08:00
Jonathan Stafford
cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08: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
Jonathan Stafford
210d88ac79 Documented signal in Receiver class 2012-01-21 16:11:41 +08:00
rimach
88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
M2j
cac10059f3 update the 'scripture reference invalid' message 2012-01-18 21:20:05 +01:00
Mattias Põldaru
62a5578528 Make % acceptable character for filenames again. 2012-01-18 21:18:18 +02:00
Mattias Põldaru
62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02: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
Mattias Põldaru
8601a47dce Remove obsolete import. Fix saving wrong syntax and % bugs. 2012-01-18 13:20:15 +02:00
Jonathan Stafford
6543bbafb6 Changed slide_advance variable to be set only in SlideController initialisation or when settings are changed. 2012-01-18 17:52:51 +08:00
M2j
82250ee71f added dependency check for PyICU in exception dialog 2012-01-17 21:58:20 +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
Mattias Põldaru
e4f983e6ca Label back with new text. Also element Labels to the right place as Meinert suggested. 2012-01-17 10:50:29 +02:00
Mattias Põldaru
df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru
982bfbbd55 Fix labels according to Meinert's comment. 2012-01-16 15:50:17 +02:00
Jonathan Stafford
1dbcc18c7e Reintroduced slide_advance variable so that settings are only read once. Reverted language files. 2012-01-16 17:50:15 +08:00
Jonathan Stafford
c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford
01f7244db7 Removed unnecessary slide_advance 2012-01-15 18:05:12 +08:00
Mattias Põldaru
e6f2fd67c3 Disable QTimeEdit box, when it is not used. 2012-01-15 11:58:02 +02:00
Jonathan Stafford
87775f164a Migrate Wrap Setting to Slide Advance Setting 2012-01-15 17:08:08 +08:00
Jonathan Stafford
360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Mattias Põldaru
ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru
b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02:00
rimach
edf4ac75c8 move phonon and vlc to own windows 2012-01-12 22:45:07 +01:00
rimach
3e6d1e7962 update vlc code 2012-01-11 21:51:11 +01:00
rimach
b834371d5c Sync with head 2012-01-09 22:30:31 +01:00
Jonathan Corwin
f413ad2d30 Prevent selection of text on maindisplay 2012-01-07 23:03:14 +00:00
Jonathan Corwin
75359ac361 Helps if we load the right setting 2012-01-07 12:09:17 +00: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
8be4f309f5 Escape html tags and support formatting tags in Alerts 
bzr-revno: 1866
Fixes: https://launchpad.net/bugs/908197
 2012-01-06 18:44:12 +00:00
Stevan Pettit
11d63c6607 If the save location is unavailable, the "Save As" dialog is used. 
bzr-revno: 1865
Fixes: https://launchpad.net/bugs/905040
 2012-01-06 18:42:09 +00:00
Jonathan Corwin
fcf2eb17f0 Fix controller/theme wizard displays if transparent 2012-01-04 18:37:27 +00:00
Jonathan Corwin
46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Mattias Põldaru
6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru
1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Mattias Põldaru
85a92455d1 Apply formatting tags to alerts. 2012-01-03 01:43:59 +02:00
Stevan Pettit
34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit
3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05: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
Jon Tibble
768c099971 Indentation 2011-12-31 17:36:58 +00:00
Jon Tibble
e1a4837a19 Long line 2011-12-31 17:36:23 +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
c997c38c59 Head r1860 2011-12-31 13:54:57 +00:00
Jon Tibble
89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Mattias Põldaru
185cc5487a Use cgi.escape instead of simply replacing tags, also escaping & was missing. 2011-12-30 15:00:08 +02:00
Andreas Preikschat
68ee74f72f - download theme screenshots in a thread to speed up the FTW 
bzr-revno: 1860
 2011-12-30 08:59:02 +01:00
Andreas Preikschat
214bd37057 fixed method name 2011-12-29 20:41:25 +01:00
Jon Tibble
4280e03c47 Head r1859 2011-12-29 18:47:39 +00:00
Tim Bentley
93a59d560f Another year has passed by 
bzr-revno: 1859
 2011-12-29 17:50:42 +00:00
Andreas Preikschat
20ef9b9730 download theme screenshots in a thread 2011-12-29 13:26:37 +01: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
Jonathan Corwin
2b9f09b32a Minor fixes 2011-12-23 21:52:54 +00:00
Mattias Põldaru
b48dda3c74 Converts <> marks to &lt;&gt; to make it impossible to insert HTML to alerts. 
Fixes: https://launchpad.net/bugs/908197
 2011-12-23 21:14:49 +02:00
Jonathan Corwin
70ffa5b988 Head 2011-12-23 18:37:27 +00:00
Jonathan Corwin
5600946e0e divergences 2011-12-23 17:35:58 +00:00
Jonathan Corwin
ec035d6d37 Set correct monitor in wizard 2011-12-23 17:25:05 +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
Jonathan Corwin
3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00: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
Martin Zibricky
5f6962f4c7 This fixes bug #906926. 
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
 2011-12-22 23:36:22 +02:00
Jonathan Corwin
69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Martin Zibricky
79c5a3a4d4 refactoring: merge with trunk and use sys.platform 2011-12-22 19:29:55 +01:00
Martin Zibricky
4071bc8deb remove disabling opengl - done in new branch 2011-12-22 19:21:22 +01:00
Martin Zibricky
6828fc9ef5 fixed bug 907857: opengl rendering disabled for mac 2011-12-22 19:17:35 +01:00
Martin Zibricky
82728e148e #906926 fix stay on top for OS X 2011-12-22 15:46:47 +01:00
Jonathan Corwin
1cd3206f96 Redundant imports 2011-12-22 13:23:04 +00:00
Jonathan Corwin
16043527fc Check for Unity instead 2011-12-22 12:27:54 +00:00
Jonathan Corwin
b9c1da189a Head 2011-12-21 21:19:52 +00:00
Jonathan Corwin
febf40884f Just remove X11 bypass 2011-12-21 21:19:35 +00: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
Meinert Jordan
e974df4c54 recover v1.x theme file names from XML info 
bzr-revno: 1847
 2011-12-20 20:25:27 +00:00
Meinert Jordan
d94816d481 recover v1.x theme file names from XML info 
bzr-revno: 1846
 2011-12-20 20:23:36 +00:00
Raoul Snyman
479598ab0b Fixed up bug #905367: The values were being sent through to the server unquoted. 
- Fixed an issue where the search options were getting called too early. Now they are called on page load.
- Upgraded jQuery Mobile to 1.0 final.
- Removed the dependency on json2.js, and removed json2.js
- Converted the back button to a home button, as that was its original intention.

bzr-revno: 1845
 2011-12-20 20:21:58 +00:00
M2j
cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01: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
Andreas Preikschat
8bfaa22535 added missing ) 2011-12-18 20:46:56 +01:00
Andreas Preikschat
9e03e18653 added floft to the list of packagers 2011-12-18 20:44:41 +01: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
Andreas Preikschat
36d6a9003d Shortcut can be assigned twice in certain circumstances) 
Description of the fix:
1) Create a dict with the shortcuts as keys and a list of actions using this shortcut as value.
2) When we add a new action/shortcut we check if the shortcut is valid. If this is the case we add it to the dict and if not we remove the shortcut.

bzr-revno: 1840
 2011-12-16 15:04:51 +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
M2j
99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01: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
Tim Bentley
55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Mattias Põldaru
cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Andreas Preikschat
27843ae718 removed space 2011-12-15 16:27:17 +01:00
Mattias Põldaru
235e8c6fcf Use generated exceptions instead to make more specific errors. 2011-12-15 13:53:51 +02:00
Tim Bentley
e141419cdc Fix method names and add to poll event 2011-12-15 06:10:35 +00:00
Mattias Põldaru
95147c996b Fix #304, catch AttributeError together with XML syntax error (which is true in wider meaning of syntax, I think). 2011-12-15 05:45:30 +02:00
Jonathan Corwin
98a6c25ac8 Missed a file... 2011-12-14 23:41:52 +00:00
Jonathan Corwin
3874363e54 Add a more specific test for gnome shell 2011-12-14 22:44:41 +00:00
Mattias Põldaru
ac557714ef Fix for 860876, a bug where web remote returns wrongly decoded alert message. It also fixes no search results when searching words with non-ascii characters. 
Fixes: https://launchpad.net/bugs/860876
 2011-12-15 00:39:52 +02:00
Tim Bentley
a06a1dd24c Fix url messages 2011-12-14 20:26:23 +00:00
Tim Bentley
58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley
e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley
fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
Andreas Preikschat
d2cf6aa684 fixed a i18n bug + remove shortcut from map if removing the action 2011-12-14 16:45:11 +01:00
Mattias Põldaru
c10f73144d Fix for bug #828385, song import plugins order more alphabetical, but OpenLP related ones in front. It saves last used item's index. Saving of last used simply saves item's index in list, so if the order of import types changes (or one is added before the one), wrong item is selected for once. 
bzr-revno: 1837
Fixes: https://launchpad.net/bugs/828385
 2011-12-14 12:50:04 +02:00
Mattias Põldaru
3d278d51a7 Fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have (they really shouldn't since BOM is used to detect unicode on Windows and at least by wiki nobody is opposed). 
bzr-revno: 1836
 2011-12-14 12:47:52 +02:00
Mattias Põldaru
13385116af Using toInt of QVariant for sure is better than a chain of toString, str and int. Thanks to superfly. 2011-12-13 23:04:16 +02:00
Mattias Põldaru
2959235335 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags, resulting in the re-encoding of the same string on every save which makes the string wrong. 
bzr-revno: 1835
Fixes: https://launchpad.net/bugs/802159
 2011-12-13 22:34:30 +02:00
Mattias Põldaru
1665c557c1 I always forget something :( 2011-12-13 22:20:17 +02:00
Mattias Põldaru
143d87cc88 One more list which needs right order. 2011-12-13 22:01:21 +02:00
Mattias Põldaru
57d78d00df Make loading of variable slightly more bulletproof. 2011-12-13 21:52:57 +02:00
Mattias Põldaru
4f603d7353 Previous change of order was not enough, now is actually works. It also saves the type of import last time used and uses that value as default (as suggested), otherwise defaults to OpenLyrics. 2011-12-13 21:33:49 +02:00
Mattias Põldaru
9f5c0645aa No silly name abbreviations anymore. 2011-12-13 12:58:33 +02:00
Mattias Põldaru
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +02:00
M2j
f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j
0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Mattias Põldaru
e70ca4fa06 Fix for bug #802159, not decoding of utf8 decoded values of custom display tags. 2011-12-13 00:58:43 +02:00
Jonathan Corwin
16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00:00
Jonathan Corwin
d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly. 
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
 2011-12-12 19:20:51 +00:00
Tim Bentley
143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley
4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley
4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin
6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jonathan Corwin
318484dc29 SOF5 capitalized words 2011-12-11 17:32:18 +00:00
Jon Tibble
85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble
e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble
26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat
f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Mattias Põldaru
c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem. 
bzr-revno: 1830
 2011-12-10 20:31:16 +00:00
Mattias Põldaru
ca6250ae3b Supposedly fix BOM mess for utf-8 files. We assume no other file would begin with BOM, whatever encoding they have. 2011-12-10 20:21:18 +02:00
Tim Bentley
b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Andreas Preikschat
08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat
3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Andreas Preikschat
9967e34d0a re reverted changes 
Fixes: https://launchpad.net/bugs/768495
 2011-12-10 15:03:08 +01:00
Jonathan Corwin
4949f88f28 Fix problem with the outline alignment when the theme is using Justify. 
bzr-revno: 1829
Fixes: https://launchpad.net/bugs/859950
 2011-12-10 10:14:13 +00:00
Tim Bentley
39bc9238bf Lost temporary edit flag 2011-12-10 08:52:18 +00:00
Tim Bentley
1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Jonathan Corwin
6bf2354d1a Fix Songs of Fellowship import and support book 5 
bzr-revno: 1828
 2011-12-09 19:13:30 +00:00
Jonathan Corwin
6f77ee1351 Handle &nbsp; and other white space too 2011-12-09 18:52:24 +00:00
Andreas Preikschat
4eee13430e -Fixed media item recreation (which caused bug #900399) 
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
 2011-12-09 17:32:17 +01:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jonathan Corwin
6a17d55484 Songs of Fellowship 5 import 2011-12-09 00:08:59 +00:00
rimach
1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
Christian Richter
b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before. 
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
 2011-12-08 22:27:22 +02:00
Jonathan Corwin
c36a13d0a8 Remove webkit version in js 2011-12-08 19:49:43 +00:00
Tim Bentley
c5f6dbfa6e Head 2011-12-08 19:42:40 +00:00
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Jonathan Corwin
15d5b97075 Remove version check and js tidyups 2011-12-08 19:24:25 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +01:00
Andreas Preikschat
95aedfa5d9 assign variables in methods instead of returning them 2011-12-08 18:45:33 +01:00
Andreas Preikschat
4f9a801966 set settings_tab to None if plugin is disabled 2011-12-08 17:34:18 +01:00
Mattias Põldaru
97560f6947 The category strings, if not unicode, can only be QStrings. Thanks to superfly. 2011-12-08 14:13:57 +02:00
Jonathan Corwin
44eb1fb024 Remove comment 2011-12-07 22:24:13 +00:00
Jonathan Corwin
1c79b28461 Workaround justify and outline alignment problems 2011-12-07 21:56:06 +00:00
Andreas Preikschat
66c183a6b8 break instead of continue 2011-12-07 21:41:19 +01:00
Andreas Preikschat
32f2dcac59 reverted change 2011-12-07 21:28:26 +01:00
Andreas Preikschat
12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
rimach
f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
Jon Tibble
fd8525bf89 Head r1824 2011-12-06 22:38:46 +00:00
Mattias Põldaru
ef3e3252e7 Comparison to None is discouraged 2011-12-07 00:37:56 +02:00
rimach
b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
Mattias Põldaru
1830cfbe9e Ensure that action category names are unicode, to prevent warnings on comparison. 2011-12-06 23:25:04 +02:00
rimach
bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
rimach
7f513fc58c sync 2011-12-06 22:16:09 +01:00
Andreas Preikschat
73d0050b95 reverted r1819 
bzr-revno: 1824
 2011-12-06 20:40:55 +01:00
Andreas Preikschat
38a2a3dee2 fixed bug 768495 2011-12-06 20:30:39 +01:00