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

7569 Commits

Author SHA1 Message Date
Philip Ridout eb1cd8cdc6 Fixed bug #1074727 "OpenSong Bibles cause OpenLP to crash due to missing attribute" 
Counts the chapter and verse numbers and uses these when no number is in the attribute

bzr-revno: 2101
 2012-11-05 18:55:30 +00:00
Raoul Snyman 91f49b643e Updated the image in the About dialog to the one from the new web site. 
bzr-revno: 2100
 2012-11-05 18:54:27 +00:00
Tim Bentley 9ba9b9605d Fix missing files in presentations 2012-11-05 06:05:44 +00:00
Philip Ridout 4f78c5e5bc fixes bug #1066142 "cancel firsttime wizard without song causes song reindexing" 2012-11-04 20:45:31 +00:00
Tim Bentley 751246ce0c Merge cleanups 2012-11-04 20:11:10 +00:00
Tim Bentley a66f68d0df Check that file exists 2012-11-04 14:25:48 +00:00
Philip Ridout 53b729af9e Fixed bug #1074727 "OpenSong Bibles cause OpenLP to crash due to missing attriburte" 
Counts the chapter and verse numbers and uses these when no number is in the attribute.
 2012-11-03 22:54:55 +00:00
Tim Bentley f155b51467 Head 2099 2012-11-03 20:53:30 +00:00
Philip Ridout d855b55484 Fix for bug #1073061 2012-11-02 22:00:14 +00:00
Philip Ridout 443ad478c1 Added validate function to serviceitem 2012-11-02 18:54:42 +00:00
Tim Bentley 8cd8d07d2c missing rename 2012-11-01 18:57:07 +00:00
Tim Bentley 6047657741 cleanups and minor fixes 2012-11-01 18:45:12 +00:00
Raoul Snyman 61b505f1bd Updated the image in the About dialog to the one from the new web site. 
Fixes: https://launchpad.net/bugs/1069109
 2012-11-01 19:41:22 +02:00
Tim Bentley a91dc027d2 Documentation 2012-11-01 16:54:37 +00:00
Tim Bentley b01fd0b293 SaveAs lite validation 2012-11-01 16:36:45 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Philip Ridout d35d4f4f79 Added some methods to serviceitem.py so as not to expose "inner workings of ServiceItem" and modified get_frame_path method. (Which required a modification to slidecontroller.py & messagelistener.py) 2012-10-31 21:04:29 +00:00
Tim Bentley 1145d661a5 more tidyups 2012-10-31 18:27:24 +00:00
Tim Bentley 6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley 29ec487d58 Remove old controller stack 2012-10-30 19:38:48 +00:00
Philip Ridout 713f742a3a fixed indentation. 2012-10-30 18:36:39 +00:00
Tim Bentley 5b7b2ecfb9 Api clean up 2012-10-29 16:54:39 +00:00
Tim Bentley a1bd9013cb Reference tidy up 2012-10-29 17:25:08 +00:00
Erik Lundin 48e2ac108d Fixed bug #1072498 'VLC: Add webm as supported format' 
Fixes: https://launchpad.net/bugs/1072498
 2012-10-29 00:08:54 +01:00
Tim Bentley a106244aba Zeoo Vol for preview and fix start / stop buttons 2012-10-28 22:00:28 +00:00
Martin Zibricky b414177fc3 Merge with trunk. 2012-10-27 20:14:01 +02:00
Martin Zibricky 064a318f9a Bug #963955: Disable audio for video preview. 2012-10-27 19:32:56 +02:00
Martin Zibricky e6cc675207 Bug #963955: Fix the video progress bar. 2012-10-27 19:04:54 +02:00
Martin Zibricky 4a68322a60 Bug #963955: Fix the video progress bar. 2012-10-27 17:01:55 +02:00
Martin Zibricky b5de3c2828 Bug #963955: Avoid the need to start video twice to just get media length. 2012-10-27 16:52:51 +02:00
Philip Ridout fafe262adc Fixes bug1065423 "Missing image in service causes traceback when opening" 
Fixes bug1065420 ""missing files" dialog opens more then once when more files are missing"
 2012-10-27 10:06:33 +01:00
Tim Bentley f645ab962c Api cleanup 2012-10-26 21:20:23 +01:00
Tim Bentley a5fc3ea3f7 Fix bug 2012-10-25 22:03:12 +01:00
Tim Bentley 90a3493d89 Clean up video api 2012-10-25 21:33:28 +01:00
Tim Bentley 34b4828c30 convert video api to registered controller 2012-10-25 20:38:12 +01:00
Tim Bentley e24c588df3 Head 2012-10-25 20:17:14 +01:00
Tim Bentley a997bfa001 Fix player selection and simplify media_length 2012-10-25 20:16:56 +01:00
Tim Bentley f8a098f57c Fixed the copy rights 
Updated the translations
Updated the Volunteer link

bzr-revno: 2097
 2012-10-25 19:58:37 +01:00
Tim Bentley 555018e44a fix iffy text 2012-10-24 18:20:37 +01:00
Tim Bentley b901236a7f fix irc name 2012-10-24 17:35:41 +01:00
Tim Bentley bb3561c18a Fixes 2012-10-23 18:35:23 +01:00
Andreas Preikschat 360e64850c fixed bug 1045564 ('Bible verses on Remote Browser line wrap problem') 
Fixes: https://launchpad.net/bugs/1045564
 2012-10-23 16:20:09 +02:00
Martin Zibricky e1cd3bdd8b Allow .mov videos in phonon backend. 2012-10-21 22:42:51 +02:00
Tim Bentley 01c537d965 contribute 2012-10-21 19:23:50 +01:00
Tim Bentley 3eca286a08 Yet More updates 2012-10-21 15:42:49 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Tim Bentley 8e5dafb715 Fix bugs and more simplifications 2012-10-20 20:52:04 +01:00
Philip Ridout 0e4aeaac76 Fix Traceback when importing OpenLyrics file 
bzr-revno: 2095
 2012-10-20 16:21:15 +01:00
Tim Bentley cf635c1459 Stop service item generation running media twice 2012-10-20 09:20:11 +01:00
Tim Bentley 464480fc34 fix up settings tab 2012-10-18 21:38:01 +01:00
Philip Ridout e997d098f4 spotted a couple mistakes 2012-10-18 21:22:48 +01:00
Andreas Preikschat 57e844cc12 r2093 2012-10-18 20:13:54 +02:00
Martin Zibricky fa7d3142db Merge with trunk. 2012-10-18 00:20:22 +02:00
Martin Zibricky bd9a1e550b Bug #1067703 fixed. 2012-10-18 00:00:44 +02:00
Tim Bentley 540fe6fd1b Slow down the Impress start up loop 2012-10-16 19:21:32 +01:00
Philip Ridout bb9113ccdf Fixed bug1067247 
In the process uncovered a bug with transliteration, so fixed that also
 2012-10-16 18:26:23 +01:00
Martin Zibricky 11cb7754a5 Bug #1066853 fixed. 2012-10-16 17:23:37 +02:00
Martin Zibricky 8e125fb604 This change disables presentation plugin on osx and hides it in menu and fristtimewizard to be not visible for users. 
This also removes the line disabling presentation plugin.

bzr-revno: 2092
Fixes: https://launchpad.net/bugs/1002038
 2012-10-16 16:07:07 +02:00
Andreas Preikschat f84c089938 fixed bug #1066296 (Renaming theme keeps old/new theme in Theme manager) 
Fixes: https://launchpad.net/bugs/1066296
 2012-10-16 10:25:54 +02:00
Tim Bentley 057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Tim Bentley 8fb1ede03f Media Players help text 2012-10-15 18:35:14 +01:00
Tim Bentley a5824120c3 Lite save works 2012-10-15 17:20:23 +01:00
Martin Zibricky 16c0ec482e Bug #1002038: Fix enabling presentation plugin if no osx os. 2012-10-15 10:25:42 +02:00
Martin Zibricky 2f53897df5 Performance improvements in sort from Databases. 
Language aware.

bzr-revno: 2090
Fixes: https://launchpad.net/bugs/687638
 2012-10-15 05:51:22 +01:00
Jonathan Corwin db6b9fdd64 Fixes various Presentation issues 
bzr-revno: 2089
Fixes: https://launchpad.net/bugs/927585, https://launchpad.net/bugs/936596, https://launchpad.net/bugs/859098, https://launchpad.net/bugs/967061
 2012-10-15 05:45:56 +01:00
Martin Zibricky 869d1c6fd7 Merge with trunk. 2012-10-14 20:53:07 +02:00
Martin Zibricky 7321f5fb2d Bug #1002038: Disable and hide presentation plugin on osx. 2012-10-14 20:42:20 +02:00
Tim Bentley c29cf8ce70 Lite Save for Media working 2012-10-14 17:21:47 +01:00
Tim Bentley aea75e6c73 fix up player tab after setup changes and start to fix light save 2012-10-14 16:58:04 +01:00
Martin Zibricky 1408e6620d Merge: merge with trunk. 2012-10-14 13:14:37 +02:00
Martin Zibricky 0f18ec43a0 Bug #687638: improved performance of local aware sorting. 2012-10-14 13:11:48 +02:00
Raoul Snyman 14fec54927 Song import dialog now shows individual songs being imported. 
Improve the progress page of the FTW.

bzr-revno: 2088
 2012-10-14 08:01:46 +01:00
Tim Bentley 7ce17e99f8 Head 2087 2012-10-13 21:55:41 +01:00
Tim Bentley 77ddd4f385 Fixes 2012-10-13 21:54:56 +01:00
Tim Bentley e7cdf6d43a Do not display plank alert text 
bzr-revno: 2087
 2012-10-13 21:26:05 +01:00
Jonathan Corwin bbbf426cf2 If change slides whilst blank, update slidecontroller 2012-10-13 20:48:58 +01:00
Jonathan Corwin 9f5ed9589b Slide counts can only be got if active 2012-10-13 20:07:30 +01:00
Jonathan Corwin 4c1fe14fd2 Raoul's kicks 2012-10-13 19:32:32 +01:00
Raoul Snyman 43e41b2688 Try to lessen the number of superfluous process events signals 2012-10-13 19:05:55 +02:00
Tim Bentley ba57e335c0 Stop blank alerts being displayed 2012-10-13 08:34:15 +01:00
Jonathan Corwin 0ddeef9d8f Blank desktop issues 2012-10-12 23:13:58 +01:00
Jonathan Corwin c7e555e0e8 Various end of show issues 2012-10-12 22:33:10 +01:00
Martin Zibricky e26cd9ca6b Bug #687638: for customs cmp method in sort not necessary. 2012-10-12 21:40:15 +02:00
Jonathan Corwin efef105c3f ppt problems 2012-10-12 20:15:36 +01:00
Raoul Snyman 83de6bb99f Fixed bug #851706: The song import dialog now shows individual songs being imported. Also tried to make the progress page of the FTW work better, pity it is only slightly... 
Fixes: https://launchpad.net/bugs/851706
 2012-10-12 20:51:47 +02:00
Martin Zibricky 4427d4168e Bug #687638: use locale aware comparison in other places too. 2012-10-12 15:00:56 +02:00
Martin Zibricky 2cc18a8fb4 Bug #687638: use locale aware comparison for songs by default. 2012-10-12 13:55:06 +02:00
Martin Zibricky 7b608a948a Bug 687638: use locale aware comparison for song list. 2012-10-12 02:03:37 +02:00
Martin Zibricky 0836306f1b Bug 687638: add function locale_compare. 2012-10-12 00:55:21 +02:00
Jonathan Corwin 24041c7f17 Presentation error traps 2012-10-11 23:03:54 +01:00
Erik Lundin ef5cb33a91 Adding verses from multiple chapters fails 
bzr-revno: 2085
 2012-10-11 21:36:02 +01:00
Erik Lundin 017366c484 Made literal string to constant. 2012-10-11 21:25:50 +02:00
Erik Lundin 7d78b8f987 HEAD 2012-10-11 20:29:11 +02:00
Raoul Snyman 3fab588950 Fixed bug #1065242: Some words in the web remote were untranslateable. 
bzr-revno: 2084
Fixes: https://launchpad.net/bugs/1065242
 2012-10-11 20:26:12 +02:00
Philip Ridout 4dd0eea5de Fixes: 1065216 Alert display - Text dissapers of the edge of the screen 
Fixes: 1065149 Clicking new or save disables buttons to display alert

bzr-revno: 2083
Fixes: https://launchpad.net/bugs/1065216, https://launchpad.net/bugs/1065149
 2012-10-11 16:23:40 +02:00
Andreas Preikschat 638b95f62c fixed shortcut dialog 2012-10-11 12:53:39 +02:00
Andreas Preikschat 6553dda038 reverted fix 2012-10-11 12:42:37 +02:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Philip Ridout fb624d0c54 fixed bug #1063421 (Error when attempting to import a Sunday Plus song file.) 
bzr-revno: 2082
Fixes: https://launchpad.net/bugs/1063421
 2012-10-11 11:44:11 +02:00
Philip Ridout e55bc7f35d Fixes: 1065216 Alert display - Text dissapers of the edge of the screen 
Fixes: 1065149 Clicking new or save disables buttons to display alert

Long words now wrap rather than dissapearing off of the edge.
When creating a new item or editing one, the text is left in the text box, the item in the list stays selected and the display buttons enabled so the user does not have to find and click on the alert they just created.
 2012-10-10 22:58:21 +01:00
Raoul Snyman ad7715d402 Made the tabs in the web remote translateable. 2012-10-10 23:36:42 +02:00
Andreas Preikschat a5b456a374 Fix bypass of X11 for Gnome Shell 
bzr-revno: 2081
 2012-10-10 20:49:31 +01:00
Philip Ridout dd61f3753a Fix problems with OpenLyrics exports losing verse ends. 
bzr-revno: 2080
 2012-10-10 20:28:11 +01:00
Tim Bentley c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Andreas Preikschat bce246fabd - fixed bug #1065106 'Change in mainwindow are not reflected in remote' 
bzr-revno: 2079
Fixes: https://launchpad.net/bugs/1065106
 2012-10-10 19:34:44 +02:00
Tim Bentley f52859c2f8 Fix the icons for the media plugin so they are shown. 
bzr-revno: 2078
 2012-10-10 17:48:33 +02:00
Andreas Preikschat 57101afef2 fixed bug #1065106 'Change in mainwindow are not reflected in remote' 
Fixes: https://launchpad.net/bugs/1065106
 2012-10-10 17:33:44 +02:00
Andreas Preikschat 9437f9b4c6 - updated vlc from master 
bzr-revno: 2077
 2012-10-10 17:28:55 +02:00
Erik Lundin 89f3323f61 Fixed bug #1038694 'Change in service order not reflected in stage view' 
bzr-revno: 2076
Fixes: https://launchpad.net/bugs/1038694
 2012-10-10 16:53:06 +02:00
Philip Ridout 9956e0b0c6 fixes bug 1063421 
I was iterating over a loop as well as poping items out causing an index error
 2012-10-09 21:59:33 +01:00
Tim Bentley f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01:00
Tim Bentley fda3f1c93c Head 2012-10-09 18:38:25 +01:00
Erik Lundin ce67e95ff7 Removed unnecessary line break 2012-10-08 22:16:54 +02:00
Erik Lundin 5b6f058013 HEAD 2012-10-08 22:14:19 +02:00
Olivier Aubert 4a5b845cd0 updated from master 2012-10-08 17:44:42 +02:00
Andreas Preikschat 5d3269e907 fixed bug 1014422 ('X11 Over ride being on by default causes gnome-shell to become unusable') 
Fixes: https://launchpad.net/bugs/1014422
 2012-10-08 16:14:38 +02:00
Erik Lundin 1aa51ad5c4 Fixed bug #1038694 'Change in service order not reflected in stage view' 
Fixes: https://launchpad.net/bugs/1038694
 2012-10-08 02:47:10 +02:00
Tim Bentley 34284ea8ae Clean up media extension lists and move the controller. Fix reload of suffixes to happen after media or presentaions changes 2012-10-07 08:25:55 +01:00
Tim Bentley 1c0685d08b Iconise the media plugin items correctly 2012-10-06 11:01:04 +01:00
Tim Bentley 0c214cbf6c Head 2074 2012-10-06 10:21:46 +01:00
Tim Bentley 717cd68998 Fix media icons 2012-10-06 10:21:28 +01:00
Tim Bentley 56501b69f7 Head 2074 2012-10-06 09:37:40 +01:00
Tim Bentley 66728c52cd Renames 2012-10-06 09:35:37 +01:00
Tim Bentley 2dadfbd17a More Code cleanups 2012-10-06 09:10:28 +01:00
Tim Bentley e141ff1c24 Cleanups 2012-10-04 21:12:09 +01:00
Philip Ridout 17217062f4 Removed openlp.org-icon-32.bmp from resources. 
Found annother instance of the icon being used and corrected it.
 2012-10-04 19:18:24 +01:00
Tim Bentley 45849803aa Cleanups 2012-10-04 18:28:49 +01:00
Andreas Preikschat 802de6d241 fix 2012-10-03 22:11:54 +02:00
Philip Ridout 0674549168 fixed alert dialog's icon 2012-10-03 20:54:00 +01:00
Andreas Preikschat 43af89f70f fix 2012-10-03 20:52:52 +02:00
Andreas Preikschat 99e4786ab6 fix 2012-10-03 20:44:00 +02:00
Andreas Preikschat c4bdea7edd fixes 2012-10-03 19:55:39 +02:00
Andreas Preikschat 4a7a7e9050 fixes 2012-10-03 19:09:56 +02:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat f375d4b0b8 fixed bug 1050081 'display screen - hide mouse by default' 
Fixes: https://launchpad.net/bugs/1050081
 2012-10-03 13:27:28 +02:00
Erik Lundin b1cfabc4f3 Fixed bug #986495 'The language selection setting for bibles does not work'. 
bzr-revno: 2074
Fixes: https://launchpad.net/bugs/986495
 2012-10-03 13:16:59 +02:00
Andreas Preikschat b226364559 when a verse appears more than once do not render the verse again, instead use the already rendered one to improve performance 2012-10-02 19:35:10 +02:00
Raoul Snyman 14efe006fc Fixed bug #993445 and cleaned up the logic a little in some other places. 
bzr-revno: 2073
 2012-10-02 13:51:50 +02:00
Andreas Preikschat afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +02:00
Erik Lundin b92f453632 HEAD 2012-09-30 00:15:06 +02:00
Erik Lundin 748f6f6d84 HEAD 2012-09-30 00:10:10 +02:00
Tim Bentley d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Tim Bentley ee126c9924 Change background color of video 2012-09-29 19:36:30 +01:00
Tim Bentley a3e41b1ee7 Fix video injection and have black backgrounds 2012-09-29 17:27:55 +01:00
Andreas Preikschat 5eeab86db9 removed not needed parameters 2012-09-26 16:13:42 +02:00
Philip Ridout 93d5785b4c Fixes: Bug #876211 (OpenLyrics export non-compliant for split verses Edit) 
Fixes: Bug #904690 (cloning a song does not retain splits Edit)

Comment added to claifry line 28
 2012-09-25 21:15:56 +01:00
Raoul Snyman b71043f37d Fixed bug #1051971 where we weren't validating that a user had actually selected a file. 
bzr-revno: 2070
Fixes: https://launchpad.net/bugs/1051971
 2012-09-24 18:07:48 +02:00
Andreas Preikschat 88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Andreas Preikschat 4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00