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

203 Commits

Author SHA1 Message Date
suutari-olli 6273cc911d Merged trunk on 11.4.2016 2016-04-11 00:17:03 +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
suutari-olli 12b63f8e71 Merged to trunk (1.4.2016) 2016-04-01 16:10:23 +03:00
suutari-olli eee1301f4e In this branch: 
- Removed old "Default image" settings from advanced tab.
- Removed related imports and functions.
- Renamed def on_background_color_changed to on_logo_background_color_changed
 2016-04-01 04:11:28 +03:00
suutari-olli 79724872fd In this branch: 
- Renamed "Default image" and related settings to "Logo" etc.
- Moved these settings to General tab from Advanced tab
- Re-wired these settings to code functions

To do:

- Remove these from advanced tab.
- Verify tests still work
 2016-04-01 03:54:33 +03:00
suutari-olli 19862a69a3 Merged to trunk. 2016-03-30 19:54:20 +03:00
Ian Knight 80a8abf4d0 Merged changes from trunk 2016-03-21 01:30:15 +10:30
suutari-olli dd70dbe515 Changed word order from "show nothing default" to "default show nothing" to better match other settings in the set. 2016-03-16 19:37:54 +02:00
ian@knightly.xyz dc6a9b6d86 Added single click preview for service manager (see attached blueprint) 
- Checkbox appears in advanced settings tab.
- When enabled, items will be sent to preview when clicked in service manager, but NOT if double-clicked.

bzr-revno: 2629
Fixes: https://launchpad.net/bugs/1536809
 2016-03-15 22:34:58 +01:00
suutari-olli a73c42ac34 Added: "Do not show anything on startup" as an option for disabling default image and background. 
(By default OpenLP logo and white bg color are shown on primary Live monitor
(At the moment it's only possible to change the color/image but not disable them.)
 2016-03-15 21:39:51 +02:00
suutari-olli 4a6b5b7cc4 In this merge: 
- Moved setting for controlling unblanking behaviour to General options tab.
- Removed it from  advanced tab
- Changed default setting to "no"
- Looped playback (once or to end) is now linked to this setting
- Unblanking slides on click -.- no longer unblanks display when sending new items live if
  "Unblank display when sending new item to live" is not enabled. -.-
- Doubleclicking preview -.- ^^
- Improved some comments

To do:
Test(s)?
 2016-03-15 20:37:55 +02:00
Ian Knight 68460f5e3f Added smart scaling when manually resized, integrated with settings dialog, fixed some pep8 errors 2016-03-06 03:11:32 +10:30
suutari-olli 87b9ae3600 Added "Unblank display when changing slide in Live" to advanced tab. 
Added automatic unblanking when starting loopped playback.

Now, only the tests remain!
 2016-03-03 02:07:52 +02:00
Raoul Snyman f6c2a5b410 Fix bug #1533246 
Fixes: https://launchpad.net/bugs/1533246
 2016-02-02 23:55:37 +02:00
Ian Knight 960fbb8865 Implemented Better Preview for Service Manager Blueprint 2016-01-18 03:16:37 +10:30
Tomas Groth e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Jonathan Springer ca8600414f Add comments and doc strings 2015-12-26 11:05:41 -05:00
Jonathan Springer 86c4acab9c Move adding shortcuts to __default_dict__ into __init__ to avoid having QKeySequences being run before a QApplication is created and crashing 2015-12-23 23:13:50 -05:00
Jonathan Springer b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
Jonathan Springer 9d94845584 Add some missed old shortcuts to their alternate field 2015-12-23 12:58:07 -05:00
Jonathan Springer 8327346647 merge trunk 2015-12-16 17:25:41 -05:00
Jonathan Springer 445e755895 Change some keyboard shortcuts to use predefined platform dependent shotcuts from Qt. 
Display keyboard shortcuts with modifiers in their platform native form.
 2015-12-16 17:19:50 -05:00
Jonathan Springer 50c0a173eb Add settings migration for phonon to system change 2015-12-07 16:41:15 -05:00
Jonathan Springer 7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tim Bentley ccd604b3be Strings 2015-10-15 19:00:39 +01:00
Tim Bentley cd4034ebf1 settings 2015-10-15 18:56:17 +01:00
Jonathan Springer eaf1e7a049 Docstring cleanups 2015-09-08 15:13:59 -04:00
Phill Ridout 4b52fde1da Fixes possible bug and adds test 2015-02-21 13:08:56 +00:00
Phill Ridout a255faa95b HEAD 2015-02-19 21:53:21 +00:00
Phill Ridout fa5b036323 adds bytes type 2015-02-19 21:47:53 +00:00
Tomas Groth 7c0386b7c0 Fixes for mysql as db backend 
bzr-revno: 2504
 2015-02-17 19:50:18 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Phill Ridout 77109e61fd Update doc string 2015-02-13 21:00:55 +00:00
Phill Ridout 126873ddaa fixes bug1416703 by implementing a function to do the conversion 
Fixes: https://launchpad.net/bugs/1416703
 2015-02-13 20:41:34 +00:00
Phill Ridout f6de8a4f7a Fix 1416703 2015-02-12 20:44:34 +00:00
Tomas Groth 733812572c Added projector and fixed spelling. 2015-02-11 22:15:46 +00:00
Tomas Groth 12a0b8b750 Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570. 
Fixes: https://launchpad.net/bugs/1412570
 2015-02-09 20:49:24 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Ken Roberts d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Ken Roberts 16f4fcbce3 Update settings to allow selecting source dialog layout 2014-10-20 16:17:15 -07:00
Tomas Groth cbd1b7c223 Changed setting version name 2014-10-14 09:52:59 +02:00
Ken Roberts e5743462e2 Added default socket timeout/poll time in settings 2014-10-13 17:07:54 -07:00
Tomas Groth e1fde7f6a5 Ask the user if a backup of the data folder should be created after upgrading 2014-10-13 12:26:23 +02:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Jonathan Springer f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Stewart Becker 73ec92ae13 Added option to wrap footer text 2014-07-21 07:37:41 +01:00
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Tim Bentley 9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley 0f183af84d Missed file 2013-10-15 20:17:53 +01:00