comparison src/multichoicedialog.cpp @ 483:a582c6417004

Some textual updates; include final URL path element in default for local file on clone

 MultiChoiceDialog::getDefaultPath() const
 {
     QDir home(QDir::home());
     QDir dflt;
 
+    dflt = QDir(home.filePath(tr("Documents")));
+    DEBUG << "testing " << dflt << endl;
+    if (dflt.exists()) return dflt.canonicalPath();
+
     dflt = QDir(home.filePath(tr("My Documents")));
     DEBUG << "testing " << dflt << endl;
     if (dflt.exists()) return dflt.canonicalPath();
 
-    dflt = QDir(home.filePath(tr("Documents")));
+    dflt = QDir(home.filePath(tr("Desktop")));
     DEBUG << "testing " << dflt << endl;
     if (dflt.exists()) return dflt.canonicalPath();
 
     DEBUG << "all failed, returning " << home << endl;
     return home.canonicalPath();

 
 void
 MultiChoiceDialog::urlChanged(const QString &s)
 {
     updateOkButton();
+    updateFileComboFromURL();
 }
 
 void
 MultiChoiceDialog::fileChanged(const QString &s)
 {
     updateOkButton();
 }
 
 void
-MultiChoiceDialog::updateOkButton()
-{
-/* This doesn't work well
+MultiChoiceDialog::updateFileComboFromURL()
+{
     if (m_argTypes[m_currentChoice] != UrlToDirectoryArg) {
         return;
-    }
-    QDir dirPath(m_fileCombo->currentText());
-    if (!dirPath.exists()) {
-        if (!dirPath.cdUp()) return;
     }
     QString url = m_urlCombo->currentText();
     if (QRegExp("^\\w+://").indexIn(url) < 0) {
         return;
     }
     QString urlDirName = url;
     urlDirName.replace(QRegExp("^.*\\//.*\\/"), "");
     if (urlDirName == "" || urlDirName == url) {
         return;
     }
-    m_fileCombo->lineEdit()->setText(dirPath.filePath(urlDirName));
-*/
+    QString dirPath = m_fileCombo->currentText();
+    QString defaultPath = getDefaultPath();
+    if (dirPath == defaultPath) {
+        dirPath += QDir::separator() + urlDirName;
+    } else if (dirPath == defaultPath + QDir::separator()) {
+        dirPath += urlDirName;
+    } else {
+        QDir d(dirPath);
+        d.cdUp();
+        dirPath = d.filePath(urlDirName);
+    }
+    m_fileCombo->lineEdit()->setText(dirPath);
+}
+
+void
+MultiChoiceDialog::updateOkButton()
+{
     if (m_argTypes[m_currentChoice] == UrlToDirectoryArg) {
         m_okButton->setEnabled(getArgument() != "" &&
                                getAdditionalArgument() != "");
     } else {
         m_okButton->setEnabled(getArgument() != "");

         }
     }
 
     m_descriptionLabel->setText(m_descriptions[id]);
 
+    m_browseButton->hide();
+
+    m_urlLabel->hide();
+    m_urlCombo->clear();
+    m_urlCombo->hide();
+
     m_fileLabel->hide();
+    m_fileCombo->clear();
     m_fileCombo->hide();
-    m_browseButton->hide();
-    m_urlLabel->hide();
-    m_urlCombo->hide();
 
     QSharedPointer<RecentFiles> rf = m_recentFiles[id];
-    m_fileCombo->clear();
-    m_urlCombo->clear();
 
     switch (m_argTypes[id]) {
         
     case NoArg:
         break;

         m_urlCombo->addItems(rf->getRecent());
         m_fileLabel->setText(tr("&Folder:"));
         m_fileLabel->show();
         m_fileCombo->show();
         m_fileCombo->lineEdit()->setText(getDefaultPath());
+        updateFileComboFromURL();
         m_browseButton->show();
         break;
     }
 
     updateOkButton();