Changeset 14497

Timestamp:

Apr 15, 2015, 12:08:24 AM (6 years ago)

Author:

mikedld

Message:

Use native separators for path button and free space label tooltips. Improve path button dialog initial directory/file selection.

Location:

trunk/qt

Files:

• freespace-label.cc (modified) (2 diffs)
• path-button.cc (modified) (3 diffs)

trunk/qt/freespace-label.cc

@@ -7 +7 @@
  * $Id$
  */
+
+#include <QDir>
 
 #include <libtransmission/transmission.h>
@@ -99 +101 @@
   tr_variantDictFindStr (arguments, TR_KEY_path, &path, &len);
   str = QString::fromUtf8 (path, len);
-  setToolTip (str);
+  setToolTip (QDir::toNativeSeparators (str));
 
   myTimer.start ();

trunk/qt/path-button.cc

@@ -9 +9 @@
 
 #include <QApplication>
+#include <QDir>
 #include <QFileDialog>
 #include <QFileIconProvider>
@@ -64 +65 @@
     return;
 
-  myPath = Utils::removeTrailingDirSeparator (path);
+  myPath = QDir::toNativeSeparators (Utils::removeTrailingDirSeparator (path));
 
   updateAppearance ();
@@ -115 +116 @@
   if (!myNameFilter.isEmpty ())
     dialog->setNameFilter (myNameFilter);
-  dialog->selectFile (myPath);
+
+  const QFileInfo pathInfo (myPath);
+  if (!myPath.isEmpty () && pathInfo.exists ())
+    {
+      if (pathInfo.isDir ())
+        {
+          dialog->setDirectory (pathInfo.absoluteFilePath ());
+        }
+      else
+        {
+          dialog->setDirectory (pathInfo.absolutePath ());
+          dialog->selectFile (pathInfo.fileName ());
+        }
+    }
 
   connect (dialog, SIGNAL (fileSelected (QString)), this, SLOT (onFileSelected (QString)));