diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index 896e75b40..cc6bb2f0b 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -36,7 +36,7 @@ from openlp.core.lib.ui import create_button from openlp.core.ui.media import get_media_players, set_media_players -class MediaQ_check_box(QtGui.QCheckBox): +class MediaQCheckBox(QtGui.QCheckBox): """ MediaQ_check_box adds an extra property, playerName to the Q_check_box class. """ @@ -57,7 +57,7 @@ class PlayerTab(SettingsTab): """ self.media_players = self.media_controller.media_players self.saved_used_players = None - self.iconPath = u':/media/multimedia-player.png' + self.icon_path = u':/media/multimedia-player.png' player_translated = translate('OpenLP.PlayerTab', 'Players') SettingsTab.__init__(self, parent, u'Players', player_translated) @@ -67,33 +67,33 @@ class PlayerTab(SettingsTab): """ self.setObjectName(u'MediaTab') SettingsTab.setupUi(self) - self.background_Color_group_box = QtGui.QGroupBox(self.leftColumn) - self.background_Color_group_box.setObjectName(u'Font_group_box') - self.form_layout = QtGui.QFormLayout(self.background_Color_group_box) - self.form_layout.setObjectName(u'Form_layout') + self.background_color_group_box = QtGui.QGroupBox(self.left_column) + self.background_color_group_box.setObjectName(u'background_color_group_box') + self.form_layout = QtGui.QFormLayout(self.background_color_group_box) + self.form_layout.setObjectName(u'form_layout') self.color_layout = QtGui.QHBoxLayout() - self.background_color_label = QtGui.QLabel(self.background_Color_group_box) - self.background_color_label.setObjectName(u'BackgroundColor_label') + self.background_color_label = QtGui.QLabel(self.background_color_group_box) + self.background_color_label.setObjectName(u'background_color_label') self.color_layout.addWidget(self.background_color_label) - self.background_color_button = QtGui.QPushButton(self.background_Color_group_box) - self.background_color_button.setObjectName(u'BackgroundColor_button') + self.background_color_button = QtGui.QPushButton(self.background_color_group_box) + self.background_color_button.setObjectName(u'background_color_button') self.color_layout.addWidget(self.background_color_button) self.form_layout.addRow(self.color_layout) - self.information_label = QtGui.QLabel(self.background_Color_group_box) + self.information_label = QtGui.QLabel(self.background_color_group_box) self.information_label.setObjectName(u'information_label') self.information_label.setWordWrap(True) self.form_layout.addRow(self.information_label) - self.left_layout.addWidget(self.background_Color_group_box) + self.left_layout.addWidget(self.background_color_group_box) self.left_layout.addStretch() - self.rightColumn.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) + self.right_column.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred) self.right_layout.addStretch() - self.media_player_group_box = QtGui.QGroupBox(self.leftColumn) + self.media_player_group_box = QtGui.QGroupBox(self.left_column) self.media_player_group_box.setObjectName(u'media_player_group_box') self.media_player_layout = QtGui.QVBoxLayout(self.media_player_group_box) self.media_player_layout.setObjectName(u'media_player_layout') self.player_check_boxes = {} self.left_layout.addWidget(self.media_player_group_box) - self.player_order_group_box = QtGui.QGroupBox(self.leftColumn) + self.player_order_group_box = QtGui.QGroupBox(self.left_column) self.player_order_group_box.setObjectName(u'player_order_group_box') self.player_order_layout = QtGui.QHBoxLayout(self.player_order_group_box) self.player_order_layout.setObjectName(u'player_order_layout') @@ -118,12 +118,12 @@ class PlayerTab(SettingsTab): self.ordering_button_layout.addWidget(self.ordering_up_button) self.ordering_button_layout.addWidget(self.ordering_down_button) self.ordering_button_layout.addStretch(1) - self.player_order_layout.add_layout(self.ordering_button_layout) + self.player_order_layout.addLayout(self.ordering_button_layout) self.left_layout.addWidget(self.player_order_group_box) self.left_layout.addStretch() self.right_layout.addStretch() # Signals and slots - self.background_color_button.clicked.connect(self.on_background_color_button_Clicked) + self.background_color_button.clicked.connect(self.on_background_color_button_clicked) def retranslateUi(self): """ @@ -131,7 +131,7 @@ class PlayerTab(SettingsTab): """ self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players')) self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order')) - self.background_Color_group_box.setTitle(UiStrings().BackgroundColor) + self.background_color_group_box.setTitle(UiStrings().BackgroundColor) self.background_color_label.setText(UiStrings().DefaultColor) self.information_label.setText(translate('OpenLP.PlayerTab', 'Visible background for videos with aspect ratio different to screen.')) @@ -206,7 +206,7 @@ class PlayerTab(SettingsTab): self.used_players = get_media_players()[0] self.saved_used_players = self.used_players settings = Settings() - settings.beginGroup(self.settingsSection) + settings.beginGroup(self.settings_section) self.update_player_list() self.background_color = settings.value(u'background color') self.initial_color = self.background_color @@ -218,7 +218,7 @@ class PlayerTab(SettingsTab): Save the settings """ settings = Settings() - settings.beginGroup(self.settingsSection) + settings.beginGroup(self.settings_section) settings.setValue(u'background color', self.background_color) settings.endGroup() old_players, override_player = get_media_players() @@ -235,7 +235,7 @@ class PlayerTab(SettingsTab): """ for key, player in self.media_players.iteritems(): player = self.media_players[key] - checkbox = MediaQ_check_box(self.media_player_group_box) + checkbox = MediaQCheckBox(self.media_player_group_box) checkbox.setEnabled(player.available) checkbox.setObjectName(player.name + u'_check_box') checkbox.setToolTip(player.get_info()) diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 50ada28d1..6b9611067 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -139,7 +139,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): A different settings tab is selected """ self.stacked_layout.setCurrentIndex(tabIndex) - self.stacked_layout.currentWidget().tabVisible() + self.stacked_layout.currentWidget().tab_visible() def register_post_process(self, function): """ diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index 7e1f486b8..d02eb7986 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -40,13 +40,13 @@ class ThemesTab(SettingsTab): """ ThemesTab is the theme settings tab in the settings dialog. """ - def _init_(self, parent): + def __init__(self, parent): """ Constructor """ self.icon_path = u':/themes/theme_new.png' theme_translated = translate('OpenLP.ThemesTab', 'Themes') - SettingsTab._init_(self, parent, u'Themes', theme_translated) + SettingsTab.__init__(self, parent, u'Themes', theme_translated) def setupUi(self): """ @@ -71,20 +71,20 @@ class ThemesTab(SettingsTab): self.level_group_box = QtGui.QGroupBox(self.right_column) self.level_group_box.setObjectName(u'level_group_box') self.level_layout = QtGui.QFormLayout(self.level_group_box) - self.level_layout.set_labelAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) + self.level_layout.setLabelAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) self.level_layout.setFormAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignTop) self.level_layout.setObjectName(u'level_layout') - self.song_level_radio_button = QtGui.Q_radio_button(self.level_group_box) + self.song_level_radio_button = QtGui.QRadioButton(self.level_group_box) self.song_level_radio_button.setObjectName(u'song_level_radio_button') self.song_level_label = QtGui.QLabel(self.level_group_box) self.song_level_label.setObjectName(u'song_level_label') self.level_layout.addRow(self.song_level_radio_button, self.song_level_label) - self.service_level_radio_button = QtGui.Q_radio_button(self.level_group_box) + self.service_level_radio_button = QtGui.QRadioButton(self.level_group_box) self.service_level_radio_button.setObjectName(u'service_level_radio_button') self.service_level_label = QtGui.QLabel(self.level_group_box) self.service_level_label.setObjectName(u'service_level_label') self.level_layout.addRow(self.service_level_radio_button, self.service_level_label) - self.global_level_radio_button = QtGui.Q_radio_button(self.level_group_box) + self.global_level_radio_button = QtGui.QRadioButton(self.level_group_box) self.global_level_radio_button.setObjectName(u'global_level_radio_button') self.global_level_label = QtGui.QLabel(self.level_group_box) self.global_level_label.setObjectName(u'global_level_label') @@ -99,8 +99,8 @@ class ThemesTab(SettingsTab): self.right_layout.addWidget(self.level_group_box) self.right_layout.addStretch() self.song_level_radio_button.clicked.connect(self.on_song_level_button_clicked) - self.service_level_radio_button.clicked.connect(self.on_service_level_button_Clicked) - self.global_level_radio_button.clicked.connect(self.on_global_level_buttonClicked) + self.service_level_radio_button.clicked.connect(self.on_service_level_button_clicked) + self.global_level_radio_button.clicked.connect(self.on_global_level_button_clicked) self.default_combo_box.activated.connect(self.on_default_combo_box_changed) Registry().register_function(u'theme_update_list', self.update_theme_list) @@ -129,7 +129,7 @@ class ThemesTab(SettingsTab): Load the theme settings into the tab """ settings = Settings() - settings.beginGroup(self.settingsSection) + settings.beginGroup(self.settings_section) self.theme_level = settings.value(u'theme level') self.global_theme = settings.value(u'global theme') settings.endGroup() @@ -145,7 +145,7 @@ class ThemesTab(SettingsTab): Save the settings """ settings = Settings() - settings.beginGroup(self.settingsSection) + settings.beginGroup(self.settings_section) settings.setValue(u'theme level', self.theme_level) settings.setValue(u'global theme', self.global_theme) settings.endGroup() @@ -158,19 +158,19 @@ class ThemesTab(SettingsTab): """ Registry().execute(u'theme_update_global') - def on_song_level_Button_clicked(self): + def on_song_level_button_clicked(self): """ Set the theme level """ self.theme_level = ThemeLevel.Song - def on_service_levelButton_clicked(self): + def on_service_level_button_clicked(self): """ Set the theme level """ self.theme_level = ThemeLevel.Service - def on_global_levelButton_clicked(self): + def on_global_level_button_clicked(self): """ Set the theme level """ diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index cf556b303..34f80a463 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -350,7 +350,7 @@ class BiblesTab(SettingsTab): def save(self): settings = Settings() - settings.beginGroup(self.settingsSection) + settings.beginGroup(self.settings_section) settings.setValue(u'display new chapter', self.show_new_chapters) settings.setValue(u'display brackets', self.display_style) settings.setValue(u'verse layout style', self.layout_style) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 93321ce8c..cecec53b5 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -142,4 +142,4 @@ class PresentationTab(SettingsTab): controller = self.controllers[key] checkbox = self.presenter_check_boxes[controller.name] checkbox.setEnabled(controller.is_available()) - self.setControllerText(checkbox, controller) + self.set_controller_text(checkbox, controller)