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

AndroidManifestEditor: Fix widget hierarchy

Browse Source 
Since TextEditorActionHandler has now a virtual function, we can
do a less fancy hierarchy for the AndroidManifestEditor and thus fix

Task-number: QTCREATORBUG-10597
Task-number: QTCREATORBUG-11163

Change-Id: I6c4014ae03b66f0639f8c8973763d690fb062cc4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2013-11-01 16:02:24 +01:00
parent 8ab5b7ec0b
commit e485b439bc
6 changed files with 147 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/android/androidmanifesteditorfactory.cpp
View File

@@ -39,6 +39,19 @@
using namespace Android;
using namespace Android::Internal;
class AndroidTextEditorActionHandler : public TextEditor::TextEditorActionHandler
{
public:
explicit AndroidTextEditorActionHandler(QObject *parent)
: TextEditorActionHandler(parent, Constants::ANDROID_MANIFEST_EDITOR_CONTEXT)
{}
private:
TextEditor::BaseTextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
{
AndroidManifestEditor *androidManifestEditor = static_cast<AndroidManifestEditor *>(editor);
return androidManifestEditor->textEditor();
}
};
AndroidManifestEditorFactory::AndroidManifestEditorFactory(QObject *parent)
: Core::IEditorFactory(parent)
@@ -46,12 +59,11 @@ AndroidManifestEditorFactory::AndroidManifestEditorFactory(QObject *parent)
setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
setDisplayName(tr("Android Manifest editor"));
addMimeType(Constants::ANDROID_MANIFEST_MIME_TYPE);
new TextEditor::TextEditorActionHandler(this, Constants::ANDROID_MANIFEST_EDITOR_CONTEXT);
new AndroidTextEditorActionHandler(this);
}
Core::IEditor *AndroidManifestEditorFactory::createEditor()
{
AndroidManifestEditorWidget *editor = new AndroidManifestEditorWidget();
TextEditor::TextEditorSettings::initializeEditor(editor);
return editor->editor();
AndroidManifestEditorWidget *androidManifestEditorWidget = new AndroidManifestEditorWidget();
return androidManifestEditorWidget->editor();
}