diff --git a/openlp/plugins/songs/forms/duplicatesongremovalform.py b/openlp/plugins/songs/forms/duplicatesongremovalform.py index 422c5d871..8e2b74a75 100644 --- a/openlp/plugins/songs/forms/duplicatesongremovalform.py +++ b/openlp/plugins/songs/forms/duplicatesongremovalform.py @@ -112,7 +112,7 @@ class DuplicateSongRemovalForm(OpenLPWizard): self.songsHorizontalScrollArea = QtGui.QScrollArea(self.reviewPage) self.songsHorizontalScrollArea.setObjectName(u'songsHorizontalScrollArea') self.songsHorizontalScrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - self.songsHorizontalScrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) + self.songsHorizontalScrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) self.songsHorizontalScrollArea.setFrameStyle(QtGui.QFrame.NoFrame) self.songsHorizontalScrollArea.setWidgetResizable(True) self.songsHorizontalScrollArea.setStyleSheet(u'QScrollArea#songsHorizontalScrollArea {background-color:transparent;}') @@ -303,17 +303,6 @@ class SongReviewWidget(QtGui.QWidget): self.songGroupBox.setMaximumWidth(300) self.songGroupBoxLayout = QtGui.QVBoxLayout(self.songGroupBox) self.songGroupBoxLayout.setObjectName(u'songGroupBoxLayout') - self.songScrollArea = QtGui.QScrollArea(self) - self.songScrollArea.setObjectName(u'songScrollArea') - self.songScrollArea.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.songScrollArea.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded) - self.songScrollArea.setFrameStyle(QtGui.QFrame.NoFrame) - self.songScrollArea.setWidgetResizable(True) - self.songContentWidget = QtGui.QWidget(self.songScrollArea) - self.songContentWidget.setObjectName(u'songContentWidget') - self.songContentVerticalLayout = QtGui.QVBoxLayout(self.songContentWidget) - self.songContentVerticalLayout.setObjectName(u'songContentVerticalLayout') - self.songContentVerticalLayout.setSizeConstraint(QtGui.QLayout.SetMinAndMaxSize) self.songInfoFormLayout = QtGui.QFormLayout() self.songInfoFormLayout.setObjectName(u'songInfoFormLayout') self.songTitleLabel = QtGui.QLabel(self) @@ -377,7 +366,7 @@ class SongReviewWidget(QtGui.QWidget): self.songVerseOrderContent.setText(self.song.verse_order) self.songVerseOrderContent.setWordWrap(True) self.songInfoFormLayout.setWidget(6, QtGui.QFormLayout.FieldRole, self.songVerseOrderContent) - self.songContentVerticalLayout.addLayout(self.songInfoFormLayout) + self.songGroupBoxLayout.addLayout(self.songInfoFormLayout) self.songInfoVerseGroupBox = QtGui.QGroupBox(self.songGroupBox) self.songInfoVerseGroupBox.setObjectName(u'songInfoVerseGroupBox') self.songInfoVerseGroupBoxLayout = QtGui.QFormLayout(self.songInfoVerseGroupBox) @@ -389,10 +378,8 @@ class SongReviewWidget(QtGui.QWidget): verseLabel.setText(verse[1]) verseLabel.setWordWrap(True) self.songInfoVerseGroupBoxLayout.addRow(verseMarker, verseLabel) - self.songContentVerticalLayout.addWidget(self.songInfoVerseGroupBox) - self.songContentVerticalLayout.addStretch() - self.songScrollArea.setWidget(self.songContentWidget) - self.songGroupBoxLayout.addWidget(self.songScrollArea) + self.songGroupBoxLayout.addWidget(self.songInfoVerseGroupBox) + self.songGroupBoxLayout.addStretch() self.songVerticalLayout.addWidget(self.songGroupBox) self.songRemoveButton = QtGui.QPushButton(self) self.songRemoveButton.setObjectName(u'songRemoveButton')