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

1926 Commits

Author SHA1 Message Date
Ian Knight 7599429065 Merge from trunk 2016-06-01 13:45:43 +09:30
Raoul Snyman 672b8334fa Initial attempt to move to nose2 2016-05-31 23:40:13 +02:00
Raoul Snyman 5a6c4f90a1 Fix formatting problems 2016-05-31 18:10:31 +02:00
Ken Roberts 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
Ken Roberts 1782cd8274 "Convert strings from python2 to python3 in plugins part 3 
- Convert strings in plugins/remote
- Convert strings in plugins/songs
- Update projectordb test
- Fix oops in format tag - missed escaping brace(s)

--------------------------------
lp:~alisonken1/openlp/strings-plugins3 (revision 2670)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1576/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1487/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1425/
[SUCCESS]..."

bzr-revno: 2670
 2016-05-31 16:56:23 +02:00
Ken Roberts c27b676c8c pep8 2016-05-27 22:55:54 -07:00
Ken Roberts 546030b64d Convert strings to python3 in plugins part 4 2016-05-27 22:50:31 -07:00
Ken Roberts 9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth 11e7ff5621 trunk 2016-05-26 15:09:03 +02:00
Tomas Groth fd4cfd1eaa Fix traceback during songshowplus import. Fixes bug 1585489. 
Fixes: https://launchpad.net/bugs/1585489
 2016-05-25 09:04:41 +02:00
Tim Bentley 32ef88f807 Fix set_value and adjust tests 2016-05-24 17:28:11 +01:00
Tim Bentley c13b922148 head 2016-05-24 17:18:45 +01:00
Ken Roberts 473772c505 Convert strings in plugins part 2 
- Convert strings in custom
- Convert strings in images
- Convert strings in media
- Convert strings in presentations
- Update projector-pjlink test

--------------------------------
lp:~alisonken1/openlp/strings-plugins2 (revision 2667)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1571/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1482/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1420/
[SUCCESS] https://ci.openlp.io/jo...

bzr-revno: 2668
 2016-05-24 17:18:25 +01:00
Ken Roberts 801f508a72 Convert strings in plugins part 2 2016-05-21 11:19:18 -07:00
Ken Roberts d52cebdfca Update strings in alerts and bible plugins to python3 2016-05-21 01:31:24 -07:00
Tim Bentley d0f6d21774 Add Working flags 2016-05-21 06:24:05 +01:00
suutari-olli dcfcd3e576 - Merged trunk on 21.5.16 2016-05-21 00:45:14 +03:00
Ken Roberts 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 2c1c7810b9 Improved test coverage. 2016-05-20 22:57:52 +09:30
Ian Knight 812c124528 Added test case for Auto option. 2016-05-20 22:06:59 +09:30
suutari-olli 165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
Tim Bentley 8507d3e263 fixes 2016-05-18 18:25:16 +01:00
Tim Bentley fd33d9a0c5 fixes 2016-05-18 18:16:40 +01:00
Tim Bentley 7c1e922f10 pep8 2016-05-18 18:06:25 +01:00
Ken Roberts 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
Simon Hanna f3e1194956 Add comments to test 2016-05-17 21:35:25 +02:00
Simon Hanna 6bbf783a2e Add test 2016-05-17 21:31:56 +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
Ian Knight a7466f1ea7 Check for Div0 and added unit test cases 2016-05-16 22:05:58 +09:30
suutari-olli 334d16d81c - Noticed this had a conflict, fixed it, improved comments 2016-05-15 22:41:13 +03:00
Ken Roberts 7c4671b676 Convert strings to python3 in core.common.lib 2016-05-15 10:33:42 -07:00
Ken Roberts 07468f0093 Fix oops 2016-05-15 10:32:04 -07:00
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