Philip Ridout
9d5829e3a5
head
2016-08-16 19:49:47 +01:00
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
b657d255cc
Remove blank line
...
Fixes: https://launchpad.net/bugs/1547964
2016-08-14 22:58:27 +02:00
693c18a23a
Add some tests for the MediaShout importer
2016-08-14 22:48:36 +02:00
Olli Suutari
f3533885ec
- Merged trunk on 14/8/16.
2016-08-14 23:21:21 +03:00
Olli Suutari
c77dd470c5
- Added the missing "clicked" to make the code easier to understand.
2016-08-14 23:19:54 +03:00
Philip Ridout
f08d0c28a5
further bible refactors
2016-08-14 11:00:27 +01:00
Tim Bentley
c6c7931323
head
2016-08-14 10:23:12 +01:00
Tim Bentley
4211bac47c
Fix test
2016-08-14 10:22:28 +01:00
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
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
14b351f2ae
HEAD
...
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
fbd9b330a3
Fix another pep8 issues
2016-08-13 16:50:15 +02:00
2bd58e1c29
Fix some pep8 issues
2016-08-13 16:41:24 +02:00
879a51a1fe
Fix the tests for SongSelect and write tests for the SystemPlayer
2016-08-13 16:29:12 +02:00
Tim Bentley
0ec8b40294
Add mocks
2016-08-13 14:47:19 +01:00
Tim Bentley
3b34721967
remove test
2016-08-13 06:25:40 +01: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
Philip Ridout
2416009860
HEAD
2016-08-12 20:16:12 +01:00
Tim Bentley
eceaf90a64
pep8
2016-08-12 20:03:35 +01:00
Tim Bentley
f2d936c3d3
pep8
2016-08-12 19:59:45 +01:00
Tim Bentley
b3f10eb852
fix test
2016-08-12 19:56:25 +01:00
Tim Bentley
225160be24
Head
2016-08-12 19:21:30 +01:00
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
f92302a41e
HEAD
2016-08-12 12:30:07 +02:00
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
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
Tim Bentley
0da295f834
move core endpoint definitions
2016-08-10 22:19:00 +01:00
Tim Bentley
e31f3b8603
left old code
2016-08-10 22:07:36 +01:00