Commit Graph

784 Commits

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