Revert "Change the plugin configuration do_user_config() to reopen the the dialog if the validator fails. This happens only if the plugin has a config widget and validators."

This reverts commit 19a2115618a3a5d0624eaa8f5ca0b3aa821033a7.
This commit is contained in:
Charles Haley 2025-05-11 10:39:05 +01:00
parent 768c575bb2
commit ff4e978ce5

View File

@ -180,19 +180,14 @@ class Plugin: # {{{
v.addWidget(button_box) v.addWidget(button_box)
if not config_dialog.restore_geometry(gprefs, prefname): if not config_dialog.restore_geometry(gprefs, prefname):
QApplication.instance().ensure_window_on_screen(config_dialog) QApplication.instance().ensure_window_on_screen(config_dialog)
while True: config_dialog.exec()
validation_error = False
config_dialog.exec() if config_dialog.result() == QDialog.DialogCode.Accepted:
if config_dialog.result() == QDialog.DialogCode.Accepted: if hasattr(config_widget, 'validate'):
if hasattr(config_widget, 'validate'): if config_widget.validate():
if config_widget.validate():
self.save_settings(config_widget)
else:
validation_error = True
else:
self.save_settings(config_widget) self.save_settings(config_widget)
if not validation_error: else:
break self.save_settings(config_widget)
else: else:
from calibre.customize.ui import customize_plugin, plugin_customization from calibre.customize.ui import customize_plugin, plugin_customization
help_text = self.customization_help(gui=True) help_text = self.customization_help(gui=True)