mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-09-28 04:54:13 +02:00
ispyisail
8623dd4c6f
openAndAddProject() shows BackupDialog as a stack object parented to the editor and exec()s it; every QET::QetMessageBox does the same. exec() runs a nested event loop, and closing the editor during it turns WA_DeleteOnClose into a deleteLater() that the nested loop processes: ~QWidget() deletes the editor's children, the stack-allocated dialog among them, and the process aborts. Reported on macOS, where File > Quit lives in the application menu and stays usable while the backup question is up. The close is now refused while any modal widget is active, and the dialog is raised so the refused quit is not silent. It is done in QETMainWindow::event() rather than in closeEvent(), because QETDiagramEditor::closeEvent() starts closing projects before it decides whether to accept. That covers the diagram and title-block editors; QETElementEditor is a plain QMainWindow, so its closeEvent() calls the same helper before canClose(), which itself opens a modal. QETApp::quitQET() needs nothing: closeEveryEditor() goes through each editor's close(), and quitQET() already only quits when every close succeeded. Rejected alternatives, both suggested on the issue: - Giving the dialog no parent stops the abort but not the deletion. One caller of openAndAddProject() is the editor's own constructor, which goes on to open the next file and call slot_updateActions() on this -- a loud abort would become a silent use-after-free. - Guarding only QETApp::closeEveryEditor(), which I first recommended on the issue, misses the reported route entirely: File > Quit is connected to QETDiagramEditor::close(), not to quitQET(). Verified on Linux, where there is nothing to click (the menu bar belongs to the blocked window, and Qt ignores window-manager close requests for it), by calling close() from gdb while the dialog's loop was running -- both QETApp::quitQET() and QWidget::close() on the editor. Unfixed, both abort with "free(): invalid size" in QObjectPrivate::deleteChildren() under ~QETDiagramEditor(), matching the report frame for frame; fixed, close() returns false, the editor and the dialog stay up, and after answering the dialog Ctrl+Q exits normally. The element-editor guard is the same helper but was not exercised separately. tests/modal-quit-regression/ turns that into a gate: it breaks on QDialog::exec(), interrupts inside the nested loop, calls quitQET() and checks the process survives. It matches no window titles (translated) and no window ids, runs on the offscreen platform, and needs only gdb with Python. Checked both ways: exit 1 with the backtrace above on a build without this change, exit 0 with it. ctest 8/8. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
76 lines
2.9 KiB
C++
76 lines
2.9 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef QET_MAIN_WINDOW_H
|
|
#define QET_MAIN_WINDOW_H
|
|
#include <QMainWindow>
|
|
#include <QHash>
|
|
/**
|
|
This is the base class for the main top-level windows within
|
|
QElectroTech.
|
|
*/
|
|
class QETMainWindow : public QMainWindow {
|
|
Q_OBJECT
|
|
|
|
// constructor, destructor
|
|
public:
|
|
QETMainWindow(QWidget * = nullptr, Qt::WindowFlags = Qt::Widget);
|
|
~QETMainWindow() override;
|
|
|
|
static bool refuseCloseWhileModal(QEvent *e);
|
|
|
|
// methods
|
|
protected:
|
|
void initCommonActions();
|
|
void initCommonMenus();
|
|
void insertMenu(QMenu *, QMenu *, bool = true);
|
|
QAction *actionForMenu(QMenu *);
|
|
|
|
protected:
|
|
void activateMenuBar();
|
|
bool event(QEvent *) override;
|
|
void dragEnterEvent(QDragEnterEvent *e) override;
|
|
void dropEvent(QDropEvent *e) override;
|
|
virtual void firstActivation(QEvent *);
|
|
|
|
// slots
|
|
public slots:
|
|
void toggleFullScreen();
|
|
void updateFullScreenAction();
|
|
void checkToolbarsmenu();
|
|
|
|
// attributes
|
|
protected:
|
|
QAction *configure_action_; ///< Launch the QElectroTech configuration dialog
|
|
QAction *fullscreen_action_; ///< Toggle full screen
|
|
QAction *whatsthis_action_; ///< Toggle "What's this" mode
|
|
QAction *about_qet_; ///< Launch the "About QElectroTech" dialog
|
|
QAction *manual_online_; ///< Launch browser on QElectroTech online manual
|
|
QAction *youtube_; ///< Launch browser on QElectroTech Youtube channel
|
|
QAction *upgrade_; ///< Launch browser on QElectroTech Windows Nightly builds
|
|
QAction *upgrade_M; ///< Launch browser on QElectroTech MAC_OS_X builds
|
|
QAction *donate_; ///< Launch browser to donate link
|
|
QAction *about_qt_; ///< launch the "About Qt" dialog
|
|
QAction *diagnostics_action_; ///< Open the diagnostics report dialog (discussion #644, step 5)
|
|
QMenu *settings_menu_; ///< Settings menu
|
|
QMenu *help_menu_; ///< Help menu
|
|
QMenu *display_toolbars_; ///< Show/hide toolbars/docks
|
|
QHash<QMenu *, QAction *> menu_actions_; ///< Store actions retrieved when inserting menus
|
|
bool first_activation_; ///< Used to detect whether the window is activated for the first time
|
|
};
|
|
#endif
|