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

3928 Commits

Author SHA1 Message Date
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
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
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
8289084423 changed indentation on the strings 2012-03-09 21:42:29 +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
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
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
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
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
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
M2j
b952b2cdbc Merge differing trees and remove whitspaces 2012-03-04 15:52:09 +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
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
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
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
Armin Köhler
2592d6f698 add possibility to search for songbook and songnumber 2012-02-26 22:27:05 +01: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
d4aab974d2 HEAD 2012-02-25 13:02:43 +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
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
Meinert Jordan
5cf9a83657 i18n for scripture references. 
bzr-revno: 1879
 2012-02-16 20:51:27 +02:00
M2j
ec4b78ccb2 replace placeholderText as it is not included in supported platform. 2012-02-05 20:20:01 +01: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
addc049c5b Set word wrap on qrDescriptionLabel so that it doesn't cause the groupbox to resize. 2012-01-30 17:44:37 +00:00
M2j
c0197d1af6 Bug #910860: Strip spaces from author name on CCLI import 2012-01-28 17:08:01 +01:00
Philip Ridout
b77b0d18d7 Added QR Code and link to download android app to settings tab 2012-01-25 22:04:36 +00: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
M2j
cac10059f3 update the 'scripture reference invalid' message 2012-01-18 21:20:05 +01: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
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
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
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
Mattias Põldaru
a0ecae3f47 Rename EasiSlides to EasySlides. 
Fixes: https://launchpad.net/bugs/904384
 2011-12-31 16:18:05 +02:00
Jon Tibble
89f3929bf7 Dedupe media search 2011-12-30 21:40:13 +00:00
Jon Tibble
4280e03c47 Head r1859 2011-12-29 18:47:39 +00: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
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
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
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
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
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
Raoul Snyman
d800951800 Actually read directly from the media controller, and then update the settings tab. 2011-12-15 23:06:50 +02: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
acebb85055 more changes 2011-12-15 17:19:54 +00: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
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
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
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
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
88d7176900 Fix for #828385, more sensible and partly alphabetical order of import formats. 2011-12-13 02:34:46 +02: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
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
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
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
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
Tim Bentley
ecba19f124 Fixes 2011-12-08 19:42:31 +00:00
Andreas Preikschat
fe8f5fb963 fixed plugins 2011-12-08 18:55:12 +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
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
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
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
Raoul Snyman
c825df38fa Hopefully the final piece of the fix. 2011-12-04 15:26:27 +02: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
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
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
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
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
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
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
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00