Index: kcmtaskbar.cpp
===================================================================
RCS file: /home/kde/kdebase/kcontrol/taskbar/kcmtaskbar.cpp,v
retrieving revision 1.15
diff -u -3 -p -r1.15 kcmtaskbar.cpp
--- kcmtaskbar.cpp	2001/05/07 18:17:36	1.15
+++ kcmtaskbar.cpp	2001/05/16 02:24:57
@@ -52,6 +52,7 @@ TaskbarConfig::TaskbarConfig( QWidget *p
     connect(ui->showAllCheck, SIGNAL(clicked()), SLOT(configChanged()));
     connect(ui->showListBtnCheck, SIGNAL(clicked()), SLOT(configChanged()));
     connect(ui->groupCheck, SIGNAL(clicked()), SLOT(configChanged()));
+    connect(ui->perDesktopCheck, SIGNAL(clicked()), SLOT(configChanged()));
     connect(ui->sortCheck, SIGNAL(clicked()), SLOT(configChanged()));
 
     load();
@@ -75,6 +76,7 @@ void TaskbarConfig::load()
         ui->showAllCheck->setChecked(c->readBoolEntry("ShowAllWindows", true));
         ui->showListBtnCheck->setChecked(c->readBoolEntry("ShowWindowListBtn", true));
         ui->groupCheck->setChecked(c->readBoolEntry("GroupTasks", true));
+        ui->perDesktopCheck->setChecked(c->readBoolEntry("TaskPerDesktop", true));
 	ui->sortCheck->setChecked(c->readBoolEntry("SortByDesktop", true));
     }
 
@@ -91,6 +93,7 @@ void TaskbarConfig::save()
         c->writeEntry("ShowAllWindows", ui->showAllCheck->isChecked());
         c->writeEntry("ShowWindowListBtn", ui->showListBtnCheck->isChecked());
         c->writeEntry("GroupTasks", ui->groupCheck->isChecked());
+        c->writeEntry("TaskPerDesktop", ui->perDesktopCheck->isChecked());
 	c->writeEntry("SortByDesktop", ui->sortCheck->isChecked());
         c->sync();
     }
@@ -111,6 +114,7 @@ void TaskbarConfig::defaults()
     ui->showAllCheck->setChecked(true);
     ui->showListBtnCheck->setChecked(true);
     ui->groupCheck->setChecked(true);
+    ui->perDesktopCheck->setChecked(true);
     ui->sortCheck->setChecked(true);
     emit changed(true);
 }
Index: kcmtaskbarui.ui
===================================================================
RCS file: /home/kde/kdebase/kcontrol/taskbar/kcmtaskbarui.ui,v
retrieving revision 1.2
diff -u -3 -p -r1.2 kcmtaskbarui.ui
--- kcmtaskbarui.ui	2001/05/07 18:17:36	1.2
+++ kcmtaskbarui.ui	2001/05/16 02:24:57
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>605</width>
+            <width>597</width>
             <height>454</height>
         </rect>
     </property>
@@ -22,35 +22,50 @@
     <property>
         <name>layoutMargin</name>
     </property>
-    <vbox>
+    <widget>
+        <class>QButtonGroup</class>
         <property stdset="1">
-            <name>margin</name>
-            <number>4</number>
+            <name>name</name>
+            <cstring>taskbarGroup</cstring>
         </property>
         <property stdset="1">
-            <name>spacing</name>
-            <number>6</number>
+            <name>geometry</name>
+            <rect>
+                <x>4</x>
+                <y>4</y>
+                <width>593</width>
+                <height>160</height>
+            </rect>
         </property>
+        <property stdset="1">
+            <name>title</name>
+            <string>Taskbar</string>
+        </property>
+        <property>
+            <name>layoutMargin</name>
+        </property>
+        <property>
+            <name>layoutSpacing</name>
+        </property>
         <widget>
-            <class>QButtonGroup</class>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>taskbarGroup</cstring>
+                <cstring>Layout2</cstring>
             </property>
             <property stdset="1">
-                <name>title</name>
-                <string>Taskbar</string>
-            </property>
-            <property>
-                <name>layoutMargin</name>
+                <name>geometry</name>
+                <rect>
+                    <x>11</x>
+                    <y>17</y>
+                    <width>147</width>
+                    <height>126</height>
+                </rect>
             </property>
-            <property>
-                <name>layoutSpacing</name>
-            </property>
             <vbox>
                 <property stdset="1">
                     <name>margin</name>
-                    <number>11</number>
+                    <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
@@ -106,7 +121,7 @@
                     </property>
                     <property stdset="1">
                         <name>checked</name>
-                        <bool>true</bool>
+                        <bool>false</bool>
                     </property>
                     <property>
                         <name>whatsThis</name>
@@ -117,6 +132,25 @@
                     <class>QCheckBox</class>
                     <property stdset="1">
                         <name>name</name>
+                        <cstring>perDesktopCheck</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Group tasks &amp;per desktop</string>
+                    </property>
+                    <property stdset="1">
+                        <name>checked</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>whatsThis</name>
+                        <string>Check this option if you want the taskbar to group tasks by deskop.</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
                         <cstring>sortCheck</cstring>
                     </property>
                     <property stdset="1">
@@ -134,27 +168,27 @@
                 </widget>
             </vbox>
         </widget>
-        <spacer>
-            <property>
-                <name>name</name>
-                <cstring>Spacer1</cstring>
-            </property>
-            <property stdset="1">
-                <name>orientation</name>
-                <enum>Vertical</enum>
-            </property>
-            <property stdset="1">
-                <name>sizeType</name>
-                <enum>Expanding</enum>
-            </property>
-            <property>
-                <name>sizeHint</name>
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
-            </property>
-        </spacer>
-    </vbox>
+    </widget>
+    <spacer>
+        <property>
+            <name>name</name>
+            <cstring>Spacer1</cstring>
+        </property>
+        <property stdset="1">
+            <name>orientation</name>
+            <enum>Vertical</enum>
+        </property>
+        <property stdset="1">
+            <name>sizeType</name>
+            <enum>Expanding</enum>
+        </property>
+        <property>
+            <name>sizeHint</name>
+            <size>
+                <width>20</width>
+                <height>20</height>
+            </size>
+        </property>
+    </spacer>
 </widget>
 </UI>