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

Modes: Do the mode switching again like it used to be

Browse Source 
It's more complicated then expected, to be detangled another day
This commit is contained in:
dt
2010-09-07 15:25:14 +02:00
parent 12e974db10
commit c2338d20a5
4 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -96,7 +96,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
void CorePlugin::extensionsInitialized() void CorePlugin::extensionsInitialized()
{ {
m_mainWindow->extensionsInitialized(); m_mainWindow->extensionsInitialized();
m_mainWindow->modeManager()->switchToDefaultMode();
} }
void CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args) void CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args)

11
src/plugins/coreplugin/modemanager.cpp
View File

@@ -73,7 +73,6 @@ struct ModeManagerPrivate
QSignalMapper *m_signalMapper; QSignalMapper *m_signalMapper;
Context m_addedContexts; Context m_addedContexts;
int m_oldCurrent; int m_oldCurrent;
bool m_switchedToMode;
}; };
ModeManager *ModeManagerPrivate::m_instance = 0; ModeManager *ModeManagerPrivate::m_instance = 0;
@@ -84,8 +83,7 @@ ModeManagerPrivate::ModeManagerPrivate(Internal::MainWindow *mainWindow,
m_mainWindow(mainWindow), m_mainWindow(mainWindow),
m_modeStack(modeStack), m_modeStack(modeStack),
m_signalMapper(new QSignalMapper(q)), m_signalMapper(new QSignalMapper(q)),
m_oldCurrent(-1), m_oldCurrent(-1)
m_switchedToMode(false)
{ {
} }
@@ -153,7 +151,6 @@ IMode *ModeManager::mode(const QString &id) const
void ModeManager::activateMode(const QString &id) void ModeManager::activateMode(const QString &id)
{ {
d->m_switchedToMode = true;
const int index = indexOf(id); const int index = indexOf(id);
if (index >= 0) if (index >= 0)
d->m_modeStack->setCurrentIndex(index); d->m_modeStack->setCurrentIndex(index);
@@ -312,12 +309,6 @@ void ModeManager::setFocusToCurrentMode()
} }
} }
void ModeManager::switchToDefaultMode()
{
if (!d->m_switchedToMode)
d->m_modeStack->setCurrentIndex(0);
}
ModeManager *ModeManager::instance() ModeManager *ModeManager::instance()
{ {
return ModeManagerPrivate::m_instance; return ModeManagerPrivate::m_instance;

2
src/plugins/coreplugin/modemanager.h
View File

@@ -66,8 +66,6 @@ public:
void addProjectSelector(QAction *action); void addProjectSelector(QAction *action);
void addWidget(QWidget *widget); void addWidget(QWidget *widget);
void switchToDefaultMode();
signals: signals:
void currentModeAboutToChange(Core::IMode *mode); void currentModeAboutToChange(Core::IMode *mode);

1
src/plugins/welcome/welcomeplugin.cpp
View File

@@ -76,6 +76,7 @@ bool WelcomePlugin::initialize(const QStringList & /* arguments */, QString * /*
void WelcomePlugin::extensionsInitialized() void WelcomePlugin::extensionsInitialized()
{ {
m_welcomeMode->initPlugins(); m_welcomeMode->initPlugins();
Core::ModeManager::instance()->activateMode(m_welcomeMode->id());
} }
Q_EXPORT_PLUGIN(WelcomePlugin) Q_EXPORT_PLUGIN(WelcomePlugin)