From 8838e9563eab69ac44925f9b5aad69f03ba8757c Mon Sep 17 00:00:00 2001 From: Jon Tibble Date: Wed, 28 Jul 2010 14:36:29 +0100 Subject: [PATCH] Naming cleanup fixes --- openlp/core/ui/mainwindow.py | 6 +++--- openlp/core/ui/thememanager.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index cbbe7f5bd..1730e02d8 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -220,17 +220,17 @@ class Ui_MainWindow(object): # Create the menu items self.FileNewItem = QtGui.QAction(MainWindow) self.FileNewItem.setIcon( - self.ServiceManagerContents.Toolbar.getIconFromTitle( + self.ServiceManagerContents.toolbar.getIconFromTitle( u'New Service')) self.FileNewItem.setObjectName(u'FileNewItem') self.FileOpenItem = QtGui.QAction(MainWindow) self.FileOpenItem.setIcon( - self.ServiceManagerContents.Toolbar.getIconFromTitle( + self.ServiceManagerContents.toolbar.getIconFromTitle( u'Open Service')) self.FileOpenItem.setObjectName(u'FileOpenItem') self.FileSaveItem = QtGui.QAction(MainWindow) self.FileSaveItem.setIcon( - self.ServiceManagerContents.Toolbar.getIconFromTitle( + self.ServiceManagerContents.toolbar.getIconFromTitle( u'Save Service')) self.FileSaveItem.setObjectName(u'FileSaveItem') self.FileSaveAsItem = QtGui.QAction(MainWindow) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 5198c0ea4..760d8b059 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -49,7 +49,7 @@ class ThemeManager(QtGui.QWidget): QtGui.QWidget.__init__(self, parent) self.parent = parent self.settingsSection = u'themes' - self.serviceComboBox = self.parent.ServiceManagerContents.ThemeComboBox + self.serviceComboBox = self.parent.ServiceManagerContents.themeComboBox self.layout = QtGui.QVBoxLayout(self) self.layout.setSpacing(0) self.layout.setMargin(0)