diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index 9bb00ea96..ee35ea7e5 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -84,56 +84,58 @@ class SongExportForm(OpenLPWizard): """ # The page with all available songs. self.available_songs_page = QtWidgets.QWizardPage() - available_songs_layout = QtWidgets.QHBoxLayout(self.available_songs_page) - available_songs_layout.setObjectName('available_songs_layout') - vertical_layout = QtWidgets.QVBoxLayout() - vertical_layout.setObjectName('vertical_layout') + self.available_songs_page.setObjectName('available_songs_page') + self.available_songs_layout = QtWidgets.QHBoxLayout(self.available_songs_page) + self.available_songs_layout.setObjectName('available_songs_layout') + self.vertical_layout = QtWidgets.QVBoxLayout() + self.vertical_layout.setObjectName('vertical_layout') self.available_list_widget = QtWidgets.QListWidget(self.available_songs_page) self.available_list_widget.setObjectName('available_list_widget') - vertical_layout.addWidget(self.available_list_widget) - horizontal_layout = QtWidgets.QHBoxLayout() - horizontal_layout.setObjectName('horizontal_layout') + self.vertical_layout.addWidget(self.available_list_widget) + self.horizontal_layout = QtWidgets.QHBoxLayout() + self.horizontal_layout.setObjectName('horizontal_layout') self.search_label = QtWidgets.QLabel(self.available_songs_page) self.search_label.setObjectName('search_label') - horizontal_layout.addWidget(self.search_label) + self.horizontal_layout.addWidget(self.search_label) self.search_line_edit = QtWidgets.QLineEdit(self.available_songs_page) self.search_line_edit.setObjectName('search_line_edit') - horizontal_layout.addWidget(self.search_line_edit) + self.horizontal_layout.addWidget(self.search_line_edit) spacer_item = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - horizontal_layout.addItem(spacer_item) + self.horizontal_layout.addItem(spacer_item) self.uncheck_button = QtWidgets.QPushButton(self.available_songs_page) self.uncheck_button.setObjectName('uncheck_button') - horizontal_layout.addWidget(self.uncheck_button) + self.horizontal_layout.addWidget(self.uncheck_button) self.check_button = QtWidgets.QPushButton(self.available_songs_page) self.check_button.setObjectName('selectButton') - horizontal_layout.addWidget(self.check_button) - vertical_layout.addLayout(horizontal_layout) - available_songs_layout.addLayout(vertical_layout) + self.horizontal_layout.addWidget(self.check_button) + self.vertical_layout.addLayout(self.horizontal_layout) + self.available_songs_layout.addLayout(self.vertical_layout) self.addPage(self.available_songs_page) # The page with the selected songs. self.export_song_page = QtWidgets.QWizardPage() self.export_song_page.setObjectName('available_songs_page') - export_song_layout = QtWidgets.QHBoxLayout(self.export_song_page) - export_song_layout.setObjectName('export_song_layout') - grid_layout = QtWidgets.QGridLayout() - grid_layout.setObjectName('range_layout') + self.export_song_layout = QtWidgets.QHBoxLayout(self.export_song_page) + self.export_song_layout.setObjectName('export_song_layout') + self.grid_layout = QtWidgets.QGridLayout() + self.grid_layout.setObjectName('range_layout') self.selected_list_widget = QtWidgets.QListWidget(self.export_song_page) self.selected_list_widget.setObjectName('selected_list_widget') - grid_layout.addWidget(self.selected_list_widget, 1, 0, 1, 1) - horizontal_layout = QtWidgets.QHBoxLayout() - horizontal_layout.setObjectName('horizontal_layout') + self.grid_layout.addWidget(self.selected_list_widget, 1, 0, 1, 1) + # FIXME: self.horizontal_layout is already defined above?!?!? + self.horizontal_layout = QtWidgets.QHBoxLayout() + self.horizontal_layout.setObjectName('horizontal_layout') self.directory_label = QtWidgets.QLabel(self.export_song_page) self.directory_label.setObjectName('directory_label') - horizontal_layout.addWidget(self.directory_label) + self.horizontal_layout.addWidget(self.directory_label) self.directory_line_edit = QtWidgets.QLineEdit(self.export_song_page) self.directory_line_edit.setObjectName('directory_line_edit') - horizontal_layout.addWidget(self.directory_line_edit) + self.horizontal_layout.addWidget(self.directory_line_edit) self.directory_button = QtWidgets.QToolButton(self.export_song_page) self.directory_button.setIcon(build_icon(':/exports/export_load.png')) self.directory_button.setObjectName('directory_button') - horizontal_layout.addWidget(self.directory_button) - grid_layout.addLayout(horizontal_layout, 0, 0, 1, 1) - export_song_layout.addLayout(grid_layout) + self.horizontal_layout.addWidget(self.directory_button) + self.grid_layout.addLayout(self.horizontal_layout, 0, 0, 1, 1) + self.export_song_layout.addLayout(self.grid_layout) self.addPage(self.export_song_page) def retranslateUi(self):