Philip Ridout
80793f9412
Modified SaveEdit, so that it saves the chosen search type
2016-11-11 21:23:03 +00:00
Philip Ridout
94fca706ff
Move no results functionality to the ListWidgetWithDnD
2016-11-10 07:09:04 +00:00
Tim Bentley
913b2a0654
fix search
2016-11-04 21:24:01 +00:00
Philip Ridout
ec19cc5f07
Modified some resources and added test
2016-10-30 08:29:22 +00:00
Philip Ridout
997cb859d3
Changed some icons to use svg
2016-10-27 18:45:50 +01: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
7acfe1dbfd
Add new branding to OpenLP for when we get to 2.6
2016-10-23 20:28:30 +02:00
Olli Suutari
aef0941e18
- Modified the def create_separated_list by suggestions of TRB143
2016-10-17 22:42:07 +03:00
Olli Suutari
a7b4d001c7
- Merged trunk and fixed conflict.
2016-10-17 20:40:45 +03:00
Olli Suutari
98b51a1db8
- Code cleanup
2016-10-17 07:29:08 +03:00
Olli Suutari
340b2f3298
- Actually fixed the missing DB bug.
2016-10-17 07:17:33 +03:00
Olli Suutari
0887ca6645
- Removed self from def handle_db_error
2016-10-04 17:21:40 +03:00
Olli Suutari
5d9d76f62d
pep8
2016-10-04 17:14:28 +03:00
Olli Suutari
39916d59ed
- Attempt to fix jen
2016-10-04 17:09:53 +03:00
Olli Suutari
3c733ddd20
- Merged trunk on 4.10.16
2016-10-04 16:39:14 +03:00
Olli Suutari
ebdad8519f
- Added one missing empty row
2016-10-04 16:31:09 +03:00
Olli Suutari
be9c394b63
- For jenkins
2016-10-04 16:27:41 +03:00
Olli Suutari
7ee7ef8846
- Not sure why the db bug is fixed in this branch
2016-10-04 16:07:53 +03:00
Olli Suutari
421555e578
- Improved one comment
2016-10-04 15:27:52 +03:00
Olli Suutari
ece524e2a1
- def handle_db_error now uses except FileNotFoundError to handle the missing data path
2016-10-04 15:16:42 +03:00
Olli Suutari
ce4d8224a2
-redid some mistakenly removed text changes
2016-10-04 10:37:08 +03:00
Olli Suutari
869caa9bf5
- pep8 (one ident)
2016-10-04 10:27:08 +03:00
Olli Suutari
036907eb5e
- Changed "&" back to "and"
2016-10-04 03:03:15 +03:00
Olli Suutari
946fb02d57
The def create_separated_list now uses the perfectly made and re-formatted code by the mastermind alisonken1
2016-10-02 21:57:38 +03:00
Olli Suutari
c7a682ebfb
- The footer now follows proper english grammar rules.
2016-10-02 20:03:59 +03:00
Olli Suutari
cff02e6b7a
Fixed bug: 1513490
2016-10-02 18:51:16 +03:00
Olli Suutari
4471338a19
- Fixed bug 1624661
2016-10-02 14:31:35 +03:00
Tim Bentley
c5e761a153
fix poll api for remotes
2016-09-30 20:50:48 +01:00
Olli Suutari
238397fa3c
- Made a better fix for giving OpenLP focus, it now works more than once.
2016-09-30 05:57:44 +03:00
Olli Suutari
8dbd79dba0
- cleanup.. The drag&drop focus solution only works for the 1st drag&drop... Why?
2016-09-30 05:36:32 +03:00
Olli Suutari
337edf039f
Fixed bug 1487788
2016-09-30 05:26:04 +03:00
Olli Suutari
d716f62d57
- reverted some other changes made while trying to find the fix
2016-09-30 04:11:41 +03:00
Olli Suutari
141c07d42a
Fixed bug 1512040
2016-09-30 04:06:51 +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
Olli Suutari
ba3b2396e7
- Merged trunk on 16.9.16
2016-09-16 22:54:25 +03:00
Olli Suutari
1fae73014e
- Removed one unrequired code line
2016-09-12 15:11:59 +03:00
Olli Suutari
639c01dfe2
- Merged trunk on 9.9.16
2016-09-09 10:58:15 +03:00
Olli Suutari
a99bd8603f
- Combined some <strong> tags in expection dialogue.
...
- Added new line to the end of the test.
2016-09-09 10:57:11 +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
aecd6b8858
Fixed 1 strong tag
2016-09-02 19:54:00 +03:00
Olli Suutari
e4e46d40f5
- Setting migration for escape item
...
- Renamed shortcut descriptions for blanks
2016-09-02 19:19:28 +03:00
Olli Suutari
2fcd292969
- Renamed some code
2016-09-02 18:52:44 +03:00
Olli Suutari
2c4dbda42f
- The new method now also stops loops.
2016-09-02 18:41:16 +03:00
Olli Suutari
4f48cb5df2
- fixed the "blank only" button visibility
2016-09-02 18:34:39 +03:00
Olli Suutari
875481d2d9
- A working only blank to desktop
2016-09-02 18:22:29 +03:00
Olli Suutari
46a7c92a90
- Merged trunk
2016-08-25 22:27:55 +03:00
Olli Suutari
7fba73843b
- Added the missing </strong> tag to expection form. (bug 1616441)
2016-08-25 22:24:59 +03:00
Tomas Groth
25c268145a
merge trunk
2016-08-18 21:04:44 +02: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
Tim Bentley
c6c7931323
head
2016-08-14 10:23:12 +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
14b351f2ae
HEAD
...
Fixes: https://launchpad.net/bugs/1608194
2016-08-13 16:57:38 +02:00
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
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
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
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
0fc598fab5
HEAD
2016-08-10 11:13:45 +02:00
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
ff56739f35
String format error
2016-08-07 14:08:03 -07:00
a89495063e
merge trunk
2016-08-07 13:52:42 -07:00
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
2f7a1ab456
Merge trunk
2016-08-05 12:41:22 -07:00
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
e231398010
HEAD
2016-07-24 14:25:46 +02:00
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
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
98f5a5c856
Fix another slot signature
2016-07-19 22:22:37 +02:00
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
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
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
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
d3a2dd399a
Fix missing format key, updated test
2016-06-25 04:39:57 -07:00
de754e2cb1
Convert exceptionform._create_report to return dict
2016-06-24 05:39:47 -07:00
d878d8b8cb
Missed closing paren
2016-06-23 21:38:18 -07:00
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
8806a06ab9
Test cleanups
2016-06-17 19:45:02 -07:00
7cc56af2bb
bugfix 1593883 pjlink authenticatino test
2016-06-17 19:02:53 -07:00
7e8eb21510
Pep8 and notes about hashing
2016-06-17 16:54:04 -07:00
d1ff2385ae
bug 1593883 fix - switch from qmd5_hash to md5_hash
2016-06-17 16:48:32 -07:00
aaba690c97
Fix call to wrong signal on error
2016-06-17 16:05:26 -07:00
c64df391aa
bug 1593882 fix
2016-06-17 15:46:21 -07:00
76ffe35621
bug 1593882 - fix authenticated connection but bin not set
2016-06-17 15:06:55 -07:00
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
7a8b519b8c
Add test for renderer change to template string
2016-06-16 07:44:32 -07:00
968a0ab87a
Add static routes for serving files, and template rendering built into endpoints
2016-06-15 23:52:46 +02:00
b627736e5e
Convert renderer string to Template()
2016-06-15 08:05:05 -07:00
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
aedcecc7ff
String format oops
2016-06-08 19:57:21 -07:00
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
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
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
a4483af5b4
Revert htmlbuilder for now
2016-06-04 01:03:25 -07:00
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
5a6c4f90a1
Fix formatting problems
2016-05-31 18:10:31 +02:00
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
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
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
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
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
a3df011409
Typo
2016-05-17 06:21:29 -07:00
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
403df406df
Simplify a line with multiple references in format
2016-05-16 07:02:47 -07:00
1f5f457786
pep8
2016-05-16 06:44:57 -07:00
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
7c4671b676
Convert strings to python3 in core.common.lib
2016-05-15 10:33:42 -07:00
07468f0093
Fix oops
2016-05-15 10:32:04 -07:00
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
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
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
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
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
884f060dea
Oops and text in projector test
2016-04-24 04:22:04 -07:00
28e14012a8
Remove unneeded print statement
2016-04-24 04:04:32 -07:00
292606ba38
Fix translate() string format and some missed conversions
2016-04-23 14:38:43 -07:00
d5b98b7308
Added projector power test
2016-04-23 12:55:47 -07:00
591ed15ab7
Merge upstream
2016-04-23 12:28:52 -07:00
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
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
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
b5c9f96ccf
oops fix - typo
2016-04-17 16:57:33 -07:00
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
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
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
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
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
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
f57f335b0f
Fixed the broken import statements.
2016-04-08 18:03:05 +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
483c12d779
vlc tests pass
2016-04-07 19:14:10 +01: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
6729ea9d19
move file
2016-04-05 19:33:50 +01:00
Tim Bentley
2df1169ea8
fix tests
2016-04-05 19:11:42 +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
98a021b89f
Pep8
2016-04-04 21:03:19 +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
suutari-olli
1739492520
This branch includes the following UI string changes:
...
These changes mainly take place on mainwindow.py but few other strings are changed as well.
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.
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
(Expect for starting videos automatically, that string may needs to be changed once bug related to that is fixed)
- Removed "Manager" from some strings since it's no longer used.
- Added dots to various tooltips / descriptions.
In advanced tab: Number of recent files to display: has been changed to Number of recent Service files to display:
2016-04-03 18:54:39 +03:00
Tim Bentley
7424d6be8b
More refactoring
...
bzr-revno: 2635
2016-04-03 16:54:13 +01:00
suutari-olli
e8e893c842
Changed Live to live (lowercaps) for controlling this setting to match other settings.
2016-04-03 14:26:48 +03:00
6bca1fc455
Fix decode() string error in about text - fix qt try/except error in projector
2016-04-01 20:04:15 -07:00
Tim Bentley
ec30c560a7
move tests and code
2016-04-01 18:28:40 +01:00
Tim Bentley
dbb07db257
fix PEP8
2016-04-01 18:15:45 +01:00
Tim Bentley
0678155400
fix PEP8
2016-04-01 18:09:47 +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
36d15615d1
- Changed comments related to "default image" to match "logo".
...
- Removed one default_
2016-04-01 05:32:36 +03:00
suutari-olli
4f5bb4f5eb
Added empty newline to the end of generaltab.py
2016-04-01 04:45:46 +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
suutari-olli
3aa7851c7d
Added two tests for this.
...
The other to check if visibility is changed to "True" for logo, the other for the opposite.
To do:
How to name this new setting? / Old "Default image" settings.
2016-03-31 23:35:04 +03:00
Tim Bentley
cd239fe802
fixes
2016-03-31 17:47:42 +01: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
005cf54116
Removed duplicate check for this setting from def setup,
...
realized it is overridden by later check anyways.
2016-03-30 20:33:56 +03:00
suutari-olli
16077a855f
Removed # which was added in search for solution from:
...
Registry().execute('live_display_active')
(This was noticed while looking at the diff)
2016-03-30 20:04:10 +03:00
suutari-olli
19862a69a3
Merged to trunk.
2016-03-30 19:54:20 +03:00
suutari-olli
a95f72c93a
Now using self.setVisible(False) instead of transparency for hiding the logo.
...
Renamed the visual text for the setting to: "Don't show Logo"
2016-03-30 19:50:12 +03:00
Tim Bentley
d11cb1d622
Only set tab_visited when the tab is visited and not on loading
2016-03-29 17:55:33 +01:00
Tim Bentley
be8bdcf1f3
remove print
2016-03-29 17:00:55 +01:00
Tim Bentley
2433efdfd0
Update themes in service manager when themes are set in settings
2016-03-29 16:45:59 +01:00
Tomas Groth
12a8481e14
Use standard button text in the FTW, if possible. Fixes bug 1554554.
...
Fixes: https://launchpad.net/bugs/1554554
2016-03-23 12:55:54 +01:00
Tomas Groth
dc0924fbbb
Translation fixes. Fixes bug 1545072
...
Fixes: https://launchpad.net/bugs/1545072
2016-03-22 22:11:12 +01:00
Tomas Groth
c9a8e2cf59
trunk
2016-03-22 15:14:16 +01:00
Tomas Groth
1f9478208e
trunk
2016-03-20 21:37:05 +01:00
Ian Knight
80a8abf4d0
Merged changes from trunk
2016-03-21 01:30:15 +10:30
Ian Knight
4980465f98
Cleaned pep8 errors
2016-03-21 01:14:00 +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
second@tgc.dk
6738d936cd
Fix slide order change when splitting custom slides. Fixes bug 1554748.
...
Fix EasyWorship import issues with missing verses and traceback on unknown chars.
Fix traceback in the bug-report dialog. Fixes bug 1554428.
Fix weird test bug in test_pluginmanager.py.
Pep8 fixes
bzr-revno: 2628
Fixes: https://launchpad.net/bugs/1547234 , https://launchpad.net/bugs/1553922 , https://launchpad.net/bugs/1554428 , https://launchpad.net/bugs/1554748
2016-03-15 22:32:10 +01:00
suutari-olli
432c7a6380
Visual ident pep8 fix.
...
If there are other's after this, they are part of trunk?
2016-03-15 22:12:37 +02: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
ddae0b4247
Removed duplicate: self.on_hide_display(True)
...
(Was trying to create/test a test but failed and forgot to take it away)
2016-03-15 16:11:24 +02:00
suutari-olli
a78565568f
Pep8 fixes
...
To do:
Test(s)
2016-03-15 12:30:37 +02:00
suutari-olli
0c23135304
- Removed Whites space before (self, item) on row 789, how did it get there in the first place?
2016-03-15 11:39:54 +02:00
suutari-olli
546ed56823
- If display is blanked when song in Live is edited, now re-blanks display after updating the song. (Improved fix)
...
- Improved un-blanking when starting Loop, pressing "Stop loop" no longer unblanks display.
- Improved comment(s)
To do:
- Write test(s)
2016-03-14 04:11:13 +02:00
Tomas Groth
4cea5e8b43
Fix traceback in the bug-report dialog. Fixes bug 1554428.
...
Fixes: https://launchpad.net/bugs/1554428
2016-03-12 22:22:21 +01: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
Tim Bentley
0c2c869dbf
Fix more bugs
2016-03-08 17:49:57 +00: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
Tim Bentley
4e39f71f4e
remove crash systemplayer
2016-03-07 21:55:13 +00:00
Tim Bentley
7308a97c29
remove crash
2016-03-07 21:52:09 +00: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
4a74c9ce68
Projector - String standards
2016-03-03 09:53:29 -08:00
suutari-olli
43df6739b0
Now including fix for bug:
...
https://bugs.launchpad.net/openlp/+bug/1531691
2016-03-03 04:49:04 +02:00
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
suutari-olli
770843e0c6
This branch adds the functionality of un-blanking display from:
...
blank to desktop, black and theme by clicking slides in "Live" panel.
This also adds this functionality for:
- Starting loops
- Go to verse x
- Next/Previous verse
2016-03-03 00:49:49 +02:00
second@tgc.dk
0afada2129
Another attempt to fully fix bug 1531319.
...
bzr-revno: 2625
2016-02-29 21:57:10 +01:00
Ian Knight
1e94cd92e9
Split auto-scroll & height cap features to new branch
2016-02-29 15:31:05 +10:30
ec5a362ea5
- Fix projector manager receiving an invalid class response on initial connection
...
- Fix string encoding to ascii when sending request to projector
--------------------------------
lp:~alisonken1/openlp/bug-1550891 (revision 2624)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1301/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1223/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1162/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/997/ ...
bzr-revno: 2624
Fixes: https://launchpad.net/bugs/1550891
2016-02-28 20:41:25 +00:00
suutari.olli@gmail.com
b490772f8b
This branch fixes the issue where Blank to desktop,
...
black and theme won't work if Live screen has stolen focus.
Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.
This was achieved by adding 3 lines of code, one for each method under the definition of methods available in this screen mode.
I also explained this in a comment I inserted to the code.
Since the only way to screw this seems to be by removing these additions,
a test for the...
bzr-revno: 2623
2016-02-28 20:33:19 +00:00
7c23941f35
Fix sending unicode string when expecting ascii (binary) data
2016-02-28 04:35:15 -08:00
9774618d37
Bugfix 1550891 - non-standard class reply from projector
2016-02-28 02:26:38 -08:00
Tim Bentley
af51d10fad
fix up some tests
2016-02-27 14:03:52 +00:00
suutari-olli
e3c4f53dc4
Seems like I added one empty row at some point...
...
Removing it...
2016-02-27 00:03:32 +02:00
suutari-olli
6ef2cc8b59
Added test, fixed comment.
2016-02-26 23:28:01 +02:00
Tim Bentley
071dfa6299
remove prints
2016-02-26 18:17:39 +00:00
Tim Bentley
5f5d69d4d2
Getting there many bits work
2016-02-26 16:00:04 +00:00
Simon Hanna
1d51939308
Do not show version numbers for plugins
2016-02-22 15:51:58 +01:00
Simon Hanna
9356d990ac
Show plugin information even if the plugin is disabled
2016-02-22 15:51:11 +01:00
Simon Hanna
9ced5436ba
Fix exception caused when plugins are disabled
2016-02-22 15:34:00 +01:00
Simon Hanna
5ba53fa097
Merge trunk in
2016-02-22 15:25:22 +01:00
Tim Bentley
9eed19ee50
fix missing bits from revert
2016-02-21 09:29:16 +00:00
Tim Bentley
72a180716b
revert changes
2016-02-21 09:23:09 +00:00
Tomas Groth
7c43ae6b88
Another attempt to fully fix bug 1531319,
...
Fixes: https://launchpad.net/bugs/1531319
2016-02-20 22:42:31 +01:00
Tim Bentley
334eb6c8c5
fix missing resize)
2016-02-20 11:51:58 +00:00
Tim Bentley
3e522186ec
Displays work now
2016-02-19 18:59:39 +00:00
Tim Bentley
cdbf6ac9ea
Fix timers
2016-02-16 21:14:38 +00:00
Tim Bentley
30dc055532
Video backgrounds work
2016-02-14 17:53:16 +00:00
Tim Bentley
89f6926a71
Add replacement to context
2016-02-14 16:54:31 +00:00
Tim Bentley
583da17777
pep8 comment fixes
2016-02-14 16:14:48 +00:00
Tim Bentley
19b6716bea
More cleanups comments and flash removal
2016-02-14 15:43:54 +00:00
Tim Bentley
360d1155f1
Remove flash
2016-02-14 08:38:21 +00:00
Tim Bentley
7a72fe84df
more updates and cleanups
2016-02-14 08:26:04 +00:00
Tim Bentley
a6b5b36502
More cleanups
2016-02-13 22:10:11 +00:00
Tim Bentley
ea40173f9b
new start
2016-02-13 13:13:00 +00:00
Tim Bentley
108ed79e7b
fix up
2016-02-13 12:48:36 +00:00
Tomas Groth
fdb53f919f
Fix for force-updating display on windows when using themes without transitions.
2016-02-09 22:01:20 +01:00
second@tgc.dk
8d083af742
More workarounds for bug 1531319.
...
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.
bzr-revno: 2616
Fixes: https://launchpad.net/bugs/1490508
2016-02-06 21:53:23 +01:00
Tomas Groth
17d6f13ac0
More workarounds for bug 1531319.
...
Fixes: https://launchpad.net/bugs/1531319
2016-02-06 20:43:54 +01:00
0dd29893da
More tests
2016-02-04 23:25:06 +02:00
5928fde62e
Fix a weird issue with the 'clear alternate shortcut' button clearing both
2016-02-02 23:56:03 +02:00
f6c2a5b410
Fix bug #1533246
...
Fixes: https://launchpad.net/bugs/1533246
2016-02-02 23:55:37 +02:00
b2e54a4baa
Downgrade VLC.py to a version that is in use
2016-01-25 20:14:03 +02:00
Tim Bentley
81c9f5f1ca
more simplifications
2016-01-24 10:13:33 +00:00
suutari-olli
dee737e3fb
Added proper comment
2016-01-23 17:28:16 +02:00
Tomas Groth
fb04813088
remove debug prints
2016-01-23 13:38:08 +01:00
Tim Bentley
4aebe441e7
cleanups
2016-01-23 12:11:34 +00:00
Tim Bentley
06ed550c8f
head and Mediainfo
2016-01-23 10:09:36 +00:00
Tim Bentley
29dd834816
debug
2016-01-23 10:07:59 +00:00
Tomas Groth
c34bfd6d95
Adjusted string
2016-01-23 09:15:37 +01:00
Tomas Groth
4594fcefbd
pep fixes
2016-01-22 22:33:20 +01:00
Tomas Groth
4bef5f72f2
trunk
2016-01-22 22:30:26 +01:00
Tomas Groth
e593d77e14
Fix some broken tests that was not being used due to naming.
2016-01-22 22:26:25 +01:00
Tim Bentley
4a0330f126
Add wrapper for mediainfo
2016-01-22 20:12:46 +00:00
Tomas Groth
9415018899
Disable OpenGL on linux (too). Fixes bug 1535332.
...
Fixes: https://launchpad.net/bugs/1535332
2016-01-22 20:52:50 +01:00
suutari-olli
5f513a9a1f
This simple fix should make blank to desktop, black and theme available during single screen mode
2016-01-22 19:06:35 +02:00
Tomas Groth
7d677025b5
Disable OpenGL on windows to make webkit player work.
2016-01-21 22:18:56 +01:00
Tomas Groth
85c329fb26
Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319.
...
Fixes: https://launchpad.net/bugs/1531319
2016-01-20 23:25:40 +01:00
Ian Knight
fbd3f9f3dd
Corrected pep8 fails
2016-01-19 17:32:47 +10:30
Ian Knight
7f8e19adca
Prevented Single Click Preview when a double click had triggered & Updated tests for this
2016-01-19 17:22:23 +10:30
Ian Knight
960fbb8865
Implemented Better Preview for Service Manager Blueprint
2016-01-18 03:16:37 +10:30
s.mehrbrodt@gmail.com
ddfed93fbe
"* Fix importing older song dbs by migrating them first
...
* Fix comparing songs without title
lp:~sam92/openlp/bug-1533081 (revision 2615)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/
Stopping after failure"
bzr-revno: 2609
Fixes: https://launchpad.net/bugs/1533081 , https://launchpad.net/bugs/1534306
2016-01-16 22:13:41 +02:00
Tomas Groth
6b23a2224f
Fix playback of linked audio. Fixes bug 1533280.
...
Fixes: https://launchpad.net/bugs/1533280
2016-01-15 21:22:08 +01:00
Tomas Groth
e91520fa60
pep8 fixes
2016-01-13 22:00:46 +01:00
Tomas Groth
6f9056c935
trunk
2016-01-12 22:36:32 +01:00
Tomas Groth
3f3078c33a
Fix traceback when expanding and collapsing songs.
...
Fixes: https://launchpad.net/bugs/1532169
2016-01-12 22:29:20 +01:00
Tomas Groth
e3d7e436f1
In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted.
2016-01-12 21:17:15 +01:00
simon.hanna@serve-me.info
98258bc753
Reenable the stylesheet
...
remove the icons from mediamanager so that display in plasma works
bzr-revno: 2605
Fixes: https://launchpad.net/bugs/1404669
2016-01-11 21:57:20 +00:00
Tomas Groth
c8fd1b8338
Fix taking screenshots while using powerpoint or impress.
...
Fixes: https://launchpad.net/bugs/1532938
2016-01-11 22:13:57 +01:00
Simon Hanna
9d8c757d0d
Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma
2016-01-10 19:01:36 +01:00
Simon Hanna
4d7ceba301
Merge with trunk
2016-01-10 17:01:43 +01:00
Simon Hanna
e172e2aeb2
Revert Changes
2016-01-10 17:00:05 +01:00
s.mehrbrodt@gmail.com
ad37560ecd
lp:~sam92/openlp/multiple-songbooks (revision 2607)
...
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1226/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1151/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1090/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/928/
Stopping after failure
bzr-revno: 2600
2016-01-09 19:53:09 +00:00
5a2c3e5abc
Ticket 921817 - exception when connecting using PJLink authentication method
...
Fix incorrect location data when projector instance created.
Fix typo in getting authenticated connection salt setup.
Move salt/pin/test hash to resources file for multiple tests.
Add test for ticket 921817.
Passes local nosetests3 and pep8.
bzr-revno: 2599
2016-01-09 19:44:30 +00:00
9904ba8da8
Remove media manager stylesheet for now
2016-01-09 21:10:56 +02:00
Simon Hanna
44cd766885
Remove code that was added by mistake
2016-01-09 18:22:09 +01:00
8fcae33516
resolve merge conflics
2016-01-09 08:59:42 -08:00
Simon Hanna
0416e29a83
Merge with trunk
2016-01-09 17:50:08 +01:00
Simon Hanna
afaf54a142
Fix pep8 errors
2016-01-09 17:26:14 +01:00
Samuel Mehrbrodt
fe74a19783
Merge
2016-01-09 16:04:34 +01:00
Tomas Groth
e9e845035a
pep8 fixes
2016-01-09 10:09:29 +01:00
Simon Hanna
21c6a3ff1c
Merge with trunk
2016-01-09 01:07:15 +01:00
Samuel Mehrbrodt
b1c9f6937f
Merge branch
2016-01-09 00:08:21 +01:00
Samuel Mehrbrodt
da5790f17f
Merge trunk
2016-01-09 00:05:43 +01:00
Tomas Groth
5d6758ffaf
trunk
2016-01-08 22:51:40 +01:00
Tomas Groth
a44d70cb0f
Fix some tests on windows.
2016-01-08 22:44:22 +01:00
Tomas Groth
43e273c4ed
Disable OpenGL in the maindisplay on windows for now.
2016-01-08 22:43:43 +01:00
simon.hanna@serve-me.info
e8e553b663
Modify all forms to remove the help button from their status bar.
...
I don't think I missed a form. The Wizards remain untouched as the help button works there
bzr-revno: 2591
Fixes: https://launchpad.net/bugs/1490184
2016-01-08 17:26:39 +00:00
Samuel Mehrbrodt
69e1660d6c
PEP8
2016-01-08 15:05:54 +01:00
Simon Hanna
2c5475e8fa
Fix some pep issues in the changed files
2016-01-08 14:47:52 +01:00
4fd53706c6
We still need a db_url. Thanks interface tests!
2016-01-08 00:18:01 +02:00
Samuel Mehrbrodt
ddefceee04
Fix migration for non-sqlite
2016-01-07 23:12:03 +01:00
Simon Hanna
d5780b9f78
update functions that were previously methods to drop the '_'
...
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
b1febaa452
Try to make sense of what the projector stuff is supposed to be doing. Found that internally the normal init_url was being called, which was wrong (i.e. it was being called twice, once from a plugin perspective, and then again from the projector perspective). Also, self.db_url was not being applied.
2016-01-06 22:02:39 +02:00
Simon Hanna
5bc13e45e3
Move some static methods out of their classes where it makes sense
2016-01-05 23:28:48 +01:00
Samuel Mehrbrodt
8780b74342
Use deepcopy instead of copy
2016-01-05 16:17:22 +01:00
Samuel Mehrbrodt
5f2e0ba0ee
Add test for deleting columns in a db
2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt
b9a7170cdf
Add missing file
2016-01-05 08:57:01 +01:00
Samuel Mehrbrodt
4706ff4af8
Merge trunk
2016-01-04 19:47:03 +01:00
Simon Hanna
c467c321b4
Make methods static that don't need to rely on instance data
2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt
c7d7d16921
PEP8
2016-01-04 13:18:11 +01:00
Tomas Groth
8991d2ca62
trunk
2016-01-03 18:02:23 +01:00
Tomas Groth
dec1aa6720
Started on chords support
2016-01-03 18:01:44 +01:00
Simon Hanna
6d0e006b09
Change Combobox to Checkbox for plugin states
2016-01-03 14:03:29 +01:00
a023177c4d
Fix typo in projector authentication
2016-01-03 00:15:54 -08:00
Tomas Groth
e562571aa9
trunk
2016-01-03 00:13:48 +01:00
Tim Bentley
4ef5126a22
head
2016-01-01 20:39:54 +00:00
Tim Bentley
9c2b472ee8
prints
2016-01-01 20:39:26 +00:00
Tim Bentley
3a8b068af8
Year older
2015-12-31 22:46:06 +00:00
Simon Hanna
bf9420a781
Update forms to remove the help button in the statusbar
...
Fixes: https://launchpad.net/bugs/1490184
2015-12-30 16:03:35 +01:00
f864a24f9a
Fix typo in pin code hashing
2015-12-29 06:01:22 -08:00
springermac@gmail.com
b87156e104
"Make sure the main display on Mac OS X stays above the menu bar and dock but still allow the main window to be focused"
...
bzr-revno: 2585
2015-12-28 22:01:34 +02:00
springermac@gmail.com
160550f836
"Change some keyboard shortcuts to use predefined platform dependent shortcuts from Qt.
...
Display keyboard shortcuts with modifiers in their platform native form."
bzr-revno: 2584
2015-12-28 21:35:15 +02:00
second@tgc.dk
0d66ccdae4
"Only import vlc in one place. Make it work with PyInstaller.
...
Added bit-install-hint for VLC
Pep8 fixes
"
bzr-revno: 2583
2015-12-27 23:15:24 +02:00
Andreas Preikschat
eefb496cde
HEAD
2015-12-26 22:35:48 +01:00
Andreas Preikschat
18893b3903
Feature: updated vlc.py
2015-12-26 22:34:29 +01:00
Jonathan Springer
e8c1d5adca
Clarify comment
2015-12-26 11:08:50 -05:00
Jonathan Springer
ca8600414f
Add comments and doc strings
2015-12-26 11:05:41 -05:00
Tomas Groth
a6f5251d7e
pep8 fixes
2015-12-26 15:30:12 +01:00
Tomas Groth
c5e5f5b889
Added bit-install-hint for VLC
2015-12-26 15:25:09 +01:00
Tomas Groth
b69bb5ce27
trunk
2015-12-26 10:00:48 +01:00
Jonathan Springer
860d630360
Make sure the main display stays above the menu bar and dock but still allow the main window to be focused
2015-12-24 14:26: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
Tim Bentley
fe0cdc70fb
cleanup
2015-12-23 22:19:28 +00: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
Tim Bentley
3a05159871
head
2015-12-23 06:06:50 +00:00
Tim Bentley
3791eea777
clean ups
2015-12-23 06:06:25 +00:00
Jonathan Springer
f3108cffe3
Fix exit dialog
2015-12-22 17:20:39 -05:00
Tim Bentley
e90fb00ddd
head
2015-12-22 19:07:51 +00:00
Tomas Groth
5bbea1685d
trunk with qt5
2015-12-22 14:13:17 +01:00
Tomas Groth
f32c7823df
First stab at a pysword based SWORD-importer.
2015-12-22 14:04:01 +01:00
Jonathan Springer
bee587fa67
merge trunk
2015-12-20 19:43:38 -05:00
Tim Bentley
15f1b61fd4
simplified
2015-12-20 21:30:47 +00:00
Tim Bentley
2ef0b3b210
remove debugs
2015-12-20 18:00:38 +00:00
Tim Bentley
b728dddaa4
remove slidecontroller
2015-12-20 17:58:24 +00:00
Tim Bentley
8de95e34a0
first merge
2015-12-20 17:24:45 +00:00
s.mehrbrodt@gmail.com
12141d6a7e
Small fixes:
...
* Multiple '%s' in one string need to be named for translations (otherwise the order might get confused)
* OpenLP 2.0 -> OpenLP 2
* Change buttons of "Do you really want to close" dialog: Instead of ("No", "Yes") use ("Cancel", "Close OpenLP")
* Improve exception dialog (mention that description should be english and relevant files should be attached)
* Do not translate the bug report labels
* Ignore "E402 module level import not at top of file" pep8 errors (added to ...
bzr-revno: 2574
2015-12-18 16:48:53 +00:00
Samuel Mehrbrodt
e6978033e9
PEP8
2015-12-17 22:43:49 +01: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
0a935bdb90
merge trunk
2015-12-13 19:21:58 -05:00
Tomas Groth
44a523631e
Only import vlc in one place. Make it work with PyInstaller.
2015-12-13 21:35:23 +01:00
Samuel Mehrbrodt
0d4541b8dc
Merge trunk
2015-12-11 09:33:24 +01:00
Jonathan Springer
ec4ec887ea
Fix CheckMedia player not stopping.
...
Fix duration of zero on first play.
2015-12-10 14:03:57 -05:00
Jonathan Springer
fc3c433a21
Fix failing situation by making default_players a list instead of a string
2015-12-10 12:26:08 -05:00
Jonathan Springer
50c0a173eb
Add settings migration for phonon to system change
2015-12-07 16:41:15 -05:00
Jonathan Springer
baa59f9321
Forgot to uncomment some code
2015-12-07 16:40:45 -05:00
Jonathan Springer
2e23d9919d
Fix system player being used for live-background
2015-12-07 16:40:09 -05:00
Jonathan Springer
ae4858e434
Fix traceback in mediacontroller if a service item had a processor type of automatic
2015-12-07 16:34:10 -05:00
Jonathan Springer
3b3c8a35b6
merge trunk
2015-11-29 17:57:37 -05:00
Jonathan Springer
05a653e670
Make sure all generated pixmaps are show at the proper pixel ratio
2015-11-29 17:48:10 -05:00
Tim Bentley
1ba8652985
Remove Prints
2015-11-28 15:38:31 +00:00
Tim Bentley
ae1888106d
Fix Presentations and Media
2015-11-28 15:37:26 +00:00
Jonathan Springer
9c46eda524
Enable and fix mimetype filters.
...
Make sure file can be played due to lack of mimetype support on Linux and Windows
2015-11-16 22:59:30 -05:00
Jonathan Springer
285e12bc9d
PEP8
2015-11-06 20:09:32 -05:00
Jonathan Springer
7af1ca1d49
Migrate to PyQt5
2015-11-06 19:49:40 -05:00
tim.bentley@gmail.com
7c5add7fac
First merge for 2.4.
...
A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.
lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...
bzr-revno: 2566
Fixes: https://launchpad.net/bugs/913508 , https://launchpad.net/bugs/1168778 , https://launchpad.net/bugs/1281100 , https://launchpad.net/bugs/1390699 , https://launchpad.net/bugs/1390706 , https://launchpad.net/bugs/1413217 , https://launchpad.net/bugs/1420276 , https://launchpad.net/bugs/1439304 , https://launchpad.net/bugs/1487014
2015-11-05 19:05:19 +00:00
Tim Bentley
a888a4a4aa
more missed
2015-11-04 18:37:06 +00:00
Tim Bentley
ba823a9302
fix align
2015-11-02 21:30:11 +00:00
Tim Bentley
6e754ec0a6
fix align
2015-11-02 21:25:38 +00:00
Tim Bentley
20f0d39113
fix align
2015-11-02 21:19:01 +00:00
Tim Bentley
0e4847b5fa
head
2015-11-02 20:57:48 +00:00
Tim Bentley
d165010aaa
minor fix ups
2015-11-02 20:52:22 +00:00
Tim Bentley
89d9d7d73a
replace code removed in error
2015-10-28 21:21:05 +00:00
Andreas Preikschat
bdd8ef820a
Feature: update vlc.py from upstream
2015-10-25 23:00:57 +01:00
Tim Bentley
ae8b2d051a
Fix about dialog from translators
2015-10-19 22:14:30 +01:00
Tim Bentley
25332a2cb1
Head and 2.2
2015-10-17 12:20:51 +01:00
Tim Bentley
6b60573740
UI changes
2015-10-16 17:30:13 +01:00
Tim Bentley
742e0c912b
Plug item
2015-10-16 17:26:01 +01:00
Tim Bentley
a5b8827c96
Pep 8
2015-10-16 17:17:38 +01:00
Tim Bentley
58124c01d2
Add advanced
2015-10-16 17:09:35 +01:00
second@tgc.dk
48c9389a9f
Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.
...
bzr-revno: 2560
2015-10-15 21:52:13 +01:00
Tim Bentley
925623bf74
core_int
2015-10-15 19:03:57 +01: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
191a739f81
Let's download things once only, instead of 3 times.
2015-10-14 23:19:02 +02:00
Tomas Groth
949bf4a8a7
Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.
2015-10-13 22:52:33 +01:00
Tomas Groth
62e9663aec
Make 2 texts translateable
2015-10-12 13:59:17 +01:00
Tim Bentley
21743e4472
fix length
2015-09-10 21:35:14 +01:00
Jonathan Springer
d60a1e8340
Move icons that use build_icon into the function they are needed in so build_icon isn't called when the file is imported avoiding an assert when importing without a QApplication initialized
...
Change relative import in bible db to absolute import
Docstring cleanups
bzr-revno: 2554
2015-09-10 22:11:46 +02:00
Jonathan Springer
6688d45108
merge trunk
2015-09-08 15:15:43 -04:00
Jonathan Springer
eaf1e7a049
Docstring cleanups
2015-09-08 15:13:59 -04:00
Tomas Groth
1dcbc6837c
Make the fix for bug 1473632 work on more linux distros.
2015-09-04 10:01:07 +01:00
Tomas Groth
fec061782b
Make sure presentations is closed correctly. Fixes bug 1490996.
...
Fixes: https://launchpad.net/bugs/1490996
2015-09-03 20:21:43 +01:00
Tomas Groth
964af5fc92
Fix crash with VLC on windows with unicode chars in filename. Fixes bug 1491998.
...
Fixes: https://launchpad.net/bugs/1491998
2015-09-03 20:11:08 +01:00
Tomas Groth
0b4cf91c42
Fix traceback on windows in the OO/LO song importer.
...
Improved the robustness of the download-webbibles-form. Fixes bug 1489757.
Fix SongPro import. Fixes bug 1489376.
Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.
bzr-revno: 2552
2015-08-28 22:05:57 +01:00
Samuel Mehrbrodt
7477f781ef
Close -> Exit (as in the menu)
2015-08-27 10:15:51 +02:00
Tomas Groth
f98c35df94
Fix traceback on linux when VLC isn't installed. Fixes bug 1489143.
...
Fixes: https://launchpad.net/bugs/1489143
2015-08-26 22:37:23 +01:00
Samuel Mehrbrodt
813cbaf2ad
PEP8
2015-08-26 10:40:09 +02:00
Samuel Mehrbrodt
8d791a51f4
Better wording for close dialog
2015-08-26 10:37:16 +02:00
Samuel Mehrbrodt
2df4dad39c
Improve exception dialog
2015-08-26 10:20:55 +02:00
Samuel Mehrbrodt
0c9f23a875
PEP8
2015-08-26 09:59:27 +02:00
Samuel Mehrbrodt
eac92737a2
Better strings for translation
2015-08-26 09:51:37 +02:00
Samuel Mehrbrodt
fce9a1e1f2
OpenLP 2.0 -> OpenLP 2
2015-08-26 09:26:19 +02:00
Jonathan Springer
59a04e982f
Add ability to open Apple help file from app bundle.
...
Only show offline help if we are running frozen.
2015-08-24 14:19:30 -04:00
Tomas Groth
5940a77b20
Move call to XInitThreads for linux-vlc setup to module-load. Fixes bug 1473632.
...
Fixes: https://launchpad.net/bugs/1473632
2015-07-20 21:33:58 +01:00
Tomas Groth
aea6c424fc
Check mediaplayer is loaded before trying to use it when blanking. Fixes bug 1465390.
...
Fixes: https://launchpad.net/bugs/1465390
2015-06-15 21:29:34 +01:00
Tomas Groth
bdecfbf3e9
Fix path of presentation thumbnail when loading from service files. Fixes bug 1463703.
...
Fixes: https://launchpad.net/bugs/1463703
2015-06-10 17:14:23 +02:00
Tomas Groth
60d45d8b8b
Fix log-traceback when trying to remove servicemanager files before eg. powerpoint has closed the files.
2015-06-08 20:34:22 +01:00
Tomas Groth
e3be044d5d
Improve network exception handling, again.
2015-06-08 20:32:46 +01:00
Tomas Groth
7eb506fae8
Improve network exception handling.
2015-06-07 21:56:06 +01:00
Tim Bentley
b7d0fc8ffc
Fix focus and test
2015-05-31 07:40:37 +01:00
bd92e6a7d3
Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None
...
bzr-revno: 2541
2015-05-30 13:11:32 +01:00
Tomas Groth
623a0974a5
For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
...
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
* Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
* Implement workaround for unblanking bug in PowerPoint 2010.
* Open PowerPoint hidden so the main application window isn't visible.
* Added support for odp for PowerPoint 2007 and newer.
* Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
* Minimized the flashing of the PowerPoint presentation window in the taskbar.
bzr-revno: 2539
2015-05-29 17:22:22 +01:00
5bcdc85ce1
Fix a left-over from the VLC 2.2 fix; fix a problem when video player from the UI is None
2015-05-28 22:38:43 +02:00
Jonathan Springer
aa97feb064
Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen.
...
bzr-revno: 2538
2015-05-28 00:06:22 +02:00
Tomas Groth
a5cebb73c4
trunk
2015-05-25 21:58:05 +01:00
Tomas Groth
c3e567969b
Don't import setting keys that does not exists. Fixes bug 1458672.
...
Fixes: https://launchpad.net/bugs/1458672
2015-05-25 21:43:37 +01:00
Tim Bentley
54dbafed8e
Fix issue with android where tagging is wrong is the render takes too long
2015-05-25 20:31:12 +01:00
Jonathan Springer
236dba77e8
Fix bug 1395848 by setting the WindowStaysOnTop window flag when the MainDisplay is not on the primary screen.
2015-05-21 23:15:15 -04:00
Tomas Groth
c9a8f07a37
Only use transitions if we are changing slide. Fixes bug 1449064.
...
Fixes: https://launchpad.net/bugs/1449064
2015-05-01 22:17:59 +01:00
Tomas Groth
73ae9a2643
Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
...
Fixes: https://launchpad.net/bugs/1449041
2015-05-01 16:21:59 +02:00
Tomas Groth
d044821483
pep8 fixes
2015-04-30 14:48:45 +02:00
Tomas Groth
54fbaf3a4f
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
2015-04-30 14:37:13 +02:00
fda7ab562c
Add some tests
2015-04-28 16:01:09 +02:00
07b7d9b6a9
Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out.
...
bzr-revno: 2533
2015-04-27 17:02:16 +01:00
217b731a95
No need to figure out if VLC is available if we've loaded the module before
2015-04-27 11:24:02 +02:00
ab54b04468
Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path
2015-04-25 16:32:09 +02:00
Jonathan Springer
a162aa50fa
merge trunk
2015-04-24 17:00:16 -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
cd7c4f6197
Make sure we always add a blank line between verses. Fixes bug 1439311.
...
Fixes: https://launchpad.net/bugs/1439311
2015-04-11 23:13:30 +01:00
Tomas Groth
6f5a139329
Normalize file path to OS standard after drag-and-drop. Fixes bug 1440571.
...
Fixes: https://launchpad.net/bugs/1440571
2015-04-07 23:20:30 +01:00
Tomas Groth
cff0b412f8
Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671.
...
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).
bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671 , https://launchpad.net/bugs/1438563 , https://launchpad.net/bugs/1422761
2015-04-03 20:31:19 +02:00
Tomas Groth
589bc98bec
Use html.escape instead of the deprecated cgi.escape
2015-04-02 21:32:20 +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
Tomas Groth
335c804e8f
Fix support for special characters in theme names. Fixes bug 1438563.
...
Fixes: https://launchpad.net/bugs/1438563
2015-04-02 10:04:56 +01:00
Jonathan Springer
16425b05a0
Fix bug 1247661 by restoring to main window when the dock icon is clicked
2015-03-24 18:33:57 -04:00
Tomas Groth
25f6fe0a59
Fix another case of bug 1422761.
...
Fixes: https://launchpad.net/bugs/1422761
2015-03-20 17:03:45 +00:00
Tomas Groth
f8084059ba
Added test + small fixes.
2015-03-18 22:04:30 +00:00
Tomas Groth
7e406e7005
Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324.
...
Fixes: https://launchpad.net/bugs/1413324
2015-03-18 22:02:51 +00:00
Tomas Groth
b3fd23da59
Updated the list of extensions supported by VLC.
2015-03-18 20:44:35 +00:00
Tomas Groth
27332f87e1
Run XInitThreads when using VLC to make it work correctly. Fixes bug 1433245.
...
Fixes: https://launchpad.net/bugs/1433245
2015-03-17 22:06:21 +00:00
Tomas Groth
c3d21ca742
Disable the stop button in the slidecontroller mediaplayer buttons instead of hiding it to stop the position and audio slider resizing. Fixes bug 1431478.
2015-03-16 21:32:56 +00:00
Tomas Groth
e34179795b
Attempt to fix a webkit player exception
2015-03-15 22:34:12 +00:00
Tomas Groth
fe6249a9e7
Removed tab from text since transifex cannot handle it.
2015-03-09 22:10:21 +00:00
Tomas Groth
39c79aaed9
PEP8 fixes
2015-03-09 20:57:39 +00:00
Tomas Groth
aefe3e9cad
trunk
2015-03-09 20:42:28 +00:00
54c23cc7bd
Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click
...
Fixes: https://launchpad.net/bugs/1419300
2015-03-07 00:18:51 +02:00
Arjan Schrijver
ea96bff031
Add myself as translator
2015-03-01 14:29:47 +01:00
Tim Bentley
1d82bc534c
Add tests
2015-02-28 09:41:06 +00:00
Tim Bentley
75bae159b0
fix error tag
2015-02-28 07:04:41 +00:00
Tomas Groth
84a0fa0ecd
Moved string format input outside calls to translate. Fixes bug 1425035.
...
Fixes: https://launchpad.net/bugs/1425035
2015-02-27 21:14:08 +00:00
4847efdfd6
Release 2.1.3
...
bzr-revno: 2513
2015-02-21 22:05:25 +02:00
85b8cb2c50
Fix bug 1422683: Added exception checks to get_web_page() to help with changed description. Rearrange calls so thumbnail downloads don't hang other event threads. Reraise exception when retries > CONNECTION_RETRIES.
...
bzr-revno: 2512
Fixes: https://launchpad.net/bugs/1422683
2015-02-21 21:11:25 +02:00
23ef01bce2
Fix typo's in function calls
...
bzr-revno: 2511
2015-02-21 21:08:55 +02:00
Tomas Groth
66b898f2c3
Don't try to play media if no players are available. Fixes bug 1422761.
...
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.
bzr-revno: 2510
Fixes: https://launchpad.net/bugs/1422761 , https://launchpad.net/bugs/1423956
2015-02-21 21:03:59 +02:00
Phill Ridout
a6fed0a3e5
HEAD
2015-02-21 13:10:28 +00:00
Phill Ridout
4b52fde1da
Fixes possible bug and adds test
2015-02-21 13:08:56 +00:00
Tomas Groth
df9594e11d
trunk
2015-02-21 12:45:44 +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
Phill Ridout
fb20f9243f
Further fixes
2015-02-19 21:24:12 +00:00
b62bb37776
Reraise exception if retries > CONNECTION_RETRIES
2015-02-19 09:17:04 -08:00
fd81d2d80a
Fix thumbnail download blocking events
2015-02-19 07:34:09 -08:00
64d0a42946
Typos in projector.manager
2015-02-18 14:21:39 -08:00
Tomas Groth
83ad7c31d7
Don't try to play media if no players are available. Fixes bug 1422761
...
Fixes: https://launchpad.net/bugs/1422761
2015-02-18 21:32:42 +00:00
Phill Ridout
a6dfbdcf71
fix upgrade_db
2015-02-18 21:13:12 +00:00
33d8dcfa50
Reraise exception outside of checks
2015-02-18 12:40:39 -08:00
2b63b5d3ad
Add extra exceptions to get_web_page
2015-02-18 08:13:36 -08:00
80055b7ec0
Fix ftw socket.timeout bug 1422683
2015-02-17 13:27:51 -08:00
Tomas Groth
7c0386b7c0
Fixes for mysql as db backend
...
bzr-revno: 2504
2015-02-17 19:50:18 +00:00
Tim Bentley
870b69b497
Remove cache for http authentication
...
bzr-revno: 2503
2015-02-17 19:49:16 +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
Philip Ridout
f7cb420a31
Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog.
...
Also added a ValidationError exception class, to tidy up the unzip code slightly
bzr-revno: 2501
2015-02-17 05:51:24 +00:00
Philip Ridout
16758d1b80
Fixes bug1073931 "Corrupted databases stop OpenLP from starting"
...
Checks if the database session is available before trying to use it.
Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256
bzr-revno: 2500
2015-02-17 05:47:19 +00:00
Tomas Groth
f01aa970a7
Revert fix for bug 1421561, it is fixed elsewhere.
2015-02-16 22:03:59 +00:00
Tomas Groth
06355032a2
Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197.
...
Fixes: https://launchpad.net/bugs/1422197
2015-02-16 21:59:55 +00:00
Tomas Groth
0617ce3dc9
trunk
2015-02-16 21:02:58 +00:00
Tomas Groth
aef91445ca
Handle OSError exception when creating files in various places. Fixes bug 1416888.
...
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tim Bentley
58f10d3b6b
Fix cache for http authentication
2015-02-14 09:12:35 +00:00
Phill Ridout
6ca70bbc5c
New line at end of file
2015-02-13 23:27:25 +00:00
Phill Ridout
2eb58a56bd
PEP fixes
2015-02-13 23:21:57 +00:00
Phill Ridout
498d17b000
Added tests
2015-02-13 23:10:16 +00:00