diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index eed8a1f7f6..21d55ff268 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -33,6 +33,7 @@ along with this program. If not, see .
#include
#include
#include
+#include
#include
#include
@@ -75,7 +76,7 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
ui.setupUi(this);
layout()->setMargin(0);
ui.tabWidget->setCurrentIndex(0);
- ui.statusLabel->hide();
+ ui.statusTitleWidget->hide();
connect(ui.advancedOptions, SIGNAL(clicked()), this, SLOT(showAdvancedOptions()));
connect(ui.useCompositing, SIGNAL(toggled(bool)), this, SLOT(compositingEnabled(bool)));
@@ -118,10 +119,11 @@ KWinCompositingConfig::KWinCompositingConfig(QWidget *parent, const QVariantList
compositingEnabled(false);
QString text = i18n("Compositing is not supported on your system.");
- text += "
";
+ text += "
";
text += CompositingPrefs::compositingNotPossibleReason();
- ui.statusLabel->setText(text);
- ui.statusLabel->show();
+ ui.statusTitleWidget->setText(text);
+ ui.statusTitleWidget->setPixmap(KTitleWidget::InfoMessage, KTitleWidget::ImageLeft);
+ ui.statusTitleWidget->show();
}
KAboutData *about = new KAboutData(I18N_NOOP("kcmkwincompositing"), 0,
diff --git a/kcmkwin/kwincompositing/main.ui b/kcmkwin/kwincompositing/main.ui
index 68f2ca1cdf..68a242d014 100644
--- a/kcmkwin/kwincompositing/main.ui
+++ b/kcmkwin/kwincompositing/main.ui
@@ -16,18 +16,13 @@
0
-
-
- 0
- 0
- 585
- 618
-
-
General
-
+
+ -
+
+
-
@@ -80,7 +75,10 @@
-
- Effect for window switching
+ Effect for window switching:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
windowSwitchingCombo
@@ -88,12 +86,22 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
-
- Effect for desktop switching
+ Effect for desktop switching:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
desktopSwitchingCombo
@@ -101,9 +109,16 @@
-
-
+
+
+
+ 0
+ 0
+
+
+
- -
+
-
You can find more effects in the 'All Effects' tab
@@ -112,6 +127,12 @@
-
+
+
+ 0
+ 0
+
+
3
@@ -155,11 +176,41 @@
-
- Animation speed
+ Animation speed:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 5
+
+
+
+
+ effectWinManagement
+ effectShadows
+ effectAnimations
+ label_3
+ windowSwitchingCombo
+ label_4
+ desktopSwitchingCombo
+ label
+ animationSpeedCombo
+ label_5
+ verticalSpacer
-
@@ -189,9 +240,6 @@
- -
-
-
-
@@ -208,14 +256,6 @@
-
-
- 0
- 0
- 591
- 619
-
-
All Effects
@@ -242,8 +282,14 @@
+ tabWidget
+
+ KTitleWidget
+ QWidget
+
+
KPluginSelector
QWidget
diff --git a/kcmkwin/kwindesktop/desktop.cpp b/kcmkwin/kwindesktop/desktop.cpp
index f41a5d5668..06c35a42e6 100644
--- a/kcmkwin/kwindesktop/desktop.cpp
+++ b/kcmkwin/kwindesktop/desktop.cpp
@@ -71,15 +71,12 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const QVariantList &)
layout->setMargin(0);
layout->setSpacing(KDialog::spacingHint());
- // number group
- QGroupBox *number_group = new QGroupBox(this);
-
- QHBoxLayout *lay = new QHBoxLayout(number_group);
+ QHBoxLayout *lay = new QHBoxLayout();
lay->setMargin(KDialog::marginHint());
lay->setSpacing(KDialog::spacingHint());
- QLabel *label = new QLabel(i18n("N&umber of desktops: "), number_group);
- _numInput = new KIntNumInput(4, number_group);
+ QLabel *label = new QLabel(i18n("N&umber of desktops: "), this);
+ _numInput = new KIntNumInput(4, this);
_numInput->setRange(1, maxDesktops, 1);
connect(_numInput, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int)));
connect(_numInput, SIGNAL(valueChanged(int)), SLOT( changed() ));
@@ -87,29 +84,31 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const QVariantList &)
QString wtstr = i18n( "Here you can set how many virtual desktops you want on your KDE desktop. Move the slider to change the value." );
label->setWhatsThis( wtstr );
_numInput->setWhatsThis( wtstr );
+ QSpacerItem *horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
lay->addWidget(label);
lay->addWidget(_numInput);
- lay->setStretchFactor( _numInput, 2 );
+ lay->addItem(horizontalSpacer);
+ //lay->setStretchFactor( _numInput, 2 );
- layout->addWidget(number_group);
+ layout->addLayout(lay);
// name group
QGroupBox *name_group = new QGroupBox(i18n("Desktop &Names"), this);
- QFormLayout *namesLayout = new QFormLayout;
+ QGridLayout *namesLayout = new QGridLayout;
name_group->setLayout(namesLayout);
- QFontMetrics fm(label->font());
- int labelWidth = fm.width(i18n("Desktop %1:", 10)); // be sure that all label will have the same width (with one or two numbers, e.g. 1, 99)
for(int i = 0; i < maxDesktops; i++)
{
_nameLabel[i] = new QLabel(i18n("Desktop %1:", i+1), name_group);
_nameInput[i] = new KLineEdit(name_group);
+ _nameLabel[i]->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
_nameLabel[i]->setWhatsThis( i18n( "Here you can enter the name for desktop %1", i+1 ) );
_nameInput[i]->setWhatsThis( i18n( "Here you can enter the name for desktop %1", i+1 ) );
connect(_nameInput[i], SIGNAL(textChanged(const QString&)),
SLOT( changed() ));
- namesLayout->addRow(_nameLabel[i],_nameInput[i]);
+ namesLayout->addWidget(_nameLabel[i], i, 0, 1, 1);
+ namesLayout->addWidget(_nameInput[i], i, 1, 1, 1);
}
for(int i = 1; i < maxDesktops; i++)
@@ -143,14 +142,18 @@ KDesktopConfig::KDesktopConfig(QWidget *parent, const QVariantList &)
if (config->isGroupImmutable(groupname))
{
name_group->setEnabled(false);
- number_group->setEnabled(false);
+ //number of desktops widgets
+ label->setEnabled(false);
+ _numInput->setEnabled(false);
}
else
{
KConfigGroup cfgGroup(config.data(), groupname.constData());
if (cfgGroup.isEntryImmutable("Number"))
{
- number_group->setEnabled(false);
+ //number of desktops widgets
+ label->setEnabled(false);
+ _numInput->setEnabled(false);
}
}
// End check for immutable