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

14618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Ridout
f08d0c28a5 further bible refactors 2016-08-14 11:00:27 +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.info
c763585250 Fix bug #1608194 by updated OpenLP to use the new SongSelect website. 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194 (revision 2694)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1739/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1650/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1588/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1344/
[SUCCESS] https://ci.openlp.io/job/Branc...

bzr-revno: 2694
Fixes: https://launchpad.net/bugs/1608194
 2016-08-14 09:57:21 +02:00
Raoul Snyman
14b351f2ae HEAD 
Fixes: https://launchpad.net/bugs/1608194
 2016-08-13 16:57:38 +02:00
Raoul Snyman
fbd9b330a3 Fix another pep8 issues 2016-08-13 16:50:15 +02:00
Raoul Snyman
2bd58e1c29 Fix some pep8 issues 2016-08-13 16:41:24 +02:00
Raoul Snyman
879a51a1fe Fix the tests for SongSelect and write tests for the SystemPlayer 2016-08-13 16:29:12 +02:00
Philip Ridout
2416009860 HEAD 2016-08-12 20:16:12 +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
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
4944a98a1d - Removed resources/images/system_online_help.png as it is no longer needed. 2016-08-12 00:15:03 +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
Philip Ridout
83b30799ca finished up with tests 2016-08-11 20:34:55 +01:00
Philip Ridout
34a5689499 split web bibles in to their own modules 2016-08-11 20:08:25 +01:00
Philip Ridout
f5480640f6 more files 2016-08-11 20:07:21 +01:00
Philip Ridout
0617f71134 split out web bible importers 2016-08-11 20:03:58 +01:00
Philip Ridout
5ac5c6cd68 split the web bible importers out io their own files 2016-08-11 20:02:29 +01:00
Philip Ridout
226432a3c3 head 2016-08-11 18:38:20 +01: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
Olli Suutari
eed1407057 - Fixed the bug where Bible "Advanced" clear button gives focus to "Quick" search field, thus making typing in it possible. 2016-08-11 00:22:07 +03:00
suutari.olli@gmail.com
f57bf00b3a - Generated the new icons for the freshly merged Bible branch 
bzr-revno: 2690
 2016-08-10 22:37:49 +02:00
Philip Ridout
d5f5a33680 Stylistic changes 2016-08-10 20:08:09 +01:00
suutari.olli@gmail.com
26843aa144 This branch introduces the functionality of unblanking 
display from Blank to Black/Theme/Desktop for:

a) Clicking slide in "Live panel"
b) Next/Previous shortcuts (Green arrows)
c) Go to verse x.
d) When starting automatic playback (To end or Loop)
Also added "Unblank display when changing slide in Live" to advanced
options tab for disabling/enabling this behavior for a-c.

Additionally this branch also includes fix for bug
https://bugs.launchpad.net/openlp/+bug/1531691
Do note that this bra...

bzr-revno: 2689
Fixes: https://launchpad.net/bugs/1462420, https://launchpad.net/bugs/1531691
 2016-08-10 20:04:54 +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
d786382b9a 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...

bzr-revno: 2687
 2016-08-10 19:31:12 +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
9d43344a92 pep fixes 2016-08-09 21:56:04 +01:00
Philip Ridout
4866dce071 test fixes 2016-08-09 21:49:52 +01:00
Philip Ridout
f1b25ef503 Moved importers in to dedicated directory 2016-08-09 21:45:25 +01:00
Philip Ridout
74607afbfc Add OpenLPMixin to bible importer 2016-08-09 20:32:29 +01:00
Philip Ridout
27731dbbbc Removed old bible upgrade form 2016-08-09 20:14:52 +01:00
Philip Ridout
b502c0b79d Moved get file encoding from lib to common 2016-08-09 07:24:04 +01:00
Philip Ridout
b65b05de70 PEP fixes 2016-08-08 21:08:07 +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
suutari-olli
6465c1c16b - Committing the changes. 2016-08-08 18:56:15 +03: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