Files
qt-creator/src/plugins/git/branchcheckoutdialog.cpp
Eike Ziller 9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'
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
2015-02-12 17:29:21 +01:00

120 lines
4.0 KiB
C++

/****************************************************************************
**
** Copyright (C) 2015 Petar Perisin <petar.perisin@gmail.com>
** 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 "branchcheckoutdialog.h"
#include "ui_branchcheckoutdialog.h"
namespace Git {
namespace Internal {
BranchCheckoutDialog::BranchCheckoutDialog(QWidget *parent,
const QString &currentBranch,
const QString &nextBranch) :
QDialog(parent),
m_ui(new Ui::BranchCheckoutDialog),
m_foundStashForNextBranch(false),
m_hasLocalChanges(true)
{
m_ui->setupUi(this);
setWindowTitle(tr("Checkout branch \"%1\"").arg(nextBranch));
m_ui->moveChangesRadioButton->setText(tr("Move Local Changes to \"%1\"").arg(nextBranch));
m_ui->popStashCheckBox->setText(tr("Pop Stash of \"%1\"").arg(nextBranch));
if (!currentBranch.isEmpty()) {
m_ui->makeStashRadioButton->setText(tr("Create Branch Stash for \"%1\"").arg(currentBranch));
} else {
m_ui->makeStashRadioButton->setText(tr("Create Branch Stash for Current Branch"));
foundNoLocalChanges();
}
connect(m_ui->moveChangesRadioButton, &QRadioButton::toggled,
this, &BranchCheckoutDialog::updatePopStashCheckBox);
}
BranchCheckoutDialog::~BranchCheckoutDialog()
{
delete m_ui;
}
void BranchCheckoutDialog::foundNoLocalChanges()
{
m_ui->discardChangesRadioButton->setChecked(true);
m_ui->localChangesGroupBox->setEnabled(false);
m_hasLocalChanges = false;
}
void BranchCheckoutDialog::foundStashForNextBranch()
{
m_ui->popStashCheckBox->setChecked(true);
m_ui->popStashCheckBox->setEnabled(true);
m_foundStashForNextBranch = true;
}
bool BranchCheckoutDialog::makeStashOfCurrentBranch()
{
return m_ui->makeStashRadioButton->isChecked();
}
bool BranchCheckoutDialog::moveLocalChangesToNextBranch()
{
return m_ui->moveChangesRadioButton->isChecked();
}
bool BranchCheckoutDialog::discardLocalChanges()
{
return m_ui->discardChangesRadioButton->isChecked() && m_ui->localChangesGroupBox->isEnabled();
}
bool BranchCheckoutDialog::popStashOfNextBranch()
{
return m_ui->popStashCheckBox->isChecked();
}
bool BranchCheckoutDialog::hasStashForNextBranch()
{
return m_foundStashForNextBranch;
}
bool BranchCheckoutDialog::hasLocalChanges()
{
return m_hasLocalChanges;
}
void BranchCheckoutDialog::updatePopStashCheckBox(bool moveChangesChecked)
{
m_ui->popStashCheckBox->setChecked(!moveChangesChecked && m_foundStashForNextBranch);
m_ui->popStashCheckBox->setEnabled(!moveChangesChecked && m_foundStashForNextBranch);
}
} // namespace Internal
} // namespace Git