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

13316 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Roberts
15f1381de8 Upstream merges 2015-01-04 09:38:59 -08:00
Ken Roberts
5006fb238d Bump copyright year 2015-01-04 09:31:15 -08:00
Tomas Groth
9461f334ce Disable webkit and phonon mediaplayers on Mac OS X, 
bzr-revno: 2467
 2015-01-04 09:01:18 +00:00
6dfcbfd65a Fixes bug #1405260 "Slide controller title forces window width to grow" and adds the functionality to elide the text in the label. The tool tip is set to the full text. 
As bug #1390236 "OpenLP locks up / crashes when preforming a text search on bible" is caused by bug #1405260 "Slide controller title forces window width to grow" this has also been fixed.

Also fixes a third bug which affects making selections with the keyboard when "single click to preview" is selected.

Tests added for the new InfoLabel Class and for the bible media manager build_display_results method

bzr-revno: 2466
 2015-01-04 08:59:05 +00:00
Phill Ridout
c27c875f33 Readded deleted line. One more comment typo 2015-01-02 11:58:44 +00:00
Phill Ridout
3cafbfd0ed Typo in comments fixed 2015-01-02 11:54:42 +00:00
Phill Ridout
9fef267fd3 Changed the year 2015-01-02 11:42:17 +00:00
Phill Ridout
b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Phill Ridout
20d927b270 Rework to use a subclassed QLabel to allow dynamic resizing 2015-01-02 11:40:07 +00:00
Tomas Groth
9b2660bf7f Rewrote tests for webkit and phonon player 2015-01-01 17:41:32 +00:00
Tim Bentley
b56eece7f3 translations 
bzr-revno: 2465
 2014-12-31 20:06:18 +00:00
Tim Bentley
acaf4d6b03 Another year passes 
bzr-revno: 2464
 2014-12-31 20:05:30 +00:00
Tomas Groth
e5c5a229a4 Update to 2015 2014-12-31 15:06:35 +00:00
Tomas Groth
1e95bc7fbb Added simple tests for webkit and phonon players 2014-12-31 14:57:41 +00:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Tim Bentley
82ca72471e Head 2014-12-31 10:53:01 +00:00
Tim Bentley
a93e1f20c0 Updates 2014-12-31 10:32:53 +00:00
Ken Roberts
e89558da39 Fix label text for CCLI 
bzr-revno: 2463
 2014-12-31 10:26:50 +00:00
Phill Ridout
52c7d89706 removal of util function 2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized 2014-12-30 11:21:06 +00:00
Phill Ridout
3cf2a21ca2 fix tests 2014-12-30 09:03:35 +00:00
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
Raoul Snyman
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