Commit Graph

13645 Commits

Author SHA1 Message Date
Phill Ridout
d87c39de44 revert previous changes 2014-12-30 08:55:16 +00:00
Phill Ridout
5d1eac9ded Add function to provide elided text
Fixes: https://launchpad.net/bugs/1405260
2014-12-30 08:48:46 +00:00
Ken Roberts
ff185523e1 Test for bug 1404967 2014-12-29 09:41:45 -08:00
Phill Ridout
36417083ce head 2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt
46d9d60830 Add missing translationtype to song edit form
bzr-revno: 2462
2014-12-28 21:49:54 +00:00
Tomas Groth
25e3e742b9 Fix media end time, Bible Parsing, ServiceManage Preview, locking of keytpress
bzr-revno: 2461
2014-12-28 21:46:34 +00:00
Tomas Groth
aae831e90d Disable webkit and phonon mediaplayers on Mac for now 2014-12-26 22:52:14 +00:00
Tomas Groth
98c5dd4865 Fix bug 1405476 by checking if an end_time has been set.
Fixes: https://launchpad.net/bugs/1405476
2014-12-26 17:45:34 +00:00
Tomas Groth
853c532bf9 Do not allow edit of start/end time for optical mediaclips in the servicemanager. Fixes bug 1393186 until re-edit of optical clips is added.
Fixes: https://launchpad.net/bugs/1393186
2014-12-25 22:02:58 +00:00
Samuel Mehrbrodt
c5d716f565 Test 2014-12-24 14:21:17 +01:00
Samuel Mehrbrodt
f13a9d00b5 Missing translation type
Fixes: https://launchpad.net/bugs/1405164
2014-12-24 11:42:46 +01:00
Tomas Groth
795977b094 Make bible text parsing a bit more rebust, fixes bug 1404865.
Fixes: https://launchpad.net/bugs/1404865
2014-12-23 22:09:34 +00:00
Tomas Groth
35de35103b Remove unneeded serviceitem shift when auto previewing. Fixes bug 1405133 and bug 1401234
Fixes: https://launchpad.net/bugs/1401234, https://launchpad.net/bugs/1405133
2014-12-23 21:17:20 +00:00
Phill Ridout
c9e1dcceff head 2014-12-23 18:57:04 +00:00
Tim Bentley
98a3cd127f Update code to 2.2 from 2.1 so translators can get working!
bzr-revno: 2460
2014-12-22 21:55:44 +00:00
Tim Bentley
3388249ec4 Fix bug in Custom matching where theme was not set so match always failed.
bzr-revno: 2459
2014-12-22 21:54:39 +00:00
Ken Roberts
3be4f10833 Change edit song ccli label to "CCLI song number" 2014-12-22 12:19:05 -08:00
Tim Bentley
93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Tomas Groth
672e2cc81f trunk 2014-12-19 23:08:23 +00:00
Tomas Groth
321709d7a7 [bug 954613] Introduce locking when updating slide display to avoid slidecontroller and display getting out of sync.
Fixes: https://launchpad.net/bugs/954613
2014-12-19 23:07:32 +00:00
Phill Ridout
4a9a7f2829 adds tests for bible media item 2014-12-19 22:02:45 +00:00
Phill Ridout
cb0e4dc7ba added copyright header to test 2014-12-19 22:01:15 +00:00
Tim Bentley
927e610977 Fix tests 2014-12-18 21:15:14 +00:00
Ken Roberts
10b9099f52 Fix typo 2014-12-18 12:51:34 -08:00
Ken Roberts
cfc0322eaf Test for projectoredit form 2014-12-18 11:06:25 -08:00
Ken Roberts
c596940a15 Fix notes edit not clearing between calls, added projectoreditform tests 2014-12-18 10:50:51 -08:00
Tim Bentley
5686e85384 Fix custom duplication bug 2014-12-16 07:47:46 +00:00
Tim Bentley
8c209fbb86 Head 2014-12-15 22:03:02 +00:00
926f89eece FTW issues fixed by using threads the right way.
- Refactor FRW to show up faster by downloading config file after show
- Fix a long-standing UI bug in FRW by supplying title and subtitle to config page

bzr-revno: 2458
2014-12-15 19:48:11 +00:00
fe02a80e26 HEAD 2014-12-14 22:37:36 +02:00
ba81146093 Fix a bug inadvertently introduced in the merge conflict. 2014-12-14 22:37:24 +02:00
b2f6eaf7d4 [Fix #1386913] "Discard" option in projector-select input option should only be for editing source input text
- Fix "Discard" and "Reset" dialog buttons calling wrong functions (swapttped)
- Fix dialog title text to reflect proper "Select" or "Edit" title
- Fix tabbed dialog width to be consistent
- Added calls to translate for user text
- Added basic test for openlp.core.ui.projector.sourceselectform

bzr-revno: 2457
Fixes: https://launchpad.net/bugs/1386913
2014-12-14 22:34:52 +02:00
Phill Ridout
e93eda152b fixes bug1390236 by limiting the selection in the media manager when a large number of results are returned 2014-12-14 16:56:48 +00:00
Phill Ridout
ae852466ec Fix selecting items in media manager using the keyboard when preview media items when clicked is set 2014-12-14 16:54:25 +00:00
e041d02c9c Refactored get_uno_command & get_uno_instance
bzr-revno: 2456
2014-12-12 21:31:39 +00:00
b407a8ace5 HEAD 2014-12-12 22:58:21 +02:00
5742f7546e Fixed up merge conflicts. 2014-12-12 22:57:42 +02:00
Tim Bentley
4febe07889 Update Translations
bzr-revno: 2455
2014-12-08 20:25:54 +00:00
Phill Ridout
2642a21d53 Refactor get_uno_command & get_uno_instance 2014-12-08 07:19:51 +00:00
Tim Bentley
f967ac455c transalations 2014-12-07 19:50:24 +00:00
Tim Bentley
175760983b Head 2014-12-07 19:40:11 +00:00
Phill Ridout
6fd0612748 set connection type for each test 2014-12-07 19:13:21 +00:00
Phill Ridout
2dd7a6e776 remove print statment 2014-12-07 17:53:32 +00:00
Phill Ridout
2aff850b64 HEAD 2014-12-07 17:46:46 +00:00
Phill Ridout
9d54d6351a Tests 2014-12-07 17:46:23 +00:00
Tomas Groth
4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
24a8f67fd0 Handle LibreOffice and SOffice commands on linux
Fixed imports conflict on merge.

bzr-revno: 2453
2014-12-07 08:20:30 +00:00
Philip Ridout
c9a2b87ac5 Fix links and Color buttons
bzr-revno: 2452
2014-12-07 08:16:15 +00:00
Tomas Groth
df6c533387 Fix upgrade on song db with lost version. Fixes bug 1391638.
Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015.
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271.

bzr-revno: 2451
2014-12-07 08:13:52 +00:00
Tomas Groth
46641fecbe Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944).
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.

bzr-revno: 2450
2014-12-07 08:11:59 +00:00