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

982 Commits

Author SHA1 Message Date
Tim Bentley
1c76353cba head 2013-03-15 08:40:16 +00:00
Tim Bentley
9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Tim Bentley
5c79832bcc More updates to authentication 2013-03-11 21:00:00 +00:00
Tim Bentley
c62dab074e Basic Authentication now working 2013-03-08 19:15:49 +00:00
Tim Bentley
6bf07f9dce Head 2013-03-08 16:35:10 +00:00
Tim Bentley
2464bef944 Head + conflicts 2013-03-07 18:22:38 +00:00
Andreas Preikschat
7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat
d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat
6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat
33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Andreas Preikschat
c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Tim Bentley
f1aadde13c Initial Cherrypy implementation 2013-03-06 21:53:29 +00:00
Tim Bentley
4fb0aca862 Fix review comments 2013-03-05 17:11:58 +00:00
Tim Bentley
5ee12ff1c0 Fix bug from bootstrap merge 2013-03-04 18:01:57 +00:00
Tim Bentley
188aa53082 Head + conflicts 2013-03-01 17:36:43 +00:00
Tim Bentley
83fe10361a For minor fixes 2013-03-01 17:29:09 +00:00
Andreas Preikschat
25b1584a9d r2194 + conflict 2013-02-27 12:33:03 +01:00
Andreas Preikschat
31f28a7570 fixed same short lines 2013-02-24 19:13:50 +01:00
Tim Bentley
0a1ebfbdb9 Head + merge issues 2013-02-21 21:33:06 +00:00
Andreas Preikschat
db2b4ccd61 head + conflicts 2013-02-21 22:26:24 +01:00
Tim Bentley
2516417ee5 fix conflict 2013-02-21 19:16:05 +00:00
Tim Bentley
ffb10c0149 More cleanups of slide controller and friends 2013-02-20 20:43:20 +00:00
Tim Bentley
ad7d78ff26 More cleanups 2013-02-20 19:31:51 +00:00
Andreas Preikschat
38c2c2db5e make diff more readable 2013-02-19 10:33:07 +01:00
Andreas Preikschat
53f93d6342 r2187 + conflicts 2013-02-19 10:16:54 +01:00
Andreas Preikschat
781da422b6 started to remove forgotten shortcut kwargs 2013-02-19 10:13:49 +01:00
Andreas Preikschat
a20f309824 r2181 2013-02-16 13:44:47 +01:00
Tim Bentley
bd0ff619a9 Clean up settings and alerts 2013-02-14 21:31:17 +00:00
Andreas Preikschat
6eba926a70 improved hide menu behaviour 2013-02-10 20:08:37 +01:00
Andreas Preikschat
8bb88f3c9f fixed bug 1112587 
Fixes: https://launchpad.net/bugs/1112587
 2013-02-10 13:29:42 +01:00
Tim Bentley
cae39247d9 Final cleanup of variables 2013-02-07 11:33:47 +00:00
Tim Bentley
c90d45ca73 Bye Bye Event Receiver 2013-02-07 08:42:17 +00:00
Andreas Preikschat
b3e20f2788 r2170 + conflict 2013-02-05 09:10:50 +01:00
Andreas Preikschat
f94ae4d7c2 reordered imports 2013-02-05 09:05:28 +01:00
Andreas Preikschat
9aa7cf7b29 r2169 + conflict 2013-02-04 22:07:38 +01:00
Tim Bentley
b83b6eccd1 Head and merge failures 2013-02-03 16:40:39 +00:00
Tim Bentley
27cd63ebcd Remove events and move to Registry 2013-02-03 09:07:31 +00:00
Raoul Snyman
922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Raoul Snyman
b0d96aa932 HEAD 2013-02-02 20:43:34 +02:00
Raoul Snyman
c891edc40c Last of the dialogs 2013-02-01 23:34:23 +02:00
Andreas Preikschat
9d2fc38717 r2164 + conflict 2013-01-31 20:22:56 +01:00
Dmitriy Marmyshev
235d1c8b79 Make slide controller buttons width aware 
bzr-revno: 2163
 2013-01-31 19:06:53 +00:00
Andreas Preikschat
9bc317532c r2162 + conflict 2013-01-31 19:47:53 +01:00
Andreas Preikschat
16ba742d1d sorted default dict a bit; fixed settings conversion; renamed a setting; removed old setting 2013-01-31 08:56:34 +01:00
Tim Bentley
80a2a7449e Move var cleanups 2013-01-27 20:36:18 +00:00
Tim Bentley
91a959a490 More name cleanups 2013-01-27 10:18:06 +00:00
Tim Bentley
eb3e5b8642 Remote Edit cleanup and simplification 2013-01-27 09:57:03 +00:00
Tim Bentley
183c0c700d More Registry cleanups and bug fixes 2013-01-26 07:39:07 +00:00
Tim Bentley
c0aca32660 Head 2013-01-24 20:08:52 +00:00
Dmitriy Marmyshev
6e92547398 styling fix 2013-01-24 07:07:41 +04:00
Tim Bentley
be6977a1a3 remove plugin helpers 2013-01-23 21:05:25 +00:00
Tim Bentley
aafef12bf8 Head with fixes 2013-01-23 20:29:43 +00:00
Tim Bentley
9a107e627b Head 2013-01-23 19:53:02 +00:00
Tim Bentley
3378e32da3 More cleanups and removal of plugin_helpers 2013-01-23 19:28:47 +00:00
Tim Bentley
064ca583ca Live and Preview Moved 2013-01-22 21:25:16 +00:00
Tim Bentley
a6de33f177 Registry takes shape and takes over 2013-01-22 21:09:43 +00:00
Andreas Preikschat
d0c9c35deb r2154 + fixed trunk 2013-01-21 20:47:53 +01:00
Tim Bentley
4224d8befe Spelling 2013-01-21 07:34:50 +00:00
Tim Bentley
b04a6bba79 Code tidy ups to make pylint happier 2013-01-21 07:29:43 +00:00
Dmitriy Marmyshev
a20c077698 Add Autoplay feature to Service items and Service Manager 
bzr-revno: 2152
 2013-01-21 06:45:00 +00:00
Andreas Preikschat
e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Dmitriy Marmyshev
e3e8693bcc name fix 2013-01-18 23:00:13 +04:00
Tim Bentley
9d8fc508b0 Head 2013-01-16 19:37:11 +00:00
Andreas Preikschat
c29bbd3ca0 r2146 2013-01-16 12:29:19 +01:00
Dmitriy Marmyshev
ef947355c5 style fixing 2013-01-16 03:59:04 +04:00
Dmitriy Marmyshev
024ba1aac9 Auto separating blank buttons, if width allows this. 
Fixes: https://launchpad.net/bugs/718797
 2013-01-12 00:23:06 +04:00
Tim Bentley
634246a493 set the focus to the maindisplay when it is updated. 
Fixes: https://launchpad.net/bugs/1097898
 2013-01-11 17:08:44 +00:00
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
Dmitriy Marmyshev
30ea5fce9c Pause looping when blanking screen 2013-01-09 14:30:32 +04:00
Tim Bentley
feef9df575 Head 2013-01-02 21:50:45 +00:00
Dmitriy Marmyshev
df916a3fc1 HEAD 2013-01-01 14:28:52 +04:00
Tim Bentley
e79250c06b Fix seek slider code - and Head 2012-12-30 08:33:42 +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
Andreas Preikschat
b6c9fa16c5 reverted last commit 2012-12-27 17:27:59 +01: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
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
Tim Bentley
0ea45fd885 SlideController and ServiceManager 2012-12-10 18:04:58 +00:00
Tim Bentley
3bd911de79 Revised media and bug fixes 
bzr-revno: 2124
 2012-12-07 19:00:33 +00:00
Andreas Preikschat
cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01: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
fae1d79fff 2020 2012-12-03 19:19:10 +00:00
Andreas Preikschat
ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley
a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley
57ad90f1a6 Head 2012-11-16 21:46:56 +00:00
Dmitriy Marmyshev
2f34b5ddf2 Renamed all variables by standard. 2012-11-14 15:47:15 +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
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
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
6c121bda1a Api simplifications and removal of unneeded variables 2012-10-31 18:04:24 +00:00
Tim Bentley
f645ab962c Api cleanup 2012-10-26 21:20:23 +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
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
057a1fe415 Rename methods 2012-10-15 19:38:58 +01:00
Andreas Preikschat
cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Tim Bentley
c43cdea8b1 Head 2079 2012-10-10 19:10:10 +01:00
Tim Bentley
f1e04b6d62 Adjust output to use new images 2012-10-09 19:00:33 +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
159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Tim Bentley
d58efe2282 Remove unused varable 2012-09-29 19:58:18 +01:00
Andreas Preikschat
88288aa695 refactored class 2012-09-24 17:14:36 +02:00
Tim Bentley
a3b2fcd113 Video lenght 2 2012-09-14 17:35:07 +01:00
Tim Bentley
59ca1f5469 Try 2 2012-09-07 17:58:13 +01:00
Tim Bentley
4390c13901 Auto start media 2012-09-04 21:22:27 +01:00
Philip Ridout
dcc4608f3c fixes issue 1045 and bug 1037076 "Short cut keys do not work for background audio" 2012-08-18 11:55:57 +01:00
Andreas Preikschat
bc3173966a clean ups 2012-07-01 20:41:59 +02:00
Andreas Preikschat
9da23266c6 reworked image manager _cache to contain unique images (to be cleaned up) 2012-06-30 17:19:33 +02:00
Samuel Findlay
4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Stevan Pettit
245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Stevan Pettit
cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Andreas Preikschat
b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat
81b4d84c1f changed attributes and arguments to camelCase 2012-06-04 12:22:47 +02:00
Stevan Pettit
394a02c696 Merged trunk 2012-05-29 08:59:11 -04:00
Andreas Preikschat
ded1e82659 r1975 2012-05-23 18:49:24 +02:00
Andreas Preikschat
4a6697f5a1 r1975 2012-05-23 18:31:25 +02:00
Raoul Snyman
1c57abf8ab Refactored ScreenList into a true Pythonic singleton, though I sadly had to go with a "create" classmethod in order to retain the functionality of the previous constructor.. 2012-05-20 22:56:11 +02:00
Andreas Preikschat
060718be32 (experimental) attempt to imporve renderer (to be fixed) 2012-05-20 20:26:24 +02:00
Andreas Preikschat
9fa14f3e3a attempt to fix bug 923496 
Fixes: https://launchpad.net/bugs/923496
 2012-05-20 17:52:21 +02:00
Andreas Preikschat
ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat
2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit
f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Andreas Preikschat
63997aa7b2 - repla- replaced numScreens by screenCount; - removed 0 in range() 
bzr-revno: 1961
 2012-05-01 22:35:42 +02:00
Andreas Preikschat
a0225d790a replaced numScreens by screenCount; removed 0 in range() 2012-05-01 13:00:02 +02:00
M2j
c6c62bdcad pythonifying code: 
- replace has_key() by key in dict
- remove len() method from sequence and mapping types when mapping to bool
 2012-04-29 17:31:56 +02:00
Raoul Snyman
070ed7fcb5 Merged HEAD from trunk and fixed a conflict. 
Some more refactoring.
 2012-04-22 21:37:11 +02:00
M2j
dded8ee569 Bring back NextTrack 2012-04-02 23:00:24 +02:00
Jon Tibble
086a32d7b1 Head r1908 2012-03-17 16:42:53 +00:00
Jonathan Corwin
8bca20a48c Create wrapper routine due to incorrect parameter to slidenext 2012-03-16 23:05:06 +00:00
Jon Tibble
9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
M2j
9aaafdf108 Merge with lp:~raoul-snyman/openlp/bug-845692 to forestall merge conflicts. 2012-03-05 11:09:07 +01:00
M2j
970e6c5564 correct parenting of shortcut actions in slide controller 2012-03-04 20:06:49 +01:00
M2j
587850bb59 Bug #943919: Make shortcuts for "Move to Previous/Next" in live slide controller 
configurable.
 2012-03-03 14:52:57 +01:00
M2j
45de016abb derive OpenLPToolbar().actions keys from object names to prevent collisions in 
case translators translate different strings same.
 2012-03-02 13:11:13 +01:00
M2j
6d909c64eb unified remaining action creation methods (addToolbarButton, context_menu_action, context_menu_separator) 2012-03-02 11:22:52 +01:00
M2j
fe2966ac9e make slideShortcutActivated private 2012-02-28 10:47:34 +01:00
M2j
d13ec2184a concentrate action creation in slide controller 2012-02-28 10:24:42 +01:00
M2j
95c8f8fe5a removed base_action, checkable_action, icon_action, and shortcut_action 2012-02-28 00:44:35 +01:00
Raoul Snyman
ef4b69c50f Fixed some long lines. 2012-02-25 15:39:12 +02:00
Raoul Snyman
476ba8eb1b Fixed the copyright in the patch file which someone else missed. 
Regenerated the resource file.
Fixed the copyright in the translation_utils.py script which someone else missed.
Removed an unnecessary comment.
 2012-02-25 13:11:59 +02:00
Raoul Snyman
d4aab974d2 HEAD 2012-02-25 13:02:43 +02:00
Raoul Snyman
d681afb2b4 Added an icon in for the Next button, and added in direct-to-track skipping too. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 02:01:24 +02:00
Raoul Snyman
8fa7dcf080 Add the last two remaining outstanding items, the "next track" and the time remaining. 
Fixes: https://launchpad.net/bugs/845692
 2012-02-25 01:26:10 +02:00
Raoul Snyman
d14a316309 Added repeating of the background audio track list. 
Migrated the songs plugin configuration tab to use the proper camelCase names.
 2012-02-16 23:08:30 +02:00
Jonathan Stafford
d57905f9d8 Fixed Preview Crash Bug 932610 
Fixes: https://launchpad.net/bugs/932610
 2012-02-15 18:37:42 +08:00
Jonathan Stafford
13ab688518 Changing the "Wrap Slide" option into a three-way radio button selection to allow the option of the up/down arrow keys to jump between service items at the end of each song, etc. 
bzr-revno: 1876
 2012-02-06 17:35:41 +00:00
Jonathan Stafford
e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
Andreas Preikschat
bedb2d833d fix ZeroDivisionError 2012-02-04 18:11:35 +01:00
Jonathan Stafford
d26de263f3 Fixed missing u and tidied up blank lines between class definitions 2012-01-30 06:07:06 +08:00
Jonathan Stafford
02975a61bf Renamed and moved both enumerations to lib/__init__.py 2012-01-28 16:07:54 +08:00
Jonathan Stafford
6487a3248a Moved Service Item Advance enumeration to slidecontroller 2012-01-25 20:34:13 +08:00
Jonathan Stafford
d686799035 Created Service Item Advance enumeration class 2012-01-25 18:03:57 +08:00
Jonathan Stafford
2c472ff38e Small Fixes 2012-01-23 17:33:12 +08:00
Jonathan Stafford
cc04a82c08 Changed up arrow to jump to last slide of previous service item (when applicable) 2012-01-22 17:07:59 +08:00
Jonathan Stafford
6543bbafb6 Changed slide_advance variable to be set only in SlideController initialisation or when settings are changed. 2012-01-18 17:52:51 +08:00
Jonathan Stafford
1dbcc18c7e Reintroduced slide_advance variable so that settings are only read once. Reverted language files. 2012-01-16 17:50:15 +08:00
Jonathan Stafford
c1604b64ff Fixed camelCase, indentation, extra spaces, and slide timer 2012-01-15 21:11:10 +08:00
Jonathan Stafford
01f7244db7 Removed unnecessary slide_advance 2012-01-15 18:05:12 +08:00
Jonathan Stafford
360b744e7c Basic Service Item Slide Advance Settings working 2012-01-15 16:27:35 +08:00
Tim Bentley
93a59d560f Another year has passed by 
bzr-revno: 1859
 2011-12-29 17:50:42 +00:00
Tim Bentley
2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Jonathan Corwin
3a5723cbaa Don't show initial display window if on same screen as application window, override or not. 2011-12-23 14:38:02 +00:00
Jonathan Corwin
69490c8f2c Ensure visible flags correct, and display if single screen works on Windows 2011-12-22 20:11:52 +00:00
Tim Bentley
55353e54f0 yet more changes 2011-12-15 18:59:25 +00:00
Tim Bentley
acebb85055 more changes 2011-12-15 17:19:54 +00:00
Tim Bentley
58f7649cca Fix elif 2011-12-14 20:04:38 +00:00
Tim Bentley
e450ea476d Remove blank line 2011-12-14 19:19:26 +00:00
Tim Bentley
c1ca990a2b Fix up methods to do the changes 2011-12-14 19:07:40 +00:00
Mattias Põldaru
1538d0b3bf More earlier conversions to unicode. 2011-12-09 14:35:18 +02:00
Mattias Põldaru
e471edca89 Convert strings unicode as soon as possible and assume they are in unicode later. 2011-12-09 13:50:25 +02:00
Jon Tibble
9c0bde098f Fix spacing 2011-12-03 13:40:48 +00:00
Jon Tibble
bd02fb5f30 Whitespace 2011-12-02 21:49:20 +00:00
Jon Tibble
f970d9462d Cleanups 2011-12-02 21:13:05 +00:00
Raoul Snyman
24095edc2b Added a missing import. 
Fixes: https://launchpad.net/bugs/898876
 2011-12-02 08:59:32 +02:00
Christian Richter
e8f0bf5cd1 Rewrite of the multimedia stuff. 
bzr-revno: 1810
 2011-12-02 08:56:57 +02:00
rimach
58035f505d bugfixing 2011-11-30 18:06:57 +01:00
Tim Bentley
8b8a67c1f7 Fix double loop entry 2011-11-28 18:03:38 +00:00
Tim Bentley
4f629dfd3b Implement a queue to process the requests 2011-11-28 17:10:00 +00:00
Tim Bentley
ef884792ac Move to reference counting 2011-11-27 16:08:42 +00:00
rimach
d7f38caccd bugfixing 2011-11-24 22:10:37 +01:00
Tim Bentley
5e702c1782 Fixes keyboard flood where events are switched order by PYQT. 
Now a keyboard press is only handled if the previous is finished.  

Fixes: https://launchpad.net/bugs/892571
 2011-11-23 06:05:42 +00:00
rimach
7077d5cda6 sync 2011-11-11 17:47:26 +01:00
rimach
087a1f7600 bugfixing 2011-11-11 17:45:25 +01:00
rimach
2ed85a2bb9 bugfixing 2011-11-02 21:27:53 +01:00
Andreas Preikschat
71c6a7315c fixed comment 2011-10-31 10:14:07 +01:00