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

Design mode/Qt Designer clean-up, part III: Resources.

Browse Source 
Move resource code to new ResourceHandler class and
instantiate it on the form window.
This commit is contained in:
Friedemann Kleint
2010-03-09 17:01:34 +01:00
parent 8aae812558
commit c7e3e6adf3
14 changed files with 287 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/designer/formeditorw.cpp
View File

@@ -39,6 +39,7 @@
#include "designerxmleditor.h"
#include "designercontext.h"
#include "editorwidget.h"
#include "resourcehandler.h"
#include <coreplugin/modemanager.h>
#include <coreplugin/designmode.h>
@@ -662,15 +663,17 @@ EditorData FormEditorW::createEditor(QWidget *parent)
qdesigner_internal::FormWindowBase *form = qobject_cast<qdesigner_internal::FormWindowBase *>(m_fwm->createFormWindow(0));
QTC_ASSERT(form, return data);
connect(form, SIGNAL(toolChanged(int)), this, SLOT(toolChanged(int)));
ResourceHandler *resourceHandler = new ResourceHandler(form);
form->setDesignerGrid(qdesigner_internal::FormWindowBase::defaultDesignerGrid());
qdesigner_internal::FormWindowBase::setupDefaultAction(form);
data.formEditor = new FormWindowEditor(form);
DesignerXmlEditor *xmlEditor = new DesignerXmlEditor(form, parent);
TextEditor::TextEditorSettings::instance()->initializeEditor(xmlEditor);
data.xmlEditor = xmlEditor->designerEditable();
data.formEditor->setFile(data.xmlEditor->file());
connect(data.formEditor, SIGNAL(formWindowSizeChanged(int,int)),
xmlEditor, SIGNAL(changed()));
connect(data.xmlEditor->file(), SIGNAL(changed()),
resourceHandler, SLOT(updateResources()));
m_editorWidget->add(data);
return data;
}
@@ -720,11 +723,11 @@ void FormEditorW::activeFormWindowChanged(QDesignerFormWindowInterface *afw)
m_actionGroupPreviewInStyle->setEnabled(afw != 0);
}
FormWindowEditor *FormEditorW::activeFormWindow() const
EditorData FormEditorW::activeEditor() const
{
if (m_editorWidget)
return m_editorWidget->activeFormWindow();
return 0;
return m_editorWidget->activeEditor();
return EditorData();
}
void FormEditorW::activateEditMode(int id)