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

13847 Commits

Author SHA1 Message Date
Tomas Groth cb3ef2f7c8 Make it possible for presentations to wrap or go to next item, like native openlp-items. Fixes bug 1165855. 
Fixes: https://launchpad.net/bugs/1165855
 2016-04-21 22:09:42 +02:00
gabriel.loo@gmail.com c3e27b44f0 Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault). 
bzr-revno: 2646
Fixes: https://launchpad.net/bugs/1570228
 2016-04-21 17:03:36 +01:00
Gabriel Loo caa9c59c75 Added unit tests for SongSelect Importer search 2016-04-17 18:55:40 -04:00
Ken Roberts f6cb085b0d "- Update string format to Python3 style 
- Added projector lamp values test

Convert string format from Python2 
     '%s %s' % (value1, value2)
to Python3
     '{key1} {key2}'.format(key1=value1, key2=value2)

--------------------------------
lp:~alisonken1/openlp/strings_projector_pjlink (revision 2642)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1442/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1297/
..."

bzr-revno: 2645
 2016-04-17 17:33:08 +02:00
Ken Roberts 37bae16307 String formatting 2016-04-16 14:32:56 -07:00
ian@knightly.xyz dadff3c4de Allows users to change the automatic scrolling behaviour for when a new slide is selected. 
Currently on selecting a new slide, the next slide will be scrolled into view.
The changes provide a combo-box in the advanced settings that allow users to select additional options (see branch description for details).

Additional bounds checking and unit tests have been added to support this.

This latest proposal also contains additional input validation and testing thereof for values from Settings(...

bzr-revno: 2644
Fixes: https://launchpad.net/bugs/1550858
 2016-04-16 22:01:22 +01:00
suutari.olli@gmail.com 6df9cbeb47 "In this re-proposal: 
Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:')
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628

--------------------------------------------------------------------------------------------------------------

- Merged to trunk on 13.4.16, tests are now passing.

lp:~suutari-olli/openlp/show-no-log..."

bzr-revno: 2643
Fixes: https://launchpad.net/bugs/1512038
 2016-04-16 21:51:35 +02:00
Ian Knight f8718ee1cb Added extra validation checks and matching tests to __recalculate_layout(), row_resized(), replace_service_item() & change_slide() 2016-04-17 02:05:08 +09:30
Ian Knight 665a35b085 Cleaned up extra brackets 2016-04-17 01:20:58 +09:30
Tim Bentley e4a26718cc Media repeat icon 
bzr-revno: 2642
 2016-04-16 14:48:21 +01:00
Tim Bentley 6d3687d18e update to new icon 2016-04-16 14:41:30 +01:00
Ken Roberts d92757af97 Convert strings to format() method 2016-04-16 01:08:45 -07:00
Ian Knight ae6e6baeca Added comments 2016-04-16 16:44:04 +09:30
Ian Knight c8172d882f Merged from trunk 2016-04-16 16:32:36 +09:30
Ian Knight 26e8dde0ea Implemented feature, cleaned pep8 errors 2016-04-16 16:30:48 +09:30
Ian Knight 17d9bf0adc Implemented auto-scroll-choice 2016-04-16 16:23:01 +09:30
Tim Bentley ef81873416 Many changes in the code: 
* Video over text backgrounds loop
* We have timers for live and preview not sharing the same timer thread (Major bug)!
* We use MediaInfo to get the video time when building the service item not when playing. (Big change and major bug fix)
* Media can loop and button (stop by the stop button) controlls it. (Icon will be changed in next merge).
* Medio Live and Preview no longer clash and stop and start each other.
* Many code fixups and clean ups
* Remove flash as we do not support it and it is dead!
* fix up tests
* service files created before this will not work on this code as I have changed when the length is extracted.

Fixed comments from last merge request.

bzr-revno: 2641
 2016-04-15 21:56:42 +01:00
Tim Bentley 34c9d8b3ae add icon 2 2016-04-15 21:51:47 +01:00
Tim Bentley 8482da5d35 add icon 2016-04-15 21:51:35 +01:00
Gabriel Loo 3bca28fa0f fixed bug #1570228 'App crashes on SongSelect Importer search' 
Fixes: https://launchpad.net/bugs/1570228
 2016-04-14 04:18:53 -04:00
Tim Bentley 317364ca7e pep8 2016-04-13 20:15:53 +01:00
Tim Bentley a453a0d0d0 fix tests 2016-04-13 19:48:46 +01:00
Tim Bentley 6bac0cee26 pep8 2016-04-13 19:39:39 +01:00
Tim Bentley 19d120de1b Head and review comments 2016-04-13 19:38:49 +01:00
suutari.olli@gmail.com 6398e217df Added new icon for Preview. (Provided by superfly) 
--------------------------------------

This branch changes icons for Preview and Replace Live background buttons.

Currently preview button uses same icon as Blank to Theme and
Replace Live background uses same icon as Blank to black.
This is problematic because these icons don’t describe these
actions and may be confused with their other meanings.

Preview icon is replaced by system_mediamanager.png icon, which consists of
frame and is eas...

bzr-revno: 2640
Fixes: https://launchpad.net/bugs/1536808
 2016-04-13 18:40:05 +01:00
suutari-olli 7219ba22e6 Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') 
to uistrings, background color label now uses this.

This same string will be used several times in this branch:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628
 2016-04-13 18:50:04 +03:00
suutari-olli 010c7b6fb4 Merge to trunk on 13.4.16 2016-04-13 00:01:58 +03:00
Tim Bentley 65e84a317e fix tests 2016-04-12 22:00:18 +01:00
Tim Bentley d87c884f2d fix tests 2016-04-12 21:45:50 +01:00
Tim Bentley 01762951d0 head 2016-04-12 21:26:43 +01:00
second@tgc.dk cdadaf1ecb "Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. 
Set progress bar steps to number of chapters in zefania import.
Use standard button text in the FTW, if possible. Fixes bug 1554554.
Translation fixes. Fixes bug 1545072
Fix song tag detection. Fixes bug 1549549.
Fix a method call with too many parentheses, which fixes getting bible books from crosswalk."

bzr-revno: 2639
Fixes: https://launchpad.net/bugs/1545072, https://launchpad.net/bugs/1549549, https://launchpad.net/bugs/1553863, https://launchpad.net/bugs/1554554
 2016-04-12 21:36:16 +02:00
Tomas Groth 2aeb7f9e6f trunk 2016-04-10 22:24:07 +02:00
Tomas Groth 91714caedf Fix a method call with too many parentheses. 2016-04-10 22:13:33 +02:00
suutari-olli f57f335b0f Fixed the broken import statements. 2016-04-08 18:03:05 +03:00
suutari-olli 728ffd7205 Merge to trunk on 8.4.16 
You will need to 
manually delete the __pycache__ directory inside openlp_core_utils.
run "bzr resolve openlp_core_utils"
then you will be allowed to commit the changes.

also resolved conflict for advancedtab.py
 2016-04-08 16:46:45 +03:00
suutari-olli 76aa114ff0 This now moves old settings from advanced tab into the new settings. 2016-04-08 16:40:34 +03:00
Tim Bentley 483c12d779 vlc tests pass 2016-04-07 19:14:10 +01:00
Tim Bentley 189dc95bbf fix up tests 2016-04-07 19:01:16 +01:00
Tomas Groth 489321316f Made a exception catch more specific. 2016-04-06 23:14:23 +02:00
Tim Bentley a41d86cb7c Head 2016-04-06 06:08:44 +01:00
Tim Bentley a56f851794 Remove utils and move code to common and lib dirs, fix up tests and broken tests 
bzr-revno: 2638
 2016-04-06 05:58:51 +01:00
Tim Bentley 7f1f8cf780 pep8 2016-04-05 21:14:50 +01:00
Tim Bentley 31a2b37a88 pep8 2016-04-05 21:07:57 +01:00
Tim Bentley 59e3603a3e fix tests 2016-04-05 20:58:40 +01:00
Tim Bentley 1082254f02 fix tests 2016-04-05 20:51:46 +01:00
Tim Bentley 3500c73494 fix tests 2016-04-05 20:44:00 +01:00
Tim Bentley b6c49450d4 fix tests 2016-04-05 20:33:37 +01:00
Tim Bentley fb2de75cbc fix tests 2016-04-05 20:11:10 +01:00
Tim Bentley 7c88006c7b fix tests 2016-04-05 19:44:50 +01:00
Tim Bentley 1725518088 delete directory 2016-04-05 19:34:08 +01:00