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

2042 Commits

Author SHA1 Message Date
Ken Roberts f51132e876 core/common convert strings to python3 format 2016-05-13 21:24:46 -07:00
tim.bentley@gmail.com f37722dd73 "Allow themes to have video files so allow for background videos behind text. 
move string to python 3 format

lp:~trb143/openlp/background_videos (revision 2692)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1522/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1433/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1167/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Test..."

bzr-revno: 2659
 2016-05-12 23:00:54 +02:00
Ken Roberts c58ce31e8b "Convert __init__.py file strings from python2 to python3 format 
Python2 "%s text" % value1
Python2 "%s text %s" % (value1, value2)
Python3 "{var1} text {var2:02d}".format(var1=text, var2=number)

- String conversions in init files
- Added test for projector power state change
- Remove extraneous print() call in mediainfo plugin
- Fix translate() string formatting
- Revert string format for re.compile() until further testing is done
- Skip crosswalk.com test until their server is fixed

-----..."

bzr-revno: 2658
 2016-05-12 22:34:57 +02:00
suutari-olli 7e5b49ffdf - Merged trunk on 11.5.16 2016-05-11 18:37:58 +03:00
suutari-olli bd9c9a8430 - Merged trunk 2016-05-10 03:58:37 +03:00
Ian Knight 3cdbaff2a6 Housekeeping 2016-05-06 11:16:49 +09:30
Ken Roberts 9ac95cf665 Skip crosswalk.com test while server down 2016-05-05 12:37:48 -07:00
Ian Knight aac09c0afb Fixed create_thumb_invalid_size_test 2016-05-06 04:33:12 +09:30
Ian Knight 55002518ef Added Functional Tests, cleaned PEP8 errors 2016-05-06 04:27:32 +09:30
Ken Roberts 72fc30d600 merge trunk 2016-05-05 08:51:07 -07:00
Tomas Groth 17fa45b1dd Added tests. 2016-05-04 22:58:44 +02:00
Tim Bentley 0efd1931b4 head 2016-05-02 09:05:47 +01:00
Ken Roberts e42c6a9071 - Convert strings in mainwindow.py 
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

bzr-revno: 2656
 2016-05-02 06:49:54 +01:00
Tim Bentley 38cd4b1f67 with tests 2016-04-30 18:12:40 +01:00
suutari-olli 09a084be18 - Removed un-needed import that was added earlier 
- Pep8 fixes
 2016-04-30 03:07:36 +03:00
suutari-olli 10c4118583 Added a test for checking that all the general required stuff is called on quick search. 2016-04-30 02:58:07 +03:00
Ken Roberts 956c9d1653 pep8 in test_openlpimporter.py 2016-04-29 13:35:54 -07:00
Ken Roberts 5601e61c0f Convert strings to python3 in mainwindow 2016-04-29 13:25:12 -07:00
Samuel Mehrbrodt 9cd49f194f PEP8 2016-04-29 19:32:09 +02:00
Samuel Mehrbrodt 868b538dd2 Fix test and add new one 2016-04-29 19:10:50 +02:00
suutari-olli aa2720da40 Merged trunk on 28.4.16, removed broken test. 2016-04-28 23:12:34 +03:00
suutari-olli 0217ecae2b Commit for merging trunk. 
This also has a broken test.
 2016-04-28 19:28:45 +03:00
raoul@snyman.info 1744032383 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database 
Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

bzr-revno: 2654
Fixes: https://launchpad.net/bugs/1557514
 2016-04-27 22:44:03 +01:00
Raoul Snyman 60f3ae195c Forgot to add the test file 2016-04-27 23:23:16 +02:00
ian@knightly.xyz f4697a6051 Added QR code and link to iOS remote app and test to HTML Builder. 
lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

bzr-revno: 2653
 2016-04-27 17:57:34 +01:00
Tomas Groth 58ac52a30e merge trunk 2016-04-26 20:58:03 +02:00
Ian Knight 56f5bbac52 Testing 2016-04-26 12:17:38 +09:30
Ian Knight b8173f7f0e Added Test to HTML Builder 2016-04-26 12:13:29 +09:30
Chris Hill bb15b4ce71 merge w/ trunk 2016-04-25 11:54:08 +01:00
Ken Roberts 884f060dea Oops and text in projector test 2016-04-24 04:22:04 -07:00
Ken Roberts d5b98b7308 Added projector power test 2016-04-23 12:55:47 -07:00
Ken Roberts 591ed15ab7 Merge upstream 2016-04-23 12:28:52 -07:00
Ken Roberts 907e1df129 - Update string format to Python3 style 
- Added projector multiple lamp values test
- Updated strings for translation (they should all be ok now)
- Fix merge conflicts (projector_pjlink1 and projector_ui tests)

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

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

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

bzr-revno: 2650
 2016-04-23 14:48:27 +01:00
Tim Bentley 071a4438e9 Finish moving things around 
bzr-revno: 2649
 2016-04-23 14:46:59 +01:00
Tim Bentley fed2466ad6 Add Icon and defense tests for missing mediainfo 
bzr-revno: 2648
 2016-04-23 14:45:55 +01:00
Ken Roberts c1222dc2bb Convert strings to python3 in __init__ files 2016-04-22 17:40:59 -07:00
Tim Bentley 37ea1c5da1 fix 2016-04-22 20:25:28 +01:00
Tim Bentley d9d31c4626 tests 2016-04-22 19:35:23 +01:00
Ken Roberts bec015142b Merge trunk to fix conflicts 2016-04-22 04:41:29 -07:00
suutari.olli@gmail.com f0d75a29c2 This branch introduces the following fixes/features: 
- Fixed bug 1565447 (Unable to save panel visibility if View mode is used)
  (Added a hidden setting for controlling this)
- Locking Panels now also locks “View” menu so view menu can’t
  be set if panels are locked.
- Panels are now locked by default, this prevents users from
  totally messing their UI so easily.
- Added a checkbox for disabling/enabling Projectors during first time wizard
  (By default disabled, added a hidden setting fo...

bzr-revno: 2647
Fixes: https://launchpad.net/bugs/1508582, https://launchpad.net/bugs/1565447
 2016-04-21 22:16:24 +01:00
Tim Bentley 59b3c7b053 head 2016-04-21 17:27:04 +01:00
Tim Bentley bd8ddf7506 fix tests 2016-04-21 17:26:34 +01:00
gabriel.loo@gmail.com c3e27b44f0 Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault). 
bzr-revno: 2646
Fixes: https://launchpad.net/bugs/1570228
 2016-04-21 17:03:36 +01:00
Tomas Groth 89ce4131e7 Skip pysword tests is pysword isn't installed. 2016-04-20 21:29:04 +02:00
Tim Bentley f2537981e4 update 2016-04-20 17:36:37 +01:00
suutari-olli c1d9991acb Noticed I had removed one test from end of the file, added it back. 2016-04-20 19:01:58 +03: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
suutari-olli a0859a5694 Noticed I had created 2 unneeded blank lines to test file. 2016-04-18 21:30:22 +03:00
suutari-olli 3639ad1bd4 Added two tests. 
One to check projectors panel is set visible
after the wizard, the other for the opposite.
 2016-04-18 20:18:04 +03:00
Gabriel Loo caa9c59c75 Added unit tests for SongSelect Importer search 2016-04-17 18:55:40 -04:00
Chris Hill 66fc2ff7c3 merge w/ trunk 2016-04-17 22:23:50 +01:00
Chris Hill 0c8f9e3b71 Removed auto-select for searches where multiple IDs selected, added tests to hide temporary songs 2016-04-17 22:22:30 +01:00
Tim Bentley 1942a8ac14 fix 2016-04-17 21:11:55 +01:00
Tim Bentley 760b34f35a fix 2016-04-17 20:42:14 +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 6767ba504c colorbutton 2016-04-17 19:57:03 +01:00
Tim Bentley c2a2d8545e head 2016-04-17 19:49:22 +01:00
Tim Bentley 210cb0be31 head 2016-04-17 19:48:50 +01:00
Ken Roberts 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
Ken Roberts 16ed511a93 Fix notes in multiple lamp test 2016-04-17 02:33:48 -07:00
Ken Roberts 1288da1b87 Added multiple lamp test 2016-04-17 02:30:30 -07: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
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
suutari-olli 12b1d64b6a - Started working on test. (This is currently broken, it asks "Are you sure you want to re-run wiz message"), wanted to see if it does it with jenkins. 2016-04-16 18:13:19 +03:00
Ken Roberts d92757af97 Convert strings to format() method 2016-04-16 01:08:45 -07:00
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
Tomas Groth 6f975654cc Added tests. 2016-04-15 22:34:20 +02:00
Tim Bentley a453a0d0d0 fix tests 2016-04-13 19:48:46 +01:00
Tim Bentley 19d120de1b Head and review comments 2016-04-13 19:38:49 +01:00
suutari-olli 2f6870ed8a Merged trunk on 13.4.16 2016-04-13 17:12:28 +03:00
suutari-olli 33078b426f - Reverted the Powerpoint > PowerPoint changes. 2016-04-13 17:10:47 +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 d87c884f2d fix tests 2016-04-12 21:45:50 +01:00
Tim Bentley 01762951d0 head 2016-04-12 21:26:43 +01:00
suutari-olli 2c9502418f - Fixed PPT name tests by changing Powerpoint into PowerPoint 
- Replaced resources.py with trunk version.
 2016-04-12 05:54:23 +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 0275b06711 Hopefully fixed the test for checking the main window name... 2016-04-10 03:12:18 +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
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
Ken Roberts 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 12b63f8e71 Merged to trunk (1.4.2016) 2016-04-01 16:10:23 +03:00
suutari-olli 6858a7cfb5 Added 3 tests for replacing Live item from service manager while display is blanked. (One for each) 2016-04-01 16:08:44 +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 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Ken Roberts 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 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
raoul@snyman.info 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
Raoul Snyman 0802682a13 Fix up some comments 2016-02-05 21:01:21 +02:00
Raoul Snyman 0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman 94edb189e8 Added some tests around the shortcut list form 2016-02-04 23:19:01 +02:00
Raoul Snyman 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
raoul@snyman.info f588b82976 Fix up the tests for Windows by retrying deleting the databases. 
bzr-revno: 2608
 2016-01-15 21:37:53 +01:00
Raoul Snyman 478d356d2e Oops, forgot a variable 2016-01-15 21:41:14 +02:00
Raoul Snyman 48eeb50d02 Add retries around other db removals 2016-01-15 21:14:24 +02:00
Raoul Snyman 1e8d787b93 Make pep8 happy 2016-01-15 20:37:03 +02:00
Raoul Snyman 5d21aab539 Make pep8 happy 2016-01-15 20:31:05 +02:00
Raoul Snyman e1ed3ab163 Use rmtree in the retry mechanism 2016-01-15 20:10:09 +02:00
Raoul Snyman b11b88f4eb Add a retry mechanism 2016-01-15 19:58:21 +02:00
Raoul Snyman d7b9e2cbe5 Try deleting the file itself after telling Python to do garbage collection 2016-01-15 19:50:57 +02:00
Raoul Snyman 402917024b Another go at this 2016-01-15 19:11:02 +02:00
Raoul Snyman 11b7bfd22d See if waiting a second helps 2016-01-14 22:31:37 +02:00
Raoul Snyman 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
Raoul Snyman 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
Ken Roberts 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
raoul@snyman.info 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
Raoul Snyman 9904ba8da8 Remove media manager stylesheet for now 2016-01-09 21:10:56 +02:00
Raoul Snyman a4391bd6e3 HEAD 2016-01-09 20:01:49 +02:00
Ken Roberts bcbb523375 pep8 2016-01-09 09:46:20 -08:00
Ken Roberts f8d353efcb Rename test method 2016-01-09 09:43:38 -08:00
Ken Roberts 94df2d2d86 Fix test for pjlink ticket 921817 2016-01-09 09:21:20 -08:00
Ken Roberts 8fcae33516 resolve merge conflics 2016-01-09 08:59:42 -08:00
simon.hanna@serve-me.info 04e117181d Strip whitespace from title when importing a Songbeamer song. 
bzr-revno: 2596
 2016-01-09 16:59:25 +00: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 2785fbaa2d Fix tests 2016-01-09 16:53:49 +01:00
Samuel Mehrbrodt ad5246fc4a songbookentry -> songbook_entry, mock_song -> song 2016-01-09 16:23:11 +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 bf4225838e Fix failing test due to name conflict 2016-01-09 01:15:23 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna 8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +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 b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth 21b8388069 Small cleanup of videopsalm 2016-01-08 20:52:24 +01:00
Tomas Groth 345f135e98 Made sundayplus importer work with python3. Added tests. 2016-01-08 20:51:03 +01:00
Tim Bentley 7fd37c1033 head 2016-01-08 17:44:47 +00:00
s.mehrbrodt@gmail.com 859288f172 Usability improvements 
* When pressing Ctrl+F, select the text in the searchfield to allow immediate typing
* Allow entering the verse order in lowercase (automatically convert to uppercase)

bzr-revno: 2592
Fixes: https://launchpad.net/bugs/1530340, https://launchpad.net/bugs/1530354
 2016-01-08 17:28:47 +00: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
simon.hanna@serve-me.info a6ef19683d CodecForTr was dropped in Qt5 
The deletion of songs still depended on that.

Just a minor edit to drop the dependency

bzr-revno: 2590
 2016-01-08 17:24:48 +00:00
Tim Bentley fd3a85a68c head 2016-01-08 17:09:29 +00:00
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman c4bb673ac0 Remove potentially unnecessary code 2016-01-08 00:00:02 +02:00
Tomas Groth a61430a59f Fix the tests on Windows too 2016-01-07 23:57:01 +02:00
Raoul Snyman 7853706479 Apparently BibleServer.com has removed that Bible. Use another one instead. 2016-01-07 23:38:13 +02:00
Raoul Snyman 543d6898d3 Fix up the projector interface tests 2016-01-07 23:36:43 +02:00
Tomas Groth f2cccb90ae Fix projector tests 2016-01-07 23:07:55 +02: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
Simon Hanna 7ebbf65a86 Add a test 2016-01-07 13:36:11 +01:00
Raoul Snyman 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
Raoul Snyman 51eefc84d9 Fix OS X test which wasn't being skipped on non-OS X platforms 2016-01-06 22:00:51 +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
Simon Hanna 46301b63f4 Add docstrings to tests 2016-01-05 22:35:35 +01:00
Tim Bentley 8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Samuel Mehrbrodt 75b885961e Add test for converting verse order to uppercase 2016-01-05 17:11:30 +01:00
Samuel Mehrbrodt 5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt bfdd9e81ab Extend test for multiple songbooks 2016-01-04 20:23:42 +01:00
Samuel Mehrbrodt ccd8b0625f Fix test 2016-01-04 20:20:21 +01:00
Samuel Mehrbrodt ecd2c28cc7 Add test 2016-01-04 20:14:00 +01:00
Simon Hanna 7ed23514b4 Add test for about() function of MediaPlugin 2016-01-04 01:28:13 +01:00
Simon Hanna 8121f77e2d Add test for about() function of SongUsagePlugin 2016-01-04 01:27:56 +01:00
Simon Hanna 9459aff90c Add test for webkit_version function 2016-01-03 12:47:07 +01:00
Ken Roberts 2edb32ac7f pep8 fix 2016-01-03 00:32:43 -08:00
Ken Roberts f0a5e2eddb fix extraneous docstring notes in pjlink1 test 2016-01-03 00:18:58 -08:00
Ken Roberts a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Simon Hanna 96c99f3e28 Add test to check if title is stripped on Songbeamer import 2016-01-03 01:53:17 +01:00
Simon Hanna c7563a5a64 Add documentation to tests 2016-01-03 00:37:22 +01:00
Tim Bentley 607371a6d7 Years move on 
bzr-revno: 2588
 2016-01-02 21:37:40 +00:00
Tim Bentley 3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Simon Hanna 990a8a9502 Add tests for the SongFormat class 2015-12-30 22:36:37 +01:00
Raoul Snyman ffbf75bb2f Release 2.3.1 
bzr-revno: 2586
 2015-12-28 22:19:43 +02: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
Raoul Snyman 9f939859b7 [Songs Plugin] Add a stop button to the SongSelect importer to stop searching. 2015-12-26 16:33:29 +02:00
Tomas Groth b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
Jonathan Springer 65b8b12590 Add tests 2015-12-24 14:27:44 -05:00
Raoul Snyman 8bf871fe2b [SongSelect] Fix a potential bug where the song author only has 1 name (most commonly seen when the name is 'Unknown') 2015-12-23 20:20:22 +02:00
Jonathan Springer b858b0b103 merge trunk 2015-12-23 13:01:37 -05:00
springermac@gmail.com d9a02f6ada Migrate to PyQt5 
bzr-revno: 2576
 2015-12-21 21:27:10 +01:00
Jonathan Springer bee587fa67 merge trunk 2015-12-20 19:43:38 -05:00
Tomas Groth 89ae1ae738 Added tests for LyriX import. 2015-12-20 20:28:14 +01:00
Tomas Groth 2a4205c0a1 Migrated songselect and songbeamer tests to the SongImportTestHelper based structure. 2015-12-20 17:46:39 +01:00
Tomas Groth 037d3f4f7d Added support for author types in tests + some VideoPsalm fixes 2015-12-18 23:24:20 +01:00
Tomas Groth 6eb17b561d trunk 2015-12-18 21:13:21 +01: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