Commit Graph

6141 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 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
Tomas Groth 75960ac8da When bible or song plugin is disabled in FTW don't show download for those plugins in FTW. Fixes bug 1194622.
Fixes: https://launchpad.net/bugs/1194622
2014-11-11 14:58:03 +01:00
Tomas Groth 2efdc97311 Fix traceback when saving service while in debug mode 2014-11-11 12:34:47 +01:00
Ken Roberts aadbce133e Add missing tranlsate to text/fix select/edit title 2014-11-10 16:14:17 -08: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
Tomas Groth 6b538995f4 Fix for theme copy/creation on windows, fixes bug 1390917
Fixes: https://launchpad.net/bugs/1390917
2014-11-10 11:24:44 +01:00
Tomas Groth bf382863d2 Fix for bug1390987
Fixes: https://launchpad.net/bugs/1390987
2014-11-10 09:48:22 +01: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
Ken Roberts b6f87adb1d Fix bug 1390702 2014-11-08 16:39:55 -08:00
Raoul Snyman 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
Raoul Snyman 4f4c76ae8b [fix] Don't exit OpenLP when you cancel the FRW from the Tools menu 2014-11-08 21:25:06 +02:00
Ken Roberts 0750071fe2 Fix spacing on View-Projector Manager 2014-11-08 11:22:22 -08:00
Raoul Snyman dec7390ef5 [bug 1389571] Use Qt threads properly, and kick off a separate thread for each download.
[fix] Finally fixed the "configuring OpenLP" page by adding headers
[refactor] Make the Wizard start up faster by only downloading the config file after the wizard has started
2014-11-08 01:46:18 +02:00
Ken Roberts f2cd0a9743 Fix "Discard" and "Reset" button calls, pep8 2014-11-07 14:44:40 -08: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
Raoul Snyman 435a299b19 First (failed) stab at using threads correctly. 2014-11-06 23:08:56 +02:00
Tomas Groth f685572da2 Improved FTW handling of connection issues 2014-11-06 14:19:00 +01:00
Tomas Groth bc8afc9e4f Update thememanager widget after theme import 2014-11-06 14:16:14 +01:00
Tomas Groth ff4ddefa77 pep8 fix 2014-11-06 10:42:54 +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
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
Phill Ridout 04c6e27ac5 PEP Fixes 2014-10-24 22:03:49 +01:00
Phill Ridout 8696482f39 Few tweeks, and comments 2014-10-24 21:46:14 +01:00
Phill Ridout 2f9df8cfbd HEAD 2014-10-24 21:12:48 +01:00
Ken Roberts f81903bbcf Merge upstream 2014-10-23 15:16:38 -07:00
Ken Roberts 3cf8c0464c Fix discard/reset button calls - added button tooltips 2014-10-23 14:00:06 -07:00
Phill Ridout c9cede9650 Implemented custom widget ColorButton OpenLP wide 2014-10-23 21:56:09 +01:00
Phill Ridout a4f788599f add custom colorbutton widget 2014-10-23 20:50:01 +01:00
Ken Roberts c7d36826aa Add 1.5 second delay for autoloading projectors 2014-10-22 19:40:22 -07:00
Ken Roberts 0264d57b61 Add input source edit text option 2014-10-22 19:21:26 -07:00
Raoul Snyman 108e3b6687 Forgot to catch the cancel_wizard_text refactor 2014-10-22 23:01:40 +02:00
Raoul Snyman 3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman 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 6391b17b6d Fix focus to ip text widget when calling projetor edit 2014-10-21 17:49:21 -07:00
Ken Roberts 2e6556a11b Fix call to get_source_list in pjlink1 2014-10-21 17:02:37 -07:00
Ken Roberts 416c37140c Fix single dialog get_source_list() call 2014-10-21 16:51:51 -07:00
Ken Roberts 5ae48da58e Fix missing poll check 2014-10-21 16:45:15 -07:00
Ken Roberts 04ad28c106 Fixed typos in ProjectorSource 2014-10-21 15:47:25 -07:00
Ken Roberts 2b5b58379f Code cleanups 2014-10-21 14:50:35 -07:00
Ken Roberts b38921a90b Code cleanups 2014-10-21 14:40:47 -07:00
Ken Roberts a026633f78 Notes cleanups 2014-10-21 14:24:16 -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
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
Ken Roberts 0fe5b9f8fe Typo in column define 2014-10-21 13:11:25 -07:00
Ken Roberts a8cebffec0 cleanups 2014-10-21 13:05:35 -07:00
Tim Bentley 2b3e3d777e Add Test and fix more code 2014-10-21 21:05:08 +01:00
Ken Roberts 598f94f5c1 Add ProjectorSource schema for user-defined source display text 2014-10-21 13:03:58 -07:00
Ken Roberts 21f6216574 Switch PJLINK_DEFAULT_TEXT to dict 2014-10-21 13:01:07 -07:00
Tim Bentley f5f8c1ce08 Fix start up thread timer 2014-10-21 06:13:22 +01:00
Ken Roberts 3def1baf9d pep8 2014-10-20 16:36:07 -07:00
Ken Roberts 8bb9510622 Fix tab text on mac 2014-10-20 16:25:27 -07:00
Ken Roberts 16f4fcbce3 Update settings to allow selecting source dialog layout 2014-10-20 16:17:15 -07:00
Ken Roberts 4283ff7502 Add tiled icons on toolbar for muliple-selection 2014-10-20 11:37:59 -07:00
Ken Roberts 8d4eb3b368 Fix icon for source input menu item 2014-10-20 10:07:53 -07:00
Ken Roberts 1e2cfcd7bd pep8 2014-10-20 09:50:19 -07:00
Ken Roberts 6a2f675e84 Realign tabs to left-right 2014-10-20 09:34:33 -07:00
Ken Roberts c028353ecd Fix docstrings 2014-10-19 17:43:40 -07:00
Ken Roberts 3cb21e4c13 Set tab focus to tab with selected source 2014-10-19 17:31:09 -07:00
Ken Roberts 7fb3ca8c17 Fix misplace tabwidget addWidget 2014-10-19 17:11:06 -07:00
Ken Roberts c42af376cc Fix tabbed source select gui size 2014-10-19 16:55:19 -07:00
Ken Roberts 4b64e24e36 Initial change to tabs for source select 2014-10-19 12:20:51 -07:00
Ken Roberts 10c415cf1a Docstrings cleanup 2014-10-17 10:28:12 -07:00
Ken Roberts d8f94ac3df Remove extraneous imports 2014-10-17 08:23:45 -07:00
Ken Roberts 81f26dd9a3 pep8 and extra logging info 2014-10-16 20:09:42 -07:00
Ken Roberts dfcbaa8c28 Add socket timer for lost connections 2014-10-16 19:28:51 -07:00
Ken Roberts c1415bb891 Fix authentication send, added current source to source select dialog 2014-10-16 17:04:19 -07:00
Ken Roberts 054be0135a Add check for connect before calling connect on doubleclick 2014-10-16 14:21:01 -07:00
Ken Roberts 187dee6217 Add double-click to connect option 2014-10-16 14:11:43 -07:00
Ken Roberts 0ec753468c projector view info icon update 2014-10-16 14:01:37 -07:00
Ken Roberts 6264435acb Fix view status icon on toolbar 2014-10-16 13:48:41 -07:00
Ken Roberts 99c7566f98 Update source selection as soon as power is on 2014-10-16 13:33:29 -07:00
Ken Roberts 77040050f4 Restructure send_busy flag 2014-10-16 13:03:20 -07:00
Ken Roberts 4714cbfcf7 pep8 2014-10-16 11:30:29 -07:00
Ken Roberts ec59abdc85 pep8 2014-10-16 11:16:08 -07:00
Ken Roberts 645f92e7d4 Change projector wizard to basic edit form 2014-10-16 11:08:44 -07:00
Ken Roberts f60f8d211b Fix source select when sources not known yet 2014-10-15 13:53:17 -07:00
Ken Roberts e4926416f8 Fix unlock send queue 2014-10-15 13:27:43 -07:00
Ken Roberts c064a17ece Add toolbar separator 2014-10-15 11:45:41 -07:00
Ken Roberts 5879209627 Fix toolbar icon status on socket error 2014-10-15 11:41:12 -07:00
Ken Roberts dc321155a0 Fix localhost connection 2014-10-15 11:18:00 -07:00
Ken Roberts 8ea0917230 pep8 2014-10-15 10:38:39 -07:00
Ken Roberts f468fbb47d Fix bad data in process command 2014-10-15 10:34:27 -07:00
Ken Roberts 650c5007b2 Add poll_loop after send command 2014-10-15 10:29:15 -07:00
Ken Roberts 2e3391eff4 Remove blocking calls on sockets 2014-10-15 10:22:12 -07:00
Ken Roberts 4d127cd6fa Fix icon update only when status changes 2014-10-14 20:34:06 -07:00
Ken Roberts e3439172f8 Toolbar icon enable/disable on power on/off based on projector state 2014-10-14 19:57:58 -07:00
Ken Roberts fb51f505d5 Extra poll after command returned OK 2014-10-14 19:57:13 -07:00
Ken Roberts 03a31f9bc9 Remove extra spacers in toolbar 2014-10-14 19:30:38 -07:00
Ken Roberts ef5b597a8b Fix missing information from view item 2014-10-14 19:18:40 -07:00
Ken Roberts cf7756d6c7 Fix packet length check for valid command with empty data 2014-10-14 19:18:00 -07:00
Ken Roberts 7931c97698 Toolbar icons/change source icon 2014-10-14 18:40:21 -07:00
Ken Roberts 6e96851e2e Fix toolbar icons disabled state 2014-10-14 11:59:57 -07:00
Ken Roberts ad6a8ec5ce Test cleanups and fix network error icons 2014-10-14 10:40:07 -07:00
Ken Roberts cc43efa809 Toolbar change based on selected projector items 2014-10-14 10:12:49 -07:00
Ken Roberts 5f232ce5fd Fix wrong status on sending data 2014-10-14 08:14:16 -07:00
Tomas Groth cbd1b7c223 Changed setting version name 2014-10-14 09:52:59 +02:00
Ken Roberts e5743462e2 Added default socket timeout/poll time in settings 2014-10-13 17:07:54 -07:00
Ken Roberts 39e574dba7 Change timer setting based on initial connect/poll 2014-10-13 13:58:39 -07:00
Ken Roberts 713a255241 Fix authentication errors 2014-10-13 13:16:25 -07:00
Ken Roberts 5938ccc9a6 added get_projector_by_id 2014-10-13 13:16:03 -07:00
Tomas Groth f36c8660ab Changed a variable name 2014-10-13 20:24:19 +01:00
Ken Roberts 5a1aa5c88c pep8 2014-10-13 10:09:23 -07:00
Ken Roberts e7e53501df Fix authentication error processing 2014-10-13 09:40:58 -07:00
Ken Roberts 498ecb5b6a increase pin length to allow test pin 2014-10-13 08:11:55 -07:00
Ken Roberts 72cca86208 Refactor pjlink/remove db id in view projector/add pjlink command to constants 2014-10-13 07:51:23 -07:00
Tomas Groth 5091b3de37 Added a test 2014-10-13 16:08:06 +02:00
Tomas Groth e1fde7f6a5 Ask the user if a backup of the data folder should be created after upgrading 2014-10-13 12:26:23 +02:00
Ken Roberts 26db1f16ad pep8 2014-10-10 12:14:15 -07:00
Ken Roberts 89800c1a7d Relocate second toolbar to top 2014-10-10 10:29:52 -07:00
Ken Roberts a58cf9754b Merge new toolbar 2014-10-10 10:07:31 -07:00
Ken Roberts 91ab6a64bf Tiled icons for toolbar 2014-10-10 09:54:35 -07:00
Ken Roberts fcd14a12cd tranlate strings and cleanups 2014-10-10 08:58:48 -07:00
Ken Roberts 5da20ec01d pep8 cleanups 2014-10-09 20:31:51 -07:00
Ken Roberts cbb995c4c6 More single character cleanups 2014-10-09 20:28:24 -07:00
Ken Roberts d6bb5aad52 More single character cleanups 2014-10-09 20:16:46 -07:00
Jonathan Springer 859ae13eb3 More work for top and bottom toolbars for the projector manager 2014-10-09 22:49:18 -04:00
Jonathan Springer 857a1d06f6 Intial changes for multiple toolbars for projector manager 2014-10-09 22:08:59 -04:00
Ken Roberts c0169bb762 Test for MacOSX for wizard buttons 2014-10-09 15:12:08 -07:00
Ken Roberts 66a674c8de more wizard text updates 2014-10-09 15:00:29 -07:00
Ken Roberts 303eabdfa6 Wizard text updates 2014-10-09 14:46:05 -07:00
Ken Roberts b8f84f79eb Fix previous reviews 2014-10-09 13:30:07 -07:00
Ken Roberts 842898aaf9 Remove extraneous imports 2014-10-09 07:41:32 -07:00
Ken Roberts 6c4b8e5b91 Revert multiselection 2014-10-08 19:05:53 -07:00
Ken Roberts 0feca36ede Add multi-selection to projector item widgets 2014-10-08 18:56:45 -07:00
Ken Roberts 853826a501 Icon/tranlate fixes 2014-10-08 18:43:34 -07:00
Ken Roberts d4b6c067ef Fix issue with source select being None 2014-10-08 15:36:23 -07:00
Ken Roberts db2d2ca3b3 Missed import for is_macosx 2014-10-08 13:21:59 -07:00
Ken Roberts 1eee08ff6b pep8 on wizard.py 2014-10-08 13:04:50 -07:00
Ken Roberts 06da940310 Update wizard setup for Mac OSX on wizard pages 2014-10-08 13:03:33 -07:00
Ken Roberts 6a75726eed Update wizard setup for Mac OSX 2014-10-08 13:01:47 -07:00
Raoul Snyman 53905dec21 Fix up the look and feel of the wizards after I messed it up with my changes for OS X 2014-10-08 21:42:30 +02:00
Ken Roberts c789d1c0ed Missed db reference in edit page 2014-10-07 12:37:55 -07:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Tomas Groth 71324fc932 Forward ported fix for bug1265368
Fixes: https://launchpad.net/bugs/1265368
2014-09-25 11:07:31 +02:00
Tomas Groth 31a868ca61 Moved thumbnail creation to httprouter.py 2014-09-23 22:45:42 +01:00
Tomas Groth 4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Tomas Groth 15624e20ef Fixed typo and removed unused import 2014-09-11 12:08:44 +02:00
Tomas Groth 5c4be05fc1 Went back to to the load-into-imagemanager-on-demand approach 2014-09-11 11:52:32 +02:00
Tomas Groth cf351a7af9 Fix thumbnail creating 2014-09-10 22:30:32 +01:00
Tomas Groth 8d76aeffd2 Added thumbnails for images from serviceitems 2014-09-10 07:40:12 +01:00
Tomas Groth dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Raoul Snyman 40edebdab0 Style fixes 2014-09-08 00:30:21 +02:00
Raoul Snyman 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
Raoul Snyman 09be73cc26 HEAD 2014-09-05 22:15:44 +02:00
Raoul Snyman 1a573315db Make tabbed docks look better by using document mode 2014-09-04 23:38:39 +02:00
Raoul Snyman 1f9c0a31f8 Made wizard image bigger, and made Theme wizard bigger 2014-09-04 22:25:23 +02:00
Raoul Snyman 496c12b2db Reformatted a comment; Renamed NT to WIN; Made OpenLPMixin constructor slightly more robust. 2014-09-04 22:10:34 +02:00
Jonathan Springer ceeb1b0118 Removed icons from menu items on Mac OS X 2014-09-04 20:27:21 +02:00
Raoul Snyman cf8f15964c Move to use the new is_macosx() method, and tweak the theme wizard a little more. 2014-09-02 23:15:58 +02:00
Raoul Snyman 184a397970 HEAD 2014-09-02 22:38:36 +02: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 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
Phill Ridout 0b93faf7b9 PEP fixes 2014-08-26 18:38:07 +01:00
Phill Ridout 34a1ab3b3e HEAD 2014-08-26 17:51:52 +01:00
Tomas Groth 91f7b2d615 Added a few comments. 2014-08-25 21:52:12 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tim Bentley 565c2312d0 head 2014-08-24 10:37:49 +01:00
Tim Bentley 516fd30bc7 fix conversion bug 2014-08-23 21:42:10 +01:00
Raoul Snyman 948eecb6a0 HEAD 2014-08-23 00:13:02 +02:00
Raoul Snyman 8065649158 Make the wizards look right on OS X 2014-08-23 00:12:35 +02:00
Tomas Groth 3b092319c9 trunk 2014-08-21 11:24:40 +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 933ec66efc Fix theme export and add unit test.
bzr-revno: 2406
2014-08-04 06:00:34 +01:00
Stewart Becker d90fcface2 Style fixes for Tim 2014-07-24 20:28:57 +01:00
Stewart Becker 73ec92ae13 Added option to wrap footer text 2014-07-21 07:37:41 +01:00
Samuel Mehrbrodt 2613ad3076 Don't run upgrades on an up to date database 2014-07-17 23:04:58 +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
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 8fa23ac95d Added support for showing thumbnails of images in webinterface 2014-07-14 14:41:27 +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
Raoul Snyman 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
Tomas Groth 542fe4e887 small changes 2014-07-11 23:45:01 +02:00
Tomas Groth 98a58d45bf pep8 fixes 2014-07-11 15:35:44 +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
Tomas Groth e0c8709ad1 trunk 2014-07-07 19:24:23 +02: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 b92ca3f209 Fix service up movement
Fixes: https://launchpad.net/bugs/1338316
2014-07-07 13:17:24 +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
Tomas Groth d402bf86cb trunk 2014-07-02 22:48:56 +02:00
Tim Bentley f649f0af3c Fix initialisation 2014-07-02 19:13:23 +01:00
Tim Bentley 7d2f8fa6cd Fix setup.py 2014-07-01 22:10:26 +01:00
Tomas Groth 3c91a6bbfd Fixed seeking when playing mediaclip 2014-07-01 22:06:55 +02:00
Phill Ridout 9b6979b840 Changed log.warn to log.warning 2014-06-30 21:59:22 +01:00
Samuel Mehrbrodt af6537116c Close file also on success 2014-06-30 14:36:35 +02:00
Samuel Mehrbrodt 9702870afa Close and delete zip in case of exception 2014-06-30 09:30:19 +02:00
Tomas Groth e773d82341 Updated VLC bindings to latest build 2014-06-26 09:41:22 +02:00
Tomas Groth 248e703345 Fixed loading of libvlc.dll on windows 2014-06-24 19:46:23 +02:00
Samuel Mehrbrodt 39fbbf779d Move this line out of try/catch block 2014-06-23 15:54:13 +02:00
Samuel Mehrbrodt aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Samuel Mehrbrodt e174365051 Fix theme export
Fixes: https://launchpad.net/bugs/1332990
2014-06-23 13:38:17 +02:00
Tomas Groth 956af8706b Small suggested changes 2014-06-17 09:27:12 +02:00
Tomas Groth 44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Tomas Groth 7a47e5cb67 fixed bug #719514 ' Themes: <file> and <otherfile> are the same file'
Fixes: https://launchpad.net/bugs/719514
2014-06-15 22:35:31 +02:00
Tomas Groth 2a1a93d319 Made it possible to name optical clips, and fixed some issues. 2014-06-14 23:48:07 +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 e424c33283 This has been removed in trunk 2014-06-09 10:59:52 +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 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 f23e603314 Fix up interface better 2014-06-05 17:25:37 +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
Tim Bentley a912db6abf new bug 2014-06-01 18:12:00 +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