Commit Graph

9670 Commits

Author SHA1 Message Date
Tomas Groth 28599c8f24 Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304
Fixes: https://launchpad.net/bugs/1387304
2014-11-13 11:26:44 +01:00
Tomas Groth b7e3a33c4a Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Fixes: https://launchpad.net/bugs/1382672
2014-11-12 22:18:57 +00:00
Tomas Groth f609be65bc Make the settingswindow higher to make room for the new settings.
Fixes: https://launchpad.net/bugs/1377283
2014-11-12 21:20:57 +00:00
Ken Roberts 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
Raoul Snyman 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
Ken Roberts b6f87adb1d Fix bug 1390702 2014-11-08 16:39:55 -08:00
Ken Roberts 0750071fe2 Fix spacing on View-Projector Manager 2014-11-08 11:22:22 -08:00
Tomas Groth ff4ddefa77 pep8 fix 2014-11-06 10:42:54 +01:00
Tomas Groth b6e0036383 Re-re-fix duplicate song check on windows, and now it actually works in builds. 2014-11-06 10:34:07 +01:00
Tomas Groth 992ac3bbb8 Second attempt to fix duplicate-song-detection on windows 2014-11-05 21:44:45 +00: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 af6a5322e2 Make it possible to break out of waiting loop 2014-11-04 12:58:03 +01:00
Tomas Groth 88e4c2e0b9 Try to fix 0 track length by waiting. Fixes bug 1387293
Fixes: https://launchpad.net/bugs/1387293
2014-11-03 20:30:43 +00:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Tomas Groth 2ed5f2bbe4 Fix for import of Words of Worship file 2014-11-03 11:03:53 +01:00
Phill Ridout f160607e17 Renamed some methods 2014-11-02 19:57:06 +00:00
Phill Ridout 9c6e007ed3 Applied changes as superfly suggested 2014-11-02 19:32:40 +00:00
Phill Ridout b119cc40be HEAD 2.1.1 release 2014-11-02 17:19:27 +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
Raoul Snyman 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
Raoul Snyman 39fa2641af Fixed up an import statement 2014-11-01 12:38:33 +02:00
Raoul Snyman 9f1638959e Fix some more instances of button text 2014-11-01 12:35:54 +02:00
Tim Bentley ee4bd0f521 head 2014-11-01 07:47:43 +00:00
Tim Bentley 837013763a fix focus 2014-11-01 07:47:26 +00:00
Tomas Groth 6500a4b813 Fix for bug #1387286, playing audio CD clips on windows
Fixes: https://launchpad.net/bugs/1387286
2014-10-31 22:44:22 +00:00
Raoul Snyman ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
Raoul Snyman 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
Raoul Snyman 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
Tomas Groth f05a4344af trunk 2014-10-29 21:13:29 +00:00
Tomas Groth 036ed94c68 Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025
Fixes: https://launchpad.net/bugs/1247025
2014-10-29 21:04:17 +00:00
Phill Ridout 3685948ed5 HEAD 2014-10-29 19:11:43 +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
Raoul Snyman 00455847a7 HEAD 2014-10-28 22:27:09 +02:00
Raoul Snyman 743dc59d51 [fix 1386710] Fix traceback after settings form is saved
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
Raoul Snyman 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
Tim Bentley afde4a25ad Fix missing dummy values for debug 2014-10-27 20:22:57 +00:00
Tomas Groth e9a151cec0 This fixes the adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix 2014-10-27 14:14:12 +01:00
Tomas Groth d2f388bb59 Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
Fixes: https://launchpad.net/bugs/1296574
2014-10-27 14:11:55 +01:00
Tomas Groth 3d387cb296 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 2014-10-27 13:58:59 +01:00
Tomas Groth 6d2cfedd7e Remove prints 2014-10-27 13:52:56 +01:00
Tomas Groth 3693e55f5c Change filename encoding to only apply to local variable. 2014-10-27 11:37:22 +01:00
Phill Ridout 80cdb84e4a HEAD 2014-10-26 07:51:17 +00:00
Phill Ridout d2b6d2126e Add copyright and doc stying 2014-10-26 07:50:49 +00:00
Raoul Snyman 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