From kde-commits  Wed May 31 21:57:49 2006
From: Eva Brucherseifer <eva () kde ! org>
Date: Wed, 31 May 2006 21:57:49 +0000
To: kde-commits
Subject: kdenox/konq-embed/dropin
Message-Id: <1149112669.355319.623.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=114911267821945

SVN commit 547123 by eva:

save download file to right location


 M  +3 -14     kfiledialog.cpp  
 M  +17 -3     khtml/khtml_ext.cpp  
 M  +1 -1      khtml/khtml_ext.h  


--- trunk/kdenox/konq-embed/dropin/kfiledialog.cpp #547122:547123
@@ -67,7 +67,7 @@
 
     if ( qpefd->exec() == QDialog::Accepted )
     {
-        result = "file:" + qpefd->selectedPath() + qpefd->selectedFilename(); 
+        result = "file:" + qpefd->selectedPath() + "/" + qpefd->selectedFilename(); 
     }
 
     delete qpefd;
@@ -168,7 +168,7 @@
     memory.clear();
     nameMap.clear();
 
-    QDir docDir( QPEApplication::documentDir() );
+    QDir docDir( QDir::homeDirPath() );
     if ( docDir.exists() )
     {
         QString name = StorageInfo::tr("Internal Storage");
@@ -182,21 +182,10 @@
     for ( ; it.current(); ++it ){
         if ( (*it)->isRemovable() ) {
             memory.append( (*it)->name() );
-            nameMap[(*it)->name()] = (*it)->path() +"/";
+            nameMap[(*it)->name()] = (*it)->path();
         } 
     }
 
-#ifdef QTOPIA_SIMULATOR
-    QDir homeDir (QDir::homeDirPath());
-    if ( homeDir.exists() ){
-        QString homeFs = StorageInfo::tr("Simulator Home Directory: %1").arg(homeDir.path());
-        memory.append( homeFs );
-        nameMap[homeFs] = homeDir.path();
-    }
-#endif
-
-//    delete m_storageCombo->contextMenu;
-//    contextMenu = 0;
     m_storageCombo->clear();
     m_storageCombo->insertStringList(memory);
 }
--- trunk/kdenox/konq-embed/dropin/khtml/khtml_ext.cpp #547122:547123
@@ -113,9 +113,8 @@
                                    const KURL &url,
                                    const QMap<QString, QString> &metadata,
                                    const QString &filter, long cacheId,
-                                   const QString & suggestedFilename )
+                                   const QString & suggestedFilename, const QString& mimeType )
 {
-  kdDebug() << "saveURL 1 " << endl;
   QString name = QString::fromLatin1( "index.html" );
   if ( !suggestedFilename.isEmpty() )
     name = suggestedFilename;
@@ -127,7 +126,22 @@
   do {
     query = KMessageBox::Yes;
       destURL = KFileDialog::getSaveURL( name, filter, parent, caption );
-//      destURL = QFileDialog::getSaveFileName(name, filter, parent, "saveurl", caption );
+#ifdef _QT_QPE_
+      QStringList types = QStringList::split('/', mimeType);
+      QString major = types[0];
+      QString minor = types[1];
+
+      // creating needed directoriess
+      QFileInfo fi = destURL.path();
+      QDir dir = fi.dir();
+      if (!dir.exists("Documents")) dir.mkdir("Documents");
+      dir = dir.absPath() + "/Documents";
+      if (!dir.exists(major)) dir.mkdir(major);
+      dir = dir.absPath() + "/" + major;
+      if (!dir.exists(minor)) dir.mkdir(minor);
+      destURL = dir.absPath() + "/" + minor + "/" + suggestedFilename;
+
+#endif
       kdDebug() << "about to save file to " << destURL << endl;
       if( destURL.isLocalFile() )
       {
--- trunk/kdenox/konq-embed/dropin/khtml/khtml_ext.h #547122:547123
@@ -92,7 +92,7 @@
   static void saveURL( QWidget *, const QString &, const KURL &,
                        const QMap<QString, QString> & = KIO::MetaData(),
                        const QString & = QString::null, long = 0,
-                       const QString & = QString::null );
+                       const QString & = QString::null, const QString & = QString::null );
   
   static void saveURL( const KURL &, const KURL &,
                        const QMap<QString, QString> & = KIO::MetaData(),