Move code from Designer to QtSupport

* Move settings pages for Qt code generation from Designer to QtSupport
  plugin.
* Make Designer plugin depend on QtSupport

Change-Id: I222dac0a648c194ce46fd9f8bbb09c70db851bbd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-07-18 15:47:20 +02:00
parent f7e8acbd09
commit ff33e989c7
16 changed files with 244 additions and 154 deletions

View File

@@ -0,0 +1,134 @@
/****************************************************************************
**
** 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 "codegensettingspage.h"
#include "qtsupportconstants.h"
#include <cpptools/cpptoolsconstants.h>
#include <QCoreApplication>
#include <QTextStream>
#include <coreplugin/icore.h>
namespace QtSupport {
namespace Internal {
// ---------- CodeGenSettingsPageWidget
CodeGenSettingsPageWidget::CodeGenSettingsPageWidget(QWidget *parent) :
QWidget(parent)
{
m_ui.setupUi(this);
connect(m_ui.includeQtModuleCheckBox, SIGNAL(toggled(bool)),
m_ui.addQtVersionCheckBox, SLOT(setEnabled(bool)));
}
CodeGenSettings CodeGenSettingsPageWidget::parameters() const
{
CodeGenSettings rc;
rc.embedding = static_cast<CodeGenSettings::UiClassEmbedding>(uiEmbedding());
rc.retranslationSupport =m_ui.retranslateCheckBox->isChecked();
rc.includeQtModule = m_ui.includeQtModuleCheckBox->isChecked();
rc.addQtVersionCheck = m_ui.addQtVersionCheckBox->isChecked();
return rc;
}
void CodeGenSettingsPageWidget::setParameters(const CodeGenSettings &p)
{
m_ui.retranslateCheckBox->setChecked(p.retranslationSupport);
m_ui.includeQtModuleCheckBox->setChecked(p.includeQtModule);
m_ui.addQtVersionCheckBox->setChecked(p.addQtVersionCheck);
setUiEmbedding(p.embedding);
}
int CodeGenSettingsPageWidget::uiEmbedding() const
{
if (m_ui.ptrAggregationRadioButton->isChecked())
return CodeGenSettings::PointerAggregatedUiClass;
if (m_ui.aggregationButton->isChecked())
return CodeGenSettings::AggregatedUiClass;
return CodeGenSettings::InheritedUiClass;
}
void CodeGenSettingsPageWidget::setUiEmbedding(int v)
{
switch (v) {
case CodeGenSettings::PointerAggregatedUiClass:
m_ui.ptrAggregationRadioButton->setChecked(true);
break;
case CodeGenSettings::AggregatedUiClass:
m_ui.aggregationButton->setChecked(true);
break;
case CodeGenSettings::InheritedUiClass:
m_ui.multipleInheritanceButton->setChecked(true);
break;
}
}
// ---------- CodeGenSettingsPage
CodeGenSettingsPage::CodeGenSettingsPage(QObject *parent) :
Core::IOptionsPage(parent),
m_widget(0)
{
m_parameters.fromSettings(Core::ICore::settings());
setId(Constants::CODEGEN_SETTINGS_PAGE_ID);
setDisplayName(QCoreApplication::translate("QtSupport", Constants::CODEGEN_SETTINGS_PAGE_NAME));
setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools", CppTools::Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(CppTools::Constants::SETTINGS_CATEGORY_CPP_ICON));
}
QWidget *CodeGenSettingsPage::widget()
{
if (!m_widget) {
m_widget = new CodeGenSettingsPageWidget;
m_widget->setParameters(m_parameters);
}
return m_widget;
}
void CodeGenSettingsPage::apply()
{
if (m_widget) {
const CodeGenSettings newParameters = m_widget->parameters();
if (newParameters != m_parameters) {
m_parameters = newParameters;
m_parameters.toSettings(Core::ICore::settings());
}
}
}
void CodeGenSettingsPage::finish()
{
delete m_widget;
}
} // namespace Internal
} // namespace QtSupport