1166

openlp/core/lib/rendermanager.py

@@ -214,7 +214,7 @@ class RenderManager(object):
         if self.force_page:
             verse = verse + verse + verse
         else:
-            self.image_manager.del_image(self.theme_data.theme_name)
+            self.image_manager.del_image(theme_data.theme_name)
         footer = []
         footer.append(u'Arky Arky (Unknown)' )
         footer.append(u'Public Domain')

openlp/core/ui/filerenamedialog.py

@@ -53,7 +53,5 @@ class Ui_FileRenameDialog(object):
         QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
 
     def retranslateUi(self, FileRenameDialog):
-        FileRenameDialog.setWindowTitle(translate('OpenLP.FileRenameForm',
-            'File Rename'))
         self.fileRenameLabel.setText(translate('OpenLP.FileRenameForm',
             'New File Name:'))

openlp/core/ui/filerenameform.py

@@ -28,6 +28,8 @@ from PyQt4 import QtCore, QtGui
 
 from filerenamedialog import Ui_FileRenameDialog
 
+from openlp.core.lib import translate
+
 class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
     """
     The exception dialog
@@ -39,3 +41,15 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
             self.accept)
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
             self.reject)
+
+    def exec_(self, copy=False):
+        """
+        Run the Dialog with correct heading.
+        """
+        if copy:
+            self.setWindowTitle(translate('OpenLP.FileRenameForm',
+                'File Copy'))
+        else:
+            self.setWindowTitle(translate('OpenLP.FileRenameForm',
+            'File Rename'))
+        return QtGui.QDialog.exec_(self)

openlp/core/ui/generaltab.py

@@ -312,6 +312,18 @@ class GeneralTab(SettingsTab):
         # Signals and slots
         QtCore.QObject.connect(self.overrideCheckBox,
             QtCore.SIGNAL(u'toggled(bool)'), self.onOverrideCheckBoxToggled)
+        QtCore.QObject.connect(self.customHeightValueEdit,
+            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            self.onDisplayPositionChanged)
+        QtCore.QObject.connect(self.customWidthValueEdit,
+            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            self.onDisplayPositionChanged)
+        QtCore.QObject.connect(self.customYValueEdit,
+            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            self.onDisplayPositionChanged)
+        QtCore.QObject.connect(self.customXValueEdit,
+            QtCore.SIGNAL(u'textEdited(const QString&)'),
+            self.onDisplayPositionChanged)
 
     def retranslateUi(self):
         """
@@ -503,10 +515,19 @@ class GeneralTab(SettingsTab):
 
     def onOverrideCheckBoxToggled(self, checked):
         """
-        Toggle screen state depending on check box state
+        Toggle screen state depending on check box state.
+
+        ``checked``
+            The state of the check box (boolean).
         """
         self.customXValueEdit.setEnabled(checked)
         self.customYValueEdit.setEnabled(checked)
         self.customHeightValueEdit.setEnabled(checked)
         self.customWidthValueEdit.setEnabled(checked)
         self.overrideChanged = True
+
+    def onDisplayPositionChanged(self):
+        """
+        Called when the width, height, x position or y position has changed.
+        """
+        self.overrideChanged = True

openlp/core/ui/mainwindow.py

@@ -148,7 +148,7 @@ class Ui_MainWindow(object):
         self.MediaManagerDock.setMinimumWidth(
             self.settingsmanager.mainwindow_left)
         self.MediaManagerDock.setObjectName(u'MediaManagerDock')
-        self.MediaManagerContents = QtGui.QWidget()
+        self.MediaManagerContents = QtGui.QWidget(MainWindow)
         self.MediaManagerContents.setObjectName(u'MediaManagerContents')
         self.MediaManagerLayout = QtGui.QHBoxLayout(self.MediaManagerContents)
         self.MediaManagerLayout.setContentsMargins(0, 2, 0, 0)

openlp/core/ui/pluginform.py

@@ -79,7 +79,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
                 status_text = unicode(
                     translate('OpenLP.PluginForm', '%s (Disabled)'))
             name_string = plugin.getString(StringContent.Name)
-            item.setText(status_text % name_string[u'plural'])
+            item.setText(status_text % name_string[u'singular'])
             # If the plugin has an icon, set it!
             if plugin.icon:
                 item.setIcon(plugin.icon)
@@ -107,12 +107,12 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         if self.pluginListWidget.currentItem() is None:
             self._clearDetails()
             return
-        plugin_name_plural = \
+        plugin_name_singular = \
             self.pluginListWidget.currentItem().text().split(u' ')[0]
         self.activePlugin = None
         for plugin in self.parent.pluginManager.plugins:
             name_string = plugin.getString(StringContent.Name)
-            if name_string[u'plural'] == plugin_name_plural:
+            if name_string[u'singular'] == plugin_name_singular:
                 self.activePlugin = plugin
                 break
         if self.activePlugin:
@@ -142,4 +142,4 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
                 translate('OpenLP.PluginForm', '%s (Disabled)'))
         name_string = self.activePlugin.getString(StringContent.Name)
         self.pluginListWidget.currentItem().setText(
-            status_text % name_string[u'plural'])
+            status_text % name_string[u'singular'])

openlp/core/ui/thememanager.py

@@ -223,15 +223,17 @@ class ThemeManager(QtGui.QWidget):
         """
         Renames an existing theme to a new name
         """
-        item = self.themeListWidget.currentItem()
+        action = unicode(translate('OpenLP.ThemeManager', 'Rename'))
-        oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
+        if self._validate_theme_action(action, False):
-        self.fileRenameForm.fileNameEdit.setText(oldThemeName)
+            item = self.themeListWidget.currentItem()
-        self.saveThemeName = u''
+            oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
-        if self.fileRenameForm.exec_():
+            self.fileRenameForm.fileNameEdit.setText(oldThemeName)
-            newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
+            self.saveThemeName = oldThemeName
-            oldThemeData = self.getThemeData(oldThemeName)
+            if self.fileRenameForm.exec_():
-            self.deleteTheme(oldThemeName)
+                newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
-            self.cloneThemeData(oldThemeData, newThemeName)
+                oldThemeData = self.getThemeData(oldThemeName)
+                self.deleteTheme(oldThemeName)
+                self.cloneThemeData(oldThemeData, newThemeName)
 
     def onCopyTheme(self):
         """
@@ -241,7 +243,7 @@ class ThemeManager(QtGui.QWidget):
         oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
         self.fileRenameForm.fileNameEdit.setText(oldThemeName)
         self.saveThemeName = u''
-        if self.fileRenameForm.exec_():
+        if self.fileRenameForm.exec_(True):
             newThemeName =  unicode(self.fileRenameForm.fileNameEdit.text())
             themeData = self.getThemeData(oldThemeName)
             self.cloneThemeData(themeData, newThemeName)
@@ -286,47 +288,13 @@ class ThemeManager(QtGui.QWidget):
         """
         Delete a theme
         """
-        self.global_theme = unicode(QtCore.QSettings().value(
+        action = unicode(translate('OpenLP.ThemeManager', 'Delete'))
-            self.settingsSection + u'/global theme',
+        if self._validate_theme_action(action):
-            QtCore.QVariant(u'')).toString())
-        if check_item_selected(self.themeListWidget,
-            translate('OpenLP.ThemeManager',
-            'You must select a theme to delete.')):
             item = self.themeListWidget.currentItem()
             theme = unicode(item.text())
-            # confirm deletion
+            row = self.themeListWidget.row(item)
-            answer = QtGui.QMessageBox.question(self,
+            self.themeListWidget.takeItem(row)
-                translate('OpenLP.ThemeManager', 'Delete Confirmation'),
+            self.deleteTheme(theme)
-                unicode(translate('OpenLP.ThemeManager', 'Delete %s theme?'))
-                % theme,
-                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
-                QtGui.QMessageBox.No), QtGui.QMessageBox.No)
-            if answer == QtGui.QMessageBox.No:
-                return
-            # should be the same unless default
-            if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
-                QtGui.QMessageBox.critical(self,
-                    translate('OpenLP.ThemeManager', 'Error'),
-                    translate('OpenLP.ThemeManager',
-                        'You are unable to delete the default theme.'))
-            else:
-                for plugin in self.parent.pluginManager.plugins:
-                    if plugin.usesTheme(theme):
-                        QtGui.QMessageBox.critical(self,
-                            translate('OpenLP.ThemeManager', 'Error'),
-                            unicode(translate('OpenLP.ThemeManager',
-                                'Theme %s is used in the %s plugin.')) % \
-                                (theme, plugin.name))
-                        return
-                if unicode(self.serviceComboBox.currentText()) == theme:
-                    QtGui.QMessageBox.critical(self,
-                        translate('OpenLP.ThemeManager', 'Error'),
-                        unicode(translate('OpenLP.ThemeManager',
-                        'Theme %s is used by the service manager.')) % theme)
-                    return
-                row = self.themeListWidget.row(item)
-                self.themeListWidget.takeItem(row)
-                self.deleteTheme(theme)
 
     def deleteTheme(self, theme):
         """
@@ -668,7 +636,6 @@ class ThemeManager(QtGui.QWidget):
                         plugin.renameTheme(self.saveThemeName, name)
                 if unicode(self.serviceComboBox.currentText()) == name:
                     editedServiceTheme = True
-                self.deleteTheme(self.saveThemeName)
         if result == QtGui.QMessageBox.Yes:
             # Save the theme, overwriting the existing theme if necessary.
             if imageTo and self.oldBackgroundImage and \
@@ -782,3 +749,50 @@ class ThemeManager(QtGui.QWidget):
         theme.parse(themeXml)
         theme.extend_image_filename(path)
         return theme
+
+    def _validate_theme_action(self, action, testPlugin=True):
+        """
+        Check to see if theme has been selected and the destructive action
+        is allowed.
+        """
+        self.global_theme = unicode(QtCore.QSettings().value(
+            self.settingsSection + u'/global theme',
+            QtCore.QVariant(u'')).toString())
+        if check_item_selected(self.themeListWidget,
+            unicode(translate('OpenLP.ThemeManager',
+            'You must select a theme to %s.')) % action):
+            item = self.themeListWidget.currentItem()
+            theme = unicode(item.text())
+            # confirm deletion
+            answer = QtGui.QMessageBox.question(self,
+                unicode(translate('OpenLP.ThemeManager', '%s Confirmation'))
+                % action,
+                unicode(translate('OpenLP.ThemeManager', '%s %s theme?'))
+                % (action, theme),
+                QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
+                QtGui.QMessageBox.No), QtGui.QMessageBox.No)
+            if answer == QtGui.QMessageBox.No:
+                return False
+            # should be the same unless default
+            if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
+                QtGui.QMessageBox.critical(self,
+                    translate('OpenLP.ThemeManager', 'Error'),
+                    translate('OpenLP.ThemeManager',
+                        'You are unable to delete the default theme.'))
+            else:
+                if testPlugin:
+                    for plugin in self.parent.pluginManager.plugins:
+                        if plugin.usesTheme(theme):
+                            QtGui.QMessageBox.critical(self,
+                                translate('OpenLP.ThemeManager', 'Error'),
+                                unicode(translate('OpenLP.ThemeManager',
+                                    'Theme %s is used in the %s plugin.')) % \
+                                    (theme, plugin.name))
+                            return False
+                if unicode(self.serviceComboBox.currentText()) == theme:
+                    QtGui.QMessageBox.critical(self,
+                        translate('OpenLP.ThemeManager', 'Error'),
+                        unicode(translate('OpenLP.ThemeManager',
+                        'Theme %s is used by the service manager.')) % theme)
+                    return False
+        return True

openlp/plugins/bibles/lib/http.py

@@ -284,6 +284,7 @@ class BSExtract(object):
             if not soup:
                 return None
         Receiver.send_message(u'openlp_process_events')
+        content = None
         try:
             content = soup.find(u'div', u'content').find(u'div').findAll(u'div')
         except:

openlp/plugins/remotes/html/openlp.js

@@ -206,8 +206,12 @@ OpenLP.Namespace.create("OpenLP.Remote", {
     },
     sendLiveSet: function (e)
     {
-        var id = OpenLP.Events.getElement(e).parent().attr("value");
+        var tr = OpenLP.Events.getElement(e).parent();
-        OpenLP.Remote.sendEvent("slidecontroller_live_set", id);
+        if (tr[0].tagName != "TR")
+        {
+            tr = tr.parent();
+        }
+        OpenLP.Remote.sendEvent("slidecontroller_live_set", tr.attr("value"));
         return false;
     },
     sendSetItem: function (e)

openlp/plugins/remotes/remoteplugin.py

@@ -89,5 +89,5 @@ class RemotesPlugin(Plugin):
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('RemotePlugin', 'Remotes')
+            u'title': translate('RemotePlugin', 'Remote')
-        }
+        }

openlp/plugins/songs/forms/editsongdialog.py

@@ -146,8 +146,7 @@ class Ui_EditSongDialog(object):
             self.AuthorsSelectionComboItem.sizePolicy().hasHeightForWidth())
         self.AuthorsSelectionComboItem.setSizePolicy(sizePolicy)
         self.AuthorsSelectionComboItem.setEditable(True)
-        self.AuthorsSelectionComboItem.setInsertPolicy(
+        self.AuthorsSelectionComboItem.setInsertPolicy(QtGui.QComboBox.NoInsert)
-            QtGui.QComboBox.InsertAlphabetically)
         self.AuthorsSelectionComboItem.setSizeAdjustPolicy(
             QtGui.QComboBox.AdjustToMinimumContentsLength)
         self.AuthorsSelectionComboItem.setMinimumContentsLength(8)
@@ -224,6 +223,7 @@ class Ui_EditSongDialog(object):
         sizePolicy.setHeightForWidth(
             self.SongTopicCombo.sizePolicy().hasHeightForWidth())
         self.SongTopicCombo.setEditable(True)
+        self.SongTopicCombo.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.SongTopicCombo.setSizePolicy(sizePolicy)
         self.SongTopicCombo.setObjectName(u'SongTopicCombo')
         self.TopicAddLayout.addWidget(self.SongTopicCombo)
@@ -271,6 +271,7 @@ class Ui_EditSongDialog(object):
         sizePolicy.setHeightForWidth(
             self.SongbookCombo.sizePolicy().hasHeightForWidth())
         self.SongbookCombo.setEditable(True)
+        self.SongbookCombo.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.SongbookCombo.setSizePolicy(sizePolicy)
         self.SongbookCombo.setObjectName(u'SongbookCombo')
         self.SongbookLayout.addRow(self.SongbookNameLabel, self.SongbookCombo)
@@ -315,6 +316,7 @@ class Ui_EditSongDialog(object):
         self.ThemeLayout.setObjectName(u'ThemeLayout')
         self.ThemeSelectionComboItem = QtGui.QComboBox(self.ThemeGroupBox)
         self.ThemeSelectionComboItem.setEditable(True)
+        self.ThemeSelectionComboItem.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.ThemeSelectionComboItem.setObjectName(u'ThemeSelectionComboItem')
         self.ThemeLayout.addWidget(self.ThemeSelectionComboItem)
         self.ThemeAddButton = QtGui.QPushButton(self.ThemeGroupBox)