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

364 Commits

Author SHA1 Message Date
Olli Suutari 1c2ea31112 - Merged trunk on 8.1.17 2017-01-08 21:12:12 +02:00
Tim Bentley 74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Olli Suutari a9520ced68 - Merged trunk on 23.12.16 2016-12-23 22:16:24 +02:00
Tim Bentley a1f9029d25 Add start of tab and update poll 2016-12-23 16:11:47 +00:00
Tim Bentley 126c5462a0 Head 2016-12-22 15:12:03 +00:00
Tim Bentley 8570fb5e8c Fix tests 2016-12-21 09:41:57 +00:00
Tim Bentley a368a1d695 Move urg_get_file 2016-12-20 21:59:40 +00:00
Tim Bentley 95e70465de Add files 2016-12-20 21:21:17 +00:00
Philip Ridout 849bbd2c51 Pep fixes 2016-12-18 18:42:28 +00:00
Philip Ridout f9d01e414a settings.py 2016-12-18 13:35:03 +00:00
Olli Suutari f3ce137233 - Merged trunk on 4.12.16 2016-12-04 00:48:30 +02:00
Raoul Snyman ccdc88c4cb Change the name of the help menu to try to fix the double-help-menu problem 2016-11-29 17:44:32 +02:00
Philip Ridout 6a3982bab9 Moved over to using UiStrings 2016-11-12 10:00:36 +00:00
Tim Bentley 4adcef75fa Head 2016-10-26 19:13:49 +01:00
Tim Bentley 2d695f13ea Head 2016-10-26 19:12:38 +01:00
Tim Bentley e6571644dd head 2016-10-23 20:24:53 +01:00
Olli Suutari 3c733ddd20 - Merged trunk on 4.10.16 2016-10-04 16:39:14 +03:00
Tim Bentley c8dad716cc Review Comments 2016-09-19 19:51:48 +01:00
Olli Suutari 2edf579ec3 - Added the placeholder texts to uistrings 
- Added placeholder texts for Bible importer & Edit.
 2016-09-17 01:24:27 +03:00
Philip Ridout 80cdc35433 Move already refactored imorters over to using the log methods in OpenLPMixin 2016-09-04 17:15:57 +01:00
Tim Bentley 15adb41256 add song reporting 2016-09-03 07:42:45 +01:00
Olli Suutari e4e46d40f5 - Setting migration for escape item 
- Renamed shortcut descriptions for blanks
 2016-09-02 19:19:28 +03:00
Olli Suutari 875481d2d9 - A working only blank to desktop 2016-09-02 18:22:29 +03:00
Olli Suutari 3ac99b3e28 - Merged trunk on 14/8/16 2016-08-15 00:04:22 +03:00
Olli Suutari 35758b306a - Restored the default Help shortcut. 2016-08-15 00:01:48 +03:00
Tim Bentley 225160be24 Head 2016-08-12 19:21:30 +01:00
phill.ridout@gmail.com a503c1a0f9 Some more bible refactors. Mainly focusing on xml parsing and the csv importer 
lp:~phill-ridout/openlp/more-bible-refactors (revision 2699)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1708/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1619/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1319/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/909/
[SUCCESS] htt...

bzr-revno: 2692
 2016-08-12 18:26:54 +01:00
Tim Bentley 304032cd7d Merge and fix mess 2016-08-12 06:15:56 +01:00
Olli Suutari 8c107048b4 - Created a shortcut for the new help button, removed the old two shortcuts and created obsolete settings transfer. 2016-08-12 00:32:20 +03:00
Olli Suutari f590294b4a - Coded a combined help button, which opens the Local Help if using Mac or Win and Online help if using other OS's. 
(still need to change the help menu items)
 2016-08-11 23:54:56 +03:00
Olli Suutari 9794d26e95 - Changed the order of blank to modes in Shortcuts list from: 
Black, theme, desktop to desktop, theme, black.
- Pep8 fix (Ident)
 2016-08-11 16:28:30 +03:00
Olli Suutari 4cb3debb65 - Fixed bug: https://bugs.launchpad.net/openlp/+bug/1612187 
- Changed the default hotkey for "Blank to Desktop" to "Esc", added "D" as an alternative shortcut.
- Removed the default shortcut for "Escape item".
 2016-08-11 14:32:44 +03:00
Tim Bentley 098697a2cc more endpoint moves 2016-08-10 21:52:27 +01:00
Olli Suutari 50131ba202 - Merged trunk and resolved conflict that was created by ui-messages-part-1 branch. 2016-08-10 21:50:40 +03:00
suutari.olli@gmail.com ae81497fe3 This branch includes various UI string changes, such as: 
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
-  etc...

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Remove...

bzr-revno: 2688
 2016-08-10 19:31:33 +01:00
Ken Roberts c35a2d1430 String conversions with templates part 1 
- Fix string format key error in first time wizard from previous string conversion
- Fix projector pjlink1 test to use MagicMock
- Part 1 string conversions where format template is a string variable that's filled later
- Update projectordb test
- Fix a test on htmlbuilder string formatting
- Revert openlp/core/lib/htmlbuilder.py
- Convert renderer to use Template()
- Added test for renderer css
- Merge trunk and fix conflict
- Fix formatting in excep...
 2016-08-10 19:29:21 +01:00
Olli Suutari fc3b2f021e - Merged trunk on 10/8/16. 2016-08-10 00:37:59 +03:00
Philip Ridout b502c0b79d Moved get file encoding from lib to common 2016-08-09 07:24:04 +01:00
Ken Roberts a89495063e merge trunk 2016-08-07 13:52:42 -07:00
Tim Bentley cade36a332 Head 2016-08-07 19:37:15 +01:00
suutari.olli@gmail.com fb105f2e0b This branch introduces following improvements to Quick Bible search: 
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Added Search while typing functionality for Quick Bible search
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages
  (E.g. added actual example verses to Reference error)
- 3 New settings for controllin...

bzr-revno: 2686
Fixes: https://launchpad.net/bugs/1591480
 2016-08-07 19:33:46 +01:00
Ken Roberts 2f7a1ab456 Merge trunk 2016-08-05 12:41:22 -07:00
Ken Roberts b41b4a5918 Fix some todo notes 2016-08-05 12:18:47 -07:00
Philip Ridout bf28102401 More style fixes 2016-08-03 21:17:48 +01:00
Philip Ridout 60767c8ce4 Fixes bug #917164. A start on refactoring bibles 2016-08-03 18:26:10 +01:00
suutari-olli 1298b629f1 - Merged trunk on 31.7.16 2016-07-31 14:58:54 +03:00
suutari-olli aa1cd8fa91 - Merged trunk on 24.7.16 
- Added superflys startup traceback fix to my code
- Resolved conflicts
 2016-07-24 23:20:25 +03:00
suutari-olli b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
Tim Bentley ca2ceba972 Head 2016-07-23 05:59:26 +01:00
second@tgc.dk c426b8c1a2 "Added a test using pylint to test the code for the most serious issues. 
Added pylintrc for finding more potential issues with pylint (not used in the test).
Made some fixes as suggested by pylint."

bzr-revno: 2681
 2016-07-21 23:32:25 +02:00
Tim Bentley 6e5070316c next prev 2016-07-17 08:12:42 +01:00
suutari-olli 1c133398e2 Merged trunk on 14.7.16 2016-07-14 21:03:57 +03:00
Tim Bentley 3a7aff9c0e migrate settings 2016-07-09 12:21:25 +01:00
Ken Roberts de3f4046b7 Convert md5sum calls to utf-8 for non-ascii pins 2016-07-08 12:19:08 -07:00
Tim Bentley eaa7904f58 More remotes removal and custom pages 2016-07-07 06:14:52 +01:00
Tomas Groth 8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
suutari-olli 68b4d62502 - Turned the two new hidden settings into registry flags 2016-06-27 02:14:24 +03:00
Ken Roberts 8806a06ab9 Test cleanups 2016-06-17 19:45:02 -07:00
Ken Roberts 7cc56af2bb bugfix 1593883 pjlink authenticatino test 2016-06-17 19:02:53 -07:00
Ken Roberts d1ff2385ae bug 1593883 fix - switch from qmd5_hash to md5_hash 2016-06-17 16:48:32 -07:00
Ken Roberts c8754c86aa Merge trunk fix conflict 2016-06-16 18:08:21 -07:00
suutari-olli db003d7ec6 - Merged trunk on 14.6.16 
To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"
 2016-06-14 23:54:36 +03:00
suutari-olli c249eb1f20 merged trunk on 14.6.16 2016-06-14 01:02:56 +03:00
suutari-olli 4ec7e5e879 - Added "Search too short for search while typing" message to search results 
!! Need to rename this from: search_results_banana to something smarter.
- Fixed "," breaking OLP if it's the last char in text search.
- "," no longer separates keywords in Text search. 
- Removed mention about separating keywords with "," from the empty search message.
- Started working on not duplicating search results on "Lock search results" > THIS DOES NOT WORK YET.
 2016-06-11 13:10:15 +03:00
Tim Bentley b8b05bb665 Fixes 2016-06-06 17:44:14 +01:00
Tim Bentley 32fad35f79 move remote to api and add waitress 2016-06-05 22:16:13 +01:00
Tim Bentley fad8b35660 Add tests for new registry function 2016-06-05 21:36:42 +01:00
Tim Bentley a5f460dc76 Bye Bye SSL 2016-06-05 17:20:39 +01:00
suutari-olli 9990472586 - Merged trunk on 5.6.16 
- Removed some additional error messages from "Search while typing"
  (Count verses not found in both bibles, no Bibles installed)
 2016-06-05 15:15:51 +03:00
Ken Roberts 598d715de6 Initial string conversions for variable templates 2016-06-03 17:15:19 -07:00
Ian Knight 7599429065 Merge from trunk 2016-06-01 13:45:43 +09:30
Tim Bentley 32ef88f807 Fix set_value and adjust tests 2016-05-24 17:28:11 +01:00
Tim Bentley af36dc4c41 pep8 2016-05-21 06:28:13 +01:00
Tim Bentley d0f6d21774 Add Working flags 2016-05-21 06:24:05 +01:00
suutari-olli dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
Ian Knight 3ae5240d15 Implemented auto option & updated settings to use combo box 2016-05-19 04:10:27 +09:30
suutari-olli 165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
suutari-olli 45798e67f0 Removed 2nd blank line from end of the uistrings. 2016-05-15 23:41:58 +03:00
suutari-olli 334d16d81c - Noticed this had a conflict, fixed it, improved comments 2016-05-15 22:41:13 +03:00
Ken Roberts 07468f0093 Fix oops 2016-05-15 10:32:04 -07:00
Ken Roberts f51132e876 core/common convert strings to python3 format 2016-05-13 21:24:46 -07:00
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text. 
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
 2016-05-12 23:00:54 +02:00
suutari-olli 46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
suutari-olli bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
suutari-olli e4bce11a03 Commiting for merging trunk, some new changes. 2016-05-10 03:53:14 +03:00
Ken Roberts 9ac95cf665 Skip crosswalk.com test while server down 2016-05-05 12:37:48 -07:00
suutari-olli f5e7e932d1 Improved a bunch of comments. 2016-05-02 09:54:15 +03:00
Tim Bentley c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
suutari-olli 09a084be18 - Removed un-needed import that was added earlier 
- Pep8 fixes
 2016-04-30 03:07:36 +03:00
suutari-olli aa2720da40 Merged trunk on 28.4.16, removed broken test. 2016-04-28 23:12:34 +03:00
Ken Roberts 884f060dea Oops and text in projector test 2016-04-24 04:22:04 -07:00
Ken Roberts 28e14012a8 Remove unneeded print statement 2016-04-24 04:04:32 -07:00
Ken Roberts 292606ba38 Fix translate() string format and some missed conversions 2016-04-23 14:38:43 -07:00
Ken Roberts 591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Tim Bentley fed2466ad6 Add Icon and defense tests for missing mediainfo 
bzr-revno: 2648
 2016-04-23 14:45:55 +01:00
Ken Roberts c1222dc2bb Convert strings to python3 in __init__ files 2016-04-22 17:40:59 -07:00
Tim Bentley 20acc90951 Pep8 2016-04-22 17:37:21 +01:00
suutari.olli@gmail.com f0d75a29c2 This branch introduces the following fixes/features: 
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
  (Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
  be set if panels are locked.
- Panels are now locked by default, this prevents users from
  totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
  (By default disabled, added a hidden setting fo...

bzr-revno: 2647
Fixes: https://launchpad.net/bugs/1508582, https://launchpad.net/bugs/1565447
 2016-04-21 22:16:24 +01:00
Tim Bentley 59b3c7b053 head 2016-04-21 17:27:04 +01:00
Tim Bentley bd8ddf7506 fix tests 2016-04-21 17:26:34 +01:00
Tim Bentley f2537981e4 update 2016-04-20 17:36:37 +01:00
suutari-olli 0563c6372f Made a better fix for fixing bug where display is unblanked on editing current live item. 
This now sets a hidden setting to true while processing Live item and then changes it back to false.
Display is thus not unblanked at all during the process. (Old fix showed the edited slide for a small time)

Downside: All the new tests were based on the old method and thus they were removed.
 2016-04-17 06:43:25 +03:00
suutari-olli bf3cad050c Turned the new setting into question. 2016-04-17 04:52:45 +03:00
suutari-olli 69af91edef - Fixed bug 1462420 - Double clicking Preview adds item to Service countless times 
(Added hidden setting for controlling this, it is set to True once double clicking
  has added item to Service and gets reset to False once new item is sent to preview.
 2016-04-17 04:13:39 +03: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 49dca3a0f9 - Changed how preset enabled setting is called 
- Changed the Projectors desription
- Changed Show .ppt .odp and pdf presentations to files.
 2016-04-16 16:58:28 +03:00
Tim Bentley b8bbb4391c move code from presentations 2016-04-16 14:51:42 +01:00
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
suutari-olli 4520403387 - Added checkbox for controlling the visibility of Projectors panel in 1st time wiz. 2016-04-15 19:06:14 +03: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 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
suutari-olli feb549a8e7 - Capitalized references to plugin/panel names in settings. (Live etc.) 
- Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') to uistrings.
  This is now used in players tab, alerts tab and images tab.
- Added space before "s" and "pt" units.
 2016-04-13 19:14:35 +03: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
Tim Bentley 65e84a317e fix tests 2016-04-12 22:00:18 +01:00
suutari-olli 6273cc911d Merged trunk on 11.4.2016 2016-04-11 00:17:03 +03:00
suutari-olli cb421a8fd7 In this commit: 
- Cleanup of the scripture reference error. (Now using full names, removed one un-needed line)
- Added more comments
- Removed def get_verses_combined, now triggering the error message on mediaitem based on search mode instead.
 2016-04-10 21:50:22 +03:00
suutari-olli c0311ed8c9 Noticed the identification for scripture reference error got messed at some point, fixed it. 
Also renamed "Interval" to "gap" to make constructing the message less painful.
 2016-04-10 00:08:49 +03:00
suutari-olli e233631c3d Merge to trunk on 9.4.16 2016-04-09 23:06:10 +03:00
suutari-olli 34231003ce Noticed "No bibles available" was defined 3 times > Moved it to uistrings. 
Added "Must have bibles" condition for other error messages in combined search.

To do:

Add a setting for controlling visibility of the no results error, it may be of annoyance.
Tests...
 2016-04-09 17:43:02 +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 a41d86cb7c Head 2016-04-06 06:08:44 +01:00
suutari-olli 54f720e5a2 In this merge: 
Splitted scripture reference error into small pieces, built error from them.
This still needs to be moved away from uistrings.py
 2016-04-06 07:09:35 +03:00
Tim Bentley 31a2b37a88 pep8 2016-04-05 21:07:57 +01:00
Tim Bentley 3e8e72be85 move methods and clean up 2016-04-05 18:30:20 +01:00
Tim Bentley b7da0be71e move method 2016-04-05 18:10:51 +01:00
Tim Bentley f19280c88d move method 2016-04-05 17:58:29 +01:00
Tim Bentley 5dd4b8e386 Pep8 2016-04-04 21:27:33 +01:00
Tim Bentley 85587ce2f3 uno commands 2016-04-04 21:14:04 +01:00
Tim Bentley dffba47b44 move version checker 2016-04-04 20:53:54 +01:00
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