Commit Graph

3240 Commits

Author SHA1 Message Date
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
Tim Bentley bb8b0cd435 Move the Alert web code back to the plugin 2011-10-13 06:14:03 +01:00
Tim Bentley e87b4658d8 fix up alert changing triggers 2011-10-11 20:54:18 +01:00
Tim Bentley 9176911810 Try 1 2011-10-11 19:10:53 +01:00
Andreas Preikschat 76f47a4f62 - clean ups
- only display alert when the screen is not hidden
2011-10-10 18:54:01 +02:00
Andreas Preikschat 658e8f234b clean ups 2011-10-10 18:37:46 +02:00
Andreas Preikschat 6883427cbd fixed bug 871441
Fixes: https://launchpad.net/bugs/871441
2011-10-10 18:22:41 +02:00
Andreas Preikschat 06068eedce fixed bug 863846
Fixes: https://launchpad.net/bugs/863846
2011-10-08 15:29:35 +02:00
Tim Bentley 161300fe73 Number of changes
- Allow time (24/12) hour for sage view
- Add pictorial display of the lay out in theme manage
- Fix bug where remote edit removes an overridden theme.

bzr-revno: 1770
2011-10-05 19:20:54 +01:00
Tim Bentley 575aa02022 Amend text 2011-10-05 18:18:56 +01:00
Andreas Preikschat 45b296b741 clean up 2011-10-05 19:04:59 +02:00
Tim Bentley 159a95855f Change Text 2011-10-05 17:14:21 +01:00
Andreas Preikschat 1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview
Fixes: https://launchpad.net/bugs/856296
2011-10-03 19:27:34 +02:00
Tim Bentley 5053e27c76 Fix up review comments 2011-10-03 17:53:54 +01:00
Tim Bentley 9f9f2186ae Minor performance improvement 2011-10-02 20:57:42 +01:00
Tim Bentley 6426d9aac4 Display is now big enough 2011-10-02 17:38:05 +01:00
Tim Bentley 297a250010 Display works but bigggggggggg 2011-10-02 08:52:28 +01:00
Tim Bentley 9b5074991c Add new dialog 2011-10-01 21:33:53 +01:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
Tim Bentley 128b6b80bf Display now works 2011-09-29 18:57:48 +01:00
rimach 3261dc01f1 sync with head and update 2011-09-28 23:00:43 +02:00
rimach 33d9ce07ac sync with head 2011-09-28 22:57:01 +02:00
rimach c299efab1a update 2011-09-28 22:54:43 +02:00
Tim Bentley 9142ffb488 more visible lines 2011-09-28 21:43:30 +01:00
Tim Bentley ff32139b2e refactor code to stop duplicate code 2011-09-28 18:39:26 +01:00
Tim Bentley 632e2ce2dd More fixes 2011-09-28 05:50:56 +01:00
Tim Bentley 3e2e87bb2c Initial stab
Fixes: https://launchpad.net/bugs/814201
2011-09-27 20:37:34 +01:00
Tim Bentley 276d4045e3 Fix edit for tags loaded for song which is not saved
bzr-revno: 1765
2011-09-27 18:23:21 +01:00
Tim Bentley 695e08a63a get the right field 2011-09-26 19:56:52 +01:00
Tim Bentley 7fe57a9a5d Make Int 2011-09-26 19:12:27 +01:00
Tim Bentley fb3f001c26 Add Justify theme option
bzr-revno: 1762
Fixes: https://launchpad.net/bugs/802252
2011-09-26 17:07:30 +01:00
Tim Bentley 682e822d21 Clean up 2011-09-25 08:27:09 +01:00
Tim Bentley 88c09d8981 Correct problem it tags not being used on song load 2011-09-25 07:37:40 +01:00
Raoul Snyman 0aadc32d4f Fixed the last part of bug #855342 where when you save a file a few times, it throws an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-24 00:14:23 +02:00
Martin Zibricky 3492681ca2 [merge] merge with truk r1756 2011-09-23 02:43:51 +02:00
Martin Zibricky 7d016dd6a6 Fix regressions with formattingtagsform 2011-09-23 02:41:01 +02:00
Martin Zibricky 354bec8b33 Fix - do not save temporary key by formatting tags into openlp configuration 2011-09-22 22:30:15 +02:00
rimach 81be1f36ae bugfixing and sync with trunk 2011-09-22 21:21:34 +02:00
rimach d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
rimach 18bda31ee9 correct merge proposal issues 2011-09-22 20:22:35 +02:00
Martin Zibricky 8b6887036b Fix regressions with users tags in preview and import/export in openlyrics 2011-09-22 16:23:51 +02:00
Raoul Snyman e3ecee8ae5 Fixed bug #855342 where saving an already-saved service file with an audio file in it caused an exception.
Fixes: https://launchpad.net/bugs/855342
2011-09-21 22:47:30 +02:00
Martin Zibricky c47f936fd5 [merge] Merge with trunk r1754 2011-09-21 01:08:46 +02:00
Raoul Snyman 429a1a4541 Remove reference to the non-existent __del__ method.
Fixes: https://launchpad.net/bugs/854125
2011-09-19 20:55:34 +02:00
Martin Zibricky fa9287c11b [merge] Merge with trunk r1750 2011-09-19 00:45:19 +02:00
Stevan Pettit 0b6cc6134a Added a "Finish" button to the "No-internet" window of the First Time Wizard.
Added code to this button to process any changes made in the plugin screen.

bzr-revno: 1749
2011-09-18 14:09:32 +01:00
Stevan Pettit c44b4dccf2 Fixed import statements 2011-09-17 18:33:03 -04:00
Tim Bentley 6a901f2de9 Add justify to theme options
Fixes: https://launchpad.net/bugs/802252
2011-09-16 18:23:39 +01:00
Martin Zibricky 8c87d89301 [merge] merge with trunk r1744 2011-09-13 22:37:19 +02:00
Stevan Pettit 1d06562c69 added QCoreApplication.exit() to cancel button 2011-09-13 13:20:51 -04:00
Stevan Pettit 25cb0ac22e Added "Finish" button to no-internet screen. Changed window message 2011-09-12 20:13:12 -04:00
Martin Zibricky 50dbb1ed0b [merge] merge with trunk r1743 2011-09-12 22:36:41 +02:00
Raoul Snyman 2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Stevan Pettit c04be6775f Added code to remove obsolete settings entries 2011-09-11 08:29:08 -04:00
Martin Zibricky a3ff14d337 [merge] merge with trunk r1742 2011-09-10 19:28:11 +02:00
Stevan Pettit e560371e53 Added code to allow canceling of downloads and to completely bypass any downloads is there is no internet access in the First Time Wizard
bzr-revno: 1742
Fixes: https://launchpad.net/bugs/836980, https://launchpad.net/bugs/836611
2011-09-09 07:45:43 +02:00
Stevan Pettit 2c589f8b0e Added code to allow canceling of file downloads. Fixed aparent hang if no internet connection. 2011-09-08 09:14:51 -04:00
Tim Bentley e93a1d2687 Hide the screen on startup if only 1 screen
Fixes: https://launchpad.net/bugs/800156
2011-09-06 20:32:30 +01:00
Martin Zibricky 46203297de [merge] merge with trunk r1740 2011-09-06 12:48:19 +02:00
Stevan Pettit 796e779300 Fixed various issues around the exporting and importing of settings.
bzr-revno: 1740
Fixes: https://launchpad.net/bugs/838831
2011-09-05 19:21:12 +02:00
Stevan Pettit b90796da45 Cleaned up some code 2011-09-05 09:03:30 -04:00
Martin Zibricky bd503f5c7d [merge] merge with trunk r1739 2011-09-05 12:48:46 +02:00
Raoul Snyman 11f5a29b6d Added some openlp_process_events signals and move the hiding of the finish button higher up in the code.
Fixes: https://launchpad.net/bugs/837319
2011-09-04 23:00:37 +02:00
Stevan Pettit 30c09f9b4b Change local variable names in settings import/export routines. Changed string search 2011-09-03 16:38:25 -04:00
Stevan Pettit 50a5b98f8c Fixed problems with "shortcuts" section of export/import file 2011-09-02 18:57:02 -04:00
Martin Zibricky 9a74b05a1f [merge] merge with trunk r1735 2011-09-02 23:31:42 +02:00
Raoul Snyman 2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file.
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
2011-08-31 09:49:57 +02:00
Raoul Snyman 0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
Raoul Snyman 8b8b4fbf51 HEAD 2011-08-30 21:42:12 +02:00
Mattias Põldaru af10011c0c This seems to fix
819271, web NIV download from Bibleserver crash.
No crash (257) and performance jump and reduced memory usage on loading services with huge files.
Fixed filename comparison on drag and drop.

bzr-revno: 1734
2011-08-30 19:06:45 +01:00
rimach 709037ccca review changes part 2 and Head 2011-08-30 18:58:12 +02:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach 169f8a2942 review changes 2011-08-29 23:52:26 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
Raoul Snyman 540c717dbb Started work on an audio player with a playlist. 2011-08-29 22:39:15 +02:00
rimach d7f4298fbb bugfixing and Head 2011-08-29 21:59:12 +02:00
rimach 20c9813d26 Head 2011-08-29 21:56:46 +02:00
rimach c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman bbc8e04a3f HEAD 2011-08-29 20:46:01 +02:00
Stevan Pettit 7cbccb6b70 Added code to reload Bible list after first time wizard is rerun
bzr-revno: 1731
2011-08-29 17:54:09 +01:00
Mattias Põldaru 44c4febd29 Merge with upstream 2011-08-29 16:08:50 +03:00
Andreas Preikschat d061436a35 replaced Ini by config 2011-08-29 08:30:31 +02:00
Raoul Snyman 532ad84b87 - Bundle audio files with the song when adding it to the service
- Save audio files with service
- Load audio files from service
- Copy audio files to songs plugin when adding a song from a service.
2011-08-28 22:51:44 +02:00
Raoul Snyman 0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Raoul Snyman 015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
Stevan Pettit bf1d8c239f Added code to mainwindow.py to allow exporting/importing of OpenLP settings to an INI file.
During importing, the selected file is checked to insure it is an OpenLP settings file.
The user is warned prior to the import that changes will be made.

I also changed the settings section of an entry in servicemanager from "service" to "servicemanager".

I changed my nick in about.

Changed the import restart message.
Removed need for "import string".
Fixed the Try:

Changed filetype of export settings file from .ini to .conf

bzr-revno: 1728
2011-08-28 18:41:07 +01:00
Stevan Pettit 9957419f2b Changed system exit call 2011-08-28 09:39:34 -04:00
Andreas Preikschat f3691516fd import tags from xml (part 1) 2011-08-27 16:00:24 +02:00
Stevan Pettit 3722253bcf Added code to process any Bibles downloaded during the re-run of the First Time wizard 2011-08-26 23:14:30 -04:00
Andreas Preikschat 627b9429aa documented formatting tags; added infrastructure to allow temporary formatting tags 2011-08-26 16:27:53 +02:00
Stevan Pettit 24126e74c8 Changed filetype of settings file from .ini to .conf 2011-08-26 09:14:12 -04:00
Tim Bentley 61feddd34e Fix method call 2011-08-26 11:21:47 +01:00
Stevan Pettit d927adbe5a Changed import re-start message. Removed need for "import string" 2011-08-25 14:40:44 -04:00
Tim Bentley 803adc92c0 Fixes 2011-08-25 19:33:25 +01:00
Tim Bentley ba3fb9221e Head 2011-08-25 19:22:38 +01:00
Stevan Pettit 215abd2966 Merged with trunk 2011-08-25 08:15:31 -04:00
Stevan Pettit 9b4df37a77 Modified code to handle keys with _ 2011-08-24 12:17:24 -04:00
rimach d64d22533f preview issue fixed, sync with trunk 2011-08-23 22:29:11 +02:00
rimach 229fe56305 Head 2011-08-23 22:28:09 +02:00
rimach 565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
Stevan Pettit 131c9f90b5 Modified shutdown from sys.exit to os._exit 2011-08-23 08:11:41 -04:00
Tim Bentley 957a86b11e fexes 2011-08-22 18:32:18 +01:00
Stevan Pettit b36a4f74d3 Fixed traceback error when adding ini to filename 2011-08-21 19:15:16 -04:00
Stevan Pettit 79ab8cc1c0 Added code to always create a filename.INI file. 2011-08-21 10:05:24 -04:00
Tim Bentley 21bf34c436 Theme fix 2011-08-21 06:33:07 +01:00
Andreas Preikschat 8108e279dc changed menu shortcut letter 2011-08-20 21:36:51 +02:00
Tim Bentley 3c17af592d Fix autoupdates 2011-08-20 16:02:57 +01:00
Tim Bentley cc1e174d62 Updates 2011-08-20 14:21:25 +01:00
Tim Bentley 9e6d05098b 1715 2011-08-20 12:46:18 +01:00
Tim Bentley ad61defdae Add border colors and fix song usage 2011-08-20 12:45:06 +01:00
Andreas Preikschat 9363177e9d - Fixed bug #804747 (Bible disappear after upgrade)\n- Fixed bug Bug #824129 (Bibles plugin does not always delete corrupted bibles from falied imports)\n- Removed not needed or redundant variables.\n- Removed not needed code.\n- When upgrading bibles move the files to the temp directory.\n- clean ups
bzr-revno: 1714
Fixes: https://launchpad.net/bugs/804747, https://launchpad.net/bugs/824129
2011-08-20 10:23:18 +02:00
Stevan Pettit 9f284d9ab2 Moved export/import settings menu items from tools to file menu. Added status-tips 2011-08-18 22:43:08 -04:00
Stevan Pettit b95924ae74 Added code to export/import settings via an ini file 2011-08-16 22:58:07 -04:00
Raoul Snyman ca5c8d9a0b Fixed bug #802146: Couldn't import some SongShowPlus files. Rearranged the file menu as well to be in a more logical order, and to look a little nicer.
Fixes: https://launchpad.net/bugs/802146
2011-08-16 23:19:57 +02:00
Mattias Põldaru a3ddb50479 Now we do not read several GB video files entirely into memory when opening service, this also fixes #257 in tracker. 2011-08-16 01:46:31 +03:00
Andreas Preikschat 9865e2b73a r1710 2011-08-15 11:30:36 +02:00
Andreas Preikschat 17e397ffa8 added spellchecker to service notes dialog (bug #825979); escape texts in various places (bug #825983)
Fixes: https://launchpad.net/bugs/825983, https://launchpad.net/bugs/825979
2011-08-14 15:05:39 +02:00
Andreas Preikschat ec93173891 r1708 2011-08-13 12:41:57 +02:00
Andreas Preikschat 0924bfc246 fixed bug #804747; clean ups
Fixes: https://launchpad.net/bugs/804747
2011-08-12 15:11:30 +02:00
Andreas Preikschat cb16463d99 moved recent files to a menu (bug #818794)
bzr-revno: 1708
Fixes: https://launchpad.net/bugs/818794
2011-08-11 13:40:52 +02:00
Stevan Pettit f92552735f fixed bug 802150 (Attempt to save a service causes a crash when image/media/presentation files do not exist)
bzr-revno: 1707
Fixes: https://launchpad.net/bugs/802150
2011-08-11 11:20:29 +02:00
Andreas Preikschat ba02eb6a98 moved recent files to a menu (bug #818794)
Fixes: https://launchpad.net/bugs/818794
2011-08-11 11:01:25 +02:00
Stevan Pettit c0978d8e22 Added code to skip-all missing files during service save 2011-08-10 17:29:44 -04:00
Andreas Preikschat f2090100a1 Fixed link to 'Contributing' site.
bzr-revno: 1705
2011-08-08 10:46:07 +02:00
Andreas Preikschat c27d50bdda fixed link to 'Contributing' site 2011-08-08 08:30:25 +02:00
Andreas Preikschat ffbfd1efe9 - improved code readability
- updated docstrings

bzr-revno: 1704
2011-08-07 16:37:40 +02:00
Stevan Pettit 392c103476 Fixed bug #818791 ("Reorder Service Item" does not manage two instances of the same image)
bzr-revno: 1703
Fixes: https://launchpad.net/bugs/818791
2011-08-06 16:06:28 +02:00
Stevan Pettit 271e5341f8 modified code to delete/move item selected, not first match in list 2011-08-05 18:09:51 -04:00
Stevan Pettit a66f7f3365 removed un-needed commented code. fixed dialog "no" answer 2011-08-05 17:53:56 -04:00
Tim Bentley 4e043e1dcf Add DnD to Openlp form outside
bzr-revno: 1701
2011-08-05 09:55:37 +01:00
Andreas Preikschat 383d512c22 r1700 2011-08-05 09:26:48 +02:00
Stevan Pettit 5e6c60da88 Modified firsttimeform to include existing themes in the set default theme list, if the wizard is being re-run.
bzr-revno: 1700
2011-08-05 07:52:44 +02:00
Stevan Pettit b4e776b92c removed un-needed code 2011-08-04 09:43:05 -04:00
Tim Bentley ecd7a197de Fix conflict 2011-08-04 05:51:41 +01:00
Stevan Pettit 7f440527f8 modified servicemanager to check for missing files during service save 2011-08-03 14:49:47 -04:00
Stevan Pettit af7ff7c6be changed some comments, removed a variable using functioin inline 2011-08-03 09:19:43 -04:00
Andreas Preikschat dd3daa0576 - changed "Customize Shortcuts" to "Configure Shortcuts"
- fixed bug #816382 (Formatting Tags or Display Tags?)

bzr-revno: 1699
Fixes: https://launchpad.net/bugs/816382
2011-08-02 21:18:44 +02:00
Tim Bentley 0b46165429 Last set of fixes 2011-08-02 19:17:07 +01:00
Stevan Pettit af8a89dfd4 fixed come comments 2011-08-02 08:51:41 -04:00
Stevan Pettit c608a0750d Modified firsttimeform to include existing themes when wizard is re-run 2011-08-01 21:58:10 -04:00
Tim Bentley c9c0904c31 Head 2011-07-30 17:00:11 +01:00
Stevan Pettit 4db1e54023 Added the ability to re-run the First Time Wizard (bug #801325)
bzr-revno: 1698
Fixes: https://launchpad.net/bugs/801325
2011-07-30 14:24:08 +02:00
Andreas Preikschat 4f195a4721 changed translate context 2011-07-30 09:43:19 +02:00
Andreas Preikschat b3896d880b spelling 2011-07-30 09:40:34 +02:00
Andreas Preikschat c0976a4690 moved files and changed code to reflect string changes
Fixes: https://launchpad.net/bugs/816382
2011-07-30 09:34:37 +02:00
Andreas Preikschat 06d32e5108 change 'Display Tag' strings to 'Formatting Tag'
Fixes: https://launchpad.net/bugs/816382
2011-07-30 09:19:16 +02:00
Andreas Preikschat 77f7581d22 change 'Display Tag' strings to 'Formatting Tag'
Fixes: https://launchpad.net/bugs/816382
2011-07-30 09:14:39 +02:00
Andreas Preikschat f0d4afaaf6 improved code readability 2011-07-30 08:33:51 +02:00
rimach crichter@web.de 2e69c00cf1 resolve volume settings problem in phononapi 2011-07-28 22:50:20 +02:00
rimach crichter@web.de f1d7284e8d resolve volume settings problem in phononapi 2011-07-28 22:49:43 +02:00
rimach crichter@web.de 9af26bac34 fix media loading in Service bug, sync with trunk 2011-07-28 22:36:19 +02:00
rimach crichter@web.de ea7e03406c fix loading media in Service bug 2011-07-28 22:34:20 +02:00
Stevan Pettit 7c13fcfaad Minor text change to FTW message in mainwindow 2011-07-27 16:38:23 -04:00
Tim Bentley f1902ade5a Fix up drag and drop code 2011-07-27 19:28:35 +01:00
Stevan Pettit e40f561976 minor changes to text in mainwindow.py 2011-07-27 13:04:31 -04:00
Stevan Pettit 1ffe0e961d Added status tips for FTW menu item. Removed some continuation characters 2011-07-26 20:30:56 -04:00
rimach crichter@web.de 4cb65187e7 add Starttime to phonon api and sync with trunk 2011-07-25 23:10:25 +02:00
rimach crichter@web.de ed9d704db9 Head 2011-07-25 23:06:43 +02:00
rimach crichter@web.de 1c63ef3ea1 add starttime for python and vlc 2011-07-25 22:56:39 +02:00
Stevan Pettit c84c69645e added docstring to FTW section. changed menu text, changed default button to No 2011-07-25 15:24:35 -04:00
Stevan Pettit 0d9f6a946e modified slidecontroller to "reset" the loop button when new item is sent live 2011-07-24 15:41:33 -04:00
Andreas Preikschat 187bb647c0 - improved rendering speed by checking if the text fits as a whole (to save time figuring out that it fits as a whole)
- use binary chop to find the number of lines which will fit on a slide (if it does not fit as a whole)
- do not use instance variables as arguments
- renamed image_manager to imageManager and theme_manager to themeManager as the classes are derived of Qt

Some changes to html (html5):
- added doctype
- removed obsolete language attribute

bzr-revno: 1694
2011-07-24 19:52:53 +02:00
Tim Bentley 0b44825d0c Allow the up and down selection to step over collapsed service items
bzr-revno: 1693
Fixes: https://launchpad.net/bugs/805084
2011-07-24 18:47:54 +01:00
Stevan Pettit 90c18b6bfd changed plugin names to lowercase, removed .lower() from appropriate code 2011-07-23 17:29:24 -04:00
Stevan Pettit 8800b41749 Added confirmation message prior to re-start of FTW 2011-07-23 14:09:13 -04:00
Stevan Pettit f7a222da6c modified mainwindow.py code to make first time wizard re-run inline code 2011-07-23 08:52:43 -04:00
Tim Bentley c813b31427 Correct up and down selection for service manage panel
Fixes: https://launchpad.net/bugs/805084
2011-07-23 06:48:55 +01:00
Stevan Pettit b15fd4df49 modified mainwondow.py to allow first time wizard to be re-run 2011-07-22 09:39:49 -04:00
rimach crichter@web.de f1463a4467 bugfixing 2011-07-20 23:17:05 +02:00
rimach crichter@web.de c61f23370c bugfixing 2011-07-20 23:16:36 +02:00
rimach crichter@web.de 6881dd95c3 bugfixing 2011-07-20 22:48:33 +02:00
rimach crichter@web.de 210926867f bugfixing 2011-07-20 22:47:29 +02:00
rimach crichter@web.de 58f7ab3dbc Head 2011-07-19 22:06:29 +02:00
rimach crichter@web.de 146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de 45dfb28c54 update 2011-07-19 22:04:32 +02:00
rimach crichter@web.de 65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Andreas Preikschat 1214706d2a removed debug help 2011-07-18 18:20:40 +02:00
Andreas Preikschat baec0f5c69 added margin back; added missing spaces 2011-07-18 18:01:42 +02:00
Andreas Preikschat 7483c8dfe8 r1690 2011-07-18 15:24:58 +02:00
Jon Tibble 60b286ca3e Head r1689 2011-07-17 12:56:17 +01:00
Andreas Preikschat 47e43404aa - added doctype to html
- added encoding to html
- changed <br /> to <br>
- removed obsolete language attribute
2011-07-16 11:00:30 +02:00
Andreas Preikschat b51f9b2a0c - do not set a service modified when using the up/down arrows to change the selected service item
- only set the service modified when an item is selected while using the 'move button' and 'delete button'
2011-07-16 09:20:13 +02:00
Andreas Preikschat 69b0f264d0 r1686 2011-07-15 20:34:08 +02:00
Jon Tibble 40d31106b3 Head r1686 2011-07-14 19:42:38 +01:00
Tim Bentley 72cd870e48 Fix 1.9.6 String errors
bzr-revno: 1685
2011-07-14 17:18:23 +01:00
Jon Tibble 8d4369adb8 Head r1684 2011-07-12 20:06:37 +01:00
Andreas Preikschat 84d1a0d35d - Fixed bug #805082
- Removed trailing "Help"

bzr-revno: 1684
2011-07-12 16:49:19 +02:00
Jon Tibble a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
Tim Bentley b83048ff4e Fix outstanding strings in Error for translations
Fixes: https://launchpad.net/bugs/796440
2011-07-11 17:32:25 +01:00
rimach crichter@web.de 98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley 77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley 7d21d45764 missing : 2011-07-10 13:02:58 +01:00
Tim Bentley 4651ec35b6 Fixes 2011-07-10 12:59:23 +01:00
Andreas Preikschat 50bc672f59 removed the trailing 'help' 2011-07-10 12:52:30 +02:00
Andreas Preikschat 3c63ffd4a6 fixed bug 805082
Fixes: https://launchpad.net/bugs/805082
2011-07-10 12:45:52 +02:00
Tim Bentley dd302537ec Fix code 2011-07-10 07:58:15 +01:00
Tim Bentley e9fb8e59c1 Allow service item themes to change and be added back to slide controller
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
2011-07-09 08:43:35 +01:00
Tim Bentley cf9355d725 Add some formatting 2011-07-09 07:03:52 +01:00
Tim Bentley b94115d4b2 Amend tooltips so show theme for service item if present.
Fixes: https://launchpad.net/bugs/806834
2011-07-08 21:55:18 +01:00
Andreas Preikschat 2c2000f488 r1680 + conflicts 2011-07-08 15:20:14 +02:00
Stevan Pettit 6a612ee107 Modified slidecontroller to change loop button icons and captions when user select a loop to run.
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)

Added the translated button captions to ui.py

in slidecontroller, changed Qicon to build_icon

bzr-revno: 1676
2011-07-08 07:41:30 +01:00
Jon Tibble 1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble 1899961965 Long lines 2011-07-07 22:22:41 +01:00
Tim Bentley d02ee451f2 Add ability to clone a song with a full copy of it.
Add missing build_icon and line wrap error.

Slow down event generation to stop flood of messages which crash the system. UI does not notice the change.

Changes for 795980 also included

bzr-revno: 1675
Fixes: https://launchpad.net/bugs/795980, https://launchpad.net/bugs/752374, https://launchpad.net/bugs/763583
2011-07-07 21:14:12 +01:00
Jon Tibble 623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Stevan Pettit 856d44270f Changed use of Qicon to build_icon in slidecontroller 2011-07-07 13:38:13 -04:00
Stevan Pettit 1ffd5713b0 Modified slide controller to change loop button icons when selecting slide loops 2011-07-07 11:23:55 -04:00
Andreas Preikschat b68751835f r1673 2011-07-06 16:00:32 +02:00
Tim Bentley 2a73f1b188 Prevent Images and Media backgrounds being added when No service Item is present in the live controller.
Fixes: https://launchpad.net/bugs/795980
2011-07-03 09:13:48 +01:00
Tim Bentley 091cdbbc24 Slow down slidecontroller events to allow buffers to clear.
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
2011-07-02 07:48:17 +01:00
Andreas Preikschat 418c3b9c18 - use the functions context_menu_action and context_menu_separator from core/lib/ui
bzr-revno: 1672
2011-07-01 10:26:26 +02:00
Raoul Snyman dcd10f0b8f A couple of minor UI tweaks.
bzr-revno: 1671
2011-07-01 10:09:36 +02:00
Andreas Preikschat 54f8ae82e7 - improved collapse/expand all buttons in the service manager
bzr-revno: 1669
2011-06-30 16:57:42 +02:00
Andreas Preikschat deddee5668 - fixed theme copy
bzr-revno: 1668
2011-06-30 16:56:55 +02:00
Stevan Pettit ab993842ff Added code to create a main window menu item to display the Windows help file (openlp.chm) if it exists on the users machine:
- If it exists, F1 will display the local file, Alt-F1 will display the online help.
- If the help file does not exist, F1 will display the Online help (as it currently does).

bzr-revno: 1667
2011-06-30 09:48:20 +02:00
Stevan Pettit 97a76369bf Changed Windows test to os.name 2011-06-29 13:30:53 -04:00
Tim Bentley 143e697281 Add middle splitter 2011-06-29 17:11:19 +01:00
Stevan Pettit 0612a93964 Changed helpfile check to Windows condition check. Modified build script to create OpenLP.chm 2011-06-29 10:42:14 -04:00
Andreas Preikschat c2fb73dde6 do not regenerate all service items when collapsing/expanding all items 2011-06-29 16:28:10 +02:00
Andreas Preikschat 6980299697 use help function 2011-06-29 11:23:42 +02:00
Andreas Preikschat 6e3343c606 fixed theme copy 2011-06-29 11:08:53 +02:00
Andreas Preikschat 795aae2277 r1665 2011-06-29 09:27:38 +02:00
Tim Bentley 30df723358 Fixes 2011-06-29 07:12:32 +01:00
Raoul Snyman 486a427794 Minor UI tweaks. 2011-06-28 21:24:29 +02:00
Tim Bentley a167f6ef86 Make progressbar smaller 2011-06-28 17:40:17 +01:00
Tim Bentley 75550b505b Save Controller Toolbars
Fixes: https://launchpad.net/bugs/765239
2011-06-28 17:35:50 +01:00
Tim Bentley 2d60f3842a review comment 2011-06-27 16:56:48 +01:00
Tim Bentley 372dcedb88 Head 2011-06-27 16:54:21 +01:00
Andreas Preikschat c1e4ff0231 - removed not needed lists
- some translation fixes
- remove close button on print dialog

bzr-revno: 1662
2011-06-27 10:32:41 +02:00
Andreas Preikschat 7ac53156fb When you copy a theme the suggested theme name will be 'Copy of <theme name>'
bzr-revno: 1661
2011-06-27 10:31:16 +02:00
Andreas Preikschat c92e292518 - now you can resize the display tag dialog
- changed the column widths
- make sure we always use the space available
- scroll to the bottom when adding a new tag

bzr-revno: 1659
2011-06-27 10:26:15 +02:00
Stevan Pettit f7f20f9722 Add link to Windows help file from main window 2011-06-27 00:05:25 -04:00
Andreas Preikschat 943f2e1cb2 rearranged lines 2011-06-26 21:34:01 +02:00
Andreas Preikschat f2a243cfb4 change theme name to 'Copy of <theme name>' when copying a theme 2011-06-26 19:33:22 +02:00
Andreas Preikschat a05d9098ef - removed not needed code
- some translation fixes
- remove close button on print dialog
2011-06-26 18:15:13 +02:00
Andreas Preikschat ee985fde7d fixed margin; scroll to the bottom when adding a new tag 2011-06-26 16:37:38 +02:00
Andreas Preikschat cd3798573a improved display tag dialog resizing 2011-06-26 16:12:19 +02:00
Tim Bentley 217510281c Fix comments 2011-06-26 07:49:10 +01:00
Andreas Preikschat a077d83000 fixed saving 'Setup' mode shortcut 2011-06-26 07:58:29 +02:00
Andreas Preikschat 1ff42f59de - added comments
- qt name change
- remove test lines
2011-06-25 06:36:43 +02:00
Tim Bentley 94aae25333 1.9.6 2011-06-24 20:15:16 +01:00
Raoul Snyman e6cab2ce84 Fixed bug #791050 by hiding and then showing the toolbar.
bzr-revno: 1657
2011-06-24 14:25:31 +02:00
Raoul Snyman 509f739684 Fixed bug #791050 by hiding and then showing the toolbar. 2011-06-24 08:53:56 +02:00
Jonathan Corwin e1dc332be4 Trap meta key combinations for bug 743273. (Tested with Win key on Windows, don't have OS-X to test CMD key) 2011-06-23 23:30:56 +01:00
Andreas Preikschat 4d20334cce changed instance variable to camelCase as the class is Qt based 2011-06-23 15:32:32 +02:00
Andreas Preikschat 99da6e48f2 r1652 2011-06-22 10:41:23 +02:00
Jonathan Corwin cb60e6e9ef 1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled.
2. Check for missing attributes in the easislides import XML

bzr-revno: 1652
2011-06-21 22:09:33 +01:00
Jonathan Corwin 6be7a1e06e When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay.
bzr-revno: 1651
2011-06-21 22:08:30 +01:00
Andreas Preikschat 47f5332bc3 Initial work on new image queuing (not working) 2011-06-21 22:28:22 +02:00
Andreas Preikschat 11cb39d2dc resize image in the thread not when adding the image 2011-06-21 13:37:28 +02:00
Andreas Preikschat dbef87021c minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly 2011-06-21 12:10:53 +02:00
Raoul Snyman faa9aca78b Fixed bug #800047 where the Preferences menu item in OS X was incorrect. 2011-06-21 08:10:03 +02:00
Jonathan Corwin 59280d10b7 Preserve greyed out of next button in import wizard 2011-06-20 22:57:34 +01:00
Andreas Preikschat 3616554a17 r1645 2011-06-20 21:57:08 +02:00
Jonathan Corwin 5082091426 Remove parent from live maindisplay, so videos work. Also means the display won't minimize when the main window is, or when the Windows show desktop facility is used 2011-06-20 20:44:56 +01:00
Jonathan Corwin f3c83a19e1 maindisplay on top of X11 taskbar 2011-06-18 12:44:40 +01:00
Jonathan Corwin 38fb5e54fe Prevent error if attempt to keep going off the end of a presentation.
Reduce memory usage by not resizing small thumbnails back up to full monitor size in the slidecontroller.

bzr-revno: 1643
2011-06-18 09:56:14 +01:00
Jonathan Corwin 8cd128ddfe We don't want to resize 320x240 thumbnails back up to 1400x900 resolution just to display them in the slide controller! 2011-06-16 23:03:59 +01:00
Tim Bentley 440b5eee77 Head 2011-06-16 21:11:12 +01:00
rimach crichter@web.de d84098348b Head 2011-06-14 22:51:29 +02:00
rimach crichter@web.de 9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
Andreas Preikschat 18cbfe6f53 Correct Focus on entry to dialog
bzr-revno: 1639
2011-06-14 05:55:44 +01:00
rimach crichter@web.de 2c62a819b3 Head 2011-06-13 23:20:20 +02:00
Andreas Preikschat 79c0ef15e0 give text edit focus 2011-06-13 22:49:14 +02:00
Tim Bentley c6afbec849 Fix names 2011-06-13 19:10:06 +01:00
Tim Bentley eef44f0174 Use a method call instead of a signal as the signal does other things as well
Fixes: https://launchpad.net/bugs/796324
2011-06-13 08:29:58 +01:00
Tim Bentley 608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Andreas Preikschat 1cc95fddb6 general thumb clean ups 2011-06-12 17:17:01 +02:00
Tim Bentley 1550239f5e Add Lock Toolbar feature - Beta 3 2011-06-12 15:19:32 +01:00
Raoul Snyman 9e99146725 Fixed various strings.
bzr-revno: 1633
2011-06-12 15:41:58 +02:00
Raoul Snyman 8bc3d9bc62 Fixed 789046 and minor cleanups
bzr-revno: 1632
Fixes: https://launchpad.net/bugs/789046
2011-06-12 08:13:18 +01:00
Raoul Snyman 4014267300 Fixed various strings. 2011-06-11 23:43:08 +02:00
Raoul Snyman d337ecacb6 Fixed bug #789046 and cleaned up one or two other things. 2011-06-11 23:04:52 +02:00
Tim Bentley 26419d8f18 Speed up edit by not calling render until there is a match 2011-06-11 18:17:13 +01:00
Tim Bentley 0c549e33e5 Only mark the service as changed if it has changed
Fixes: https://launchpad.net/bugs/795890
2011-06-11 12:22:40 +01:00
Jonathan Corwin b73a8a86a7 End times should be finished 2011-06-11 09:02:43 +01:00
Jonathan Corwin ee8b11e4e9 More strings 2011-06-10 22:50:44 +01:00
Jonathan Corwin dfd2468c4c String fixes 2011-06-09 23:03:30 +01:00
Jonathan Corwin 7cdd9b2fbc Close and delete old display window when creating a new one 2011-06-08 22:39:07 +01:00
rimach crichter@web.de 99079b1c95 Head 2011-06-08 20:11:20 +02:00
rimach crichter@web.de c628b3aa09 bugfixing 2011-06-08 16:49:48 +02:00