Merge lp:~milleja46/openlp/milleja46 into lp:openlp

[Joshua Miller]

Adds in looping of slides based on a checkbox in the general settings. Fully functional now, and corrections as noted, and extra blank deletion.

[Tim Bentley (trb143)]

line 80 longer than 80 bytes

lines 85 and 88 not needed.

QtCore.QSettings().value(self.parent.generalSettingsSection + u'/enable slide loop'
should be
QtCore.QSettings().value(u'general/enable slide loop'

review: Needs Fixing

[Jonathan Corwin (j-corwin)]

> QtCore.QSettings().value(self.parent.generalSettingsSection + u'/enable slide
> loop'
> should be
> QtCore.QSettings().value(u'general/enable slide loop'

Tim, what Joshua has is consistent with the rest of slidecontroller.py, and we've just spent the last few days telling him to replace the 'general' with the self.parent.generalSettingsSection!

[Raoul Snyman (raoul-snyman)]

@Joshua just a small thing, rename your "enable_loop" variable to "can_loop" as it makes a little more sense when you read the "if" statement.

  if can_loop:

Just makes the code a little more readable.

[Jonathan Corwin (j-corwin)]

Delete line 45

Line 88, shouldn't be pass, but:
    row = self.previewListWidget.rowCount() - 1
Otherwise row will be one greater than the highest index in the controller.

Leave the self.parent.generalSettingsSection until Tim has chance to respond to my earlier comment and I find out why he wants it changed. But it still needs splitting so it doesn't go over 80 characters.

review: Needs Fixing

[Tim Bentley (trb143)]

Accept that SlideController does it that way with Qsettings BUT the reset of the code ThemeManager which I have written does it the other way.

self.parent.generalSettingsSection + u'/enable slide is less readable than u'general/enable slide.
This is a different debate for later so ignore that comment. The rest still stand.

[Tim Bentley (trb143)]

Looks good but can_loop can be removed and the IF test applied against the QSettings directly.

This is in both situations

review: Needs Fixing

[lp:~milleja46/openlp/milleja46]

1574. By Tim Bentley on 2011-05-26

More busy and sort changes

1575. By Joshua Miller on 2011-05-26

Enable or disable looping of slides based on a checkbox in the general settings

1576. By Tim Bentley on 2011-05-26

Copyright updates

1577. By Andreas Preikschat on 2011-05-26

- Removed 'Default' button
- Translate the tag description (bug #787552).

1578. By Andreas Preikschat on 2011-05-26

Fix for   being displayed as text.

1579. By Andreas Preikschat on 2011-05-27

- Fixed Bible verse display misalignment(Bug #788770)

1580. By Stevan Pettit on 2011-05-27

Fix bug #788084, modified code to use object id instead of title.

1581. By Jonathan Corwin on 2011-05-27

Remove the index from the search_lyrics column to allow OpenLP to work with a MySQL MyISAM database

1582. By Andreas Preikschat on 2011-05-27

- Themes in service item theme menu are checkable.
- Allow the user to reset the theme to the (global/service) default theme.

1583. By Andreas Preikschat on 2011-05-27

- Hide the theme menu when theme level is not 'Song'.
- clean ups

1584. By Andreas Preikschat on 2011-05-27

- Improved 'Auto Select' feature
- Fixed a traceback which occurs when you click the "Add" button in the slidecontroller when you are not previewing an item.
- Improved parentage
- clean ups

1585. By Jonathan Corwin on 2011-05-27

Make the slide loop/slide delay settings labels less misleading

1586. By Jonathan Corwin on 2011-05-27

Change timed slide button tooltip to remove reference to looping, and add a few full stops to a few others.

1587. By Raoul Snyman on 2011-05-28

Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7.

1588. By Stevan Pettit on 2011-05-28

Fixed bug #788335: Modified slidecontroller to properly blank the display when OpenLP is started and no item has been sent to live.

1589. By Jeffrey Smith on 2011-05-28

Make 'continuous loop' button into a selection ('loop' or 'play to end')

1590. By Raoul Snyman on 2011-05-28

Added a simple file to point users to the online manual. This is necessary for the Debian and Ubuntu builds.

1591. By Armin Köhler on 2011-05-29

Monster change to Bibles:
- Web Bibles import their books on registration
- Added a book_reference_id to the books table of Bibles
- Moved various sqlite and csv resources into a single sqlite database
- Added an upgrade wizard to upgrade existing Bibles
- Check on startup if a user has older Bibles
- Various other bug fixes and cleanups

1592. By Andreas Preikschat on 2011-05-29

- fixed bug #789143

1593. By Andreas Preikschat on 2011-05-29

- changed a few camelCase names
- changed object names

1594. By Jonathan Corwin on 2011-05-30

MediaManagerItems need to inherit from the TabBox inside the media dock, or the media dock itself.
Fix parentage of several classes

1595. By Andreas Preikschat on 2011-05-30

- Fixed bug #789929 (Display Tags cannot be deleted)

1596. By Raoul Snyman on 2011-05-30

Fix bug #714510 by removing the unnecessary indexes and defaulting the song_book_id on the songs table to NULL instead of 0.

1597. By Armin Köhler on 2011-05-30

Change content of booklist combobox in advanced search and autocomplete suggestionlist in quick search if a second bible is choosen the lists refresh and contain only books which are in both bibles.

1598. By Andreas Preikschat on 2011-05-31

- fixed bug #789618 "Large gap between two parts of a verse in Service Order Print"

1599. By Raoul Snyman on 2011-05-31

Fixed bug #790382 by using the Mako template engine to pass Python variables into the template and tweaking a few things in the JS.

1600. By jerryb on 2011-05-31

Log failing imports

1601. By jerryb on 2011-06-01

Add robustness to Generic document and Songs of Fellowship importers.

1602. By Armin Köhler on 2011-06-01

Fix traceback on startup when Bibles plugin is disabled

1603. By Jonathan Corwin on 2011-06-02

Fix problems with remembering blank/hidden state when starting up, and with the startup logo flashing briefly on the screen. Also fix the Show blank warning box.
Fix toolbox appearing on the media manager when it's associated plugin is inactive.
Make the override display act like a dual display on startup. I.e. it appears.

1604. By Armin Köhler on 2011-06-02

- Fix problems with non-ascii book names on Biblegateway
- Fix download problem with first verse on Biblegateway
- Remove unnecessary whitespace

1605. By Andreas Preikschat on 2011-06-02

- removed dangling list
- added debug message
- do not show an error message when the directory does not exist, instead create one
- do not override the file class
- clean ups

1606. By Andreas Preikschat on 2011-06-03

Fixes bug #791814 "Windows: Language Menu shows wrong entries"

1607. By Stevan Pettit on 2011-06-03

Fixed bug-789102. "Editing song via service and saving it, highlights it in media manager"

1608. By Armin Köhler on 2011-06-03

- Fix bug #788762: only show the "No matching book" dialog once.
- If a second Bible is chosen, text search results will only contain passages which are in both Bibles.

1609. By Jonathan Corwin on 2011-06-03

Change some unexceptional log.exceptions to log.warns in presentations

1610. By Stevan Pettit on 2011-06-04

Fixed traceback error that occurs in windows-builder.py if the bzr version info contains non-ascii characters.

Added Mako requirement documentation

1611. By Armin Köhler on 2011-06-04

Change upgrade of bibles: bibleupgradeform now trys to upgrade existing verses from webbibles.

1612. By Jonathan Corwin on 2011-06-04

In a song, replace apostrophes with an empty string instead of a space. This allows the searcher to find words containing "it's" and "Lord's" should they type "its" or "Lords" (and vice versa).
Also reinstate the setting of search_lyrics by clean_song.

1613. By Tim Bentley on 2011-06-05

Fix selection in ServiceManager over theme change

1614. By Armin Köhler on 2011-06-05

- Fix Bug #792811 - Traceback UnicodeEncodeError while importing a webbible
- If upgrade fails new bible databases which are failed now should be deleted always. If upgrade was successfull the old database is deleted immediately. So never should stay an old and a new version from one bible.
- changed behaviour if the user cancel the import so that after a traceback it is possible to cancel the dialog.
- Fix Bug #792831 - now the right parent is used for dialogs and error messages
- Biblegateway.com has changed it's Bible-Book-List Layout. Addapt the regex for importing the booklist of a bible from biblegateway to the new html layout.
- changed log usage
- remove unnecessary code
- small fixes

1615. By Armin Köhler on 2011-06-05

Fix Bug #793091 - if plugin changed status from inactive to active plugin.appStartup now is called

1616. By Andreas Preikschat on 2011-06-06

- fixed bug 788770
- fixed space in the media manager

1617. By Andreas Preikschat on 2011-06-06

- fixed bug #793537 "Traceback when hooking up 2nd monitor"

1618. By Andreas Preikschat on 2011-06-06

Improved thumbnail creation speed in the media manager

1619. By Tim Bentley on 2011-06-07

Correct the line count in theme wizard

1620. By Jonathan Corwin on 2011-06-09

Prevent error message appearing on operator screen when searching for Bible text via the remote

1621. By Jonathan Corwin on 2011-06-09

Close and delete old MainDisplay windows when a new one is created due to a screen change.

1622. By Andreas Preikschat on 2011-06-09

- give title edit focus when creating a new customs

1623. By Andreas Preikschat on 2011-06-10

- Improved image resizing speed

1624. By Jonathan Corwin on 2011-06-10

Fix outstanding strings prior to string freeze

1625. By Stevan Pettit on 2011-06-10

Added code to openlp/plugins/bibles/lib/manager.py to skip old_databases during load. (Would we want to delete them)?-----> Removed this change, reverted back to original code.

Added a routine to openlp/plugins/bibles/lib/db.py to close the DB "Cursor" and "Connection"

Added code to openlp/plugins/bibles/forms/bibleupgradeform.py to "close" the DB so the old DB file can be deleted afrter use.

1626. By jerryb on 2011-06-11

Add LibreOffice to error messages.
Standardise error messages.

1627. By Andreas Preikschat on 2011-06-11

fixed 'split' string

1628. By Tim Bentley on 2011-06-11

Fix mediamanager bug

1629. By Jonathan Corwin on 2011-06-11

Fix a few more strings

1630. By Tim Bentley on 2011-06-11

Fix phantom save service messages

1631. By Tim Bentley on 2011-06-12

Speed up slide editing

1632. By Raoul Snyman on 2011-06-12

Fixed 789046 and minor cleanups

1633. By Raoul Snyman on 2011-06-12

Fixed various strings.

1634. By Simon Scudder on 2011-06-12

Function showtext in the html javascript was altered, so that the shadow layer (if present) will ignore all the font color settings. This is done using a regular expression replace, that searches for -webkit-text-fill-color and erases up to the first ; or "

If there is only a colour formatting command in the span tag, an empty class attribute is left behind, which shouldn't be a problem.

1635. By Andreas Preikschat on 2011-06-12

- fixed crash attempting to add a non existent image to the service
- fixed display of full presentation path in remote search
- fixed names
- fixed use of 'settingsSection' (the second argument is not a sections, rather a value name <-> using settingsSection is misleading)

1636. By Tim Bentley on 2011-06-12

One and only Simon Scudder

1637. By Tim Bentley on 2011-06-13

Return of the default theme

1638. By Tim Bentley on 2011-06-14

Split names

1639. By Andreas Preikschat on 2011-06-14

Correct Focus on entry to dialog

1640. By Raoul Snyman on 2011-06-14

Fixed bug #792204: SongShow Plus importer fails to import song.

1641. By Raoul Snyman on 2011-06-14

Fixed bug #763064: Empty line in first verse prevents saving a song.

1642. By Simon Scudder on 2011-06-18

Import Song Book Number correctly from OpenLyrics files

1643. By Jonathan Corwin on 2011-06-18

Prevent error if attempt to keep going off the end of a presentation.
Reduce memory usage by not resizing small thumbnails back up to full monitor size in the slidecontroller.

1644. By Stevan Pettit on 2011-06-18

Fixed problem with preview edit button not working for custom slides.
Also restores backwards compatability with custom plugin settings with 1.9.5

1645. By Jonathan Corwin on 2011-06-19

Stop the service item note getting lost if the service item is edited

1646. By Jonathan Corwin on 2011-06-20

Fixing main display kerning problem for qtwebkit v534.3

1647. By Jonathan Corwin on 2011-06-20

Partial fix for the Unity top panel showing problem. However this doesn't fully fix it, since it appears the only way for a window to cover that bar is for it to have focus. This isn't possible in OpenLP, since the controlling window will have focus.

1648. By Andreas Preikschat on 2011-06-20

- updated ts files

1649. By Raoul Snyman on 2011-06-21

Fixed bug #800047 where the Preferences menu item in OS X was incorrect.

1650. By Jonathan Corwin on 2011-06-21

1. For openlyrics export, restrict the length of the filename to ensure it isn't too long for the filesystem.
2. When adding a song from a loaded service file, the author list string was being split by comma and the count compared to the number of authors against the db song. This gave a false negative if one of the individual authors contained a comma. Change the author comparison technique.

1651. By Jonathan Corwin on 2011-06-21

When the maindisplay has a parent, the Phonon video only shows a white screen. Remove the parent and the video works again. This also means minimizing the mainwindow (or pressing Win+D) no longer minimizes the maindisplay.

1652. By Jonathan Corwin on 2011-06-21

1. In the import wizard, if user goes back and next again, ensure a disabled button stays disabled.
2. Check for missing attributes in the easislides import XML

1653. By Stevan Pettit on 2011-06-23

Changes to inno setup wizzard images/icons for Windows build

1654. By Raoul Snyman on 2011-06-23

Half of bug #795068 fixed. Just figured I might as well get this in before the release.

1655. By Raoul Snyman on 2011-06-23

Fix bug #801000 where Enchant falls over in one or two situations where there is no locale set or it encounters some other problem and generates a generic Error.

1656. By Raoul Snyman on 2011-06-24

Fixed bug #7999411: Trap for some missing UNO constants on some systems.
Fixed bug #7432732: Add missing MetaModifier key check in the shortcuts dialog, so hopefully better shortcuts can be set on OS X.

1657. By Raoul Snyman on 2011-06-24

Fixed bug #791050 by hiding and then showing the toolbar.

1658. By Andreas Preikschat on 2011-06-27

- fixed saving 'Setup' mode shortcut

1659. By Andreas Preikschat on 2011-06-27

- now you can resize the display tag dialog
- changed the column widths
- make sure we always use the space available
- scroll to the bottom when adding a new tag

1660. By Andreas Preikschat on 2011-06-27

- removed not used "display tab" ui file
- removed old theme wizard ui file

1661. By Andreas Preikschat on 2011-06-27

When you copy a theme the suggested theme name will be 'Copy of <theme name>'

1662. By Andreas Preikschat on 2011-06-27

- removed not needed lists
- some translation fixes
- remove close button on print dialog

1663. By Joshua Miller on 2011-06-28

Adds a semi-base for video's in a theme

1664. By Joshua Miller on 2011-06-28

changes to add in video support for themes

1665. By Joshua Miller on 2011-06-28

changes to improve support for videos

1666. By Joshua Miller on 2011-06-28

A another showing of what i've tried so far

1667. By Joshua Miller on 2011-06-30

Finally adds video lines to the dialog

1668. By Joshua Miller on 2011-06-30

a few changes for video support in themes

Unmerged revisions

1668. By Joshua Miller on 2011-06-30

a few changes for video support in themes

1667. By Joshua Miller on 2011-06-30

Finally adds video lines to the dialog

1666. By Joshua Miller on 2011-06-28

A another showing of what i've tried so far

1665. By Joshua Miller on 2011-06-28

changes to improve support for videos

1664. By Joshua Miller on 2011-06-28

changes to add in video support for themes

1663. By Joshua Miller on 2011-06-28

Adds a semi-base for video's in a theme

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2011-05-24 20:47:05 +0000
+++ openlp/core/ui/generaltab.py	2011-05-26 11:02:47 +0000
@@ -97,6 +97,9 @@
         self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
         self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox')
         self.settingsLayout.addRow(self.autoPreviewCheckBox)
+        self.enableLoopCheckBox = QtGui.QCheckBox(self.settingsGroupBox)
+        self.enableLoopCheckBox.setObjectName(u'enableLoopCheckBox')
+        self.settingsLayout.addRow(self.enableLoopCheckBox)
         # Moved here from image tab
         self.timeoutLabel = QtGui.QLabel(self.settingsGroupBox)
         self.timeoutLabel.setObjectName(u'timeoutLabel')
@@ -219,6 +222,8 @@
             'Unblank display when adding new live item'))
         self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab',
             'Automatically preview next item in service'))
+        self.enableLoopCheckBox.setText(translate('OpenLP.GeneralTab',
+            'Enable slide loop'))
         self.timeoutLabel.setText(translate('OpenLP.GeneralTab',
             'Slide loop delay:'))
         self.timeoutSpinBox.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
@@ -271,6 +276,8 @@
             QtCore.QVariant(True)).toBool())
         self.autoPreviewCheckBox.setChecked(settings.value(u'auto preview',
             QtCore.QVariant(False)).toBool())
+        self.enableLoopCheckBox.setChecked(settings.value(u'enable slide loop',
+            QtCore.QVariant(True)).toBool())
         self.timeoutSpinBox.setValue(settings.value(u'loop delay',
            QtCore.QVariant(5)).toInt()[0])
         self.overrideCheckBox.setChecked(settings.value(u'override position',
@@ -314,6 +321,8 @@
             QtCore.QVariant(self.autoUnblankCheckBox.isChecked()))
         settings.setValue(u'auto preview',
             QtCore.QVariant(self.autoPreviewCheckBox.isChecked()))
+        settings.setValue(u'enable slide loop',
+            QtCore.QVariant(self.enableLoopCheckBox.isChecked()))
         settings.setValue(u'loop delay',
             QtCore.QVariant(self.timeoutSpinBox.value()))
         settings.setValue(u'ccli number',

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-05-25 09:10:57 +0000
+++ openlp/core/ui/slidecontroller.py	2011-05-26 11:02:47 +0000
@@ -349,13 +349,6 @@
             QtCore.SIGNAL(u'slidecontroller_%s_previous' % self.typePrefix),
             self.onSlideSelectedPrevious)
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'slidecontroller_%s_next_noloop' % self.typePrefix),
-            self.onSlideSelectedNextNoloop)
-        QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'slidecontroller_%s_previous_noloop' %
-            self.typePrefix),
-            self.onSlideSelectedPreviousNoloop)
-        QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'slidecontroller_%s_last' % self.typePrefix),
             self.onSlideSelectedLast)
         QtCore.QObject.connect(Receiver.get_receiver(),
@@ -940,10 +933,7 @@
             rect.y(), rect.width(), rect.height())
         self.slidePreview.setPixmap(winimg)
 
-    def onSlideSelectedNextNoloop(self):
-        self.onSlideSelectedNext(False)
-
-    def onSlideSelectedNext(self, loop=True):
+    def onSlideSelectedNext(self):
         """
         Go to the next slide.
         """
@@ -956,18 +946,15 @@
         else:
             row = self.previewListWidget.currentRow() + 1
             if row == self.previewListWidget.rowCount():
-                if loop:
+                if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                    u'/enable slide loop', QtCore.QVariant(True)).toBool():
                     row = 0
                 else:
-                    Receiver.send_message('servicemanager_next_item')
-                    return
+                    row = self.previewListWidget.rowCount() - 1
             self.__checkUpdateSelectedSlide(row)
             self.slideSelected()
 
-    def onSlideSelectedPreviousNoloop(self):
-        self.onSlideSelectedPrevious(False)
-
-    def onSlideSelectedPrevious(self, loop=True):
+    def onSlideSelectedPrevious(self):
         """
         Go to the previous slide.
         """
@@ -980,7 +967,8 @@
         else:
             row = self.previewListWidget.currentRow() - 1
             if row == -1:
-                if loop:
+                if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                    u'/enable slide loop', QtCore.QVariant(True)).toBool():
                     row = self.previewListWidget.rowCount() - 1
                 else:
                     row = 0