Tim Bentley
19d120de1b
Head and review comments
2016-04-13 19:38:49 +01: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
d87c884f2d
fix tests
2016-04-12 21:45:50 +01:00
Tim Bentley
01762951d0
head
2016-04-12 21:26:43 +01:00
Tomas Groth
2aeb7f9e6f
trunk
2016-04-10 22:24:07 +02: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
Tim Bentley
483c12d779
vlc tests pass
2016-04-07 19:14:10 +01:00
Tim Bentley
189dc95bbf
fix up tests
2016-04-07 19:01:16 +01:00
Tim Bentley
a41d86cb7c
Head
2016-04-06 06:08:44 +01:00
Tim Bentley
7f1f8cf780
pep8
2016-04-05 21:14:50 +01:00
Tim Bentley
59e3603a3e
fix tests
2016-04-05 20:58:40 +01:00
Tim Bentley
1082254f02
fix tests
2016-04-05 20:51:46 +01:00
Tim Bentley
3500c73494
fix tests
2016-04-05 20:44:00 +01:00
Tim Bentley
b6c49450d4
fix tests
2016-04-05 20:33:37 +01:00
Tim Bentley
fb2de75cbc
fix tests
2016-04-05 20:11:10 +01:00
Tim Bentley
7c88006c7b
fix tests
2016-04-05 19:44:50 +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
3e8af699c3
fix import issues
2016-04-04 22:19:37 +01:00
Tim Bentley
d440891819
fix import
2016-04-04 22:11:23 +01:00
Tim Bentley
ee62d9fa6c
change package
2016-04-04 22:01:24 +01:00
Tim Bentley
0b480f5e8d
add test mixin
2016-04-04 21:47:33 +01:00
Tim Bentley
8a1b62fdcd
move tests
2016-04-04 21:41:08 +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
Tim Bentley
a0bfc7d069
move methods
2016-04-03 20:44:09 +01:00
chris@minkus.me.uk
5a3e5c655c
Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key
...
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests
--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op ...
bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
2016-04-03 16:57:52 +01:00
ian@knightly.xyz
a0e004b68f
Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check.
...
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...
bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860 , https://launchpad.net/bugs/1550856
2016-04-03 16:55:55 +01:00
Tim Bentley
7424d6be8b
More refactoring
...
bzr-revno: 2635
2016-04-03 16:54:13 +01:00
ian@knightly.xyz
dd0ef0a17c
Adds support for importing ProPresenter 5 and 6 files. See branch description for further details.
...
lp:~knightrider0xd/openlp/propresenter_5-6_import (revision 2634)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1271/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1210/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1044/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface ...
bzr-revno: 2634
Fixes: https://launchpad.net/bugs/1358601
2016-04-03 16:44:04 +01:00
Chris Hill
38c9ed1fd0
Merge w/ trunk
2016-04-03 11:57:57 +01:00
Chris Hill
330a1758c8
Use get_natural_key instead of _natural_sort_key
2016-04-03 11:57:39 +01: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
203c7b9dd8
move historycombo
2016-04-01 17:56:54 +01: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
2e58e45068
fixes more
2016-03-31 17:56:32 +01:00
Tim Bentley
ba6d66497c
actions
2016-03-31 17:34:22 +01:00
Tim Bentley
946d9ee3d5
fix tests
2016-03-31 17:24:44 +01:00
Tim Bentley
3693cf331d
fix string in natural sort and move db
2016-03-31 17:14:28 +01:00
Ian Knight
573bc510ff
Added ProPresenter 5 & 6 support
2016-03-31 03:41:52 +10:30
Tim Bentley
77fca59e57
add new line
2016-03-29 17:07:40 +01:00
Tim Bentley
2433efdfd0
Update themes in service manager when themes are set in settings
2016-03-29 16:45:59 +01:00
Chris Hill
8de2f013eb
merge w/ trunk
2016-03-28 12:52:59 +01:00
Ian Knight
1667363abd
Shifted common test code into setup.
2016-03-24 00:44:37 +10:30
Tomas Groth
7c6e1902c4
Fix tag detection. Fixes bug 1549549.
...
Fixes: https://launchpad.net/bugs/1549549
2016-03-22 22:08:56 +01:00
Ian Knight
a98e62ed5d
Corrected comments
2016-03-21 16:11:46 +10:30
Ian Knight
80a8abf4d0
Merged changes from trunk
2016-03-21 01:30:15 +10:30
Ian Knight
4f1a074546
Cleaned pep8 errors
2016-03-21 01:04:52 +10:30
Tomas Groth
45b122f768
make stuff prettier...
2016-03-20 09:28:41 +01:00
Tomas Groth
dca65148c4
forgot to add a file and made some pep8 fixes
2016-03-19 21:42:59 +01:00
Tomas Groth
2937f39999
trunk
2016-03-19 21:30:12 +01:00
Chris Hill
9c5da3d196
merge w/ trunk
2016-03-19 15:09:50 +00:00
Chris Hill
bb0adc6f5d
fixed bug #1280295 'Enable natural sorting for song book searches', refactored to move filtering to database, updated test
...
Fixes: https://launchpad.net/bugs/1280295
2016-03-19 15:01:10 +00:00
Ian Knight
79b4c474d6
Added testing
2016-03-19 19:10:11 +10:30
Tomas Groth
7b69634552
Fixes for translation support + test
2016-03-19 07:20:12 +01:00
Tomas Groth
fdc22b4e4c
Add translations support
2016-03-18 23:09:49 +01:00
Tomas Groth
302fcb221b
Added another OPS Pro import test
2016-03-16 22:28:29 +01: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
678e6d342d
Spelling - Add plural "projectors" to multiple-selected projector tooltip descriptions
...
String Standards - Add period after tooltip descriptions
Tests - Added projector status_change test
bzr-revno: 2627
2016-03-15 22:24:38 +01:00
Tomas Groth
e908799240
Fix slide order change when splitting custom slides. Fixes bug 1554748.
...
Fixes: https://launchpad.net/bugs/1554748
2016-03-13 22:55:47 +01:00
Tomas Groth
faa434d937
pep8 fixes
2016-03-13 19:37:08 +01:00
Tomas Groth
4b57a2bae6
Fix weird test bug.
2016-03-12 22:23:06 +01:00
Tomas Groth
e9e5976d22
Finished first test.
2016-03-11 22:56:07 +01:00
Tomas Groth
51ffb92d40
Started work on tests
2016-03-09 22:44:15 +01:00
Tomas Groth
98eb50e9b2
Made the anchor/tag detection more generic.
2016-03-08 22:43:10 +01:00
Tomas Groth
e67ad21740
Getting closer...
2016-03-07 23:27:28 +01:00
chris@minkus.me.uk
3f7cb577b4
Fix for bug #1000729 . Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search, based on the existing 'Author' search.
...
bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1000729
2016-03-05 20:48:27 +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
544319ba92
Add projector: status_change_test
2016-03-03 10:19:42 -08:00
second@tgc.dk
0afada2129
Another attempt to fully fix bug 1531319.
...
bzr-revno: 2625
2016-02-29 21:57:10 +01:00
Tomas Groth
5809a2d6f4
Added test
2016-02-29 20:29:32 +01:00
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
9774618d37
Bugfix 1550891 - non-standard class reply from projector
2016-02-28 02:26:38 -08:00
suutari-olli
e548518331
Added 2nd empty row after last test in class.
2016-02-27 16:25:31 +02:00
Tim Bentley
af51d10fad
fix up some tests
2016-02-27 14:03:52 +00:00
suutari-olli
6ef2cc8b59
Added test, fixed comment.
2016-02-26 23:28:01 +02:00
Chris Hill
57200fa84e
merge with trunk
2016-02-19 20:28:39 +00:00
Tomas Groth
034344ae48
Add missing import.
2016-02-15 22:11:38 +01:00
Tomas Groth
4c883c8cf0
Remove songs used in tests that is not in public domain.
2016-02-15 21:49:23 +01:00
Tim Bentley
54720d6924
head
2016-02-13 22:11:11 +00:00
Chris Hill
41d627e3f9
natural sort lower case
2016-02-13 16:57:09 +00:00
Chris Hill
3eecea213d
merge with trunk
2016-02-13 16:40:16 +00:00
271a35581c
Release 2.4
...
bzr-revno: 2621
2016-02-13 16:41:12 +02:00
Tim Bentley
ea40173f9b
new start
2016-02-13 13:13:00 +00:00
Tomas Groth
e99fe71ca2
Added test
2016-02-12 21:23:18 +01:00
Tomas Groth
510e109ff5
trunk
2016-02-12 20:59:32 +01:00
Tomas Groth
b90dbbc303
pep8 fix
2016-02-12 20:46:04 +01:00
dcd39adfe2
[songusage] No need to trigger the action twice
2016-02-11 23:05:41 +02:00
Chris Hill
76e7faf1aa
Remove _try_int function - spurious
2016-02-07 09:27:28 +00:00
a172183a4e
Release 2.3.3
...
bzr-revno: 2617
2016-02-06 23:12:06 +02: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
c75d0cee29
Added a test.
2016-02-06 21:33:27 +01:00
Chris Hill
f23e2dfb46
update from trunk, works in 2.4
2016-02-06 17:50:58 +00:00
4a5f77f884
"Fixed a problem with the shortcuts.
...
Also tried to make the alternate clear button on the shortcuts dialog a little less weird.
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1533246 (revision 2616)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1275/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1138/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functi ..."
bzr-revno: 2614
Fixes: https://launchpad.net/bugs/1533246
2016-02-05 22:04:00 +02:00
0802682a13
Fix up some comments
2016-02-05 21:01:21 +02:00
0dd29893da
More tests
2016-02-04 23:25:06 +02:00
94edb189e8
Added some tests around the shortcut list form
2016-02-04 23:19:01 +02:00
734bf4ffc4
Fix some BeautifulSoup warnings about parsers.
2016-02-04 22:17:40 +02:00
s.mehrbrodt@gmail.com
8fbd431bed
Fix entering Songbooks with keyboard
...
Also clear songbook entry field when editing another song
lp:~sam92/openlp/bug-1537212 (revision 2611)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1273/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1197/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1136/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/972/
Stopping after failure
bzr-revno: 2612
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 20:41:22 +00:00
Samuel Mehrbrodt
0f1c7bae44
Add test
2016-01-30 15:13:35 +01:00
Tomas Groth
f61ac941d0
Mock FormattingTags in test, instead of loading all tags.
2016-01-23 10:53:34 +01:00
Tomas Groth
c1108b1593
Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field.
2016-01-23 09:19:12 +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
Ian Knight
3900c33083
Corrected pep8 fails
2016-01-19 17:39:09 +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
34c771688c
Tests for Better Preview for Service Manager Blueprint
2016-01-18 12:49:20 +10:30
Ian Knight
960fbb8865
Implemented Better Preview for Service Manager Blueprint
2016-01-18 03:16:37 +10:30
f588b82976
Fix up the tests for Windows by retrying deleting the databases.
...
bzr-revno: 2608
2016-01-15 21:37:53 +01:00
478d356d2e
Oops, forgot a variable
2016-01-15 21:41:14 +02:00
48eeb50d02
Add retries around other db removals
2016-01-15 21:14:24 +02:00
1e8d787b93
Make pep8 happy
2016-01-15 20:37:03 +02:00
5d21aab539
Make pep8 happy
2016-01-15 20:31:05 +02:00
e1ed3ab163
Use rmtree in the retry mechanism
2016-01-15 20:10:09 +02:00
b11b88f4eb
Add a retry mechanism
2016-01-15 19:58:21 +02:00
d7b9e2cbe5
Try deleting the file itself after telling Python to do garbage collection
2016-01-15 19:50:57 +02:00
402917024b
Another go at this
2016-01-15 19:11:02 +02:00
11b7bfd22d
See if waiting a second helps
2016-01-14 22:31:37 +02:00
9e8fe903a7
attempt to fix some tests in windows
2016-01-14 22:25:58 +02:00
Tomas Groth
e91520fa60
pep8 fixes
2016-01-13 22:00:46 +01:00
Tomas Groth
b1660c0525
Added test
2016-01-13 21:56:55 +01:00
Tim Bentley
31d6f931e5
head
2016-01-11 21:58:21 +00:00
Tim Bentley
3f0025a013
add tests
2016-01-11 21:57:45 +00: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
springermac@gmail.com
e6959992f9
Fix Mac OS X display flags test
...
Fix import in pjlink tests
Skip OpenOffice test if uno isn't available, e.g., on Mac OS X
bzr-revno: 2604
2016-01-11 21:27:11 +01:00
Jonathan Springer
fc2efb7343
Fix Mac OS X display flags test
2016-01-10 22:27:28 -05:00
Jonathan Springer
c07503f5dc
Fix import
2016-01-10 17:10:50 -05:00
Jonathan Springer
263a7b2c62
Fix macosx_display_windows_flags_state test
2016-01-10 17:10:05 -05:00
Jonathan Springer
a9df7771f6
Skip OpenOffice test if uno isn't available
2016-01-10 17:09:18 -05:00
Simon Hanna
09faa0cb87
Add a test
2016-01-10 21:06:41 +01:00
Simon Hanna
4d7ceba301
Merge with trunk
2016-01-10 17:01:43 +01:00
0e8dc032da
Release 2.3.2
...
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
Simon Hanna
0f1d6718bd
Add tests for ignored case
2016-01-10 01:34:53 +01:00
Simon Hanna
70e1f3926b
Add test for fix
2016-01-10 01:18:27 +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
d5856f02c6
[Song select] Stop search on viewing a song.
...
[Song select] Add a stop button to the SongSelect importer to stop searching.
[Song select] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown')
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/song-select-fixes (revision 2582)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1227/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1152/
[SUCC...
bzr-revno: 2598
2016-01-09 19:38:10 +00:00
9904ba8da8
Remove media manager stylesheet for now
2016-01-09 21:10:56 +02:00
a4391bd6e3
HEAD
2016-01-09 20:01:49 +02:00