Commit Graph

407 Commits

Author SHA1 Message Date
Meinert Jordan 48619f72cc Various i18n fixes.
bzr-revno: 847
2010-06-15 17:22:26 +02:00
Tim Bentley f38d97686e Fix method 2010-06-13 20:41:11 +01:00
Tim Bentley 732ce9555e Fix up blanks screen issues and cleanups 2010-06-13 20:34:25 +01:00
M2j 2dac357fa7 HEAD 2010-06-10 15:17:39 +02:00
M2j 940c6fd44f Set theme and service file content to UTF-8
Replaced replaced all non-ASCII chars in the sources (exept of comments)
Fixed theme background images bug
2010-06-09 21:10:57 +02:00
Jon Tibble 0b1621923a PEP8 type checking and cleanups 2010-06-09 18:09:32 +01:00
Frode Woldsund 2df6bf5ef5 Fixed some wrong translate context and some indentation errors 2010-06-07 23:36:22 +02:00
Frode Woldsund 23ac93019a Merged the trunk into my tree 2010-06-07 00:30:11 +02:00
Frode Woldsund dc35faf1ae Fixed all errors from the feedback I got from IRC 2010-06-06 12:07:48 +02:00
Frode Woldsund e88c05bd58 Added unicon symbol to all arguments in the translate() function. And fixed missing "spaces" and other smal error regarding the coding standar 2010-06-06 11:52:11 +02:00
Tim Bentley 61b4850941 Clean up slidecontroller 2010-06-05 16:31:07 +01:00
Jon Tibble d756aacf7a Unused variable 2010-06-01 01:45:20 +01:00
Frode Woldsund 3be909c5c0 Replaced { self.trUtf8() } with { translate() } which is the new standar. I also imported the translate library on the following files. I did not remove any import sinse I do not know how this { self.trUtf8() } does work. 2010-06-01 00:06:16 +02:00
Jon Tibble fb1e222422 Moar whitespace, exceptions and naming 2010-05-29 20:50:50 +01:00
Jon Tibble 122756eca5 Fix indentations 2010-05-24 23:37:20 +01:00
Tim Bentley f7987501b9 Stop memory growth, improve verse display 2010-05-23 08:03:28 +01:00
Tim Bentley d86f0285c9 Song Edit tableisation 2010-05-17 19:39:28 +01:00
Tim Bentley ac845a93ba Fix screen issues - not sure how though 2010-05-16 16:18:05 +01:00
Tim Bentley 23c3974afd Display fixes 2010-05-15 07:44:36 +01:00
Tim Bentley f7244c5e6e Remove comments and simplify 2010-05-10 19:29:51 +01:00
Tim Bentley 51728db0b6 Add cache to renderer 2010-05-10 19:19:45 +01:00
Tim Bentley 6c9c9848db Clean up fixes 2010-05-06 17:49:12 +01:00
Tim Bentley fd22b01e59 Head811 2010-05-05 20:15:09 +01:00
Tim Bentley 27a963a9c2 Validate Service item viewer loading 2010-05-05 20:14:48 +01:00
Jonathan Corwin 465ce8c7f7 web fixes, allow more file types. Slidecontroller_hide event 2010-05-03 22:49:42 +01:00
Jonathan Corwin 9ef2b13ad6 comments, update client, load html from disk, blanking 2010-05-01 13:10:48 +01:00
Jonathan Corwin 12810ad34a Head 2010-05-01 09:46:06 +01:00
Jon Tibble 5a7e36b5bc Correct settingsSection naming convention 2010-04-30 23:38:15 +01:00
Jon Tibble b81160768b Coding style fixes 2010-04-30 22:00:17 +01:00
Tim Bentley 387e281da0 Fix up bugs from last merge 2010-04-30 16:41:48 +01:00
Tim Bentley c42054ec87 Fix up final 802 fallout 2010-04-30 15:30:07 +01:00
Tim Bentley 61a1693ce0 Head 802 2010-04-30 15:27:05 +01:00
Tim Bentley 8e630c5adf Fixes 2010-04-30 10:38:17 +01:00
Tim Bentley d28498611d Fix up video playing so main screen is hidden on start 2010-04-30 06:16:06 +01:00
Jon Tibble 22b00a130f Make settings_sections consistent 2010-04-30 02:31:41 +01:00
Jonathan Corwin 72fa923937 update browser if slide changes 2010-04-29 23:52:23 +01:00
Tim Bentley 4e6c56c430 Video clean ups and bug fixes from 800 2010-04-29 21:56:27 +01:00
Tim Bentley 39a4593bd3 Fix up display buttons 2010-04-29 20:33:45 +01:00
Jonathan Corwin f4cc91f529 Show service and song text. Click on service item/song verse to go live 2010-04-28 23:08:37 +01:00
Tim Bentley b25b8ea590 Head 800 and fix fall out part 1 2010-04-28 18:07:36 +01:00
Jon Tibble bc74bc0335 Cleanup settings saving 2010-04-28 15:17:42 +01:00
Jon Tibble 507cd19739 Cleanups and diff reading fixes 2010-04-28 02:28:37 +01:00
Jon Tibble 484a76289c Fix presentations a bit more 2010-04-27 23:36:50 +01:00
Jon Tibble 9605183812 Config file to QSettings conversion 2010-04-27 17:27:57 +01:00
Tim Bentley d7e060c503 Start to add ability to set display screen size for a session 2010-04-24 19:42:01 +01:00
Jonathan Corwin fa54f94905 Finish signal refactor 2010-04-22 22:22:09 +01:00
Jonathan Corwin 877af7ea2c More fixes 2010-04-21 22:56:48 +01:00
Jonathan Corwin 40e6289102 head 2010-04-20 23:12:04 +01:00
Jonathan Corwin 29e4d4cf1a event fixes 2010-04-20 23:00:55 +01:00
Jonathan Corwin bc6b7a8488 signal/slot refactor part 1 2010-04-16 08:31:01 +01:00
Tim Bentley 3cc600a67b More changes and attempts 2010-04-13 16:53:00 +01:00
Tim Bentley e0be3b5705 refactor video display 2010-04-10 11:28:57 +01:00
Tim Bentley b9630907a8 Fixes 2010-04-08 17:00:04 +01:00
Tim Bentley bc4f31ef93 More fixes and new features 2010-04-08 10:15:40 +01:00
Tim Bentley 150eaf7e56 Video changes and bug fixes part1 2010-04-08 08:37:01 +01:00
Tim Bentley 89bbdea0b9 Code fixes from last merge and presentation improvements 2010-04-03 09:42:51 +01:00
Tim Bentley 18eb768f2f Sort out multiple Chorus tags 2010-04-03 09:04:41 +01:00
Tim Bentley 828695ea0e Fix review comments 2010-04-03 08:10:31 +01:00
Tim Bentley 8328a2dabe Replace flags with capibilities 2010-04-02 20:02:38 +01:00
Tim Bentley 60d7416e69 Fix service path errors 2010-03-30 20:01:23 +01:00
Tim Bentley b8f9f21b5d Review comments 2010-03-28 16:56:49 +01:00
Tim Bentley 92e90b91e5 Fixes and cleanups 2010-03-26 20:20:09 +00:00
Tim Bentley e4db12423a Add Theme and Hide buttons to slide controller 2010-03-25 21:53:52 +00:00
Tim Bentley 463847c61c Correct image override process 2010-03-25 20:24:52 +00:00
Tim Bentley 59dd69eee1 Do not display empty list 2010-03-24 19:10:08 +00:00
Tim Bentley f158044d5e Fix row counts and bad code before superfly spots it 2010-03-24 19:05:45 +00:00
Tim Bentley 33d2de6f9b Heads 2010-03-24 18:59:37 +00:00
Raoul Snyman 2c325d718b Changes:
- Consolidated common icons for a slightly smaller resource file.
- Changed the Import Bible icon to an import icon.
- Merge from head.
2010-03-23 21:04:15 +02:00
Tim Bentley fd23dbc030 Head755 2010-03-22 18:33:54 +00:00
Tim Bentley 32086cb877 Fix slide selection so looks nice 2010-03-22 18:31:43 +00:00
Raoul Snyman ea5ceaf00a Updated copyright.
Updated credits.
2010-03-22 01:58:01 +02:00
Tim Bentley 2ff005cdc0 Add verse tag to live song rows 2010-03-21 19:55:51 +00:00
Tim Bentley 3e4683bd6d Fix up issues and confusion with service item edit 2010-03-21 17:56:56 +00:00
Tim Bentley 2d43cd2d8a Stop double loading of service items 2010-03-21 15:08:46 +00:00
rimach 9169870520 make Blank button workable 2010-03-20 00:02:23 +01:00
Tim Bentley 2d934c8ed9 Fix screen size and rendering issues 2010-03-13 15:11:31 +00:00
Raoul Snyman c7c1a9c06a Added icons for:
- Blank Screen
 - Show Desktop
 - Show Theme Background
2010-03-12 17:38:56 +02:00
Tim Bentley dde75e2288 Head733 2010-03-11 12:48:19 +00:00
Tim Bentley b3ce7bf940 Refactor theme outlines 2010-03-11 08:11:36 +00:00
Jonathan Corwin bfee664c94 fixes 2010-03-10 23:00:48 +00:00
Jonathan Corwin 99a963e509 Head 2010-03-10 22:28:19 +00:00
Tim Bentley 74b288aa6a Head731 2010-03-10 16:58:07 +00:00
Tim Bentley 9bace991fa renderer changes 2010-03-10 16:57:33 +00:00
Jon Tibble 26d33e5fa9 Head r730 2010-03-10 13:45:26 +00:00
Jonathan Corwin 714135a94f presentation text/notes routines. blanking issues 2010-03-06 23:33:10 +00:00
Jon Tibble d4b77873fb Head r724 2010-03-05 21:54:29 +00:00
Raoul Snyman 250fb09737 Merged head in. 2010-03-05 20:37:52 +02:00
Tim Bentley 6bff7936eb Add ServiceItemNoteForm and handling 2010-03-03 17:48:37 +00:00
Tim Bentley 4abcbe86b2 ServiceItem Cleanups 2010-03-02 19:44:55 +00:00
Raoul Snyman 024fdd56e6 Added installer stuff. 2010-03-01 20:37:10 +02:00
Tim Bentley 325fab92da Clean up all the Gloab log statements 2010-02-27 15:31:23 +00:00
Jon Tibble 5947f58cf6 Head r717 2010-02-27 15:13:28 +00:00
Tim Bentley d47fc53b78 Add Alternate rows to slide controller 2010-02-27 07:39:47 +00:00
Jon Tibble 2185f4e842 Remove C-style semi-colons 2010-02-26 23:47:59 +00:00
Raoul Snyman 0ddaa2bf4a Some more visual tweaks.
Fixes for older versions of PyQt4.
2010-02-24 20:39:12 +02:00
Tim Bentley edc46f2967 Fix songs so tagging can work > 10 verses. Tested with 100! 2010-02-09 16:09:57 +00:00
Tim Bentley 079c9a4679 Key handling changes 2010-02-04 19:25:32 +00:00
Tim Bentley 1164ab9beb Added Extra key events to SlideController 2010-02-03 18:29:02 +00:00
Tim Bentley d6912adbf8 Make display blanking work correctly 2010-01-24 16:28:18 +00:00
Tim Bentley e6e6eeb7c0 Media and Blank screen now play together nicely. 2010-01-24 15:18:26 +00:00
Tim Bentley ad40020169 Fix logging to single file
Fix QMessage to displays on correct screen.
2010-01-24 13:58:39 +00:00
Tim Bentley c35ff6b8d1 Presentation display fixes 2010-01-23 09:49:01 +00:00
Tim Bentley 9dc38cf289 Refactor the screen handling code to try and set the screen sizes correctly. 2010-01-16 07:22:50 +00:00
Tim Bentley ee8a92b77f fix screen lines calcs so they are correct.
Prints added for rendering size diagnostics.
2010-01-10 11:49:04 +00:00
Tim Bentley 6ef3f6aadc Lots of fixes:
Alerts now stack up a wait correctly
Presentations will run but issue with impress previews
Transparent themes now work
New image for media previews
2010-01-09 09:34:06 +00:00
Raoul Snyman b4b075c961 Updated copyright year. 2009-12-31 14:52:01 +02:00
Tim Bentley be3fecac20 Sort out Presentation plugin Handler
* Allow 2 presentations to work at same time
* Sort out live / preview issues to stop cross messaging
2009-12-13 22:08:10 +00:00
Tim Bentley 14837d6efa Fix up preview in 1024x764 so looks sensible 2009-12-12 09:24:12 +00:00
Tim Bentley 231a2fa933 More fixes for bibles 2009-12-11 19:02:45 +00:00
Tim Bentley 5d79141cfc Verse tagging - combo complete 2009-12-06 16:50:13 +00:00
Tim Bentley 528004df23 Start to add change in toolbar 2009-12-06 13:55:07 +00:00
Tim Bentley 40523ed0f6 Toolbar fixups 2009-12-06 08:39:56 +00:00
Raoul Snyman 583d96b5d1 Song Verses Toolbar: Phase 1
- Convert verse icons to drop-down verse menu.
2009-12-06 09:14:11 +02:00
Tim Bentley 480fc4771f Fix up song tagging so case does not matter
Fix bug in transitions when using images
Remove MediaTab as not wanted
2009-12-05 08:05:11 +00:00
Tim Bentley b8149cc826 Fix up Icon code to use isinstance
Fix up code to ignore cases when doing tests.
2009-12-04 20:25:48 +00:00
Tim Bentley 1b6ad5814b Verse Tagging complete 2009-12-02 11:22:48 +00:00
Tim Bentley a2ff6433ba Build Dynamic Icons for SlideController 2009-12-02 10:59:54 +00:00
Tim Bentley 156a70208b Add new types to verse editing
Clean up dialog so looks better
Add controls around the editor in terms of validation
2009-12-02 08:35:02 +00:00
Raoul Snyman f5bee07341 Added Michael to the copyright notice.
Fixed a bug where Media Manager item toolbar buttons were becoming toggle buttons.
Cleaned up config settings.
Miscellaneous other bugfixes.
2009-11-30 22:29:26 +02:00
Raoul Snyman 47bf4477d4 Fixed up a few configuration settings. 2009-11-30 20:29:22 +02:00
Raoul Snyman a6d8813a50 Merge from HEAD, started changing the copyright to include Michael Gorven. 2009-11-29 22:30:41 +02:00
Raoul Snyman 910a61ce3f Merged in HEAD 2009-11-29 22:01:23 +02:00
Tim Bentley 8036cbf077 Head678 2009-11-29 19:03:20 +00:00
Tim Bentley 77b0da2c41 Tidy ups pre merge 2009-11-29 19:00:10 +00:00
Tim Bentley 829e4976e2 Slide Controller refactoring ready for Verse changes 2009-11-29 08:33:46 +00:00
Tim Bentley d0a49ba3a1 Song taagging into Slide Controller 2009-11-28 12:38:48 +00:00
Tim Bentley 1c60a29d68 Basic Tranisitions 2009-11-28 09:12:22 +00:00
Tim Bentley 23d945a454 Replace phonon code, add framework for transitions 2009-11-28 06:49:53 +00:00
Tim Bentley ab5b0ee0d5 Amended plugin to use correct stat values
Fixed bible media item to initialise in correct order
Fixed servicemanager to use correct methods on service loading
Sorted out lots of issues tagging the song verses
2009-11-27 21:54:37 +00:00
Raoul Snyman ce63999383 Various configuration option cleanups and changes. 2009-11-27 23:37:01 +02:00
Raoul Snyman d0832a2c86 Changed all the trUtf8(u'...') to trUtf8('...') 2009-11-26 20:43:49 +02:00
Tim Bentley 365d15050c Head671 and fixes 2009-11-15 07:24:30 +00:00
Tim Bentley f9f4cc2518 Renderer cleanups and fixes 2009-11-15 07:07:40 +00:00
Raoul Snyman 2054d38cae Merged in lp:~raoul-snyman/openlp/bitsandbobs
bzr-revno: 671
2009-11-15 09:02:27 +02:00
Tim Bentley 98e4b47d91 headr670 2009-11-14 17:01:14 +00:00
Tim Bentley 78fd8efdf7 Remove unneed varables
Move code into serviceItem
Fix up splitter code
2009-11-14 12:24:27 +00:00
Tim Bentley 26b9274604 ServiceItem cleanup - fix presentation issues 2009-11-14 11:47:10 +00:00
Tim Bentley 3ecec95aca ServiceItem cleanup - remove code duplication 2009-11-14 11:44:06 +00:00
Tim Bentley b0ae4e4ceb ServiceItem cleanup - fix media playing 2009-11-14 10:51:58 +00:00
Tim Bentley b1766d7ee4 ServiceItem cleanup - sort out name format errors 2009-11-14 09:41:11 +00:00
Tim Bentley 0aca1665be ServiceItem cleanup - remove CommandItem 2009-11-14 09:37:54 +00:00
Tim Bentley ad6abb1e9c ServiceItem cleanup - hide lists 2009-11-14 09:02:30 +00:00
Tim Bentley e618c3061c ServiceItem cleanup - rename arrays 2009-11-14 08:40:14 +00:00
Raoul Snyman 9e96aac849 Make sure screen and button are still black after coming back from media. 2009-11-13 23:37:11 +02:00
Raoul Snyman 1d80bb6229 Attempt to fix recursion in blanking.
Fixed all the Receiver.send_message instances to stop instantiating the Receiver class.
2009-11-13 23:24:59 +02:00
Raoul Snyman 8c599b6707 Fixed up an issue between the display screen and the blank button 2009-11-13 22:10:35 +02:00
Raoul Snyman 262577bd6e Removed an unused parameter from addToolbarButton, and added a "checkable" argument. 2009-11-13 20:46:47 +02:00
Jon Tibble 3defb3b4c5 SPG 2009-11-13 17:42:51 +00:00
Jon Tibble f764eb7d59 Fix imports 2009-11-12 23:58:19 +00:00
Tim Bentley e62c482a2e Slide Controller and Transition changes 2009-11-12 17:21:15 +00:00