Commit Graph

10387 Commits

Author SHA1 Message Date
Tomas Groth df840d7705 fix backport error 2016-05-10 21:11:14 +02:00
Tomas Groth a34cbab35c Added support for using the new mutool in mudraw mode 2016-05-09 21:44:14 +02:00
Tomas Groth f843236059 Fix crosswalk bible list download 2016-05-09 21:41:23 +02:00
Tomas Groth 2e41c5e6fa Fix traceback if bible list download fails. 2016-05-09 21:40:09 +02:00
Raoul Snyman 4ee29b0e3d Release 2.4.1
bzr-revno: 2630
2016-04-30 21:20:28 +02:00
Raoul Snyman e505950d3f HEAD 2016-04-29 22:15:41 +02:00
Samuel Mehrbrodt 6e901e336c Fix performance regression in songbook search
Fixes: https://launchpad.net/bugs/1552563
2016-04-29 19:39:52 +02:00
Raoul Snyman 79285ce759 Show a message asking the user if they want to remove a file that doesn't exist
Fixes: https://launchpad.net/bugs/1559336
2016-04-28 23:12:50 +02:00
raoul@snyman.info 475ab2af3a "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-2.4 (revision 2625)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1502/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1413/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1147/
[SUCCESS] https://ci.op..."

bzr-revno: 2626
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 23:26:14 +02:00
Raoul Snyman 411953285d Fix bug #1557514 by autodetecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:45:39 +02:00
ian@knightly.xyz 76f8349e34 Adds QR code and links to the remotes settings for the new iOS app and test to HTML Builder.
lp:~knightrider0xd/openlp/ios-app-2.4 (revision 2627)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1500/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1411/
Currently failing Jenkins interface tests due to unrelated bug, but tested & pep8 passing.

bzr-revno: 2625
2016-04-27 18:00:36 +01:00
Tomas Groth 895b3bf9b5 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. 2016-04-21 21:57:00 +02:00
Tomas Groth 2c640389f1 Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863. Set progress bar steps to number of chapters in zefania import. Fix song tag detection. Fixes bug 1549549. Fix a method call with too many parentheses, which fixes getting bible books from crosswalk. Fix bug that prevents song book entries to be imported. 2016-04-21 21:49:22 +02:00
Ian Knight ff60d9c271 Added QR code and link for iOS app to remote plugin ui 2016-04-18 17:18:59 +09:30
Tim Bentley f46f3e835c theme update 2016-04-02 18:58:27 +01:00
Ken Roberts 045744dc17 Backport fix for non-standard reply for PJLink class request 2016-03-03 09:15:58 -08:00
Raoul Snyman 271a35581c Release 2.4
bzr-revno: 2621
2016-02-13 16:41:12 +02:00
Tomas Groth 510e109ff5 trunk 2016-02-12 20:59:32 +01:00
Raoul Snyman dcd39adfe2 [songusage] No need to trigger the action twice 2016-02-11 23:05:41 +02:00
Tomas Groth fdb53f919f Fix for force-updating display on windows when using themes without transitions. 2016-02-09 22:01:20 +01: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 17d6f13ac0 More workarounds for bug 1531319.
Fixes: https://launchpad.net/bugs/1531319
2016-02-06 20:43:54 +01:00
Tomas Groth aa8af06f79 If presetation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508.
Fixes: https://launchpad.net/bugs/1490508
2016-02-05 21:11:36 +01: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 0dd29893da More tests 2016-02-04 23:25:06 +02:00
Raoul Snyman 734bf4ffc4 Fix some BeautifulSoup warnings about parsers. 2016-02-04 22:17:40 +02:00
Raoul Snyman 5928fde62e Fix a weird issue with the 'clear alternate shortcut' button clearing both 2016-02-02 23:56:03 +02:00
Raoul Snyman f6c2a5b410 Fix bug #1533246
Fixes: https://launchpad.net/bugs/1533246
2016-02-02 23:55:37 +02:00
Tomas Groth a02aca022a Use the chosen encoding when importing from easyworship db. 2016-01-31 20:36:54 +01: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 a409306d0d Fix bug 1537212
Fixes: https://launchpad.net/bugs/1537212
2016-01-30 09:33:31 +01:00
Raoul Snyman b2e54a4baa Downgrade VLC.py to a version that is in use 2016-01-25 20:14:03 +02:00
Tomas Groth fb04813088 remove debug prints 2016-01-23 13:38:08 +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 c34bfd6d95 Adjusted string 2016-01-23 09:15:37 +01:00
Tomas Groth 4594fcefbd pep fixes 2016-01-22 22:33:20 +01:00
Tomas Groth 4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
Tomas Groth e593d77e14 Fix some broken tests that was not being used due to naming. 2016-01-22 22:26:25 +01:00
Tomas Groth 692a08f888 When setting the verseorder to uppercase, remember the cursor position. Fixes bug 1536411.
Fixes: https://launchpad.net/bugs/1536411
2016-01-22 21:04:31 +01:00
Tomas Groth 9415018899 Disable OpenGL on linux (too). Fixes bug 1535332.
Fixes: https://launchpad.net/bugs/1535332
2016-01-22 20:52:50 +01:00
Tomas Groth 7d677025b5 Disable OpenGL on windows to make webkit player work. 2016-01-21 22:18:56 +01:00
Tomas Groth 85c329fb26 Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319.
Fixes: https://launchpad.net/bugs/1531319
2016-01-20 23:25:40 +01:00
s.mehrbrodt@gmail.com ddfed93fbe "* Fix importing older song dbs by migrating them first
* Fix comparing songs without title

lp:~sam92/openlp/bug-1533081 (revision 2615)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1184/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1123/
[FAILURE] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/959/
Stopping after failure"

bzr-revno: 2609
Fixes: https://launchpad.net/bugs/1533081, https://launchpad.net/bugs/1534306
2016-01-16 22:13:41 +02:00
Tomas Groth 6b23a2224f Fix playback of linked audio. Fixes bug 1533280.
Fixes: https://launchpad.net/bugs/1533280
2016-01-15 21:22:08 +01:00
Tomas Groth e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth 6f9056c935 trunk 2016-01-12 22:36:32 +01:00
Tomas Groth 3f3078c33a Fix traceback when expanding and collapsing songs.
Fixes: https://launchpad.net/bugs/1532169
2016-01-12 22:29:20 +01:00
Tomas Groth e3d7e436f1 In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted. 2016-01-12 21:17:15 +01:00
Tomas Groth cf7630d3e3 Fix crash when sending Pdf live. 2016-01-12 21:14:04 +01:00
Tim Bentley 31d6f931e5 head 2016-01-11 21:58:21 +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
Tomas Groth c8fd1b8338 Fix taking screenshots while using powerpoint or impress.
Fixes: https://launchpad.net/bugs/1532938
2016-01-11 22:13:57 +01:00
Tim Bentley 2218ecbcd7 head 2016-01-11 21:12:03 +00:00
Tim Bentley 50df2e6258 fix json 2016-01-11 21:04:24 +00:00
Simon Hanna 9d8c757d0d Re-enable the stylesheet, remove icon in mediamanager to fix rendering in plasma 2016-01-10 19:01:36 +01:00
Simon Hanna 4d7ceba301 Merge with trunk 2016-01-10 17:01:43 +01:00
Simon Hanna e172e2aeb2 Revert Changes 2016-01-10 17:00:05 +01:00
Raoul Snyman 0e8dc032da Release 2.3.2
bzr-revno: 2602
2016-01-10 15:15:22 +02:00
Simon Hanna 9525453679 Ignore case when matching verse tags during SongBeamerImport 2016-01-10 01:22:31 +01:00
Simon Hanna 076cc57d39 Fix Song import 2016-01-10 01:17:58 +01:00
Simon Hanna faff2b7da4 Undo changes to instance variables 2016-01-09 23:35:56 +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
Simon Hanna 44cd766885 Remove code that was added by mistake 2016-01-09 18:22:09 +01: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 1e5c187552 PEP8 2016-01-09 16:30:27 +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 e16a1916b7 forgot to remove debug print 2016-01-09 14:53:59 +01:00
Tomas Groth e9e845035a pep8 fixes 2016-01-09 10:09:29 +01:00
Simon Hanna 21c6a3ff1c Merge with trunk 2016-01-09 01:07:15 +01:00
Simon Hanna 8ccfde6929 Merge trunk in 2016-01-09 01:03:54 +01:00
Samuel Mehrbrodt b1c9f6937f Merge branch 2016-01-09 00:08:21 +01:00
Samuel Mehrbrodt da5790f17f Merge trunk 2016-01-09 00:05:43 +01:00
Tomas Groth 5d6758ffaf trunk 2016-01-08 22:51:40 +01:00
Tomas Groth a44d70cb0f Fix some tests on windows. 2016-01-08 22:44:22 +01:00
Tomas Groth 43e273c4ed Disable OpenGL in the maindisplay on windows for now. 2016-01-08 22:43:43 +01:00
Tomas Groth b5270b48a9 Fix for easyslide importer and added test. 2016-01-08 22:42:36 +01:00
Tomas Groth 211f93a921 Made importer list sorted, again. 2016-01-08 20:53:58 +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
Samuel Mehrbrodt 69e1660d6c PEP8 2016-01-08 15:05:54 +01:00
Simon Hanna 2c5475e8fa Fix some pep issues in the changed files 2016-01-08 14:47:52 +01:00
Raoul Snyman 4fd53706c6 We still need a db_url. Thanks interface tests! 2016-01-08 00:18:01 +02:00
Samuel Mehrbrodt ddefceee04 Fix migration for non-sqlite 2016-01-07 23:12:03 +01:00
Simon Hanna d5780b9f78 update functions that were previously methods to drop the '_'
rename _child to to_str because of name conflicts
2016-01-07 14:10:31 +01:00
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
Simon Hanna 11876436a1 Fix deletion of custom slides 2016-01-06 00:58:31 +01:00
Simon Hanna 584a0fda0d Fix the deletion of songs
This was left out when migrating to Qt 5
2016-01-05 23:58:04 +01:00
Simon Hanna 5bc13e45e3 Move some static methods out of their classes where it makes sense 2016-01-05 23:28:48 +01:00
Tim Bentley 8df7c3a9ea add tests 2016-01-05 19:32:12 +00:00
Tim Bentley 2bbdf51aca remove extra string 2016-01-05 18:20:47 +00:00
Tim Bentley 3975901e11 Fix search breakage 2016-01-05 18:19:40 +00:00
Samuel Mehrbrodt 860f596dde Only trigger this method by user input
Else we will have infinite loop by using setText in that method
2016-01-05 17:10:16 +01:00
Samuel Mehrbrodt 0cd2bbff36 Convert lowercase verse order to uppercase automatically
Fixes: https://launchpad.net/bugs/1530354
2016-01-05 16:42:07 +01:00
Samuel Mehrbrodt c47d1bdca4 Select text in search field when it gains focus
Fixes: https://launchpad.net/bugs/1530340
2016-01-05 16:32:49 +01:00
Samuel Mehrbrodt 8780b74342 Use deepcopy instead of copy 2016-01-05 16:17:22 +01:00
Samuel Mehrbrodt 5f2e0ba0ee Add test for deleting columns in a db 2016-01-05 16:14:58 +01:00
Samuel Mehrbrodt b9a7170cdf Add missing file 2016-01-05 08:57:01 +01:00
Raoul Snyman 6714df645e [song select] Stop search on viewing a song. 2016-01-04 22:28:41 +02:00
Samuel Mehrbrodt d274b6cb08 Fix exporting OpenLyrics 2016-01-04 20:00:19 +01:00
Samuel Mehrbrodt 245e374171 Fix removing a songbook 2016-01-04 19:50:42 +01:00
Samuel Mehrbrodt 4706ff4af8 Merge trunk 2016-01-04 19:47:03 +01:00
Samuel Mehrbrodt e4ecc3e763 Fix searching with multiple songbooks 2016-01-04 19:46:00 +01:00
Samuel Mehrbrodt a106245d8b Display multiple songbooks in the footer 2016-01-04 13:48:47 +01:00
Simon Hanna c467c321b4 Make methods static that don't need to rely on instance data 2016-01-04 13:21:58 +01:00
Samuel Mehrbrodt c7d7d16921 PEP8 2016-01-04 13:18:11 +01:00
Samuel Mehrbrodt d2ab4862b4 Initial support for multiple songbooks 2016-01-04 13:11:24 +01:00
Simon Hanna 4206d11228 Make methods static where possible 2016-01-04 01:18:01 +01:00
Ken Roberts a023177c4d Fix typo in projector authentication 2016-01-03 00:15:54 -08:00
Simon Hanna 6e9547dc33 Strip whitespace from title tag on import of Songbeamer file 2016-01-03 01:39:53 +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 bf9420a781 Update forms to remove the help button in the statusbar
Fixes: https://launchpad.net/bugs/1490184
2015-12-30 16:03:35 +01:00
Simon Hanna 39e48b9fed Show double verses at the end of songs in stageview
Fixes: https://launchpad.net/bugs/1510572
2015-12-30 01:09:11 +01:00
Ken Roberts f864a24f9a Fix typo in pin code hashing 2015-12-29 06:01:22 -08: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
second@tgc.dk 0d66ccdae4 "Only import vlc in one place. Make it work with PyInstaller.
Added bit-install-hint for VLC
Pep8 fixes

"

bzr-revno: 2583
2015-12-27 23:15:24 +02:00
Andreas Preikschat eefb496cde HEAD 2015-12-26 22:35:48 +01:00
Andreas Preikschat 18893b3903 Feature: updated vlc.py 2015-12-26 22:34:29 +01:00
Jonathan Springer e8c1d5adca Clarify comment 2015-12-26 11:08:50 -05:00
Jonathan Springer ca8600414f Add comments and doc strings 2015-12-26 11:05:41 -05:00
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 a6f5251d7e pep8 fixes 2015-12-26 15:30:12 +01:00
Tomas Groth c5e5f5b889 Added bit-install-hint for VLC 2015-12-26 15:25:09 +01:00
Tomas Groth b69bb5ce27 trunk 2015-12-26 10:00:48 +01:00
raoul@snyman.info a898b8e878 A couple of fixes for Debian package requirements: Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file.
bzr-revno: 2580
2015-12-24 19:33:33 +00:00
Jonathan Springer 860d630360 Make sure the main display stays above the menu bar and dock but still allow the main window to be focused 2015-12-24 14:26:41 -05:00
Jonathan Springer 86c4acab9c Move adding shortcuts to __default_dict__ into __init__ to avoid having QKeySequences being run before a QApplication is created and crashing 2015-12-23 23:13:50 -05:00
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
Jonathan Springer 9d94845584 Add some missed old shortcuts to their alternate field 2015-12-23 12:58:07 -05:00
Raoul Snyman 322b481b01 [Debian package requirements] Add jQuery and jQuery Mobile sources; Add Keywords field to desktop file 2015-12-23 14:55:30 +02:00
Jonathan Springer f3108cffe3 Fix exit dialog 2015-12-22 17:20:39 -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