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

5371 Commits

Author SHA1 Message Date
Tim Bentley 3b627be641 Finish plugin sorts 2011-05-26 05:48:13 +01:00
Stevan Pettit 4f857f8921 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-25 23:34:42 -04:00
Josh Miller 0a5155b822 Final changes to enabling looping of slides now it works 2011-05-25 20:11:56 -04:00
Andreas Preikschat 6e235f6bff - Fixed bug #786896 
- New display tag {br}
- Better regex usage in the SongBeamer import

bzr-revno: 1571
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 23:11:15 +02:00
Armin Köhler 0f98c4fd8f change behaviour if "Cancel" button is pushed. 2011-05-25 22:20:17 +02:00
Armin Köhler 175d6cebb2 add Bible Name to LanguageDialog 
renamed "Importing" to "Upgrading" and "Choose" to "Select"
fixed traceback while textsearch
removed unnecessary code
 2011-05-25 21:13:37 +02: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 e8cdba44be small clean up 2011-05-25 16:52:46 +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 3a91365e5a fixed space 
Fixes: https://launchpad.net/bugs/786896
 2011-05-25 15:14:59 +02:00
Andreas Preikschat cf4dbcdafe r1569 2011-05-25 15:10:44 +02:00
Andreas Preikschat 638a72301c mention the need of an object name in the doc string 2011-05-25 13:26:18 +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 8c9728c3b2 HEAD 2011-05-24 22:53:41 +02: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
Andreas Preikschat 0db69c93ed Implemented the binary chop algorithm to speed up 'word by word' rendering. 
bzr-revno: 1567
 2011-05-24 21:33:12 +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
Andreas Preikschat b9bcd98716 removed not need line 2011-05-24 18:51:40 +02:00
Andreas Preikschat d068d11c76 (started to) fix bug #86896 2011-05-24 17:06:38 +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
Andreas Preikschat 2377a5f5ff fix for Esther 8:7 2011-05-24 09:02:13 +02:00
Andreas Preikschat 5473d3c817 added windows comment 2011-05-24 07:23:28 +02: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
Andreas Preikschat 5b7dc62112 comments 2011-05-23 20:41:49 +02:00
Andreas Preikschat 84999905bd r1564 2011-05-23 20:24:38 +02:00
Andreas Preikschat 8602345491 removed print 2011-05-23 20:23:45 +02:00
Andreas Preikschat ffd017799f new 'word by word' algorithm 2011-05-23 19:28:52 +02:00
Andreas Preikschat ce5c354e06 fix for head 2011-05-23 13:49:14 +02:00
Andreas Preikschat 987cd14fbf r1564 2011-05-23 13:16:28 +02:00
Andreas Preikschat 73293c2985 removed imports 2011-05-23 13:14:05 +02:00
Andreas Preikschat 594caf0a19 fix for windows 2011-05-23 12:34:42 +02:00
Tim Bentley b6a85d0405 Add Split items to songs and custom, improve impress error handling 
bzr-revno: 1564
 2011-05-23 05:59:35 +01: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
Tim Bentley 50a81cc3c9 png not jpg 2011-05-22 19:50:34 +01: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
Tim Bentley b544e519b1 Add tolltip and impress debugging 2011-05-22 19:48:14 +01:00
Tim Bentley 37679fc1db Finish slide spltting code 2011-05-22 14:08:43 +01: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
Stevan Pettit 08932ad664 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-21 21:29:09 -04: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 c9481e034e modified: 
openlp/core/lib/mediamanageritem.py
 2011-05-21 16:29:43 -04: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
Jonathan Corwin 031525b0e6 Lose the [None] and fix jquery issue 2011-05-21 18:43:37 +01:00
Stevan Pettit 23e95892ec modified: 
openlp/plugins/songs/lib/wowimport.py
pending merges:
  Gerald Britton 2011-05-21 [merge] Words of Worship import where a file m...
    Gerald Britton 2011-05-20 Fix Words of Worship import to issue error...
 2011-05-21 10:49:25 -04:00
Jonathan Corwin 218ee2db2b tweak the jquery 2011-05-21 10:14:30 +01:00
Gerald Britton 8872d146a6 Words of Worship import where a file missing the WoW header information would be silently ignored 
bzr-revno: 1559
 2011-05-21 09:19:14 +01: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 732f5321dd indent 2011-05-20 23:32:46 +01: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 f753070f53 fix for windows 2011-05-20 19:06:38 +02:00
Gerald Britton a5a8c0d6d2 Fix Words of Worship import to issue error message for files missing the expected header 2011-05-20 12:34:44 -04:00
Andreas Preikschat 5a7aa2fb9f do not override list 2011-05-20 17:18:57 +02:00
Andreas Preikschat 3359726be2 improved media item sorting 2011-05-20 17:14:10 +02: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 cec32eae0f Head 2011-05-20 11:09:51 +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 00a2a7b771 modified: 
openlp/core/lib/mediamanageritem.py
 2011-05-20 01:19:26 -04:00
Stevan Pettit c4b0862979 modified: 
openlp/core/lib/mediamanageritem.py
  openlp/core/ui/slidecontroller.py
 2011-05-20 01:01:49 -04:00
Jonathan Corwin d4e83ae45a Remote web add to service 2011-05-20 00:09:42 +01:00
Stevan Pettit af5fdcf73d modified: 
openlp/plugins/custom/lib/mediaitem.py
 2011-05-19 18:34:46 -04:00
Stevan Pettit 206ee04db6 modified: 
openlp/plugins/custom/forms/editcustomform.py
  openlp/plugins/custom/lib/mediaitem.py
  openlp/plugins/songs/forms/editsongform.py
  openlp/plugins/songs/lib/mediaitem.py
 2011-05-19 18:20:00 -04:00
Tim Bentley 32127d51bb Add Search to Custom 
bzr-revno: 1557
 2011-05-19 17:10:49 +01:00
Andreas Preikschat 875202deca reverted changes 2011-05-19 08:01:28 +02:00
Stevan Pettit fc5b72b0b4 Add the ability to double-click a slide entry in custom to edit the slide. 
bzr-revno: 1556
 2011-05-19 07:37:05 +02:00
Andreas Preikschat f537f91939 Improved regex usage. 
bzr-revno: 1555
 2011-05-19 07:29:50 +02:00
Tim Bentley 0c2196339a Fix search order 2011-05-19 05:48:10 +01:00
Tim Bentley cff081066f Head 2011-05-19 05:42:10 +01:00
Stevan Pettit e3ca10b46f modified: 
openlp/plugins/custom/forms/editcustomform.py
 2011-05-18 23:19:36 -04:00
Armin Köhler 8c308ac4f8 Fixed bug #779995: FoilPresenter songs with verses without text cause a traceback. 
bzr-revno: 1554
 2011-05-18 22:56:18 +02:00
Armin Köhler 674260eadb fix bug https://bugs.launchpad.net/openlp/+bug/779995 2011-05-18 21:07:08 +02:00
Jonathan Corwin 7b534642b9 Plan B. Figure out what the code is actually meant to be doing 2011-05-18 19:59:36 +01:00
Jonathan Corwin 3add2de140 Fix song editing what I did broke. Oops 2011-05-18 19:32:18 +01:00
Armin Köhler c51d8182a6 delete all sucessfull imported bibles by default 
remove the possibility to choose which bibles should be deleted after the upgrade
 2011-05-18 20:19:11 +02:00
Armin Köhler 236ca44105 HEAD r1552 2011-05-18 20:00:40 +02:00
Tim Bentley d6ea529411 Fix description 2 2011-05-18 16:01:33 +01:00
Tim Bentley 67be2937be Fix description 2011-05-18 15:34:35 +01:00
Tim Bentley 509811620d Head 2011-05-18 15:27:29 +01:00
Andreas Preikschat 4cd23308b8 regex clean ups 2011-05-18 16:26:19 +02:00
Andreas Preikschat 30a6d46cd8 Added missing html tag. 
bzr-revno: 1552
 2011-05-18 12:48:21 +02:00
Jonathan Corwin 2d5d16b40b Return filename in text for non-text types. Display verse tag in remote view 2011-05-17 23:00:50 +01:00
Jonathan Corwin 0323dfcb90 Add ability to search and go live on all media manager items via the web remote. Also tweak the web interface to fit better on a phone screen 
bzr-revno: 1550
 2011-05-17 22:22:24 +01:00
Andreas Preikschat 957f4accb0 fixed broken html head 2011-05-17 20:55:45 +02:00
Jonathan Corwin 7a857290a6 More fixes 2011-05-17 19:48:04 +01:00
Jonathan Corwin 5fcb41bc9d fixes 2011-05-16 22:01:21 +01:00
Tim Bentley a66b582484 Head 2011-05-16 18:59:02 +01:00
Tim Bentley dfbf368c8a Sort images 2011-05-16 18:58:52 +01: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
Andreas Preikschat b92d437a8d - fixed a traceback which occurred when performing a text search but no bible is available 
bzr-revno: 1549
 2011-05-16 13:13:57 +02:00
Jonathan Corwin 274c4ee87a tidies 2011-05-15 21:53:25 +01:00
Jonathan Corwin f701eb9417 Head 2011-05-15 21:34:32 +01:00
Jonathan Corwin 2655c1b133 Remote searches presentations, media and images 2011-05-15 21:03:45 +01:00
Tim Bentley 070d719961 Fixes 2011-05-15 20:18:50 +01:00
Tim Bentley 387c911fdb Head 2011-05-15 20:07:53 +01:00
Tim Bentley 70660b7b71 Add Search to Custom and cleanups 2011-05-15 20:07:40 +01:00
Tim Bentley 1ea9c51c20 Reset dialogs on Cancel and minor cleanups 
bzr-revno: 1548
 2011-05-15 20:06:34 +01:00
Armin Köhler fbd5349c2f small bugfixes 
hide entry in tools menu if there are no bibles to upgrade
 2011-05-15 20:42:08 +02:00
Jonathan Corwin 3f21b3e2ca Remote custom search. Revert a few remote web changes 2011-05-15 19:33:00 +01:00
Tim Bentley 9fc67eba68 Spelling 2011-05-15 17:36:34 +01: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
Armin Köhler b10fbf98eb HEAD r1547 2011-05-15 16:22:04 +02:00
Tim Bentley 2d08c0ec2b The Image cache was being updates with a null image and this was leading to a corruption in the cache. 
Only add a file if it is there!

bzr-revno: 1547
Fixes: https://launchpad.net/bugs/766201
 2011-05-15 15:20:11 +01:00
Tim Bentley 0854919976 Stop cache being over written if no file name 
Fixes: https://launchpad.net/bugs/766201
 2011-05-15 14:42:12 +01:00
Andreas Preikschat cbdaf3334b fixed spelling 2011-05-15 15:10:21 +02:00
Andreas Preikschat 909cbfb176 - Move the No Search Results code. (I do not expect the code to be used by another QListWidget.) 
- Remove setUniformItemSizes

bzr-revno: 1546
 2011-05-15 15:08:16 +02:00
Andreas Preikschat a2db0a1b5d fixed traceback when doing a text search without bible 2011-05-15 15:06:16 +02:00
Andreas Preikschat 4baaedc710 - Prevent adjusting the loop delay spin box (on the Gerneral Tab) to 0. 
- Changed title for the stage view html.

bzr-revno: 1545
 2011-05-15 14:57:25 +02:00
Andreas Preikschat 685bd32ccc r1544 2011-05-15 14:11:33 +02:00
Andreas Preikschat c728559862 moved 'No Search Results' code 2011-05-15 14:11:08 +02:00
Raoul Snyman 1a35356acd Added layout style to advanced tab. 
Made search edit focused on switch to quick tab.
Reordered methods to: private, inherited, slots, additional.

bzr-revno: 1544
 2011-05-15 14:07:42 +02: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
Jonathan Corwin 357d34a4d8 Remote bible search. Kludgy and probably broken something or going to conflict. Also tweaked Remote web interface 2011-05-14 22:25:22 +01:00
Raoul Snyman 3774bf2312 Added layout style to advanced tab. 
Made search edit focused on switch to quick tab.
Reordered methods to: private, inherited, slots, additional.
 2011-05-14 22:12:01 +02:00
Jonathan Corwin 75414d2ba8 Fix a couple of things 2011-05-14 13:26:05 +01:00
Andreas Preikschat 144ff29e90 fixed bug #744463 
Fixes: https://launchpad.net/bugs/744463
 2011-05-14 13:48:15 +02:00
Andreas Preikschat d22cacd982 Fixed a traceback which is occurs when you "lock" the search and do not select a dual bible (quick tab). 
bzr-revno: 1542
 2011-05-14 12:50:47 +02:00
Jonathan Corwin 047287950c Remote song search and go live beginnings 2011-05-14 10:48:58 +01:00
Andreas Preikschat b04e688647 fixed attribute error 2011-05-13 22:59:14 +02:00
Andreas Preikschat b1979857e4 complete fix 2011-05-13 21:58:05 +02:00
Andreas Preikschat 1f4bc114a9 Fixed traceback, when 'locked' and no dual bible selected. 2011-05-13 21:44:34 +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 998411ed9b - only show the context menu if we are over an item 
- ServiceManager clean ups

bzr-revno: 1539
 2011-05-13 18:42:48 +02:00
Andreas Preikschat 31cebdf4f7 added missing period 2011-05-13 17:34:56 +02:00
Andreas Preikschat de30e61401 - only show menu when over an item 
- clean ups
 2011-05-13 16:39:37 +02:00
Andreas Preikschat 07b704677a 2011-05-13 15:58:17 +02:00
Andreas Preikschat 0f73fbd310 2011-05-13 15:00:20 +02:00
Andreas Preikschat d4f7bf1e0a 2011-05-13 14:55:04 +02:00
Jonathan Corwin ef5c4bc7d4 Detect repeat verses 2011-05-12 22:55:45 +01:00
Armin Köhler 4ffa5c59d7 change some strings to better english 
small fixes
 2011-05-12 22:04:33 +02:00
Andreas Preikschat 2bb59f7051 - Disable the drop in the SearchEdit 
- Disable the drag in the MediaManager/ServiceManager if no item is selected.

bzr-revno: 1536
 2011-05-12 21:51:16 +02:00
Armin Köhler d1f8e9f275 HEAD 1535 2011-05-12 21:17:30 +02:00
Raoul Snyman dd68784555 Some enhancements to the Bibles media item. 
bzr-revno: 1535
 2011-05-12 20:10:09 +02:00