Phill Ridout
126873ddaa
fixes bug1416703 by implementing a function to do the conversion
...
Fixes: https://launchpad.net/bugs/1416703
2015-02-13 20:41:34 +00:00
Tomas Groth
340a766bba
Change ConnectionException to ConnectionError. Fixes bug 1421561
...
Fixes: https://launchpad.net/bugs/1421561
2015-02-13 20:10:53 +00:00
Phill Ridout
e35a1d7763
head
2015-02-12 21:35:26 +00:00
Phill Ridout
b427e216f1
small fixes
2015-02-12 21:24:39 +00:00
Phill Ridout
f6de8a4f7a
Fix 1416703
2015-02-12 20:44:34 +00:00
Tomas Groth
733812572c
Added projector and fixed spelling.
2015-02-11 22:15:46 +00:00
Tomas Groth
8c8fbe45b2
Fixes to make mysql db work
2015-02-11 20:56:13 +00:00
Tomas Groth
bab5e90e20
Adjust error messages.
2015-02-10 22:25:30 +00:00
88cb02bb3d
Fix bug #1417809 : Remove default ascii encoding so md5hash can be used to hash other data.
...
bzr-revno: 2497
Fixes: https://launchpad.net/bugs/1417809
2015-02-10 21:38:53 +02:00
Tomas Groth
1e9430b435
Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered.
...
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available.
Fix bug 1412517: Fix support for 'end' mark in bible-search.
bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978 , https://launchpad.net/bugs/1414980 , https://launchpad.net/bugs/1410738 , https://launchpad.net/bugs/1412517
2015-02-10 21:24:33 +02:00
Tomas Groth
12a0b8b750
Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.
...
Fixes: https://launchpad.net/bugs/1412570
2015-02-09 20:49:24 +00:00
Phill Ridout
08e1404ffb
rename some of the unpacked vars
2015-02-08 18:38:47 +00:00
Tomas Groth
d8e6f35694
Handle OSError exception when creating files in various places. Fixes bug 1416888.
...
Fixes: https://launchpad.net/bugs/1416888
2015-02-06 22:17:24 +00:00
a4235aafe9
Remove new functions - fix tests
2015-02-04 08:43:04 -08:00
Tomas Groth
7287759ba5
Fixed a string
2015-02-03 23:41:30 +00:00
a50744adbc
Added sha1_filecheck
2015-02-03 14:54:41 -08:00
Phill Ridout
b6493bebbf
Final Fixes
2015-02-02 22:04:30 +00:00
Phill Ridout
b8838f496a
Modified download hashing
2015-02-02 19:25:34 +00:00
b02d44416a
Allow md5check to use non-ascii encoding, added md5_filecheck
2015-02-02 10:00:39 -08:00
Phill Ridout
4c36bba911
head
2015-02-01 21:40:59 +00:00
Philip Ridout
b40f931618
Fix - Preview media slider repeatedly shows "Error Occurred" dialogue box
...
bzr-revno: 2493
2015-02-01 15:04:37 +00:00
Tim Bentley
93038bb27d
Move delete option to support ham fisted users
...
bzr-revno: 2492
2015-02-01 13:37:54 +00:00
Phill Ridout
6d2b1d958e
Better handle failed downloads
2015-01-31 21:52:02 +00:00
93ce2caf34
Fix invalid call to QMessageBox() when user wants to delete user-defined source text.
...
bzr-revno: 2491
2015-01-31 14:18:19 +00:00
Tim Bentley
6f76c164e0
fix delete
2015-01-30 21:15:03 +00:00
Phill Ridout
59088887fc
PEP Fixes
2015-01-29 21:21:03 +00:00
Phill Ridout
0e79c0fe40
Remove testing code
2015-01-29 20:58:14 +00:00
Phill Ridout
b33fe701df
Make Phonon optional
...
Fixes: https://launchpad.net/bugs/1224404
2015-01-29 20:57:02 +00:00
Tomas Groth
10d25f8173
Added a cancel-button to FTW when no internet is available. Fixes bug 1410738
...
Fixes: https://launchpad.net/bugs/1410738
2015-01-27 15:52:18 +01:00
Phill Ridout
bfe1824cb4
removed redundant code
2015-01-26 21:18:23 +00:00
Phill Ridout
1712464e8c
Fix up tests
2015-01-26 20:42:19 +00:00
Phill Ridout
28222ed0f8
fix check_available to work on feature detection
2015-01-25 22:00:14 +00:00
Philip Ridout
5390ed5bac
Fixes Bug #1367141 : Presentations/Images with same name gets the same thumbnail
...
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)
Also added code to remove the old thumbnails.
bzr-revno: 2487
2015-01-24 18:24:51 +00:00
Phill Ridout
14719b8ab3
remove print statments
2015-01-22 20:12:23 +00:00
Philip Ridout
fe3d887fd7
Corrects Translation strings
...
bzr-revno: 2485
2015-01-22 19:47:16 +00:00
Philip Ridout
c43823a2b0
Fixes the copyright headers
...
bzr-revno: 2484
2015-01-22 19:46:04 +00:00
Phill Ridout
92eee52d3f
pep fixes
2015-01-22 18:07:56 +00:00
Phill Ridout
051db41e20
removed python3 string
2015-01-22 17:42:29 +00:00
Phill Ridout
75dff3d2be
HEAD
2015-01-22 17:31:00 +00:00
Phill Ridout
833c6fb800
Add test
2015-01-22 15:05:03 +00:00
Phill Ridout
7750f1ec11
Correct the rest of the headers
2015-01-22 13:31:25 +00:00
Tomas Groth
f53187e26a
Fix layout in player-settings. Fixes bug 1410772
...
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.
bzr-revno: 2482
2015-01-21 20:35:36 +00:00
Phill Ridout
4d749a89ac
Presentation fixes
2015-01-20 21:56:05 +00:00
Phill Ridout
7fda8043f5
Improve translation string
...
Fixes: https://launchpad.net/bugs/1412234
2015-01-20 21:38:34 +00:00
745a3e3ef8
Remove translations from error code number strings
2015-01-19 14:36:53 -08:00
Tomas Groth
8ba226fe0e
Fix layout in player-settings. Fixes bug 1410772
...
Fixes: https://launchpad.net/bugs/1410772
2015-01-19 12:21:00 +01:00
de213b0f66
Copyright cleanup time,
...
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
e959511021
Fix invalid call to QMessageBox
2015-01-18 15:42:59 -08:00
Tomas Groth
d424ae51fa
Make sure we use dnd position if available. Fixes bug 1410843.
...
Fixes: https://launchpad.net/bugs/1410843
2015-01-18 21:44:34 +00:00
Tomas Groth
ff87971270
Set the default delay-spinbox value from the appropiate setting. Fixes bug 1411765.
...
Fixes: https://launchpad.net/bugs/1411765
2015-01-18 20:52:49 +00:00
ffcea13021
Updated the copyright.
2015-01-18 15:39:21 +02:00
deb8ae8656
Fix First Time Wizard fail on URL error (ex: proxy authorization)
...
Fix spelling
bzr-revno: 2478
Fixes: https://launchpad.net/bugs/1409627
2015-01-16 22:43:47 +02:00
Tomas Groth
cf30667fb5
Fix Windows tests when running on WINE
...
bzr-revno: 2477
2015-01-16 22:42:00 +02:00
Phill Ridout
e5bae7e885
Fixes1410694 by fixing typo, also added additional error. Added the OS Name and version to the version file request headers
...
Fixes: https://launchpad.net/bugs/1410694
2015-01-14 21:35:02 +00:00
6be873bd91
spelling
2015-01-14 07:38:50 -08:00
Tomas Groth
1efc145cdf
PEP8 fixes
2015-01-14 12:32:27 +01:00
Tomas Groth
cffad28749
Close session after upgrade. Fixes a filelock issue in windows tests.
2015-01-14 11:56:18 +01:00
9551920821
Catch network error in FTW
2015-01-13 11:03:05 -08:00
3774cf3704
Update the credits in the About dialog
2015-01-11 21:46:41 +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
ac19e018fa
Fix retries on connection timeout error
2015-01-09 07:38:10 -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
a4efccb00b
Replace remote Registry().execute(event) next/previous with Qt signal
2015-01-06 14:37:18 -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
15f1381de8
Upstream merges
2015-01-04 09:38:59 -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
c27c875f33
Readded deleted line. One more comment typo
2015-01-02 11:58:44 +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
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
5d1eac9ded
Add function to provide elided text
...
Fixes: https://launchpad.net/bugs/1405260
2014-12-30 08:48:46 +00:00
Phill Ridout
36417083ce
head
2014-12-29 17:25:36 +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
Tomas Groth
aae831e90d
Disable webkit and phonon mediaplayers on Mac for now
2014-12-26 22:52:14 +00:00
Tomas Groth
98c5dd4865
Fix bug 1405476 by checking if an end_time has been set.
...
Fixes: https://launchpad.net/bugs/1405476
2014-12-26 17:45:34 +00:00
Tomas Groth
853c532bf9
Do not allow edit of start/end time for optical mediaclips in the servicemanager. Fixes bug 1393186 until re-edit of optical clips is added.
...
Fixes: https://launchpad.net/bugs/1393186
2014-12-25 22:02:58 +00:00
Tomas Groth
35de35103b
Remove unneeded serviceitem shift when auto previewing. Fixes bug 1405133 and bug 1401234
...
Fixes: https://launchpad.net/bugs/1401234 , https://launchpad.net/bugs/1405133
2014-12-23 21:17:20 +00:00
Phill Ridout
c9e1dcceff
head
2014-12-23 18:57:04 +00:00
Ken Roberts
3be4f10833
Change edit song ccli label to "CCLI song number"
2014-12-22 12:19:05 -08:00
Tim Bentley
93d0314b7e
General fixes
2014-12-22 17:34:43 +00:00
Tomas Groth
672e2cc81f
trunk
2014-12-19 23:08:23 +00:00
Tomas Groth
321709d7a7
[bug 954613] Introduce locking when updating slide display to avoid slidecontroller and display getting out of sync.
...
Fixes: https://launchpad.net/bugs/954613
2014-12-19 23:07:32 +00:00
Ken Roberts
10b9099f52
Fix typo
2014-12-18 12:51:34 -08:00
Ken Roberts
c596940a15
Fix notes edit not clearing between calls, added projectoreditform tests
2014-12-18 10:50:51 -08:00
fe02a80e26
HEAD
2014-12-14 22:37:36 +02:00
ba81146093
Fix a bug inadvertently introduced in the merge conflict.
2014-12-14 22:37:24 +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
Phill Ridout
ae852466ec
Fix selecting items in media manager using the keyboard when preview media items when clicked is set
2014-12-14 16:54:25 +00: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
2dd7a6e776
remove print statment
2014-12-07 17:53:32 +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
24a8f67fd0
Handle LibreOffice and SOffice commands on linux
...
Fixed imports conflict on merge.
bzr-revno: 2453
2014-12-07 08:20:30 +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
56f4b8aa5e
Another fix for blank menu.
2014-12-06 20:40:40 +00:00
Tomas Groth
4123b9af1d
Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type.
2014-12-06 20:08:42 +00:00
Phill Ridout
e190bf30e9
Fixes 1397570 by 'feature detection'
2014-12-05 17:04:44 +00:00
Tomas Groth
fd57f81376
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden
2014-12-04 22:14:56 +00:00
Tomas Groth
782b3d3bcf
trunk
2014-12-03 22:35:06 +00:00
Tomas Groth
fd48879513
The fix for loading songs with linked audio. Fixes bug 1398403
...
Fixes: https://launchpad.net/bugs/1398403
2014-12-03 22:31:23 +00:00
Tomas Groth
e94579e7f1
Only update blank menu if needed
2014-12-03 21:19:43 +00:00
Phill Ridout
70c3a21620
HEAD
2014-12-03 19:50:41 +00:00
Phill Ridout
fc4eb5dd4d
URL updates. PEP fix
2014-12-03 17:45:34 +00:00
Tomas Groth
767e3d91f2
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.
2014-12-02 11:07:03 +00:00
Tomas Groth
20394de842
pep8 fix
2014-12-02 10:02:13 +00:00
Tomas Groth
af4715dc3c
Remove the registered functions instead of overwriting
2014-12-02 09:46:19 +00:00
Tomas Groth
1c71efc532
Allow overwriting functions in registry, and use it when registring MainDisplay. Fixes bug 1397287
...
Fixes: https://launchpad.net/bugs/1397287
2014-12-01 15:08:13 +00:00
Phill Ridout
563347c8b8
HEAD
2014-11-30 07:44:57 +00:00
Tomas Groth
7d51352b2d
Added divx and xvid as supported files for VLC. Fixes bug 1215302
...
Fixes: https://launchpad.net/bugs/1215302
2014-11-28 08:15:59 +00:00
34406385fb
HEAD
2014-11-26 22:50:54 +02:00
a517ed5fea
[refactor] Remove the progress bar on the first download page, and update the label to be slightly more descriptive
...
[fix] Hide the back button on the plugins page so that folks can't go back and re-download the config file
2014-11-26 22:02:48 +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
31018fb5ae
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271
...
Fixes: https://launchpad.net/bugs/1266271
2014-11-25 22:22:28 +00: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
Tomas Groth
5b794e5762
Added small pause before connection retry
2014-11-24 19:38:15 +00:00
Tomas Groth
0af6dc8eea
Always retry on connection failure.
2014-11-23 20:52:16 +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
378132d82f
Moved Settings KeyError handling to the export.
2014-11-13 20:15:43 +00:00
Tomas Groth
ed13dcbd75
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
...
Fixes: https://launchpad.net/bugs/1390238
2014-11-13 12:21:54 +01:00
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
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
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
4f4c76ae8b
[fix] Don't exit OpenLP when you cancel the FRW from the Tools menu
2014-11-08 21:25:06 +02:00
0750071fe2
Fix spacing on View-Projector Manager
2014-11-08 11:22:22 -08:00
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
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
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
39fa2641af
Fixed up an import statement
2014-11-01 12:38:33 +02:00
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
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
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
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
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
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
108e3b6687
Forgot to catch the cancel_wizard_text refactor
2014-10-22 23:01:40 +02:00
3771cb42a8
HEAD
2014-10-22 22:47:47 +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
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
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
40edebdab0
Style fixes
2014-09-08 00:30:21 +02: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
09be73cc26
HEAD
2014-09-05 22:15:44 +02:00
1a573315db
Make tabbed docks look better by using document mode
2014-09-04 23:38:39 +02:00
1f9c0a31f8
Made wizard image bigger, and made Theme wizard bigger
2014-09-04 22:25:23 +02:00
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
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
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
948eecb6a0
HEAD
2014-08-23 00:13:02 +02:00
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
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
