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

ProjectExplorer: Un-break "Edit Active Build/Run Configuration"

Browse Source 
Was harmed by the recent refactoring.

Change-Id: I9399e573132396bd261836253b5703e32a6740b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2025-05-28 16:42:10 +02:00
parent 59f607e448
commit f5aa2f8a14
1 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/projectexplorer/projectwindow.cpp
View File

@@ -321,8 +321,6 @@ public:
void itemUpdatedFromBelow() final; void itemUpdatedFromBelow() final;
TargetItem *currentTargetItem() const; TargetItem *currentTargetItem() const;
TreeItem *buildSettingsItem() const;
TreeItem *runSettingsItem() const;
TargetItem *targetItem(Target *target) const; TargetItem *targetItem(Target *target) const;
void scheduleRebuildContents(); void scheduleRebuildContents();
@@ -686,9 +684,6 @@ public:
}); });
} }
TreeItem *activeBuildSettingsItem() const { return m_targetsItem->buildSettingsItem(); }
TreeItem *activeRunSettingsItem() const { return m_targetsItem->runSettingsItem(); }
TargetGroupItem *targetsItem() const { return m_targetsItem; } TargetGroupItem *targetsItem() const { return m_targetsItem; }
VanishedTargetsGroupItem *vanishedTargetsItem() const { return m_vanishedTargetsItem; } VanishedTargetsGroupItem *vanishedTargetsItem() const { return m_vanishedTargetsItem; }
MiscSettingsGroupItem *miscSettingsItem() const { return m_miscItem; } MiscSettingsGroupItem *miscSettingsItem() const { return m_miscItem; }
@@ -1130,24 +1125,6 @@ TargetItem *TargetGroupItem::currentTargetItem() const
return targetItem(m_project->activeTarget()); return targetItem(m_project->activeTarget());
} }
TreeItem *TargetGroupItem::buildSettingsItem() const
{
if (TargetItem * const targetItem = currentTargetItem()) {
if (targetItem->childCount() == 2)
return targetItem->childAt(0);
}
return nullptr;
}
TreeItem *TargetGroupItem::runSettingsItem() const
{
if (TargetItem * const targetItem = currentTargetItem()) {
if (targetItem->hasChildren())
return targetItem->childAt(targetItem->childCount() - 1);
}
return nullptr;
}
TargetItem *TargetGroupItem::targetItem(Target *target) const TargetItem *TargetGroupItem::targetItem(Target *target) const
{ {
if (target) { if (target) {
@@ -1292,6 +1269,11 @@ public:
layout->addWidget(m_tabWidget); layout->addWidget(m_tabWidget);
} }
void setCurrentIndex(int index)
{
m_tabWidget->setCurrentIndex(index);
}
void setPanels(const ProjectPanels &panels, bool setFocus) void setPanels(const ProjectPanels &panels, bool setFocus)
{ {
const int oldIndex = m_tabWidget->currentIndex(); const int oldIndex = m_tabWidget->currentIndex();
@@ -1630,7 +1612,7 @@ public:
item->itemActivatedDirectly(); item->itemActivatedDirectly();
} }
void activateProjectPanel(Utils::Id panelId) void activateProjectPanel(Id panelId)
{ {
if (ProjectItem *projectItem = currentProjectItem()) { if (ProjectItem *projectItem = currentProjectItem()) {
if (TreeItem *item = projectItem->itemForProjectPanel(panelId)) if (TreeItem *item = projectItem->itemForProjectPanel(panelId))
@@ -1638,6 +1620,16 @@ public:
} }
} }
void activateTargetTab(int index)
{
if (ProjectItem *projectItem = currentProjectItem()) {
if (TargetItem *targetItem = projectItem->targetsItem()->currentTargetItem()) {
targetItem->itemActivatedDirectly();
m_centralWidget->setCurrentIndex(index);
}
}
}
void openContextMenu(const QPoint &pos) void openContextMenu(const QPoint &pos)
{ {
QMenu menu; QMenu menu;
@@ -1757,18 +1749,12 @@ void ProjectWindow::activateProjectPanel(Utils::Id panelId)
void ProjectWindow::activateBuildSettings() void ProjectWindow::activateBuildSettings()
{ {
if (ProjectItem *projectItem = d->currentProjectItem()) { d->activateTargetTab(0);
if (TreeItem *item = projectItem->activeBuildSettingsItem())
d->itemActivated(item->index());
}
} }
void ProjectWindow::activateRunSettings() void ProjectWindow::activateRunSettings()
{ {
if (ProjectItem *projectItem = d->currentProjectItem()) { d->activateTargetTab(1);
if (TreeItem *item = projectItem->activeRunSettingsItem())
d->itemActivated(item->index());
}
} }
OutputWindow *ProjectWindow::buildSystemOutput() const OutputWindow *ProjectWindow::buildSystemOutput() const