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

6574 Commits

Author SHA1 Message Date
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
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
Tim Bentley e141419cdc Fix method names and add to poll event 2011-12-15 06:10:35 +00: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
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