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

Qmldesigner: Change action registration

Browse Source 
Context variables don't worked, so the context was registered.

Change-Id: Ic0efb8dc68d4762656e7858c1011e9fb759a7d81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-02-11 13:28:59 +01:00
committed by Thomas Hartmann
parent 852f947fc6
commit 3e1f2521cc
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -163,7 +163,7 @@ void QmlDesignerPlugin::createDesignModeWidget()
m_context->context().add(qmlDesignerNavigatorContext); m_context->context().add(qmlDesignerNavigatorContext);
m_context->context().add(ProjectExplorer::Constants::LANG_QMLJS); m_context->context().add(ProjectExplorer::Constants::LANG_QMLJS);
m_shortCutManager.registerActions(); m_shortCutManager.registerActions(qmlDesignerMainContext, qmlDesignerFormEditorContext, qmlDesignerNavigatorContext);
connect(Core::ICore::editorManager(), connect(Core::ICore::editorManager(),
SIGNAL(currentEditorChanged(Core::IEditor*)), SIGNAL(currentEditorChanged(Core::IEditor*)),

9
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -3,6 +3,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/icontext.h>
#include <coreplugin/editormanager/openeditorsmodel.h> #include <coreplugin/editormanager/openeditorsmodel.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
@@ -39,14 +40,12 @@ ShortCutManager::ShortCutManager()
} }
void ShortCutManager::registerActions() void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContext,
const Core::Context &qmlDesignerFormEditorContext,
const Core::Context &qmlDesignerNavigatorContext)
{ {
Core::ActionContainer *editMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT); Core::ActionContainer *editMenu = Core::ActionManager::actionContainer(Core::Constants::M_EDIT);
Core::Context qmlDesignerMainContext(Constants::C_QMLDESIGNER);
Core::Context qmlDesignerFormEditorContext(Constants::C_QMLFORMEDITOR);
Core::Context qmlDesignerNavigatorContext(Constants::C_QMLNAVIGATOR);
connect(&m_undoAction, SIGNAL(triggered()), this, SLOT(undo())); connect(&m_undoAction, SIGNAL(triggered()), this, SLOT(undo()));
connect(&m_redoAction, SIGNAL(triggered()), this, SLOT(redo())); connect(&m_redoAction, SIGNAL(triggered()), this, SLOT(redo()));

6
src/plugins/qmldesigner/shortcutmanager.h
View File

@@ -5,9 +5,9 @@
#include <QAction> #include <QAction>
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
namespace Core { namespace Core {
class IEditor; class IEditor;
class Context;
} }
namespace QmlDesigner { namespace QmlDesigner {
@@ -21,7 +21,9 @@ class ShortCutManager : public QObject
public: public:
ShortCutManager(); ShortCutManager();
void registerActions(); void registerActions(const Core::Context &qmlDesignerMainContext,
const Core::Context &qmlDesignerFormEditorContext,
const Core::Context &qmlDesignerNavigatorContext);
void connectUndoActions(DesignDocument *designDocument); void connectUndoActions(DesignDocument *designDocument);
void disconnectUndoActions(DesignDocument *designDocument); void disconnectUndoActions(DesignDocument *designDocument);