forked from openlp/openlp
Commiting for merging trunk, some new changes.
This commit is contained in:
parent
cc9f89bfdb
commit
e4bce11a03
@ -52,6 +52,7 @@ class UiStrings(object):
|
|||||||
self.About = translate('OpenLP.Ui', 'About')
|
self.About = translate('OpenLP.Ui', 'About')
|
||||||
self.Add = translate('OpenLP.Ui', '&Add')
|
self.Add = translate('OpenLP.Ui', '&Add')
|
||||||
self.AddGroup = translate('OpenLP.Ui', 'Add group')
|
self.AddGroup = translate('OpenLP.Ui', 'Add group')
|
||||||
|
self.AddGroupDot = translate('OpenLP.Ui', 'Add group.')
|
||||||
self.Advanced = translate('OpenLP.Ui', 'Advanced')
|
self.Advanced = translate('OpenLP.Ui', 'Advanced')
|
||||||
self.AllFiles = translate('OpenLP.Ui', 'All Files')
|
self.AllFiles = translate('OpenLP.Ui', 'All Files')
|
||||||
self.Automatic = translate('OpenLP.Ui', 'Automatic')
|
self.Automatic = translate('OpenLP.Ui', 'Automatic')
|
||||||
|
@ -91,8 +91,8 @@ class Ui_ExceptionDialog(object):
|
|||||||
Translate the widgets on the fly.
|
Translate the widgets on the fly.
|
||||||
"""
|
"""
|
||||||
# Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable.
|
# Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable.
|
||||||
bugs_mail = '<a href = "mailto:bugs@openlp.org" > bugs@openlp.org</a>'
|
|
||||||
exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
|
exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
|
||||||
|
# Explanation text, adds a small space before: If possible, write in English.
|
||||||
self.description_explanation.setText(
|
self.description_explanation.setText(
|
||||||
translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
|
translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
|
||||||
' If possible, write in English.'))
|
' If possible, write in English.'))
|
||||||
@ -100,11 +100,12 @@ class Ui_ExceptionDialog(object):
|
|||||||
translate('OpenLP.ExceptionDialog', '<strong>Oops, OpenLP hit a problem '
|
translate('OpenLP.ExceptionDialog', '<strong>Oops, OpenLP hit a problem '
|
||||||
'and couldn\'t recover!</strong> <br><br>'
|
'and couldn\'t recover!</strong> <br><br>'
|
||||||
'<strong>You can help </strong> OpenLP developers to <strong>fix this</strong> by<br>'
|
'<strong>You can help </strong> OpenLP developers to <strong>fix this</strong> by<br>'
|
||||||
'sending them a <strong>bug report</strong> to %s<br><br>'
|
'sending them a <strong>bug report</strong> to {email}<br><br>'
|
||||||
'<strong>No email app? </strong> You can <strong>save</strong> this '
|
'<strong>No email app? </strong> You can <strong>save</strong> this '
|
||||||
'information to a <strong>file</strong> and<br>'
|
'information to a <strong>file</strong> and<br>'
|
||||||
'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
|
'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
|
||||||
'<strong>Thank you<strong> for being part of making OpenLP better!<br>') % bugs_mail)
|
'<strong>Thank you<strong> for being part of making OpenLP better!<br>'
|
||||||
|
).format(email='<a href = "mailto:bugs@openlp.org" > bugs@openlp.org</a>'))
|
||||||
self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
|
self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
|
||||||
self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
|
self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
|
||||||
self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))
|
self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))
|
||||||
|
@ -186,7 +186,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.search_tab_bar.setObjectName('search_tab_bar')
|
self.search_tab_bar.setObjectName('search_tab_bar')
|
||||||
self.page_layout.addWidget(self.search_tab_bar)
|
self.page_layout.addWidget(self.search_tab_bar)
|
||||||
# Add the Quick Search tab.
|
# Add the Quick Search tab.
|
||||||
self.add_search_tab('quick', translate('BiblesPlugin.MediaItem', 'Quick'))
|
self.add_search_tab('quick', translate('BiblesPlugin.MediaItem', 'Search'))
|
||||||
self.quick_search_label = QtWidgets.QLabel(self.quickTab)
|
self.quick_search_label = QtWidgets.QLabel(self.quickTab)
|
||||||
self.quick_search_label.setObjectName('quick_search_label')
|
self.quick_search_label.setObjectName('quick_search_label')
|
||||||
self.quickLayout.addWidget(self.quick_search_label, 0, 0, QtCore.Qt.AlignRight)
|
self.quickLayout.addWidget(self.quick_search_label, 0, 0, QtCore.Qt.AlignRight)
|
||||||
@ -195,10 +195,10 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
self.quick_search_edit.setObjectName('quick_search_edit')
|
self.quick_search_edit.setObjectName('quick_search_edit')
|
||||||
self.quick_search_label.setBuddy(self.quick_search_edit)
|
self.quick_search_label.setBuddy(self.quick_search_edit)
|
||||||
self.quickLayout.addWidget(self.quick_search_edit, 0, 1, 1, 2)
|
self.quickLayout.addWidget(self.quick_search_edit, 0, 1, 1, 2)
|
||||||
self.add_search_fields('quick', translate('BiblesPlugin.MediaItem', 'Quick'))
|
self.add_search_fields('quick', translate('BiblesPlugin.MediaItem', 'Search'))
|
||||||
self.quickTab.setVisible(True)
|
self.quickTab.setVisible(True)
|
||||||
# Add the Advanced Search tab.
|
# Add the Advanced Search tab.
|
||||||
self.add_search_tab('advanced', translate('BiblesPlugin.MediaItem', 'Advanced'))
|
self.add_search_tab('advanced', translate('BiblesPlugin.MediaItem', 'Select'))
|
||||||
self.advanced_book_label = QtWidgets.QLabel(self.advancedTab)
|
self.advanced_book_label = QtWidgets.QLabel(self.advancedTab)
|
||||||
self.advanced_book_label.setObjectName('advanced_book_label')
|
self.advanced_book_label.setObjectName('advanced_book_label')
|
||||||
self.advancedLayout.addWidget(self.advanced_book_label, 0, 0, QtCore.Qt.AlignRight)
|
self.advancedLayout.addWidget(self.advanced_book_label, 0, 0, QtCore.Qt.AlignRight)
|
||||||
|
@ -88,7 +88,7 @@ class ImagePlugin(Plugin):
|
|||||||
self.text_strings[StringContent.VisibleName] = {'title': translate('ImagePlugin', 'Images', 'container title')}
|
self.text_strings[StringContent.VisibleName] = {'title': translate('ImagePlugin', 'Images', 'container title')}
|
||||||
# Middle Header Bar
|
# Middle Header Bar
|
||||||
tooltips = {
|
tooltips = {
|
||||||
'load': translate('ImagePlugin', 'Load a new image.'),
|
'load': translate('ImagePlugin', 'Add new image(s).'),
|
||||||
'import': '',
|
'import': '',
|
||||||
'new': translate('ImagePlugin', 'Add a new image.'),
|
'new': translate('ImagePlugin', 'Add a new image.'),
|
||||||
'edit': translate('ImagePlugin', 'Edit the selected image.'),
|
'edit': translate('ImagePlugin', 'Edit the selected image.'),
|
||||||
|
@ -74,8 +74,8 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
|
self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
|
||||||
file_formats = get_images_filter()
|
file_formats = get_images_filter()
|
||||||
self.on_new_file_masks = '%s;;%s (*)' % (file_formats, UiStrings().AllFiles)
|
self.on_new_file_masks = '%s;;%s (*)' % (file_formats, UiStrings().AllFiles)
|
||||||
self.add_group_action.setText(UiStrings().AddGroup)
|
self.add_group_action.setText(UiStrings().AddGroupDot)
|
||||||
self.add_group_action.setToolTip(UiStrings().AddGroup)
|
self.add_group_action.setToolTip(UiStrings().AddGroupDot)
|
||||||
self.replace_action.setText(UiStrings().ReplaceBG)
|
self.replace_action.setText(UiStrings().ReplaceBG)
|
||||||
self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
|
self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
|
||||||
self.reset_action.setText(UiStrings().ResetBG)
|
self.reset_action.setText(UiStrings().ResetBG)
|
||||||
@ -179,7 +179,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
text=UiStrings().AddGroup, icon=':/images/image_new_group.png', triggers=self.on_add_group_click)
|
text=UiStrings().AddGroup, icon=':/images/image_new_group.png', triggers=self.on_add_group_click)
|
||||||
create_widget_action(
|
create_widget_action(
|
||||||
self.list_view,
|
self.list_view,
|
||||||
text=self.plugin.get_string(StringContent.Load)['tooltip'],
|
text=translate('ImagePlugin', 'Add new image(s)'),
|
||||||
icon=':/general/general_open.png', triggers=self.on_file_click)
|
icon=':/general/general_open.png', triggers=self.on_file_click)
|
||||||
|
|
||||||
def add_start_header_bar(self):
|
def add_start_header_bar(self):
|
||||||
|
@ -54,7 +54,7 @@ class MediaTab(SettingsTab):
|
|||||||
def retranslateUi(self):
|
def retranslateUi(self):
|
||||||
self.advanced_group_box.setTitle(UiStrings().Advanced)
|
self.advanced_group_box.setTitle(UiStrings().Advanced)
|
||||||
self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden'))
|
self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden'))
|
||||||
self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically'))
|
self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start videos Live items automatically'))
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player'))
|
self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player'))
|
||||||
|
Loading…
Reference in New Issue
Block a user