diff --git a/kcms/qtquicksettings/kcmqtquicksettings.h b/kcms/qtquicksettings/kcmqtquicksettings.h --- a/kcms/qtquicksettings/kcmqtquicksettings.h +++ b/kcms/qtquicksettings/kcmqtquicksettings.h @@ -44,10 +44,6 @@ explicit KCMQtQuickSettingsModule(QWidget *parent, const QVariantList &); ~KCMQtQuickSettingsModule() override; - void load() override; - void save() override; - void defaults() override; - private: QScopedPointer m_ui; QScopedPointer m_settings; diff --git a/kcms/qtquicksettings/kcmqtquicksettings.cpp b/kcms/qtquicksettings/kcmqtquicksettings.cpp --- a/kcms/qtquicksettings/kcmqtquicksettings.cpp +++ b/kcms/qtquicksettings/kcmqtquicksettings.cpp @@ -42,44 +42,11 @@ setAboutData(about); m_ui->setupUi(this); - m_ui->backendCombo->addItem(i18n("Automatic"), QVariant(QStringLiteral()));//so data matches empty config - m_ui->backendCombo->addItem(i18n("Open GL"), QVariant(QStringLiteral("opengl"))); - m_ui->backendCombo->addItem(i18n("Software"), QVariant(QStringLiteral("software"))); - - m_ui->renderLoopCombo->addItem(i18n("Automatic"), QVariant(QStringLiteral())); - m_ui->renderLoopCombo->addItem(i18n("Basic"), QVariant(QStringLiteral("basic"))); - m_ui->renderLoopCombo->addItem(i18n("Threaded"), QVariant(QStringLiteral("threaded"))); - - connect(m_ui->backendCombo, static_cast(&QComboBox::activated), this, static_cast(&KCMQtQuickSettingsModule::changed)); - connect(m_ui->renderLoopCombo, static_cast(&QComboBox::activated), this, static_cast(&KCMQtQuickSettingsModule::changed)); - - connect(m_ui->glCoreProfileCheckbox, &QCheckBox::stateChanged, this, static_cast(&KCMQtQuickSettingsModule::changed)); + addConfig(m_settings.get(), this); } KCMQtQuickSettingsModule::~KCMQtQuickSettingsModule() { } -void KCMQtQuickSettingsModule::load() -{ - m_ui->backendCombo->setCurrentIndex(m_ui->backendCombo->findData(m_settings->sceneGraphBackend())); - m_ui->renderLoopCombo->setCurrentIndex(m_ui->renderLoopCombo->findData(m_settings->renderLoop())); - m_ui->glCoreProfileCheckbox->setChecked(m_settings->forceGlCoreProfile()); -} - -void KCMQtQuickSettingsModule::save() -{ - m_settings->setSceneGraphBackend(m_ui->backendCombo->currentData().toString()); - m_settings->setRenderLoop(m_ui->renderLoopCombo->currentData().toString()); - m_settings->setForceGlCoreProfile(m_ui->glCoreProfileCheckbox->isChecked()); - m_settings->save(); -} - -void KCMQtQuickSettingsModule::defaults() -{ - m_ui->backendCombo->setCurrentIndex(0); - m_ui->renderLoopCombo->setCurrentIndex(0); - m_ui->glCoreProfileCheckbox->setChecked(false); -} - #include "kcmqtquicksettings.moc" diff --git a/kcms/qtquicksettings/kcmqtquicksettingswidget.ui b/kcms/qtquicksettings/kcmqtquicksettingswidget.ui --- a/kcms/qtquicksettings/kcmqtquicksettingswidget.ui +++ b/kcms/qtquicksettings/kcmqtquicksettingswidget.ui @@ -40,7 +40,23 @@ - + + + + Automatic + + + + + Open GL + + + + + Software + + + @@ -57,10 +73,26 @@ - + + + + Automatic + + + + + Basic + + + + + Threaded + + + - + Force diff --git a/kcms/qtquicksettings/renderer.kcfg b/kcms/qtquicksettings/renderer.kcfg --- a/kcms/qtquicksettings/renderer.kcfg +++ b/kcms/qtquicksettings/renderer.kcfg @@ -5,11 +5,21 @@ http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - - + + + + + + + automaticloop - - + + + + + + + automaticbackend false