Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Conversion dialogs: Dont allow a single large pane to change the size of all other panes. Fixes #1856382 [Changing the Output format to PDF in the conversation settings changes the cover size in the window](https://bugs.launchpad.net/calibre/+bug/1856382)

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-15 13:30:22 +05:30
parent 36dfc37887
commit ba95c2b363
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/gui2/convert/bulk.py
View File

@ -29,6 +29,7 @@ class BulkConfig(Config):
def __init__(self, parent, db, preferred_output_format=None, def __init__(self, parent, db, preferred_output_format=None,
has_saved_settings=True): has_saved_settings=True):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.widgets = []
self.setupUi() self.setupUi()
self.setup_output_formats(db, preferred_output_format) self.setup_output_formats(db, preferred_output_format)
@ -78,7 +79,7 @@ class BulkConfig(Config):
self.plumber.merge_plugin_recs(self.plumber.output_plugin) self.plumber.merge_plugin_recs(self.plumber.output_plugin)
def widget_factory(cls): def widget_factory(cls):
return cls(self.stack, self.plumber.get_option_by_name, return cls(self, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db) self.plumber.get_option_help, self.db)
self.setWindowTitle(_('Bulk convert')) self.setWindowTitle(_('Bulk convert'))
@ -91,28 +92,23 @@ class BulkConfig(Config):
toc.manually_fine_tune_toc.hide() toc.manually_fine_tune_toc.hide()
output_widget = self.plumber.output_plugin.gui_configuration_widget( output_widget = self.plumber.output_plugin.gui_configuration_widget(
self.stack, self.plumber.get_option_by_name, self, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db) self.plumber.get_option_help, self.db)
while True: self.break_cycles()
c = self.stack.currentWidget() widgets = self.widgets = [lf, hw, ps, sd, toc, sr]
if not c:
break
self.stack.removeWidget(c)
widgets = [lf, hw, ps, sd, toc, sr]
if output_widget is not None: if output_widget is not None:
widgets.append(output_widget) widgets.append(output_widget)
for w in widgets: for w in widgets:
self.stack.addWidget(w)
w.set_help_signal.connect(self.help.setPlainText) w.set_help_signal.connect(self.help.setPlainText)
w.setVisible(False)
self._groups_model = GroupModel(widgets) self._groups_model = GroupModel(widgets)
self.groups.setModel(self._groups_model) self.groups.setModel(self._groups_model)
idx = oidx if -1 < oidx < self._groups_model.rowCount() else 0 idx = oidx if -1 < oidx < self._groups_model.rowCount() else 0
self.groups.setCurrentIndex(self._groups_model.index(idx)) self.groups.setCurrentIndex(self._groups_model.index(idx))
self.stack.setCurrentIndex(idx) self.show_pane(idx)
try: try:
shutil.rmtree(self.plumber.archive_input_tdir, ignore_errors=True) shutil.rmtree(self.plumber.archive_input_tdir, ignore_errors=True)
except: except:

64
src/calibre/gui2/convert/single.py
View File

@ -9,8 +9,8 @@ import shutil
from PyQt5.Qt import ( from PyQt5.Qt import (
QAbstractListModel, QCheckBox, QComboBox, QCoreApplication, QDialog, QAbstractListModel, QCheckBox, QComboBox, QCoreApplication, QDialog,
QDialogButtonBox, QFont, QFrame, QGridLayout, QHBoxLayout, QIcon, QLabel, QDialogButtonBox, QFont, QFrame, QGridLayout, QHBoxLayout, QIcon, QLabel,
QListView, QModelIndex, QRect, QScrollArea, QSize, QSizePolicy, QSpacerItem, QListView, QModelIndex, QScrollArea, QSize, QSizePolicy, QSpacerItem,
QStackedWidget, Qt, QTextEdit, QVBoxLayout, QWidget Qt, QTextEdit, QWidget
) )
from calibre.customize.conversion import OptionRecommendation from calibre.customize.conversion import OptionRecommendation
@ -29,7 +29,7 @@ from calibre.gui2.convert.search_and_replace import SearchAndReplaceWidget
from calibre.gui2.convert.structure_detection import StructureDetectionWidget from calibre.gui2.convert.structure_detection import StructureDetectionWidget
from calibre.gui2.convert.toc import TOCWidget from calibre.gui2.convert.toc import TOCWidget
from calibre.utils.config import prefs from calibre.utils.config import prefs
from polyglot.builtins import native_string_type, range, unicode_type from polyglot.builtins import native_string_type, unicode_type
class GroupModel(QAbstractListModel): class GroupModel(QAbstractListModel):
@ -73,6 +73,7 @@ class Config(QDialog):
def __init__(self, parent, db, book_id, def __init__(self, parent, db, book_id,
preferred_input_format=None, preferred_output_format=None): preferred_input_format=None, preferred_output_format=None):
QDialog.__init__(self, parent) QDialog.__init__(self, parent)
self.widgets = []
self.setupUi() self.setupUi()
self.opt_individual_saved_settings.setVisible(False) self.opt_individual_saved_settings.setVisible(False)
self.db, self.book_id = db, book_id self.db, self.book_id = db, book_id
@ -148,27 +149,8 @@ class Config(QDialog):
self.scrollArea.setLineWidth(0) self.scrollArea.setLineWidth(0)
self.scrollArea.setWidgetResizable(True) self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName("scrollArea") self.scrollArea.setObjectName("scrollArea")
self.scrollAreaWidgetContents = QWidget()
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 810, 494))
self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents")
self.verticalLayout_3 = QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
self.verticalLayout_3.setObjectName("verticalLayout_3")
self.stack = QStackedWidget(self.scrollAreaWidgetContents)
sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.stack.sizePolicy().hasHeightForWidth())
self.stack.setSizePolicy(sizePolicy)
self.stack.setObjectName("stack")
self.page = QWidget() self.page = QWidget()
self.page.setObjectName("page") self.page.setObjectName("page")
self.stack.addWidget(self.page)
self.page_2 = QWidget()
self.page_2.setObjectName("page_2")
self.stack.addWidget(self.page_2)
self.verticalLayout_3.addWidget(self.stack)
self.scrollArea.setWidget(self.scrollAreaWidgetContents)
self.gridLayout.addWidget(self.scrollArea, 1, 1, 1, 1) self.gridLayout.addWidget(self.scrollArea, 1, 1, 1, 1)
self.buttonBox = QDialogButtonBox(self) self.buttonBox = QDialogButtonBox(self)
self.buttonBox.setOrientation(Qt.Horizontal) self.buttonBox.setOrientation(Qt.Horizontal)
@ -213,8 +195,7 @@ class Config(QDialog):
@property @property
def manually_fine_tune_toc(self): def manually_fine_tune_toc(self):
for i in range(self.stack.count()): for w in self.widgets:
w = self.stack.widget(i)
if hasattr(w, 'manually_fine_tune_toc'): if hasattr(w, 'manually_fine_tune_toc'):
return w.manually_fine_tune_toc.isChecked() return w.manually_fine_tune_toc.isChecked()
@ -225,7 +206,7 @@ class Config(QDialog):
self.plumber = create_dummy_plumber(input_format, output_format) self.plumber = create_dummy_plumber(input_format, output_format)
def widget_factory(cls): def widget_factory(cls):
return cls(self.stack, self.plumber.get_option_by_name, return cls(self, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db, self.book_id) self.plumber.get_option_help, self.db, self.book_id)
self.mw = widget_factory(MetadataWidget) self.mw = widget_factory(MetadataWidget)
@ -241,36 +222,32 @@ class Config(QDialog):
debug = widget_factory(DebugWidget) debug = widget_factory(DebugWidget)
output_widget = self.plumber.output_plugin.gui_configuration_widget( output_widget = self.plumber.output_plugin.gui_configuration_widget(
self.stack, self.plumber.get_option_by_name, self, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db, self.book_id) self.plumber.get_option_help, self.db, self.book_id)
input_widget = self.plumber.input_plugin.gui_configuration_widget( input_widget = self.plumber.input_plugin.gui_configuration_widget(
self.stack, self.plumber.get_option_by_name, self, self.plumber.get_option_by_name,
self.plumber.get_option_help, self.db, self.book_id) self.plumber.get_option_help, self.db, self.book_id)
while True:
c = self.stack.currentWidget()
if not c:
break
self.stack.removeWidget(c)
widgets = [self.mw, lf, hw, ps, sd, toc, sr] self.break_cycles()
self.widgets = widgets = [self.mw, lf, hw, ps, sd, toc, sr]
if input_widget is not None: if input_widget is not None:
widgets.append(input_widget) widgets.append(input_widget)
if output_widget is not None: if output_widget is not None:
widgets.append(output_widget) widgets.append(output_widget)
widgets.append(debug) widgets.append(debug)
for w in widgets: for w in widgets:
self.stack.addWidget(w)
w.set_help_signal.connect(self.help.setPlainText) w.set_help_signal.connect(self.help.setPlainText)
w.setVisible(False)
self._groups_model = GroupModel(widgets) self._groups_model = GroupModel(widgets)
self.groups.setModel(self._groups_model) self.groups.setModel(self._groups_model)
idx = oidx if -1 < oidx < self._groups_model.rowCount() else 0 idx = oidx if -1 < oidx < self._groups_model.rowCount() else 0
self.groups.setCurrentIndex(self._groups_model.index(idx)) self.groups.setCurrentIndex(self._groups_model.index(idx))
self.stack.setCurrentIndex(idx) self.show_pane(idx)
try: try:
shutil.rmtree(self.plumber.archive_input_tdir, ignore_errors=True) shutil.rmtree(self.plumber.archive_input_tdir, ignore_errors=True)
except: except Exception:
pass pass
def setup_input_output_formats(self, db, book_id, preferred_input_format, def setup_input_output_formats(self, db, book_id, preferred_input_format,
@ -290,7 +267,17 @@ class Config(QDialog):
self.output_formats.setCurrentIndex(output_formats.index(preferred_output_format)) self.output_formats.setCurrentIndex(output_formats.index(preferred_output_format))
def show_pane(self, index): def show_pane(self, index):
self.stack.setCurrentIndex(index.row()) if hasattr(index, 'row'):
index = index.row()
ow = self.scrollArea.takeWidget()
if ow:
ow.setParent(self)
for i, w in enumerate(self.widgets):
if i == index:
self.scrollArea.setWidget(w)
w.show()
else:
w.setVisible(False)
def accept(self): def accept(self):
recs = GuiRecommendations() recs = GuiRecommendations()
@ -318,8 +305,7 @@ class Config(QDialog):
return QDialog.done(self, r) return QDialog.done(self, r)
def break_cycles(self): def break_cycles(self):
for i in range(self.stack.count()): for w in self.widgets:
w = self.stack.widget(i)
w.break_cycles() w.break_cycles()
@property @property