raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,282 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

2796 Commits

Author SHA1 Message Date
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
rimach crichter@web.de 592af0e181 bugfixing 2011-06-08 15:18:05 +02:00
rimach crichter@web.de ac7126d929 head 2011-06-06 21:20:19 +02:00
rimach crichter@web.de 43fe38c129 sync 2011-06-06 21:12:14 +02:00
Tim Bentley 6b73c842cb Head 2011-06-06 18:36:02 +01:00
Tim Bentley b2bb583fb0 Fixes 2011-06-06 18:35:47 +01:00
Andreas Preikschat 6047dd9f5b fixed bug 793537 
Fixes: https://launchpad.net/bugs/793537
 2011-06-06 16:17:39 +02:00
rimach crichter@web.de dbce448da1 update 2011-06-05 23:10:49 +02:00
Armin Köhler 17209fcc29 define appStartup() in plugin.py 
remove hassattr(plugin, appStartup)
 2011-06-05 20:46:00 +02:00
Armin Köhler 5505644176 Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup is called 2011-06-05 20:19:44 +02:00
Tim Bentley b6d0f2243d Fix error if cnp 2011-06-04 19:14:32 +01:00
Tim Bentley 0841802ddc Fix state for service items 2011-06-04 19:08:48 +01:00
Andreas Preikschat 847d69cd2f - removed dangling list 
- added debug message
- do not show an error message when the directory does not exist, instead create one
- do not override the file class
- clean ups

bzr-revno: 1605
 2011-06-02 15:09:37 +02:00
Jonathan Corwin 596123dd06 Fix problems with remembering blank/hidden state when starting up, and with the startup logo flashing briefly on the screen. Also fix the Show blank warning box. 
Fix toolbox appearing on the media manager when it's associated plugin is inactive.
Make the override display act like a dual display on startup. I.e. it appears.

bzr-revno: 1603
 2011-06-02 07:16:45 +01:00
Armin Köhler 975808d11e fix Traceback with appStartup() if plugin is disabled 2011-06-01 21:25:26 +02:00
Jonathan Corwin c7a90102a2 Fix some startup blank/hide problems 2011-06-01 08:38:19 +01:00
Andreas Preikschat 5494b20805 added more debug 2011-06-01 08:31:22 +02:00
Andreas Preikschat 4c81ac295d r1600 2011-06-01 07:43:41 +02:00
Andreas Preikschat 4ce960d0cc do not override the file class 2011-06-01 07:42:56 +02:00
Andreas Preikschat 79b107138a - fixed bug #789618 "Large gap between two parts of a verse in Service Order Print" 
bzr-revno: 1598
Fixes: https://launchpad.net/bugs/789618
 2011-05-31 12:53:35 +02:00
Andreas Preikschat ed3a608b8d fixed tag deletion (bug #789929 
Fixes: https://launchpad.net/bugs/789929
 2011-05-30 17:07:49 +02:00
Andreas Preikschat 0a2d97021c added spaces 2011-05-30 07:03:46 +02:00
Jonathan Corwin 3da3dd9869 Head 2011-05-29 21:47:12 +01:00
Jonathan Corwin 9cd536e137 Fix the parent that whydoubt sneaked in 2011-05-29 21:46:13 +01:00
Andreas Preikschat 571765c84f - changed a few camelCase names 
- changed object names

bzr-revno: 1593
 2011-05-29 18:00:37 +02:00
Jonathan Corwin 02da22c349 Head 2011-05-29 16:33:09 +01:00
Armin Köhler f701ae71bd Monster change to Bibles: 
- Web Bibles import their books on registration
- Added a book_reference_id to the books table of Bibles
- Moved various sqlite and csv resources into a single sqlite database
- Added an upgrade wizard to upgrade existing Bibles
- Check on startup if a user has older Bibles
- Various other bug fixes and cleanups

bzr-revno: 1591
 2011-05-29 17:18:17 +02:00
Andreas Preikschat 22ad88d3ee fix for bug #789618 
Fixes: https://launchpad.net/bugs/789618
 2011-05-29 08:26:14 +02:00
Andreas Preikschat b56f93aad5 camelCase fixes and shortcut fixes 2011-05-29 08:23:12 +02:00
Jonathan Corwin ddf11d4681 Live dangerously, and pass parent None to MainDisplay 2011-05-28 21:12:32 +01:00
Jeffrey S. Smith f80eb74e62 Merge changes from trunk 2011-05-28 14:03:31 -05:00
Jonathan Corwin 82a72fdc87 Don't set .parent's on Qt items, pass to init instead 2011-05-28 19:47:14 +01:00
Jeffrey S. Smith 88f1f4065e Make 'continuous loop' button into a selection ('loop' or 'play to end') 2011-05-28 08:45:44 -05:00
Armin Köhler 8caece6af0 HEAD r1588 2011-05-28 14:50:29 +02:00
Stevan Pettit 7ed1be6612 Fixed bug #788335 - Changed slidecontroller to correctly blank screen 2011-05-28 00:05:33 -04:00
Armin Köhler 8699e36b37 HEAD r1586 2011-05-27 22:38:06 +02:00
Jonathan Corwin 37377b959d Change timed slide button tooltip to remove reference to looping, and add a few full stops to a few others. 
bzr-revno: 1586
 2011-05-27 21:14:41 +01:00
Jonathan Corwin cd4942657d Change timed slide tooltip to remove reference to looping, and fix periods on others 2011-05-27 18:42:54 +01:00
Jonathan Corwin 41601b9ec1 Make the slide loop/slide delay settings labels less misleading 
bzr-revno: 1585
 2011-05-27 14:34:01 +01:00
Andreas Preikschat 8ffb05bae3 - Improved 'Auto Select' feature 
- Fixed a traceback which occurs when you click the "Add" button in the slidecontroller when you are not previewing an item.
- Improved parentage
- clean ups

bzr-revno: 1584
 2011-05-27 13:59:19 +02:00
Jonathan Corwin f1b778fb24 Change loop and timed slide settings labels 2011-05-27 12:54:52 +01:00
Andreas Preikschat c63382e41c - hide the theme menu when theme level is not 'Song' 
- clean ups
 2011-05-27 12:17:59 +02:00
Andreas Preikschat 59d374517e - improved 'auto select' 
- fixed a traceback
- improved parentage
- clean ups
 2011-05-27 11:34:14 +02:00
Andreas Preikschat 18e3cb0232 removed not needed import 2011-05-27 09:02:02 +02:00
Andreas Preikschat 8a38c0b766 do not hide the menu 2011-05-27 08:45:42 +02:00
Andreas Preikschat 0d443c3691 r1580 2011-05-27 08:39:32 +02:00
Andreas Preikschat b890b52a8d finished the theme menu 2011-05-27 08:29:14 +02:00
Armin Köhler af38bf7cc8 HEAD r1578 2011-05-26 22:41:19 +02:00
Andreas Preikschat 8aef6f3c8e r1576 2011-05-26 20:13:50 +02:00
Andreas Preikschat af961afa78 removed the 'default' button 2011-05-26 20:00:25 +02:00
Andreas Preikschat 7ec12f15ea r1576 2011-05-26 19:56:08 +02:00
Tim Bentley 3ff2aa8006 Copyright updates 
bzr-revno: 1576
 2011-05-26 18:25:59 +01:00
Tim Bentley acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley 8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Joshua Miller 93ec7f52a1 Enable or disable looping of slides based on a checkbox in the general settings 
bzr-revno: 1575
Fixes: https://launchpad.net/bugs/739777
 2011-05-26 16:52:02 +01:00
Tim Bentley fe4b5fb147 More busy and sort changes 
bzr-revno: 1574
 2011-05-26 16:44:25 +01:00
Josh Miller 6b90adea6e Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py and changes can_loop directly to the setting required 2011-05-26 07:01:48 -04:00
Josh Miller 254bac86d4 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too and gets rid of the odd emtpy line in generaltab.py 2011-05-26 06:56:21 -04:00
Josh Miller 9221c8cb60 Corrections to the code, enable_loop is now can_loop, and fits the 80 character line requirement as best i could get it too 2011-05-26 06:37:36 -04:00
Andreas Preikschat 98614f629c make themes in menu checkable 2011-05-26 10:15:56 +02:00
Armin Köhler f3864cb4aa HEAD r1572 2011-05-26 09:27:50 +02:00
Andreas Preikschat 6e4b15833e r1572 2011-05-26 08:47:06 +02:00
Andreas Preikschat aae9724f34 allow html tags to be translated 
Fixes: https://launchpad.net/bugs/787552
 2011-05-26 08:45:22 +02:00
Raoul Snyman 38000b5e56 Give the media items the ability to do something when they are "focused". 
Make the search edits on the Songs, Bibles and Custom media items focus when the item is selected.
 2011-05-26 08:23:22 +02:00
Tim Bentley 3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Josh Miller 0a5155b822 Final changes to enabling looping of slides now it works 2011-05-25 20:11:56 -04:00
M2j 6f0bdad784 all lower() for theme sorting to consider Windows 2011-05-25 20:47:13 +02:00
M2j 7a1a83a98a Head 1570 2011-05-25 20:42:03 +02:00
Armin Köhler dd4543ad2d HEAD r1569 2011-05-25 16:29:16 +02:00
Armin Köhler 0c83471ee4 move some code 
stop moving bibles to subfolders
some fixes
 2011-05-25 16:18:03 +02:00
Andreas Preikschat 98d7cb5fe5 fixed object name 2011-05-25 11:10:57 +02:00
Andreas Preikschat 981c2f8c5b more name fixes 2011-05-25 10:32:37 +02:00
Andreas Preikschat 10f59d0313 started to fix camelCase names 2011-05-25 09:59:51 +02:00
Raoul Snyman 1797848d6e Updated online help action to use utility functions, and added an icon needed by the utility functions. 2011-05-25 08:56:33 +02:00
Josh Miller b92b733828 corrections and enable slide loop updates 2011-05-24 18:32:30 -04:00
Raoul Snyman 7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
rimach crichter@web.de 82a14745e3 cleanup, correct settings tab 2011-05-24 22:03:57 +02:00
Raoul Snyman becbff524b More translation updates. 2011-05-24 21:29:02 +02:00
Raoul Snyman 8d1d642c06 More translation updates. 2011-05-24 20:38:06 +02:00
Raoul Snyman 55dfd67a5c More translation updates. 2011-05-24 19:42:30 +02:00
Raoul Snyman da45bb0b06 Fixed various strings, as listed in bug #734445. 2011-05-24 19:32:36 +02:00
Josh Miller 541feef8ea Another try at the code for enabling loop through a checkbox, seems to work as far as i see 2011-05-24 07:23:55 -04:00
Josh Miller 6b046d9afb Another try at the code for enabling loop through a checkbox in general settings as the signal but ignores it in slidecontroller for some odd reason acting like it's not there... 2011-05-23 19:23:00 -04:00
M2j 06d561f9fc localized string sorting 2011-05-23 22:42:07 +02:00
rimach crichter@web.de d39ecb8e8e Sync 2011-05-23 21:42:10 +02:00
Josh Miller 6d577395a4 A switch of code to see if it worked and doesn't for the enable loop 2011-05-22 17:39:37 -04:00
Josh Miller 33dcf7c439 This is a run of the 'enable slide loop' code that gushie showed me plus my checkbox code for it 2011-05-22 14:49:16 -04:00
Jonathan Corwin 64b08da271 Open a service file via the command line or by double clicking on the file on Windows systems 
bzr-revno: 1563
 2011-05-22 12:57:27 +01:00
Jonathan Corwin ac29839151 Add items to service via the search on the web remote 
bzr-revno: 1562
 2011-05-22 12:56:22 +01:00
Stevan Pettit ecb188dfdd Amend Song and Custom to remember the item on exit from edit. 
bzr-revno: 1561
 2011-05-22 09:45:57 +01:00
Jonathan Corwin 0c365e2a59 Windows command line 2011-05-21 23:16:28 +01:00
Andreas Preikschat 95b9abc78e - Changed the order the live screen/preview screen are set up. 
- Added a menu entry to update the theme preview images.

bzr-revno: 1560
 2011-05-21 23:50:04 +02:00
Stevan Pettit cfe1903883 modified: 
openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
 2011-05-21 16:21:05 -04:00
Josh Miller eedecf6434 testing 2011-05-21 15:01:40 -04:00
rimach crichter@web.de 578e0fea3f cleanups, add settings dialog 2011-05-21 10:18:52 +02:00
Stevan Pettit 48148bc297 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/slidecontroller.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
pending merges:
  Tim Bentley 2011-05-20 [merge] Stop preview media and presentations when...
    Tim Bentley 2011-05-20 Fix extra indent
    Tim Bentley 2011-05-20 [merge] Head
    Tim Bentley 2011-05-20 Stop the media / presentation if going from P...
 2011-05-20 21:30:23 -04:00
Jonathan Corwin bbbf0d3435 Go live/add to service via list 2011-05-20 23:30:20 +01:00
Stevan Pettit 31c1d23070 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
 2011-05-20 17:30:28 -04:00
Andreas Preikschat 383670e446 use the awesome mainwindow progress bar 2011-05-20 17:00:27 +02:00
Andreas Preikschat 304f4ff732 added menu entry to update the theme images 2011-05-20 13:45:39 +02:00
Tim Bentley f09d64c1be Fix extra indent 2011-05-20 11:23:48 +01:00
Tim Bentley 66d851887a Stop the media / presentation if going from Preview to Live 
Fixes: https://launchpad.net/bugs/780095
 2011-05-20 11:01:48 +01:00
Stevan Pettit c4b0862979 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
 2011-05-20 01:01:49 -04:00
Andreas Preikschat 875202deca reverted changes 2011-05-19 08:01:28 +02:00
rimach crichter@web.de 43a55c7087 Sync 2011-05-17 23:11:46 +02:00
rimach crichter@web.de aebc0e240e further progress 2011-05-17 21:50:00 +02:00
Andreas Preikschat 7829de8597 set cursor busy, update the preview images before the displays 2011-05-16 14:22:08 +02:00
Andreas Preikschat a2ab806ca9 r1549 2011-05-16 13:42:51 +02:00
Andreas Preikschat 55738636d9 render the themes when the screen size changed 2011-05-16 13:41:43 +02:00
Tim Bentley 0786f2059e Add dialog reset on cancelled exit of Settings. 
Remove PreLoad() is no longer needed.
Rename preLoad is displayTags to say what it means.

Fixes: https://launchpad.net/bugs/778537
 2011-05-15 16:52:20 +01:00
Andreas Preikschat 6d1ec4ae10 - prevent setting the loop delay spin box to 0 
- Changed title for the stage view html
 2011-05-15 12:38:11 +02:00
Andreas Preikschat 144ff29e90 fixed bug #744463 
Fixes: https://launchpad.net/bugs/744463
 2011-05-14 13:48:15 +02:00
Jonathan Corwin 55a5480ea4 Stage view changes: show all slides for a verse and tidy verse tags 
bzr-revno: 1540
 2011-05-13 18:43:38 +01:00
Andreas Preikschat 07b704677a 2011-05-13 15:58:17 +02:00
Andreas Preikschat 4e870ed705 only allow drag if an item is selected 2011-05-12 17:50:20 +02:00
Jonathan Corwin e940279b34 More stageview changes 2011-05-12 00:16:53 +01:00
Andreas Preikschat c0df166105 removed bug/feature which resets the values in the spin box 2011-05-11 20:38:26 +02:00
Andreas Preikschat 9709429261 r1532 2011-05-11 10:13:10 +02:00
rimach crichter@web.de 2ccf6a67fa sync 2011-05-10 22:54:26 +02:00
rimach crichter@web.de d4162e814c next steps 2011-05-10 22:39:17 +02:00
Andreas Preikschat 34e0355921 removed debug line 2011-05-09 13:41:12 +02:00
Andreas Preikschat 1e0ef1ecb8 clean up 2011-05-09 10:15:59 +02:00
Tim Bentley 1850d8f483 Update Display Tags UI 
bzr-revno: 1526
 2011-05-08 15:13:33 +01:00
Andreas Preikschat 2a0f3b272a r1522 2011-05-08 15:21:00 +02:00
Andreas Preikschat a4e5d290a3 - changed a few loops to list comprehensions 
- fixed unclosed file
- attempt to reduce possible tracebacks when running two instances of the FRW

bzr-revno: 1525
 2011-05-08 13:08:28 +02:00
Tim Bentley 22553f6ef8 UI Tidy ups 2011-05-08 06:42:48 +01:00
Tim Bentley 36ba62d86f Clean up DisplayTags UI 2011-05-07 18:43:24 +01:00
Andreas Preikschat cd8e96b6a3 Fixed the order of components which need to update their screen information 2011-05-07 17:51:44 +02:00
Andreas Preikschat 738729e779 re ordering 2011-05-07 13:22:34 +02:00
Andreas Preikschat c07f2f40c5 r1522 2011-05-07 13:06:43 +02:00
Jonathan Corwin 03380fb40f head 2011-05-06 23:00:52 +01:00
Jonathan Corwin 5c6639e95b Fix remote bug if same item in service twice. More stage view tweaks 2011-05-06 23:00:18 +01:00
Andreas Preikschat 25a697e03e removed more old code 2011-05-06 21:55:16 +02:00
Andreas Preikschat 9a16666639 removed blank line 2011-05-06 21:31:29 +02:00
Andreas Preikschat a81a43c15e clean up 2011-05-06 21:19:09 +02:00
Andreas Preikschat 80f7aa2cc9 r1522 + resolved conflicts 2011-05-06 21:15:08 +02:00
Andreas Preikschat 090e8378ae - allow negative x and y values 
- fixes
- removed redundant variables
 2011-05-06 21:09:40 +02:00
Andreas Preikschat 7854c664e8 added blank lines 2011-05-06 09:41:29 +02:00
Andreas Preikschat 82a509c012 fixed strings 2011-05-06 09:38:51 +02:00
Andreas Preikschat 68c1236a2a 2011-05-06 07:17:13 +02:00
Gerald Britton f85ce8dc91 Change a series of "if" into if/elif 
bzr-revno: 1519
 2011-05-05 22:00:12 +02:00
Andreas Preikschat e1b1f7c6d0 fixed alert bug 2011-05-05 20:40:04 +02:00
Gerald Britton d9afa8ec2d Change series of ifs into if/elif/elif 2011-05-05 14:23:54 -04:00
Andreas Preikschat 2a7c5bd4de names changes 2011-05-05 17:16:55 +02:00
Andreas Preikschat 0c9bea3b50 - removed obsolete code 
- fixes
 2011-05-05 15:02:12 +02:00
Andreas Preikschat e25145a81b 2011-05-05 13:51:47 +02:00
Tim Bentley b0a0f1c877 head 2011-05-04 18:35:41 +01:00
Tim Bentley bec35e6138 Fix change of display to correct size. 
Fixes: https://launchpad.net/bugs/775534
 2011-05-04 18:35:24 +01:00
Andreas Preikschat cbd7ae2afc - make start up smoother by setting up the displays correct the first time 
- do not pass screens as argument
 2011-05-04 19:31:02 +02:00
Andreas Preikschat 307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Andreas Preikschat 96f4f2f747 fixed traceback when deleting theme; fixed delete button being visible/hidden 2011-05-03 19:05:17 +02:00
Andreas Preikschat 9a997afd81 fixed wording 2011-05-01 18:03:42 +02:00
Andreas Preikschat 76bd824114 added comment 2011-05-01 17:54:05 +02:00
Andreas Preikschat 6c1e66de99 do not check the button 2011-05-01 17:50:48 +02:00
Andreas Preikschat f8fdcf8fba allow to empty shortcuts; allow 'space' to be used as shortcut 2011-05-01 09:17:30 +02:00
Tim Bentley ddf9c3b61b Remove Var from last merge 2011-04-29 20:24:21 +01:00
Tim Bentley 0f7f03da30 Clean up Phonon media Object creation 
bzr-revno: 1503
 2011-04-29 20:22:20 +01:00
Tim Bentley 9e721a4824 More improvements 2011-04-29 19:43:29 +01:00
Tim Bentley 08b6d7cee1 Fixes for Jon 2011-04-29 17:27:27 +01:00
Tim Bentley 4304d111f1 Live Initialisation Delayed 2011-04-29 12:55:49 +01:00
Tim Bentley e6f69c01f4 Remove 2 phonon initialisations 2011-04-29 12:21:14 +01:00
Tim Bentley acb4f12ac9 remove comments 2011-04-29 10:07:41 +01:00
Tim Bentley e4c0d1227e Fix timer 2011-04-29 09:54:11 +01:00
Tim Bentley 7908ac4f67 Fix large Service Files 2011-04-29 09:45:36 +01:00
Tim Bentley f83d52621a Fixes 2011-04-29 08:40:19 +01:00
Tim Bentley 79dc4948fa Head 2011-04-29 08:11:19 +01:00
Tim Bentley 188431ce37 Fix up Service Save 2011-04-29 07:21:31 +01:00
Andreas Preikschat 3ded22fc47 - added Start Loop and Stop Loop to the list of available shortcut actions 
- added a new (hidden) action to toggle the loop

bzr-revno: 1497
Fixes: https://launchpad.net/bugs/771966
 2011-04-29 07:26:20 +02:00
Jon Tibble e506d40cef Head 1495 2011-04-28 22:38:12 +01:00
Tim Bentley c7e07bdbd5 r1496 2011-04-28 21:11:11 +01:00
Tim Bentley dd597e472f Head 2011-04-28 19:13:48 +01:00
Tim Bentley 17d74a8d9a Add Load service Progress Bar 2011-04-28 19:13:19 +01:00
Tim Bentley e50dc0cfbf head1945 2011-04-28 17:52:46 +01:00
Andreas Preikschat aea4909201 added missing space 2011-04-28 18:36:53 +02:00
Andreas Preikschat e9ec8aaaaf added shorcuts for start/stop/toggle loop (#771966) 
Fixes: https://launchpad.net/bugs/771966
 2011-04-28 18:32:37 +02:00
Andreas Preikschat 9aa1f580d2 fixed right/left shortcuts 2011-04-28 08:36:04 +02:00
Raoul Snyman 35cb2b2fa6 Fix up the multicolouredness. 2011-04-27 12:30:29 +02:00
Raoul Snyman 86a05a38b5 Fixed bug #752212. Added a revert button to revert the image to the default OpenLP image. Also moved things slightly to for the dialog to look a little better on other platforms/DEs. 2011-04-27 11:00:37 +02:00
Tim Bentley 3923c14d0c Head 2011-04-26 19:39:32 +01:00
Tim Bentley a1f4d5cd2b Fix error in Theme Wizard backgrounds 
bzr-revno: 1491
Fixes: https://launchpad.net/bugs/769988
 2011-04-26 19:25:52 +01:00
Meinert Jordan 62d55814d2 - fix the recreation of the song order to work with single character verse references 
- rename 'type' variable to avoid the function name (and unify the naming)
- fix: remove unicode string in a translate() call

bzr-revno: 1489
 2011-04-26 19:16:13 +01:00
Jonathan Corwin 5887033238 Changes to the service print html/css 
serviceprint.css can now be deleted and has been replaced by service-print.css. There have been changes to the css/html which will be documented on the wiki

bzr-revno: 1486
 2011-04-25 17:22:16 +01:00
Tim Bentley 100fb77456 Fix double edit 2011-04-25 11:26:21 +01:00
Jonathan Corwin 504a471491 o123hallo points 2011-04-25 11:13:13 +01:00
Andreas Preikschat f89e362b5d mark service as modified when item notes have been edited 2011-04-25 10:35:48 +02:00
Tim Bentley abf44320c3 Set correct field to blank 2011-04-25 08:56:13 +01:00
Tim Bentley a173bce047 Minor fix 2011-04-25 08:13:17 +01:00
Tim Bentley 10fca2dd05 Remove theme image if moving from image to solid or gradient. 
Fixes: https://launchpad.net/bugs/769988
 2011-04-25 08:06:35 +01:00
Andreas Preikschat c12b4bc28f - improved the song importers by allowing to provide feedback to the user. 
- Do not abort a song import, always try to continue and log which songs could not be imported.
- Clean ups (close files, deduplication, ...)

bzr-revno: 1483
 2011-04-25 09:06:16 +02:00
Tim Bentley 6e9459b63d r1482 2011-04-25 07:44:04 +01:00
Jonathan Corwin 81c63146f5 remove print statement 2011-04-24 20:54:48 +01:00
Jonathan Corwin 8965e4a730 head 2011-04-24 20:50:58 +01:00
Jonathan Corwin ae874f09bf Print Service cleanups 2011-04-24 20:50:28 +01:00
Andreas Preikschat f7e81ad70a fixe possible bug when using the clear buttons 2011-04-24 16:44:40 +02:00
Andreas Preikschat c66ffbd725 removed import 2011-04-22 09:06:38 +02:00
Andreas Preikschat 65925efd25 fixed logo pixelation 2011-04-22 08:30:07 +02:00
M2j a80a953980 Head 1477 2011-04-21 10:51:32 +02:00
M2j 073e68e8d5 translation string fixes 2011-04-21 10:47:52 +02:00
Andreas Preikschat 8cd3742c87 added textEdit and buttons for better feedback 2011-04-20 19:36:16 +02:00
rimach crichter@web.de 392b5ecb47 head 2011-04-19 14:10:38 +02:00
rimach crichter@web.de 942fe8a141 further changes 2011-04-19 14:03:36 +02:00
Andreas Preikschat 3166e8e07b - fixed bug #763309 
bzr-revno: 1477
Fixes: https://launchpad.net/bugs/763309
 2011-04-18 21:58:53 +02:00
rimach crichter@web.de 50ff8438a0 Video reimplementations issues 2011-04-18 21:50:12 +02:00
Andreas Preikschat 0fa4bee842 r1476 2011-04-18 21:27:02 +02:00
Tim Bentley f0f77a0dd9 Head 2011-04-18 16:31:32 +01:00
Tim Bentley 133145d5c2 Fix comment 2011-04-18 16:31:20 +01:00
Tim Bentley 3c8568443b Delete the correct item 
Fixes: https://launchpad.net/bugs/764651
 2011-04-18 16:30:32 +01:00
Andreas Preikschat c7843012e9 fixed bug #76330 
Fixes: https://launchpad.net/bugs/7633099
 2011-04-18 16:57:37 +02:00
Andreas Preikschat f183215ecc - do not show the error message when you "rename" a theme, but you do not change the theme name 
- fixed a bug, where a theme "lost" its background image when you renamed or copied the theme

bzr-revno: 1475
 2011-04-17 19:57:47 +02:00
Andreas Preikschat 6fb421825c r1471 2011-04-17 15:31:13 +02:00
Andreas Preikschat d3a0952d66 fixed a bug, where themes 'lost' their background image; fixed theme re name when the name has not been changed 2011-04-17 14:36:35 +02:00
Andreas Preikschat 946d74372d 2011-04-17 13:00:44 +02:00
Andreas Preikschat 19b2e0bede - added a missing space 
bzr-revno: 1471
 2011-04-16 22:10:21 +02:00
Tim Bentley f94ae1a9c5 Head r 1469 2011-04-16 12:42:35 +01:00
Andreas Preikschat de8e8ee422 fixed missing space 2011-04-16 09:23:00 +02:00
Raoul Snyman 64823a943a Add a bit of spacing around the edges of the settings form to make it feel a little less crowded. 
bzr-revno: 1469
 2011-04-16 09:17:01 +02:00
Raoul Snyman b46aa38ce9 Add a bit of spacing around the edges of the settings form to make it feel a little less crowded. 2011-04-16 00:46:24 +02:00
Raoul Snyman 7fdd4bb1c1 Line length cleanups. 2011-04-15 23:55:11 +02:00
Raoul Snyman 8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley 7476b37ba4 Refactor the SettingsTab to be more KDE like. 
Sort out the Tabs parentage
Clean up the code paths to stop the Tab being loaded twice at startup.
Clean up the TAB Hide/Unhide code. Removed it and rebuild the UI if required.
Fix Bible Quick text to say right things.

bzr-revno: 1467
Fixes: https://launchpad.net/bugs/739762
 2011-04-15 21:47:19 +01:00
Tim Bentley 269c4fa044 Fixups 2011-04-15 18:17:51 +01:00
Andreas Preikschat b8db8807fd r1464 2011-04-15 18:15:37 +02:00
Andreas Preikschat a13cf49940 idea to improve song import feedback 2011-04-15 18:01:15 +02:00
Jonathan Corwin 4a74230c6d Head 2011-04-14 22:34:35 +01:00
Jonathan Corwin 4286f6389d Switching from ppt to songs now fine 2011-04-14 22:34:01 +01:00
Tim Bentley 4dd70d454f Fix Postsetup 2011-04-14 19:55:41 +01:00
Tim Bentley e1bc312eb1 r1463 2011-04-14 19:35:47 +01:00
Andreas Preikschat 11e9f980e2 - remoed the up/down shortcuts from the shortcut list 
bzr-revno: 1463
 2011-04-14 20:34:08 +02:00
Tim Bentley 0468a39dd2 r1462 2011-04-14 19:31:09 +01:00
Tim Bentley 206cd90639 Finished 2011-04-14 19:30:53 +01:00
Andreas Preikschat 83e06b6eb1 don't allow to change the up/down shortcuts in the slidecontrollers 2011-04-14 20:05:00 +02:00
Andreas Preikschat 27e9edad51 fixed wrong parentage 2011-04-14 16:51:05 +02:00
Jonathan Corwin d45423569f Head 2011-04-13 23:11:21 +01:00
Jonathan Corwin 5f93ff657e PPT's are getting there. Going from blank ppt to song broken now 2011-04-13 23:10:41 +01:00
Tim Bentley 6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Tim Bentley 3a6b1def4a r1460 2011-04-13 19:42:01 +01:00
Tim Bentley 79ed96648f More cleanups 2011-04-13 19:40:09 +01:00
Andreas Preikschat e1b723270d - added an option to add page breaks after text items 
- rewrite the updatePreviewText method using lxml
- the layout can now be modified with CSS (see .local/share/openlp/servicePrint.css)

bzr-revno: 1460
 2011-04-13 20:38:08 +02:00
Tim Bentley 0b4fd3c585 r1458 2011-04-13 19:20:09 +01:00
Andreas Preikschat 01c286e50e fixed crash 2011-04-13 20:01:28 +02:00
Andreas Preikschat 8451d52f27 fixed _fromstring; changed setting name in config 2011-04-13 12:22:26 +02:00
Andreas Preikschat 7d5ee8adf6 spelling 2011-04-13 11:53:57 +02:00
Andreas Preikschat 7d2719288a extended helper methods 2011-04-13 11:42:18 +02:00
Andreas Preikschat 004bbc8865 r1457 2011-04-13 11:20:27 +02:00
Andreas Preikschat d207cf2243 clean ups 2011-04-13 11:19:16 +02:00