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

List:       kde-commits
Subject:    kdebase/kdesktop
From:       Martin Koller <m.koller () surfeu ! at>
Date:       2005-02-06 22:32:58
Message-ID: 20050206223258.A709C1D015 () office ! kde ! org
[Download RAW message or body]

CVS commit by mkoller: 

BUG: 97546
Problem: when media:/ told kdesktop at startup it has e.g. 2 items (by calling \
slotNewItems()) before getting the signal from the ~/Desktop directory
saveIconPositions() was called, which immediately deleted all the previous stored
IconPositions from all the icons not yet on the desktop, which led to rearranging \
them when afterwards the slotNewItems() was called from ~/Desktop dir.

Solution: don't delete settings in IconPositions file when the icons are not yet \
existing


  M +2 -25     kdiconview.cc   1.147


--- kdebase/kdesktop/kdiconview.cc  #1.146:1.147
@@ -141,6 +141,4 @@ KDIconView::KDIconView( QWidget *parent,
              this, SLOT(slotItemRenamed(QIconViewItem *, const QString &)) );
 
-    setShowToolTips( false );
-
     if (!m_bEditableDesktopIcons)
     {
@@ -1007,5 +1005,5 @@ void KDIconView::slotNewItems( const KFi
 void KDIconView::slotRefreshItems( const KFileItemList & entries )
 {
-    //kdDebug(1204) << "KDIconView::slotRefreshItems" << endl;
+    kdDebug(1204) << "KDIconView::slotRefreshItems" << endl;
     bool bNeedPreviewJob = false;
     KFileItemListIterator rit(entries);
@@ -1105,5 +1103,5 @@ void KDIconView::refreshTrashIcon()
 void KDIconView::slotDeleteItem( KFileItem * _fileitem )
 {
-//    kdDebug(1204) << "KDIconView::slotDeleteItems" << endl;
+    kdDebug(1204) << "KDIconView::slotDeleteItems" << endl;
     // we need to find out the KFileIVI containing the fileitem
     QIconViewItem *it = firstItem();
@@ -1556,29 +1554,8 @@ void KDIconView::saveIconPositions()
     kdDebug(1214) << "KDIconView::saveIconPositions " << item->url().fileName() << " \
" << it->x() << " " << it->y() << endl;  saveIconPosition(m_dotDirectory, it->x(), \
                it->y(), iconArea());
-    m_dotDirectory->writeEntry( "Exists", true );
 
     it = it->nextItem();
   }
 
-  QStringList groups = m_dotDirectory->groupList();
-  QStringList::ConstIterator gIt = groups.begin();
-  QStringList::ConstIterator gEnd = groups.end();
-  for (; gIt != gEnd; ++gIt )
-  {
-    if ( (*gIt).startsWith(prefix) )
-    {
-      m_dotDirectory->setGroup( *gIt );
-      if ( m_dotDirectory->hasKey( "Exists" ) )
-      {
-        m_dotDirectory->deleteEntry( "Exists", false );
-      }
-      else
-      {
-        kdDebug(1214) << "KDIconView::saveIconPositions deleting group " << *gIt << \
                endl;
-        m_dotDirectory->deleteGroup( *gIt );
-      }
-    }
-  }
-
   m_dotDirectory->sync();
 }


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