OpenLP

Merge lp:~trb143/openlp/bugfixes into lp:openlp

  1. bugfixes
  2. Merge into trunk
Proposed by Tim Bentley
Status: Superseded
Proposed branch: lp:~trb143/openlp/bugfixes
Merge into: lp:openlp
Diff against target: None lines
To merge this branch: bzr merge lp:~trb143/openlp/bugfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Needs Fixing
Review via email: mp+9129@code.launchpad.net

This proposal supersedes a proposal from 2009-07-21.

This proposal has been superseded by a proposal from 2009-07-22.

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

Add Keyboard events to ServiceManage
Add Splash Screen to Display Screen
Fix Renderer for footers

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Sorry if I gave you the wrong impression, but I don't think this will work. CP1252 is a Windows-specific code. We need to find the encoding that matches this.

17 + infile = codecs.open(inname, 'r', encoding='CP1252')

Otherwise everything else looks fine.

review: Needs Fixing
lp:~trb143/openlp/bugfixes updated
496. By Tim Bentley

Fix up song dialog errors
Fix servicemanager key entry
Fix servicemanager state handling

497. By Raoul Snyman

Merged in changes from the songmaintenance branch

498. By Raoul Snyman

Merged in some changes for the song maintenance form.

499. By Tim Bentley

New features and fixes.

500. By Tim Bentley

Bug fixes from last merge

501. By Raoul Snyman

Merged in changes from my song maintenance branch.

502. By Raoul Snyman

Merge from songmaintenance branch.

503. By Tim Bentley

New bible Import Screen
Transparent Theme backgrounds
Global Theme Handling improvements

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

modified:
  openlp/core/lib/renderer.py
  openlp/core/lib/themexmlhandler.py
  openlp/core/ui/amendthemeform.py
  openlp/core/ui/servicemanager.py
  openlp/core/ui/thememanager.py
  openlp/core/ui/themestab.py
  openlp/plugins/bibles/forms/bibleimportdialog.py
  resources/forms/bibleimportdialog.ui
pending merges:
  Tim Bentley 2009-08-07 finish Theme handling corrections
    Tim Bentley 2009-08-07 Default handling allows editing and blocks deletes
    Tim Bentley 2009-08-07 New bible import form
    Tim Bentley 2009-08-06 [merge] Head
    Tim Bentley 2009-08-06 Standardize row hight in renderer

504. By Tim Bentley

Lets save songs now

505. By Raoul Snyman

Merge from bugfixes

506. By Tim Bentley

Remote pluging
EventManager Fixes
Cleanups
Renderer Performance improvements

507. By Tim Bentley

Updates

508. By Tim Bentley

Lets put the bracket in the correct place

509. By Tim Bentley

Plugin Screen added
Presentation Plugin started
Remotes now configurable

510. By Tim Bentley

Many fixes and corrections
Adding Presentation code (start)
Add error message to code

511. By Tim Bentley

SlideController clean up
Image Plugin Cleanup

512. By Tim Bentley

Clean up Event Processing

513. By Jon Tibble

Committing Jon Tibble's merge proposal.

514. By Maikel Stuivenberg

Merged in lp:~maikels/openlp/myfixes

515. By Tim Bentley

Sort out SlideController

516. By Tim Bentley

Various changes see loog for details

517. By Jon Tibble

Merge for John

518. By Jon Tibble

Merge for Jon

519. By Tim Bentley

Performance Improvements and code fixes

520. By Raoul Snyman

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

521. By Jon Tibble

Merged in lp:~meths/openlp/trivialfixes

522. By Tim Bentley

New features and fixes

523. By Tim Bentley

Add Next slide to Presentations
Start with settings manager

524. By Raoul Snyman

Merged lp:~raoul-snyman/openlp/docstrings into trunk.

525. By Jon Tibble

Latest merge from lp:~meths/openlp/trivialfixes

526. By Tim Bentley

Various changes

527. By Jon Tibble

For Jon

528. By Tim Bentley

Song and Custom cleanups

529. By Jon Tibble

For Jon

530. By Raoul Snyman

Merged changes in from lp:~raoul-snyman/openlp/songmaintenance

531. By Jon Tibble

Merged in lp:~meths/openlp/trivialfixes

532. By Raoul Snyman

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

533. By Jon Tibble

Merged in lp:~meths/openlp/trivialfixes

534. By Jon Tibble

For Jon
Fix themes

535. By Jon Tibble

For Jon
Fix themes 2

536. By Jon Tibble

For Jon

537. By Raoul Snyman

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

538. By Tim Bentley

Updates to Presentations etc

539. By Maikel Stuivenberg

For Maikel

540. By Tim Bentley

Themes and Timer points

541. By Tim Bentley

Fix merge error

542. By Jon Tibble

For Jon

543. By Tim Bentley

Renderer handling changes

544. By Jon Tibble

Merged in lp:~meths/openlp/trivialfixes

545. By Jon Tibble

For Jon

546. By Jon Tibble

For Jon

547. By Jonathan Corwin

for jonathan

548. By Tim Bentley

presentation fixes

549. By Tim Bentley

Correction from == to is

550. By Jon Tibble

Merge log.exception() conversion

551. By Tim Bentley

Arrival of the Audit

552. By Tim Bentley

Plugin cleanup

553. By Maikel Stuivenberg

Menu changes

554. By Jon Tibble

Dock Widget Refactoring

555. By Jon Tibble

Fix service loading on Windows

556. By Tim Bentley

Audit Fixes

557. By Jon Tibble

Refactor services

558. By Jon Tibble

Cleanup code and fixes

559. By Tim Bentley

Renderer Fixes

560. By Raoul Snyman

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

561. By Tim Bentley

rendering fixes

562. By Jon Tibble

Song editor fixes

563. By Jon Tibble

Coding Standards

564. By Tim Bentley

Best merge ever

565. By Tim Bentley

Audit changes and clean up

566. By Jonathan Corwin

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

567. By Jon Tibble

Code clean ups

568. By Tim Bentley

Audit Changes to database

569. By Jonathan Corwin

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

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 bug #606437

949. By Tim Bentley

Head

950. By Tim Bentley

Fix missing code from previous merge

951. By Tim Bentley

Head 964

952. By Tim Bentley

Head966

953. By Tim Bentley

Fix word uage

954. By Tim Bentley

Head967

955. By Tim Bentley

Fix to trigger

956. By Tim Bentley

Head981

957. By Tim Bentley

Head985

958. By Tim Bentley

Fix song usage missing code

959. By Tim Bentley

Remove blank lines

960. By Tim Bentley

Fix up songusage

961. By Tim Bentley

Fix bug #598407

962. By Tim Bentley

Fixes

963. By Tim Bentley

994

964. By Tim Bentley

Fix theme import Redhat Bugzilla

965. By Tim Bentley

Head1025

966. By Tim Bentley

Remove execuitable flag

967. By Tim Bentley

Fix translation code to find qm files

968. By Tim Bentley

Space

969. By Tim Bentley

Lanugages now work

970. By Tim Bentley

Head1030

971. By Tim Bentley

Fix bug 637547

972. By Tim Bentley

Whitespace for cclimport

973. By Tim Bentley

fix bug 637886

974. By Tim Bentley

Try to fix translation files

975. By Tim Bentley

Fix code

976. By Tim Bentley

remove prints

Unmerged revisions

976. By Tim Bentley

remove prints

975. By Tim Bentley

Fix code

974. By Tim Bentley

Try to fix translation files

973. By Tim Bentley

fix bug 637886

972. By Tim Bentley

Whitespace for cclimport

971. By Tim Bentley

Fix bug 637547

970. By Tim Bentley

Head1030

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-07-19 06:31:08 +0000
3+++ cnvdb.py 2009-07-21 18:10:14 +0000
4@@ -20,6 +20,7 @@
5 """
6 import codecs
7 import sys
8+import chardet
9
10 def convert_file(inname, outname):
11 """
12@@ -31,7 +32,7 @@
13 ``outname``
14 The output file name.
15 """
16- infile = codecs.open(inname, 'r', encoding='iso-8859-1')
17+ infile = codecs.open(inname, 'r', encoding='CP1252')
18 writefile = codecs.open(outname, 'w', encoding='utf-8')
19 for line in infile:
20 #replace the quotes with quotes
21
22=== modified file 'openlp/core/lib/renderer.py'
23--- openlp/core/lib/renderer.py 2009-07-15 17:33:31 +0000
24+++ openlp/core/lib/renderer.py 2009-07-21 20:04:27 +0000
25@@ -40,6 +40,7 @@
26 self._debug = 0
27 self._right_margin = 64 # the amount of right indent
28 self._shadow_offset = 5
29+ self._shadow_offset_footer = 3
30 self._outline_offset = 2
31 self.theme_name = None
32 self._theme = None
33@@ -482,15 +483,17 @@
34 # dont allow alignment messing with footers
35 if footer:
36 align = 0
37+ shadow_offset = self._shadow_offset_footer
38 else:
39 align = int(self._theme .display_horizontalAlign)
40+ shadow_offset = self._shadow_offset
41 for linenum in range(len(lines)):
42 line = lines[linenum]
43 #find out how wide line is
44 w , h = self._get_extent_and_render(line, footer, tlcorner=(x, y), draw=False)
45 if self._theme.display_shadow:
46- w += self._shadow_offset
47- h += self._shadow_offset
48+ w += shadow_offset
49+ h += shadow_offset
50 if self._theme.display_outline:
51 # pixels either side
52 w += 2 * self._outline_offset
53@@ -515,7 +518,7 @@
54 if live:
55 # now draw the text, and any outlines/shadows
56 if self._theme.display_shadow:
57- self._get_extent_and_render(line, footer, tlcorner=(x+self._shadow_offset,y+self._shadow_offset),
58+ self._get_extent_and_render(line, footer, tlcorner=(x + shadow_offset, y + shadow_offset),
59 draw=True, color = self._theme.display_shadow_color)
60 if self._theme.display_outline:
61 self._get_extent_and_render(line, footer, (x+self._outline_offset,y), draw=True,
62
63=== modified file 'openlp/core/ui/maindisplay.py'
64--- openlp/core/ui/maindisplay.py 2009-07-19 07:40:31 +0000
65+++ openlp/core/ui/maindisplay.py 2009-07-21 18:10:14 +0000
66@@ -62,12 +62,22 @@
67 self.showFullScreen()
68 else:
69 self.showMinimized()
70+ #Build a custom splash screen
71+ self.InitialFrame = QtGui.QImage(screen[u'size'].width(),
72+ screen[u'size'].height(), QtGui.QImage.Format_ARGB32_Premultiplied)
73+ splash_image = QtGui.QImage(u':/graphics/openlp-splash-screen.png')
74+ painter_image = QtGui.QPainter()
75+ painter_image.begin(self.InitialFrame)
76+ painter_image.fillRect(self.InitialFrame.rect(), QtCore.Qt.white)
77+ painter_image.drawImage((screen[u'size'].width() - splash_image.width()) / 2,
78+ (screen[u'size'].height() - splash_image.height()) / 2 , splash_image)
79+ self.frameView(self.InitialFrame)
80+ #Build a Black screen
81 painter = QtGui.QPainter()
82 self.blankFrame = QtGui.QImage(screen[u'size'].width(),
83 screen[u'size'].height(), QtGui.QImage.Format_ARGB32_Premultiplied)
84 painter.begin(self.blankFrame)
85 painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black)
86- self.frameView(self.blankFrame)
87
88 def frameView(self, frame):
89 """
90
91=== modified file 'openlp/core/ui/servicemanager.py'
92--- openlp/core/ui/servicemanager.py 2009-07-11 05:18:34 +0000
93+++ openlp/core/ui/servicemanager.py 2009-07-21 20:04:27 +0000
94@@ -41,9 +41,38 @@
95 if event.key() == QtCore.Qt.Key_Enter:
96 self.parent.makeLive()
97 event.accept()
98- event.ignore()
99- else:
100- event.ignore()
101+ elif event.key() == QtCore.Qt.Key_Home:
102+ self.parent.onServiceTop()
103+ event.accept()
104+ elif event.key() == QtCore.Qt.Key_End:
105+ self.parent.onServiceEnd()
106+ event.accept()
107+ elif event.key() == QtCore.Qt.Key_PageUp:
108+ self.parent.onServiceUp()
109+ event.accept()
110+ elif event.key() == QtCore.Qt.Key_PageDown:
111+ self.parent.onServiceDown()
112+ event.accept()
113+ elif event.key() == QtCore.Qt.Key_Up:
114+ self.parent.onMoveSelectionUp()
115+ event.accept()
116+ elif event.key() == QtCore.Qt.Key_Down:
117+ self.parent.onMoveSelectionDown()
118+ event.accept()
119+ event.ignore()
120+ else:
121+ event.ignore()
122+
123+class Iter(QtGui.QTreeWidgetItemIterator):
124+ def __init__(self, *args):
125+ QtGui.QTreeWidgetItemIterator.__init__(self, *args)
126+ def next(self):
127+ self.__iadd__(1)
128+ value = self.value()
129+ if value:
130+ return self.value()
131+ else:
132+ return None
133
134 class ServiceManager(QtGui.QWidget):
135 """
136@@ -134,6 +163,52 @@
137 self.servicePath = self.config.get_data_path()
138 self.service_theme = self.config.get_config(u'theme service theme', u'')
139
140+ def onMoveSelectionUp(self):
141+ """
142+ Moves the selection up the window
143+ Called by the up arrow
144+ """
145+ it = Iter(self.ServiceManagerList)
146+ item = it.value()
147+ tempItem = None
148+ setLastItem = False
149+ while item is not None:
150+ if item.isSelected() and tempItem is None:
151+ setLastItem = True
152+ item.setSelected(False)
153+ if item.isSelected():
154+ #We are on the first record
155+ if tempItem is not None:
156+ tempItem.setSelected(True)
157+ item.setSelected(False)
158+ else:
159+ tempItem = item
160+ lastItem = item
161+ item = it.next()
162+ #Top Item was selected so set the last one
163+ if setLastItem:
164+ lastItem.setSelected(True)
165+
166+ def onMoveSelectionDown(self):
167+ """
168+ Moves the selection down the window
169+ Called by the down arrow
170+ """
171+ it = Iter(self.ServiceManagerList)
172+ item = it.value()
173+ firstItem = item
174+ setSelected = False
175+ while item is not None:
176+ if setSelected:
177+ setSelected = False
178+ item.setSelected(True)
179+ elif item.isSelected():
180+ item.setSelected(False)
181+ setSelected = True
182+ item = it.next()
183+ if setSelected:
184+ firstItem.setSelected(True)
185+
186 def collapsed(self, item):
187 """
188 Record if an item is collapsed
189@@ -159,7 +234,7 @@
190 temp = self.serviceItems[item]
191 self.serviceItems.remove(self.serviceItems[item])
192 self.serviceItems.insert(0, temp)
193- self.repaintServiceList()
194+ self.repaintServiceList(0, count)
195 self.parent.OosChanged(False, self.serviceName)
196
197 def onServiceUp(self):
198@@ -172,7 +247,7 @@
199 temp = self.serviceItems[item]
200 self.serviceItems.remove(self.serviceItems[item])
201 self.serviceItems.insert(item - 1, temp)
202- self.repaintServiceList()
203+ self.repaintServiceList(item - 1 , count)
204 self.parent.OosChanged(False, self.serviceName)
205
206 def onServiceDown(self):
207@@ -185,7 +260,7 @@
208 temp = self.serviceItems[item]
209 self.serviceItems.remove(self.serviceItems[item])
210 self.serviceItems.insert(item + 1, temp)
211- self.repaintServiceList()
212+ self.repaintServiceList(item + 1 , count)
213 self.parent.OosChanged(False, self.serviceName)
214
215 def onServiceEnd(self):
216@@ -197,7 +272,7 @@
217 temp = self.serviceItems[item]
218 self.serviceItems.remove(self.serviceItems[item])
219 self.serviceItems.insert(len(self.serviceItems), temp)
220- self.repaintServiceList()
221+ self.repaintServiceList(len(self.serviceItems) - 1, count)
222 self.parent.OosChanged(False, self.serviceName)
223
224 def onNewService(self):
225@@ -216,10 +291,10 @@
226 item, count = self.findServiceItem()
227 if item is not -1:
228 self.serviceItems.remove(self.serviceItems[item])
229- self.repaintServiceList()
230+ self.repaintServiceList(0, 0)
231 self.parent.OosChanged(False, self.serviceName)
232
233- def repaintServiceList(self):
234+ def repaintServiceList(self, serviceItem, serviceItemCount):
235 """
236 Clear the existing service list and prepaint all the items
237 Used when moving items as the move takes place in supporting array,
238@@ -232,20 +307,20 @@
239 count += 1
240 #Repaint the screen
241 self.ServiceManagerList.clear()
242- for item in self.serviceItems:
243+ for itemcount, item in enumerate(self.serviceItems):
244 serviceitem = item[u'data']
245 treewidgetitem = QtGui.QTreeWidgetItem(self.ServiceManagerList)
246 treewidgetitem.setText(0,serviceitem.title)
247 treewidgetitem.setIcon(0,serviceitem.iconic_representation)
248 treewidgetitem.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(item[u'order']))
249 treewidgetitem.setExpanded(item[u'expanded'])
250- count = 0
251- for frame in serviceitem.frames:
252+ for count , frame in enumerate(serviceitem.frames):
253 treewidgetitem1 = QtGui.QTreeWidgetItem(treewidgetitem)
254 text = frame[u'title']
255 treewidgetitem1.setText(0,text[:40])
256 treewidgetitem1.setData(0, QtCore.Qt.UserRole,QtCore.QVariant(count))
257- count = count + 1
258+ if serviceItem == itemcount and serviceItemCount == count:
259+ self.ServiceManagerList.setCurrentItem(treewidgetitem1)
260
261 def onSaveService(self):
262 """
263
264=== modified file 'openlp/plugins/songs/forms/authorsform.py'
265--- openlp/plugins/songs/forms/authorsform.py 2009-07-18 05:43:50 +0000
266+++ openlp/plugins/songs/forms/authorsform.py 2009-07-22 06:14:34 +0000
267@@ -63,6 +63,7 @@
268 else:
269 self.AuthorListWidget.setCurrentRow(self.currentRow)
270 self._validate_form()
271+ self.onAuthorListWidgetItemClicked()
272
273 def onDeleteButtonClick(self):
274 """
275@@ -100,31 +101,32 @@
276 self._validate_form()
277 self.DisplayEdit.setFocus()
278
279- def onAuthorListWidgetItemClicked(self, index):
280+ def onAuthorListWidgetItemClicked(self):
281 """
282 An Author has been selected display it
283 If the author is attached to a Song prevent delete
284 """
285 self.currentRow = self.AuthorListWidget.currentRow()
286 item = self.AuthorListWidget.currentItem()
287- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
288- self.author = self.songmanager.get_author(item_id)
289- self.DisplayEdit.setText(self.author.display_name)
290- if self.author.first_name is None:
291- self.FirstNameEdit.setText(u'')
292- else:
293- self.FirstNameEdit.setText(self.author.first_name)
294- if self.author.last_name is None:
295- self.LastNameEdit.setText(u'')
296- else:
297- self.LastNameEdit.setText(self.author.last_name)
298- if len(self.author.songs) > 0:
299- self.MessageLabel.setText(translate(u'AuthorForm', u'Author in use "Delete" is disabled'))
300- self.DeleteButton.setEnabled(False)
301- else:
302- self.MessageLabel.setText(translate(u'AuthorForm', u'Author in not used'))
303- self.DeleteButton.setEnabled(True)
304- self._validate_form()
305+ if item is not None:
306+ item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
307+ self.author = self.songmanager.get_author(item_id)
308+ self.DisplayEdit.setText(self.author.display_name)
309+ if self.author.first_name is None:
310+ self.FirstNameEdit.setText(u'')
311+ else:
312+ self.FirstNameEdit.setText(self.author.first_name)
313+ if self.author.last_name is None:
314+ self.LastNameEdit.setText(u'')
315+ else:
316+ self.LastNameEdit.setText(self.author.last_name)
317+ if len(self.author.songs) > 0:
318+ self.MessageLabel.setText(translate(u'AuthorForm', u'Author in use "Delete" is disabled'))
319+ self.DeleteButton.setEnabled(False)
320+ else:
321+ self.MessageLabel.setText(translate(u'AuthorForm', u'Author in not used'))
322+ self.DeleteButton.setEnabled(True)
323+ self._validate_form()
324 self.DisplayEdit.setFocus()
325
326 def _validate_form(self):
327
328=== modified file 'openlp/plugins/songs/forms/songbookform.py'
329--- openlp/plugins/songs/forms/songbookform.py 2009-07-14 18:38:33 +0000
330+++ openlp/plugins/songs/forms/songbookform.py 2009-07-22 06:14:34 +0000
331@@ -62,6 +62,7 @@
332 self.BookSongListWidget.setCurrentRow(self.BookSongListWidget.count() - 1)
333 else:
334 self.BookSongListWidget.setCurrentRow(self.currentRow)
335+ self.onBooksListViewItemClicked()
336
337 def onDeleteButtonClick(self):
338 """
339@@ -98,24 +99,25 @@
340 self._validate_form()
341 self.NameEdit.setFocus()
342
343- def onBooksListViewItemClicked(self, index):
344+ def onBooksListViewItemClicked(self):
345 """
346 An Book has been selected display it
347 If the Book is attached to a Song prevent delete
348 """
349 self.currentRow = self.BookSongListWidget.currentRow()
350 item = self.BookSongListWidget.currentItem()
351- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
352- self.Book = self.songmanager.get_book(item_id)
353- self.NameEdit.setText(self.Book.name)
354- self.PublisherEdit.setText(self.Book.publisher)
355- if len(self.Book.songs) > 0:
356- self.MessageLabel.setText(translate(u'BookForm', u'Book in use "Delete" is disabled'))
357- self.DeleteButton.setEnabled(False)
358- else:
359- self.MessageLabel.setText(translate(u'BookForm', u'Book in not used'))
360- self.DeleteButton.setEnabled(True)
361- self._validate_form()
362+ if item is not None:
363+ item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
364+ self.Book = self.songmanager.get_book(item_id)
365+ self.NameEdit.setText(self.Book.name)
366+ self.PublisherEdit.setText(self.Book.publisher)
367+ if len(self.Book.songs) > 0:
368+ self.MessageLabel.setText(translate(u'BookForm', u'Book in use "Delete" is disabled'))
369+ self.DeleteButton.setEnabled(False)
370+ else:
371+ self.MessageLabel.setText(translate(u'BookForm', u'Book in not used'))
372+ self.DeleteButton.setEnabled(True)
373+ self._validate_form()
374 self.NameEdit.setFocus()
375
376 def _validate_form(self):
377
378=== modified file 'openlp/plugins/songs/forms/topicsform.py'
379--- openlp/plugins/songs/forms/topicsform.py 2009-07-14 18:38:33 +0000
380+++ openlp/plugins/songs/forms/topicsform.py 2009-07-22 06:14:34 +0000
381@@ -63,6 +63,7 @@
382 else:
383 self.TopicsListWidget.setCurrentRow(self.currentRow)
384 self._validate_form()
385+ self.onTopicsListWidgetItemClicked()
386
387 def onDeleteButtonClick(self):
388 """
389@@ -97,23 +98,24 @@
390 self._validate_form()
391 self.TopicNameEdit.setFocus()
392
393- def onTopicsListWidgetItemClicked(self, index):
394+ def onTopicsListWidgetItemClicked(self):
395 """
396 An Topic has been selected display it
397 If the Topic is attached to a Song prevent delete
398 """
399 self.currentRow = self.TopicsListWidget.currentRow()
400 item = self.TopicsListWidget.currentItem()
401- item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
402- self.topic = self.songmanager.get_topic(item_id)
403- self.TopicNameEdit.setText(self.topic.name)
404- if len(self.topic.songs) > 0:
405- self.MessageLabel.setText(translate(u'TopicForm', u'Topic in use "Delete" is disabled'))
406- self.DeleteButton.setEnabled(False)
407- else:
408- self.MessageLabel.setText(translate(u'TopicForm', u'Topic in not used'))
409- self.DeleteButton.setEnabled(True)
410- self._validate_form()
411+ if item is not None:
412+ item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0]
413+ self.topic = self.songmanager.get_topic(item_id)
414+ self.TopicNameEdit.setText(self.topic.name)
415+ if len(self.topic.songs) > 0:
416+ self.MessageLabel.setText(translate(u'TopicForm', u'Topic in use "Delete" is disabled'))
417+ self.DeleteButton.setEnabled(False)
418+ else:
419+ self.MessageLabel.setText(translate(u'TopicForm', u'Topic in not used'))
420+ self.DeleteButton.setEnabled(True)
421+ self._validate_form()
422 self.TopicNameEdit.setFocus()
423
424 def _validate_form(self):
425
426=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
427--- openlp/plugins/songs/lib/mediaitem.py 2009-07-18 05:43:50 +0000
428+++ openlp/plugins/songs/lib/mediaitem.py 2009-07-21 18:10:14 +0000
429@@ -289,7 +289,7 @@
430 else:
431 verses = song.lyrics.split(u'\n\n')
432 for slide in verses:
433- service_item.add_from_text(slide[:30], slide)
434+ service_item.add_from_text(slide[:30], unicode(slide))
435 service_item.title = song.title
436 for author in song.authors:
437 if len(author_list) > 1: