diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index f0da82b0e..7892a1222 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -43,7 +43,6 @@ class Renderer(object): """ self._rect = None self._debug = False - self._right_margin = 64 # the amount of right indent self._display_shadow_size_footer = 0 self._display_outline_size_footer = 0 self.theme_name = None @@ -149,7 +148,7 @@ class Renderer(object): def pre_render_text(self, text): metrics = QtGui.QFontMetrics(self.mainFont) #work out line width - line_width = self._rect.width() - self._right_margin + line_width = self._rect.width() #number of lines on a page - adjust for rounding up. line_height = metrics.height() if self._theme.display_shadow: @@ -224,6 +223,7 @@ class Renderer(object): ``rect_footer`` The footer text block. """ + log.debug(u'set_text_rectangle %s , %s' %(rect_main, rect_footer) ) self._rect = rect_main self._rect_footer = rect_footer @@ -447,8 +447,7 @@ class Renderer(object): rightextent = x + w # shift right from last line's rh edge if self._theme.display_wrapStyle == 1 and linenum != 0: - rightextent = self._first_line_right_extent + \ - self._right_margin + rightextent = self._first_line_right_extent if rightextent > maxx: rightextent = maxx x = rightextent - w diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index edab3d309..5e9b1c331 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -146,13 +146,13 @@ class RenderManager(object): footer_rect = None if not theme.font_main_override: main_rect = QtCore.QRect(10, 0, - self.width - 1, self.footer_start) + self.width - 20, self.footer_start) else: main_rect = QtCore.QRect(theme.font_main_x, theme.font_main_y, theme.font_main_width - 1, theme.font_main_height - 1) if not theme.font_footer_override: footer_rect = QtCore.QRect(10, self.footer_start, - self.width - 1, self.height - self.footer_start) + self.width - 20, self.height - self.footer_start) else: footer_rect = QtCore.QRect(theme.font_footer_x, theme.font_footer_y, theme.font_footer_width - 1, diff --git a/openlp/core/lib/themexmlhandler.py b/openlp/core/lib/themexmlhandler.py index cbd46d597..1271609a9 100644 --- a/openlp/core/lib/themexmlhandler.py +++ b/openlp/core/lib/themexmlhandler.py @@ -53,7 +53,7 @@ blankthemexml=\ Normal False 0 - + Arial @@ -62,7 +62,7 @@ blankthemexml=\ Normal False 0 - + True diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 510b0ecc7..e59ce2060 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -168,8 +168,7 @@ class MainDisplay(DisplayWidget): self.screen[u'size'].height(), QtGui.QImage.Format_ARGB32_Premultiplied) painter.begin(self.blankFrame) - #TODO make black when testing finished - painter.fillRect(self.blankFrame.rect(), QtCore.Qt.red) + painter.fillRect(self.blankFrame.rect(), QtCore.Qt.black) #build a blank transparent image self.transparent = QtGui.QPixmap(self.screen[u'size'].width(), self.screen[u'size'].height()) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 808c4ad4c..ab2eaf7d8 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -418,7 +418,7 @@ class Ui_MainWindow(object): self.LanguageEnglishItem.setText(self.trUtf8('English')) self.LanguageEnglishItem.setStatusTip( self.trUtf8('Set the interface language to English')) - self.ToolsAddToolItem.setText(self.trUtf8('&Add Tool...')) + self.ToolsAddToolItem.setText(self.trUtf8('Add &Tool...')) self.ToolsAddToolItem.setStatusTip( self.trUtf8('Add an application to the list of tools')) self.action_Preview_Panel.setText(self.trUtf8('&Preview Pane')) @@ -620,6 +620,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.screens.set_current_display(updated_display) self.RenderManager.update_display(updated_display) self.mainDisplay.setup(updated_display) + #Trigger after changes have been made + Receiver.send_message(u'config_updated') self.activateWindow() def closeEvent(self, event): diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index a0a198f2d..cec14fc8c 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -100,6 +100,7 @@ class ServiceManager(QtGui.QWidget): self.parent = parent self.serviceItems = [] self.serviceName = u'' + self.droppos = 0 #is a new service and has not been saved self.isNew = True #Indicates if remoteTriggering is active. If it is the next addServiceItem call @@ -190,6 +191,8 @@ class ServiceManager(QtGui.QWidget): QtCore.SIGNAL(u'presentation types'), self.onPresentationTypes) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_next_item'), self.nextItem) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'config_updated'), self.regenerateServiceItems) # Last little bits of setting up self.config = PluginConfig(u'ServiceManager') self.servicePath = self.config.get_data_path() @@ -216,6 +219,8 @@ class ServiceManager(QtGui.QWidget): def contextMenu(self, point): item = self.ServiceManagerList.itemAt(point) + if item is None: + return if item.parent() is None: pos = item.data(0, QtCore.Qt.UserRole).toInt()[0] else: @@ -472,7 +477,8 @@ class ServiceManager(QtGui.QWidget): log.debug(u'onSaveService') if not quick or self.isNew: filename = QtGui.QFileDialog.getSaveFileName(self, - u'Save Service', self.config.get_last_dir()) + self.trUtf8(u'Save Service'), self.config.get_last_dir(), + self.trUtf8(u'OpenLP Service Files (*.osz)')) else: filename = self.config.get_last_dir() if filename: @@ -511,9 +517,9 @@ class ServiceManager(QtGui.QWidget): os.remove(servicefile) except: pass #if not present do not worry - name = filename.split(os.path.sep) - self.serviceName = name[-1] - self.parent.serviceChanged(True, self.serviceName) + name = filename.split(os.path.sep) + self.serviceName = name[-1] + self.parent.serviceChanged(True, self.serviceName) def onQuickSaveService(self): self.onSaveService(True) @@ -615,7 +621,7 @@ class ServiceManager(QtGui.QWidget): for item in tempServiceItems: self.addServiceItem(item[u'service_item'], False, item[u'expanded']) #Set to False as items may have changed rendering - #does not impact the saved song so True may aslo be valid + #does not impact the saved song so True may also be valid self.parent.serviceChanged(False, self.serviceName) def addServiceItem(self, item, rebuild=False, expand=True): @@ -635,19 +641,21 @@ class ServiceManager(QtGui.QWidget): self.repaintServiceList(sitem + 1, 0) self.parent.LiveController.replaceServiceManagerItem(item) else: - if sitem == -1: + #nothing selected or dnd + if self.droppos == 0: self.serviceItems.append({u'service_item': item, u'order': len(self.serviceItems) + 1, u'expanded':expand}) self.repaintServiceList(len(self.serviceItems) + 1, 0) else: - self.serviceItems.insert(sitem + 1, {u'service_item': item, - u'order': len(self.serviceItems)+1, + self.serviceItems.insert(self.droppos, {u'service_item': item, + u'order': self.droppos, u'expanded':expand}) - self.repaintServiceList(sitem + 1, 0) + self.repaintServiceList(self.droppos, 0) #if rebuilding list make sure live is fixed. if rebuild: self.parent.LiveController.replaceServiceManagerItem(item) + self.droppos = 0 self.parent.serviceChanged(False, self.serviceName) def makePreview(self): @@ -728,18 +736,13 @@ class ServiceManager(QtGui.QWidget): link = event.mimeData() if link.hasText(): plugin = event.mimeData().text() + item = self.ServiceManagerList.itemAt(event.pos()) if plugin == u'ServiceManager': startpos, startCount = self.findServiceItem() - item = self.ServiceManagerList.itemAt(event.pos()) if item is None: endpos = len(self.serviceItems) else: - parentitem = item.parent() - if parentitem is None: - endpos = item.data(0, QtCore.Qt.UserRole).toInt()[0] - else: - endpos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] - endpos -= 1 + endpos = self._getParentItemData(item) - 1 if endpos < startpos: newpos = endpos else: @@ -749,6 +752,10 @@ class ServiceManager(QtGui.QWidget): self.serviceItems.insert(newpos, serviceItem) self.repaintServiceList(endpos, startCount) else: + if item == None: + self.droppos = len(self.serviceItems) + else: + self.droppos = self._getParentItemData(item) Receiver.send_message(u'%s_add_service_item' % plugin) def updateThemeList(self, theme_list): @@ -783,3 +790,10 @@ class ServiceManager(QtGui.QWidget): item, count = self.findServiceItem() self.serviceItems[item][u'service_item'].theme = theme self.regenerateServiceItems() + + def _getParentItemData(self, item): + parentitem = item.parent() + if parentitem is None: + return item.data(0, QtCore.Qt.UserRole).toInt()[0] + else: + return parentitem.data(0, QtCore.Qt.UserRole).toInt()[0] diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 4a3902347..b2db0f567 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -28,7 +28,6 @@ import logging from PyQt4 import QtGui from openlp.core.ui import GeneralTab, ThemesTab -from openlp.core.lib import Receiver from settingsdialog import Ui_SettingsDialog log = logging.getLogger(__name__) @@ -45,7 +44,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): self.ThemesTab = ThemesTab(mainWindow) self.addTab(u'Themes', self.ThemesTab) - def addTab(self, name, tab): + def addTab(self, name, tab): log.info(u'Adding %s tab' % tab.tabTitle) self.SettingsTabWidget.addTab(tab, tab.tabTitleVisible) @@ -65,7 +64,6 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): def accept(self): for tab_index in range(0, self.SettingsTabWidget.count()): self.SettingsTabWidget.widget(tab_index).save() - Receiver.send_message(u'config_updated') return QtGui.QDialog.accept(self) def postSetUp(self): diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 71b12d95d..0af64819a 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -299,6 +299,8 @@ class SlideController(QtGui.QWidget): QtCore.SIGNAL(u'%s_change' % prefix), self.onSlideChange) QtCore.QObject.connect(self.Splitter, QtCore.SIGNAL(u'splitterMoved(int, int)'), self.trackSplitter) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'config_updated'), self.refreshServiceItem) def widthChanged(self): """ @@ -377,6 +379,17 @@ class SlideController(QtGui.QWidget): self.Mediabar.setVisible(True) self.volumeSlider.setAudioOutput(self.audio) + def refreshServiceItem(self): + """ + Method to update the service item if the screen has changed + """ + log.debug(u'refreshServiceItem') + if self.serviceItem: + if self.serviceItem.is_text() or self.serviceItem.is_image(): + item = self.serviceItem + item.render() + self.addServiceManagerItem(item, self.selectedRow) + def addServiceItem(self, item): """ Method to install the service item into the controller diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 5cad41f58..1d8be6499 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -177,20 +177,20 @@ class ThemeManager(QtGui.QWidget): if theme != unicode(item.data(QtCore.Qt.UserRole).toString()): QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('You are unable to delete the default theme!'), + self.trUtf8('You are unable to delete the default theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) else: for plugin in self.parent.plugin_manager.plugins: if not plugin.can_delete_theme(theme): QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('theme %s is use in %s plugin' % (theme, plugin.name)), + self.trUtf8('Theme %s is use in %s plugin' % (theme, plugin.name)), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme: QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('theme %s is use Service Manager' % theme), + self.trUtf8('Theme %s is use by Service Manager' % theme), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return self.themelist.remove(theme) @@ -216,7 +216,7 @@ class ThemeManager(QtGui.QWidget): item = self.ThemeListWidget.currentItem() if item is None: QtGui.QMessageBox.critical(self, self.trUtf8('Error'), - self.trUtf8('You have not selected a theme!'), + self.trUtf8('You have not selected a theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) return theme = unicode(item.data(QtCore.Qt.UserRole).toString()) @@ -359,7 +359,7 @@ class ThemeManager(QtGui.QWidget): except: QtGui.QMessageBox.critical( self, self.trUtf8('Error'), - self.trUtf8('File is not a valid theme!'), + self.trUtf8('File is not a valid theme.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) log.exception(u'Importing theme from zip file failed %s' % filename) finally: diff --git a/openlp/plugins/alerts/forms/alerteditform.py b/openlp/plugins/alerts/forms/alerteditform.py index 62c129508..a88eff4f3 100644 --- a/openlp/plugins/alerts/forms/alerteditform.py +++ b/openlp/plugins/alerts/forms/alerteditform.py @@ -85,7 +85,7 @@ class AlertEditForm(QtGui.QDialog, Ui_AlertEditDialog): if self.AlertLineEdit.text(): QtGui.QMessageBox.information(self, self.trUtf8('Item selected to Edit'), - self.trUtf8('Please Save or Clear seletced item')) + self.trUtf8('Please save or clear selected item')) else: self.EditButton.setEnabled(True) self.DeleteButton.setEnabled(True) diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index bd65b6622..580d2f590 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -93,7 +93,6 @@ class BiblePlugin(Plugin): 'displayed on the screen during the service.') return about_text - def can_delete_theme(self, theme): if self.settings_tab.bible_theme == theme: return False diff --git a/openlp/plugins/bibles/forms/importwizardform.py b/openlp/plugins/bibles/forms/importwizardform.py index d25ad4b4c..422e869eb 100644 --- a/openlp/plugins/bibles/forms/importwizardform.py +++ b/openlp/plugins/bibles/forms/importwizardform.py @@ -111,7 +111,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Bible Location'), self.trUtf8('You need to specify a file to import your ' - 'Bible from!'), + 'Bible from.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OSISLocationEdit.setFocus() return False @@ -120,7 +120,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Books File'), self.trUtf8('You need to specify a file with books of ' - 'the Bible to use in the import!'), + 'the Bible to use in the import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.BooksLocationEdit.setFocus() return False @@ -128,7 +128,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid Verse File'), self.trUtf8('You need to specify a file of Bible ' - 'verses to import!'), + 'verses to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.CsvVerseLocationEdit.setFocus() return False @@ -137,7 +137,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Invalid OpenSong Bible'), self.trUtf8('You need to specify an OpenSong Bible ' - 'file to import!'), + 'file to import.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.OpenSongFileEdit.setFocus() return False @@ -148,7 +148,7 @@ class ImportWizardForm(QtGui.QWizard, Ui_BibleImportWizard): QtGui.QMessageBox.critical(self, self.trUtf8('Empty Version Name'), self.trUtf8('You need to specify a version name for your ' - 'Bible!'), + 'Bible.'), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) self.VersionNameEdit.setFocus() return False diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index d24982532..5fc871abc 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -124,7 +124,8 @@ class BibleManager(object): self.db_cache = {} for filename in files: name, extension = os.path.splitext(filename) - self.db_cache[name] = BibleDB(self.parent, path=self.path, name=name, config=self.config) + self.db_cache[name] = BibleDB(self.parent, path=self.path, + name=name, config=self.config) # look to see if lazy load bible exists and get create getter. source = self.db_cache[name].get_meta(u'download source') if source: diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 30403e69d..c68697017 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -45,6 +45,7 @@ class BibleListView(BaseListWithDnD): def resizeEvent(self, event): self.parent.onListViewResize(event.size().width(), event.size().width()) + class BibleMediaItem(MediaManagerItem): """ This is the custom media manager item for Bibles. @@ -452,14 +453,14 @@ class BibleMediaItem(MediaManagerItem): for item in items: bitem = self.ListView.item(item.row()) reference = bitem.data(QtCore.Qt.UserRole).toPyObject() - bible = unicode(reference[QtCore.QString('bible')]) - book = unicode(reference[QtCore.QString('book')]) - chapter = unicode(reference[QtCore.QString('chapter')]) - verse = unicode(reference[QtCore.QString('verse')]) - text = unicode(reference[QtCore.QString('text')]) - version = unicode(reference[QtCore.QString('version')]) - copyright = unicode(reference[QtCore.QString('copyright')]) - permission = unicode(reference[QtCore.QString('permission')]) + bible = unicode(reference[QtCore.QString('bible')].toPyObject()) + book = unicode(reference[QtCore.QString('book')].toPyObject()) + chapter = unicode(reference[QtCore.QString('chapter')].toPyObject()) + verse = unicode(reference[QtCore.QString('verse')].toPyObject()) + text = unicode(reference[QtCore.QString('text')].toPyObject()) + version = unicode(reference[QtCore.QString('version')].toPyObject()) + copyright = unicode(reference[QtCore.QString('copyright')].toPyObject()) + permission = unicode(reference[QtCore.QString('permission')].toPyObject()) if self.parent.settings_tab.display_style == 1: verse_text = self.formatVerse(old_chapter, chapter, verse, u'(u', u')') elif self.parent.settings_tab.display_style == 2: @@ -563,7 +564,7 @@ class BibleMediaItem(MediaManagerItem): permission = u'' else: permission = permission.value - for count, verse in enumerate(self.search_results): + for count, verse in enumerate(self.search_results): bible_text = u' %s %d:%d (%s)' % \ (verse.book.name, verse.chapter, verse.verse, bible) bible_verse = QtGui.QListWidgetItem(bible_text) diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index 6fa18cf6d..43b9e71a3 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -102,7 +102,7 @@ class OpenSongBible(BibleDB): finally: if file: file.close() - if self.stop_import: + if self.stop_import_flag: self.wizard.incrementProgressBar(u'Import canceled!') return False else: diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index ac5384390..29905a760 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -69,7 +69,7 @@ class CustomPlugin(Plugin): def about(self): about_text = self.trUtf8('Custom Plugin
This plugin ' 'allows slides to be displayed on the screen in the same way ' - 'songs are. This plugin provides greater freedom over the ' + 'songs are. This plugin provides greater freedom over the ' 'songs plugin.
') return about_text diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 75f2fd981..1542faa1e 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -61,7 +61,7 @@ class ImageMediaItem(MediaManagerItem): def retranslateUi(self): self.OnNewPrompt = self.trUtf8('Select Image(s)') self.OnNewFileMasks = \ - self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)') + self.trUtf8('Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)') def requiredIcons(self): MediaManagerItem.requiredIcons(self) @@ -101,7 +101,7 @@ class ImageMediaItem(MediaManagerItem): self.OverrideCheckBox.setChecked(False) self.OverrideCheckBox.setText(self.trUtf8('Override background')) self.OverrideCheckBox.setStatusTip( - self.trUtf8('Allow background of live slide to be overridden')) + self.trUtf8('Allow the background of live slide to be overridden')) self.OverrideLayout.addWidget(self.OverrideCheckBox) self.OverrideLabel = QtGui.QLabel(self.ImageWidget) self.OverrideLabel.setObjectName(u'OverrideLabel') diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index bfb3bcbca..3f33090f6 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -114,6 +114,6 @@ class PresentationPlugin(Plugin): def about(self): about_text = self.trUtf8('Presentation Plugin
Delivers ' 'the ability to show presentations using a number of different ' - 'programs. The choice of available presentation programs is ' + 'programs. The choice of available presentation programs is ' 'available to the user in a drop down box.') return about_text diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index 56eb1954a..9dda0cafc 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -41,8 +41,8 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog): def accept(self): ret = QtGui.QMessageBox.question(self, - self.trUtf8('Delete Selected Audit Events?'), - self.trUtf8('Are you sure you want to delete selected Audit Data?'), + self.trUtf8('Delete Selected Song Usage Events?'), + self.trUtf8('Are you sure you want to delete selected Song Usage data?'), QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.Ok | QtGui.QMessageBox.Cancel), diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index be548ac35..28690d85f 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -81,7 +81,7 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog): instance.copyright, instance.ccl_number , instance.authors) file.write(record) except: - log.exception(u'Failed to write out audit records') + log.exception(u'Failed to write out song usage records') finally: if file: file.close() diff --git a/resources/innosetup/OpenLP-2.0.iss b/resources/innosetup/OpenLP-2.0.iss index 41e9cd84b..b826fa76f 100644 --- a/resources/innosetup/OpenLP-2.0.iss +++ b/resources/innosetup/OpenLP-2.0.iss @@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName} DefaultGroupName=OpenLP 2.0 AllowNoIcons=true LicenseFile=LICENSE.txt -OutputBaseFilename=OpenLP-1.9.0-bzr737-setup +OutputBaseFilename=OpenLP-1.9.0-bzr739-setup Compression=lzma SolidCompression=true SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico