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

ProjectExplorer: inline projectwizardpage.ui

Browse Source 
Change-Id: I0c016e08c77b2029a1d024664dde6ae9e3187b3c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Alessandro Portale
2022-08-18 15:42:54 +02:00
parent 95edda95b4
commit e070d826e5
5 changed files with 79 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/CMakeLists.txt
View File

@@ -150,7 +150,7 @@ add_qtc_plugin(ProjectExplorer
projecttreewidget.cpp projecttreewidget.h projecttreewidget.cpp projecttreewidget.h
projectwelcomepage.cpp projectwelcomepage.h projectwelcomepage.cpp projectwelcomepage.h
projectwindow.cpp projectwindow.h projectwindow.cpp projectwindow.h
projectwizardpage.cpp projectwizardpage.h projectwizardpage.ui projectwizardpage.cpp projectwizardpage.h
rawprojectpart.cpp rawprojectpart.h rawprojectpart.cpp rawprojectpart.h
removetaskhandler.cpp removetaskhandler.h removetaskhandler.cpp removetaskhandler.h
runconfiguration.cpp runconfiguration.h runconfiguration.cpp runconfiguration.h

2
src/plugins/projectexplorer/projectexplorer.qbs
View File

@@ -124,7 +124,7 @@ Project {
"projecttree.h", "projecttree.h",
"projecttreewidget.cpp", "projecttreewidget.h", "projecttreewidget.cpp", "projecttreewidget.h",
"projectwindow.cpp", "projectwindow.h", "projectwindow.cpp", "projectwindow.h",
"projectwizardpage.cpp", "projectwizardpage.h", "projectwizardpage.ui", "projectwizardpage.cpp", "projectwizardpage.h",
"rawprojectpart.cpp", "rawprojectpart.h", "rawprojectpart.cpp", "rawprojectpart.h",
"removetaskhandler.cpp", "removetaskhandler.h", "removetaskhandler.cpp", "removetaskhandler.h",
"runconfiguration.cpp", "runconfiguration.h", "runconfiguration.cpp", "runconfiguration.h",

103
src/plugins/projectexplorer/projectwizardpage.cpp
View File

@@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "projectwizardpage.h" #include "projectwizardpage.h"
#include "ui_projectwizardpage.h"
#include "project.h" #include "project.h"
#include "projectmodels.h" #include "projectmodels.h"
@@ -14,15 +13,20 @@
#include <coreplugin/vcsmanager.h> #include <coreplugin/vcsmanager.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/layoutbuilder.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <utils/treeviewcombobox.h>
#include <utils/wizard.h> #include <utils/wizard.h>
#include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbaseconstants.h>
#include <QComboBox>
#include <QDir> #include <QDir>
#include <QLabel>
#include <QPushButton>
#include <QScrollArea>
#include <QTextStream> #include <QTextStream>
#include <QTreeView>
/*! /*!
\class ProjectExplorer::Internal::ProjectWizardPage \class ProjectExplorer::Internal::ProjectWizardPage
@@ -259,29 +263,52 @@ static AddNewTree *buildAddFilesTree(FolderNode *root, const FilePaths &files,
// ProjectWizardPage: // ProjectWizardPage:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
ProjectWizardPage::ProjectWizardPage(QWidget *parent) : WizardPage(parent), ProjectWizardPage::ProjectWizardPage(QWidget *parent)
m_ui(new Ui::WizardPage) : WizardPage(parent)
{ {
m_ui->setupUi(this); m_projectLabel = new QLabel;
m_ui->vcsManageButton->setText(ICore::msgShowOptionsDialog()); m_projectComboBox = new Utils::TreeViewComboBox;
connect(m_ui->projectComboBox, &QComboBox::currentIndexChanged, m_additionalInfo = new QLabel;
m_addToVersionControlLabel = new QLabel(tr("Add to &version control:"));
m_addToVersionControlComboBox = new QComboBox;
m_vcsManageButton = new QPushButton(ICore::msgShowOptionsDialog());
m_vcsManageButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
m_filesLabel = new QLabel;
m_filesLabel->setAlignment(Qt::AlignBottom);
m_filesLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
auto scrollArea = new QScrollArea;
scrollArea->setFrameShape(QFrame::NoFrame);
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
scrollArea->setWidgetResizable(true);
scrollArea->setWidget(m_filesLabel);
using namespace Utils::Layouting;
Column {
Form {
m_projectLabel, m_projectComboBox, br,
empty, m_additionalInfo, br,
m_addToVersionControlLabel, m_addToVersionControlComboBox, m_vcsManageButton, br,
},
scrollArea,
}.attachTo(this);
connect(m_projectComboBox, &QComboBox::currentIndexChanged,
this, &ProjectWizardPage::projectChanged); this, &ProjectWizardPage::projectChanged);
connect(m_ui->addToVersionControlComboBox, &QComboBox::currentIndexChanged, connect(m_addToVersionControlComboBox, &QComboBox::currentIndexChanged,
this, &ProjectWizardPage::versionControlChanged); this, &ProjectWizardPage::versionControlChanged);
connect(m_ui->vcsManageButton, &QAbstractButton::clicked, this, &ProjectWizardPage::manageVcs); connect(m_vcsManageButton, &QAbstractButton::clicked, this, &ProjectWizardPage::manageVcs);
setProperty(SHORT_TITLE_PROPERTY, tr("Summary")); setProperty(SHORT_TITLE_PROPERTY, tr("Summary"));
connect(VcsManager::instance(), &VcsManager::configurationChanged, connect(VcsManager::instance(), &VcsManager::configurationChanged,
this, &ProjectExplorer::Internal::ProjectWizardPage::initializeVersionControls); this, &ProjectExplorer::Internal::ProjectWizardPage::initializeVersionControls);
m_ui->projectComboBox->setModel(&m_model); m_projectComboBox->setModel(&m_model);
} }
ProjectWizardPage::~ProjectWizardPage() ProjectWizardPage::~ProjectWizardPage()
{ {
disconnect(m_ui->projectComboBox, &QComboBox::currentIndexChanged, disconnect(m_projectComboBox, &QComboBox::currentIndexChanged,
this, &ProjectWizardPage::projectChanged); this, &ProjectWizardPage::projectChanged);
delete m_ui;
} }
bool ProjectWizardPage::expandTree(const QModelIndex &root) bool ProjectWizardPage::expandTree(const QModelIndex &root)
@@ -299,9 +326,9 @@ bool ProjectWizardPage::expandTree(const QModelIndex &root)
// Apply to self // Apply to self
if (expand) if (expand)
m_ui->projectComboBox->view()->expand(root); m_projectComboBox->view()->expand(root);
else else
m_ui->projectComboBox->view()->collapse(root); m_projectComboBox->view()->collapse(root);
// if we are a high priority node, our *parent* needs to be expanded // if we are a high priority node, our *parent* needs to be expanded
auto tree = static_cast<AddNewTree *>(root.internalPointer()); auto tree = static_cast<AddNewTree *>(root.internalPointer());
@@ -314,25 +341,25 @@ bool ProjectWizardPage::expandTree(const QModelIndex &root)
void ProjectWizardPage::setBestNode(AddNewTree *tree) void ProjectWizardPage::setBestNode(AddNewTree *tree)
{ {
QModelIndex index = tree ? m_model.indexForItem(tree) : QModelIndex(); QModelIndex index = tree ? m_model.indexForItem(tree) : QModelIndex();
m_ui->projectComboBox->setCurrentIndex(index); m_projectComboBox->setCurrentIndex(index);
while (index.isValid()) { while (index.isValid()) {
m_ui->projectComboBox->view()->expand(index); m_projectComboBox->view()->expand(index);
index = index.parent(); index = index.parent();
} }
} }
FolderNode *ProjectWizardPage::currentNode() const FolderNode *ProjectWizardPage::currentNode() const
{ {
QVariant v = m_ui->projectComboBox->currentData(Qt::UserRole); QVariant v = m_projectComboBox->currentData(Qt::UserRole);
return v.isNull() ? nullptr : static_cast<FolderNode *>(v.value<void *>()); return v.isNull() ? nullptr : static_cast<FolderNode *>(v.value<void *>());
} }
void ProjectWizardPage::setAddingSubProject(bool addingSubProject) void ProjectWizardPage::setAddingSubProject(bool addingSubProject)
{ {
m_ui->projectLabel->setText(addingSubProject ? m_projectLabel->setText(addingSubProject ?
tr("Add as a subproject to project:") tr("Add as a subproject to project:")
: tr("Add to &project:")); : tr("Add to &project:"));
} }
void ProjectWizardPage::initializeVersionControls() void ProjectWizardPage::initializeVersionControls()
@@ -446,45 +473,45 @@ void ProjectWizardPage::initializeProjectTree(Node *context, const FilePaths &pa
auto predicate = [context](TreeItem *ti) { return static_cast<AddNewTree*>(ti)->node() == context; }; auto predicate = [context](TreeItem *ti) { return static_cast<AddNewTree*>(ti)->node() == context; };
TreeItem *contextItem = root->findAnyChild(predicate); TreeItem *contextItem = root->findAnyChild(predicate);
if (contextItem) if (contextItem)
m_ui->projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem)); m_projectComboBox->setCurrentIndex(m_model.indexForItem(contextItem));
setAdditionalInfo(selector.deployingProjects()); setAdditionalInfo(selector.deployingProjects());
setBestNode(selector.bestChoice()); setBestNode(selector.bestChoice());
setAddingSubProject(action == AddSubProject); setAddingSubProject(action == AddSubProject);
m_ui->projectComboBox->setEnabled(m_model.rowCount(QModelIndex()) > 1); m_projectComboBox->setEnabled(m_model.rowCount(QModelIndex()) > 1);
} }
void ProjectWizardPage::setNoneLabel(const QString &label) void ProjectWizardPage::setNoneLabel(const QString &label)
{ {
m_ui->projectComboBox->setItemText(0, label); m_projectComboBox->setItemText(0, label);
} }
void ProjectWizardPage::setAdditionalInfo(const QString &text) void ProjectWizardPage::setAdditionalInfo(const QString &text)
{ {
m_ui->additionalInfo->setText(text); m_additionalInfo->setText(text);
m_ui->additionalInfo->setVisible(!text.isEmpty()); m_additionalInfo->setVisible(!text.isEmpty());
} }
void ProjectWizardPage::setVersionControls(const QStringList &vcs) void ProjectWizardPage::setVersionControls(const QStringList &vcs)
{ {
m_ui->addToVersionControlComboBox->clear(); m_addToVersionControlComboBox->clear();
m_ui->addToVersionControlComboBox->addItems(vcs); m_addToVersionControlComboBox->addItems(vcs);
} }
int ProjectWizardPage::versionControlIndex() const int ProjectWizardPage::versionControlIndex() const
{ {
return m_ui->addToVersionControlComboBox->currentIndex(); return m_addToVersionControlComboBox->currentIndex();
} }
void ProjectWizardPage::setVersionControlIndex(int idx) void ProjectWizardPage::setVersionControlIndex(int idx)
{ {
m_ui->addToVersionControlComboBox->setCurrentIndex(idx); m_addToVersionControlComboBox->setCurrentIndex(idx);
} }
IVersionControl *ProjectWizardPage::currentVersionControl() IVersionControl *ProjectWizardPage::currentVersionControl()
{ {
int index = m_ui->addToVersionControlComboBox->currentIndex() - 1; // Subtract "<None>" int index = m_addToVersionControlComboBox->currentIndex() - 1; // Subtract "<None>"
if (index < 0 || index > m_activeVersionControls.count()) if (index < 0 || index > m_activeVersionControls.count())
return nullptr; // <None> return nullptr; // <None>
return m_activeVersionControls.at(index); return m_activeVersionControls.at(index);
@@ -530,13 +557,13 @@ void ProjectWizardPage::setFiles(const QStringList &fileNames)
str << "</pre>"; str << "</pre>";
} }
m_ui->filesLabel->setText(fileMessage); m_filesLabel->setText(fileMessage);
} }
void ProjectWizardPage::setProjectToolTip(const QString &tt) void ProjectWizardPage::setProjectToolTip(const QString &tt)
{ {
m_ui->projectComboBox->setToolTip(tt); m_projectComboBox->setToolTip(tt);
m_ui->projectLabel->setToolTip(tt); m_projectLabel->setToolTip(tt);
} }
void ProjectWizardPage::projectChanged(int index) void ProjectWizardPage::projectChanged(int index)
@@ -553,15 +580,15 @@ void ProjectWizardPage::manageVcs()
void ProjectWizardPage::hideVersionControlUiElements() void ProjectWizardPage::hideVersionControlUiElements()
{ {
m_ui->addToVersionControlLabel->hide(); m_addToVersionControlLabel->hide();
m_ui->vcsManageButton->hide(); m_vcsManageButton->hide();
m_ui->addToVersionControlComboBox->hide(); m_addToVersionControlComboBox->hide();
} }
void ProjectWizardPage::setProjectUiVisible(bool visible) void ProjectWizardPage::setProjectUiVisible(bool visible)
{ {
m_ui->projectLabel->setVisible(visible); m_projectLabel->setVisible(visible);
m_ui->projectComboBox->setVisible(visible); m_projectComboBox->setVisible(visible);
} }
} // namespace Internal } // namespace Internal

16
src/plugins/projectexplorer/projectwizardpage.h
View File

@@ -12,10 +12,13 @@
#include <utils/treemodel.h> #include <utils/treemodel.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTreeView; class QComboBox;
class QLabel;
class QPushButton;
class QModelIndex; class QModelIndex;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Utils { class TreeViewComboBox; }
namespace Core { class IVersionControl; } namespace Core { class IVersionControl; }
namespace ProjectExplorer { namespace ProjectExplorer {
@@ -23,8 +26,6 @@ namespace Internal {
class AddNewTree; class AddNewTree;
namespace Ui { class WizardPage; }
// Documentation inside. // Documentation inside.
class ProjectWizardPage : public Utils::WizardPage class ProjectWizardPage : public Utils::WizardPage
{ {
@@ -70,13 +71,20 @@ private:
void setProjectToolTip(const QString &); void setProjectToolTip(const QString &);
bool expandTree(const QModelIndex &root); bool expandTree(const QModelIndex &root);
Ui::WizardPage *m_ui;
QStringList m_projectToolTips; QStringList m_projectToolTips;
Utils::TreeModel<> m_model; Utils::TreeModel<> m_model;
QList<Core::IVersionControl*> m_activeVersionControls; QList<Core::IVersionControl*> m_activeVersionControls;
QString m_commonDirectory; QString m_commonDirectory;
bool m_repositoryExists = false; bool m_repositoryExists = false;
QLabel *m_projectLabel;
Utils::TreeViewComboBox *m_projectComboBox;
QLabel *m_additionalInfo;
QLabel *m_addToVersionControlLabel;
QComboBox *m_addToVersionControlComboBox;
QPushButton *m_vcsManageButton;
QLabel *m_filesLabel;
}; };
} // namespace Internal } // namespace Internal

146
src/plugins/projectexplorer/projectwizardpage.ui
View File

@@ -1,146 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ProjectExplorer::Internal::WizardPage</class>
<widget class="QWizardPage" name="ProjectExplorer::Internal::WizardPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>397</width>
<height>248</height>
</rect>
</property>
<property name="title">
<string>Project Management</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="projectLabel">
<property name="text">
<string>Add to &amp;project:</string>
</property>
<property name="buddy">
<cstring>projectComboBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QLabel" name="additionalInfo">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="addToVersionControlLabel">
<property name="text">
<string>Add to &amp;version control:</string>
</property>
<property name="buddy">
<cstring>addToVersionControlComboBox</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="addToVersionControlComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="vcsManageButton">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="Utils::TreeViewComboBox" name="projectComboBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToContents</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAsNeeded</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>379</width>
<height>154</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="filesLabel">
<property name="text">
<string>The following files will be added:
</string>
</property>
<property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::TreeViewComboBox</class>
<extends>QComboBox</extends>
<header location="global">utils/treeviewcombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>projectComboBox</tabstop>
<tabstop>addToVersionControlComboBox</tabstop>
<tabstop>vcsManageButton</tabstop>
<tabstop>scrollArea</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>