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

Added unicon symbol to all arguments in the translate() function. And fixed missing "spaces" and other smal error regarding the coding standar

This commit is contained in:
Frode Woldsund 2010-06-06 11:52:11 +02:00
parent 3be909c5c0
commit e88c05bd58
10 changed files with 317 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/ui/aboutform.py
View File

@ -44,7 +44,7 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
about_text = about_text.replace(u'<version>', about_text = about_text.replace(u'<version>',
self.applicationVersion[u'version']) self.applicationVersion[u'version'])
if self.applicationVersion[u'build']: if self.applicationVersion[u'build']:
build_text = u' %s %s' % (translate('AboutForm','build'), build_text = u' %s %s' % (translate(u'AboutForm', u'build'),
self.applicationVersion[u'build']) self.applicationVersion[u'build'])
else: else:
build_text = u'' build_text = u''

12
openlp/core/ui/amendthemeform.py
View File

@ -210,8 +210,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
def onImageToolButtonClicked(self): def onImageToolButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName( filename = QtGui.QFileDialog.getOpenFileName(
self, translate('AmendThemeForm',u'Open file')) self, translate(u'AmendThemeForm', u'Open file'))
if filename: if filename:0
self.ImageLineEdit.setText(filename) self.ImageLineEdit.setText(filename)
self.theme.background_filename = filename self.theme.background_filename = filename
self.previewTheme() self.previewTheme()
@ -629,7 +629,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
if theme.background_type == u'solid': if theme.background_type == u'solid':
self.Color1PushButton.setStyleSheet( self.Color1PushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.background_color)) u'background-color: %s' % unicode(theme.background_color))
self.Color1Label.setText(translate('AmendThemeForm','Background Color:')) self.Color1Label.setText(translate(u'AmendThemeForm', u'Background Color:'))
self.Color1Label.setVisible(True) self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True) self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(False) self.Color2Label.setVisible(False)
@ -644,8 +644,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
% unicode(theme.background_startColor)) % unicode(theme.background_startColor))
self.Color2PushButton.setStyleSheet(u'background-color: %s' \ self.Color2PushButton.setStyleSheet(u'background-color: %s' \
% unicode(theme.background_endColor)) % unicode(theme.background_endColor))
self.Color1Label.setText(translate('AmendThemeForm','First Color:')) self.Color1Label.setText(translate(u'AmendThemeForm', u'First Color:'))
self.Color2Label.setText(translate('AmendThemeForm','Second Color:')) self.Color2Label.setText(translate(u'AmendThemeForm', u'Second Color:'))
self.Color1Label.setVisible(True) self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True) self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(True) self.Color2Label.setVisible(True)
@ -713,7 +713,7 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
log.debug(u'Page Length area height %s, metrics %s, lines %s' % log.debug(u'Page Length area height %s, metrics %s, lines %s' %
(self.FontMainHeightSpinBox.value(), metrics.height(), (self.FontMainHeightSpinBox.value(), metrics.height(),
page_length)) page_length))
page_length_text = unicode(translate('AmendThemeForm','Slide Height is %s rows')) page_length_text = unicode(translate(u'AmendThemeForm', u'Slide Height is %s rows'))
self.FontMainLinesPageLabel.setText(page_length_text % page_length) self.FontMainLinesPageLabel.setText(page_length_text % page_length)
frame = self.thememanager.generateImage(self.theme) frame = self.thememanager.generateImage(self.theme)
self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame)) self.ThemePreview.setPixmap(QtGui.QPixmap.fromImage(frame))

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

@ -39,7 +39,7 @@ class DisplayTab(SettingsTab):
SettingsTab.__init__(self, u'Display') SettingsTab.__init__(self, u'Display')
def setupUi(self): def setupUi(self):
self.tabTitleVisible = translate('DisplayTab','Displays') self.tabTitleVisible = translate(u'DisplayTab', u'Displays')
self.layoutWidget = QtGui.QWidget(self) self.layoutWidget = QtGui.QWidget(self)
self.layoutWidget.setGeometry(QtCore.QRect(0, 40, 241, 79)) self.layoutWidget.setGeometry(QtCore.QRect(0, 40, 241, 79))
self.layoutWidget.setObjectName(u'layoutWidget') self.layoutWidget.setObjectName(u'layoutWidget')
@ -159,22 +159,22 @@ class DisplayTab(SettingsTab):
self.onOverrideCheckBoxChanged) self.onOverrideCheckBoxChanged)
def retranslateUi(self): def retranslateUi(self):
self.setWindowTitle( translate('DisplayTab',u'Amend Display Settings')) self.setWindowTitle(translate(u'DisplayTab', u'Amend Display Settings'))
self.CurrentGroupBox.setTitle( translate('DisplayTab',u'Default Settings')) self.CurrentGroupBox.setTitle(translate(u'DisplayTab', u'Default Settings'))
self.XLabel.setText(translate('DisplayTab',u'X')) self.XLabel.setText(translate(u'DisplayTab', u'X'))
self.Xpos.setText(u'0') self.Xpos.setText(u'0')
self.YLabel.setText( translate('DisplayTab',u'Y')) self.YLabel.setText(translate(u'DisplayTab', u'Y'))
self.Ypos.setText(u'0') self.Ypos.setText(u'0')
self.HeightLabel.setText( translate('DisplayTab',u'Height')) self.HeightLabel.setText(translate(u'DisplayTab', u'Height'))
self.Height.setText(u'0') self.Height.setText(u'0')
self.WidthLabel.setText( translate('DisplayTab',u'Width')) self.WidthLabel.setText(translate(u'DisplayTab', u'Width'))
self.Width.setText(u'0') self.Width.setText(u'0')
self.CurrentGroupBox_2.setTitle( translate('DisplayTab',u'Amend Settings')) self.CurrentGroupBox_2.setTitle(translate(u'DisplayTab', u'Amend Settings'))
self.XAmendLabel.setText( translate('DisplayTab',u'X')) self.XAmendLabel.setText(translate(u'DisplayTab', u'X'))
self.YAmendLabel.setText( translate('DisplayTab',u'Y')) self.YAmendLabel.setText(translate(u'DisplayTab', u'Y'))
self.HeightAmendLabel.setText( translate('DisplayTab',u'Height')) self.HeightAmendLabel.setText(translate(u'DisplayTab', u'Height'))
self.WidthAmendLabel.setText( translate('DisplayTab',u'Width')) self.WidthAmendLabel.setText(translate(u'DisplayTab', u'Width'))
self.OverrideCheckBox.setText( translate('DisplayTab',u'Override Output Display')) self.OverrideCheckBox.setText(translate(u'DisplayTab', u'Override Output Display'))
def load(self): def load(self):
settings = QtCore.QSettings() settings = QtCore.QSettings()

42
openlp/core/ui/generaltab.py
View File

@ -54,7 +54,7 @@ class GeneralTab(SettingsTab):
def setupUi(self): def setupUi(self):
self.setObjectName(u'GeneralTab') self.setObjectName(u'GeneralTab')
self.tabTitleVisible = translate('GeneralTab','General') self.tabTitleVisible = translate(u'GeneralTab', u'General')
self.GeneralLayout = QtGui.QHBoxLayout(self) self.GeneralLayout = QtGui.QHBoxLayout(self)
self.GeneralLayout.setSpacing(8) self.GeneralLayout.setSpacing(8)
self.GeneralLayout.setMargin(8) self.GeneralLayout.setMargin(8)
@ -177,25 +177,32 @@ class GeneralTab(SettingsTab):
QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus) QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus)
def retranslateUi(self): def retranslateUi(self):
self.MonitorGroupBox.setTitle(translate('GeneralTab','Monitors')) self.MonitorGroupBox.setTitle(translate(u'GeneralTab', u'Monitors'))
self.MonitorLabel.setText( self.MonitorLabel.setText(
translate('GeneralTab','Select monitor for output display:')) translate(u'GeneralTab', u'Select monitor for output display:'))
self.DisplayOnMonitorCheck.setText( self.DisplayOnMonitorCheck.setText(
translate('GeneralTab','Display if a single screen')) translate(u'GeneralTab', u'Display if a single screen'))
self.StartupGroupBox.setTitle(translate('GeneralTab','Application Startup')) self.StartupGroupBox.setTitle(
self.WarningCheckBox.setText(translate('GeneralTab','Show blank screen warning')) translate(u'GeneralTab', u'Application Startup'))
self.WarningCheckBox.setText(
translate(u'GeneralTab', u'Show blank screen warning'))
self.AutoOpenCheckBox.setText( self.AutoOpenCheckBox.setText(
translate('GeneralTab','Automatically open the last service')) translate(u'GeneralTab', u'Automatically open the last service'))
self.ShowSplashCheckBox.setText(translate('GeneralTab','Show the splash screen')) self.ShowSplashCheckBox.setText(
self.SettingsGroupBox.setTitle(translate('GeneralTab','Application Settings')) translate(u'GeneralTab', u'Show the splash screen'))
self.SettingsGroupBox.setTitle(
translate(u'GeneralTab', u'Application Settings'))
self.SaveCheckServiceCheckBox.setText( self.SaveCheckServiceCheckBox.setText(
translate('GeneralTab','Prompt to save Service before starting New')) translate(u'GeneralTab',
u'Prompt to save Service before starting New'))
self.AutoPreviewCheckBox.setText( self.AutoPreviewCheckBox.setText(
translate('GeneralTab','Preview Next Song from Service Manager')) translate(u'GeneralTab', u'Preview Next Song from Service Manager'))
self.CCLIGroupBox.setTitle(translate('GeneralTab','CCLI Details')) self.CCLIGroupBox.setTitle(translate(u'GeneralTab', u'CCLI Details'))
self.NumberLabel.setText(translate('GeneralTab','CCLI Number:')) self.NumberLabel.setText(translate(u'GeneralTab', u'CCLI Number:'))
self.UsernameLabel.setText(translate('GeneralTab','SongSelect Username:')) self.UsernameLabel.setText(
self.PasswordLabel.setText(translate('GeneralTab','SongSelect Password:')) translate(u'GeneralTab', u'SongSelect Username:'))
self.PasswordLabel.setText(
translate(u'GeneralTab', u'SongSelect Password:'))
def onMonitorComboBoxChanged(self): def onMonitorComboBoxChanged(self):
self.MonitorNumber = self.MonitorComboBox.currentIndex() self.MonitorNumber = self.MonitorComboBox.currentIndex()
@ -231,10 +238,11 @@ class GeneralTab(SettingsTab):
settings = QtCore.QSettings() settings = QtCore.QSettings()
settings.beginGroup(self.settingsSection) settings.beginGroup(self.settingsSection)
for screen in self.screens.screen_list: for screen in self.screens.screen_list:
screen_name = u'%s %d' % (translate('GeneralTab','Screen'), screen_name = u'%s %d' % (translate(u'GeneralTab', u'Screen'),
screen[u'number'] + 1) screen[u'number'] + 1)
if screen[u'primary']: if screen[u'primary']:
screen_name = u'%s (%s)' % (screen_name, translate('GeneralTab','primary')) screen_name = u'%s (%s)' % (screen_name,
translate(u'GeneralTab', u'primary'))
self.MonitorComboBox.addItem(screen_name) self.MonitorComboBox.addItem(screen_name)
# Get the configs # Get the configs
self.Warning = settings.value( self.Warning = settings.value(

183
openlp/core/ui/mainwindow.py
View File

@ -33,7 +33,8 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \
ThemeManager, SlideController, PluginForm, MediaDockManager, DisplayManager ThemeManager, SlideController, PluginForm, MediaDockManager, DisplayManager
from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \ from openlp.core.lib import RenderManager, build_icon, OpenLPDockWidget, \
SettingsManager, PluginManager, Receiver, translate SettingsManager, PluginManager, Receiver, translate
from openlp.core.utils import check_latest_version, AppLocation, add_actions, LanguageManager from openlp.core.utils import check_latest_version, AppLocation, add_actions, \
LanguageManager
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -352,111 +353,113 @@ class Ui_MainWindow(object):
""" """
Set up the translation system Set up the translation system
""" """
MainWindow.mainTitle = translate('MainWindow', 'OpenLP 2.0') MainWindow.mainTitle = translate(u'MainWindow', u'OpenLP 2.0')
MainWindow.language = translate('MainWindow', 'English') MainWindow.language = translate(u'MainWindow', u'English')
MainWindow.defaultThemeText = translate('MainWindow', MainWindow.defaultThemeText = translate(u'MainWindow',
'Default Theme: ') u'Default Theme: ')
MainWindow.setWindowTitle(MainWindow.mainTitle) MainWindow.setWindowTitle(MainWindow.mainTitle)
self.FileMenu.setTitle(translate('MainWindow', '&File')) self.FileMenu.setTitle(translate(u'MainWindow', u'&File'))
self.FileImportMenu.setTitle(translate('MainWindow', '&Import')) self.FileImportMenu.setTitle(translate(u'MainWindow', u'&Import'))
self.FileExportMenu.setTitle(translate('MainWindow', '&Export')) self.FileExportMenu.setTitle(translate(u'MainWindow', u'&Export'))
self.OptionsMenu.setTitle(translate('MainWindow', '&Options')) self.OptionsMenu.setTitle(translate(u'MainWindow', u'&Options'))
self.OptionsViewMenu.setTitle(translate('MainWindow', '&View')) self.OptionsViewMenu.setTitle(translate(u'MainWindow', u'&View'))
self.ViewModeMenu.setTitle(translate('MainWindow', 'M&ode')) self.ViewModeMenu.setTitle(translate(u'MainWindow', u'M&ode'))
self.OptionsLanguageMenu.setTitle(translate('MainWindow', self.OptionsLanguageMenu.setTitle(translate(u'MainWindow',
u'&Language')) u'&Language'))
self.ToolsMenu.setTitle(translate('MainWindow', '&Tools')) self.ToolsMenu.setTitle(translate(u'MainWindow', u'&Tools'))
self.HelpMenu.setTitle(translate('MainWindow', '&Help')) self.HelpMenu.setTitle(translate(u'MainWindow', u'&Help'))
self.MediaManagerDock.setWindowTitle( self.MediaManagerDock.setWindowTitle(
translate('MainWindow', 'Media Manager')) translate(u'MainWindow', u'Media Manager'))
self.ServiceManagerDock.setWindowTitle( self.ServiceManagerDock.setWindowTitle(
translate('MainWindow', 'Service Manager')) translate(u'MainWindow', u'Service Manager'))
self.ThemeManagerDock.setWindowTitle( self.ThemeManagerDock.setWindowTitle(
translate('MainWindow', 'Theme Manager')) translate(u'MainWindow', u'Theme Manager'))
self.FileNewItem.setText(translate('MainWindow', '&New')) self.FileNewItem.setText(translate(u'MainWindow', u'&New'))
self.FileNewItem.setToolTip(translate('MainWindow', 'New Service')) self.FileNewItem.setToolTip(translate(u'MainWindow', u'New Service'))
self.FileNewItem.setStatusTip( self.FileNewItem.setStatusTip(
translate('MainWindow', 'Create a new Service')) translate(u'MainWindow', u'Create a new Service'))
self.FileNewItem.setShortcut(translate('MainWindow', 'Ctrl+N')) self.FileNewItem.setShortcut(translate(u'MainWindow', u'Ctrl+N'))
self.FileOpenItem.setText(translate('MainWindow', '&Open')) self.FileOpenItem.setText(translate(u'MainWindow', u'&Open'))
self.FileOpenItem.setToolTip(translate('MainWindow', 'Open Service')) self.FileOpenItem.setToolTip(translate(u'MainWindow', u'Open Service'))
self.FileOpenItem.setStatusTip( self.FileOpenItem.setStatusTip(
translate('MainWindow', 'Open an existing service')) translate(u'MainWindow', u'Open an existing service'))
self.FileOpenItem.setShortcut(translate('MainWindow', 'Ctrl+O')) self.FileOpenItem.setShortcut(translate(u'MainWindow', u'Ctrl+O'))
self.FileSaveItem.setText(translate('MainWindow', '&Save')) self.FileSaveItem.setText(translate(u'MainWindow', u'&Save'))
self.FileSaveItem.setToolTip(translate('MainWindow', 'Save Service')) self.FileSaveItem.setToolTip(translate(u'MainWindow', u'Save Service'))
self.FileSaveItem.setStatusTip( self.FileSaveItem.setStatusTip(
translate('MainWindow', 'Save the current service to disk')) translate(u'MainWindow', u'Save the current service to disk'))
self.FileSaveItem.setShortcut(translate('MainWindow', 'Ctrl+S')) self.FileSaveItem.setShortcut(translate(u'MainWindow', u'Ctrl+S'))
self.FileSaveAsItem.setText(translate('MainWindow', 'Save &As...')) self.FileSaveAsItem.setText(translate(u'MainWindow', u'Save &As...'))
self.FileSaveAsItem.setToolTip( self.FileSaveAsItem.setToolTip(
translate('MainWindow', 'Save Service As')) translate(u'MainWindow', u'Save Service As'))
self.FileSaveAsItem.setStatusTip(translate('MainWindow', self.FileSaveAsItem.setStatusTip(translate(u'MainWindow',
'Save the current service under a new name')) u'Save the current service under a new name'))
self.FileSaveAsItem.setShortcut(translate('MainWindow', 'F12')) self.FileSaveAsItem.setShortcut(translate(u'MainWindow', u'F12'))
self.FileExitItem.setText(translate('MainWindow', 'E&xit')) self.FileExitItem.setText(translate(u'MainWindow', u'E&xit'))
self.FileExitItem.setStatusTip(translate('MainWindow', 'Quit OpenLP')) self.FileExitItem.setStatusTip(translate(u'MainWindow', u'Quit OpenLP'))
self.FileExitItem.setShortcut(translate('MainWindow', 'Alt+F4')) self.FileExitItem.setShortcut(translate(u'MainWindow', u'Alt+F4'))
self.ImportThemeItem.setText(translate('MainWindow', '&Theme')) self.ImportThemeItem.setText(translate(u'MainWindow', u'&Theme'))
self.ImportLanguageItem.setText(translate('MainWindow', '&Language')) self.ImportLanguageItem.setText(translate(u'MainWindow', u'&Language'))
self.ExportThemeItem.setText(translate('MainWindow', '&Theme')) self.ExportThemeItem.setText(translate(u'MainWindow', u'&Theme'))
self.ExportLanguageItem.setText(translate('MainWindow', '&Language')) self.ExportLanguageItem.setText(translate(u'MainWindow', u'&Language'))
self.actionLook_Feel.setText(translate('MainWindow', 'Look && &Feel')) self.actionLook_Feel.setText(translate(u'MainWindow', u'Look && &Feel'))
self.OptionsSettingsItem.setText(translate('MainWindow', '&Settings')) self.OptionsSettingsItem.setText(translate(u'MainWindow', u'&Settings'))
self.ViewMediaManagerItem.setText( self.ViewMediaManagerItem.setText(
translate('MainWindow', '&Media Manager')) translate(u'MainWindow', u'&Media Manager'))
self.ViewMediaManagerItem.setToolTip( self.ViewMediaManagerItem.setToolTip(
translate('MainWindow', 'Toggle Media Manager')) translate(u'MainWindow', u'Toggle Media Manager'))
self.ViewMediaManagerItem.setStatusTip(translate('MainWindow', self.ViewMediaManagerItem.setStatusTip(translate(u'MainWindow',
'Toggle the visibility of the Media Manager')) u'Toggle the visibility of the Media Manager'))
self.ViewMediaManagerItem.setShortcut(translate('MainWindow', 'F8')) self.ViewMediaManagerItem.setShortcut(translate(u'MainWindow', u'F8'))
self.ViewThemeManagerItem.setText( self.ViewThemeManagerItem.setText(
translate('MainWindow', '&Theme Manager')) translate(u'MainWindow', u'&Theme Manager'))
self.ViewThemeManagerItem.setToolTip( self.ViewThemeManagerItem.setToolTip(
translate('MainWindow', 'Toggle Theme Manager')) translate(u'MainWindow', u'Toggle Theme Manager'))
self.ViewThemeManagerItem.setStatusTip(translate('MainWindow', self.ViewThemeManagerItem.setStatusTip(translate(u'MainWindow',
'Toggle the visibility of the Theme Manager')) u'Toggle the visibility of the Theme Manager'))
self.ViewThemeManagerItem.setShortcut(translate('MainWindow', 'F10')) self.ViewThemeManagerItem.setShortcut(translate(u'MainWindow', u'F10'))
self.ViewServiceManagerItem.setText( self.ViewServiceManagerItem.setText(
translate('MainWindow', '&Service Manager')) translate(u'MainWindow', u'&Service Manager'))
self.ViewServiceManagerItem.setToolTip( self.ViewServiceManagerItem.setToolTip(
translate('MainWindow', 'Toggle Service Manager')) translate(u'MainWindow', u'Toggle Service Manager'))
self.ViewServiceManagerItem.setStatusTip(translate('MainWindow', self.ViewServiceManagerItem.setStatusTip(translate(u'MainWindow',
'Toggle the visibility of the Service Manager')) u'Toggle the visibility of the Service Manager'))
self.ViewServiceManagerItem.setShortcut(translate('MainWindow', 'F9')) self.ViewServiceManagerItem.setShortcut(translate(u'MainWindow', u'F9'))
self.action_Preview_Panel.setText( self.action_Preview_Panel.setText(
translate('MainWindow', '&Preview Panel')) translate(u'MainWindow', u'&Preview Panel'))
self.action_Preview_Panel.setToolTip( self.action_Preview_Panel.setToolTip(
translate('MainWindow', 'Toggle Preview Panel')) translate(u'MainWindow', u'Toggle Preview Panel'))
self.action_Preview_Panel.setStatusTip(translate('MainWindow', self.action_Preview_Panel.setStatusTip(translate(u'MainWindow',
'Toggle the visibility of the Preview Panel')) u'Toggle the visibility of the Preview Panel'))
self.action_Preview_Panel.setShortcut(translate('MainWindow', 'F11')) self.action_Preview_Panel.setShortcut(translate(u'MainWindow', u'F11'))
self.PluginItem.setText(translate('MainWindow', '&Plugin List')) self.PluginItem.setText(translate(u'MainWindow', u'&Plugin List'))
self.PluginItem.setStatusTip( self.PluginItem.setStatusTip(
translate('MainWindow', 'List the Plugins')) translate(u'MainWindow', u'List the Plugins'))
self.PluginItem.setShortcut(translate('MainWindow', 'Alt+F7')) self.PluginItem.setShortcut(translate(u'MainWindow', u'Alt+F7'))
self.HelpDocumentationItem.setText( self.HelpDocumentationItem.setText(
translate('MainWindow', '&User Guide')) translate(u'MainWindow', u'&User Guide'))
self.HelpAboutItem.setText(translate('MainWindow', '&About')) self.HelpAboutItem.setText(translate(u'MainWindow', u'&About'))
self.HelpAboutItem.setStatusTip( self.HelpAboutItem.setStatusTip(
translate('MainWindow', 'More information about OpenLP')) translate(u'MainWindow', u'More information about OpenLP'))
self.HelpAboutItem.setShortcut(translate('MainWindow', 'Ctrl+F1')) self.HelpAboutItem.setShortcut(translate(u'MainWindow', u'Ctrl+F1'))
self.HelpOnlineHelpItem.setText(translate('MainWindow', '&Online Help')) self.HelpOnlineHelpItem.setText(
self.HelpWebSiteItem.setText(translate('MainWindow', '&Web Site')) translate(u'MainWindow', u'&Online Help'))
self.HelpWebSiteItem.setText(translate(u'MainWindow', u'&Web Site'))
#i18n #i18n
self.AutoLanguageItem.setText(translate('MainWindow', '&Auto Detect')) self.AutoLanguageItem.setText(translate(u'MainWindow', u'&Auto Detect'))
self.AutoLanguageItem.setStatusTip( self.AutoLanguageItem.setStatusTip(
translate('MainWindow', 'Choose System language, if available')) translate(u'MainWindow', u'Choose System language, if available'))
for item in self.LanguageGroup.actions(): for item in self.LanguageGroup.actions():
item.setText(item.objectName()) item.setText(item.objectName())
item.setStatusTip(translate('MainWindow', item.setStatusTip(translate(u'MainWindow',
'Set the interface language to %1').arg(item.objectName())) u'Set the interface language to %1').arg(item.objectName()))
self.ToolsAddToolItem.setText(translate('MainWindow', 'Add &Tool...')) self.ToolsAddToolItem.setText(translate(u'MainWindow', u'Add &Tool...'))
self.ToolsAddToolItem.setStatusTip( self.ToolsAddToolItem.setStatusTip(
translate('MainWindow', 'Add an application to the list of tools')) translate(u'MainWindow',
u'Add an application to the list of tools'))
self.action_Preview_Panel.setText( self.action_Preview_Panel.setText(
translate('MainWindow', '&Preview Pane')) translate(u'MainWindow', u'&Preview Pane'))
self.ModeLiveItem.setText(translate('MainWindow', '&Live')) self.ModeLiveItem.setText(translate(u'MainWindow', u'&Live'))
class MainWindow(QtGui.QMainWindow, Ui_MainWindow): class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
@ -616,11 +619,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
Triggered by delay thread. Triggered by delay thread.
""" """
app_version = self.applicationVersion[u'full'] app_version = self.applicationVersion[u'full']
version_text = unicode(translate('MainWindow','Version %s of OpenLP is now ' version_text = unicode(translate(u'MainWindow', u'Version %s of OpenLP '
'available for download (you are currently running version %s).' u'is now available for download (you are currently running version '
'\n\nYou can download the latest version from http://openlp.org')) u' %s). \n\nYou can download the latest version from '
u'http://openlp.org'))
QtGui.QMessageBox.question(self, QtGui.QMessageBox.question(self,
translate('MainWindow','OpenLP Version Updated'), translate(u'MainWindow', u'OpenLP Version Updated'),
version_text % (version, app_version), version_text % (version, app_version),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
@ -651,8 +655,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
and settings.value(u'blank warning', QtCore.QVariant(False)).toBool(): and settings.value(u'blank warning', QtCore.QVariant(False)).toBool():
self.LiveController.onBlankDisplay(True) self.LiveController.onBlankDisplay(True)
QtGui.QMessageBox.question(self, QtGui.QMessageBox.question(self,
translate('MainWindow','OpenLP Main Display Blanked'), translate(u'MainWindow', u'OpenLP Main Display Blanked'),
translate('MainWindow','The Main Display has been blanked out'), translate(u'MainWindow',
u'The Main Display has been blanked out'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok), QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
settings.endGroup() settings.endGroup()
@ -707,9 +712,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
""" """
if self.serviceNotSaved: if self.serviceNotSaved:
ret = QtGui.QMessageBox.question(self, ret = QtGui.QMessageBox.question(self,
translate('MainWindow','Save Changes to Service?'), translate(u'MainWindow', u'Save Changes to Service?'),
translate('MainWindow','Your service has changed. ' translate(u'MainWindow', u'Your service has changed. '
'Do you want to save those changes?'), u'Do you want to save those changes?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Discard | QtGui.QMessageBox.Discard |

108
openlp/core/ui/servicemanager.py
View File

@ -114,21 +114,27 @@ class ServiceManager(QtGui.QWidget):
# Create the top toolbar # Create the top toolbar
self.Toolbar = OpenLPToolbar(self) self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ServiceManager','New Service'), u':/general/general_new.png', translate(u'ServiceManager', u'New Service'),
translate('ServiceManager','Create a new service'), self.onNewService) u':/general/general_new.png',
translate(u'ServiceManager', u'Create a new service'),
self.onNewService)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ServiceManager','Open Service'), u':/general/general_open.png', translate(u'ServiceManager', u'Open Service'),
translate('ServiceManager','Load an existing service'), self.onLoadService) u':/general/general_open.png',
translate(u'ServiceManager', u'Load an existing service'),
self.onLoadService)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ServiceManager','Save Service'), u':/general/general_save.png', translate(u'ServiceManager', u'Save Service'),
translate('ServiceManager','Save this service'), self.onSaveService) u':/general/general_save.png',
translate(u'ServiceManager', u'Save this service'),
self.onSaveService)
self.Toolbar.addSeparator() self.Toolbar.addSeparator()
self.ThemeLabel = QtGui.QLabel(translate('ServiceManager','Theme:'), self.ThemeLabel = QtGui.QLabel(translate(u'ServiceManager', u'Theme:'),
self) self)
self.ThemeLabel.setMargin(3) self.ThemeLabel.setMargin(3)
self.Toolbar.addWidget(self.ThemeLabel) self.Toolbar.addWidget(self.ThemeLabel)
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar) self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
self.ThemeComboBox.setToolTip(translate('ServiceManager', self.ThemeComboBox.setToolTip(translate(u'ServiceManager',
u'Select a theme for the service')) u'Select a theme for the service'))
self.ThemeComboBox.setSizeAdjustPolicy( self.ThemeComboBox.setSizeAdjustPolicy(
QtGui.QComboBox.AdjustToContents) QtGui.QComboBox.AdjustToContents)
@ -159,21 +165,29 @@ class ServiceManager(QtGui.QWidget):
# Add the bottom toolbar # Add the bottom toolbar
self.OrderToolbar = OpenLPToolbar(self) self.OrderToolbar = OpenLPToolbar(self)
self.OrderToolbar.addToolbarButton( self.OrderToolbar.addToolbarButton(
translate('ServiceManager','Move to &top'), u':/services/service_top.png', translate(u'ServiceManager', u'Move to &top'),
translate('ServiceManager','Move to top'), self.onServiceTop) u':/services/service_top.png',
translate(u'ServiceManager', u'Move to top'), self.onServiceTop)
self.OrderToolbar.addToolbarButton( self.OrderToolbar.addToolbarButton(
translate('ServiceManager','Move &up'), u':/services/service_up.png', translate(u'ServiceManager', u'Move &up'),
translate('ServiceManager','Move up order'), self.onServiceUp) u':/services/service_up.png',
translate(u'ServiceManager', u'Move up order'), self.onServiceUp)
self.OrderToolbar.addToolbarButton( self.OrderToolbar.addToolbarButton(
translate('ServiceManager','Move &down'), u':/services/service_down.png', translate(u'ServiceManager', u'Move &down'),
translate('ServiceManager','Move down order'), self.onServiceDown) u':/services/service_down.png',
translate(u'ServiceManager', u'Move down order'),
self.onServiceDown)
self.OrderToolbar.addToolbarButton( self.OrderToolbar.addToolbarButton(
translate('ServiceManager','Move to &bottom'), u':/services/service_bottom.png', translate(u'ServiceManager', u'Move to &bottom'),
translate('ServiceManager','Move to end'), self.onServiceEnd) u':/services/service_bottom.png',
translate(u'ServiceManager', u'Move to end'),
self.onServiceEnd)
self.OrderToolbar.addSeparator() self.OrderToolbar.addSeparator()
self.OrderToolbar.addToolbarButton( self.OrderToolbar.addToolbarButton(
translate('ServiceManager','&Delete From Service'), u':/general/general_delete.png', translate(u'ServiceManager', u'&Delete From Service'),
translate('ServiceManager','Delete From Service'), self.onDeleteFromService) u':/general/general_delete.png',
translate(u'ServiceManager', u'Delete From Service'),
self.onDeleteFromService)
self.Layout.addWidget(self.OrderToolbar) self.Layout.addWidget(self.OrderToolbar)
# Connect up our signals and slots # Connect up our signals and slots
QtCore.QObject.connect(self.ThemeComboBox, QtCore.QObject.connect(self.ThemeComboBox,
@ -203,30 +217,38 @@ class ServiceManager(QtGui.QWidget):
self.servicePath = AppLocation.get_section_data_path(u'servicemanager') self.servicePath = AppLocation.get_section_data_path(u'servicemanager')
#build the drag and drop context menu #build the drag and drop context menu
self.dndMenu = QtGui.QMenu() self.dndMenu = QtGui.QMenu()
self.newAction = self.dndMenu.addAction(translate('ServiceManager','&Add New Item')) self.newAction = self.dndMenu.addAction(
translate(u'ServiceManager', u'&Add New Item'))
self.newAction.setIcon(build_icon(u':/general/general_edit.png')) self.newAction.setIcon(build_icon(u':/general/general_edit.png'))
self.addToAction = self.dndMenu.addAction(translate('ServiceManager','&Add to Selected Item')) self.addToAction = self.dndMenu.addAction(
translate(u'ServiceManager', u'&Add to Selected Item'))
self.addToAction.setIcon(build_icon(u':/general/general_edit.png')) self.addToAction.setIcon(build_icon(u':/general/general_edit.png'))
#build the context menu #build the context menu
self.menu = QtGui.QMenu() self.menu = QtGui.QMenu()
self.editAction = self.menu.addAction(translate('ServiceManager','&Edit Item')) self.editAction = self.menu.addAction(
translate(u'ServiceManager', u'&Edit Item'))
self.editAction.setIcon(build_icon(u':/general/general_edit.png')) self.editAction.setIcon(build_icon(u':/general/general_edit.png'))
self.maintainAction = self.menu.addAction(translate('ServiceManager','&Maintain Item')) self.maintainAction = self.menu.addAction(
translate(u'ServiceManager', u'&Maintain Item'))
self.maintainAction.setIcon(build_icon(u':/general/general_edit.png')) self.maintainAction.setIcon(build_icon(u':/general/general_edit.png'))
self.notesAction = self.menu.addAction(translate('ServiceManager','&Notes')) self.notesAction = self.menu.addAction(
translate(u'ServiceManager', u'&Notes'))
self.notesAction.setIcon(build_icon(u':/services/service_notes.png')) self.notesAction.setIcon(build_icon(u':/services/service_notes.png'))
self.deleteAction = self.menu.addAction( self.deleteAction = self.menu.addAction(
translate('ServiceManager','&Delete From Service')) translate(u'ServiceManager', u'&Delete From Service'))
self.deleteAction.setIcon(build_icon(u':/general/general_delete.png')) self.deleteAction.setIcon(build_icon(u':/general/general_delete.png'))
self.sep1 = self.menu.addAction(u'') self.sep1 = self.menu.addAction(u'')
self.sep1.setSeparator(True) self.sep1.setSeparator(True)
self.previewAction = self.menu.addAction(translate('ServiceManager','&Preview Verse')) self.previewAction = self.menu.addAction(
translate(u'ServiceManager', u'&Preview Verse'))
self.previewAction.setIcon(build_icon(u':/general/general_preview.png')) self.previewAction.setIcon(build_icon(u':/general/general_preview.png'))
self.liveAction = self.menu.addAction(translate('ServiceManager','&Live Verse')) self.liveAction = self.menu.addAction(
translate(u'ServiceManager', u'&Live Verse'))
self.liveAction.setIcon(build_icon(u':/general/general_live.png')) self.liveAction.setIcon(build_icon(u':/general/general_live.png'))
self.sep2 = self.menu.addAction(u'') self.sep2 = self.menu.addAction(u'')
self.sep2.setSeparator(True) self.sep2.setSeparator(True)
self.themeMenu = QtGui.QMenu(translate('ServiceManager',u'&Change Item Theme')) self.themeMenu = QtGui.QMenu(
translate(u'ServiceManager', u'&Change Item Theme'))
self.menu.addMenu(self.themeMenu) self.menu.addMenu(self.themeMenu)
def supportedSuffixes(self, suffix): def supportedSuffixes(self, suffix):
@ -458,9 +480,10 @@ class ServiceManager(QtGui.QWidget):
self.parent.generalSettingsSection + u'/save prompt', self.parent.generalSettingsSection + u'/save prompt',
QtCore.QVariant(False)).toBool(): QtCore.QVariant(False)).toBool():
ret = QtGui.QMessageBox.question(self, ret = QtGui.QMessageBox.question(self,
translate('ServiceManager','Save Changes to Service?'), translate(u'ServiceManager', u'Save Changes to Service?'),
translate('ServiceManager','Your service is unsaved, do you want to save ' translate(u'ServiceManager',
'those changes before creating a new one?'), u'Your service is unsaved, do you want to save '
u'those changes before creating a new one?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel | QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Save), QtGui.QMessageBox.Save),
@ -542,9 +565,9 @@ class ServiceManager(QtGui.QWidget):
log.debug(u'onSaveService') log.debug(u'onSaveService')
if not quick or self.isNew: if not quick or self.isNew:
filename = QtGui.QFileDialog.getSaveFileName(self, filename = QtGui.QFileDialog.getSaveFileName(self,
translate('ServiceManager',u'Save Service'), translate(u'ServiceManager', u'Save Service'),
SettingsManager.get_last_dir(self.parent.serviceSettingsSection), SettingsManager.get_last_dir(self.parent.serviceSettingsSection),
translate('ServiceManager',u'OpenLP Service Files (*.osz)')) translate(u'ServiceManager', u'OpenLP Service Files (*.osz)'))
else: else:
filename = SettingsManager.get_last_dir( filename = SettingsManager.get_last_dir(
self.parent.serviceSettingsSection) self.parent.serviceSettingsSection)
@ -601,7 +624,7 @@ class ServiceManager(QtGui.QWidget):
self.parent.serviceSettingsSection) self.parent.serviceSettingsSection)
else: else:
filename = QtGui.QFileDialog.getOpenFileName( filename = QtGui.QFileDialog.getOpenFileName(
self, translate('ServiceManager','Open Service'), self, translate(u'ServiceManager', u'Open Service'),
SettingsManager.get_last_dir( SettingsManager.get_last_dir(
self.parent.serviceSettingsSection), u'Services (*.osz)') self.parent.serviceSettingsSection), u'Services (*.osz)')
self.loadService(filename) self.loadService(filename)
@ -614,9 +637,10 @@ class ServiceManager(QtGui.QWidget):
""" """
if self.parent.serviceNotSaved: if self.parent.serviceNotSaved:
ret = QtGui.QMessageBox.question(self, ret = QtGui.QMessageBox.question(self,
translate('ServiceManager','Save Changes to Service?'), translate(u'ServiceManager', u'Save Changes to Service?'),
translate('ServiceManager','Your current service is unsaved, do you want to ' translate(u'ServiceManager',
'save the changes before opening a new one?'), u'Your current service is unsaved, do you want to '
u'save the changes before opening a new one?'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Discard | QtGui.QMessageBox.Discard |
QtGui.QMessageBox.Save), QtGui.QMessageBox.Save),
@ -778,9 +802,9 @@ class ServiceManager(QtGui.QWidget):
self.serviceItems[item][u'service_item'], count) self.serviceItems[item][u'service_item'], count)
else: else:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate('ServiceManager','Missing Display Handler'), translate(u'ServiceManager', u'Missing Display Handler'),
translate('ServiceManager','Your item cannot be displayed as ' translate(u'ServiceManager', u'Your item cannot be displayed '
'there is no handler to display it'), u'as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok), QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)
@ -814,9 +838,9 @@ class ServiceManager(QtGui.QWidget):
self.serviceItems[item][u'service_item'], 0) self.serviceItems[item][u'service_item'], 0)
else: else:
QtGui.QMessageBox.critical(self, QtGui.QMessageBox.critical(self,
translate('ServiceManager','Missing Display Handler'), translate(u'ServiceManager', u'Missing Display Handler'),
translate('ServiceManager','Your item cannot be displayed as ' translate(u'ServiceManager', u'Your item cannot be displayed '
'there is no handler to display it'), u'as there is no handler to display it'),
QtGui.QMessageBox.StandardButtons( QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok), QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok) QtGui.QMessageBox.Ok)

74
openlp/core/ui/slidecontroller.py
View File

@ -127,11 +127,11 @@ class SlideController(QtGui.QWidget):
# Type label for the top of the slide controller # Type label for the top of the slide controller
self.TypeLabel = QtGui.QLabel(self.Panel) self.TypeLabel = QtGui.QLabel(self.Panel)
if self.isLive: if self.isLive:
self.TypeLabel.setText(translate('SlideController','Live')) self.TypeLabel.setText(translate(u'SlideController', u'Live'))
self.split = 1 self.split = 1
self.typePrefix = u'live' self.typePrefix = u'live'
else: else:
self.TypeLabel.setText(translate('SlideController','Preview')) self.TypeLabel.setText(translate(u'SlideController', u'Preview'))
self.split = 0 self.split = 0
self.typePrefix = u'preview' self.typePrefix = u'preview'
self.TypeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;') self.TypeLabel.setStyleSheet(u'font-weight: bold; font-size: 12pt;')
@ -178,75 +178,92 @@ class SlideController(QtGui.QWidget):
if self.isLive: if self.isLive:
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'First Slide', u':/slides/slide_first.png', u'First Slide', u':/slides/slide_first.png',
translate('SlideController','Move to first'), self.onSlideSelectedFirst) translate(u'SlideController', u'Move to first'),
self.onSlideSelectedFirst)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Previous Slide', u':/slides/slide_previous.png', u'Previous Slide', u':/slides/slide_previous.png',
translate('SlideController','Move to previous'), self.onSlideSelectedPrevious) translate(u'SlideController', u'Move to previous'),
self.onSlideSelectedPrevious)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Next Slide', u':/slides/slide_next.png', u'Next Slide', u':/slides/slide_next.png',
translate('SlideController','Move to next'), self.onSlideSelectedNext) translate(u'SlideController', u'Move to next'),
self.onSlideSelectedNext)
if self.isLive: if self.isLive:
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Last Slide', u':/slides/slide_last.png', u'Last Slide', u':/slides/slide_last.png',
translate('SlideController','Move to last'), self.onSlideSelectedLast) translate(u'SlideController', u'Move to last'),
self.onSlideSelectedLast)
if self.isLive: if self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarSeparator(u'Close Separator')
self.blankButton = self.Toolbar.addToolbarButton( self.blankButton = self.Toolbar.addToolbarButton(
u'Blank Screen', u':/slides/slide_blank.png', u'Blank Screen', u':/slides/slide_blank.png',
translate('SlideController','Blank Screen'), self.onBlankDisplay, True) translate(u'SlideController', u'Blank Screen'),
self.onBlankDisplay, True)
self.themeButton = self.Toolbar.addToolbarButton( self.themeButton = self.Toolbar.addToolbarButton(
u'Display Theme', u':/slides/slide_theme.png', u'Display Theme', u':/slides/slide_theme.png',
translate('SlideController','Theme Screen'), self.onThemeDisplay, True) translate(u'SlideController', u'Theme Screen'),
self.onThemeDisplay, True)
self.hideButton = self.Toolbar.addToolbarButton( self.hideButton = self.Toolbar.addToolbarButton(
u'Hide screen', u':/slides/slide_desktop.png', u'Hide screen', u':/slides/slide_desktop.png',
translate('SlideController','Hide Screen'), self.onHideDisplay, True) translate(u'SlideController', u'Hide Screen'),
self.onHideDisplay, True)
if not self.isLive: if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Go Live', u':/general/general_live.png', u'Go Live', u':/general/general_live.png',
translate('SlideController','Move to live'), self.onGoLive) translate(u'SlideController', u'Move to live'), self.onGoLive)
self.Toolbar.addToolbarSeparator(u'Close Separator') self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Edit Song', u':/general/general_edit.png', u'Edit Song', u':/general/general_edit.png',
translate('SlideController','Edit and re-preview Song'), self.onEditSong) translate(u'SlideController', u'Edit and re-preview Song'),
self.onEditSong)
if isLive: if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator') self.Toolbar.addToolbarSeparator(u'Loop Separator')
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Start Loop', u':/media/media_time.png', u'Start Loop', u':/media/media_time.png',
translate('SlideController','Start continuous loop'), self.onStartLoop) translate(u'SlideController', u'Start continuous loop'),
self.onStartLoop)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
u'Stop Loop', u':/media/media_stop.png', u'Stop Loop', u':/media/media_stop.png',
translate('SlideController','Stop continuous loop'), self.onStopLoop) translate(u'SlideController', u'Stop continuous loop'),
self.onStopLoop)
self.DelaySpinBox = QtGui.QSpinBox() self.DelaySpinBox = QtGui.QSpinBox()
self.DelaySpinBox.setMinimum(1) self.DelaySpinBox.setMinimum(1)
self.DelaySpinBox.setMaximum(180) self.DelaySpinBox.setMaximum(180)
self.Toolbar.addToolbarWidget( self.Toolbar.addToolbarWidget(
u'Image SpinBox', self.DelaySpinBox) u'Image SpinBox', self.DelaySpinBox)
self.DelaySpinBox.setSuffix(translate('SlideController','s')) self.DelaySpinBox.setSuffix(translate(u'SlideController', u's'))
self.DelaySpinBox.setToolTip( self.DelaySpinBox.setToolTip(
translate('SlideController','Delay between slides in seconds')) translate(u'SlideController',
u'Delay between slides in seconds'))
self.ControllerLayout.addWidget(self.Toolbar) self.ControllerLayout.addWidget(self.Toolbar)
#Build a Media ToolBar #Build a Media ToolBar
self.Mediabar = OpenLPToolbar(self) self.Mediabar = OpenLPToolbar(self)
self.Mediabar.addToolbarButton( self.Mediabar.addToolbarButton(
u'Media Start', u':/slides/media_playback_start.png', u'Media Start', u':/slides/media_playback_start.png',
translate('SlideController','Start playing media'), self.onMediaPlay) translate(u'SlideController', u'Start playing media'),
self.onMediaPlay)
self.Mediabar.addToolbarButton( self.Mediabar.addToolbarButton(
u'Media Pause', u':/slides/media_playback_pause.png', u'Media Pause', u':/slides/media_playback_pause.png',
translate('SlideController','Start playing media'), self.onMediaPause) translate(u'SlideController', u'Start playing media'),
self.onMediaPause)
self.Mediabar.addToolbarButton( self.Mediabar.addToolbarButton(
u'Media Stop', u':/slides/media_playback_stop.png', u'Media Stop', u':/slides/media_playback_stop.png',
translate('SlideController','Start playing media'), self.onMediaStop) translate(u'SlideController', u'Start playing media'),
self.onMediaStop)
if self.isLive: if self.isLive:
self.blankButton = self.Mediabar.addToolbarButton( self.blankButton = self.Mediabar.addToolbarButton(
u'Blank Screen', u':/slides/slide_blank.png', u'Blank Screen', u':/slides/slide_blank.png',
translate('SlideController','Blank Screen'), self.onBlankDisplay, True) translate(u'SlideController', u'Blank Screen'),
self.onBlankDisplay, True)
self.themeButton = self.Mediabar.addToolbarButton( self.themeButton = self.Mediabar.addToolbarButton(
u'Display Theme', u':/slides/slide_theme.png', u'Display Theme', u':/slides/slide_theme.png',
translate('SlideController','Theme Screen'), self.onThemeDisplay, True) translate(u'SlideController', u'Theme Screen'),
self.onThemeDisplay, True)
self.hideButton = self.Mediabar.addToolbarButton( self.hideButton = self.Mediabar.addToolbarButton(
u'Hide screen', u':/slides/slide_desktop.png', u'Hide screen', u':/slides/slide_desktop.png',
translate('SlideController','Hide Screen'), self.onHideDisplay, True) translate(u'SlideController', u'Hide Screen'),
self.onHideDisplay, True)
if not self.isLive: if not self.isLive:
self.seekSlider = Phonon.SeekSlider() self.seekSlider = Phonon.SeekSlider()
self.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24)) self.seekSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
@ -262,11 +279,11 @@ class SlideController(QtGui.QWidget):
# Build the Song Toolbar # Build the Song Toolbar
if isLive: if isLive:
self.SongMenu = QtGui.QToolButton(self.Toolbar) self.SongMenu = QtGui.QToolButton(self.Toolbar)
self.SongMenu.setText(translate('SlideController','Go to Verse')) self.SongMenu.setText(translate(u'SlideController', u'Go to Verse'))
self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup) self.SongMenu.setPopupMode(QtGui.QToolButton.InstantPopup)
self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu) self.Toolbar.addToolbarWidget(u'Song Menu', self.SongMenu)
self.SongMenu.setMenu(QtGui.QMenu(translate('SlideController','Go to Verse'), self.SongMenu.setMenu(QtGui.QMenu(
self.Toolbar)) translate(u'SlideController', u'Go to Verse'), self.Toolbar))
self.Toolbar.makeWidgetsInvisible([u'Song Menu']) self.Toolbar.makeWidgetsInvisible([u'Song Menu'])
# Screen preview area # Screen preview area
self.PreviewFrame = QtGui.QFrame(self.Splitter) self.PreviewFrame = QtGui.QFrame(self.Splitter)
@ -539,8 +556,8 @@ class SlideController(QtGui.QWidget):
bits = frame[u'verseTag'].split(u':') bits = frame[u'verseTag'].split(u':')
tag = None tag = None
#If verse handle verse number else tag only #If verse handle verse number else tag only
if bits[0] == translate('SlideController','Verse') or \ if bits[0] == translate(u'SlideController', u'Verse') or \
bits[0] == translate('SlideController','Chorus'): bits[0] == translate(u'SlideController', u'Chorus'):
tag = u'%s\n%s' % (bits[0][0], bits[1][0:] ) tag = u'%s\n%s' % (bits[0][0], bits[1][0:] )
tag1 = u'%s%s' % (bits[0][0], bits[1][0:] ) tag1 = u'%s%s' % (bits[0][0], bits[1][0:] )
row = tag row = tag
@ -553,8 +570,9 @@ class SlideController(QtGui.QWidget):
if self.isLive and frame[u'verseTag'] is not None: if self.isLive and frame[u'verseTag'] is not None:
if tag1 not in self.slideList: if tag1 not in self.slideList:
self.slideList[tag1] = framenumber self.slideList[tag1] = framenumber
self.SongMenu.menu().addAction(translate('SlideController',u'%s'%tag1), self.SongMenu.menu().addAction(
self.onSongBarHandler) translate(u'SlideController', u'%s'%tag1),
self.onSongBarHandler)
item.setText(frame[u'text']) item.setText(frame[u'text'])
else: else:
label = QtGui.QLabel() label = QtGui.QLabel()

2
openlp/core/ui/splashscreen.py
View File

@ -24,7 +24,7 @@
############################################################################### ###############################################################################
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
from openlp.core.lib import build_icon, translate from openlp.core.lib import build_icon
class SplashScreen(object): class SplashScreen(object):
def __init__(self, version): def __init__(self, version):

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

@ -55,21 +55,25 @@ class ThemeManager(QtGui.QWidget):
self.amendThemeForm = AmendThemeForm(self) self.amendThemeForm = AmendThemeForm(self)
self.Toolbar = OpenLPToolbar(self) self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ThemeManager','New Theme'), u':/themes/theme_new.png', translate(u'ThemeManager', u'New Theme'), u':/themes/theme_new.png',
translate('ThemeManager','Create a new theme'), self.onAddTheme) translate(u'ThemeManager', u'Create a new theme'), self.onAddTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ThemeManager','Edit Theme'), u':/themes/theme_edit.png', translate(u'ThemeManager', u'Edit Theme'),
translate('ThemeManager','Edit a theme'), self.onEditTheme) u':/themes/theme_edit.png',
translate(u'ThemeManager', u'Edit a theme'), self.onEditTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ThemeManager','Delete Theme'), u':/general/general_delete.png', translate(u'ThemeManager', u'Delete Theme'),
translate('ThemeManager','Delete a theme'), self.onDeleteTheme) u':/general/general_delete.png',
translate(u'ThemeManager', u'Delete a theme'), self.onDeleteTheme)
self.Toolbar.addSeparator() self.Toolbar.addSeparator()
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ThemeManager','Import Theme'), u':/general/general_import.png', translate(u'ThemeManager', u'Import Theme'),
translate('ThemeManager','Import a theme'), self.onImportTheme) u':/general/general_import.png',
translate(u'ThemeManager', u'Import a theme'), self.onImportTheme)
self.Toolbar.addToolbarButton( self.Toolbar.addToolbarButton(
translate('ThemeManager','Export Theme'), u':/general/general_export.png', translate(u'ThemeManager', u'Export Theme'),
translate('ThemeManager','Export a theme'), self.onExportTheme) u':/general/general_export.png',
translate(u'ThemeManager', u'Export a theme'), 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)
@ -79,23 +83,23 @@ class ThemeManager(QtGui.QWidget):
self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget, u':/themes/theme_edit.png', contextMenuAction(self.ThemeListWidget, u':/themes/theme_edit.png',
translate('ThemeManager','Edit a theme'), self.onEditTheme)) translate(u'ThemeManager', u'Edit a theme'), self.onEditTheme))
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuSeparator(self.ThemeListWidget)) contextMenuSeparator(self.ThemeListWidget))
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget, contextMenuAction(self.ThemeListWidget,
u':/general/general_delete.png', u':/general/general_delete.png',
translate('ThemeManager','Delete theme'), translate(u'ThemeManager', u'Delete theme'),
self.onDeleteTheme)) self.onDeleteTheme))
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget, contextMenuAction(self.ThemeListWidget,
u':/general/general_export.png', u':/general/general_export.png',
translate('ThemeManager','Make Global'), translate(u'ThemeManager', u'Make Global'),
self.changeGlobalFromScreen)) self.changeGlobalFromScreen))
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget, contextMenuAction(self.ThemeListWidget,
u':/general/general_export.png', u':/general/general_export.png',
translate('ThemeManager','Export theme'), translate(u'ThemeManager', u'Export theme'),
self.onExportTheme)) self.onExportTheme))
self.ThemeListWidget.addAction( self.ThemeListWidget.addAction(
contextMenuSeparator(self.ThemeListWidget)) contextMenuSeparator(self.ThemeListWidget))
@ -128,7 +132,8 @@ class ThemeManager(QtGui.QWidget):
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 = u'%s (%s)' % (newName, translate('ThemeManager','default')) name = u'%s (%s)' % (newName,
translate(u'ThemeManager', u'default'))
self.ThemeListWidget.item(count).setText(name) self.ThemeListWidget.item(count).setText(name)
def changeGlobalFromScreen(self, index = -1): def changeGlobalFromScreen(self, index = -1):
@ -145,7 +150,8 @@ class ThemeManager(QtGui.QWidget):
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 = u'%s (%s)' % (self.global_theme, translate('ThemeManager','default')) name = u'%s (%s)' % (self.global_theme,
translate(u'ThemeManager', u'default'))
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',
@ -179,21 +185,25 @@ class ThemeManager(QtGui.QWidget):
# should be the same unless default # should be the same unless default
if theme != unicode(item.data(QtCore.Qt.UserRole).toString()): if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
self, translate('ThemeManager','Error'), self, translate(u'ThemeManager', u'Error'),
translate('ThemeManager','You are unable to delete the default theme.'), translate(u'ThemeManager',
u'You are unable to delete the default theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
else: else:
for plugin in self.parent.plugin_manager.plugins: for plugin in self.parent.plugin_manager.plugins:
if not plugin.can_delete_theme(theme): if not plugin.can_delete_theme(theme):
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
self, translate('ThemeManager','Error'), self, translate(u'ThemeManager', u'Error'),
translate('ThemeManager','Theme %s is use in %s plugin' % (theme, plugin.name)), translate(u'ThemeManager',
u'Theme %s is use in %s plugin'
% (theme, plugin.name)),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme: if unicode(self.parent.ServiceManagerContents.ThemeComboBox.currentText()) == theme:
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
self, translate('ThemeManager','Error'), self, translate('ThemeManager','Error'),
translate('ThemeManager','Theme %s is use by Service Manager' % theme), translate(u'ThemeManager',
u'Theme %s is use by Service Manager' % theme),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
self.themelist.remove(theme) self.themelist.remove(theme)
@ -218,13 +228,14 @@ class ThemeManager(QtGui.QWidget):
""" """
item = self.ThemeListWidget.currentItem() item = self.ThemeListWidget.currentItem()
if item is None: if item is None:
QtGui.QMessageBox.critical(self, translate('ThemeManager','Error'), QtGui.QMessageBox.critical(self,
translate('ThemeManager','You have not selected a theme.'), translate(u'ThemeManager', u'Error'),
translate(u'ThemeManager', u'You have not selected a theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return return
theme = unicode(item.data(QtCore.Qt.UserRole).toString()) theme = unicode(item.data(QtCore.Qt.UserRole).toString())
path = QtGui.QFileDialog.getExistingDirectory(self, path = QtGui.QFileDialog.getExistingDirectory(self,
unicode(translate('ThemeManager','Save Theme - (%s)')) % theme, unicode(translate(u'ThemeManager', u'Save Theme - (%s)')) % theme,
SettingsManager.get_last_dir(self.settingsSection, 1)) SettingsManager.get_last_dir(self.settingsSection, 1))
path = unicode(path) path = unicode(path)
if path: if path:
@ -247,7 +258,7 @@ class ThemeManager(QtGui.QWidget):
def onImportTheme(self): def onImportTheme(self):
files = QtGui.QFileDialog.getOpenFileNames( files = QtGui.QFileDialog.getOpenFileNames(
self, translate('ThemeManager','Select Theme Import File'), self, translate(u'ThemeManager', u'Select Theme Import File'),
SettingsManager.get_last_dir(self.settingsSection), u'Theme (*.*)') SettingsManager.get_last_dir(self.settingsSection), u'Theme (*.*)')
log.info(u'New Themes %s', unicode(files)) log.info(u'New Themes %s', unicode(files))
if files: if files:
@ -277,7 +288,7 @@ class ThemeManager(QtGui.QWidget):
textName = os.path.splitext(name)[0] textName = os.path.splitext(name)[0]
if textName == self.global_theme: if textName == self.global_theme:
name = u'%s (%s)' % (textName, name = u'%s (%s)' % (textName,
translate('ThemeManager','default')) translate(u'ThemeManager', u'default'))
else: else:
name = textName name = textName
thumb = os.path.join(self.thumbPath, u'%s.png' % textName) thumb = os.path.join(self.thumbPath, u'%s.png' % textName)
@ -363,8 +374,8 @@ class ThemeManager(QtGui.QWidget):
self.generateAndSaveImage(dir, themename, filexml) self.generateAndSaveImage(dir, themename, filexml)
except: except:
QtGui.QMessageBox.critical( QtGui.QMessageBox.critical(
self, translate('ThemeManager','Error'), self, translate(u'ThemeManager', u'Error'),
translate('ThemeManager','File is not a valid theme.'), translate(u'ThemeManager', u'File is not a valid theme.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok)) QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
log.exception(u'Importing theme from zip file failed %s' % filename) log.exception(u'Importing theme from zip file failed %s' % filename)
finally: finally:
@ -446,9 +457,10 @@ class ThemeManager(QtGui.QWidget):
if self.saveThemeName != name: if self.saveThemeName != name:
if os.path.exists(theme_file): if os.path.exists(theme_file):
result = QtGui.QMessageBox.question( result = QtGui.QMessageBox.question(
self, translate('ThemeManager','Theme Exists'), self, translate(u'ThemeManager', u'Theme Exists'),
translate('ThemeManager','A theme with this name already exists, ' translate(u'ThemeManager',
'would you like to overwrite it?'), u'A theme with this name already exists, '
u'would you like to overwrite it?'),
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No), (QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
QtGui.QMessageBox.No) QtGui.QMessageBox.No)
if result == QtGui.QMessageBox.Yes: if result == QtGui.QMessageBox.Yes:
@ -504,7 +516,7 @@ class ThemeManager(QtGui.QWidget):
def baseTheme(self): def baseTheme(self):
log.debug(u'base theme created') log.debug(u'base theme created')
newtheme = ThemeXML() newtheme = ThemeXML()
newtheme.new_document(unicode(translate('ThemeManager','New Theme'))) newtheme.new_document(unicode(translate(u'ThemeManager', u'New Theme')))
newtheme.add_background_solid(unicode(u'#000000')) newtheme.add_background_solid(unicode(u'#000000'))
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'), newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'),
unicode(30), u'False') unicode(30), u'False')

37
openlp/core/ui/themestab.py
View File

@ -37,7 +37,7 @@ class ThemesTab(SettingsTab):
def setupUi(self): def setupUi(self):
self.setObjectName(u'ThemesTab') self.setObjectName(u'ThemesTab')
self.tabTitleVisible = translate('ThemesTab','Themes') self.tabTitleVisible = translate(u'ThemesTab', u'Themes')
self.ThemesTabLayout = QtGui.QHBoxLayout(self) self.ThemesTabLayout = QtGui.QHBoxLayout(self)
self.ThemesTabLayout.setSpacing(8) self.ThemesTabLayout.setSpacing(8)
self.ThemesTabLayout.setMargin(8) self.ThemesTabLayout.setMargin(8)
@ -106,21 +106,26 @@ class ThemesTab(SettingsTab):
QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList) QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList)
def retranslateUi(self): def retranslateUi(self):
self.GlobalGroupBox.setTitle(translate('ThemesTab','Global theme')) self.GlobalGroupBox.setTitle(translate(u'ThemesTab', u'Global theme'))
self.LevelGroupBox.setTitle(translate('ThemesTab','Theme level')) self.LevelGroupBox.setTitle(translate(u'ThemesTab', u'Theme level'))
self.SongLevelRadioButton.setText(translate('ThemesTab','Song level')) self.SongLevelRadioButton.setText(
self.SongLevelLabel.setText(translate('ThemesTab','Use the theme from each song ' translate(u'ThemesTab', u'Song level'))
'in the database. If a song doesn\'t have a theme associated with ' self.SongLevelLabel.setText(
'it, then use the service\'s theme. If the service doesn\'t have ' translate(u'ThemesTab', u'Use the theme from each song '
'a theme, then use the global theme.')) u'in the database. If a song doesn\'t have a theme associated with '
self.ServiceLevelRadioButton.setText(translate('ThemesTab','Service level')) u'it, then use the service\'s theme. If the service doesn\'t have '
self.ServiceLevelLabel.setText(translate('ThemesTab','Use the theme from the ' u'a theme, then use the global theme.'))
'service, overriding any of the individual songs\' themes. If the ' self.ServiceLevelRadioButton.setText(
'service doesn\'t have a theme, then use the global theme.')) translate(u'ThemesTab', u'Service level'))
self.GlobalLevelRadioButton.setText(translate('ThemesTab','Global level')) self.ServiceLevelLabel.setText(
self.GlobalLevelLabel.setText(translate('ThemesTab','Use the global theme, ' translate(u'ThemesTab', u'Use the theme from the service, '
'overriding any themes associated with either the service or the ' u'overriding any of the individual songs\' themes. If the '
'songs.')) u'service doesn\'t have a theme, then use the global theme.'))
self.GlobalLevelRadioButton.setText(
translate(u'ThemesTab', u'Global level'))
self.GlobalLevelLabel.setText(
translate(u'ThemesTab', u'Use the global theme, overriding any '
u'themes associated with either the service or the songs.'))
def load(self): def load(self):
settings = QtCore.QSettings() settings = QtCore.QSettings()