Merge lp:~meths/openlp/trivialfixes into lp:openlp
- trivialfixes
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~meths/openlp/trivialfixes |
Merge into: | lp:openlp |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~meths/openlp/trivialfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+12184@code.launchpad.net |
This proposal supersedes a proposal from 2009-09-21.
This proposal has been superseded by a proposal from 2009-09-21.
Commit message
Description of the change
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal | # |
Raoul Snyman (raoul-snyman) wrote : | # |
Mostly fine.
Tim Bentley (trb143) wrote : | # |
Lot better some still not sure about
- 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
- 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 quickerVarious 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 timePresentations 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 upsSongBeamerImport:
- 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 fileTwo 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 AuthorsSelectio
nComboItem 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 internationaliz
ation. 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 thinksImporting 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õ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õ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õ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õ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õ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õ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ö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ö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
1 | === modified file 'openlp/core/lib/mediamanageritem.py' |
2 | --- openlp/core/lib/mediamanageritem.py 2009-09-16 04:59:38 +0000 |
3 | +++ openlp/core/lib/mediamanageritem.py 2009-09-21 19:26:10 +0000 |
4 | @@ -136,7 +136,8 @@ |
5 | self.Toolbar = OpenLPToolbar(self) |
6 | self.PageLayout.addWidget(self.Toolbar) |
7 | |
8 | - def addToolbarButton(self, title, tooltip, icon, slot=None, objectname=None): |
9 | + def addToolbarButton(self, title, tooltip, icon, slot=None, |
10 | + objectname=None): |
11 | """ |
12 | A method to help developers easily add a button to the toolbar. |
13 | |
14 | @@ -192,31 +193,46 @@ |
15 | ## File Button ## |
16 | if self.hasFileIcon: |
17 | self.addToolbarButton( |
18 | - translate(self.TranslationContext, u'Load '+self.PluginTextShort), |
19 | - translate(self.TranslationContext, u'Load a new '+self.PluginTextShort), |
20 | - u':'+self.IconPath+ u'_load.png', self.onFileClick, self.PluginTextShort+u'FileItem') |
21 | + translate( |
22 | + self.TranslationContext, u'Load ' + self.PluginTextShort), |
23 | + translate( |
24 | + self.TranslationContext, |
25 | + u'Load a new ' + self.PluginTextShort), |
26 | + u':' + self.IconPath + u'_load.png', self.onFileClick, |
27 | + self.PluginTextShort + u'FileItem') |
28 | ## New Button ## |
29 | if self.hasNewIcon: |
30 | self.addToolbarButton( |
31 | - translate(self.TranslationContext, u'New '+self.PluginTextShort), |
32 | - translate(self.TranslationContext, u'Add a new '+self.PluginTextShort), |
33 | - u':'+self.IconPath+ u'_new.png', self.onNewClick, self.PluginTextShort+u'NewItem') |
34 | + translate( |
35 | + self.TranslationContext, u'New ' + self.PluginTextShort), |
36 | + translate( |
37 | + self.TranslationContext, |
38 | + u'Add a new ' + self.PluginTextShort), |
39 | + u':' + self.IconPath + u'_new.png', self.onNewClick, |
40 | + self.PluginTextShort + u'NewItem') |
41 | ## Edit Button ## |
42 | if self.hasEditIcon: |
43 | self.addToolbarButton( |
44 | - translate(self.TranslationContext, u'Edit '+self.PluginTextShort), |
45 | - translate(self.TranslationContext, u'Edit the selected '+self.PluginTextShort), |
46 | - u':'+self.IconPath+ u'_edit.png', self.onEditClick, self.PluginTextShort+u'EditItem') |
47 | + translate( |
48 | + self.TranslationContext, u'Edit ' + self.PluginTextShort), |
49 | + translate( |
50 | + self.TranslationContext, |
51 | + u'Edit the selected ' + self.PluginTextShort), |
52 | + u':' + self.IconPath + u'_edit.png', self.onEditClick, |
53 | + self.PluginTextShort + u'EditItem') |
54 | ## Delete Button ## |
55 | self.addToolbarButton( |
56 | - translate(self.TranslationContext, u'Delete '+self.PluginTextShort), |
57 | + translate( |
58 | + self.TranslationContext, u'Delete ' + self.PluginTextShort), |
59 | translate(self.TranslationContext, u'Delete the selected item'), |
60 | - u':'+self.IconPath+ u'_delete.png', self.onDeleteClick, self.PluginTextShort+u'DeleteItem') |
61 | + u':' + self.IconPath + u'_delete.png', self.onDeleteClick, |
62 | + self.PluginTextShort + u'DeleteItem') |
63 | ## Separator Line ## |
64 | self.addToolbarSeparator() |
65 | ## Preview ## |
66 | self.addToolbarButton( |
67 | - translate(self.TranslationContext, u'Preview '+self.PluginTextShort), |
68 | + translate( |
69 | + self.TranslationContext, u'Preview ' + self.PluginTextShort), |
70 | translate(self.TranslationContext, u'Preview the selected item'), |
71 | u':/system/system_preview.png', self.onPreviewClick, u'PreviewItem') |
72 | ## Live Button ## |
73 | @@ -226,9 +242,14 @@ |
74 | u':/system/system_live.png', self.onLiveClick, u'LiveItem') |
75 | ## Add to service Button ## |
76 | self.addToolbarButton( |
77 | - translate(self.TranslationContext, u'Add '+self.PluginTextShort+u' To Service'), |
78 | - translate(self.TranslationContext, u'Add the selected item(s) to the service'), |
79 | - u':/system/system_add.png', self.onAddClick, self.PluginTextShort+u'AddItem') |
80 | + translate( |
81 | + self.TranslationContext, |
82 | + u'Add ' + self.PluginTextShort + u' To Service'), |
83 | + translate( |
84 | + self.TranslationContext, |
85 | + u'Add the selected item(s) to the service'), |
86 | + u':/system/system_add.png', self.onAddClick, |
87 | + self.PluginTextShort + u'AddItem') |
88 | |
89 | def addListViewToToolBar(self): |
90 | #Add the List widget |
91 | @@ -236,7 +257,8 @@ |
92 | self.ListView.uniformItemSizes = True |
93 | self.ListView.setGeometry(QtCore.QRect(10, 100, 256, 591)) |
94 | self.ListView.setSpacing(1) |
95 | - self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection) |
96 | + self.ListView.setSelectionMode( |
97 | + QtGui.QAbstractItemView.ExtendedSelection) |
98 | self.ListView.setAlternatingRowColors(True) |
99 | self.ListView.setDragEnabled(True) |
100 | self.ListView.setObjectName(self.PluginTextShort+u'ListView') |
101 | @@ -247,12 +269,14 @@ |
102 | if self.hasEditIcon: |
103 | self.ListView.addAction(contextMenuAction(self.ListView, |
104 | ':' +self.IconPath+u'_new.png', |
105 | - translate(self.TranslationContext, u'&Edit '+self.PluginTextShort), |
106 | + translate(self.TranslationContext, |
107 | + u'&Edit ' + self.PluginTextShort), |
108 | self.onEditClick)) |
109 | self.ListView.addAction(contextMenuSeparator(self.ListView)) |
110 | self.ListView.addAction(contextMenuAction( |
111 | self.ListView, ':/system/system_preview.png', |
112 | - translate(self.TranslationContext, u'&Preview '+self.PluginTextShort), |
113 | + translate(self.TranslationContext, |
114 | + u'&Preview ' + self.PluginTextShort), |
115 | self.onPreviewClick)) |
116 | self.ListView.addAction(contextMenuAction( |
117 | self.ListView, ':/system/system_live.png', |
118 | @@ -301,20 +325,23 @@ |
119 | count = 0 |
120 | filelist = [] |
121 | while count < self.ListView.count(): |
122 | - bitem = self.ListView.item(count) |
123 | + bitem = self.ListView.item(count) |
124 | filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) |
125 | filelist.append(filename) |
126 | count += 1 |
127 | return filelist |
128 | |
129 | def loadList(self, list): |
130 | - raise NotImplementedError(u'MediaManagerItem.loadList needs to be defined by the plugin') |
131 | + raise NotImplementedError( |
132 | + u'MediaManagerItem.loadList needs to be defined by the plugin') |
133 | |
134 | def onNewClick(self): |
135 | - raise NotImplementedError(u'MediaManagerItem.onNewClick needs to be defined by the plugin') |
136 | + raise NotImplementedError( |
137 | + u'MediaManagerItem.onNewClick needs to be defined by the plugin') |
138 | |
139 | def onEditClick(self): |
140 | - raise NotImplementedError(u'MediaManagerItem.onEditClick needs to be defined by the plugin') |
141 | + raise NotImplementedError( |
142 | + u'MediaManagerItem.onEditClick needs to be defined by the plugin') |
143 | |
144 | def onDeleteClick(self): |
145 | raise NotImplementedError(u'MediaManagerItem.onDeleteClick needs to be defined by the plugin') |
146 | @@ -323,7 +350,7 @@ |
147 | raise NotImplementedError(u'MediaManagerItem.generateSlideData needs to be defined by the plugin') |
148 | |
149 | def onPreviewClick(self): |
150 | - log.debug(self.PluginTextShort+u' Preview Requested') |
151 | + log.debug(self.PluginTextShort + u' Preview Requested') |
152 | service_item = self.buildServiceItem() |
153 | if service_item is not None: |
154 | self.parent.preview_controller.addServiceItem(service_item) |
155 | @@ -335,7 +362,7 @@ |
156 | self.parent.live_controller.addServiceItem(service_item) |
157 | |
158 | def onAddClick(self): |
159 | - log.debug(self.PluginTextShort+u' Add Requested') |
160 | + log.debug(self.PluginTextShort + u' Add Requested') |
161 | service_item = self.buildServiceItem() |
162 | if service_item is not None: |
163 | self.parent.service_manager.addServiceItem(service_item) |
164 | @@ -345,7 +372,8 @@ |
165 | Common method for generating a service item |
166 | """ |
167 | service_item = ServiceItem(self.parent) |
168 | - service_item.addIcon(u':/media/media_'+self.PluginTextShort.lower()+u'.png') |
169 | + service_item.addIcon( |
170 | + u':/media/media_' + self.PluginTextShort.lower() + u'.png') |
171 | if self.generateSlideData(service_item): |
172 | self.ListView.clearSelection() |
173 | return service_item |
174 | |
175 | === modified file 'openlp/core/lib/pluginmanager.py' |
176 | --- openlp/core/lib/pluginmanager.py 2009-09-19 23:05:30 +0000 |
177 | +++ openlp/core/lib/pluginmanager.py 2009-09-21 17:56:36 +0000 |
178 | @@ -26,7 +26,7 @@ |
179 | import sys |
180 | import logging |
181 | |
182 | -from openlp.core.lib import Plugin, PluginStatus |
183 | +from openlp.core.lib import Plugin, PluginStatus |
184 | |
185 | class PluginManager(object): |
186 | """ |
187 | |
188 | === modified file 'openlp/core/lib/renderer.py' |
189 | --- openlp/core/lib/renderer.py 2009-09-20 13:21:05 +0000 |
190 | +++ openlp/core/lib/renderer.py 2009-09-21 17:56:36 +0000 |
191 | @@ -188,13 +188,13 @@ |
192 | else: |
193 | pos = len(line) |
194 | split_text = line |
195 | - while metrics.width(split_text, -1) > line_width: |
196 | + while metrics.width(split_text, -1) > line_width: |
197 | #Find the next space to the left |
198 | pos = line[:pos].rfind(u' ') |
199 | #no more spaces found |
200 | if pos == 0: |
201 | split_text = line |
202 | - while metrics.width(split_text, -1) > line_width: |
203 | + while metrics.width(split_text, -1) > line_width: |
204 | split_text = split_text[:-1] |
205 | pos = len(split_text) |
206 | else: |
207 | @@ -242,7 +242,7 @@ |
208 | # reset the frame. first time do not worry about what you paint on. |
209 | self._frame = QtGui.QImage(self.bg_frame) |
210 | x, y = self._correctAlignment(self._rect, bbox) |
211 | - bbox = self._render_lines_unaligned(lines, False, (x, y), True) |
212 | + bbox = self._render_lines_unaligned(lines, False, (x, y), True) |
213 | if footer_lines is not None: |
214 | bbox = self._render_lines_unaligned(footer_lines, True, |
215 | (self._rect_footer.left(), self._rect_footer.top()), True) |
216 | @@ -327,7 +327,8 @@ |
217 | # centre align |
218 | y = rect.top() + (rect.height() - bbox.height()) / 2 |
219 | else: |
220 | - log.error(u'Invalid value for theme.VerticalAlign:%s' % self._theme.display_verticalAlign) |
221 | + log.error(u'Invalid value for theme.VerticalAlign:%s', |
222 | + self._theme.display_verticalAlign) |
223 | return x, y |
224 | |
225 | def _render_lines_unaligned(self, lines, footer, tlcorner=(0, 0), |
226 | @@ -400,7 +401,7 @@ |
227 | startx = x |
228 | starty = y |
229 | rightextent = None |
230 | - #print "inputs", startx, starty, maxx, maxy |
231 | + #print "inputs", startx, starty, maxx, maxy |
232 | # dont allow alignment messing with footers |
233 | if footer: |
234 | align = 0 |
235 | @@ -412,7 +413,7 @@ |
236 | for linenum in range(len(lines)): |
237 | line = lines[linenum] |
238 | #find out how wide line is |
239 | - w, h = self._get_extent_and_render(line, footer, tlcorner=(x, y), |
240 | + w, h = self._get_extent_and_render(line, footer, tlcorner=(x, y), |
241 | draw=False) |
242 | if self._theme.display_shadow: |
243 | w += shadow_offset |
244 | |
245 | === modified file 'openlp/core/lib/rendermanager.py' |
246 | --- openlp/core/lib/rendermanager.py 2009-09-20 07:12:47 +0000 |
247 | +++ openlp/core/lib/rendermanager.py 2009-09-21 17:56:36 +0000 |
248 | @@ -121,7 +121,8 @@ |
249 | else: |
250 | if theme is not None: |
251 | self.theme = theme |
252 | - elif self.global_style == u'Song' or self.global_style == u'Service': |
253 | + elif self.global_style == u'Song' or \ |
254 | + self.global_style == u'Service': |
255 | if self.service_theme == u'': |
256 | self.theme = self.global_theme |
257 | else: |
258 | @@ -129,9 +130,10 @@ |
259 | else: |
260 | self.theme = self.global_theme |
261 | if self.theme != self.renderer.theme_name: |
262 | - log.debug(u'theme is now %s', self.theme) |
263 | + log.debug(u'theme is now %s', self.theme) |
264 | self.themedata = self.theme_manager.getThemeData(self.theme) |
265 | - self.calculate_default(self.screen_list[self.current_display][u'size']) |
266 | + self.calculate_default( |
267 | + self.screen_list[self.current_display][u'size']) |
268 | self.renderer.set_theme(self.themedata) |
269 | self.build_text_rectangle(self.themedata) |
270 | |
271 | @@ -212,7 +214,7 @@ |
272 | self.renderer.set_frame_dest(self.width, self.height) |
273 | return self.renderer.generate_frame_from_lines(main_text, footer_text) |
274 | |
275 | - def resize_image(self, image, width = 0, height = 0): |
276 | + def resize_image(self, image, width=0, height=0): |
277 | """ |
278 | Resize an image to fit on the current screen. |
279 | |
280 | @@ -253,6 +255,7 @@ |
281 | self.width = screen.width() |
282 | self.height = screen.height() |
283 | self.screen_ratio = float(self.height) / float(self.width) |
284 | - log.debug(u'calculate default %d, %d, %f', self.width, self.height, self.screen_ratio ) |
285 | + log.debug(u'calculate default %d, %d, %f', |
286 | + self.width, self.height, self.screen_ratio ) |
287 | # 90% is start of footer |
288 | self.footer_start = int(self.height * 0.90) |
289 | |
290 | === modified file 'openlp/core/ui/__init__.py' |
291 | --- openlp/core/ui/__init__.py 2009-09-08 19:58:05 +0000 |
292 | +++ openlp/core/ui/__init__.py 2009-09-21 17:56:36 +0000 |
293 | @@ -39,5 +39,5 @@ |
294 | from mainwindow import MainWindow |
295 | |
296 | __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar', |
297 | - 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager', |
298 | + 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager', |
299 | 'ThemeManager', 'AmendThemeForm'] |
300 | |
301 | === modified file 'openlp/core/ui/alertstab.py' |
302 | --- openlp/core/ui/alertstab.py 2009-09-08 19:58:05 +0000 |
303 | +++ openlp/core/ui/alertstab.py 2009-09-21 17:56:36 +0000 |
304 | @@ -24,7 +24,7 @@ |
305 | |
306 | from PyQt4 import QtCore, QtGui |
307 | |
308 | -from openlp.core.lib import SettingsTab, translate |
309 | +from openlp.core.lib import SettingsTab, translate |
310 | |
311 | class AlertsTab(SettingsTab): |
312 | """ |
313 | @@ -33,7 +33,8 @@ |
314 | def __init__(self): |
315 | self.font_color = '#ffffff' |
316 | self.bg_color = '#660000' |
317 | - SettingsTab.__init__(self, translate(u'AlertsTab', u'Alerts'), u'Alerts') |
318 | + SettingsTab.__init__( |
319 | + self, translate(u'AlertsTab', u'Alerts'), u'Alerts') |
320 | |
321 | def setupUi(self): |
322 | self.setObjectName(u'AlertsTab') |
323 | @@ -110,10 +111,12 @@ |
324 | self.SlideRightLayout.setMargin(0) |
325 | self.SlideRightLayout.setObjectName(u'SlideRightLayout') |
326 | self.PreviewGroupBox = QtGui.QGroupBox(self.AlertRightColumn) |
327 | - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) |
328 | + sizePolicy = QtGui.QSizePolicy( |
329 | + QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) |
330 | sizePolicy.setHorizontalStretch(0) |
331 | sizePolicy.setVerticalStretch(0) |
332 | - sizePolicy.setHeightForWidth(self.PreviewGroupBox.sizePolicy().hasHeightForWidth()) |
333 | + sizePolicy.setHeightForWidth( |
334 | + self.PreviewGroupBox.sizePolicy().hasHeightForWidth()) |
335 | self.PreviewGroupBox.setSizePolicy(sizePolicy) |
336 | self.PreviewGroupBox.setObjectName(u'PreviewGroupBox') |
337 | self.PreviewLayout = QtGui.QVBoxLayout(self.PreviewGroupBox) |
338 | @@ -124,7 +127,8 @@ |
339 | self.FontPreview.setMinimumSize(QtCore.QSize(280, 100)) |
340 | self.FontPreview.setReadOnly(True) |
341 | self.FontPreview.setFocusPolicy(QtCore.Qt.NoFocus) |
342 | - self.FontPreview.setAlignment(QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) |
343 | + self.FontPreview.setAlignment( |
344 | + QtCore.Qt.AlignHCenter|QtCore.Qt.AlignVCenter) |
345 | self.FontPreview.setObjectName(u'FontPreview') |
346 | self.PreviewLayout.addWidget(self.FontPreview) |
347 | self.SlideRightLayout.addWidget(self.PreviewGroupBox) |
348 | @@ -146,11 +150,13 @@ |
349 | self.FontGroupBox.setTitle(translate(u'AlertsTab', u'Font')) |
350 | self.FontLabel.setText(translate(u'AlertsTab', u'Font Name:')) |
351 | self.FontColorLabel.setText(translate(u'AlertsTab', u'Font Color:')) |
352 | - self.BackgroundColorLabel.setText(translate(u'AlertsTab', u'Background Color:')) |
353 | + self.BackgroundColorLabel.setText( |
354 | + translate(u'AlertsTab', u'Background Color:')) |
355 | self.TimeoutLabel.setText(translate(u'AlertsTab', u'Alert timeout:')) |
356 | self.TimeoutSpinBox.setSuffix(translate(u'AlertsTab', u's')) |
357 | self.PreviewGroupBox.setTitle(translate(u'AlertsTab', u'Preview')) |
358 | - self.FontPreview.setText(translate(u'AlertsTab', u'openlp.org 2.0 rocks!')) |
359 | + self.FontPreview.setText( |
360 | + translate(u'AlertsTab', u'openlp.org 2.0 rocks!')) |
361 | |
362 | def onBackgroundColorButtonClicked(self): |
363 | self.bg_color = QtGui.QColorDialog.getColor( |
364 | @@ -174,12 +180,17 @@ |
365 | |
366 | def load(self): |
367 | self.timeout = int(self.config.get_config(u'timeout', 5)) |
368 | - self.font_color = unicode(self.config.get_config(u'font color', u'#ffffff')) |
369 | - self.bg_color = unicode(self.config.get_config(u'background color', u'#660000')) |
370 | - self.font_face = unicode(self.config.get_config(u'font face', QtGui.QFont().family())) |
371 | + self.font_color = unicode( |
372 | + self.config.get_config(u'font color', u'#ffffff')) |
373 | + self.bg_color = unicode( |
374 | + self.config.get_config(u'background color', u'#660000')) |
375 | + self.font_face = unicode( |
376 | + self.config.get_config(u'font face', QtGui.QFont().family())) |
377 | self.TimeoutSpinBox.setValue(self.timeout) |
378 | - self.FontColorButton.setStyleSheet(u'background-color: %s' % self.font_color) |
379 | - self.BackgroundColorButton.setStyleSheet(u'background-color: %s' % self.bg_color) |
380 | + self.FontColorButton.setStyleSheet( |
381 | + u'background-color: %s' % self.font_color) |
382 | + self.BackgroundColorButton.setStyleSheet( |
383 | + u'background-color: %s' % self.bg_color) |
384 | font = QtGui.QFont() |
385 | font.setFamily(self.font_face) |
386 | self.FontComboBox.setCurrentFont(font) |
387 | @@ -198,5 +209,5 @@ |
388 | font.setBold(True) |
389 | font.setPointSize(16) |
390 | self.FontPreview.setFont(font) |
391 | - self.FontPreview.setStyleSheet( |
392 | - u'background-color: %s; color: %s' % (self.bg_color, self.font_color)) |
393 | + self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' % \ |
394 | + (self.bg_color, self.font_color)) |
395 | |
396 | === modified file 'openlp/core/ui/amendthemeform.py' |
397 | --- openlp/core/ui/amendthemeform.py 2009-09-13 18:42:45 +0000 |
398 | +++ openlp/core/ui/amendthemeform.py 2009-09-21 17:56:36 +0000 |
399 | @@ -33,7 +33,7 @@ |
400 | |
401 | log = logging.getLogger(u'AmendThemeForm') |
402 | |
403 | -class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): |
404 | +class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog): |
405 | |
406 | def __init__(self, thememanager, parent=None): |
407 | QtGui.QDialog.__init__(self, parent) |
408 | |
409 | === modified file 'openlp/core/ui/maindisplay.py' |
410 | --- openlp/core/ui/maindisplay.py 2009-09-08 19:58:05 +0000 |
411 | +++ openlp/core/ui/maindisplay.py 2009-09-21 19:26:10 +0000 |
412 | @@ -26,7 +26,7 @@ |
413 | from PyQt4 import QtCore, QtGui |
414 | |
415 | from time import sleep |
416 | -from openlp.core.lib import translate, Receiver |
417 | +from openlp.core.lib import translate, Receiver |
418 | |
419 | class MainDisplay(QtGui.QWidget): |
420 | """ |
421 | @@ -129,7 +129,7 @@ |
422 | self.displayBlank = False |
423 | self.frameView(self.frame) |
424 | |
425 | - def displayAlert(self, text=u''): |
426 | + def displayAlert(self, text=u''): |
427 | """ |
428 | Called from the Alert Tab to display an alert |
429 | |
430 | @@ -141,7 +141,9 @@ |
431 | painter = QtGui.QPainter(alertframe) |
432 | top = alertframe.rect().height() * 0.9 |
433 | painter.fillRect( |
434 | - QtCore.QRect(0, top, alertframe.rect().width(), alertframe.rect().height() - top), |
435 | + QtCore.QRect( |
436 | + 0, top, alertframe.rect().width(), |
437 | + alertframe.rect().height() - top), |
438 | QtGui.QColor(alertTab.bg_color)) |
439 | font = QtGui.QFont() |
440 | font.setFamily(alertTab.font_face) |
441 | |
442 | === modified file 'openlp/core/ui/mainwindow.py' |
443 | --- openlp/core/ui/mainwindow.py 2009-09-19 23:05:30 +0000 |
444 | +++ openlp/core/ui/mainwindow.py 2009-09-21 17:56:36 +0000 |
445 | @@ -28,7 +28,7 @@ |
446 | from PyQt4 import QtCore, QtGui |
447 | |
448 | from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \ |
449 | - ServiceManager, ThemeManager, MainDisplay, SlideController, \ |
450 | + ServiceManager, ThemeManager, MainDisplay, SlideController, \ |
451 | PluginForm |
452 | from openlp.core.lib import translate, Plugin, MediaManagerItem, \ |
453 | SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \ |
454 | @@ -119,7 +119,7 @@ |
455 | |
456 | # self.MediaManagerDock.setSizePolicy(QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, |
457 | # QtGui.QSizePolicy.Maximum)) |
458 | -# geometry = self.MediaManagerDock.geometry() |
459 | +# geometry = self.MediaManagerDock.geometry() |
460 | # geometry.setWidth(self.settingsmanager.mainwindow_left) |
461 | # self.MediaManagerDock.setGeometry(geometry) |
462 | # self.MediaManagerDock.setMinimumWidth(10) |
463 | |
464 | === modified file 'openlp/core/ui/plugindialoglistform.py' |
465 | --- openlp/core/ui/plugindialoglistform.py 2009-09-18 17:37:11 +0000 |
466 | +++ openlp/core/ui/plugindialoglistform.py 2009-09-21 17:56:36 +0000 |
467 | @@ -9,7 +9,7 @@ |
468 | |
469 | import logging |
470 | from PyQt4 import QtCore, QtGui |
471 | -from openlp.core.lib import translate, PluginStatus |
472 | +from openlp.core.lib import translate, PluginStatus |
473 | |
474 | class PluginForm(QtGui.QDialog): |
475 | global log |
476 | @@ -45,14 +45,18 @@ |
477 | self.ButtonBox.setObjectName(u'ButtonBox') |
478 | |
479 | self.retranslateUi(PluginForm) |
480 | - QtCore.QObject.connect(self.ButtonBox, QtCore.SIGNAL(u'accepted()'), PluginForm.close) |
481 | + QtCore.QObject.connect(self.ButtonBox, |
482 | + QtCore.SIGNAL(u'accepted()'), PluginForm.close) |
483 | QtCore.QMetaObject.connectSlotsByName(PluginForm) |
484 | |
485 | def retranslateUi(self, PluginForm): |
486 | PluginForm.setWindowTitle(translate(u'PluginForm', u'Plugin list')) |
487 | - self.PluginViewList.horizontalHeaderItem(0).setText(translate(u'PluginForm', u'Name')) |
488 | - self.PluginViewList.horizontalHeaderItem(1).setText(translate(u'PluginForm', u'Version')) |
489 | - self.PluginViewList.horizontalHeaderItem(2).setText(translate(u'PluginForm', u'Status')) |
490 | + self.PluginViewList.horizontalHeaderItem(0).setText( |
491 | + translate(u'PluginForm', u'Name')) |
492 | + self.PluginViewList.horizontalHeaderItem(1).setText( |
493 | + translate(u'PluginForm', u'Version')) |
494 | + self.PluginViewList.horizontalHeaderItem(2).setText( |
495 | + translate(u'PluginForm', u'Status')) |
496 | |
497 | def load(self): |
498 | """ |
499 | @@ -68,14 +72,14 @@ |
500 | item2 = QtGui.QTableWidgetItem(plugin.version) |
501 | item2.setTextAlignment(QtCore.Qt.AlignVCenter) |
502 | if plugin.status == PluginStatus.Active: |
503 | - item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Active')) |
504 | + item3 = QtGui.QTableWidgetItem( |
505 | + translate(u'PluginForm', u'Active')) |
506 | else: |
507 | - item3 = QtGui.QTableWidgetItem(translate(u'PluginForm', u'Inactive')) |
508 | + item3 = QtGui.QTableWidgetItem( |
509 | + translate(u'PluginForm', u'Inactive')) |
510 | item3.setTextAlignment(QtCore.Qt.AlignVCenter) |
511 | self.PluginViewList.setItem(row, 0, item1) |
512 | self.PluginViewList.setItem(row, 1, item2) |
513 | self.PluginViewList.setItem(row, 2, item3) |
514 | self.PluginViewList.setRowHeight(row, 15) |
515 | |
516 | - |
517 | - |
518 | |
519 | === modified file 'openlp/core/ui/servicemanager.py' |
520 | --- openlp/core/ui/servicemanager.py 2009-09-19 21:45:50 +0000 |
521 | +++ openlp/core/ui/servicemanager.py 2009-09-21 17:56:36 +0000 |
522 | @@ -33,7 +33,7 @@ |
523 | from PyQt4 import QtCore, QtGui |
524 | from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \ |
525 | RenderManager, translate, buildIcon, ServiceType, \ |
526 | - contextMenuAction, contextMenuSeparator, Receiver |
527 | + contextMenuAction, contextMenuSeparator, Receiver |
528 | from openlp.core.utils import ConfigHelper |
529 | |
530 | class ServiceManagerList(QtGui.QTreeWidget): |
531 | @@ -285,7 +285,7 @@ |
532 | temp = self.serviceItems[item] |
533 | self.serviceItems.remove(self.serviceItems[item]) |
534 | self.serviceItems.insert(item - 1, temp) |
535 | - self.repaintServiceList(item - 1, count) |
536 | + self.repaintServiceList(item - 1, count) |
537 | self.parent.serviceChanged(False, self.serviceName) |
538 | |
539 | def onServiceDown(self): |
540 | @@ -298,7 +298,7 @@ |
541 | temp = self.serviceItems[item] |
542 | self.serviceItems.remove(self.serviceItems[item]) |
543 | self.serviceItems.insert(item + 1, temp) |
544 | - self.repaintServiceList(item + 1, count) |
545 | + self.repaintServiceList(item + 1, count) |
546 | self.parent.serviceChanged(False, self.serviceName) |
547 | |
548 | def onServiceEnd(self): |
549 | @@ -539,7 +539,7 @@ |
550 | pos = 0 |
551 | count = 0 |
552 | for item in items: |
553 | - parentitem = item.parent() |
554 | + parentitem = item.parent() |
555 | if parentitem is None: |
556 | pos = item.data(0, QtCore.Qt.UserRole).toInt()[0] |
557 | else: |
558 | |
559 | === modified file 'openlp/core/ui/slidecontroller.py' |
560 | --- openlp/core/ui/slidecontroller.py 2009-09-20 07:38:23 +0000 |
561 | +++ openlp/core/ui/slidecontroller.py 2009-09-21 17:56:36 +0000 |
562 | @@ -60,8 +60,8 @@ |
563 | |
564 | class SlideController(QtGui.QWidget): |
565 | """ |
566 | - SlideController is the slide controller widget. This widget is what the user |
567 | - uses to control the displaying of verses/slides/etc on the screen. |
568 | + SlideController is the slide controller widget. This widget is what the |
569 | + user uses to control the displaying of verses/slides/etc on the screen. |
570 | """ |
571 | global log |
572 | log = logging.getLogger(u'SlideController') |
573 | @@ -74,7 +74,8 @@ |
574 | self.settingsmanager = settingsmanager |
575 | self.isLive = isLive |
576 | self.parent = parent |
577 | - self.image_list = [u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox'] |
578 | + self.image_list = [ |
579 | + u'Start Loop', u'Stop Loop', u'Loop Separator', u'Image SpinBox'] |
580 | self.timer_id = 0 |
581 | self.commandItem = None |
582 | self.Panel = QtGui.QWidget(parent.ControlSplitter) |
583 | @@ -177,7 +178,8 @@ |
584 | sizePolicy.setHeightForWidth( |
585 | self.SlidePreview.sizePolicy().hasHeightForWidth()) |
586 | self.SlidePreview.setSizePolicy(sizePolicy) |
587 | - self.SlidePreview.setFixedSize(QtCore.QSize(self.settingsmanager.slidecontroller_image, 225)) |
588 | + self.SlidePreview.setFixedSize( |
589 | + QtCore.QSize(self.settingsmanager.slidecontroller_image, 225)) |
590 | self.SlidePreview.setFrameShape(QtGui.QFrame.Box) |
591 | self.SlidePreview.setFrameShadow(QtGui.QFrame.Plain) |
592 | self.SlidePreview.setLineWidth(1) |
593 | @@ -238,7 +240,8 @@ |
594 | """ |
595 | log.debug(u'addServiceItem') |
596 | #If old item was a command tell it to stop |
597 | - if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command: |
598 | + if self.commandItem is not None and \ |
599 | + self.commandItem.service_item_type == ServiceType.Command: |
600 | Receiver().send_message(u'%s_stop'% self.commandItem.name.lower()) |
601 | self.commandItem = item |
602 | before = time.time() |
603 | @@ -246,8 +249,9 @@ |
604 | log.info(u'Rendering took %4s' % (time.time() - before)) |
605 | self.enableToolBar(item) |
606 | if item.service_item_type == ServiceType.Command: |
607 | - Receiver().send_message(u'%s_start'%item.name.lower(), \ |
608 | - [item.shortname, item.service_item_path, item.service_frames[0][u'title']]) |
609 | + Receiver().send_message(u'%s_start' % item.name.lower(), \ |
610 | + [item.shortname, item.service_item_path, |
611 | + item.service_frames[0][u'title']]) |
612 | else: |
613 | self.displayServiceManagerItems(item, 0) |
614 | |
615 | @@ -259,13 +263,15 @@ |
616 | """ |
617 | log.debug(u'addServiceItem') |
618 | #If old item was a command tell it to stop |
619 | - if self.commandItem is not None and self.commandItem.service_item_type == ServiceType.Command: |
620 | + if self.commandItem is not None and \ |
621 | + self.commandItem.service_item_type == ServiceType.Command: |
622 | Receiver().send_message(u'%s_stop'% self.commandItem.name.lower()) |
623 | self.commandItem = item |
624 | self.enableToolBar(item) |
625 | if item.service_item_type == ServiceType.Command: |
626 | - Receiver().send_message(u'%s_start'%item.name.lower(), \ |
627 | - [item.shortname, item.service_item_path, item.service_frames[0][u'title']]) |
628 | + Receiver().send_message(u'%s_start' % item.name.lower(), \ |
629 | + [item.shortname, item.service_item_path, |
630 | + item.service_frames[0][u'title']]) |
631 | else: |
632 | self.displayServiceManagerItems(item, slideno) |
633 | |
634 | @@ -279,9 +285,11 @@ |
635 | self.serviceitem = serviceitem |
636 | self.PreviewListWidget.clear() |
637 | self.PreviewListWidget.setRowCount(0) |
638 | - self.PreviewListWidget.setColumnWidth(0, self.settingsmanager.slidecontroller_image) |
639 | + self.PreviewListWidget.setColumnWidth( |
640 | + 0, self.settingsmanager.slidecontroller_image) |
641 | for framenumber, frame in enumerate(self.serviceitem.frames): |
642 | - self.PreviewListWidget.setRowCount(self.PreviewListWidget.rowCount() + 1) |
643 | + self.PreviewListWidget.setRowCount( |
644 | + self.PreviewListWidget.rowCount() + 1) |
645 | item = QtGui.QTableWidgetItem() |
646 | label = QtGui.QLabel() |
647 | label.setMargin(8) |
648 | @@ -294,9 +302,11 @@ |
649 | label.setText(frame[u'text']) |
650 | self.PreviewListWidget.setCellWidget(framenumber, 0, label) |
651 | self.PreviewListWidget.setItem(framenumber, 0, item) |
652 | - slide_height = self.settingsmanager.slidecontroller_image * self.parent.RenderManager.screen_ratio |
653 | + slide_height = self.settingsmanager.slidecontroller_image * \ |
654 | + self.parent.RenderManager.screen_ratio |
655 | self.PreviewListWidget.setRowHeight(framenumber, slide_height) |
656 | - self.PreviewListWidget.setColumnWidth(0, self.PreviewListWidget.viewport().size().width()) |
657 | + self.PreviewListWidget.setColumnWidth( |
658 | + 0, self.PreviewListWidget.viewport().size().width()) |
659 | if slideno > self.PreviewListWidget.rowCount(): |
660 | self.PreviewListWidget.selectRow(self.PreviewListWidget.rowCount()) |
661 | else: |
662 | @@ -357,7 +367,8 @@ |
663 | Go to the previous slide. |
664 | """ |
665 | if self.commandItem.service_item_type == ServiceType.Command: |
666 | - Receiver().send_message(u'%s_previous'% self.commandItem.name.lower()) |
667 | + Receiver().send_message( |
668 | + u'%s_previous'% self.commandItem.name.lower()) |
669 | else: |
670 | row = self.PreviewListWidget.currentRow() - 1 |
671 | if row == -1: |
672 | @@ -377,7 +388,8 @@ |
673 | Start the timer loop running and store the timer id |
674 | """ |
675 | if self.PreviewListWidget.rowCount() > 1: |
676 | - self.timer_id = self.startTimer(int(self.DelaySpinBox.value()) * 1000) |
677 | + self.timer_id = self.startTimer( |
678 | + int(self.DelaySpinBox.value()) * 1000) |
679 | |
680 | def onStopLoop(self): |
681 | """ |
682 | @@ -398,4 +410,5 @@ |
683 | """ |
684 | row = self.PreviewListWidget.currentRow() |
685 | if row > -1 and row < self.PreviewListWidget.rowCount(): |
686 | - self.parent.LiveController.addServiceManagerItem(self.commandItem, row) |
687 | + self.parent.LiveController.addServiceManagerItem( |
688 | + self.commandItem, row) |
689 | |
690 | === modified file 'openlp/core/ui/splashscreen.py' |
691 | --- openlp/core/ui/splashscreen.py 2009-09-08 19:58:05 +0000 |
692 | +++ openlp/core/ui/splashscreen.py 2009-09-21 17:56:36 +0000 |
693 | @@ -29,36 +29,42 @@ |
694 | def __init__(self, version): |
695 | self.splash_screen = QtGui.QSplashScreen() |
696 | self.setupUi() |
697 | - starting = translate(u'SplashScreen',u'Starting') |
698 | - self.message=starting+u'..... '+version |
699 | + starting = translate(u'SplashScreen', u'Starting') |
700 | + self.message = starting + u'..... ' + version |
701 | |
702 | def setupUi(self): |
703 | self.splash_screen.setObjectName(u'splash_screen') |
704 | self.splash_screen.setWindowModality(QtCore.Qt.NonModal) |
705 | self.splash_screen.setEnabled(True) |
706 | self.splash_screen.resize(370, 370) |
707 | - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) |
708 | + sizePolicy = QtGui.QSizePolicy( |
709 | + QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) |
710 | sizePolicy.setHorizontalStretch(0) |
711 | sizePolicy.setVerticalStretch(0) |
712 | - sizePolicy.setHeightForWidth(self.splash_screen.sizePolicy().hasHeightForWidth()) |
713 | + sizePolicy.setHeightForWidth( |
714 | + self.splash_screen.sizePolicy().hasHeightForWidth()) |
715 | self.splash_screen.setSizePolicy(sizePolicy) |
716 | self.splash_screen.setContextMenuPolicy(QtCore.Qt.PreventContextMenu) |
717 | icon = QtGui.QIcon() |
718 | - icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) |
719 | + icon.addPixmap(QtGui.QPixmap(u':/icon/openlp-logo-16x16.png'), |
720 | + QtGui.QIcon.Normal, QtGui.QIcon.Off) |
721 | splash_image = QtGui.QPixmap(u':/graphics/openlp-splash-screen.png') |
722 | self.splash_screen.setWindowIcon(icon) |
723 | self.splash_screen.setPixmap(splash_image) |
724 | self.splash_screen.setMask(splash_image.mask()) |
725 | - self.splash_screen.setWindowFlags(QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint) |
726 | + self.splash_screen.setWindowFlags( |
727 | + QtCore.Qt.SplashScreen | QtCore.Qt.WindowStaysOnTopHint) |
728 | self.retranslateUi() |
729 | QtCore.QMetaObject.connectSlotsByName(self.splash_screen) |
730 | |
731 | def retranslateUi(self): |
732 | - self.splash_screen.setWindowTitle(translate(u'splash_screen', u'Splash Screen')) |
733 | + self.splash_screen.setWindowTitle( |
734 | + translate(u'splash_screen', u'Splash Screen')) |
735 | |
736 | def show(self): |
737 | self.splash_screen.show() |
738 | - self.splash_screen.showMessage(self.message, QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom, QtCore.Qt.black) |
739 | + self.splash_screen.showMessage(self.message, |
740 | + QtCore.Qt.AlignLeft | QtCore.Qt.AlignBottom, QtCore.Qt.black) |
741 | self.splash_screen.repaint() |
742 | |
743 | def finish(self, widget): |
744 | |
745 | === modified file 'openlp/core/ui/thememanager.py' |
746 | --- openlp/core/ui/thememanager.py 2009-09-14 18:53:56 +0000 |
747 | +++ openlp/core/ui/thememanager.py 2009-09-21 17:56:36 +0000 |
748 | @@ -97,10 +97,10 @@ |
749 | |
750 | def changeGlobalFromTab(self, themeName): |
751 | log.debug(u'changeGlobalFromTab %s', themeName) |
752 | - for count in range (0, self.ThemeListWidget.count()): |
753 | + for count in range (0, self.ThemeListWidget.count()): |
754 | #reset the old name |
755 | item = self.ThemeListWidget.item(count) |
756 | - oldName = item.text() |
757 | + oldName = item.text() |
758 | newName = unicode(item.data(QtCore.Qt.UserRole).toString()) |
759 | if oldName != newName: |
760 | self.ThemeListWidget.item(count).setText(newName) |
761 | @@ -112,9 +112,9 @@ |
762 | |
763 | def changeGlobalFromScreen(self, index): |
764 | log.debug(u'changeGlobalFromScreen %s', index) |
765 | - for count in range (0, self.ThemeListWidget.count()): |
766 | + for count in range (0, self.ThemeListWidget.count()): |
767 | item = self.ThemeListWidget.item(count) |
768 | - oldName = item.text() |
769 | + oldName = item.text() |
770 | #reset the old name |
771 | if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()): |
772 | self.ThemeListWidget.item(count).setText( |
773 | @@ -194,12 +194,13 @@ |
774 | path = unicode(path) |
775 | if path != u'': |
776 | self.config.set_last_dir(path, 1) |
777 | - themePath = os.path.join(path, theme + u'.theme') |
778 | + themePath = os.path.join(path, theme + u'.theme') |
779 | zip = zipfile.ZipFile(themePath, 'w') |
780 | source = os.path.join(self.path, theme) |
781 | for root, dirs, files in os.walk(source): |
782 | for name in files: |
783 | - zip.write(os.path.join(source, name), os.path.join(theme, name)) |
784 | + zip.write( |
785 | + os.path.join(source, name), os.path.join(theme, name)) |
786 | zip.close() |
787 | |
788 | def onImportTheme(self): |
789 | @@ -226,7 +227,7 @@ |
790 | for name in files: |
791 | if name.endswith(u'.png'): |
792 | #check to see file is in theme root directory |
793 | - theme = os.path.join(self.path, name) |
794 | + theme = os.path.join(self.path, name) |
795 | if os.path.exists(theme): |
796 | (path, filename) = os.path.split(unicode(file)) |
797 | textName = os.path.splitext(name)[0] |
798 | @@ -244,7 +245,7 @@ |
799 | self.pushThemes() |
800 | |
801 | def pushThemes(self): |
802 | - Receiver().send_message(u'update_themes', self.getThemes() ) |
803 | + Receiver().send_message(u'update_themes', self.getThemes() ) |
804 | |
805 | def getThemes(self): |
806 | return self.themelist |
807 | |
808 | === modified file 'openlp/core/ui/themestab.py' |
809 | --- openlp/core/ui/themestab.py 2009-09-08 19:58:05 +0000 |
810 | +++ openlp/core/ui/themestab.py 2009-09-21 17:56:36 +0000 |
811 | @@ -24,7 +24,7 @@ |
812 | |
813 | from PyQt4 import QtCore, QtGui |
814 | |
815 | -from openlp.core.lib import SettingsTab, translate, Receiver |
816 | +from openlp.core.lib import SettingsTab, translate, Receiver |
817 | |
818 | class ThemesTab(SettingsTab): |
819 | """ |
820 | @@ -32,7 +32,8 @@ |
821 | """ |
822 | def __init__(self, parent): |
823 | self.parent = parent |
824 | - SettingsTab.__init__(self, translate(u'ThemesTab', u'Themes'), u'Themes') |
825 | + SettingsTab.__init__( |
826 | + self, translate(u'ThemesTab', u'Themes'), u'Themes') |
827 | |
828 | def setupUi(self): |
829 | self.setObjectName(u'ThemesTab') |
830 | @@ -106,15 +107,19 @@ |
831 | def retranslateUi(self): |
832 | self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme')) |
833 | self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level')) |
834 | - self.SongLevelRadioButton.setText(translate(u'ThemesTab', u'Song level')) |
835 | + self.SongLevelRadioButton.setText( |
836 | + translate(u'ThemesTab', u'Song level')) |
837 | self.SongLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from each song in the database. If a song doesn\'t have a theme associated with it, then use the service\'s theme. If the service doesn\'t have a theme, then use the global theme.')) |
838 | - self.ServiceLevelRadioButton.setText(translate(u'ThemesTab', u'Service level')) |
839 | + self.ServiceLevelRadioButton.setText( |
840 | + translate(u'ThemesTab', u'Service level')) |
841 | self.ServiceLevelLabel.setText(translate(u'ThemesTab', u'Use the theme from the service, overriding any of the individual songs\' themes. If the service doesn\'t have a theme, then use the global theme.')) |
842 | - self.GlobalLevelRadioButton.setText(translate(u'ThemesTab', u'Global level')) |
843 | + self.GlobalLevelRadioButton.setText( |
844 | + translate(u'ThemesTab', u'Global level')) |
845 | self.GlobalLevelLabel.setText(translate(u'ThemesTab', u'Use the global theme, overriding any themes associated with either the service or the songs.')) |
846 | |
847 | def load(self): |
848 | - self.global_style = self.config.get_config(u'theme global style', u'Global') |
849 | + self.global_style = self.config.get_config( |
850 | + u'theme global style', u'Global') |
851 | self.global_theme = self.config.get_config(u'theme global theme', u'') |
852 | if self.global_style == u'Global': |
853 | self.GlobalLevelRadioButton.setChecked(True) |
854 | @@ -126,29 +131,35 @@ |
855 | def save(self): |
856 | self.config.set_config(u'theme global style', self.global_style ) |
857 | self.config.set_config(u'theme global theme',self.global_theme) |
858 | - Receiver().send_message(u'update_global_theme', self.global_theme ) |
859 | + Receiver().send_message(u'update_global_theme', self.global_theme ) |
860 | |
861 | def postSetUp(self): |
862 | - Receiver().send_message(u'update_global_theme', self.global_theme ) |
863 | + Receiver().send_message(u'update_global_theme', self.global_theme ) |
864 | |
865 | def onSongLevelButtonPressed(self): |
866 | self.global_style= u'Song' |
867 | - self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style) |
868 | + self.parent.RenderManager.set_global_theme( |
869 | + self.global_theme, self.global_style) |
870 | |
871 | def onServiceLevelButtonPressed(self): |
872 | self.global_style= u'Service' |
873 | - self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style) |
874 | + self.parent.RenderManager.set_global_theme( |
875 | + self.global_theme, self.global_style) |
876 | |
877 | def onGlobalLevelButtonPressed(self): |
878 | self.global_style= u'Global' |
879 | - self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style) |
880 | + self.parent.RenderManager.set_global_theme( |
881 | + self.global_theme, self.global_style) |
882 | |
883 | def onDefaultComboBoxChanged(self, value): |
884 | self.global_theme = unicode(self.DefaultComboBox.currentText()) |
885 | - self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style) |
886 | - image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme) |
887 | + self.parent.RenderManager.set_global_theme( |
888 | + self.global_theme, self.global_style) |
889 | + image = self.parent.ThemeManagerContents.getPreviewImage( |
890 | + self.global_theme) |
891 | preview = QtGui.QPixmap(unicode(image)) |
892 | - display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) |
893 | + display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, |
894 | + QtCore.Qt.SmoothTransformation) |
895 | self.DefaultListView.setPixmap(display) |
896 | |
897 | def updateThemeList(self, theme_list): |
898 | @@ -160,14 +171,18 @@ |
899 | self.DefaultComboBox.clear() |
900 | for theme in theme_list: |
901 | self.DefaultComboBox.addItem(theme) |
902 | - id = self.DefaultComboBox.findText(self.global_theme, QtCore.Qt.MatchExactly) |
903 | + id = self.DefaultComboBox.findText( |
904 | + self.global_theme, QtCore.Qt.MatchExactly) |
905 | if id == -1: |
906 | id = 0 # Not Found |
907 | self.global_theme = u'' |
908 | self.DefaultComboBox.setCurrentIndex(id) |
909 | - self.parent.RenderManager.set_global_theme(self.global_theme, self.global_style) |
910 | + self.parent.RenderManager.set_global_theme( |
911 | + self.global_theme, self.global_style) |
912 | if self.global_theme is not u'': |
913 | - image = self.parent.ThemeManagerContents.getPreviewImage(self.global_theme) |
914 | + image = self.parent.ThemeManagerContents.getPreviewImage( |
915 | + self.global_theme) |
916 | preview = QtGui.QPixmap(unicode(image)) |
917 | - display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) |
918 | + display = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio, |
919 | + QtCore.Qt.SmoothTransformation) |
920 | self.DefaultListView.setPixmap(display) |
921 | |
922 | === modified file 'openlp/migration/migratesongs.py' |
923 | --- openlp/migration/migratesongs.py 2009-09-08 19:58:05 +0000 |
924 | +++ openlp/migration/migratesongs.py 2009-09-21 17:56:36 +0000 |
925 | @@ -31,17 +31,18 @@ |
926 | from sqlalchemy import * |
927 | from sqlalchemy.sql import select |
928 | from sqlalchemy import create_engine |
929 | -from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, clear_mappers |
930 | +from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \ |
931 | + clear_mappers |
932 | from openlp.plugins.songs.lib.models import metadata, session, \ |
933 | - engine, songs_table, Song, Author, Topic, Book |
934 | + engine, songs_table, Song, Author, Topic, Book |
935 | from openlp.plugins.songs.lib.tables import * |
936 | from openlp.plugins.songs.lib.classes import * |
937 | |
938 | def init_models(url): |
939 | engine = create_engine(url) |
940 | metadata.bind = engine |
941 | - session = scoped_session(sessionmaker(autoflush=True, autocommit=False, |
942 | - bind=engine)) |
943 | + session = scoped_session( |
944 | + sessionmaker(autoflush=True, autocommit=False, bind=engine)) |
945 | mapper(Author, authors_table) |
946 | mapper(TAuthor, temp_authors_table) |
947 | mapper(Book, song_books_table) |
948 | @@ -57,7 +58,7 @@ |
949 | return session |
950 | |
951 | temp_authors_table = Table(u'authors_temp', metadata, |
952 | - Column(u'authorid', types.Integer, primary_key=True), |
953 | + Column(u'authorid', types.Integer, primary_key=True), |
954 | Column(u'authorname', String(40)) |
955 | ) |
956 | |
957 | @@ -154,14 +155,18 @@ |
958 | song.search_title = u'' |
959 | song.search_lyrics = u'' |
960 | print songs_temp.songtitle |
961 | - aa = self.session.execute(u'select * from songauthors_temp where songid =' + unicode(songs_temp.songid) ) |
962 | + aa = self.session.execute( |
963 | + u'select * from songauthors_temp where songid =' + \ |
964 | + unicode(songs_temp.songid) ) |
965 | for row in aa: |
966 | a = row['authorid'] |
967 | authors_temp = self.session.query(TAuthor).get(a) |
968 | - bb = self.session.execute(u'select * from authors where display_name = \"%s\"' % unicode(authors_temp.authorname) ).fetchone() |
969 | + bb = self.session.execute( |
970 | + u'select * from authors where display_name = \"%s\"' % \ |
971 | + unicode(authors_temp.authorname) ).fetchone() |
972 | if bb is None: |
973 | author = Author() |
974 | - author.display_name = authors_temp.authorname |
975 | + author.display_name = authors_temp.authorname |
976 | author.first_name = u'' |
977 | author.last_name = u'' |
978 | else: |
979 | @@ -180,11 +185,11 @@ |
980 | conn = sqlite3.connect(self.data_path + os.sep + database) |
981 | conn.execute("""update songs set search_title = |
982 | replace(replace(replace(replace(replace(replace(replace(replace( |
983 | - replace(title, '&', 'and'), ',', ''), ';', ''), ':', ''), |
984 | + replace(title, '&', 'and'), ',', ''), ';', ''), ':', ''), |
985 | '(u', ''), ')', ''), '{', ''), '}',''),'?','');""") |
986 | conn.execute("""update songs set search_lyrics = |
987 | replace(replace(replace(replace(replace(replace(replace(replace( |
988 | - replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''), |
989 | + replace(lyrics, '&', 'and'), ',', ''), ';', ''), ':', ''), |
990 | '(u', ''), ')', ''), '{', ''), '}',''),'?','') |
991 | ;""") |
992 | conn.commit() |
993 | |
994 | === modified file 'openlp/plugins/audit/auditplugin.py' |
995 | --- openlp/plugins/audit/auditplugin.py 2009-09-19 19:45:15 +0000 |
996 | +++ openlp/plugins/audit/auditplugin.py 2009-09-21 17:56:36 +0000 |
997 | @@ -27,7 +27,7 @@ |
998 | from PyQt4 import QtCore, QtGui |
999 | from datetime import date |
1000 | |
1001 | -from openlp.core.lib import Plugin, Receiver, translate, str_to_bool |
1002 | +from openlp.core.lib import Plugin, Receiver, translate, str_to_bool |
1003 | from openlp.plugins.audit.lib import AuditTab |
1004 | |
1005 | class AuditPlugin(Plugin): |
1006 | @@ -98,7 +98,8 @@ |
1007 | QtCore.QObject.connect(Receiver.get_receiver(), |
1008 | QtCore.SIGNAL(u'audit_changed'), self.onUpdateAudit) |
1009 | self.auditFileName = self.config.get_config(u'audit file', u'') |
1010 | - self.auditActive = str_to_bool(self.config.get_config(u'audit active', False)) |
1011 | + self.auditActive = str_to_bool( |
1012 | + self.config.get_config(u'audit active', False)) |
1013 | if self.auditFileName == u'': |
1014 | self.auditActive = False |
1015 | self.ToolsAuditItem.setEnabled(False) |
1016 | @@ -117,7 +118,8 @@ |
1017 | """ |
1018 | if self.auditActive: |
1019 | for author in auditData[1]: |
1020 | - self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % (date.today(), auditData[0], author, auditData[2])) |
1021 | + self.auditFile.write(u'\"%s\",\"%s\",\"%s\",\"%s\"\n' % \ |
1022 | + (date.today(), auditData[0], author, auditData[2])) |
1023 | self.auditFile.flush() |
1024 | |
1025 | def onUpdateAudit(self): |
1026 | @@ -126,7 +128,8 @@ |
1027 | Sort out the file and the auditing state |
1028 | """ |
1029 | self.auditFileNameNew = self.config.get_config(u'audit file', u'') |
1030 | - self.auditActive = str_to_bool(self.config.get_config(u'audit active', False)) |
1031 | + self.auditActive = str_to_bool( |
1032 | + self.config.get_config(u'audit active', False)) |
1033 | if self.auditFileNameNew == u'': |
1034 | self.auditActive = False |
1035 | self.ToolsAuditItem.setChecked(self.auditActive) |
1036 | |
1037 | === modified file 'openlp/plugins/audit/lib/audittab.py' |
1038 | --- openlp/plugins/audit/lib/audittab.py 2009-09-19 19:31:18 +0000 |
1039 | +++ openlp/plugins/audit/lib/audittab.py 2009-09-21 17:56:36 +0000 |
1040 | @@ -24,7 +24,7 @@ |
1041 | |
1042 | from PyQt4 import QtCore, QtGui |
1043 | |
1044 | -from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver |
1045 | +from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver |
1046 | |
1047 | class AuditTab(SettingsTab): |
1048 | """ |
1049 | @@ -45,7 +45,8 @@ |
1050 | self.AuditFileName.setObjectName("AuditFileName") |
1051 | self.horizontalLayout.addWidget(self.AuditFileName) |
1052 | icon1 = QtGui.QIcon() |
1053 | - icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off) |
1054 | + icon1.addPixmap(QtGui.QPixmap(u':/imports/import_load.png'), |
1055 | + QtGui.QIcon.Normal, QtGui.QIcon.Off) |
1056 | self.AuditFileButton = QtGui.QPushButton(self) |
1057 | self.AuditFileButton.setObjectName("AuditFileButton") |
1058 | self.AuditFileButton.setIcon(icon1) |
1059 | @@ -63,19 +64,23 @@ |
1060 | def retranslateUi(self): |
1061 | self.AuditModeGroupBox.setTitle(translate(u'AuditTab', u'Audit File')) |
1062 | self.AuditActive.setText(translate(u'AuditTab', 'Audit available:')) |
1063 | - self.WarningLabel.setText(translate(u'AuditTab', u'A restart is needed for this change to become effective')) |
1064 | + self.WarningLabel.setText(translate(u'AuditTab', |
1065 | + u'A restart is needed for this change to become effective')) |
1066 | |
1067 | def load(self): |
1068 | self.AuditFileName.setText(self.config.get_config(u'Audit file', u'')) |
1069 | self.AuditActive.setChecked(int(self.config.get_config(u'startup', 0))) |
1070 | |
1071 | def onAuditFileButtonClicked(self): |
1072 | - filename = QtGui.QFileDialog.getOpenFileName(self, u'Audit File',self.AuditFileName.text()) |
1073 | + filename = QtGui.QFileDialog.getOpenFileName( |
1074 | + self, u'Audit File',self.AuditFileName.text()) |
1075 | if filename != u'': |
1076 | filename = unicode(filename) |
1077 | self.AuditFileName.setText(filename) |
1078 | |
1079 | def save(self): |
1080 | - self.config.set_config(u'Audit file', unicode(self.AuditFileName.text())) |
1081 | - self.config.set_config(u'startup', unicode(self.AuditActive.checkState())) |
1082 | + self.config.set_config( |
1083 | + u'Audit file', unicode(self.AuditFileName.text())) |
1084 | + self.config.set_config( |
1085 | + u'startup', unicode(self.AuditActive.checkState())) |
1086 | Receiver().send_message(u'audit_changed') |
1087 | |
1088 | === modified file 'openlp/plugins/bibles/bibleplugin.py' |
1089 | --- openlp/plugins/bibles/bibleplugin.py 2009-09-08 19:58:05 +0000 |
1090 | +++ openlp/plugins/bibles/bibleplugin.py 2009-09-21 17:56:36 +0000 |
1091 | @@ -25,7 +25,6 @@ |
1092 | import logging |
1093 | |
1094 | from PyQt4 import QtCore, QtGui |
1095 | -from PyQt4.QtCore import * |
1096 | |
1097 | from openlp.core.lib import Plugin, translate |
1098 | |
1099 | @@ -62,7 +61,8 @@ |
1100 | import_menu.addAction(self.ImportBibleItem) |
1101 | self.ImportBibleItem.setText(translate(u'BiblePlugin', u'&Bible')) |
1102 | # Signals and slots |
1103 | - QtCore.QObject.connect(self.ImportBibleItem, QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick) |
1104 | + QtCore.QObject.connect(self.ImportBibleItem, |
1105 | + QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick) |
1106 | |
1107 | def add_export_menu_item(self, export_menu): |
1108 | self.ExportBibleItem = QtGui.QAction(export_menu) |
1109 | |
1110 | === modified file 'openlp/plugins/bibles/forms/bibleimportform.py' |
1111 | --- openlp/plugins/bibles/forms/bibleimportform.py 2009-09-08 19:58:05 +0000 |
1112 | +++ openlp/plugins/bibles/forms/bibleimportform.py 2009-09-21 17:56:36 +0000 |
1113 | @@ -31,7 +31,7 @@ |
1114 | from PyQt4 import QtCore, QtGui |
1115 | |
1116 | from bibleimportdialog import Ui_BibleImportDialog |
1117 | -from openlp.core.lib import Receiver, translate |
1118 | +from openlp.core.lib import Receiver, translate |
1119 | |
1120 | |
1121 | class BibleImportForm(QtGui.QDialog, Ui_BibleImportDialog): |
1122 | @@ -41,7 +41,7 @@ |
1123 | """ |
1124 | Class documentation goes here. |
1125 | """ |
1126 | - def __init__(self, config, biblemanager , bibleplugin, parent = None): |
1127 | + def __init__(self, config, biblemanager, bibleplugin, parent=None): |
1128 | ''' |
1129 | Constructor |
1130 | ''' |
1131 | @@ -196,23 +196,28 @@ |
1132 | log.debug(u'Import Bible') |
1133 | message = None |
1134 | if self.bible_type == u'OSIS': |
1135 | - loaded = self.biblemanager.register_osis_file_bible(unicode(self.BibleNameEdit.displayText()), |
1136 | + loaded = self.biblemanager.register_osis_file_bible( |
1137 | + unicode(self.BibleNameEdit.displayText()), |
1138 | self.OSISLocationEdit.displayText()) |
1139 | elif self.bible_type == u'CSV': |
1140 | - loaded = self.biblemanager.register_csv_file_bible(unicode(self.BibleNameEdit.displayText()), |
1141 | - self.BooksLocationEdit.displayText(), self.VerseLocationEdit.displayText()) |
1142 | + loaded = self.biblemanager.register_csv_file_bible( |
1143 | + unicode(self.BibleNameEdit.displayText()), |
1144 | + self.BooksLocationEdit.displayText(), |
1145 | + self.VerseLocationEdit.displayText()) |
1146 | else: |
1147 | # set a value as it will not be needed |
1148 | self.setMax(1) |
1149 | - bible = self.bible_versions[unicode(self.BibleComboBox.currentText())] |
1150 | - loaded = self.biblemanager.register_http_bible(unicode(self.BibleComboBox.currentText()), \ |
1151 | - unicode(self.LocationComboBox.currentText()), \ |
1152 | - unicode(bible), \ |
1153 | - unicode(self.AddressEdit.displayText()), \ |
1154 | - unicode(self.UsernameEdit .displayText()), \ |
1155 | - unicode(self.PasswordEdit.displayText())) |
1156 | + bible = self.bible_versions[ |
1157 | + unicode(self.BibleComboBox.currentText())] |
1158 | + loaded = self.biblemanager.register_http_bible( |
1159 | + unicode(self.BibleComboBox.currentText()), |
1160 | + unicode(self.LocationComboBox.currentText()), |
1161 | + unicode(bible), unicode(self.AddressEdit.displayText()), |
1162 | + unicode(self.UsernameEdit .displayText()), |
1163 | + unicode(self.PasswordEdit.displayText())) |
1164 | if loaded: |
1165 | - self.biblemanager.save_meta_data(unicode(self.BibleNameEdit.displayText()), |
1166 | + self.biblemanager.save_meta_data( |
1167 | + unicode(self.BibleNameEdit.displayText()), |
1168 | unicode(self.VersionNameEdit.displayText()), |
1169 | unicode(self.CopyrightEdit.displayText()), |
1170 | unicode(self.PermisionEdit.displayText())) |
1171 | @@ -226,7 +231,8 @@ |
1172 | return loaded, message |
1173 | |
1174 | def checkOsis(self): |
1175 | - if len(self.BooksLocationEdit.displayText()) > 0 or len(self.VerseLocationEdit.displayText()) > 0: |
1176 | + if len(self.BooksLocationEdit.displayText()) > 0 or \ |
1177 | + len(self.VerseLocationEdit.displayText()) > 0: |
1178 | self.setCsv() |
1179 | else: |
1180 | # Was CSV and is not any more stops lostFocus running mad |
1181 | @@ -235,7 +241,8 @@ |
1182 | self.resetScreenFieldStates() |
1183 | |
1184 | def checkHttp(self): |
1185 | - if self.BibleComboBox.currentIndex() != 0 : # First slot is blank so no bible |
1186 | + if self.BibleComboBox.currentIndex() != 0 : |
1187 | + # First slot is blank so no bible |
1188 | self.setHttp() |
1189 | else: |
1190 | # Was HTTP and is not any more stops lostFocus running mad |
1191 | |
1192 | === modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py' |
1193 | --- openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-08 19:58:05 +0000 |
1194 | +++ openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-21 17:56:36 +0000 |
1195 | @@ -42,7 +42,8 @@ |
1196 | """ |
1197 | self.bibledb = bibledb |
1198 | self.loadbible = True |
1199 | - QtCore.QObject.connect(Receiver().get_receiver(),QtCore.SIGNAL(u'openlpstopimport'),self.stop_import) |
1200 | + QtCore.QObject.connect(Receiver().get_receiver(), |
1201 | + QtCore.SIGNAL(u'openlpstopimport'), self.stop_import) |
1202 | |
1203 | def stop_import(self): |
1204 | self.loadbible= False |
1205 | @@ -80,7 +81,7 @@ |
1206 | # split into 3 units and leave the rest as a single field |
1207 | p = line.split(u',', 3) |
1208 | p0 = p[0].replace(u'"', u'') |
1209 | - p3 = p[3].replace(u'"',u'') |
1210 | + p3 = p[3].replace(u'"',u'') |
1211 | if book_ptr is not p0: |
1212 | book = self.bibledb.get_bible_book(p0) |
1213 | book_ptr = book.name |
1214 | |
1215 | === modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py' |
1216 | --- openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-12 17:24:16 +0000 |
1217 | +++ openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-21 17:56:36 +0000 |
1218 | @@ -59,7 +59,7 @@ |
1219 | self._load_testament(u'New Testament') |
1220 | self._load_testament(u'Apocrypha') |
1221 | |
1222 | - def add_verse(self, bookid, chap, vse, text): |
1223 | + def add_verse(self, bookid, chap, vse, text): |
1224 | #log.debug(u'add_verse %s,%s,%s", bookid, chap, vse) |
1225 | verse = Verse() |
1226 | verse.book_id = bookid |
1227 | @@ -113,7 +113,7 @@ |
1228 | return False |
1229 | |
1230 | def _load_testament(self, testament): |
1231 | - log.debug(u'load_testaments %s', testament) |
1232 | + log.debug(u'load_testaments %s', testament) |
1233 | test = ONTestament() |
1234 | test.name = testament |
1235 | self.session.add(test) |
1236 | |
1237 | === modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py' |
1238 | --- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-08 19:58:05 +0000 |
1239 | +++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-21 19:26:10 +0000 |
1240 | @@ -39,21 +39,32 @@ |
1241 | log.debug(u'init %s', proxyurl) |
1242 | self.proxyurl = proxyurl |
1243 | |
1244 | - def get_bible_chapter(self, version, bookid, bookname, chapter) : |
1245 | + def get_bible_chapter(self, version, bookid, bookname, chapter) : |
1246 | """ |
1247 | Access and decode bibles via the BibleGateway website |
1248 | - Version - the version of the bible like 31 for New International version |
1249 | - bookid - Book id for the book of the bible - eg 1 for Genesis |
1250 | - bookname - not used |
1251 | - chapter - chapter number |
1252 | + |
1253 | + ``Version`` |
1254 | + The version of the bible like 31 for New International version |
1255 | + |
1256 | + ``bookid`` |
1257 | + Book id for the book of the bible - eg 1 for Genesis |
1258 | + |
1259 | + ``bookname`` |
1260 | + Not used |
1261 | + |
1262 | + ``chapter`` |
1263 | + Chapter number |
1264 | """ |
1265 | - log.debug( u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname, chapter) |
1266 | - urlstring = u'http://www.biblegateway.com/passage/?book_id='+unicode(bookid)+u'&chapter'+unicode(chapter)+u'&version='+unicode(version) |
1267 | + log.debug(u'get_bible_chapter %s,%s,%s,%s', |
1268 | + version, bookid, bookname, chapter) |
1269 | + urlstring = u'http://www.biblegateway.com/passage/?book_id=' + \ |
1270 | + unicode(bookid) + u'&chapter' + unicode(chapter) + u'&version=' + \ |
1271 | + unicode(version) |
1272 | xml_string = self._get_web_text(urlstring, self.proxyurl) |
1273 | #print xml_string |
1274 | - VerseSearch = u'class='+u'"'+u'sup'+u'"'+u'>' |
1275 | + VerseSearch = u'class=' + u'"' + u'sup' + u'"' + u'>' |
1276 | verse = 1 |
1277 | - i= xml_string.find(u'result-text-style-normal') |
1278 | + i = xml_string.find(u'result-text-style-normal') |
1279 | xml_string = xml_string[i:len(xml_string)] |
1280 | versePos = xml_string.find(VerseSearch) |
1281 | #print versePos |
1282 | @@ -62,11 +73,11 @@ |
1283 | verseText = '' # clear out string |
1284 | versePos = xml_string.find(u'</span', versePos) |
1285 | i = xml_string.find(VerseSearch, versePos+1) |
1286 | - #print i , versePos |
1287 | + #print i , versePos |
1288 | if i == -1: |
1289 | i = xml_string.find(u'</div', versePos+1) |
1290 | j = xml_string.find(u'<strong', versePos+1) |
1291 | - #print i , j |
1292 | + #print i , j |
1293 | if j > 0 and j < i: |
1294 | i = j |
1295 | verseText = xml_string[versePos + 7 : i ] |
1296 | @@ -75,9 +86,10 @@ |
1297 | bible[verse] = self._clean_text(verseText) # store the verse |
1298 | versePos = -1 |
1299 | else: |
1300 | - i = xml_string[:i].rfind(u'<span')+1 |
1301 | - verseText = xml_string[versePos + 7 : i - 1 ] # Loose the </span> |
1302 | - xml_string = xml_string[i - 1 :len(xml_string)] # chop off verse 1 |
1303 | + i = xml_string[:i].rfind(u'<span') + 1 |
1304 | + verseText = xml_string[versePos + 7 : i - 1] # Loose </span> |
1305 | + # Chop off verse 1 |
1306 | + xml_string = xml_string[i - 1 :len(xml_string)] |
1307 | versePos = xml_string.find(VerseSearch) #look for the next verse |
1308 | bible[verse] = self._clean_text(verseText) # store the verse |
1309 | verse += 1 |
1310 | @@ -92,16 +104,26 @@ |
1311 | log.debug(u'init %s', proxyurl) |
1312 | self.proxyurl = proxyurl |
1313 | |
1314 | - def get_bible_chapter(self, version, bookid, bookname, chapter) : |
1315 | - log.debug( u'getBibleChapter %s,%s,%s,%s', version, bookid, bookname, chapter) |
1316 | + def get_bible_chapter(self, version, bookid, bookname, chapter) : |
1317 | + log.debug(u'getBibleChapter %s,%s,%s,%s', |
1318 | + version, bookid, bookname, chapter) |
1319 | """ |
1320 | Access and decode bibles via the Crosswalk website |
1321 | - Version - the version of the bible like niv for New International version |
1322 | - bookid - not used |
1323 | - bookname - text name of in english eg 'gen' for Genesis |
1324 | - chapter - chapter number |
1325 | + |
1326 | + ``version`` |
1327 | + The version of the bible like niv for New International Version |
1328 | + |
1329 | + ``bookid`` |
1330 | + Not used |
1331 | + |
1332 | + ``bookname`` |
1333 | + Text name of in english e.g. 'gen' for Genesis |
1334 | + |
1335 | + ``chapter`` |
1336 | + Chapter number |
1337 | """ |
1338 | - log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname, chapter) |
1339 | + log.debug(u'get_bible_chapter %s,%s,%s,%s', |
1340 | + version, bookid, bookname, chapter) |
1341 | bookname = bookname.replace(u' ', u'') |
1342 | urlstring = u'http://bible.crosswalk.com/OnlineStudyBible/bible.cgi?word=%s+%d&version=%s' % (bookname, chapter, version) |
1343 | xml_string = self._get_web_text(urlstring, self.proxyurl) |
1344 | @@ -135,7 +157,7 @@ |
1345 | #remove the <B> at the front |
1346 | xml_string = xml_string[i + 3 :len(xml_string)] |
1347 | versePos = xml_string.find(u'<BLOCKQUOTE>') |
1348 | - #log.debug(u'verse pos %d', versePos) |
1349 | + #log.debug(u'verse pos %d', versePos) |
1350 | bible = {} |
1351 | while versePos > 0: |
1352 | verseText = u'' |
1353 | @@ -153,7 +175,7 @@ |
1354 | verseText = xml_string[versePos: i] |
1355 | versePos = 0 |
1356 | else: |
1357 | - #log.debug( i, versePos) |
1358 | + #log.debug( i, versePos) |
1359 | verseText = xml_string[versePos: i] |
1360 | versePos = i |
1361 | #print verseText |
1362 | @@ -170,7 +192,9 @@ |
1363 | def __init__(self): |
1364 | """ |
1365 | Finds all the bibles defined for the system |
1366 | - Creates an Interface Object for each bible containing connection information |
1367 | + Creates an Interface Object for each bible containing connection |
1368 | + information |
1369 | + |
1370 | Throws Exception if no Bibles are found. |
1371 | |
1372 | Init confirms the bible exists and stores the database path. |
1373 | @@ -202,18 +226,19 @@ |
1374 | log.debug(u'set_bible_source %s', biblesource) |
1375 | self.biblesource = biblesource |
1376 | |
1377 | - def get_bible_chapter(self, version, bookid, bookname, chapter): |
1378 | + def get_bible_chapter(self, version, bookid, bookname, chapter): |
1379 | """ |
1380 | Receive the request and call the relevant handler methods |
1381 | """ |
1382 | - log.debug(u'get_bible_chapter %s,%s,%s,%s', version, bookid, bookname, chapter) |
1383 | + log.debug(u'get_bible_chapter %s,%s,%s,%s', |
1384 | + version, bookid, bookname, chapter) |
1385 | log.debug(u'biblesource = %s', self.biblesource) |
1386 | try: |
1387 | if self.biblesource.lower() == u'crosswalk': |
1388 | ev = CWExtract(self.proxyurl) |
1389 | else: |
1390 | ev = BGExtract(self.proxyurl) |
1391 | - return ev.get_bible_chapter(self.bibleid, bookid, bookname, chapter) |
1392 | + return ev.get_bible_chapter(self.bibleid, bookid, bookname, chapter) |
1393 | except Exception, e: |
1394 | log.error(u'Error thrown = %s', e.args[0]) |
1395 | print e |
1396 | |
1397 | === modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py' |
1398 | --- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-08 19:58:05 +0000 |
1399 | +++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-21 17:56:36 +0000 |
1400 | @@ -86,7 +86,7 @@ |
1401 | The Import dialog, so that we can increase the counter on |
1402 | the progress bar. |
1403 | """ |
1404 | - detect_file = open(osisfile_record, u'r') |
1405 | + detect_file = open(osisfile_record, u'r') |
1406 | details = chardet.detect(detect_file.read(2048)) |
1407 | detect_file.close() |
1408 | osis = codecs.open(osisfile_record, u'r', details['encoding']) |
1409 | @@ -102,7 +102,7 @@ |
1410 | pos = file_record.find(verseText) |
1411 | if pos > -1: # we have a verse |
1412 | epos= file_record.find(u'>', pos) |
1413 | - ref = file_record[pos+15:epos-1] # Book Reference |
1414 | + ref = file_record[pos+15:epos-1] # Book Reference |
1415 | #lets find the bible text only |
1416 | # find start of text |
1417 | pos = epos + 1 |
1418 | @@ -113,10 +113,10 @@ |
1419 | text = self.remove_block(u'<title', u'</title>', text) |
1420 | text = self.remove_block(u'<note', u'</note>', text) |
1421 | text = self.remove_block(u'<divineName', u'</divineName>', text) |
1422 | - text = self.remove_tag(u'<lb', text) |
1423 | - text = self.remove_tag(u'<q', text) |
1424 | - text = self.remove_tag(u'<l', text) |
1425 | - text = self.remove_tag(u'<lg', text) |
1426 | + text = self.remove_tag(u'<lb', text) |
1427 | + text = self.remove_tag(u'<q', text) |
1428 | + text = self.remove_tag(u'<l', text) |
1429 | + text = self.remove_tag(u'<lg', text) |
1430 | # Strange tags where the end is not the same as the start |
1431 | # The must be in this order as at least one bible has them |
1432 | # crossing and the removal does not work. |
1433 | @@ -127,12 +127,12 @@ |
1434 | #print "Y", search_text, e |
1435 | pos = -1 |
1436 | else: |
1437 | - text = text[:pos] + text[epos + 4: ] |
1438 | + text = text[:pos] + text[epos + 4: ] |
1439 | pos = text.find(u'<FI>') |
1440 | pos = text.find(u'<RF>') |
1441 | while pos > -1: |
1442 | epos = text.find(u'<Rf>', pos) |
1443 | - text = text[:pos] + text[epos + 4: ] |
1444 | + text = text[:pos] + text[epos + 4: ] |
1445 | #print "X", pos, epos, text |
1446 | pos = text.find(u'<RF>') |
1447 | # split up the reference |
1448 | @@ -184,7 +184,7 @@ |
1449 | if epos == -1: |
1450 | pos = -1 |
1451 | else: |
1452 | - text = text[:pos] + text[epos + len(end_tag): ] |
1453 | + text = text[:pos] + text[epos + len(end_tag): ] |
1454 | pos = text.find(start_tag) |
1455 | return text |
1456 | |
1457 | @@ -203,6 +203,6 @@ |
1458 | pos = text.find(start_tag) |
1459 | while pos > -1: |
1460 | epos = text.find(u'/>', pos) |
1461 | - text = text[:pos] + text[epos + 2: ] |
1462 | + text = text[:pos] + text[epos + 2: ] |
1463 | pos = text.find(start_tag) |
1464 | return text |
1465 | |
1466 | === modified file 'openlp/plugins/bibles/lib/biblestab.py' |
1467 | --- openlp/plugins/bibles/lib/biblestab.py 2009-09-13 07:39:48 +0000 |
1468 | +++ openlp/plugins/bibles/lib/biblestab.py 2009-09-21 17:56:36 +0000 |
1469 | @@ -26,7 +26,7 @@ |
1470 | |
1471 | from PyQt4 import Qt, QtCore, QtGui |
1472 | |
1473 | -from openlp.core.lib import translate, str_to_bool, Receiver |
1474 | +from openlp.core.lib import translate, str_to_bool, Receiver |
1475 | from openlp.core.lib import SettingsTab |
1476 | |
1477 | class BiblesTab(SettingsTab): |
1478 | @@ -42,7 +42,8 @@ |
1479 | self.show_new_chapters = False |
1480 | self.display_style = 0 |
1481 | self.bible_search = True |
1482 | - SettingsTab.__init__(self, translate(u'BiblesTab', u'Bibles'), u'Bibles') |
1483 | + SettingsTab.__init__( |
1484 | + self, translate(u'BiblesTab', u'Bibles'), u'Bibles') |
1485 | |
1486 | def setupUi(self): |
1487 | self.setObjectName(u'BiblesTab') |
1488 | @@ -142,34 +143,53 @@ |
1489 | self.BibleLayout.addWidget(self.BibleRightWidget) |
1490 | # Signals and slots |
1491 | QtCore.QObject.connect(self.NewChaptersCheckBox, |
1492 | - QtCore.SIGNAL(u'stateChanged(int)'), self.onNewChaptersCheckBoxChanged) |
1493 | + QtCore.SIGNAL(u'stateChanged(int)'), |
1494 | + self.onNewChaptersCheckBoxChanged) |
1495 | QtCore.QObject.connect(self.BibleSearchCheckBox, |
1496 | - QtCore.SIGNAL(u'stateChanged(int)'), self.onBibleSearchCheckBoxChanged) |
1497 | + QtCore.SIGNAL(u'stateChanged(int)'), |
1498 | + self.onBibleSearchCheckBoxChanged) |
1499 | QtCore.QObject.connect(self.DisplayStyleComboBox, |
1500 | - QtCore.SIGNAL(u'activated(int)'), self.onDisplayStyleComboBoxChanged) |
1501 | + QtCore.SIGNAL(u'activated(int)'), |
1502 | + self.onDisplayStyleComboBoxChanged) |
1503 | QtCore.QObject.connect(self.BibleThemeComboBox, |
1504 | QtCore.SIGNAL(u'activated(int)'), self.onBibleThemeComboBoxChanged) |
1505 | QtCore.QObject.connect(self.LayoutStyleComboBox, |
1506 | - QtCore.SIGNAL(u'activated(int)'), self.onLayoutStyleComboBoxChanged) |
1507 | + QtCore.SIGNAL(u'activated(int)'), |
1508 | + self.onLayoutStyleComboBoxChanged) |
1509 | QtCore.QObject.connect(Receiver.get_receiver(), |
1510 | QtCore.SIGNAL(u'update_themes'), self.updateThemeList) |
1511 | |
1512 | def retranslateUi(self): |
1513 | - self.VerseDisplayGroupBox.setTitle(translate(u'SettingsForm', u'Verse Display')) |
1514 | - self.NewChaptersCheckBox.setText(translate(u'SettingsForm', u'Only show new chapter numbers')) |
1515 | - self.LayoutStyleLabel.setText(translate(u'SettingsForm', u'Layout Style:')) |
1516 | - self.DisplayStyleLabel.setText(translate(u'SettingsForm', u'Display Style:')) |
1517 | - self.BibleThemeLabel.setText(translate(u'SettingsForm', u'Bible Theme:')) |
1518 | - self.LayoutStyleComboBox.setItemText(0, translate(u'SettingsForm', u'verse per slide')) |
1519 | - self.LayoutStyleComboBox.setItemText(1, translate(u'SettingsForm', u'verse per line')) |
1520 | - self.LayoutStyleComboBox.setItemText(2, translate(u'SettingsForm', u'continuous')) |
1521 | - self.DisplayStyleComboBox.setItemText(0, translate(u'SettingsForm', u'No brackets')) |
1522 | - self.DisplayStyleComboBox.setItemText(1, translate(u'SettingsForm', u'( and )')) |
1523 | - self.DisplayStyleComboBox.setItemText(2, translate(u'SettingsForm', u'{ and }')) |
1524 | - self.DisplayStyleComboBox.setItemText(3, translate(u'SettingsForm', u'[ and ]')) |
1525 | - self.ChangeNoteLabel.setText(translate(u'SettingsForm', u'Note:\nChanges don\'t affect verses already in the service')) |
1526 | - self.BibleSearchGroupBox.setTitle(translate(u'SettingsForm', u'Search')) |
1527 | - self.BibleSearchCheckBox.setText(translate(u'SettingsForm', u'Search-as-you-type')) |
1528 | + self.VerseDisplayGroupBox.setTitle( |
1529 | + translate(u'SettingsForm', u'Verse Display')) |
1530 | + self.NewChaptersCheckBox.setText( |
1531 | + translate(u'SettingsForm', u'Only show new chapter numbers')) |
1532 | + self.LayoutStyleLabel.setText( |
1533 | + translate(u'SettingsForm', u'Layout Style:')) |
1534 | + self.DisplayStyleLabel.setText( |
1535 | + translate(u'SettingsForm', u'Display Style:')) |
1536 | + self.BibleThemeLabel.setText( |
1537 | + translate(u'SettingsForm', u'Bible Theme:')) |
1538 | + self.LayoutStyleComboBox.setItemText( |
1539 | + 0, translate(u'SettingsForm', u'verse per slide')) |
1540 | + self.LayoutStyleComboBox.setItemText( |
1541 | + 1, translate(u'SettingsForm', u'verse per line')) |
1542 | + self.LayoutStyleComboBox.setItemText( |
1543 | + 2, translate(u'SettingsForm', u'continuous')) |
1544 | + self.DisplayStyleComboBox.setItemText( |
1545 | + 0, translate(u'SettingsForm', u'No brackets')) |
1546 | + self.DisplayStyleComboBox.setItemText( |
1547 | + 1, translate(u'SettingsForm', u'( and )')) |
1548 | + self.DisplayStyleComboBox.setItemText( |
1549 | + 2, translate(u'SettingsForm', u'{ and }')) |
1550 | + self.DisplayStyleComboBox.setItemText( |
1551 | + 3, translate(u'SettingsForm', u'[ and ]')) |
1552 | + self.ChangeNoteLabel.setText(translate(u'SettingsForm', |
1553 | + u'Note:\nChanges don\'t affect verses already in the service')) |
1554 | + self.BibleSearchGroupBox.setTitle( |
1555 | + translate(u'SettingsForm', u'Search')) |
1556 | + self.BibleSearchCheckBox.setText( |
1557 | + translate(u'SettingsForm', u'Search-as-you-type')) |
1558 | |
1559 | def onBibleThemeComboBoxChanged(self): |
1560 | self.bible_theme = self.BibleThemeComboBox.currentText() |
1561 | @@ -195,20 +215,27 @@ |
1562 | self.bible_search = True |
1563 | |
1564 | def load(self): |
1565 | - self.show_new_chapters = str_to_bool(self.config.get_config(u'display new chapter', u'False')) |
1566 | - self.display_style = int(self.config.get_config(u'display brackets', u'0')) |
1567 | - self.layout_style = int(self.config.get_config(u'verse layout style', u'0')) |
1568 | + self.show_new_chapters = str_to_bool( |
1569 | + self.config.get_config(u'display new chapter', u'False')) |
1570 | + self.display_style = int( |
1571 | + self.config.get_config(u'display brackets', u'0')) |
1572 | + self.layout_style = int( |
1573 | + self.config.get_config(u'verse layout style', u'0')) |
1574 | self.bible_theme = self.config.get_config(u'bible theme', u'0') |
1575 | - self.bible_search = str_to_bool(self.config.get_config(u'search as type', u'True')) |
1576 | + self.bible_search = str_to_bool( |
1577 | + self.config.get_config(u'search as type', u'True')) |
1578 | self.NewChaptersCheckBox.setChecked(self.show_new_chapters) |
1579 | self.DisplayStyleComboBox.setCurrentIndex(self.display_style) |
1580 | self.LayoutStyleComboBox.setCurrentIndex(self.layout_style) |
1581 | self.BibleSearchCheckBox.setChecked(self.bible_search) |
1582 | |
1583 | def save(self): |
1584 | - self.config.set_config(u'display new chapter', unicode(self.show_new_chapters)) |
1585 | - self.config.set_config(u'display brackets', unicode(self.display_style)) |
1586 | - self.config.set_config(u'verse layout style', unicode(self.layout_style)) |
1587 | + self.config.set_config( |
1588 | + u'display new chapter', unicode(self.show_new_chapters)) |
1589 | + self.config.set_config( |
1590 | + u'display brackets', unicode(self.display_style)) |
1591 | + self.config.set_config( |
1592 | + u'verse layout style', unicode(self.layout_style)) |
1593 | self.config.set_config(u'search as type', unicode(self.bible_search)) |
1594 | self.config.set_config(u'bible theme', unicode(self.bible_theme)) |
1595 | |
1596 | @@ -220,7 +247,8 @@ |
1597 | self.BibleThemeComboBox.addItem(u'') |
1598 | for theme in theme_list: |
1599 | self.BibleThemeComboBox.addItem(theme) |
1600 | - id = self.BibleThemeComboBox.findText(unicode(self.bible_theme), QtCore.Qt.MatchExactly) |
1601 | + id = self.BibleThemeComboBox.findText( |
1602 | + unicode(self.bible_theme), QtCore.Qt.MatchExactly) |
1603 | if id == -1: |
1604 | # Not Found |
1605 | id = 0 |
1606 | |
1607 | === modified file 'openlp/plugins/bibles/lib/manager.py' |
1608 | --- openlp/plugins/bibles/lib/manager.py 2009-09-17 23:10:25 +0000 |
1609 | +++ openlp/plugins/bibles/lib/manager.py 2009-09-21 17:56:36 +0000 |
1610 | @@ -81,7 +81,7 @@ |
1611 | def reload_bibles(self): |
1612 | log.debug(u'Reload bibles') |
1613 | files = self.config.get_files(self.bibleSuffix) |
1614 | - log.debug(u'Bible Files %s', files ) |
1615 | + log.debug(u'Bible Files %s', files ) |
1616 | self.bible_db_cache = {} |
1617 | self.bible_http_cache = {} |
1618 | # books of the bible with testaments |
1619 | @@ -166,7 +166,7 @@ |
1620 | Defaults to *None*. The password to accompany the username. |
1621 | """ |
1622 | log.debug(u'register_HTTP_bible %s, %s, %s, %s, %s, %s', |
1623 | - biblename, biblesource, bibleid, proxyurl, proxyid, proxypass) |
1624 | + biblename, biblesource, bibleid, proxyurl, proxyid, proxypass) |
1625 | if self._is_new_bible(biblename): |
1626 | # Create new Bible |
1627 | nbible = BibleDBImpl(self.biblePath, biblename, self.config) |
1628 | @@ -271,7 +271,7 @@ |
1629 | log.debug(u'get_bible_books %s', bible) |
1630 | return self.bible_db_cache[bible].get_bible_books() |
1631 | |
1632 | - def get_book_chapter_count(self, bible, book): |
1633 | + def get_book_chapter_count(self, bible, book): |
1634 | """ |
1635 | Returns the number of Chapters for a given book |
1636 | """ |
1637 | @@ -283,7 +283,7 @@ |
1638 | Returns all the number of verses for a given |
1639 | book and chapterMaxBibleBookVerses |
1640 | """ |
1641 | - log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter) |
1642 | + log.debug(u'get_book_verse_count %s,%s,%s', bible, book, chapter) |
1643 | return self.bible_db_cache[bible].get_max_bible_book_verses( |
1644 | book, chapter) |
1645 | |
1646 | @@ -300,7 +300,7 @@ |
1647 | Saves the bibles meta data |
1648 | """ |
1649 | log.debug(u'save_meta data %s,%s, %s,%s', |
1650 | - bible, version, copyright, permissions) |
1651 | + bible, version, copyright, permissions) |
1652 | self.bible_db_cache[bible].save_meta(u'Version', version) |
1653 | self.bible_db_cache[bible].save_meta(u'Copyright', copyright) |
1654 | self.bible_db_cache[bible].save_meta(u'Permissions', permissions) |
1655 | @@ -309,7 +309,7 @@ |
1656 | """ |
1657 | Returns the meta data for a given key |
1658 | """ |
1659 | - log.debug(u'get_meta %s,%s', bible, key) |
1660 | + log.debug(u'get_meta %s,%s', bible, key) |
1661 | return self.bible_db_cache[bible].get_meta(key) |
1662 | |
1663 | def get_verse_text(self, bible, bookname, schapter, echapter, sverse, |
1664 | @@ -414,7 +414,7 @@ |
1665 | """ |
1666 | Check cache to see if new bible |
1667 | """ |
1668 | - for b , o in self.bible_db_cache.iteritems(): |
1669 | + for b , o in self.bible_db_cache.iteritems(): |
1670 | log.debug(u'Bible from cache in is_new_bible %s', b ) |
1671 | if b == name : |
1672 | return False |
1673 | |
1674 | === modified file 'openlp/plugins/bibles/lib/mediaitem.py' |
1675 | --- openlp/plugins/bibles/lib/mediaitem.py 2009-09-16 10:50:13 +0000 |
1676 | +++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
1677 | @@ -28,7 +28,7 @@ |
1678 | from PyQt4 import QtCore, QtGui |
1679 | |
1680 | from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \ |
1681 | - Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD |
1682 | + Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD |
1683 | from openlp.plugins.bibles.forms import BibleImportForm |
1684 | from openlp.plugins.bibles.lib.manager import BibleMode |
1685 | |
1686 | @@ -329,10 +329,10 @@ |
1687 | log.debug(u'Advanced Search Button pressed') |
1688 | bible = unicode(self.AdvancedVersionComboBox.currentText()) |
1689 | book = unicode(self.AdvancedBookComboBox.currentText()) |
1690 | - chapter_from = int(self.AdvancedFromChapter.currentText()) |
1691 | - chapter_to = int(self.AdvancedToChapter.currentText()) |
1692 | - verse_from = int(self.AdvancedFromVerse.currentText()) |
1693 | - verse_to = int(self.AdvancedToVerse.currentText()) |
1694 | + chapter_from = int(self.AdvancedFromChapter.currentText()) |
1695 | + chapter_to = int(self.AdvancedToChapter.currentText()) |
1696 | + verse_from = int(self.AdvancedFromVerse.currentText()) |
1697 | + verse_to = int(self.AdvancedToVerse.currentText()) |
1698 | self.search_results = self.parent.biblemanager.get_verse_text( |
1699 | bible, book, chapter_from, chapter_to, verse_from, verse_to) |
1700 | if self.ClearAdvancedSearchComboBox.currentIndex() == 0: |
1701 | @@ -374,7 +374,7 @@ |
1702 | raw_footer = [] |
1703 | bible_text = u'' |
1704 | for item in items: |
1705 | - bitem = self.ListView.item(item.row()) |
1706 | + bitem = self.ListView.item(item.row()) |
1707 | text = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) |
1708 | verse = text[:text.find(u'(')] |
1709 | bible = text[text.find(u'(') + 1:-1] |
1710 | @@ -457,13 +457,13 @@ |
1711 | self.adjustComboBox(1, self.verses, self.AdvancedToVerse) |
1712 | |
1713 | def adjustComboBox(self, frm, to , combo): |
1714 | - log.debug(u'adjustComboBox %s , %s , %s', combo, frm, to) |
1715 | + log.debug(u'adjustComboBox %s , %s , %s', combo, frm, to) |
1716 | combo.clear() |
1717 | for i in range(int(frm), int(to) + 1): |
1718 | combo.addItem(unicode(i)) |
1719 | |
1720 | def displayResults(self, bible): |
1721 | - for count, verse in enumerate(self.search_results): |
1722 | + for count, verse in enumerate(self.search_results): |
1723 | bible_text = u' %s %d:%d (%s)' % (verse.book.name, |
1724 | verse.chapter, verse.verse, bible) |
1725 | bible_verse = QtGui.QListWidgetItem(bible_text) |
1726 | @@ -474,7 +474,7 @@ |
1727 | if cr is not None: |
1728 | cr.setSelected(True) |
1729 | |
1730 | - def searchByReference(self, bible, search): |
1731 | + def searchByReference(self, bible, search): |
1732 | log.debug(u'searchByReference %s ,%s', bible, search) |
1733 | book = u'' |
1734 | start_chapter = u'' |
1735 | @@ -529,7 +529,7 @@ |
1736 | sp1 = sp[1].split(u':') |
1737 | if len(sp1) == 1: |
1738 | end_chapter = start_chapter |
1739 | - end_verse = sp1[0] |
1740 | + end_verse = sp1[0] |
1741 | else: |
1742 | end_chapter = sp1[0] |
1743 | end_verse = sp1[1] |
1744 | |
1745 | === modified file 'openlp/plugins/custom/forms/editcustomform.py' |
1746 | --- openlp/plugins/custom/forms/editcustomform.py 2009-09-12 18:27:17 +0000 |
1747 | +++ openlp/plugins/custom/forms/editcustomform.py 2009-09-21 19:26:10 +0000 |
1748 | @@ -115,7 +115,7 @@ |
1749 | self.ThemeComboBox.setCurrentIndex(0) |
1750 | |
1751 | def accept(self): |
1752 | - valid , message = self._validate() |
1753 | + valid , message = self._validate() |
1754 | if not valid: |
1755 | QtGui.QMessageBox.critical(self, |
1756 | translate(u'customEditDialog', u'Error'), message, |
1757 | @@ -126,7 +126,9 @@ |
1758 | sxml.add_lyrics_to_song() |
1759 | count = 1 |
1760 | for i in range (0, self.VerseListView.count()): |
1761 | - sxml.add_verse_to_lyrics(u'custom', unicode(count), unicode(self.VerseListView.item(i).text())) |
1762 | + sxml.add_verse_to_lyrics( |
1763 | + u'custom', unicode(count), |
1764 | + unicode(self.VerseListView.item(i).text())) |
1765 | count += 1 |
1766 | self.customSlide.title = unicode(self.TitleEdit.displayText()) |
1767 | self.customSlide.text = unicode(sxml.extract_xml()) |
1768 | @@ -201,10 +203,12 @@ |
1769 | for row in unicode(self.VerseTextEdit.toPlainText()).split(u'---'): |
1770 | self.VerseListView.addItem(row) |
1771 | else: |
1772 | - self.VerseListView.currentItem().setText(self.VerseTextEdit.toPlainText()) |
1773 | + self.VerseListView.currentItem().setText( |
1774 | + self.VerseTextEdit.toPlainText()) |
1775 | #number of lines has change |
1776 | - if len(self.beforeText.split(u'\n')) != len(self.VerseTextEdit.toPlainText().split(u'\n')): |
1777 | - tempList = {} |
1778 | + if len(self.beforeText.split(u'\n')) != \ |
1779 | + len(self.VerseTextEdit.toPlainText().split(u'\n')): |
1780 | + tempList = {} |
1781 | for row in range(0, self.VerseListView.count()): |
1782 | tempList[row] = self.VerseListView.item(row).text() |
1783 | self.VerseListView.clear() |
1784 | @@ -227,9 +231,11 @@ |
1785 | message = u'' |
1786 | if len(self.TitleEdit.displayText()) == 0: |
1787 | valid = False |
1788 | - message = translate(u'customEditDialog', u'You need to enter a title \n') |
1789 | + message = translate( |
1790 | + u'customEditDialog', u'You need to enter a title \n') |
1791 | # must have 1 slide |
1792 | if self.VerseListView.count() == 0: |
1793 | valid = False |
1794 | - message += translate(u'customEditDialog', u'You need to enter a slide \n') |
1795 | - return valid, message |
1796 | + message += translate( |
1797 | + u'customEditDialog', u'You need to enter a slide \n') |
1798 | + return valid, message |
1799 | |
1800 | === modified file 'openlp/plugins/custom/lib/mediaitem.py' |
1801 | --- openlp/plugins/custom/lib/mediaitem.py 2009-09-12 18:27:17 +0000 |
1802 | +++ openlp/plugins/custom/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
1803 | @@ -26,7 +26,7 @@ |
1804 | |
1805 | from PyQt4 import QtCore, QtGui |
1806 | |
1807 | -from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \ |
1808 | +from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \ |
1809 | translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD |
1810 | |
1811 | class CustomListView(BaseListWithDnD): |
1812 | @@ -65,7 +65,8 @@ |
1813 | self.ListView.clear() |
1814 | for CustomSlide in list: |
1815 | custom_name = QtGui.QListWidgetItem(CustomSlide.title) |
1816 | - custom_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id)) |
1817 | + custom_name.setData( |
1818 | + QtCore.Qt.UserRole, QtCore.QVariant(CustomSlide.id)) |
1819 | self.ListView.addItem(custom_name) |
1820 | |
1821 | def onNewClick(self): |
1822 | |
1823 | === modified file 'openlp/plugins/images/imageplugin.py' |
1824 | --- openlp/plugins/images/imageplugin.py 2009-09-08 19:58:05 +0000 |
1825 | +++ openlp/plugins/images/imageplugin.py 2009-09-21 17:56:36 +0000 |
1826 | @@ -27,7 +27,7 @@ |
1827 | from PyQt4 import QtCore, QtGui |
1828 | |
1829 | from openlp.core.lib import Plugin |
1830 | -from openlp.plugins.images.lib import ImageMediaItem, ImageTab |
1831 | +from openlp.plugins.images.lib import ImageMediaItem, ImageTab |
1832 | |
1833 | class ImagePlugin(Plugin): |
1834 | global log |
1835 | |
1836 | === modified file 'openlp/plugins/images/lib/imagetab.py' |
1837 | --- openlp/plugins/images/lib/imagetab.py 2009-09-08 19:58:05 +0000 |
1838 | +++ openlp/plugins/images/lib/imagetab.py 2009-09-21 17:56:36 +0000 |
1839 | @@ -24,7 +24,7 @@ |
1840 | |
1841 | from PyQt4 import QtCore, QtGui |
1842 | |
1843 | -from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver |
1844 | +from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver |
1845 | |
1846 | class ImageTab(SettingsTab): |
1847 | """ |
1848 | @@ -53,7 +53,8 @@ |
1849 | self.TimeoutSpacer = QtGui.QSpacerItem(147, 20, |
1850 | QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
1851 | self.TimeoutLayout.addItem(self.TimeoutSpacer) |
1852 | - self.ImageLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox) |
1853 | + self.ImageLayout.setWidget( |
1854 | + 0, QtGui.QFormLayout.LabelRole, self.ImageModeGroupBox) |
1855 | # Signals and slots |
1856 | QtCore.QObject.connect(self.TimeoutSpinBox, |
1857 | QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged) |
1858 | @@ -71,7 +72,7 @@ |
1859 | |
1860 | def save(self): |
1861 | self.config.set_config(u'loop delay', self.loop_delay) |
1862 | - Receiver().send_message(u'update_spin_delay', self.loop_delay ) |
1863 | + Receiver().send_message(u'update_spin_delay', self.loop_delay ) |
1864 | |
1865 | def postSetUp(self): |
1866 | - Receiver().send_message(u'update_spin_delay', self.loop_delay ) |
1867 | + Receiver().send_message(u'update_spin_delay', self.loop_delay ) |
1868 | |
1869 | === modified file 'openlp/plugins/images/lib/mediaitem.py' |
1870 | --- openlp/plugins/images/lib/mediaitem.py 2009-09-12 18:27:17 +0000 |
1871 | +++ openlp/plugins/images/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
1872 | @@ -26,7 +26,8 @@ |
1873 | import os |
1874 | |
1875 | from PyQt4 import QtCore, QtGui |
1876 | -from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD, buildIcon |
1877 | +from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \ |
1878 | + BaseListWithDnD, buildIcon |
1879 | |
1880 | # We have to explicitly create separate classes for each plugin |
1881 | # in order for DnD to the Service manager to work correctly. |
1882 | @@ -61,9 +62,11 @@ |
1883 | MediaManagerItem.__init__(self, parent, icon, title) |
1884 | |
1885 | def initialise(self): |
1886 | - self.ListView.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection) |
1887 | + self.ListView.setSelectionMode( |
1888 | + QtGui.QAbstractItemView.ExtendedSelection) |
1889 | self.ListView.setIconSize(QtCore.QSize(88,50)) |
1890 | - self.servicePath = os.path.join(self.parent.config.get_data_path(), u'.thumbnails') |
1891 | + self.servicePath = os.path.join( |
1892 | + self.parent.config.get_data_path(), u'.thumbnails') |
1893 | if os.path.exists(self.servicePath) == False: |
1894 | os.mkdir(self.servicePath) |
1895 | self.loadList(self.parent.config.load_list(self.ConfigSection)) |
1896 | @@ -103,9 +106,9 @@ |
1897 | return False |
1898 | service_item.title = u'Image(s)' |
1899 | for item in items: |
1900 | - bitem = self.ListView.item(item.row()) |
1901 | + bitem = self.ListView.item(item.row()) |
1902 | filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) |
1903 | frame = QtGui.QImage(unicode(filename)) |
1904 | (path, name) = os.path.split(filename) |
1905 | - service_item.add_from_image(path, name, frame) |
1906 | + service_item.add_from_image(path, name, frame) |
1907 | return True |
1908 | |
1909 | === modified file 'openlp/plugins/media/lib/mediaitem.py' |
1910 | --- openlp/plugins/media/lib/mediaitem.py 2009-09-15 21:59:20 +0000 |
1911 | +++ openlp/plugins/media/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
1912 | @@ -81,7 +81,7 @@ |
1913 | filename = self.ListData.getFilename(index) |
1914 | frame = QtGui.QImage(unicode(filename)) |
1915 | (path, name) = os.path.split(filename) |
1916 | - service_item.add_from_image(path, name, frame) |
1917 | + service_item.add_from_image(path, name, frame) |
1918 | return True |
1919 | |
1920 | def onPreviewClick(self): |
1921 | |
1922 | === modified file 'openlp/plugins/media/lib/mediatab.py' |
1923 | --- openlp/plugins/media/lib/mediatab.py 2009-09-08 19:58:05 +0000 |
1924 | +++ openlp/plugins/media/lib/mediatab.py 2009-09-21 17:56:36 +0000 |
1925 | @@ -24,7 +24,7 @@ |
1926 | |
1927 | from PyQt4 import QtCore, QtGui |
1928 | |
1929 | -from openlp.core.lib import SettingsTab, str_to_bool, translate |
1930 | +from openlp.core.lib import SettingsTab, str_to_bool, translate |
1931 | |
1932 | class MediaTab(SettingsTab): |
1933 | """ |
1934 | @@ -50,14 +50,16 @@ |
1935 | self.UseVMRLabel.setObjectName(u'UseVMRLabel') |
1936 | self.MediaModeLayout.addWidget(self.UseVMRLabel) |
1937 | |
1938 | - self.MediaLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox) |
1939 | + self.MediaLayout.setWidget( |
1940 | + 0, QtGui.QFormLayout.LabelRole, self.MediaModeGroupBox) |
1941 | # Signals and slots |
1942 | QtCore.QObject.connect(self.UseVMRCheckBox, |
1943 | QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged) |
1944 | |
1945 | def retranslateUi(self): |
1946 | self.MediaModeGroupBox.setTitle(translate(u'MediaTab', u'Media Mode')) |
1947 | - self.UseVMRCheckBox.setText(translate(u'MediaTab', u'Use Video Mode Rendering')) |
1948 | + self.UseVMRCheckBox.setText( |
1949 | + translate(u'MediaTab', u'Use Video Mode Rendering')) |
1950 | self.UseVMRLabel.setText(translate(u'MediaTab', u'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">\n' |
1951 | u'<html><head><meta name="qrichtext" content="1" /><style type="text/css">\n' |
1952 | u'p, li { white-space: pre-wrap; }\n' |
1953 | @@ -72,7 +74,8 @@ |
1954 | self.use_vmr_mode = True |
1955 | |
1956 | def load(self): |
1957 | - self.use_vmr_mode = str_to_bool(self.config.get_config(u'use mode layout', u'False')) |
1958 | + self.use_vmr_mode = str_to_bool( |
1959 | + self.config.get_config(u'use mode layout', u'False')) |
1960 | if self.use_vmr_mode : |
1961 | self.UseVMRCheckBox.setChecked(True) |
1962 | |
1963 | |
1964 | === modified file 'openlp/plugins/presentations/lib/impresscontroller.py' |
1965 | --- openlp/plugins/presentations/lib/impresscontroller.py 2009-09-18 16:06:25 +0000 |
1966 | +++ openlp/plugins/presentations/lib/impresscontroller.py 2009-09-21 17:56:36 +0000 |
1967 | @@ -27,7 +27,7 @@ |
1968 | # http://nxsy.org/comparing-documents-with-openoffice-and-python |
1969 | |
1970 | import logging |
1971 | -import os , subprocess |
1972 | +import os , subprocess |
1973 | import time |
1974 | import sys |
1975 | |
1976 | |
1977 | === modified file 'openlp/plugins/presentations/lib/mediaitem.py' |
1978 | --- openlp/plugins/presentations/lib/mediaitem.py 2009-09-12 18:27:17 +0000 |
1979 | +++ openlp/plugins/presentations/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
1980 | @@ -26,7 +26,8 @@ |
1981 | import os |
1982 | |
1983 | from PyQt4 import QtCore, QtGui |
1984 | -from openlp.core.lib import MediaManagerItem, ServiceItem, translate, BaseListWithDnD |
1985 | +from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \ |
1986 | + BaseListWithDnD |
1987 | from openlp.plugins.presentations.lib import MessageListener |
1988 | |
1989 | # We have to explicitly create separate classes for each plugin |
1990 | @@ -64,10 +65,12 @@ |
1991 | |
1992 | def addEndHeaderBar(self): |
1993 | self.PresentationWidget = QtGui.QWidget(self) |
1994 | - sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
1995 | + sizePolicy = QtGui.QSizePolicy( |
1996 | + QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) |
1997 | sizePolicy.setHorizontalStretch(0) |
1998 | sizePolicy.setVerticalStretch(0) |
1999 | - sizePolicy.setHeightForWidth(self.PresentationWidget.sizePolicy().hasHeightForWidth()) |
2000 | + sizePolicy.setHeightForWidth( |
2001 | + self.PresentationWidget.sizePolicy().hasHeightForWidth()) |
2002 | self.PresentationWidget.setSizePolicy(sizePolicy) |
2003 | self.PresentationWidget.setObjectName(u'PresentationWidget') |
2004 | self.DisplayLayout = QtGui.QGridLayout(self.PresentationWidget) |
2005 | @@ -78,7 +81,8 @@ |
2006 | self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget) |
2007 | self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel') |
2008 | self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1) |
2009 | - self.DisplayTypeLabel.setText(translate(u'PresentationMediaItem', u'Present using:')) |
2010 | + self.DisplayTypeLabel.setText( |
2011 | + translate(u'PresentationMediaItem', u'Present using:')) |
2012 | # Add the Presentation widget to the page layout |
2013 | self.PageLayout.addWidget(self.PresentationWidget) |
2014 | |
2015 | @@ -102,7 +106,8 @@ |
2016 | item_id = (item.data(QtCore.Qt.UserRole)).toInt()[0] |
2017 | row = self.ListView.row(item) |
2018 | self.ListView.takeItem(row) |
2019 | - self.parent.config.set_list(self.ConfigSection, self.ListData.getFileList()) |
2020 | + self.parent.config.set_list( |
2021 | + self.ConfigSection, self.ListData.getFileList()) |
2022 | |
2023 | def generateSlideData(self, service_item): |
2024 | items = self.ListView.selectedIndexes() |
2025 | @@ -111,8 +116,8 @@ |
2026 | service_item.title = unicode(self.DisplayTypeComboBox.currentText()) |
2027 | service_item.shortname = unicode(self.DisplayTypeComboBox.currentText()) |
2028 | for item in items: |
2029 | - bitem = self.ListView.item(item.row()) |
2030 | + bitem = self.ListView.item(item.row()) |
2031 | filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString()) |
2032 | (path, name) = os.path.split(filename) |
2033 | - service_item.add_from_command(path, name) |
2034 | + service_item.add_from_command(path, name) |
2035 | return True |
2036 | |
2037 | === modified file 'openlp/plugins/presentations/lib/messagelistener.py' |
2038 | --- openlp/plugins/presentations/lib/messagelistener.py 2009-09-18 06:07:10 +0000 |
2039 | +++ openlp/plugins/presentations/lib/messagelistener.py 2009-09-21 17:56:36 +0000 |
2040 | @@ -26,8 +26,8 @@ |
2041 | |
2042 | class MessageListener(object): |
2043 | """ |
2044 | - This is the Presentation listener who acts on events from the slide controller |
2045 | - and passes the messages on the the correct presentation handlers |
2046 | + This is the Presentation listener who acts on events from the slide |
2047 | + controller and passes the messages on the the correct presentation handlers |
2048 | """ |
2049 | global log |
2050 | log=logging.getLogger(u'MessageListener') |
2051 | @@ -55,7 +55,7 @@ |
2052 | Start of new presentation |
2053 | Save the handler as any new presentations start here |
2054 | """ |
2055 | - self.handler, file = self.decodeMessage(message) |
2056 | + self.handler, file = self.decodeMessage(message) |
2057 | self.controllers[self.handler].loadPresentation(file) |
2058 | |
2059 | def next(self, message): |
2060 | |
2061 | === modified file 'openlp/plugins/presentations/lib/presentationtab.py' |
2062 | --- openlp/plugins/presentations/lib/presentationtab.py 2009-09-12 17:24:16 +0000 |
2063 | +++ openlp/plugins/presentations/lib/presentationtab.py 2009-09-21 19:26:10 +0000 |
2064 | @@ -24,14 +24,15 @@ |
2065 | |
2066 | from PyQt4 import Qt, QtCore, QtGui |
2067 | |
2068 | -from openlp.core.lib import SettingsTab, translate, str_to_bool |
2069 | +from openlp.core.lib import SettingsTab, translate, str_to_bool |
2070 | |
2071 | class PresentationTab(SettingsTab): |
2072 | """ |
2073 | PresentationsTab is the Presentations settings tab in the settings dialog. |
2074 | """ |
2075 | def __init__(self): |
2076 | - SettingsTab.__init__(self, translate(u'PresentationTab', u'Presentation'), u'Presentations') |
2077 | + SettingsTab.__init__(self, |
2078 | + translate(u'PresentationTab', u'Presentation'), u'Presentations') |
2079 | |
2080 | def setupUi(self): |
2081 | self.setObjectName(u'PresentationTab') |
2082 | @@ -41,7 +42,8 @@ |
2083 | self.PresentationLayout.setObjectName(u'PresentationLayout') |
2084 | self.PresentationLeftWidget = QtGui.QWidget(self) |
2085 | self.PresentationLeftWidget.setObjectName(u'PresentationLeftWidget') |
2086 | - self.PresentationLeftLayout = QtGui.QVBoxLayout(self.PresentationLeftWidget) |
2087 | + self.PresentationLeftLayout = QtGui.QVBoxLayout( |
2088 | + self.PresentationLeftWidget) |
2089 | self.PresentationLeftLayout.setObjectName(u'PresentationLeftLayout') |
2090 | self.PresentationLeftLayout.setSpacing(8) |
2091 | self.PresentationLeftLayout.setMargin(0) |
2092 | @@ -60,17 +62,20 @@ |
2093 | self.PowerpointCheckBox.setTristate(False) |
2094 | self.PowerpointCheckBox.setObjectName(u'PowerpointCheckBox') |
2095 | self.VerseDisplayLayout.addWidget(self.PowerpointCheckBox, 0, 0, 1, 1) |
2096 | - self.PowerpointViewerCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox) |
2097 | + self.PowerpointViewerCheckBox = QtGui.QCheckBox( |
2098 | + self.VerseDisplayGroupBox) |
2099 | self.PowerpointViewerCheckBox.setTristate(False) |
2100 | self.PowerpointViewerCheckBox.setObjectName(u'PowerpointViewerCheckBox') |
2101 | - self.VerseDisplayLayout.addWidget(self.PowerpointViewerCheckBox, 1, 0, 1, 1) |
2102 | + self.VerseDisplayLayout.addWidget( |
2103 | + self.PowerpointViewerCheckBox, 1, 0, 1, 1) |
2104 | self.ImpressCheckBox = QtGui.QCheckBox(self.VerseDisplayGroupBox) |
2105 | self.ImpressCheckBox.setTristate(False) |
2106 | self.ImpressCheckBox.setObjectName(u'ImpressCheckBox') |
2107 | self.VerseDisplayLayout.addWidget(self.ImpressCheckBox, 2, 0, 1, 1) |
2108 | self.PresentationThemeWidget = QtGui.QWidget(self.VerseDisplayGroupBox) |
2109 | self.PresentationThemeWidget.setObjectName(u'PresentationThemeWidget') |
2110 | - self.PresentationThemeLayout = QtGui.QHBoxLayout(self.PresentationThemeWidget) |
2111 | + self.PresentationThemeLayout = QtGui.QHBoxLayout( |
2112 | + self.PresentationThemeWidget) |
2113 | self.PresentationThemeLayout.setSpacing(8) |
2114 | self.PresentationThemeLayout.setMargin(0) |
2115 | self.PresentationThemeLayout.setObjectName(u'PresentationThemeLayout') |
2116 | @@ -81,7 +86,8 @@ |
2117 | self.PresentationLayout.addWidget(self.PresentationLeftWidget) |
2118 | self.PresentationRightWidget = QtGui.QWidget(self) |
2119 | self.PresentationRightWidget.setObjectName(u'PresentationRightWidget') |
2120 | - self.PresentationRightLayout = QtGui.QVBoxLayout(self.PresentationRightWidget) |
2121 | + self.PresentationRightLayout = QtGui.QVBoxLayout( |
2122 | + self.PresentationRightWidget) |
2123 | self.PresentationRightLayout.setObjectName(u'PresentationRightLayout') |
2124 | self.PresentationRightLayout.setSpacing(8) |
2125 | self.PresentationRightLayout.setMargin(0) |
2126 | @@ -91,16 +97,26 @@ |
2127 | self.PresentationLayout.addWidget(self.PresentationRightWidget) |
2128 | |
2129 | def retranslateUi(self): |
2130 | - self.PowerpointCheckBox.setText(translate(u'PresentationTab', 'Powerpoint available:')) |
2131 | - self.PowerpointViewerCheckBox.setText(translate(u'PresentationTab', 'PowerpointViewer available:')) |
2132 | - self.ImpressCheckBox.setText(translate(u'PresentationTab', 'Impress available:')) |
2133 | + self.PowerpointCheckBox.setText( |
2134 | + translate(u'PresentationTab', 'Powerpoint available:')) |
2135 | + self.PowerpointViewerCheckBox.setText( |
2136 | + translate(u'PresentationTab', 'PowerpointViewer available:')) |
2137 | + self.ImpressCheckBox.setText( |
2138 | + translate(u'PresentationTab', 'Impress available:')) |
2139 | |
2140 | def load(self): |
2141 | - self.PowerpointCheckBox.setChecked(int(self.config.get_config(u'Powerpoint', 0))) |
2142 | - self.PowerpointViewerCheckBox.setChecked(int(self.config.get_config(u'Powerpoint Viewer', 0))) |
2143 | - self.ImpressCheckBox.setChecked(int(self.config.get_config(u'Impress', 0))) |
2144 | + self.PowerpointCheckBox.setChecked( |
2145 | + int(self.config.get_config(u'Powerpoint', 0))) |
2146 | + self.PowerpointViewerCheckBox.setChecked( |
2147 | + int(self.config.get_config(u'Powerpoint Viewer', 0))) |
2148 | + self.ImpressCheckBox.setChecked( |
2149 | + int(self.config.get_config(u'Impress', 0))) |
2150 | |
2151 | def save(self): |
2152 | - self.config.set_config(u'Powerpoint', unicode(self.PowerpointCheckBox.checkState())) |
2153 | - self.config.set_config(u'Powerpoint Viewer', unicode(self.PowerpointViewerCheckBox.checkState())) |
2154 | - self.config.set_config(u'Impress', unicode(self.ImpressCheckBox.checkState())) |
2155 | + self.config.set_config( |
2156 | + u'Powerpoint', unicode(self.PowerpointCheckBox.checkState())) |
2157 | + self.config.set_config( |
2158 | + u'Powerpoint Viewer', |
2159 | + unicode(self.PowerpointViewerCheckBox.checkState())) |
2160 | + self.config.set_config( |
2161 | + u'Impress', unicode(self.ImpressCheckBox.checkState())) |
2162 | |
2163 | === modified file 'openlp/plugins/presentations/presentationplugin.py' |
2164 | --- openlp/plugins/presentations/presentationplugin.py 2009-09-18 16:06:25 +0000 |
2165 | +++ openlp/plugins/presentations/presentationplugin.py 2009-09-21 17:56:36 +0000 |
2166 | @@ -28,7 +28,7 @@ |
2167 | |
2168 | from PyQt4 import QtCore, QtGui |
2169 | |
2170 | -from openlp.core.lib import Plugin, MediaManagerItem |
2171 | +from openlp.core.lib import Plugin, MediaManagerItem |
2172 | from openlp.plugins.presentations.lib import PresentationMediaItem, \ |
2173 | PresentationTab, ImpressController |
2174 | try: |
2175 | |
2176 | === modified file 'openlp/plugins/remotes/lib/remotetab.py' |
2177 | --- openlp/plugins/remotes/lib/remotetab.py 2009-09-07 19:00:24 +0000 |
2178 | +++ openlp/plugins/remotes/lib/remotetab.py 2009-09-21 19:26:10 +0000 |
2179 | @@ -20,14 +20,15 @@ |
2180 | |
2181 | from PyQt4 import QtCore, QtGui |
2182 | |
2183 | -from openlp.core.lib import SettingsTab, str_to_bool, translate |
2184 | +from openlp.core.lib import SettingsTab, str_to_bool, translate |
2185 | |
2186 | class RemoteTab(SettingsTab): |
2187 | """ |
2188 | RemoteTab is the Remotes settings tab in the settings dialog. |
2189 | """ |
2190 | def __init__(self): |
2191 | - SettingsTab.__init__(self, translate(u'RemoteTab', u'Remotes'), u'Remotes') |
2192 | + SettingsTab.__init__( |
2193 | + self, translate(u'RemoteTab', u'Remotes'), u'Remotes') |
2194 | |
2195 | def setupUi(self): |
2196 | self.setObjectName(u'RemoteTab') |
2197 | @@ -49,18 +50,25 @@ |
2198 | self.WarningLabel = QtGui.QLabel(self.RemoteModeGroupBox) |
2199 | self.WarningLabel.setObjectName(u'WarningLabel') |
2200 | self.RemoteModeLayout.addWidget(self.WarningLabel) |
2201 | - self.RemoteLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox) |
2202 | + self.RemoteLayout.setWidget( |
2203 | + 0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox) |
2204 | |
2205 | def retranslateUi(self): |
2206 | - self.RemoteModeGroupBox.setTitle(translate(u'RemoteTab', u'Remotes Receiver Port')) |
2207 | + self.RemoteModeGroupBox.setTitle( |
2208 | + translate(u'RemoteTab', u'Remotes Receiver Port')) |
2209 | self.RemoteActive.setText(translate(u'RemoteTab', 'Remote available:')) |
2210 | - self.WarningLabel.setText(translate(u'RemoteTab', u'A restart is needed for this change to become effective')) |
2211 | + self.WarningLabel.setText(translate(u'RemoteTab', |
2212 | + u'A restart is needed for this change to become effective')) |
2213 | |
2214 | def load(self): |
2215 | - self.RemotePortSpinBox.setValue(int(self.config.get_config(u'remote port', 4316))) |
2216 | - self.RemoteActive.setChecked(int(self.config.get_config(u'startup', 0))) |
2217 | + self.RemotePortSpinBox.setValue( |
2218 | + int(self.config.get_config(u'remote port', 4316))) |
2219 | + self.RemoteActive.setChecked( |
2220 | + int(self.config.get_config(u'startup', 0))) |
2221 | |
2222 | def save(self): |
2223 | - self.config.set_config(u'remote port', unicode(self.RemotePortSpinBox.value())) |
2224 | - self.config.set_config(u'startup', unicode(self.RemoteActive.checkState())) |
2225 | + self.config.set_config( |
2226 | + u'remote port', unicode(self.RemotePortSpinBox.value())) |
2227 | + self.config.set_config( |
2228 | + u'startup', unicode(self.RemoteActive.checkState())) |
2229 | |
2230 | |
2231 | === modified file 'openlp/plugins/remotes/remoteclient-cli.py' |
2232 | --- openlp/plugins/remotes/remoteclient-cli.py 2009-09-02 01:44:09 +0000 |
2233 | +++ openlp/plugins/remotes/remoteclient-cli.py 2009-09-21 17:56:36 +0000 |
2234 | @@ -33,7 +33,7 @@ |
2235 | print u'Errow thrown ', sys.exc_info()[1] |
2236 | |
2237 | def format_message(options): |
2238 | - return u'%s:%s' % (options.event, options.message) |
2239 | + return u'%s:%s' % (options.event, options.message) |
2240 | |
2241 | def main(): |
2242 | usage = "usage: %prog [options] arg1 arg2" |
2243 | |
2244 | === modified file 'openlp/plugins/remotes/remoteplugin.py' |
2245 | --- openlp/plugins/remotes/remoteplugin.py 2009-09-13 07:39:48 +0000 |
2246 | +++ openlp/plugins/remotes/remoteplugin.py 2009-09-21 17:56:36 +0000 |
2247 | @@ -62,12 +62,12 @@ |
2248 | def readData(self): |
2249 | log.info(u'Remoted data has arrived') |
2250 | while self.server.hasPendingDatagrams(): |
2251 | - datagram, host, port = self.server.readDatagram( |
2252 | + datagram, host, port = self.server.readDatagram( |
2253 | self.server.pendingDatagramSize()) |
2254 | self.handle_datagram(datagram) |
2255 | |
2256 | def handle_datagram(self, datagram): |
2257 | - log.info(u'Sending event %s ', datagram) |
2258 | + log.info(u'Sending event %s ', datagram) |
2259 | pos = datagram.find(u':') |
2260 | event = unicode(datagram[:pos].lower()) |
2261 | |
2262 | |
2263 | === modified file 'openlp/plugins/songs/lib/manager.py' |
2264 | --- openlp/plugins/songs/lib/manager.py 2009-09-18 11:55:26 +0000 |
2265 | +++ openlp/plugins/songs/lib/manager.py 2009-09-21 17:56:36 +0000 |
2266 | @@ -27,7 +27,7 @@ |
2267 | |
2268 | from sqlalchemy import asc, desc |
2269 | from openlp.plugins.songs.lib.models import init_models, metadata, session, \ |
2270 | - engine, songs_table, Song, Author, Topic, Book |
2271 | + engine, songs_table, Song, Author, Topic, Book |
2272 | |
2273 | import logging |
2274 | |
2275 | |
2276 | === modified file 'openlp/plugins/songs/lib/mediaitem.py' |
2277 | --- openlp/plugins/songs/lib/mediaitem.py 2009-09-18 16:06:39 +0000 |
2278 | +++ openlp/plugins/songs/lib/mediaitem.py 2009-09-21 17:56:36 +0000 |
2279 | @@ -27,7 +27,7 @@ |
2280 | from PyQt4 import QtCore, QtGui |
2281 | |
2282 | from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \ |
2283 | - SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \ |
2284 | + SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \ |
2285 | Receiver |
2286 | from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm |
2287 | |
2288 | @@ -49,7 +49,7 @@ |
2289 | self.PluginTextShort = u'Song' |
2290 | self.ConfigSection = u'song' |
2291 | MediaManagerItem.__init__(self, parent, icon, title) |
2292 | - self.edit_song_form = EditSongForm(self.parent.songmanager, self) |
2293 | + self.edit_song_form = EditSongForm(self.parent.songmanager, self) |
2294 | self.song_maintenance_form = SongMaintenanceForm( |
2295 | self.parent.songmanager, self) |
2296 | |
2297 | @@ -306,7 +306,7 @@ |
2298 | raw_footer.append(author_list) |
2299 | raw_footer.append(song.copyright ) |
2300 | raw_footer.append(unicode( |
2301 | - translate(u'SongMediaItem', u'CCL Licence: ') + ccl )) |
2302 | + translate(u'SongMediaItem', u'CCL Licence: ') + ccl)) |
2303 | service_item.raw_footer = raw_footer |
2304 | service_item.audit = [service_item.title, author_audit, ccl] |
2305 | return True |
2306 | |
2307 | === modified file 'openlp/plugins/songs/lib/songxml.py' |
2308 | --- openlp/plugins/songs/lib/songxml.py 2009-09-08 19:58:05 +0000 |
2309 | +++ openlp/plugins/songs/lib/songxml.py 2009-09-21 17:56:36 +0000 |
2310 | @@ -71,7 +71,7 @@ |
2311 | class _OpenSong(XmlRootClass): |
2312 | """Class for import of OpenSogn""" |
2313 | |
2314 | - def __init__(self, xmlContent = None): |
2315 | + def __init__(self, xmlContent = None): |
2316 | """Initialize from given xml content""" |
2317 | super(_OpenSong, self).__init__() |
2318 | self.from_buffer(xmlContent) |
2319 | @@ -81,7 +81,7 @@ |
2320 | global _blankOpenSongXml |
2321 | self._setFromXml(_blankOpenSongXml, 'song') |
2322 | |
2323 | - def from_buffer(self, xmlContent): |
2324 | + def from_buffer(self, xmlContent): |
2325 | """Initialize from buffer(string) with xml content""" |
2326 | self._reset() |
2327 | if xmlContent != None : |
2328 | @@ -259,7 +259,7 @@ |
2329 | """Return the songid for the database""" |
2330 | return self.songid |
2331 | |
2332 | - def from_opensong_buffer(self, xmlcontent): |
2333 | + def from_opensong_buffer(self, xmlcontent): |
2334 | """Initialize from buffer(string) of xml lines in opensong format""" |
2335 | self._reset() |
2336 | opensong = _OpenSong(xmlcontent) |
2337 | @@ -275,20 +275,20 @@ |
2338 | self.set_category_array(opensong.get_category_array()) |
2339 | self.set_lyrics(opensong.get_lyrics()) |
2340 | |
2341 | - def from_opensong_file(self, xmlfilename): |
2342 | + def from_opensong_file(self, xmlfilename): |
2343 | """Initialize from file containing xml |
2344 | |
2345 | xmlfilename -- path to xml file |
2346 | """ |
2347 | lst = [] |
2348 | - f = open(xmlfilename, 'r') |
2349 | + f = open(xmlfilename, 'r') |
2350 | for line in f : |
2351 | lst.append(line) |
2352 | f.close() |
2353 | xml = "".join(lst) |
2354 | self.from_opensong_buffer(xml) |
2355 | |
2356 | - def _remove_punctuation(self, title): |
2357 | + def _remove_punctuation(self, title): |
2358 | """Remove the puntuation chars from title |
2359 | |
2360 | chars are: .,:;!?&%#/\@`$'|"^~*- |
2361 | @@ -296,7 +296,7 @@ |
2362 | punctuation = ".,:;!?&%#'\"/\\@`$|^~*-" |
2363 | s = title |
2364 | for c in punctuation : |
2365 | - s = s.replace(c, '') |
2366 | + s = s.replace(c, '') |
2367 | return s |
2368 | |
2369 | def set_title(self, title): |
2370 | @@ -322,7 +322,8 @@ |
2371 | return self.search_title |
2372 | |
2373 | def from_ccli_text_buffer(self, textList): |
2374 | - """Create song from a list of texts (strings) - CCLI text format expected |
2375 | + """ |
2376 | + Create song from a list of texts (strings) - CCLI text format expected |
2377 | |
2378 | textList (list of strings) -- the song |
2379 | """ |
2380 | @@ -377,13 +378,13 @@ |
2381 | self.set_song_cclino(sCcli) |
2382 | self.set_lyrics(lyrics) |
2383 | |
2384 | - def from_ccli_text_file(self, textFileName): |
2385 | + def from_ccli_text_file(self, textFileName): |
2386 | """Create song from a list of texts read from given file |
2387 | |
2388 | textFileName -- path to text file |
2389 | """ |
2390 | lines = [] |
2391 | - f = open(textFileName, 'r') |
2392 | + f = open(textFileName, 'r') |
2393 | for orgline in f: |
2394 | lines.append(orgline.rstrip()) |
2395 | f.close() |
2396 | @@ -424,7 +425,7 @@ |
2397 | """Return copyright info string""" |
2398 | return self._assure_string(self.copyright) |
2399 | |
2400 | - def set_copyright(self, copyright): |
2401 | + def set_copyright(self, copyright): |
2402 | """Set the copyright string""" |
2403 | self.copyright = copyright |
2404 | |
2405 | @@ -432,7 +433,7 @@ |
2406 | """Return the songCclino""" |
2407 | return self._assure_string(self.song_cclino) |
2408 | |
2409 | - def set_song_cclino(self, song_cclino): |
2410 | + def set_song_cclino(self, song_cclino): |
2411 | """Set the song_cclino""" |
2412 | self.song_cclino = song_cclino |
2413 | |
2414 | @@ -440,7 +441,7 @@ |
2415 | """Return the theme name for the song""" |
2416 | return self._assure_string(self.theme) |
2417 | |
2418 | - def set_theme(self, theme): |
2419 | + def set_theme(self, theme): |
2420 | """Set the theme name (string)""" |
2421 | self.theme = theme |
2422 | |
2423 | @@ -448,7 +449,7 @@ |
2424 | """Return the song_book (string)""" |
2425 | return self._assure_string(self.song_book) |
2426 | |
2427 | - def set_song_book(self, song_book): |
2428 | + def set_song_book(self, song_book): |
2429 | """Set the song_book (string)""" |
2430 | self.song_book = song_book |
2431 | |
2432 | @@ -456,7 +457,7 @@ |
2433 | """Return the song_number (string)""" |
2434 | return self._assure_string(self.song_number) |
2435 | |
2436 | - def set_song_number(self, song_number): |
2437 | + def set_song_number(self, song_number): |
2438 | """Set the song_number (string)""" |
2439 | self.song_number = song_number |
2440 | |
2441 | @@ -464,7 +465,7 @@ |
2442 | """Return the comments (string)""" |
2443 | return self._assure_string(self.comments) |
2444 | |
2445 | - def set_comments(self, comments): |
2446 | + def set_comments(self, comments): |
2447 | """Set the comments (string)""" |
2448 | self.comments = comments |
2449 | |
2450 | @@ -472,11 +473,11 @@ |
2451 | """Get the verseOrder (string) - preferably space delimited""" |
2452 | return self._assure_string(self.verse_order) |
2453 | |
2454 | - def set_verse_order(self, verse_order): |
2455 | + def set_verse_order(self, verse_order): |
2456 | """Set the verse order (string) - space delimited""" |
2457 | self.verse_order = verse_order |
2458 | |
2459 | - def get_author_list(self, asOneString = True): |
2460 | + def get_author_list(self, asOneString = True): |
2461 | """Return the list of authors as a string |
2462 | |
2463 | asOneString |
2464 | @@ -491,7 +492,7 @@ |
2465 | res = self._split_to_list(self.author_list) |
2466 | return res |
2467 | |
2468 | - def set_author_list(self, author_list): |
2469 | + def set_author_list(self, author_list): |
2470 | """Set the author_list |
2471 | |
2472 | author_list -- a string or list of strings |
2473 | @@ -501,7 +502,7 @@ |
2474 | else : |
2475 | self.author_list = self._list_to_string(author_list) |
2476 | |
2477 | - def get_category_array(self, asOneString = True): |
2478 | + def get_category_array(self, asOneString = True): |
2479 | """Return the list of categories as a string |
2480 | |
2481 | asOneString |
2482 | @@ -516,7 +517,7 @@ |
2483 | res = self._split_to_list(self.category_array) |
2484 | return res |
2485 | |
2486 | - def set_category_array(self, category_array): |
2487 | + def set_category_array(self, category_array): |
2488 | """Set the category_array |
2489 | |
2490 | category_array -- a string or list of strings |
2491 | @@ -530,7 +531,7 @@ |
2492 | """Return the show_title flag (bool)""" |
2493 | return self.show_title |
2494 | |
2495 | - def set_show_title(self, show_title): |
2496 | + def set_show_title(self, show_title): |
2497 | """Set the show_title flag (bool)""" |
2498 | self.show_title = show_title |
2499 | |
2500 | @@ -538,7 +539,7 @@ |
2501 | """Return the show_author_list flag""" |
2502 | return self.show_author_list |
2503 | |
2504 | - def set_show_author_list(self, show_author_list): |
2505 | + def set_show_author_list(self, show_author_list): |
2506 | """Set the show_author_list flag (bool)""" |
2507 | self.show_author_list = show_author_list |
2508 | |
2509 | @@ -554,7 +555,7 @@ |
2510 | """Return the showSongCclino (string)""" |
2511 | return self.show_song_cclino |
2512 | |
2513 | - def set_show_song_cclino(self, show_song_cclino): |
2514 | + def set_show_song_cclino(self, show_song_cclino): |
2515 | """Set the show_song_cclino flag (bool)""" |
2516 | self.show_song_cclino = show_song_cclino |
2517 | |
2518 | @@ -565,7 +566,7 @@ |
2519 | """ |
2520 | return self.lyrics |
2521 | |
2522 | - def set_lyrics(self, lyrics): |
2523 | + def set_lyrics(self, lyrics): |
2524 | """Set the lyrics as a list of strings""" |
2525 | self.lyrics = lyrics |
2526 | self._parse_lyrics() |
2527 | @@ -594,7 +595,7 @@ |
2528 | numOfSlides = len(self.slideList) |
2529 | return numOfSlides |
2530 | |
2531 | - def get_preview_slide(self, slideNumber): |
2532 | + def get_preview_slide(self, slideNumber): |
2533 | """Return the preview text for specified slide number |
2534 | |
2535 | slideNumber -- 0: all slides, 1..n : specific slide |
2536 | @@ -618,7 +619,7 @@ |
2537 | # remove formattingincluding themes |
2538 | return res |
2539 | |
2540 | - def get_render_slide(self, slideNumber): |
2541 | + def get_render_slide(self, slideNumber): |
2542 | """Return the slide to be rendered including the additional |
2543 | properties |
2544 | |
2545 | |
2546 | === modified file 'openlp/plugins/songs/lib/tables.py' |
2547 | --- openlp/plugins/songs/lib/tables.py 2009-09-08 19:58:05 +0000 |
2548 | +++ openlp/plugins/songs/lib/tables.py 2009-09-21 17:56:36 +0000 |
2549 | @@ -29,7 +29,7 @@ |
2550 | |
2551 | # Definition of the "authors" table |
2552 | authors_table = Table(u'authors', metadata, |
2553 | - Column(u'id', types.Integer, primary_key=True), |
2554 | + Column(u'id', types.Integer, primary_key=True), |
2555 | Column(u'first_name', types.Unicode(128)), |
2556 | Column(u'last_name', types.Unicode(128)), |
2557 | Column(u'display_name', types.Unicode(255), nullable=False) |
2558 | @@ -45,7 +45,8 @@ |
2559 | # Definition of the "songs" table |
2560 | songs_table = Table(u'songs', metadata, |
2561 | Column(u'id', types.Integer, primary_key=True), |
2562 | - Column(u'song_book_id', types.Integer, ForeignKey(u'song_books.id'), default=0), |
2563 | + Column(u'song_book_id', types.Integer, |
2564 | + ForeignKey(u'song_books.id'), default=0), |
2565 | Column(u'title', types.Unicode(255), nullable=False), |
2566 | Column(u'lyrics', types.UnicodeText, nullable=False), |
2567 | Column(u'verse_order', types.Unicode(128)), |
2568 | @@ -60,27 +61,38 @@ |
2569 | |
2570 | # Definition of the "topics" table |
2571 | topics_table = Table(u'topics', metadata, |
2572 | - Column(u'id', types.Integer, primary_key=True), |
2573 | + Column(u'id', types.Integer, primary_key=True), |
2574 | Column(u'name', types.Unicode(128), nullable=False) |
2575 | ) |
2576 | |
2577 | # Definition of the "authors_songs" table |
2578 | authors_songs_table = Table(u'authors_songs', metadata, |
2579 | - Column(u'author_id', types.Integer, ForeignKey(u'authors.id'), primary_key=True), |
2580 | - Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True) |
2581 | + Column(u'author_id', types.Integer, |
2582 | + ForeignKey(u'authors.id'), primary_key=True), |
2583 | + Column(u'song_id', types.Integer, |
2584 | + ForeignKey(u'songs.id'), primary_key=True) |
2585 | ) |
2586 | |
2587 | # Definition of the "songs_topics" table |
2588 | songs_topics_table = Table(u'songs_topics', metadata, |
2589 | - Column(u'song_id', types.Integer, ForeignKey(u'songs.id'), primary_key=True), |
2590 | - Column(u'topic_id', types.Integer, ForeignKey(u'topics.id'), primary_key=True) |
2591 | + Column(u'song_id', types.Integer, |
2592 | + ForeignKey(u'songs.id'), primary_key=True), |
2593 | + Column(u'topic_id', types.Integer, |
2594 | + ForeignKey(u'topics.id'), primary_key=True) |
2595 | ) |
2596 | -Index(u'authors_id',authors_table.c.id) |
2597 | -Index(u'authors_display_name_id',authors_table.c.display_name, authors_table.c.id) |
2598 | -Index(u'song_books_id',song_books_table.c.id) |
2599 | -Index(u'songs_id',songs_table.c.id) |
2600 | -Index(u'topics_id',topics_table.c.id) |
2601 | -Index(u'authors_songs_author',authors_songs_table.c.author_id, authors_songs_table.c.song_id) |
2602 | -Index(u'authors_songs_song',authors_songs_table.c.song_id, authors_songs_table.c.author_id) |
2603 | -Index(u'topics_song_topic', songs_topics_table.c.topic_id, songs_topics_table.c.song_id) |
2604 | -Index(u'topics_song_song',songs_topics_table.c.song_id, songs_topics_table.c.topic_id) |
2605 | + |
2606 | +# Define table indexes |
2607 | +Index(u'authors_id', authors_table.c.id) |
2608 | +Index(u'authors_display_name_id', authors_table.c.display_name, |
2609 | + authors_table.c.id) |
2610 | +Index(u'song_books_id', song_books_table.c.id) |
2611 | +Index(u'songs_id', songs_table.c.id) |
2612 | +Index(u'topics_id', topics_table.c.id) |
2613 | +Index(u'authors_songs_author', authors_songs_table.c.author_id, |
2614 | + authors_songs_table.c.song_id) |
2615 | +Index(u'authors_songs_song', authors_songs_table.c.song_id, |
2616 | + authors_songs_table.c.author_id) |
2617 | +Index(u'topics_song_topic', songs_topics_table.c.topic_id, |
2618 | + songs_topics_table.c.song_id) |
2619 | +Index(u'topics_song_song', songs_topics_table.c.song_id, |
2620 | + songs_topics_table.c.topic_id) |
2621 | |
2622 | === modified file 'openlp/plugins/songs/songsplugin.py' |
2623 | --- openlp/plugins/songs/songsplugin.py 2009-09-08 19:58:05 +0000 |
2624 | +++ openlp/plugins/songs/songsplugin.py 2009-09-21 17:56:36 +0000 |
2625 | @@ -94,7 +94,8 @@ |
2626 | # Translations... |
2627 | self.ImportSongMenu.setTitle(translate(u'main_window', u'&Song')) |
2628 | self.ImportOpenSongItem.setText(translate(u'main_window', u'OpenSong')) |
2629 | - self.ImportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0')) |
2630 | + self.ImportOpenlp1Item.setText( |
2631 | + translate(u'main_window', u'openlp.org 1.0')) |
2632 | self.ImportOpenlp1Item.setToolTip( |
2633 | translate(u'main_window', u'Export songs in openlp.org 1.0 format')) |
2634 | self.ImportOpenlp1Item.setStatusTip( |
2635 | @@ -137,7 +138,8 @@ |
2636 | # Translations... |
2637 | self.ExportSongMenu.setTitle(translate(u'main_window', u'&Song')) |
2638 | self.ExportOpenSongItem.setText(translate(u'main_window', u'OpenSong')) |
2639 | - self.ExportOpenlp1Item.setText(translate(u'main_window', u'openlp.org 1.0')) |
2640 | + self.ExportOpenlp1Item.setText( |
2641 | + translate(u'main_window', u'openlp.org 1.0')) |
2642 | self.ExportOpenlp2Item.setText(translate(u'main_window', u'OpenLP 2.0')) |
2643 | # Signals and slots |
2644 | QtCore.QObject.connect(self.ExportOpenlp1Item, |
2645 | |
2646 | === modified file 'openlp/plugins/songs/test/test_song_basic.py' |
2647 | --- openlp/plugins/songs/test/test_song_basic.py 2009-09-03 15:19:30 +0000 |
2648 | +++ openlp/plugins/songs/test/test_song_basic.py 2009-09-21 17:56:36 +0000 |
2649 | @@ -50,8 +50,8 @@ |
2650 | s = Song() |
2651 | t = "A normal title" |
2652 | s.set_title(t) |
2653 | - assert(s.get_title() == t) |
2654 | - assert(s.get_search_title() == t) |
2655 | + assert(s.get_title() == t) |
2656 | + assert(s.get_search_title() == t) |
2657 | |
2658 | def test_Title3(self): |
2659 | """Set a titel with punctuation 1""" |
2660 | @@ -59,8 +59,8 @@ |
2661 | t1 = "Hey! Come on, ya programmers*" |
2662 | t2 = "Hey Come on ya programmers" |
2663 | s.set_title(t1) |
2664 | - assert(s.get_title() == t1) |
2665 | - assert(s.get_search_title() == t2) |
2666 | + assert(s.get_title() == t1) |
2667 | + assert(s.get_search_title() == t2) |
2668 | |
2669 | def test_Title4(self): |
2670 | """Set a titel with punctuation 2""" |
2671 | @@ -68,11 +68,14 @@ |
2672 | t1 = "??#Hey! Come on, ya programmers*" |
2673 | t2 = "Hey Come on ya programmers" |
2674 | s.set_title(t1) |
2675 | - assert(s.get_title() == t1) |
2676 | - assert(s.get_search_title() == t2) |
2677 | + assert(s.get_title() == t1) |
2678 | + assert(s.get_search_title() == t2) |
2679 | |
2680 | def test_Title5(self): |
2681 | - """Set a title, where searchable title becomes empty - raises an exception""" |
2682 | + """ |
2683 | + Set a title |
2684 | + Where searchable title becomes empty raises an exception |
2685 | + """ |
2686 | s = Song() |
2687 | py.test.raises(SongTitleError, s.set_title, ',*') |
2688 | |
2689 | |
2690 | === modified file 'openlpcnv.pyw' |
2691 | --- openlpcnv.pyw 2009-09-08 19:58:05 +0000 |
2692 | +++ openlpcnv.pyw 2009-09-21 17:56:36 +0000 |
2693 | @@ -49,7 +49,7 @@ |
2694 | Initialise the process. |
2695 | """ |
2696 | self.display = Display() |
2697 | - self.stime = time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime()) |
2698 | + self.stime = time.strftime(u'%Y-%m-%d-%H%M%S', time.localtime()) |
2699 | self.display.output(u'OpenLp v1.9.0 Migration Utility Started') |
2700 | |
2701 | def process(self): |
Some looks go but some is bad.
Lines 21-28 etc make the code more unreadable.
Readability is vital