Commit Graph

14073 Commits

Author SHA1 Message Date
Tim Bentley
b8bbb4391c move code from presentations 2016-04-16 14:51:42 +01:00
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
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
Tomas Groth
6f975654cc Added tests. 2016-04-15 22:34:20 +02:00
suutari-olli
9f5426abdc Added short descriptions for enabling/disabling plugins, improved the messages. 2016-04-15 21:48:27 +03:00
suutari-olli
4520403387 - Added checkbox for controlling the visibility of Projectors panel in 1st time wiz. 2016-04-15 19:06:14 +03: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
suutari-olli
c9065a286a Added a setting that hides/shows Projectors panel after first time wizard.
This still needs a visual UI (Aka checkbox to wizard)
2016-04-14 10:19:59 +03:00
suutari-olli
2b35156931 - Changed default setting from False to True for 'user interface/lock panel': True
(This has caused countless cases of users messing up their UI and not knowing how to fix it)
2016-04-14 04:17:36 +03:00
suutari-olli
217ecbbfb0 - Removed # Banana and # Cherry comments, which I created to find parts of the code.
(Cherry was replaced with actual comment)
2016-04-14 04:10:59 +03:00
suutari-olli
d51910b6a0 In this commit:
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
- Locking panel visibility now makes the Mode menu unavailable.
2016-04-14 03:59:24 +03: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
Chris Hill
1d05ec4111 merge w/ trunk 2016-04-12 21:18:07 +01:00
Chris Hill
dfb34a5156 Enable auto-select for all searches when item previously selected 2016-04-12 21:17:12 +01:00
Tomas Groth
9628339b4c trunk 2016-04-12 22:05:58 +02:00
Tomas Groth
d3a57ae46b various fixes and improvements to the sword import. 2016-04-12 21:55:32 +02: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
Chris Hill
743a916292 merge w/ trunk 2016-04-08 12:53:54 +01: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