parseArguments(arguments);
const bool success = m_mainWindow->init(errorMessage);
if (success) {
- EditorManager *editorManager = m_mainWindow->editorManager();
- m_editMode = new EditMode(editorManager);
+ m_editMode = new EditMode;
addObject(m_editMode);
m_mainWindow->modeManager()->activateMode(m_editMode->id());
-
- m_designMode = new DesignMode(editorManager);
+ m_designMode = new DesignMode;
addObject(m_designMode);
}
return success;
} // namespace Internal
-struct DesignEditorInfo {
+struct DesignEditorInfo
+{
int widgetIndex;
QStringList mimeTypes;
Context context;
QWidget *widget;
};
-struct DesignModePrivate {
- explicit DesignModePrivate(DesignMode *q, EditorManager *editorManager);
+class DesignModePrivate
+{
+public:
+ explicit DesignModePrivate(DesignMode *q);
+
+public:
Internal::DesignModeCoreListener *m_coreListener;
QWeakPointer<Core::IEditor> m_currentEditor;
bool m_isActive;
-
QList<DesignEditorInfo*> m_editors;
-
- EditorManager *m_editorManager;
QStackedWidget *m_stackWidget;
Context m_activeContext;
};
-DesignModePrivate::DesignModePrivate(DesignMode *q, EditorManager *editorManager) :
- m_coreListener(new Internal::DesignModeCoreListener(q)),
+DesignModePrivate::DesignModePrivate(DesignMode *q)
+ : m_coreListener(new Internal::DesignModeCoreListener(q)),
m_isActive(false),
- m_editorManager(editorManager),
m_stackWidget(new QStackedWidget)
{
}
-DesignMode::DesignMode(EditorManager *editorManager) :
- IMode(), d(new DesignModePrivate(this, editorManager))
+DesignMode::DesignMode()
+ : d(new DesignModePrivate(this))
{
setObjectName(QLatin1String("DesignMode"));
setEnabled(false);
ExtensionSystem::PluginManager::instance()->addObject(d->m_coreListener);
- connect(editorManager, SIGNAL(currentEditorChanged(Core::IEditor*)),
+ connect(EditorManager::instance(), SIGNAL(currentEditorChanged(Core::IEditor*)),
this, SLOT(currentEditorChanged(Core::IEditor*)));
connect(ModeManager::instance(), SIGNAL(currentModeChanged(Core::IMode*,Core::IMode*)),
#include <coreplugin/imode.h>
namespace Core {
-class EditorManager;
class IEditor;
namespace Internal {
* to the main editor widget itself.
*/
-struct DesignModePrivate;
+class DesignModePrivate;
class CORE_EXPORT DesignMode : public Core::IMode
{
Q_OBJECT
public:
- explicit DesignMode(EditorManager *editorManager);
+ explicit DesignMode();
virtual ~DesignMode();
void registerDesignWidget(QWidget *widget,
using namespace Core;
using namespace Core::Internal;
-EditMode::EditMode(EditorManager *editorManager) :
- m_editorManager(editorManager),
+EditMode::EditMode() :
m_splitter(new MiniSplitter),
m_rightSplitWidgetLayout(new QVBoxLayout)
{
+ m_editorManager = EditorManager::instance();
setObjectName(QLatin1String("EditMode"));
setDisplayName(tr("Edit"));
setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Edit.png")));