TCC taskbar configuration: fixed up remaining issues in 'Appearance' tab.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 301 insertions, 255 deletions

diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index c93bf600c..570544a72 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -224,6 +224,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
 
     connect(m_widget->appearance, TQT_SIGNAL(activated(int)),
             this, TQT_SLOT(appearanceChanged(int)));
+    connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)),
+            this, TQT_SLOT(displayIconsNTextChanged(int)));
     addConfig(m_settingsObject, m_widget);
 
     setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here."
@@ -250,7 +252,6 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     {
         m_widget->kcfg_ShowAllWindows->hide();
         m_widget->kcfg_SortByDesktop->hide();
-        // m_widget->spacer2->changeSize(0, 0);
     }
 
     if (!TQApplication::desktop()->isVirtualDesktop() ||
@@ -290,44 +291,44 @@ TaskbarConfig::~TaskbarConfig()
 }
 
 void TaskbarConfig::slotEditGlobalConfiguration() {
-	TQByteArray data;
-	kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
+    TQByteArray data;
+    kapp->dcopClient()->send("kicker", "kicker", "reshowTaskBarConfig()", data);
 }
 
 void TaskbarConfig::processLockouts()
 {
-	m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
-	if (m_isGlobalConfig)
-	{
-		m_widget->globalConfigWarning->show();
-		m_widget->localConfigWarning->hide();
-		m_widget->globalConfigReload->hide();
-		m_widget->globalConfigEdit->hide();
-		m_widget->kcfg_UseGlobalSettings->hide();
-		m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
-	}
-	else {
-		m_widget->globalConfigWarning->hide();
-		m_widget->localConfigWarning->show();
-		m_widget->kcfg_UseGlobalSettings->show();
-		if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
-			m_widget->tabs->hide();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->show();
-			m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding);
-		}
-		else {
-			m_widget->tabs->show();
-			// FIXME
-			// Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
-			//m_widget->globalConfigReload->show();
-			m_widget->globalConfigReload->hide();
-			m_widget->globalConfigEdit->hide();
-			m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
-		}
-	}
-
-	m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
+    m_configFileName = GLOBAL_TASKBAR_CONFIG_FILE_NAME;
+    if (m_isGlobalConfig)
+    {
+        m_widget->globalConfigWarning->show();
+        m_widget->localConfigWarning->hide();
+        m_widget->globalConfigReload->hide();
+        m_widget->globalConfigEdit->hide();
+        m_widget->kcfg_UseGlobalSettings->hide();
+        m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+    }
+    else {
+        m_widget->globalConfigWarning->hide();
+        m_widget->localConfigWarning->show();
+        m_widget->kcfg_UseGlobalSettings->show();
+        if (m_widget->kcfg_UseGlobalSettings->isChecked()) {
+            m_widget->tabs->hide();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->show();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding);
+        }
+        else {
+            m_widget->tabs->show();
+            // FIXME
+            // Disable this feature until a method can be found to force the TDECModule to reload its settings from disk after the global settings have been copied!
+            //m_widget->globalConfigReload->show();
+            m_widget->globalConfigReload->hide();
+            m_widget->globalConfigEdit->hide();
+            m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
+        }
+    }
+
+    m_widget->kcfg_AllowDragAndDropReArrange->setEnabled(!m_widget->kcfg_SortByApp->isChecked());
 }
 
 void TaskbarConfig::slotReloadConfigurationFromGlobals()
@@ -393,12 +394,8 @@ void TaskbarConfig::updateAppearanceCombo()
         return;
     }
 
-    else if (m_widget->appearance->count() == (int)m_appearances.count())
-    {
-        m_widget->customAppearance->setEnabled(true);
-    }
-
     m_widget->appearance->setCurrentItem(m_appearances.count());
+    m_widget->customAppearance->setEnabled(true);
 }
 
 void TaskbarConfig::updateCustomAppearance()
@@ -408,19 +405,35 @@ void TaskbarConfig::updateCustomAppearance()
     m_widget->kcfg_ShowButtonOnHover->setChecked(m_settingsObject->showButtonOnHover());
 }
 
+void TaskbarConfig::updateIconsTextCombo()
+{
+    if (m_widget->kcfg_DisplayIconsNText->currentText() == "Text only")
+    {
+        m_widget->useIconsFrame->setEnabled(false);
+    }
+    else
+    {
+        m_widget->useIconsFrame->setEnabled(true);
+    }
+}
+
 void TaskbarConfig::appearanceChanged(int selected)
 {
     if (selected < m_appearances.count())
     {
         m_widget->customAppearance->setEnabled(false);
-        unmanagedWidgetChangeState(!m_appearances[selected].matchesSettings());
     }
     else if(selected == m_appearances.count())
     {
         m_widget->customAppearance->setEnabled(true);
         updateCustomAppearance();
-        unmanagedWidgetChangeState(true);
     }
+    unmanagedWidgetChangeState(true);
+}
+
+void TaskbarConfig::displayIconsNTextChanged(int selected)
+{
+    m_widget->useIconsFrame->setEnabled(selected != 1);  // 1 == Text only
 }
 
 void TaskbarConfig::load()
@@ -428,6 +441,7 @@ void TaskbarConfig::load()
     TDECModule::load();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
     m_widget->showAllScreens->setChecked(!m_settingsObject->showCurrentScreenOnly());
 
     int iconSize = m_settingsObject->iconSize();
@@ -468,6 +482,7 @@ void TaskbarConfig::defaults()
     TDECModule::defaults();
     slotUpdateComboBox();
     updateAppearanceCombo();
+    updateIconsTextCombo();
 }
 
 void TaskbarConfig::notChanged()
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index 68fb91e12..1a0860c69 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -67,6 +67,7 @@ public slots:
 protected slots:
     void slotUpdateComboBox();
     void appearanceChanged(int);
+    void displayIconsNTextChanged(int);
     void notChanged();
     void slotUpdateCustomColors();
 
@@ -78,6 +79,7 @@ private slots:
 private:
     TaskbarAppearance::List m_appearances;
     void updateAppearanceCombo();
+    void updateIconsTextCombo();
     void updateCustomAppearance();
     static const TQStringList& actionList();
     static TQStringList i18nActionList();
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index 930a82d7f..012e562cc 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -139,7 +139,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>kcfg_ShowAllWindows</cstring>
                                 </property>
@@ -153,12 +153,27 @@
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. 
-
-By default, this option is selected and all windows are shown.</string>
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. By default, this option is selected and all windows are shown.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="3">
+                            <spacer row="1" column="0">
+                                <property name="name">
+                                    <cstring>spacer2_2_3</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQCheckBox" row="1" column="1" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_SortByDesktop</cstring>
                                 </property>
@@ -172,12 +187,27 @@ By default, this option is selected and all windows are shown.</string>
                                     <bool>true</bool>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
-
-By default this option is selected.</string>
+                                    <string>Selecting this option causes the taskbar to show windows in order of the desktop they appear on. By default this option is selected.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4">
+                            <widget class="TQCheckBox" row="2" column="0" colspan="4">
+                                <property name="name">
+                                    <cstring>showAllScreens</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Show windows from all sc&amp;reens</string>
+                                </property>
+                                <property name="accel">
+                                    <string>Alt+R</string>
+                                </property>
+                                <property name="checked">
+                                    <bool>true</bool>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar. By default, this option is selected and all windows are shown.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQCheckBox" row="3" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>kcfg_ShowOnlyIconified</cstring>
                                 </property>
@@ -188,33 +218,14 @@ By default this option is selected.</string>
                                     <string>Alt+N</string>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. 
-
-By default, this option is not selected and the taskbar will show all windows.</string>
+                                    <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. By default, this option is not selected and the taskbar will show all windows.</string>
                                 </property>
                             </widget>
-                            <widget class="KSeparator" row="4" column="0" rowspan="1" colspan="4">
+                            <widget class="KSeparator" row="4" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>kSeparator5</cstring>
                                 </property>
                             </widget>
-                            <spacer row="6" column="3">
-                                <property name="name">
-                                    <cstring>spacer23</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>31</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
                             <widget class="TQLabel" row="5" column="0" rowspan="2" colspan="2">
                                 <property name="name">
                                     <cstring>showTaskStatesLabel</cstring>
@@ -232,7 +243,7 @@ By default, this option is not selected and the taskbar will show all windows.</
                                     <cstring>kcfg_ShowTaskStates</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQComboBox" row="5" column="2" rowspan="2" colspan="1">
+                            <widget class="TQComboBox" row="5" column="2" rowspan="2">
                                 <property name="name">
                                     <cstring>kcfg_ShowTaskStates</cstring>
                                 </property>
@@ -251,45 +262,26 @@ By default, this option is not selected and the taskbar will show all windows.</
                                     </size>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>The taskbar can show and/or hide tasks based on their current process state.  Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+                                    <string>The taskbar can show and/or hide tasks based on their current process state. Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
                                 </property>
                             </widget>
-                            <spacer row="1" column="0">
+                            <spacer row="6" column="3">
                                 <property name="name">
-                                    <cstring>spacer2_2_3</cstring>
+                                    <cstring>spacer23</cstring>
                                 </property>
                                 <property name="orientation">
                                     <enum>Horizontal</enum>
                                 </property>
                                 <property name="sizeType">
-                                    <enum>Fixed</enum>
+                                    <enum>Expanding</enum>
                                 </property>
                                 <property name="sizeHint">
                                     <size>
-                                        <width>20</width>
+                                        <width>31</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
-                                <property name="name">
-                                    <cstring>showAllScreens</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Show windows from all sc&amp;reens</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+R</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.</string>
-                                </property>
-                            </widget>
                         </grid>
                     </widget>
                     <widget class="TQButtonGroup">
@@ -328,7 +320,7 @@ By default, this option is selected and all windows are shown.</string>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="1" column="1" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_AllowDragAndDropReArrange</cstring>
                                 </property>
@@ -345,7 +337,7 @@ By default, this option is selected and all windows are shown.</string>
                                     <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="4">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>kcfg_SortByApp</cstring>
                                 </property>
@@ -359,12 +351,12 @@ By default, this option is selected and all windows are shown.</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="KSeparator" row="3" column="0" rowspan="1" colspan="4">
+                            <widget class="KSeparator" row="3" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>kSeparator6</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="4" column="0" colspan="2">
                                 <property name="name">
                                     <cstring>groupTasksLabel</cstring>
                                 </property>
@@ -400,11 +392,7 @@ By default, this option is selected and all windows are shown.</string>
                                     </size>
                                 </property>
                                 <property name="whatsThis" stdset="0">
-                                    <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option.
-
-You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;.
-
-By default the taskbar groups windows when it is full.</string>
+                                    <string>The taskbar can group similar windows into single buttons. When one of these window group buttons are clicked on a menu appears showing all the windows in that group. This can be especially useful with the &lt;em&gt;Show all windows&lt;/em&gt; option. You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to &lt;strong&gt;Always&lt;/strong&gt; group windows or to group windows only &lt;strong&gt;When the Taskbar is Full&lt;/strong&gt;. By default the taskbar groups windows when it is full.</string>
                                 </property>
                             </widget>
                             <spacer row="4" column="3">
@@ -480,7 +468,7 @@ By default the taskbar groups windows when it is full.</string>
                         <property name="sizePolicy">
                             <sizepolicy>
                                 <hsizetype>3</hsizetype>
-                                <vsizetype>4</vsizetype>
+                                <vsizetype>5</vsizetype>
                                 <horstretch>0</horstretch>
                                 <verstretch>0</verstretch>
                             </sizepolicy>
@@ -509,7 +497,7 @@ By default the taskbar groups windows when it is full.</string>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
+                            <widget class="TQCheckBox" row="1" column="0" colspan="3">
                                 <property name="name">
                                     <cstring>kcfg_UseCustomColors</cstring>
                                 </property>
@@ -526,7 +514,7 @@ By default the taskbar groups windows when it is full.</string>
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                            <widget class="TQLayoutWidget" row="2" column="1" colspan="2">
                                 <property name="name">
                                     <cstring>layout19</cstring>
                                 </property>
@@ -576,25 +564,16 @@ By default the taskbar groups windows when it is full.</string>
                                         <property name="name">
                                             <cstring>kcfg_InactiveTaskTextColor</cstring>
                                         </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
                                     </widget>
                                     <widget class="KColorButton" row="1" column="1">
                                         <property name="name">
                                             <cstring>kcfg_ActiveTaskTextColor</cstring>
                                         </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
                                     </widget>
                                     <widget class="KColorButton" row="2" column="1">
                                         <property name="name">
                                             <cstring>kcfg_TaskBackgroundColor</cstring>
                                         </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
                                     </widget>
                                     <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
@@ -638,7 +617,7 @@ By default the taskbar groups windows when it is full.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="0" column="0" colspan="2">
                                 <property name="name">
                                     <cstring>kcfg_ShowWindowListBtn</cstring>
                                 </property>
@@ -655,7 +634,23 @@ By default the taskbar groups windows when it is full.</string>
                                     <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
                                 </property>
                             </widget>
-                            <widget class="TQSpinBox" row="1" column="1">
+                            <widget class="KSeparator" row="1" column="0" colspan="2">
+                                <property name="name">
+                                    <cstring>kSeparator7</cstring>
+                                </property>
+                            </widget>
+                            <widget class="TQLabel" row="2" column="0">
+                                <property name="name">
+                                    <cstring>maxButtonWidthLabel</cstring>
+                                </property>
+                                <property name="text">
+                                    <string>Max width for buttons:</string>
+                                </property>
+                                <property name="whatsThis" stdset="0">
+                                    <string>This option allows to set the maximum width for taskbar buttons.</string>
+                                </property>
+                            </widget>
+                            <widget class="TQSpinBox" row="2" column="1">
                                 <property name="name">
                                     <cstring>kcfg_MaximumButtonWidth</cstring>
                                 </property>
@@ -672,14 +667,6 @@ By default the taskbar groups windows when it is full.</string>
                                     <number>200</number>
                                 </property>
                             </widget>
-                            <widget class="TQLabel" row="1" column="0">
-                                <property name="name">
-                                    <cstring>maxButtonWidthLabel</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Maximum button width:</string>
-                                </property>
-                            </widget>
                         </grid>
                     </widget>
                     <widget class="TQButtonGroup" row="1" column="0">
@@ -701,78 +688,26 @@ By default the taskbar groups windows when it is full.</string>
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>kcfg_DisplayIconsNText</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>5</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="whatsThis" stdset="0">
-                                    <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
-                                </property>
-                            </widget>
-                            <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>displayIconsNTextLabel</cstring>
                                 </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>1</hsizetype>
-                                        <vsizetype>5</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="minimumSize">
-                                    <size>
-                                        <width>100</width>
-                                        <height>0</height>
-                                    </size>
-                                </property>
                                 <property name="text">
                                     <string>Dis&amp;play:</string>
                                 </property>
                                 <property name="buddy" stdset="0">
                                     <cstring>kcfg_DisplayIconsNText</cstring>
                                 </property>
-                            </widget>
-                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="4">
-                                <property name="name">
-                                    <cstring>kcfg_ShowThumbnails</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Show thumbnails on hover (needs TWin compositor enabled)</string>
-                                </property>
-                            </widget>
-                            <widget class="TQSpinBox" row="3" column="3">
-                                <property name="name">
-                                    <cstring>kcfg_ThumbnailMaxDimension</cstring>
-                                </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
-                                </property>
-                                <property name="suffix">
-                                    <string> px</string>
-                                </property>
-                                <property name="maxValue">
-                                    <number>500</number>
-                                </property>
-                                <property name="minValue">
-                                    <number>50</number>
-                                </property>
-                                <property name="value">
-                                    <number>100</number>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
                                 </property>
                             </widget>
-                            <spacer row="3" column="0">
+                            <spacer row="0" column="1">
                                 <property name="name">
-                                    <cstring>spacer2_2_2_3</cstring>
+                                    <cstring>spacer2_2_2_3_3</cstring>
                                 </property>
                                 <property name="orientation">
                                     <enum>Horizontal</enum>
@@ -787,27 +722,107 @@ By default the taskbar groups windows when it is full.</string>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2">
+                            <widget class="TQComboBox" row="0" column="2" colspan="2">
                                 <property name="name">
-                                    <cstring>thumbMaxDimensionLabel</cstring>
+                                    <cstring>kcfg_DisplayIconsNText</cstring>
                                 </property>
-                                <property name="enabled">
-                                    <bool>false</bool>
+                                <property name="sizePolicy">
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>0</vsizetype>
+                                        <horstretch>0</horstretch>
+                                        <verstretch>0</verstretch>
+                                    </sizepolicy>
                                 </property>
-                                <property name="text">
-                                    <string>Maximum dimension:</string>
+                                <property name="whatsThis" stdset="0">
+                                    <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="1" column="2">
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
                                 <property name="name">
-                                    <cstring>smallIcons</cstring>
+                                    <cstring>useIconsFrame</cstring>
                                 </property>
-                                <property name="text">
-                                    <string>Small icons</string>
+                                <property name="enabled">
+                                    <bool>false</bool>
                                 </property>
-                                <property name="checked">
-                                    <bool>true</bool>
+                                <property name="frameShape">
+                                    <enum>StyledPanel</enum>
+                                </property>
+                                <property name="frameShadow">
+                                    <enum>Raised</enum>
                                 </property>
+                                <grid>
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>smallIcons</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Small icons</string>
+                                        </property>
+                                        <property name="whatsThis" stdset="0">
+                                            <string>Selecting this option makes the taskbar use small icons.</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="1" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_ShowThumbnails</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Show thumbnails on hover</string>
+                                        </property>
+                                    </widget>
+                                    <spacer row="2" column="0">
+                                        <property name="name">
+                                            <cstring>spacer2_2_2_3</cstring>
+                                        </property>
+                                        <property name="orientation">
+                                            <enum>Horizontal</enum>
+                                        </property>
+                                        <property name="sizeType">
+                                            <enum>Fixed</enum>
+                                        </property>
+                                        <property name="sizeHint">
+                                            <size>
+                                                <width>20</width>
+                                                <height>20</height>
+                                            </size>
+                                        </property>
+                                    </spacer>
+                                    <widget class="TQLabel" row="2" column="1">
+                                        <property name="name">
+                                            <cstring>thumbMaxDimensionLabel</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="text">
+                                            <string>Maximum dimension:</string>
+                                        </property>
+                                    </widget>
+                                    <widget class="TQSpinBox" row="2" column="2">
+                                        <property name="name">
+                                            <cstring>kcfg_ThumbnailMaxDimension</cstring>
+                                        </property>
+                                        <property name="enabled">
+                                            <bool>false</bool>
+                                        </property>
+                                        <property name="suffix">
+                                            <string> px</string>
+                                        </property>
+                                        <property name="maxValue">
+                                            <number>500</number>
+                                        </property>
+                                        <property name="minValue">
+                                            <number>50</number>
+                                        </property>
+                                        <property name="value">
+                                            <number>100</number>
+                                        </property>
+                                    </widget>
+                                </grid>
                             </widget>
                         </grid>
                     </widget>
@@ -840,8 +855,31 @@ By default the taskbar groups windows when it is full.</string>
                                 <property name="buddy" stdset="0">
                                     <cstring>appearance</cstring>
                                 </property>
+                                <property name="minimumSize">
+                                    <size>
+                                        <width>130</width>
+                                        <height>0</height>
+                                    </size>
+                                </property>
                             </widget>
-                            <widget class="TQComboBox" row="0" column="1">
+                            <spacer row="0" column="1">
+                                <property name="name">
+                                    <cstring>spacer2_2_2_3_3</cstring>
+                                </property>
+                                <property name="orientation">
+                                    <enum>Horizontal</enum>
+                                </property>
+                                <property name="sizeType">
+                                    <enum>Fixed</enum>
+                                </property>
+                                <property name="sizeHint">
+                                    <size>
+                                        <width>20</width>
+                                        <height>20</height>
+                                    </size>
+                                </property>
+                            </spacer>
+                            <widget class="TQComboBox" row="0" column="2" colspan="2">
                                 <property name="name">
                                     <cstring>appearance</cstring>
                                 </property>
@@ -854,7 +892,7 @@ By default the taskbar groups windows when it is full.</string>
                                     </sizepolicy>
                                 </property>
                             </widget>
-                            <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQFrame" row="1" column="0" colspan="4">
                                 <property name="name">
                                     <cstring>customAppearance</cstring>
                                 </property>
@@ -871,30 +909,13 @@ By default the taskbar groups windows when it is full.</string>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
-                                        <property name="name">
-                                            <cstring>kcfg_HaloText</cstring>
-                                        </property>
-                                        <property name="text">
-                                            <string>Draw halo around text</string>
-                                        </property>
-                                        <property name="accel">
-                                            <string></string>
-                                        </property>
-                                        <property name="checked">
-                                            <bool>true</bool>
-                                        </property>
-                                    </widget>
-                                    <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                                    <widget class="TQCheckBox" row="0" column="0" colspan="3">
                                         <property name="name">
                                             <cstring>kcfg_DrawButtons</cstring>
                                         </property>
                                         <property name="text">
                                             <string>Always draw items as buttons</string>
                                         </property>
-                                        <property name="accel">
-                                            <string></string>
-                                        </property>
                                     </widget>
                                     <spacer row="1" column="0">
                                         <property name="name">
@@ -913,15 +934,23 @@ By default the taskbar groups windows when it is full.</string>
                                             </size>
                                         </property>
                                     </spacer>
-                                    <widget class="TQCheckBox" row="1" column="1">
+                                    <widget class="TQCheckBox" row="1" column="1" colspan="2">
                                         <property name="name">
                                             <cstring>kcfg_ShowButtonOnHover</cstring>
                                         </property>
                                         <property name="text">
                                             <string>Draw items as buttons on hover</string>
                                         </property>
-                                        <property name="accel">
-                                            <string></string>
+                                    </widget>
+                                    <widget class="TQCheckBox" row="2" column="0" colspan="3">
+                                        <property name="name">
+                                            <cstring>kcfg_HaloText</cstring>
+                                        </property>
+                                        <property name="text">
+                                            <string>Draw halo around text</string>
+                                        </property>
+                                        <property name="checked">
+                                            <bool>true</bool>
                                         </property>
                                     </widget>
                                 </grid>
@@ -1032,7 +1061,7 @@ By default the taskbar groups windows when it is full.</string>
                                     <cstring>kcfg_RightButtonAction</cstring>
                                 </property>
                             </widget>
-                            <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="4" column="0" colspan="2">
                                 <property name="name">
                                     <cstring>kcfg_CycleWheel</cstring>
                                 </property>
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index c641afef7..917e9e2de 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -144,34 +144,33 @@ private:
     void sortContainersByDesktop(TaskContainer::List& list);
     void setViewportBackground();
 
-    bool			          blocklayout;
-    bool			          m_showAllWindows;
-    bool			          m_cycleWheel;
-    int 			          m_currentScreen;    // The screen to show, -1 for all screens
-    bool			          m_showOnlyCurrentScreen;
-    bool			          m_sortByDesktop;
+    bool                blocklayout;
+    bool                m_showAllWindows;
+    bool                m_cycleWheel;
+    int                 m_currentScreen;    // The screen to show, -1 for all screens
+    bool                m_showOnlyCurrentScreen;
+    bool                m_sortByDesktop;
     int                 m_displayIconsNText;
-    bool			          m_showOnlyIconified;
-    int				          m_showTaskStates;
+    bool                m_showOnlyIconified;
+    int                 m_showTaskStates;
     int                 m_iconSize;
-    ArrowType 			    arrowType;
-    TaskContainer::List	containers;
-    TaskContainer::List	m_hiddenContainers;
-    TaskContainer::List	m_deletableContainers;
-    PixmapList			    frames;
+    ArrowType           arrowType;
+    TaskContainer::List containers;
+    TaskContainer::List m_hiddenContainers;
+    TaskContainer::List m_deletableContainers;
+    PixmapList          frames;
     int                 maximumButtonsWithoutShrinking() const;
     bool                shouldGroup() const;
     bool                isGrouping;
     void                reGroup();
     TDEGlobalAccel*     keys;
-    KTextShadowEngine*	m_textShadowEngine;
-    bool			          m_ignoreUpdates;
-    bool			          m_sortByAppPrev;
-    TQTimer			        m_relayoutTimer;
-    TQImage			        m_blendGradient;
-    TaskBarSettings*		m_settingsObject;
-    TaskBarSettings*		m_globalSettingsObject;
-
+    KTextShadowEngine*  m_textShadowEngine;
+    bool                m_ignoreUpdates;
+    bool                m_sortByAppPrev;
+    TQTimer             m_relayoutTimer;
+    TQImage             m_blendGradient;
+    TaskBarSettings*    m_settingsObject;
+    TaskBarSettings*    m_globalSettingsObject;
 };
 
 #endif
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 6d2b5ea59..7436f2e8e 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -75,9 +75,9 @@
                     <label>Only Running</label>
                 </choice>
             </choices>
-	    <default>ShowAll</default>
+      <default>ShowAll</default>
             <label>Show tasks with state:</label>
-	    <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
+      <whatsthis>The taskbar can show and/or hide tasks based on their current process state. Select <em>Any</em> to show all tasks regardless of current state.</whatsthis>
         </entry>
         <entry key="SortByDesktop" type="Bool" >
             <default>true</default>
@@ -173,19 +173,20 @@
             <label>Draw taskbar entries "flat" and not as a button</label>
             <whatsthis>Turning this option on will cause the taskbar to draw visible button frames for each entry in the taskbar. By default, this option is off.</whatsthis>
         </entry>
+        <entry key="ShowButtonOnHover" type="Bool" >
+            <default>true</default>
+            <label>Show a visible button frame on the task the cursor is positioned over</label>
+            <whatsthis>Turning this option on will cause the taskbar to draw a visible button frame around the item currently under the mouse. By default, this option is on.</whatsthis>
+        </entry>
         <entry key="HaloText" type="Bool" >
             <default>false</default>
             <label>Draw taskbar text with a halo around it</label>
             <whatsthis>Turning this option on will cause the taskbar to draw fancier text that has an outline around it. While this is useful for transparent panels or particularly dark panel backgrounds, it is slower.</whatsthis>
         </entry>
-        <entry key="ShowButtonOnHover" type="Bool" >
-            <default>true</default>
-            <label>Show a visible button frame on the task the cursor is positioned over</label>
-        </entry>
         <entry key="ShowThumbnails" type="Bool" >
             <default>false</default>
             <label>Show thumbnails instead of icons in the mouse-over effects</label>
-            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively.</p></whatsthis>
+            <whatsthis>Enabling this option will draw a thumbnail of the window in its mouse-over effect.<p>If a window is minimized or resides on a different desktop while the taskbar is starting, an icon is shown until the window is restored or the appropriate desktop is activated, respectively. This options needs a TWin compositor in order to work.</p></whatsthis>
         </entry>
         <entry key="ThumbnailMaxDimension" type="UInt" >
             <default>100</default>
@@ -212,8 +213,8 @@
             <default code="true">QColor()</default>
             <whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis>
         </entry>
-	<entry name="IconSize" type="UInt" >
-	    <default>16</default>
-	</entry>
+        <entry name="IconSize" type="UInt" >
+            <default>16</default>
+        </entry>
     </group>
 </kcfg>