mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
ed09e6a909
In commit b0556abdd35f96b816ba11e40bf5707abe0c3ebf, the filter-widget and the filter were connected by a direct function call. This led to a rather obscure crash on application-close with Qt 5.12. The crash is due to the Ui::MainWindow class being a sub-object of MainWindow, but the FilterWidget2 being *not* a subobject. What happens is that after calling the MainWindow destructor, the subobjects are destructed, notably the Ui class. Then the base-class destructor is called (which makes sense, as destructors are called in reverse order of constructors). But: the QObject destructor calls hide() on all still existing child-objects according to Qt's object hierarchy, notably the visible FilterWidget2. Now the FilterWidget2, on hiding, updates the MainWindow, which has already destructed all its subobjects. Crash. Prevent this crash by making FilterWidget2 a subobject of MainWindow and thus have it destructed before running the QObject destructor. Alternative ways would be: 1) Use signal/slot() instead of function calls, as these are automatically removed if an object is destroyed. 2) Make the FilterWidget2 subobject a smart-pointer. Thus, we probably wouldn't have to include the corresponding header. 3) Make the FilterWidget2 subobject a plain pointer and delete it explicitly in the constructor. Reported-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
262 lines
7.1 KiB
C++
262 lines
7.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* mainwindow.h
|
|
*
|
|
* header file for the main window of Subsurface
|
|
*
|
|
*/
|
|
#ifndef MAINWINDOW_H
|
|
#define MAINWINDOW_H
|
|
|
|
#include <QMainWindow>
|
|
#include <QAction>
|
|
#include <QUrl>
|
|
#include <QUuid>
|
|
#include <QProgressDialog>
|
|
|
|
#include "ui_mainwindow.h"
|
|
#include "ui_plannerDetails.h"
|
|
#include "desktop-widgets/notificationwidget.h"
|
|
#include "desktop-widgets/filterwidget2.h"
|
|
#include "core/gpslocation.h"
|
|
#include "core/dive.h"
|
|
|
|
#define NUM_RECENT_FILES 4
|
|
|
|
class QSortFilterProxyModel;
|
|
class DiveTripModel;
|
|
class QItemSelection;
|
|
class DiveListView;
|
|
class MainTab;
|
|
class QWebView;
|
|
class QSettings;
|
|
class UpdateManager;
|
|
class UserManual;
|
|
class DivePlannerWidget;
|
|
class ProfileWidget2;
|
|
class PlannerDetails;
|
|
class PlannerSettingsWidget;
|
|
class LocationInformationWidget;
|
|
|
|
typedef std::pair<QByteArray, QVariant> WidgetProperty;
|
|
typedef QVector<WidgetProperty> PropertyList;
|
|
|
|
class MainWindow : public QMainWindow {
|
|
Q_OBJECT
|
|
public:
|
|
enum {
|
|
COLLAPSED,
|
|
EXPANDED
|
|
};
|
|
|
|
enum CurrentState {
|
|
VIEWALL,
|
|
MAP_MAXIMIZED,
|
|
INFO_MAXIMIZED,
|
|
PROFILE_MAXIMIZED,
|
|
LIST_MAXIMIZED,
|
|
EDIT
|
|
};
|
|
|
|
MainWindow();
|
|
~MainWindow();
|
|
static MainWindow *instance();
|
|
void loadRecentFiles();
|
|
void updateRecentFiles();
|
|
void updateRecentFilesMenu();
|
|
void addRecentFile(const QString &file, bool update);
|
|
LocationInformationWidget *locationInformationWidget();
|
|
void setTitle();
|
|
|
|
void loadFiles(const QStringList files);
|
|
void importFiles(const QStringList importFiles);
|
|
void cleanUpEmpty();
|
|
void setToolButtonsEnabled(bool enabled);
|
|
void printPlan();
|
|
void checkSurvey();
|
|
void setApplicationState(const QByteArray& state);
|
|
void setStateProperties(const QByteArray& state, const PropertyList& tl, const PropertyList& tr, const PropertyList& bl,const PropertyList& br);
|
|
bool inPlanner();
|
|
NotificationWidget *getNotificationWidget();
|
|
void enableDisableCloudActions();
|
|
void enableDisableOtherDCsActions();
|
|
void setCheckedActionFilterTags(bool checked);
|
|
void enterEditState();
|
|
void exitEditState();
|
|
|
|
MainTab *mainTab;
|
|
PlannerDetails *plannerDetails;
|
|
PlannerSettingsWidget *divePlannerSettingsWidget;
|
|
ProfileWidget2 *graphics;
|
|
DivePlannerWidget *divePlannerWidget;
|
|
DiveListView *diveList;
|
|
private
|
|
slots:
|
|
/* file menu action */
|
|
void recentFileTriggered(bool checked);
|
|
void on_actionNew_triggered();
|
|
void on_actionOpen_triggered();
|
|
void on_actionSave_triggered();
|
|
void on_actionSaveAs_triggered();
|
|
void on_actionClose_triggered();
|
|
void on_actionCloudstorageopen_triggered();
|
|
void on_actionCloudstoragesave_triggered();
|
|
void on_actionCloudOnline_triggered();
|
|
void on_actionPrint_triggered();
|
|
void on_actionPreferences_triggered();
|
|
void on_actionQuit_triggered();
|
|
void on_actionHash_images_triggered();
|
|
|
|
/* log menu actions */
|
|
void on_actionDownloadDC_triggered();
|
|
void on_actionDivelogs_de_triggered();
|
|
void on_actionEditDeviceNames_triggered();
|
|
void on_actionAddDive_triggered();
|
|
void on_actionRenumber_triggered();
|
|
void on_actionAutoGroup_triggered();
|
|
void on_actionYearlyStatistics_triggered();
|
|
|
|
/* view menu actions */
|
|
void on_actionViewList_triggered();
|
|
void on_actionViewProfile_triggered();
|
|
void on_actionViewInfo_triggered();
|
|
void on_actionViewMap_triggered();
|
|
void on_actionViewAll_triggered();
|
|
void on_actionPreviousDC_triggered();
|
|
void on_actionNextDC_triggered();
|
|
void on_actionFullScreen_triggered(bool checked);
|
|
|
|
/* other menu actions */
|
|
void on_actionAboutSubsurface_triggered();
|
|
void on_actionUserManual_triggered();
|
|
void on_actionUserSurvey_triggered();
|
|
void on_actionDivePlanner_triggered();
|
|
void on_actionReplanDive_triggered();
|
|
void on_action_Check_for_Updates_triggered();
|
|
|
|
void on_actionDiveSiteEdit_triggered();
|
|
void selectionChanged();
|
|
void initialUiSetup();
|
|
|
|
void on_actionImportDiveLog_triggered();
|
|
|
|
/* TODO: Move those slots below to it's own class */
|
|
void on_actionExport_triggered();
|
|
void on_copy_triggered();
|
|
void on_paste_triggered();
|
|
void on_actionFilterTags_triggered();
|
|
void on_actionConfigure_Dive_Computer_triggered();
|
|
void setDefaultState();
|
|
void setAutomaticTitle();
|
|
void cancelCloudStorageOperation();
|
|
void unsetProfHR();
|
|
void unsetProfTissues();
|
|
|
|
protected:
|
|
void closeEvent(QCloseEvent *);
|
|
|
|
signals:
|
|
void startDiveSiteEdit();
|
|
void showError(QString message);
|
|
|
|
public
|
|
slots:
|
|
void turnOffNdlTts();
|
|
void readSettings();
|
|
void refreshDisplay(bool doRecreateDiveList = true);
|
|
void recreateDiveList();
|
|
void showProfile();
|
|
void refreshProfile();
|
|
void editCurrentDive();
|
|
void planCanceled();
|
|
void planCreated();
|
|
void setEnabledToolbar(bool arg1);
|
|
void setPlanNotes();
|
|
// Some shortcuts like "change DC" or "copy/paste dive components"
|
|
// should only be enabled when the profile's visible.
|
|
void disableShortcuts(bool disablePaste = true);
|
|
void enableShortcuts();
|
|
|
|
void socialNetworkRequestConnect();
|
|
void socialNetworkRequestUpload();
|
|
void facebookLoggedIn();
|
|
void facebookLoggedOut();
|
|
void updateVariations(QString);
|
|
|
|
|
|
private:
|
|
Ui::MainWindow ui;
|
|
FilterWidget2 filterWidget2;
|
|
QAction *actionNextDive;
|
|
QAction *actionPreviousDive;
|
|
QAction *undoAction;
|
|
QAction *redoAction;
|
|
#ifndef NO_USERMANUAL
|
|
UserManual *helpView;
|
|
#endif
|
|
CurrentState state;
|
|
CurrentState stateBeforeEdit;
|
|
QString filter_open();
|
|
QString filter_import();
|
|
static MainWindow *m_Instance;
|
|
QString displayedFilename(QString fullFilename);
|
|
bool askSaveChanges();
|
|
bool okToClose(QString message);
|
|
void closeCurrentFile();
|
|
void setCurrentFile(const char *f);
|
|
void updateCloudOnlineStatus();
|
|
void showProgressBar();
|
|
void hideProgressBar();
|
|
void writeSettings();
|
|
int file_save();
|
|
int file_save_as();
|
|
void beginChangeState(CurrentState s);
|
|
void saveSplitterSizes();
|
|
void toggleCollapsible(bool toggle);
|
|
void updateLastUsedDir(const QString &s);
|
|
void registerApplicationState(const QByteArray& state, QWidget *topLeft, QWidget *topRight, QWidget *bottomLeft, QWidget *bottomRight);
|
|
void enterState(CurrentState);
|
|
bool filesAsArguments;
|
|
UpdateManager *updateManager;
|
|
LocationInformationWidget *diveSiteEdit;
|
|
|
|
bool plannerStateClean();
|
|
void setupForAddAndPlan(const char *model);
|
|
void configureToolbar();
|
|
void setupSocialNetworkMenu();
|
|
QDialog *survey;
|
|
QDialog *findMovedImagesDialog;
|
|
struct dive copyPasteDive;
|
|
struct dive_components what;
|
|
QList<QAction *> profileToolbarActions;
|
|
QStringList recentFiles;
|
|
QAction *actionsRecent[NUM_RECENT_FILES];
|
|
|
|
struct WidgetForQuadrant {
|
|
WidgetForQuadrant(QWidget *tl = 0, QWidget *tr = 0, QWidget *bl = 0, QWidget *br = 0) :
|
|
topLeft(tl), topRight(tr), bottomLeft(bl), bottomRight(br) {}
|
|
QWidget *topLeft;
|
|
QWidget *topRight;
|
|
QWidget *bottomLeft;
|
|
QWidget *bottomRight;
|
|
};
|
|
|
|
struct PropertiesForQuadrant {
|
|
PropertiesForQuadrant(){}
|
|
PropertiesForQuadrant(const PropertyList& tl, const PropertyList& tr,const PropertyList& bl,const PropertyList& br) :
|
|
topLeft(tl), topRight(tr), bottomLeft(bl), bottomRight(br) {}
|
|
PropertyList topLeft;
|
|
PropertyList topRight;
|
|
PropertyList bottomLeft;
|
|
PropertyList bottomRight;
|
|
};
|
|
|
|
QHash<QByteArray, WidgetForQuadrant> applicationState;
|
|
QHash<QByteArray, PropertiesForQuadrant> stateProperties;
|
|
|
|
GpsLocation *locationProvider;
|
|
QMenu *connections;
|
|
QAction *share_on_fb;
|
|
};
|
|
|
|
#endif // MAINWINDOW_H
|