diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index bb7a7a8b9..c93bf600c 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -304,6 +304,7 @@ void TaskbarConfig::processLockouts()
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();
@@ -313,6 +314,7 @@ void TaskbarConfig::processLockouts()
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();
@@ -321,6 +323,7 @@ void TaskbarConfig::processLockouts()
//m_widget->globalConfigReload->show();
m_widget->globalConfigReload->hide();
m_widget->globalConfigEdit->hide();
+ m_widget->localLikeGlobalSpacer->changeSize(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Maximum);
}
}
@@ -416,6 +419,7 @@ void TaskbarConfig::appearanceChanged(int selected)
{
m_widget->customAppearance->setEnabled(true);
updateCustomAppearance();
+ unmanagedWidgetChangeState(true);
}
}
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index ae4f4531d..88c0f3e66 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -8,8 +8,8 @@
0
0
- 813
- 616
+ 817
+ 828
@@ -26,7 +26,7 @@
- layout8
+ layout3
@@ -78,6 +78,23 @@
Edit global floating taskbar configuration
+
+
+ localLikeGlobalSpacer
+
+
+ Vertical
+
+
+ Maximum
+
+
+
+ 20
+ 1
+
+
+
@@ -107,6 +124,14 @@
grpDisplay
+
+
+ 5
+ 4
+ 0
+ 0
+
+
Display
@@ -114,7 +139,7 @@
unnamed
-
+
kcfg_ShowAllWindows
@@ -133,7 +158,26 @@
By default, this option is selected and all windows are shown.
-
+
+
+ kcfg_SortByDesktop
+
+
+ Sort windows by desk&top
+
+
+ Alt+T
+
+
+ true
+
+
+ Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
+
+By default this option is selected.
+
+
+
kcfg_ShowOnlyIconified
@@ -149,31 +193,46 @@ By default, this option is selected and all windows are shown.
By default, this option is not selected and the taskbar will show all windows.
-
+
kSeparator5
-
+
- showAllScreens
+ spacer23
-
- Show windows from all sc&reens
+
+ Horizontal
-
- Alt+R
+
+ Expanding
-
- true
+
+
+ 31
+ 20
+
-
- Turning this option off will cause the taskbar to display <b>only</b> windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.
+
+
+
+ showTaskStatesLabel
+
+
+
+ 250
+ 0
+
+
+
+ &Show tasks with state:
+
+
+ kcfg_ShowTaskStates
-
+
kcfg_ShowTaskStates
@@ -195,46 +254,56 @@ By default, this option is selected and all windows are shown.
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.
-
-
- showTaskStatesLabel
-
-
-
- 250
- 0
-
-
-
- &Show tasks with state:
-
-
- kcfg_ShowTaskStates
-
-
-
+
- spacer23
+ spacer2_2_3
Horizontal
- Expanding
+ Fixed
- 31
+ 20
20
+
+
+ showAllScreens
+
+
+ Show windows from all sc&reens
+
+
+ Alt+R
+
+
+ true
+
+
+ Turning this option off will cause the taskbar to display <b>only</b> windows which are on the same Xinerama screen as the taskbar.
+
+By default, this option is selected and all windows are shown.
+
+
grpSortGroup
+
+
+ 5
+ 4
+ 0
+ 0
+
+
Sorting and grouping
@@ -290,25 +359,6 @@ By default, this option is selected and all windows are shown.
true
-
-
- kcfg_SortByDesktop
-
-
- Sort windows by desk&top
-
-
- Alt+T
-
-
- true
-
-
- Selecting this option causes the taskbar to show windows in order of the desktop they appear on.
-
-By default this option is selected.
-
-
kSeparator6
@@ -430,7 +480,7 @@ By default the taskbar groups windows when it is full.
3
- 5
+ 4
0
0
@@ -768,7 +818,7 @@ By default the taskbar groups windows when it is full.
7
- 5
+ 4
0
0
@@ -1034,6 +1084,8 @@ By default the taskbar groups windows when it is full.
+
+
kcfg_ShowThumbnails
@@ -1071,18 +1123,18 @@ By default the taskbar groups windows when it is full.
kcfg_AllowDragAndDropReArrange
setDisabled(bool)
-
- kcfg_ShowAllWindows
- toggled(bool)
- kcfg_SortByDesktop
- setEnabled(bool)
-
kcfg_DrawButtons
toggled(bool)
kcfg_ShowButtonOnHover
setDisabled(bool)
+
+ kcfg_ShowAllWindows
+ toggled(bool)
+ kcfg_SortByDesktop
+ setEnabled(bool)
+
kcolorbutton.h