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

820 Commits

Author SHA1 Message Date
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
Andreas Preikschat 94c99d1b3d fixed detection for more than one match 2011-10-31 10:13:25 +01:00
Andreas Preikschat 5348139cfe fixed spelling 2011-10-31 09:55:59 +01:00
Andreas Preikschat cac0728d0b fixed spelling 2011-10-31 09:54:04 +01:00
Andreas Preikschat f346ebebe0 fixed import and added note 2011-10-31 09:53:18 +01:00
Andreas Preikschat ffafcaaadc fix for translated verse tags 2011-10-31 09:44:38 +01:00
Andreas Preikschat 2458ffc3bc completed detection + cleaned detection 2011-10-31 08:41:28 +01:00
rimach dc327e2385 bugfixing 2011-10-26 22:11:15 +02:00
Andreas Preikschat 360843baf7 fixed spelling mistake 2011-10-26 21:19:42 +02:00
Andreas Preikschat c9c31990e2 fixed detection 2011-10-26 16:53:51 +02:00
Andreas Preikschat 33960f9eb4 allow all possible 'shortcut' combinations 2011-10-25 18:31:22 +02:00
rimach a2ebf30b68 bugfixing 2011-10-24 22:04:29 +02:00
Andreas Preikschat ee960bb88c use '1' etc shortcuts for bible verses, images, etc 2011-10-24 18:13:30 +02:00
Andreas Preikschat a42940b6bb - shortcuts only for live controller 
- removed v shortcut
 2011-10-24 17:36:59 +02:00
Andreas Preikschat cc186aff9d clean ups + fixes 2011-10-23 20:28:42 +02:00
Andreas Preikschat b603017b1c started work on shortcuts allowing jumping between different verses 
Fixes: https://launchpad.net/bugs/827862
 2011-10-23 19:47:15 +02:00
Andreas Preikschat 05bf2ec6fa removed obsolete signals and rearranged the docs 2011-10-22 13:09:01 +02:00
rimach 599573b5ce Sync 2011-10-17 23:51:24 +02:00
Tim Bentley 9652a690b3 More cleanups and start of updates 2011-10-15 07:32:01 +01:00
Andreas Preikschat 45b296b741 clean up 2011-10-05 19:04:59 +02:00
Andreas Preikschat 1967951061 attempt to prevent calling updatePreview more than once 2011-10-04 20:01:13 +02:00
Andreas Preikschat 201ec584a8 removed dead code + minor clean up 2011-10-03 20:51:32 +02:00
Andreas Preikschat 360e117918 removed dead code 2011-10-03 20:14:39 +02:00
Andreas Preikschat 88c0a22ac4 improve performance of preview 
Fixes: https://launchpad.net/bugs/856296
 2011-10-03 19:27:34 +02:00
Andreas Preikschat 8f3f09eef9 r1765 + resolved conflict 2011-10-01 09:28:45 +02:00
rimach c299efab1a update 2011-09-28 22:54:43 +02:00
rimach d88f437ffc bugfixing 2011-09-22 21:20:25 +02:00
rimach 11aae0bb82 sync with trunnk 2011-09-22 20:54:05 +02:00
Raoul Snyman 2b6e254b91 Add the option to start background audio paused (default is on). 2011-09-12 22:04:46 +02:00
Tim Bentley e93a1d2687 Hide the screen on startup if only 1 screen 
Fixes: https://launchpad.net/bugs/800156
 2011-09-06 20:32:30 +01:00
Raoul Snyman 2a02167646 Fixed up a few things, including updating theme when reactivating the current song. 2011-08-31 23:17:10 +02:00
Raoul Snyman abc2f3e89f Some minor fixes. 2011-08-31 13:29:04 +02:00
Raoul Snyman 0d16b05779 Now with pausing too! 2011-08-30 23:20:32 +02:00
Raoul Snyman c41e7c49df CAN HEARZ IT!!!! 2011-08-30 22:29:29 +02:00
rimach 2c5bc34968 review changes part 2 2011-08-30 18:54:45 +02:00
rimach c608301b0b review changes 2011-08-29 23:51:03 +02:00
rimach c547db5462 bugfixing 2011-08-29 21:55:58 +02:00
Raoul Snyman 015249407d Renamed some of the ItemCapabilities. 2011-08-28 19:45:13 +02:00
rimach 565c429bf9 preview issue fixed 2011-08-23 22:19:45 +02:00
rimach crichter@web.de ed9d704db9 Head 2011-07-25 23:06:43 +02:00
Stevan Pettit 0d9f6a946e modified slidecontroller to "reset" the loop button when new item is sent live 2011-07-24 15:41:33 -04:00
rimach crichter@web.de 210926867f bugfixing 2011-07-20 22:47:29 +02:00
rimach crichter@web.de 146e01b9ac Head 2011-07-19 22:05:44 +02:00
rimach crichter@web.de 65e6d45eff further changes 2011-07-18 23:25:10 +02:00
Jon Tibble a5dedf5b8e Head 1683 2011-07-11 19:35:20 +01:00
rimach crichter@web.de 98e1028705 update 2011-07-10 23:43:07 +02:00
Tim Bentley 77a055a304 Head 2011-07-10 13:07:10 +01:00
Tim Bentley e9fb8e59c1 Allow service item themes to change and be added back to slide controller 
Break object link between saved item in slide controller and service manager.

Fixes: https://launchpad.net/bugs/806829
 2011-07-09 08:43:35 +01:00
Stevan Pettit 6a612ee107 Modified slidecontroller to change loop button icons and captions when user select a loop to run. 
Lines 1060-1061 and 1081-1082 cover the case if the user uses the dropdown to change the loop type (continuous or once)

Added the translated button captions to ui.py

in slidecontroller, changed Qicon to build_icon

bzr-revno: 1676
 2011-07-08 07:41:30 +01:00
Jon Tibble 1ec41056ca Head r1675 2011-07-07 22:24:22 +01:00
Jon Tibble 623b56742c Cleanups 2011-07-07 19:03:12 +01:00
Stevan Pettit 856d44270f Changed use of Qicon to build_icon in slidecontroller 2011-07-07 13:38:13 -04:00
Stevan Pettit 1ffd5713b0 Modified slide controller to change loop button icons when selecting slide loops 2011-07-07 11:23:55 -04:00
Tim Bentley 091cdbbc24 Slow down slidecontroller events to allow buffers to clear. 
Line wrap incorrect and fix object name

Fixes: https://launchpad.net/bugs/752374
 2011-07-02 07:48:17 +01:00
Andreas Preikschat 1ff42f59de - added comments 
- qt name change
- remove test lines
 2011-06-25 06:36:43 +02:00
Raoul Snyman 509f739684 Fixed bug #791050 by hiding and then showing the toolbar. 2011-06-24 08:53:56 +02:00
Andreas Preikschat 47f5332bc3 Initial work on new image queuing (not working) 2011-06-21 22:28:22 +02:00
Andreas Preikschat 11cb39d2dc resize image in the thread not when adding the image 2011-06-21 13:37:28 +02:00
Andreas Preikschat dbef87021c minor clean ups; do not create qimage and then convert to qpixmap, instad create qpixmap directly 2011-06-21 12:10:53 +02:00
Jonathan Corwin 8cd128ddfe We don't want to resize 320x240 thumbnails back up to 1400x900 resolution just to display them in the slide controller! 2011-06-16 23:03:59 +01:00
rimach crichter@web.de 9dfb50951f bugfixing 2011-06-14 18:10:20 +02:00
rimach crichter@web.de 2c62a819b3 Head 2011-06-13 23:20:20 +02:00
Tim Bentley 608910a098 Fix name 2011-06-12 17:02:52 +01:00