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

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-05-29 16:53:21
Message-ID: 20040529165321.22B61126E4 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD: CVS commit by kloecker: 

Disable invalid items in the attachment popup menu in the composer. Patch by Tobias Schaefer.


  M +7 -5      kmcomposewin.cpp   1.765.2.54
  M +1 -1      kmcomposewin.h   1.224.2.23


--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.53:1.765.2.54
@@ -2310,7 +2310,7 @@ void KMComposeWin::slotAttachPopupMenu(Q
      mAttachMenu = new QPopupMenu(this);
 
-     mAttachMenu->insertItem(i18n("to view", "View"), this,
+     mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this,
                              SLOT(slotAttachView()));
-     mAttachMenu->insertItem(i18n("Remove"), this, SLOT(slotAttachRemove()));
+     mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, SLOT(slotAttachRemove()));
      mSaveAsId = mAttachMenu->insertItem( i18n("Save As..."), this,
                                           SLOT( slotAttachSave() ) );
@@ -2327,7 +2327,9 @@ void KMComposeWin::slotAttachPopupMenu(Q
     }
   }
-  bool multiSelection = ( selectedCount > 1 );
-  mAttachMenu->setItemEnabled( mSaveAsId, !multiSelection );
-  mAttachMenu->setItemEnabled( mPropertiesId, !multiSelection );
+
+  mAttachMenu->setItemEnabled( mViewId, selectedCount > 0 );
+  mAttachMenu->setItemEnabled( mRemoveId, selectedCount > 0 );
+  mAttachMenu->setItemEnabled( mSaveAsId, selectedCount == 1 );
+  mAttachMenu->setItemEnabled( mPropertiesId, selectedCount == 1 );
 
   mAttachMenu->popup(QCursor::pos());

--- kdepim/kmail/kmcomposewin.h  #1.224.2.22:1.224.2.23
@@ -724,5 +724,5 @@ protected:
   QPtrList<KMMessagePart> mAtmList;
   QPopupMenu *mAttachMenu;
-  int mSaveAsId, mPropertiesId;
+  int mViewId, mRemoveId, mSaveAsId, mPropertiesId;
   bool mAutoSign, mAutoPgpSign, mAutoPgpEncrypt, mAutoDeleteMsg;
   bool mNeverSignWhenSavingInDrafts, mNeverEncryptWhenSavingInDrafts;


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