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

Design mode/Qt Designer: clean-up Part II: Fix undo.

Browse Source 
Re-introduce FormEditorFile that delegates dirty handling to the form
window. Change DesignerXmlEditable to be an IEditor that embeds
TextEditable so that the PlainTextEditor can work with it, but delegates
relevant functionality to FormEditorFile.
Centralize all form window creation code that was scattered around
in FormEditorW::createEditor() and have that return a struct Editor
data, which is passed to FormEditorStack.
Update the text editor only on open/createNew/switch away from design
mode.
This commit is contained in:
Friedemann Kleint
2010-03-09 15:48:01 +01:00
parent 403d755855
commit 1c78e200c2
17 changed files with 401 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/designer/formeditorstack.h
View File

@@ -30,6 +30,8 @@
#ifndef FORMEDITORSTACK_H
#define FORMEDITORSTACK_H
#include "editordata.h"
#include <QtGui/QStackedWidget>
#include <QtCore/QList>
#include <QtCore/QString>
@@ -41,6 +43,7 @@ QT_END_NAMESPACE
namespace Core {
class IEditor;
class IMode;
}
namespace Designer {
@@ -49,11 +52,11 @@ class DesignerXmlEditorEditable;
namespace Internal {
/**
* A wrapper for Qt Designer form editors, so that they can be used in Design mode.
* FormEditorW owns an instance of this class, and creates new form editors when
* needed.
*/
/* FormEditorStack: Maintains a stack of Qt Designer form windows embedded
* into a scrollarea and their associated XML editors.
* Takes care of updating the XML editor once design mode is left.
* Also updates the maincontainer resize handles when the active form
* window changes. */
class FormEditorStack : public QStackedWidget
{
Q_OBJECT
@@ -61,29 +64,23 @@ class FormEditorStack : public QStackedWidget
public:
explicit FormEditorStack(QWidget *parent = 0);
Designer::FormWindowEditor *createFormWindowEditor(DesignerXmlEditorEditable *xmlEditor);
void add(const EditorData &d);
bool removeFormWindowEditor(Core::IEditor *xmlEditor);
bool setVisibleEditor(Core::IEditor *xmlEditor);
Designer::FormWindowEditor *formWindowEditorForXmlEditor(const Core::IEditor *xmlEditor) const;
Designer::FormWindowEditor *formWindowEditorForFormWindow(const QDesignerFormWindowInterface *fw) const;
FormWindowEditor *activeFormWindow() const;
private slots:
void formChanged();
void reloadDocument();
void updateFormWindowSelectionHandles();
void modeAboutToChange(Core::IMode *);
private:
inline int indexOf(const QDesignerFormWindowInterface *) const;
inline int indexOf(const Core::IEditor *xmlEditor) const;
void setFormEditorData(Designer::FormWindowEditor *formEditor, const QString &contents);
struct FormXmlData {
FormXmlData();
DesignerXmlEditorEditable *xmlEditor;
Designer::FormWindowEditor *formEditor;
};
QList<FormXmlData> m_formEditors;
QList<EditorData> m_formEditors;
QDesignerFormEditorInterface *m_designerCore;
};