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

Implement the New Project creation wizard for QDS

Browse Source 
Task-number: QDS-4490
Change-Id: Ie8073e8838ec14a7f11ad972acc6fca4456adf58
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Samuel Ghinet
2021-11-09 18:58:15 +02:00
parent e7d682e1b0
commit a850b1b866
44 changed files with 3164 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/coreplugin/icore.cpp
View File

@@ -32,6 +32,7 @@
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <utils/algorithm.h>
#include <QApplication>
#include <QDebug>
@@ -165,9 +166,13 @@ namespace Core {
// The Core Singleton
static ICore *m_instance = nullptr;
static MainWindow *m_mainwindow = nullptr;
std::function<NewDialog *(QWidget *)> ICore::m_newDialogFactory = [](QWidget *parent) {
static NewDialog *defaultDialogFactory(QWidget *parent)
{
return new NewDialogWidget(parent);
};
}
static std::function<NewDialog *(QWidget *)> m_newDialogFactory = defaultDialogFactory;
/*!
Returns the pointer to the instance. Only use for connecting to signals.
@@ -253,7 +258,23 @@ void ICore::showNewItemDialog(const QString &title,
const QVariantMap &extraVariables)
{
QTC_ASSERT(!isNewItemDialogRunning(), return);
NewDialog *newDialog = ICore::m_newDialogFactory(dialogParent());
/* This is a workaround for QDS: In QDS, we currently have a "New Project" dialog box but we do
* not also have a "New file" dialog box (yet). Therefore, when requested to add a new file, we
* need to use QtCreator's dialog box. In QDS, if `factories` contains project wizard factories
* (even though it may contain file wizard factories as well), then we consider it to be a
* request for "New Project". Otherwise, if we only have file wizard factories, we defer to
* QtCreator's dialog and request "New File"
*/
auto dialogFactory = m_newDialogFactory;
bool haveProjectWizards = Utils::anyOf(factories, [](IWizardFactory *f) {
return f->kind() == IWizardFactory::ProjectWizard;
});
if (!haveProjectWizards)
dialogFactory = defaultDialogFactory;
NewDialog *newDialog = dialogFactory(dialogParent());
connect(newDialog->widget(), &QObject::destroyed, m_instance, &ICore::updateNewItemDialogState);
newDialog->setWizardFactories(factories, defaultLocation, extraVariables);
newDialog->setWindowTitle(title);