Changeset 14196

Timestamp:

Sep 8, 2013, 7:03:25 PM (8 years ago)

Author:

jordan

Message:

(trunk, qt) #4813: allow launching files in Qt interface

Location:

trunk/qt

Files:

• details.cc (modified) (3 diffs)
• details.h (modified) (1 diff)
• file-tree.cc (modified) (6 diffs)
• file-tree.h (modified) (5 diffs)

trunk/qt/details.cc

@@ -18 +18 @@
 #include <QComboBox>
 #include <QDateTime>
+#include <QDesktopServices>
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
@@ -1395 +1396 @@
            this,           SLOT (onPathEdited (const QString&, const QString&)));
 
+  connect (myFileTreeView, SIGNAL (openRequested (const QString&)),
+           this,           SLOT (onOpenRequested (const QString&)));
+
   return myFileTreeView;
 }
@@ -1435 +1439 @@
   mySession.torrentRenamePath (myIds, oldpath, newname);
 }
+
+void
+Details :: onOpenRequested (const QString& path)
+{
+  if (!mySession.isLocal ())
+    return;
+
+  foreach (const int id, myIds)
+    {
+      const Torrent * const tor = myModel.getTorrentFromId (id);
+      if (tor == NULL)
+        continue;
+
+      const QString localFilePath = tor->getPath () + "/" + path;
+      if (!QFile::exists (localFilePath))
+        continue;
+
+      if (QDesktopServices::openUrl (QUrl::fromLocalFile (localFilePath)))
+        break;
+    }
+}

trunk/qt/details.h

@@ -143 +143 @@
     void onFileWantedChanged (const QSet<int>& fileIndices, bool);
     void onPathEdited (const QString& oldpath, const QString& newname);
+    void onOpenRequested (const QString& path);
     void onHonorsSessionLimitsToggled (bool);
     void onDownloadLimitedToggled (bool);

trunk/qt/file-tree.cc

@@ -381 +381 @@
 }
 
+QString
+FileTreeItem :: path () const
+{
+  QString itemPath;
+  const FileTreeItem * item = this;
+
+  while (item != NULL && !item->name().isEmpty())
+    {
+      if (itemPath.isEmpty())
+        itemPath = item->name();
+      else
+        itemPath = item->name() + "/" + itemPath;
+      item = item->parent ();
+    }
+
+  return itemPath;
+}
+
+bool
+FileTreeItem :: isComplete () const
+{
+  return myHaveSize == totalSize ();
+}
+
 /***
 ****
@@ -436 +460 @@
   if (role == Qt::EditRole)
     {
-      QString oldpath;
       FileTreeItem * item = itemFromIndex (index);
 
-      while (item && !item->name().isEmpty())
-        {
-          if (oldpath.isEmpty())
-            oldpath = item->name();
-          else
-            oldpath = item->name() + "/" + oldpath;
-          item = item->parent ();
-        }
-
-      emit pathEdited (oldpath, newname.toString());
+      emit pathEdited (item->path (), newname.toString ());
     }
 
@@ -738 +752 @@
       subtreeChanged(index, column);
     }
+}
+
+void
+FileTreeModel :: doubleClicked (const QModelIndex& index)
+{
+  if (!index.isValid())
+    return;
+
+  const int column (index.column());
+  if (column == COL_WANTED || column == COL_PRIORITY)
+    return;
+
+  FileTreeItem * item = itemFromIndex (index);
+
+  if (item->childCount () == 0 && item->isComplete ())
+    emit openRequested (item->path ());
 }
 
@@ -897 +927 @@
            this, SLOT(onClicked(const QModelIndex&)));
 
+  connect (this, SIGNAL(doubleClicked(const QModelIndex&)),
+           this, SLOT(onDoubleClicked(const QModelIndex&)));
+
   connect (&myModel, SIGNAL(priorityChanged(const QSet<int>&, int)),
            this,     SIGNAL(priorityChanged(const QSet<int>&, int)));
@@ -905 +938 @@
   connect (&myModel, SIGNAL(pathEdited(const QString&, const QString&)),
            this,     SIGNAL(pathEdited(const QString&, const QString&)));
+
+  connect (&myModel, SIGNAL (openRequested (const QString&)),
+           this,     SLOT (onOpenRequested (const QString&)),
+           Qt::QueuedConnection);
 }
 
@@ -917 +954 @@
   const QModelIndex modelIndex = myProxy->mapToSource (proxyIndex);
   myModel.clicked (modelIndex);
+}
+
+void
+FileTreeView :: onDoubleClicked (const QModelIndex& proxyIndex)
+{
+  const QModelIndex modelIndex = myProxy->mapToSource (proxyIndex);
+  myModel.doubleClicked (modelIndex);
+}
+
+void
+FileTreeView :: onOpenRequested (const QString& path)
+{
+  if (state () == EditingState)
+    return;
+
+  emit openRequested (path);
 }
 

trunk/qt/file-tree.h

@@ -69 +69 @@
     int fileIndex () const { return myFileIndex; }
     uint64_t totalSize () const { return myTotalSize; }
+    QString path () const;
+    bool isComplete () const;
 
   private:
@@ -116 +118 @@
     void wantedChanged (const QSet<int>& fileIndices, bool);
     void pathEdited (const QString& oldpath, const QString& newname);
+    void openRequested (const QString& path);
 
   public:
@@ -139 +142 @@
   public slots:
     void clicked (const QModelIndex & index);
+    void doubleClicked (const QModelIndex & index);
 };
 
@@ -168 +172 @@
     void wantedChanged (const QSet<int>& fileIndices, bool wanted);
     void pathEdited (const QString& oldpath, const QString& newname);
+    void openRequested (const QString& path);
 
   protected:
@@ -179 +184 @@
   public slots:
     void onClicked (const QModelIndex& index);
+    void onDoubleClicked (const QModelIndex& index);
+    void onOpenRequested (const QString& path);
 };