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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kmail
From:       David Faure <faure () kde ! org>
Date:       2004-11-23 21:40:51
Message-ID: 20041123214051.6D05218E13 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Fixed "Folder Menu not updated after enabling Expiration for a Folder", approved by Ingo.
BUG: 92918


  M +3 -7      kmfoldertree.cpp   1.313.2.7
  M +13 -1     kmmainwidget.cpp   1.250.2.12
  M +2 -0      kmmainwidget.h   1.70.2.4


--- kdepim/kmail/kmfoldertree.cpp  #1.313.2.6:1.313.2.7
@@ -242,11 +242,7 @@ void KMFolderTreeItem::properties()
     return;
 
-  KMFolderDialog *props;
-
-  props = new KMFolderDialog( mFolder, mFolder->parent(), static_cast<KMFolderTree *>( listView() ),
-                              i18n("Properties of Folder %1").arg( mFolder->label() ) );
-  props->exec();
-  //Nothing here the above exec() may actually delete this KMFolderTreeItem
-  return;
+  KMFolderTree* tree = static_cast<KMFolderTree*>( listView() );
+  tree->mainWidget()->modifyFolder( this );
+  //Nothing here the above may actually delete this KMFolderTreeItem
 }
 

--- kdepim/kmail/kmmainwidget.cpp  #1.250.2.11:1.250.2.12
@@ -888,5 +888,17 @@ void KMMainWidget::slotModifyFolder()
   KMFolderTreeItem *item = static_cast<KMFolderTreeItem*>( mFolderTree->currentItem() );
   if ( item )
-    item->properties();
+    modifyFolder( item );
+}
+
+//-----------------------------------------------------------------------------
+void KMMainWidget::modifyFolder( KMFolderTreeItem* folderItem )
+{
+  KMFolder* folder = folderItem->folder();
+  KMFolderTree* folderTree = static_cast<KMFolderTree *>( folderItem->listView() );
+  KMFolderDialog *props = new KMFolderDialog( folder, folder->parent(), folderTree,
+                                              i18n("Properties of Folder %1").arg( folder->label() ) );
+  props->exec();
+  delete props;
+  updateFolderMenu();
 }
 

--- kdepim/kmail/kmmainwidget.h  #1.70.2.3:1.70.2.4
@@ -143,4 +143,6 @@ public:
   KMSystemTray *systray() const;
 
+  void modifyFolder( KMFolderTreeItem* folderItem );
+
 public slots:
   void slotMoveMsgToFolder( KMFolder *dest);


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