Clean up scheduler dialog

Fixes #1867895 [[Enhancement] Schedule news download screen](https://bugs.launchpad.net/calibre/+bug/1867895)
This commit is contained in:
Kovid Goyal 2020-03-24 08:56:18 +05:30
parent c705fc8f9a
commit 7a1641a5ad
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -16,7 +16,7 @@ from PyQt5.Qt import (
QDialog, Qt, QTime, QObject, QMenu, QHBoxLayout, QAction, QIcon, QMutex, QApplication, QDialog, Qt, QTime, QObject, QMenu, QHBoxLayout, QAction, QIcon, QMutex, QApplication,
QTimer, pyqtSignal, QWidget, QGridLayout, QCheckBox, QTimeEdit, QLabel, QTimer, pyqtSignal, QWidget, QGridLayout, QCheckBox, QTimeEdit, QLabel,
QLineEdit, QDoubleSpinBox, QSize, QTreeView, QSizePolicy, QToolButton, QLineEdit, QDoubleSpinBox, QSize, QTreeView, QSizePolicy, QToolButton,
QScrollArea, QFrame, QVBoxLayout, QTabWidget, QSpacerItem, QGroupBox, QFrame, QVBoxLayout, QTabWidget, QSpacerItem, QGroupBox,
QRadioButton, QStackedWidget, QSpinBox, QPushButton, QDialogButtonBox QRadioButton, QStackedWidget, QSpinBox, QPushButton, QDialogButtonBox
) )
@ -250,12 +250,8 @@ class SchedulerDialog(QDialog):
self.recipe_model.searched.connect(self.search_done) self.recipe_model.searched.connect(self.search_done)
# Right Panel # Right Panel
self.scroll_area = sa = QScrollArea(self)
self.l.addWidget(sa, 0, 1, 2, 1)
sa.setFrameShape(QFrame.NoFrame)
sa.setWidgetResizable(True)
self.scroll_area_contents = sac = QWidget(self) self.scroll_area_contents = sac = QWidget(self)
sa.setWidget(sac) self.l.addWidget(sac, 0, 1, 2, 1)
sac.v = v = QVBoxLayout(sac) sac.v = v = QVBoxLayout(sac)
v.setContentsMargins(0, 0, 0, 0) v.setContentsMargins(0, 0, 0, 0)
self.detail_box = QTabWidget(self) self.detail_box = QTabWidget(self)
@ -272,7 +268,6 @@ class SchedulerDialog(QDialog):
self.blurb = la = QLabel('blurb') self.blurb = la = QLabel('blurb')
la.setWordWrap(True), la.setOpenExternalLinks(True) la.setWordWrap(True), la.setOpenExternalLinks(True)
vt.addWidget(la) vt.addWidget(la)
vt.addItem(QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding))
self.frame = f = QFrame(self.tab) self.frame = f = QFrame(self.tab)
vt.addWidget(f) vt.addWidget(f)
f.setFrameShape(f.StyledPanel) f.setFrameShape(f.StyledPanel)
@ -297,7 +292,6 @@ class SchedulerDialog(QDialog):
self.last_downloaded = la = QLabel(f) self.last_downloaded = la = QLabel(f)
la.setWordWrap(True) la.setWordWrap(True)
vf.addWidget(la) vf.addWidget(la)
vt.addItem(QSpacerItem(20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding))
self.account = acc = QGroupBox(self.tab) self.account = acc = QGroupBox(self.tab)
acc.setTitle(_("&Account")) acc.setTitle(_("&Account"))
vt.addWidget(acc) vt.addWidget(acc)
@ -729,7 +723,8 @@ class Scheduler(QObject):
if __name__ == '__main__': if __name__ == '__main__':
app = QApplication([]) from calibre.gui2 import Application
app = Application([])
d = SchedulerDialog(RecipeModel()) d = SchedulerDialog(RecipeModel())
d.exec_() d.exec_()
del app del app