[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker
From:       Stefan Nikolaus <stefan.nikolaus () kdemail ! net>
Date:       2005-03-03 20:46:29
Message-ID: 20050303204629.0A62217987 () office ! kde ! org
[Download RAW message or body]

CVS commit by nikolaus: 

as some people get nervous, sorting by name is replaced by sorting by app.


  M +3 -4      taskbar/taskbar.cpp   1.78
  M +3 -3      taskbar/taskbar.kcfg   1.7
  M +0 -4      taskmanager/taskmanager.cpp   1.92
  M +0 -5      taskmanager/taskmanager.h   1.60


--- kdebase/kicker/taskbar/taskbar.cpp  #1.77:1.78
@@ -51,5 +51,5 @@ int TaskContainerList::compareItems(QPtr
     TaskContainer* con1 = static_cast<TaskContainer*>(item1);
     TaskContainer* con2 = static_cast<TaskContainer*>(item2);
-    return QString::localeAwareCompare(con1->name(), con2->name());
+    return QString::localeAwareCompare(con1->id().lower(), con2->id().lower());
 }
 
@@ -92,5 +92,4 @@ TaskBar::TaskBar( QWidget *parent, const
     connect(TaskManager::the(), SIGNAL(desktopChanged(int)), \
                SLOT(desktopChanged(int)));
     connect(TaskManager::the(), SIGNAL(windowChanged(WId)), \
                SLOT(windowChanged(WId)));
-    connect(TaskManager::the(), SIGNAL(taskNameChanged()), SLOT(reLayout()));
     
     isGrouping = shouldGroup();
@@ -504,5 +503,5 @@ void TaskBar::reLayout()
     }
 
-    if (TaskBarSettings::sortByName())
+    if (TaskBarSettings::sortByApp())
     {
         list.sort();

--- kdebase/kicker/taskbar/taskbar.kcfg  #1.6:1.7
@@ -38,8 +38,8 @@
             <whatsthis>Selecting this option causes the taskbar to show windows in \
order of the desktop they appear on.\n\nBy default this option is \
selected.</whatsthis>  </entry>
-        <entry key="SortByName" type="Bool" >
+        <entry key="SortByApp" type="Bool" >
             <default>true</default>
-            <label>Sort windows by name</label>
-            <whatsthis>Selecting this option causes the taskbar to show windows \
alphabetically ordered.\n\nBy default this option is selected.</whatsthis> +          \
<label>Sort windows by application</label> +            <whatsthis>Selecting this \
option causes the taskbar to show windows ordered by application.\n\nBy default this \
option is selected.</whatsthis>  </entry>
         <entry key="ShowIcon" type="Bool" >

--- kdebase/kicker/taskmanager/taskmanager.cpp  #1.91:1.92
@@ -258,8 +258,4 @@ void TaskManager::windowChanged(WId w, u
             t->refreshIcon();
         }
-        else if (dirty == NET::WMName)
-        {
-            emit taskNameChanged();
-        }
     }
 

--- kdebase/kicker/taskmanager/taskmanager.h  #1.59:1.60
@@ -562,9 +562,4 @@ signals:
     void windowChangedGeometry(WId);
 
-    /**
-     * Emitted when a task changes name.
-     */
-    void taskNameChanged();
-
 protected slots:
     //* @internal


[prev in list] [next in list] [prev in thread] [next in thread]