forked from qt-creator/qt-creator
Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
170 lines
6.0 KiB
C++
170 lines
6.0 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms and
|
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "qmlprojectrunconfigurationwidget.h"
|
|
#include "qmlprojectrunconfiguration.h"
|
|
#include "qmlproject.h"
|
|
|
|
#include <coreplugin/icore.h>
|
|
#include <projectexplorer/projectexplorer.h>
|
|
#include <projectexplorer/target.h>
|
|
#include <utils/detailswidget.h>
|
|
|
|
#include <QLineEdit>
|
|
#include <QComboBox>
|
|
#include <QFormLayout>
|
|
#include <QLabel>
|
|
#include <QStandardItemModel>
|
|
|
|
using Core::ICore;
|
|
|
|
namespace QmlProjectManager {
|
|
namespace Internal {
|
|
|
|
QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRunConfiguration *rc) :
|
|
m_runConfiguration(rc),
|
|
m_fileListCombo(0),
|
|
m_fileListModel(new QStandardItemModel(this))
|
|
{
|
|
QVBoxLayout *layout = new QVBoxLayout(this);
|
|
layout->setMargin(0);
|
|
|
|
//
|
|
// Qt Version, Arguments
|
|
//
|
|
|
|
Utils::DetailsWidget *detailsWidget = new Utils::DetailsWidget();
|
|
detailsWidget->setState(Utils::DetailsWidget::NoSummary);
|
|
|
|
QWidget *formWidget = new QWidget(detailsWidget);
|
|
detailsWidget->setWidget(formWidget);
|
|
QFormLayout *form = new QFormLayout(formWidget);
|
|
form->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
|
|
|
|
m_fileListCombo = new QComboBox;
|
|
m_fileListCombo->setModel(m_fileListModel);
|
|
|
|
connect(m_fileListCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated),
|
|
this, &QmlProjectRunConfigurationWidget::setMainScript);
|
|
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()),
|
|
SLOT(updateFileComboBox()));
|
|
|
|
QLineEdit *qmlViewerArgs = new QLineEdit;
|
|
qmlViewerArgs->setText(rc->m_qmlViewerArgs);
|
|
connect(qmlViewerArgs, &QLineEdit::textChanged,
|
|
this, &QmlProjectRunConfigurationWidget::onViewerArgsChanged);
|
|
|
|
form->addRow(tr("Arguments:"), qmlViewerArgs);
|
|
form->addRow(tr("Main QML file:"), m_fileListCombo);
|
|
|
|
layout->addWidget(detailsWidget);
|
|
|
|
updateFileComboBox();
|
|
|
|
connect(rc, SIGNAL(scriptSourceChanged()),
|
|
this, SLOT(updateFileComboBox()));
|
|
}
|
|
|
|
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
|
|
{
|
|
return s1.toLower() < s2.toLower();
|
|
}
|
|
|
|
void QmlProjectRunConfigurationWidget::updateFileComboBox()
|
|
{
|
|
ProjectExplorer::Project *project = m_runConfiguration->target()->project();
|
|
QDir projectDir(project->projectDirectory().toString());
|
|
|
|
if (m_runConfiguration->mainScriptSource() == QmlProjectRunConfiguration::FileInProjectFile) {
|
|
const QString mainScriptInFilePath
|
|
= projectDir.relativeFilePath(m_runConfiguration->mainScript());
|
|
m_fileListModel->clear();
|
|
m_fileListModel->appendRow(new QStandardItem(mainScriptInFilePath));
|
|
m_fileListCombo->setEnabled(false);
|
|
return;
|
|
}
|
|
|
|
m_fileListCombo->setEnabled(true);
|
|
m_fileListModel->clear();
|
|
m_fileListModel->appendRow(new QStandardItem(QLatin1String(CURRENT_FILE)));
|
|
QModelIndex currentIndex;
|
|
|
|
QStringList sortedFiles = project->files(ProjectExplorer::Project::AllFiles);
|
|
|
|
// make paths relative to project directory
|
|
QStringList relativeFiles;
|
|
foreach (const QString &fn, sortedFiles) {
|
|
relativeFiles += projectDir.relativeFilePath(fn);
|
|
}
|
|
sortedFiles = relativeFiles;
|
|
|
|
qStableSort(sortedFiles.begin(), sortedFiles.end(), caseInsensitiveLessThan);
|
|
|
|
QString mainScriptPath;
|
|
if (m_runConfiguration->mainScriptSource() != QmlProjectRunConfiguration::FileInEditor)
|
|
mainScriptPath = projectDir.relativeFilePath(m_runConfiguration->mainScript());
|
|
|
|
foreach (const QString &fn, sortedFiles) {
|
|
QFileInfo fileInfo(fn);
|
|
if (fileInfo.suffix() != QLatin1String("qml"))
|
|
continue;
|
|
|
|
QStandardItem *item = new QStandardItem(fn);
|
|
m_fileListModel->appendRow(item);
|
|
|
|
if (mainScriptPath == fn)
|
|
currentIndex = item->index();
|
|
}
|
|
|
|
if (currentIndex.isValid())
|
|
m_fileListCombo->setCurrentIndex(currentIndex.row());
|
|
else
|
|
m_fileListCombo->setCurrentIndex(0);
|
|
}
|
|
|
|
void QmlProjectRunConfigurationWidget::setMainScript(int index)
|
|
{
|
|
if (index == 0) {
|
|
m_runConfiguration->setScriptSource(QmlProjectRunConfiguration::FileInEditor);
|
|
} else {
|
|
const QString path = m_fileListModel->data(m_fileListModel->index(index, 0)).toString();
|
|
m_runConfiguration->setScriptSource(QmlProjectRunConfiguration::FileInSettings, path);
|
|
}
|
|
}
|
|
|
|
void QmlProjectRunConfigurationWidget::onViewerArgsChanged()
|
|
{
|
|
if (QLineEdit *lineEdit = qobject_cast<QLineEdit*>(sender()))
|
|
m_runConfiguration->m_qmlViewerArgs = lineEdit->text();
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace QmlProjectManager
|