feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Let perspectives specify their central widget

Browse Source 
The default 0 value will be interpreted as 'use the editor stack'.

Also, drop the idea of value semantics for Perspective objects
to get a simpler approach to the destruction of owned widgets
(tools docks + central widget)

Change-Id: Ic6470411ee5d387c43447f95b5a12c81c6658ff8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2016-05-12 11:57:29 +02:00
parent 602d899e0f
commit df8e3b5925
8 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/debuggermainwindow.h
View File

@@ -68,20 +68,28 @@ public:
};
Perspective() = default;
Perspective(const QString &name, const QVector<Operation> &operations);
// Takes ownership of \a centralWidget and all dock widgets in \a operations.
Perspective(const QString &name, const QVector<Operation> &operations,
QWidget *centralWidget = 0);
~Perspective();
void addOperation(const Operation &operation);
QVector<Operation> operations() const { return m_operations; }
QVector<QByteArray> docks() const { return m_docks; }
QWidget *centralWidget() const { return m_centralWidget; }
QString name() const;
void setName(const QString &name);
private:
Perspective(const Perspective &) = delete;
void operator=(const Perspective &) = delete;
QString m_name;
QVector<QByteArray> m_docks;
QVector<Operation> m_operations;
QPointer<QWidget> m_centralWidget;
};
class DEBUGGER_EXPORT ToolbarDescription
@@ -107,7 +115,7 @@ public:
DebuggerMainWindow();
~DebuggerMainWindow() override;
void registerPerspective(const QByteArray &perspectiveId, const Perspective &perspective);
void registerPerspective(const QByteArray &perspectiveId, const Perspective *perspective);
void registerToolbar(const QByteArray &perspectiveId, QWidget *widget);
void saveCurrentPerspective();
@@ -119,6 +127,7 @@ public:
void showStatusMessage(const QString &message, int timeoutMS);
QDockWidget *dockWidget(const QByteArray &dockId) const;
QByteArray currentPerspective() const { return m_currentPerspectiveId; }
QStackedWidget *centralWidgetStack() const { return m_centralWidgetStack; }
private:
QDockWidget *registerDockWidget(const QByteArray &dockId, QWidget *widget);
@@ -127,14 +136,16 @@ private:
QByteArray m_currentPerspectiveId;
QComboBox *m_perspectiveChooser;
QStackedWidget *m_controlsStackWidget;
QStackedWidget *m_centralWidgetStack;
QWidget *m_editorPlaceHolder;
Utils::StatusLabel *m_statusLabel;
QDockWidget *m_toolbarDock;
QHash<QByteArray, QDockWidget *> m_dockForDockId;
QHash<QByteArray, QWidget *> m_toolbarForPerspectiveId;
QHash<QByteArray, Perspective> m_perspectiveForPerspectiveId;
QHash<QByteArray, const Perspective *> m_perspectiveForPerspectiveId;
};
DEBUGGER_EXPORT QWidget *createModeWindow(const Core::Id &mode, DebuggerMainWindow *mainWindow, QWidget *central);
DEBUGGER_EXPORT QWidget *createModeWindow(const Core::Id &mode, DebuggerMainWindow *mainWindow);
} // Utils