Commit 338ce246 authored by Mikhail Zolotukhin's avatar Mikhail Zolotukhin Committed by Nate Graham
Browse files

Remove traces of old GTK configs

Summary:
Since slider behavior is controlled by kded daemon, gtk kcm has no control over it now.

It appears, that some traces of the warps-slider config were not removed. Now it is removed along with some other ones redundant lines.

Test Plan: Check that GTK KCM no longer crash, if entered from System Settings.

Reviewers: ngraham

Reviewed By: ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D25863
parent abffd8d7
......@@ -43,8 +43,6 @@ bool AppearanceGTK2::loadSettingsPrivate(const QString& path)
for(auto it = foundSettings.constBegin(), itEnd = foundSettings.constEnd(); it!=itEnd; ++it) {
if (it.key() == "gtk-theme-name")
m_settings["theme"] = *it;
else if (it.key() == "gtk-primary-button-warps-slider")
m_settings["primary_button_warps_slider"] = *it;
}
return true;
}
......@@ -145,12 +143,7 @@ void AppearanceGTK2::removeGtkrcLegacyContents(QString &fileContents) const
void AppearanceGTK2::reset()
{
m_settings = QMap<QString, QString> {
{"toolbar_style", "GTK_TOOLBAR_ICONS"},
{"show_icons_buttons", "0"},
{"show_icons_menus", "0"},
{"primary_button_warps_slider", "false"}
};
m_settings = QMap<QString, QString> {};
}
QString AppearanceGTK2::defaultConfigFile() const
......
......@@ -81,12 +81,10 @@ bool AppearanceGTK3::loadSettings(const KSharedConfig::Ptr& file)
}
m_settings = QMap<QString, QString> {
{"primary_button_warps_slider", "false"},
{"application_prefer_dark_theme", "false"}
};
m_settings["theme"] = group.readEntry("gtk-theme-name");
m_settings["primary_button_warps_slider"] = group.readEntry("gtk-primary-button-warps-slider");
m_settings["application_prefer_dark_theme"] = group.readEntry("gtk-application-prefer-dark-theme");
for(auto it = m_settings.begin(); it != m_settings.end(); ) {
if (it.value().isEmpty())
......
......@@ -92,7 +92,6 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
connect(ui->cb_theme, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged()));
connect(ui->cb_theme_gtk3, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged()));
connect(ui->checkBox_theme_gtk3_prefer_dark, &QAbstractButton::clicked, this, &GTKConfigKCModule::appChanged);
connect(ui->buttonGroup_primary_button_warps_slider, SIGNAL(buttonToggled(QAbstractButton*, bool)), this, SLOT(appChanged()));
//preview updates
connect(ui->gtk2Preview, &QAbstractButton::clicked, this, &GTKConfigKCModule::runGtk2IfNecessary);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment