diff --git a/src/abstractappearance.h b/src/abstractappearance.h --- a/src/abstractappearance.h +++ b/src/abstractappearance.h @@ -39,11 +39,9 @@ virtual QStringList installedThemes() const = 0; void setTheme(const QString& name); - void setPrimaryButtonWarpsSlider(bool enabled); QString getTheme() const; QString getThemeGtk3() const; - bool getPrimaryButtonWarpsSlider() const; QStringList installedThemesNames() const; bool hasProperty(const QString& key) const; diff --git a/src/abstractappearance.cpp b/src/abstractappearance.cpp --- a/src/abstractappearance.cpp +++ b/src/abstractappearance.cpp @@ -31,12 +31,10 @@ //SETTERS void AbstractAppearance::setTheme(const QString& name) { m_settings["theme"] = name;} -void AbstractAppearance::setPrimaryButtonWarpsSlider(bool enabled) { m_settings["primary_button_warps_slider"] = enabled ? "1" : "0"; } // GETTERS QString AbstractAppearance::getTheme() const { return m_settings["theme"];} QString AbstractAppearance::getThemeGtk3() const { return m_settings["themegtk3"]; } -bool AbstractAppearance::getPrimaryButtonWarpsSlider() const { return isTrue(m_settings["primary_button_warps_slider"]); } QRegExp valueRx(" *([a-zA-Z\\-_]+) *= *\"?([^\"\\n]+)\"?", Qt::CaseSensitive, QRegExp::RegExp2); QMap AbstractAppearance::readSettingsTuples(QIODevice* device) diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp --- a/src/appearancegtk2.cpp +++ b/src/appearancegtk2.cpp @@ -94,7 +94,6 @@ void AppearanceGTK2::modifyGtkrcContents(QString& fileContents) const { modifyGtkrcProperty("gtk-theme-name", m_settings["theme"], fileContents); - modifyGtkrcProperty("gtk-primary-button-warps-slider", m_settings["primary_button_warps_slider"], fileContents); removeGtkrcLegacyContents(fileContents); } diff --git a/src/appearancegtk3.cpp b/src/appearancegtk3.cpp --- a/src/appearancegtk3.cpp +++ b/src/appearancegtk3.cpp @@ -64,7 +64,6 @@ KConfigGroup group(file, "Settings"); group.writeEntry("gtk-theme-name", m_settings["theme"]); - group.writeEntry("gtk-primary-button-warps-slider", m_settings["primary_button_warps_slider"]); group.writeEntry("gtk-application-prefer-dark-theme", m_settings["application_prefer_dark_theme"]); const bool sync = group.sync(); diff --git a/src/appearencegtk.cpp b/src/appearencegtk.cpp --- a/src/appearencegtk.cpp +++ b/src/appearencegtk.cpp @@ -37,12 +37,6 @@ qDeleteAll(m_app); } -#define PROPERTY_IMPLEMENTATION(type, name, propname)\ -void AppearenceGTK::set##name(const type& a) { foreach(AbstractAppearance* app, m_app) app->set##name(a); }\ -type AppearenceGTK::get##name() const { foreach(AbstractAppearance* app, m_app) { if(app->hasProperty(propname)) return app->get##name(); } /*Q_ASSERT(false);*/ return type (); } - -PROPERTY_IMPLEMENTATION(bool, PrimaryButtonWarpsSlider, "primary_button_warps_slider") - QString AppearenceGTK::getTheme() const { return gtk2Appearance()->getTheme(); } void AppearenceGTK::setTheme(const QString& name) { return gtk2Appearance()->setTheme(name); } QString AppearenceGTK::getThemeGtk3() const { return gtk3Appearance()->getTheme(); } diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp --- a/src/gtkconfigkcmodule.cpp +++ b/src/gtkconfigkcmodule.cpp @@ -126,8 +126,6 @@ appareance->setThemeGtk3(ui->cb_theme_gtk3->currentText()); appareance->setTheme(ui->cb_theme->currentText()); appareance->setApplicationPreferDarkTheme(ui->checkBox_theme_gtk3_prefer_dark->isChecked()); - - appareance->setPrimaryButtonWarpsSlider(ui->buttonGroup_primary_button_warps_slider->checkedButton() == ui->radioButton_warp); } void GTKConfigKCModule::showThemeGHNS() @@ -149,10 +147,6 @@ void GTKConfigKCModule::refreshLists() { refreshThemesUi(true); - - const bool warps = appareance->getPrimaryButtonWarpsSlider(); - ui->radioButton_warp->setChecked(warps); - ui->radioButton_dont_warp->setChecked(!warps); } void GTKConfigKCModule::appChanged() @@ -253,9 +247,6 @@ // qDebug() << "loading defaults..."; m_saveEnabled = false; - - // this makes it consistent with Qt apps and restores the old Gtk behavior - ui->radioButton_dont_warp->setChecked(true); setComboItem(ui->cb_theme, QStringList("oxygen-gtk") << "Clearlooks"); setComboItem(ui->cb_theme_gtk3, QStringList("oxygen-gtk") << "Adwaita"); diff --git a/src/ui/gui.ui b/src/ui/gui.ui --- a/src/ui/gui.ui +++ b/src/ui/gui.ui @@ -97,36 +97,6 @@ - - - - On scrollbar left-click: - - - - - - - Scro&ll one page up/down - - - true - - - buttonGroup_primary_button_warps_slider - - - - - - - &Jump to mouse cursor position - - - buttonGroup_primary_button_warps_slider - - - diff --git a/tests/configsavetest.cpp b/tests/configsavetest.cpp --- a/tests/configsavetest.cpp +++ b/tests/configsavetest.cpp @@ -17,7 +17,6 @@ static void fillValues(QScopedPointer& a) { a->setTheme("a"); - a->setPrimaryButtonWarpsSlider(true); auto a3 = dynamic_cast(a.data()); if (a3) { @@ -28,7 +27,6 @@ void compareAppearances(QScopedPointer& reloaded, QScopedPointer& instance) { QCOMPARE(reloaded->getTheme(), instance->getTheme()); - QCOMPARE(reloaded->getPrimaryButtonWarpsSlider(), instance->getPrimaryButtonWarpsSlider()); } QByteArray readFile(const QString& path)