Merge lp:~meths/openlp/trivialfixes into lp:openlp

[Jon Tibble]

[Tim Bentley (trb143)]

Some looks go but some is bad.
Lines 21-28 etc make the code more unreadable.
Readability is vital

review: Needs Fixing

[lp:~meths/openlp/trivialfixes]

563. By Jon Tibble on 2009-09-21

Coding Standards

564. By Tim Bentley on 2009-09-22

Best merge ever

565. By Tim Bentley on 2009-09-23

Audit changes and clean up

566. By Jonathan Corwin on 2009-09-24

Merge from lp:~j-corwin/openlp/presentations

567. By Jon Tibble on 2009-09-24

Code clean ups

568. By Tim Bentley on 2009-09-24

Audit Changes to database

569. By Jonathan Corwin on 2009-09-24

Merge from lp:~j-corwin/openlp/presentations

570. By Jon Tibble on 2009-09-25

PPTViewer fixes

571. By Jon Tibble on 2009-09-25

Imports clean up

572. By Tim Bentley on 2009-09-25

Plugin changes to Audit, Song and Custom

573. By Jon Tibble on 2009-09-26

None testing and clean ups

574. By Tim Bentley on 2009-09-26

Plugin updates

575. By Jonathan Corwin on 2009-09-27

Jons Presentation merge with hack to fix conflicts

576. By Tim Bentley on 2009-09-27

Audit changes and cleanups

577. By Jonathan Corwin on 2009-09-28

Presentation merge with gotos

578. By Jon Tibble on 2009-09-28

Fix presentation starting

579. By Jon Tibble on 2009-09-29

Use buildIcon and fixes

580. By Tim Bentley on 2009-09-29

Style cleanups

581. By Jonathan Corwin on 2009-09-30

Presentations made it at last

582. By Jonathan Corwin on 2009-10-01

Presentation dll

583. By Tim Bentley on 2009-10-02

Start of about Text

584. By Jon Tibble on 2009-10-02

Dialogs, Exceptions and Toolbars

585. By Tim Bentley on 2009-10-02

Update PluginList Window

586. By Jonathan Corwin on 2009-10-04

Presentation updates

587. By Tim Bentley on 2009-10-05

Add Ability to hide plugins

588. By Jonathan Corwin on 2009-10-08

More Presentation improvements

589. By Tim Bentley on 2009-10-08

More hiding code changes

590. By Tim Bentley on 2009-10-08

Fix song issue

591. By Jon Tibble on 2009-10-09

Presentation cleanups

592. By Jon Tibble on 2009-10-09

Bible rendering fixes

593. By Tim Bentley on 2009-10-10

Apply fixes for Jon

594. By Raoul Snyman on 2009-10-10

Merged in lp:~raoul-snyman/openlp/pluginlist

595. By Tim Bentley on 2009-10-11

Plugin hinding comes to town

596. By Jonathan Corwin on 2009-10-12

More Presentation fixes

597. By Tim Bentley on 2009-10-12

Various changes and fixes

598. By Jonathan Corwin on 2009-10-14

TLC for the asv

599. By Raoul Snyman on 2009-10-14

Merged in lp:~raoul-snyman/openlp/versionfix

600. By Tim Bentley on 2009-10-14

Add Web Bibles to Advanced Tab and other nice features

601. By Jonathan Corwin on 2009-10-16

Presentation changes

602. By Tim Bentley on 2009-10-16

Update config files for deployment

603. By Tim Bentley on 2009-10-17

Changes to settings and SlideController handling

604. By Jon Tibble on 2009-10-17

Python 2.5 fixes

605. By Raoul Snyman on 2009-10-17

Merged in lp:~raoul-snyman/openlp/uifixes

606. By Raoul Snyman on 2009-10-17

Merge from lp:~raoul-snyman/openlp/uifixes

607. By Jonathan Corwin on 2009-10-17

Merged in lp:~j-corwin/openlp/present

608. By Raoul Snyman on 2009-10-18

Merged lp:~raoul-snyman/openlp/uifixes

609. By Tim Bentley on 2009-10-18

Theme Image and Presentation fixes

610. By Jon Tibble on 2009-10-19

General fixes

611. By Tim Bentley on 2009-10-19

General Tab Changes

612. By Jonathan Corwin on 2009-10-19

Merged tweaks to openlpcnv.pyw

613. By Raoul Snyman on 2009-10-20

Merge from lp:~raoul-snyman/openlp/converter

614. By Raoul Snyman on 2009-10-21

Fix Slide Controller look and feel

615. By Raoul Snyman on 2009-10-21

Fix Bible Media manager look and feel

616. By Jonathan Corwin on 2009-10-21

Presentation fixes for Impress

617. By Tim Bentley on 2009-10-21

Bible Fixes

618. By Tim Bentley on 2009-10-22

Theme features - wrap indentation and lines per slide

619. By Tim Bentley on 2009-10-23

Font Sizing and rendering improvements

620. By Jonathan Corwin on 2009-10-24

Presentations Impress mini display

621. By Raoul Snyman on 2009-10-24

Merge from lp:~raoul-snyman/openlp/i18n

622. By Jon Tibble on 2009-10-24

Fix imports and config item

623. By Tim Bentley on 2009-10-24

Song editing from Preview, bible fixes

624. By Jon Tibble on 2009-10-24

Fix imports and typo

625. By Tim Bentley on 2009-10-25

fix up song edit from preview

626. By Jonathan Corwin on 2009-10-25

More presentation fixes

627. By Tim Bentley on 2009-10-25

Save and preview + dynamic theme changing

628. By Raoul Snyman on 2009-10-26

Fix slide controller look and feel

629. By Raoul Snyman on 2009-10-26

Fix i18n issues

630. By Tim Bentley on 2009-10-27

Move Audit to SongUsage , Return of BibleGateway part1. Additions to SlideController

631. By Tim Bentley on 2009-10-29

Add more bible sources and improve handling

632. By Jon Tibble on 2009-10-29

Fix plugintabs i18n

633. By Jon Tibble on 2009-10-29

Fix i18n and cleanup for New Theme

634. By Tim Bentley on 2009-10-29

Edit Songs and Custom for Service Manager and auto replace

635. By Jon Tibble on 2009-10-29

Fix i18n for mediaitems

636. By Jon Tibble on 2009-10-29

Fix unnecessary screen setup

637. By Tim Bentley on 2009-10-29

Minor fixes

638. By Jon Tibble on 2009-10-30

Fix theme editing, copyright and song icon

639. By Jon Tibble on 2009-10-30

Plugin fixes, cleanups and i18n

640. By Tim Bentley on 2009-10-30

Fixes to Renderer etc

641. By Tim Bentley on 2009-10-31

Remote Song Editing Finished - minor other changes

642. By Jon Tibble on 2009-10-31

Fix typos

643. By Tim Bentley on 2009-11-01

Fix up editing code from Preview and ServiceManager

644. By Raoul Snyman on 2009-11-01

Fix up converter

645. By Tim Bentley on 2009-11-01

Clean up the version code and remove not required file

646. By Tim Bentley on 2009-11-01

Media is starting to work - just

647. By Jon Tibble on 2009-11-02

Fix mediaitem translation

648. By Jon Tibble on 2009-11-02

Enable consecutive video playing

649. By Tim Bentley on 2009-11-02

Minor fixes and copyright

650. By Tim Bentley on 2009-11-02

Merge it right this time

651. By Jon Tibble on 2009-11-02

Single monitor display hiding

652. By Jon Tibble on 2009-11-03

Cleanups

653. By Tim Bentley on 2009-11-03

Expansion and Song editing fixes

654. By Tim Bentley on 2009-11-04

Fix song editing error messages

655. By Jon Tibble on 2009-11-04

Various cleanups and fixes

656. By Jon Tibble on 2009-11-05

More fixes

657. By Raoul Snyman on 2009-11-05

Merged in display fixes from lp:~raoul-snyman/openlp/fixes

658. By Jon Tibble on 2009-11-06

Clean theme handling

659. By Tim Bentley on 2009-11-07

Remote editing for custom and theme fix

660. By Jon Tibble on 2009-11-07

Fix file handling

661. By Tim Bentley on 2009-11-07

Plugin clean ups

662. By Jonathan Corwin on 2009-11-07

Presentation fixes

663. By Tim Bentley on 2009-11-08

SlideController cleanups

664. By Tim Bentley on 2009-11-08

Fix bugs in theme and slidecontroller

665. By Tim Bentley on 2009-11-08

Clean up slidecontroller

666. By Tim Bentley on 2009-11-10

Add media Preview code

667. By Tim Bentley on 2009-11-10

Change version number

668. By Jon Tibble on 2009-11-12

Unicode and import fixes

669. By Tim Bentley on 2009-11-12

Slide Controller cleanups and Media bug fixes

670. By Jon Tibble on 2009-11-14

Cleanups and fixes

671. By Raoul Snyman on 2009-11-15

Merged in lp:~raoul-snyman/openlp/bitsandbobs

672. By Raoul Snyman on 2009-11-15

Updated version.txt

673. By Tim Bentley on 2009-11-15

Refactor Service Item and clean up Slide Controller

674. By Michael Gorven on 2009-11-21

Merge get-strings: Improve regex to extract translation strings.
https://code.launchpad.net/~mgorven/openlp/get-strings/+merge/15120

675. By Tim Bentley on 2009-11-22

Updates to the Renderer and impose minimum slide width

676. By Raoul Snyman on 2009-11-26

Merge from lp:~raoul-snyman/openlp/bitsandbobs

677. By Michael Gorven on 2009-11-28

Merge lp:~mgorven/openlp/get-strings-ast: Use AST module to parse code and extract translation strings.
https://code.launchpad.net/~mgorven/openlp/get-strings-ast/+merge/15328

678. By Raoul Snyman on 2009-11-29

Merged in lp:~raoul-snyman/openlp/i18n

679. By Tim Bentley on 2009-11-29

Verse tagging changes etc

680. By Tim Bentley on 2009-11-30

Add verse expansion from song plugin

681. By Tim Bentley on 2009-11-30

Cannot type

682. By Raoul Snyman on 2009-11-30

Merge from lp:~raoul-snyman/openlp/bitsandbobs

683. By Michael Gorven on 2009-12-01

Merge lp:~mgorven/openlp/copyright-symbol: Fix copyright symbol in translation strings.
https://code.launchpad.net/~mgorven/openlp/copyright-symbol/+merge/15399

684. By Tim Bentley on 2009-12-06

Verse Tagging

685. By Tim Bentley on 2009-12-09

Merge from lp:~trb143/openlp/cleanup

686. By Tim Bentley on 2009-12-10

Fix Theme handling so Song level works again

687. By Tim Bentley on 2009-12-10

Fix Theme tab handling

688. By Tim Bentley on 2009-12-11

Fix bibles and themes

689. By Tim Bentley on 2009-12-14

Presentation, Custom , bug fixes

690. By Tim Bentley on 2009-12-15

Add Shadow and Outline options to Themes

691. By Tim Bentley on 2009-12-16

Fix bug stopping Custom editing

692. By Raoul Snyman on 2009-12-24

Merged in OpenSong/Bible importer branch.

693. By Raoul Snyman on 2009-12-28

Merge in changes from lp:~raoul-snyman/openlp/biblesplugin

694. By Raoul Snyman on 2009-12-31

Updated the copyright.

695. By Tim Bentley on 2010-01-22

Changes to:
 Alerts so they wait before being displayed
 Presentations so they work correctly
 Themes so the blank line is removed
 Rendering so the correct size is used
 Themes are cached so theme manager loads quicker

Various other fixes

696. By Tim Bentley on 2010-01-24

More Fixes for Presentations
Fix screen blanking so resets for Video
Fix screen blanking so it does not remember at start up if set by presentations and video.
Fix Pop ups so they display on correct monitor

697. By Raoul Snyman on 2010-01-27

New version 1 -> 2 Bible converter script.

698. By Tim Bentley on 2010-01-29

Display updates, Song Usage fixes, Theme display fixes

699. By Tim Bentley on 2010-02-02

Changes to presentations to allow smart file selection
Fix ServiceManager to load / save services.
Add start of filtering to allow Services to handle presentations where the player is missing
Add debugging to try and sort out Impress crashes.

700. By Raoul Snyman on 2010-02-06

Some major work on the Bibles plugin:
 - Reworked import system to make it pluggable.
 - Created a Bible Import Wizard.
 - Converted Crosswalk to use BeautifulSoup.
 - Merged HTTP and DB Bible list.
 - Made all Bibles descend from BibleDB.
 - Lots of other changes and fixes.

701. By Tim Bentley on 2010-02-06

Fix up notification on startup
Fix alerts for presentations
Fix remote client so works better
Add extra key strokes for display of songs

702. By Tim Bentley on 2010-02-09

Fix Presentation file filter
Fix Cancel for song verse editor

703. By Tim Bentley on 2010-02-10

Fix number of song verses. > 10

704. By Tim Bentley on 2010-02-16

Fix theme import bug

705. By Tim Bentley on 2010-02-16

Fix SongUsage Dialog so should be complete
Minor bug fixes discovered and fixed.
Alerts - Major refactor
* Make a plugin
* Move code from maindisplay into plugin
* Add Location , Font size and History option to Font Tab and fix code to use them
* Add button to Alert Tab to allow History to be edited
* Amend Alert screen to be able to use History if option set
* Build screen to allow alerts to be Added / Edited and Deleted.

706. By Jonathan Corwin on 2010-02-17

A couple of small changes to get powerpoint+viewer working.

707. By Tim Bentley on 2010-02-18

Fix displayAlert error
Fix UTF8 settings on SongUSage dialog

708. By Jonathan Corwin on 2010-02-19

A few more small presentation fixes/cosmetics.

709. By Raoul Snyman on 2010-02-19

Updated version.txt to the latest revision.

710. By Raoul Snyman on 2010-02-21

Moved the log file to a location that OpenLP can write to as an unpriviledged user.

711. By Jon Tibble on 2010-02-22

Import and theme importing fixes

712. By Raoul Snyman on 2010-02-22

Cleaned up setup.py file, so that a source distribution is possible, and also packages can be built.

713. By Michael Gorven on 2010-02-23

Add menu entry .desktop file and some source tarball and script fixes.
https://code.launchpad.net/~mgorven/openlp/menu-entry/+merge/19978

714. By Tim Bentley on 2010-02-23

Fix Presentation Tag and flush Renderer cache on re-paint

715. By Raoul Snyman on 2010-02-24

Trying to set a tag on trunk.

716. By Tim Bentley on 2010-02-26

Add HTTP Check to Thread to stop UI blocking at startup
Add Preview option for songs etc from service manager

717. By Tim Bentley on 2010-02-27

Fix lost text on Song editing
Fixed Display on SlideController
Fixed bugs in last merge
Cleaned up comments and some log debug statements.

718. By Tim Bentley on 2010-02-27

Automate Media type list from phonon

719. By Raoul Snyman on 2010-03-02

Added some more icons.

720. By Jonathan Corwin on 2010-03-03

Split live/preview presentation documents, plus fixes for Windows

721. By Raoul Snyman on 2010-03-03

A fix to the OSIS importer, and added the version file.

722. By Raoul Snyman on 2010-03-04

Create the config directory if it doesn't exist yet, in order to save the log file.

723. By Tim Bentley on 2010-03-05

Cleaned up logging code
Added code to stop themes in use being deleted
Added Service Notes to service items
Fixed ServiceManager context menu so it works based on the item selected
Various minor bug fixes
Fix up bug for Theme savings and OOS

724. By Jonathan Corwin on 2010-03-05

Presentations:
- Close presentation app down correctly
- Add mode to automatically detect file type

725. By Tim Bentley on 2010-03-06

Add indication if service item has notes
Add display of notes as Tooltip

726. By Tim Bentley on 2010-03-07

Remove version tag

727. By Tim Bentley on 2010-03-08

Fix serviceItem expansion on repaint
Add ALL to Images file filter
Add Icon overlay to serviceItem when we have notes.

728. By Raoul Snyman on 2010-03-09

Fixed up some problems and inadvertant bugs from the move of the "get-strings.py" file to the scripts directory.

729. By Tim Bentley on 2010-03-09

ServiceManager fixes

730. By Raoul Snyman on 2010-03-10

Windows modifications:
- Added Windows build files.
- Added Windows installer files.
- Modified the tabs in the media manager to look a little better on both Windows and Linux.
- Windows icon.

731. By Jon Tibble on 2010-03-10

Truth test and C style cleanups

732. By Raoul Snyman on 2010-03-11

Fix "red letter" versions of Crosswalk Bibles.

733. By Jonathan Corwin on 2010-03-11

Fix issues regarding the blank button for presentations and added methods to extract presentation text and notes for use in the future.

734. By Tim Bentley on 2010-03-11

Refactor renderer to do outline correctly
Add removal of footer for blank screens
Fix song edit bug allowing preview to be triggered.

735. By Tim Bentley on 2010-03-12

Fix text strings and new verse tag

736. By Raoul Snyman on 2010-03-12

Added some icons.

737. By Raoul Snyman on 2010-03-12

Fixed up Mac OS X detection

--------------- This line and the following will be ignored --------------

modified:
  openlp.pyw
  openlp/core/utils/__init__.py
pending merges:
  Raoul Snyman 2010-03-12 - Fixed up Mac OS X detection

738. By Raoul Snyman on 2010-03-13

Added various fixes for the Windows build.

739. By Tim Bentley on 2010-03-13

Text string fixes

740. By Raoul Snyman on 2010-03-14

Various fixes in the Bibles plugin to get Bibles working correctly in the Windows build.

741. By Tim Bentley on 2010-03-14

Fix ServiceManager drag and drop`
Fix rendering size issues
Fix screen sizes following display changes

742. By Tim Bentley on 2010-03-14

Fix blank screen color
Fix save and cancel of services
Fix tool shortcut
add a filter to the save dialog - "OpenLP Service Files (*.osz)

743. By Raoul Snyman on 2010-03-15

Merged in some translation fixes.

744. By Raoul Snyman on 2010-03-16

Some fixes in the Bible plugin.

745. By Jon Tibble on 2010-03-17

Cleanups

746. By Jon Tibble on 2010-03-18

AppLocation.PluginsDir changes

747. By Raoul Snyman on 2010-03-19

Fixed the BibleGateway importer.

748. By rimach on 2010-03-20

Make the "Blank" button work.

749. By Raoul Snyman on 2010-03-20

Fixed a bug where failed/cancelled imported Bible files are not deleted.

750. By Tim Bentley on 2010-03-21

Fix NONE appearing as song verses
Delay the hidden window display
Fix missing add status for custom slides

751. By Raoul Snyman on 2010-03-21

Bug fixes for the Bible imports.

752. By Tim Bentley on 2010-03-21

Stop double loading of Service items from service manager unless triggered by remote edit.

753. By Raoul Snyman on 2010-03-21

Being overzealous about unicode.

754. By Raoul Snyman on 2010-03-22

Various fixes to the Bibles plugin.

755. By Raoul Snyman on 2010-03-22

Add Christian and Phill to the credits

756. By Raoul Snyman on 2010-03-23

Bugfixes in Bibles.

757. By Raoul Snyman on 2010-03-23

Change the "Live" icon.

758. By Jonathan Corwin on 2010-03-23

Fixed a bug with transparent backgrounds.

759. By Jonathan Corwin on 2010-03-23

Fix up the bible migration.

760. By Raoul Snyman on 2010-03-23

Changes:
- Changed the "New" icon to an "Import" icon for the Bibles plugin.
- Consolidated icons to make the resources file a little smaller.
- A few other small tweaks.

761. By Jonathan Corwin on 2010-03-23

Close down presentation apps at end correctly

762. By Jon Tibble on 2010-03-23

Unused variable and import fixes

763. By Jon Tibble on 2010-03-24

Change loop method and remove unused variables

764. By Tim Bentley on 2010-03-24

Add enter to quick bible edit field

765. By Raoul Snyman on 2010-03-24

Fixed two bugs in the web downloads import dealing with non-latin characters.

766. By Raoul Snyman on 2010-03-25

Start presentation apps in right place.

767. By Tim Bentley on 2010-03-25

Fix bug for PyTQ4.4

768. By Michael Gorven on 2010-03-26

Correct .desktop file syntax so that rpmbuild doesn't fail.
https://code.launchpad.net/~mgorven/openlp/desktop-file-rpmbuild/+merge/22231

769. By Tim Bentley on 2010-03-26

Fix text outlines

770. By Raoul Snyman on 2010-03-26

Update the credits.

771. By Raoul Snyman on 2010-03-26

Fixed a bug with Strongs in CrossWalk.

772. By Raoul Snyman on 2010-03-27

Fix to deal with "X.Y.Z" style version (i.e. without the "-bzrXXX").

773. By Raoul Snyman on 2010-03-27

Fixed the "Bible" item in the "Import" menu.

774. By Tim Bentley on 2010-03-27

Fix dates

775. By Raoul Snyman on 2010-03-27

Bible fixes:
 - Red letter text on CrossWalk import.
 - Removed text on web download progress, moved to an "indeterminable" progress style.
 - Some unicode optimisations.

776. By Raoul Snyman on 2010-03-27

Tag the 1.9.1 release.

777. By Tim Bentley on 2010-03-28

* Refactor the Alerts plugin and remove an un-needed screen
* Fix saving serviceitems from manager so data is saved correctly(not backward compatible)
* Clean up the Editing code for Songs so Editall works better
* Add missing icons to slidecontroller for theme and hide. (Restore does not work yet!)
* Add ability to add to existing service items for images and bibles
* Add ability to reorder leaves within serviceitems (Images only)
* Refactor the dynamic image replacement code in plugins
* Allow multiple images to be deleted from plugin
* Add more items to context menus.

778. By Jon Tibble on 2010-03-29

Import cleanups

779. By Raoul Snyman on 2010-03-30

Fixed a broken import.

780. By Tim Bentley on 2010-03-31

Fix media path bug

781. By Raoul Snyman on 2010-04-02

Added images I forgot to add when I cleaned up the images a little.

782. By Jonathan Corwin on 2010-04-02

Songs of Fellowship song import

783. By Tim Bentley on 2010-04-03

Display handling cleanups and changes to service item flags

784. By Tim Bentley on 2010-04-03

Remove old files. Clean up verse tags part 1

785. By Jonathan Corwin on 2010-04-04

Songs of Fellowship fixes
Multiple song delete from media manager

786. By Tim Bentley on 2010-04-08

Add multi add to service manager and check image previews

787. By Raoul Snyman on 2010-04-09

Some fixes to the songs converter script.

788. By Jonathan Corwin on 2010-04-09

Tidy up song database, and add Arky Arky!

789. By Tim Bentley on 2010-04-09

Fedora packaging fixes

790. By Tim Bentley on 2010-04-10

Add time to more service item types
Add video slider bar to preview.
Change hide live to transparent live!
Split video out to own display so text over video can work.
Number of other bugs fixed.
Custom editor has slide split button now

791. By Raoul Snyman on 2010-04-11

Fix version problems.

792. By Jon Tibble on 2010-04-12

Import and line ending fixes

793. By Jonathan Corwin on 2010-04-13

General purpose OOo writer/impress (Word/PPT) import
plus fix for systems without OOo

794. By mahfiaz on 2010-04-14

Fixed up the loading and saving of non-ascii values to the config file.

795. By Raoul Snyman on 2010-04-19

dded autocompletion to the authors, topics, songbooks and themes.

796. By Tim Bentley on 2010-04-19

Alert manager cleanups
Improvements in video display

797. By Jon Tibble on 2010-04-21

Import fixes and typo

798. By Tim Bentley on 2010-04-22

Alert manager cleanups
Presentation icons
Detect missing files and change icon

799. By Jonathan Corwin on 2010-04-23

Refactor signal/slot names for consistency and to remove plugin specifics from core.

800. By Jon Tibble on 2010-04-28

QSettings, recent files and UI saving

801. By Jon Tibble on 2010-04-29

Help -> Website and disable unimplemented options

802. By Jon Tibble on 2010-04-30

Consistency fixes

803. By Tim Bentley on 2010-04-30

Fix the hide buttons so they work for text and videos. Presentations needs looking at!
Fix presentations so they work
Add new attribute to themes so line spacing can be adjusted bigger and smaller
Alerts over videos now works correctly.
Add new setting so Text frames can be sized and positioned for use where a monitor is different size to the final output.

804. By Tim Bentley on 2010-04-30

Text over video arrives to OpenLP

805. By Jon Tibble on 2010-05-01

Coding standards fixes

806. By Tim Bentley on 2010-05-01

Fix loop in ending video to stop crashes.
Add comments
rename _frame and _frameOP

807. By Jonathan Corwin on 2010-05-01

Remote operation via web

808. By Tim Bentley on 2010-05-01

Fix Presentations and add DnD to serviceitem updates

809. By Tim Bentley on 2010-05-03

Fix bible spelling in database

810. By Raoul Snyman on 2010-05-04

Documentation!

811. By Jonathan Corwin on 2010-05-05

Remotes: support more filetypes and subfolders for web
presentation_hide signal support

812. By Tim Bentley on 2010-05-06

Correctly default initial display on 1st setup
Stop timer on New service Item
Stop serviceitems being played if no player available.

813. By Martin Thompson on 2010-05-10

Merged from mjthompson/qt4.4

814. By Tim Bentley on 2010-05-10

Turbo change the screen renderer by adding a cache
Fix names which are incorrect

815. By Martin Thompson on 2010-05-14

Fixed crash when non-existent monitor is called for in OpenLP.conf

816. By rimach@siduxbox on 2010-05-16

Add translations and update the code to accept them/use them

817. By andreas@andypc on 2010-05-16

Fix bug in bibles with 2 bible displays

818. By Tim Bentley on 2010-05-17

Clean up slide controllers so they display right
Fix screen hight.
Fix renderer so the footer is not line width adjusted.
Various other cleanups

819. By Raoul Snyman on 2010-05-20

Merged in lp:~raoul-snyman/openlp/song-import
- Removed menu items to import and export dialogs that don't work
- Added the new song Import Wizard
- Reworked the Edit Verse dialog

820. By Tim Bentley on 2010-05-20

Verse editor cleanups

821. By Jon Tibble on 2010-05-20

Unused import and variable fixes

822. By Raoul Snyman on 2010-05-24

Some fixes for the Windows build.

823. By Tim Bentley on 2010-05-24

Fix memory leak and improve slide controller tags

824. By Raoul Snyman on 2010-05-25

Created a Windows build script to help automate the building of Windows installers for OpenLP.

825. By Raoul Snyman on 2010-05-26

Better version checking.

826. By Jon Tibble on 2010-05-27

Many varied cleanups

827. By andreas@andypc on 2010-05-27

Now the footer displays both bible versions and their copyright in dual bible view. Also made another small fix (in rev827): "Permission" -> "Permissions"

828. By Raoul Snyman on 2010-05-28

Some more tweaks and fixes to the Windows builder script.

829. By Jon Tibble on 2010-05-30

Refactor BaseModel

830. By mahfiaz on 2010-05-30

Estonian translation

831. By Jon Tibble on 2010-06-02

Import, exception, naming and whitespace cleanups

832. By Meinert Jordan <email address hidden> on 2010-06-06

QString to Unicode conversions.

833. By Tim Bentley on 2010-06-06

Amend verse tagging code for translations

834. By Meinert Jordan <email address hidden> on 2010-06-07

Fix Qstring bug
Update Combo code

835. By Jon Tibble on 2010-06-07

Catch correct exception type

836. By frodus@frodus-laptop on 2010-06-08

Cleaned up the whole tree by replacing all trUtf8() with translate() function

837. By Jon Tibble on 2010-06-08

Cleanups

838. By Jon Tibble on 2010-06-10

Cleanups and fixes:
* PEP8 type checking
* Fix theme export breakage
* Naming and whitespace

839. By Jon Tibble on 2010-06-10

Remove and refactor:
* Remove old song import/export forms
* Refactor theme migration method
* Refactor duplicationed code

840. By Jon Tibble on 2010-06-12

DocStrings

841. By Jon Tibble on 2010-06-12

Move VerseType to lib

842. By Raoul Snyman on 2010-06-13

Tidied up the UI of the Song Maintenance Dialog to make it look good on all OSes.

843. By Tim Bentley on 2010-06-13

Fix problems with screen blanking

844. By Jon Tibble on 2010-06-14

Various cleanups:
* Fix bible runtime location
* Naming fixes
* Move addToServiceItem
* Fix db settings location

845. By Jon Tibble on 2010-06-14

Fix QColorDialog usage

846. By Jon Tibble on 2010-06-14

Revert resources location patch

847. By Meinert Jordan on 2010-06-15

Various i18n fixes.

848. By Jonathan Corwin on 2010-06-17

Fix opening and displaying of presentations

849. By Frode Woldsund on 2010-06-17

Complete trUtf8 -> translate conversion

850. By Jon Tibble on 2010-06-17

Bible search fix
Edit and Delete feedback for Media Manager Items
Fix Bible Import Wizard setField errors
Fix addToServiceItem locations
Remove unused scripts/get-strings.py

851. By Jon Tibble on 2010-06-17

Import translate in splashscreen.py

852. By Tim Bentley on 2010-06-18

Fix DND problems with live and cache
Fix bible footers being lost
Fix Image editing losing selection.

853. By Jon Tibble on 2010-06-18

HTTPBible Verse Count and Bug #595671

854. By Raoul Snyman on 2010-06-18

Merged in song maintenance improvements.

855. By Raoul Snyman on 2010-06-19

Some streamlining of the song edit form.

856. By Tim Bentley on 2010-06-19

Translation updates
Remove Text over video for now.
Fix song editing bug

857. By Frode Woldsund on 2010-06-19

String Cleanup in MainWindow

858. By Jon Tibble on 2010-06-19

Complete openlp.migration removal

859. By Meinert Jordan on 2010-06-19

Unicode for Themes

860. By Jon Tibble on 2010-06-19

Cleanups

861. By Raoul Snyman on 2010-06-19

Fix up the available image formats somewhat.

862. By Meinert Jordan on 2010-06-20

Various fixes in the song edit form, and other places.

863. By Raoul Snyman on 2010-06-20

Fix bug #596506 and bug #596505

864. By Jon Tibble on 2010-06-20

Cleanups

865. By Tim Bentley on 2010-06-21

Fix bug #596821

866. By Raoul Snyman on 2010-06-21

Updated the majority of the translate() functions.

867. By Tim Bentley on 2010-06-21

Translation string updates

868. By Jonathan Corwin on 2010-06-21

Bug 596995 - Fix remote plugin via PPA

869. By Jon Tibble on 2010-06-21

Stray backslashes and translate() updates

870. By Raoul Snyman on 2010-06-22

Fix up Theme form parentage.

871. By Frode Woldsund on 2010-06-22

Another translate() bugfix.

872. By Jon Tibble on 2010-06-22

* Fix log file location (Bug #596822)
* Script resources generation
* Cleanup long lines

873. By Jon Tibble on 2010-06-22

Fix version check (Bug #597121)

874. By Tim Bentley on 2010-06-22

Fix screen blanking when in single screen

875. By rimach on 2010-06-23

Various improvements to the translation_utils script.

876. By Tim Bentley on 2010-06-24

Update plugin versions and cleanups

877. By Jon Tibble on 2010-06-24

Ampersands and item selection checking

878. By Raoul Snyman on 2010-06-24

Fix bug #595676i, improve the OSIS importer and add source languages from Pootle.

879. By Jon Tibble on 2010-06-24

Fix check_item_selection

880. By Jonathan Corwin on 2010-06-24

Presentation tidies

881. By Jonathan Corwin on 2010-06-24

pptviewlib changes

882. By Raoul Snyman on 2010-06-25

Fix the song plugin's dependence on OpenOffice.org by conditionally importing the SOF and Generic importers.

883. By Frode Woldsund on 2010-06-25

Fixed (c) symbol.

884. By Tim Bentley on 2010-06-25

Stop delete of last Image

885. By Jon Tibble on 2010-06-25

Docstrings

886. By andreas <andreas@andypc> on 2010-06-25

ListWidget usability improvement

887. By Jon Tibble on 2010-06-25

Cleanups

888. By Jonathan Corwin on 2010-06-25

Bug 596361 and other minor presentation fixes

889. By Jonathan Corwin on 2010-06-26

sofimport error due to missing uno prevented song plugin loading (osx)

890. By Andreas Preikschat on 2010-06-26

Improved delete button behaviour.

891. By Raoul Snyman on 2010-06-27

Fixed up problems with version checking.

892. By Jonathan Corwin on 2010-06-28

Trap presentation errors when OpenOffice.org is not installed

893. By Jon Tibble on 2010-06-28

Fix off-by-one saving songs

894. By Jon Tibble on 2010-06-28

Refactor database code

895. By Tim Bentley on 2010-06-28

Start of Display changes.
- Move output displays to QGraphicScene's
- Sort out Video display so it works with hiding / displaying #595682
- Move Alerts to Html from Images
- Hide the Service Dropdown when Global Theme is set #596541
- Slidecontroller Button cleanups

896. By Andreas Preikschat on 2010-06-29

Fixed bug #599066 - Deleting bugs in media manager (custom, media, images, presentations).

897. By Jon Tibble on 2010-06-29

* Fix theme deletion
* Naming fixes
* Docstrings

898. By Jon Tibble on 2010-06-29

Docstrings

899. By Jon Tibble on 2010-06-29

Fix service loading

900. By Raoul Snyman on 2010-06-30

Added decent images for remotes, alerts and song usage.

901. By Jon Tibble on 2010-06-30

Fix service loading properly (Bug #600091)

902. By Tim Bentley on 2010-06-30

Replaceable backgrounds get the HTML treatment.
Sensible Text over video returns.

903. By Raoul Snyman on 2010-06-30

Change namespace of other plugin icons and make ServiceItems use the plugin's icon instead of some arb image "prediction" that is prone to failure.

904. By Jon Tibble on 2010-07-01

Database fixes and refactorings

905. By Jon Tibble on 2010-07-01

Cleanups and sizePolicy refactor

906. By Jon Tibble on 2010-07-02

Fix song loading and wildcard import

907. By Jon Tibble on 2010-07-02

Cleanup plugins (Bug #600996)

908. By Tim Bentley on 2010-07-02

Move video and Image clean ups.
Transitions work again after last merge!

909. By Andreas Preikschat on 2010-07-02

Some random fix ;-)

910. By Tim Bentley on 2010-07-02

Name cleanups

911. By Jonathan Corwin on 2010-07-03

Cleanups and fix PPTViewer dll loading

912. By Phill on 2010-07-04

Fix up video tag for webkit view.
Remove unused tag

913. By Jon Tibble on 2010-07-04

Import fix

914. By Jon Tibble on 2010-07-04

Start XML refactoring

915. By Jon Tibble on 2010-07-05

Fixes and cleanups

916. By Tim Bentley on 2010-07-05

Fix up plugin Meths style

917. By Jon Tibble on 2010-07-05

Fix song saving

918. By Jonathan Corwin on 2010-07-06

Presentation fixes

919. By Raoul Snyman on 2010-07-06

Shuffle the menus and add a nice little icon for the plugin list.

920. By Raoul Snyman on 2010-07-06

Fix up some strings and come bugs in the alerts plugin.

921. By Raoul Snyman on 2010-07-06

Added View Modes.

922. By Raoul Snyman on 2010-07-06

Fixed a small bug with one of the toggle menu items.

923. By Jon Tibble on 2010-07-07

Tweaks and cleanups

924. By Jon Tibble on 2010-07-07

Refactor view mode code

925. By andreas <andreas@andypc> on 2010-07-07

Whitespace cleanups

926. By andreas <andreas@andypc> on 2010-07-08

Naming and whitespace cleanups

927. By Jon Tibble on 2010-07-08

Big cleanup

928. By Jon Tibble on 2010-07-09

build_icon fixes

929. By Jon Tibble on 2010-07-10

AdvancedTab

930. By Jon Tibble on 2010-07-10

Fix service saving (Bug #603798)

931. By Jon Tibble on 2010-07-10

Fix recent merge

932. By Jonathan Corwin on 2010-07-12

Common thumbnails for all presentation types and create when presentation first added

933. By Jon Tibble on 2010-07-12

Import fixes

934. By Andreas Preikschat on 2010-07-12

Improve song data integrity

935. By Jon Tibble on 2010-07-12

Save current media plugin (Bug #596540)

936. By Jon Tibble on 2010-07-13

Theme backgrounds (Bug #594911)

937. By Jon Tibble on 2010-07-13

Double click live setting

938. By Jon Tibble on 2010-07-13

Fix theme editing (Bug #594909 part 1)

939. By Jon Tibble on 2010-07-13

Fix AdvancedTab layout

940. By Jon Tibble on 2010-07-15

Fix service save icon method

941. By Raoul Snyman on 2010-07-15

Removed the display tab, moved options to general tab, plus some cleanups.

942. By Jon Tibble on 2010-07-15

Fix service save location (Bug #605649)

943. By Andreas Preikschat on 2010-07-15

Import fix

944. By Phill on 2010-07-16

Sorted out the show/hide desktop.

945. By Jon Tibble on 2010-07-16

Use populate() for DB objects

946. By Jon Tibble on 2010-07-16

Tab Order and Theme fix (Bug #606256)

947. By Jon Tibble on 2010-07-16

Fix English and alignment

948. By Tim Bentley on 2010-07-17

Fix text hiding bug with images

949. By Jon Tibble on 2010-07-17

Fixes and cleanups

950. By Billy Lange on 2010-07-18

Add confirm before theme delete

951. By Martin Thompson on 2010-07-19

Merged opensong import branch

952. By Andreas Preikschat on 2010-07-19

Cleanups and song data merging

953. By Jon Tibble on 2010-07-20

Save Song Book (Bug #607030)

954. By Andreas Preikschat on 2010-07-20

Prevent topic and author duplication in songs

955. By Jon Tibble on 2010-07-20

Fix topic/author adding (Bug #607034)

956. By Jon Tibble on 2010-07-20

DATABASE SCHEMA CHANGE, fixes and cleanups

957. By Jon Tibble on 2010-07-21

Fix theme saving and song import. Cleanups

958. By Andreas Preikschat on 2010-07-21

Fix song authors and books

959. By Jon Tibble on 2010-07-21

Importer fix

960. By Jonathan Corwin on 2010-07-22

Bug 608149 - Enable presentation controllers by default, and simplify default workflow

961. By Jonathan Corwin on 2010-07-22

Presentations no longer blanked when go live, if display not blank

962. By Raoul Snyman on 2010-07-23

Tweak the display of the media manager items to make them stand out slightly more.

963. By Jon Tibble on 2010-07-23

DocStrings

964. By Jon Tibble on 2010-07-24

Fix numbered book BG bibles (Bug #609354)

965. By Raoul Snyman on 2010-07-24

Going through all the strings and making them decent, user-friendly English.

966. By Raoul Snyman on 2010-07-24

Fix up a couple of things Jon T found in my previous merge proposal, plus some strings I missed.

967. By Raoul Snyman on 2010-07-25

Update the copyright notice and the credits.

968. By Tim Bentley on 2010-07-25

Add display update trigger missed in cleanup

969. By Jon Tibble on 2010-07-26

Bible refactor & search, getter & setter removal, cleanups

970. By Jon Tibble on 2010-07-26

Long lines

971. By Raoul Snyman on 2010-07-27

Fixed a small bug where there was a "u" in the verse label with () brackets.

972. By Jon Tibble on 2010-07-27

Fix showing screen after black and cleanups

973. By Jon Tibble on 2010-07-27

Naming fixes & trailing line endings

974. By Jon Tibble on 2010-07-27

Explicit exception handling

975. By Phill on 2010-07-28

Fix for bug #609442.

976. By Phill on 2010-07-28

Moved loop settings to a more appropriate tab, removed image tab as a result.

977. By Jon Tibble on 2010-07-28

Exception fixes and naming cleanups

978. By Jon Tibble on 2010-07-30

Refactor reference parsing & remove dead code in Bibles

979. By Jon Tibble on 2010-07-30

Cleanups

980. By Jon Tibble on 2010-07-31

Refactors, cleanups and fixes

981. By Phill on 2010-07-31

A very minor presentation fix. About text for remotes was not going on to next line after heading.

982. By Jon Tibble on 2010-08-01

Fix alerts and screen resizing

983. By Jon Tibble on 2010-08-01

Fix last commit

984. By Andreas Preikschat on 2010-08-01

Disable buttons when no item to act on

985. By Jon Tibble on 2010-08-02

Work with SQLAlchemy 0.6

986. By Tim Bentley on 2010-08-02

Fix song usage
Fix 598407

987. By Andreas Preikschat on 2010-08-11

Dual bible fixes

988. By Raoul Snyman on 2010-08-21

Changed the openlp-logo.svg file to be a single icon SVG and renamed the original file.

989. By Raoul Snyman on 2010-08-23

Fixed the icon properly this time.

990. By Raoul Snyman on 2010-08-25

Now the Song Wizard works, just waiting for the importers to catch up.

991. By Raoul Snyman on 2010-08-26

Fix a string and update the translation sources.

992. By Jon Tibble on 2010-08-26

Cleanups and a version check fix

993. By Raoul Snyman on 2010-08-26

Additional failover for version problems.

994. By Raoul Snyman on 2010-08-27

I was playing, and somehow it got into trunk :-(. This fixes bug #625183.

995. By Jon Tibble on 2010-08-27

Update OpenLPv2 song importer

996. By Tim Bentley on 2010-08-27

Fix theme bug reported on Redhat bugzilla

997. By Tim Bentley on 2010-08-28

Display and renderer changes

998. By Jon Tibble on 2010-08-29

Cleanups and song form fix (Bug #612282)

999. By Tim Bentley on 2010-08-29

Renderer fixes and change theme export suffix

1000. By Raoul Snyman on 2010-08-29

Only show the display screen on startup if it is not on the primary screen.

1001. By Phill on 2010-09-01

Adding the Words of Worship importer.

1002. By Derek Scotney <email address hidden> on 2010-09-03

Add CCLI file importer to song wizard

1003. By Andreas Preikschat on 2010-09-03

Improved dual Bible handling, fixed some edge-case bugs, including bug #625997.

1004. By Raoul Snyman on 2010-09-03

Fix for bug #621695.

1005. By Tim Bentley on 2010-09-03

Fix bugs with renderer

1006. By Jonathan Corwin on 2010-09-03

Fix {} colour substitutions and problems displaying first slide

1007. By Tim Bentley on 2010-09-04

Speed up backgrounds by removing images and using CSS instead
move spelling text widget to own file
fix up highlighting of fields for spelling and tagging.

1008. By Jonathan Corwin on 2010-09-04

Calculate page breaks more accurately, and other HTML/CSS tidies

1009. By Phill on 2010-09-04

Fix incorrect method

1010. By Phill on 2010-09-04

Rearranged the screen co-ordinate fields.

1011. By Tim Bentley on 2010-09-04

Clean up the renderer

1012. By Jonathan Corwin on 2010-09-04

Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars

1013. By Tim Bentley on 2010-09-05

Fix bug for song CCLI setting
Fix bug for dual bible tab which was a general settings bug.

1014. By Jonathan Corwin on 2010-09-05

Hook generic and sof song imports into the wizard

1015. By Tim Bentley on 2010-09-06

Fix bugs regarding screen blanking

1016. By Tim Bentley on 2010-09-07

Fix song editing bug

1017. By Raoul Snyman on 2010-09-08

Merge in the openlp.org 1.x importer.

1018. By Raoul Snyman on 2010-09-08

Added a simple dialog to display any uncaught exceptions.

1019. By Tim Bentley on 2010-09-08

Short term fix for 633354
Fix display and text bugs

1020. By Tim Bentley on 2010-09-09

Proper fix for plugin bug

1021. By Jonathan Corwin on 2010-09-09

Left+Bottom align footer, and prevent wrapping

1022. By Derek Scotney <email address hidden> on 2010-09-09

Fix verse numbering

1023. By Raoul Snyman on 2010-09-09

jQuery-fied the JavaScript, made the interface look a little prettier.

1024. By Jonathan Corwin on 2010-09-10

Tidy song_import code and fix bug 634771

1025. By Raoul Snyman on 2010-09-10

Just some behind-the-scenes house keeping.

1026. By Tim Bentley on 2010-09-11

Fix file permission and correct i18n location

1027. By Jonathan Corwin on 2010-09-12

Loop video background

1028. By Raoul Snyman on 2010-09-12

Fixes bug #635330 and attempts to fix bug #635338

1029. By Tim Bentley on 2010-09-13

Fix code so translations can be found

1030. By Raoul Snyman on 2010-09-13

Various string-related fixes:
- Removed a bunch of double spaces.
- Renamed the translation files.
- Updated the translation files.
- Fixed up a few widgets.
Also fixed up the layout on the Edit Song form.

1031. By Jon Tibble on 2010-09-14

Cleanups

1032. By Tim Bentley on 2010-09-14

Fix whitespace and bugs

1033. By Raoul Snyman on 2010-09-15

Add in code to display a disabled message if an importer is not available.

1034. By Raoul Snyman on 2010-09-15

Fix for bug #635515.
Added an option to disable the error form.

1035. By Martin Thompson on 2010-09-17

Integrated with the song import wizard.
More testcases with synthetic data.
More testing done with more real data.

1036. By Raoul Snyman on 2010-09-17

Some more fixes for the Windows World:
- Fixed location of .qm files, so that they can be found in a Windows build
- Added PyEnchant to the build process
- Fixed up langaugemanager.py so that it conforms to coding standards

1037. By Raoul Snyman on 2010-09-17

Attempting to solve bug #635338

1038. By Raoul Snyman on 2010-09-17

Fixed a spelling error.

1039. By Raoul Snyman on 2010-09-17

Fix bug #640460.

1040. By Raoul Snyman on 2010-09-17

Some more spelling/grammatical corrections.

1041. By Jonathan Corwin on 2010-09-18

String fixes

1042. By Andreas Preikschat on 2010-09-18

Fixed bug #641734

1043. By Raoul Snyman on 2010-09-18

Fix for bug #640697

1044. By rimach on 2010-09-18

Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5

1045. By Raoul Snyman on 2010-09-20

Added a method to update the translation files.

1046. By Jonathan Corwin on 2010-09-20

Rendering speedups/fixes

1047. By Jeffrey Smith on 2010-09-21

Added a song importer for EasyWorship

1048. By Raoul Snyman on 2010-09-21

Fixed bug #644106

1049. By rimach <rimach@siduxbox> on 2010-09-22

Fix translation files

1050. By Raoul Snyman on 2010-09-22

Update strings.

1051. By Jonathan Corwin on 2010-09-22

Speed up video loop, and adjust left margin for outline

1052. By Tim Bentley on 2010-09-22

Update plugin list
Fix ServiceManager
Put splash image back
Fix hide screen bug.

1053. By Andreas Preikschat on 2010-09-22

This fixes the following bugs and issues:
- Bible items cannot be extended any more
- Dual and single Bible verses cannot be mixed (Media Manager/Service Manager)
- Bible item title in the service manager contains all bible passages (separated by a comma) bug #634533 and bug #609355
- Fixed bug #643783

1054. By Tim Bentley on 2010-09-23

Remove line breaks in ServiceManager

1055. By Jeffrey Smith on 2010-09-24

Refactor code for making song import wizard pages.

1056. By rimach on 2010-09-24

Fixed exception thrown on unchecking 'Auto detect' in languages menu
Fixed saving of language setting
Added pinging of review page in translation_util.py

1057. By Raoul Snyman on 2010-09-25

Fixed bug #598805 - Song order inconsistency.

1058. By Tim Bentley on 2010-09-25

Fix crash and optimise display

1059. By Tim Bentley on 2010-09-25

Update Manifest file

1060. By Jeffrey Smith on 2010-09-25

Better handling of memo files larger than 16MiB.
Handle blank fields more intelligently.

1061. By Jonathan Corwin on 2010-09-25

Fix song number/book save and load

1062. By Raoul Snyman on 2010-09-25

Updated translations.

1063. By Tim Bentley on 2010-09-25

Update preview text

1064. By Tim Bentley on 2010-09-26

Theme handling cleanups

1065. By Tim Bentley on 2010-09-26

Fix merge error

1066. By Andreas Preikschat on 2010-09-26

Bible code tidy

1067. By Tim Bentley on 2010-09-28

Fix blank line bug

1068. By Tim Bentley on 2010-09-29

Fix saved service bug

1069. By rimach on 2010-09-30

Add Song Beamer importer

1070. By Andreas Preikschat on 2010-10-04

Fixed up chapter and verse comboboxes for advanced Bible search.
A few other cleanups.

1071. By rimach on 2010-10-05

Added code for:
- translating the Media Manager and all the content (icons, context menus)
- translating the Plugin List

1072. By Tim Bentley on 2010-10-07

Allow Service Item to be updated from Song Plugin on Edit

1073. By Phill on 2010-10-08

Update File load extensions for song imports

1074. By Tim Bentley on 2010-10-08

Fix duplicate file save bug
Fix Dnd bug

1075. By Tim Bentley on 2010-10-09

Enhance ServiceItem Expand/Collapse features

1076. By Jonathan Corwin on 2010-10-09

Option to use phonon or webkit for video. Fix blank to image

1077. By Wesley Stout on 2010-10-10

Start of Documentation

1078. By Andreas Preikschat on 2010-10-10

A few things:
- Finished bible "text search" (the search considers all verses which are in the database).
- Comment/doc clean ups.
- Changed "permission" to "permissions" since the database uses "permissions" (changing this is just being consequent).
- Disabled search button while searching.

1079. By Andreas Preikschat on 2010-10-10

Make sure that the 'edit' and 'delete' buttons are disabled after editing all verses (because no verse is selected).

1080. By Raoul Snyman on 2010-10-11

Some updates to the documentation:
- Added some more classes to the rST files.
- Fixed up some docstrings to proper rST.

1081. By Raoul Snyman on 2010-10-11

For us developers... pull the bzr version.

1082. By Raoul Snyman on 2010-10-11

Moved Windows-specific resources into its own "windows" directory.

1083. By andreas <andreas@andypc> on 2010-10-11

Revised custom Dialog and new edit form

1084. By Andreas Preikschat on 2010-10-12

Fix for bug #657694 (lines 8-9)
Enhanced the code (lines 11-29)

1085. By Raoul Snyman on 2010-10-13

Documentation updates.

1086. By Andreas Preikschat on 2010-10-14

Fixed a bug in the song editor where the last added verse would revert to the previous verse type.

1087. By Jeffrey Smith on 2010-10-14

This is a fix for bug #659673

1088. By Wesley Stout on 2010-10-15

Added the Glossary

1089. By Jonathan Corwin on 2010-10-15

Warn rather than error if COM Impress controller not available.

1090. By Andreas Preikschat on 2010-10-15

Code Cleanups

1091. By Raoul Snyman on 2010-10-15

Updated the image plugin page.
Fixed up Wesley's images.

1092. By Tim Bentley on 2010-10-15

Alerts work again , image performance improvements

1093. By Raoul Snyman on 2010-10-15

Rearranged the documentation into two separate parts, the API for developers, and the manual for users.

1094. By Raoul Snyman on 2010-10-17

Updated documentation.
Renamed some classes and files to match naming conventions.

1095. By Tim Bentley on 2010-10-17

Fix image but and more path optimisation

1096. By Wesley Stout on 2010-10-19

Video display Documentation

1097. By Raoul Snyman on 2010-10-19

Updated the dual monitor stuff with some metadata and got a more recent screenshot of dual monitors on a stock standard Windows XP.

1098. By Jon Tibble on 2010-10-21

Cleanups

1099. By Jon Tibble on 2010-10-22

Fix spelling of Samuel (Bug #647931)

1100. By Tim Bentley on 2010-10-24

Changes to Image processing to improve performance.
Moved image storage for Themes and Image plugins to central cache.
Moved conversion to byte array on to a thread
Built basic thread locking management to cover adding and processing at same time

Presentations and Videos work how that always did.

Cleaned up lots of image size and type conversions.

1101. By Andreas Preikschat on 2010-10-24

Fixed a traceback after editing a image item in the servicemanager (line 62).
Replaced the up/down button text in ServiceItemEditForm/Dialog with icons.
Rearranged the buttons (delete, <space>, up, down).

1102. By Tim Bentley on 2010-10-26

Fix saving images in services and correct border code

1103. By Tim Bentley on 2010-10-27

Bug fixes for
Bug #636835: songs.sqlite will not be downsized when deleting songs
Bug #657307: When working with a saved order of service, saving brings up the save new window instead.
Also renamed Fedora to fedora.

1104. By Tim Bentley on 2010-10-29

Fix missing media Icon
Speed up Vacuum code.
Fix 1002

1105. By Andreas Preikschat on 2010-10-29

Fix custom and songusage managers

1106. By Meinert Jordan on 2010-10-29

Some things from my months old todo list:
- enabling nested docks for more flexible container arrangements
- show the next slide content
- some old UTF8 problems

1107. By Raoul Snyman on 2010-10-30

Clean up resources folder. Got rid of about 30 megs of stuff we don't use.

1108. By Raoul Snyman on 2010-10-30

Customisable Shortcuts, Phase 1: View-only list of actions and shortcuts, currently also only the actions in the main window are in the shortcut dialog.

1109. By Tim Bentley on 2010-10-30

Fix mimetype issues

1110. By Tim Bentley on 2010-11-03

Fix renderer
Fix Image preview.

1111. By Andreas Preikschat on 2010-11-03

Changed "songmanager" to "manager"
Fixed a bug which occurs when you click on "Save & Preview" a second time

1112. By Jon Tibble on 2010-11-03

Lots of cleanups

1113. By Andreas Preikschat on 2010-11-05

Some small clean ups:
- removed lines at the end of the file (if there were more than one)
- some missing spaces

1114. By Raoul Snyman on 2010-11-08

Finally get round to doing the "expand all" and "collapse all" icons.

1115. By Tim Bentley on 2010-11-13

Sort themes when read

1116. By Raoul Snyman on 2010-11-16

Added a "re-index" tool for repopulating the "search_title" field of songs.

1117. By Raoul Snyman on 2010-11-16

Found and fixed a bug.

1118. By Tim Bentley on 2010-11-19

Replace theme editor with wizard.
Revamp theme XML schema
Move theme code to use new schema and auto migrate V2 themes to it.
Revamp V1 import code.
Add two new gradient backgrounds.

1119. By Tim Bentley on 2010-11-21

Fix blank theme problem
Remove blank check box line.

1120. By Tim Bentley on 2010-11-21

Fix bug with service item edit ids missing
Fix name format error
Add debugging to help with service load and song edit bugs. Need to see what is happening when we hit them.

1121. By Tim Bentley on 2010-11-23

Fix video backgrounds and Service Loading with edit

1122. By Jon Tibble on 2010-11-24

Fix BibleGateway searches for BeautifulSoup 3.1

1123. By Tim Bentley on 2010-11-25

Update theme code to handle lines per slide label.
Remove extra debugging as Author's now work for song loading from services

1124. By Tim Bentley on 2010-11-25

Fix spelling

1125. By Wesley Stout on 2010-11-27

Fixed some errors.
Added a few different formats to the documentation for importing songs.

1126. By Tim Bentley on 2010-12-01

Remove theme for Images.
Sort out silly ness which requires a restart
Add preview when returning from blank screen.
Fix bug in servicemanager where DnD with nothing present crashes.
Clean up Custom Plugin a bit.

Build OpenLyrics Import / Export for service items so song items can be moved across computermabobs.

1127. By andreas <andreas@andypc> on 2010-12-02

- docs
- disable "edit" and "delete" button when loading a song or creating a new one (*)

(*) To reproduce this, edit/create a song, select a verse and click "Cancel". When you edit/create another song, the "edit" and "delete" buttons are enabled.

Manually fix conflict in comments on merge (trb143)

1128. By andreas <andreas@andypc> on 2010-12-03

- added the <u>Underline</u> tag
- clean ups

SongBeamerImport:
- clean ups and tweaks
- fixed a bug which would drop the first line of a verse, when it does not have any "verse type"
- convert SongBeamer's html tags to OpenLP specific style

1129. By andreas <andreas@andypc> on 2010-12-03

hanged importer messages (Bug #668789)
- disabled text search for web bibles (does not matter if the web bible is the dual or normal bible)
- available web bibles in the bible importer are now sorted
- imported bible in the Media Manager are now sorted
- speed improvements (unfortunately this takes the ability to keep unselected item unselected when doing an other search)
- "second" instead of "dual"
- docs, comments
- added an auto completion for bible books ("Quick Search" Tab; "Verse Search" combo box)

1130. By Tim Bentley on 2010-12-04

Pylint cleanups
Bug fixing in Themes
Spelling Fix in Songs

1131. By Raoul Snyman on 2010-12-05

Reworked some of the layout and things of the Theme Wizard.

1132. By Jon Tibble on 2010-12-07

Fix v2 song importer and various cleanups

1133. By Tim Bentley on 2010-12-07

Fix Theme Bug text color.
Fix serious spelling error.

1134. By Meinert Jordan on 2010-12-08

- openlp.org 1.x importer detects the character encoding for the database and shows a inputDialog for correcting the guess.
- prefer UTF-8 encoding for CCLI import
- split song order at consecutive white spaces (it rejected song orders with two consecutive spaces)

1135. By Tim Bentley on 2010-12-08

Add text entry validator to display positions
Fix Spelling

1136. By Derek Scotney <email address hidden> on 2010-12-08

Fixes unwanted text imported from some SongSelect files. SongSelect only has a few verse types available for verses and adds extra ones by setting the verse type to 'misc' and then including the actual type on the next line. In the case of a 'misc' type or unknown type, the next line is checked for a valid verse type. The fix has been made for both .txt and .usr file types.

1137. By Andreas Preikschat on 2010-12-10

Changed the string "Parameter(s)" to "Parameter" because the alerts plugin only supports one parameter.

1138. By Meinert Jordan on 2010-12-10

Import Wizards don't Stop

1139. By Meinert Jordan on 2010-12-10

Local aware song order

1140. By Andreas Preikschat on 2010-12-10

Add OpenLP1 bible importer

1141. By Tim Bentley on 2010-12-11

Fix song imports with missing Authors

1142. By Andreas Preikschat on 2010-12-12

- fixed progress bar (bible openlp1 import)
- fixed Bug #688647 (mostly copy&paste)
- fixed "reject" method (the import would not stop, if currentId() == 2/3)
- some songbeamer import tweaks

1143. By Tim Bentley on 2010-12-12

Add Autocompletion to the Songs Dialog
Fix up some lost and confused Camels

1144. By Meinert Jordan on 2010-12-12

Additional buttons in the exception dialog for sending a bug report per email or saving it to a file.
The report contains the traceback along with library versions.

The bug report is prefilled with the traceback, the openlp version, platform informations (on Linux also KDE or GNOME), the and the versions of all used libraries.

1145. By andreas <andreas@andypc> on 2010-12-12

- "Save" button now only saves the alert (if the alert has not created before the save button is disabled). -> the buttons are less confusing
- feedback:
1) If the "alert text" field does not contain "<>" but the parameter field is not empty, then a pop up opens.
2) If the "alert text" field does contain "<>" but the parameter field is empty, a pop up opens.

1146. By Andreas Preikschat on 2010-12-14

Whitespace cleanup

1147. By Tim Bentley on 2010-12-15

Fix Custom edit bug

1148. By andreas <andreas@andypc> on 2010-12-17

White Space Cleanups

1149. By Meinert Jordan on 2010-12-17

Fix: wrong variable names caused osis and http bible imports to crash
Fix: handle unicode in song search string generation
Fix: replaced tab indentation
regenerate search_lyrics on song reindex action

1150. By Tim Bentley on 2010-12-17

Fix image bug in service manager

1151. By andreas <andreas@andypc> on 2010-12-18

- camelCase for Ui_FileRenameDialog
- Fixed bug #690774
- Keep copyright field empty if the imported song (from the service list) does not have any copyright information.

1152. By Meinert Jordan <email address hidden> on 2010-12-18

Rewritten openlp.plugins.bibles.lib.parse_reference() function.
Localization of bible reference separators.
Non-breaking space between verse numbers and verse text.
Web-Import from bibleserver.com
Replaced commas in title strings of biblegateway.csv => completely updated the file

Two known issues:
The localized separators are still hard coded and need GUI configuration.
Not all of the new bibles are full usable, because OpenLP has still unlocalized code for the book names (applies also to other bible imports like OSIS).

1153. By Tim Bentley on 2010-12-20

Songs being edited must have an Author
Songs being edited must have text in a verse

1154. By Tim Bentley on 2010-12-21

Bug #692684: Theme Wizard not updating

1155. By Tim Bentley on 2010-12-21

Fix config tag error

1156. By Tim Bentley on 2010-12-21

Remove Bible add to existing setting

1157. By andreas <andreas@andypc> on 2010-12-21

Fix file extensions

1158. By Andreas Preikschat on 2010-12-22

Added the "final credit" from version 1.

1159. By Tim Bentley on 2010-12-22

Fix song saving bug #691952
Fix custom edit bug #693150

1160. By Jon Tibble on 2010-12-22

Cleanups

1161. By andreas <andreas@andypc> on 2010-12-22

Add Language files

1162. By Meinert Jordan on 2010-12-23

Fixed a bug where an author was added to the AuthorsSelectionComboItem without a database entry.

1163. By Tim Bentley on 2010-12-23

Fix up theme delete / rename validation for now.

1164. By Raoul Snyman on 2010-12-24

Web interface does not always send all necessary data

1165. By Tim Bentley on 2010-12-26

Number of theme bug fixes and clean ups
Plugin list is now singular

1166. By andreas <andreas@andypc> on 2010-12-26

Part of corrections to display sizes

1167. By Tim Bentley on 2010-12-27

Version and Copyright Year updates

1168. By andreas <andreas@andypc> on 2010-12-27

Update Language files

1169. By rimach <rimach@siduxbox> on 2010-12-27

SongBeamer fixes
Correct Song Tab error

1170. By andreas <andreas@andypc> on 2010-12-28

Fix Slidecontroller sizing

1171. By Tim Bentley on 2010-12-29

Small style cleanups
Add guards for Presentations / Images / Media which are removed from files system after loading
Fix 694079 on Linux by adding css into build
Add guard to delay exiting as shutting down in middle of a service is not a good idea

1172. By Raoul Snyman on 2010-12-29

Created a new SearchEdit class, and implemented it in the song search.

1173. By Tim Bentley on 2010-12-30

Fix up presentation display bugs.

1174. By Andreas Preikschat on 2010-12-31

This fixes edge cases, where the slidecontrollers will not be updated correctly.

(Make sure, that the Media Manager is on the left side and the Theme and Service Manager on the right hand side.)

1) Hide the Theme Manager by pressing F10
2) Hide the Service Manager by pressing F9 (first case)
3) Increase the size of the slidecontrollers.
4) Show the Service Manager by pressing F9 (second case)

I removed the paintEvent from the slidecontroller and inserted it in mainwindow. I do like it the other way around, but doing it this way fixes the edge cases.

1175. By Jonathan Corwin on 2010-12-31

Fix missing DesktopScreen: https://bugs.launchpad.net/openlp/+bug/672164/comments/9

1176. By Meinert Jordan <email address hidden> on 2010-12-31

Theme Wizard the layout was distorted because of several manual formating instructions. I limited all format instructions to the necessary minimum. Furthermore I aligned all QFormLayouts towards each other.
It should contain no functional changes except of bug fixes (traped exceptions).
Some widgets ans slots are renamed for a consistent naming scheme.
Small fixes: removed two consecutive spaces and string introducing double quotes from python code. Edited some log.debug() arguments to avoid UnicodeErrors.

1177. By Meinert Jordan <email address hidden> on 2010-12-31

While walking through the German translation, I observed a couple of problems in the internationalization. These problems are addressed in this branch. There are very few changed translatable strings but a lot which will be recognized as new from linguist.
I couldn't test all calls in the importers, because I don't have bibles in all formats. But nearly all changes in this request should be obvious.

1178. By Raoul Snyman on 2011-01-01

Fix the save/save as/etc stuff so that it works properly.

1179. By Raoul Snyman on 2011-01-01

Fix some bugs I accidentally introduced into trunk.

1180. By Raoul Snyman on 2011-01-01

Fixed bug #641661

1181. By Tim Bentley on 2011-01-01

Add a Busy Cursor

1182. By Tim Bentley on 2011-01-01

Remove excessiove debugging

1183. By Raoul Snyman on 2011-01-02

Added a step to update from bzr before building.

1184. By Tim Bentley on 2011-01-02

Fix Song dialog for new songs
Fix Auto Service Opening

1185. By Andreas Preikschat on 2011-01-03

- fixed adding/appending more images to the Service Manager
- possibility to add/append images to the Service Manager if an image is missing
- prevent that "Replace Live Background" can use a non existing image and prevent replacing the background with more images (as this makes no sense)

1186. By Tim Bentley on 2011-01-03

Allow the exit conformation dialog to be disabled

1187. By Raoul Snyman on 2011-01-04

Fixed bug #697271

1188. By Raoul Snyman on 2011-01-04

Fix for bug #696979

1189. By Meinert Jordan <email address hidden> on 2011-01-05

Fix Layout of Settings Tab and other dialogs

1190. By Tim Bentley on 2011-01-05

Fix image error text
Add Guard to video background.
Use new event method to display message
Add Fix for theme editor start up bug.

1191. By Andreas Preikschat on 2011-01-05

Remove not supported html from songs being imported.

1192. By Meinert Jordan on 2011-01-06

Nearly everything in this commit is either the renaming of variables or rewriting of the layout. The visible layout change in the dialogs default size is mainly limited to label alignments (for resized dialogs, translated strings or some Themes it might be much more).
Functional changes are:
- Preventing a bug, when no bibles are installed
- Fixing a spelling error in osisbooks.csv
- Showing the 'reset background' buttons only, if the background is really replaced.
- showing a character encoding dialog for the ewimporter
- BibleGateway importer fix for rtl

1193. By Raoul Snyman on 2011-01-07

Fix some overlooked bugs from the change in the way service files are saved.

1194. By Jon Tibble on 2011-01-07

Cleanups

1195. By Meinert Jordan on 2011-01-07

The validators are avoiding invalid file names resp. invalid CCL numbers

1196. By Meinert Jordan on 2011-01-07

Bug #698881 (accessing unavailable presentation controller)
Keep settings if the controller is not available
Add explaining text to unavailable controllers checkButton

1197. By Jon Tibble on 2011-01-08

Few more cleanups
Fix BibleGateway xrefs (Bug #700271)

1198. By Jon Tibble on 2011-01-09

Refactor out first_item

1199. By Tim Bentley on 2011-01-09

This is big but lets get it in soon.
Changes:
- Search for songs by theme on exact match NOT like
- Add ability to create your own displaytabs and manage them by settings.
- Clean up Theme Manager and make more code common.

1200. By Tim Bentley on 2011-01-09

This time with changes sorry.

1201. By Meinert Jordan on 2011-01-09

fixed layout problem for long bible names (or long presentation controller names)
unified the linebreak in setSizePolicy() calls

1202. By Meinert Jordan on 2011-01-10

wrong parentship caused theme and servicemanager to disapear in a floating dock
more intelligent resizing of item list in PluginForm and SongMaintenanceForm
fix in BS web bible parser

1203. By Andreas Preikschat on 2011-01-10

- added OpenLyrics importer
- continued to implement OpenLyrics features
- split class
- fix wrong use of "theme"
- and other thinks

Importing songs with multiple languages has not been considered (yet). (One song with all languages is imported.)

1204. By Tim Bentley on 2011-01-10

Correct File Filter and Cleanup

1205. By Andreas Preikschat on 2011-01-10

- removed the "quick message" and added dialogs instead
- send the cursor_normal and cursor_busy signal when doing a text search

1206. By Jon Tibble on 2011-01-10

Refactor web bibles

1207. By Jon Tibble on 2011-01-11

Cleanups

1208. By Jon Tibble on 2011-01-12

Make OOo stuff more verbose
Fix BibleServer downloads (Bug 701651)

1209. By Tim Bentley on 2011-01-12

Hide theme delete button for default themes

1210. By Andreas Preikschat on 2011-01-12

Cleanups

Clean up from last merge:
- removed not needed pretty_print argument
- doc fix
- return None instead of 0

1211. By Tim Bentley on 2011-01-12

Fix bug 696557. Cache resizing was adding name to full path
Comment tidy ups.

1212. By Jon Tibble on 2011-01-12

Fix BibleGateway code
Make BibleServer code more robust

1213. By Jon Tibble on 2011-01-13

Cleanups and refactor unicode file check

1214. By Andreas Preikschat on 2011-01-13

replaced the "bibles_showprogress" and "bibles_hideprogress" with the "cursor_busy" and "cursor_normal" signals

1215. By Andreas Preikschat on 2011-01-14

Fix slidecontroller resizing and cleanups

1216. By Jon Tibble on 2011-01-14

Refactor wizards
Smaller refactor to web bibles
Cleanups

1217. By Jon Tibble on 2011-01-15

More cleanups
Refactor file deleting
Fix db committing too early (Bug #703073)

1218. By Tim Bentley on 2011-01-15

Fix Transitions in Bibles
Fix Blank at start Bible slide
Fix Blank display on restart so the correct blanking method is used.

1219. By Jon Tibble on 2011-01-15

Refactor error messages

1220. By Jon Tibble on 2011-01-16

Fix local bible quick search.
Fix OpenSong CUV bible import.

1221. By Jon Tibble on 2011-01-17

Fix song validation and saving

1222. By Andreas Preikschat on 2011-01-17

Update preview image on background changes

1223. By Garrett on 2011-01-17

Enable cursor hiding over live display

1224. By Jon Tibble on 2011-01-18

Lots of small refactors and cleanups

1225. By Andreas Preikschat on 2011-01-18

Fixes to Service Item Order screen

1226. By Mattias P&#245;ldaru <email address hidden> on 2011-01-18

Easislides import plugin

1227. By Jon Tibble on 2011-01-18

Fix song saving with a verse order

1228. By Andreas Preikschat on 2011-01-18

- removed the doc for an attribute which is not passed
- removed white spaces

1229. By andreas <andreas@andypc> on 2011-01-19

Translations Update

1230. By Jon Tibble on 2011-01-19

Fix duplicate checks (Bug #703149)
Cleanup config change responses (Bug #697215)

1231. By Andreas Preikschat on 2011-01-20

Update songs for multi-language lyrics

1232. By Andreas Preikschat on 2011-01-21

Better button handling

1233. By Tim Bentley on 2011-01-21

Fix adding Images to existing service items

1234. By Jon Tibble on 2011-01-21

Cleanups and bible parsing fix

1235. By Tim Bentley on 2011-01-21

Add Key Actions to Shortcut Dialogs

1236. By Jon Tibble on 2011-01-21

Fix breakage and cleanups

1237. By Andreas Preikschat on 2011-01-22

Service item selection (Bug #598393)

1238. By Jon Tibble on 2011-01-22

Refactors in UNO and EasiSlides

1239. By Jon Tibble on 2011-01-22

Fix BaseDirectory check (Bug #706202)

1240. By Tim Bentley on 2011-01-22

Slide Controller names have been cleaned up and some line lengths fixed
Added guards to presentation code to stop loading if preview images are missing stops crash later on

1241. By Tim Bentley on 2011-01-22

Bible tidyups
Database corrections
Song of Songs --> Song Of Solomon
Naham --> Nahum
Obad --> Obadiah

1242. By Andreas Preikschat on 2011-01-22

- fixed a bug, which occurs when you "replace live background" when no item is live (so basically after starting OpenLP)
- update the little preview frame, when you "Blank to Theme/Screen"

1243. By Jon Tibble on 2011-01-23

Fix Windows AppLocation (Bug #706396)

1244. By Tim Bentley on 2011-01-24

Fix theme wizard so Outline and Shadow check boxes are checked
Latch image background changes until the theme changes.
Turn off the rest background if the image or video has been changed from the plugin and the theme changes.

1245. By Andreas Preikschat on 2011-01-24

- Name changes/clean ups.
- I improved the selection behaviour. For example when a child item is supposed to be selected I used "child", otherwise -1 (e. g. when deleting an item).

1246. By Phill on 2011-01-24

Allows the update check on load to be disabled

1247. By Tim Bentley on 2011-01-24

Added finish replacement cleanup

1248. By Jon Tibble on 2011-01-25

Fix theme editing and NGU bible usage

1249. By Jon Tibble on 2011-01-26

Lots of cleanups and refactors

1250. By Jon Tibble on 2011-01-28

Fix CSV bible importing (bug #687309)

1251. By andreas <andreas@andypc> on 2011-01-28

Only trivial changes:
- only allow to select one slide in the slidecontrollers
- make curosr busy when merging authors/topics/books
- cosmetic code change (saves 4 spaces all over the methods)

1252. By Tim Bentley on 2011-01-29

Fix Up / Down Confusion
Give SongUsage some TLC and fix UTF8 bugs and better messaging.
Service Items now more meaningful in their titles.

1253. By Tim Bentley on 2011-01-31

Fix Override state on theme edit dialog so the display and values are correct.

1254. By Andreas Preikschat on 2011-01-31

Changed the title for images in the service manager.
The title is <filename> if the item consists of one image only. Consequently the other case is, that the item consists of more than one image.

1255. By Jon Tibble on 2011-01-31

Fix BG Chinese bible (Bug #706211)

Fix CSV import to accept the same files V1 did and cater to "not quite" ASCII encoding generated by cp1252 files.

1256. By Jon Tibble on 2011-02-01

Deduplication

1257. By Tim Bentley on 2011-02-01

Fix Theme font size

1258. By andreas <andreas@andypc> on 2011-02-01

Add ability to print OOS document

1259. By Jon Tibble on 2011-02-01

Fix song edit form and cleanups

1260. By Andreas Preikschat on 2011-02-02

You cannot append images to a service item, when you use a localised version of OpenLP. This fixes this.

1261. By Jon Tibble on 2011-02-02

Deduplication, naming and various cleanups

1262. By Jon Tibble on 2011-02-02

Fix custom edit (Bug #711934)

1263. By Jon Tibble on 2011-02-03

Start the UI component library with a couple of moves and a new item.
Dedupe song object checking.
Stop reloading songs when loading services without songs in them!
Change mouse cursor when loading services as reloading songs can take time.

1264. By Andreas Preikschat on 2011-02-03

Enhanced the button behaviour on the alert dialog.

1265. By Andreas Preikschat on 2011-02-04

Merged (not redundant) parts of documentation/SongFormat.txt into the songs/lib/db module and removed it. Added the media_files and media_files_songs tables (although the doc is not complete there).

1266. By Jon Tibble on 2011-02-04

Remove scripts now importers take their role.
Fix missing import.
More UI library component refactors.
Clean up spacer use in import forms.
More deduplication in slidecontroller.py

1267. By Tim Bentley on 2011-02-04

Fix setup.py so it works following file removal.
Fix settings to work with -d option
Upgrade Exception form to allow an attachment.
Upgrade Exception form to force a 20 character error description

1268. By Andreas Preikschat on 2011-02-04

- Buttons which require a slide to act on are disabled if there is none to act on
- some other changes

1269. By Jon Tibble on 2011-02-04

Cleanup, speedup and another UI library component

1270. By Jon Tibble on 2011-02-05

Start deobfuscating UI library
Catch failure to start presenter processes (Bug #712140)

1271. By Tim Bentley on 2011-02-05

Fix Theme Image copy Bug
Clean up Theme Rename and Copy bugs

1272. By Raoul Snyman on 2011-02-05

Some updates to the Windows build:
- Set remotes plugin to be disabled
- Uninstall previous installation of OpenLP automatically.

1273. By Tim Bentley on 2011-02-05

Fix up theme popups

1274. By Jon Tibble on 2011-02-06

Fix song service load (Bug #696219)
Cleanups
Change cursor when activating plugins

1275. By Andreas Preikschat on 2011-02-07

I added the Tool Flag, so that the displays will not appear in the task bar.

1276. By Andreas Preikschat on 2011-02-07

Only show "CCLI License:" in the footer, if the user entered a CCLI number.

1277. By Andreas Preikschat on 2011-02-08

- Removed the error dialog when there are no service items in the service (as suggested by superfly)
- Added the ability to include the "playing time" of media items
- Moved settings from advanced tab to the dialog
- Added a dialog with preview function. It provides the following settings:
  a) print text (slides)
  b) print notes
  c) print playing time
  (when the user actually prints the service, the settings are saved.)
- Ability to enter Custom Service Notes.

1278. By Jon Tibble on 2011-02-08

Cleanups - blank lines, line breaks, docstrings, correct string chars.
Remove unused exception
Dedupe presentation controller code
Fill out the range of Delphi colours to fix theme loading (Support 98)
Naming fixes including starting the attack on mainwindow.py.

1279. By Tim Bentley on 2011-02-08

Fix previews after screen blanking on live controller

1280. By Jon Tibble on 2011-02-08

Fixes and UI valign component

1281. By Jon Tibble on 2011-02-08

Fix last commit

1282. By Jon Tibble on 2011-02-09

UI library - UiStrings

1283. By Jon Tibble on 2011-02-09

Fixes and translation deduplication

1284. By Raoul Snyman on 2011-02-10

Fixed up some of the docstrings and updated the documentation.

1285. By Raoul Snyman on 2011-02-10

Created a new theme for Qt Help.
Added a condition in the configuration depending on the theme.

Note: to get Qt Help, change the theme to "openlp_qthelp" and then build with "make qthelp".

1286. By andreas <andreas@andypc> on 2011-02-10

- added a OpenLyrics exporter
- save OpenLyrics meta data to songs (service items and xml files)
- fixed a bug in OpenSong import
- fixed verse type when importing xml songs (instead of "V" we add "Verse" to the database)
- verse order in exported songs is now lower case (service items and xml files)
- updated copyright information (not the scripts directory)

Notes to the OpenLyrics export dialog:
- sorting does not work very nicely
- the search does only consider the title of the qlistwidgetitem:
    "title (author, author, author)"
- the search does not remove , and . and the like
- the buttons check/uncheck all songs (also hidden ones)

I thought about two scenarios:
1) Somebody wants to export all songs. He'll use the "check all" button and will not need the search box.

2) The user wants to export single songs. He will use the search box and double click the songs (or check the checkbox).

1287. By Mattias P&#245;ldaru <email address hidden> on 2011-02-10

Open Data Folder

1288. By Jon Tibble on 2011-02-10

More UiStrings
Fix UiStrings sentence case
Button box rearranging
Fix failure to grab Impress on close (Support #38)

1289. By Andreas Preikschat on 2011-02-10

Do not add the entry attribute to songbooks when there is no song number.

1290. By Jon Tibble on 2011-02-10

Refactor and rename listviews for DnD
Wizard refactors
Cleanups

1291. By Jon Tibble on 2011-02-11

Fixes, cleanups and UiStrings
Refactor plugins: icon building, settings tabs and media items

1292. By Tim Bentley on 2011-02-11

Fix reference to none object

1293. By Jon Tibble on 2011-02-11

Fix data directory paths

1294. By Andreas Preikschat on 2011-02-11

Fixed selecting the wrong item when moving an item down (re-ordering images)

1295. By Jon Tibble on 2011-02-12

Fixes

1296. By Tim Bentley on 2011-02-13

Add ability to set the start point of a media item.
Display the start and end time of an item in service manager.

1297. By Phill on 2011-02-13

Importer for SongShow Plus

1298. By Raoul Snyman on 2011-02-13

Re-fixed the data directory on Linux with XDG installed.

1299. By andreas <andreas@andypc> on 2011-02-14

Implemented a new bible search edit.

1300. By Tim Bentley on 2011-02-14

Fix up the Video length calculation code

1301. By Jon Tibble on 2011-02-14

Unicode and translation grammar fixes

1302. By Jon Tibble on 2011-02-15

Fix song overwrite and cleanups

1303. By mahfiaz on 2011-02-15

filesystem encoding fix for non-ascii home dir

1304. By Raoul Snyman on 2011-02-15

Amalgamated OpenLP theme filters into one and removed "All Files" filter to limit the effects of user ignorance.

1305. By rimach on 2011-02-16

A couple of bug fixes and minor enhancements.

1306. By Mattias P&#245;ldaru <email address hidden> on 2011-02-17

Fix EasiSlides importer

1307. By Andreas Preikschat on 2011-02-17

Fix the error 'Corrupt JPEG data: premature end of data segment'

1308. By Andreas Preikschat on 2011-02-17

- clear search edit line when starting the wizard again
- changed the "uncheck all" and "check all" buttons check/uncheck only those songs which are currently visible. This enables the user to perform more advanced searches.

1309. By Raoul Snyman on 2011-02-17

Updated InnoSetup script to add a Debug shortcut in the menu.

1310. By mahfiaz on 2011-02-18

More changes, now internally tags are held not as Salm:1 (previously), nor v:1 (in the meantime), but just as in openlyrics format, v1.
The v1a is not yet supported, it requires spinboxes to be changed first. The old and new should be handled silently side-by-side.

1311. By Jon Tibble on 2011-02-18

Fix mime data string

1312. By Jon Tibble on 2011-02-19

Lots of refactoring all over...
Refactor magic numbers to use enumerations:
- VerticalType and HorizontalType in themes (required import tweaking to avoid circular imports)
- LayoutStyle and DisplayStyle for bibles
- SongSearch
Refactor string translations:
- More UiStrings
- Introduce WizardStrings and SongStrings
Refactor song importer __init__() methods to reduce the duplication.
Cleanups for spelling, whitespace, naming, unused variables and imports.

1313. By Raoul Snyman on 2011-02-19

Fixed up a few things in the documentation.

1314. By Raoul Snyman on 2011-02-19

Added a README.txt file for Python distribution.

1315. By Jon Tibble on 2011-02-19

Fix CCLI author import

1316. By Mattias P&#245;ldaru <email address hidden> on 2011-02-20

Fix two missing objects

1317. By Tim Bentley on 2011-02-20

Revised Print Dialog and fix Preview Edit

1318. By mahfiaz on 2011-02-20

Log media extensions.

1319. By Andreas Preikschat on 2011-02-20

- added a new Songbeamer property
- replaced try
- enumeration fix

1320. By Mattias P&#245;ldaru <email address hidden> on 2011-02-20

More pythonic code, fixes a possible error, where *.ra would be left out of supported extensions if checked after *.ram.

1321. By Tim Bentley on 2011-02-21

Move the DisplayTab dialog

1322. By Tim Bentley on 2011-02-21

Fix breakages from last merge.
Remove old import file.
Set up variables correctly.
Correct the Translation tags.

1323. By Raoul Snyman on 2011-02-22

Fixed a bug where the settings for remotes was not actually used.

1324. By Andreas Preikschat on 2011-02-23

Added apocrypha to osis import.

1325. By Mattias P&#245;ldaru <email address hidden> on 2011-02-23

Add more detailed mimetype logging. We could add the extensions list hack back later, if needed. To decide that, we need more information from users.

1326. By Armin K&#246;hler <email address hidden> on 2011-02-23

Add importfilter for foilpresenter song files

1327. By Andreas Preikschat on 2011-02-23

The re-index tool adds 'Author unknown' if songs do not have any author.

1328. By Raoul Snyman on 2011-02-23

Add the option to change the default display.

1329. By Jon Tibble on 2011-02-24

Fixes and cleanups

1330. By Raoul Snyman on 2011-02-24

Add Armin to the copyright notice.

1331. By Andreas Preikschat on 2011-02-24

Moved redundant code to parent class

1332. By Jon Tibble on 2011-02-24

Fix missing verse handling

1333. By Armin K&#246;hler <email address hidden> on 2011-02-25

adapted the handling of author unknown in foilpresenter song importer

1334. By Jon Tibble on 2011-02-25

Fix non-saving OpenLyrics authors (Bug 724568)

1335. By Raoul Snyman on 2011-02-25

Fixed bug #700859: Bible importers do not clean up properly after a failed import.

1336. By Andreas Preikschat on 2011-02-25

Removed unused enumeration class.
Fixed a bug (Clicking the advanced "Search" button will cause a traceback when no bible is present)
Cosmetic cleanups.

1337. By Andreas Preikschat on 2011-02-25

Clean ups (missing lines, white spaces, etc.)

1338. By Tim Bentley on 2011-02-26

Move Display Tag Menu Item

1339. By Tim Bentley on 2011-02-26

Small cleanup

1340. By Armin Köhler on 2011-02-26

Bug fixes.

1341. By Jon Tibble on 2011-02-26

Fix Jesus' words in BibleGateway parsing.

1342. By Matthias Hub on 2011-02-28

OS X build scripts

1343. By Tim Bentley on 2011-03-02

Fix toolbar separator.

1344. By Raoul Snyman on 2011-03-02

Updated translations.

1345. By Tim Bentley on 2011-03-03

Fix hide mouse error

1346. By Andreas Preikschat on 2011-03-03

Code Cleanups

1347. By mahfiaz on 2011-03-03

Making it easier to translate and a fix (hopefully).

1348. By Andreas Preikschat on 2011-03-04

Added the ability to detect (un)plugged screens after OpenLP has started.
Added the ability to detect screen resolution changes.

1349. By mahfiaz on 2011-03-04

Fixed bug #728637

1350. By Tim Bentley on 2011-03-04

Speed up start up by not displaying screens twice
Fix Black display between image items

1351. By Raoul Snyman on 2011-03-05

Updated the translations again.

1352. By Andreas Preikschat on 2011-03-05

set the 'Add Tool...' menu item invisible

1353. By Andreas Preikschat on 2011-03-05

- fix a bug, which occurs when viewing (preview/live) a song without/with incomplete footer.
- clean up

1354. By Jon Tibble on 2011-03-05

Cleanups

1355. By Raoul Snyman on 2011-03-05

Updated the credits.

1356. By Tim Bentley on 2011-03-06

Fix not flagging of service item changes

1357. By Andreas Preikschat on 2011-03-06

- fix "Show Desktop" being not visible (now it's visible all the time)
- fix a bug: sending an image live when you hide the desktop, the image was visible for a short moment

1358. By Tim Bentley on 2011-03-06

Fix up song duplication bug where search_title seems to often have a space at the end.

Reindex will clean up the database once this is in.

1359. By Tim Bentley on 2011-03-07

Add first time wizard

1360. By Tim Bentley on 2011-03-07

Stop Wizard eating songs databases

1361. By Andreas Preikschat on 2011-03-07

Fixed Bug #727710

1362. By Raoul Snyman on 2011-03-08

Added an initial Gentoo ebuild file.

1363. By Andreas Preikschat on 2011-03-09

Added some more debug information.

1364. By Tim Bentley on 2011-03-09

First time wizard improvements

1365. By Jon Tibble on 2011-03-09

Cleanups

1366. By Jon Tibble on 2011-03-09

UiStrings.OpenFile

1367. By Jon Tibble on 2011-03-09

Head r1366

1368. By Jon Tibble on 2011-03-11

Head r1373

1369. By Jon Tibble on 2011-03-11

Unused import

1370. By Jon Tibble on 2011-03-11

Unused variables

1371. By Jon Tibble on 2011-03-11

Head r1374

1372. By Jon Tibble on 2011-03-12

Head r1377

1373. By Jon Tibble on 2011-03-12

Head r1379

1374. By Jon Tibble on 2011-03-14

Head r1388

1375. By Jon Tibble on 2011-03-14

Head r1389

1376. By Jon Tibble on 2011-03-15

Head r1390

1377. By Jon Tibble on 2011-03-15

Fix typo

1378. By Jon Tibble on 2011-03-16

Head r1391

1379. By Jon Tibble on 2011-03-17

Head r1396

1380. By Jon Tibble on 2011-03-18

Head r1401

1381. By Jon Tibble on 2011-03-19

Head r1405

1382. By Jon Tibble on 2011-03-19

Unused import

1383. By Jon Tibble on 2011-03-19

Long line

1384. By Jon Tibble on 2011-03-20

Head r1408

1385. By Jon Tibble on 2011-03-21

Head r1414

1386. By Jon Tibble on 2011-03-26

Head r1419

1387. By Jon Tibble on 2011-03-26

Head r1421

1388. By Jon Tibble on 2011-03-26

Head r1427

1389. By Jon Tibble on 2011-03-26

Head r1428

1390. By Jon Tibble on 2011-03-26

Alignment

1391. By Jon Tibble on 2011-03-31

Head r1441

1392. By Jon Tibble on 2011-04-09

Head r1451

1393. By Jon Tibble on 2011-04-28

Head 1495

1394. By Jon Tibble on 2011-11-26

Head r1804

1395. By Jon Tibble on 2011-11-26

Cleanups

1396. By Jon Tibble on 2011-11-26

Fix undefined variables

1397. By Jon Tibble on 2011-12-02

Head r1812

1398. By Jon Tibble on 2011-12-02

Cleanups

1399. By Jon Tibble on 2011-12-02

Cleanup fix

1400. By Jon Tibble on 2011-12-02

Whitespace

1401. By Jon Tibble on 2011-12-02

Revert broken old incomplete thought

1402. By Jon Tibble on 2011-12-03

Fix spacing

1403. By Jon Tibble on 2011-12-03

Head r1815

1404. By Jon Tibble on 2011-12-04

Head r1819

1405. By Jon Tibble on 2011-12-04

Reduce recent file list duplication (Bug #892668)

1406. By Jon Tibble on 2011-12-04

Fix non-ascii service filename loading

1407. By Jon Tibble on 2011-12-04

Head r1821

1408. By Jon Tibble on 2011-12-05

Fix non-ascii file check on Macs

1409. By Jon Tibble on 2011-12-06

Head r1824

1410. By Jon Tibble on 2011-12-10

Head r1829

1411. By Jon Tibble on 2011-12-10

Head r1831

1412. By Jon Tibble on 2011-12-11

Fix v1 theme importing

1413. By Jon Tibble on 2011-12-11

Previous fix broke on non-Windows, try again

1414. By Jon Tibble on 2011-12-11

Fix logging theme names

1415. By Jon Tibble on 2011-12-12

Head r1834

1416. By Jon Tibble on 2011-12-25

Head r1856

1417. By Jon Tibble on 2011-12-26

Fix unused imports

1418. By Jon Tibble on 2011-12-29

Head r1859

1419. By Jon Tibble on 2011-12-30

Dedupe media search

1420. By Jon Tibble on 2011-12-31

Head r1860

1421. By Jon Tibble on 2011-12-31

Long line

1422. By Jon Tibble on 2011-12-31

Indentation

1423. By Jon Tibble on 2011-12-31

Fix crashes in media settings (Bug #908252)

1424. By Jon Tibble on 2012-01-04

Head r1863

1425. By Jon Tibble on 2012-01-06

Head r1866

1426. By Jon Tibble on 2012-01-13

Head r1868

1427. By Jon Tibble on 2012-03-11

Head r1897

1428. By Jon Tibble on 2012-03-11

Unused imports

1429. By Jon Tibble on 2012-03-11

Head r1901

1430. By Jon Tibble on 2012-03-12

Cleanups

1431. By Jon Tibble on 2012-03-12

Head r1902

1432. By Jon Tibble on 2012-03-12

Unused variables

1433. By Jon Tibble on 2012-03-12

Head r1903

1434. By Jon Tibble on 2012-03-13

Head r1904

1435. By Jon Tibble on 2012-03-16

Head r1906

1436. By Jon Tibble on 2012-03-17

Bugs #888815 #941966

1437. By Jon Tibble on 2012-03-17

Head r1908

1438. By Jon Tibble on 2012-03-18

Head r1909

1439. By Jon Tibble on 2012-03-18

Head r1910

1440. By Jon Tibble on 2012-03-19

Head r1912

1441. By Jon Tibble on 2012-03-24

Head r1917

1442. By Jon Tibble on 2012-04-18

Head r1941

1443. By Jon Tibble on 2012-05-20

Head r1973

1444. By Jon Tibble on 2012-06-02

Head r1978

1445. By Jon Tibble on 2012-06-22

Head r2003

Unmerged revisions

1445. By Jon Tibble on 2012-06-22

Head r2003

1444. By Jon Tibble on 2012-06-02

Head r1978

1443. By Jon Tibble on 2012-05-20

Head r1973

1442. By Jon Tibble on 2012-04-18

Head r1941

1441. By Jon Tibble on 2012-03-24

Head r1917

1440. By Jon Tibble on 2012-03-19

Head r1912

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2009-09-16 04:59:38 +0000
+++ openlp/core/lib/mediamanageritem.py	2009-09-21 17:56:36 +0000
@@ -136,7 +136,8 @@
             self.Toolbar = OpenLPToolbar(self)
             self.PageLayout.addWidget(self.Toolbar)
 
-    def addToolbarButton(self, title, tooltip, icon, slot=None, objectname=None):
+    def addToolbarButton(self, title, tooltip, icon, slot=None,
+        objectname=None):
         """
         A method to help developers easily add a button to the toolbar.
 
@@ -192,31 +193,43 @@
         ## File Button ##
         if self.hasFileIcon:
             self.addToolbarButton(
-                translate(self.TranslationContext, u'Load '+self.PluginTextShort),
-                translate(self.TranslationContext, u'Load a new '+self.PluginTextShort),
-                u':'+self.IconPath+ u'_load.png', self.onFileClick, self.PluginTextShort+u'FileItem')
+                translate(self.TranslationContext,
+                u'Load ' + self.PluginTextShort),
+                translate(self.TranslationContext,
+                u'Load a new ' + self.PluginTextShort),
+                u':' + self.IconPath + u'_load.png', self.onFileClick,
+                self.PluginTextShort + u'FileItem')
         ## New Button ##
         if self.hasNewIcon:
             self.addToolbarButton(
-                translate(self.TranslationContext, u'New '+self.PluginTextShort),
-                translate(self.TranslationContext, u'Add a new '+self.PluginTextShort),
-                u':'+self.IconPath+ u'_new.png', self.onNewClick, self.PluginTextShort+u'NewItem')
+                translate(self.TranslationContext,
+                u'New ' + self.PluginTextShort),
+                translate(self.TranslationContext,
+                u'Add a new ' + self.PluginTextShort),
+                u':' + self.IconPath + u'_new.png', self.onNewClick,
+                self.PluginTextShort + u'NewItem')
         ## Edit Button ##
         if self.hasEditIcon:
             self.addToolbarButton(
-                translate(self.TranslationContext, u'Edit '+self.PluginTextShort),
-                translate(self.TranslationContext, u'Edit the selected '+self.PluginTextShort),
-                u':'+self.IconPath+ u'_edit.png', self.onEditClick, self.PluginTextShort+u'EditItem')
+                translate(self.TranslationContext,
+                u'Edit ' + self.PluginTextShort),
+                translate(self.TranslationContext,
+                u'Edit the selected ' + self.PluginTextShort),
+                u':' + self.IconPath + u'_edit.png', self.onEditClick,
+                self.PluginTextShort + u'EditItem')
         ## Delete Button ##
         self.addToolbarButton(
-            translate(self.TranslationContext, u'Delete '+self.PluginTextShort),
+            translate(self.TranslationContext,
+            u'Delete ' + self.PluginTextShort),
             translate(self.TranslationContext, u'Delete the selected item'),
-            u':'+self.IconPath+ u'_delete.png', self.onDeleteClick, self.PluginTextShort+u'DeleteItem')
+            u':' + self.IconPath + u'_delete.png', self.onDeleteClick,
+            self.PluginTextShort + u'DeleteItem')
         ## Separator Line ##
         self.addToolbarSeparator()
         ## Preview ##
         self.addToolbarButton(
-            translate(self.TranslationContext, u'Preview '+self.PluginTextShort),
+            translate(self.TranslationContext,
+            u'Preview ' + self.PluginTextShort),
             translate(self.TranslationContext, u'Preview the selected item'),
             u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem')
         ## Live  Button ##
@@ -226,9 +239,12 @@
             u':/system/system_live.png', self.onLiveClick, u'LiveItem')
         ## Add to service Button ##
         self.addToolbarButton(
-            translate(self.TranslationContext, u'Add '+self.PluginTextShort+u' To Service'),
-            translate(self.TranslationContext, u'Add the selected item(s) to the service'),
-            u':/system/system_add.png', self.onAddClick, self.PluginTextShort+u'AddItem')
+            translate(self.TranslationContext,
+            u'Add ' + self.PluginTextShort + u' To Service'),
+            translate(self.TranslationContext,
+            u'Add the selected item(s) to the service'),
+            u':/system/system_add.png', self.onAddClick,
+            self.PluginTextShort + u'AddItem')
 
     def addListViewToToolBar(self):
         #Add the List widget
@@ -236,7 +252,8 @@
         self.ListView.uniformItemSizes = True
         self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591))
         self.ListView.setSpacing(1)
-        self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.ListView.setSelectionMode(
+            QtGui.QAbstractItemView.ExtendedSelection)
         self.ListView.setAlternatingRowColors(True)
         self.ListView.setDragEnabled(True)
         self.ListView.setObjectName(self.PluginTextShort+u'ListView')
@@ -247,12 +264,14 @@
         if self.hasEditIcon:
             self.ListView.addAction(contextMenuAction(self.ListView,
                 ':' +self.IconPath+u'_new.png',
-                translate(self.TranslationContext, u'&Edit '+self.PluginTextShort),
+                translate(self.TranslationContext,
+                u'&Edit ' + self.PluginTextShort),
                 self.onEditClick))
             self.ListView.addAction(contextMenuSeparator(self.ListView))
         self.ListView.addAction(contextMenuAction(
             self.ListView, ':/system/system_preview.png',
-            translate(self.TranslationContext, u'&Preview '+self.PluginTextShort),
+            translate(self.TranslationContext,
+                u'&Preview ' + self.PluginTextShort),
             self.onPreviewClick))
         self.ListView.addAction(contextMenuAction(
             self.ListView, ':/system/system_live.png',
@@ -301,20 +320,23 @@
         count = 0
         filelist = []
         while  count < self.ListView.count():
-            bitem =  self.ListView.item(count)
+            bitem = self.ListView.item(count)
             filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
             filelist.append(filename)
             count += 1
         return filelist
 
     def loadList(self, list):
-        raise NotImplementedError(u'MediaManagerItem.loadList needs to be defined by the plugin')
+        raise NotImplementedError(
+            u'MediaManagerItem.loadList needs to be defined by the plugin')
 
     def onNewClick(self):
-        raise NotImplementedError(u'MediaManagerItem.onNewClick needs to be defined by the plugin')
+        raise NotImplementedError(
+            u'MediaManagerItem.onNewClick needs to be defined by the plugin')
 
     def onEditClick(self):
-        raise NotImplementedError(u'MediaManagerItem.onEditClick needs to be defined by the plugin')
+        raise NotImplementedError(
+            u'MediaManagerItem.onEditClick needs to be defined by the plugin')
 
     def onDeleteClick(self):
         raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to be defined by the plugin')
@@ -323,7 +345,7 @@
         raise NotImplementedError(u'MediaManagerItem.generateSlideData needs to be defined by the plugin')
 
     def onPreviewClick(self):
-        log.debug(self.PluginTextShort+u' Preview Requested')
+        log.debug(self.PluginTextShort + u' Preview Requested')
         service_item = self.buildServiceItem()
         if service_item is not None:
             self.parent.preview_controller.addServiceItem(service_item)
@@ -335,7 +357,7 @@
             self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):
-        log.debug(self.PluginTextShort+u' Add Requested')
+        log.debug(self.PluginTextShort + u' Add Requested')
         service_item = self.buildServiceItem()
         if service_item is not None:
             self.parent.service_manager.addServiceItem(service_item)
@@ -345,7 +367,8 @@
         Common method for generating a service item
         """
         service_item = ServiceItem(self.parent)
-        service_item.addIcon(u':/media/media_'+self.PluginTextShort.lower()+u'.png')
+        service_item.addIcon(
+            u':/media/media_' + self.PluginTextShort.lower() + u'.png')
         if self.generateSlideData(service_item):
             self.ListView.clearSelection()
             return service_item

=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py	2009-09-19 23:05:30 +0000
+++ openlp/core/lib/pluginmanager.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,7 @@
 import sys
 import logging
 
-from openlp.core.lib import Plugin,  PluginStatus
+from openlp.core.lib import Plugin, PluginStatus
 
 class PluginManager(object):
     """

=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2009-09-20 13:21:05 +0000
+++ openlp/core/lib/renderer.py	2009-09-21 17:56:36 +0000
@@ -188,13 +188,13 @@
                 else:
                     pos = len(line)
                     split_text = line
-                while metrics.width(split_text,  -1) > line_width:
+                while metrics.width(split_text, -1) > line_width:
                     #Find the next space to the left
                     pos = line[:pos].rfind(u' ')
                     #no more spaces found
                     if pos  == 0:
                         split_text = line
-                        while metrics.width(split_text,  -1) > line_width:
+                        while metrics.width(split_text, -1) > line_width:
                             split_text = split_text[:-1]
                         pos = len(split_text)
                     else:
@@ -242,7 +242,7 @@
         # reset the frame. first time do not worry about what you paint on.
         self._frame = QtGui.QImage(self.bg_frame)
         x, y = self._correctAlignment(self._rect, bbox)
-        bbox = self._render_lines_unaligned(lines, False,  (x, y), True)
+        bbox = self._render_lines_unaligned(lines, False, (x, y), True)
         if footer_lines is not None:
             bbox = self._render_lines_unaligned(footer_lines, True,
                 (self._rect_footer.left(), self._rect_footer.top()), True)
@@ -327,7 +327,8 @@
             # centre align
             y = rect.top() + (rect.height() - bbox.height()) / 2
         else:
-            log.error(u'Invalid value for theme.VerticalAlign:%s' % self._theme.display_verticalAlign)
+            log.error(u'Invalid value for theme.VerticalAlign:%s',
+                self._theme.display_verticalAlign)
         return x, y
 
     def _render_lines_unaligned(self, lines, footer, tlcorner=(0, 0),
@@ -400,7 +401,7 @@
         startx = x
         starty = y
         rightextent = None
-        #print "inputs",  startx,  starty, maxx, maxy
+        #print "inputs", startx, starty, maxx, maxy
         # dont allow alignment messing with footers
         if footer:
             align = 0
@@ -412,7 +413,7 @@
         for linenum in range(len(lines)):
             line = lines[linenum]
             #find out how wide line is
-            w, h = self._get_extent_and_render(line, footer,  tlcorner=(x, y),
+            w, h = self._get_extent_and_render(line, footer, tlcorner=(x, y),
                 draw=False)
             if self._theme.display_shadow:
                 w += shadow_offset

=== modified file 'openlp/core/lib/rendermanager.py'
--- openlp/core/lib/rendermanager.py	2009-09-20 07:12:47 +0000
+++ openlp/core/lib/rendermanager.py	2009-09-21 17:56:36 +0000
@@ -121,7 +121,8 @@
         else:
             if theme is not None:
                 self.theme = theme
-            elif self.global_style == u'Song' or self.global_style == u'Service':
+            elif self.global_style == u'Song' or \
+                self.global_style == u'Service':
                 if self.service_theme == u'':
                     self.theme = self.global_theme
                 else:
@@ -129,9 +130,10 @@
             else:
                 self.theme = self.global_theme
         if self.theme != self.renderer.theme_name:
-            log.debug(u'theme is now %s',  self.theme)
+            log.debug(u'theme is now %s', self.theme)
             self.themedata = self.theme_manager.getThemeData(self.theme)
-            self.calculate_default(self.screen_list[self.current_display][u'size'])
+            self.calculate_default(
+                self.screen_list[self.current_display][u'size'])
             self.renderer.set_theme(self.themedata)
             self.build_text_rectangle(self.themedata)
 
@@ -212,7 +214,7 @@
         self.renderer.set_frame_dest(self.width, self.height)
         return self.renderer.generate_frame_from_lines(main_text, footer_text)
 
-    def resize_image(self, image, width = 0,  height = 0):
+    def resize_image(self, image, width=0, height=0):
         """
         Resize an image to fit on the current screen.
 
@@ -253,6 +255,7 @@
             self.width = screen.width()
             self.height = screen.height()
         self.screen_ratio = float(self.height) / float(self.width)
-        log.debug(u'calculate default %d, %d, %f', self.width, self.height, self.screen_ratio )
+        log.debug(u'calculate default %d, %d, %f',
+            self.width, self.height, self.screen_ratio )
         # 90% is start of footer
         self.footer_start = int(self.height * 0.90)

=== modified file 'openlp/core/ui/__init__.py'
--- openlp/core/ui/__init__.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/__init__.py	2009-09-21 17:56:36 +0000
@@ -39,5 +39,5 @@
 from mainwindow import MainWindow
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
-           'MainWindow', 'MainDisplay',  'SlideController', 'ServiceManager',
+           'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager',
            'ThemeManager', 'AmendThemeForm']

=== modified file 'openlp/core/ui/alertstab.py'
--- openlp/core/ui/alertstab.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/alertstab.py	2009-09-21 17:56:36 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  translate
+from openlp.core.lib import SettingsTab, translate
 
 class AlertsTab(SettingsTab):
     """
@@ -33,7 +33,8 @@
     def __init__(self):
         self.font_color = '#ffffff'
         self.bg_color = '#660000'
-        SettingsTab.__init__(self, translate(u'AlertsTab', u'Alerts'), u'Alerts')
+        SettingsTab.__init__(
+            self, translate(u'AlertsTab', u'Alerts'), u'Alerts')
 
     def setupUi(self):
         self.setObjectName(u'AlertsTab')
@@ -110,10 +111,12 @@
         self.SlideRightLayout.setMargin(0)
         self.SlideRightLayout.setObjectName(u'SlideRightLayout')
         self.PreviewGroupBox = QtGui.QGroupBox(self.AlertRightColumn)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
+        sizePolicy = QtGui.QSizePolicy(
+            QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.PreviewGroupBox.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(
+            self.PreviewGroupBox.sizePolicy().hasHeightForWidth())
         self.PreviewGroupBox.setSizePolicy(sizePolicy)
         self.PreviewGroupBox.setObjectName(u'PreviewGroupBox')
         self.PreviewLayout = QtGui.QVBoxLayout(self.PreviewGroupBox)
@@ -124,7 +127,8 @@
         self.FontPreview.setMinimumSize(QtCore.QSize(280, 100))
         self.FontPreview.setReadOnly(True)
         self.FontPreview.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.FontPreview.setAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
+        self.FontPreview.setAlignment(
+            QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter)
         self.FontPreview.setObjectName(u'FontPreview')
         self.PreviewLayout.addWidget(self.FontPreview)
         self.SlideRightLayout.addWidget(self.PreviewGroupBox)
@@ -146,11 +150,13 @@
         self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font'))
         self.FontLabel.setText(translate(u'AlertsTab', u'Font Name:'))
         self.FontColorLabel.setText(translate(u'AlertsTab', u'Font Color:'))
-        self.BackgroundColorLabel.setText(translate(u'AlertsTab', u'Background Color:'))
+        self.BackgroundColorLabel.setText(
+            translate(u'AlertsTab', u'Background Color:'))
         self.TimeoutLabel.setText(translate(u'AlertsTab', u'Alert timeout:'))
         self.TimeoutSpinBox.setSuffix(translate(u'AlertsTab', u's'))
         self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview'))
-        self.FontPreview.setText(translate(u'AlertsTab', u'openlp.org 2.0 rocks!'))
+        self.FontPreview.setText(
+            translate(u'AlertsTab', u'openlp.org 2.0 rocks!'))
 
     def onBackgroundColorButtonClicked(self):
         self.bg_color = QtGui.QColorDialog.getColor(
@@ -174,12 +180,17 @@
 
     def load(self):
         self.timeout = int(self.config.get_config(u'timeout', 5))
-        self.font_color = unicode(self.config.get_config(u'font color', u'#ffffff'))
-        self.bg_color = unicode(self.config.get_config(u'background color', u'#660000'))
-        self.font_face = unicode(self.config.get_config(u'font face', QtGui.QFont().family()))
+        self.font_color = unicode(
+            self.config.get_config(u'font color', u'#ffffff'))
+        self.bg_color = unicode(
+            self.config.get_config(u'background color', u'#660000'))
+        self.font_face = unicode(
+            self.config.get_config(u'font face', QtGui.QFont().family()))
         self.TimeoutSpinBox.setValue(self.timeout)
-        self.FontColorButton.setStyleSheet(u'background-color: %s' % self.font_color)
-        self.BackgroundColorButton.setStyleSheet(u'background-color: %s' % self.bg_color)
+        self.FontColorButton.setStyleSheet(
+            u'background-color: %s' % self.font_color)
+        self.BackgroundColorButton.setStyleSheet(
+            u'background-color: %s' % self.bg_color)
         font = QtGui.QFont()
         font.setFamily(self.font_face)
         self.FontComboBox.setCurrentFont(font)
@@ -198,5 +209,5 @@
         font.setBold(True)
         font.setPointSize(16)
         self.FontPreview.setFont(font)
-        self.FontPreview.setStyleSheet(
-            u'background-color: %s; color: %s' % (self.bg_color, self.font_color))
+        self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \
+            (self.bg_color, self.font_color))

=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py	2009-09-13 18:42:45 +0000
+++ openlp/core/ui/amendthemeform.py	2009-09-21 17:56:36 +0000
@@ -33,7 +33,7 @@
 
 log = logging.getLogger(u'AmendThemeForm')
 
-class AmendThemeForm(QtGui.QDialog,  Ui_AmendThemeDialog):
+class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
 
     def __init__(self, thememanager, parent=None):
         QtGui.QDialog.__init__(self, parent)

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/maindisplay.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,7 @@
 from PyQt4 import QtCore, QtGui
 
 from time import sleep
-from openlp.core.lib import translate,  Receiver
+from openlp.core.lib import translate, Receiver
 
 class MainDisplay(QtGui.QWidget):
     """
@@ -129,7 +129,7 @@
             self.displayBlank = False
             self.frameView(self.frame)
 
-    def displayAlert(self,  text=u''):
+    def displayAlert(self, text=u''):
         """
         Called from the Alert Tab to display an alert
 
@@ -141,7 +141,8 @@
         painter = QtGui.QPainter(alertframe)
         top = alertframe.rect().height() * 0.9
         painter.fillRect(
-            QtCore.QRect(0, top, alertframe.rect().width(), alertframe.rect().height() - top),
+            QtCore.QRect(0, top,
+            alertframe.rect().width(), alertframe.rect().height() - top),
             QtGui.QColor(alertTab.bg_color))
         font = QtGui.QFont()
         font.setFamily(alertTab.font_face)

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2009-09-19 23:05:30 +0000
+++ openlp/core/ui/mainwindow.py	2009-09-21 17:56:36 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
-    ServiceManager, ThemeManager, MainDisplay, SlideController,  \
+    ServiceManager, ThemeManager, MainDisplay, SlideController, \
     PluginForm
 from openlp.core.lib import translate, Plugin, MediaManagerItem, \
     SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
@@ -119,7 +119,7 @@
 
 #        self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored,
 #            QtGui.QSizePolicy.Maximum))
-#        geometry =  self.MediaManagerDock.geometry()
+#        geometry = self.MediaManagerDock.geometry()
 #        geometry.setWidth(self.settingsmanager.mainwindow_left)
 #        self.MediaManagerDock.setGeometry(geometry)
 #        self.MediaManagerDock.setMinimumWidth(10)

=== modified file 'openlp/core/ui/plugindialoglistform.py'
--- openlp/core/ui/plugindialoglistform.py	2009-09-18 17:37:11 +0000
+++ openlp/core/ui/plugindialoglistform.py	2009-09-21 17:56:36 +0000
@@ -9,7 +9,7 @@
 
 import logging
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import translate,  PluginStatus
+from openlp.core.lib import translate, PluginStatus
 
 class PluginForm(QtGui.QDialog):
     global log
@@ -45,14 +45,18 @@
         self.ButtonBox.setObjectName(u'ButtonBox')
 
         self.retranslateUi(PluginForm)
-        QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), PluginForm.close)
+        QtCore.QObject.connect(self.ButtonBox,
+            QtCore.SIGNAL(u'accepted()'), PluginForm.close)
         QtCore.QMetaObject.connectSlotsByName(PluginForm)
 
     def retranslateUi(self, PluginForm):
         PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list'))
-        self.PluginViewList.horizontalHeaderItem(0).setText(translate(u'PluginForm', u'Name'))
-        self.PluginViewList.horizontalHeaderItem(1).setText(translate(u'PluginForm', u'Version'))
-        self.PluginViewList.horizontalHeaderItem(2).setText(translate(u'PluginForm', u'Status'))
+        self.PluginViewList.horizontalHeaderItem(0).setText(
+            translate(u'PluginForm', u'Name'))
+        self.PluginViewList.horizontalHeaderItem(1).setText(
+            translate(u'PluginForm', u'Version'))
+        self.PluginViewList.horizontalHeaderItem(2).setText(
+            translate(u'PluginForm', u'Status'))
 
     def load(self):
         """
@@ -68,14 +72,14 @@
             item2 = QtGui.QTableWidgetItem(plugin.version)
             item2.setTextAlignment(QtCore.Qt.AlignVCenter)
             if plugin.status == PluginStatus.Active:
-                item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Active'))
+                item3 = QtGui.QTableWidgetItem(
+                    translate(u'PluginForm', u'Active'))
             else:
-                item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Inactive'))
+                item3 = QtGui.QTableWidgetItem(
+                    translate(u'PluginForm', u'Inactive'))
             item3.setTextAlignment(QtCore.Qt.AlignVCenter)
             self.PluginViewList.setItem(row, 0, item1)
             self.PluginViewList.setItem(row, 1, item2)
             self.PluginViewList.setItem(row, 2, item3)
             self.PluginViewList.setRowHeight(row, 15)
 
-
-

=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py	2009-09-19 21:45:50 +0000
+++ openlp/core/ui/servicemanager.py	2009-09-21 17:56:36 +0000
@@ -33,7 +33,7 @@
 from PyQt4 import QtCore, QtGui
 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
     RenderManager, translate, buildIcon, ServiceType, \
-    contextMenuAction, contextMenuSeparator,  Receiver
+    contextMenuAction, contextMenuSeparator, Receiver
 from openlp.core.utils import ConfigHelper
 
 class ServiceManagerList(QtGui.QTreeWidget):
@@ -285,7 +285,7 @@
             temp = self.serviceItems[item]
             self.serviceItems.remove(self.serviceItems[item])
             self.serviceItems.insert(item - 1, temp)
-            self.repaintServiceList(item - 1,  count)
+            self.repaintServiceList(item - 1, count)
         self.parent.serviceChanged(False, self.serviceName)
 
     def onServiceDown(self):
@@ -298,7 +298,7 @@
             temp = self.serviceItems[item]
             self.serviceItems.remove(self.serviceItems[item])
             self.serviceItems.insert(item + 1, temp)
-            self.repaintServiceList(item + 1,  count)
+            self.repaintServiceList(item + 1, count)
         self.parent.serviceChanged(False, self.serviceName)
 
     def onServiceEnd(self):
@@ -539,7 +539,7 @@
         pos = 0
         count = 0
         for item in items:
-            parentitem =  item.parent()
+            parentitem = item.parent()
             if parentitem is None:
                 pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
             else:

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2009-09-20 07:38:23 +0000
+++ openlp/core/ui/slidecontroller.py	2009-09-21 17:56:36 +0000
@@ -60,8 +60,8 @@
 
 class SlideController(QtGui.QWidget):
     """
-    SlideController is the slide controller widget. This widget is what the user
-    uses to control the displaying of verses/slides/etc on the screen.
+    SlideController is the slide controller widget. This widget is what the
+    user uses to control the displaying of verses/slides/etc on the screen.
     """
     global log
     log = logging.getLogger(u'SlideController')
@@ -74,7 +74,8 @@
         self.settingsmanager = settingsmanager
         self.isLive = isLive
         self.parent = parent
-        self.image_list = [u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox']
+        self.image_list = [
+            u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox']
         self.timer_id = 0
         self.commandItem = None
         self.Panel = QtGui.QWidget(parent.ControlSplitter)
@@ -177,7 +178,8 @@
         sizePolicy.setHeightForWidth(
             self.SlidePreview.sizePolicy().hasHeightForWidth())
         self.SlidePreview.setSizePolicy(sizePolicy)
-        self.SlidePreview.setFixedSize(QtCore.QSize(self.settingsmanager.slidecontroller_image, 225))
+        self.SlidePreview.setFixedSize(
+            QtCore.QSize(self.settingsmanager.slidecontroller_image, 225))
         self.SlidePreview.setFrameShape(QtGui.QFrame.Box)
         self.SlidePreview.setFrameShadow(QtGui.QFrame.Plain)
         self.SlidePreview.setLineWidth(1)
@@ -238,7 +240,8 @@
         """
         log.debug(u'addServiceItem')
         #If old item was a command tell it to stop
-        if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
+        if self.commandItem is not None and \
+            self.commandItem.service_item_type == ServiceType.Command:
             Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
         self.commandItem = item
         before = time.time()
@@ -246,8 +249,9 @@
         log.info(u'Rendering took %4s' % (time.time() - before))
         self.enableToolBar(item)
         if item.service_item_type == ServiceType.Command:
-            Receiver().send_message(u'%s_start'%item.name.lower(), \
-                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
+            Receiver().send_message(u'%s_start' % item.name.lower(), \
+                [item.shortname, item.service_item_path,
+                item.service_frames[0][u'title']])
         else:
             self.displayServiceManagerItems(item, 0)
 
@@ -259,13 +263,15 @@
         """
         log.debug(u'addServiceItem')
         #If old item was a command tell it to stop
-        if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command:
+        if self.commandItem is not None and \
+            self.commandItem.service_item_type == ServiceType.Command:
             Receiver().send_message(u'%s_stop'% self.commandItem.name.lower())
         self.commandItem = item
         self.enableToolBar(item)
         if item.service_item_type == ServiceType.Command:
-            Receiver().send_message(u'%s_start'%item.name.lower(), \
-                [item.shortname, item.service_item_path, item.service_frames[0][u'title']])
+            Receiver().send_message(u'%s_start' % item.name.lower(), \
+                [item.shortname, item.service_item_path,
+                item.service_frames[0][u'title']])
         else:
             self.displayServiceManagerItems(item, slideno)
 
@@ -279,9 +285,11 @@
         self.serviceitem = serviceitem
         self.PreviewListWidget.clear()
         self.PreviewListWidget.setRowCount(0)
-        self.PreviewListWidget.setColumnWidth(0, self.settingsmanager.slidecontroller_image)
+        self.PreviewListWidget.setColumnWidth(
+            0, self.settingsmanager.slidecontroller_image)
         for framenumber, frame in enumerate(self.serviceitem.frames):
-            self.PreviewListWidget.setRowCount(self.PreviewListWidget.rowCount() + 1)
+            self.PreviewListWidget.setRowCount(
+                self.PreviewListWidget.rowCount() + 1)
             item = QtGui.QTableWidgetItem()
             label = QtGui.QLabel()
             label.setMargin(8)
@@ -294,9 +302,11 @@
                 label.setText(frame[u'text'])
             self.PreviewListWidget.setCellWidget(framenumber, 0, label)
             self.PreviewListWidget.setItem(framenumber, 0, item)
-            slide_height = self.settingsmanager.slidecontroller_image * self.parent.RenderManager.screen_ratio
+            slide_height = self.settingsmanager.slidecontroller_image * \
+                self.parent.RenderManager.screen_ratio
             self.PreviewListWidget.setRowHeight(framenumber, slide_height)
-        self.PreviewListWidget.setColumnWidth(0, self.PreviewListWidget.viewport().size().width())
+        self.PreviewListWidget.setColumnWidth(
+            0, self.PreviewListWidget.viewport().size().width())
         if slideno > self.PreviewListWidget.rowCount():
             self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount())
         else:
@@ -357,7 +367,8 @@
         Go to the previous slide.
         """
         if self.commandItem.service_item_type == ServiceType.Command:
-            Receiver().send_message(u'%s_previous'% self.commandItem.name.lower())
+            Receiver().send_message(
+                u'%s_previous'% self.commandItem.name.lower())
         else:
             row = self.PreviewListWidget.currentRow() - 1
             if row == -1:
@@ -377,7 +388,8 @@
         Start the timer loop running and store the timer id
         """
         if self.PreviewListWidget.rowCount() > 1:
-            self.timer_id = self.startTimer(int(self.DelaySpinBox.value()) * 1000)
+            self.timer_id = self.startTimer(
+                int(self.DelaySpinBox.value()) * 1000)
 
     def onStopLoop(self):
         """
@@ -398,4 +410,5 @@
         """
         row = self.PreviewListWidget.currentRow()
         if row > -1 and row < self.PreviewListWidget.rowCount():
-            self.parent.LiveController.addServiceManagerItem(self.commandItem, row)
+            self.parent.LiveController.addServiceManagerItem(
+                self.commandItem, row)

=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/splashscreen.py	2009-09-21 17:56:36 +0000
@@ -29,36 +29,42 @@
     def __init__(self, version):
         self.splash_screen = QtGui.QSplashScreen()
         self.setupUi()
-        starting = translate(u'SplashScreen',u'Starting')
-        self.message=starting+u'..... '+version
+        starting = translate(u'SplashScreen', u'Starting')
+        self.message = starting + u'..... ' + version
 
     def setupUi(self):
         self.splash_screen.setObjectName(u'splash_screen')
         self.splash_screen.setWindowModality(QtCore.Qt.NonModal)
         self.splash_screen.setEnabled(True)
         self.splash_screen.resize(370, 370)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtGui.QSizePolicy(
+            QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.splash_screen.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(
+            self.splash_screen.sizePolicy().hasHeightForWidth())
         self.splash_screen.setSizePolicy(sizePolicy)
         self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'),
+            QtGui.QIcon.Normal, QtGui.QIcon.Off)
         splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png')
         self.splash_screen.setWindowIcon(icon)
         self.splash_screen.setPixmap(splash_image)
         self.splash_screen.setMask(splash_image.mask())
-        self.splash_screen.setWindowFlags(QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint)
+        self.splash_screen.setWindowFlags(
+            QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint)
         self.retranslateUi()
         QtCore.QMetaObject.connectSlotsByName(self.splash_screen)
 
     def retranslateUi(self):
-        self.splash_screen.setWindowTitle(translate(u'splash_screen', u'Splash Screen'))
+        self.splash_screen.setWindowTitle(
+            translate(u'splash_screen', u'Splash Screen'))
 
     def show(self):
         self.splash_screen.show()
-        self.splash_screen.showMessage(self.message, QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom,  QtCore.Qt.black)
+        self.splash_screen.showMessage(self.message,
+            QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom, QtCore.Qt.black)
         self.splash_screen.repaint()
 
     def finish(self, widget):

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2009-09-14 18:53:56 +0000
+++ openlp/core/ui/thememanager.py	2009-09-21 17:56:36 +0000
@@ -97,10 +97,10 @@
 
     def changeGlobalFromTab(self, themeName):
         log.debug(u'changeGlobalFromTab %s', themeName)
-        for count in range (0,  self.ThemeListWidget.count()):
+        for count in range (0, self.ThemeListWidget.count()):
             #reset the old name
             item = self.ThemeListWidget.item(count)
-            oldName =  item.text()
+            oldName = item.text()
             newName = unicode(item.data(QtCore.Qt.UserRole).toString())
             if oldName != newName:
                 self.ThemeListWidget.item(count).setText(newName)
@@ -112,9 +112,9 @@
 
     def changeGlobalFromScreen(self, index):
         log.debug(u'changeGlobalFromScreen %s', index)
-        for count in range (0,  self.ThemeListWidget.count()):
+        for count in range (0, self.ThemeListWidget.count()):
             item = self.ThemeListWidget.item(count)
-            oldName =  item.text()
+            oldName = item.text()
             #reset the old name
             if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()):
                 self.ThemeListWidget.item(count).setText(
@@ -194,12 +194,13 @@
         path = unicode(path)
         if path != u'':
             self.config.set_last_dir(path, 1)
-            themePath =  os.path.join(path, theme + u'.theme')
+            themePath = os.path.join(path, theme + u'.theme')
             zip = zipfile.ZipFile(themePath, 'w')
             source = os.path.join(self.path, theme)
             for root, dirs, files in os.walk(source):
                 for name in files:
-                    zip.write(os.path.join(source, name), os.path.join(theme, name))
+                    zip.write(
+                        os.path.join(source, name), os.path.join(theme, name))
             zip.close()
 
     def onImportTheme(self):
@@ -226,7 +227,7 @@
             for name in files:
                 if name.endswith(u'.png'):
                     #check to see file is in theme root directory
-                    theme =  os.path.join(self.path, name)
+                    theme = os.path.join(self.path, name)
                     if os.path.exists(theme):
                         (path, filename) = os.path.split(unicode(file))
                         textName = os.path.splitext(name)[0]
@@ -244,7 +245,7 @@
         self.pushThemes()
 
     def pushThemes(self):
-        Receiver().send_message(u'update_themes',  self.getThemes() )
+        Receiver().send_message(u'update_themes', self.getThemes() )
 
     def getThemes(self):
         return self.themelist

=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py	2009-09-08 19:58:05 +0000
+++ openlp/core/ui/themestab.py	2009-09-21 17:56:36 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  translate,  Receiver
+from openlp.core.lib import SettingsTab, translate, Receiver
 
 class ThemesTab(SettingsTab):
     """
@@ -32,7 +32,8 @@
     """
     def __init__(self, parent):
         self.parent = parent
-        SettingsTab.__init__(self, translate(u'ThemesTab', u'Themes'), u'Themes')
+        SettingsTab.__init__(
+            self, translate(u'ThemesTab', u'Themes'), u'Themes')
 
     def setupUi(self):
         self.setObjectName(u'ThemesTab')
@@ -106,15 +107,19 @@
     def retranslateUi(self):
         self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme'))
         self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level'))
-        self.SongLevelRadioButton.setText(translate(u'ThemesTab', u'Song level'))
+        self.SongLevelRadioButton.setText(
+            translate(u'ThemesTab', u'Song level'))
         self.SongLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from each song in the database. If a song doesn\'t have a theme associated with it, then use the service\'s theme. If the service doesn\'t have a theme, then use the global theme.'))
-        self.ServiceLevelRadioButton.setText(translate(u'ThemesTab', u'Service level'))
+        self.ServiceLevelRadioButton.setText(
+            translate(u'ThemesTab', u'Service level'))
         self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from the service, overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.'))
-        self.GlobalLevelRadioButton.setText(translate(u'ThemesTab', u'Global level'))
+        self.GlobalLevelRadioButton.setText(
+            translate(u'ThemesTab', u'Global level'))
         self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated with either the service or the songs.'))
 
     def load(self):
-        self.global_style = self.config.get_config(u'theme global style', u'Global')
+        self.global_style = self.config.get_config(
+            u'theme global style', u'Global')
         self.global_theme = self.config.get_config(u'theme global theme', u'')
         if self.global_style == u'Global':
             self.GlobalLevelRadioButton.setChecked(True)
@@ -126,29 +131,35 @@
     def save(self):
         self.config.set_config(u'theme global style', self.global_style )
         self.config.set_config(u'theme global theme',self.global_theme)
-        Receiver().send_message(u'update_global_theme',  self.global_theme )
+        Receiver().send_message(u'update_global_theme', self.global_theme )
 
     def postSetUp(self):
-        Receiver().send_message(u'update_global_theme',  self.global_theme )
+        Receiver().send_message(u'update_global_theme', self.global_theme )
 
     def onSongLevelButtonPressed(self):
         self.global_style= u'Song'
-        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.global_style)
 
     def onServiceLevelButtonPressed(self):
         self.global_style= u'Service'
-        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.global_style)
 
     def onGlobalLevelButtonPressed(self):
         self.global_style= u'Global'
-        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.global_style)
 
     def onDefaultComboBoxChanged(self, value):
         self.global_theme = unicode(self.DefaultComboBox.currentText())
-        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
-        image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.global_style)
+        image = self.parent.ThemeManagerContents.getPreviewImage(
+            self.global_theme)
         preview = QtGui.QPixmap(unicode(image))
-        display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+        display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
+            QtCore.Qt.SmoothTransformation)
         self.DefaultListView.setPixmap(display)
 
     def updateThemeList(self, theme_list):
@@ -160,14 +171,18 @@
         self.DefaultComboBox.clear()
         for theme in theme_list:
             self.DefaultComboBox.addItem(theme)
-        id = self.DefaultComboBox.findText(self.global_theme, QtCore.Qt.MatchExactly)
+        id = self.DefaultComboBox.findText(
+            self.global_theme, QtCore.Qt.MatchExactly)
         if id == -1:
             id = 0 # Not Found
             self.global_theme = u''
         self.DefaultComboBox.setCurrentIndex(id)
-        self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style)
+        self.parent.RenderManager.set_global_theme(
+            self.global_theme, self.global_style)
         if self.global_theme is not u'':
-            image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme)
+            image = self.parent.ThemeManagerContents.getPreviewImage(
+                self.global_theme)
             preview = QtGui.QPixmap(unicode(image))
-            display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
+            display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
+                QtCore.Qt.SmoothTransformation)
             self.DefaultListView.setPixmap(display)

=== modified file 'openlp/migration/migratesongs.py'
--- openlp/migration/migratesongs.py	2009-09-08 19:58:05 +0000
+++ openlp/migration/migratesongs.py	2009-09-21 17:56:36 +0000
@@ -31,17 +31,18 @@
 from sqlalchemy import  *
 from sqlalchemy.sql import select
 from sqlalchemy import create_engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, clear_mappers
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \
+    clear_mappers
 from openlp.plugins.songs.lib.models import metadata, session, \
-    engine, songs_table, Song, Author, Topic,  Book
+    engine, songs_table, Song, Author, Topic, Book
 from openlp.plugins.songs.lib.tables import *
 from openlp.plugins.songs.lib.classes import *
 
 def init_models(url):
     engine = create_engine(url)
     metadata.bind = engine
-    session = scoped_session(sessionmaker(autoflush=True, autocommit=False,
-                                          bind=engine))
+    session = scoped_session(
+        sessionmaker(autoflush=True, autocommit=False, bind=engine))
     mapper(Author, authors_table)
     mapper(TAuthor, temp_authors_table)
     mapper(Book, song_books_table)
@@ -57,7 +58,7 @@
     return session
 
 temp_authors_table = Table(u'authors_temp', metadata,
-    Column(u'authorid', types.Integer,  primary_key=True),
+    Column(u'authorid', types.Integer, primary_key=True),
     Column(u'authorname', String(40))
 )
 
@@ -154,14 +155,18 @@
             song.search_title = u''
             song.search_lyrics = u''
             print songs_temp.songtitle
-            aa  = self.session.execute(u'select * from songauthors_temp where songid =' + unicode(songs_temp.songid) )
+            aa  = self.session.execute(
+                u'select * from songauthors_temp where songid =' + \
+                unicode(songs_temp.songid) )
             for row in aa:
                 a = row['authorid']
                 authors_temp = self.session.query(TAuthor).get(a)
-                bb  = self.session.execute(u'select * from authors where display_name = \"%s\"' % unicode(authors_temp.authorname) ).fetchone()
+                bb  = self.session.execute(
+                    u'select * from authors where display_name = \"%s\"' % \
+                    unicode(authors_temp.authorname) ).fetchone()
                 if bb is None:
                     author = Author()
-                    author.display_name =  authors_temp.authorname
+                    author.display_name = authors_temp.authorname
                     author.first_name = u''
                     author.last_name = u''
                 else:
@@ -180,11 +185,11 @@
         conn = sqlite3.connect(self.data_path + os.sep + database)
         conn.execute("""update songs set search_title =
             replace(replace(replace(replace(replace(replace(replace(replace(
-            replace(title,  '&', 'and'), ',', ''), ';', ''), ':', ''),
+            replace(title, '&', 'and'), ',', ''), ';', ''), ':', ''),
             '(u', ''), ')', ''), '{', ''), '}',''),'?','');""")
         conn.execute("""update songs set search_lyrics =
             replace(replace(replace(replace(replace(replace(replace(replace(
-            replace(lyrics,  '&', 'and'), ',', ''), ';', ''), ':', ''),
+            replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''),
             '(u', ''), ')', ''), '{', ''), '}',''),'?','')
             ;""")
         conn.commit()

=== modified file 'openlp/plugins/audit/auditplugin.py'
--- openlp/plugins/audit/auditplugin.py	2009-09-19 19:45:15 +0000
+++ openlp/plugins/audit/auditplugin.py	2009-09-21 17:56:36 +0000
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 from datetime import date
 
-from openlp.core.lib import Plugin,  Receiver,  translate,  str_to_bool
+from openlp.core.lib import Plugin, Receiver, translate, str_to_bool
 from openlp.plugins.audit.lib import AuditTab
 
 class AuditPlugin(Plugin):
@@ -98,7 +98,8 @@
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'audit_changed'), self.onUpdateAudit)
         self.auditFileName = self.config.get_config(u'audit file', u'')
-        self.auditActive = str_to_bool(self.config.get_config(u'audit active', False))
+        self.auditActive = str_to_bool(
+            self.config.get_config(u'audit active', False))
         if self.auditFileName == u'':
             self.auditActive = False
             self.ToolsAuditItem.setEnabled(False)
@@ -117,7 +118,8 @@
         """
         if self.auditActive:
             for author in auditData[1]:
-                self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % (date.today(), auditData[0], author,  auditData[2]))
+                self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % \
+                    (date.today(), auditData[0], author, auditData[2]))
             self.auditFile.flush()
 
     def onUpdateAudit(self):
@@ -126,7 +128,8 @@
         Sort out the file and the auditing state
         """
         self.auditFileNameNew = self.config.get_config(u'audit file', u'')
-        self.auditActive = str_to_bool(self.config.get_config(u'audit active', False))
+        self.auditActive = str_to_bool(
+            self.config.get_config(u'audit active', False))
         if self.auditFileNameNew == u'':
             self.auditActive = False
             self.ToolsAuditItem.setChecked(self.auditActive)

=== modified file 'openlp/plugins/audit/lib/audittab.py'
--- openlp/plugins/audit/lib/audittab.py	2009-09-19 19:31:18 +0000
+++ openlp/plugins/audit/lib/audittab.py	2009-09-21 17:56:36 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  str_to_bool,  translate,  Receiver
+from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
 
 class AuditTab(SettingsTab):
     """
@@ -45,7 +45,8 @@
         self.AuditFileName.setObjectName("AuditFileName")
         self.horizontalLayout.addWidget(self.AuditFileName)
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'),
+            QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.AuditFileButton = QtGui.QPushButton(self)
         self.AuditFileButton.setObjectName("AuditFileButton")
         self.AuditFileButton.setIcon(icon1)
@@ -63,19 +64,23 @@
     def retranslateUi(self):
         self.AuditModeGroupBox.setTitle(translate(u'AuditTab', u'Audit File'))
         self.AuditActive.setText(translate(u'AuditTab', 'Audit available:'))
-        self.WarningLabel.setText(translate(u'AuditTab', u'A restart is needed for this change to become effective'))
+        self.WarningLabel.setText(translate(u'AuditTab',
+            u'A restart is needed for this change to become effective'))
 
     def load(self):
         self.AuditFileName.setText(self.config.get_config(u'Audit file', u''))
         self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0)))
 
     def onAuditFileButtonClicked(self):
-        filename = QtGui.QFileDialog.getOpenFileName(self, u'Audit File',self.AuditFileName.text())
+        filename = QtGui.QFileDialog.getOpenFileName(
+            self, u'Audit File',self.AuditFileName.text())
         if filename != u'':
             filename = unicode(filename)
             self.AuditFileName.setText(filename)
 
     def save(self):
-        self.config.set_config(u'Audit file', unicode(self.AuditFileName.text()))
-        self.config.set_config(u'startup', unicode(self.AuditActive.checkState()))
+        self.config.set_config(
+            u'Audit file', unicode(self.AuditFileName.text()))
+        self.config.set_config(
+            u'startup', unicode(self.AuditActive.checkState()))
         Receiver().send_message(u'audit_changed')

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2009-09-21 17:56:36 +0000
@@ -25,7 +25,6 @@
 import logging
 
 from PyQt4 import QtCore, QtGui
-from PyQt4.QtCore import *
 
 from openlp.core.lib import Plugin, translate
 
@@ -62,7 +61,8 @@
         import_menu.addAction(self.ImportBibleItem)
         self.ImportBibleItem.setText(translate(u'BiblePlugin', u'&Bible'))
         # Signals and slots
-        QtCore.QObject.connect(self.ImportBibleItem, QtCore.SIGNAL(u'triggered()'),  self.onBibleNewClick)
+        QtCore.QObject.connect(self.ImportBibleItem,
+            QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick)
 
     def add_export_menu_item(self, export_menu):
         self.ExportBibleItem = QtGui.QAction(export_menu)

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2009-09-21 17:56:36 +0000
@@ -31,7 +31,7 @@
 from PyQt4 import QtCore, QtGui
 
 from bibleimportdialog import Ui_BibleImportDialog
-from openlp.core.lib import Receiver,  translate
+from openlp.core.lib import Receiver, translate
 
 
 class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog):
@@ -41,7 +41,7 @@
     """
     Class documentation goes here.
     """
-    def __init__(self, config, biblemanager , bibleplugin, parent = None):
+    def __init__(self, config, biblemanager, bibleplugin, parent=None):
         '''
         Constructor
         '''
@@ -196,23 +196,28 @@
         log.debug(u'Import Bible')
         message = None
         if self.bible_type == u'OSIS':
-            loaded = self.biblemanager.register_osis_file_bible(unicode(self.BibleNameEdit.displayText()),
+            loaded = self.biblemanager.register_osis_file_bible(
+                unicode(self.BibleNameEdit.displayText()),
                 self.OSISLocationEdit.displayText())
         elif self.bible_type == u'CSV':
-            loaded = self.biblemanager.register_csv_file_bible(unicode(self.BibleNameEdit.displayText()),
-                self.BooksLocationEdit.displayText(), self.VerseLocationEdit.displayText())
+            loaded = self.biblemanager.register_csv_file_bible(
+                unicode(self.BibleNameEdit.displayText()),
+                self.BooksLocationEdit.displayText(),
+                self.VerseLocationEdit.displayText())
         else:
             # set a value as it will not be needed
             self.setMax(1)
-            bible = self.bible_versions[unicode(self.BibleComboBox.currentText())]
-            loaded = self.biblemanager.register_http_bible(unicode(self.BibleComboBox.currentText()), \
-                                                                                     unicode(self.LocationComboBox.currentText()),  \
-                                                                                     unicode(bible), \
-                                                                                     unicode(self.AddressEdit.displayText()),  \
-                                                                                     unicode(self.UsernameEdit .displayText()),  \
-                                                                                     unicode(self.PasswordEdit.displayText()))
+            bible = self.bible_versions[
+                unicode(self.BibleComboBox.currentText())]
+            loaded = self.biblemanager.register_http_bible(
+                unicode(self.BibleComboBox.currentText()),
+                unicode(self.LocationComboBox.currentText()),
+                unicode(bible), unicode(self.AddressEdit.displayText()),
+                unicode(self.UsernameEdit .displayText()),
+                unicode(self.PasswordEdit.displayText()))
         if loaded:
-            self.biblemanager.save_meta_data(unicode(self.BibleNameEdit.displayText()),
+            self.biblemanager.save_meta_data(
+                unicode(self.BibleNameEdit.displayText()),
                 unicode(self.VersionNameEdit.displayText()),
                 unicode(self.CopyrightEdit.displayText()),
                 unicode(self.PermisionEdit.displayText()))
@@ -226,7 +231,8 @@
         return loaded, message
 
     def checkOsis(self):
-        if len(self.BooksLocationEdit.displayText()) > 0 or len(self.VerseLocationEdit.displayText()) > 0:
+        if len(self.BooksLocationEdit.displayText()) > 0 or \
+            len(self.VerseLocationEdit.displayText()) > 0:
             self.setCsv()
         else:
             # Was CSV and is not any more stops lostFocus running mad
@@ -235,7 +241,8 @@
                 self.resetScreenFieldStates()
 
     def checkHttp(self):
-        if self.BibleComboBox.currentIndex() != 0 :  # First slot is blank so no bible
+        if self.BibleComboBox.currentIndex() != 0 :
+            # First slot is blank so no bible
             self.setHttp()
         else:
             # Was HTTP and is not any more stops lostFocus running mad

=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
--- openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/lib/bibleCSVimpl.py	2009-09-21 17:56:36 +0000
@@ -42,7 +42,8 @@
         """
         self.bibledb = bibledb
         self.loadbible = True
-        QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL(u'openlpstopimport'),self.stop_import)
+        QtCore.QObject.connect(Receiver().get_receiver(),
+            QtCore.SIGNAL(u'openlpstopimport'), self.stop_import)
 
     def stop_import(self):
         self.loadbible= False
@@ -80,7 +81,7 @@
             # split into 3 units and leave the rest as a single field
             p = line.split(u',', 3)
             p0 = p[0].replace(u'"', u'')
-            p3 =  p[3].replace(u'"',u'')
+            p3 = p[3].replace(u'"',u'')
             if book_ptr is not p0:
                 book = self.bibledb.get_bible_book(p0)
                 book_ptr = book.name

=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
--- openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-12 17:24:16 +0000
+++ openlp/plugins/bibles/lib/bibleDBimpl.py	2009-09-21 17:56:36 +0000
@@ -59,7 +59,7 @@
         self._load_testament(u'New Testament')
         self._load_testament(u'Apocrypha')
 
-    def add_verse(self, bookid, chap,  vse, text):
+    def add_verse(self, bookid, chap, vse, text):
         #log.debug(u'add_verse %s,%s,%s", bookid, chap, vse)
         verse = Verse()
         verse.book_id = bookid
@@ -113,7 +113,7 @@
             return False
 
     def _load_testament(self, testament):
-        log.debug(u'load_testaments %s',  testament)
+        log.debug(u'load_testaments %s', testament)
         test = ONTestament()
         test.name = testament
         self.session.add(test)

=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
--- openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py	2009-09-21 17:56:36 +0000
@@ -39,21 +39,32 @@
         log.debug(u'init %s', proxyurl)
         self.proxyurl = proxyurl
 
-    def get_bible_chapter(self, version, bookid, bookname,  chapter) :
+    def get_bible_chapter(self, version, bookid, bookname, chapter) :
         """
         Access and decode bibles via the BibleGateway website
-            Version - the version of the bible like 31 for New International version
-            bookid - Book id for the book of the bible - eg 1 for Genesis
-            bookname - not used
-            chapter - chapter number
+
+        ``Version``
+            The version of the bible like 31 for New International version
+
+        ``bookid``
+            Book id for the book of the bible - eg 1 for Genesis
+
+        ``bookname``
+            Not used
+
+        ``chapter``
+            Chapter number
         """
-        log.debug( u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
-        urlstring = u'http://www.biblegateway.com/passage/?book_id='+unicode(bookid)+u'&chapter'+unicode(chapter)+u'&version='+unicode(version)
+        log.debug(u'get_bible_chapter %s,%s,%s,%s',
+            version, bookid, bookname, chapter)
+        urlstring = u'http://www.biblegateway.com/passage/?book_id=' + \
+            unicode(bookid) + u'&chapter' + unicode(chapter) + u'&version=' + \
+            unicode(version)
         xml_string = self._get_web_text(urlstring, self.proxyurl)
         #print xml_string
-        VerseSearch = u'class='+u'"'+u'sup'+u'"'+u'>'
+        VerseSearch = u'class=' + u'"' + u'sup' + u'"' + u'>'
         verse = 1
-        i= xml_string.find(u'result-text-style-normal')
+        i = xml_string.find(u'result-text-style-normal')
         xml_string = xml_string[i:len(xml_string)]
         versePos = xml_string.find(VerseSearch)
         #print versePos
@@ -62,11 +73,11 @@
             verseText = '' # clear out string
             versePos = xml_string.find(u'</span', versePos)
             i = xml_string.find(VerseSearch, versePos+1)
-            #print i ,  versePos
+            #print i , versePos
             if i == -1:
                 i = xml_string.find(u'</div', versePos+1)
                 j = xml_string.find(u'<strong', versePos+1)
-                #print i ,  j
+                #print i , j
                 if j > 0 and j < i:
                     i = j
                 verseText = xml_string[versePos + 7 : i ]
@@ -75,9 +86,11 @@
                 bible[verse] = self._clean_text(verseText) # store the verse
                 versePos = -1
             else:
-                i = xml_string[:i].rfind(u'<span')+1
-                verseText = xml_string[versePos + 7 : i - 1 ] # Loose the </span>
-                xml_string = xml_string[i - 1 :len(xml_string)] # chop off verse 1
+                i = xml_string[:i].rfind(u'<span') + 1
+                # Loose the </span>
+                verseText = xml_string[versePos + 7 : i - 1 ]
+                # Chop off verse 1
+                xml_string = xml_string[i - 1 :len(xml_string)]
                 versePos = xml_string.find(VerseSearch) #look for the next verse
                 bible[verse] = self._clean_text(verseText) # store the verse
                 verse += 1
@@ -92,16 +105,26 @@
         log.debug(u'init %s', proxyurl)
         self.proxyurl = proxyurl
 
-    def get_bible_chapter(self, version, bookid, bookname,  chapter) :
-        log.debug( u'getBibleChapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
+    def get_bible_chapter(self, version, bookid, bookname, chapter) :
+        log.debug(u'getBibleChapter %s,%s,%s,%s',
+            version, bookid, bookname, chapter)
         """
         Access and decode bibles via the Crosswalk website
-            Version - the version of the bible like niv for New International version
-            bookid - not used
-            bookname - text name of in english eg 'gen' for Genesis
-            chapter - chapter number
+
+        ``version``
+            The version of the bible like niv for New International Version
+
+        ``bookid``
+            Not used
+
+        ``bookname``
+            Text name of in english e.g. 'gen' for Genesis
+
+        ``chapter``
+            Chapter number
         """
-        log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
+        log.debug(u'get_bible_chapter %s,%s,%s,%s',
+            version, bookid, bookname, chapter)
         bookname = bookname.replace(u' ', u'')
         urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s' % (bookname, chapter, version)
         xml_string = self._get_web_text(urlstring, self.proxyurl)
@@ -135,7 +158,7 @@
         #remove the <B> at the front
         xml_string = xml_string[i + 3 :len(xml_string)]
         versePos = xml_string.find(u'<BLOCKQUOTE>')
-        #log.debug(u'verse pos %d',  versePos)
+        #log.debug(u'verse pos %d', versePos)
         bible = {}
         while versePos > 0:
             verseText = u''
@@ -153,7 +176,7 @@
                 verseText = xml_string[versePos: i]
                 versePos = 0
             else:
-                #log.debug( i,  versePos)
+                #log.debug( i, versePos)
                 verseText = xml_string[versePos: i]
                 versePos = i
             #print verseText
@@ -170,7 +193,9 @@
     def __init__(self):
         """
         Finds all the bibles defined for the system
-        Creates an Interface Object for each bible containing connection information
+        Creates an Interface Object for each bible containing connection
+        information
+
         Throws Exception if no Bibles are found.
 
         Init confirms the bible exists and stores the database path.
@@ -202,18 +227,19 @@
         log.debug(u'set_bible_source %s', biblesource)
         self.biblesource = biblesource
 
-    def get_bible_chapter(self, version, bookid, bookname,  chapter):
+    def get_bible_chapter(self, version, bookid, bookname, chapter):
         """
         Receive the request and call the relevant handler methods
         """
-        log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname,  chapter)
+        log.debug(u'get_bible_chapter %s,%s,%s,%s',
+            version, bookid, bookname, chapter)
         log.debug(u'biblesource = %s', self.biblesource)
         try:
             if self.biblesource.lower() == u'crosswalk':
                 ev = CWExtract(self.proxyurl)
             else:
                 ev = BGExtract(self.proxyurl)
-            return ev.get_bible_chapter(self.bibleid, bookid, bookname,  chapter)
+            return ev.get_bible_chapter(self.bibleid, bookid, bookname, chapter)
         except Exception, e:
             log.error(u'Error thrown = %s', e.args[0])
             print e

=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
--- openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/bibles/lib/bibleOSISimpl.py	2009-09-21 17:56:36 +0000
@@ -86,7 +86,7 @@
             The Import dialog, so that we can increase the counter on
             the progress bar.
         """
-        detect_file = open(osisfile_record,  u'r')
+        detect_file = open(osisfile_record, u'r')
         details = chardet.detect(detect_file.read(2048))
         detect_file.close()
         osis = codecs.open(osisfile_record, u'r', details['encoding'])
@@ -102,7 +102,7 @@
             pos = file_record.find(verseText)
             if pos > -1: # we have a verse
                 epos= file_record.find(u'>', pos)
-                ref =  file_record[pos+15:epos-1]  # Book Reference
+                ref = file_record[pos+15:epos-1]  # Book Reference
                 #lets find the bible text only
                 # find start of text
                 pos = epos + 1
@@ -113,10 +113,10 @@
                 text = self.remove_block(u'<title', u'</title>', text)
                 text = self.remove_block(u'<note', u'</note>', text)
                 text = self.remove_block(u'<divineName', u'</divineName>', text)
-                text = self.remove_tag(u'<lb',  text)
-                text = self.remove_tag(u'<q',  text)
-                text = self.remove_tag(u'<l',  text)
-                text = self.remove_tag(u'<lg',  text)
+                text = self.remove_tag(u'<lb', text)
+                text = self.remove_tag(u'<q', text)
+                text = self.remove_tag(u'<l', text)
+                text = self.remove_tag(u'<lg', text)
                 # Strange tags where the end is not the same as the start
                 # The must be in this order as at least one bible has them
                 # crossing and the removal does not work.
@@ -127,12 +127,12 @@
                         #print "Y", search_text, e
                         pos = -1
                     else:
-                        text =  text[:pos] + text[epos + 4: ]
+                        text = text[:pos] + text[epos + 4: ]
                         pos = text.find(u'<FI>')
                 pos = text.find(u'<RF>')
                 while pos > -1:
                     epos = text.find(u'<Rf>', pos)
-                    text =  text[:pos] + text[epos + 4: ]
+                    text = text[:pos] + text[epos + 4: ]
                     #print "X", pos, epos, text
                     pos = text.find(u'<RF>')
                 # split up the reference
@@ -184,7 +184,7 @@
             if epos == -1:
                 pos = -1
             else:
-                text =  text[:pos] + text[epos + len(end_tag): ]
+                text = text[:pos] + text[epos + len(end_tag): ]
                 pos = text.find(start_tag)
         return text
 
@@ -203,6 +203,6 @@
         pos = text.find(start_tag)
         while pos > -1:
             epos = text.find(u'/>', pos)
-            text =  text[:pos] + text[epos + 2: ]
+            text = text[:pos] + text[epos + 2: ]
             pos = text.find(start_tag)
         return text

=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py	2009-09-13 07:39:48 +0000
+++ openlp/plugins/bibles/lib/biblestab.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import Qt, QtCore, QtGui
 
-from openlp.core.lib import translate, str_to_bool,  Receiver
+from openlp.core.lib import translate, str_to_bool, Receiver
 from openlp.core.lib import SettingsTab
 
 class BiblesTab(SettingsTab):
@@ -42,7 +42,8 @@
         self.show_new_chapters = False
         self.display_style = 0
         self.bible_search = True
-        SettingsTab.__init__(self, translate(u'BiblesTab', u'Bibles'), u'Bibles')
+        SettingsTab.__init__(
+            self, translate(u'BiblesTab', u'Bibles'), u'Bibles')
 
     def setupUi(self):
         self.setObjectName(u'BiblesTab')
@@ -142,34 +143,53 @@
         self.BibleLayout.addWidget(self.BibleRightWidget)
         # Signals and slots
         QtCore.QObject.connect(self.NewChaptersCheckBox,
-            QtCore.SIGNAL(u'stateChanged(int)'), self.onNewChaptersCheckBoxChanged)
+            QtCore.SIGNAL(u'stateChanged(int)'),
+            self.onNewChaptersCheckBoxChanged)
         QtCore.QObject.connect(self.BibleSearchCheckBox,
-            QtCore.SIGNAL(u'stateChanged(int)'), self.onBibleSearchCheckBoxChanged)
+            QtCore.SIGNAL(u'stateChanged(int)'),
+            self.onBibleSearchCheckBoxChanged)
         QtCore.QObject.connect(self.DisplayStyleComboBox,
-            QtCore.SIGNAL(u'activated(int)'), self.onDisplayStyleComboBoxChanged)
+            QtCore.SIGNAL(u'activated(int)'),
+            self.onDisplayStyleComboBoxChanged)
         QtCore.QObject.connect(self.BibleThemeComboBox,
             QtCore.SIGNAL(u'activated(int)'), self.onBibleThemeComboBoxChanged)
         QtCore.QObject.connect(self.LayoutStyleComboBox,
-            QtCore.SIGNAL(u'activated(int)'), self.onLayoutStyleComboBoxChanged)
+            QtCore.SIGNAL(u'activated(int)'),
+            self.onLayoutStyleComboBoxChanged)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
 
     def retranslateUi(self):
-        self.VerseDisplayGroupBox.setTitle(translate(u'SettingsForm', u'Verse Display'))
-        self.NewChaptersCheckBox.setText(translate(u'SettingsForm', u'Only show new chapter numbers'))
-        self.LayoutStyleLabel.setText(translate(u'SettingsForm', u'Layout Style:'))
-        self.DisplayStyleLabel.setText(translate(u'SettingsForm', u'Display Style:'))
-        self.BibleThemeLabel.setText(translate(u'SettingsForm', u'Bible Theme:'))
-        self.LayoutStyleComboBox.setItemText(0, translate(u'SettingsForm', u'verse per slide'))
-        self.LayoutStyleComboBox.setItemText(1, translate(u'SettingsForm', u'verse per line'))
-        self.LayoutStyleComboBox.setItemText(2, translate(u'SettingsForm', u'continuous'))
-        self.DisplayStyleComboBox.setItemText(0, translate(u'SettingsForm', u'No brackets'))
-        self.DisplayStyleComboBox.setItemText(1, translate(u'SettingsForm', u'( and )'))
-        self.DisplayStyleComboBox.setItemText(2, translate(u'SettingsForm', u'{ and }'))
-        self.DisplayStyleComboBox.setItemText(3, translate(u'SettingsForm', u'[ and ]'))
-        self.ChangeNoteLabel.setText(translate(u'SettingsForm', u'Note:\nChanges don\'t affect verses already in the service'))
-        self.BibleSearchGroupBox.setTitle(translate(u'SettingsForm', u'Search'))
-        self.BibleSearchCheckBox.setText(translate(u'SettingsForm', u'Search-as-you-type'))
+        self.VerseDisplayGroupBox.setTitle(
+            translate(u'SettingsForm', u'Verse Display'))
+        self.NewChaptersCheckBox.setText(
+            translate(u'SettingsForm', u'Only show new chapter numbers'))
+        self.LayoutStyleLabel.setText(
+            translate(u'SettingsForm', u'Layout Style:'))
+        self.DisplayStyleLabel.setText(
+            translate(u'SettingsForm', u'Display Style:'))
+        self.BibleThemeLabel.setText(
+            translate(u'SettingsForm', u'Bible Theme:'))
+        self.LayoutStyleComboBox.setItemText(
+            0, translate(u'SettingsForm', u'verse per slide'))
+        self.LayoutStyleComboBox.setItemText(
+            1, translate(u'SettingsForm', u'verse per line'))
+        self.LayoutStyleComboBox.setItemText(
+            2, translate(u'SettingsForm', u'continuous'))
+        self.DisplayStyleComboBox.setItemText(
+            0, translate(u'SettingsForm', u'No brackets'))
+        self.DisplayStyleComboBox.setItemText(
+            1, translate(u'SettingsForm', u'( and )'))
+        self.DisplayStyleComboBox.setItemText(
+            2, translate(u'SettingsForm', u'{ and }'))
+        self.DisplayStyleComboBox.setItemText(
+            3, translate(u'SettingsForm', u'[ and ]'))
+        self.ChangeNoteLabel.setText(translate(u'SettingsForm',
+            u'Note:\nChanges don\'t affect verses already in the service'))
+        self.BibleSearchGroupBox.setTitle(
+            translate(u'SettingsForm', u'Search'))
+        self.BibleSearchCheckBox.setText(
+            translate(u'SettingsForm', u'Search-as-you-type'))
 
     def onBibleThemeComboBoxChanged(self):
         self.bible_theme = self.BibleThemeComboBox.currentText()
@@ -195,20 +215,27 @@
             self.bible_search = True
 
     def load(self):
-        self.show_new_chapters = str_to_bool(self.config.get_config(u'display new chapter', u'False'))
-        self.display_style = int(self.config.get_config(u'display brackets', u'0'))
-        self.layout_style = int(self.config.get_config(u'verse layout style', u'0'))
+        self.show_new_chapters = str_to_bool(
+            self.config.get_config(u'display new chapter', u'False'))
+        self.display_style = int(
+            self.config.get_config(u'display brackets', u'0'))
+        self.layout_style = int(
+            self.config.get_config(u'verse layout style', u'0'))
         self.bible_theme = self.config.get_config(u'bible theme', u'0')
-        self.bible_search = str_to_bool(self.config.get_config(u'search as type', u'True'))
+        self.bible_search = str_to_bool(
+            self.config.get_config(u'search as type', u'True'))
         self.NewChaptersCheckBox.setChecked(self.show_new_chapters)
         self.DisplayStyleComboBox.setCurrentIndex(self.display_style)
         self.LayoutStyleComboBox.setCurrentIndex(self.layout_style)
         self.BibleSearchCheckBox.setChecked(self.bible_search)
 
     def save(self):
-        self.config.set_config(u'display new chapter', unicode(self.show_new_chapters))
-        self.config.set_config(u'display brackets', unicode(self.display_style))
-        self.config.set_config(u'verse layout style', unicode(self.layout_style))
+        self.config.set_config(
+            u'display new chapter', unicode(self.show_new_chapters))
+        self.config.set_config(
+            u'display brackets', unicode(self.display_style))
+        self.config.set_config(
+            u'verse layout style', unicode(self.layout_style))
         self.config.set_config(u'search as type', unicode(self.bible_search))
         self.config.set_config(u'bible theme', unicode(self.bible_theme))
 
@@ -220,7 +247,8 @@
         self.BibleThemeComboBox.addItem(u'')
         for theme in theme_list:
             self.BibleThemeComboBox.addItem(theme)
-        id = self.BibleThemeComboBox.findText(unicode(self.bible_theme), QtCore.Qt.MatchExactly)
+        id = self.BibleThemeComboBox.findText(
+            unicode(self.bible_theme), QtCore.Qt.MatchExactly)
         if id == -1:
             # Not Found
             id = 0

=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py	2009-09-17 23:10:25 +0000
+++ openlp/plugins/bibles/lib/manager.py	2009-09-21 17:56:36 +0000
@@ -81,7 +81,7 @@
     def reload_bibles(self):
         log.debug(u'Reload bibles')
         files = self.config.get_files(self.bibleSuffix)
-        log.debug(u'Bible Files %s',  files )
+        log.debug(u'Bible Files %s', files )
         self.bible_db_cache = {}
         self.bible_http_cache  = {}
         # books of the bible with testaments
@@ -166,7 +166,7 @@
             Defaults to *None*. The password to accompany the username.
         """
         log.debug(u'register_HTTP_bible %s, %s, %s, %s, %s, %s',
-            biblename, biblesource, bibleid, proxyurl,  proxyid, proxypass)
+            biblename, biblesource, bibleid, proxyurl, proxyid, proxypass)
         if self._is_new_bible(biblename):
             # Create new Bible
             nbible = BibleDBImpl(self.biblePath, biblename, self.config)
@@ -271,7 +271,7 @@
         log.debug(u'get_bible_books %s', bible)
         return self.bible_db_cache[bible].get_bible_books()
 
-    def get_book_chapter_count(self, bible,  book):
+    def get_book_chapter_count(self, bible, book):
         """
         Returns the number of Chapters for a given book
         """
@@ -283,7 +283,7 @@
         Returns all the number of verses for a given
         book and chapterMaxBibleBookVerses
         """
-        log.debug(u'get_book_verse_count %s,%s,%s', bible, book,  chapter)
+        log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter)
         return self.bible_db_cache[bible].get_max_bible_book_verses(
             book, chapter)
 
@@ -300,7 +300,7 @@
         Saves the bibles meta data
         """
         log.debug(u'save_meta data %s,%s, %s,%s',
-            bible,  version, copyright, permissions)
+            bible, version, copyright, permissions)
         self.bible_db_cache[bible].save_meta(u'Version', version)
         self.bible_db_cache[bible].save_meta(u'Copyright', copyright)
         self.bible_db_cache[bible].save_meta(u'Permissions', permissions)
@@ -309,7 +309,7 @@
         """
         Returns the meta data for a given key
         """
-        log.debug(u'get_meta %s,%s', bible,  key)
+        log.debug(u'get_meta %s,%s', bible, key)
         return self.bible_db_cache[bible].get_meta(key)
 
     def get_verse_text(self, bible, bookname, schapter, echapter, sverse,
@@ -414,7 +414,7 @@
         """
         Check cache to see if new bible
         """
-        for b ,  o in self.bible_db_cache.iteritems():
+        for b , o in self.bible_db_cache.iteritems():
             log.debug(u'Bible from cache in is_new_bible %s', b )
             if b == name :
                 return False

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2009-09-16 10:50:13 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -28,7 +28,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
-    Receiver, contextMenuAction, contextMenuSeparator,  BaseListWithDnD
+    Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD
 from openlp.plugins.bibles.forms import BibleImportForm
 from openlp.plugins.bibles.lib.manager import BibleMode
 
@@ -329,10 +329,10 @@
         log.debug(u'Advanced Search Button pressed')
         bible = unicode(self.AdvancedVersionComboBox.currentText())
         book = unicode(self.AdvancedBookComboBox.currentText())
-        chapter_from =  int(self.AdvancedFromChapter.currentText())
-        chapter_to =  int(self.AdvancedToChapter.currentText())
-        verse_from =  int(self.AdvancedFromVerse.currentText())
-        verse_to =  int(self.AdvancedToVerse.currentText())
+        chapter_from = int(self.AdvancedFromChapter.currentText())
+        chapter_to = int(self.AdvancedToChapter.currentText())
+        verse_from = int(self.AdvancedFromVerse.currentText())
+        verse_to = int(self.AdvancedToVerse.currentText())
         self.search_results = self.parent.biblemanager.get_verse_text(
             bible, book, chapter_from, chapter_to, verse_from, verse_to)
         if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
@@ -374,7 +374,7 @@
         raw_footer = []
         bible_text = u''
         for item in items:
-            bitem =  self.ListView.item(item.row())
+            bitem = self.ListView.item(item.row())
             text = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
             verse = text[:text.find(u'(')]
             bible = text[text.find(u'(') + 1:-1]
@@ -457,13 +457,13 @@
         self.adjustComboBox(1, self.verses, self.AdvancedToVerse)
 
     def adjustComboBox(self, frm, to , combo):
-        log.debug(u'adjustComboBox %s , %s , %s', combo, frm,  to)
+        log.debug(u'adjustComboBox %s , %s , %s', combo, frm, to)
         combo.clear()
         for i in range(int(frm), int(to) + 1):
             combo.addItem(unicode(i))
 
     def displayResults(self, bible):
-        for count,  verse  in enumerate(self.search_results):
+        for count, verse  in enumerate(self.search_results):
             bible_text = u' %s %d:%d (%s)' % (verse.book.name,
                 verse.chapter, verse.verse, bible)
             bible_verse = QtGui.QListWidgetItem(bible_text)
@@ -474,7 +474,7 @@
             if cr is not None:
                 cr.setSelected(True)
 
-    def searchByReference(self, bible,  search):
+    def searchByReference(self, bible, search):
         log.debug(u'searchByReference %s ,%s', bible, search)
         book = u''
         start_chapter = u''
@@ -529,7 +529,7 @@
                 sp1 = sp[1].split(u':')
                 if len(sp1) == 1:
                     end_chapter = start_chapter
-                    end_verse =  sp1[0]
+                    end_verse = sp1[0]
                 else:
                     end_chapter = sp1[0]
                     end_verse = sp1[1]

=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py	2009-09-12 18:27:17 +0000
+++ openlp/plugins/custom/forms/editcustomform.py	2009-09-21 17:56:36 +0000
@@ -115,7 +115,7 @@
             self.ThemeComboBox.setCurrentIndex(0)
 
     def accept(self):
-        valid ,  message = self._validate()
+        valid , message = self._validate()
         if not valid:
             QtGui.QMessageBox.critical(self,
             translate(u'customEditDialog', u'Error'), message,
@@ -126,7 +126,8 @@
         sxml.add_lyrics_to_song()
         count = 1
         for i in range (0, self.VerseListView.count()):
-            sxml.add_verse_to_lyrics(u'custom', unicode(count),  unicode(self.VerseListView.item(i).text()))
+            sxml.add_verse_to_lyrics(u'custom', unicode(count),
+                unicode(self.VerseListView.item(i).text()))
             count += 1
         self.customSlide.title = unicode(self.TitleEdit.displayText())
         self.customSlide.text = unicode(sxml.extract_xml())
@@ -201,9 +202,11 @@
             for row in unicode(self.VerseTextEdit.toPlainText()).split(u'---'):
                 self.VerseListView.addItem(row)
         else:
-            self.VerseListView.currentItem().setText(self.VerseTextEdit.toPlainText())
+            self.VerseListView.currentItem().setText(
+                self.VerseTextEdit.toPlainText())
             #number of lines has change
-            if len(self.beforeText.split(u'\n')) != len(self.VerseTextEdit.toPlainText().split(u'\n')):
+            if len(self.beforeText.split(u'\n')) != \
+                len(self.VerseTextEdit.toPlainText().split(u'\n')):
                 tempList = {}
                 for row in range(0, self.VerseListView.count()):
                     tempList[row] = self.VerseListView.item(row).text()
@@ -227,9 +230,11 @@
         message = u''
         if len(self.TitleEdit.displayText()) == 0:
             valid = False
-            message = translate(u'customEditDialog', u'You need to enter a title \n')
+            message = translate(
+                u'customEditDialog', u'You need to enter a title \n')
         # must have 1 slide
         if self.VerseListView.count() == 0:
             valid = False
-            message += translate(u'customEditDialog', u'You need to enter a slide \n')
-        return valid,  message
+            message += translate(
+                u'customEditDialog', u'You need to enter a slide \n')
+        return valid, message

=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py	2009-09-12 18:27:17 +0000
+++ openlp/plugins/custom/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import MediaManagerItem,  SongXMLParser,  ServiceItem, \
+from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \
     translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
 
 class CustomListView(BaseListWithDnD):
@@ -65,7 +65,8 @@
         self.ListView.clear()
         for CustomSlide in list:
             custom_name = QtGui.QListWidgetItem(CustomSlide.title)
-            custom_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id))
+            custom_name.setData(
+                QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id))
             self.ListView.addItem(custom_name)
 
     def onNewClick(self):

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/images/imageplugin.py	2009-09-21 17:56:36 +0000
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import Plugin
-from openlp.plugins.images.lib import ImageMediaItem,  ImageTab
+from openlp.plugins.images.lib import ImageMediaItem, ImageTab
 
 class ImagePlugin(Plugin):
     global log

=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/images/lib/imagetab.py	2009-09-21 17:56:36 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  str_to_bool,  translate,  Receiver
+from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
 
 class ImageTab(SettingsTab):
     """
@@ -53,7 +53,8 @@
         self.TimeoutSpacer = QtGui.QSpacerItem(147, 20,
             QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.TimeoutLayout.addItem(self.TimeoutSpacer)
-        self.ImageLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox)
+        self.ImageLayout.setWidget(
+            0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox)
         # Signals and slots
         QtCore.QObject.connect(self.TimeoutSpinBox,
             QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
@@ -71,7 +72,7 @@
 
     def save(self):
         self.config.set_config(u'loop delay', self.loop_delay)
-        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
+        Receiver().send_message(u'update_spin_delay', self.loop_delay )
 
     def postSetUp(self):
-        Receiver().send_message(u'update_spin_delay',  self.loop_delay )
+        Receiver().send_message(u'update_spin_delay', self.loop_delay )

=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py	2009-09-12 18:27:17 +0000
+++ openlp/plugins/images/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,8 @@
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD,  buildIcon
+from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
+    BaseListWithDnD, buildIcon
 
 # We have to explicitly create separate classes for each plugin
 # in order for DnD to the Service manager to work correctly.
@@ -61,9 +62,11 @@
         MediaManagerItem.__init__(self, parent, icon, title)
 
     def initialise(self):
-        self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.ListView.setSelectionMode(
+            QtGui.QAbstractItemView.ExtendedSelection)
         self.ListView.setIconSize(QtCore.QSize(88,50))
-        self.servicePath = os.path.join(self.parent.config.get_data_path(), u'.thumbnails')
+        self.servicePath = os.path.join(
+            self.parent.config.get_data_path(), u'.thumbnails')
         if os.path.exists(self.servicePath) == False:
             os.mkdir(self.servicePath)
         self.loadList(self.parent.config.load_list(self.ConfigSection))
@@ -103,9 +106,9 @@
             return False
         service_item.title = u'Image(s)'
         for item in items:
-            bitem =  self.ListView.item(item.row())
+            bitem = self.ListView.item(item.row())
             filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
             frame = QtGui.QImage(unicode(filename))
             (path, name) = os.path.split(filename)
-            service_item.add_from_image(path,  name, frame)
+            service_item.add_from_image(path, name, frame)
         return True

=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py	2009-09-15 21:59:20 +0000
+++ openlp/plugins/media/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -81,7 +81,7 @@
             filename = self.ListData.getFilename(index)
             frame = QtGui.QImage(unicode(filename))
             (path, name) = os.path.split(filename)
-            service_item.add_from_image(path,  name, frame)
+            service_item.add_from_image(path, name, frame)
         return True
 
     def onPreviewClick(self):

=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/media/lib/mediatab.py	2009-09-21 17:56:36 +0000
@@ -24,7 +24,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  str_to_bool,  translate
+from openlp.core.lib import SettingsTab, str_to_bool, translate
 
 class MediaTab(SettingsTab):
     """
@@ -50,14 +50,16 @@
         self.UseVMRLabel.setObjectName(u'UseVMRLabel')
         self.MediaModeLayout.addWidget(self.UseVMRLabel)
 
-        self.MediaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox)
+        self.MediaLayout.setWidget(
+            0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox)
         # Signals and slots
         QtCore.QObject.connect(self.UseVMRCheckBox,
             QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged)
 
     def retranslateUi(self):
         self.MediaModeGroupBox.setTitle(translate(u'MediaTab', u'Media Mode'))
-        self.UseVMRCheckBox.setText(translate(u'MediaTab', u'Use Video Mode Rendering'))
+        self.UseVMRCheckBox.setText(
+            translate(u'MediaTab', u'Use Video Mode Rendering'))
         self.UseVMRLabel.setText(translate(u'MediaTab', u'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">\n'
             u'<html><head><meta name="qrichtext" content="1" /><style type="text/css">\n'
             u'p, li { white-space: pre-wrap; }\n'
@@ -72,7 +74,8 @@
             self.use_vmr_mode = True
 
     def load(self):
-        self.use_vmr_mode = str_to_bool(self.config.get_config(u'use mode layout', u'False'))
+        self.use_vmr_mode = str_to_bool(
+            self.config.get_config(u'use mode layout', u'False'))
         if self.use_vmr_mode :
             self.UseVMRCheckBox.setChecked(True)
 

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2009-09-18 16:06:25 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2009-09-21 17:56:36 +0000
@@ -27,7 +27,7 @@
 # http://nxsy.org/comparing-documents-with-openoffice-and-python
 
 import logging
-import os ,  subprocess
+import os , subprocess
 import time
 import sys
 

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2009-09-12 18:27:17 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -26,7 +26,8 @@
 import os
 
 from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD
+from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
+    BaseListWithDnD
 from openlp.plugins.presentations.lib import MessageListener
 
 # We have to explicitly create separate classes for each plugin
@@ -64,10 +65,12 @@
 
     def addEndHeaderBar(self):
         self.PresentationWidget = QtGui.QWidget(self)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        sizePolicy = QtGui.QSizePolicy(
+            QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.PresentationWidget.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(
+            self.PresentationWidget.sizePolicy().hasHeightForWidth())
         self.PresentationWidget.setSizePolicy(sizePolicy)
         self.PresentationWidget.setObjectName(u'PresentationWidget')
         self.DisplayLayout = QtGui.QGridLayout(self.PresentationWidget)
@@ -78,7 +81,8 @@
         self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget)
         self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel')
         self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1)
-        self.DisplayTypeLabel.setText(translate(u'PresentationMediaItem', u'Present using:'))
+        self.DisplayTypeLabel.setText(
+            translate(u'PresentationMediaItem', u'Present using:'))
         # Add the Presentation widget to the page layout
         self.PageLayout.addWidget(self.PresentationWidget)
 
@@ -102,7 +106,8 @@
             item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
             row = self.ListView.row(item)
             self.ListView.takeItem(row)
-            self.parent.config.set_list(self.ConfigSection, self.ListData.getFileList())
+            self.parent.config.set_list(
+                self.ConfigSection, self.ListData.getFileList())
 
     def generateSlideData(self, service_item):
         items = self.ListView.selectedIndexes()
@@ -111,8 +116,8 @@
         service_item.title = unicode(self.DisplayTypeComboBox.currentText())
         service_item.shortname = unicode(self.DisplayTypeComboBox.currentText())
         for item in items:
-            bitem =  self.ListView.item(item.row())
+            bitem = self.ListView.item(item.row())
             filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
             (path, name) = os.path.split(filename)
-            service_item.add_from_command(path,  name)
+            service_item.add_from_command(path, name)
         return True

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2009-09-18 06:07:10 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2009-09-21 17:56:36 +0000
@@ -26,8 +26,8 @@
 
 class MessageListener(object):
     """
-    This is the Presentation listener who acts on events from the slide controller
-    and passes the messages on the the correct presentation handlers
+    This is the Presentation listener who acts on events from the slide
+    controller and passes the messages on the the correct presentation handlers
     """
     global log
     log=logging.getLogger(u'MessageListener')
@@ -55,7 +55,7 @@
         Start of new presentation
         Save the handler as any new presentations start here
         """
-        self.handler, file =  self.decodeMessage(message)
+        self.handler, file = self.decodeMessage(message)
         self.controllers[self.handler].loadPresentation(file)
 
     def next(self, message):

=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py	2009-09-12 17:24:16 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py	2009-09-21 17:56:36 +0000
@@ -24,14 +24,15 @@
 
 from PyQt4 import Qt, QtCore, QtGui
 
-from openlp.core.lib import SettingsTab, translate,  str_to_bool
+from openlp.core.lib import SettingsTab, translate, str_to_bool
 
 class PresentationTab(SettingsTab):
     """
     PresentationsTab is the Presentations settings tab in the settings dialog.
     """
     def __init__(self):
-        SettingsTab.__init__(self, translate(u'PresentationTab', u'Presentation'), u'Presentations')
+        SettingsTab.__init__(self,
+            translate(u'PresentationTab', u'Presentation'), u'Presentations')
 
     def setupUi(self):
         self.setObjectName(u'PresentationTab')
@@ -41,7 +42,8 @@
         self.PresentationLayout.setObjectName(u'PresentationLayout')
         self.PresentationLeftWidget = QtGui.QWidget(self)
         self.PresentationLeftWidget.setObjectName(u'PresentationLeftWidget')
-        self.PresentationLeftLayout = QtGui.QVBoxLayout(self.PresentationLeftWidget)
+        self.PresentationLeftLayout = QtGui.QVBoxLayout(
+            self.PresentationLeftWidget)
         self.PresentationLeftLayout.setObjectName(u'PresentationLeftLayout')
         self.PresentationLeftLayout.setSpacing(8)
         self.PresentationLeftLayout.setMargin(0)
@@ -60,17 +62,20 @@
         self.PowerpointCheckBox.setTristate(False)
         self.PowerpointCheckBox.setObjectName(u'PowerpointCheckBox')
         self.VerseDisplayLayout.addWidget(self.PowerpointCheckBox, 0, 0, 1, 1)
-        self.PowerpointViewerCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
+        self.PowerpointViewerCheckBox = QtGui.QCheckBox(
+            self.VerseDisplayGroupBox)
         self.PowerpointViewerCheckBox.setTristate(False)
         self.PowerpointViewerCheckBox.setObjectName(u'PowerpointViewerCheckBox')
-        self.VerseDisplayLayout.addWidget(self.PowerpointViewerCheckBox, 1, 0, 1, 1)
+        self.VerseDisplayLayout.addWidget(
+            self.PowerpointViewerCheckBox, 1, 0, 1, 1)
         self.ImpressCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox)
         self.ImpressCheckBox.setTristate(False)
         self.ImpressCheckBox.setObjectName(u'ImpressCheckBox')
         self.VerseDisplayLayout.addWidget(self.ImpressCheckBox, 2, 0, 1, 1)
         self.PresentationThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox)
         self.PresentationThemeWidget.setObjectName(u'PresentationThemeWidget')
-        self.PresentationThemeLayout = QtGui.QHBoxLayout(self.PresentationThemeWidget)
+        self.PresentationThemeLayout = QtGui.QHBoxLayout(
+            self.PresentationThemeWidget)
         self.PresentationThemeLayout.setSpacing(8)
         self.PresentationThemeLayout.setMargin(0)
         self.PresentationThemeLayout.setObjectName(u'PresentationThemeLayout')
@@ -81,7 +86,8 @@
         self.PresentationLayout.addWidget(self.PresentationLeftWidget)
         self.PresentationRightWidget = QtGui.QWidget(self)
         self.PresentationRightWidget.setObjectName(u'PresentationRightWidget')
-        self.PresentationRightLayout = QtGui.QVBoxLayout(self.PresentationRightWidget)
+        self.PresentationRightLayout = QtGui.QVBoxLayout(
+            self.PresentationRightWidget)
         self.PresentationRightLayout.setObjectName(u'PresentationRightLayout')
         self.PresentationRightLayout.setSpacing(8)
         self.PresentationRightLayout.setMargin(0)
@@ -91,16 +97,25 @@
         self.PresentationLayout.addWidget(self.PresentationRightWidget)
 
     def retranslateUi(self):
-        self.PowerpointCheckBox.setText(translate(u'PresentationTab', 'Powerpoint available:'))
-        self.PowerpointViewerCheckBox.setText(translate(u'PresentationTab', 'PowerpointViewer available:'))
-        self.ImpressCheckBox.setText(translate(u'PresentationTab', 'Impress available:'))
+        self.PowerpointCheckBox.setText(
+            translate(u'PresentationTab', 'Powerpoint available:'))
+        self.PowerpointViewerCheckBox.setText(
+            translate(u'PresentationTab', 'PowerpointViewer available:'))
+        self.ImpressCheckBox.setText(
+            translate(u'PresentationTab', 'Impress available:'))
 
     def load(self):
-        self.PowerpointCheckBox.setChecked(int(self.config.get_config(u'Powerpoint', 0)))
-        self.PowerpointViewerCheckBox.setChecked(int(self.config.get_config(u'Powerpoint Viewer', 0)))
-        self.ImpressCheckBox.setChecked(int(self.config.get_config(u'Impress', 0)))
+        self.PowerpointCheckBox.setChecked(
+            int(self.config.get_config(u'Powerpoint', 0)))
+        self.PowerpointViewerCheckBox.setChecked(
+            int(self.config.get_config(u'Powerpoint Viewer', 0)))
+        self.ImpressCheckBox.setChecked(
+            int(self.config.get_config(u'Impress', 0)))
 
     def save(self):
-        self.config.set_config(u'Powerpoint', unicode(self.PowerpointCheckBox.checkState()))
-        self.config.set_config(u'Powerpoint Viewer', unicode(self.PowerpointViewerCheckBox.checkState()))
-        self.config.set_config(u'Impress', unicode(self.ImpressCheckBox.checkState()))
+        self.config.set_config(
+            u'Powerpoint', unicode(self.PowerpointCheckBox.checkState()))
+        self.config.set_config(u'Powerpoint Viewer',
+            unicode(self.PowerpointViewerCheckBox.checkState()))
+        self.config.set_config(
+            u'Impress', unicode(self.ImpressCheckBox.checkState()))

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2009-09-18 16:06:25 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2009-09-21 17:56:36 +0000
@@ -28,7 +28,7 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import Plugin,  MediaManagerItem
+from openlp.core.lib import Plugin, MediaManagerItem
 from openlp.plugins.presentations.lib import PresentationMediaItem, \
     PresentationTab, ImpressController
 try:

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2009-09-07 19:00:24 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2009-09-21 17:56:36 +0000
@@ -20,14 +20,15 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import SettingsTab,  str_to_bool,  translate
+from openlp.core.lib import SettingsTab, str_to_bool, translate
 
 class RemoteTab(SettingsTab):
     """
     RemoteTab is the Remotes settings tab in the settings dialog.
     """
     def __init__(self):
-        SettingsTab.__init__(self, translate(u'RemoteTab', u'Remotes'), u'Remotes')
+        SettingsTab.__init__(
+            self, translate(u'RemoteTab', u'Remotes'), u'Remotes')
 
     def setupUi(self):
         self.setObjectName(u'RemoteTab')
@@ -49,18 +50,25 @@
         self.WarningLabel = QtGui.QLabel(self.RemoteModeGroupBox)
         self.WarningLabel.setObjectName(u'WarningLabel')
         self.RemoteModeLayout.addWidget(self.WarningLabel)
-        self.RemoteLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox)
+        self.RemoteLayout.setWidget(
+            0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox)
 
     def retranslateUi(self):
-        self.RemoteModeGroupBox.setTitle(translate(u'RemoteTab', u'Remotes Receiver Port'))
+        self.RemoteModeGroupBox.setTitle(
+            translate(u'RemoteTab', u'Remotes Receiver Port'))
         self.RemoteActive.setText(translate(u'RemoteTab', 'Remote available:'))
-        self.WarningLabel.setText(translate(u'RemoteTab', u'A restart is needed for this change to become effective'))
+        self.WarningLabel.setText(translate(u'RemoteTab',
+            u'A restart is needed for this change to become effective'))
 
     def load(self):
-        self.RemotePortSpinBox.setValue(int(self.config.get_config(u'remote port', 4316)))
-        self.RemoteActive.setChecked(int(self.config.get_config(u'startup', 0)))
+        self.RemotePortSpinBox.setValue(
+            int(self.config.get_config(u'remote port', 4316)))
+        self.RemoteActive.setChecked(int(
+            self.config.get_config(u'startup', 0)))
 
     def save(self):
-        self.config.set_config(u'remote port', unicode(self.RemotePortSpinBox.value()))
-        self.config.set_config(u'startup', unicode(self.RemoteActive.checkState()))
+        self.config.set_config(
+            u'remote port', unicode(self.RemotePortSpinBox.value()))
+        self.config.set_config(
+            u'startup', unicode(self.RemoteActive.checkState()))
 

=== modified file 'openlp/plugins/remotes/remoteclient-cli.py'
--- openlp/plugins/remotes/remoteclient-cli.py	2009-09-02 01:44:09 +0000
+++ openlp/plugins/remotes/remoteclient-cli.py	2009-09-21 17:56:36 +0000
@@ -33,7 +33,7 @@
         print u'Errow thrown ', sys.exc_info()[1]
 
 def format_message(options):
-    return u'%s:%s' % (options.event,  options.message)
+    return u'%s:%s' % (options.event, options.message)
 
 def main():
     usage = "usage: %prog [options] arg1 arg2"

=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py	2009-09-13 07:39:48 +0000
+++ openlp/plugins/remotes/remoteplugin.py	2009-09-21 17:56:36 +0000
@@ -62,12 +62,12 @@
     def readData(self):
         log.info(u'Remoted data has arrived')
         while self.server.hasPendingDatagrams():
-            datagram,  host, port = self.server.readDatagram(
+            datagram, host, port = self.server.readDatagram(
                 self.server.pendingDatagramSize())
             self.handle_datagram(datagram)
 
     def handle_datagram(self, datagram):
-        log.info(u'Sending event %s ',  datagram)
+        log.info(u'Sending event %s ', datagram)
         pos = datagram.find(u':')
         event = unicode(datagram[:pos].lower())
 

=== modified file 'openlp/plugins/songs/lib/manager.py'
--- openlp/plugins/songs/lib/manager.py	2009-09-18 11:55:26 +0000
+++ openlp/plugins/songs/lib/manager.py	2009-09-21 17:56:36 +0000
@@ -27,7 +27,7 @@
 
 from sqlalchemy import asc, desc
 from openlp.plugins.songs.lib.models import init_models, metadata, session, \
-    engine, songs_table, Song, Author, Topic,  Book
+    engine, songs_table, Song, Author, Topic, Book
 
 import logging
 

=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py	2009-09-18 16:06:39 +0000
+++ openlp/plugins/songs/lib/mediaitem.py	2009-09-21 17:56:36 +0000
@@ -27,7 +27,7 @@
 from PyQt4 import QtCore, QtGui
 
 from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
-    SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD,  \
+    SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \
     Receiver
 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
 
@@ -49,7 +49,7 @@
         self.PluginTextShort = u'Song'
         self.ConfigSection = u'song'
         MediaManagerItem.__init__(self, parent, icon, title)
-        self.edit_song_form = EditSongForm(self.parent.songmanager,  self)
+        self.edit_song_form = EditSongForm(self.parent.songmanager, self)
         self.song_maintenance_form = SongMaintenanceForm(
             self.parent.songmanager, self)
 
@@ -306,7 +306,7 @@
         raw_footer.append(author_list)
         raw_footer.append(song.copyright )
         raw_footer.append(unicode(
-            translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
+            translate(u'SongMediaItem', u'CCL Licence: ') + ccl))
         service_item.raw_footer = raw_footer
         service_item.audit = [service_item.title, author_audit, ccl]
         return True

=== modified file 'openlp/plugins/songs/lib/songxml.py'
--- openlp/plugins/songs/lib/songxml.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/lib/songxml.py	2009-09-21 17:56:36 +0000
@@ -71,7 +71,7 @@
 class _OpenSong(XmlRootClass):
     """Class for import of OpenSogn"""
 
-    def __init__(self,  xmlContent = None):
+    def __init__(self, xmlContent = None):
         """Initialize from given xml content"""
         super(_OpenSong, self).__init__()
         self.from_buffer(xmlContent)
@@ -81,7 +81,7 @@
         global _blankOpenSongXml
         self._setFromXml(_blankOpenSongXml, 'song')
 
-    def from_buffer(self,  xmlContent):
+    def from_buffer(self, xmlContent):
         """Initialize from buffer(string) with xml content"""
         self._reset()
         if xmlContent != None :
@@ -259,7 +259,7 @@
         """Return the songid for the database"""
         return self.songid
 
-    def from_opensong_buffer(self,  xmlcontent):
+    def from_opensong_buffer(self, xmlcontent):
         """Initialize from buffer(string) of xml lines in opensong format"""
         self._reset()
         opensong = _OpenSong(xmlcontent)
@@ -275,20 +275,20 @@
         self.set_category_array(opensong.get_category_array())
         self.set_lyrics(opensong.get_lyrics())
 
-    def from_opensong_file(self,  xmlfilename):
+    def from_opensong_file(self, xmlfilename):
         """Initialize from file containing xml
 
         xmlfilename -- path to xml file
         """
         lst = []
-        f = open(xmlfilename,  'r')
+        f = open(xmlfilename, 'r')
         for line in f :
             lst.append(line)
         f.close()
         xml = "".join(lst)
         self.from_opensong_buffer(xml)
 
-    def _remove_punctuation(self,  title):
+    def _remove_punctuation(self, title):
         """Remove the puntuation chars from title
 
         chars are: .,:;!?&%#/\@`$'|"^~*-
@@ -296,7 +296,7 @@
         punctuation = ".,:;!?&%#'\"/\\@`$|^~*-"
         s = title
         for c in punctuation :
-            s = s.replace(c,  '')
+            s = s.replace(c, '')
         return s
 
     def set_title(self, title):
@@ -322,7 +322,8 @@
         return self.search_title
 
     def from_ccli_text_buffer(self, textList):
-        """Create song from a list of texts (strings) - CCLI text format expected
+        """
+        Create song from a list of texts (strings) - CCLI text format expected
 
         textList (list of strings) -- the song
         """
@@ -377,13 +378,13 @@
         self.set_song_cclino(sCcli)
         self.set_lyrics(lyrics)
 
-    def from_ccli_text_file(self,  textFileName):
+    def from_ccli_text_file(self, textFileName):
         """Create song from a list of texts read from given file
 
         textFileName -- path to text file
         """
         lines = []
-        f = open(textFileName,  'r')
+        f = open(textFileName, 'r')
         for orgline in f:
             lines.append(orgline.rstrip())
         f.close()
@@ -424,7 +425,7 @@
         """Return copyright info string"""
         return self._assure_string(self.copyright)
 
-    def set_copyright(self,  copyright):
+    def set_copyright(self, copyright):
         """Set the copyright string"""
         self.copyright = copyright
 
@@ -432,7 +433,7 @@
         """Return the songCclino"""
         return self._assure_string(self.song_cclino)
 
-    def set_song_cclino(self,  song_cclino):
+    def set_song_cclino(self, song_cclino):
         """Set the song_cclino"""
         self.song_cclino = song_cclino
 
@@ -440,7 +441,7 @@
         """Return the theme name for the song"""
         return self._assure_string(self.theme)
 
-    def set_theme(self,  theme):
+    def set_theme(self, theme):
         """Set the theme name (string)"""
         self.theme = theme
 
@@ -448,7 +449,7 @@
         """Return the song_book (string)"""
         return self._assure_string(self.song_book)
 
-    def set_song_book(self,  song_book):
+    def set_song_book(self, song_book):
         """Set the song_book (string)"""
         self.song_book = song_book
 
@@ -456,7 +457,7 @@
         """Return the song_number (string)"""
         return self._assure_string(self.song_number)
 
-    def set_song_number(self,  song_number):
+    def set_song_number(self, song_number):
         """Set the song_number (string)"""
         self.song_number = song_number
 
@@ -464,7 +465,7 @@
         """Return the comments (string)"""
         return self._assure_string(self.comments)
 
-    def set_comments(self,  comments):
+    def set_comments(self, comments):
         """Set the comments (string)"""
         self.comments = comments
 
@@ -472,11 +473,11 @@
         """Get the verseOrder (string) - preferably space delimited"""
         return self._assure_string(self.verse_order)
 
-    def set_verse_order(self,  verse_order):
+    def set_verse_order(self, verse_order):
         """Set the verse order (string) - space delimited"""
         self.verse_order = verse_order
 
-    def get_author_list(self,  asOneString = True):
+    def get_author_list(self, asOneString = True):
         """Return the list of authors as a string
 
         asOneString
@@ -491,7 +492,7 @@
             res = self._split_to_list(self.author_list)
         return res
 
-    def set_author_list(self,  author_list):
+    def set_author_list(self, author_list):
         """Set the author_list
 
         author_list -- a string or list of strings
@@ -501,7 +502,7 @@
         else :
             self.author_list = self._list_to_string(author_list)
 
-    def get_category_array(self,  asOneString = True):
+    def get_category_array(self, asOneString = True):
         """Return the list of categories as a string
 
         asOneString
@@ -516,7 +517,7 @@
             res = self._split_to_list(self.category_array)
         return res
 
-    def set_category_array(self,  category_array):
+    def set_category_array(self, category_array):
         """Set the category_array
 
         category_array -- a string or list of strings
@@ -530,7 +531,7 @@
         """Return the show_title flag (bool)"""
         return self.show_title
 
-    def set_show_title(self,  show_title):
+    def set_show_title(self, show_title):
         """Set the show_title flag (bool)"""
         self.show_title = show_title
 
@@ -538,7 +539,7 @@
         """Return the show_author_list flag"""
         return self.show_author_list
 
-    def set_show_author_list(self,  show_author_list):
+    def set_show_author_list(self, show_author_list):
         """Set the show_author_list flag (bool)"""
         self.show_author_list = show_author_list
 
@@ -554,7 +555,7 @@
         """Return the showSongCclino (string)"""
         return self.show_song_cclino
 
-    def set_show_song_cclino(self,  show_song_cclino):
+    def set_show_song_cclino(self, show_song_cclino):
         """Set the show_song_cclino flag (bool)"""
         self.show_song_cclino = show_song_cclino
 
@@ -565,7 +566,7 @@
         """
         return self.lyrics
 
-    def set_lyrics(self,  lyrics):
+    def set_lyrics(self, lyrics):
         """Set the lyrics as a list of strings"""
         self.lyrics = lyrics
         self._parse_lyrics()
@@ -594,7 +595,7 @@
         numOfSlides = len(self.slideList)
         return numOfSlides
 
-    def get_preview_slide(self,  slideNumber):
+    def get_preview_slide(self, slideNumber):
         """Return the preview text for specified slide number
 
         slideNumber -- 0: all slides, 1..n : specific slide
@@ -618,7 +619,7 @@
         # remove formattingincluding themes
         return res
 
-    def get_render_slide(self,  slideNumber):
+    def get_render_slide(self, slideNumber):
         """Return the slide to be rendered including the additional
         properties
 

=== modified file 'openlp/plugins/songs/lib/tables.py'
--- openlp/plugins/songs/lib/tables.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/lib/tables.py	2009-09-21 17:56:36 +0000
@@ -29,7 +29,7 @@
 
 # Definition of the "authors" table
 authors_table = Table(u'authors', metadata,
-    Column(u'id', types.Integer,  primary_key=True),
+    Column(u'id', types.Integer, primary_key=True),
     Column(u'first_name', types.Unicode(128)),
     Column(u'last_name', types.Unicode(128)),
     Column(u'display_name', types.Unicode(255), nullable=False)
@@ -45,7 +45,8 @@
 # Definition of the "songs" table
 songs_table = Table(u'songs', metadata,
     Column(u'id', types.Integer, primary_key=True),
-    Column(u'song_book_id', types.Integer, ForeignKey(u'song_books.id'), default=0),
+    Column(u'song_book_id', types.Integer,
+        ForeignKey(u'song_books.id'), default=0),
     Column(u'title', types.Unicode(255), nullable=False),
     Column(u'lyrics', types.UnicodeText, nullable=False),
     Column(u'verse_order', types.Unicode(128)),
@@ -60,27 +61,38 @@
 
 # Definition of the "topics" table
 topics_table = Table(u'topics', metadata,
-    Column(u'id', types.Integer,  primary_key=True),
+    Column(u'id', types.Integer, primary_key=True),
     Column(u'name', types.Unicode(128), nullable=False)
 )
 
 # Definition of the "authors_songs" table
 authors_songs_table = Table(u'authors_songs', metadata,
-    Column(u'author_id', types.Integer, ForeignKey(u'authors.id'), primary_key=True),
-    Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True)
+    Column(u'author_id', types.Integer,
+        ForeignKey(u'authors.id'), primary_key=True),
+    Column(u'song_id', types.Integer,
+        ForeignKey(u'songs.id'), primary_key=True)
 )
 
 # Definition of the "songs_topics" table
 songs_topics_table = Table(u'songs_topics', metadata,
-    Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True),
-    Column(u'topic_id', types.Integer, ForeignKey(u'topics.id'), primary_key=True)
+    Column(u'song_id', types.Integer,
+        ForeignKey(u'songs.id'), primary_key=True),
+    Column(u'topic_id', types.Integer,
+        ForeignKey(u'topics.id'), primary_key=True)
 )
-Index(u'authors_id',authors_table.c.id)
-Index(u'authors_display_name_id',authors_table.c.display_name, authors_table.c.id)
-Index(u'song_books_id',song_books_table.c.id)
-Index(u'songs_id',songs_table.c.id)
-Index(u'topics_id',topics_table.c.id)
-Index(u'authors_songs_author',authors_songs_table.c.author_id, authors_songs_table.c.song_id)
-Index(u'authors_songs_song',authors_songs_table.c.song_id, authors_songs_table.c.author_id)
-Index(u'topics_song_topic', songs_topics_table.c.topic_id, songs_topics_table.c.song_id)
-Index(u'topics_song_song',songs_topics_table.c.song_id, songs_topics_table.c.topic_id)
+
+# Define table indexes
+Index(u'authors_id', authors_table.c.id)
+Index(u'authors_display_name_id', authors_table.c.display_name,
+    authors_table.c.id)
+Index(u'song_books_id', song_books_table.c.id)
+Index(u'songs_id', songs_table.c.id)
+Index(u'topics_id', topics_table.c.id)
+Index(u'authors_songs_author', authors_songs_table.c.author_id,
+    authors_songs_table.c.song_id)
+Index(u'authors_songs_song', authors_songs_table.c.song_id,
+    authors_songs_table.c.author_id)
+Index(u'topics_song_topic', songs_topics_table.c.topic_id,
+    songs_topics_table.c.song_id)
+Index(u'topics_song_song', songs_topics_table.c.song_id,
+    songs_topics_table.c.topic_id)

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2009-09-08 19:58:05 +0000
+++ openlp/plugins/songs/songsplugin.py	2009-09-21 17:56:36 +0000
@@ -94,7 +94,8 @@
         # Translations...
         self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song'))
         self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
-        self.ImportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
+        self.ImportOpenlp1Item.setText(
+            translate(u'main_window', u'openlp.org 1.0'))
         self.ImportOpenlp1Item.setToolTip(
             translate(u'main_window', u'Export songs in openlp.org 1.0 format'))
         self.ImportOpenlp1Item.setStatusTip(
@@ -137,7 +138,8 @@
         # Translations...
         self.ExportSongMenu.setTitle(translate(u'main_window', u'&Song'))
         self.ExportOpenSongItem.setText(translate(u'main_window', u'OpenSong'))
-        self.ExportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0'))
+        self.ExportOpenlp1Item.setText(
+            translate(u'main_window', u'openlp.org 1.0'))
         self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0'))
         # Signals and slots
         QtCore.QObject.connect(self.ExportOpenlp1Item,

=== modified file 'openlp/plugins/songs/test/test_song_basic.py'
--- openlp/plugins/songs/test/test_song_basic.py	2009-09-03 15:19:30 +0000
+++ openlp/plugins/songs/test/test_song_basic.py	2009-09-21 17:56:36 +0000
@@ -50,8 +50,8 @@
         s = Song()
         t = "A normal title"
         s.set_title(t)
-        assert(s.get_title() ==  t)
-        assert(s.get_search_title() ==  t)
+        assert(s.get_title() == t)
+        assert(s.get_search_title() == t)
 
     def test_Title3(self):
         """Set a titel with punctuation 1"""
@@ -59,8 +59,8 @@
         t1 = "Hey! Come on, ya programmers*"
         t2 = "Hey Come on ya programmers"
         s.set_title(t1)
-        assert(s.get_title() ==  t1)
-        assert(s.get_search_title() ==  t2)
+        assert(s.get_title() == t1)
+        assert(s.get_search_title() == t2)
 
     def test_Title4(self):
         """Set a titel with punctuation 2"""
@@ -68,11 +68,14 @@
         t1 = "??#Hey! Come on, ya programmers*"
         t2 = "Hey Come on ya programmers"
         s.set_title(t1)
-        assert(s.get_title() ==  t1)
-        assert(s.get_search_title() ==  t2)
+        assert(s.get_title() == t1)
+        assert(s.get_search_title() == t2)
 
     def test_Title5(self):
-        """Set a title, where searchable title becomes empty - raises an exception"""
+        """
+        Set a title
+        Where searchable title becomes empty raises an exception
+        """
         s = Song()
         py.test.raises(SongTitleError, s.set_title, ',*')
 

=== modified file 'openlpcnv.pyw'
--- openlpcnv.pyw	2009-09-08 19:58:05 +0000
+++ openlpcnv.pyw	2009-09-21 17:56:36 +0000
@@ -49,7 +49,7 @@
         Initialise the process.
         """
         self.display = Display()
-        self.stime =  time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime())
+        self.stime = time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime())
         self.display.output(u'OpenLp v1.9.0 Migration Utility Started')
 
     def process(self):