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

Loading and saving of screens is working; Refractored retranslateUi => retranslate_ui

This commit is contained in:
Raoul Snyman 2018-09-11 22:43:27 -07:00
parent 0794015765
commit 0c8156b4c4
96 changed files with 259 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/api/tab.py
View File

@ -43,9 +43,9 @@ class ApiTab(SettingsTab):
advanced_translated = translate('OpenLP.AdvancedTab', 'Advanced')
super(ApiTab, self).__init__(parent, 'api', advanced_translated)
def setupUi(self):
def setup_ui(self):
self.setObjectName('ApiTab')
super(ApiTab, self).setupUi()
super(ApiTab, self).setup_ui()
self.server_settings_group_box = QtWidgets.QGroupBox(self.left_column)
self.server_settings_group_box.setObjectName('server_settings_group_box')
self.server_settings_layout = QtWidgets.QFormLayout(self.server_settings_group_box)
@ -154,7 +154,7 @@ class ApiTab(SettingsTab):
self.thumbnails_check_box.stateChanged.connect(self.on_thumbnails_check_box_changed)
self.address_edit.textChanged.connect(self.set_urls)
def retranslateUi(self):
def retranslate_ui(self):
self.tab_title_visible = translate('RemotePlugin.RemoteTab', 'Remote Interface')
self.server_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Server Settings'))
self.address_label.setText(translate('RemotePlugin.RemoteTab', 'Serve on IP address:'))

4
openlp/core/display/canvas.py
View File

@ -226,7 +226,7 @@ class MainCanvas(OpenLPMixin, Canvas, RegistryProperties):
self.rebuild_css = False
self.hide_mode = None
self.override = {}
self.retranslateUi()
self.retranslate_ui()
self.media_object = None
if self.is_live:
self.audio_player = AudioPlayer(self)
@ -325,7 +325,7 @@ class MainCanvas(OpenLPMixin, Canvas, RegistryProperties):
for plugin in self.plugin_manager.plugins:
plugin.refresh_css(self.frame)
def retranslateUi(self):
def retranslate_ui(self):
"""
Setup the interface translation strings.
"""

33
openlp/core/display/screens.py
View File

@ -24,8 +24,9 @@ The :mod:`screen` module provides management functionality for a machines'
displays.
"""
import logging
from functools import cmp_to_key
from PyQt5 import QtCore
from PyQt5 import QtCore, QtWidgets
from openlp.core.common.i18n import translate
from openlp.core.common.registry import Registry
@ -49,7 +50,7 @@ class Screen(object):
"""
self.number = number
self.geometry = geometry
self.display_geometry = geometry
self.custom_geometry = None
self.is_primary = is_primary
self.is_display = is_display
@ -64,6 +65,13 @@ class Screen(object):
name = '{name} ({primary})'.format(name=name, primary=translate('OpenLP.ScreenList', 'primary'))
return name
@property
def display_geometry(self):
"""
Returns the geometry to use when displaying. This property decides between the native and custom geometries
"""
return self.custom_geometry or self.geometry
@classmethod
def from_dict(cls, screen_dict):
"""
@ -280,10 +288,27 @@ class ScreenList(object):
"""
Update the list of screens
"""
def _screen_compare(this, other):
"""
Compare screens. Can't use a key here because of the nested property and method to be called
"""
if this.geometry().x() < other.geometry().x():
return -1
elif this.geometry().x() > other.geometry().x():
return 1
else:
if this.geometry().y() < other.geometry().y():
return -1
elif this.geometry().y() > other.geometry().y():
return 1
else:
return 0
self.screens = []
for number in range(self.desktop.screenCount()):
os_screens = QtWidgets.QApplication.screens()
os_screens.sort(key=cmp_to_key(_screen_compare))
for number, screen in enumerate(os_screens):
self.screens.append(
Screen(number, self.desktop.screenGeometry(number), self.desktop.primaryScreen() == number))
Screen(number, screen.geometry(), self.desktop.primaryScreen() == number))
def on_screen_resolution_changed(self, number):
"""

8
openlp/core/lib/mediamanageritem.py
View File

@ -108,8 +108,8 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
self.page_layout.setSpacing(0)
self.page_layout.setContentsMargins(0, 0, 0, 0)
self.required_icons()
self.setupUi()
self.retranslateUi()
self.setup_ui()
self.retranslate_ui()
self.auto_select_id = -1
def setup_item(self):
@ -130,7 +130,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
self.has_delete_icon = True
self.add_to_service_item = False
def retranslateUi(self):
def retranslate_ui(self):
"""
This method is called automatically to provide OpenLP with the opportunity to translate the ``MediaManagerItem``
to another language.
@ -145,7 +145,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
self.toolbar = OpenLPToolbar(self)
self.page_layout.addWidget(self.toolbar)
def setupUi(self):
def setup_ui(self):
"""
This method sets up the interface on the button. Plugin developers use this to add and create toolbars, and the
rest of the interface of the media manager item.

8
openlp/core/lib/settingstab.py
View File

@ -54,12 +54,12 @@ class SettingsTab(QtWidgets.QWidget, RegistryProperties):
"""
Run some initial setup. This method is separate from __init__ in order to mock it out in tests.
"""
self.setupUi()
self.retranslateUi()
self.setup_ui()
self.retranslate_ui()
self.initialise()
self.load()
def setupUi(self):
def setup_ui(self):
"""
Setup the tab's interface.
"""
@ -90,7 +90,7 @@ class SettingsTab(QtWidgets.QWidget, RegistryProperties):
left_width = max(left_width, self.left_column.minimumSizeHint().width())
self.left_column.setFixedWidth(left_width)
def retranslateUi(self):
def retranslate_ui(self):
"""
Setup the interface translation strings.
"""

8
openlp/core/projectors/editform.py
View File

@ -42,7 +42,7 @@ class Ui_ProjectorEditForm(object):
The :class:`~openlp.core.lib.ui.projector.editform.Ui_ProjectorEditForm` class defines
the user interface for the ProjectorEditForm dialog.
"""
def setupUi(self, edit_projector_dialog):
def setup_ui(self, edit_projector_dialog):
"""
Create the interface layout.
"""
@ -108,7 +108,7 @@ class Ui_ProjectorEditForm(object):
QtWidgets.QDialogButtonBox.Cancel)
self.dialog_layout.addWidget(self.button_box, 8, 0, 1, 2)
def retranslateUi(self, edit_projector_dialog):
def retranslate_ui(self, edit_projector_dialog):
if self.new_projector:
title = translate('OpenLP.ProjectorEditForm', 'Add New Projector')
self.projector.port = PJLINK_PORT
@ -150,7 +150,7 @@ class ProjectorEditForm(QtWidgets.QDialog, Ui_ProjectorEditForm):
super(ProjectorEditForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.projectordb = projectordb
self.setupUi(self)
self.setup_ui(self)
self.button_box.accepted.connect(self.accept_me)
self.button_box.helpRequested.connect(self.help_me)
self.button_box.rejected.connect(self.cancel_me)
@ -169,7 +169,7 @@ class ProjectorEditForm(QtWidgets.QDialog, Ui_ProjectorEditForm):
self.ip_text_label.setVisible(True)
# Since it's already defined, IP address is unchangeable, so focus on port number
self.port_text.setFocus()
self.retranslateUi(self)
self.retranslate_ui(self)
reply = QtWidgets.QDialog.exec(self)
return reply

6
openlp/core/projectors/tab.py
View File

@ -50,12 +50,12 @@ class ProjectorTab(SettingsTab):
projector_translated = translate('OpenLP.ProjectorTab', 'Projector')
super(ProjectorTab, self).__init__(parent, 'Projector', projector_translated)
def setupUi(self):
def setup_ui(self):
"""
Setup the UI
"""
self.setObjectName('ProjectorTab')
super(ProjectorTab, self).setupUi()
super(ProjectorTab, self).setup_ui()
self.connect_box = QtWidgets.QGroupBox(self.left_column)
self.connect_box.setObjectName('connect_box')
self.connect_box_layout = QtWidgets.QFormLayout(self.connect_box)
@ -95,7 +95,7 @@ class ProjectorTab(SettingsTab):
self.connect_on_linkup.setObjectName('connect_on_linkup')
self.connect_box_layout.addRow(self.connect_on_linkup)
def retranslateUi(self):
def retranslate_ui(self):
"""
Translate the UI on the fly
"""

6
openlp/core/ui/advancedtab.py
View File

@ -59,12 +59,12 @@ class AdvancedTab(SettingsTab):
advanced_translated = translate('OpenLP.AdvancedTab', 'Advanced')
super(AdvancedTab, self).__init__(parent, 'Advanced', advanced_translated)
def setupUi(self):
def setup_ui(self):
"""
Configure the UI elements for the tab.
"""
self.setObjectName('AdvancedTab')
super(AdvancedTab, self).setupUi()
super(AdvancedTab, self).setup_ui()
self.ui_group_box = QtWidgets.QGroupBox(self.left_column)
self.ui_group_box.setObjectName('ui_group_box')
self.ui_layout = QtWidgets.QFormLayout(self.ui_group_box)
@ -241,7 +241,7 @@ class AdvancedTab(SettingsTab):
self.next_item_radio_button.clicked.connect(self.on_next_item_button_clicked)
self.search_as_type_check_box.stateChanged.connect(self.on_search_as_type_check_box_changed)
def retranslateUi(self):
def retranslate_ui(self):
"""
Setup the interface translation strings.
"""

6
openlp/core/ui/exceptiondialog.py
View File

@ -34,7 +34,7 @@ class Ui_ExceptionDialog(object):
"""
The GUI widgets of the exception dialog.
"""
def setupUi(self, exception_dialog):
def setup_ui(self, exception_dialog):
"""
Set up the UI.
"""
@ -84,10 +84,10 @@ class Ui_ExceptionDialog(object):
[self.send_report_button, self.save_report_button, self.attach_tile_button])
self.exception_layout.addWidget(self.button_box)
self.retranslateUi(exception_dialog)
self.retranslate_ui(exception_dialog)
self.description_text_edit.textChanged.connect(self.on_description_updated)
def retranslateUi(self, exception_dialog):
def retranslate_ui(self, exception_dialog):
"""
Translate the widgets on the fly.
"""

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

@ -50,7 +50,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties):
Constructor.
"""
super(ExceptionForm, self).__init__(None, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint)
self.setupUi(self)
self.setup_ui(self)
self.settings_section = 'crashreport'
self.report_text = '**OpenLP Bug Report**\n' \
'Version: {version}\n\n' \

6
openlp/core/ui/filerenamedialog.py
View File

@ -33,7 +33,7 @@ class Ui_FileRenameDialog(object):
"""
The UI widgets for the rename dialog
"""
def setupUi(self, file_rename_dialog):
def setup_ui(self, file_rename_dialog):
"""
Set up the UI
"""
@ -51,10 +51,10 @@ class Ui_FileRenameDialog(object):
self.dialog_layout.addWidget(self.file_name_edit, 0, 1)
self.button_box = create_button_box(file_rename_dialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box, 1, 0, 1, 2)
self.retranslateUi(file_rename_dialog)
self.retranslate_ui(file_rename_dialog)
self.setMaximumHeight(self.sizeHint().height())
def retranslateUi(self, file_rename_dialog):
def retranslate_ui(self, file_rename_dialog):
"""
Translate the UI on the fly.
"""

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

@ -46,7 +46,7 @@ class FileRenameForm(QtWidgets.QDialog, Ui_FileRenameDialog, RegistryProperties)
"""
Set up the class. This method is mocked out by the tests.
"""
self.setupUi(self)
self.setup_ui(self)
def exec(self, copy=False):
"""

6
openlp/core/ui/firsttimelanguagedialog.py
View File

@ -33,7 +33,7 @@ class Ui_FirstTimeLanguageDialog(object):
"""
The UI widgets of the language selection dialog.
"""
def setupUi(self, language_dialog):
def setup_ui(self, language_dialog):
"""
Set up the UI.
"""
@ -59,10 +59,10 @@ class Ui_FirstTimeLanguageDialog(object):
self.dialog_layout.addLayout(self.language_layout)
self.button_box = create_button_box(language_dialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(language_dialog)
self.retranslate_ui(language_dialog)
self.setMaximumHeight(self.sizeHint().height())
def retranslateUi(self, language_dialog):
def retranslate_ui(self, language_dialog):
"""
Translate the UI on the fly.
"""

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

@ -39,7 +39,7 @@ class FirstTimeLanguageForm(QtWidgets.QDialog, Ui_FirstTimeLanguageDialog):
"""
super(FirstTimeLanguageForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint |
QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.qm_list = LanguageManager.get_qm_list()
self.language_combo_box.addItem('Autodetect')
self.language_combo_box.addItems(sorted(self.qm_list.keys()))

6
openlp/core/ui/formattingtagdialog.py
View File

@ -33,7 +33,7 @@ class Ui_FormattingTagDialog(object):
"""
The UI widgets for the formatting tags window.
"""
def setupUi(self, formatting_tag_dialog):
def setup_ui(self, formatting_tag_dialog):
"""
Set up the UI
"""
@ -103,9 +103,9 @@ class Ui_FormattingTagDialog(object):
self.restore_button.setIcon(UiIcons().undo)
self.restore_button.setObjectName('restore_button')
self.list_data_grid_layout.addWidget(self.button_box)
self.retranslateUi(formatting_tag_dialog)
self.retranslate_ui(formatting_tag_dialog)
def retranslateUi(self, formatting_tag_dialog):
def retranslate_ui(self, formatting_tag_dialog):
"""
Translate the UI on the fly
"""

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

@ -52,7 +52,7 @@ class FormattingTagForm(QtWidgets.QDialog, Ui_FormattingTagDialog, FormattingTag
"""
super(FormattingTagForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self._setup()
def _setup(self):

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

@ -29,7 +29,6 @@ from PyQt5 import QtGui, QtWidgets
from openlp.core.common import get_images_filter
from openlp.core.common.i18n import UiStrings, translate
from openlp.core.common.path import Path
from openlp.core.common.registry import Registry
from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList
from openlp.core.lib.settingstab import SettingsTab
@ -54,73 +53,13 @@ class GeneralTab(SettingsTab):
general_translated = translate('OpenLP.GeneralTab', 'General')
super(GeneralTab, self).__init__(parent, 'Core', general_translated)
def setupUi(self):
def setup_ui(self):
"""
Create the user interface for the general settings tab
"""
self.setObjectName('GeneralTab')
super(GeneralTab, self).setupUi()
super(GeneralTab, self).setup_ui()
self.tab_layout.setStretch(1, 1)
# Monitors
self.screen_group_box = QtWidgets.QGroupBox(self.left_column)
self.screen_group_box.setObjectName('screen_group_box')
self.screen_layout = QtWidgets.QVBoxLayout(self.screen_group_box)
self.screen_layout.setObjectName('screen_layout')
self.screen_combo_box = QtWidgets.QComboBox(self.screen_group_box)
self.screen_combo_box.setObjectName('screen_combo_box')
self.screen_layout.addWidget(self.screen_combo_box)
# Actual screen details
self.screen_detail_layout = QtWidgets.QGridLayout()
self.screen_detail_layout.setContentsMargins(0, 0, 0, 0)
# self.screen_detail_layout.setSpacing(8)
self.screen_detail_layout.setObjectName('screen_detail_layout')
self.screen_use_this_checkbox = QtWidgets.QCheckBox(self.screen_group_box)
self.screen_use_this_checkbox.setObjectName('screen_use_this_checkbox')
self.screen_detail_layout.addWidget(self.screen_use_this_checkbox)
# Display Position
# self.override_radio_button = QtWidgets.QRadioButton(self.screen_group_box)
# self.override_radio_button.setObjectName('override_radio_button')
# self.screen_detail_layout.addWidget(self.override_radio_button)
# self.custom_x_label = QtWidgets.QLabel(self.screen_group_box)
# self.custom_x_label.setObjectName('custom_x_label')
# self.screen_layout.addWidget(self.custom_x_label)
# self.custom_X_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
# self.custom_X_value_edit.setObjectName('custom_X_value_edit')
# self.custom_X_value_edit.setRange(-9999, 9999)
# self.screen_layout.addWidget(self.custom_X_value_edit)
# self.custom_y_label = QtWidgets.QLabel(self.screen_group_box)
# self.custom_y_label.setObjectName('custom_y_label')
# self.screen_layout.addWidget(self.custom_y_label)
# self.custom_Y_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
# self.custom_Y_value_edit.setObjectName('custom_Y_value_edit')
# self.custom_Y_value_edit.setRange(-9999, 9999)
# self.screen_layout.addWidget(self.custom_Y_value_edit)
# self.custom_width_label = QtWidgets.QLabel(self.screen_group_box)
# self.custom_width_label.setObjectName('custom_width_label')
# self.screen_layout.addWidget(self.custom_width_label)
# self.custom_width_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
# self.custom_width_value_edit.setObjectName('custom_width_value_edit')
# self.custom_width_value_edit.setRange(1, 9999)
# self.screen_layout.addWidget(self.custom_width_value_edit)
# self.custom_height_label = QtWidgets.QLabel(self.screen_group_box)
# self.custom_height_label.setObjectName('custom_height_label')
# self.screen_layout.addWidget(self.custom_height_label)
# self.custom_height_value_edit = QtWidgets.QSpinBox(self.screen_group_box)
# self.custom_height_value_edit.setObjectName('custom_height_value_edit')
# self.custom_height_value_edit.setRange(1, 9999)
# self.screen_layout.addWidget(self.custom_height_value_edit)
# self.display_on_screen_check = QtWidgets.QCheckBox(self.screen_group_box)
# self.display_on_screen_check.setObjectName('screen_combo_box')
# self.screen_layout.addWidget(self.display_on_screen_check)
# Set up the stretchiness of each column, so that the first column
# less stretchy (and therefore smaller) than the others
# self.screen_layout.setColumnStretch(0, 1)
# self.screen_layout.setColumnStretch(1, 3)
# self.screen_layout.setColumnStretch(2, 3)
# self.screen_layout.setColumnStretch(3, 3)
# self.screen_layout.setColumnStretch(4, 3)
self.screen_layout.addLayout(self.screen_detail_layout)
self.left_layout.addWidget(self.screen_group_box)
# CCLI Details
self.ccli_group_box = QtWidgets.QGroupBox(self.left_column)
self.ccli_group_box.setObjectName('ccli_group_box')
@ -221,30 +160,17 @@ class GeneralTab(SettingsTab):
self.settings_layout.addRow(self.timeout_label, self.timeout_spin_box)
self.right_layout.addWidget(self.settings_group_box)
self.right_layout.addStretch()
# Signals and slots
# self.override_radio_button.toggled.connect(self.on_override_radio_button_pressed)
# self.custom_height_value_edit.valueChanged.connect(self.on_display_changed)
# self.custom_width_value_edit.valueChanged.connect(self.on_display_changed)
# self.custom_Y_value_edit.valueChanged.connect(self.on_display_changed)
# self.custom_X_value_edit.valueChanged.connect(self.on_display_changed)
self.screen_combo_box.currentIndexChanged.connect(self.on_display_changed)
# Reload the tab, as the screen resolution/count may have changed.
Registry().register_function('config_screen_changed', self.load)
# Remove for now
self.username_label.setVisible(False)
self.username_edit.setVisible(False)
self.password_label.setVisible(False)
self.password_edit.setVisible(False)
def retranslateUi(self):
def retranslate_ui(self):
"""
Translate the general settings tab to the currently selected language
"""
self.tab_title_visible = translate('OpenLP.GeneralTab', 'General')
self.screen_group_box.setTitle(translate('OpenLP.GeneralTab', 'Monitors'))
# self.screen_radio_button.setText(translate('OpenLP.GeneralTab', 'Select screen for output display:'))
self.screen_use_this_checkbox.setText(translate('OpenLP.GeneralTab', 'Use this screen as a display'))
# self.display_on_screen_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen'))
self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup'))
self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning'))
self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the previous service file'))
@ -269,12 +195,6 @@ class GeneralTab(SettingsTab):
self.number_label.setText(UiStrings().CCLINumberLabel)
self.username_label.setText(translate('OpenLP.GeneralTab', 'SongSelect username:'))
self.password_label.setText(translate('OpenLP.GeneralTab', 'SongSelect password:'))
# Moved from display tab
# self.override_radio_button.setText(translate('OpenLP.GeneralTab', 'Override display position:'))
# self.custom_x_label.setText(translate('OpenLP.GeneralTab', 'X'))
# self.custom_y_label.setText(translate('OpenLP.GeneralTab', 'Y'))
# self.custom_height_label.setText(translate('OpenLP.GeneralTab', 'Height'))
# self.custom_width_label.setText(translate('OpenLP.GeneralTab', 'Width'))
self.audio_group_box.setTitle(translate('OpenLP.GeneralTab', 'Background Audio'))
self.start_paused_check_box.setText(translate('OpenLP.GeneralTab', 'Start background audio paused'))
self.repeat_list_check_box.setText(translate('OpenLP.GeneralTab', 'Repeat track list'))
@ -288,25 +208,12 @@ class GeneralTab(SettingsTab):
"""
settings = Settings()
settings.beginGroup(self.settings_section)
self.screen_combo_box.clear()
for screen in self.screens:
self.screen_combo_box.addItem(str(screen), screen.number)
screens = settings.value('screens')
for number, screen in screens.items():
if screen['is_display']:
for item_index in range(self.screen_combo_box.count()):
if self.screen_combo_box.itemData(item_index) == number:
self.screen_combo_box.setCurrentIndex(item_index)
else:
self.screen_combo_box.setCurrentIndex(0)
self.number_edit.setText(settings.value('ccli number'))
self.username_edit.setText(settings.value('songselect username'))
self.password_edit.setText(settings.value('songselect password'))
self.save_check_service_check_box.setChecked(settings.value('save prompt'))
self.auto_unblank_check_box.setChecked(settings.value('auto unblank'))
self.click_live_slide_to_unblank_check_box.setChecked(settings.value('click live slide to unblank'))
# TODO: This is going to be a more complicated setup
# self.display_on_screen_check.setChecked(self.screens.display)
self.warning_check_box.setChecked(settings.value('blank warning'))
self.auto_open_check_box.setChecked(settings.value('auto open'))
self.show_splash_check_box.setChecked(settings.value('show splash'))
@ -317,21 +224,9 @@ class GeneralTab(SettingsTab):
self.check_for_updates_check_box.setChecked(settings.value('update check'))
self.auto_preview_check_box.setChecked(settings.value('auto preview'))
self.timeout_spin_box.setValue(settings.value('loop delay'))
# self.screen_radio_button.setChecked(not settings.value('override position',))
# self.override_radio_button.setChecked(settings.value('override position'))
# self.custom_X_value_edit.setValue(settings.value('x position'))
# self.custom_Y_value_edit.setValue(settings.value('y position'))
# self.custom_height_value_edit.setValue(settings.value('height'))
# self.custom_width_value_edit.setValue(settings.value('width'))
self.start_paused_check_box.setChecked(settings.value('audio start paused'))
self.repeat_list_check_box.setChecked(settings.value('audio repeat list'))
settings.endGroup()
# self.screen_combo_box.setDisabled(self.override_radio_button.isChecked())
# self.custom_X_value_edit.setEnabled(self.override_radio_button.isChecked())
# self.custom_Y_value_edit.setEnabled(self.override_radio_button.isChecked())
# self.custom_height_value_edit.setEnabled(self.override_radio_button.isChecked())
# self.custom_width_value_edit.setEnabled(self.override_radio_button.isChecked())
self.display_changed = False
def save(self):
"""
@ -339,8 +234,6 @@ class GeneralTab(SettingsTab):
"""
settings = Settings()
settings.beginGroup(self.settings_section)
# settings.setValue('screen', self.screen_combo_box.currentIndex())
# settings.setValue('display on screen', self.display_on_screen_check.isChecked())
settings.setValue('blank warning', self.warning_check_box.isChecked())
settings.setValue('auto open', self.auto_open_check_box.isChecked())
settings.setValue('show splash', self.show_splash_check_box.isChecked())
@ -356,60 +249,16 @@ class GeneralTab(SettingsTab):
settings.setValue('ccli number', self.number_edit.displayText())
settings.setValue('songselect username', self.username_edit.displayText())
settings.setValue('songselect password', self.password_edit.displayText())
# settings.setValue('x position', self.custom_X_value_edit.value())
# settings.setValue('y position', self.custom_Y_value_edit.value())
# settings.setValue('height', self.custom_height_value_edit.value())
# settings.setValue('width', self.custom_width_value_edit.value())
# settings.setValue('override position', self.override_radio_button.isChecked())
settings.setValue('audio start paused', self.start_paused_check_box.isChecked())
settings.setValue('audio repeat list', self.repeat_list_check_box.isChecked())
settings.endGroup()
# On save update the screens as well
self.post_set_up(True)
self.post_set_up()
def post_set_up(self, is_post_update=False):
def post_set_up(self):
"""
Apply settings after settings tab has loaded and most of the system so must be delayed
Apply settings after the tab has loaded
"""
self.settings_form.register_post_process('slidecontroller_live_spin_delay')
# Do not continue on start up.
if not is_post_update:
return
self.screens.set_display_screen(self.screen_combo_box.currentData())
# self.screens.display = self.display_on_screen_check.isChecked()
# self.screens.override['size'] = QtCore.QRect(
# self.custom_X_value_edit.value(),
# self.custom_Y_value_edit.value(),
# self.custom_width_value_edit.value(),
# self.custom_height_value_edit.value())
# self.screens.override['number'] = self.screens.which_screen(self.screens.override['size'])
# self.screens.override['primary'] = (self.screens.desktop.primaryScreen() == self.screens.override['number'])
# if self.override_radio_button.isChecked():
# self.screens.set_override_display()
# else:
# self.screens.reset_current_display()
if self.display_changed:
self.settings_form.register_post_process('config_screen_changed')
self.display_changed = False
def on_override_radio_button_pressed(self, checked):
"""
Toggle screen state depending on check box state.
:param checked: The state of the check box (boolean).
"""
self.screen_combo_box.setDisabled(checked)
self.custom_X_value_edit.setEnabled(checked)
self.custom_Y_value_edit.setEnabled(checked)
self.custom_height_value_edit.setEnabled(checked)
self.custom_width_value_edit.setEnabled(checked)
self.display_changed = True
def on_display_changed(self):
"""
Called when the width, height, x position or y position has changed.
"""
self.display_changed = True
def on_logo_background_color_changed(self, color):
"""

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

@ -68,7 +68,7 @@ class Ui_MainWindow(object):
"""
This is the UI part of the main window.
"""
def setupUi(self, main_window):
def setup_ui(self, main_window):
"""
Set up the user interface
"""
@ -346,7 +346,7 @@ class Ui_MainWindow(object):
self.tools_menu.menuAction(), self.settings_menu.menuAction(), self.help_menu.menuAction()))
add_actions(self, [self.search_shortcut_action])
# Initialise the translation
self.retranslateUi(main_window)
self.retranslate_ui(main_window)
self.media_tool_box.setCurrentIndex(0)
# Connect up some signals and slots
self.file_menu.aboutToShow.connect(self.update_recent_files_menu)
@ -357,7 +357,7 @@ class Ui_MainWindow(object):
self.set_lock_panel(panel_locked)
self.settings_imported = False
def retranslateUi(self, main_window):
def retranslate_ui(self, main_window):
"""
Set up the translation system
"""
@ -510,10 +510,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, LogMixin, RegistryPropert
PluginManager(self)
ImageManager()
# Set up the interface
self.setupUi(self)
self.setup_ui(self)
# Define the media Dock Manager
self.media_dock_manager = MediaDockManager(self.media_tool_box)
# Load settings after setupUi so default UI sizes are overwritten
# Load settings after setup_ui so default UI sizes are overwritten
# Once settings are loaded update the menu with the recent files.
self.update_recent_files_menu()
self.plugin_form = PluginForm(self)

6
openlp/core/ui/media/playertab.py
View File

@ -61,12 +61,12 @@ class PlayerTab(SettingsTab):
player_translated = translate('OpenLP.PlayerTab', 'Players')
super(PlayerTab, self).__init__(parent, 'Players', player_translated)
def setupUi(self):
def setup_ui(self):
"""
Set up the UI
"""
self.setObjectName('MediaTab')
super(PlayerTab, self).setupUi()
super(PlayerTab, self).setup_ui()
self.background_color_group_box = QtWidgets.QGroupBox(self.left_column)
self.background_color_group_box.setObjectName('background_color_group_box')
self.form_layout = QtWidgets.QFormLayout(self.background_color_group_box)
@ -123,7 +123,7 @@ class PlayerTab(SettingsTab):
# Signals and slots
self.background_color_button.colorChanged.connect(self.on_background_color_changed)
def retranslateUi(self):
def retranslate_ui(self):
"""
Translate the UI on the fly
"""

6
openlp/core/ui/plugindialog.py
View File

@ -33,7 +33,7 @@ class Ui_PluginViewDialog(object):
"""
The UI of the plugin view dialog
"""
def setupUi(self, plugin_view_dialog):
def setup_ui(self, plugin_view_dialog):
"""
Set up the UI
"""
@ -66,9 +66,9 @@ class Ui_PluginViewDialog(object):
self.plugin_layout.addLayout(self.list_layout)
self.button_box = create_button_box(plugin_view_dialog, 'button_box', ['ok'])
self.plugin_layout.addWidget(self.button_box)
self.retranslateUi(plugin_view_dialog)
self.retranslate_ui(plugin_view_dialog)
def retranslateUi(self, plugin_view_dialog):
def retranslate_ui(self, plugin_view_dialog):
"""
Translate the UI on the fly
"""

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

@ -46,7 +46,7 @@ class PluginForm(QtWidgets.QDialog, Ui_PluginViewDialog, RegistryProperties):
QtCore.Qt.WindowCloseButtonHint)
self.active_plugin = None
self.programatic_change = False
self.setupUi(self)
self.setup_ui(self)
self.load()
self._clear_details()
# Right, now let's put some signals and slots together!

6
openlp/core/ui/printservicedialog.py
View File

@ -45,7 +45,7 @@ class Ui_PrintServiceDialog(object):
"""
The UI of the print service dialog
"""
def setupUi(self, print_service_dialog):
def setup_ui(self, print_service_dialog):
"""
Set up the UI
"""
@ -127,10 +127,10 @@ class Ui_PrintServiceDialog(object):
self.options_group_box.setLayout(self.group_layout)
self.options_layout.addWidget(self.options_group_box)
self.retranslateUi(print_service_dialog)
self.retranslate_ui(print_service_dialog)
self.options_button.toggled.connect(self.toggle_options)
def retranslateUi(self, print_service_dialog):
def retranslate_ui(self, print_service_dialog):
"""
Translate the UI on the fly
"""

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

@ -133,7 +133,7 @@ class PrintServiceForm(QtWidgets.QDialog, Ui_PrintServiceDialog, RegistryPropert
self.print_dialog = QtPrintSupport.QPrintDialog(self.printer, self)
self.document = QtGui.QTextDocument()
self.zoom = 0
self.setupUi(self)
self.setup_ui(self)
# Load the settings for the dialog.
settings = Settings()
settings.beginGroup('advanced')

6
openlp/core/ui/serviceitemeditdialog.py
View File

@ -33,7 +33,7 @@ class Ui_ServiceItemEditDialog(object):
"""
The UI widgets for the service item edit dialog
"""
def setupUi(self, serviceItemEditDialog):
def setup_ui(self, serviceItemEditDialog):
"""
Set up the UI
"""
@ -62,9 +62,9 @@ class Ui_ServiceItemEditDialog(object):
self.dialog_layout.addLayout(self.button_layout, 0, 1)
self.button_box = create_button_box(serviceItemEditDialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box, 1, 0, 1, 2)
self.retranslateUi(serviceItemEditDialog)
self.retranslate_ui(serviceItemEditDialog)
def retranslateUi(self, serviceItemEditDialog):
def retranslate_ui(self, serviceItemEditDialog):
"""
Translate the UI on the fly
"""

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

@ -39,7 +39,7 @@ class ServiceItemEditForm(QtWidgets.QDialog, Ui_ServiceItemEditDialog, RegistryP
"""
super(ServiceItemEditForm, self).__init__(Registry().get('main_window'), QtCore.Qt.WindowSystemMenuHint |
QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.item_list = []
self.list_widget.currentRowChanged.connect(self.on_current_row_changed)

8
openlp/core/ui/servicenoteform.py
View File

@ -41,8 +41,8 @@ class ServiceNoteForm(QtWidgets.QDialog, RegistryProperties):
"""
super(ServiceNoteForm, self).__init__(Registry().get('main_window'), QtCore.Qt.WindowSystemMenuHint |
QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
self.setupUi()
self.retranslateUi()
self.setup_ui()
self.retranslate_ui()
def exec(self):
"""
@ -51,7 +51,7 @@ class ServiceNoteForm(QtWidgets.QDialog, RegistryProperties):
self.text_edit.setFocus()
return QtWidgets.QDialog.exec(self)
def setupUi(self):
def setup_ui(self):
"""
Set up the UI of the dialog
"""
@ -66,7 +66,7 @@ class ServiceNoteForm(QtWidgets.QDialog, RegistryProperties):
self.button_box = create_button_box(self, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
def retranslateUi(self):
def retranslate_ui(self):
"""
Translate the UI on the fly
"""

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

@ -33,7 +33,7 @@ class Ui_SettingsDialog(object):
"""
The UI widgets of the settings dialog.
"""
def setupUi(self, settings_dialog):
def setup_ui(self, settings_dialog):
"""
Set up the UI
"""
@ -54,9 +54,9 @@ class Ui_SettingsDialog(object):
self.dialog_layout.addLayout(self.stacked_layout, 0, 1, 1, 1)
self.button_box = create_button_box(settings_dialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box, 1, 1, 1, 1)
self.retranslateUi(settings_dialog)
self.retranslate_ui(settings_dialog)
def retranslateUi(self, settings_dialog):
def retranslate_ui(self, settings_dialog):
"""
Translate the UI on the fly
"""

29
openlp/core/ui/settingsform.py
View File

@ -33,6 +33,7 @@ from openlp.core.lib import build_icon
from openlp.core.projectors.tab import ProjectorTab
from openlp.core.ui.advancedtab import AdvancedTab
from openlp.core.ui.generaltab import GeneralTab
from openlp.core.ui.screenstab import ScreensTab
from openlp.core.ui.themestab import ThemesTab
from openlp.core.ui.media import PlayerTab
from openlp.core.ui.settingsdialog import Ui_SettingsDialog
@ -53,7 +54,7 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
super(SettingsForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.processes = []
self.setupUi(self)
self.setup_ui(self)
self.setting_list_widget.currentRowChanged.connect(self.list_item_changed)
self.general_tab = None
self.themes_tab = None
@ -73,8 +74,9 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
# take at 0 and the rest shuffle up.
self.stacked_layout.takeAt(0)
self.insert_tab(self.general_tab)
self.insert_tab(self.themes_tab)
self.insert_tab(self.advanced_tab)
self.insert_tab(self.screens_tab)
self.insert_tab(self.themes_tab)
self.insert_tab(self.player_tab)
self.insert_tab(self.projector_tab)
self.insert_tab(self.api_tab)
@ -151,18 +153,17 @@ class SettingsForm(QtWidgets.QDialog, Ui_SettingsDialog, RegistryProperties):
"""
Run any post-setup code for the tabs on the form
"""
# General tab
self.general_tab = GeneralTab(self)
# Themes tab
self.themes_tab = ThemesTab(self)
# Projector Tab
self.projector_tab = ProjectorTab(self)
# Advanced tab
self.advanced_tab = AdvancedTab(self)
# Advanced tab
self.player_tab = PlayerTab(self)
# Api tab
self.api_tab = ApiTab(self)
try:
self.general_tab = GeneralTab(self)
self.themes_tab = ThemesTab(self)
self.projector_tab = ProjectorTab(self)
self.advanced_tab = AdvancedTab(self)
self.player_tab = PlayerTab(self)
self.api_tab = ApiTab(self)
self.screens_tab = ScreensTab(self)
except Exception as e:
print(e)
# Post setup
self.general_tab.post_set_up()
self.themes_tab.post_set_up()
self.advanced_tab.post_set_up()

6
openlp/core/ui/shortcutlistdialog.py
View File

@ -67,7 +67,7 @@ class Ui_ShortcutListDialog(object):
"""
The UI widgets for the shortcut dialog.
"""
def setupUi(self, shortcutListDialog):
def setup_ui(self, shortcutListDialog):
"""
Set up the UI
"""
@ -130,9 +130,9 @@ class Ui_ShortcutListDialog(object):
self.button_box = create_button_box(shortcutListDialog, 'button_box', ['cancel', 'ok', 'defaults'])
self.button_box.setOrientation(QtCore.Qt.Horizontal)
self.shortcut_list_layout.addWidget(self.button_box)
self.retranslateUi(shortcutListDialog)
self.retranslate_ui(shortcutListDialog)
def retranslateUi(self, shortcutListDialog):
def retranslate_ui(self, shortcutListDialog):
"""
Translate the UI on the fly
"""

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

@ -49,7 +49,7 @@ class ShortcutListForm(QtWidgets.QDialog, Ui_ShortcutListDialog, RegistryPropert
"""
super(ShortcutListForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.changed_actions = {}
self.action_list = ActionList.get_instance()
self.dialog_was_shown = False

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

@ -35,9 +35,9 @@ class SplashScreen(QtWidgets.QSplashScreen):
Constructor
"""
super(SplashScreen, self).__init__()
self.setupUi()
self.setup_ui()
def setupUi(self):
def setup_ui(self):
"""
Set up the UI
"""

6
openlp/core/ui/starttimedialog.py
View File

@ -33,7 +33,7 @@ class Ui_StartTimeDialog(object):
"""
The UI widgets for the time dialog
"""
def setupUi(self, StartTimeDialog):
def setup_ui(self, StartTimeDialog):
"""
Set up the UI
"""
@ -107,10 +107,10 @@ class Ui_StartTimeDialog(object):
self.dialog_layout.addWidget(self.second_spin_box, 3, 1, 1, 1)
self.button_box = create_button_box(StartTimeDialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box, 5, 2, 1, 2)
self.retranslateUi(StartTimeDialog)
self.retranslate_ui(StartTimeDialog)
self.setMaximumHeight(self.sizeHint().height())
def retranslateUi(self, StartTimeDialog):
def retranslate_ui(self, StartTimeDialog):
"""
Update the translations on the fly
"""

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

@ -41,7 +41,7 @@ class StartTimeForm(QtWidgets.QDialog, Ui_StartTimeDialog, RegistryProperties):
"""
super(StartTimeForm, self).__init__(Registry().get('main_window'), QtCore.Qt.WindowSystemMenuHint |
QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self):
"""

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

@ -60,7 +60,7 @@ class ThemeForm(QtWidgets.QWizard, Ui_ThemeWizard, RegistryProperties):
"""
Set up the class. This method is mocked out by the tests.
"""
self.setupUi(self)
self.setup_ui(self)
self.registerFields()
self.update_theme_allowed = True
self.temp_background_filename = None

6
openlp/core/ui/themelayoutdialog.py
View File

@ -33,7 +33,7 @@ class Ui_ThemeLayoutDialog(object):
"""
The layout of the theme
"""
def setupUi(self, themeLayoutDialog):
def setup_ui(self, themeLayoutDialog):
"""
Set up the UI
"""
@ -62,9 +62,9 @@ class Ui_ThemeLayoutDialog(object):
self.preview_layout.addWidget(self.footer_colour_label)
self.button_box = create_button_box(themeLayoutDialog, 'button_box', ['ok'])
self.preview_layout.addWidget(self.button_box)
self.retranslateUi(themeLayoutDialog)
self.retranslate_ui(themeLayoutDialog)
def retranslateUi(self, themeLayoutDialog):
def retranslate_ui(self, themeLayoutDialog):
"""
Translate the UI on the fly
"""

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

@ -36,7 +36,7 @@ class ThemeLayoutForm(QtWidgets.QDialog, Ui_ThemeLayoutDialog):
Constructor
"""
super(ThemeLayoutForm, self).__init__(parent)
self.setupUi(self)
self.setup_ui(self)
def exec(self, image):
"""

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

@ -45,12 +45,12 @@ class ThemesTab(SettingsTab):
theme_translated = translate('OpenLP.ThemesTab', 'Themes')
super(ThemesTab, self).__init__(parent, 'Themes', theme_translated)
def setupUi(self):
def setup_ui(self):
"""
Set up the UI
"""
self.setObjectName('ThemesTab')
super(ThemesTab, self).setupUi()
super(ThemesTab, self).setup_ui()
self.global_group_box = QtWidgets.QGroupBox(self.left_column)
self.global_group_box.setObjectName('global_group_box')
self.global_group_box_layout = QtWidgets.QVBoxLayout(self.global_group_box)
@ -109,7 +109,7 @@ class ThemesTab(SettingsTab):
self.default_combo_box.activated.connect(self.on_default_combo_box_changed)
Registry().register_function('theme_update_list', self.update_theme_list)
def retranslateUi(self):
def retranslate_ui(self):
"""
Translate the UI on the fly
"""

6
openlp/core/ui/themewizard.py
View File

@ -37,7 +37,7 @@ class Ui_ThemeWizard(object):
"""
The Create/Edit theme wizard
"""
def setupUi(self, theme_wizard):
def setup_ui(self, theme_wizard):
"""
Set up the UI
"""
@ -375,7 +375,7 @@ class Ui_ThemeWizard(object):
self.preview_area_layout.addWidget(self.preview_box_label)
self.preview_layout.addWidget(self.preview_area)
theme_wizard.addPage(self.preview_page)
self.retranslateUi(theme_wizard)
self.retranslate_ui(theme_wizard)
self.background_combo_box.currentIndexChanged.connect(self.background_stack.setCurrentIndex)
self.outline_check_box.toggled.connect(self.outline_color_button.setEnabled)
self.outline_check_box.toggled.connect(self.outline_size_spin_box.setEnabled)
@ -390,7 +390,7 @@ class Ui_ThemeWizard(object):
self.footer_position_check_box.toggled.connect(self.footer_width_spin_box.setDisabled)
self.footer_position_check_box.toggled.connect(self.footer_height_spin_box.setDisabled)
def retranslateUi(self, theme_wizard):
def retranslate_ui(self, theme_wizard):
"""
Translate the UI on the fly
"""

6
openlp/core/widgets/wizard.py
View File

@ -110,7 +110,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
self.delete_icon = UiIcons().delete
self.finish_button = self.button(QtWidgets.QWizard.FinishButton)
self.cancel_button = self.button(QtWidgets.QWizard.CancelButton)
self.setupUi(image)
self.setup_ui(image)
self.register_fields()
self.custom_init()
self.custom_signals()
@ -119,7 +119,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
self.error_copy_to_button.clicked.connect(self.on_error_copy_to_button_clicked)
self.error_save_to_button.clicked.connect(self.on_error_save_to_button_clicked)
def setupUi(self, image):
def setup_ui(self, image):
"""
Set up the wizard UI.
:param image: path to start up image
@ -136,7 +136,7 @@ class OpenLPWizard(QtWidgets.QWizard, RegistryProperties):
self.add_custom_pages()
if self.with_progress_page:
self.add_progress_page()
self.retranslateUi()
self.retranslate_ui()
def register_fields(self):
"""

2
openlp/plugins/alerts/forms/__init__.py
View File

@ -35,7 +35,7 @@ mentioned above, like so::
def __init__(self, parent=None):
super(AuthorsForm, self).__init__(parent)
self.setupUi(self)
self.setup_ui(self)
This allows OpenLP to use ``self.object`` for all the GUI elements while keeping them separate from the functionality,
so that it is easier to recreate the GUI from the .ui files later if necessary.

6
openlp/plugins/alerts/forms/alertdialog.py
View File

@ -31,7 +31,7 @@ class Ui_AlertDialog(object):
"""
Alert UI Class
"""
def setupUi(self, alert_dialog):
def setup_ui(self, alert_dialog):
"""
Setup the Alert UI dialog
@ -83,9 +83,9 @@ class Ui_AlertDialog(object):
self.button_box = create_button_box(alert_dialog, 'button_box', ['close'],
[self.display_button, self.display_close_button])
self.alert_dialog_layout.addWidget(self.button_box, 2, 0, 1, 2)
self.retranslateUi(alert_dialog)
self.retranslate_ui(alert_dialog)
def retranslateUi(self, alert_dialog):
def retranslate_ui(self, alert_dialog):
"""
Retranslate the UI strings

2
openlp/plugins/alerts/forms/alertform.py
View File

@ -41,7 +41,7 @@ class AlertForm(QtWidgets.QDialog, Ui_AlertDialog):
self.manager = plugin.manager
self.plugin = plugin
self.item_id = None
self.setupUi(self)
self.setup_ui(self)
self.display_button.clicked.connect(self.on_display_clicked)
self.display_close_button.clicked.connect(self.on_display_close_clicked)
self.alert_text_edit.textChanged.connect(self.on_text_changed)

6
openlp/plugins/alerts/lib/alertstab.py
View File

@ -33,9 +33,9 @@ class AlertsTab(SettingsTab):
"""
AlertsTab is the alerts settings tab in the settings dialog.
"""
def setupUi(self):
def setup_ui(self):
self.setObjectName('AlertsTab')
super(AlertsTab, self).setupUi()
super(AlertsTab, self).setup_ui()
self.font_group_box = QtWidgets.QGroupBox(self.left_column)
self.font_group_box.setObjectName('font_group_box')
self.font_layout = QtWidgets.QFormLayout(self.font_group_box)
@ -93,7 +93,7 @@ class AlertsTab(SettingsTab):
self.timeout_spin_box.valueChanged.connect(self.on_timeout_spin_box_changed)
self.font_size_spin_box.valueChanged.connect(self.on_font_size_spin_box_changed)
def retranslateUi(self):
def retranslate_ui(self):
self.font_group_box.setTitle(translate('AlertsPlugin.AlertsTab', 'Font'))
self.font_label.setText(translate('AlertsPlugin.AlertsTab', 'Font name:'))
self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:'))

6
openlp/plugins/bibles/forms/bibleimportform.py
View File

@ -82,11 +82,11 @@ class BibleImportForm(OpenLPWizard):
super(BibleImportForm, self).__init__(parent, bible_plugin,
'bibleImportWizard', ':/wizards/wizard_importbible.bmp')
def setupUi(self, image):
def setup_ui(self, image):
"""
Set up the UI for the bible wizard.
"""
super(BibleImportForm, self).setupUi(image)
super(BibleImportForm, self).setup_ui(image)
self.format_combo_box.currentIndexChanged.connect(self.on_current_index_changed)
def on_current_index_changed(self, index):
@ -388,7 +388,7 @@ class BibleImportForm(OpenLPWizard):
self.license_details_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.full_license_edit)
self.addPage(self.license_details_page)
def retranslateUi(self):
def retranslate_ui(self):
"""
Allow for localisation of the bible import wizard.
"""

6
openlp/plugins/bibles/forms/booknamedialog.py
View File

@ -28,7 +28,7 @@ from openlp.core.ui.icons import UiIcons
class Ui_BookNameDialog(object):
def setupUi(self, book_name_dialog):
def setup_ui(self, book_name_dialog):
book_name_dialog.setObjectName('book_name_dialog')
book_name_dialog.setWindowIcon(UiIcons().main_icon)
book_name_dialog.resize(400, 271)
@ -79,9 +79,9 @@ class Ui_BookNameDialog(object):
self.button_box = create_button_box(book_name_dialog, 'button_box', ['cancel', 'ok'])
self.book_name_layout.addWidget(self.button_box)
self.retranslateUi(book_name_dialog)
self.retranslate_ui(book_name_dialog)
def retranslateUi(self, book_name_dialog):
def retranslate_ui(self, book_name_dialog):
book_name_dialog.setWindowTitle(translate('BiblesPlugin.BookNameDialog', 'Select Book Name'))
self.info_label.setText(
translate('BiblesPlugin.BookNameDialog', 'The following book name cannot be matched up internally. '

2
openlp/plugins/bibles/forms/booknameform.py
View File

@ -51,7 +51,7 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
"""
super(BookNameForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.custom_signals()
self.book_names = BibleStrings().BookNames
self.book_id = False

6
openlp/plugins/bibles/forms/editbibledialog.py
View File

@ -30,7 +30,7 @@ from openlp.core.ui.icons import UiIcons
class Ui_EditBibleDialog(object):
def setupUi(self, edit_bible_dialog):
def setup_ui(self, edit_bible_dialog):
edit_bible_dialog.setObjectName('edit_bible_dialog')
edit_bible_dialog.setWindowIcon(UiIcons().main_icon)
edit_bible_dialog.resize(520, 400)
@ -125,10 +125,10 @@ class Ui_EditBibleDialog(object):
self.dialog_layout.addWidget(self.bible_tab_widget)
self.button_box = create_button_box(edit_bible_dialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(edit_bible_dialog)
self.retranslate_ui(edit_bible_dialog)
QtCore.QMetaObject.connectSlotsByName(edit_bible_dialog)
def retranslateUi(self, edit_bible_dialog):
def retranslate_ui(self, edit_bible_dialog):
self.book_names = BibleStrings().BookNames
edit_bible_dialog.setWindowTitle(translate('BiblesPlugin.EditBibleForm', 'Bible Editor'))
# Meta tab

2
openlp/plugins/bibles/forms/editbibleform.py
View File

@ -49,7 +49,7 @@ class EditBibleForm(QtWidgets.QDialog, Ui_EditBibleDialog, RegistryProperties):
QtCore.Qt.WindowCloseButtonHint)
self.media_item = media_item
self.book_names = BibleStrings().BookNames
self.setupUi(self)
self.setup_ui(self)
self.manager = manager
def load_bible(self, bible):

6
openlp/plugins/bibles/forms/languagedialog.py
View File

@ -28,7 +28,7 @@ from openlp.core.ui.icons import UiIcons
class Ui_LanguageDialog(object):
def setupUi(self, language_dialog):
def setup_ui(self, language_dialog):
language_dialog.setObjectName('language_dialog')
language_dialog.setWindowIcon(UiIcons().main_icon)
language_dialog.resize(400, 165)
@ -61,9 +61,9 @@ class Ui_LanguageDialog(object):
self.button_box = create_button_box(language_dialog, 'button_box', ['cancel', 'ok'])
self.language_layout.addWidget(self.button_box)
self.retranslateUi(language_dialog)
self.retranslate_ui(language_dialog)
def retranslateUi(self, language_dialog):
def retranslate_ui(self, language_dialog):
language_dialog.setWindowTitle(translate('BiblesPlugin.LanguageDialog', 'Select Language'))
self.bible_label.setText(translate('BiblesPlugin.LanguageDialog', ''))
self.info_label.setText(

2
openlp/plugins/bibles/forms/languageform.py
View File

@ -47,7 +47,7 @@ class LanguageForm(QDialog, Ui_LanguageDialog):
"""
super(LanguageForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self, bible_name):
if bible_name:

6
openlp/plugins/bibles/lib/biblestab.py
View File

@ -47,9 +47,9 @@ class BiblesTab(SettingsTab):
self.display_style = 0
super().__init__(*args, **kwargs)
def setupUi(self):
def setup_ui(self):
self.setObjectName('BiblesTab')
super(BiblesTab, self).setupUi()
super(BiblesTab, self).setup_ui()
self.verse_display_group_box = QtWidgets.QGroupBox(self.left_column)
self.verse_display_group_box.setObjectName('verse_display_group_box')
self.verse_display_layout = QtWidgets.QFormLayout(self.verse_display_group_box)
@ -174,7 +174,7 @@ class BiblesTab(SettingsTab):
self.bible_search_while_typing_check_box.stateChanged.connect(
self.on_bible_search_while_typing_check_box_changed)
def retranslateUi(self):
def retranslate_ui(self):
self.verse_display_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Verse Display'))
self.is_verse_number_visible_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Show verse numbers'))
self.new_chapters_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Only show new chapter numbers'))

8
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -233,8 +233,8 @@ class BibleMediaItem(MediaManagerItem):
self.results_view_tab.setCurrentIndex(ResultsTab.Search)
self.page_layout.addWidget(self.results_view_tab)
def setupUi(self):
super().setupUi()
def setup_ui(self):
super().setup_ui()
sort_model = QtCore.QSortFilterProxyModel(self.select_book_combo_box)
model = self.select_book_combo_box.model()
# Reparent the combo box model to the sort proxy, otherwise it will be deleted when we change the comobox's
@ -268,8 +268,8 @@ class BibleMediaItem(MediaManagerItem):
self.on_results_view_tab_total_update(ResultsTab.Saved)
self.on_results_view_tab_total_update(ResultsTab.Search)
def retranslateUi(self):
log.debug('retranslateUi')
def retranslate_ui(self):
log.debug('retranslate_ui')
self.chapter_label.setText(translate('BiblesPlugin.MediaItem', 'Chapter:'))
self.verse_label.setText(translate('BiblesPlugin.MediaItem', 'Verse:'))
self.style_combo_box.setItemText(LayoutStyle.VersePerSlide, UiStrings().VersePerSlide)

6
openlp/plugins/custom/forms/editcustomdialog.py
View File

@ -27,7 +27,7 @@ from openlp.core.ui.icons import UiIcons
class Ui_CustomEditDialog(object):
def setupUi(self, custom_edit_dialog):
def setup_ui(self, custom_edit_dialog):
"""
Build the Edit Dialog UI
:param custom_edit_dialog: The Dialog
@ -98,9 +98,9 @@ class Ui_CustomEditDialog(object):
self.button_box = create_button_box(custom_edit_dialog, 'button_box', ['cancel', 'save'],
[self.preview_button])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(custom_edit_dialog)
self.retranslate_ui(custom_edit_dialog)
def retranslateUi(self, custom_edit_dialog):
def retranslate_ui(self, custom_edit_dialog):
custom_edit_dialog.setWindowTitle(translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
self.title_label.setText(translate('CustomPlugin.EditCustomForm', '&Title:'))
self.add_button.setText(UiStrings().Add)

2
openlp/plugins/custom/forms/editcustomform.py
View File

@ -49,7 +49,7 @@ class EditCustomForm(QtWidgets.QDialog, Ui_CustomEditDialog):
QtCore.Qt.WindowCloseButtonHint)
self.manager = manager
self.media_item = media_item
self.setupUi(self)
self.setup_ui(self)
# Create other objects and forms.
self.edit_slide_form = EditCustomSlideForm(self)
# Connecting signals and slots

6
openlp/plugins/custom/forms/editcustomslidedialog.py
View File

@ -29,7 +29,7 @@ from openlp.core.widgets.edits import SpellTextEdit
class Ui_CustomSlideEditDialog(object):
def setupUi(self, custom_slide_edit_dialog):
def setup_ui(self, custom_slide_edit_dialog):
custom_slide_edit_dialog.setObjectName('custom_slide_edit_dialog')
custom_slide_edit_dialog.setWindowIcon(UiIcons().main_icon)
custom_slide_edit_dialog.resize(350, 300)
@ -42,9 +42,9 @@ class Ui_CustomSlideEditDialog(object):
self.button_box = create_button_box(custom_slide_edit_dialog, 'button_box', ['cancel', 'save'],
[self.split_button, self.insert_button])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(custom_slide_edit_dialog)
self.retranslate_ui(custom_slide_edit_dialog)
def retranslateUi(self, custom_slide_edit_dialog):
def retranslate_ui(self, custom_slide_edit_dialog):
custom_slide_edit_dialog.setWindowTitle(translate('CustomPlugin.EditVerseForm', 'Edit Slide'))
self.split_button.setText(UiStrings().Split)
self.split_button.setToolTip(UiStrings().SplitToolTip)

2
openlp/plugins/custom/forms/editcustomslideform.py
View File

@ -41,7 +41,7 @@ class EditCustomSlideForm(QtWidgets.QDialog, Ui_CustomSlideEditDialog):
"""
super(EditCustomSlideForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
# Connecting signals and slots
self.insert_button.clicked.connect(self.on_insert_button_clicked)
self.split_button.clicked.connect(self.on_split_button_clicked)

6
openlp/plugins/custom/lib/customtab.py
View File

@ -34,9 +34,9 @@ class CustomTab(SettingsTab):
"""
CustomTab is the Custom settings tab in the settings dialog.
"""
def setupUi(self):
def setup_ui(self):
self.setObjectName('CustomTab')
super(CustomTab, self).setupUi()
super(CustomTab, self).setup_ui()
self.custom_mode_group_box = QtWidgets.QGroupBox(self.left_column)
self.custom_mode_group_box.setObjectName('custom_mode_group_box')
self.custom_mode_layout = QtWidgets.QFormLayout(self.custom_mode_group_box)
@ -53,7 +53,7 @@ class CustomTab(SettingsTab):
self.display_footer_check_box.stateChanged.connect(self.on_display_footer_check_box_changed)
self.add_from_service_checkbox.stateChanged.connect(self.on_add_from_service_check_box_changed)
def retranslateUi(self):
def retranslate_ui(self):
self.custom_mode_group_box.setTitle(translate('CustomPlugin.CustomTab', 'Custom Display'))
self.display_footer_check_box.setText(translate('CustomPlugin.CustomTab', 'Display footer'))
self.add_from_service_checkbox.setText(translate('CustomPlugin.CustomTab',

2
openlp/plugins/custom/lib/mediaitem.py
View File

@ -102,7 +102,7 @@ class CustomMediaItem(MediaManagerItem):
self.add_custom_from_service = Settings().value(self.settings_section + '/add custom from service')
self.is_search_as_you_type_enabled = Settings().value('advanced/search as type')
def retranslateUi(self):
def retranslate_ui(self):
"""
"""

2
openlp/plugins/images/forms/__init__.py
View File

@ -35,7 +35,7 @@ mentioned above, like so::
def __init__(self, parent=None):
super(AuthorsForm, self).__init__(parent)
self.setupUi(self)
self.setup_ui(self)
This allows OpenLP to use ``self.object`` for all the GUI elements while keeping them separate from the functionality,
so that it is easier to recreate the GUI from the .ui files later if necessary.

6
openlp/plugins/images/forms/addgroupdialog.py
View File

@ -27,7 +27,7 @@ from openlp.core.lib.ui import create_button_box
class Ui_AddGroupDialog(object):
def setupUi(self, add_group_dialog):
def setup_ui(self, add_group_dialog):
add_group_dialog.setObjectName('add_group_dialog')
add_group_dialog.resize(300, 10)
self.dialog_layout = QtWidgets.QVBoxLayout(add_group_dialog)
@ -48,10 +48,10 @@ class Ui_AddGroupDialog(object):
self.dialog_layout.addLayout(self.name_layout)
self.button_box = create_button_box(add_group_dialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(add_group_dialog)
self.retranslate_ui(add_group_dialog)
add_group_dialog.setMaximumHeight(add_group_dialog.sizeHint().height())
def retranslateUi(self, add_group_dialog):
def retranslate_ui(self, add_group_dialog):
add_group_dialog.setWindowTitle(translate('ImagePlugin.AddGroupForm', 'Add group'))
self.parent_group_label.setText(translate('ImagePlugin.AddGroupForm', 'Parent group:'))
self.name_label.setText(translate('ImagePlugin.AddGroupForm', 'Group name:'))

2
openlp/plugins/images/forms/addgroupform.py
View File

@ -37,7 +37,7 @@ class AddGroupForm(QtWidgets.QDialog, Ui_AddGroupDialog):
"""
super(AddGroupForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self, clear=True, show_top_level_group=False, selected_group=None):
"""

6
openlp/plugins/images/forms/choosegroupdialog.py
View File

@ -30,7 +30,7 @@ class Ui_ChooseGroupDialog(object):
"""
The UI for the "Choose Image Group" form.
"""
def setupUi(self, choose_group_dialog):
def setup_ui(self, choose_group_dialog):
"""
Set up the UI.
@ -69,10 +69,10 @@ class Ui_ChooseGroupDialog(object):
self.group_button_box = create_button_box(choose_group_dialog, 'buttonBox', ['ok'])
self.choose_group_layout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.group_button_box)
self.retranslateUi(choose_group_dialog)
self.retranslate_ui(choose_group_dialog)
QtCore.QMetaObject.connectSlotsByName(choose_group_dialog)
def retranslateUi(self, choose_group_dialog):
def retranslate_ui(self, choose_group_dialog):
"""
Translate the UI on the fly.

2
openlp/plugins/images/forms/choosegroupform.py
View File

@ -35,7 +35,7 @@ class ChooseGroupForm(QtWidgets.QDialog, Ui_ChooseGroupDialog):
"""
super(ChooseGroupForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self, selected_group=None):
"""

6
openlp/plugins/images/lib/imagetab.py
View File

@ -32,9 +32,9 @@ class ImageTab(SettingsTab):
"""
ImageTab is the images settings tab in the settings dialog.
"""
def setupUi(self):
def setup_ui(self):
self.setObjectName('ImagesTab')
super(ImageTab, self).setupUi()
super(ImageTab, self).setup_ui()
self.background_color_group_box = QtWidgets.QGroupBox(self.left_column)
self.background_color_group_box.setObjectName('background_color_group_box')
self.form_layout = QtWidgets.QFormLayout(self.background_color_group_box)
@ -58,7 +58,7 @@ class ImageTab(SettingsTab):
# Signals and slots
self.background_color_button.colorChanged.connect(self.on_background_color_changed)
def retranslateUi(self):
def retranslate_ui(self):
self.background_color_group_box.setTitle(UiStrings().BackgroundColor)
self.background_color_label.setText(UiStrings().BackgroundColorColon)
self.information_label.setText(

2
openlp/plugins/images/lib/mediaitem.py
View File

@ -76,7 +76,7 @@ class ImageMediaItem(MediaManagerItem):
# Allow DnD from the desktop.
self.list_view.activateDnD()
def retranslateUi(self):
def retranslate_ui(self):
self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
file_formats = get_images_filter()
self.on_new_file_masks = '{formats};;{files} (*)'.format(formats=file_formats, files=UiStrings().AllFiles)

6
openlp/plugins/media/forms/mediaclipselectordialog.py
View File

@ -28,7 +28,7 @@ from openlp.core.ui.icons import UiIcons
class Ui_MediaClipSelector(object):
def setupUi(self, media_clip_selector):
def setup_ui(self, media_clip_selector):
media_clip_selector.setObjectName('media_clip_selector')
media_clip_selector.resize(554, 654)
self.combobox_size_policy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding,
@ -161,7 +161,7 @@ class Ui_MediaClipSelector(object):
self.save_button = self.button_box.button(QtWidgets.QDialogButtonBox.Save)
self.main_layout.addWidget(self.button_box)
self.retranslateUi(media_clip_selector)
self.retranslate_ui(media_clip_selector)
self.button_box.accepted.connect(media_clip_selector.accept)
self.button_box.rejected.connect(media_clip_selector.reject)
QtCore.QMetaObject.connectSlotsByName(media_clip_selector)
@ -181,7 +181,7 @@ class Ui_MediaClipSelector(object):
media_clip_selector.setTabOrder(self.jump_end_button, self.save_button)
media_clip_selector.setTabOrder(self.save_button, self.close_button)
def retranslateUi(self, media_clip_selector):
def retranslate_ui(self, media_clip_selector):
media_clip_selector.setWindowTitle(translate('MediaPlugin.MediaClipSelector', 'Select Media Clip'))
self.source_groupbox.setTitle(translate('MediaPlugin.MediaClipSelector', 'Source'))
self.media_path_label.setText(translate('MediaPlugin.MediaClipSelector', 'Media path:'))

2
openlp/plugins/media/forms/mediaclipselectorform.py
View File

@ -65,7 +65,7 @@ class MediaClipSelectorForm(QtWidgets.QDialog, Ui_MediaClipSelector, RegistryPro
self.audio_cd = False
self.playback_length = 0
self.media_item = media_item
self.setupUi(self)
self.setup_ui(self)
# setup play/pause icon
self.play_icon = UiIcons().play
self.pause_icon = UiIcons().pause

2
openlp/plugins/media/lib/mediaitem.py
View File

@ -86,7 +86,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties):
# Allow DnD from the desktop
self.list_view.activateDnD()
def retranslateUi(self):
def retranslate_ui(self):
"""
This method is called automatically to provide OpenLP with the opportunity to translate the ``MediaManagerItem``
to another language.

6
openlp/plugins/media/lib/mediatab.py
View File

@ -35,9 +35,9 @@ class MediaTab(SettingsTab):
self.parent = parent
super(MediaTab, self).__init__(parent, title, visible_title, icon_path)
def setupUi(self):
def setup_ui(self):
self.setObjectName('MediaTab')
super(MediaTab, self).setupUi()
super(MediaTab, self).setup_ui()
self.advanced_group_box = QtWidgets.QGroupBox(self.left_column)
self.advanced_group_box.setObjectName('advanced_group_box')
self.advanced_layout = QtWidgets.QVBoxLayout(self.advanced_group_box)
@ -52,7 +52,7 @@ class MediaTab(SettingsTab):
self.left_layout.addStretch()
self.right_layout.addStretch()
def retranslateUi(self):
def retranslate_ui(self):
self.advanced_group_box.setTitle(UiStrings().Advanced)
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 new Live media automatically'))

2
openlp/plugins/presentations/lib/mediaitem.py
View File

@ -56,7 +56,7 @@ class PresentationMediaItem(MediaManagerItem):
self.controllers = controllers
super(PresentationMediaItem, self).__init__(parent, plugin)
def retranslateUi(self):
def retranslate_ui(self):
"""
The name of the plugin media displayed in UI
"""

6
openlp/plugins/presentations/lib/presentationtab.py
View File

@ -42,12 +42,12 @@ class PresentationTab(SettingsTab):
super(PresentationTab, self).__init__(parent, title, visible_title, icon_path)
self.activated = False
def setupUi(self):
def setup_ui(self):
"""
Create the controls for the settings tab
"""
self.setObjectName('PresentationTab')
super(PresentationTab, self).setupUi()
super(PresentationTab, self).setup_ui()
self.controllers_group_box = QtWidgets.QGroupBox(self.left_column)
self.controllers_group_box.setObjectName('controllers_group_box')
self.controllers_layout = QtWidgets.QVBoxLayout(self.controllers_group_box)
@ -99,7 +99,7 @@ class PresentationTab(SettingsTab):
self.program_path_edit.pathChanged.connect(self.on_program_path_edit_path_changed)
self.pdf_program_check_box.clicked.connect(self.program_path_edit.setEnabled)
def retranslateUi(self):
def retranslate_ui(self):
"""
Make any translation changes
"""

2
openlp/plugins/songs/forms/__init__.py
View File

@ -39,7 +39,7 @@ mentioned above, like so::
def __init__(self, parent=None):
super(AuthorsForm, self).__init__(parent)
self.setupUi(self)
self.setup_ui(self)
This allows OpenLP to use ``self.object`` for all the GUI elements while keeping
them separate from the functionality, so that it is easier to recreate the GUI

6
openlp/plugins/songs/forms/authorsdialog.py
View File

@ -32,7 +32,7 @@ class Ui_AuthorsDialog(object):
The :class:`~openlp.plugins.songs.forms.authorsdialog.Ui_AuthorsDialog` class defines the user interface for the
AuthorsForm dialog.
"""
def setupUi(self, authors_dialog):
def setup_ui(self, authors_dialog):
"""
Set up the UI for the dialog.
"""
@ -65,10 +65,10 @@ class Ui_AuthorsDialog(object):
self.dialog_layout.addLayout(self.author_layout)
self.button_box = create_button_box(authors_dialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(authors_dialog)
self.retranslate_ui(authors_dialog)
authors_dialog.setMaximumHeight(authors_dialog.sizeHint().height())
def retranslateUi(self, authors_dialog):
def retranslate_ui(self, authors_dialog):
"""
Translate the UI on the fly.
"""

2
openlp/plugins/songs/forms/authorsform.py
View File

@ -37,7 +37,7 @@ class AuthorsForm(QtWidgets.QDialog, Ui_AuthorsDialog):
"""
super(AuthorsForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.auto_display_name = False
self.first_name_edit.textEdited.connect(self.on_first_name_edited)
self.last_name_edit.textEdited.connect(self.on_last_name_edited)

2
openlp/plugins/songs/forms/duplicatesongremovalform.py
View File

@ -129,7 +129,7 @@ class DuplicateSongRemovalForm(OpenLPWizard, RegistryProperties):
self.dummy_page = QtWidgets.QWizardPage()
self.dummy_page_id = self.addPage(self.dummy_page)
def retranslateUi(self):
def retranslate_ui(self):
"""
Song wizard localisation.
"""

6
openlp/plugins/songs/forms/editsongdialog.py
View File

@ -34,7 +34,7 @@ class Ui_EditSongDialog(object):
The :class:`~openlp.plugins.songs.forms.editsongdialog.Ui_EditSongDialog` class defines the user interface for the
EditSongForm dialog.
"""
def setupUi(self, edit_song_dialog):
def setup_ui(self, edit_song_dialog):
edit_song_dialog.setObjectName('edit_song_dialog')
edit_song_dialog.setWindowIcon(UiIcons().main_icon)
edit_song_dialog.resize(900, 600)
@ -293,9 +293,9 @@ class Ui_EditSongDialog(object):
self.button_box = create_button_box(edit_song_dialog, 'button_box', ['cancel', 'save'])
self.bottom_layout.addWidget(self.button_box)
self.dialog_layout.addLayout(self.bottom_layout)
self.retranslateUi(edit_song_dialog)
self.retranslate_ui(edit_song_dialog)
def retranslateUi(self, edit_song_dialog):
def retranslate_ui(self, edit_song_dialog):
"""
Translate the UI on the fly.
"""

2
openlp/plugins/songs/forms/editsongform.py
View File

@ -64,7 +64,7 @@ class EditSongForm(QtWidgets.QDialog, Ui_EditSongDialog, RegistryProperties):
self.song = None
# can this be automated?
self.width = 400
self.setupUi(self)
self.setup_ui(self)
# Connecting signals and slots
self.author_add_button.clicked.connect(self.on_author_add_button_clicked)
self.author_edit_button.clicked.connect(self.on_author_edit_button_clicked)

6
openlp/plugins/songs/forms/editversedialog.py
View File

@ -31,7 +31,7 @@ from openlp.plugins.songs.lib import VerseType
class Ui_EditVerseDialog(object):
def setupUi(self, edit_verse_dialog):
def setup_ui(self, edit_verse_dialog):
edit_verse_dialog.setObjectName('edit_verse_dialog')
edit_verse_dialog.setWindowIcon(UiIcons().main_icon)
edit_verse_dialog.resize(400, 400)
@ -86,9 +86,9 @@ class Ui_EditVerseDialog(object):
self.dialog_layout.addLayout(self.transpose_layout)
self.button_box = create_button_box(edit_verse_dialog, 'button_box', ['cancel', 'ok'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(edit_verse_dialog)
self.retranslate_ui(edit_verse_dialog)
def retranslateUi(self, edit_verse_dialog):
def retranslate_ui(self, edit_verse_dialog):
edit_verse_dialog.setWindowTitle(translate('SongsPlugin.EditVerseForm', 'Edit Verse'))
self.verse_type_label.setText(translate('SongsPlugin.EditVerseForm', '&Verse type:'))
self.verse_type_combo_box.setItemText(VerseType.Verse, VerseType.translated_names[VerseType.Verse])

2
openlp/plugins/songs/forms/editverseform.py
View File

@ -46,7 +46,7 @@ class EditVerseForm(QtWidgets.QDialog, Ui_EditVerseDialog):
"""
super(EditVerseForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.has_single_verse = False
self.insert_button.clicked.connect(self.on_insert_button_clicked)
self.overflow_split_button.clicked.connect(self.on_overflow_split_button_clicked)

6
openlp/plugins/songs/forms/mediafilesdialog.py
View File

@ -31,7 +31,7 @@ class Ui_MediaFilesDialog(object):
"""
The user interface for the media files dialog.
"""
def setupUi(self, media_files_dialog):
def setup_ui(self, media_files_dialog):
"""
Set up the user interface.
"""
@ -55,9 +55,9 @@ class Ui_MediaFilesDialog(object):
self.files_vertical_layout.addWidget(self.file_list_widget)
self.button_box = create_button_box(media_files_dialog, 'button_box', ['cancel', 'ok'])
self.files_vertical_layout.addWidget(self.button_box)
self.retranslateUi(media_files_dialog)
self.retranslate_ui(media_files_dialog)
def retranslateUi(self, media_files_dialog):
def retranslate_ui(self, media_files_dialog):
"""
Translate the UI on the fly.

2
openlp/plugins/songs/forms/mediafilesform.py
View File

@ -38,7 +38,7 @@ class MediaFilesForm(QtWidgets.QDialog, Ui_MediaFilesDialog):
def __init__(self, parent):
super(MediaFilesForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def populate_files(self, file_paths):
"""

6
openlp/plugins/songs/forms/songbookdialog.py
View File

@ -31,7 +31,7 @@ class Ui_SongBookDialog(object):
"""
The user interface for the Songbook dialog.
"""
def setupUi(self, song_book_dialog):
def setup_ui(self, song_book_dialog):
"""
Set up the user interface.
"""
@ -57,10 +57,10 @@ class Ui_SongBookDialog(object):
self.dialog_layout.addLayout(self.book_layout)
self.button_box = create_button_box(song_book_dialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(song_book_dialog)
self.retranslate_ui(song_book_dialog)
song_book_dialog.setMaximumHeight(song_book_dialog.sizeHint().height())
def retranslateUi(self, song_book_dialog):
def retranslate_ui(self, song_book_dialog):
"""
Translate the UI on the fly.
"""

2
openlp/plugins/songs/forms/songbookform.py
View File

@ -40,7 +40,7 @@ class SongBookForm(QtWidgets.QDialog, Ui_SongBookDialog):
"""
super(SongBookForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self, clear=True):
"""

6
openlp/plugins/songs/forms/songexportform.py
View File

@ -66,11 +66,11 @@ class SongExportForm(OpenLPWizard):
log.debug('Stopping songs export')
self.stop_export_flag = True
def setupUi(self, image):
def setup_ui(self, image):
"""
Set up the song wizard UI.
"""
super(SongExportForm, self).setupUi(image)
super(SongExportForm, self).setup_ui(image)
def custom_signals(self):
"""
@ -135,7 +135,7 @@ class SongExportForm(OpenLPWizard):
self.export_song_layout.addLayout(self.grid_layout)
self.addPage(self.export_song_page)
def retranslateUi(self):
def retranslate_ui(self):
"""
Song wizard localisation.
"""

6
openlp/plugins/songs/forms/songimportform.py
View File

@ -57,12 +57,12 @@ class SongImportForm(OpenLPWizard, RegistryProperties):
super(SongImportForm, self).__init__(parent, plugin, 'songImportWizard', ':/wizards/wizard_song.bmp')
self.clipboard = self.main_window.clipboard
def setupUi(self, image):
def setup_ui(self, image):
"""
Set up the song wizard UI.
"""
self.format_widgets = dict([(song_format, {}) for song_format in SongFormat.get_format_list()])
super(SongImportForm, self).setupUi(image)
super(SongImportForm, self).setup_ui(image)
self.current_format = SongFormat.OpenLyrics
self.format_stack.setCurrentIndex(self.current_format)
self.format_combo_box.currentIndexChanged.connect(self.on_current_index_changed)
@ -127,7 +127,7 @@ class SongImportForm(OpenLPWizard, RegistryProperties):
self.source_layout.addLayout(self.format_stack)
self.addPage(self.source_page)
def retranslateUi(self):
def retranslate_ui(self):
"""
Song wizard localisation.
"""

6
openlp/plugins/songs/forms/songmaintenancedialog.py
View File

@ -32,7 +32,7 @@ class Ui_SongMaintenanceDialog(object):
"""
The user interface for the song maintenance dialog
"""
def setupUi(self, song_maintenance_dialog):
def setup_ui(self, song_maintenance_dialog):
"""
Set up the user interface for the song maintenance dialog
"""
@ -134,11 +134,11 @@ class Ui_SongMaintenanceDialog(object):
self.dialog_layout.addLayout(self.stacked_layout, 0, 1)
self.button_box = create_button_box(song_maintenance_dialog, 'button_box', ['close'])
self.dialog_layout.addWidget(self.button_box, 1, 0, 1, 2)
self.retranslateUi(song_maintenance_dialog)
self.retranslate_ui(song_maintenance_dialog)
self.stacked_layout.setCurrentIndex(0)
self.type_list_widget.currentRowChanged.connect(self.stacked_layout.setCurrentIndex)
def retranslateUi(self, song_maintenance_dialog):
def retranslate_ui(self, song_maintenance_dialog):
"""
Translate the UI on the fly.
"""

2
openlp/plugins/songs/forms/songmaintenanceform.py
View File

@ -47,7 +47,7 @@ class SongMaintenanceForm(QtWidgets.QDialog, Ui_SongMaintenanceDialog, RegistryP
"""
super(SongMaintenanceForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.manager = manager
self.author_form = AuthorsForm(self)
self.topic_form = TopicsForm(self)

8
openlp/plugins/songs/forms/songreviewwidget.py
View File

@ -56,11 +56,11 @@ class SongReviewWidget(QtWidgets.QWidget):
"""
super(SongReviewWidget, self).__init__(parent)
self.song = song
self.setupUi()
self.retranslateUi()
self.setup_ui()
self.retranslate_ui()
self.song_remove_button.clicked.connect(self.on_remove_button_clicked)
def setupUi(self):
def setup_ui(self):
self.song_vertical_layout = QtWidgets.QVBoxLayout(self)
self.song_vertical_layout.setObjectName('song_vertical_layout')
self.song_group_box = QtWidgets.QGroupBox(self)
@ -186,7 +186,7 @@ class SongReviewWidget(QtWidgets.QWidget):
self.song_remove_button.setSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
self.song_vertical_layout.addWidget(self.song_remove_button, alignment=QtCore.Qt.AlignHCenter)
def retranslateUi(self):
def retranslate_ui(self):
self.song_remove_button.setText('Remove')
self.song_title_label.setText('Title:')
self.song_alternate_title_label.setText('Alternate Title:')

6
openlp/plugins/songs/forms/topicsdialog.py
View File

@ -31,7 +31,7 @@ class Ui_TopicsDialog(object):
"""
The user interface for the topics dialog.
"""
def setupUi(self, topics_dialog):
def setup_ui(self, topics_dialog):
"""
Set up the user interface for the topics dialog.
"""
@ -51,10 +51,10 @@ class Ui_TopicsDialog(object):
self.dialog_layout.addLayout(self.name_layout)
self.button_box = create_button_box(topics_dialog, 'button_box', ['cancel', 'save'])
self.dialog_layout.addWidget(self.button_box)
self.retranslateUi(topics_dialog)
self.retranslate_ui(topics_dialog)
topics_dialog.setMaximumHeight(topics_dialog.sizeHint().height())
def retranslateUi(self, topics_dialog):
def retranslate_ui(self, topics_dialog):
"""
Translate the UI on the fly.
"""

2
openlp/plugins/songs/forms/topicsform.py
View File

@ -40,7 +40,7 @@ class TopicsForm(QtWidgets.QDialog, Ui_TopicsDialog):
"""
super(TopicsForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
def exec(self, clear=True):
"""

2
openlp/plugins/songs/lib/mediaitem.py
View File

@ -133,7 +133,7 @@ class SongMediaItem(MediaManagerItem):
self.display_written_by_text = Settings().value(self.settings_section + '/display written by')
self.display_copyright_symbol = Settings().value(self.settings_section + '/display copyright symbol')
def retranslateUi(self):
def retranslate_ui(self):
self.search_text_label.setText('{text}:'.format(text=UiStrings().Search))
self.search_text_button.setText(UiStrings().Search)
self.maintenance_action.setText(SongStrings.SongMaintenance)

6
openlp/plugins/songs/lib/songstab.py
View File

@ -32,12 +32,12 @@ class SongsTab(SettingsTab):
"""
SongsTab is the Songs settings tab in the settings dialog.
"""
def setupUi(self):
def setup_ui(self):
"""
Set up the configuration tab UI.
"""
self.setObjectName('SongsTab')
super(SongsTab, self).setupUi()
super(SongsTab, self).setup_ui()
self.mode_group_box = QtWidgets.QGroupBox(self.left_column)
self.mode_group_box.setObjectName('mode_group_box')
self.mode_layout = QtWidgets.QVBoxLayout(self.mode_group_box)
@ -108,7 +108,7 @@ class SongsTab(SettingsTab):
self.german_notation_radio_button.clicked.connect(self.on_german_notation_button_clicked)
self.neolatin_notation_radio_button.clicked.connect(self.on_neolatin_notation_button_clicked)
def retranslateUi(self):
def retranslate_ui(self):
self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Song related settings'))
self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab',
'Enable "Go to verse" button in Live panel'))

6
openlp/plugins/songusage/forms/songusagedeletedialog.py
View File

@ -31,7 +31,7 @@ class Ui_SongUsageDeleteDialog(object):
"""
The Song Usage delete dialog
"""
def setupUi(self, song_usage_delete_dialog):
def setup_ui(self, song_usage_delete_dialog):
"""
Setup the UI
@ -55,9 +55,9 @@ class Ui_SongUsageDeleteDialog(object):
self.vertical_layout.addWidget(self.delete_calendar)
self.button_box = create_button_box(song_usage_delete_dialog, 'button_box', ['cancel', 'ok'])
self.vertical_layout.addWidget(self.button_box)
self.retranslateUi(song_usage_delete_dialog)
self.retranslate_ui(song_usage_delete_dialog)
def retranslateUi(self, song_usage_delete_dialog):
def retranslate_ui(self, song_usage_delete_dialog):
"""
Retranslate the strings
:param song_usage_delete_dialog:

2
openlp/plugins/songusage/forms/songusagedeleteform.py
View File

@ -39,7 +39,7 @@ class SongUsageDeleteForm(QtWidgets.QDialog, Ui_SongUsageDeleteDialog, RegistryP
self.manager = manager
super(SongUsageDeleteForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint |
QtCore.Qt.WindowTitleHint | QtCore.Qt.WindowCloseButtonHint)
self.setupUi(self)
self.setup_ui(self)
self.button_box.clicked.connect(self.on_button_box_clicked)
def on_button_box_clicked(self, button):

6
openlp/plugins/songusage/forms/songusagedetaildialog.py
View File

@ -32,7 +32,7 @@ class Ui_SongUsageDetailDialog(object):
"""
The Song Usage report details
"""
def setupUi(self, song_usage_detail_dialog):
def setup_ui(self, song_usage_detail_dialog):
"""
Set up the UI
@ -74,10 +74,10 @@ class Ui_SongUsageDetailDialog(object):
self.vertical_layout.addWidget(self.file_group_box)
self.button_box = create_button_box(song_usage_detail_dialog, 'button_box', ['cancel', 'ok'])
self.vertical_layout.addWidget(self.button_box)
self.retranslateUi(song_usage_detail_dialog)
self.retranslate_ui(song_usage_detail_dialog)
self.report_path_edit.pathChanged.connect(song_usage_detail_dialog.on_report_path_edit_path_changed)
def retranslateUi(self, song_usage_detail_dialog):
def retranslate_ui(self, song_usage_detail_dialog):
"""
Retranslate the UI

2
openlp/plugins/songusage/forms/songusagedetailform.py
View File

@ -48,7 +48,7 @@ class SongUsageDetailForm(QtWidgets.QDialog, Ui_SongUsageDetailDialog, RegistryP
super(SongUsageDetailForm, self).__init__(parent, QtCore.Qt.WindowSystemMenuHint | QtCore.Qt.WindowTitleHint |
QtCore.Qt.WindowCloseButtonHint)
self.plugin = plugin
self.setupUi(self)
self.setup_ui(self)
def initialise(self):
"""