4859e9866d
Add .bin support for CCLI file import
2015-01-11 10:37:50 -08:00
172f13b12e
Fix an erroneous import (probably PyCharm)
2015-01-11 17:18:17 +02:00
0bb325fea7
HEAD
2015-01-11 17:17:33 +02:00
0deb0a10cc
[bug 1397606] Set the file dialogue box to the currently selected background image
...
bzr-revno: 2471
Fixes: https://launchpad.net/bugs/1397606
2015-01-11 17:17:01 +02:00
91933c3e2f
[bug 1409031] Fix retry counter when fetching a webpage
...
bzr-revno: 2470
Fixes: https://launchpad.net/bugs/1409031
2015-01-11 17:13:13 +02:00
02fb9edeb6
[bug 1407445] Fix remote previous/next calls to servicemananger
...
- Remove unneeded Registry() modification
- Fix line spacing
bzr-revno: 2469
Fixes: https://launchpad.net/bugs/1407445
2015-01-11 17:09:57 +02:00
8758020568
HEAD
2015-01-11 17:02:32 +02:00
Phill Ridout
dac7185692
Remove extra line
2015-01-09 19:51:39 +00:00
5c7777fd5a
Fix line spacing
2015-01-09 10:55:46 -08:00
0b2445b9a2
Fix spacing
2015-01-09 10:53:36 -08:00
d2fb2d47eb
Tests for bug 1409031
2015-01-09 10:46:50 -08:00
Phill Ridout
e0fa70e47e
Set the last file location in the file dialog box
...
Fixes: https://launchpad.net/bugs/1397606
2015-01-08 22:05:32 +00:00
Ken Roberts
7277e3e92a
Remove unneeded Registry modification
2015-01-08 10:55:26 -08:00
Ken Roberts
3f3c4cf80b
remote next/previous call test
2015-01-08 10:07:36 -08:00
Ken Roberts
3a9b61d9dc
Remove old testing framework in setup()
2015-01-06 16:36:39 -08:00
Ken Roberts
093f853fd9
Remove testing api (not needed anymore)
2015-01-05 10:54:44 -08:00
Ken Roberts
2e9f274027
Fix test db temp file for windows, projector edit form notes clearing
2015-01-05 10:36:10 -08:00
Ken Roberts
ba66618ca0
Bump other copyright year
2015-01-04 09:45:10 -08:00
Ken Roberts
15f1381de8
Upstream merges
2015-01-04 09:38:59 -08:00
Ken Roberts
5006fb238d
Bump copyright year
2015-01-04 09:31:15 -08:00
Tomas Groth
9461f334ce
Disable webkit and phonon mediaplayers on Mac OS X,
...
bzr-revno: 2467
2015-01-04 09:01:18 +00:00
Phill Ridout
3cafbfd0ed
Typo in comments fixed
2015-01-02 11:54:42 +00:00
Phill Ridout
9fef267fd3
Changed the year
2015-01-02 11:42:17 +00:00
Phill Ridout
b9f09142ed
HEAD
2015-01-02 11:40:51 +00:00
Phill Ridout
20d927b270
Rework to use a subclassed QLabel to allow dynamic resizing
2015-01-02 11:40:07 +00:00
Tomas Groth
9b2660bf7f
Rewrote tests for webkit and phonon player
2015-01-01 17:41:32 +00:00
Tomas Groth
e5c5a229a4
Update to 2015
2014-12-31 15:06:35 +00:00
Tomas Groth
1e95bc7fbb
Added simple tests for webkit and phonon players
2014-12-31 14:57:41 +00:00
Tim Bentley
f3c09af379
Years go by
2014-12-31 10:58:13 +00:00
e89558da39
Fix label text for CCLI
...
bzr-revno: 2463
2014-12-31 10:26:50 +00:00
Phill Ridout
52c7d89706
removal of util function
2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b
Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized
2014-12-30 11:21:06 +00:00
Phill Ridout
3cf2a21ca2
fix tests
2014-12-30 09:03:35 +00:00
Ken Roberts
ff185523e1
Test for bug 1404967
2014-12-29 09:41:45 -08:00
Phill Ridout
36417083ce
head
2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt
46d9d60830
Add missing translationtype to song edit form
...
bzr-revno: 2462
2014-12-28 21:49:54 +00:00
Tomas Groth
25e3e742b9
Fix media end time, Bible Parsing, ServiceManage Preview, locking of keytpress
...
bzr-revno: 2461
2014-12-28 21:46:34 +00:00
Samuel Mehrbrodt
c5d716f565
Test
2014-12-24 14:21:17 +01:00
Tomas Groth
795977b094
Make bible text parsing a bit more rebust, fixes bug 1404865.
...
Fixes: https://launchpad.net/bugs/1404865
2014-12-23 22:09:34 +00:00
Phill Ridout
c9e1dcceff
head
2014-12-23 18:57:04 +00:00
Tim Bentley
98a3cd127f
Update code to 2.2 from 2.1 so translators can get working!
...
bzr-revno: 2460
2014-12-22 21:55:44 +00:00
Tim Bentley
93d0314b7e
General fixes
2014-12-22 17:34:43 +00:00
Phill Ridout
4a9a7f2829
adds tests for bible media item
2014-12-19 22:02:45 +00:00
Phill Ridout
cb0e4dc7ba
added copyright header to test
2014-12-19 22:01:15 +00:00
Tim Bentley
927e610977
Fix tests
2014-12-18 21:15:14 +00:00
Ken Roberts
cfc0322eaf
Test for projectoredit form
2014-12-18 11:06:25 -08:00
Tim Bentley
5686e85384
Fix custom duplication bug
2014-12-16 07:47:46 +00:00
fe02a80e26
HEAD
2014-12-14 22:37:36 +02:00
b2f6eaf7d4
[ Fix #1386913 ] "Discard" option in projector-select input option should only be for editing source input text
...
- Fix "Discard" and "Reset" dialog buttons calling wrong functions (swapttped)
- Fix dialog title text to reflect proper "Select" or "Edit" title
- Fix tabbed dialog width to be consistent
- Added calls to translate for user text
- Added basic test for openlp.core.ui.projector.sourceselectform
bzr-revno: 2457
Fixes: https://launchpad.net/bugs/1386913
2014-12-14 22:34:52 +02:00
5742f7546e
Fixed up merge conflicts.
2014-12-12 22:57:42 +02:00
Phill Ridout
2642a21d53
Refactor get_uno_command & get_uno_instance
2014-12-08 07:19:51 +00:00
Phill Ridout
6fd0612748
set connection type for each test
2014-12-07 19:13:21 +00:00
Phill Ridout
2aff850b64
HEAD
2014-12-07 17:46:46 +00:00
Phill Ridout
9d54d6351a
Tests
2014-12-07 17:46:23 +00:00
Tomas Groth
4ed9e9a722
Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
...
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.
bzr-revno: 2454
2014-12-07 08:21:37 +00:00
Philip Ridout
c9a2b87ac5
Fix links and Color buttons
...
bzr-revno: 2452
2014-12-07 08:16:15 +00:00
Tomas Groth
df6c533387
Fix upgrade on song db with lost version. Fixes bug 1391638.
...
Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015.
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271.
bzr-revno: 2451
2014-12-07 08:13:52 +00:00
Tomas Groth
46641fecbe
Made the FTW able to handle if the downloaded config file is invalid (part of bug 1222944).
...
Improved FTW handling of connection issues.
Update thememanager widget after theme import.
Close song db session after import to unlock file on windows, so they can be deleted.
Fix for importing old bible DBs, like KJV
Removed old pyinstaller hooks which has been moved to the packaging branch.
When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.
bzr-revno: 2450
2014-12-07 08:11:59 +00:00
Tomas Groth
da7ff60697
Moved test service files into appropriate folder.
2014-12-06 21:05:45 +00:00
Tomas Groth
782b3d3bcf
trunk
2014-12-03 22:35:06 +00:00
Tomas Groth
0038ffcbe6
Add test for loading song with linked audio - the actual test
2014-12-03 22:29:20 +00:00
Tomas Groth
304c489cd7
Add test for loading song with linked audio
2014-12-03 22:27:09 +00:00
Phill Ridout
70c3a21620
HEAD
2014-12-03 19:50:41 +00:00
Tomas Groth
6ebc08d0d9
Attempt to fix crash in test
2014-12-02 09:46:50 +00:00
Tomas Groth
e9410de13c
Revert attempted fixes to projector tests. Just don't use windows...
2014-12-01 08:33:16 +00:00
Tomas Groth
7d2f2d147c
Another projector test fix attempt
2014-12-01 08:22:17 +00:00
Phill Ridout
563347c8b8
HEAD
2014-11-30 07:44:57 +00:00
Tomas Groth
6af0aef8bd
Another attempt to fix projector test across platforms and versions
2014-11-28 10:53:39 +00:00
Tomas Groth
612041dafa
Remove unnecessary start of patch in test
2014-11-28 08:26:33 +00:00
Tomas Groth
9b731aad7a
Fix projector tests on windows
2014-11-27 21:40:56 +00:00
c33cf2b5b5
We need to remove the service manager from the Registry in tearDown
2014-11-27 01:45:17 +02:00
cbb5630ba5
See if this fixes things on CI
2014-11-27 01:39:31 +02:00
049ca7e9d2
Go back to deleting everything, as it seems to yield the best result
2014-11-27 01:34:48 +02:00
d28e838fa6
Empty methods need a pass statement
2014-11-26 23:32:22 +02:00
d978f12630
Try something ridiculous, like removing all the deletes
2014-11-26 22:56:21 +02:00
34406385fb
HEAD
2014-11-26 22:50:54 +02:00
Ken Roberts
ea14deaa87
Fix quotes
2014-11-26 09:24:05 -08:00
Tomas Groth
e3bd817c5b
Merge with trunk
2014-11-26 09:04:09 +00:00
Tomas Groth
92a6831b15
Fix slidecontroller test
2014-11-25 22:31:18 +00:00
Tim Bentley
21db63b032
remove blank line
2014-11-25 21:36:52 +00:00
Tomas Groth
80a8434458
Added one more test for song db upgrade
2014-11-25 15:11:18 +01:00
Tomas Groth
4ca013e211
Added test for song db upgrade
2014-11-25 12:25:41 +01:00
bca75efe53
Playing around
2014-11-24 23:37:57 +02:00
e537abf916
Lets try this again
2014-11-24 23:34:10 +02:00
7f84fac9e5
Introduced a problem on CI it seems.
2014-11-24 23:22:24 +02:00
fbaad51811
Try to fix the segfault
2014-11-24 23:18:32 +02:00
bd79b1d059
[bug 1314469] Fix the border seen in the main display on KDE by not overwriting that bit of the stylesheet
...
Fixes: https://launchpad.net/bugs/1314469
2014-11-24 21:43:34 +02:00
Tim Bentley
f4ff654a65
If invlaid bible name stop searching
...
Fixes: https://launchpad.net/bugs/1290246
2014-11-22 20:26:59 +00:00
Tim Bentley
22a4974d86
Comments
2014-11-22 07:07:08 +00:00
Tim Bentley
4fb0e43c04
New start old bugs
2014-11-20 06:58:33 +00:00
93706f8d99
Fix for overwriting files on song export + test. Fixes bug 1216232.
...
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.
bzr-revno: 2447
2014-11-19 20:59:27 +00:00
Tomas Groth
c85f49a16c
Added test for openlyrics export of songs with same title and author
2014-11-16 22:44:44 +00:00
Tomas Groth
378132d82f
Moved Settings KeyError handling to the export.
2014-11-13 20:15:43 +00:00
Tomas Groth
9b517cd569
Improved support for verseorder in WA import
2014-11-11 11:38:24 +01:00
Phill Ridout
5cc1fa2261
Fixes a few typos
2014-11-10 20:48:22 +00:00
Tomas Groth
61e42a9782
When querying values from Setting, return None if key does not exists. Fixes bug 1387278
...
Fixes: https://launchpad.net/bugs/1387278
2014-11-10 11:51:03 +01:00
3fa0635d79
Fix Projector Manager dock so View->Lock Panels will lock/unlock the UI features
...
bzr-revno: 2445
2014-11-09 13:20:09 +00:00
Philip Ridout
1ed8100537
Added new ColorButton subclassed from QPushButton to select colours reducing code duplication
...
Added tests for ColorButton
Renamed some methods to take in to account the new signal that ColorButton emits
Fixed some tests for FileDialog
bzr-revno: 2444
2014-11-09 13:18:53 +00:00
Ken Roberts
84f104b7f8
Test for bug 1390702
2014-11-08 18:54:08 -08:00
e9ec5d202c
[bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
...
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
14377f3329
[refactor] Renamed "was_download_cancelled" to "was_cancelled"
...
[refactor] Put some more stuff back into initalise() where it belongs
[refactor] Rewrote old tests, wrote new tests
2014-11-08 23:15:25 +02:00
Ken Roberts
f2cd0a9743
Fix "Discard" and "Reset" button calls, pep8
2014-11-07 14:44:40 -08:00
Ken Roberts
c89b54e4a4
Add basic test for projector.sourceselectform
2014-11-07 14:24:20 -08:00
Tomas Groth
519119aecb
Fixed test to reflect 30 sec timeout in get_web_page
2014-11-07 10:41:37 +01:00
Tomas Groth
48c561e34b
Made the FTW able to handle if the downloaded config file is invalid.
...
Fixes: https://launchpad.net/bugs/1222944
2014-11-07 10:32:45 +01:00
Tomas Groth
ff4ddefa77
pep8 fix
2014-11-06 10:42:54 +01:00
Tomas Groth
02a159bf65
Added one more test file for WoW import
2014-11-05 14:04:43 +01:00
Tomas Groth
77c7da2d20
Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
...
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth
51f4539822
Added test for Word of Worship import
2014-11-03 15:36:27 +01:00
Phill Ridout
985717edb4
HEAD
2014-11-02 18:26:07 +00:00
Phill Ridout
2b710a82ab
Correct tag
2014-11-02 17:41:04 +00:00
Phill Ridout
3218ae8cae
Added 2.1.1 tag
2014-11-02 17:31:06 +00:00
Phill Ridout
b119cc40be
HEAD 2.1.1 release
2014-11-02 17:19:27 +00:00
Phill Ridout
b464b5613c
pep fixes
2014-11-02 17:19:02 +00:00
Phill Ridout
b682117f92
Completed tests for ColorButton
2014-11-02 16:50:18 +00:00
Tim Bentley
616565fe19
Head
2014-11-01 11:12:27 +00:00
b692e11d82
Filter out ampersands and angle brackets
...
bzr-revno: 2437
2014-11-01 11:11:48 +00:00
Tomas Groth
146a505ee6
#1387286 , playing audio CD clips on windows.
...
#1247025 , Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025.
Fix traceback on theme import in windows.
bzr-revno: 2436
2014-11-01 11:09:10 +00:00
Tim Bentley
b20b114a7b
test fix
2014-11-01 11:06:17 +00:00
Tim Bentley
6323f8bba7
Add tests
2014-11-01 10:59:45 +00:00
0e46a05ccc
Apparently pylint doesnt like blank lines at the end of the file. fussy.
...
Fixes: https://launchpad.net/bugs/1387309
2014-10-31 22:15:44 +02:00
ee7fb49e49
Fix some linting issues
2014-10-31 22:12:06 +02:00
6a67a77240
Fix bug #1387309 : Filter out ampersands and angle brackets
2014-10-31 21:47:36 +02:00
Tomas Groth
74b582032f
Fix theme import in windows. Test included.
2014-10-31 13:01:07 +01:00
69873c0db3
Two fixes:
...
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
- Found a potential bug where the settings form was canceled, with one or more inactive plugins
- Wrote a test for the above settings form bug
Fixes: https://launchpad.net/bugs/1386896
2014-10-31 00:53:06 +02:00
Phill Ridout
8c0f480b0e
Start of ColorButton tests
2014-10-29 19:18:01 +00:00
Phill Ridout
3685948ed5
HEAD
2014-10-29 19:11:43 +00:00
Phill Ridout
013e59c527
fixes to FileDialog tests
2014-10-29 19:07:13 +00:00
Ken Roberts
ddd94ba061
Upstream merges
2014-10-28 13:48:20 -07:00
Ken Roberts
6ae179d672
Upstream merges
2014-10-28 13:45:53 -07:00
00455847a7
HEAD
2014-10-28 22:27:09 +02:00
743dc59d51
[fix 1386710] Fix traceback after settings form is saved
...
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
ae7c863333
[fix 1385979] Check if the item is valid first
2014-10-28 21:02:06 +02:00
Tomas Groth
c19613ce82
Various small bugfixes:
...
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574 . Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.
bzr-revno: 2431
Fixes: https://launchpad.net/bugs/1296574
2014-10-28 20:36:54 +02:00
Tomas Groth
11b2b4dc3b
Added test for checking extension list creation
2014-10-27 21:38:19 +00:00
Tim Bentley
afde4a25ad
Fix missing dummy values for debug
2014-10-27 20:22:57 +00:00
b34da371ba
[ fix #1385438 ] Make list widget items select tab pages via user data rather than just their position.
...
Fixes: https://launchpad.net/bugs/1385438
2014-10-25 22:26:19 +02:00
Ken Roberts
e8e6410d45
Fix test suite change
2014-10-24 12:17:12 -07:00
Ken Roberts
f81903bbcf
Merge upstream
2014-10-23 15:16:38 -07:00
3771cb42a8
HEAD
2014-10-22 22:47:47 +02:00
76f4b6e3ad
Forgot to add test file
2014-10-22 22:44:05 +02:00
551a10d311
Added and updated tests:
...
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests
Updated setup.py with some Python3 changes.
2014-10-22 22:43:05 +02:00
Ken Roberts
d08594ab55
Upstream changes
2014-10-21 18:27:01 -07:00
Ken Roberts
b38921a90b
Code cleanups
2014-10-21 14:40:47 -07:00
Tomas Groth
5662f4b2af
Ask the user if a backup of the data folder should be created after upgrading
...
bzr-revno: 2427
2014-10-21 22:08:26 +01:00
Samuel Mehrbrodt
674cf930ef
Update jQuery and jQuery Mobile
...
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth
5ecbfa61fd
Fix tests so they can run individually.
...
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).
bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Tim Bentley
d6dc19ae5e
Correct Version to Mainwindow communications.
...
bzr-revno: 2424
2014-10-21 22:03:31 +01:00
Phill Ridout
07c693c8c8
Changed some of the comments
2014-10-21 21:08:37 +01:00
Tim Bentley
2b3e3d777e
Add Test and fix more code
2014-10-21 21:05:08 +01:00
Ken Roberts
d914deacd2
Fix projector test cleanups
2014-10-21 08:41:09 -07:00
Ken Roberts
81f6214cc5
pep8
2014-10-21 08:21:19 -07:00
Ken Roberts
232f048616
fix call to changed function
2014-10-21 08:17:27 -07:00
Ken Roberts
8fcba0aa65
fix call to changed function
2014-10-21 08:15:20 -07:00
Ken Roberts
ed4605be61
Remove old test db file in case of schema changes
2014-10-21 08:12:43 -07:00
Ken Roberts
f9f4296acf
Missed ProjectorEditForm import for test
2014-10-16 11:25:08 -07:00
Ken Roberts
81e7798c50
Change test from wizard to edit form
2014-10-16 11:22:34 -07:00
Tomas Groth
cbd1b7c223
Changed setting version name
2014-10-14 09:52:59 +02:00
Samuel Mehrbrodt
806bb5973e
Merge trunk
2014-10-13 19:40:12 +02:00
Tomas Groth
5091b3de37
Added a test
2014-10-13 16:08:06 +02:00
Samuel Mehrbrodt
637c0060f9
Add test
2014-10-13 13:38:13 +02:00
Ken Roberts
7545fb534f
Fix changed imports in mockups
2014-10-06 14:19:08 -07:00
Tomas Groth
773a1cef39
Remove non-working test
2014-10-06 21:05:06 +01:00
Phill Ridout
3ea58aa4ca
change line endings
2014-10-06 20:41:29 +01:00
Ken Roberts
0227e0a2bd
Initial projector code
2014-10-06 12:10:03 -07:00
Phill Ridout
ddec0e00cd
Patch changes from botched branch
2014-10-06 19:09:47 +01:00
Tomas Groth
9dbbe9d5be
Fixed console popping up on windows when running mudraw.exe
2014-10-03 11:57:35 +02:00
Tomas Groth
2b9d36702b
Added oxps as supported presentation filetype (by mudraw)
2014-09-29 21:11:07 +01:00
Tomas Groth
a8a7068de8
Added slidecontroller ui test
2014-09-27 20:57:28 +01:00
Tomas Groth
60dc075e3b
pep8 fix
2014-09-25 21:46:09 +01:00
Tomas Groth
9b8b114a59
Fixed the new test.
2014-09-25 21:31:31 +01:00
Tomas Groth
839df08eb7
Another test fix
2014-09-25 17:02:10 +02:00
Tomas Groth
3e66b4aa98
Fix for importing custom tags from openlyricsxml + test in progress
2014-09-25 17:01:11 +02:00
Tomas Groth
977fd1d187
Fix tests so they can run individually.
2014-09-25 16:59:56 +02:00
Tomas Groth
31a868ca61
Moved thumbnail creation to httprouter.py
2014-09-23 22:45:42 +01:00
Tomas Groth
78d9da5c26
Fix comments and typos
2014-09-22 22:19:02 +01:00
Tomas Groth
4bacaab205
trunk
2014-09-21 20:23:40 +01:00
Tomas Groth
5dceb1a0e6
Fixes for DVD
...
bzr-revno: 2421
2014-09-17 21:43:53 +01:00
Samuel Mehrbrodt
b24ba5322b
Merge trunk
2014-09-14 15:44:32 +02:00
Samuel Mehrbrodt
e6a6015c21
Fix tests
2014-09-14 15:32:38 +02:00
efe030b020
Update the UI on Mac OS to make it look and feel more like a first-class Mac app.
...
* Removed the icons from the menus (thanks to Jonathan S. for that)
* Use Mac OS X wizards instead of our Windows-style wizards when on OS X
bzr-revno: 2419
2014-09-14 15:07:31 +02:00
Samuel Mehrbrodt
aef7bb55c4
Add test
2014-09-14 00:00:43 +02:00
Tomas Groth
489f2266b2
Fix test for windows
2014-09-10 10:54:03 +02:00
Tomas Groth
74391978e8
pep8 fix
2014-09-10 10:07:10 +02:00
Tomas Groth
2e0c3e24f7
Changed thememanager test so it doesn't make the zipfile module unuseable.
2014-09-10 10:05:45 +02:00
Tomas Groth
d767990280
Adjusted tests
2014-09-10 09:34:38 +02:00
Tomas Groth
3769a01682
Small fixes
2014-09-08 22:48:49 +01:00
Tomas Groth
dab4ad7080
trunk
2014-09-08 22:08:49 +01:00
Tomas Groth
98c41ae586
Mock device detection during test.
2014-09-08 21:58:42 +01:00
Tomas Groth
79ef9315d5
Added a test
2014-09-08 21:49:33 +01:00
bf488da516
Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm.
2014-09-08 00:17:20 +02:00
Tomas Groth
98d5ed7acf
Fix the OSIS bible importer
...
bzr-revno: 2418
2014-09-06 07:44:08 +01:00
Tomas Groth
df28a6799b
trunk
2014-09-02 21:17:56 +01:00
Tomas Groth
a2710553d9
Implemented a workaround for bug1251437 / http://bugs.python.org/issue22248
...
The problem is the urllib.request.urlopen cannot handle redirect urls with non-ascii chars, so I've added url-encoding of the redirect url.
bzr-revno: 2416
2014-08-29 17:37:25 +01:00
Jonathan Springer
f3207dac8e
Consolidate platform specific checks into the common module
2014-08-27 19:18:06 -04:00
Tomas Groth
7fecaa1d70
Added language detection when importing
...
Fixes: https://launchpad.net/bugs/1214875
2014-08-27 15:10:33 +02:00
Tomas Groth
1adeb175ae
trunk
2014-08-27 10:44:04 +02:00
Tomas Groth
62811d660f
Implemented a workaround for bug1251437
...
Fixes: https://launchpad.net/bugs/1251437
2014-08-27 10:43:18 +02:00
Tomas Groth
36326085f8
trunk
2014-08-26 22:19:08 +01:00
Tomas Groth
11a19fbd32
Merged Raouls GUI changes
2014-08-26 22:11:29 +01:00
Phill Ridout
9ca8be20fb
HEAD
2014-08-26 17:09:28 +01:00
Tomas Groth
c50619212d
trunk
2014-08-25 21:34:54 +01:00
Tomas Groth
359a209341
Fixed copy/paste error.
2014-08-25 21:31:35 +01:00
Tomas Groth
a48589752f
Moved thumbnail setting into the main settingstab.
2014-08-25 21:04:33 +01:00
Tomas Groth
71a1b26e1c
Changed test desciption.
2014-08-24 16:14:29 +01:00
Tomas Groth
3101d72b48
Rewrote OSIS import, added tests.
2014-08-24 15:40:45 +01:00
Tomas Groth
43d3823bfb
trunk
2014-08-24 15:38:17 +01:00
Tomas Groth
254acf4601
trunk
2014-08-24 15:37:51 +01:00
Tim Bentley
2f8d8f912e
Fix conversion error and add tests for service manager context menu
...
bzr-revno: 2412
2014-08-24 15:37:47 +01:00
Samuel Mehrbrodt
c1d82bdf54
Merge trunk
2014-08-24 13:34:14 +02:00
Tim Bentley
565c2312d0
head
2014-08-24 10:37:49 +01:00
Tim Bentley
09bb622af8
Final tests
2014-08-24 10:32:26 +01:00
Tim Bentley
516fd30bc7
fix conversion bug
2014-08-23 21:42:10 +01:00
Phill Ridout
a2a4e6c4c7
HEAD
2014-08-22 17:26:46 +01:00
Tomas Groth
fd4dc4caf7
Fixed another windows test by properly constructing paths.
2014-08-21 15:07:02 +02:00
Tomas Groth
3a1fda85d5
Fixed windows test failure by removing special char from filenames
2014-08-21 14:51:34 +02:00
Tomas Groth
49fca807f4
deleted file leftover from merge
2014-08-21 14:41:46 +02:00
Tomas Groth
3b092319c9
trunk
2014-08-21 11:24:40 +02:00
86291d0c41
Round 1 of media clip dialog refresh
2014-08-21 01:35:24 +02:00
Samuel Mehrbrodt
bde55c79f8
No newline at end of file...
2014-08-18 21:15:23 +02:00
Samuel Mehrbrodt
0bf256070a
Add test
2014-08-18 21:04:46 +02:00
Tomas Groth
db477f8d9c
trunk
2014-08-04 18:12:03 +01:00
Stewart Becker
04bafa62fa
Added an option to wrap footer text
...
bzr-revno: 2409
2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt
16399e2ea5
This prevents updates from running (which should only run on outdated databases that existed before)
...
bzr-revno: 2408
2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt
82b3c00863
Add importer for PresentationManager
...
bzr-revno: 2407
2014-08-04 06:01:41 +01:00
Samuel Mehrbrodt
933ec66efc
Fix theme export and add unit test.
...
bzr-revno: 2406
2014-08-04 06:00:34 +01:00
Stewart Becker
2f984c45c4
Style fixes for Tim
2014-07-24 22:57:16 +01:00
Stewart Becker
d90fcface2
Style fixes for Tim
2014-07-24 20:28:57 +01:00
Stewart Becker
668864c38d
Tidy up tests and formatting
2014-07-22 21:06:48 +01:00
Stewart Becker
9a1ce000b7
Patch Registry.execute so that it is undoen at end of test
2014-07-21 22:45:27 +01:00
Stewart Becker
2555bc50d4
Add test for wrap footer setting
2014-07-21 18:13:20 +01:00
Phill Ridout
6a09b727b5
HEAD
2014-07-20 21:17:50 +01:00
Phill Ridout
67ab508286
Tweeked test to use a call list
2014-07-20 21:00:06 +01:00
Samuel Mehrbrodt
fa5787e5d8
Add test
2014-07-17 23:16:00 +02:00
Tomas Groth
a0b7c72e09
Changed Image dimension-key into width and height + a bunch of small changes
2014-07-15 20:52:59 +02:00
Tomas Groth
00693b8cce
trunk
2014-07-15 15:41:34 +02:00
Tomas Groth
b6cd13fc91
pep8 fixes
2014-07-15 12:02:56 +02:00
Tomas Groth
e1c00f9689
Fix tests for pptview - again
2014-07-15 11:50:52 +02:00
Tomas Groth
0a018a59fb
Fix tests for pptview
2014-07-15 11:45:23 +02:00
Tomas Groth
9853b21170
Added test.ppt needed for tests
2014-07-15 11:28:50 +02:00
Tomas Groth
597e06153c
Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes
2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt
d5a3651c95
Merge trunk
2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt
b2afbd688d
Add an importer for PowerPraise
...
bzr-revno: 2404
2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt
6c40962afb
Allow editing of author types and fix bug in servicemanager
...
bzr-revno: 2403
2014-07-14 17:25:59 +01:00
Tomas Groth
88fc41a5eb
Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py
2014-07-14 16:15:08 +02:00
Tomas Groth
29f8eedeaf
Merged with trunk and reverted changes to the tag test
2014-07-14 09:19:47 +02:00
Tomas Groth
022ac9bfac
trunk
2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt
af64bece26
Improve Song Copyright
...
bzr-revno: 2402
2014-07-13 21:57:05 +01:00
a670724ebe
Fix tags test to work with cross repo flags
...
bzr-revno: 2401
2014-07-13 21:56:02 +01:00
563fb794b5
Added an explanatory comment
2014-07-13 21:21:50 +02:00
63350ab6eb
Try to ignore the 2.0.x line of tags
2014-07-13 15:10:58 +02:00
ba9ff89354
[fix] PEP8 error: no whitespace
2014-07-13 13:04:37 +02:00
f2d3bbee47
Added the name of the current item to the service controller, and added some more tests
2014-07-13 01:47:53 +02:00
Samuel Mehrbrodt
79c5d61d94
Negative test
2014-07-12 22:00:58 +02:00
Tomas Groth
3edabb268e
removed websockets
2014-07-11 22:35:23 +02:00
Samuel Mehrbrodt
53cb11e03e
EOF; verse order fixed
2014-07-11 16:19:53 +02:00
Tomas Groth
98a58d45bf
pep8 fixes
2014-07-11 15:35:44 +02:00
Tomas Groth
52f298fdc1
change to unix style lineending
2014-07-11 14:54:00 +02:00
Tomas Groth
9d64837602
fixed image test
2014-07-11 14:43:40 +02:00
Tomas Groth
4920f86351
removed leftover file from merge
2014-07-11 14:21:49 +02:00
Tomas Groth
406cc506c1
Merged with trunk and fixed tests
2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt
7f731146a3
Merge trunk
2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt
79009a1a7f
Add test
2014-07-09 14:41:55 +02:00
Tomas Groth
fdded5adc2
Fix tag tests
2014-07-07 19:28:27 +02:00
Tomas Groth
e0c8709ad1
trunk
2014-07-07 19:24:23 +02:00
Tomas Groth
e6f5136708
Suggested changes to tests
2014-07-07 19:22:58 +02:00
Samuel Mehrbrodt
b211ddd99c
Merge trunk
2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt
2296be7418
Merge trunk
2014-07-07 18:16:32 +02:00
Tomas Groth
695079dd00
Improve powerpoint error handling.
...
bzr-revno: 2399
2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt
520c251923
Cleanup: Move song import plugins into subfolder
...
bzr-revno: 2398
2014-07-07 17:08:32 +01:00
Tim Bentley
2770c76895
Fix setup.py for python3 to remove binary strings.
...
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.
bzr-revno: 2397
2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt
b7a141f75c
Add Presentation Manager import
...
Fixes: https://launchpad.net/bugs/957017
2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt
8e8288ddaa
Add test
2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt
cfd9631d04
Parse verse names
2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt
0fb445e117
PEP8
2014-07-04 11:36:54 +02:00
Samuel Mehrbrodt
686f8d2437
More renaming
2014-07-04 11:31:06 +02:00
Tomas Groth
33e104d57d
Tried to fix some linux vs windows issues. Also added a test.
2014-07-04 10:45:17 +02:00
Samuel Mehrbrodt
953adf7145
A blank line!
2014-07-04 10:35:24 +02:00
Samuel Mehrbrodt
87eb8804de
Fixes
2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt
7112356c21
Parse verse order
2014-07-03 23:48:52 +02:00
Samuel Mehrbrodt
9f34552364
PowerPraise importer
...
Fixes: https://launchpad.net/bugs/1336929
2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt
c9b47e8e6f
PEP8
2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt
3b7d5f53ba
PEP8
2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt
d59be6ca82
Move song import plugins to subfolder
2014-07-03 18:54:51 +02:00
Tomas Groth
79c7c58398
Added test for powerpointcontroller
2014-07-03 13:21:12 +02:00
Tim Bentley
12c8663f8e
indent
2014-07-02 20:52:26 +01:00
Tim Bentley
6847ee2e37
remove bl
2014-07-02 20:47:54 +01:00
Tomas Groth
376f8f3dc7
Added test for thememanager
2014-07-02 21:18:18 +02:00
Tim Bentley
f71c4cc7af
remove nonvalid test
2014-07-02 19:58:52 +01:00
Tim Bentley
4ac921a2e7
tests
2014-07-02 19:38:10 +01:00
Phill Ridout
05f4f2d72e
fixed tests
2014-06-30 21:54:11 +01:00
Samuel Mehrbrodt
b4be73b616
Fix bzr tags test
2014-06-26 11:21:46 +02:00
Samuel Mehrbrodt
c638834023
Add missing files
2014-06-26 09:59:16 +02:00
Samuel Mehrbrodt
66827a7676
Parse verse order
2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt
93c3a57ea9
Add missing files
2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt
c3e9d0c5b3
Add test
2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt
aa0e1ca107
Add test
2014-06-23 15:51:56 +02:00
Tomas Groth
44eccb8360
trunk
2014-06-16 09:01:12 +02:00
Tomas Groth
346c9e475a
updated test
2014-06-15 21:33:05 +02:00
Samuel Mehrbrodt
d61111ab89
Add proper error messages to EasyWorship import.
...
Also make sure that Songs.db (lowercase ending) is also being recognized.
bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt
340857cecc
Detect languages in source code folder when running from source
...
bzr-revno: 2393
2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt
95b816c843
ProPresenter Import
...
bzr-revno: 2392
2014-06-11 06:08:10 +01:00
Andreas Preikschat
2791b37525
pep fixes
2014-06-10 11:48:42 +02:00
Andreas Preikschat
3235c334eb
sorted imports
2014-06-10 11:42:11 +02:00
Andreas Preikschat
837d95ae41
added a test case
2014-06-10 11:39:24 +02:00
Andreas Preikschat
6d0ee83de1
moved tests
2014-06-10 11:24:50 +02:00
Samuel Mehrbrodt
543f4f37dd
Add test for ProPresenter Import
2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt
b2e4c6f99f
Add test for missing songs.mb
2014-06-09 09:55:48 +02:00
Tomas Groth
d832933110
Small fix for locating mudraw on windows and mac.
...
Enabled presentation plugin on mac and adjusted test accordingly.
bzr-revno: 2390
2014-06-08 21:25:32 +01:00
Tim Bentley
8d67406728
Fix a validation bug with presentations being loaded from services
...
Fix range bug stopping service items being triggered unless it was the first!
bzr-revno: 2389
2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt
08e41672cb
Better name for test
2014-06-08 16:27:03 +02:00
Samuel Mehrbrodt
5c90d7847e
Merge trunk
2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt
007e18945e
Various string fixes and other tidying up
...
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils
bzr-revno: 2388
2014-06-08 16:12:23 +02:00
Tim Bentley
567b3f4b57
Fix up description
2014-06-05 17:32:29 +01:00
Tim Bentley
f23e603314
Fix up interface better
2014-06-05 17:25:37 +01:00
Tim Bentley
2e82d92ebc
Head
2014-06-04 05:55:28 +01:00
Stewart Becker
ed295d38dd
Fixed a typo: load_Last_file -> load_last_file
...
Added tests for OpenSongImport and fixed some PEP8 issues.
bzr-revno: 2387
2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt
a6a43264da
Merge trunk
2014-06-03 21:23:21 +02:00
Samuel Mehrbrodt
9f5895dd82
Song duplicates added when using different author types for the same author
...
bzr-revno: 2386
2014-06-03 17:20:46 +01:00
Tim Bentley
7bea1ea7de
fix pep
2014-05-31 21:10:59 +01:00
Tim Bentley
983db7b0f0
fix pep
2014-05-31 21:07:46 +01:00
Tim Bentley
82f97ee736
Fix suffix error in presentation
2014-05-31 21:00:10 +01:00
Tomas Groth
13cc26f26a
Support for importing Zefania bible XML format
...
bzr-revno: 2385
2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt
50c2c9bc0e
Fix bug 1316979 by changing the 'authors' relation to readonly.
...
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt
0441f0e71b
Better description
2014-05-30 19:59:11 +02:00
Tomas Groth
d424270b7f
Fixed locating mudraw on windows and mac, and enabled presentationplugin on mac.
2014-05-30 11:21:26 +02:00
Samuel Mehrbrodt
873f18ad65
Add test
2014-05-22 15:48:57 +02:00
Samuel Mehrbrodt
dd9d535f81
Split test in two methods
2014-05-21 21:55:16 +02:00
Tomas Groth
d9c6e2a228
trunk
2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt
854149408f
Add test
2014-05-21 17:31:25 +02:00
Samuel Mehrbrodt
5cd2f7ebff
Remove tests
2014-05-21 17:31:02 +02:00
Samuel Mehrbrodt
4fadbef196
PEP8
2014-05-21 17:22:13 +02:00
Samuel Mehrbrodt
2462fcf06e
Remove test
2014-05-21 17:18:04 +02:00
Samuel Mehrbrodt
d1814f05de
Add test
2014-05-21 17:17:08 +02:00
Tomas Groth
7ed56225f2
trunk
2014-05-21 11:31:47 +02:00
Tomas Groth
c0b167ca78
Added tests for import of OpenSong bible format
2014-05-21 11:30:36 +02:00
Tomas Groth
4039cf1103
More tests
2014-05-20 23:54:18 +02:00
Tomas Groth
58179f8d83
Tests
2014-05-20 20:41:07 +02:00
Tomas Groth
37f04c5199
Added simple tests.
2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt
d6afa49055
Test fixes
2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt
a75790d699
Indentation
2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt
1804b690bd
Merge trunk
2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt
35e23456fe
merge trunk
2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt
97b603a2d6
Add test for author matching
2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt
b7b0176dec
Cleanups
2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt
a1e2e92132
PEP8
2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt
6eb2d4f49d
Write test for adding and removing authors
2014-05-13 11:08:46 +02:00
Jonathan Springer
1cd9fff9bd
Change how we define which menu items are included in the main menu on Mac OS
...
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified
bzr-revno: 2382
2014-05-11 05:45:30 +01:00
Tim Bentley
ec7a7b74fe
test
2014-05-10 08:38:38 +01:00
Samuel Mehrbrodt
9dd9f21135
Add an option to display the songbook in the footer
...
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt
8592551d81
Fix SongShowPlus Import when CCLI number contains text
...
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth
45344f900d
Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
...
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Jonathan Springer
13b9a7de72
Add test for the main window function set_service_modified
2014-05-08 10:57:26 -04:00
Jonathan Springer
6d277ef78d
Merge trunk
2014-05-07 19:52:51 -04:00
Tim Bentley
c6d6be30c6
fix
2014-05-07 21:38:34 +01:00
Tim Bentley
dbf2330896
head
2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt
9467b06e14
Merge trunk
2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt
f3a86d87d4
Merge trunk
2014-05-07 22:30:52 +02:00
Stefan Strasser
fb2381f11a
fixed bug #1312629 Error on entering invalid character in verse-order
...
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Tim Bentley
1e6f00c2eb
Add test
2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt
cca1ce57f3
Add test
2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt
3d1cb3f383
Add test
2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt
ee7a8b9804
Fixes
2014-05-07 12:25:36 +02:00
Tomas Groth
c7ce62bd43
Changed to ignore wrongly formatted songs.
2014-05-05 19:29:57 +02:00
Tim Bentley
f21d3cfa83
fix tests
2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt
37653bfd13
Add missing tag to test
2014-05-03 17:34:13 +02:00
Samuel Mehrbrodt
f60379b542
Add new test
2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt
b02fc541a3
Reorganize tests
2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt
922bbc3b57
Typo, remove annotations
2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt
a98ea19306
Add test for songbook display
2014-05-03 12:42:18 +02:00
Samuel Mehrbrodt
e8c7547ab2
Try to get ccli number even if there is text in the field
2014-05-03 10:47:31 +02:00
Tomas Groth
689700dd01
fixes for tests
2014-05-02 23:48:59 +02:00
Tomas Groth
5d63820b17
Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
...
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Samuel Mehrbrodt
b993af2e90
No newline at end of file...
2014-05-02 10:04:11 +02:00
Andreas Preikschat
deff310f53
removed u'
2014-05-02 08:42:17 +02:00
Andreas Preikschat
2ba7fa4f44
head
2014-05-01 18:58:32 +02:00
Andreas Preikschat
3f75a913e2
removed not working tests
2014-05-01 18:57:45 +02:00
Samuel Mehrbrodt
bdf3109aaa
Fix SongShowPlus Import for certain cases
...
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker
eb64c136d0
Deal with empty ccli tag in OpenSong imports
2014-04-30 21:50:57 +01:00
Stewart Becker
a56f00ddc0
Merge from parent
2014-04-30 21:40:33 +01:00
Stewart Becker
4022cff5e5
Fix some issues I ran into when importing our OpenSong 'database'
2014-04-30 21:39:40 +01:00
Andreas Preikschat
0160c583e9
Fix Renderer broken when two option breaks next to each other
...
bzr-revno: 2374
2014-04-29 17:57:07 +01:00
Andreas Preikschat
ff1bc31bfc
- Fixed bug #1240037
...
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts
bzr-revno: 2373
2014-04-29 17:55:30 +01:00
Tomas Groth
cc0f0e1eb0
Support for importing ews files (EasyWorship Service files)
...
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Andreas Preikschat
b73d8b088c
head
2014-04-29 13:04:32 +02:00
Tomas Groth
48fe8c5e37
Restructured the tests a bit.
2014-04-26 21:47:11 +02:00
Andreas Preikschat
911864a442
removed useless code
2014-04-26 19:31:59 +02:00
Andreas Preikschat
53c584ede4
removed print
2014-04-26 11:26:20 +02:00
Andreas Preikschat
533710fc5b
blank line
2014-04-26 11:02:04 +02:00
Andreas Preikschat
6bdadff334
raise exception when item not in list
2014-04-26 11:01:12 +02:00
Andreas Preikschat
aa899bfde0
fixes
2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt
20f748d608
Allow authors to be tagged by their type (words music etc)
...
bzr-revno: 2371
2014-04-26 09:42:26 +01:00
Tim Bentley
9e8f0d82de
Add icons to see the state of the remote (on / SSL / authentication)
...
Stop restarting the server as this crashes it and should not be common.
bzr-revno: 2370
2014-04-26 09:38:44 +01:00
Andreas Preikschat
5a2793bc50
head
2014-04-26 10:19:12 +02:00
Stefan Strasser
c2d1589dcb
fixed a pep-issue in songs-lib and corrected a comment in a test
2014-04-26 07:07:08 +02:00
Stefan Strasser
1cd7d73d10
fixed bug #1312629 Error on entering invalid character in verse-order
...
Fixes: https://launchpad.net/bugs/1312629
2014-04-25 22:04:43 +02:00
Tomas Groth
bc29a01eb5
head
2014-04-23 21:30:12 +02:00
Stewart Becker
04d5a40542
Fix PEP8 issues
2014-04-22 22:48:48 +01:00
Stewart Becker
6d63a008f0
Merged in from trunk
2014-04-22 22:46:21 +01:00
Stewart Becker
d39e1fd4a2
Added comments to OepnSong files and stricter line-break tests
2014-04-22 22:43:12 +01:00
Tomas Groth
074ab4b1bb
Head
2014-04-22 22:18:58 +02:00
Tomas Groth
7980231273
Skip tests on windows.
2014-04-22 22:13:36 +02:00
Andreas Preikschat
5a3aecf997
fixed bugs in class
2014-04-22 17:06:21 +02:00
Andreas Preikschat
1ae7c32adb
fixed import
2014-04-22 12:32:02 +02:00
Andreas Preikschat
70bce87434
head
2014-04-22 12:30:43 +02:00
Andreas Preikschat
6c08a80bfd
added test; refactor
2014-04-22 12:29:15 +02:00
Stewart Becker
7deeefafb4
Remove call used only for debugging
2014-04-21 19:52:42 +01:00
Stewart Becker
9a05c7603a
Fixed apostrophe format
2014-04-21 19:42:54 +01:00
Stewart Becker
3e1ed273be
Show calls to add_verse for debugging
2014-04-21 19:20:06 +01:00
Stewart Becker
57abcf9b40
Remebered to add the tests this time
2014-04-21 18:23:00 +01:00
Stewart Becker
e6162e033f
Add tests for OpenSongImport, and fixes so that they pass
2014-04-21 16:49:41 +01:00
Jonathan Springer
05171453ea
merge trunk
2014-04-21 10:46:54 -04:00
Samuel Mehrbrodt
cc0af8845e
PEP8
2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt
031868ae31
trunk
2014-04-21 11:49:17 +02:00
dee8ed2850
Fix an exception raised when loading media players if the configuration is blank
2014-04-21 00:23:26 +02:00
Andreas Preikschat
328b25dbe8
fix: Bug #1146964 Attach button on exception form does not work
...
bzr-revno: 2368
2014-04-20 22:51:11 +02:00
Jonathan Springer
c8d0efe2ea
merge trunk
2014-04-20 16:19:41 -04:00
Tim Bentley
f7ba5ee0e3
head
2014-04-20 21:19:21 +01:00
Samuel Mehrbrodt
cec163085c
Fix bug 1247493: OpenSong Importer fails
...
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
2014-04-20 21:15:21 +01:00
Tomas Groth
4560d39ad9
head
2014-04-20 20:33:55 +02:00
Tomas Groth
a999e59a4f
Fixes for merge
2014-04-20 16:36:56 +02:00
Samuel Mehrbrodt
4253cd4f52
Fix Songbook search
...
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
2014-04-20 16:32:28 +02:00
Andreas Preikschat
79d3e95c32
pep8 fixes
2014-04-20 16:13:09 +02:00
Andreas Preikschat
85c2179102
added test
2014-04-20 16:03:07 +02:00
Tomas Groth
f6231e024a
Head
2014-04-20 15:57:12 +02:00
Andreas Preikschat
c691fc55d0
added a test
2014-04-20 15:00:14 +02:00
Tim Bentley
a2c99317c6
fixes
2014-04-19 06:42:45 +01:00
Tim Bentley
f48a3346db
fixes
2014-04-19 06:29:00 +01:00
Tim Bentley
af792941af
pep8 again
2014-04-19 06:13:46 +01:00
Tim Bentley
5dc35112c3
pep8 again
2014-04-19 06:09:54 +01:00
Samuel Mehrbrodt
9460b39a01
Remove utf8 file
2014-04-17 17:00:28 +02:00
Samuel Mehrbrodt
d3443d12c2
Remove one test for now
2014-04-17 16:32:56 +02:00
Jonathan Springer
ef5b1cf4ac
Revert PEP8 clean ups as they were already done in a different branch
2014-04-16 17:19:22 -04:00
Samuel Mehrbrodt
5f86811f82
Fix tests
2014-04-16 23:01:57 +02:00
Jonathan Springer
b6e0aa6c2e
PEP8 clean up in tests
2014-04-16 16:44:22 -04:00
Samuel Mehrbrodt
9010e05430
add new openlyrics file
2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt
2c6da0603b
Fix tests
2014-04-16 22:33:06 +02:00
Jonathan Springer
f7a23737f2
merge trunk
2014-04-16 16:26:24 -04:00
Samuel Mehrbrodt
dd4e2c8d61
More PEP8
2014-04-16 21:59:34 +02:00
Samuel Mehrbrodt
bb1af7ed00
PEP8
2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt
aa5a86fba9
Trunk
2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt
d65d1c016c
Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
...
bzr-revno: 2365
2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt
5929b02586
Test: Songbeamer Authors import
2014-04-16 10:25:17 +02:00
Jonathan Springer
cebec89556
merge trunk
2014-04-16 04:00:19 -04:00
Jonathan Springer
ebc4476fdd
Fixes first time wizard to use url and paths in web config file
...
Fixes PEP8 error in servicemanager
Add tests for first time form
bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt
c20939215a
PDF Fixes
...
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.
bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt
49773de4f6
Fix transparent theme on OS X
...
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests
bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Andreas Preikschat
cb29c78bb0
Print repository name and revision number when using script (especially the revno is interesting for devs)
...
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names
bzr-revno: 2361
2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt
be4a654298
More tests
2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt
30ceaea2b2
Trunk
2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt
cd06c994d8
fixed: replacing background with video unblank screen even if it blanked to theme
...
bzr-revno: 2360
2014-04-15 23:00:41 +02:00
Jonathan Springer
90ddde07d4
Fix bzr tag test to handle being run from a different directory
...
bzr-revno: 2359
2014-04-15 22:55:21 +02:00
Samuel Mehrbrodt
5c20fbba22
Trunk
2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt
e1a9a36ea3
Trunk
2014-04-15 22:53:47 +02:00
Stefan Strasser
db955cbf96
Some enhancements for songbeamer-import
...
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Jonathan Springer
721bcc20e2
Reorder imports
2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt
8c18659adb
Update verse order when verse names change (OpenLyrics Import)
...
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Andreas Preikschat
dbd6d74c8d
removed not wanted code
2014-04-15 22:30:20 +02:00
Andreas Preikschat
5090a014ae
use self.assert and friends
2014-04-15 22:27:32 +02:00
Jonathan Springer
87e1c5d986
Add tests for First Time Wizards web config file
2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt
71a972b711
Trunk
2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt
4b76bfc615
Trunk
2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt
4640b1b2d9
Trunk
2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
82dbb7d219
Trunk
2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt
ccc138413e
Trunk
2014-04-15 10:15:07 +02:00
Stefan Strasser
5e1a7ce767
replaced all occurrences of the deprecated alias assertEquals() with assertEqual()
2014-04-15 07:28:51 +02:00
Jonathan Springer
6c86c9768d
Fix typo
2014-04-14 16:01:13 -04:00
Samuel Mehrbrodt
e7af43af4a
Trunk
2014-04-14 21:46:02 +02:00
Jonathan Springer
97ecc3442f
Fix bzt tag test to handle being run from a different directory
2014-04-14 15:45:41 -04:00
Samuel Mehrbrodt
e7edaf170f
Merge trunk
2014-04-14 21:44:35 +02:00
Andreas Preikschat
0c2112091d
fixed spelling
2014-04-14 21:36:07 +02:00
Andreas Preikschat
8cc3f3b968
head
2014-04-14 21:02:19 +02:00
Andreas Preikschat
2c8d163b09
fixed assertion message
2014-04-14 20:59:28 +02:00
Andreas Preikschat
877fd135d3
head
2014-04-14 20:53:33 +02:00
Stefan Strasser
4a4f8c060b
Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias)
2014-04-14 20:33:34 +02:00
ff5279d21c
Cleaned up the UI of the tabs on the "Library" toolbox.
...
Added a test.
Fixed up PEP8 so that code analysis passes.
bzr-revno: 2354
2014-04-14 19:28:04 +01:00
Jonathan Springer
861f7a8722
Add test to check for proper tags on the current branch.
...
bzr-revno: 2353
2014-04-14 19:20:48 +01:00
Stefan Strasser
0293815135
Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur
2014-04-13 19:08:38 +02:00
Samuel Mehrbrodt
758a80a4aa
Trunk
2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt
e0a85a668b
Leading whitespace
2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt
f3a8c45bd2
Merge trunk
2014-04-13 12:42:57 +02:00
Andreas Preikschat
4f38ae2809
head
2014-04-13 09:36:42 +02:00
Dmitriy Marmyshev
3cf9094e5f
Added ability to rename items in ServiceManager.
...
bzr-revno: 2352
2014-04-12 23:26:09 +02:00
b9ba2c68a6
Fix up PEP8 issues.
2014-04-12 22:19:22 +02:00
672eed037c
HEAD
2014-04-12 21:48:15 +02:00
Andreas Preikschat
487f4279dd
fixed blank line
2014-04-12 19:11:32 +02:00
Andreas Preikschat
321fed97e9
more output for the jenkins script
2014-04-12 18:52:29 +02:00
Andreas Preikschat
2c93a5840b
head
2014-04-12 18:05:27 +02:00
Jonathan Springer
991eb6d004
Fix debug messages (bug #1170231 )
...
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer
4cb71cb5e3
Remove orphaned and unused registry execute, and fix two functions to register to the registry
...
instead of executing.
Modify loading file from the command line to only load files ending with osz, or oszl.
Fix argument to pass correct type.
bzr-revno: 2350
2014-04-12 16:40:07 +02:00
Andreas Preikschat
d16d8066ad
- updated vlc.py
...
bzr-revno: 2349
2014-04-12 16:37:38 +02:00
Jonathan Springer
307f46921c
Merge trunk
2014-04-10 20:29:22 -04:00
Samuel Mehrbrodt
93cd8269f8
Test case
2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt
9da5d290cb
Typo
2014-04-10 18:18:25 +02:00
Samuel Mehrbrodt
32f6005c98
Test for OpenLyrics Importer
2014-04-10 09:50:30 +02:00
Tomas Groth
f16a781309
Changed the clipselector gui a bit.
2014-04-09 22:24:19 +02:00
Samuel Mehrbrodt
ed250c400d
Test
2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt
31649b0a8e
Better test
2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt
11884adbed
Disable two tests for the moment
2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt
bfc086749b
Test
2014-04-08 23:03:04 +02:00
Jonathan Springer
25c3503397
Add test to check for proper handling of service files passed in through the command line.
2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt
e0c6381762
Fix test
2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt
5b3a58d1d6
Add newline
2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt
129f726d4c
Rename method
2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt
791fdba019
Fix test
2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt
1bf1e79e27
Merge trunk
2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt
1759c72f36
Test
2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt
2b8586bf99
Test
2014-04-08 13:19:12 +02:00
Samuel Mehrbrodt
b0d3b54f53
Trunk
2014-04-08 11:17:55 +02:00
Tomas Groth
aefef04d97
Small fixes. Added checks of start/end times.
2014-04-07 23:08:48 +02:00
Jonathan Springer
d3526c6204
Simplify code per Andreas Preikschat's comment.
2014-04-07 13:22:12 -04:00
Samuel Mehrbrodt
d1ab85d2fc
Trunk
2014-04-07 15:51:49 +02:00
Jonathan Springer
e19ab7a2c3
Merge trunk
2014-04-06 22:48:24 -04:00
Jonathan Springer
c751a208f9
Change back to using a white list.
2014-04-06 22:47:41 -04:00
Tomas Groth
bc2d45fc30
Head
2014-04-05 15:27:53 +02:00
Tomas Groth
43f18ee2c9
Added some tests.
2014-04-05 09:46:35 +02:00
Tomas Groth
7dc1b8b759
PEP8 fixes
2014-04-05 09:22:24 +02:00
Tomas Groth
648e0b2290
head
2014-04-05 09:06:30 +02:00
8b2c2f9eef
fixed a test
2014-04-04 23:12:44 +02:00
5b69472bc2
HEAD
2014-04-04 22:31:55 +02:00
Tomas Groth
232ff2b73f
Some cleanup and comments
2014-04-04 22:28:55 +02:00
d1b867988d
missed the test somehow
2014-04-04 22:25:49 +02:00
Tim Bentley
8813490bad
fix tests
2014-04-04 21:24:11 +01:00
Tim Bentley
edb38d1255
head
2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f
Fixed wrong dll load path.
...
bzr-revno: 2347
2014-04-04 21:22:12 +01:00
Tomas Groth
7be9613bf0
Head
2014-04-04 19:57:28 +02:00
Tomas Groth
5c405050f1
Added test for ews import.
2014-04-04 19:57:03 +02:00
Tomas Groth
7ef62293f3
Added test
2014-04-03 22:22:10 +02:00
Tim Bentley
151f1017c5
finished
2014-04-02 20:35:09 +01:00
Tim Bentley
806ce25296
head
2014-04-02 19:51:36 +01:00
Tim Bentley
c38c576f94
test fixes
2014-04-02 19:51:21 +01:00
Andreas Preikschat
2a9c85c2a2
fixed a spelling mistake
...
bzr-revno: 2346
2014-04-02 19:51:06 +01:00
Samuel Mehrbrodt
eece90b2ec
Merge trunk
2014-04-02 09:04:27 +02:00
73941ca56f
Renamed a test case and added a test for the trace_error_handler() method.
2014-04-02 01:49:58 +02:00
Andreas Preikschat
5bc5678078
- added a script to trigger jenkins
...
bzr-revno: 2345
2014-03-31 22:05:42 +02:00
Samuel Mehrbrodt
a7dc47e80f
Test
2014-03-31 21:07:54 +02:00
Andreas Preikschat
c451a8eafa
added test
2014-03-31 19:01:09 +02:00
Andreas Preikschat
5f0b40fe30
Moved script
2014-03-31 18:27:26 +02:00
Andreas Preikschat
13c053bc5c
added jenkins script
2014-03-31 18:08:42 +02:00
Andreas Preikschat
08835e80f8
merged from lp:~googol/openlp/vlc
2014-03-31 18:05:37 +02:00
Andreas Preikschat
729edf1d21
pep8 failure test
2014-03-31 17:44:18 +02:00
Andreas Preikschat
4da90f0c6a
comments: updated comments
2014-03-31 17:36:11 +02:00
Andreas Preikschat
3260de7b7c
added another test
2014-03-31 17:31:05 +02:00
Andreas Preikschat
9dd5f30254
be a bit more talky
2014-03-31 17:24:31 +02:00
Andreas Preikschat
3f038ad5c5
break
2014-03-31 17:21:41 +02:00
Andreas Preikschat
b391072e9f
removed test code
2014-03-31 17:20:17 +02:00
Andreas Preikschat
d77c6fe7c0
added renderer test case
2014-03-31 17:17:40 +02:00
Andreas Preikschat
c64723371a
test of ci script
2014-03-31 16:47:43 +02:00
Andreas Preikschat
5a02ab9471
test: splash screen test
2014-03-31 16:07:05 +02:00
Andreas Preikschat
b69f480dc0
head
2014-03-31 14:19:33 +02:00
Tomas Groth
73304d7ec3
Added check to see if given path exists.
2014-03-30 21:32:41 +02:00
Samuel Mehrbrodt
c98970d0e4
Fix mediaitem tests
2014-03-30 20:01:03 +02:00
Tomas Groth
bfbfcd5b15
Head
2014-03-30 13:26:13 +02:00
6ad3fca88e
Try to fix bug #1136278 by detecting if the upgrades have already run
...
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
2014-03-30 13:02:25 +02:00
3e047b3487
Fixes for inheritance in the song importers. This should make the tests pass in Python 3.4.
...
bzr-revno: 2342
2014-03-30 07:54:35 +01:00
Samuel Mehrbrodt
0adf961b3c
Fix missing arguments in event handlers
...
bzr-revno: 2341
2014-03-30 07:51:35 +01:00
98a762e86c
HEAD
2014-03-29 15:58:09 +02:00
e4c3f08a2a
Fix some of the tests which were failing in Python 3.4
2014-03-29 15:31:28 +02:00
Andreas Preikschat
b4bf94a4f0
pep8
2014-03-28 21:41:27 +01:00
Andreas Preikschat
7787e1a845
head
2014-03-28 21:38:38 +01:00
Tomas Groth
19558e7a03
head
2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt
bf32fe164a
Test
2014-03-26 13:06:48 +01:00
Tomas Groth
8ad47cb888
Fixes for windows tests and for starting OpenLP on windows.
2014-03-24 17:49:50 +01:00
Samuel Mehrbrodt
78e7cb5873
Test for add_welcome_page
2014-03-24 14:32:28 +01:00
Andreas Preikschat
fcf4d0ce17
missing line at the end
2014-03-23 11:53:11 +01:00
Andreas Preikschat
7a1825a79a
tests
2014-03-23 11:49:03 +01:00
Andreas Preikschat
91adff326d
head
2014-03-22 20:18:04 +01:00
Andreas Preikschat
11fe2045e5
fixed tests
2014-03-22 10:24:52 +01:00
Tomas Groth
3608ad4fcd
Added first tests for mediaclipselectorform.py
2014-03-20 22:52:53 +01:00
Tomas Groth
852ec00fd7
Head
2014-03-20 21:11:18 +01:00
Tomas Groth
734adbbd5a
Fix import of MagicMock
2014-03-19 19:33:03 +01:00
Tomas Groth
991661b169
Head
2014-03-19 18:49:46 +01:00
35e3564655
Tests!
2014-03-18 23:03:53 +02:00
Tomas Groth
fa4120a4bd
Small test fixes
2014-03-18 21:58:52 +01:00
Tomas Groth
258f1db411
Merged with head.
2014-03-18 20:40:09 +01:00
Tomas Groth
51ea57f35e
Added a test for loading serviceitem with optical media item.
2014-03-17 21:59:58 +01:00
Tim Bentley
22e9d6d1a9
Head
2014-03-17 07:14:51 +00:00
Tim Bentley
86bbc0d66c
Migrate new tests to mixins
2014-03-15 06:29:41 +00:00
Tim Bentley
9cf3428542
Head
2014-03-15 06:25:35 +00:00
Tim Bentley
85111766d5
Migrate tests and add copyright
2014-03-14 22:08:44 +00:00
Tim Bentley
1fa0d58f85
Tests
2014-03-14 20:06:24 +00:00
Tim Bentley
9dd4669f13
test fixes
2014-03-14 17:38:57 +00:00
Tim Bentley
4e834f6d70
Head
2014-03-14 17:37:28 +00:00
Tim Bentley
c2a429c52d
Space
2014-03-14 17:35:00 +00:00
Tim Bentley
d2efa83e89
Head
2014-03-14 17:34:36 +00:00
Jonathan Springer
2b55c1ceb5
Change test to use a black list instead of a white list.
2014-03-13 17:36:01 -04:00
Tomas Groth
df69ff37aa
minor cleanup
2014-03-13 22:16:38 +01:00
Tomas Groth
ed03ec2195
Fixes for tests on wine/windows
2014-03-13 21:59:10 +01:00
Tim Bentley
17f33712db
minor fixes
2014-03-13 20:37:02 +00:00
Tim Bentley
9051692dba
Mixin for tests
2014-03-13 20:34:46 +00:00
Jonathan Springer
84b621301b
Add test to check for the proper tags on the branch
2014-03-13 00:50:45 -04:00
Jonathan Springer
af5e751d27
Merge trunk
2014-03-12 18:15:08 -04:00
Tomas Groth
ecc1ffbd4c
Fix tests.
...
To avoid segfaults reuse QApplication instance.
Also use ICU when getting locale sort key.
bzr-revno: 2331
2014-03-13 00:07:23 +02:00
Jonathan Springer
92e9ef9394
Missed one
2014-03-12 15:05:06 -04:00
Jonathan Springer
6f05711414
Fixes settings initialization in tests to actually use temporary ini file.
2014-03-12 01:31:19 -04:00
Tim Bentley
e78dac1edf
Head
2014-03-11 20:17:18 +00:00
Tim Bentley
ff44daa258
Yet more tests - with file
2014-03-11 20:11:04 +00:00
Tim Bentley
6935adde29
Yet more tests
2014-03-11 20:10:46 +00:00
Tim Bentley
a74567b9f6
Bible database tests
2014-03-11 19:01:09 +00:00
Tomas Groth
2b55da02c1
Reuse QApplication instance to avoid segfaults.
2014-03-10 20:56:36 +01:00