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

332 Commits

Author SHA1 Message Date
suutari-olli 447f7a9ead Merging to trunk on 3.4.16 2016-04-03 23:58:06 +03:00
Tim Bentley a0bfc7d069 move methods 2016-04-03 20:44:09 +01:00
Tim Bentley 6fa0f07e32 head 2016-04-03 20:07:09 +01:00
Tim Bentley d7e2e0e839 remove import 2016-04-03 20:06:48 +01:00
ian@knightly.xyz a0e004b68f Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check. 
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...

bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860, https://launchpad.net/bugs/1550856
 2016-04-03 16:55:55 +01:00
Tim Bentley ec30c560a7 move tests and code 2016-04-01 18:28:40 +01:00
Tim Bentley 203c7b9dd8 move historycombo 2016-04-01 17:56:54 +01: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
Tim Bentley 4362ff63f8 language manager 2016-03-31 17:42:42 +01:00
Tim Bentley ba6d66497c actions 2016-03-31 17:34:22 +01:00
Tim Bentley 3693cf331d fix string in natural sort and move db 2016-03-31 17:14:28 +01: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 87cdde1575 Merging trunk on 15/3/16 2016-03-15 21:14:40 +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
suutari-olli a78565568f Pep8 fixes 
To do:
Test(s)
 2016-03-15 12:30:37 +02:00
suutari-olli d61ded487e In this Merge: 
- Min. search lenght no longer counts spaces.
- Bolded part of "Empty or too short" error message
- Modified some comments 

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Listing search results when typing for Text search
 2016-03-09 02:25:07 +02:00
suutari-olli 6de4a5c923 In this commit: 
- Replace '. ' with ' ' in Reference search, so for an example Gen. 1 works
- Modified related error messages

To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
 2016-03-09 00:46:47 +02:00
suutari-olli 432177fd2d In this commit: 
- Added: self.application.set_normal_cursor() to "Web bible" and "no search results" for combined.

 To do:
- Write tests

Optional fixes that are not yet done/may not be done.
- Ignore '.' in Reference search for smoother searching experience + Remove mention about it in error and add ending to uistrings.py
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
 2016-03-08 03:34:42 +02:00
suutari-olli 07c519084a - Moved empty/short search messages and parts of scripture error to uistrings.py 
- Improved some Error messages
- Improved some comments
 2016-03-08 02:34:31 +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
Tim Bentley 334eb6c8c5 fix missing resize) 2016-02-20 11:51:58 +00:00
Raoul Snyman f6c2a5b410 Fix bug #1533246 
Fixes: https://launchpad.net/bugs/1533246
 2016-02-02 23:55:37 +02:00
Tomas Groth c34bfd6d95 Adjusted string 2016-01-23 09:15:37 +01: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
Tomas Groth f8114d0b97 Disable button for replacing live background if the webkit player is not available. 2015-04-21 22:49:22 +01:00
Tomas Groth f8b575065a pep8 fix 2015-04-02 21:29:43 +01:00
Tomas Groth d2301e016e improved logging 2015-04-02 13:50:50 +01:00
Phill Ridout 4b52fde1da Fixes possible bug and adds test 2015-02-21 13:08:56 +00:00
Phill Ridout 05ce21104d PEP fix 2015-02-19 21:57:26 +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 1b2b1c74cc Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197. 
If no copyright info is given for bible, don't print it. Fixes bug 1420785.
Make csv-bible import work with python3. Fixes bug 1421136.
Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.

bzr-revno: 2502
 2015-02-17 18:50:10 +00:00
Tomas Groth 0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Phill Ridout af2467ed93 Check for theme version. Implement a custom exception 
Fixes: https://launchpad.net/bugs/1419691
 2015-02-13 21:47:06 +00:00
Phill Ridout 77109e61fd Update doc string 2015-02-13 21:00:55 +00:00
Phill Ridout 3e697dc213 HEAD 2015-02-13 20:41:54 +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
Ken Roberts a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
Ken Roberts a50744adbc Added sha1_filecheck 2015-02-03 14:54:41 -08:00
Ken Roberts b02d44416a Allow md5check to use non-ascii encoding, added md5_filecheck 2015-02-02 10:00:39 -08: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 e89558da39 Fix label text for CCLI 
bzr-revno: 2463
 2014-12-31 10:26:50 +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 af4715dc3c Remove the registered functions instead of overwriting 2014-12-02 09:46:19 +00:00
Tomas Groth 1c71efc532 Allow overwriting functions in registry, and use it when registring MainDisplay. Fixes bug 1397287 
Fixes: https://launchpad.net/bugs/1397287
 2014-12-01 15:08:13 +00:00
Raoul Snyman ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
Raoul Snyman 6a67a77240 Fix bug #1387309: Filter out ampersands and angle brackets 2014-10-31 21:47:36 +02: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 b8f84f79eb Fix previous reviews 2014-10-09 13:30:07 -07:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Raoul Snyman 496c12b2db Reformatted a comment; Renamed NT to WIN; Made OpenLPMixin constructor slightly more robust. 2014-09-04 22:10:34 +02: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
Samuel Mehrbrodt 56ebf2de00 Revert change in check for language dir 2014-05-28 19:17:26 +02:00
Samuel Mehrbrodt e70a09c93e Detect language folder in source directory 2014-05-22 15:40:05 +02:00
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
Andreas Preikschat 4231692ae1 removed print 2014-05-02 08:34:57 +02:00
Andreas Preikschat 2ba7fa4f44 head 2014-05-01 18:58:32 +02:00
Andreas Preikschat 3f75a913e2 removed not working tests 2014-05-01 18:57:45 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tim Bentley 576ab6e1f9 head 2014-04-04 21:20:00 +01:00
Raoul Snyman 73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Tim Bentley 3e7370c656 head 2014-04-01 18:33:13 +01:00
Tim Bentley edd1ed849a minor fixes 2014-04-01 18:32:19 +01:00
Andreas Preikschat 3db984a846 clean up: simplify code 2014-03-31 19:32:49 +02:00
Andreas Preikschat 5227924846 fix: removed stray print 2014-03-31 19:29:14 +02:00
Andreas Preikschat c451a8eafa added test 2014-03-31 19:01:09 +02:00
Tim Bentley 5d9533947d Final set of PEP8 cleanups 2014-03-20 19:10:31 +00:00
Tim Bentley 30835067d3 fix trunk 2014-03-18 20:36:02 +00:00
Tim Bentley 9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley 0a2456fa19 Finish adding RegistryProperties 2014-03-16 21:25:23 +00:00
Tim Bentley ea99cbb08d use decorator 2014-03-13 20:20:42 +00:00
Tim Bentley 5e6f97d74e fix order and comment 2014-03-13 20:08:47 +00:00
Tim Bentley 31ee1b43a6 first view 2014-03-12 17:41:52 +00:00
Raoul Snyman b35de747ab Move HistoryComboBox to openlp.core.common 2014-03-11 20:58:49 +02:00
Tim Bentley 5d740a7706 Removep 
bzr commit -mRemovep
 2014-01-11 22:05:38 +00:00
Tim Bentley 743ad7b44a Clean up inits 2014-01-11 21:29:01 +00:00
Tim Bentley 7fe95731f9 Fix up Main display 2014-01-11 17:52:01 +00:00
Tim Bentley 360d9883b4 Migrate renderer 2014-01-05 17:09:51 +00:00
Tim Bentley 51178b2ede Fix tests 2013-12-31 20:29:03 +00:00
Tim Bentley c8a3b33044 Start to fix ServiceManager and extent tests 2013-12-30 19:50:34 +00:00
Tim Bentley 27d651a129 Fix comment 2013-12-29 20:13:58 +00:00
Tim Bentley f187d86d1e Fix comment 2013-12-29 20:13:40 +00:00
Tim Bentley 8b109a8593 Fix comment 2013-12-29 20:09:41 +00:00
Tim Bentley e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley af006d087a Mainwidow cleanup 2013-12-23 20:43:35 +00:00
Tim Bentley 49dab79ce9 ThemeManager conversion 2013-12-23 07:03:56 +00:00
Tim Bentley d4ce5489ad updates and fix up slidecontroller 2013-12-19 20:17:06 +00:00
Tim Bentley e9a7850bc8 Add registry mixin and code cleanups 2013-12-15 16:50:09 +00:00
Tim Bentley e93b825ab4 Clean up PluginManager and complete logging 2013-12-14 08:12:41 +00:00
Tim Bentley d684359e59 Clean up exceptions used in error 2013-12-13 19:44:17 +00:00
Tim Bentley 84e90e01d1 new files 2013-12-13 18:42:26 +00:00
Tim Bentley cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Philip Ridout c41842125d HEAD 2013-11-16 20:32:50 +00:00
Tim Bentley 0f183af84d Missed file 2013-10-15 20:17:53 +01:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley a013d17bdd fix tests and add basic test 2013-10-13 18:02:12 +01:00
Tim Bentley b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley 257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00