[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:56:00
Message-ID: 20040529165600.3AE2E126E2 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Merge from HEAD: CVS commit by sanders: 

Outlook compatible attachment naming option.

(sans GUI) - and -

CVS commit by binner: 

"Open" button in dialog for "Insert File..." but not for "Attach File..."


  M +18 -4     kmcomposewin.cpp   1.765.2.55
  M +1 -0      kmcomposewin.h   1.224.2.24


--- kdepim/kmail/kmcomposewin.cpp  #1.765.2.54:1.765.2.55
@@ -486,4 +486,5 @@ void KMComposeWin::readConfig(void)
   if (mLineBreak < 30)
     mLineBreak = 30;
+  mOutlookCompatible = config->readBoolEntry( "outlook-compatible-attachments", false );
   mAutoPgpSign = config->readBoolEntry("pgp-auto-sign", false);
   mAutoPgpEncrypt = config->readBoolEntry("pgp-auto-encrypt", false);
@@ -1966,6 +1967,11 @@ void KMComposeWin::slotAttachFile()
   // this function.
 
-  KURL::List files = KFileDialog::getOpenURLs(QString::null, QString::null,
-        this, i18n("Attach File"));
+  KFileDialog fdlg(QString::null, QString::null, this, 0, TRUE);
+  fdlg.setOperationMode( KFileDialog::Other );
+  fdlg.setCaption(i18n("Attach File"));
+  fdlg.setMode(KFile::Files);
+  fdlg.exec();
+  KURL::List files = fdlg.selectedURLs();
+
   for (KURL::List::Iterator it = files.begin(); it != files.end(); ++it)
     addAttach(*it);
@@ -2046,6 +2052,13 @@ void KMComposeWin::slotAttachFileResult(
     KMMessage::preferredCharsets(), name);
   if (encoding.isEmpty()) encoding = "utf-8";
-  QCString encName = KMMsgBase::encodeRFC2231String(name, encoding);
-  bool RFC2231encoded = name != QString(encName);
+
+  QCString encName;
+  if ( mOutlookCompatible )
+    encName = KMMsgBase::encodeRFC2047String( name, encoding );
+  else
+    encName = KMMsgBase::encodeRFC2231String( name, encoding );
+  bool RFC2231encoded = false;
+  if ( !mOutlookCompatible )
+    RFC2231encoded = name != QString( encName );
 
   // create message part
@@ -2105,4 +2118,5 @@ void KMComposeWin::slotInsertFile()
 {
   KFileDialog fdlg(QString::null, QString::null, this, 0, TRUE);
+  fdlg.setOperationMode( KFileDialog::Opening );
   fdlg.setCaption(i18n("Insert File"));
   fdlg.toolBar()->insertCombo(KMMsgBase::supportedEncodings(FALSE), 4711,

--- kdepim/kmail/kmcomposewin.h  #1.224.2.23:1.224.2.24
@@ -780,4 +780,5 @@ protected:
 
   bool mAlwaysSend;
+  bool mOutlookCompatible;
 
   QStringList mFolderNames;


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