forked from openlp/openlp
Long lines
This commit is contained in:
parent
bc7d643ab2
commit
37d2e910b7
@ -244,7 +244,8 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
self.addToolbarButton(
|
self.addToolbarButton(
|
||||||
unicode(translate('OpenLP.MediaManagerItem', 'Delete %s')) %
|
unicode(translate('OpenLP.MediaManagerItem', 'Delete %s')) %
|
||||||
self.PluginNameShort,
|
self.PluginNameShort,
|
||||||
translate('OpenLP.MediaManagerItem', 'Delete the selected item'),
|
translate('OpenLP.MediaManagerItem',
|
||||||
|
'Delete the selected item'),
|
||||||
u':/general/general_delete.png', self.onDeleteClick)
|
u':/general/general_delete.png', self.onDeleteClick)
|
||||||
## Separator Line ##
|
## Separator Line ##
|
||||||
self.addToolbarSeparator()
|
self.addToolbarSeparator()
|
||||||
@ -297,7 +298,8 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
self.listView.addAction(
|
self.listView.addAction(
|
||||||
context_menu_action(
|
context_menu_action(
|
||||||
self.listView, u':/general/general_delete.png',
|
self.listView, u':/general/general_delete.png',
|
||||||
unicode(translate('OpenLP.MediaManagerItem', '&Delete %s')) %
|
unicode(translate(
|
||||||
|
'OpenLP.MediaManagerItem', '&Delete %s')) %
|
||||||
self.pluginNameVisible,
|
self.pluginNameVisible,
|
||||||
self.onDeleteClick))
|
self.onDeleteClick))
|
||||||
self.listView.addAction(context_menu_separator(self.listView))
|
self.listView.addAction(context_menu_separator(self.listView))
|
||||||
@ -509,7 +511,8 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
service_item = self.parent.serviceManager.getServiceItem()
|
service_item = self.parent.serviceManager.getServiceItem()
|
||||||
if not service_item:
|
if not service_item:
|
||||||
QtGui.QMessageBox.information(self,
|
QtGui.QMessageBox.information(self,
|
||||||
translate('OpenLP.MediaManagerItem', 'No Service Item Selected'),
|
translate('OpenLP.MediaManagerItem',
|
||||||
|
'No Service Item Selected'),
|
||||||
translate('OpenLP.MediaManagerItem',
|
translate('OpenLP.MediaManagerItem',
|
||||||
'You must select an existing service item to add to.'))
|
'You must select an existing service item to add to.'))
|
||||||
elif self.title.lower() == service_item.name.lower():
|
elif self.title.lower() == service_item.name.lower():
|
||||||
@ -519,7 +522,8 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
else:
|
else:
|
||||||
#Turn off the remote edit update message indicator
|
#Turn off the remote edit update message indicator
|
||||||
QtGui.QMessageBox.information(self,
|
QtGui.QMessageBox.information(self,
|
||||||
translate('OpenLP.MediaManagerItem', 'Invalid Service Item'),
|
translate('OpenLP.MediaManagerItem',
|
||||||
|
'Invalid Service Item'),
|
||||||
unicode(translate('OpenLP.MediaManagerItem',
|
unicode(translate('OpenLP.MediaManagerItem',
|
||||||
'You must select a %s service item.')) % self.title)
|
'You must select a %s service item.')) % self.title)
|
||||||
|
|
||||||
@ -535,4 +539,4 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
if self.generateSlideData(service_item, item):
|
if self.generateSlideData(service_item, item):
|
||||||
return service_item
|
return service_item
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
@ -562,5 +562,6 @@ class Ui_AboutDialog(object):
|
|||||||
self.aboutNotebook.setTabText(
|
self.aboutNotebook.setTabText(
|
||||||
self.aboutNotebook.indexOf(self.licenseTab),
|
self.aboutNotebook.indexOf(self.licenseTab),
|
||||||
translate('OpenLP.AboutForm', 'License'))
|
translate('OpenLP.AboutForm', 'License'))
|
||||||
self.contributeButton.setText(translate('OpenLP.AboutForm', 'Contribute'))
|
self.contributeButton.setText(
|
||||||
|
translate('OpenLP.AboutForm', 'Contribute'))
|
||||||
self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
|
self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
|
||||||
|
@ -134,7 +134,8 @@ class AdvancedTab(SettingsTab):
|
|||||||
"""
|
"""
|
||||||
self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
|
self.uiGroupBox.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
|
||||||
self.recentLabel.setText(
|
self.recentLabel.setText(
|
||||||
translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
|
translate('OpenLP.AdvancedTab',
|
||||||
|
'Number of recent files to display:'))
|
||||||
self.mediaPluginCheckBox.setText(translate('OpenLP.AdvancedTab',
|
self.mediaPluginCheckBox.setText(translate('OpenLP.AdvancedTab',
|
||||||
'Remember active media manager tab on startup'))
|
'Remember active media manager tab on startup'))
|
||||||
self.doubleClickLiveCheckBox.setText(translate('OpenLP.AdvancedTab',
|
self.doubleClickLiveCheckBox.setText(translate('OpenLP.AdvancedTab',
|
||||||
@ -188,4 +189,4 @@ class AdvancedTab(SettingsTab):
|
|||||||
"""
|
"""
|
||||||
self.sharedLabel.setEnabled(checked)
|
self.sharedLabel.setEnabled(checked)
|
||||||
self.sharedTextEdit.setEnabled(checked)
|
self.sharedTextEdit.setEnabled(checked)
|
||||||
self.sharedPushButton.setEnabled(checked)
|
self.sharedPushButton.setEnabled(checked)
|
||||||
|
@ -222,7 +222,8 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
|
|||||||
images_filter = '%s;;%s (*.*) (*)' % (images_filter,
|
images_filter = '%s;;%s (*.*) (*)' % (images_filter,
|
||||||
translate('OpenLP.AmendThemeForm', 'All Files'))
|
translate('OpenLP.AmendThemeForm', 'All Files'))
|
||||||
filename = QtGui.QFileDialog.getOpenFileName(self,
|
filename = QtGui.QFileDialog.getOpenFileName(self,
|
||||||
translate('OpenLP.AmendThemeForm', 'Select Image'), u'', images_filter)
|
translate('OpenLP.AmendThemeForm', 'Select Image'), u'',
|
||||||
|
images_filter)
|
||||||
if filename:
|
if filename:
|
||||||
self.ImageLineEdit.setText(filename)
|
self.ImageLineEdit.setText(filename)
|
||||||
self.theme.background_filename = filename
|
self.theme.background_filename = filename
|
||||||
@ -765,4 +766,4 @@ class AmendThemeForm(QtGui.QDialog, Ui_AmendThemeDialog):
|
|||||||
if self.theme.font_main_width < metrics.maxWidth() * 2 + 64:
|
if self.theme.font_main_width < metrics.maxWidth() * 2 + 64:
|
||||||
self.theme.font_main_width = metrics.maxWidth() * 2 + 64
|
self.theme.font_main_width = metrics.maxWidth() * 2 + 64
|
||||||
self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
|
self.FontMainWidthSpinBox.setValue(self.theme.font_main_width)
|
||||||
return metrics
|
return metrics
|
||||||
|
@ -287,7 +287,8 @@ class GeneralTab(SettingsTab):
|
|||||||
"""
|
"""
|
||||||
Translate the general settings tab to the currently selected language
|
Translate the general settings tab to the currently selected language
|
||||||
"""
|
"""
|
||||||
self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab', 'Monitors'))
|
self.MonitorGroupBox.setTitle(translate('OpenLP.GeneralTab',
|
||||||
|
'Monitors'))
|
||||||
self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
|
self.MonitorLabel.setText(translate('OpenLP.GeneralTab',
|
||||||
'Select monitor for output display:'))
|
'Select monitor for output display:'))
|
||||||
self.DisplayOnMonitorCheck.setText(
|
self.DisplayOnMonitorCheck.setText(
|
||||||
@ -473,4 +474,4 @@ class GeneralTab(SettingsTab):
|
|||||||
self.customYValueEdit.setEnabled(checked)
|
self.customYValueEdit.setEnabled(checked)
|
||||||
self.customHeightValueEdit.setEnabled(checked)
|
self.customHeightValueEdit.setEnabled(checked)
|
||||||
self.customWidthValueEdit.setEnabled(checked)
|
self.customWidthValueEdit.setEnabled(checked)
|
||||||
self.override_changed = True
|
self.override_changed = True
|
||||||
|
@ -498,7 +498,8 @@ class Ui_MainWindow(object):
|
|||||||
self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
|
self.HelpAboutItem.setText(translate('OpenLP.MainWindow', '&About'))
|
||||||
self.HelpAboutItem.setStatusTip(
|
self.HelpAboutItem.setStatusTip(
|
||||||
translate('OpenLP.MainWindow', 'More information about OpenLP'))
|
translate('OpenLP.MainWindow', 'More information about OpenLP'))
|
||||||
self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow', 'Ctrl+F1'))
|
self.HelpAboutItem.setShortcut(translate('OpenLP.MainWindow',
|
||||||
|
'Ctrl+F1'))
|
||||||
self.HelpOnlineHelpItem.setText(
|
self.HelpOnlineHelpItem.setText(
|
||||||
translate('OpenLP.MainWindow', '&Online Help'))
|
translate('OpenLP.MainWindow', '&Online Help'))
|
||||||
self.HelpWebSiteItem.setText(
|
self.HelpWebSiteItem.setText(
|
||||||
@ -707,7 +708,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
version_text = unicode(translate('OpenLP.MainWindow',
|
version_text = unicode(translate('OpenLP.MainWindow',
|
||||||
'Version %s of OpenLP is now available for download (you are '
|
'Version %s of OpenLP is now available for download (you are '
|
||||||
'currently running version %s). \n\nYou can download the latest '
|
'currently running version %s). \n\nYou can download the latest '
|
||||||
'version from <a href="http://openlp.org/">http://openlp.org/</a>.'))
|
'version from '
|
||||||
|
'<a href="http://openlp.org/">http://openlp.org/</a>.'))
|
||||||
QtGui.QMessageBox.question(self,
|
QtGui.QMessageBox.question(self,
|
||||||
translate('OpenLP.MainWindow', 'OpenLP Version Updated'),
|
translate('OpenLP.MainWindow', 'OpenLP Version Updated'),
|
||||||
version_text % (version, app_version),
|
version_text % (version, app_version),
|
||||||
@ -893,7 +895,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
|
|
||||||
def defaultThemeChanged(self, theme):
|
def defaultThemeChanged(self, theme):
|
||||||
self.DefaultThemeLabel.setText(
|
self.DefaultThemeLabel.setText(
|
||||||
unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) % theme)
|
unicode(translate('OpenLP.MainWindow', 'Default Theme: %s')) %
|
||||||
|
theme)
|
||||||
|
|
||||||
def toggleMediaManager(self, visible):
|
def toggleMediaManager(self, visible):
|
||||||
if self.MediaManagerDock.isVisible() != visible:
|
if self.MediaManagerDock.isVisible() != visible:
|
||||||
@ -1016,4 +1019,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
|
|||||||
self.recentFiles.insert(0, QtCore.QString(filename))
|
self.recentFiles.insert(0, QtCore.QString(filename))
|
||||||
while self.recentFiles.count() > maxRecentFiles:
|
while self.recentFiles.count() > maxRecentFiles:
|
||||||
# Don't care what API says takeLast works, removeLast doesn't!
|
# Don't care what API says takeLast works, removeLast doesn't!
|
||||||
self.recentFiles.takeLast()
|
self.recentFiles.takeLast()
|
||||||
|
@ -71,5 +71,6 @@ class Ui_ServiceItemEditDialog(object):
|
|||||||
ServiceItemEditDialog.setWindowTitle(
|
ServiceItemEditDialog.setWindowTitle(
|
||||||
translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
|
translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
|
||||||
self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
|
self.upButton.setText(translate('OpenLP.ServiceItemEditForm', 'Up'))
|
||||||
self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm', 'Delete'))
|
self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
|
||||||
|
'Delete'))
|
||||||
self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down'))
|
self.downButton.setText(translate('OpenLP.ServiceItemEditForm', 'Down'))
|
||||||
|
@ -133,8 +133,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
translate('OpenLP.ServiceManager', 'Save this service'),
|
translate('OpenLP.ServiceManager', 'Save this service'),
|
||||||
self.onQuickSaveService)
|
self.onQuickSaveService)
|
||||||
self.Toolbar.addSeparator()
|
self.Toolbar.addSeparator()
|
||||||
self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager', 'Theme:'),
|
self.ThemeLabel = QtGui.QLabel(translate('OpenLP.ServiceManager',
|
||||||
self)
|
'Theme:'), self)
|
||||||
self.ThemeLabel.setMargin(3)
|
self.ThemeLabel.setMargin(3)
|
||||||
self.Toolbar.addToolbarWidget(u'ThemeLabel', self.ThemeLabel)
|
self.Toolbar.addToolbarWidget(u'ThemeLabel', self.ThemeLabel)
|
||||||
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
|
self.ThemeComboBox = QtGui.QComboBox(self.Toolbar)
|
||||||
@ -846,8 +846,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
else:
|
else:
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
||||||
translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
|
translate('OpenLP.ServiceManager', 'Your item cannot be '
|
||||||
'as there is no handler to display it'),
|
'displayed 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)
|
||||||
@ -882,8 +882,8 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
else:
|
else:
|
||||||
QtGui.QMessageBox.critical(self,
|
QtGui.QMessageBox.critical(self,
|
||||||
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
translate('OpenLP.ServiceManager', 'Missing Display Handler'),
|
||||||
translate('OpenLP.ServiceManager', 'Your item cannot be displayed '
|
translate('OpenLP.ServiceManager', 'Your item cannot be '
|
||||||
'as there is no handler to display it'),
|
'displayed 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)
|
||||||
@ -1031,4 +1031,4 @@ class ServiceManager(QtGui.QWidget):
|
|||||||
data_item[u'notes'] = unicode(service_item.notes)
|
data_item[u'notes'] = unicode(service_item.notes)
|
||||||
data_item[u'selected'] = (item == curitem)
|
data_item[u'selected'] = (item == curitem)
|
||||||
data.append(data_item)
|
data.append(data_item)
|
||||||
Receiver.send_message(u'servicemanager_list_response', data)
|
Receiver.send_message(u'servicemanager_list_response', data)
|
||||||
|
@ -164,7 +164,7 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
self.DisplayTypeComboBox.insertItem(0, self.Automatic)
|
self.DisplayTypeComboBox.insertItem(0, self.Automatic)
|
||||||
self.DisplayTypeComboBox.setCurrentIndex(0)
|
self.DisplayTypeComboBox.setCurrentIndex(0)
|
||||||
if QtCore.QSettings().value(self.settingsSection + u'/override app',
|
if QtCore.QSettings().value(self.settingsSection + u'/override app',
|
||||||
QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
|
QtCore.QVariant(QtCore.Qt.Unchecked)) == QtCore.Qt.Checked:
|
||||||
self.PresentationWidget.show()
|
self.PresentationWidget.show()
|
||||||
else:
|
else:
|
||||||
self.PresentationWidget.hide()
|
self.PresentationWidget.hide()
|
||||||
@ -299,4 +299,4 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
if self.controllers[controller].enabled():
|
if self.controllers[controller].enabled():
|
||||||
if filetype in self.controllers[controller].alsosupports:
|
if filetype in self.controllers[controller].alsosupports:
|
||||||
return controller
|
return controller
|
||||||
return None
|
return None
|
||||||
|
@ -150,7 +150,8 @@ class PptviewDocument(PresentationDocument):
|
|||||||
if self.check_thumbnails():
|
if self.check_thumbnails():
|
||||||
return
|
return
|
||||||
for idx in range(self.get_slide_count()):
|
for idx in range(self.get_slide_count()):
|
||||||
path = u'%s\\slide%s.bmp' % (self.get_temp_folder(), unicode(idx + 1))
|
path = u'%s\\slide%s.bmp' % (self.get_temp_folder(),
|
||||||
|
unicode(idx + 1))
|
||||||
self.convert_thumbnail(path, idx + 1)
|
self.convert_thumbnail(path, idx + 1)
|
||||||
|
|
||||||
def close_presentation(self):
|
def close_presentation(self):
|
||||||
@ -246,4 +247,4 @@ class PptviewDocument(PresentationDocument):
|
|||||||
"""
|
"""
|
||||||
Triggers the previous slide on the running presentation
|
Triggers the previous slide on the running presentation
|
||||||
"""
|
"""
|
||||||
self.controller.process.PrevStep(self.pptid)
|
self.controller.process.PrevStep(self.pptid)
|
||||||
|
@ -44,7 +44,8 @@ class RemoteTab(SettingsTab):
|
|||||||
self.remoteLayout.setObjectName(u'remoteLayout')
|
self.remoteLayout.setObjectName(u'remoteLayout')
|
||||||
self.serverSettingsGroupBox = QtGui.QGroupBox(self)
|
self.serverSettingsGroupBox = QtGui.QGroupBox(self)
|
||||||
self.serverSettingsGroupBox.setObjectName(u'serverSettingsGroupBox')
|
self.serverSettingsGroupBox.setObjectName(u'serverSettingsGroupBox')
|
||||||
self.serverSettingsLayout = QtGui.QFormLayout(self.serverSettingsGroupBox)
|
self.serverSettingsLayout = QtGui.QFormLayout(
|
||||||
|
self.serverSettingsGroupBox)
|
||||||
self.serverSettingsLayout.setSpacing(8)
|
self.serverSettingsLayout.setSpacing(8)
|
||||||
self.serverSettingsLayout.setMargin(8)
|
self.serverSettingsLayout.setMargin(8)
|
||||||
self.serverSettingsLayout.setObjectName(u'serverSettingsLayout')
|
self.serverSettingsLayout.setObjectName(u'serverSettingsLayout')
|
||||||
@ -78,4 +79,4 @@ class RemoteTab(SettingsTab):
|
|||||||
QtCore.QSettings().setValue(self.settingsSection + u'/port',
|
QtCore.QSettings().setValue(self.settingsSection + u'/port',
|
||||||
QtCore.QVariant(self.portSpinBox.value()))
|
QtCore.QVariant(self.portSpinBox.value()))
|
||||||
QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
|
QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
|
||||||
QtCore.QVariant(self.addressEdit.text()))
|
QtCore.QVariant(self.addressEdit.text()))
|
||||||
|
Loading…
Reference in New Issue
Block a user