forked from qt-creator/qt-creator
Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
169 lines
5.5 KiB
C++
169 lines
5.5 KiB
C++
/**************************************************************************
|
|
**
|
|
** This file is part of Qt Creator
|
|
**
|
|
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
|
|
**
|
|
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
**
|
|
** No Commercial Usage
|
|
**
|
|
** This file contains pre-release code and may not be distributed.
|
|
** You may use this file in accordance with the terms and conditions
|
|
** contained in the Technology Preview License Agreement accompanying
|
|
** this package.
|
|
**
|
|
** 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 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
|
** packaging of this file. Please review the following information to
|
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** If you have questions regarding the use of this file, please contact
|
|
** Nokia at qt-info@nokia.com.
|
|
**
|
|
**************************************************************************/
|
|
|
|
#include "settingspage.h"
|
|
#include "gitsettings.h"
|
|
#include "gitplugin.h"
|
|
#include "gitclient.h"
|
|
|
|
#include <vcsbase/vcsbaseconstants.h>
|
|
|
|
#include <QtCore/QCoreApplication>
|
|
#include <QtCore/QFileInfo>
|
|
#include <QtCore/QDebug>
|
|
#include <QtCore/QTextStream>
|
|
#include <QtCore/QProcessEnvironment>
|
|
#include <QtGui/QMessageBox>
|
|
|
|
namespace Git {
|
|
namespace Internal {
|
|
|
|
SettingsPageWidget::SettingsPageWidget(QWidget *parent) :
|
|
QWidget(parent)
|
|
{
|
|
m_ui.setupUi(this);
|
|
connect(m_ui.adoptButton, SIGNAL(clicked()), this, SLOT(setSystemPath()));
|
|
#ifdef Q_OS_WIN
|
|
const QByteArray currentHome = qgetenv("HOME");
|
|
const QString toolTip
|
|
= tr("Set the environment variable HOME to '%1'\n(%2).\n"
|
|
"This causes msysgit to look for the SSH-keys in that location\n"
|
|
"instead of its installation directory when run outside git bash.").
|
|
arg(GitClient::fakeWinHome(QProcessEnvironment::systemEnvironment()),
|
|
currentHome.isEmpty() ? tr("not currently set") :
|
|
tr("currently set to '%1'").arg(QString::fromLocal8Bit(currentHome)));
|
|
m_ui.winHomeCheckBox->setToolTip(toolTip);
|
|
#else
|
|
m_ui.winHomeCheckBox->setVisible(false);
|
|
#endif
|
|
}
|
|
|
|
GitSettings SettingsPageWidget::settings() const
|
|
{
|
|
GitSettings rc;
|
|
rc.path = m_ui.pathLineEdit->text();
|
|
rc.adoptPath = m_ui.environmentGroupBox->isChecked() && !rc.path.isEmpty();
|
|
rc.logCount = m_ui.logCountSpinBox->value();
|
|
rc.timeoutSeconds = m_ui.timeoutSpinBox->value();
|
|
rc.pullRebase = m_ui.pullRebaseCheckBox->isChecked();
|
|
rc.promptToSubmit = m_ui.promptToSubmitCheckBox->isChecked();
|
|
rc.winSetHomeEnvironment = m_ui.winHomeCheckBox->isChecked();
|
|
rc.gitkOptions = m_ui.gitkOptionsLineEdit->text().trimmed();
|
|
return rc;
|
|
}
|
|
|
|
void SettingsPageWidget::setSettings(const GitSettings &s)
|
|
{
|
|
m_ui.environmentGroupBox->setChecked(s.adoptPath);
|
|
m_ui.pathLineEdit->setText(s.path);
|
|
m_ui.logCountSpinBox->setValue(s.logCount);
|
|
m_ui.timeoutSpinBox->setValue(s.timeoutSeconds);
|
|
m_ui.pullRebaseCheckBox->setChecked(s.pullRebase);
|
|
m_ui.promptToSubmitCheckBox->setChecked(s.promptToSubmit);
|
|
m_ui.winHomeCheckBox->setChecked(s.winSetHomeEnvironment);
|
|
m_ui.gitkOptionsLineEdit->setText(s.gitkOptions);
|
|
}
|
|
|
|
void SettingsPageWidget::setSystemPath()
|
|
{
|
|
m_ui.pathLineEdit->setText(QLatin1String(qgetenv("PATH")));
|
|
}
|
|
|
|
QString SettingsPageWidget::searchKeywords() const
|
|
{
|
|
QString rc;
|
|
QLatin1Char sep(' ');
|
|
QTextStream(&rc)
|
|
<< sep << m_ui.environmentGroupBox->title()
|
|
<< sep << m_ui.pathlabel->text()
|
|
<< sep << m_ui.winHomeCheckBox->text()
|
|
<< sep << m_ui.groupBox->title()
|
|
<< sep << m_ui.logCountLabel->text()
|
|
<< sep << m_ui.timeoutLabel->text()
|
|
<< sep << m_ui.promptToSubmitCheckBox->text()
|
|
<< sep << m_ui.promptToSubmitCheckBox->text()
|
|
<< sep << m_ui.gitkGroupBox->title()
|
|
<< sep << m_ui.gitkOptionsLabel->text()
|
|
;
|
|
rc.remove(QLatin1Char('&'));
|
|
return rc;
|
|
}
|
|
|
|
// -------- SettingsPage
|
|
SettingsPage::SettingsPage() :
|
|
m_widget(0)
|
|
{
|
|
}
|
|
|
|
QString SettingsPage::id() const
|
|
{
|
|
return QLatin1String(VCSBase::Constants::VCS_ID_GIT);
|
|
}
|
|
|
|
QString SettingsPage::displayName() const
|
|
{
|
|
return tr("Git");
|
|
}
|
|
|
|
QWidget *SettingsPage::createPage(QWidget *parent)
|
|
{
|
|
m_widget = new SettingsPageWidget(parent);
|
|
m_widget->setSettings(GitPlugin::instance()->settings());
|
|
if (m_searchKeywords.isEmpty())
|
|
m_searchKeywords = m_widget->searchKeywords();
|
|
return m_widget;
|
|
}
|
|
|
|
void SettingsPage::apply()
|
|
{
|
|
const GitSettings newSettings = m_widget->settings();
|
|
// Warn if git cannot be found in path if the widget is on top
|
|
if (m_widget->isVisible()) {
|
|
bool gitFoundOk;
|
|
QString errorMessage;
|
|
newSettings.gitBinaryPath(&gitFoundOk, &errorMessage);
|
|
if (!gitFoundOk)
|
|
QMessageBox::warning(m_widget, tr("Git Settings"), errorMessage);
|
|
}
|
|
|
|
GitPlugin::instance()->setSettings(newSettings);
|
|
}
|
|
|
|
bool SettingsPage::matches(const QString &s) const
|
|
{
|
|
return m_searchKeywords.contains(s, Qt::CaseInsensitive);
|
|
}
|
|
|
|
}
|
|
}
|