diff --git a/openlp/core/ui/servicenotedialog.py b/openlp/core/ui/servicenotedialog.py index 4044181f5..899db64be 100644 --- a/openlp/core/ui/servicenotedialog.py +++ b/openlp/core/ui/servicenotedialog.py @@ -28,10 +28,10 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate class Ui_ServiceNoteEdit(object): - def setupUi(self, ServiceNoteEdit): - ServiceNoteEdit.setObjectName(u'ServiceNoteEdit') - ServiceNoteEdit.resize(400, 243) - self.widget = QtGui.QWidget(ServiceNoteEdit) + def setupUi(self, serviceNoteEdit): + serviceNoteEdit.setObjectName(u'serviceNoteEdit') + serviceNoteEdit.resize(400, 243) + self.widget = QtGui.QWidget(serviceNoteEdit) self.widget.setGeometry(QtCore.QRect(20, 10, 361, 223)) self.widget.setObjectName(u'widget') self.verticalLayout = QtGui.QVBoxLayout(self.widget) @@ -45,9 +45,9 @@ class Ui_ServiceNoteEdit(object): self.buttonBox.setObjectName(u'buttonBox') self.verticalLayout.addWidget(self.buttonBox) - self.retranslateUi(ServiceNoteEdit) - QtCore.QMetaObject.connectSlotsByName(ServiceNoteEdit) + self.retranslateUi(serviceNoteEdit) + QtCore.QMetaObject.connectSlotsByName(serviceNoteEdit) - def retranslateUi(self, ServiceNoteEdit): - ServiceNoteEdit.setWindowTitle( + def retranslateUi(self, serviceNoteEdit): + serviceNoteEdit.setWindowTitle( translate('OpenLP.ServiceNoteForm', 'Service Item Notes')) diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py index ebe8c2cf1..93b4e6141 100644 --- a/openlp/core/ui/settingsdialog.py +++ b/openlp/core/ui/settingsdialog.py @@ -29,19 +29,19 @@ from PyQt4 import QtCore, QtGui from openlp.core.lib import translate, build_icon class Ui_SettingsDialog(object): - def setupUi(self, SettingsDialog): - SettingsDialog.setObjectName(u'SettingsDialog') - SettingsDialog.resize(724, 502) - SettingsDialog.setWindowIcon( + def setupUi(self, settingsDialog): + settingsDialog.setObjectName(u'settingsDialog') + settingsDialog.resize(724, 502) + settingsDialog.setWindowIcon( build_icon(u':/system/system_settings.png')) - self.settingsLayout = QtGui.QVBoxLayout(SettingsDialog) + self.settingsLayout = QtGui.QVBoxLayout(settingsDialog) self.settingsLayout.setSpacing(8) self.settingsLayout.setMargin(8) self.settingsLayout.setObjectName(u'settingsLayout') - self.settingsTabWidget = QtGui.QTabWidget(SettingsDialog) + self.settingsTabWidget = QtGui.QTabWidget(settingsDialog) self.settingsTabWidget.setObjectName(u'settingsTabWidget') self.settingsLayout.addWidget(self.settingsTabWidget) - self.buttonBox = QtGui.QDialogButtonBox(SettingsDialog) + self.buttonBox = QtGui.QDialogButtonBox(settingsDialog) sizePolicy = QtGui.QSizePolicy( QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) sizePolicy.setHorizontalStretch(0) @@ -55,14 +55,14 @@ class Ui_SettingsDialog(object): QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(u'buttonBox') self.settingsLayout.addWidget(self.buttonBox) - self.retranslateUi(SettingsDialog) + self.retranslateUi(settingsDialog) self.settingsTabWidget.setCurrentIndex(0) QtCore.QObject.connect(self.buttonBox, - QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept) + QtCore.SIGNAL(u'accepted()'), settingsDialog.accept) QtCore.QObject.connect(self.buttonBox, - QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject) - QtCore.QMetaObject.connectSlotsByName(SettingsDialog) + QtCore.SIGNAL(u'rejected()'), settingsDialog.reject) + QtCore.QMetaObject.connectSlotsByName(settingsDialog) - def retranslateUi(self, SettingsDialog): - SettingsDialog.setWindowTitle(translate('OpenLP.SettingsForm', + def retranslateUi(self, settingsDialog): + settingsDialog.setWindowTitle(translate('OpenLP.SettingsForm', 'Configure OpenLP')) diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index fb3881047..5198c0ea4 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -50,70 +50,70 @@ class ThemeManager(QtGui.QWidget): self.parent = parent self.settingsSection = u'themes' self.serviceComboBox = self.parent.ServiceManagerContents.ThemeComboBox - self.Layout = QtGui.QVBoxLayout(self) - self.Layout.setSpacing(0) - self.Layout.setMargin(0) + self.layout = QtGui.QVBoxLayout(self) + self.layout.setSpacing(0) + self.layout.setMargin(0) self.amendThemeForm = AmendThemeForm(self) - self.Toolbar = OpenLPToolbar(self) - self.Toolbar.addToolbarButton( + self.toolbar = OpenLPToolbar(self) + self.toolbar.addToolbarButton( translate('OpenLP.ThemeManager', 'New Theme'), u':/themes/theme_new.png', translate('OpenLP.ThemeManager', 'Create a new theme.'), self.onAddTheme) - self.Toolbar.addToolbarButton( + self.toolbar.addToolbarButton( translate('OpenLP.ThemeManager', 'Edit Theme'), u':/themes/theme_edit.png', translate('OpenLP.ThemeManager', 'Edit a theme.'), self.onEditTheme) - self.Toolbar.addToolbarButton( + self.toolbar.addToolbarButton( translate('OpenLP.ThemeManager', 'Delete Theme'), u':/general/general_delete.png', translate('OpenLP.ThemeManager', 'Delete a theme.'), self.onDeleteTheme) - self.Toolbar.addSeparator() - self.Toolbar.addToolbarButton( + self.toolbar.addSeparator() + self.toolbar.addToolbarButton( translate('OpenLP.ThemeManager', 'Import Theme'), u':/general/general_import.png', translate('OpenLP.ThemeManager', 'Import a theme.'), self.onImportTheme) - self.Toolbar.addToolbarButton( + self.toolbar.addToolbarButton( translate('OpenLP.ThemeManager', 'Export Theme'), u':/general/general_export.png', translate('OpenLP.ThemeManager', 'Export a theme.'), self.onExportTheme) - self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar) - self.Layout.addWidget(self.Toolbar) - self.ThemeListWidget = QtGui.QListWidget(self) - self.ThemeListWidget.setAlternatingRowColors(True) - self.ThemeListWidget.setIconSize(QtCore.QSize(88, 50)) - self.Layout.addWidget(self.ThemeListWidget) - self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) - self.ThemeListWidget.addAction( - context_menu_action(self.ThemeListWidget, + self.themeWidget = QtGui.QWidgetAction(self.toolbar) + self.layout.addWidget(self.toolbar) + self.themeListWidget = QtGui.QListWidget(self) + self.themeListWidget.setAlternatingRowColors(True) + self.themeListWidget.setIconSize(QtCore.QSize(88, 50)) + self.layout.addWidget(self.themeListWidget) + self.themeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) + self.themeListWidget.addAction( + context_menu_action(self.themeListWidget, u':/themes/theme_edit.png', translate('OpenLP.ThemeManager', '&Edit Theme'), self.onEditTheme)) - self.ThemeListWidget.addAction( - context_menu_separator(self.ThemeListWidget)) - self.ThemeListWidget.addAction( - context_menu_action(self.ThemeListWidget, + self.themeListWidget.addAction( + context_menu_separator(self.themeListWidget)) + self.themeListWidget.addAction( + context_menu_action(self.themeListWidget, u':/general/general_delete.png', translate('OpenLP.ThemeManager', '&Delete Theme'), self.onDeleteTheme)) - self.ThemeListWidget.addAction( - context_menu_action(self.ThemeListWidget, + self.themeListWidget.addAction( + context_menu_action(self.themeListWidget, u':/general/general_export.png', translate('OpenLP.ThemeManager', 'Set As &Global Default'), self.changeGlobalFromScreen)) - self.ThemeListWidget.addAction( - context_menu_action(self.ThemeListWidget, + self.themeListWidget.addAction( + context_menu_action(self.themeListWidget, u':/general/general_export.png', translate('OpenLP.ThemeManager', 'E&xport Theme'), self.onExportTheme)) - self.ThemeListWidget.addAction( - context_menu_separator(self.ThemeListWidget)) + self.themeListWidget.addAction( + context_menu_separator(self.themeListWidget)) #Signals - QtCore.QObject.connect(self.ThemeListWidget, + QtCore.QObject.connect(self.themeListWidget, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.changeGlobalFromScreen) QtCore.QObject.connect(Receiver.get_receiver(), @@ -138,18 +138,18 @@ class ThemeManager(QtGui.QWidget): tab """ log.debug(u'changeGlobalFromTab %s', themeName) - for count in range (0, self.ThemeListWidget.count()): + for count in range (0, self.themeListWidget.count()): #reset the old name - item = self.ThemeListWidget.item(count) + item = self.themeListWidget.item(count) oldName = item.text() newName = unicode(item.data(QtCore.Qt.UserRole).toString()) if oldName != newName: - self.ThemeListWidget.item(count).setText(newName) + self.themeListWidget.item(count).setText(newName) #Set the new name if themeName == newName: name = unicode(translate('OpenLP.ThemeManager', '%s (default)')) % newName - self.ThemeListWidget.item(count).setText(name) + self.themeListWidget.item(count).setText(name) def changeGlobalFromScreen(self, index = -1): """ @@ -157,21 +157,21 @@ class ThemeManager(QtGui.QWidget): Theme Manager list """ log.debug(u'changeGlobalFromScreen %s', index) - selected_row = self.ThemeListWidget.currentRow() - for count in range (0, self.ThemeListWidget.count()): - item = self.ThemeListWidget.item(count) + selected_row = self.themeListWidget.currentRow() + for count in range (0, self.themeListWidget.count()): + item = self.themeListWidget.item(count) oldName = item.text() #reset the old name if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()): - self.ThemeListWidget.item(count).setText( + self.themeListWidget.item(count).setText( unicode(item.data(QtCore.Qt.UserRole).toString())) #Set the new name if count == selected_row: self.global_theme = unicode( - self.ThemeListWidget.item(count).text()) + self.themeListWidget.item(count).text()) name = unicode(translate('OpenLP.ThemeManager', '%s (default)')) % self.global_theme - self.ThemeListWidget.item(count).setText(name) + self.themeListWidget.item(count).setText(name) QtCore.QSettings().setValue( self.settingsSection + u'/global theme', QtCore.QVariant(self.global_theme)) @@ -194,10 +194,10 @@ class ThemeManager(QtGui.QWidget): Loads the settings for the theme that is to be edited and launches the theme editing form so the user can make their changes. """ - if check_item_selected(self.ThemeListWidget, + if check_item_selected(self.themeListWidget, translate('OpenLP.ThemeManager', 'You must select a theme to edit.')): - item = self.ThemeListWidget.currentItem() + item = self.themeListWidget.currentItem() themeName = unicode(item.text()) if themeName != unicode(item.data(QtCore.Qt.UserRole).toString()): self.editingDefault = True @@ -217,10 +217,10 @@ class ThemeManager(QtGui.QWidget): self.global_theme = unicode(QtCore.QSettings().value( self.settingsSection + u'/global theme', QtCore.QVariant(u'')).toString()) - if check_item_selected(self.ThemeListWidget, + if check_item_selected(self.themeListWidget, translate('OpenLP.ThemeManager', 'You must select a theme to delete.')): - item = self.ThemeListWidget.currentItem() + item = self.themeListWidget.currentItem() theme = unicode(item.text()) # confirm deletion answer = QtGui.QMessageBox.question(self, @@ -252,8 +252,8 @@ class ThemeManager(QtGui.QWidget): unicode(translate('OpenLP.ThemeManager', 'Theme %s is use by the service manager.')) % theme) return - row = self.ThemeListWidget.row(item) - self.ThemeListWidget.takeItem(row) + row = self.themeListWidget.row(item) + self.themeListWidget.takeItem(row) self.deleteTheme(theme) def deleteTheme(self, theme): @@ -281,7 +281,7 @@ class ThemeManager(QtGui.QWidget): """ Save the theme in a zip file """ - item = self.ThemeListWidget.currentItem() + item = self.themeListWidget.currentItem() if item is None: QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeManager', 'Error'), @@ -346,7 +346,7 @@ class ThemeManager(QtGui.QWidget): """ log.debug(u'Load themes from dir') self.themelist = [] - self.ThemeListWidget.clear() + self.themeListWidget.clear() #root, dirs, files = os.walk(self.path) dirList = os.listdir(self.path) for name in dirList: @@ -371,7 +371,7 @@ class ThemeManager(QtGui.QWidget): item_name.setIcon(icon) item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(textName)) - self.ThemeListWidget.addItem(item_name) + self.themeListWidget.addItem(item_name) self.themelist.append(textName) self.pushThemes() @@ -622,15 +622,15 @@ class ThemeManager(QtGui.QWidget): self.serviceComboBox.setCurrentIndex(newThemeIndex) if self.editingDefault: if self.saveThemeName != name: - newThemeItem = self.ThemeListWidget.findItems(name, + newThemeItem = self.themeListWidget.findItems(name, QtCore.Qt.MatchExactly)[0] - newThemeIndex = self.ThemeListWidget.indexFromItem( + newThemeIndex = self.themeListWidget.indexFromItem( newThemeItem).row() self.global_theme = unicode( - self.ThemeListWidget.item(newThemeIndex).text()) + self.themeListWidget.item(newThemeIndex).text()) newName = unicode(translate('OpenLP.ThemeManager', '%s (default)')) % self.global_theme - self.ThemeListWidget.item(newThemeIndex).setText(newName) + self.themeListWidget.item(newThemeIndex).setText(newName) QtCore.QSettings().setValue( self.settingsSection + u'/global theme', QtCore.QVariant(self.global_theme))