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

Fixes: Session loading does not restore form files

Browse Source 
RevBy: Eike
Details: Make form editor factory and form editor return the same editor kind.
This commit is contained in:
Friedemann Kleint
2009-02-04 13:39:11 +01:00
parent 1f3a96a1e8
commit 6f4a8be946
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/designer/designerconstants.h
View File

@@ -42,7 +42,6 @@ const char * const C_FORMEDITOR = "Formeditor";
const char * const T_FORMEDITOR = "Formeditor.Toolbar"; const char * const T_FORMEDITOR = "Formeditor.Toolbar";
const char * const M_FORMEDITOR = "Formeditor.Menu"; const char * const M_FORMEDITOR = "Formeditor.Menu";
const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview"; const char * const M_FORMEDITOR_PREVIEW = "Formeditor.Menu.Preview";
const char * const C_FORMWINDOW = "Formwindow";
// Wizard type // Wizard type
const char * const FORM_FILE_TYPE = "Qt4FormFiles"; const char * const FORM_FILE_TYPE = "Qt4FormFiles";

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

@@ -546,7 +546,7 @@ void FormEditorW::currentEditorChanged(Core::IEditor *editor)
qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount(); qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
// Deactivate Designer if a non-form is being edited // Deactivate Designer if a non-form is being edited
if (editor && !qstrcmp(editor->kind(), Constants::C_FORMWINDOW)) { if (editor && !qstrcmp(editor->kind(), Constants::C_FORMEDITOR)) {
FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor); FormWindowEditor *fw = qobject_cast<FormWindowEditor *>(editor);
QTC_ASSERT(fw, return); QTC_ASSERT(fw, return);
fw->activate(); fw->activate();

2
src/plugins/designer/formwindoweditor.cpp
View File

@@ -260,7 +260,7 @@ Core::IFile *FormWindowEditor::file()
const char *FormWindowEditor::kind() const const char *FormWindowEditor::kind() const
{ {
return C_FORMWINDOW; return C_FORMEDITOR;
} }
QString FormWindowEditor::displayName() const QString FormWindowEditor::displayName() const