From kde-commits  Sat Jan 29 17:17:10 2005
From: Till Adam <adam () kde ! org>
Date: Sat, 29 Jan 2005 17:17:10 +0000
To: kde-commits
Subject: kdepim/kmail
Message-Id: <20050129171710.DED1E1CFB9 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110701903725477

CVS commit by tilladam: 

Implement the first bit of the suggestions from the excellent usability
report done by Jan Muehlig, Florian Graessle and Andrea Schminck of
Relevantive/OpenUsability.org namely:

Move the expiry settings for a folder into their own dialog based on the
mockups in the report. Much better, I think, thanks guys.

CC: kdepim-usability@kde.org


  A            expirypropertiesdialog.cpp   1.1 [no copyright]
  A            expirypropertiesdialog.h   1.1 [no copyright GENERATED FILE]
  M +1 -1      Makefile.am   1.325
  M +4 -0      TODO   1.10
  M +2 -0      kmfolderdia.cpp   1.184
  M +17 -1     kmfoldertree.cpp   1.343
  M +1 -0      kmfoldertree.h   1.91


--- kdepim/kmail/Makefile.am  #1.324:1.325
@@ -116,5 +116,5 @@
                 recipientseditor.cpp \
                 recipientspicker.cpp kwindowpositioner.cpp \
-                distributionlistdialog.cpp
+                distributionlistdialog.cpp expirypropertiesdialog.cpp
 
 kmail_SOURCES = main.cpp

--- kdepim/kmail/TODO  #1.9:1.10
@@ -1,2 +1,6 @@
+Around the 3.4 release
+TA: remove the disabled expiry tab code from kmfolderdia.cpp once it is clear
+    that it won't be used anymore
+
 Before the first 3.2 Beta
 MM: Write config upgrade script for

--- kdepim/kmail/kmfolderdia.cpp  #1.183:1.184
@@ -119,7 +119,9 @@ KMFolderDialog::KMFolderDialog(KMFolder 
   if ( !mFolder || !mFolder->noContent() )
   {
+    /* This is in a separate dialog now
     box = addVBoxPage( i18n("Old Message Expiry") );
     tab = new FolderDiaExpiryTab( this, box );
     addTab( tab );
+    */
 
     box = addVBoxPage( i18n("Mailing List") );

--- kdepim/kmail/kmfoldertree.cpp  #1.342:1.343
@@ -18,4 +18,5 @@
 #include "kmcommands.h"
 #include "foldershortcutdialog.h"
+#include "expirypropertiesdialog.h"
 #include "acljobs.h"
 
@@ -239,4 +240,17 @@ bool KMFolderTreeItem::acceptDrag(QDropE
 
 //-----------------------------------------------------------------------------
+void KMFolderTreeItem::slotShowExpiryProperties()
+{
+  if ( !mFolder )
+    return;
+
+  KMFolderTree* tree = static_cast<KMFolderTree*>( listView() );
+  KMail::ExpiryPropertiesDialog *dlg = 
+    new KMail::ExpiryPropertiesDialog( tree, mFolder );
+  dlg->show();
+}
+
+
+//-----------------------------------------------------------------------------
 void KMFolderTreeItem::properties()
 {
@@ -955,5 +969,7 @@ void KMFolderTree::slotContextMenuReques
       mMainWidget->action("compact")->plug(folderMenu);
 
-      mMainWidget->action("expire")->plug(folderMenu);
+      //mMainWidget->action("expire")->plug(folderMenu);
+      folderMenu->insertItem( i18n("Expire..."), fti,
+                              SLOT( slotShowExpiryProperties() ) );
 
       folderMenu->insertSeparator();

--- kdepim/kmail/kmfoldertree.h  #1.90:1.91
@@ -85,4 +85,5 @@ public slots:
   void assignShortcut();
   void slotRepaint();
+  void slotShowExpiryProperties();
   void slotNameChanged() { emit nameChanged( this ); }