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 <> 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 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
Andreas Preikschat
36e729303c
reverted changes
2011-12-06 20:25:12 +01:00
Jon Tibble
04d7669948
Fix non-ascii file check on Macs
2011-12-05 21:40:56 +00:00
Tim Bentley
149a660dad
Head
2011-12-05 19:47:59 +00:00
Tim Bentley
d05c6b8d70
Fix up song import code
2011-12-05 19:47:50 +00:00
rimach
2df4a1903e
bugfixing
2011-12-05 19:48:32 +01:00
rimach
ae5998e2dc
sync
2011-12-05 18:43:54 +01:00
Raoul Snyman
b7e7da56e6
Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error about missing columns or tables.
...
bzr-revno: 1823
2011-12-05 18:06:47 +01:00
Jon Tibble
6b91f58da3
Head r1821
2011-12-04 20:58:39 +00:00
Jon Tibble
a54e7ff709
Fix non-ascii service filename loading
2011-12-04 20:57:58 +00:00
Raoul Snyman
ba0a4bb827
HEAD
2011-12-04 22:52:08 +02:00
Jon Tibble
6336915b4e
Reduce recent file list duplication (Bug #892668 )
...
bzr-revno: 1821
2011-12-04 20:50:52 +00:00
Raoul Snyman
11f5dfcfcd
HEAD
2011-12-04 22:50:39 +02:00
Raoul Snyman
06570a9941
Fixed a minor bug where if you imported 2 OpenLP 2.0 databases in the same OpenLP session whose schemas were different, you'd get an error.
2011-12-04 22:50:13 +02:00
Raoul Snyman
90d8b211d9
Hopefully the final fix to all our database woes.
...
bzr-revno: 1820
2011-12-04 20:19:20 +02:00
Tim Bentley
17bca693c6
Block song exports
2011-12-04 16:36:18 +00:00
Tim Bentley
f751ae092a
fix exit code
2011-12-04 16:19:45 +00:00
Jon Tibble
5804dade74
Reduce recent file list duplication (Bug #892668 )
2011-12-04 14:42:39 +00:00
Raoul Snyman
c825df38fa
Hopefully the final piece of the fix.
2011-12-04 15:26:27 +02:00
Andreas Preikschat
5d664d629d
fixed bug 768495 (Shortcut can be assigned twice in certain circumstances)
...
bzr-revno: 1819
Fixes: https://launchpad.net/bugs/768495
2011-12-04 12:08:09 +01:00
Andreas Preikschat
3218ab3d8f
- fixed a few tooltip strings
...
bzr-revno: 1818
2011-12-04 12:07:05 +01:00
Tim Bentley
456d7ec68e
remove print
2011-12-04 07:27:49 +00:00
Raoul Snyman
2016ce61ca
Sometimes the song_id column doesn't exist on the model, so we use the table instead.
2011-12-04 00:30:22 +02:00
Raoul Snyman
def18307cc
Avoid an error about something not being a Boolean.
...
Fixes: https://launchpad.net/bugs/899532
2011-12-03 23:49:40 +02:00
Raoul Snyman
2e7a25697d
HEAD
2011-12-03 23:40:30 +02:00
Andreas Preikschat
b78bb1c7e6
fixed tooltip strings
2011-12-03 21:35:53 +01:00
Tim Bentley
6698ce578d
Change Data type
2011-12-03 19:08:02 +00:00
Raoul Snyman
76d10b094f
HEAD
2011-12-03 20:33:12 +02:00
Raoul Snyman
5b67d36b3c
Fix problem where importing new song databases now does not work.
...
Fixes: https://launchpad.net/bugs/863845
2011-12-03 20:23:46 +02:00
Andreas Preikschat
f34ae80eec
fixed bug 887313
...
Fixes: https://launchpad.net/bugs/887313
2011-12-03 19:01:36 +01:00
Tim Bentley
add75e9c7f
Head 1815
2011-12-03 17:02:11 +00:00
Tim Bentley
8c4397d380
Head
2011-12-03 17:01:57 +00:00
Andreas Preikschat
ae8f57f707
r1815
2011-12-03 16:09:50 +01:00
Andreas Preikschat
5bfc101f09
changed name
2011-12-03 16:09:03 +01:00
Tim Bentley
13ec25eef5
Fix the plugin Disabled route as it has never been tested
...
Stop plugins being available if the database is more advanced than the code.
bzr-revno: 1815
2011-12-03 14:42:44 +00:00
Andreas Preikschat
eb121abb12
attempt to fix bug 768495
...
Fixes: https://launchpad.net/bugs/768495
2011-12-03 15:38:30 +01:00
Jon Tibble
9c0bde098f
Fix spacing
2011-12-03 13:40:48 +00:00
Tim Bentley
b37c41d7a8
minor fixes
2011-12-03 13:32:19 +00:00
Tim Bentley
1239cd707c
Fix database versions
2011-12-03 12:51:40 +00:00
Tim Bentley
624216a1b8
add field and usage
2011-12-03 09:05:01 +00:00
rimach
8412caf006
new version of vlc.py
2011-12-03 00:45:05 +01:00
Jon Tibble
02f5e819fb
Revert broken old incomplete thought
2011-12-02 22:23:37 +00:00
rimach
2c225c19a0
bugfixing
2011-12-02 23:00:28 +01:00
Jon Tibble
bd02fb5f30
Whitespace
2011-12-02 21:49:20 +00:00
Jon Tibble
e526687c71
Cleanup fix
2011-12-02 21:33:11 +00:00
Jon Tibble
f970d9462d
Cleanups
2011-12-02 21:13:05 +00:00
Jon Tibble
bba6d6730f
Head r1812
2011-12-02 20:17:57 +00:00
rimach
11acf005e2
add empty line
2011-12-02 16:15:31 +01:00
rimach
cc2c58d9dc
sync with trunk
2011-12-02 16:12:59 +01:00
Raoul Snyman
512bab74c3
Added a missing import.
...
bzr-revno: 1812
Fixes: https://launchpad.net/bugs/898876
2011-12-02 11:52:49 +02:00
Raoul Snyman
f8ea1349f4
Fix importing of newer songs databases.
...
bzr-revno: 1811
Fixes: https://launchpad.net/bugs/863845
2011-12-02 11:50:20 +02:00
Raoul Snyman
24095edc2b
Added a missing import.
...
Fixes: https://launchpad.net/bugs/898876
2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1
Rewrite of the multimedia stuff.
...
bzr-revno: 1810
2011-12-02 08:56:57 +02:00
Raoul Snyman
d558cb080c
Fix importing of newer songs databases.
2011-12-01 21:01:57 +02:00
rimach
4fc4bacfa7
bugfixing
2011-12-01 19:08:12 +01:00
rimach
e627960391
bugfixing
2011-12-01 19:07:15 +01:00
Raoul Snyman
3f50ea1b1a
Removed 'populate_default' arguments as they are not supported in older versions of migrate.
...
bzr-revno: 1809
Fixes: https://launchpad.net/bugs/896977
2011-11-30 22:32:04 +02:00
Tim Bentley
8fee84d052
Stop keyboard floods getting the slide controller and service manager out of set.
...
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
2011-11-30 22:27:54 +02:00
rimach
af63888e31
sync
2011-11-30 21:16:05 +01:00
rimach
6ed1342f95
sync
2011-11-30 21:14:18 +01:00
rimach
44d71dcee7
bugfixing
2011-11-30 18:10:57 +01:00
rimach
58035f505d
bugfixing
2011-11-30 18:06:57 +01:00
rimach
3570e48732
remove unused function
2011-11-30 09:29:32 +01:00
Christian Richter
b2349d892b
For newer versions of webkit playing videos doesnt work anymore.
...
bzr-revno: 1807
2011-11-29 19:49:33 +02:00
Tim Bentley
8b8a67c1f7
Fix double loop entry
2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b
Implement a queue to process the requests
2011-11-28 17:10:00 +00:00
Raoul Snyman
87f5d7843c
Removed 'populate_default' arguments as they are not supported in older versions of migrate.
...
Fixes: https://launchpad.net/bugs/896977
2011-11-27 23:24:35 +02:00
Jérémie Nau
8e86f21cbd
Service notes are not displayed on stage remote view when the current service item is the last.
2011-11-27 21:39:39 +02:00
Meinert Jordan
fee0f79a73
Bug #875286
...
use VerseType.Other if it is not recogniced during OpenSong import.
bzr-revno: 1805
2011-11-27 16:44:39 +00:00
Tim Bentley
ef884792ac
Move to reference counting
2011-11-27 16:08:42 +00:00
Jon Tibble
5b4e8826ec
Fix undefined variables
2011-11-26 21:59:21 +00:00
Jon Tibble
ac365e5b6a
Cleanups
2011-11-26 21:26:50 +00:00
Jon Tibble
fb6403f003
Head r1804
2011-11-26 20:32:47 +00:00
M2j
047477c236
layout fix in exceptionform
...
bug fix triggerd by searching for nonexistend book numbers
2011-11-26 20:13:51 +01:00
Andreas Preikschat
d4e9968a4f
Fix Song Select Import
...
- applied patch from http://support.openlp.org/issues/330
bzr-revno: 1803
2011-11-25 16:18:16 +00:00
M2j
ebcf7a5dd2
corrected function comment
2011-11-24 23:49:21 +01:00
M2j
286ec88fc4
make VerseType.Other default for VerseType encodings
2011-11-24 23:34:27 +01:00
rimach
65ce3c84d2
fix video play problem with newer webkit version and webkit player
2011-11-24 22:25:38 +01:00
rimach
7e0337a00d
sync
2011-11-24 22:12:32 +01:00
rimach
d104671a4c
bugfixing
2011-11-24 22:11:41 +01:00
rimach
d7f38caccd
bugfixing
2011-11-24 22:10:37 +01:00
rimach
dcbff07f29
sync
2011-11-24 22:09:26 +01:00
Jérémie Nau
0d1f843584
fixed method names
2011-11-24 20:28:03 +01:00
Tim Bentley
5e702c1782
Fixes keyboard flood where events are switched order by PYQT.
...
Now a keyboard press is only handled if the previous is finished.
Fixes: https://launchpad.net/bugs/892571
2011-11-23 06:05:42 +00:00
Raoul Snyman
a579725cd7
HEAD
2011-11-21 23:05:56 +02:00
Andreas Preikschat
0320f88d72
do not load the list twice when copying a theme
2011-11-19 13:00:36 +01:00
Tim Bentley
d5331f50b3
Amend check for files and delete if not used any more
...
Fixes: https://launchpad.net/bugs/891781
2011-11-18 19:34:04 +00:00
M2j
b2067bef43
Bug #875286
...
use VerseType.Other if it is not recogniced during OpenSong import.
2011-11-18 11:53:56 +01:00
Tim Bentley
04b965d166
Fix incorrect signal
2011-11-13 16:31:08 +00:00
Tim Bentley
ddc6c26f33
Head
2011-11-13 08:58:07 +00:00
Tim Bentley
516dda5ec3
Fixes
2011-11-13 08:57:29 +00:00
rimach
acffe7a66a
rename media_player.py
2011-11-12 16:31:58 +01:00
rimach
870a70ab3a
rename media_player.py
2011-11-12 16:30:41 +01:00
rimach
7077d5cda6
sync
2011-11-11 17:47:26 +01:00
rimach
a113c64464
bugfixing
2011-11-11 17:46:46 +01:00
rimach
087a1f7600
bugfixing
2011-11-11 17:45:25 +01:00
rimach
c0cc590c71
sync
2011-11-11 17:42:01 +01:00
Raoul Snyman
46643ab832
Added the quoting to database fields.
2011-11-07 23:22:35 -07:00
Andreas Preikschat
48354ec8ef
- fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller)
...
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
2011-11-05 20:39:51 +01:00
Raoul Snyman
3a62438ef1
Upgraded jQuery, jQuery Mobile; added a top toolbar.
2011-11-04 23:17:03 -07:00
Tim Bentley
d71f059433
Fix impress and service theme problems
2011-11-04 20:09:35 +00:00