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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim (merge)
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-01-11 15:57:37
Message-ID: 1263225457.352971.3925.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073099 by vkrause:

SVN_MERGE

Merged revisions 1071346 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1071346 | tmcguire | 2010-01-07 22:42:25 +0100 (Thu, 07 Jan 2010) | 45 lines
  
  SVN_MERGE
  Merged revisions 1063259,1063461 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1063259 | winterz | 2009-12-17 16:58:27 +0100 (Thu, 17 Dec 2009) | 23 lines
    
    Merged revisions 1063249-1063250,1063257 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1063249 | winterz | 2009-12-17 10:19:25 -0500 (Thu, 17 Dec 2009) | 5 lines
      
      for the saveAs dialog prompt, use "*" instead of "*.*" for the all file filter.
      also use pretty names.
      
      MERGE: e4,trunk
    ........
      r1063250 | winterz | 2009-12-17 10:26:14 -0500 (Thu, 17 Dec 2009) | 3 lines
      
      add the word "non-hidden" to the saveAs dialog filter.
      MERGE: e4,trunk
    ........
      r1063257 | winterz | 2009-12-17 10:47:29 -0500 (Thu, 17 Dec 2009) | 4 lines
      
      i18n the filter for the saveAs dialog.
      and don't use the word "non-hidden".
      MERGE: e4,4.5 (new i18n string)
    ........
  ................
    r1063461 | tmcguire | 2009-12-18 17:01:49 +0100 (Fri, 18 Dec 2009) | 12 lines
    
    SVN_MERGE
    Merged revisions 1063451 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1063451 | tmcguire | 2009-12-18 16:40:56 +0100 (Fri, 18 Dec 2009) | 4 lines
      
      When the subject starts with a dot, change it to an underscore, to avoid hidden files.
      
      kolab/issue3805
    ........
  ................
................


 _M            . (directory)  
 M  +7 -1      kmail/kmcommands.cpp  


--- branches/work/akonadi-ports/kdepim/kmail/kmcommands.cpp #1073098:1073099
@@ -663,7 +663,8 @@
   if ( !fileName.endsWith( ".mbox" ) )
     fileName += ".mbox";
 
-  return KFileDialog::getSaveUrl( KUrl::fromPath( fileName ), "*.mbox\n*.*" );
+  const QString filter = i18n( "*.mbox|email messages (*.mbox)\n*|all files (*)" );
+  return KFileDialog::getSaveUrl( KUrl::fromPath( fileName ), filter );
 }
 
 KMSaveMsgCommand::KMSaveMsgCommand( QWidget *parent, const Akonadi::Item& msg )
@@ -2264,6 +2265,11 @@
   fileName.replace( '/', '_' );
   fileName.replace( '\\', '_' );
 
+  // Avoid hidden files be replacing the first dot
+  if ( fileName.startsWith( "." ) ) {
+    fileName[0] = '_';
+  }
+
   return fileName;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]