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

File menu: make session manager a toplevel entry

Browse Source 
Whether the "Recent sessions..." entry makes sense given that it's now
immediately available in the item below, too, might still be disputed.

Rubberstamped-by: con
This commit is contained in:
hjk
2011-03-07 19:07:38 +01:00
parent de4b2244f1
commit 2661e9745c
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -539,11 +539,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// Actions // Actions
// //
// new session action
d->m_sessionManagerAction = new QAction(tr("Session Manager..."), this);
cmd = am->registerAction(d->m_sessionManagerAction, Constants::NEWSESSION, globalcontext);
cmd->setDefaultKeySequence(QKeySequence());
// new action // new action
d->m_newAction = new QAction(tr("New Project..."), this); d->m_newAction = new QAction(tr("New Project..."), this);
cmd = am->registerAction(d->m_newAction, Constants::NEWPROJECT, globalcontext); cmd = am->registerAction(d->m_newAction, Constants::NEWPROJECT, globalcontext);
@@ -588,6 +583,22 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(mfile->menu(), SIGNAL(aboutToShow()), connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateRecentProjectMenu())); this, SLOT(updateRecentProjectMenu()));
// recent session menu
Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
msession->menu()->setTitle(tr("Recent Sessions"));
msession->setOnAllDisabledBehavior(Core::ActionContainer::Show);
mfile->addMenu(msession, Core::Constants::G_FILE_OPEN);
d->m_sessionMenu = msession->menu();
connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateSessionMenu()));
// session manager action
d->m_sessionManagerAction = new QAction(tr("Session Manager..."), this);
cmd = am->registerAction(d->m_sessionManagerAction, Constants::NEWSESSION, globalcontext);
mfile->addAction(cmd, Core::Constants::G_FILE_OPEN);
cmd->setDefaultKeySequence(QKeySequence());
// XXX same action? // XXX same action?
// unload action // unload action
d->m_unloadAction = new Utils::ParameterAction(tr("Close Project"), tr("Close Project \"%1\""), d->m_unloadAction = new Utils::ParameterAction(tr("Close Project"), tr("Close Project \"%1\""),
@@ -603,15 +614,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT); mfile->addAction(cmd, Core::Constants::G_FILE_PROJECT);
msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES); msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
// session menu
Core::ActionContainer *msession = am->createMenu(Constants::M_SESSION);
msession->menu()->setTitle(tr("Session"));
msession->setOnAllDisabledBehavior(Core::ActionContainer::Show);
mfile->addMenu(msession, Core::Constants::G_FILE_PROJECT);
d->m_sessionMenu = msession->menu();
connect(mfile->menu(), SIGNAL(aboutToShow()),
this, SLOT(updateSessionMenu()));
// build session action // build session action
QIcon buildIcon(Constants::ICON_BUILD); QIcon buildIcon(Constants::ICON_BUILD);
buildIcon.addFile(Constants::ICON_BUILD_SMALL); buildIcon.addFile(Constants::ICON_BUILD_SMALL);
@@ -2541,9 +2543,6 @@ void ProjectExplorerPlugin::updateSessionMenu()
act->setChecked(true); act->setChecked(true);
} }
d->m_sessionMenu->addActions(ag->actions()); d->m_sessionMenu->addActions(ag->actions());
d->m_sessionMenu->addSeparator();
d->m_sessionMenu->addAction(d->m_sessionManagerAction);
d->m_sessionMenu->setEnabled(true); d->m_sessionMenu->setEnabled(true);
} }