Merge branch 'omp-jb51630' into 'master'

[nemo-filemanager] Return contents of clipboard. Contributes to JB#51630 See merge request mer-core/nemo-qml-plugin-filemanager!33
sailfishos · Nov 16, 2020 · b6309d5 · b6309d5
2 parents 902e7a6 + d1b3493
commit b6309d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/plugin/fileengine.cpp b/src/plugin/fileengine.cpp
@@ -86,6 +86,7 @@ void FileEngine::cutFiles(QStringList fileNames)
     m_clipboardFiles = fileNames;
     m_clipboardContainsCopy = false;
     emit clipboardCountChanged();
+    emit clipboardFilesChanged();
     emit clipboardContainsCopyChanged();
 }
 
@@ -104,6 +105,7 @@ void FileEngine::copyFiles(QStringList fileNames)
         m_clipboardFiles = fileNames;
         m_clipboardContainsCopy = true;
         emit clipboardCountChanged();
+        emit clipboardFilesChanged();
         emit clipboardContainsCopyChanged();
     }
 }
@@ -147,6 +149,7 @@ void FileEngine::pasteFiles(QString destDirectory, bool nonprivileged)
 
     m_clipboardFiles.clear();
     emit clipboardCountChanged();
+    emit clipboardFilesChanged();
 
     if (m_clipboardContainsCopy) {
         m_fileWorker->startCopyFiles(files, destDirectory, nonprivileged);

diff --git a/src/plugin/fileengine.h b/src/plugin/fileengine.h
@@ -45,6 +45,7 @@ class FileEngine : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int clipboardCount READ clipboardCount NOTIFY clipboardCountChanged)
+    Q_PROPERTY(QStringList clipboardFiles READ clipboardFiles NOTIFY clipboardFilesChanged)
     Q_PROPERTY(bool clipboardContainsCopy READ clipboardContainsCopy NOTIFY clipboardContainsCopyChanged)
     Q_PROPERTY(bool busy READ busy NOTIFY busyChanged)
     Q_PROPERTY(Mode mode READ mode NOTIFY modeChanged)
@@ -78,7 +79,9 @@ class FileEngine : public QObject
     };
 
     // properties
+    // deprecated - use clipboardFiles length
     int clipboardCount() const { return m_clipboardFiles.count(); }
+    QStringList clipboardFiles() const { return m_clipboardFiles; }
     bool clipboardContainsCopy() const { return m_clipboardContainsCopy; }
     bool busy() const;
     Mode mode() const;
@@ -106,6 +109,7 @@ class FileEngine : public QObject
 
 signals:
     void clipboardCountChanged();
+    void clipboardFilesChanged();
     void clipboardContainsCopyChanged();
     void workerDone();
     void error(Error error, QString fileName);