summaryrefslogtreecommitdiffstats
path: root/kcontrol/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/taskbar')
-rw-r--r--kcontrol/taskbar/kcmtaskbar.cpp4
-rw-r--r--kcontrol/taskbar/kcmtaskbarui.ui32
2 files changed, 20 insertions, 16 deletions
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 25f2c778d..3a2436b24 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -212,6 +212,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
{
m_widget->showAllScreens->hide();
}
+ else
+ {
+ m_widget->showAllScreens->show();
+ }
connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed()));
KAboutData *about = new KAboutData(I18N_NOOP("kcmtaskbar"),
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index 6a43b5fbb..ce0ddb6fe 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -71,7 +71,7 @@ By default this option is selected.</string>
By default, this option is selected and all windows are shown.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_ShowWindowListBtn</cstring>
</property>
@@ -85,7 +85,7 @@ By default, this option is selected and all windows are shown.</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="TQComboBox" row="7" column="2">
+ <widget class="TQComboBox" row="8" column="2">
<property name="name">
<cstring>kcfg_GroupTasks</cstring>
</property>
@@ -105,9 +105,9 @@ You can set the taskbar to &lt;strong&gt;Never&lt;/strong&gt; group windows, to
By default the taskbar groups windows when it is full.</string>
</property>
</widget>
- <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>showTaskStatesLabel</cstring>
+ <cstring>groupTasksLabel</cstring>
</property>
<property name="text">
<string>&amp;Group similar tasks:</string>
@@ -116,7 +116,7 @@ By default the taskbar groups windows when it is full.</string>
<cstring>kcfg_ShowTaskStates</cstring>
</property>
</widget>
- <widget class="TQComboBox" row="8" column="2">
+ <widget class="TQComboBox" row="9" column="2">
<property name="name">
<cstring>kcfg_ShowTaskStates</cstring>
</property>
@@ -132,9 +132,9 @@ By default the taskbar groups windows when it is full.</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>
- <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>groupTasksLabel</cstring>
+ <cstring>showTaskStatesLabel</cstring>
</property>
<property name="text">
<string>&amp;Show tasks with state:</string>
@@ -143,7 +143,7 @@ By default the taskbar groups windows when it is full.</string>
<cstring>kcfg_ShowTaskStates</cstring>
</property>
</widget>
- <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_ShowOnlyIconified</cstring>
</property>
@@ -156,7 +156,7 @@ By default the taskbar groups windows when it is full.</string>
By default, this option is not selected and the taskbar will show all windows.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_ShowIcon</cstring>
</property>
@@ -172,7 +172,7 @@ By default, this option is not selected and the taskbar will show all windows.</
By default this option is selected.</string>
</property>
</widget>
- <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>showAllScreens</cstring>
</property>
@@ -188,12 +188,12 @@ By default this option is selected.</string>
By default, this option is selected and all windows are shown.</string>
</property>
</widget>
- <widget class="TQComboBox" row="9" column="2">
+ <widget class="TQComboBox" row="10" column="2">
<property name="name">
<cstring>appearance</cstring>
</property>
</widget>
- <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
+ <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@@ -204,7 +204,7 @@ By default, this option is selected and all windows are shown.</string>
<cstring>appearance</cstring>
</property>
</widget>
- <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="2">
+ <widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kcfg_UseCustomColors</cstring>
</property>
@@ -218,7 +218,7 @@ By default, this option is selected and all windows are shown.</string>
<bool>true</bool>
</property>
</widget>
- <widget class="TQLayoutWidget" row="11" column="0" rowspan="1" colspan="3">
+ <widget class="TQLayoutWidget" row="12" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>layout9</cstring>
</property>
@@ -353,7 +353,7 @@ By default, this option is selected and all windows are shown.</string>
</size>
</property>
</spacer>
- <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_SortByApp</cstring>
</property>
@@ -364,7 +364,7 @@ By default, this option is selected and all windows are shown.</string>
<bool>true</bool>
</property>
</widget>
- <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+ <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>kcfg_CycleWheel</cstring>
</property>