forked from qt-creator/qt-creator
Conflicts: share/qtcreator/debugger/dumper.cpp share/qtcreator/debugger/dumper_p.h share/qtcreator/debugger/test/main.cpp src/plugins/debugger/gdb/classicgdbengine.cpp src/plugins/debugger/gdb/pythongdbengine.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.cpp src/plugins/debugger/lldblib/guest/lldbengineguest.h src/plugins/debugger/lldblib/guest/main.cpp src/plugins/debugger/lldblib/ipcengineguest.cpp src/plugins/debugger/lldblib/ipcengineguest.h src/plugins/debugger/lldblib/ipcenginehost.cpp src/plugins/debugger/lldblib/ipcenginehost.h src/plugins/debugger/lldblib/lldbenginehost.cpp src/plugins/debugger/lldblib/lldboptionspage.cpp src/plugins/qbsprojectmanager/qbsstep.cpp src/plugins/qbsprojectmanager/qbsstep.h src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp src/plugins/qnx/blackberrycheckdevmodestep.cpp src/plugins/qtsupport/debugginghelper.cpp Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
146 lines
5.4 KiB
C++
146 lines
5.4 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/legal
|
|
**
|
|
** 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 Digia. For licensing terms and
|
|
** conditions see http://qt.digia.com/licensing. For further information
|
|
** use the contact form at http://qt.digia.com/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 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, Digia gives you certain additional
|
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "commonsettingspage.h"
|
|
#include "vcsbaseconstants.h"
|
|
|
|
#include "ui_commonsettingspage.h"
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
#include <QDebug>
|
|
#include <QCoreApplication>
|
|
|
|
namespace VcsBase {
|
|
namespace Internal {
|
|
|
|
// ------------------ VcsBaseSettingsWidget
|
|
|
|
CommonSettingsWidget::CommonSettingsWidget(QWidget *parent) :
|
|
QWidget(parent),
|
|
m_ui(new Ui::CommonSettingsPage)
|
|
{
|
|
m_ui->setupUi(this);
|
|
m_ui->submitMessageCheckScriptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
|
m_ui->submitMessageCheckScriptChooser->setHistoryCompleter(QLatin1String("Vcs.MessageCheckScript.History"));
|
|
m_ui->nickNameFieldsFileChooser->setExpectedKind(Utils::PathChooser::File);
|
|
m_ui->nickNameFieldsFileChooser->setHistoryCompleter(QLatin1String("Vcs.NickFields.History"));
|
|
m_ui->nickNameMailMapChooser->setExpectedKind(Utils::PathChooser::File);
|
|
m_ui->nickNameMailMapChooser->setHistoryCompleter(QLatin1String("Vcs.NickMap.History"));
|
|
m_ui->sshPromptChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
|
m_ui->sshPromptChooser->setHistoryCompleter(QLatin1String("Vcs.SshPrompt.History"));
|
|
const QString patchToolTip = tr("Command used for reverting diff chunks");
|
|
m_ui->patchCommandLabel->setToolTip(patchToolTip);
|
|
m_ui->patchChooser->setToolTip(patchToolTip);
|
|
m_ui->patchChooser->setExpectedKind(Utils::PathChooser::ExistingCommand);
|
|
m_ui->patchChooser->setHistoryCompleter(QLatin1String("Vcs.PatchCommand.History"));
|
|
}
|
|
|
|
CommonSettingsWidget::~CommonSettingsWidget()
|
|
{
|
|
delete m_ui;
|
|
}
|
|
|
|
CommonVcsSettings CommonSettingsWidget::settings() const
|
|
{
|
|
CommonVcsSettings rc;
|
|
rc.nickNameMailMap = m_ui->nickNameMailMapChooser->path();
|
|
rc.nickNameFieldListFile = m_ui->nickNameFieldsFileChooser->path();
|
|
rc.submitMessageCheckScript = m_ui->submitMessageCheckScriptChooser->path();
|
|
rc.lineWrap= m_ui->lineWrapCheckBox->isChecked();
|
|
rc.lineWrapWidth = m_ui->lineWrapSpinBox->value();
|
|
rc.sshPasswordPrompt = m_ui->sshPromptChooser->path();
|
|
rc.patchCommand = m_ui->patchChooser->path();
|
|
return rc;
|
|
}
|
|
|
|
void CommonSettingsWidget::setSettings(const CommonVcsSettings &s)
|
|
{
|
|
m_ui->nickNameMailMapChooser->setPath(s.nickNameMailMap);
|
|
m_ui->nickNameFieldsFileChooser->setPath(s.nickNameFieldListFile);
|
|
m_ui->submitMessageCheckScriptChooser->setPath(s.submitMessageCheckScript);
|
|
m_ui->lineWrapCheckBox->setChecked(s.lineWrap);
|
|
m_ui->lineWrapSpinBox->setValue(s.lineWrapWidth);
|
|
m_ui->sshPromptChooser->setPath(s.sshPasswordPrompt);
|
|
m_ui->patchChooser->setPath(s.patchCommand);
|
|
}
|
|
|
|
QString CommonSettingsWidget::searchKeyWordMatchString() const
|
|
{
|
|
const QChar blank = QLatin1Char(' ');
|
|
QString rc = m_ui->lineWrapCheckBox->text()
|
|
+ blank + m_ui->submitMessageCheckScriptLabel->text()
|
|
+ blank + m_ui->nickNameMailMapLabel->text()
|
|
+ blank + m_ui->nickNameFieldsFileLabel->text()
|
|
+ blank + m_ui->sshPromptLabel->text()
|
|
+ blank + m_ui->patchCommandLabel->text()
|
|
;
|
|
rc.remove(QLatin1Char('&')); // Strip buddy markers.
|
|
return rc;
|
|
}
|
|
|
|
// --------------- VcsBaseSettingsPage
|
|
CommonOptionsPage::CommonOptionsPage(QObject *parent) :
|
|
VcsBaseOptionsPage(parent)
|
|
{
|
|
m_settings.fromSettings(Core::ICore::settings());
|
|
|
|
setId(Constants::VCS_COMMON_SETTINGS_ID);
|
|
setDisplayName(QCoreApplication::translate("VcsBase", Constants::VCS_COMMON_SETTINGS_NAME));
|
|
}
|
|
|
|
QWidget *CommonOptionsPage::widget()
|
|
{
|
|
if (!m_widget) {
|
|
m_widget = new CommonSettingsWidget;
|
|
m_widget->setSettings(m_settings);
|
|
}
|
|
return m_widget;
|
|
}
|
|
|
|
void CommonOptionsPage::apply()
|
|
{
|
|
if (m_widget) {
|
|
const CommonVcsSettings newSettings = m_widget->settings();
|
|
if (newSettings != m_settings) {
|
|
m_settings = newSettings;
|
|
m_settings.toSettings(Core::ICore::settings());
|
|
emit settingsChanged(m_settings);
|
|
}
|
|
}
|
|
}
|
|
|
|
void CommonOptionsPage::finish()
|
|
{
|
|
delete m_widget;
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace VcsBase
|