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

ProjectExplorer: Improve UI for project-related closing actions

Browse Source 
- Do not hide, but just disable currently non-applicable actions.
- Properly group the closing-related actions in the project context
menu.
This makes for more stable menu entries and reduces the chance for
accidentally choosing the wrong one.

Task-number: QTCREATORBUG-28211
Change-Id: I26ddc71839d124ec92212971f2facea82cf8d199
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Kandeler
2022-10-27 13:05:18 +02:00
parent 292e8f510e
commit ea917a0aa6
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1015,6 +1015,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
mprojectContextMenu->appendGroup(Constants::G_PROJECT_REBUILD); mprojectContextMenu->appendGroup(Constants::G_PROJECT_REBUILD);
mprojectContextMenu->appendGroup(Constants::G_FOLDER_LOCATIONS); mprojectContextMenu->appendGroup(Constants::G_FOLDER_LOCATIONS);
mprojectContextMenu->appendGroup(Constants::G_PROJECT_FILES); mprojectContextMenu->appendGroup(Constants::G_PROJECT_FILES);
mprojectContextMenu->appendGroup(Constants::G_PROJECT_CLOSE);
mprojectContextMenu->appendGroup(Constants::G_PROJECT_LAST); mprojectContextMenu->appendGroup(Constants::G_PROJECT_LAST);
mprojectContextMenu->appendGroup(Constants::G_PROJECT_TREE); mprojectContextMenu->appendGroup(Constants::G_PROJECT_TREE);
@@ -1082,6 +1083,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
msessionContextMenu->addSeparator(projectTreeContext, Constants::G_SESSION_FILES); msessionContextMenu->addSeparator(projectTreeContext, Constants::G_SESSION_FILES);
mprojectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES); mprojectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES);
mprojectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_CLOSE);
mprojectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_LAST);
msubProjectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES); msubProjectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES);
mfile->addSeparator(Core::Constants::G_FILE_PROJECT); mfile->addSeparator(Core::Constants::G_FILE_PROJECT);
mbuild->addSeparator(Constants::G_BUILD_ALLPROJECTS); mbuild->addSeparator(Constants::G_BUILD_ALLPROJECTS);
@@ -1509,7 +1512,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
"ProjectExplorer.CloseAllFilesInProjectContextMenu"); "ProjectExplorer.CloseAllFilesInProjectContextMenu");
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);
cmd->setDescription(dd->m_closeProjectFilesActionContextMenu->text()); cmd->setDescription(dd->m_closeProjectFilesActionContextMenu->text());
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST); mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_CLOSE);
// unload project again, in right position // unload project again, in right position
dd->m_unloadActionContextMenu = new ParameterAction(tr("Close Project"), tr("Close Project \"%1\""), dd->m_unloadActionContextMenu = new ParameterAction(tr("Close Project"), tr("Close Project \"%1\""),
@@ -1517,14 +1520,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
cmd = ActionManager::registerAction(dd->m_unloadActionContextMenu, Constants::UNLOADCM); cmd = ActionManager::registerAction(dd->m_unloadActionContextMenu, Constants::UNLOADCM);
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);
cmd->setDescription(dd->m_unloadActionContextMenu->text()); cmd->setDescription(dd->m_unloadActionContextMenu->text());
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST); mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_CLOSE);
dd->m_unloadOthersActionContextMenu = new ParameterAction(tr("Close Other Projects"), tr("Close All Projects Except \"%1\""), dd->m_unloadOthersActionContextMenu = new ParameterAction(tr("Close Other Projects"), tr("Close All Projects Except \"%1\""),
ParameterAction::EnabledWithParameter, this); ParameterAction::EnabledWithParameter, this);
cmd = ActionManager::registerAction(dd->m_unloadOthersActionContextMenu, Constants::UNLOADOTHERSCM); cmd = ActionManager::registerAction(dd->m_unloadOthersActionContextMenu, Constants::UNLOADOTHERSCM);
cmd->setAttribute(Command::CA_UpdateText); cmd->setAttribute(Command::CA_UpdateText);
cmd->setDescription(dd->m_unloadOthersActionContextMenu->text()); cmd->setDescription(dd->m_unloadOthersActionContextMenu->text());
mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_LAST); mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_CLOSE);
// file properties action // file properties action
dd->m_filePropertiesAction = new QAction(tr("Properties..."), this); dd->m_filePropertiesAction = new QAction(tr("Properties..."), this);
@@ -2852,10 +2855,11 @@ void ProjectExplorerPluginPrivate::updateActions()
const QString projectName = project ? project->displayName() : QString(); const QString projectName = project ? project->displayName() : QString();
const QString projectNameContextMenu = currentProject ? currentProject->displayName() : QString(); const QString projectNameContextMenu = currentProject ? currentProject->displayName() : QString();
m_unloadAction->setParameter(projectName); m_unloadAction->setParameter(SessionManager::projects().size() == 1 ? projectName : QString());
m_unloadActionContextMenu->setParameter(projectNameContextMenu); m_unloadActionContextMenu->setParameter(projectNameContextMenu);
m_unloadOthersActionContextMenu->setParameter(projectNameContextMenu); m_unloadOthersActionContextMenu->setParameter(projectNameContextMenu);
m_closeProjectFilesActionFileMenu->setParameter(projectName); m_closeProjectFilesActionFileMenu->setParameter(SessionManager::projects().size() == 1
? projectName : QString());
m_closeProjectFilesActionContextMenu->setParameter(projectNameContextMenu); m_closeProjectFilesActionContextMenu->setParameter(projectNameContextMenu);
// mode bar build action // mode bar build action
@@ -2927,17 +2931,16 @@ void ProjectExplorerPluginPrivate::updateActions()
// Session actions // Session actions
m_closeAllProjects->setEnabled(SessionManager::hasProjects()); m_closeAllProjects->setEnabled(SessionManager::hasProjects());
m_unloadAction->setVisible(SessionManager::projects().size() <= 1); m_unloadAction->setEnabled(SessionManager::projects().size() <= 1);
m_unloadAction->setEnabled(SessionManager::projects().size() == 1); m_unloadAction->setEnabled(SessionManager::projects().size() == 1);
m_unloadActionContextMenu->setEnabled(SessionManager::hasProjects()); m_unloadActionContextMenu->setEnabled(SessionManager::hasProjects());
m_unloadOthersActionContextMenu->setVisible(SessionManager::projects().size() >= 2); m_unloadOthersActionContextMenu->setEnabled(SessionManager::projects().size() >= 2);
m_closeProjectFilesActionFileMenu->setVisible(SessionManager::projects().size() <= 1);
m_closeProjectFilesActionFileMenu->setEnabled(SessionManager::projects().size() == 1); m_closeProjectFilesActionFileMenu->setEnabled(SessionManager::projects().size() == 1);
m_closeProjectFilesActionContextMenu->setEnabled(SessionManager::hasProjects()); m_closeProjectFilesActionContextMenu->setEnabled(SessionManager::hasProjects());
ActionContainer *aci = ActionContainer *aci =
ActionManager::actionContainer(Constants::M_UNLOADPROJECTS); ActionManager::actionContainer(Constants::M_UNLOADPROJECTS);
aci->menu()->menuAction()->setVisible(SessionManager::projects().size() > 1); aci->menu()->menuAction()->setEnabled(SessionManager::hasProjects());
m_buildSessionAction->setEnabled(buildSessionState.first); m_buildSessionAction->setEnabled(buildSessionState.first);
m_buildSessionForAllConfigsAction->setEnabled(buildSessionState.first); m_buildSessionForAllConfigsAction->setEnabled(buildSessionState.first);

1
src/plugins/projectexplorer/projectexplorerconstants.h
View File

@@ -60,6 +60,7 @@ const char G_PROJECT_BUILD[] = "Project.Group.Build";
const char G_PROJECT_REBUILD[] = "Project.Group.Rebuild"; const char G_PROJECT_REBUILD[] = "Project.Group.Rebuild";
const char G_PROJECT_RUN[] = "Project.Group.Run"; const char G_PROJECT_RUN[] = "Project.Group.Run";
const char G_PROJECT_FILES[] = "Project.Group.Files"; const char G_PROJECT_FILES[] = "Project.Group.Files";
const char G_PROJECT_CLOSE[] = "Project.Group.Close";
const char G_PROJECT_TREE[] = "Project.Group.Tree"; const char G_PROJECT_TREE[] = "Project.Group.Tree";
const char G_PROJECT_LAST[] = "Project.Group.Last"; const char G_PROJECT_LAST[] = "Project.Group.Last";