raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ServiceNote, Settings & ThemeManager naming

This commit is contained in:
Jon Tibble 2010-07-27 13:18:10 +01:00
parent 62be523f10
commit c3594624d3
3 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openlp/core/ui/servicenotedialog.py
View File

@ -28,10 +28,10 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate from openlp.core.lib import translate
class Ui_ServiceNoteEdit(object): class Ui_ServiceNoteEdit(object):
def setupUi(self, ServiceNoteEdit): def setupUi(self, serviceNoteEdit):
ServiceNoteEdit.setObjectName(u'ServiceNoteEdit') serviceNoteEdit.setObjectName(u'serviceNoteEdit')
ServiceNoteEdit.resize(400, 243) serviceNoteEdit.resize(400, 243)
self.widget = QtGui.QWidget(ServiceNoteEdit) self.widget = QtGui.QWidget(serviceNoteEdit)
self.widget.setGeometry(QtCore.QRect(20, 10, 361, 223)) self.widget.setGeometry(QtCore.QRect(20, 10, 361, 223))
self.widget.setObjectName(u'widget') self.widget.setObjectName(u'widget')
self.verticalLayout = QtGui.QVBoxLayout(self.widget) self.verticalLayout = QtGui.QVBoxLayout(self.widget)
@ -45,9 +45,9 @@ class Ui_ServiceNoteEdit(object):
self.buttonBox.setObjectName(u'buttonBox') self.buttonBox.setObjectName(u'buttonBox')
self.verticalLayout.addWidget(self.buttonBox) self.verticalLayout.addWidget(self.buttonBox)
self.retranslateUi(ServiceNoteEdit) self.retranslateUi(serviceNoteEdit)
QtCore.QMetaObject.connectSlotsByName(ServiceNoteEdit) QtCore.QMetaObject.connectSlotsByName(serviceNoteEdit)
def retranslateUi(self, ServiceNoteEdit): def retranslateUi(self, serviceNoteEdit):
ServiceNoteEdit.setWindowTitle( serviceNoteEdit.setWindowTitle(
translate('OpenLP.ServiceNoteForm', 'Service Item Notes')) translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))

26
openlp/core/ui/settingsdialog.py
View File

@ -29,19 +29,19 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate, build_icon from openlp.core.lib import translate, build_icon
class Ui_SettingsDialog(object): class Ui_SettingsDialog(object):
def setupUi(self, SettingsDialog): def setupUi(self, settingsDialog):
SettingsDialog.setObjectName(u'SettingsDialog') settingsDialog.setObjectName(u'settingsDialog')
SettingsDialog.resize(724, 502) settingsDialog.resize(724, 502)
SettingsDialog.setWindowIcon( settingsDialog.setWindowIcon(
build_icon(u':/system/system_settings.png')) build_icon(u':/system/system_settings.png'))
self.settingsLayout = QtGui.QVBoxLayout(SettingsDialog) self.settingsLayout = QtGui.QVBoxLayout(settingsDialog)
self.settingsLayout.setSpacing(8) self.settingsLayout.setSpacing(8)
self.settingsLayout.setMargin(8) self.settingsLayout.setMargin(8)
self.settingsLayout.setObjectName(u'settingsLayout') self.settingsLayout.setObjectName(u'settingsLayout')
self.settingsTabWidget = QtGui.QTabWidget(SettingsDialog) self.settingsTabWidget = QtGui.QTabWidget(settingsDialog)
self.settingsTabWidget.setObjectName(u'settingsTabWidget') self.settingsTabWidget.setObjectName(u'settingsTabWidget')
self.settingsLayout.addWidget(self.settingsTabWidget) self.settingsLayout.addWidget(self.settingsTabWidget)
self.buttonBox = QtGui.QDialogButtonBox(SettingsDialog) self.buttonBox = QtGui.QDialogButtonBox(settingsDialog)
sizePolicy = QtGui.QSizePolicy( sizePolicy = QtGui.QSizePolicy(
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
sizePolicy.setHorizontalStretch(0) sizePolicy.setHorizontalStretch(0)
@ -55,14 +55,14 @@ class Ui_SettingsDialog(object):
QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok) QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok)
self.buttonBox.setObjectName(u'buttonBox') self.buttonBox.setObjectName(u'buttonBox')
self.settingsLayout.addWidget(self.buttonBox) self.settingsLayout.addWidget(self.buttonBox)
self.retranslateUi(SettingsDialog) self.retranslateUi(settingsDialog)
self.settingsTabWidget.setCurrentIndex(0) self.settingsTabWidget.setCurrentIndex(0)
QtCore.QObject.connect(self.buttonBox, QtCore.QObject.connect(self.buttonBox,
QtCore.SIGNAL(u'accepted()'), SettingsDialog.accept) QtCore.SIGNAL(u'accepted()'), settingsDialog.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.QObject.connect(self.buttonBox,
QtCore.SIGNAL(u'rejected()'), SettingsDialog.reject) QtCore.SIGNAL(u'rejected()'), settingsDialog.reject)
QtCore.QMetaObject.connectSlotsByName(SettingsDialog) QtCore.QMetaObject.connectSlotsByName(settingsDialog)
def retranslateUi(self, SettingsDialog): def retranslateUi(self, settingsDialog):
SettingsDialog.setWindowTitle(translate('OpenLP.SettingsForm', settingsDialog.setWindowTitle(translate('OpenLP.SettingsForm',
'Configure OpenLP')) 'Configure OpenLP'))

106
openlp/core/ui/thememanager.py
View File

@ -50,70 +50,70 @@ class ThemeManager(QtGui.QWidget):
self.parent = parent self.parent = parent
self.settingsSection = u'themes' self.settingsSection = u'themes'
self.serviceComboBox = self.parent.ServiceManagerContents.ThemeComboBox self.serviceComboBox = self.parent.ServiceManagerContents.ThemeComboBox
self.Layout = QtGui.QVBoxLayout(self) self.layout = QtGui.QVBoxLayout(self)
self.Layout.setSpacing(0) self.layout.setSpacing(0)
self.Layout.setMargin(0) self.layout.setMargin(0)
self.amendThemeForm = AmendThemeForm(self) self.amendThemeForm = AmendThemeForm(self)
self.Toolbar = OpenLPToolbar(self) self.toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton( self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'New Theme'), translate('OpenLP.ThemeManager', 'New Theme'),
u':/themes/theme_new.png', u':/themes/theme_new.png',
translate('OpenLP.ThemeManager', 'Create a new theme.'), translate('OpenLP.ThemeManager', 'Create a new theme.'),
self.onAddTheme) self.onAddTheme)
self.Toolbar.addToolbarButton( self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Edit Theme'), translate('OpenLP.ThemeManager', 'Edit Theme'),
u':/themes/theme_edit.png', u':/themes/theme_edit.png',
translate('OpenLP.ThemeManager', 'Edit a theme.'), translate('OpenLP.ThemeManager', 'Edit a theme.'),
self.onEditTheme) self.onEditTheme)
self.Toolbar.addToolbarButton( self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Delete Theme'), translate('OpenLP.ThemeManager', 'Delete Theme'),
u':/general/general_delete.png', u':/general/general_delete.png',
translate('OpenLP.ThemeManager', 'Delete a theme.'), translate('OpenLP.ThemeManager', 'Delete a theme.'),
self.onDeleteTheme) self.onDeleteTheme)
self.Toolbar.addSeparator() self.toolbar.addSeparator()
self.Toolbar.addToolbarButton( self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Import Theme'), translate('OpenLP.ThemeManager', 'Import Theme'),
u':/general/general_import.png', u':/general/general_import.png',
translate('OpenLP.ThemeManager', 'Import a theme.'), translate('OpenLP.ThemeManager', 'Import a theme.'),
self.onImportTheme) self.onImportTheme)
self.Toolbar.addToolbarButton( self.toolbar.addToolbarButton(
translate('OpenLP.ThemeManager', 'Export Theme'), translate('OpenLP.ThemeManager', 'Export Theme'),
u':/general/general_export.png', u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'Export a theme.'), translate('OpenLP.ThemeManager', 'Export a theme.'),
self.onExportTheme) self.onExportTheme)
self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar) self.themeWidget = QtGui.QWidgetAction(self.toolbar)
self.Layout.addWidget(self.Toolbar) self.layout.addWidget(self.toolbar)
self.ThemeListWidget = QtGui.QListWidget(self) self.themeListWidget = QtGui.QListWidget(self)
self.ThemeListWidget.setAlternatingRowColors(True) self.themeListWidget.setAlternatingRowColors(True)
self.ThemeListWidget.setIconSize(QtCore.QSize(88, 50)) self.themeListWidget.setIconSize(QtCore.QSize(88, 50))
self.Layout.addWidget(self.ThemeListWidget) self.layout.addWidget(self.themeListWidget)
self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.themeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_action(self.ThemeListWidget, context_menu_action(self.themeListWidget,
u':/themes/theme_edit.png', u':/themes/theme_edit.png',
translate('OpenLP.ThemeManager', '&Edit Theme'), translate('OpenLP.ThemeManager', '&Edit Theme'),
self.onEditTheme)) self.onEditTheme))
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_separator(self.ThemeListWidget)) context_menu_separator(self.themeListWidget))
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_action(self.ThemeListWidget, context_menu_action(self.themeListWidget,
u':/general/general_delete.png', u':/general/general_delete.png',
translate('OpenLP.ThemeManager', '&Delete Theme'), translate('OpenLP.ThemeManager', '&Delete Theme'),
self.onDeleteTheme)) self.onDeleteTheme))
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_action(self.ThemeListWidget, context_menu_action(self.themeListWidget,
u':/general/general_export.png', u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'Set As &Global Default'), translate('OpenLP.ThemeManager', 'Set As &Global Default'),
self.changeGlobalFromScreen)) self.changeGlobalFromScreen))
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_action(self.ThemeListWidget, context_menu_action(self.themeListWidget,
u':/general/general_export.png', u':/general/general_export.png',
translate('OpenLP.ThemeManager', 'E&xport Theme'), translate('OpenLP.ThemeManager', 'E&xport Theme'),
self.onExportTheme)) self.onExportTheme))
self.ThemeListWidget.addAction( self.themeListWidget.addAction(
context_menu_separator(self.ThemeListWidget)) context_menu_separator(self.themeListWidget))
#Signals #Signals
QtCore.QObject.connect(self.ThemeListWidget, QtCore.QObject.connect(self.themeListWidget,
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.changeGlobalFromScreen) self.changeGlobalFromScreen)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
@ -138,18 +138,18 @@ class ThemeManager(QtGui.QWidget):
tab tab
""" """
log.debug(u'changeGlobalFromTab %s', themeName) 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 #reset the old name
item = self.ThemeListWidget.item(count) item = self.themeListWidget.item(count)
oldName = item.text() oldName = item.text()
newName = unicode(item.data(QtCore.Qt.UserRole).toString()) newName = unicode(item.data(QtCore.Qt.UserRole).toString())
if oldName != newName: if oldName != newName:
self.ThemeListWidget.item(count).setText(newName) self.themeListWidget.item(count).setText(newName)
#Set the new name #Set the new name
if themeName == newName: if themeName == newName:
name = unicode(translate('OpenLP.ThemeManager', name = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % newName '%s (default)')) % newName
self.ThemeListWidget.item(count).setText(name) self.themeListWidget.item(count).setText(name)
def changeGlobalFromScreen(self, index = -1): def changeGlobalFromScreen(self, index = -1):
""" """
@ -157,21 +157,21 @@ class ThemeManager(QtGui.QWidget):
Theme Manager list Theme Manager list
""" """
log.debug(u'changeGlobalFromScreen %s', index) log.debug(u'changeGlobalFromScreen %s', index)
selected_row = self.ThemeListWidget.currentRow() selected_row = self.themeListWidget.currentRow()
for count in range (0, self.ThemeListWidget.count()): for count in range (0, self.themeListWidget.count()):
item = self.ThemeListWidget.item(count) item = self.themeListWidget.item(count)
oldName = item.text() oldName = item.text()
#reset the old name #reset the old name
if oldName != unicode(item.data(QtCore.Qt.UserRole).toString()): 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())) unicode(item.data(QtCore.Qt.UserRole).toString()))
#Set the new name #Set the new name
if count == selected_row: if count == selected_row:
self.global_theme = unicode( self.global_theme = unicode(
self.ThemeListWidget.item(count).text()) self.themeListWidget.item(count).text())
name = unicode(translate('OpenLP.ThemeManager', name = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % self.global_theme '%s (default)')) % self.global_theme
self.ThemeListWidget.item(count).setText(name) self.themeListWidget.item(count).setText(name)
QtCore.QSettings().setValue( QtCore.QSettings().setValue(
self.settingsSection + u'/global theme', self.settingsSection + u'/global theme',
QtCore.QVariant(self.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 Loads the settings for the theme that is to be edited and launches the
theme editing form so the user can make their changes. 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', translate('OpenLP.ThemeManager',
'You must select a theme to edit.')): 'You must select a theme to edit.')):
item = self.ThemeListWidget.currentItem() item = self.themeListWidget.currentItem()
themeName = unicode(item.text()) themeName = unicode(item.text())
if themeName != unicode(item.data(QtCore.Qt.UserRole).toString()): if themeName != unicode(item.data(QtCore.Qt.UserRole).toString()):
self.editingDefault = True self.editingDefault = True
@ -217,10 +217,10 @@ class ThemeManager(QtGui.QWidget):
self.global_theme = unicode(QtCore.QSettings().value( self.global_theme = unicode(QtCore.QSettings().value(
self.settingsSection + u'/global theme', self.settingsSection + u'/global theme',
QtCore.QVariant(u'')).toString()) QtCore.QVariant(u'')).toString())
if check_item_selected(self.ThemeListWidget, if check_item_selected(self.themeListWidget,
translate('OpenLP.ThemeManager', translate('OpenLP.ThemeManager',
'You must select a theme to delete.')): 'You must select a theme to delete.')):
item = self.ThemeListWidget.currentItem() item = self.themeListWidget.currentItem()
theme = unicode(item.text()) theme = unicode(item.text())
# confirm deletion # confirm deletion
answer = QtGui.QMessageBox.question(self, answer = QtGui.QMessageBox.question(self,
@ -252,8 +252,8 @@ class ThemeManager(QtGui.QWidget):
unicode(translate('OpenLP.ThemeManager', unicode(translate('OpenLP.ThemeManager',
'Theme %s is use by the service manager.')) % theme) 'Theme %s is use by the service manager.')) % theme)
return return
row = self.ThemeListWidget.row(item) row = self.themeListWidget.row(item)
self.ThemeListWidget.takeItem(row) self.themeListWidget.takeItem(row)
self.deleteTheme(theme) self.deleteTheme(theme)
def deleteTheme(self, theme): def deleteTheme(self, theme):
@ -281,7 +281,7 @@ class ThemeManager(QtGui.QWidget):
""" """
Save the theme in a zip file Save the theme in a zip file
""" """
item = self.ThemeListWidget.currentItem() item = self.themeListWidget.currentItem()
if item is None: if item is None:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate('OpenLP.ThemeManager', 'Error'), translate('OpenLP.ThemeManager', 'Error'),
@ -346,7 +346,7 @@ class ThemeManager(QtGui.QWidget):
""" """
log.debug(u'Load themes from dir') log.debug(u'Load themes from dir')
self.themelist = [] self.themelist = []
self.ThemeListWidget.clear() self.themeListWidget.clear()
#root, dirs, files = os.walk(self.path) #root, dirs, files = os.walk(self.path)
dirList = os.listdir(self.path) dirList = os.listdir(self.path)
for name in dirList: for name in dirList:
@ -371,7 +371,7 @@ class ThemeManager(QtGui.QWidget):
item_name.setIcon(icon) item_name.setIcon(icon)
item_name.setData(QtCore.Qt.UserRole, item_name.setData(QtCore.Qt.UserRole,
QtCore.QVariant(textName)) QtCore.QVariant(textName))
self.ThemeListWidget.addItem(item_name) self.themeListWidget.addItem(item_name)
self.themelist.append(textName) self.themelist.append(textName)
self.pushThemes() self.pushThemes()
@ -622,15 +622,15 @@ class ThemeManager(QtGui.QWidget):
self.serviceComboBox.setCurrentIndex(newThemeIndex) self.serviceComboBox.setCurrentIndex(newThemeIndex)
if self.editingDefault: if self.editingDefault:
if self.saveThemeName != name: if self.saveThemeName != name:
newThemeItem = self.ThemeListWidget.findItems(name, newThemeItem = self.themeListWidget.findItems(name,
QtCore.Qt.MatchExactly)[0] QtCore.Qt.MatchExactly)[0]
newThemeIndex = self.ThemeListWidget.indexFromItem( newThemeIndex = self.themeListWidget.indexFromItem(
newThemeItem).row() newThemeItem).row()
self.global_theme = unicode( self.global_theme = unicode(
self.ThemeListWidget.item(newThemeIndex).text()) self.themeListWidget.item(newThemeIndex).text())
newName = unicode(translate('OpenLP.ThemeManager', newName = unicode(translate('OpenLP.ThemeManager',
'%s (default)')) % self.global_theme '%s (default)')) % self.global_theme
self.ThemeListWidget.item(newThemeIndex).setText(newName) self.themeListWidget.item(newThemeIndex).setText(newName)
QtCore.QSettings().setValue( QtCore.QSettings().setValue(
self.settingsSection + u'/global theme', self.settingsSection + u'/global theme',
QtCore.QVariant(self.global_theme)) QtCore.QVariant(self.global_theme))