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

Proposed by Jon Tibble
Status: Superseded
Proposed branch: lp:~meths/openlp/trivialfixes
Merge into: lp:openlp
Diff against target: 1423 lines
79 files modified
cnvdb.py (+0/-1)
demo.py (+1/-1)
documentation/source/conf.py (+2/-1)
openlp/core/lib/baselistwithdnd.py (+0/-3)
openlp/core/lib/dockwidget.py (+1/-2)
openlp/core/lib/renderer.py (+0/-2)
openlp/core/lib/rendermanager.py (+0/-3)
openlp/core/lib/serviceitem.py (+1/-2)
openlp/core/lib/settingstab.py (+1/-1)
openlp/core/lib/themexmlhandler.py (+1/-1)
openlp/core/lib/xmlrootclass.py (+1/-2)
openlp/core/test/test_mediamanageritem.py (+10/-7)
openlp/core/test/test_plugin_manager.py (+5/-5)
openlp/core/test/test_render.py (+1/-1)
openlp/core/test/test_render_theme.py (+0/-1)
openlp/core/theme/theme.py (+1/-2)
openlp/core/ui/__init__.py (+3/-3)
openlp/core/ui/amendthemeform.py (+1/-2)
openlp/core/ui/maindisplay.py (+1/-2)
openlp/core/ui/mainwindow.py (+2/-4)
openlp/core/ui/servicemanager.py (+1/-5)
openlp/core/ui/settingsform.py (+1/-2)
openlp/core/ui/slidecontroller.py (+1/-3)
openlp/core/ui/test/test_service_manager.py (+5/-7)
openlp/core/ui/thememanager.py (+3/-4)
openlp/core/utils/registry.py (+1/-1)
openlp/migration/migratebibles.py (+0/-2)
openlp/migration/migratesongs.py (+5/-7)
openlp/plugins/audit/lib/audittab.py (+2/-2)
openlp/plugins/audit/lib/manager.py (+2/-7)
openlp/plugins/audit/lib/meta.py (+0/-1)
openlp/plugins/audit/lib/models.py (+2/-2)
openlp/plugins/audit/lib/tables.py (+1/-1)
openlp/plugins/bibles/forms/bibleimportform.py (+1/-4)
openlp/plugins/bibles/lib/bibleCSVimpl.py (+0/-2)
openlp/plugins/bibles/lib/bibleDBimpl.py (+0/-1)
openlp/plugins/bibles/lib/bibleHTTPimpl.py (+1/-5)
openlp/plugins/bibles/lib/bibleOSISimpl.py (+0/-1)
openlp/plugins/bibles/lib/biblestab.py (+1/-1)
openlp/plugins/bibles/lib/common.py (+0/-3)
openlp/plugins/bibles/lib/manager.py (+0/-3)
openlp/plugins/bibles/lib/mediaitem.py (+2/-2)
openlp/plugins/bibles/lib/models.py (+0/-1)
openlp/plugins/bibles/test/test_bibleManager.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerAPI.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerCSV.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerOSIS.py (+8/-11)
openlp/plugins/custom/customplugin.py (+1/-1)
openlp/plugins/custom/forms/editcustomform.py (+1/-1)
openlp/plugins/custom/lib/manager.py (+3/-8)
openlp/plugins/custom/lib/mediaitem.py (+1/-2)
openlp/plugins/custom/lib/meta.py (+0/-1)
openlp/plugins/custom/lib/models.py (+2/-2)
openlp/plugins/custom/lib/tables.py (+1/-1)
openlp/plugins/images/imageplugin.py (+1/-1)
openlp/plugins/images/lib/imagetab.py (+1/-1)
openlp/plugins/images/lib/mediaitem.py (+1/-2)
openlp/plugins/media/lib/mediaitem.py (+1/-5)
openlp/plugins/media/mediaplugin.py (+3/-4)
openlp/plugins/presentations/lib/impresscontroller.py (+1/-4)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/messagelistener.py (+1/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-6)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+1/-3)
openlp/plugins/remotes/lib/remotetab.py (+2/-2)
openlp/plugins/remotes/remoteplugin.py (+1/-2)
openlp/plugins/songs/forms/editsongform.py (+2/-3)
openlp/plugins/songs/forms/editverseform.py (+1/-1)
openlp/plugins/songs/forms/songbookform.py (+2/-1)
openlp/plugins/songs/forms/topicsform.py (+2/-1)
openlp/plugins/songs/lib/manager.py (+3/-7)
openlp/plugins/songs/lib/mediaitem.py (+2/-3)
openlp/plugins/songs/lib/meta.py (+0/-1)
openlp/plugins/songs/lib/models.py (+1/-1)
openlp/plugins/songs/lib/songstab.py (+0/-2)
openlp/plugins/songs/songsplugin.py (+1/-1)
openlp/plugins/songs/test/test_song_verse.py (+1/-1)
openlpcnv.pyw (+0/-2)
To merge this branch: bzr merge lp:~meths/openlp/trivialfixes
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+12395@code.launchpad.net

This proposal has been superseded by a proposal from 2009-09-25.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Approved

review: Approve
lp:~meths/openlp/trivialfixes updated
570. By Jon Tibble

PPTViewer fixes

571. By Jon Tibble

Imports clean up

572. By Tim Bentley

Plugin changes to Audit, Song and Custom

573. By Jon Tibble

None testing and clean ups

574. By Tim Bentley

Plugin updates

575. By Jonathan Corwin

Jons Presentation merge with hack to fix conflicts

576. By Tim Bentley

Audit changes and cleanups

577. By Jonathan Corwin

Presentation merge with gotos

578. By Jon Tibble

Fix presentation starting

579. By Jon Tibble

Use buildIcon and fixes

580. By Tim Bentley

Style cleanups

581. By Jonathan Corwin

Presentations made it at last

582. By Jonathan Corwin

Presentation dll

583. By Tim Bentley

Start of about Text

584. By Jon Tibble

Dialogs, Exceptions and Toolbars

585. By Tim Bentley

Update PluginList Window

586. By Jonathan Corwin

Presentation updates

587. By Tim Bentley

Add Ability to hide plugins

588. By Jonathan Corwin

More Presentation improvements

589. By Tim Bentley

More hiding code changes

590. By Tim Bentley

Fix song issue

591. By Jon Tibble

Presentation cleanups

592. By Jon Tibble

Bible rendering fixes

593. By Tim Bentley

Apply fixes for Jon

594. By Raoul Snyman

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

595. By Tim Bentley

Plugin hinding comes to town

596. By Jonathan Corwin

More Presentation fixes

597. By Tim Bentley

Various changes and fixes

598. By Jonathan Corwin

TLC for the asv

599. By Raoul Snyman

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

600. By Tim Bentley

Add Web Bibles to Advanced Tab and other nice features

601. By Jonathan Corwin

Presentation changes

602. By Tim Bentley

Update config files for deployment

603. By Tim Bentley

Changes to settings and SlideController handling

604. By Jon Tibble

Python 2.5 fixes

605. By Raoul Snyman

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

606. By Raoul Snyman

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

607. By Jonathan Corwin

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

608. By Raoul Snyman

Merged lp:~raoul-snyman/openlp/uifixes

609. By Tim Bentley

Theme Image and Presentation fixes

610. By Jon Tibble

General fixes

611. By Tim Bentley

General Tab Changes

612. By Jonathan Corwin

Merged tweaks to openlpcnv.pyw

613. By Raoul Snyman

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

614. By Raoul Snyman

Fix Slide Controller look and feel

615. By Raoul Snyman

Fix Bible Media manager look and feel

616. By Jonathan Corwin

Presentation fixes for Impress

617. By Tim Bentley

Bible Fixes

618. By Tim Bentley

Theme features - wrap indentation and lines per slide

619. By Tim Bentley

Font Sizing and rendering improvements

620. By Jonathan Corwin

Presentations Impress mini display

621. By Raoul Snyman

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

622. By Jon Tibble

Fix imports and config item

623. By Tim Bentley

Song editing from Preview, bible fixes

624. By Jon Tibble

Fix imports and typo

625. By Tim Bentley

fix up song edit from preview

626. By Jonathan Corwin

More presentation fixes

627. By Tim Bentley

Save and preview + dynamic theme changing

628. By Raoul Snyman

Fix slide controller look and feel

629. By Raoul Snyman

Fix i18n issues

630. By Tim Bentley

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

631. By Tim Bentley

Add more bible sources and improve handling

632. By Jon Tibble

Fix plugintabs i18n

633. By Jon Tibble

Fix i18n and cleanup for New Theme

634. By Tim Bentley

Edit Songs and Custom for Service Manager and auto replace

635. By Jon Tibble

Fix i18n for mediaitems

636. By Jon Tibble

Fix unnecessary screen setup

637. By Tim Bentley

Minor fixes

638. By Jon Tibble

Fix theme editing, copyright and song icon

639. By Jon Tibble

Plugin fixes, cleanups and i18n

640. By Tim Bentley

Fixes to Renderer etc

641. By Tim Bentley

Remote Song Editing Finished - minor other changes

642. By Jon Tibble

Fix typos

643. By Tim Bentley

Fix up editing code from Preview and ServiceManager

644. By Raoul Snyman

Fix up converter

645. By Tim Bentley

Clean up the version code and remove not required file

646. By Tim Bentley

Media is starting to work - just

647. By Jon Tibble

Fix mediaitem translation

648. By Jon Tibble

Enable consecutive video playing

649. By Tim Bentley

Minor fixes and copyright

650. By Tim Bentley

Merge it right this time

651. By Jon Tibble

Single monitor display hiding

652. By Jon Tibble

Cleanups

653. By Tim Bentley

Expansion and Song editing fixes

654. By Tim Bentley

Fix song editing error messages

655. By Jon Tibble

Various cleanups and fixes

656. By Jon Tibble

More fixes

657. By Raoul Snyman

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

658. By Jon Tibble

Clean theme handling

659. By Tim Bentley

Remote editing for custom and theme fix

660. By Jon Tibble

Fix file handling

661. By Tim Bentley

Plugin clean ups

662. By Jonathan Corwin

Presentation fixes

663. By Tim Bentley

SlideController cleanups

664. By Tim Bentley

Fix bugs in theme and slidecontroller

665. By Tim Bentley

Clean up slidecontroller

666. By Tim Bentley

Add media Preview code

667. By Tim Bentley

Change version number

668. By Jon Tibble

Unicode and import fixes

669. By Tim Bentley

Slide Controller cleanups and Media bug fixes

670. By Jon Tibble

Cleanups and fixes

671. By Raoul Snyman

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

672. By Raoul Snyman

Updated version.txt

673. By Tim Bentley

Refactor Service Item and clean up Slide Controller

674. By Michael Gorven

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

675. By Tim Bentley

Updates to the Renderer and impose minimum slide width

676. By Raoul Snyman

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

677. By Michael Gorven

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

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

679. By Tim Bentley

Verse tagging changes etc

680. By Tim Bentley

Add verse expansion from song plugin

681. By Tim Bentley

Cannot type

682. By Raoul Snyman

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

683. By Michael Gorven

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

Verse Tagging

685. By Tim Bentley

Merge from lp:~trb143/openlp/cleanup

686. By Tim Bentley

Fix Theme handling so Song level works again

687. By Tim Bentley

Fix Theme tab handling

688. By Tim Bentley

Fix bibles and themes

689. By Tim Bentley

Presentation, Custom , bug fixes

690. By Tim Bentley

Add Shadow and Outline options to Themes

691. By Tim Bentley

Fix bug stopping Custom editing

692. By Raoul Snyman

Merged in OpenSong/Bible importer branch.

693. By Raoul Snyman

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

694. By Raoul Snyman

Updated the copyright.

695. By Tim Bentley

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

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

New version 1 -> 2 Bible converter script.

698. By Tim Bentley

Display updates, Song Usage fixes, Theme display fixes

699. By Tim Bentley

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

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

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

Fix Presentation file filter
Fix Cancel for song verse editor

703. By Tim Bentley

Fix number of song verses. > 10

704. By Tim Bentley

Fix theme import bug

705. By Tim Bentley

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

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

707. By Tim Bentley

Fix displayAlert error
Fix UTF8 settings on SongUSage dialog

708. By Jonathan Corwin

A few more small presentation fixes/cosmetics.

709. By Raoul Snyman

Updated version.txt to the latest revision.

710. By Raoul Snyman

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

711. By Jon Tibble

Import and theme importing fixes

712. By Raoul Snyman

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

713. By Michael Gorven

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

Fix Presentation Tag and flush Renderer cache on re-paint

715. By Raoul Snyman

Trying to set a tag on trunk.

716. By Tim Bentley

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

717. By Tim Bentley

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

Automate Media type list from phonon

719. By Raoul Snyman

Added some more icons.

720. By Jonathan Corwin

Split live/preview presentation documents, plus fixes for Windows

721. By Raoul Snyman

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

722. By Raoul Snyman

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

723. By Tim Bentley

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

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

725. By Tim Bentley

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

726. By Tim Bentley

Remove version tag

727. By Tim Bentley

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

728. By Raoul Snyman

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

729. By Tim Bentley

ServiceManager fixes

730. By Raoul Snyman

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

Truth test and C style cleanups

732. By Raoul Snyman

Fix "red letter" versions of Crosswalk Bibles.

733. By Jonathan Corwin

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

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

Fix text strings and new verse tag

736. By Raoul Snyman

Added some icons.

737. By Raoul Snyman

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

Added various fixes for the Windows build.

739. By Tim Bentley

Text string fixes

740. By Raoul Snyman

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

741. By Tim Bentley

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

742. By Tim Bentley

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

Merged in some translation fixes.

744. By Raoul Snyman

Some fixes in the Bible plugin.

745. By Jon Tibble

Cleanups

746. By Jon Tibble

AppLocation.PluginsDir changes

747. By Raoul Snyman

Fixed the BibleGateway importer.

748. By rimach

Make the "Blank" button work.

749. By Raoul Snyman

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

750. By Tim Bentley

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

751. By Raoul Snyman

Bug fixes for the Bible imports.

752. By Tim Bentley

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

753. By Raoul Snyman

Being overzealous about unicode.

754. By Raoul Snyman

Various fixes to the Bibles plugin.

755. By Raoul Snyman

Add Christian and Phill to the credits

756. By Raoul Snyman

Bugfixes in Bibles.

757. By Raoul Snyman

Change the "Live" icon.

758. By Jonathan Corwin

Fixed a bug with transparent backgrounds.

759. By Jonathan Corwin

Fix up the bible migration.

760. By Raoul Snyman

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

Close down presentation apps at end correctly

762. By Jon Tibble

Unused variable and import fixes

763. By Jon Tibble

Change loop method and remove unused variables

764. By Tim Bentley

Add enter to quick bible edit field

765. By Raoul Snyman

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

766. By Raoul Snyman

Start presentation apps in right place.

767. By Tim Bentley

Fix bug for PyTQ4.4

768. By Michael Gorven

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

Fix text outlines

770. By Raoul Snyman

Update the credits.

771. By Raoul Snyman

Fixed a bug with Strongs in CrossWalk.

772. By Raoul Snyman

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

773. By Raoul Snyman

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

774. By Tim Bentley

Fix dates

775. By Raoul Snyman

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

Tag the 1.9.1 release.

777. By Tim Bentley

* 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

Import cleanups

779. By Raoul Snyman

Fixed a broken import.

780. By Tim Bentley

Fix media path bug

781. By Raoul Snyman

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

782. By Jonathan Corwin

Songs of Fellowship song import

783. By Tim Bentley

Display handling cleanups and changes to service item flags

784. By Tim Bentley

Remove old files. Clean up verse tags part 1

785. By Jonathan Corwin

Songs of Fellowship fixes
Multiple song delete from media manager

786. By Tim Bentley

Add multi add to service manager and check image previews

787. By Raoul Snyman

Some fixes to the songs converter script.

788. By Jonathan Corwin

Tidy up song database, and add Arky Arky!

789. By Tim Bentley

Fedora packaging fixes

790. By Tim Bentley

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

Fix version problems.

792. By Jon Tibble

Import and line ending fixes

793. By Jonathan Corwin

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

794. By mahfiaz

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

795. By Raoul Snyman

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

796. By Tim Bentley

Alert manager cleanups
Improvements in video display

797. By Jon Tibble

Import fixes and typo

798. By Tim Bentley

Alert manager cleanups
Presentation icons
Detect missing files and change icon

799. By Jonathan Corwin

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

800. By Jon Tibble

QSettings, recent files and UI saving

801. By Jon Tibble

Help -> Website and disable unimplemented options

802. By Jon Tibble

Consistency fixes

803. By Tim Bentley

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

Text over video arrives to OpenLP

805. By Jon Tibble

Coding standards fixes

806. By Tim Bentley

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

807. By Jonathan Corwin

Remote operation via web

808. By Tim Bentley

Fix Presentations and add DnD to serviceitem updates

809. By Tim Bentley

Fix bible spelling in database

810. By Raoul Snyman

Documentation!

811. By Jonathan Corwin

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

812. By Tim Bentley

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

Merged from mjthompson/qt4.4

814. By Tim Bentley

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

815. By Martin Thompson

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

816. By rimach@siduxbox

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

817. By andreas@andypc

Fix bug in bibles with 2 bible displays

818. By Tim Bentley

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

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

Verse editor cleanups

821. By Jon Tibble

Unused import and variable fixes

822. By Raoul Snyman

Some fixes for the Windows build.

823. By Tim Bentley

Fix memory leak and improve slide controller tags

824. By Raoul Snyman

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

825. By Raoul Snyman

Better version checking.

826. By Jon Tibble

Many varied cleanups

827. By andreas@andypc

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

Some more tweaks and fixes to the Windows builder script.

829. By Jon Tibble

Refactor BaseModel

830. By mahfiaz

Estonian translation

831. By Jon Tibble

Import, exception, naming and whitespace cleanups

832. By Meinert Jordan <email address hidden>

QString to Unicode conversions.

833. By Tim Bentley

Amend verse tagging code for translations

834. By Meinert Jordan <email address hidden>

Fix Qstring bug
Update Combo code

835. By Jon Tibble

Catch correct exception type

836. By frodus@frodus-laptop

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

837. By Jon Tibble

Cleanups

838. By Jon Tibble

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

839. By Jon Tibble

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

840. By Jon Tibble

DocStrings

841. By Jon Tibble

Move VerseType to lib

842. By Raoul Snyman

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

843. By Tim Bentley

Fix problems with screen blanking

844. By Jon Tibble

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

845. By Jon Tibble

Fix QColorDialog usage

846. By Jon Tibble

Revert resources location patch

847. By Meinert Jordan

Various i18n fixes.

848. By Jonathan Corwin

Fix opening and displaying of presentations

849. By Frode Woldsund

Complete trUtf8 -> translate conversion

850. By Jon Tibble

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

Import translate in splashscreen.py

852. By Tim Bentley

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

853. By Jon Tibble

HTTPBible Verse Count and Bug #595671

854. By Raoul Snyman

Merged in song maintenance improvements.

855. By Raoul Snyman

Some streamlining of the song edit form.

856. By Tim Bentley

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

857. By Frode Woldsund

String Cleanup in MainWindow

858. By Jon Tibble

Complete openlp.migration removal

859. By Meinert Jordan

Unicode for Themes

860. By Jon Tibble

Cleanups

861. By Raoul Snyman

Fix up the available image formats somewhat.

862. By Meinert Jordan

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

863. By Raoul Snyman

Fix bug #596506 and bug #596505

864. By Jon Tibble

Cleanups

865. By Tim Bentley

Fix bug #596821

866. By Raoul Snyman

Updated the majority of the translate() functions.

867. By Tim Bentley

Translation string updates

868. By Jonathan Corwin

Bug 596995 - Fix remote plugin via PPA

869. By Jon Tibble

Stray backslashes and translate() updates

870. By Raoul Snyman

Fix up Theme form parentage.

871. By Frode Woldsund

Another translate() bugfix.

872. By Jon Tibble

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

873. By Jon Tibble

Fix version check (Bug #597121)

874. By Tim Bentley

Fix screen blanking when in single screen

875. By rimach

Various improvements to the translation_utils script.

876. By Tim Bentley

Update plugin versions and cleanups

877. By Jon Tibble

Ampersands and item selection checking

878. By Raoul Snyman

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

879. By Jon Tibble

Fix check_item_selection

880. By Jonathan Corwin

Presentation tidies

881. By Jonathan Corwin

pptviewlib changes

882. By Raoul Snyman

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

883. By Frode Woldsund

Fixed (c) symbol.

884. By Tim Bentley

Stop delete of last Image

885. By Jon Tibble

Docstrings

886. By andreas <andreas@andypc>

ListWidget usability improvement

887. By Jon Tibble

Cleanups

888. By Jonathan Corwin

Bug 596361 and other minor presentation fixes

889. By Jonathan Corwin

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

890. By Andreas Preikschat

Improved delete button behaviour.

891. By Raoul Snyman

Fixed up problems with version checking.

892. By Jonathan Corwin

Trap presentation errors when OpenOffice.org is not installed

893. By Jon Tibble

Fix off-by-one saving songs

894. By Jon Tibble

Refactor database code

895. By Tim Bentley

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

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

897. By Jon Tibble

* Fix theme deletion
* Naming fixes
* Docstrings

898. By Jon Tibble

Docstrings

899. By Jon Tibble

Fix service loading

900. By Raoul Snyman

Added decent images for remotes, alerts and song usage.

901. By Jon Tibble

Fix service loading properly (Bug #600091)

902. By Tim Bentley

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

903. By Raoul Snyman

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

Database fixes and refactorings

905. By Jon Tibble

Cleanups and sizePolicy refactor

906. By Jon Tibble

Fix song loading and wildcard import

907. By Jon Tibble

Cleanup plugins (Bug #600996)

908. By Tim Bentley

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

909. By Andreas Preikschat

Some random fix ;-)

910. By Tim Bentley

Name cleanups

911. By Jonathan Corwin

Cleanups and fix PPTViewer dll loading

912. By Phill

Fix up video tag for webkit view.
Remove unused tag

913. By Jon Tibble

Import fix

914. By Jon Tibble

Start XML refactoring

915. By Jon Tibble

Fixes and cleanups

916. By Tim Bentley

Fix up plugin Meths style

917. By Jon Tibble

Fix song saving

918. By Jonathan Corwin

Presentation fixes

919. By Raoul Snyman

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

920. By Raoul Snyman

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

921. By Raoul Snyman

Added View Modes.

922. By Raoul Snyman

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

923. By Jon Tibble

Tweaks and cleanups

924. By Jon Tibble

Refactor view mode code

925. By andreas <andreas@andypc>

Whitespace cleanups

926. By andreas <andreas@andypc>

Naming and whitespace cleanups

927. By Jon Tibble

Big cleanup

928. By Jon Tibble

build_icon fixes

929. By Jon Tibble

AdvancedTab

930. By Jon Tibble

Fix service saving (Bug #603798)

931. By Jon Tibble

Fix recent merge

932. By Jonathan Corwin

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

933. By Jon Tibble

Import fixes

934. By Andreas Preikschat

Improve song data integrity

935. By Jon Tibble

Save current media plugin (Bug #596540)

936. By Jon Tibble

Theme backgrounds (Bug #594911)

937. By Jon Tibble

Double click live setting

938. By Jon Tibble

Fix theme editing (Bug #594909 part 1)

939. By Jon Tibble

Fix AdvancedTab layout

940. By Jon Tibble

Fix service save icon method

941. By Raoul Snyman

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

942. By Jon Tibble

Fix service save location (Bug #605649)

943. By Andreas Preikschat

Import fix

944. By Phill

Sorted out the show/hide desktop.

945. By Jon Tibble

Use populate() for DB objects

946. By Jon Tibble

Tab Order and Theme fix (Bug #606256)

947. By Jon Tibble

Fix English and alignment

948. By Tim Bentley

Fix text hiding bug with images

949. By Jon Tibble

Fixes and cleanups

950. By Billy Lange

Add confirm before theme delete

951. By Martin Thompson

Merged opensong import branch

952. By Andreas Preikschat

Cleanups and song data merging

953. By Jon Tibble

Save Song Book (Bug #607030)

954. By Andreas Preikschat

Prevent topic and author duplication in songs

955. By Jon Tibble

Fix topic/author adding (Bug #607034)

956. By Jon Tibble

DATABASE SCHEMA CHANGE, fixes and cleanups

957. By Jon Tibble

Fix theme saving and song import. Cleanups

958. By Andreas Preikschat

Fix song authors and books

959. By Jon Tibble

Importer fix

960. By Jonathan Corwin

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

961. By Jonathan Corwin

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

962. By Raoul Snyman

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

963. By Jon Tibble

DocStrings

964. By Jon Tibble

Fix numbered book BG bibles (Bug #609354)

965. By Raoul Snyman

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

966. By Raoul Snyman

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

967. By Raoul Snyman

Update the copyright notice and the credits.

968. By Tim Bentley

Add display update trigger missed in cleanup

969. By Jon Tibble

Bible refactor & search, getter & setter removal, cleanups

970. By Jon Tibble

Long lines

971. By Raoul Snyman

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

972. By Jon Tibble

Fix showing screen after black and cleanups

973. By Jon Tibble

Naming fixes & trailing line endings

974. By Jon Tibble

Explicit exception handling

975. By Phill

Fix for bug #609442.

976. By Phill

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

977. By Jon Tibble

Exception fixes and naming cleanups

978. By Jon Tibble

Refactor reference parsing & remove dead code in Bibles

979. By Jon Tibble

Cleanups

980. By Jon Tibble

Refactors, cleanups and fixes

981. By Phill

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

982. By Jon Tibble

Fix alerts and screen resizing

983. By Jon Tibble

Fix last commit

984. By Andreas Preikschat

Disable buttons when no item to act on

985. By Jon Tibble

Work with SQLAlchemy 0.6

986. By Tim Bentley

Fix song usage
Fix 598407

987. By Andreas Preikschat

Dual bible fixes

988. By Raoul Snyman

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

989. By Raoul Snyman

Fixed the icon properly this time.

990. By Raoul Snyman

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

991. By Raoul Snyman

Fix a string and update the translation sources.

992. By Jon Tibble

Cleanups and a version check fix

993. By Raoul Snyman

Additional failover for version problems.

994. By Raoul Snyman

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

995. By Jon Tibble

Update OpenLPv2 song importer

996. By Tim Bentley

Fix theme bug reported on Redhat bugzilla

997. By Tim Bentley

Display and renderer changes

998. By Jon Tibble

Cleanups and song form fix (Bug #612282)

999. By Tim Bentley

Renderer fixes and change theme export suffix

1000. By Raoul Snyman

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

1001. By Phill

Adding the Words of Worship importer.

1002. By Derek Scotney <email address hidden>

Add CCLI file importer to song wizard

1003. By Andreas Preikschat

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

1004. By Raoul Snyman

Fix for bug #621695.

1005. By Tim Bentley

Fix bugs with renderer

1006. By Jonathan Corwin

Fix {} colour substitutions and problems displaying first slide

1007. By Tim Bentley

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

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

1009. By Phill

Fix incorrect method

1010. By Phill

Rearranged the screen co-ordinate fields.

1011. By Tim Bentley

Clean up the renderer

1012. By Jonathan Corwin

Size maindisplay to full screen correctly, and eliminate maindisplay scrollbars

1013. By Tim Bentley

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

1014. By Jonathan Corwin

Hook generic and sof song imports into the wizard

1015. By Tim Bentley

Fix bugs regarding screen blanking

1016. By Tim Bentley

Fix song editing bug

1017. By Raoul Snyman

Merge in the openlp.org 1.x importer.

1018. By Raoul Snyman

Added a simple dialog to display any uncaught exceptions.

1019. By Tim Bentley

Short term fix for 633354
Fix display and text bugs

1020. By Tim Bentley

Proper fix for plugin bug

1021. By Jonathan Corwin

Left+Bottom align footer, and prevent wrapping

1022. By Derek Scotney <email address hidden>

Fix verse numbering

1023. By Raoul Snyman

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

1024. By Jonathan Corwin

Tidy song_import code and fix bug 634771

1025. By Raoul Snyman

Just some behind-the-scenes house keeping.

1026. By Tim Bentley

Fix file permission and correct i18n location

1027. By Jonathan Corwin

Loop video background

1028. By Raoul Snyman

Fixes bug #635330 and attempts to fix bug #635338

1029. By Tim Bentley

Fix code so translations can be found

1030. By Raoul Snyman

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

Cleanups

1032. By Tim Bentley

Fix whitespace and bugs

1033. By Raoul Snyman

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

1034. By Raoul Snyman

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

1035. By Martin Thompson

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

1036. By Raoul Snyman

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

Attempting to solve bug #635338

1038. By Raoul Snyman

Fixed a spelling error.

1039. By Raoul Snyman

Fix bug #640460.

1040. By Raoul Snyman

Some more spelling/grammatical corrections.

1041. By Jonathan Corwin

String fixes

1042. By Andreas Preikschat

Fixed bug #641734

1043. By Raoul Snyman

Fix for bug #640697

1044. By rimach

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

Added a method to update the translation files.

1046. By Jonathan Corwin

Rendering speedups/fixes

1047. By Jeffrey Smith

Added a song importer for EasyWorship

1048. By Raoul Snyman

Fixed bug #644106

1049. By rimach <rimach@siduxbox>

Fix translation files

1050. By Raoul Snyman

Update strings.

1051. By Jonathan Corwin

Speed up video loop, and adjust left margin for outline

1052. By Tim Bentley

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

1053. By Andreas Preikschat

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

Remove line breaks in ServiceManager

1055. By Jeffrey Smith

Refactor code for making song import wizard pages.

1056. By rimach

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

Fixed bug #598805 - Song order inconsistency.

1058. By Tim Bentley

Fix crash and optimise display

1059. By Tim Bentley

Update Manifest file

1060. By Jeffrey Smith

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

1061. By Jonathan Corwin

Fix song number/book save and load

1062. By Raoul Snyman

Updated translations.

1063. By Tim Bentley

Update preview text

1064. By Tim Bentley

Theme handling cleanups

1065. By Tim Bentley

Fix merge error

1066. By Andreas Preikschat

Bible code tidy

1067. By Tim Bentley

Fix blank line bug

1068. By Tim Bentley

Fix saved service bug

1069. By rimach

Add Song Beamer importer

1070. By Andreas Preikschat

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

1071. By rimach

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

1072. By Tim Bentley

Allow Service Item to be updated from Song Plugin on Edit

1073. By Phill

Update File load extensions for song imports

1074. By Tim Bentley

Fix duplicate file save bug
Fix Dnd bug

1075. By Tim Bentley

Enhance ServiceItem Expand/Collapse features

1076. By Jonathan Corwin

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

1077. By Wesley Stout

Start of Documentation

1078. By Andreas Preikschat

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

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

1080. By Raoul Snyman

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

1081. By Raoul Snyman

For us developers... pull the bzr version.

1082. By Raoul Snyman

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

1083. By andreas <andreas@andypc>

Revised custom Dialog and new edit form

1084. By Andreas Preikschat

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

1085. By Raoul Snyman

Documentation updates.

1086. By Andreas Preikschat

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

1087. By Jeffrey Smith

This is a fix for bug #659673

1088. By Wesley Stout

Added the Glossary

1089. By Jonathan Corwin

Warn rather than error if COM Impress controller not available.

1090. By Andreas Preikschat

Code Cleanups

1091. By Raoul Snyman

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

1092. By Tim Bentley

Alerts work again , image performance improvements

1093. By Raoul Snyman

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

1094. By Raoul Snyman

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

1095. By Tim Bentley

Fix image but and more path optimisation

1096. By Wesley Stout

Video display Documentation

1097. By Raoul Snyman

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

Cleanups

1099. By Jon Tibble

Fix spelling of Samuel (Bug #647931)

1100. By Tim Bentley

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

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

Fix saving images in services and correct border code

1103. By Tim Bentley

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

Fix missing media Icon
Speed up Vacuum code.
Fix 1002

1105. By Andreas Preikschat

Fix custom and songusage managers

1106. By Meinert Jordan

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

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

1108. By Raoul Snyman

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

Fix mimetype issues

1110. By Tim Bentley

Fix renderer
Fix Image preview.

1111. By Andreas Preikschat

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

1112. By Jon Tibble

Lots of cleanups

1113. By Andreas Preikschat

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

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

1115. By Tim Bentley

Sort themes when read

1116. By Raoul Snyman

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

1117. By Raoul Snyman

Found and fixed a bug.

1118. By Tim Bentley

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

Fix blank theme problem
Remove blank check box line.

1120. By Tim Bentley

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

Fix video backgrounds and Service Loading with edit

1122. By Jon Tibble

Fix BibleGateway searches for BeautifulSoup 3.1

1123. By Tim Bentley

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

Fix spelling

1125. By Wesley Stout

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

1126. By Tim Bentley

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>

- 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>

- 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>

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

Pylint cleanups
Bug fixing in Themes
Spelling Fix in Songs

1131. By Raoul Snyman

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

1132. By Jon Tibble

Fix v2 song importer and various cleanups

1133. By Tim Bentley

Fix Theme Bug text color.
Fix serious spelling error.

1134. By Meinert Jordan

- 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

Add text entry validator to display positions
Fix Spelling

1136. By Derek Scotney <email address hidden>

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

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

1138. By Meinert Jordan

Import Wizards don't Stop

1139. By Meinert Jordan

Local aware song order

1140. By Andreas Preikschat

Add OpenLP1 bible importer

1141. By Tim Bentley

Fix song imports with missing Authors

1142. By Andreas Preikschat

- 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

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

1144. By Meinert Jordan

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>

- "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

Whitespace cleanup

1147. By Tim Bentley

Fix Custom edit bug

1148. By andreas <andreas@andypc>

White Space Cleanups

1149. By Meinert Jordan

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

Fix image bug in service manager

1151. By andreas <andreas@andypc>

- 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>

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

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

1154. By Tim Bentley

Bug #692684: Theme Wizard not updating

1155. By Tim Bentley

Fix config tag error

1156. By Tim Bentley

Remove Bible add to existing setting

1157. By andreas <andreas@andypc>

Fix file extensions

1158. By Andreas Preikschat

Added the "final credit" from version 1.

1159. By Tim Bentley

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

1160. By Jon Tibble

Cleanups

1161. By andreas <andreas@andypc>

Add Language files

1162. By Meinert Jordan

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

1163. By Tim Bentley

Fix up theme delete / rename validation for now.

1164. By Raoul Snyman

Web interface does not always send all necessary data

1165. By Tim Bentley

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

1166. By andreas <andreas@andypc>

Part of corrections to display sizes

1167. By Tim Bentley

Version and Copyright Year updates

1168. By andreas <andreas@andypc>

Update Language files

1169. By rimach <rimach@siduxbox>

SongBeamer fixes
Correct Song Tab error

1170. By andreas <andreas@andypc>

Fix Slidecontroller sizing

1171. By Tim Bentley

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

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

1173. By Tim Bentley

Fix up presentation display bugs.

1174. By Andreas Preikschat

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

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

1176. By Meinert Jordan <email address hidden>

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>

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

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

1179. By Raoul Snyman

Fix some bugs I accidentally introduced into trunk.

1180. By Raoul Snyman

Fixed bug #641661

1181. By Tim Bentley

Add a Busy Cursor

1182. By Tim Bentley

Remove excessiove debugging

1183. By Raoul Snyman

Added a step to update from bzr before building.

1184. By Tim Bentley

Fix Song dialog for new songs
Fix Auto Service Opening

1185. By Andreas Preikschat

- 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

Allow the exit conformation dialog to be disabled

1187. By Raoul Snyman

Fixed bug #697271

1188. By Raoul Snyman

Fix for bug #696979

1189. By Meinert Jordan <email address hidden>

Fix Layout of Settings Tab and other dialogs

1190. By Tim Bentley

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

Remove not supported html from songs being imported.

1192. By Meinert Jordan

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

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

1194. By Jon Tibble

Cleanups

1195. By Meinert Jordan

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

1196. By Meinert Jordan

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

Few more cleanups
Fix BibleGateway xrefs (Bug #700271)

1198. By Jon Tibble

Refactor out first_item

1199. By Tim Bentley

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

This time with changes sorry.

1201. By Meinert Jordan

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

1202. By Meinert Jordan

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

- 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

Correct File Filter and Cleanup

1205. By Andreas Preikschat

- 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

Refactor web bibles

1207. By Jon Tibble

Cleanups

1208. By Jon Tibble

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

1209. By Tim Bentley

Hide theme delete button for default themes

1210. By Andreas Preikschat

Cleanups

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

1211. By Tim Bentley

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

1212. By Jon Tibble

Fix BibleGateway code
Make BibleServer code more robust

1213. By Jon Tibble

Cleanups and refactor unicode file check

1214. By Andreas Preikschat

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

1215. By Andreas Preikschat

Fix slidecontroller resizing and cleanups

1216. By Jon Tibble

Refactor wizards
Smaller refactor to web bibles
Cleanups

1217. By Jon Tibble

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

1218. By Tim Bentley

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

Refactor error messages

1220. By Jon Tibble

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

1221. By Jon Tibble

Fix song validation and saving

1222. By Andreas Preikschat

Update preview image on background changes

1223. By Garrett

Enable cursor hiding over live display

1224. By Jon Tibble

Lots of small refactors and cleanups

1225. By Andreas Preikschat

Fixes to Service Item Order screen

1226. By Mattias P&#245;ldaru <email address hidden>

Easislides import plugin

1227. By Jon Tibble

Fix song saving with a verse order

1228. By Andreas Preikschat

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

1229. By andreas <andreas@andypc>

Translations Update

1230. By Jon Tibble

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

1231. By Andreas Preikschat

Update songs for multi-language lyrics

1232. By Andreas Preikschat

Better button handling

1233. By Tim Bentley

Fix adding Images to existing service items

1234. By Jon Tibble

Cleanups and bible parsing fix

1235. By Tim Bentley

Add Key Actions to Shortcut Dialogs

1236. By Jon Tibble

Fix breakage and cleanups

1237. By Andreas Preikschat

Service item selection (Bug #598393)

1238. By Jon Tibble

Refactors in UNO and EasiSlides

1239. By Jon Tibble

Fix BaseDirectory check (Bug #706202)

1240. By Tim Bentley

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

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

1242. By Andreas Preikschat

- 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

Fix Windows AppLocation (Bug #706396)

1244. By Tim Bentley

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

- 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

Allows the update check on load to be disabled

1247. By Tim Bentley

Added finish replacement cleanup

1248. By Jon Tibble

Fix theme editing and NGU bible usage

1249. By Jon Tibble

Lots of cleanups and refactors

1250. By Jon Tibble

Fix CSV bible importing (bug #687309)

1251. By andreas <andreas@andypc>

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

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

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

1254. By Andreas Preikschat

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

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

Deduplication

1257. By Tim Bentley

Fix Theme font size

1258. By andreas <andreas@andypc>

Add ability to print OOS document

1259. By Jon Tibble

Fix song edit form and cleanups

1260. By Andreas Preikschat

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

1261. By Jon Tibble

Deduplication, naming and various cleanups

1262. By Jon Tibble

Fix custom edit (Bug #711934)

1263. By Jon Tibble

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

Enhanced the button behaviour on the alert dialog.

1265. By Andreas Preikschat

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

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

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

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

1269. By Jon Tibble

Cleanup, speedup and another UI library component

1270. By Jon Tibble

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

1271. By Tim Bentley

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

1272. By Raoul Snyman

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

1273. By Tim Bentley

Fix up theme popups

1274. By Jon Tibble

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

1275. By Andreas Preikschat

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

1276. By Andreas Preikschat

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

1277. By Andreas Preikschat

- 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

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

Fix previews after screen blanking on live controller

1280. By Jon Tibble

Fixes and UI valign component

1281. By Jon Tibble

Fix last commit

1282. By Jon Tibble

UI library - UiStrings

1283. By Jon Tibble

Fixes and translation deduplication

1284. By Raoul Snyman

Fixed up some of the docstrings and updated the documentation.

1285. By Raoul Snyman

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>

- 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>

Open Data Folder

1288. By Jon Tibble

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

1289. By Andreas Preikschat

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

1290. By Jon Tibble

Refactor and rename listviews for DnD
Wizard refactors
Cleanups

1291. By Jon Tibble

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

1292. By Tim Bentley

Fix reference to none object

1293. By Jon Tibble

Fix data directory paths

1294. By Andreas Preikschat

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

1295. By Jon Tibble

Fixes

1296. By Tim Bentley

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

Importer for SongShow Plus

1298. By Raoul Snyman

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

1299. By andreas <andreas@andypc>

Implemented a new bible search edit.

1300. By Tim Bentley

Fix up the Video length calculation code

1301. By Jon Tibble

Unicode and translation grammar fixes

1302. By Jon Tibble

Fix song overwrite and cleanups

1303. By mahfiaz

filesystem encoding fix for non-ascii home dir

1304. By Raoul Snyman

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

1305. By rimach

A couple of bug fixes and minor enhancements.

1306. By Mattias P&#245;ldaru <email address hidden>

Fix EasiSlides importer

1307. By Andreas Preikschat

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

1308. By Andreas Preikschat

- 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

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

1310. By mahfiaz

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

Fix mime data string

1312. By Jon Tibble

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

Fixed up a few things in the documentation.

1314. By Raoul Snyman

Added a README.txt file for Python distribution.

1315. By Jon Tibble

Fix CCLI author import

1316. By Mattias P&#245;ldaru <email address hidden>

Fix two missing objects

1317. By Tim Bentley

Revised Print Dialog and fix Preview Edit

1318. By mahfiaz

Log media extensions.

1319. By Andreas Preikschat

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

1320. By Mattias P&#245;ldaru <email address hidden>

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

1321. By Tim Bentley

Move the DisplayTab dialog

1322. By Tim Bentley

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

1323. By Raoul Snyman

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

1324. By Andreas Preikschat

Added apocrypha to osis import.

1325. By Mattias P&#245;ldaru <email address hidden>

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>

Add importfilter for foilpresenter song files

1327. By Andreas Preikschat

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

1328. By Raoul Snyman

Add the option to change the default display.

1329. By Jon Tibble

Fixes and cleanups

1330. By Raoul Snyman

Add Armin to the copyright notice.

1331. By Andreas Preikschat

Moved redundant code to parent class

1332. By Jon Tibble

Fix missing verse handling

1333. By Armin K&#246;hler <email address hidden>

adapted the handling of author unknown in foilpresenter song importer

1334. By Jon Tibble

Fix non-saving OpenLyrics authors (Bug 724568)

1335. By Raoul Snyman

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

1336. By Andreas Preikschat

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

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

1338. By Tim Bentley

Move Display Tag Menu Item

1339. By Tim Bentley

Small cleanup

1340. By Armin Köhler

Bug fixes.

1341. By Jon Tibble

Fix Jesus' words in BibleGateway parsing.

1342. By Matthias Hub

OS X build scripts

1343. By Tim Bentley

Fix toolbar separator.

1344. By Raoul Snyman

Updated translations.

1345. By Tim Bentley

Fix hide mouse error

1346. By Andreas Preikschat

Code Cleanups

1347. By mahfiaz

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

1348. By Andreas Preikschat

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

1349. By mahfiaz

Fixed bug #728637

1350. By Tim Bentley

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

1351. By Raoul Snyman

Updated the translations again.

1352. By Andreas Preikschat

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

1353. By Andreas Preikschat

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

1354. By Jon Tibble

Cleanups

1355. By Raoul Snyman

Updated the credits.

1356. By Tim Bentley

Fix not flagging of service item changes

1357. By Andreas Preikschat

- 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

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

Add first time wizard

1360. By Tim Bentley

Stop Wizard eating songs databases

1361. By Andreas Preikschat

Fixed Bug #727710

1362. By Raoul Snyman

Added an initial Gentoo ebuild file.

1363. By Andreas Preikschat

Added some more debug information.

1364. By Tim Bentley

First time wizard improvements

1365. By Jon Tibble

Cleanups

1366. By Jon Tibble

UiStrings.OpenFile

1367. By Jon Tibble

Head r1366

1368. By Jon Tibble

Head r1373

1369. By Jon Tibble

Unused import

1370. By Jon Tibble

Unused variables

1371. By Jon Tibble

Head r1374

1372. By Jon Tibble

Head r1377

1373. By Jon Tibble

Head r1379

1374. By Jon Tibble

Head r1388

1375. By Jon Tibble

Head r1389

1376. By Jon Tibble

Head r1390

1377. By Jon Tibble

Fix typo

1378. By Jon Tibble

Head r1391

1379. By Jon Tibble

Head r1396

1380. By Jon Tibble

Head r1401

1381. By Jon Tibble

Head r1405

1382. By Jon Tibble

Unused import

1383. By Jon Tibble

Long line

1384. By Jon Tibble

Head r1408

1385. By Jon Tibble

Head r1414

1386. By Jon Tibble

Head r1419

1387. By Jon Tibble

Head r1421

1388. By Jon Tibble

Head r1427

1389. By Jon Tibble

Head r1428

1390. By Jon Tibble

Alignment

1391. By Jon Tibble

Head r1441

1392. By Jon Tibble

Head r1451

1393. By Jon Tibble

Head 1495

1394. By Jon Tibble

Head r1804

1395. By Jon Tibble

Cleanups

1396. By Jon Tibble

Fix undefined variables

1397. By Jon Tibble

Head r1812

1398. By Jon Tibble

Cleanups

1399. By Jon Tibble

Cleanup fix

1400. By Jon Tibble

Whitespace

1401. By Jon Tibble

Revert broken old incomplete thought

1402. By Jon Tibble

Fix spacing

1403. By Jon Tibble

Head r1815

1404. By Jon Tibble

Head r1819

1405. By Jon Tibble

Reduce recent file list duplication (Bug #892668)

1406. By Jon Tibble

Fix non-ascii service filename loading

1407. By Jon Tibble

Head r1821

1408. By Jon Tibble

Fix non-ascii file check on Macs

1409. By Jon Tibble

Head r1824

1410. By Jon Tibble

Head r1829

1411. By Jon Tibble

Head r1831

1412. By Jon Tibble

Fix v1 theme importing

1413. By Jon Tibble

Previous fix broke on non-Windows, try again

1414. By Jon Tibble

Fix logging theme names

1415. By Jon Tibble

Head r1834

1416. By Jon Tibble

Head r1856

1417. By Jon Tibble

Fix unused imports

1418. By Jon Tibble

Head r1859

1419. By Jon Tibble

Dedupe media search

1420. By Jon Tibble

Head r1860

1421. By Jon Tibble

Long line

1422. By Jon Tibble

Indentation

1423. By Jon Tibble

Fix crashes in media settings (Bug #908252)

1424. By Jon Tibble

Head r1863

1425. By Jon Tibble

Head r1866

1426. By Jon Tibble

Head r1868

1427. By Jon Tibble

Head r1897

1428. By Jon Tibble

Unused imports

1429. By Jon Tibble

Head r1901

1430. By Jon Tibble

Cleanups

1431. By Jon Tibble

Head r1902

1432. By Jon Tibble

Unused variables

1433. By Jon Tibble

Head r1903

1434. By Jon Tibble

Head r1904

1435. By Jon Tibble

Head r1906

1436. By Jon Tibble

Bugs #888815 #941966

1437. By Jon Tibble

Head r1908

1438. By Jon Tibble

Head r1909

1439. By Jon Tibble

Head r1910

1440. By Jon Tibble

Head r1912

1441. By Jon Tibble

Head r1917

1442. By Jon Tibble

Head r1941

1443. By Jon Tibble

Head r1973

1444. By Jon Tibble

Head r1978

1445. By Jon Tibble

Head r2003

Unmerged revisions

1445. By Jon Tibble

Head r2003

1444. By Jon Tibble

Head r1978

1443. By Jon Tibble

Head r1973

1442. By Jon Tibble

Head r1941

1441. By Jon Tibble

Head r1917

1440. By Jon Tibble

Head r1912

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cnvdb.py'
2--- cnvdb.py 2009-09-08 19:58:05 +0000
3+++ cnvdb.py 2009-09-25 14:24:23 +0000
4@@ -25,7 +25,6 @@
5
6 import codecs
7 import sys
8-import chardet
9
10 def convert_file(inname, outname):
11 """
12
13=== modified file 'demo.py'
14--- demo.py 2009-09-08 19:58:05 +0000
15+++ demo.py 2009-09-25 14:24:23 +0000
16@@ -25,7 +25,7 @@
17 import sys
18 import time
19
20-from PyQt4 import QtGui, QtCore
21+from PyQt4 import QtGui
22
23 from openlp.core import Renderer
24 from openlp.theme import Theme
25
26=== modified file 'documentation/source/conf.py'
27--- documentation/source/conf.py 2009-09-03 21:41:34 +0000
28+++ documentation/source/conf.py 2009-09-25 14:24:23 +0000
29@@ -11,7 +11,8 @@
30 # All configuration values have a default; values that are commented out
31 # serve to show the default.
32
33-import sys, os
34+import os
35+import sys
36
37 # If extensions (or modules to document with autodoc) are in another directory,
38 # add these directories to sys.path here. If the directory is relative to the
39
40=== modified file 'openlp/core/lib/baselistwithdnd.py'
41--- openlp/core/lib/baselistwithdnd.py 2009-09-12 17:24:16 +0000
42+++ openlp/core/lib/baselistwithdnd.py 2009-09-25 14:24:23 +0000
43@@ -22,12 +22,9 @@
44 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
45 ###############################################################################
46
47-import types
48-
49 from PyQt4 import QtCore, QtGui
50
51 from openlp.core.lib.toolbar import *
52-from openlp.core.lib import translate
53
54 class BaseListWithDnD(QtGui.QListWidget):
55 """
56
57=== modified file 'openlp/core/lib/dockwidget.py'
58--- openlp/core/lib/dockwidget.py 2009-09-19 11:25:01 +0000
59+++ openlp/core/lib/dockwidget.py 2009-09-25 14:24:23 +0000
60@@ -22,10 +22,9 @@
61 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
62 ###############################################################################
63
64-import types
65 import logging
66
67-from PyQt4 import QtCore, QtGui
68+from PyQt4 import QtGui
69
70 class OpenLPDockWidget(QtGui.QDockWidget):
71 """
72
73=== modified file 'openlp/core/lib/renderer.py'
74--- openlp/core/lib/renderer.py 2009-09-21 23:11:50 +0000
75+++ openlp/core/lib/renderer.py 2009-09-25 14:24:23 +0000
76@@ -23,8 +23,6 @@
77 ###############################################################################
78
79 import logging
80-import os
81-import sys
82
83 from PyQt4 import QtGui, QtCore
84
85
86=== modified file 'openlp/core/lib/rendermanager.py'
87--- openlp/core/lib/rendermanager.py 2009-09-21 23:11:50 +0000
88+++ openlp/core/lib/rendermanager.py 2009-09-25 14:24:23 +0000
89@@ -23,9 +23,6 @@
90 ###############################################################################
91
92 import logging
93-import os
94-import sys
95-import linecache
96
97 from PyQt4 import QtGui, QtCore
98
99
100=== modified file 'openlp/core/lib/serviceitem.py'
101--- openlp/core/lib/serviceitem.py 2009-09-21 23:11:50 +0000
102+++ openlp/core/lib/serviceitem.py 2009-09-25 14:24:23 +0000
103@@ -24,9 +24,8 @@
104
105 import logging
106 import os
107-import time
108
109-from PyQt4 import QtCore, QtGui
110+from PyQt4 import QtGui
111
112 from openlp.core.lib import buildIcon
113
114
115=== modified file 'openlp/core/lib/settingstab.py'
116--- openlp/core/lib/settingstab.py 2009-09-08 19:58:05 +0000
117+++ openlp/core/lib/settingstab.py 2009-09-25 14:24:23 +0000
118@@ -22,7 +22,7 @@
119 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
120 ###############################################################################
121
122-from PyQt4 import QtCore, QtGui
123+from PyQt4 import QtGui
124
125 from openlp.core.lib import PluginConfig
126
127
128=== modified file 'openlp/core/lib/themexmlhandler.py'
129--- openlp/core/lib/themexmlhandler.py 2009-09-08 19:58:05 +0000
130+++ openlp/core/lib/themexmlhandler.py 2009-09-25 14:24:23 +0000
131@@ -25,7 +25,7 @@
132 import os
133
134 from xml.dom.minidom import Document
135-from xml.etree.ElementTree import ElementTree, XML, dump
136+from xml.etree.ElementTree import ElementTree, XML
137
138 from openlp.core.lib import str_to_bool
139
140
141=== modified file 'openlp/core/lib/xmlrootclass.py'
142--- openlp/core/lib/xmlrootclass.py 2009-09-08 19:58:05 +0000
143+++ openlp/core/lib/xmlrootclass.py 2009-09-25 14:24:23 +0000
144@@ -22,9 +22,8 @@
145 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
146 ###############################################################################
147
148-import platform
149+import os
150 import sys
151-import os
152 from types import StringType, NoneType, UnicodeType
153
154 from xml.etree.ElementTree import ElementTree, XML
155
156=== modified file 'openlp/core/test/test_mediamanageritem.py'
157--- openlp/core/test/test_mediamanageritem.py 2009-09-03 15:19:30 +0000
158+++ openlp/core/test/test_mediamanageritem.py 2009-09-25 14:24:23 +0000
159@@ -1,5 +1,11 @@
160+import logging
161+import os
162+import sys
163+
164 from PyQt4 import QtCore, QtGui
165-import logging
166+
167+from openlp.core.lib import MediaManagerItem
168+
169 logging.basicConfig(level=logging.DEBUG,
170 format='%(asctime)s %(name)-30s %(levelname)-8s %(message)s',
171 datefmt='%m-%d %H:%M',
172@@ -12,14 +18,11 @@
173 # tell the handler to use this format
174 console.setFormatter(formatter)
175 logging.getLogger(u'').addHandler(console)
176-log=logging.getLogger(u'')
177-
178+log = logging.getLogger(u'')
179 logging.info(u'Logging started')
180-import os, sys
181-mypath=os.path.split(os.path.abspath(__file__))[0]
182-
183+mypath = os.path.split(os.path.abspath(__file__))[0]
184 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
185-from openlp.core.lib import MediaManagerItem
186+
187 class TestMediaManager:
188 def setup_class(self):
189 self.app = QtGui.QApplication([])
190
191=== modified file 'openlp/core/test/test_plugin_manager.py'
192--- openlp/core/test/test_plugin_manager.py 2009-09-06 13:57:32 +0000
193+++ openlp/core/test/test_plugin_manager.py 2009-09-25 14:24:23 +0000
194@@ -1,5 +1,7 @@
195 import logging
196-import os, sys
197+import os
198+import sys
199+
200 from openlp.core.lib.pluginmanager import PluginManager
201
202 logging.basicConfig(level=logging.DEBUG,
203@@ -14,11 +16,9 @@
204 # tell the handler to use this format
205 console.setFormatter(formatter)
206 logging.getLogger(u'').addHandler(console)
207-log=logging.getLogger(u'')
208-
209+log = logging.getLogger(u'')
210 logging.info(u'Logging started')
211-mypath=os.path.split(os.path.abspath(__file__))[0]
212-
213+mypath = os.path.split(os.path.abspath(__file__))[0]
214 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
215
216 # test the plugin manager with some plugins in the test_plugins directory
217
218=== modified file 'openlp/core/test/test_render.py'
219--- openlp/core/test/test_render.py 2009-09-06 15:26:02 +0000
220+++ openlp/core/test/test_render.py 2009-09-25 14:24:23 +0000
221@@ -16,9 +16,9 @@
222 Place, Suite 330, Boston, MA 02111-1307 USA
223 """
224
225-import time
226 import sys
227 import os, os.path
228+
229 from PyQt4 import QtGui, QtCore
230
231 from openlp.core.theme import Theme
232
233=== modified file 'openlp/core/test/test_render_theme.py'
234--- openlp/core/test/test_render_theme.py 2009-09-06 15:26:02 +0000
235+++ openlp/core/test/test_render_theme.py 2009-09-25 14:24:23 +0000
236@@ -21,7 +21,6 @@
237 from PyQt4 import QtGui, QtCore
238
239 from openlp.core.theme import Theme
240-from openlp.core import Renderer
241 from test_render import TestRender_base, whoami
242
243 pypath = os.path.split(os.path.abspath(__file__))[0]
244
245=== modified file 'openlp/core/theme/theme.py'
246--- openlp/core/theme/theme.py 2009-09-08 19:58:05 +0000
247+++ openlp/core/theme/theme.py 2009-09-25 14:24:23 +0000
248@@ -22,10 +22,9 @@
249 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
250 ###############################################################################
251
252-import platform
253 import types
254+
255 from xml.etree.ElementTree import ElementTree, XML
256-
257 from PyQt4 import QtGui
258
259 DelphiColors={"clRed":0xFF0000,
260
261=== modified file 'openlp/core/ui/__init__.py'
262--- openlp/core/ui/__init__.py 2009-09-21 17:56:36 +0000
263+++ openlp/core/ui/__init__.py 2009-09-25 14:24:23 +0000
264@@ -38,6 +38,6 @@
265 from thememanager import ThemeManager
266 from mainwindow import MainWindow
267
268-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
269- 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager',
270- 'ThemeManager', 'AmendThemeForm']
271+__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
272+ 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
273+ 'AmendThemeForm']
274
275=== modified file 'openlp/core/ui/amendthemeform.py'
276--- openlp/core/ui/amendthemeform.py 2009-09-24 01:37:21 +0000
277+++ openlp/core/ui/amendthemeform.py 2009-09-25 14:24:23 +0000
278@@ -26,9 +26,8 @@
279 import os, os.path
280
281 from PyQt4 import QtCore, QtGui
282-from openlp.core.lib import ThemeXML, Renderer, file_to_xml, str_to_bool, \
283- translate
284
285+from openlp.core.lib import ThemeXML, file_to_xml, translate
286 from amendthemedialog import Ui_AmendThemeDialog
287
288 log = logging.getLogger(u'AmendThemeForm')
289
290=== modified file 'openlp/core/ui/maindisplay.py'
291--- openlp/core/ui/maindisplay.py 2009-09-21 19:26:10 +0000
292+++ openlp/core/ui/maindisplay.py 2009-09-25 14:24:23 +0000
293@@ -25,8 +25,7 @@
294 import logging
295 from PyQt4 import QtCore, QtGui
296
297-from time import sleep
298-from openlp.core.lib import translate, Receiver
299+from openlp.core.lib import Receiver
300
301 class MainDisplay(QtGui.QWidget):
302 """
303
304=== modified file 'openlp/core/ui/mainwindow.py'
305--- openlp/core/ui/mainwindow.py 2009-09-23 18:49:26 +0000
306+++ openlp/core/ui/mainwindow.py 2009-09-25 14:24:23 +0000
307@@ -30,11 +30,9 @@
308 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
309 ServiceManager, ThemeManager, MainDisplay, SlideController, \
310 PluginForm
311-from openlp.core.lib import translate, Plugin, MediaManagerItem, \
312- SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
313- SettingsManager, PluginManager, Receiver
314+from openlp.core.lib import translate, RenderManager, PluginConfig, \
315+ OpenLPDockWidget, SettingsManager, PluginManager, Receiver
316
317-from openlp.core.utils import ConfigHelper
318
319 class Ui_MainWindow(object):
320 def setupUi(self, MainWindow):
321
322=== modified file 'openlp/core/ui/servicemanager.py'
323--- openlp/core/ui/servicemanager.py 2009-09-21 17:56:36 +0000
324+++ openlp/core/ui/servicemanager.py 2009-09-25 14:24:23 +0000
325@@ -23,18 +23,14 @@
326 ###############################################################################
327
328 import os
329-import sys
330 import string
331 import logging
332 import cPickle
333 import zipfile
334-import shutil
335
336 from PyQt4 import QtCore, QtGui
337 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
338- RenderManager, translate, buildIcon, ServiceType, \
339- contextMenuAction, contextMenuSeparator, Receiver
340-from openlp.core.utils import ConfigHelper
341+ translate, ServiceType, contextMenuAction, contextMenuSeparator, Receiver
342
343 class ServiceManagerList(QtGui.QTreeWidget):
344
345
346=== modified file 'openlp/core/ui/settingsform.py'
347--- openlp/core/ui/settingsform.py 2009-09-20 15:45:33 +0000
348+++ openlp/core/ui/settingsform.py 2009-09-25 14:24:23 +0000
349@@ -24,9 +24,8 @@
350
351 import logging
352
353-from PyQt4 import QtCore, QtGui
354+from PyQt4 import QtGui
355
356-from openlp.core.lib import SettingsTab
357 from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
358 from settingsdialog import Ui_SettingsDialog
359
360
361=== modified file 'openlp/core/ui/slidecontroller.py'
362--- openlp/core/ui/slidecontroller.py 2009-09-21 17:56:36 +0000
363+++ openlp/core/ui/slidecontroller.py 2009-09-25 14:24:23 +0000
364@@ -23,12 +23,10 @@
365 ###############################################################################
366
367 import logging
368-import os
369 import time
370
371 from PyQt4 import QtCore, QtGui
372-from openlp.core.lib import OpenLPToolbar, translate, buildIcon, Receiver, \
373- ServiceType, RenderManager, SettingsManager
374+from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType
375
376 class SlideList(QtGui.QTableWidget):
377 """
378
379=== modified file 'openlp/core/ui/test/test_service_manager.py'
380--- openlp/core/ui/test/test_service_manager.py 2009-09-19 21:45:50 +0000
381+++ openlp/core/ui/test/test_service_manager.py 2009-09-25 14:24:23 +0000
382@@ -16,20 +16,18 @@
383 Place, Suite 330, Boston, MA 02111-1307 USA
384 """
385
386-import time
387 import sys
388 import os, os.path
389 import logging
390-from PyQt4 import QtGui, QtCore
391-from PyQt4.QtCore import *
392-from PyQt4.QtGui import *
393+
394+from PyQt4 import QtGui
395+
396+from openlp.core.ui import ServiceManager
397+from openlp.plugins.images.lib import ImageServiceItem
398
399 mypath = os.path.split(os.path.abspath(__file__))[0]
400 sys.path.insert(0, (os.path.join(mypath, '..', '..', '..', '..')))
401
402-from openlp.core.ui import ServiceManager
403-from openlp.plugins.images.lib import ImageServiceItem
404-
405 logging.basicConfig(filename='test_service_manager.log', level=logging.INFO,
406 filemode='w')
407
408
409=== modified file 'openlp/core/ui/thememanager.py'
410--- openlp/core/ui/thememanager.py 2009-09-24 01:37:21 +0000
411+++ openlp/core/ui/thememanager.py 2009-09-25 14:24:23 +0000
412@@ -23,7 +23,6 @@
413 ###############################################################################
414
415 import os
416-import sys
417 import zipfile
418 import shutil
419 import logging
420@@ -31,10 +30,10 @@
421 from xml.etree.ElementTree import ElementTree, XML
422 from PyQt4 import QtCore, QtGui
423
424-from openlp.core.ui import AmendThemeForm, ServiceManager
425+from openlp.core.ui import AmendThemeForm
426 from openlp.core.theme import Theme
427-from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, Renderer, \
428- translate, str_to_bool, file_to_xml, buildIcon, Receiver
429+from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, translate, \
430+ str_to_bool, file_to_xml, buildIcon, Receiver
431 from openlp.core.utils import ConfigHelper
432
433 class ThemeManager(QtGui.QWidget):
434
435=== modified file 'openlp/core/utils/registry.py'
436--- openlp/core/utils/registry.py 2009-09-08 19:58:05 +0000
437+++ openlp/core/utils/registry.py 2009-09-25 14:24:23 +0000
438@@ -23,7 +23,7 @@
439 ###############################################################################
440
441 import os
442-import sys
443+
444 from ConfigParser import SafeConfigParser
445
446 class Registry(object):
447
448=== modified file 'openlp/migration/migratebibles.py'
449--- openlp/migration/migratebibles.py 2009-09-08 19:58:05 +0000
450+++ openlp/migration/migratebibles.py 2009-09-25 14:24:23 +0000
451@@ -22,8 +22,6 @@
452 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
453 ###############################################################################
454
455-import logging
456-
457 class MigrateBibles():
458 def __init__(self, display):
459 self.display = display
460
461=== modified file 'openlp/migration/migratesongs.py'
462--- openlp/migration/migratesongs.py 2009-09-21 23:11:50 +0000
463+++ openlp/migration/migratesongs.py 2009-09-25 14:24:23 +0000
464@@ -24,17 +24,15 @@
465
466 import os
467 import sys
468-import logging
469 import sqlite3
470-from openlp.core.lib import PluginConfig
471
472 from sqlalchemy import *
473-from sqlalchemy.sql import select
474 from sqlalchemy import create_engine
475-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \
476- clear_mappers
477-from openlp.plugins.songs.lib.models import metadata, session, \
478- engine, songs_table, Song, Author, Topic, Book
479+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
480+
481+from openlp.core.lib import PluginConfig
482+from openlp.plugins.songs.lib.models import metadata, songs_table, Song, \
483+ Author, Topic, Book
484 from openlp.plugins.songs.lib.tables import *
485 from openlp.plugins.songs.lib.classes import *
486
487
488=== modified file 'openlp/plugins/audit/lib/audittab.py'
489--- openlp/plugins/audit/lib/audittab.py 2009-09-23 15:51:03 +0000
490+++ openlp/plugins/audit/lib/audittab.py 2009-09-25 14:24:23 +0000
491@@ -22,9 +22,9 @@
492 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
493 ###############################################################################
494
495-from PyQt4 import QtCore, QtGui
496+from PyQt4 import QtGui
497
498-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
499+from openlp.core.lib import SettingsTab, translate, Receiver
500
501 class AuditTab(SettingsTab):
502 """
503
504=== modified file 'openlp/plugins/audit/lib/manager.py'
505--- openlp/plugins/audit/lib/manager.py 2009-09-23 17:36:22 +0000
506+++ openlp/plugins/audit/lib/manager.py 2009-09-25 14:24:23 +0000
507@@ -22,15 +22,10 @@
508 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
509 ###############################################################################
510
511-import os, os.path
512-import sys
513-
514-from sqlalchemy import asc, desc
515-from openlp.plugins.audit.lib.models import init_models, metadata, session, \
516- engine, AuditItem, audit_table
517-
518 import logging
519
520+from openlp.plugins.audit.lib.models import init_models, metadata, AuditItem
521+
522 class AuditManager():
523 """
524 The Song Manager provides a central location for all database code. This
525
526=== modified file 'openlp/plugins/audit/lib/meta.py'
527--- openlp/plugins/audit/lib/meta.py 2009-09-24 04:32:24 +0000
528+++ openlp/plugins/audit/lib/meta.py 2009-09-25 14:24:23 +0000
529@@ -24,7 +24,6 @@
530
531
532 from sqlalchemy import MetaData
533-from sqlalchemy.orm import scoped_session, sessionmaker
534
535 __all__ = ['session', 'metadata', 'engine']
536
537
538=== modified file 'openlp/plugins/audit/lib/models.py'
539--- openlp/plugins/audit/lib/models.py 2009-09-23 15:51:03 +0000
540+++ openlp/plugins/audit/lib/models.py 2009-09-25 14:24:23 +0000
541@@ -23,9 +23,9 @@
542 ###############################################################################
543
544 from sqlalchemy import create_engine
545-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
546+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
547
548-from openlp.plugins.audit.lib.meta import session, metadata, engine
549+from openlp.plugins.audit.lib.meta import metadata
550 from openlp.plugins.audit.lib.tables import *
551 from openlp.plugins.audit.lib.classes import *
552
553
554=== modified file 'openlp/plugins/audit/lib/tables.py'
555--- openlp/plugins/audit/lib/tables.py 2009-09-24 04:48:12 +0000
556+++ openlp/plugins/audit/lib/tables.py 2009-09-25 14:24:23 +0000
557@@ -22,7 +22,7 @@
558 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
559 ###############################################################################
560
561-from sqlalchemy import Column, Table, ForeignKey, types
562+from sqlalchemy import Column, Table, types
563
564 from openlp.plugins.audit.lib.meta import metadata
565
566
567=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
568--- openlp/plugins/bibles/forms/bibleimportform.py 2009-09-21 17:56:36 +0000
569+++ openlp/plugins/bibles/forms/bibleimportform.py 2009-09-25 14:24:23 +0000
570@@ -22,11 +22,8 @@
571 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
572 ###############################################################################
573
574-import sys
575+import logging
576 import os, os.path
577-import sys
578-import time
579-import logging
580
581 from PyQt4 import QtCore, QtGui
582
583
584=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
585--- openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-21 17:56:36 +0000
586+++ openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-25 14:24:23 +0000
587@@ -25,11 +25,9 @@
588 import logging
589 import chardet
590
591-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
592 from openlp.plugins.bibles.lib.common import BibleCommon
593 from openlp.core.lib import Receiver
594
595-
596 class BibleCSVImpl(BibleCommon):
597 global log
598 log=logging.getLogger(u'BibleCSVImpl')
599
600=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
601--- openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-21 23:11:50 +0000
602+++ openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-25 14:24:23 +0000
603@@ -26,7 +26,6 @@
604 import logging
605
606 from common import BibleCommon
607-from openlp.core.utils import ConfigHelper
608 from openlp.plugins.bibles.lib.models import *
609
610 class BibleDBImpl(BibleCommon):
611
612=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
613--- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-21 23:11:50 +0000
614+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-25 14:24:23 +0000
615@@ -22,14 +22,10 @@
616 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
617 ###############################################################################
618
619-import os, os.path
620-import sys
621-import urllib2
622+import logging
623
624 from common import BibleCommon, SearchResults
625
626-import logging
627-
628 class BGExtract(BibleCommon):
629 global log
630 log=logging.getLogger(u'BibleHTTPMgr(BG_extract)')
631
632=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
633--- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-21 23:11:50 +0000
634+++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-25 14:24:23 +0000
635@@ -30,7 +30,6 @@
636
637 from PyQt4 import QtCore
638
639-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
640 from openlp.core.lib import Receiver
641
642 class BibleOSISImpl():
643
644=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
645--- openlp/plugins/bibles/lib/biblestab.py 2009-09-21 17:56:36 +0000
646+++ openlp/plugins/bibles/lib/biblestab.py 2009-09-25 14:24:23 +0000
647@@ -24,7 +24,7 @@
648
649 import logging
650
651-from PyQt4 import Qt, QtCore, QtGui
652+from PyQt4 import QtCore, QtGui
653
654 from openlp.core.lib import translate, str_to_bool, Receiver
655 from openlp.core.lib import SettingsTab
656
657=== modified file 'openlp/plugins/bibles/lib/common.py'
658--- openlp/plugins/bibles/lib/common.py 2009-09-08 19:58:05 +0000
659+++ openlp/plugins/bibles/lib/common.py 2009-09-25 14:24:23 +0000
660@@ -22,9 +22,6 @@
661 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
662 ###############################################################################
663
664-import os
665-import os.path
666-import sys
667 import urllib2
668 import chardet
669 import logging
670
671=== modified file 'openlp/plugins/bibles/lib/manager.py'
672--- openlp/plugins/bibles/lib/manager.py 2009-09-21 23:11:50 +0000
673+++ openlp/plugins/bibles/lib/manager.py 2009-09-25 14:24:23 +0000
674@@ -24,14 +24,11 @@
675
676 import logging
677 import os
678-import sys
679
680-from common import SearchResults
681 from bibleOSISimpl import BibleOSISImpl
682 from bibleCSVimpl import BibleCSVImpl
683 from bibleDBimpl import BibleDBImpl
684 from bibleHTTPimpl import BibleHTTPImpl
685-from openlp.core.lib import Receiver
686
687 class BibleMode(object):
688 Full = 1
689
690=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
691--- openlp/plugins/bibles/lib/mediaitem.py 2009-09-21 23:11:50 +0000
692+++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-25 14:24:23 +0000
693@@ -27,8 +27,8 @@
694
695 from PyQt4 import QtCore, QtGui
696
697-from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
698- Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD
699+from openlp.core.lib import translate, MediaManagerItem, Receiver, \
700+ contextMenuAction, BaseListWithDnD
701 from openlp.plugins.bibles.forms import BibleImportForm
702 from openlp.plugins.bibles.lib.manager import BibleMode
703
704
705=== modified file 'openlp/plugins/bibles/lib/models.py'
706--- openlp/plugins/bibles/lib/models.py 2009-07-18 05:43:50 +0000
707+++ openlp/plugins/bibles/lib/models.py 2009-09-25 14:24:23 +0000
708@@ -19,7 +19,6 @@
709 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
710 Place, Suite 330, Boston, MA 02111-1307 USA
711 """
712-import string
713
714 from sqlalchemy import Column, Table, MetaData, ForeignKey, types, \
715 create_engine
716
717=== modified file 'openlp/plugins/bibles/test/test_bibleManager.py'
718--- openlp/plugins/bibles/test/test_bibleManager.py 2009-09-03 15:19:30 +0000
719+++ openlp/plugins/bibles/test/test_bibleManager.py 2009-09-25 14:24:23 +0000
720@@ -16,36 +16,33 @@
721 Place, Suite 330, Boston, MA 02111-1307 USA
722 """
723
724-import random
725-import unittest
726-
727+import logging
728 import os, os.path
729 import sys
730-mypath=os.path.split(os.path.abspath(__file__))[0]
731+
732+from openlp.plugins.bibles.lib.biblemanager import BibleManager
733+
734+mypath = os.path.split(os.path.abspath(__file__))[0]
735 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
736
737-from openlp.plugins.bibles.lib.biblemanager import BibleManager
738-from openlp.utils import ConfigHelper
739-
740-import logging
741 logging.basicConfig(level=logging.DEBUG,
742 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
743 datefmt='%m-%d %H:%M',
744 filename='plugins.log',
745 filemode='w')
746
747-console=logging.StreamHandler()
748+console = logging.StreamHandler()
749 # set a format which is simpler for console use
750 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
751 # tell the handler to use this format
752 console.setFormatter(formatter)
753 logging.getLogger(u'').addHandler(console)
754-log=logging.getLogger(u'')
755+log = logging.getLogger(u'')
756
757 logging.info(u'\nLogging started')
758
759 class TestBibleManager:
760- log=logging.getLogger(u'testBibleMgr')
761+ log = logging.getLogger(u'testBibleMgr')
762 def setup_class(self):
763 log.debug(u'\n.......Register BM')
764 self.bm = BibleManager()
765
766=== modified file 'openlp/plugins/bibles/test/test_bibleManagerAPI.py'
767--- openlp/plugins/bibles/test/test_bibleManagerAPI.py 2009-09-03 15:19:30 +0000
768+++ openlp/plugins/bibles/test/test_bibleManagerAPI.py 2009-09-25 14:24:23 +0000
769@@ -16,36 +16,33 @@
770 Place, Suite 330, Boston, MA 02111-1307 USA
771 """
772
773-import random
774-import unittest
775-
776+import logging
777 import os, os.path
778 import sys
779-mypath=os.path.split(os.path.abspath(__file__))[0]
780+
781+from openlp.plugins.biblemanager.bibleManager import BibleManager
782+
783+mypath = os.path.split(os.path.abspath(__file__))[0]
784 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
785
786-from openlp.plugins.biblemanager.bibleManager import BibleManager
787-from openlp.core.utils import ConfigHelper
788-
789-import logging
790 logging.basicConfig(level=logging.DEBUG,
791 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
792 datefmt='%m-%d %H:%M',
793 filename='plugins.log',
794 filemode='w')
795
796-console=logging.StreamHandler()
797+console = logging.StreamHandler()
798 # set a format which is simpler for console use
799 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
800 # tell the handler to use this format
801 console.setFormatter(formatter)
802 logging.getLogger(u'').addHandler(console)
803-log=logging.getLogger(u'')
804+log = logging.getLogger(u'')
805
806 logging.info(u'\nLogging started')
807
808 class TestBibleManager:
809- log=logging.getLogger(u'testBibleMgr')
810+ log = logging.getLogger(u'testBibleMgr')
811 def setup_class(self):
812 log.debug(u'\n.......Register BM')
813 self.bm = BibleManager()
814
815=== modified file 'openlp/plugins/bibles/test/test_bibleManagerCSV.py'
816--- openlp/plugins/bibles/test/test_bibleManagerCSV.py 2009-09-03 15:19:30 +0000
817+++ openlp/plugins/bibles/test/test_bibleManagerCSV.py 2009-09-25 14:24:23 +0000
818@@ -16,36 +16,33 @@
819 Place, Suite 330, Boston, MA 02111-1307 USA
820 """
821
822-import random
823-import unittest
824-
825+import logging
826 import os, os.path
827 import sys
828-mypath=os.path.split(os.path.abspath(__file__))[0]
829+
830+from openlp.plugins.bibles.lib.biblemanager import BibleManager
831+
832+mypath = os.path.split(os.path.abspath(__file__))[0]
833 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
834
835-from openlp.plugins.bibles.lib.biblemanager import BibleManager
836-from openlp.utils import ConfigHelper
837-
838-import logging
839 logging.basicConfig(level=logging.DEBUG,
840 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
841 datefmt='%m-%d %H:%M',
842 filename='plugins.log',
843 filemode='w')
844
845-console=logging.StreamHandler()
846+console = logging.StreamHandler()
847 # set a format which is simpler for console use
848 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
849 # tell the handler to use this format
850 console.setFormatter(formatter)
851 logging.getLogger(u'').addHandler(console)
852-log=logging.getLogger(u'')
853+log = logging.getLogger(u'')
854
855 logging.info(u'\nLogging started')
856
857 class TestBibleManager:
858- log=logging.getLogger(u'testBibleMgr')
859+ log = logging.getLogger(u'testBibleMgr')
860 def setup_class(self):
861 log.debug(u'\n.......Register BM')
862 self.bm = BibleManager()
863
864=== modified file 'openlp/plugins/bibles/test/test_bibleManagerOSIS.py'
865--- openlp/plugins/bibles/test/test_bibleManagerOSIS.py 2009-09-03 15:19:30 +0000
866+++ openlp/plugins/bibles/test/test_bibleManagerOSIS.py 2009-09-25 14:24:23 +0000
867@@ -16,36 +16,33 @@
868 Place, Suite 330, Boston, MA 02111-1307 USA
869 """
870
871-import random
872-import unittest
873-
874+import logging
875 import os, os.path
876 import sys
877-mypath=os.path.split(os.path.abspath(__file__))[0]
878+
879+from openlp.plugins.bibles.lib.biblemanager import BibleManager
880+
881+mypath = os.path.split(os.path.abspath(__file__))[0]
882 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
883
884-from openlp.plugins.bibles.lib.biblemanager import BibleManager
885-from openlp.utils import ConfigHelper
886-
887-import logging
888 logging.basicConfig(level=logging.DEBUG,
889 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
890 datefmt='%m-%d %H:%M',
891 filename='plugins.log',
892 filemode='w')
893
894-console=logging.StreamHandler()
895+console = logging.StreamHandler()
896 # set a format which is simpler for console use
897 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
898 # tell the handler to use this format
899 console.setFormatter(formatter)
900 logging.getLogger(u'').addHandler(console)
901-log=logging.getLogger(u'')
902+log = logging.getLogger(u'')
903
904 logging.info(u'\nLogging started')
905
906 class TestBibleManager:
907- log=logging.getLogger(u'testBibleMgr')
908+ log = logging.getLogger(u'testBibleMgr')
909 def setup_class(self):
910 log.debug(u'\n.......Register BM')
911 self.bm = BibleManager()
912
913=== modified file 'openlp/plugins/custom/customplugin.py'
914--- openlp/plugins/custom/customplugin.py 2009-09-12 18:27:17 +0000
915+++ openlp/plugins/custom/customplugin.py 2009-09-25 14:24:23 +0000
916@@ -24,7 +24,7 @@
917
918 import logging
919
920-from PyQt4 import QtCore, QtGui
921+from PyQt4 import QtGui
922
923 from forms import EditCustomForm
924 from openlp.core.lib import Plugin
925
926=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
927--- openlp/plugins/custom/forms/editcustomform.py 2009-09-22 17:43:07 +0000
928+++ openlp/plugins/custom/forms/editcustomform.py 2009-09-25 14:24:23 +0000
929@@ -22,7 +22,7 @@
930 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
931 ###############################################################################
932
933-from PyQt4 import Qt, QtCore, QtGui
934+from PyQt4 import QtCore, QtGui
935
936 from editcustomdialog import Ui_customEditDialog
937 from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
938
939=== modified file 'openlp/plugins/custom/lib/manager.py'
940--- openlp/plugins/custom/lib/manager.py 2009-09-23 15:51:03 +0000
941+++ openlp/plugins/custom/lib/manager.py 2009-09-25 14:24:23 +0000
942@@ -22,15 +22,10 @@
943 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
944 ###############################################################################
945
946-import os, os.path
947-import sys
948-
949-from sqlalchemy import asc, desc
950-from openlp.plugins.custom.lib.models import init_models, metadata, session, \
951- engine, CustomSlide, custom_slide_table
952-
953 import logging
954
955+from openlp.plugins.custom.lib.models import init_models, metadata, CustomSlide
956+
957 class CustomManager():
958 """
959 The Song Manager provides a central location for all database code. This
960@@ -38,7 +33,7 @@
961 """
962
963 global log
964- log=logging.getLogger(u'CustomManager')
965+ log = logging.getLogger(u'CustomManager')
966 log.info(u'Custom manager loaded')
967
968 def __init__(self, config):
969
970=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
971--- openlp/plugins/custom/lib/mediaitem.py 2009-09-22 17:43:07 +0000
972+++ openlp/plugins/custom/lib/mediaitem.py 2009-09-25 14:24:23 +0000
973@@ -26,8 +26,7 @@
974
975 from PyQt4 import QtCore, QtGui
976
977-from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \
978- translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
979+from openlp.core.lib import MediaManagerItem, SongXMLParser, BaseListWithDnD
980
981 class CustomListView(BaseListWithDnD):
982 def __init__(self, parent=None):
983
984=== modified file 'openlp/plugins/custom/lib/meta.py'
985--- openlp/plugins/custom/lib/meta.py 2009-09-08 19:58:05 +0000
986+++ openlp/plugins/custom/lib/meta.py 2009-09-25 14:24:23 +0000
987@@ -23,7 +23,6 @@
988 ###############################################################################
989
990 from sqlalchemy import MetaData
991-from sqlalchemy.orm import scoped_session, sessionmaker
992
993 __all__ = ['session', 'metadata', 'engine']
994
995
996=== modified file 'openlp/plugins/custom/lib/models.py'
997--- openlp/plugins/custom/lib/models.py 2009-09-08 19:58:05 +0000
998+++ openlp/plugins/custom/lib/models.py 2009-09-25 14:24:23 +0000
999@@ -23,9 +23,9 @@
1000 ###############################################################################
1001
1002 from sqlalchemy import create_engine
1003-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
1004+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
1005
1006-from openlp.plugins.custom.lib.meta import session, metadata, engine
1007+from openlp.plugins.custom.lib.meta import metadata
1008 from openlp.plugins.custom.lib.tables import *
1009 from openlp.plugins.custom.lib.classes import *
1010
1011
1012=== modified file 'openlp/plugins/custom/lib/tables.py'
1013--- openlp/plugins/custom/lib/tables.py 2009-09-08 19:58:05 +0000
1014+++ openlp/plugins/custom/lib/tables.py 2009-09-25 14:24:23 +0000
1015@@ -22,7 +22,7 @@
1016 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1017 ###############################################################################
1018
1019-from sqlalchemy import Column, Table, ForeignKey, types
1020+from sqlalchemy import Column, Table, types
1021
1022 from openlp.plugins.custom.lib.meta import metadata
1023
1024
1025=== modified file 'openlp/plugins/images/imageplugin.py'
1026--- openlp/plugins/images/imageplugin.py 2009-09-22 19:23:12 +0000
1027+++ openlp/plugins/images/imageplugin.py 2009-09-25 14:24:23 +0000
1028@@ -24,7 +24,7 @@
1029
1030 import logging
1031
1032-from PyQt4 import QtCore, QtGui
1033+from PyQt4 import QtGui
1034
1035 from openlp.core.lib import Plugin
1036 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
1037
1038=== modified file 'openlp/plugins/images/lib/imagetab.py'
1039--- openlp/plugins/images/lib/imagetab.py 2009-09-22 19:36:25 +0000
1040+++ openlp/plugins/images/lib/imagetab.py 2009-09-25 14:24:23 +0000
1041@@ -24,7 +24,7 @@
1042
1043 from PyQt4 import QtCore, QtGui
1044
1045-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
1046+from openlp.core.lib import SettingsTab, translate, Receiver
1047
1048 class ImageTab(SettingsTab):
1049 """
1050
1051=== modified file 'openlp/plugins/images/lib/mediaitem.py'
1052--- openlp/plugins/images/lib/mediaitem.py 2009-09-21 17:56:36 +0000
1053+++ openlp/plugins/images/lib/mediaitem.py 2009-09-25 14:24:23 +0000
1054@@ -26,8 +26,7 @@
1055 import os
1056
1057 from PyQt4 import QtCore, QtGui
1058-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1059- BaseListWithDnD, buildIcon
1060+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
1061
1062 # We have to explicitly create separate classes for each plugin
1063 # in order for DnD to the Service manager to work correctly.
1064
1065=== modified file 'openlp/plugins/media/lib/mediaitem.py'
1066--- openlp/plugins/media/lib/mediaitem.py 2009-09-22 19:23:12 +0000
1067+++ openlp/plugins/media/lib/mediaitem.py 2009-09-25 14:24:23 +0000
1068@@ -24,14 +24,10 @@
1069
1070 import logging
1071 import os
1072-import tempfile
1073
1074 from PyQt4 import QtCore, QtGui
1075
1076-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1077- BaseListWithDnD, buildIcon
1078-
1079-from openlp.plugins.media.lib import MediaTab, FileListData
1080+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
1081
1082 class MediaListView(BaseListWithDnD):
1083 def __init__(self, parent=None):
1084
1085=== modified file 'openlp/plugins/media/mediaplugin.py'
1086--- openlp/plugins/media/mediaplugin.py 2009-09-21 19:23:51 +0000
1087+++ openlp/plugins/media/mediaplugin.py 2009-09-25 14:24:23 +0000
1088@@ -22,11 +22,10 @@
1089 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1090 ###############################################################################
1091
1092-import os
1093-from PyQt4 import QtCore, QtGui
1094+from PyQt4 import QtGui
1095
1096-from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab
1097-from openlp.plugins.media.lib import MediaTab,MediaMediaItem
1098+from openlp.core.lib import Plugin
1099+from openlp.plugins.media.lib import MediaTab, MediaMediaItem
1100
1101 class MediaPlugin(Plugin):
1102
1103
1104=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
1105--- openlp/plugins/presentations/lib/impresscontroller.py 2009-09-21 23:11:50 +0000
1106+++ openlp/plugins/presentations/lib/impresscontroller.py 2009-09-25 14:24:23 +0000
1107@@ -27,16 +27,13 @@
1108 # http://nxsy.org/comparing-documents-with-openoffice-and-python
1109
1110 import logging
1111-import os, subprocess
1112-import time
1113-import sys
1114+import os
1115
1116 if os.name == u'nt':
1117 from win32com.client import Dispatch
1118 else:
1119 import uno
1120
1121-
1122 from PyQt4 import QtCore
1123
1124 class ImpressController(object):
1125
1126=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
1127--- openlp/plugins/presentations/lib/mediaitem.py 2009-09-21 17:56:36 +0000
1128+++ openlp/plugins/presentations/lib/mediaitem.py 2009-09-25 14:24:23 +0000
1129@@ -26,8 +26,8 @@
1130 import os
1131
1132 from PyQt4 import QtCore, QtGui
1133-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1134- BaseListWithDnD
1135+
1136+from openlp.core.lib import MediaManagerItem, translate, BaseListWithDnD
1137 from openlp.plugins.presentations.lib import MessageListener
1138
1139 # We have to explicitly create separate classes for each plugin
1140
1141=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
1142--- openlp/plugins/presentations/lib/messagelistener.py 2009-09-21 17:56:36 +0000
1143+++ openlp/plugins/presentations/lib/messagelistener.py 2009-09-25 14:24:23 +0000
1144@@ -21,8 +21,8 @@
1145 import os
1146
1147 from PyQt4 import QtCore
1148+
1149 from openlp.core.lib import Receiver
1150-from openlp.plugins.presentations.lib import ImpressController
1151
1152 class MessageListener(object):
1153 """
1154
1155=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
1156--- openlp/plugins/presentations/lib/pptviewcontroller.py 2009-09-24 07:35:30 +0000
1157+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2009-09-25 14:24:23 +0000
1158@@ -23,15 +23,10 @@
1159 ###############################################################################
1160
1161 import logging
1162-import os, subprocess
1163-import time
1164-import sys
1165-import win32api
1166+
1167 from ctypes import *
1168 from ctypes.wintypes import RECT
1169
1170-from PyQt4 import QtCore
1171-
1172 class PptviewController(object):
1173 """
1174 Class to control interactions with PowerPOint Viewer Presentations
1175
1176=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
1177--- openlp/plugins/presentations/lib/presentationtab.py 2009-09-21 19:26:10 +0000
1178+++ openlp/plugins/presentations/lib/presentationtab.py 2009-09-25 14:24:23 +0000
1179@@ -22,9 +22,9 @@
1180 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1181 ###############################################################################
1182
1183-from PyQt4 import Qt, QtCore, QtGui
1184+from PyQt4 import QtGui
1185
1186-from openlp.core.lib import SettingsTab, translate, str_to_bool
1187+from openlp.core.lib import SettingsTab, translate
1188
1189 class PresentationTab(SettingsTab):
1190 """
1191
1192=== modified file 'openlp/plugins/presentations/presentationplugin.py'
1193--- openlp/plugins/presentations/presentationplugin.py 2009-09-24 08:54:38 +0000
1194+++ openlp/plugins/presentations/presentationplugin.py 2009-09-25 14:24:23 +0000
1195@@ -23,12 +23,11 @@
1196 ###############################################################################
1197
1198 import os
1199-import sys
1200 import logging
1201
1202 from PyQt4 import QtCore, QtGui
1203
1204-from openlp.core.lib import Plugin, MediaManagerItem
1205+from openlp.core.lib import Plugin
1206 from openlp.plugins.presentations.lib import PresentationMediaItem, \
1207 PresentationTab, ImpressController
1208 if os.name == u'nt':
1209@@ -38,7 +37,6 @@
1210 pass
1211 from openlp.plugins.presentations.lib import PptviewController
1212
1213-
1214 class PresentationPlugin(Plugin):
1215
1216 global log
1217
1218=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
1219--- openlp/plugins/remotes/lib/remotetab.py 2009-09-21 19:26:10 +0000
1220+++ openlp/plugins/remotes/lib/remotetab.py 2009-09-25 14:24:23 +0000
1221@@ -18,9 +18,9 @@
1222 Place, Suite 330, Boston, MA 02111-1307 USA
1223 """
1224
1225-from PyQt4 import QtCore, QtGui
1226+from PyQt4 import QtGui
1227
1228-from openlp.core.lib import SettingsTab, str_to_bool, translate
1229+from openlp.core.lib import SettingsTab, translate
1230
1231 class RemoteTab(SettingsTab):
1232 """
1233
1234=== modified file 'openlp/plugins/remotes/remoteplugin.py'
1235--- openlp/plugins/remotes/remoteplugin.py 2009-09-21 17:56:36 +0000
1236+++ openlp/plugins/remotes/remoteplugin.py 2009-09-25 14:24:23 +0000
1237@@ -18,9 +18,8 @@
1238 Place, Suite 330, Boston, MA 02111-1307 USA
1239 """
1240 import logging
1241-import sys
1242
1243-from PyQt4 import QtNetwork, QtGui, QtCore
1244+from PyQt4 import QtNetwork, QtCore
1245
1246 from openlp.core.lib import Plugin, Receiver
1247 from openlp.plugins.remotes.lib import RemoteTab
1248
1249=== modified file 'openlp/plugins/songs/forms/editsongform.py'
1250--- openlp/plugins/songs/forms/editsongform.py 2009-09-24 10:53:13 +0000
1251+++ openlp/plugins/songs/forms/editsongform.py 2009-09-25 14:24:23 +0000
1252@@ -24,10 +24,9 @@
1253
1254 import logging
1255
1256-from PyQt4 import Qt, QtCore, QtGui
1257+from PyQt4 import QtCore, QtGui
1258
1259-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, \
1260- translate
1261+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
1262 from openlp.plugins.songs.forms import EditVerseForm
1263 from openlp.plugins.songs.lib.models import Song
1264 from editsongdialog import Ui_EditSongDialog
1265
1266=== modified file 'openlp/plugins/songs/forms/editverseform.py'
1267--- openlp/plugins/songs/forms/editverseform.py 2009-09-08 19:58:05 +0000
1268+++ openlp/plugins/songs/forms/editverseform.py 2009-09-25 14:24:23 +0000
1269@@ -22,7 +22,7 @@
1270 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1271 ###############################################################################
1272
1273-from PyQt4 import Qt, QtCore, QtGui
1274+from PyQt4 import QtCore, QtGui
1275
1276 from editversedialog import Ui_EditVerseDialog
1277
1278
1279=== modified file 'openlp/plugins/songs/forms/songbookform.py'
1280--- openlp/plugins/songs/forms/songbookform.py 2009-09-08 19:58:05 +0000
1281+++ openlp/plugins/songs/forms/songbookform.py 2009-09-25 14:24:23 +0000
1282@@ -22,7 +22,8 @@
1283 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1284 ###############################################################################
1285
1286-from PyQt4 import QtGui, QtCore
1287+from PyQt4 import QtGui
1288+
1289 from openlp.core.lib import translate
1290 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
1291
1292
1293=== modified file 'openlp/plugins/songs/forms/topicsform.py'
1294--- openlp/plugins/songs/forms/topicsform.py 2009-09-08 19:58:05 +0000
1295+++ openlp/plugins/songs/forms/topicsform.py 2009-09-25 14:24:23 +0000
1296@@ -22,7 +22,8 @@
1297 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1298 ###############################################################################
1299
1300-from PyQt4 import QtGui, QtCore
1301+from PyQt4 import QtGui
1302+
1303 from openlp.core.lib import translate
1304 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
1305
1306
1307=== modified file 'openlp/plugins/songs/lib/manager.py'
1308--- openlp/plugins/songs/lib/manager.py 2009-09-21 17:56:36 +0000
1309+++ openlp/plugins/songs/lib/manager.py 2009-09-25 14:24:23 +0000
1310@@ -22,15 +22,11 @@
1311 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1312 ###############################################################################
1313
1314-import os, os.path
1315-import sys
1316-
1317-from sqlalchemy import asc, desc
1318-from openlp.plugins.songs.lib.models import init_models, metadata, session, \
1319- engine, songs_table, Song, Author, Topic, Book
1320-
1321 import logging
1322
1323+from openlp.plugins.songs.lib.models import init_models, metadata, Song, \
1324+ Author, Topic, Book
1325+
1326 class SongManager():
1327 """
1328 The Song Manager provides a central location for all database code. This
1329
1330=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
1331--- openlp/plugins/songs/lib/mediaitem.py 2009-09-24 15:49:17 +0000
1332+++ openlp/plugins/songs/lib/mediaitem.py 2009-09-25 14:24:23 +0000
1333@@ -26,9 +26,8 @@
1334
1335 from PyQt4 import QtCore, QtGui
1336
1337-from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
1338- SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \
1339- Receiver
1340+from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
1341+ contextMenuAction, contextMenuSeparator, BaseListWithDnD, Receiver
1342 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
1343
1344 class SongListView(BaseListWithDnD):
1345
1346=== modified file 'openlp/plugins/songs/lib/meta.py'
1347--- openlp/plugins/songs/lib/meta.py 2009-09-08 19:58:05 +0000
1348+++ openlp/plugins/songs/lib/meta.py 2009-09-25 14:24:23 +0000
1349@@ -23,7 +23,6 @@
1350 ###############################################################################
1351
1352 from sqlalchemy import MetaData
1353-from sqlalchemy.orm import scoped_session, sessionmaker
1354
1355 __all__ = ['session', 'metadata', 'engine']
1356
1357
1358=== modified file 'openlp/plugins/songs/lib/models.py'
1359--- openlp/plugins/songs/lib/models.py 2009-09-21 00:47:10 +0000
1360+++ openlp/plugins/songs/lib/models.py 2009-09-25 14:24:23 +0000
1361@@ -25,7 +25,7 @@
1362 from sqlalchemy import create_engine
1363 from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
1364
1365-from openlp.plugins.songs.lib.meta import session, metadata, engine
1366+from openlp.plugins.songs.lib.meta import metadata
1367 from openlp.plugins.songs.lib.tables import *
1368 from openlp.plugins.songs.lib.classes import *
1369
1370
1371=== modified file 'openlp/plugins/songs/lib/songstab.py'
1372--- openlp/plugins/songs/lib/songstab.py 2009-09-08 19:58:05 +0000
1373+++ openlp/plugins/songs/lib/songstab.py 2009-09-25 14:24:23 +0000
1374@@ -22,8 +22,6 @@
1375 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1376 ###############################################################################
1377
1378-from PyQt4 import QtCore, QtGui
1379-
1380 from openlp.core.lib import SettingsTab, translate
1381
1382 class SongsTab(SettingsTab):
1383
1384=== modified file 'openlp/plugins/songs/songsplugin.py'
1385--- openlp/plugins/songs/songsplugin.py 2009-09-21 17:56:36 +0000
1386+++ openlp/plugins/songs/songsplugin.py 2009-09-25 14:24:23 +0000
1387@@ -27,7 +27,7 @@
1388 from PyQt4 import QtCore, QtGui
1389
1390 from openlp.core.lib import Plugin, translate
1391-from openlp.plugins.songs.lib import SongManager, SongsTab, SongMediaItem
1392+from openlp.plugins.songs.lib import SongManager, SongMediaItem
1393 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
1394 OpenSongImportForm, OpenLPExportForm
1395
1396
1397=== modified file 'openlp/plugins/songs/test/test_song_verse.py'
1398--- openlp/plugins/songs/test/test_song_verse.py 2009-09-03 15:19:30 +0000
1399+++ openlp/plugins/songs/test/test_song_verse.py 2009-09-25 14:24:23 +0000
1400@@ -17,7 +17,7 @@
1401 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
1402 Place, Suite 330, Boston, MA 02111-1307 USA
1403 """
1404-import py.test
1405+
1406 import os
1407 import sys
1408
1409
1410=== modified file 'openlpcnv.pyw'
1411--- openlpcnv.pyw 2009-09-21 17:56:36 +0000
1412+++ openlpcnv.pyw 2009-09-25 14:24:23 +0000
1413@@ -24,10 +24,8 @@
1414 ###############################################################################
1415
1416 import os
1417-import sys
1418 import logging
1419 import time
1420-import datetime
1421
1422 from openlp.migration.display import *
1423 from openlp.migration.migratefiles import *