Files
qt-creator/src/plugins/beautifier/configurationpanel.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

138 lines
4.6 KiB
C++

/**************************************************************************
**
** Copyright (C) 2015 Lorenz Haas
** 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 "configurationpanel.h"
#include "ui_configurationpanel.h"
#include "abstractsettings.h"
#include "configurationdialog.h"
#include <QPointer>
namespace Beautifier {
namespace Internal {
ConfigurationPanel::ConfigurationPanel(QWidget *parent) :
QWidget(parent),
ui(new Ui::ConfigurationPanel),
m_settings(0)
{
ui->setupUi(this);
connect(ui->add, &QPushButton::clicked, this, &ConfigurationPanel::add);
connect(ui->edit, &QPushButton::clicked, this, &ConfigurationPanel::edit);
connect(ui->remove, &QPushButton::clicked, this, &ConfigurationPanel::remove);
connect(ui->configurations, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &ConfigurationPanel::updateButtons);
}
ConfigurationPanel::~ConfigurationPanel()
{
delete ui;
}
void ConfigurationPanel::setSettings(AbstractSettings *settings)
{
m_settings = settings;
populateConfigurations();
}
void ConfigurationPanel::setCurrentConfiguration(const QString &text)
{
int textIndex = ui->configurations->findText(text);
if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex);
}
QString ConfigurationPanel::currentConfiguration() const
{
return ui->configurations->currentText();
}
void ConfigurationPanel::remove()
{
m_settings->removeStyle(ui->configurations->currentText());
populateConfigurations();
}
void ConfigurationPanel::add()
{
ConfigurationDialog dialog;
dialog.setWindowTitle(tr("Add Configuration"));
dialog.setSettings(m_settings);
if (QDialog::Accepted == dialog.exec()) {
const QString key = dialog.key();
m_settings->setStyle(key, dialog.value());
populateConfigurations(key);
}
}
void ConfigurationPanel::edit()
{
const QString key = ui->configurations->currentText();
ConfigurationDialog dialog;
dialog.setWindowTitle(tr("Edit Configuration"));
dialog.setSettings(m_settings);
dialog.setKey(key);
if (QDialog::Accepted == dialog.exec()) {
const QString newKey = dialog.key();
if (newKey == key) {
m_settings->setStyle(key, dialog.value());
} else {
m_settings->replaceStyle(key, newKey, dialog.value());
ui->configurations->setItemText(ui->configurations->currentIndex(), newKey);
}
}
}
void ConfigurationPanel::populateConfigurations(const QString &key)
{
ui->configurations->blockSignals(true);
const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText();
ui->configurations->clear();
ui->configurations->addItems(m_settings->styles());
int textIndex = ui->configurations->findText(currentText);
if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex);
updateButtons();
ui->configurations->blockSignals(false);
}
void ConfigurationPanel::updateButtons()
{
const bool enabled
= ((ui->configurations->count() > 0)
&& !m_settings->styleIsReadOnly(ui->configurations->currentText()));
ui->remove->setEnabled(enabled);
ui->edit->setEnabled(enabled);
}
} // namespace Internal
} // namespace Beautifier