Commit Graph

3028 Commits

Author SHA1 Message Date
Jonathan Stafford cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08:00
rimach 88ce7a906d reactivate vlc 2012-01-19 20:13:19 +01:00
Mattias Põldaru 62a5578528 Make % acceptable character for filenames again. 2012-01-18 21:18:18 +02:00
Mattias Põldaru 62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02:00
Mattias Põldaru 8601a47dce Remove obsolete import. Fix saving wrong syntax and % bugs. 2012-01-18 13:20:15 +02:00
Jonathan Stafford 6543bbafb6 Changed slide_advance variable to be set only in SlideController initialisation or when settings are changed. 2012-01-18 17:52:51 +08:00
Mattias Põldaru e4f983e6ca Label back with new text. Also element Labels to the right place as Meinert suggested. 2012-01-17 10:50:29 +02:00
Mattias Põldaru df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru 982bfbbd55 Fix labels according to Meinert's comment. 2012-01-16 15:50:17 +02:00
Jonathan Stafford 1dbcc18c7e Reintroduced slide_advance variable so that settings are only read once. Reverted language files. 2012-01-16 17:50:15 +08:00
Jonathan Stafford c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford 01f7244db7 Removed unnecessary slide_advance 2012-01-15 18:05:12 +08:00
Mattias Põldaru e6f2fd67c3 Disable QTimeEdit box, when it is not used. 2012-01-15 11:58:02 +02:00
Jonathan Stafford 87775f164a Migrate Wrap Setting to Slide Advance Setting 2012-01-15 17:08:08 +08:00
Jonathan Stafford 360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Mattias Põldaru ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02:00
rimach edf4ac75c8 move phonon and vlc to own windows 2012-01-12 22:45:07 +01:00
rimach 3e6d1e7962 update vlc code 2012-01-11 21:51:11 +01:00
rimach b834371d5c Sync with head 2012-01-09 22:30:31 +01:00
Jonathan Corwin 75359ac361 Helps if we load the right setting 2012-01-07 12:09:17 +00:00
Jonathan Corwin 3ebe38f7e1 Setting for X11 bypass flag. Don't open Impress unnecessarily if not enabled 2012-01-07 11:22:53 +00:00
Mattias Põldaru 8be4f309f5 Escape html tags and support formatting tags in Alerts
bzr-revno: 1866
Fixes: https://launchpad.net/bugs/908197
2012-01-06 18:44:12 +00:00
Stevan Pettit 11d63c6607 If the save location is unavailable, the "Save As" dialog is used.
bzr-revno: 1865
Fixes: https://launchpad.net/bugs/905040
2012-01-06 18:42:09 +00:00
Jonathan Corwin fcf2eb17f0 Fix controller/theme wizard displays if transparent 2012-01-04 18:37:27 +00:00
Jonathan Corwin 46a4bade8c Transparent themes 2012-01-04 17:19:49 +00:00
Mattias Põldaru 6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru 1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Mattias Põldaru 85a92455d1 Apply formatting tags to alerts. 2012-01-03 01:43:59 +02:00
Stevan Pettit 34eb37a4f4 Modified statement to avoid duplicate code execution 2012-01-01 08:43:43 -05:00
Stevan Pettit 3b58fe88f2 Added test to open save-as dialog if save location is unavailable 2011-12-31 23:09:49 -05:00
Mattias Põldaru 14dde1f0c4 Rename EasiSlides to EasySlides
bzr-revno: 1863
2011-12-31 19:17:54 +00:00
Jon Tibble e1a4837a19 Long line 2011-12-31 17:36:23 +00:00
Mattias Põldaru a0ecae3f47 Rename EasiSlides to EasySlides.
Fixes: https://launchpad.net/bugs/904384
2011-12-31 16:18:05 +02:00
Mattias Põldaru 185cc5487a Use cgi.escape instead of simply replacing tags, also escaping & was missing. 2011-12-30 15:00:08 +02:00
Andreas Preikschat 68ee74f72f - download theme screenshots in a thread to speed up the FTW
bzr-revno: 1860
2011-12-30 08:59:02 +01:00
Andreas Preikschat 214bd37057 fixed method name 2011-12-29 20:41:25 +01:00
Tim Bentley 93a59d560f Another year has passed by
bzr-revno: 1859
2011-12-29 17:50:42 +00:00
Andreas Preikschat 20ef9b9730 download theme screenshots in a thread 2011-12-29 13:26:37 +01:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jonathan Corwin 2b9f09b32a Minor fixes 2011-12-23 21:52:54 +00:00
Mattias Põldaru b48dda3c74 Converts <> marks to &lt;&gt; to make it impossible to insert HTML to alerts.
Fixes: https://launchpad.net/bugs/908197
2011-12-23 21:14:49 +02:00
Jonathan Corwin 70ffa5b988 Head 2011-12-23 18:37:27 +00:00
Jonathan Corwin 5600946e0e divergences 2011-12-23 17:35:58 +00:00
Jonathan Corwin ec035d6d37 Set correct monitor in wizard 2011-12-23 17:25:05 +00:00
Jonathan Corwin 3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00:00
Martin Zibricky 5f6962f4c7 This fixes bug #906926.
bzr-revno: 1854
Fixes: https://launchpad.net/bugs/906926
2011-12-22 23:36:22 +02:00
Jonathan Corwin 69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Martin Zibricky 79c5a3a4d4 refactoring: merge with trunk and use sys.platform 2011-12-22 19:29:55 +01:00
Martin Zibricky 4071bc8deb remove disabling opengl - done in new branch 2011-12-22 19:21:22 +01:00
Martin Zibricky 6828fc9ef5 fixed bug 907857: opengl rendering disabled for mac 2011-12-22 19:17:35 +01:00
Martin Zibricky 82728e148e #906926 fix stay on top for OS X 2011-12-22 15:46:47 +01:00
Jonathan Corwin 1cd3206f96 Redundant imports 2011-12-22 13:23:04 +00:00
Jonathan Corwin 16043527fc Check for Unity instead 2011-12-22 12:27:54 +00:00
Jonathan Corwin b9c1da189a Head 2011-12-21 21:19:52 +00:00
Jonathan Corwin febf40884f Just remove X11 bypass 2011-12-21 21:19:35 +00:00
Meinert Jordan e974df4c54 recover v1.x theme file names from XML info
bzr-revno: 1847
2011-12-20 20:25:27 +00:00
Meinert Jordan d94816d481 recover v1.x theme file names from XML info
bzr-revno: 1846
2011-12-20 20:23:36 +00:00
M2j cc37336ec5 make mediacontroller sliders reacting on scroll wheel (Bug #899312) 2011-12-19 23:46:31 +01:00
Andreas Preikschat 8bfaa22535 added missing ) 2011-12-18 20:46:56 +01:00
Andreas Preikschat 9e03e18653 added floft to the list of packagers 2011-12-18 20:44:41 +01:00
Tim Bentley 0a9ea54bf8 Fix remote hiding of screen and updating UI buttons
bzr-revno: 1841
2011-12-16 15:06:14 +00:00
Andreas Preikschat 36d6a9003d Shortcut can be assigned twice in certain circumstances)
Description of the fix:
1) Create a dict with the shortcuts as keys and a list of actions using this shortcut as value.
2) When we add a new action/shortcut we check if the shortcut is valid. If this is the case we add it to the dict and if not we remove the shortcut.

bzr-revno: 1840
2011-12-16 15:04:51 +00:00
M2j 99fc7dea18 v1 theme import moved to seperate method 2011-12-15 21:14:12 +01:00
Tim Bentley 55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Mattias Põldaru cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley acebb85055 more changes 2011-12-15 17:19:54 +00:00
Jonathan Corwin 3874363e54 Add a more specific test for gnome shell 2011-12-14 22:44:41 +00:00
Tim Bentley 58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley fa1a721c26 Head 2011-12-14 19:07:56 +00:00
Tim Bentley c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
M2j f733db0e5a Head 1834 2011-12-13 01:15:39 +01:00
M2j 0c06569dc5 Bug #882819 - recover v1.x theme file names from XML info 2011-12-13 00:46:04 +01:00
Jonathan Corwin 16f798e404 Attempt to check for gnome version 2011-12-12 22:10:37 +00:00
Jonathan Corwin d2659a64fc Add a couple of keywords for the SOF5 importer to capitalize correctly.
When a presentation controller is not enabled, only check if the app is available when necessary to prevent it loading.
Fix so LibreOffice 3.4 will close down correctly at the end when no other docs are open.

bzr-revno: 1834
2011-12-12 19:20:51 +00:00
Tim Bentley 143f65f476 Fix review comments 2011-12-12 18:00:12 +00:00
Tim Bentley 4211f196cd Fix review comments 2011-12-12 17:22:40 +00:00
Tim Bentley 4430deb207 Head 2011-12-12 17:21:23 +00:00
Jonathan Corwin 6a8f54b5f8 Start disabled presentations only when necessary. Try and shutdown Impress at the end correctly 2011-12-11 21:59:10 +00:00
Jon Tibble 85e2967854 Fix logging theme names 2011-12-11 16:23:24 +00:00
Jon Tibble e5d1fca74d Previous fix broke on non-Windows, try again 2011-12-11 15:31:44 +00:00
Jon Tibble 26df14e43c Fix v1 theme importing 2011-12-11 14:53:44 +00:00
Andreas Preikschat f1485aba47 r1830 + resolved conflict 2011-12-10 21:35:11 +01:00
Mattias Põldaru c2397af633 Ensure that action category names are unicode, to prevent warnings on comparison. Also a fix for a path problem.
bzr-revno: 1830
2011-12-10 20:31:16 +00:00
Tim Bentley b07e10282d clean up service 2011-12-10 14:34:28 +00:00
Andreas Preikschat 08743f147c replaced has_key 2011-12-10 15:10:56 +01:00
Andreas Preikschat 3cde99d9d9 update map when shortcuts change 2011-12-10 15:03:41 +01:00
Tim Bentley 1d673caff4 Fixes and notifications 2011-12-10 08:45:17 +00:00
Andreas Preikschat 4eee13430e -Fixed media item recreation (which caused bug #900399)
- Doc/method clean up
- Replaced continue with break
- Replaced method with one-liner

bzr-revno: 1827
2011-12-09 17:32:17 +01:00
Mattias Põldaru 1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
rimach 1cffe2bffa add freeBSD vlc support 2011-12-08 21:51:44 +01:00
Christian Richter b0f0d8030d Fixed a traceback when replaying live video background when no service item has been sent live before.
bzr-revno: 1826
Fixes: https://launchpad.net/bugs/899665
2011-12-08 22:27:22 +02:00
Andreas Preikschat 12547fad2a doc clean up, removed method with a one liner, fixed media item recreation bug 2011-12-07 21:25:12 +01:00
rimach f1bc18c33c remove print statement from webkitplayer.py 2011-12-07 21:20:23 +01:00
rimach b5dfba86fb bugfixing 2011-12-06 22:42:34 +01:00
rimach bb4f2fd113 correct import check 2011-12-06 22:19:37 +01:00
Jon Tibble 04d7669948 Fix non-ascii file check on Macs 2011-12-05 21:40:56 +00:00
rimach 2df4a1903e bugfixing 2011-12-05 19:48:32 +01:00
rimach ae5998e2dc sync 2011-12-05 18:43:54 +01:00
Jon Tibble a54e7ff709 Fix non-ascii service filename loading 2011-12-04 20:57:58 +00:00
Jon Tibble 5804dade74 Reduce recent file list duplication (Bug #892668) 2011-12-04 14:42:39 +00:00
Andreas Preikschat b78bb1c7e6 fixed tooltip strings 2011-12-03 21:35:53 +01:00
Andreas Preikschat f34ae80eec fixed bug 887313
Fixes: https://launchpad.net/bugs/887313
2011-12-03 19:01:36 +01:00
Tim Bentley 13ec25eef5 Fix the plugin Disabled route as it has never been tested
Stop plugins being available if the database is more advanced than the code.

bzr-revno: 1815
2011-12-03 14:42:44 +00:00
Jon Tibble 9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Tim Bentley 1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
rimach 8412caf006 new version of vlc.py 2011-12-03 00:45:05 +01:00
Jon Tibble 02f5e819fb Revert broken old incomplete thought 2011-12-02 22:23:37 +00:00
rimach 2c225c19a0 bugfixing 2011-12-02 23:00:28 +01:00
Jon Tibble bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble e526687c71 Cleanup fix 2011-12-02 21:33:11 +00:00
Jon Tibble f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Jon Tibble bba6d6730f Head r1812 2011-12-02 20:17:57 +00:00
rimach 11acf005e2 add empty line 2011-12-02 16:15:31 +01:00
rimach cc2c58d9dc sync with trunk 2011-12-02 16:12:59 +01:00
Raoul Snyman 24095edc2b Added a missing import.
Fixes: https://launchpad.net/bugs/898876
2011-12-02 08:59:32 +02:00
Christian Richter e8f0bf5cd1 Rewrite of the multimedia stuff.
bzr-revno: 1810
2011-12-02 08:56:57 +02:00
rimach 4fc4bacfa7 bugfixing 2011-12-01 19:08:12 +01:00
rimach e627960391 bugfixing 2011-12-01 19:07:15 +01:00
Tim Bentley 8fee84d052 Stop keyboard floods getting the slide controller and service manager out of set.
bzr-revno: 1808
Fixes: https://launchpad.net/bugs/892571
2011-11-30 22:27:54 +02:00
rimach af63888e31 sync 2011-11-30 21:16:05 +01:00
rimach 6ed1342f95 sync 2011-11-30 21:14:18 +01:00
rimach 44d71dcee7 bugfixing 2011-11-30 18:10:57 +01:00
rimach 58035f505d bugfixing 2011-11-30 18:06:57 +01:00
rimach 3570e48732 remove unused function 2011-11-30 09:29:32 +01:00
Tim Bentley 8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley 4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Tim Bentley ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
Jon Tibble ac365e5b6a Cleanups 2011-11-26 21:26:50 +00:00
Jon Tibble fb6403f003 Head r1804 2011-11-26 20:32:47 +00:00
M2j 047477c236 layout fix in exceptionform
bug fix triggerd by searching for nonexistend book numbers
2011-11-26 20:13:51 +01:00
rimach 7e0337a00d sync 2011-11-24 22:12:32 +01:00
rimach d104671a4c bugfixing 2011-11-24 22:11:41 +01:00
rimach d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
rimach dcbff07f29 sync 2011-11-24 22:09:26 +01:00
Tim Bentley 5e702c1782 Fixes keyboard flood where events are switched order by PYQT.
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
2011-11-23 06:05:42 +00:00
Andreas Preikschat 0320f88d72 do not load the list twice when copying a theme 2011-11-19 13:00:36 +01:00
Tim Bentley d5331f50b3 Amend check for files and delete if not used any more
Fixes: https://launchpad.net/bugs/891781
2011-11-18 19:34:04 +00:00
Tim Bentley ddc6c26f33 Head 2011-11-13 08:58:07 +00:00
rimach acffe7a66a rename media_player.py 2011-11-12 16:31:58 +01:00
rimach 870a70ab3a rename media_player.py 2011-11-12 16:30:41 +01:00
rimach 7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach a113c64464 bugfixing 2011-11-11 17:46:46 +01:00
rimach 087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach c0cc590c71 sync 2011-11-11 17:42:01 +01:00
Andreas Preikschat 48354ec8ef - fixed bug #827862 (Add Shortcut to change verse, chorus, ... in the live controller)
bzr-revno: 1797
Fixes: https://launchpad.net/bugs/827862
2011-11-05 20:39:51 +01:00
Tim Bentley d71f059433 Fix impress and service theme problems 2011-11-04 20:09:35 +00:00
rimach 4779a3f21a Head and bugfixing 2011-11-02 21:44:44 +01:00
rimach 1c35195f6a sync 2011-11-02 21:39:18 +01:00
rimach 2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Tim Bentley d4eeb4136a stop alerts crashing with splash screen
bzr-revno: 1793
2011-11-01 06:09:21 +00:00
Tim Bentley 14527bf357 Fix my stupidity 2011-10-31 18:20:10 +00:00
Andreas Preikschat 71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00
Andreas Preikschat 94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat e856fa9aed r1790 2011-10-31 09:56:48 +01:00
Andreas Preikschat 5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat 2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
Andreas Preikschat eb7b7a19d8 r1790 2011-10-31 08:09:48 +01:00
Andreas Preikschat d1030a7c2d Corrected comment 2011-10-31 08:08:51 +01:00
Tim Bentley c37ffbe3e2 Pass in plugins 2011-10-31 06:03:03 +00:00
Tim Bentley c8e9496db1 Fix up review comments 2011-10-29 20:13:11 +01:00
Tim Bentley ea4cb7f7ed Add Class instead of magic numbers 2011-10-29 14:21:54 +01:00
Tim Bentley 8e853f10b1 Fix crash with alerts over video
Change default to bottom from middle
Remove unused from from previous merge

Fixes: https://launchpad.net/bugs/875798, https://launchpad.net/bugs/883414
2011-10-29 10:33:48 +01:00
rimach 01ff00dcf9 bugfixing and sync 2011-10-26 22:13:30 +02:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat 360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat 33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat a42940b6bb - shortcuts only for live controller
- removed v shortcut
2011-10-24 17:36:59 +02:00
Andreas Preikschat cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat b603017b1c started work on shortcuts allowing jumping between different verses
Fixes: https://launchpad.net/bugs/827862
2011-10-23 19:47:15 +02:00
Tim Bentley 5f9ed32bfe Fix assignment error 2011-10-23 18:22:11 +01:00
Meinert Jordan f25cd069ab add version information for mako, migrate and uno to exceptionform
bzr-revno: 1784
2011-10-22 15:32:04 +02:00
M2j 5a415311a5 Correction for Migrate version smaller than 0.7 2011-10-22 14:30:21 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
M2j aa0b49290d add version information for mako, migrate and uno to exceptionform 2011-10-20 22:11:06 +02:00
Andreas Preikschat e5401c7eac - fixed bug 871441 (Live Preview image is not updated when you "Replace live background")
- removed dead code
- fixed docstrings
- removed 'maindisplay_active' signal in same places

bzr-revno: 1781
2011-10-19 19:30:32 +01:00
Tim Bentley 9603fcd1cc Fix bug 836897 to allow Alerts to be amended without changing the slide
Refactored the CSS,Javascript,Html load code for alerts and provided a framework for other things.

bzr-revno: 1779
Fixes: https://launchpad.net/bugs/836897
2011-10-19 19:25:08 +01:00
Tim Bentley 4d3dd6dbb5 Rename signal 2011-10-19 18:53:07 +01:00
rimach 2d870bd90c bugfixing and sync 2011-10-17 23:54:06 +02:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
rimach dbf77e2fb4 bugfixing 2011-10-17 23:35:44 +02:00
Meinert Jordan 972d917c8a Remove mailto code and use QT code
bzr-revno: 1777
Fixes: https://launchpad.net/bugs/863841
2011-10-17 17:46:35 +01:00
Tim Bentley bf2ada0b67 Fix up review comments 2011-10-16 16:39:49 +01:00
Andreas Preikschat 406ea9fe0a r1776 + resolved conflict 2011-10-16 17:21:25 +02:00
Andreas Preikschat 004472baa8 reverted alert change 2011-10-16 16:53:39 +02:00
Tim Bentley 8ebf7ff131 Finish dynamic Alert updates 2011-10-16 08:59:21 +01:00
M2j 525658ae8b better readable coding style 2011-10-15 23:21:22 +02:00
M2j 1527704c03 - exception dialog uses Qt call instead of external library
- unicode support in report and attached filename was broken
2011-10-15 22:18:49 +02:00
Andreas Preikschat 9259eed4a6 -fixed bug 871272
-clean ups

Fixes: https://launchpad.net/bugs/871272
2011-10-15 13:30:39 +02:00
Andreas Preikschat a1a79c98d1 overwrite parent method 2011-10-15 09:52:25 +02:00
Andreas Preikschat ec5991a197 removed dead code§ 2011-10-15 09:36:51 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00