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

2552 Commits

Author SHA1 Message Date
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
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
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
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
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
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