diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
--- a/src/gtkconfigkcmodule.cpp
+++ b/src/gtkconfigkcmodule.cpp
@@ -114,7 +114,7 @@
connect(ui->cb_toolbar_icons, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged()));
connect(ui->checkBox_icon_gtk_menus, SIGNAL(clicked(bool)), this, SLOT(appChanged()));
connect(ui->checkBox_icon_gtk_buttons, SIGNAL(clicked(bool)), this, SLOT(appChanged()));
- connect(ui->checkBox_primary_button_warps_slider, SIGNAL(clicked(bool)), this, SLOT(appChanged()));
+ connect(ui->buttonGroup_primary_button_warps_slider, SIGNAL(buttonToggled(QAbstractButton*, bool)), this, SLOT(appChanged()));
//preview updates
connect(ui->cb_icon_fallback, SIGNAL(activated(QString)), this, SLOT(makePreviewIconTheme()));
@@ -157,7 +157,7 @@
appareance->setToolbarStyle(gtkToolbar.key(ui->cb_toolbar_icons->currentIndex()));
appareance->setShowIconsInButtons(ui->checkBox_icon_gtk_buttons->isChecked());
appareance->setShowIconsInMenus(ui->checkBox_icon_gtk_menus->isChecked());
- appareance->setPrimaryButtonWarpsSlider(ui->checkBox_primary_button_warps_slider->isChecked());
+ appareance->setPrimaryButtonWarpsSlider(ui->buttonGroup_primary_button_warps_slider->checkedButton() == ui->radioButton_warp);
}
void GTKConfigKCModule::showThemeGHNS()
@@ -188,8 +188,10 @@
ui->checkBox_icon_gtk_buttons->setChecked(appareance->getShowIconsInButtons());
ui->checkBox_icon_gtk_menus->setChecked(appareance->getShowIconsInMenus());
- ui->checkBox_primary_button_warps_slider->setChecked(appareance->getPrimaryButtonWarpsSlider());
-
+ const bool warps = appareance->getPrimaryButtonWarpsSlider();
+ ui->radioButton_warp->setChecked(warps);
+ ui->radioButton_dont_warp->setChecked(!warps);
+
makePreviewIconTheme();
}
@@ -352,7 +354,7 @@
ui->checkBox_icon_gtk_menus->setChecked(showIcons);
// this makes it consistent with Qt apps and restores the old Gtk behavior
- ui->checkBox_primary_button_warps_slider->setChecked(false);
+ 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
@@ -6,181 +6,25 @@
0
0
- 858
+ 931
564
- -
-
-
- GTK Themes
+
-
+
+
+ <html><head/><body><p>Here you can find more GTK themes to try. You can either download them from the following websites.</p><p>Also you can download it from the opendesktop facilities as suggested below</p><p align="center"><a href="http://gnome-look.org"><span style=" text-decoration: underline; color:#0000ff;">gnome-look.org</span></a><br/><a href="art.gnome.org"><span style=" text-decoration: underline; color:#0000ff;">art.gnome.org</span></a></p></body></html>
-
-
-
-
-
- Select a GTK2 Theme:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Preview theme
-
-
- true
-
-
-
-
-
- -
-
-
- Select a GTK3 Theme:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Preview theme
-
-
- true
-
-
-
-
-
- -
-
-
- Font:
-
-
-
- -
-
-
-
-
-
- -
-
-
- Behaviour
+
+ Get New Themes
+
+
+ QToolButton::InstantPopup
+
+
+ Qt::ToolButtonTextBesideIcon
-
-
- QFormLayout::ExpandingFieldsGrow
-
-
-
-
-
- GTK style toolbar:
-
-
-
- -
-
-
-
-
- Icons Only
-
-
- -
-
- Text Only
-
-
- -
-
- Text Under Icons
-
-
- -
-
- Text After Icons
-
-
-
-
- -
-
-
- Show icons in GTK buttons:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Show icons in GTK menus:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Left mouse button warps scroll bar:
-
-
-
- -
-
-
-
-
-
-
-
-
@@ -471,6 +315,93 @@
+ -
+
+
+ GTK Themes
+
+
+
-
+
+
+ Select a GTK2 Theme:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Preview theme
+
+
+ true
+
+
+
+
+
+ -
+
+
+ Select a GTK3 Theme:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Preview theme
+
+
+ true
+
+
+
+
+
+ -
+
+
+ Font:
+
+
+
+ -
+
+
+
+
+
-
@@ -484,20 +415,105 @@
- -
-
-
- <html><head/><body><p>Here you can find more GTK themes to try. You can either download them from the following websites.</p><p>Also you can download it from the opendesktop facilities as suggested below</p><p align="center"><a href="http://gnome-look.org"><span style=" text-decoration: underline; color:#0000ff;">gnome-look.org</span></a><br/><a href="art.gnome.org"><span style=" text-decoration: underline; color:#0000ff;">art.gnome.org</span></a></p></body></html>
-
-
- Get New Themes
-
-
- QToolButton::InstantPopup
-
-
- Qt::ToolButtonTextBesideIcon
+
-
+
+
+ Behaviour
+
+
+ QFormLayout::ExpandingFieldsGrow
+
+
-
+
+
+ GTK style toolbar:
+
+
+
+ -
+
+
-
+
+ Icons Only
+
+
+ -
+
+ Text Only
+
+
+ -
+
+ Text Under Icons
+
+
+ -
+
+ Text After Icons
+
+
+
+
+ -
+
+
+ Show icons in GTK buttons:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Show icons in GTK menus:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ On left-clicking the scroll bar:
+
+
+
+ -
+
+
+ Scro&ll one page up/down
+
+
+ true
+
+
+ buttonGroup_primary_button_warps_slider
+
+
+
+ -
+
+
+ &Jump to the mouse cursor position
+
+
+ buttonGroup_primary_button_warps_slider
+
+
+
+
@@ -511,4 +527,7 @@
+
+
+