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

6976 Commits

Author SHA1 Message Date
Olli Suutari
4f900dbffb - Removed for_display=True which was causing traceback since it's apparently no longer used. 
- Added manual row split for the duplicated key error message. 
  (Looks bad to have 12 words in one row and then one word in the row after that)
 2016-08-15 19:37:53 +03:00
Olli Suutari
33aaf53c42 - Pep8 (Over ident fixed) 2016-08-15 00:14:35 +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
c6c7931323 head 2016-08-14 10:23:12 +01:00
Raoul Snyman
c2b05e3454 Fix bug #1547964 by ignoring the exception (it's harmless) 
Fixes: https://launchpad.net/bugs/1547964
 2016-08-14 10:24:17 +02:00
Raoul Snyman
14b351f2ae HEAD 
Fixes: https://launchpad.net/bugs/1608194
 2016-08-13 16:57:38 +02:00
Raoul Snyman
879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Tim Bentley
f38ad2cc14 move startup code 2016-08-13 06:18:46 +01:00
Tim Bentley
7f22d9c223 add files http_endpoint 2016-08-13 06:03:12 +01:00
Tim Bentley
43a539db64 remove http_endpoint 2016-08-13 06:02:54 +01:00
Tim Bentley
fa19108885 tidy up media 2016-08-12 20:16:39 +01:00
Tim Bentley
225160be24 Head 2016-08-12 19:21:30 +01:00
raoul@snyman.info
c79917502b Update slot signatures to comply with PyQt5.6's stricter checks. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/stricter-slot-signatures (revision 2685)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1723/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1634/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1572/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1333/
[SUCCESS] https://ci.openlp.io/j...

bzr-revno: 2693
 2016-08-12 18:28:34 +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
Raoul Snyman
f92302a41e HEAD 2016-08-12 12:30:07 +02:00
Raoul Snyman
c9ff88ebfc Removed a log line I never wrote and move a variable for a test I need it in 2016-08-12 12:24:54 +02:00
Tim Bentley
304032cd7d Merge and fix mess 2016-08-12 06:15:56 +01:00
suutari.olli@gmail.com
6f5495bcbf 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: 2691
 2016-08-12 00:12:50 +02: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
851a35a822 - Removed Local & Online help buttons, created "User manual" button. 2016-08-12 00:11:34 +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
0da295f834 move core endpoint definitions 2016-08-10 22:19:00 +01: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
alisonken1@gmail.com
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
Raoul Snyman
0fc598fab5 HEAD 2016-08-10 11:13:45 +02:00
Raoul Snyman
51f3a0f406 Fix some slot signatures that were the incorrect type 2016-08-10 11:07:49 +02: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
Tim Bentley
80f927f5d6 Tidy up code more 2016-08-08 22:01:09 +01:00
Philip Ridout
a0882bd523 Refactor csv importer 2016-08-08 21:02:18 +01:00
Philip Ridout
a78c3d67e7 head 2016-08-08 19:11:32 +01:00
Philip Ridout
e9ec672756 improved encoding detection code. Tests added 2016-08-08 19:09:33 +01:00
Ken Roberts
ff56739f35 String format error 2016-08-07 14:08:03 -07:00
Ken Roberts
a89495063e merge trunk 2016-08-07 13:52:42 -07:00
Ken Roberts
1ff94a74a3 Qt5 updates for projector/signal mismatches 2016-08-07 13:51:35 -07:00
Philip Ridout
97dbc85918 move chardet function in to core 2016-08-07 20:29:35 +01:00
Tim Bentley
3593e21033 Add media endpoints 2016-08-07 20:08:29 +01: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
suutari-olli
1c63fb6ec0 - Changed stuff based on suggestions by superfly 2016-08-04 00:19:14 +03:00
Philip Ridout
8257dbb282 HEAD 2016-08-03 21:27:05 +01: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
7eac4d5e38 - Merged trunk on 2.8.16 2016-08-02 23:18:26 +03:00
Tomas Groth
c473212107 Added pylint test to jenkins script, and fixed a format error. 2016-08-02 20:57:10 +02:00
suutari-olli
1298b629f1 - Merged trunk on 31.7.16 2016-07-31 14:58:54 +03:00
suutari-olli
0923ca6a40 - Merged trunk on 28.7.16 2016-07-28 22:57:21 +03:00
Tomas Groth
b781fa6169 some cleanups, comments and a test. 2016-07-26 21:02:35 +02:00
Tomas Groth
de54ec2715 merge trunk 2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0 More work on chords 2016-07-25 22:07:07 +02: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
0c8503a266 - Changed stuff based on comments by TRB143. 2016-07-24 22:58:34 +03:00
suutari-olli
b364bb5cf0 - merged trunk on 24.7.16 2016-07-24 21:56:13 +03:00
Raoul Snyman
e231398010 HEAD 2016-07-24 14:25:46 +02:00
Raoul Snyman
ebefc03674 Fix the disappearance of a variable :-) 2016-07-23 23:41:24 +02:00
Tim Bentley
ca2ceba972 Head 2016-07-23 05:59:26 +01:00
Tim Bentley
25a43669d7 fix test 2016-07-23 05:48:36 +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
alisonken1@gmail.com
0150291e4d "- Convert calls to md5_hash and qmd5_hash to use UTF-8 for non-ascii characters 
- Fixed test to verify UTF-8 returns valid ASCII hash
- Switch back to qmd5_hash to stay within the Qt framework

--------------------------------
lp:~alisonken1/openlp/projector-cleanups (revision 2679)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1646/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1557/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1495/
[SUCCESS] https://ci.o..."

bzr-revno: 2680
 2016-07-21 23:29:58 +02:00
Tomas Groth
530f119938 Various improvements for chords on the mainview. 2016-07-21 22:37:25 +02:00
Tomas Groth
c10f71db3a Started work on chords on maindisplay. 2016-07-20 22:43:46 +02:00
Raoul Snyman
98f5a5c856 Fix another slot signature 2016-07-19 22:22:37 +02:00
Raoul Snyman
a8b72ed876 Fix up the types in the signals and slots - PyQt 5.6 is stricter about them now. 2016-07-18 23:36:16 +02:00
Raoul Snyman
97d6586462 Fixed another part of the permission denied error 2016-07-17 21:12:00 +02:00
suutari-olli
f5bc8056f7 - removed one unrequired if statement. 2016-07-17 19:11:51 +03:00
suutari-olli
08bcb2c5d4 - Moved them to another init since something broke 2016-07-17 18:53:27 +03:00
suutari-olli
437039efed - Moved the 2nd new registry flag from one init to an another init which also has the 1st 2016-07-17 18:49:15 +03:00
suutari-olli
496c57cdfc - Fixed the issue where items sent to Preview from Service may cause tracebacks. 2016-07-17 18:41:55 +03:00
Tim Bentley
16a1b1a0af next prev 2 2016-07-17 08:28:25 +01:00
Tim Bentley
6e5070316c next prev 2016-07-17 08:12:42 +01:00
Raoul Snyman
3cdd42bfe0 Catch the PermissionError too 2016-07-17 00:20:56 +02:00
suutari-olli
4874f6a218 - Reduced comments 
- Removed unrequired reg_value from test.
 2016-07-16 19:51:08 +03:00
suutari-olli
02b4d27b96 pep8 fixes, test still broken. 2016-07-14 21:13:58 +03:00
suutari-olli
1c133398e2 Merged trunk on 14.7.16 2016-07-14 21:03:57 +03:00
suutari-olli
7b643b06ac - Tried to make the new text work with the registry changes but failed. 
> Test is broken, do not merge!
 2016-07-14 21:02:23 +03:00
Tim Bentley
70288c8ae1 More fixes 2016-07-10 07:25:25 +01:00
Tim Bentley
da32a56c0c remove extra code 2016-07-09 12:26:07 +01:00
Tim Bentley
3a7aff9c0e migrate settings 2016-07-09 12:21:25 +01:00
Tim Bentley
cd3d809610 fix syle 2016-07-09 11:48:23 +01:00
Tim Bentley
4b0b8b9647 fix test 2016-07-09 09:45:08 +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
1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth
99e6ab6657 Fix various issues as suggested by pylint 2016-07-05 22:31:29 +02:00
Tim Bentley
dc95d77511 Thumbnails work 2016-07-04 22:10:47 +01:00
Tim Bentley
1e77ce9678 Fix up static and assets 2016-07-03 16:22:52 +01:00
Tim Bentley
28a5f5c3fd More updates and getting things working 2016-07-03 08:26:09 +01:00
Tomas Groth
8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tim Bentley
a81cc8292b fix some tests 2016-06-28 22:39:16 +01:00
Tim Bentley
7aa1acc176 More fixes 2016-06-27 21:55:36 +01:00
suutari-olli
22ff4247ad - Merged trunk on 27.6.16 2016-06-27 02:23:50 +03:00
suutari-olli
6078e28171 Comment cleanup / Improvements 2016-06-27 02:20:57 +03:00
suutari-olli
68b4d62502 - Turned the two new hidden settings into registry flags 2016-06-27 02:14:24 +03:00
Ken Roberts
d3a2dd399a Fix missing format key, updated test 2016-06-25 04:39:57 -07:00
Ken Roberts
de754e2cb1 Convert exceptionform._create_report to return dict 2016-06-24 05:39:47 -07:00
Ken Roberts
d878d8b8cb Missed closing paren 2016-06-23 21:38:18 -07:00
Ken Roberts
c2d884df48 Missing format key 2016-06-23 21:28:23 -07:00
Tim Bentley
ac841a934c Add plugin endpoints 2016-06-22 20:47:11 +01:00
Tim Bentley
e642335fd3 working fixed point 2016-06-20 17:32:29 +01:00
Tim Bentley
f92701ff98 More updates 2016-06-19 18:39:48 +01:00
Tim Bentley
549598e5be cleanups 2016-06-19 09:57:38 +01:00
Tim Bentley
9e62366d2b move 2 more apis 2016-06-19 07:58:15 +01:00
Tim Bentley
36885263bb cleanup 2016-06-19 07:16:31 +01:00
Tim Bentley
fa5ce45db0 it works 2016-06-19 07:16:01 +01: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
7e8eb21510 Pep8 and notes about hashing 2016-06-17 16:54:04 -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
aaba690c97 Fix call to wrong signal on error 2016-06-17 16:05:26 -07:00
Ken Roberts
c64df391aa bug 1593882 fix 2016-06-17 15:46:21 -07:00
Ken Roberts
76ffe35621 bug 1593882 - fix authenticated connection but bin not set 2016-06-17 15:06:55 -07:00
Ken Roberts
c8754c86aa Merge trunk fix conflict 2016-06-16 18:08:21 -07:00
Tim Bentley
8b98ee002b now upto date 2016-06-16 22:00:20 +01:00
Tim Bentley
22f85538cc stage now working again 2016-06-16 21:58:42 +01:00
Tim Bentley
3d602d41b3 First changes now working 2016-06-16 21:50:01 +01:00
Ken Roberts
7a8b519b8c Add test for renderer change to template string 2016-06-16 07:44:32 -07:00
Raoul Snyman
968a0ab87a Add static routes for serving files, and template rendering built into endpoints 2016-06-15 23:52:46 +02:00
Ken Roberts
b627736e5e Convert renderer string to Template() 2016-06-15 08:05:05 -07:00
Raoul Snyman
30ee384a9b Move the API around a bit 2016-06-15 00:03:08 +02:00
Tomas Groth
0c2b68ac54 merge trunk 2016-06-14 23:12:54 +02:00
Tim Bentley
f8ca67b67e pep8 2016-06-14 21:56:50 +01: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
Tim Bentley
dc4d7fcfb1 move files 2016-06-14 21:43:25 +01:00
Tim Bentley
5a0f2f1781 fix tests 2016-06-14 21:18:20 +01:00
Tim Bentley
7d049eb2af Rename Classes 2016-06-14 21:12:04 +01:00
suutari-olli
c249eb1f20 merged trunk on 14.6.16 2016-06-14 01:02:56 +03:00
Tim Bentley
f951dbff9f Add another test 2016-06-13 20:51:46 +01:00
suutari-olli
65ffd10cdf - Improved the "Too short search" item functionality. 
- Improved some comments.
 2016-06-13 01:02:24 +03:00
Tim Bentley
ece03a8024 Another test 2016-06-12 15:50:20 +01:00
Tim Bentley
6a81063fe7 Test apicontroiler 2016-06-11 22:13:48 +01:00
Tim Bentley
4a30e71a79 Stage works! 2016-06-11 17:28:50 +01: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
6a955a5573 api and router work, move settings and tab 2016-06-10 17:16:35 +01:00
Ken Roberts
aedcecc7ff String format oops 2016-06-08 19:57:21 -07:00
Ken Roberts
e222a11390 String format oops 2016-06-08 13:41:21 -07:00
Tomas Groth
df82628c01 Fix merge issue 2016-06-08 21:34:29 +02:00
Tomas Groth
2fe7a9d127 trunk 2016-06-08 21:27:52 +02:00
Ken Roberts
5fe54b5907 Beauty spa for the htmlbuilder 2016-06-07 06:12:22 -07:00
Tim Bentley
25ca35f420 Fix up to work with python 3.4 and 3.5 take 2 2016-06-06 21:33:28 +01:00
Tim Bentley
ba1eac8cd3 Fix up to work with python 3.4 and 3.5 2016-06-06 21:27:55 +01:00
Tim Bentley
ad485bd2c9 Fix up threads to work 2016-06-06 20:56:38 +01:00
Tim Bentley
b8b05bb665 Fixes 2016-06-06 17:44:14 +01:00
Ken Roberts
2443b94eda Convert htmlbuilder strings to Template() 2016-06-06 08:16:09 -07:00
Tim Bentley
15bf9420ae Rename Controller 2016-06-05 22:28:35 +01:00
Tim Bentley
2b0e61d5fd Too many changes 2016-06-05 22:26:06 +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
05be4e606c Fix up tests 2016-06-05 19:48:07 +01:00
Tim Bentley
e0d8198626 stop excess logging 2016-06-05 17:21:52 +01:00
Tim Bentley
a5f460dc76 Bye Bye SSL 2016-06-05 17:20:39 +01:00
Tim Bentley
41d3ea59a0 more updates 2016-06-05 15:56:01 +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
Tim Bentley
8ce073d83f Move Websockets to core from plugin 2016-06-05 06:49:27 +01:00
Ken Roberts
a4483af5b4 Revert htmlbuilder for now 2016-06-04 01:03:25 -07: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
Raoul Snyman
5a6c4f90a1 Fix formatting problems 2016-05-31 18:10:31 +02:00
alisonken1@gmail.com
41dcf85cbe "Convert strings to python3 in plugins part 4 
- Convert strings in plugins/songusage
- Convert missed string in projector/pjlink1
- Updated projectorpjlink1 test

--------------------------------
lp:~alisonken1/openlp/strings-plugins4 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1578/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1489/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1427/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_F..."

bzr-revno: 2671
 2016-05-31 17:36:28 +02:00
Ken Roberts
546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
Tim Bentley
32ef88f807 Fix set_value and adjust tests 2016-05-24 17:28:11 +01:00
Tim Bentley
6d3ad3af3f Improve performance 2016-05-21 20:01:50 +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
Tim Bentley
1ea5d72d1e fix formatting tags and move SpellText Edit 2016-05-21 06:02:31 +01:00
suutari-olli
dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
Ken Roberts
7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
Ian Knight
e09e867ad1 Pep8 Errors 2016-05-20 23:07:23 +09:30
Ian Knight
3b48a4b817 Housekeeping 2016-05-20 22:08:36 +09:30
Ken Roberts
656af1e90e core_ui_aboutdialog strings conversions 2016-05-19 15:14:24 -07: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
Tim Bentley
7c1e922f10 pep8 2016-05-18 18:06:25 +01:00
Tim Bentley
2cb3d6b684 head 2016-05-17 22:35:01 +01:00
Tim Bentley
2f8b12934b fix theme display in servicemanager 2016-05-17 22:28:27 +01:00
alisonken1@gmail.com
306f027b53 Convert strings from python2 to python3 format 
- Strings converted except as noted
- Updated projector pjlink test
- Simplify lines with multiple references to single variable

--------------------------------
lp:~alisonken1/openlp/strings-lib (revision 2665)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1559/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1470/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1408/
[SUCCESS] https://ci.openlp.io/job/Branch-04a...

bzr-revno: 2664
 2016-05-17 22:22:24 +01:00
Tim Bentley
8cf6b2df3e Service Manager themes are not updated in service items when the settings theme is changed 
bzr-revno: 2663
 2016-05-17 22:19:20 +01:00
Ken Roberts
a3df011409 Typo 2016-05-17 06:21:29 -07:00
Ken Roberts
8cc6f1dbcb Fix duplicate tags in strings 2016-05-17 06:15:53 -07:00
Simon Hanna
2a0868dee3 merge trunk 2016-05-17 10:48:19 +02:00
ian@knightly.xyz
05e9e5dca0 Fixes bug 1080596 where presentations in the preview pane display live view rather than preview of selected slide. 
In addition, fixes the aspect ratio & quality of thumbnails by saving them in the correct aspect ratio at a higher resolution, and loading them through the image manager.

New test cases implemented, or existing cases modified to test coverage complete for changes.

lp:~knightrider0xd/openlp/preview-shows-live-fix-1080596 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-...

bzr-revno: 2661
Fixes: https://launchpad.net/bugs/1080596
 2016-05-16 17:26:29 +01:00
Ken Roberts
403df406df Simplify a line with multiple references in format 2016-05-16 07:02:47 -07:00
Ken Roberts
1f5f457786 pep8 2016-05-16 06:44:57 -07:00
Ken Roberts
b4329ff781 Revert a few items plus cleanups 2016-05-16 06:41:26 -07:00
Ian Knight
a7466f1ea7 Check for Div0 and added unit test cases 2016-05-16 22:05:58 +09:30
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
7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07: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
7e5b49ffdf - Merged trunk on 11.5.16 2016-05-11 18:37:58 +03:00
suutari-olli
524adae71f - Pep8 fixes 2016-05-10 14:13:41 +03:00
suutari-olli
46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
Tim Bentley
df654d72fb change net to com 2016-05-10 05:36:25 +01:00
suutari-olli
77e9e1ad27 Lowercapped bunch of stuff, splitted expection error 2016-05-10 04:55:26 +03:00
suutari-olli
d7f3e4a9f2 Lowercapped some settings. 2016-05-10 04:11:49 +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
Ian Knight
55002518ef Added Functional Tests, cleaned PEP8 errors 2016-05-06 04:27:32 +09:30
Ken Roberts
72fc30d600 merge trunk 2016-05-05 08:51:07 -07:00
Ian Knight
bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Ian Knight
a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight
f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
Tim Bentley
51613fd32d fix strings 2016-05-02 09:12:39 +01:00
Tim Bentley
0efd1931b4 head 2016-05-02 09:05:47 +01:00
suutari-olli
f5e7e932d1 Improved a bunch of comments. 2016-05-02 09:54:15 +03:00
Tim Bentley
6d7039ed41 minor fixes 2016-04-30 18:19:55 +01:00
Tim Bentley
162f1ecbe9 remove old loop 2016-04-30 16:49:06 +01:00
Tim Bentley
c80f45320b video theme creation 2016-04-30 16:40:23 +01:00
Tim Bentley
8094cd051a head 2016-04-30 10:35:54 +01:00
Tim Bentley
6158a0672c background videos 2016-04-30 10:34:37 +01:00
suutari-olli
09a084be18 - Removed un-needed import that was added earlier 
- Pep8 fixes
 2016-04-30 03:07:36 +03:00
Ken Roberts
5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
suutari-olli
aa2720da40 Merged trunk on 28.4.16, removed broken test. 2016-04-28 23:12:34 +03:00
suutari-olli
31ede5556d Added this to program startup code, should replace_service_manager_item ever crash the program. 
Settings().setValue('core/is live item edited and replaced', False)
 2016-04-27 23:38:46 +03:00
Ken Roberts
d3d6e6c620 Missed translate() string format 2016-04-27 05:49:55 -07:00
Tomas Groth
72c435633c fix merge issues 2016-04-26 21:04:22 +02:00
Tomas Groth
58ac52a30e merge trunk 2016-04-26 20:58:03 +02: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
d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
Ken Roberts
591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
alisonken1@gmail.com
907e1df129 - Update string format to Python3 style 
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

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

Jenkins down - local pep8 and tests (except windows tests) passed.

Previous Jenkins test:
--------------------------------
lp:~alisonken1/openlp/string...

bzr-revno: 2650
 2016-04-23 14:48:27 +01:00
Tim Bentley
071a4438e9 Finish moving things around 
bzr-revno: 2649
 2016-04-23 14:46:59 +01: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
f2784decc7 fix 2016-04-22 20:04:17 +01:00
Tim Bentley
123a7f02a7 yet more files 2016-04-22 19:32:59 +01:00
Tim Bentley
0d755e3354 more files 2016-04-22 19:32:45 +01:00
Tim Bentley
38996c81cc more files 2016-04-22 19:25:57 +01:00
Tim Bentley
20acc90951 Pep8 2016-04-22 17:37:21 +01:00
Ken Roberts
bec015142b Merge trunk to fix conflicts 2016-04-22 04:41:29 -07: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
55061b8fc1 - Added two tests for checking if doubleclicking preview should add item to service or send it to live. 2016-04-20 18:56:10 +03:00
Ken Roberts
b5c9f96ccf oops fix - typo 2016-04-17 16:57:33 -07:00
Ken Roberts
b2ed6bb84c Fix split in string formatting 2016-04-17 16:47:44 -07:00
Tim Bentley
1942a8ac14 fix 2016-04-17 21:11:55 +01:00
Tim Bentley
bdeff60a97 updates 2016-04-17 20:32:15 +01:00
Tim Bentley
34f00cda92 dnd and files 2016-04-17 20:09:46 +01:00
Tim Bentley
b2147045b2 colorbutton2 2016-04-17 20:06:17 +01:00
Tim Bentley
6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
alisonken1@gmail.com
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
suutari-olli
518dde5d2d - Removed _ from end of one setting name. 
- Fixed ident on replace_service_manager
 2016-04-17 15:40:34 +03:00
Ken Roberts
278ec2bed2 Update projector UI strings to Python3 format 2016-04-17 02:15:23 -07:00
suutari-olli
c046ba95d9 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:50:54 +03: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
5dbb69430f Fixed bug 1462420 (Double click on the preview duplicated the element in the service manger) 
- Added a hidden setting for controlling this behaviour. 
 It is reset if any item is sent to preview from library.
 Sending the same item to service multiple times is still possible by using the "Add icon"
 2016-04-17 04:36:53 +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
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
40981701e9 fix checks 2016-04-16 15:43:31 +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
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
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
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
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
cc9f89bfdb Splitted mail adress away expection error text, now inserting it with %s 2016-04-13 19:49:30 +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
suutari-olli
5fa0687762 Changed spelling of live back to Live (Capitalized) on settings. 2016-04-13 17:22:56 +03:00
suutari-olli
2f6870ed8a Merged trunk on 13.4.16 2016-04-13 17:12:28 +03:00
suutari-olli
bb43a6b417 Merged trunk on 13.4.16 2016-04-13 00:12:49 +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
01762951d0 head 2016-04-12 21:26:43 +01:00
Tomas Groth
9628339b4c trunk 2016-04-12 22:05:58 +02:00
suutari-olli
42b72ab3a6 Added back the last missing * 2016-04-12 06:08:47 +03:00
suutari-olli
4af785bf1d - Re-did some of the changes. 
- Fixed Powerpoint to PowerPoint in presentation controllers and one error.
 2016-04-12 05:29:10 +03:00
suutari-olli
6273cc911d Merged trunk on 11.4.2016 2016-04-11 00:17:03 +03:00
Tomas Groth
2aeb7f9e6f trunk 2016-04-10 22:24:07 +02: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
dafbc3f054 In this commit: 
- Removed version number from main window name
- Removed version number from remote window names
- Reworked the traceback error message (New text, added margin to right)
 2016-04-10 02:51:41 +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