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
142 lines
4.6 KiB
C++
142 lines
4.6 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 "diffeditorguicontroller.h"
|
|
#include "diffeditorcontroller.h"
|
|
|
|
#include <coreplugin/icore.h>
|
|
|
|
#include <utils/qtcassert.h>
|
|
|
|
static const char settingsGroupC[] = "DiffEditor";
|
|
static const char descriptionVisibleKeyC[] = "DescriptionVisible";
|
|
static const char horizontalScrollBarSynchronizationKeyC[] =
|
|
"HorizontalScrollBarSynchronization";
|
|
|
|
namespace DiffEditor {
|
|
|
|
DiffEditorGuiController::DiffEditorGuiController(
|
|
DiffEditorController *controller,
|
|
QObject *parent)
|
|
: QObject(parent),
|
|
m_controller(controller),
|
|
m_descriptionVisible(true),
|
|
m_syncScrollBars(true),
|
|
m_currentDiffFileIndex(-1)
|
|
{
|
|
QTC_ASSERT(m_controller, return);
|
|
QSettings *s = Core::ICore::settings();
|
|
s->beginGroup(QLatin1String(settingsGroupC));
|
|
m_descriptionVisible = s->value(QLatin1String(descriptionVisibleKeyC),
|
|
m_descriptionVisible).toBool();
|
|
m_syncScrollBars = s->value(QLatin1String(horizontalScrollBarSynchronizationKeyC),
|
|
m_syncScrollBars).toBool();
|
|
s->endGroup();
|
|
|
|
connect(m_controller, &DiffEditorController::cleared, this,
|
|
&DiffEditorGuiController::slotUpdateDiffFileIndex);
|
|
connect(m_controller, &DiffEditorController::diffFilesChanged, this,
|
|
&DiffEditorGuiController::slotUpdateDiffFileIndex);
|
|
slotUpdateDiffFileIndex();
|
|
}
|
|
|
|
DiffEditorController *DiffEditorGuiController::controller() const
|
|
{
|
|
return m_controller;
|
|
}
|
|
|
|
bool DiffEditorGuiController::isDescriptionVisible() const
|
|
{
|
|
return m_descriptionVisible;
|
|
}
|
|
|
|
bool DiffEditorGuiController::horizontalScrollBarSynchronization() const
|
|
{
|
|
return m_syncScrollBars;
|
|
}
|
|
|
|
int DiffEditorGuiController::currentDiffFileIndex() const
|
|
{
|
|
return m_currentDiffFileIndex;
|
|
}
|
|
|
|
void DiffEditorGuiController::slotUpdateDiffFileIndex()
|
|
{
|
|
m_currentDiffFileIndex = (m_controller->diffFiles().isEmpty() ? -1 : 0);
|
|
}
|
|
|
|
void DiffEditorGuiController::setDescriptionVisible(bool on)
|
|
{
|
|
if (m_descriptionVisible == on)
|
|
return;
|
|
|
|
m_descriptionVisible = on;
|
|
|
|
QSettings *s = Core::ICore::settings();
|
|
s->beginGroup(QLatin1String(settingsGroupC));
|
|
s->setValue(QLatin1String(descriptionVisibleKeyC), m_descriptionVisible);
|
|
s->endGroup();
|
|
|
|
emit descriptionVisibilityChanged(on);
|
|
}
|
|
|
|
void DiffEditorGuiController::setHorizontalScrollBarSynchronization(bool on)
|
|
{
|
|
if (m_syncScrollBars == on)
|
|
return;
|
|
|
|
m_syncScrollBars = on;
|
|
|
|
QSettings *s = Core::ICore::settings();
|
|
s->beginGroup(QLatin1String(settingsGroupC));
|
|
s->setValue(QLatin1String(horizontalScrollBarSynchronizationKeyC),
|
|
m_syncScrollBars);
|
|
s->endGroup();
|
|
|
|
emit horizontalScrollBarSynchronizationChanged(on);
|
|
}
|
|
|
|
void DiffEditorGuiController::setCurrentDiffFileIndex(int diffFileIndex)
|
|
{
|
|
if (m_controller->diffFiles().isEmpty())
|
|
return; // -1 is the only valid value in this case
|
|
|
|
const int newIndex = qBound(0, diffFileIndex,
|
|
m_controller->diffFiles().count() - 1);
|
|
|
|
if (m_currentDiffFileIndex == newIndex)
|
|
return;
|
|
|
|
m_currentDiffFileIndex = newIndex;
|
|
emit currentDiffFileIndexChanged(newIndex);
|
|
}
|
|
|
|
} // namespace DiffEditor
|