bug-789102, Fix autoselect when editing item in servicemanager

documentation/manual.txt

@@ -0,0 +1,7 @@
+OpenLP Manual
+=============
+
+If you're reading this file, you're probably looking for the OpenLP manual. The
+manual is hosted online at http://manual.openlp.org/. If you want to help with
+the manual, contact the OpenLP team via IRC in the #openlp.org channel on the
+Freenode network.

openlp/core/lib/mediamanageritem.py

@@ -455,7 +455,8 @@ class MediaManagerItem(QtGui.QWidget):
         """
         if QtCore.QSettings().value(u'advanced/single click preview',
             QtCore.QVariant(False)).toBool() and self.quickPreviewAllowed \
-            and self.listView.selectedIndexes():
+            and self.listView.selectedIndexes() \
+            and self.auto_select_id == -1:
             self.onPreviewClick(True)
 
     def onPreviewClick(self, keepFocus=False):

openlp/core/ui/slidecontroller.py

@@ -66,7 +66,7 @@ class SlideController(QtGui.QWidget):
             float(self.screens.current[u'size'].height())
         self.image_manager = self.parent.image_manager
         self.loopList = [
-            u'Start Loop',
+            u'Play Slides Menu',
             u'Loop Separator',
             u'Image SpinBox'
         ]
@@ -153,6 +153,7 @@ class SlideController(QtGui.QWidget):
             context=QtCore.Qt.WidgetWithChildrenShortcut)
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
+            # Hide Menu
             self.hideMenu = QtGui.QToolButton(self.toolbar)
             self.hideMenu.setText(translate('OpenLP.SlideController', 'Hide'))
             self.hideMenu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
@@ -180,27 +181,34 @@ class SlideController(QtGui.QWidget):
             self.hideMenu.menu().addAction(self.themeScreen)
             self.hideMenu.menu().addAction(self.desktopScreen)
             self.toolbar.addToolbarSeparator(u'Loop Separator')
-            startLoop = self.toolbar.addToolbarButton(
+            # Play Slides Menu
-                # Does not need translating - control string.
+            self.playSlidesMenu = QtGui.QToolButton(self.toolbar)
-                u'Start Loop', u':/media/media_time.png',
+            self.playSlidesMenu.setText(translate('OpenLP.SlideController',
-                translate('OpenLP.SlideController', 'Enable timed slides.'),
+                'Play Slides'))
-                self.onStartLoop)
+            self.playSlidesMenu.setPopupMode(QtGui.QToolButton.MenuButtonPopup)
-            startLoop.setObjectName(u'startLoop')
+            self.toolbar.addToolbarWidget(u'Play Slides Menu',
-            action_list = ActionList.get_instance()
+                self.playSlidesMenu)
-            action_list.add_action(startLoop, UiStrings().LiveToolbar)
+            self.playSlidesMenu.setMenu(QtGui.QMenu(
-            stopLoop = self.toolbar.addToolbarButton(
+                translate('OpenLP.SlideController', 'Play Slides'),
-                # Does not need translating - control string.
+                self.toolbar))
-                u'Stop Loop', u':/media/media_stop.png',
+            self.playSlidesLoop = shortcut_action(self.playSlidesMenu,
-                translate('OpenLP.SlideController', 'Stop timed slides.'),
+                u'playSlidesLoop', [], self.onPlaySlidesLoop,
-                self.onStopLoop)
+                u':/media/media_time.png', False, UiStrings().LiveToolbar)
-            stopLoop.setObjectName(u'stopLoop')
+            self.playSlidesLoop.setText(
-            action_list.add_action(stopLoop, UiStrings().LiveToolbar)
+                translate('OpenLP.SlideController', 'Play Slides in Loop'))
-            self.toogleLoop = shortcut_action(self, u'toogleLoop',
+            self.playSlidesOnce = shortcut_action(self.playSlidesMenu,
-                [QtGui.QKeySequence(u'L')], self.onToggleLoop,
+                u'playSlidesOnce', [], self.onPlaySlidesOnce,
-                category=UiStrings().LiveToolbar)
+                u':/media/media_time.png', False, UiStrings().LiveToolbar)
-            self.toogleLoop.setText(translate('OpenLP.SlideController',
+            self.playSlidesOnce.setText(
-                'Start/Stop continuous loop'))
+                translate('OpenLP.SlideController', 'Play Slides to End'))
-            self.addAction(self.toogleLoop)
+            if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                u'/enable slide loop', QtCore.QVariant(True)).toBool():
+                self.playSlidesMenu.setDefaultAction(self.playSlidesLoop)
+            else:
+                self.playSlidesMenu.setDefaultAction(self.playSlidesOnce)
+            self.playSlidesMenu.menu().addAction(self.playSlidesLoop)
+            self.playSlidesMenu.menu().addAction(self.playSlidesOnce)
+            # Loop Delay Spinbox
             self.delaySpinBox = QtGui.QSpinBox()
             self.delaySpinBox.setRange(1, 180)
             self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox)
@@ -321,7 +329,6 @@ class SlideController(QtGui.QWidget):
                 QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),
                 self.receiveSpinDelay)
             self.toolbar.makeWidgetsInvisible(self.loopList)
-            self.toolbar.actions[u'Stop Loop'].setVisible(False)
         else:
             QtCore.QObject.connect(self.previewListWidget,
                 QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
@@ -496,10 +503,6 @@ class SlideController(QtGui.QWidget):
         self.mediabar.setVisible(False)
         self.toolbar.makeWidgetsInvisible([u'Song Menu'])
         self.toolbar.makeWidgetsInvisible(self.loopList)
-        self.toogleLoop.setEnabled(False)
-        self.toolbar.actions[u'Start Loop'].setEnabled(False)
-        self.toolbar.actions[u'Stop Loop'].setEnabled(False)
-        self.toolbar.actions[u'Stop Loop'].setVisible(False)
         if item.is_text():
             if QtCore.QSettings().value(
                 self.parent.songsSettingsSection + u'/display songbar',
@@ -508,9 +511,6 @@ class SlideController(QtGui.QWidget):
         if item.is_capable(ItemCapabilities.AllowsLoop) and \
             len(item.get_frames()) > 1:
             self.toolbar.makeWidgetsVisible(self.loopList)
-            self.toogleLoop.setEnabled(True)
-            self.toolbar.actions[u'Start Loop'].setEnabled(True)
-            self.toolbar.actions[u'Stop Loop'].setEnabled(True)
         if item.is_media():
             self.toolbar.setVisible(False)
             self.mediabar.setVisible(True)
@@ -943,7 +943,7 @@ class SlideController(QtGui.QWidget):
             rect.y(), rect.width(), rect.height())
         self.slidePreview.setPixmap(winimg)
 
-    def onSlideSelectedNext(self):
+    def onSlideSelectedNext(self, wrap=None):
         """
         Go to the next slide.
         """
@@ -956,8 +956,11 @@ class SlideController(QtGui.QWidget):
         else:
             row = self.previewListWidget.currentRow() + 1
             if row == self.previewListWidget.rowCount():
-                if QtCore.QSettings().value(self.parent.generalSettingsSection +
+                if wrap is None:
-                    u'/enable slide loop', QtCore.QVariant(True)).toBool():
+                    wrap = QtCore.QSettings().value(
+                        self.parent.generalSettingsSection +
+                        u'/enable slide loop', QtCore.QVariant(True)).toBool()
+                if wrap:
                     row = 0
                 else:
                     row = self.previewListWidget.rowCount() - 1
@@ -1006,11 +1009,11 @@ class SlideController(QtGui.QWidget):
                         self.previewListWidget.rowCount() - 1)
             self.slideSelected()
 
-    def onToggleLoop(self, toggled):
+    def onToggleLoop(self):
         """
         Toggles the loop state.
         """
-        if self.toolbar.actions[u'Start Loop'].isVisible():
+        if self.playSlidesLoop.isChecked() or self.playSlidesOnce.isChecked():
             self.onStartLoop()
         else:
             self.onStopLoop()
@@ -1022,8 +1025,6 @@ class SlideController(QtGui.QWidget):
         if self.previewListWidget.rowCount() > 1:
             self.timer_id = self.startTimer(
                 int(self.delaySpinBox.value()) * 1000)
-            self.toolbar.actions[u'Stop Loop'].setVisible(True)
-            self.toolbar.actions[u'Start Loop'].setVisible(False)
 
     def onStopLoop(self):
         """
@@ -1032,15 +1033,39 @@ class SlideController(QtGui.QWidget):
         if self.timer_id != 0:
             self.killTimer(self.timer_id)
             self.timer_id = 0
-            self.toolbar.actions[u'Start Loop'].setVisible(True)
+
-            self.toolbar.actions[u'Stop Loop'].setVisible(False)
+    def onPlaySlidesLoop(self, checked=None):
+        """
+        Start or stop 'Play Slides in Loop'
+        """
+        if checked is None:
+            checked = self.playSlidesLoop.isChecked()
+        else:
+            self.playSlidesLoop.setChecked(checked)
+        log.debug(u'onPlaySlidesLoop %s' % checked)
+        self.playSlidesMenu.setDefaultAction(self.playSlidesLoop)
+        self.playSlidesOnce.setChecked(False)
+        self.onToggleLoop()
+
+    def onPlaySlidesOnce(self, checked=None):
+        """
+        Start or stop 'Play Slides to End'
+        """
+        if checked is None:
+            checked = self.playSlidesOnce.isChecked()
+        else:
+            self.playSlidesOnce.setChecked(checked)
+        log.debug(u'onPlaySlidesOnce %s' % checked)
+        self.playSlidesMenu.setDefaultAction(self.playSlidesOnce)
+        self.playSlidesLoop.setChecked(False)
+        self.onToggleLoop()
 
     def timerEvent(self, event):
         """
         If the timer event is for this window select next slide
         """
         if event.timerId() == self.timer_id:
-            self.onSlideSelectedNext()
+            self.onSlideSelectedNext(self.playSlidesLoop.isChecked())
 
     def onEditSong(self):
         """

openlp/plugins/custom/forms/editcustomform.py

@@ -137,7 +137,8 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
         self.customSlide.credits = unicode(self.creditEdit.text())
         self.customSlide.theme_name = unicode(self.themeComboBox.currentText())
         success = self.manager.save_object(self.customSlide)
-        self.parent.auto_select_id = self.customSlide.id
+        if self.parent.new:
+            self.parent.auto_select_id = self.customSlide.id
         return success
 
     def onUpButtonClicked(self):

openlp/plugins/custom/lib/mediaitem.py

@@ -66,6 +66,7 @@ class CustomMediaItem(MediaManagerItem):
         # which Custom is required.
         self.remoteCustom = -1
         self.manager = parent.manager
+        self.new = False
 
     def addEndHeaderBar(self):
         self.addToolbarSeparator()
@@ -156,9 +157,11 @@ class CustomMediaItem(MediaManagerItem):
         self.auto_select_id = -1
 
     def onNewClick(self):
+        self.new = True
         self.edit_custom_form.loadCustom(0)
         self.edit_custom_form.exec_()
         self.initialise()
+        self.new = False
 
     def onRemoteEditClear(self):
         self.remoteTriggered = None

openlp/plugins/songs/forms/editsongform.py

@@ -755,8 +755,9 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
             self.song.topics.append(self.manager.get_object(Topic, topicId))
         clean_song(self.manager, self.song)
         self.manager.save_object(self.song)
-        self.parent.auto_select_id = self.song.id
+        if self.parent.new:
-
+            self.parent.auto_select_id = self.song.id
+        
     def _processLyrics(self):
         """
         Process the lyric data entered by the user into the OpenLP XML format.

openlp/plugins/songs/lib/mediaitem.py

@@ -74,6 +74,7 @@ class SongMediaItem(MediaManagerItem):
         self.editItem = None
         self.quickPreviewAllowed = True
         self.hasSearch = True
+        self.new = False
 
     def addEndHeaderBar(self):
         self.addToolbarSeparator()
@@ -296,8 +297,10 @@ class SongMediaItem(MediaManagerItem):
 
     def onNewClick(self):
         log.debug(u'onNewClick')
+        self.new = True
         self.edit_song_form.newSong()
         self.edit_song_form.exec_()
+        self.new = False
 
     def onSongMaintenanceClick(self):
         self.song_maintenance_form.exec_()