diff --git a/effects/boxswitch/boxswitch_config.ui b/effects/boxswitch/boxswitch_config.ui
index 86b519d182..6cce699964 100644
--- a/effects/boxswitch/boxswitch_config.ui
+++ b/effects/boxswitch/boxswitch_config.ui
@@ -51,7 +51,7 @@
-
-
+
1
@@ -65,6 +65,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
opacitySlider
opacitySpin
diff --git a/effects/coverswitch/coverswitch_config.cpp b/effects/coverswitch/coverswitch_config.cpp
index d113349099..88808ae143 100644
--- a/effects/coverswitch/coverswitch_config.cpp
+++ b/effects/coverswitch/coverswitch_config.cpp
@@ -67,6 +67,7 @@ void CoverSwitchEffectConfig::load()
KConfigGroup conf = EffectsHandler::effectConfig( "CoverSwitch" );
m_ui->spinDuration->setValue( conf.readEntry( "Duration", 0 ) );
+ m_ui->spinDuration->setSuffix( ki18np( " milisecond", " miliseconds" ) );
m_ui->checkAnimateSwitch->setChecked( conf.readEntry( "AnimateSwitch", true ));
m_ui->checkAnimateStart->setChecked( conf.readEntry( "AnimateStart", true ));
m_ui->checkAnimateStop->setChecked( conf.readEntry( "AnimateStop", true ));
diff --git a/effects/coverswitch/coverswitch_config.ui b/effects/coverswitch/coverswitch_config.ui
index 83a296131c..9248ee6c88 100644
--- a/effects/coverswitch/coverswitch_config.ui
+++ b/effects/coverswitch/coverswitch_config.ui
@@ -99,7 +99,7 @@
-
-
+
@@ -139,7 +139,7 @@
-
-
+
0
@@ -149,9 +149,6 @@
Default
-
- msec
-
5000
@@ -214,6 +211,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
checkAnimateSwitch
checkAnimateStart
diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp
index bf8cdbeda5..c187336062 100644
--- a/effects/cube/cube_config.cpp
+++ b/effects/cube/cube_config.cpp
@@ -123,6 +123,7 @@ void CubeEffectConfig::load()
bool zOrdering = conf.readEntry( "ZOrdering", false );
m_ui->rotationDurationSpin->setValue( duration );
+ m_ui->rotationDurationSpin->setSuffix( ki18np( " milisecond", " miliseconds" ) );
m_ui->cubeOpacitySlider->setValue( opacity );
m_ui->cubeOpacitySpin->setValue( opacity );
m_ui->desktopOpacityOnlyBox->setChecked( desktopOpacityOnly );
diff --git a/effects/cube/cube_config.ui b/effects/cube/cube_config.ui
index a2747e586f..6e9d3003f7 100644
--- a/effects/cube/cube_config.ui
+++ b/effects/cube/cube_config.ui
@@ -128,7 +128,7 @@
-
-
+
0
@@ -144,9 +144,6 @@
Default
-
- msec
-
5000
@@ -213,7 +210,7 @@
-
-
+
75
@@ -496,6 +493,11 @@ otherwise it will remain active
QPushButton
+
+ KIntSpinBox
+ QSpinBox
+
+
KUrlRequester
QFrame
diff --git a/effects/cube/cubeslide_config.ui b/effects/cube/cubeslide_config.ui
index 931b626b6f..d8284cf1e4 100644
--- a/effects/cube/cubeslide_config.ui
+++ b/effects/cube/cubeslide_config.ui
@@ -32,7 +32,7 @@
-
-
+
0
@@ -88,6 +88,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
rotationDurationSpin
dontSlidePanelsBox
diff --git a/effects/desktopgrid/desktopgrid_config.cpp b/effects/desktopgrid/desktopgrid_config.cpp
index f0cff3b2d5..a826ac0707 100644
--- a/effects/desktopgrid/desktopgrid_config.cpp
+++ b/effects/desktopgrid/desktopgrid_config.cpp
@@ -106,7 +106,9 @@ void DesktopGridEffectConfig::load()
KConfigGroup conf = EffectsHandler::effectConfig( "DesktopGrid" );
m_ui->zoomDurationSpin->setValue( conf.readEntry( "ZoomDuration", 0 ));
+ m_ui->zoomDurationSpin->setSuffix( ki18np( " milisecond", " miliseconds"));
m_ui->borderWidthSpin->setValue( conf.readEntry( "BorderWidth", 10 ));
+ m_ui->borderWidthSpin->setSuffix( ki18np( " pixel", " pixels"));
Qt::Alignment alignment = Qt::Alignment( conf.readEntry( "DesktopNameAlignment", 0 ));
m_ui->desktopNameAlignmentCombo->setCurrentIndex( m_alignmentItems.indexOf( alignment ));
@@ -116,6 +118,7 @@ void DesktopGridEffectConfig::load()
layoutSelectionChanged();
m_ui->layoutRowsSpin->setValue( conf.readEntry( "CustomLayoutRows", 2 ));
+ m_ui->layoutRowsSpin->setSuffix( ki18np( " row", " rows"));
emit changed(false);
}
diff --git a/effects/desktopgrid/desktopgrid_config.ui b/effects/desktopgrid/desktopgrid_config.ui
index 10726221e2..375741fb41 100644
--- a/effects/desktopgrid/desktopgrid_config.ui
+++ b/effects/desktopgrid/desktopgrid_config.ui
@@ -30,7 +30,7 @@
-
-
+
0
@@ -40,9 +40,6 @@
Default
-
- msec
-
5000
@@ -65,16 +62,13 @@
-
-
+
0
0
-
- pixels
-
100
@@ -158,16 +152,13 @@
-
-
+
0
0
-
- rows
-
1
@@ -217,6 +208,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/diminactive/diminactive_config.ui b/effects/diminactive/diminactive_config.ui
index 28f3393dc8..a233da80d5 100644
--- a/effects/diminactive/diminactive_config.ui
+++ b/effects/diminactive/diminactive_config.ui
@@ -64,7 +64,7 @@
-
-
+
1
@@ -91,6 +91,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
sliderStrength
spinStrength
diff --git a/effects/flipswitch/flipswitch_config.cpp b/effects/flipswitch/flipswitch_config.cpp
index d68d8cd8e5..eda60ea0c2 100644
--- a/effects/flipswitch/flipswitch_config.cpp
+++ b/effects/flipswitch/flipswitch_config.cpp
@@ -62,6 +62,7 @@ void FlipSwitchEffectConfig::load()
int flipDuration = conf.readEntry( "FlipDuration", 0 );
bool animateFlip = conf.readEntry( "AnimateFlip", true );
m_ui->spinFlipDuration->setValue( flipDuration );
+ m_ui->spinFlipDuration->setSuffix( ki18np ( " milisecond", " miliseconds" ) );
if( animateFlip )
{
m_ui->checkAnimateFlip->setCheckState( Qt::Checked );
diff --git a/effects/flipswitch/flipswitch_config.ui b/effects/flipswitch/flipswitch_config.ui
index 833061e431..9c833fcf3e 100644
--- a/effects/flipswitch/flipswitch_config.ui
+++ b/effects/flipswitch/flipswitch_config.ui
@@ -37,7 +37,7 @@
-
-
+
0
@@ -47,9 +47,6 @@
Default
-
- msec
-
5000
@@ -63,6 +60,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
checkAnimateFlip
spinFlipDuration
diff --git a/effects/lookingglass/lookingglass_config.ui b/effects/lookingglass/lookingglass_config.ui
index ae16b59f3b..cb20ef39c5 100644
--- a/effects/lookingglass/lookingglass_config.ui
+++ b/effects/lookingglass/lookingglass_config.ui
@@ -27,7 +27,7 @@
-
-
+
0
@@ -42,6 +42,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/magiclamp/magiclamp_config.cpp b/effects/magiclamp/magiclamp_config.cpp
index 7765e01881..3f9fd1e1f9 100644
--- a/effects/magiclamp/magiclamp_config.cpp
+++ b/effects/magiclamp/magiclamp_config.cpp
@@ -55,6 +55,7 @@ void MagicLampEffectConfig::load()
int duration = conf.readEntry( "AnimationDuration", 0 );
m_ui->animationDurationSpin->setValue( duration );
+ m_ui->animationDurationSpin->setSuffix(ki18np(" milisecond", " miliseconds"));
emit changed(false);
}
diff --git a/effects/magiclamp/magiclamp_config.ui b/effects/magiclamp/magiclamp_config.ui
index 691c82ccc2..c7ae156270 100644
--- a/effects/magiclamp/magiclamp_config.ui
+++ b/effects/magiclamp/magiclamp_config.ui
@@ -24,7 +24,7 @@
-
-
+
0
@@ -34,9 +34,6 @@
Default
-
- msec
-
5000
@@ -47,6 +44,13 @@
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
diff --git a/effects/magnifier/magnifier_config.ui b/effects/magnifier/magnifier_config.ui
index 0347344567..585b85a923 100644
--- a/effects/magnifier/magnifier_config.ui
+++ b/effects/magnifier/magnifier_config.ui
@@ -30,7 +30,7 @@
-
-
+
0
@@ -62,7 +62,7 @@
-
-
+
0
@@ -89,6 +89,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/mousemark/mousemark_config.cpp b/effects/mousemark/mousemark_config.cpp
index 4909fb468c..077d9b900f 100644
--- a/effects/mousemark/mousemark_config.cpp
+++ b/effects/mousemark/mousemark_config.cpp
@@ -88,6 +88,7 @@ void MouseMarkEffectConfig::load()
int width = conf.readEntry("LineWidth", 3);
QColor color = conf.readEntry("Color", QColor(Qt::red));
m_ui->spinWidth->setValue(width);
+ m_ui->spinWidth->setSuffix(ki18np(" pixel", " pixels"));
m_ui->comboColors->setColor(color);
emit changed(false);
diff --git a/effects/mousemark/mousemark_config.ui b/effects/mousemark/mousemark_config.ui
index 3897ffe9db..f99f183ad3 100644
--- a/effects/mousemark/mousemark_config.ui
+++ b/effects/mousemark/mousemark_config.ui
@@ -30,16 +30,13 @@
-
-
+
0
0
-
- px
-
1
@@ -281,6 +278,11 @@
QComboBox
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/presentwindows/presentwindows_config.cpp b/effects/presentwindows/presentwindows_config.cpp
index 35783cf3ad..256f3e2dd6 100644
--- a/effects/presentwindows/presentwindows_config.cpp
+++ b/effects/presentwindows/presentwindows_config.cpp
@@ -107,6 +107,7 @@ void PresentWindowsEffectConfig::load()
m_ui->layoutCombo->setCurrentIndex( layoutMode );
m_ui->rearrangeDurationSpin->setValue( conf.readEntry( "RearrangeDuration", 0 ));
+ m_ui->rearrangeDurationSpin->setSuffix(ki18np(" milisecond", " miliseconds"));
bool displayTitle = conf.readEntry( "DrawWindowCaptions", true );
m_ui->displayTitleBox->setChecked( displayTitle );
diff --git a/effects/presentwindows/presentwindows_config.ui b/effects/presentwindows/presentwindows_config.ui
index 922f5617cc..66038330db 100644
--- a/effects/presentwindows/presentwindows_config.ui
+++ b/effects/presentwindows/presentwindows_config.ui
@@ -30,9 +30,9 @@
- -
-
-
+
-
+
+
0
0
@@ -41,9 +41,6 @@
Default
-
- msec
-
5000
@@ -512,6 +509,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/shadow/shadow_config.ui b/effects/shadow/shadow_config.ui
index 6e1f74ab1e..b37d79f2c5 100644
--- a/effects/shadow/shadow_config.ui
+++ b/effects/shadow/shadow_config.ui
@@ -25,7 +25,7 @@
-
-
+
0
@@ -66,7 +66,7 @@
-
-
+
0
@@ -107,7 +107,7 @@
-
-
+
0
@@ -148,7 +148,7 @@
-
-
+
0
@@ -189,7 +189,7 @@
-
-
+
0
@@ -247,6 +247,11 @@
QPushButton
+
+ KIntSpinBox
+ QSpinBox
+
+
diff --git a/effects/snow/snow_config.cpp b/effects/snow/snow_config.cpp
index 50550999b1..a6135a0ca4 100644
--- a/effects/snow/snow_config.cpp
+++ b/effects/snow/snow_config.cpp
@@ -90,9 +90,13 @@ void SnowEffectConfig::load()
m_ui->snowBehindWindows->setChecked( conf.readEntry("BehindWindows", true));
m_ui->numberFlakes->setValue( number );
m_ui->minSizeFlake->setValue( minFlake );
+ m_ui->minSizeFlake->setSuffix( ki18np(" pixel", " pixels") );
m_ui->maxSizeFlake->setValue( maxFlake );
+ m_ui->maxSizeFlake->setSuffix( ki18np(" pixel", " pixels") );
m_ui->maxVSpeed->setValue( maxVSpeed );
+ m_ui->maxVSpeed->setSuffix( ki18np(" pixel/frame", " pixels/frame") );
m_ui->maxHSpeed->setValue( maxHSpeed );
+ m_ui->maxHSpeed->setSuffix( ki18np(" pixel/frame", " pixels/frame") );
emit changed(false);
diff --git a/effects/snow/snow_config.ui b/effects/snow/snow_config.ui
index f63f6f4765..9e32e8ea14 100644
--- a/effects/snow/snow_config.ui
+++ b/effects/snow/snow_config.ui
@@ -30,7 +30,7 @@
-
-
+
0
@@ -59,16 +59,13 @@
-
-
+
0
0
-
- px
-
30
@@ -91,16 +88,13 @@
-
-
+
0
0
-
- px
-
1000
@@ -123,16 +117,13 @@
-
-
+
0
0
-
- px/frame
-
1
@@ -158,16 +149,13 @@
-
-
+
0
0
-
- px/frame
-
0
@@ -195,6 +183,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/thumbnailaside/thumbnailaside_config.cpp b/effects/thumbnailaside/thumbnailaside_config.cpp
index 8feffdb4a4..346cec6131 100644
--- a/effects/thumbnailaside/thumbnailaside_config.cpp
+++ b/effects/thumbnailaside/thumbnailaside_config.cpp
@@ -87,7 +87,9 @@ void ThumbnailAsideEffectConfig::load()
int spacing = conf.readEntry("Spacing", 10);
int opacity = conf.readEntry("Opacity", 50);
m_ui->spinWidth->setValue(width);
+ m_ui->spinWidth->setSuffix(ki18np(" pixel", " pixels"));
m_ui->spinSpacing->setValue(spacing);
+ m_ui->spinSpacing->setSuffix(ki18np(" pixel", " pixels"));
m_ui->spinOpacity->setValue(opacity);
emit changed(false);
diff --git a/effects/thumbnailaside/thumbnailaside_config.ui b/effects/thumbnailaside/thumbnailaside_config.ui
index af79c5c422..0d57e67117 100644
--- a/effects/thumbnailaside/thumbnailaside_config.ui
+++ b/effects/thumbnailaside/thumbnailaside_config.ui
@@ -30,16 +30,13 @@
-
-
+
0
0
-
- px
-
500
@@ -62,16 +59,13 @@
-
-
+
0
0
-
- px
-
30
@@ -94,7 +88,7 @@
-
-
+
0
@@ -121,6 +115,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::GlobalShortcutsEditor
QWidget
diff --git a/effects/translucency/translucency_config.cpp b/effects/translucency/translucency_config.cpp
index c16f6a4552..6581af8a32 100644
--- a/effects/translucency/translucency_config.cpp
+++ b/effects/translucency/translucency_config.cpp
@@ -77,6 +77,7 @@ void TranslucencyEffectConfig::load()
m_ui->popupmenus->setValue( (int)( conf.readEntry( "PopupMenus", 1.0) * 100 ) );
m_ui->tornoffmenus->setValue( (int)( conf.readEntry( "TornOffMenus", 1.0) * 100 ) );
m_ui->duration->setValue( conf.readEntry( "Duration", 0) );
+ m_ui->duration->setSuffix(ki18np(" milisecond", " miliseconds"));
emit changed(false);
}
diff --git a/effects/translucency/translucency_config.ui b/effects/translucency/translucency_config.ui
index 374c7029f5..fd59c63b34 100644
--- a/effects/translucency/translucency_config.ui
+++ b/effects/translucency/translucency_config.ui
@@ -267,7 +267,7 @@
-
-
+
60
@@ -277,9 +277,6 @@
Default
-
- msec
-
5000
@@ -525,6 +522,13 @@
popupmenus
tornoffmenus
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
diff --git a/effects/wobblywindows/wobblywindows_config.ui b/effects/wobblywindows/wobblywindows_config.ui
index d21b8d8968..d427dd295c 100644
--- a/effects/wobblywindows/wobblywindows_config.ui
+++ b/effects/wobblywindows/wobblywindows_config.ui
@@ -46,7 +46,7 @@
-
-
+
1
@@ -101,7 +101,7 @@
-
-
+
50
@@ -130,7 +130,7 @@
-
-
+
1
@@ -244,6 +244,13 @@
advancedBox
basicGroup
+
+
+ KIntSpinBox
+ QSpinBox
+
+
+
wobblinessSlider
moveBox
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 3c3fbec495..a227a5ac6a 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -34,7 +34,7 @@ class QGroupBox;
class QLabel;
class QSlider;
class KButtonGroup;
-class QSpinBox;
+// class QSpinBox;
class KColorButton;
class KIntNumInput;
@@ -65,8 +65,6 @@ class KIntNumInput;
#define FOCUS_UNDER_MOUSE 2
#define FOCUS_STRICTLY_UNDER_MOUSE 3
-class QSpinBox;
-
class KFocusConfig : public KCModule
{
Q_OBJECT
diff --git a/kcmkwin/kwinscreenedges/main.ui b/kcmkwin/kwinscreenedges/main.ui
index b07b26a26a..c0615a4da6 100644
--- a/kcmkwin/kwinscreenedges/main.ui
+++ b/kcmkwin/kwinscreenedges/main.ui
@@ -72,7 +72,7 @@
-
-
+
ms
@@ -104,7 +104,7 @@
-
-
+
true
@@ -189,6 +189,11 @@
+
+ KIntSpinBox
+ QSpinBox
+
+
KWin::Monitor
QWidget