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

3569 Commits

Author SHA1 Message Date
Andreas Preikschat
91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat
2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Andreas Preikschat
af5995f2a1 moved shortcut settings to settings.py 2013-01-10 21:14:49 +01:00
Andreas Preikschat
306919d15f moved settings to own file 2013-01-10 20:54:45 +01:00
Andreas Preikschat
eb6bc6adbc started work to store setting in a (half) central place 2013-01-10 20:33:48 +01:00
Tim Bentley
9f7725573d Fix tests 2013-01-09 19:56:16 +00:00
Dmitriy Marmyshev
daf1887ab9 HEAD 2013-01-09 20:12:31 +04:00
Dmitriy Marmyshev
30ea5fce9c Pause looping when blanking screen 2013-01-09 14:30:32 +04:00
Tim Bentley
7ee8d8c576 Fix crash on blank to desktop 2013-01-03 21:28:00 +00:00
Jonathan Corwin
794567b1ec Import %General, better error message, support 'players' section 2013-01-02 22:32:41 +00:00
Tim Bentley
feef9df575 Head 2013-01-02 21:50:45 +00:00
Tim Bentley
e03a265ba9 Style updates and more tests 2013-01-02 21:50:20 +00:00
Jonathan Corwin
38e580fbd7 Edit/save custom slide items in service files. 
bzr-revno: 2136
 2013-01-02 21:31:11 +00:00
Patrick Zimmermann
33bad25104 Rename "workarounds" -> "display workarounds". 2013-01-01 21:03:12 +01:00
Patrick Zimmermann
cf9f55d5d2 Change blockSignals() to use True & False. Correct line length. 2013-01-01 14:38:36 +01:00
Dmitriy Marmyshev
df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley
44a9f96c87 merge fixes 2012-12-30 19:49:48 +00:00
Tim Bentley
a235602acb Fix up auto start 2012-12-30 16:43:49 +00:00
Patrick Zimmermann
b5fe0139ea Merge master (including Settings() refactor). 2012-12-30 13:01:27 +01:00
Tim Bentley
e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +00:00
Jonathan Corwin
4257ce2932 Attempt to load %General section, and just ignore those we don't know 2012-12-29 22:55:40 +00:00
Dmitriy Marmyshev
8a96b0b3a1 HEAD 2012-12-30 02:52:19 +04:00
Tim Bentley
4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley
01de9a93df Capture key and mouse movements 2012-12-29 20:54:25 +00:00
Tim Bentley
9f28874eb5 Code fixes 2012-12-29 18:13:08 +00:00
Tim Bentley
4f2f6f73aa Completed core conversion 2012-12-29 15:25:29 +00:00
Tim Bentley
345b5638c8 Splash screen done 2012-12-29 13:35:16 +00:00
Tim Bentley
4b6292220a Main window done 2012-12-29 13:15:42 +00:00
Tim Bentley
2b6b6d5756 Start of ui 2012-12-29 09:35:24 +00:00
Jonathan Corwin
d814553924 Head + need fixings (forgot to commit head first, sorry) 2012-12-28 22:33:06 +00:00
Tim Bentley
ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat
863aa58656 final clean ups 2012-12-27 18:17:08 +01:00
Andreas Preikschat
0a57bed2f7 fixed setting import 2012-12-27 18:00:40 +01:00
Andreas Preikschat
cbd22b7141 fixed bug caused by merge 2012-12-27 17:46:27 +01:00
Andreas Preikschat
f1bdcec79d r2131 + conflicts 2012-12-27 17:33:38 +01:00
Andreas Preikschat
b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01:00
Tim Bentley
e54f4eec7b Interface unusable when run on XFce 2012-12-26 12:20:30 +00:00
Dmitriy Marmyshev
86d916509b deleted commented code 2012-12-26 00:22:41 +04:00
Tim Bentley
933925647b Fix unblocking of events 2012-12-24 21:04:52 +00:00
Jonathan Corwin
0092fc6960 Save any service text item as a custom slide 2012-12-23 00:00:24 +00:00
Tim Bentley
81640a9612 Fix media starting in wrong place 2012-12-21 19:19:26 +00:00
Tim Bentley
b1f80c96ea Fix media starting in wrong place 2012-12-21 19:11:00 +00:00
Andreas Preikschat
18aaf682e8 started to implment central place for default values 2012-12-20 21:33:43 +01:00
Andreas Preikschat
6ed77d4032 r2128 + conflicts 2012-12-20 13:09:12 +01:00
Arjan Schrijver
e574466ebb use unicode strings 2012-12-20 09:05:25 +01:00
Patrick Zimmermann
f156c37e90 Fix indentation. 2012-12-19 23:25:52 +01:00
Patrick Zimmermann
cf36197993 Rename stylesheetFix -> alternateRows. 2012-12-19 23:22:11 +01:00
Arjan Schrijver
e7787ddd2d fixed bug #1092121 'Interface unusable when run on XFce' 
Fixes: https://launchpad.net/bugs/1092121
 2012-12-19 17:26:53 +01:00
Dmitriy Marmyshev
3f380c68d9 Code cleanUp lines to 120 2012-12-19 00:25:07 +04:00
Dmitriy Marmyshev
770f245d0c HEAD 2012-12-18 00:39:07 +04:00
Patrick Zimmermann
34bec28074 Merge master 2012-12-17 20:54:07 +01:00
Patrick Zimmermann
c9624ab378 Default stylesheet logic to true on Windows even without existing configuration. 2012-12-17 20:50:09 +01:00
Dmitriy Marmyshev
3e3911c133 Renamed varaibles by standard. 2012-12-16 20:45:38 +04:00
Tim Bentley
cbbb6c7e2a Head merge and resolve conflicts 2012-12-13 19:02:32 +00:00
Tim Bentley
68ce73544a volume fixes 2012-12-13 18:55:11 +00:00
Tim Bentley
0f0b8d04e7 Core Media to 120 2012-12-11 19:55:47 +00:00
Patrick Zimmermann
f239b2345d Move changes to new branch. 2012-12-11 00:35:53 +01:00
Tim Bentley
0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley
564b2e41ae Style Fixes 2012-12-10 06:15:42 +00:00
Tim Bentley
5a4a33b9b8 Updates 2012-12-09 20:57:41 +00:00
Tim Bentley
6748266fba Fix the setting for lite saves 2012-12-08 16:20:52 +00:00
Tim Bentley
5be9ba5b2c Cleanup Service Item Validation and start tests 2012-12-08 08:40:41 +00:00
Tim Bentley
f3cabebf79 Fix header 2012-12-07 19:04:13 +00:00
Tim Bentley
3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Tim Bentley
11276f6bba Ffix up icons 2012-12-07 18:56:33 +00:00
Tim Bentley
d6513f7c60 Fix blank / unblank bug 2012-12-07 17:47:32 +00:00
Tim Bentley
0e980b6a98 resources for media 2012-12-06 19:26:50 +00:00
Andreas Preikschat
7fa97b2cac fixed import order 2012-12-06 12:09:10 +01:00
Tim Bentley
34275d0a5f Fix service save 2012-12-05 22:42:48 +00:00
Andreas Preikschat
cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat
6c1e303dbd fixed branch 2012-12-05 21:33:39 +01:00
Andreas Preikschat
9b1709963e Change defaults for display screen mouse hiding 
bzr-revno: 2122
 2012-12-05 06:13:34 +00:00
Andreas Preikschat
80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Andreas Preikschat
fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley
a1d3d002ef String fixes 2012-12-04 06:09:55 +00:00
Tim Bentley
fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Tim Bentley
b1c2cee003 Fix swf files 2012-12-03 19:18:28 +00:00
Andreas Preikschat
ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley
580de0015f Fix background video 2012-12-02 08:06:08 +00:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
2299290f5c fix stop 2012-11-29 20:46:16 +00:00
Tim Bentley
846d909dc3 Fix osz bug 2012-11-28 21:14:08 +00:00
Tim Bentley
cf0bb94b3f Clean ups 2012-11-26 17:57:36 +00:00
Tim Bentley
d538a32f49 String clean ups 2012-11-24 08:01:10 +00:00
Tim Bentley
116c5b030f Fix media language Automatic 2012-11-22 22:02:40 +00:00
Tim Bentley
4eab1a6521 Head 2012-11-22 21:58:16 +00:00
Tim Bentley
6fd865635f Fix most of the review comments 2012-11-21 21:49:18 +00:00
Raoul Snyman
85920b2132 Added .m4v to list of allowed VLC extensions. 2012-11-20 15:04:46 +02:00
Tim Bentley
acadf89a34 Fix displayed preview 2012-11-18 07:56:12 +00:00
Tim Bentley
506fd80f89 Style cleanups 2012-11-17 07:59:25 +00:00
Tim Bentley
57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Tim Bentley
9eb3757c9f Stop indexing arrays with objects 2012-11-16 21:46:17 +00:00
Dmitriy Marmyshev
2093d9829f Renamed varaibles by standard 2012-11-16 22:48:49 +04:00
Dmitriy Marmyshev
9bb9c6a629 Renamed varaibles by standard. 2012-11-16 21:06:52 +04:00
Dmitriy Marmyshev
2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +04:00
Dmitriy Marmyshev
7780751807 all methods renamed by standard. 2012-11-13 12:32:09 +04:00
Dmitriy Marmyshev
4af902e74d Some fixes for autoplay 2012-11-13 12:11:49 +04:00
Tim Bentley
5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley
55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Erik Lundin
4c502dba9c Fixed the spelling of "Erik Lundin" 2012-11-10 21:09:09 +01:00
Tim Bentley
431a5fbb15 Fix from misalignment 2012-11-10 16:51:23 +00:00
Tim Bentley
69b2bcb21f Head 2016 2012-11-10 16:43:42 +00:00
Philip Ridout
e90af50fd6 Removes items with missing files prior to saving (after confirmation from user) 
bzr-revno: 2106
 2012-11-10 16:38:26 +00:00
Dmitriy Marmyshev
d5a4cbd900 Autoplay slides ffuture 2012-11-09 22:44:25 +04:00
Tim Bentley
47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Tim Bentley
2295a74d5d Head 2104 - reverse some changes as not valid in this release 2012-11-07 18:47:56 +00:00
Martin Zibricky
72bb217749 This is the fix for playback with vlc on osx. It also includes fix to get media length without starting playback of a video. 
I tested it only on osx in one- and dual-screen setup so far.

Also controllersVisible is renamed to controlsVisible.

bzr-revno: 2104
 2012-11-07 18:42:21 +00:00
Tim Bentley
9e1e07c04c Head 2103 2012-11-07 18:41:07 +00:00
Martin Zibricky
5c82a0c3dd Bug #963955 : Rename controllersVisible to controlsVisible. 2012-11-06 12:58:32 +01:00
Martin Zibricky
54fac2266e Merge with trunk. 2012-11-06 12:54:51 +01: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
f155b51467 Head 2099 2012-11-03 20:53:30 +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
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
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
b901236a7f fix irc name 2012-10-24 17:35:41 +01:00
Tim Bentley
bb3561c18a Fixes 2012-10-23 18:35:23 +01: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
Tim Bentley
464480fc34 fix up settings tab 2012-10-18 21:38:01 +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
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
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
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
Raoul Snyman
43e41b2688 Try to lessen the number of superfluous process events signals 2012-10-13 19:05:55 +02: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
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
Andreas Preikschat
a5b456a374 Fix bypass of X11 for Gnome Shell 
bzr-revno: 2081
 2012-10-10 20:49:31 +01:00
Tim Bentley
c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01: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
Tim Bentley
f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +01: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
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
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
Tim Bentley
45849803aa Cleanups 2012-10-04 18:28:49 +01:00
Andreas Preikschat
802de6d241 fix 2012-10-03 22:11:54 +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
Andreas Preikschat
afd6af805a updated vlc.py from master 2012-10-01 13:38:45 +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
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
ElderP
3855b28d40 Added [crashreport] as a valid section for settings import 2012-09-21 16:35:42 -04:00
Raoul Snyman
657beb727c Made changes to keep others happy. 2012-09-21 08:42:31 +02:00
Andreas Preikschat
ea88f94e85 - do not reload theme list twice when renaming a theme 
- fixed not reloading list after adding a new theme [regression]

bzr-revno: 2068
 2012-09-20 07:21:17 +02:00
Andreas Preikschat
e1707c4203 updated vlc.py from master 
bzr-revno: 2067
 2012-09-20 07:19:56 +02:00