Implement openFileExplorerAndSelectFile for Linux

nirvn · nirvn · commit 1fc6aabdcd15 · 2018-08-03T13:16:53.000+07:00
diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -405,7 +405,7 @@ void QgsMapSaveDialog::onAccepted()
       connect( mapRendererTask, &QgsMapRendererTask::renderingComplete, [ = ]
       {
         QgisApp::instance()->messageBar()->pushSuccess( tr( "Save as image" ), tr( "Successfully saved map to <a href=\"%1\">%2</a>" )
-            .arg( QUrl::fromLocalFile( QFileInfo( fileNameAndFilter.first ).path() ).toString(), QDir::toNativeSeparators( fileNameAndFilter.first ) ) );
+            .arg( QUrl::fromLocalFile( fileNameAndFilter.first ).toString(), QDir::toNativeSeparators( fileNameAndFilter.first ) ) );
       } );
       connect( mapRendererTask, &QgsMapRendererTask::errorOccurred, [ = ]( int error )
       {
@@ -456,7 +456,7 @@ void QgsMapSaveDialog::onAccepted()
       connect( mapRendererTask, &QgsMapRendererTask::renderingComplete, [ = ]
       {
         QgisApp::instance()->messageBar()->pushSuccess( tr( "Save as PDF" ), tr( "Successfully saved map to <a href=\"%1\">%2</a>" )
-            .arg( QUrl::fromLocalFile( QFileInfo( fileName ).path() ).toString(), QDir::toNativeSeparators( fileName ) ) );
+            .arg( QUrl::fromLocalFile( fileName ).toString(), QDir::toNativeSeparators( fileName ) ) );
       } );
       connect( mapRendererTask, &QgsMapRendererTask::errorOccurred, [ = ]( int )
       {
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -137,6 +137,10 @@ TARGET_LINK_LIBRARIES(qgis_native
     "${NATIVE_LINK_LIBS}"
     )
 
+IF (UNIX)
+  TARGET_LINK_LIBRARIES(qgis_native Qt5DBus)
+ENDIF (UNIX)
+
 IF (WIN32)
   TARGET_LINK_LIBRARIES(qgis_native shell32)
 ENDIF (WIN32)
diff --git a/src/native/linux/qgslinuxnative.cpp b/src/native/linux/qgslinuxnative.cpp
@@ -16,3 +16,28 @@
  ***************************************************************************/
 
 #include "qgslinuxnative.h"
+
+#include <QUrl>
+#include <QString>
+#include <QtDBus/QtDBus>
+#include <QtDebug>
+
+void QgsLinuxNative::openFileExplorerAndSelectFile( const QString &path )
+{
+  if ( !QDBusConnection::sessionBus().isConnected() )
+  {
+    QgsNative::openFileExplorerAndSelectFile( path );
+    return;
+  }
+
+  QDBusInterface iface( QStringLiteral( "org.freedesktop.FileManager1" ),
+                        QStringLiteral( "/org/freedesktop/FileManager1" ),
+                        QStringLiteral( "org.freedesktop.FileManager1" ),
+                        QDBusConnection::sessionBus() );
+
+  iface.call( QDBus::NoBlock, QStringLiteral( "ShowItems" ), QStringList( QUrl::fromLocalFile( path ).toString() ), QStringLiteral( "QGIS" ) );
+  if ( iface.lastError().type() != QDBusError::NoError )
+  {
+    QgsNative::openFileExplorerAndSelectFile( path );
+  }
+}
diff --git a/src/native/linux/qgslinuxnative.h b/src/native/linux/qgslinuxnative.h
@@ -23,6 +23,7 @@
 class NATIVE_EXPORT QgsLinuxNative : public QgsNative
 {
   public:
+    void openFileExplorerAndSelectFile( const QString &path ) override;
 };
 
 #endif // QGSLINUXNATIVE_H

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ void QgsMapSaveDialog::onAccepted()`
`405`	`405`	`connect( mapRendererTask, &QgsMapRendererTask::renderingComplete, [ = ]`
`406`	`406`	`{`
`407`	`407`	`QgisApp::instance()->messageBar()->pushSuccess( tr( "Save as image" ), tr( "Successfully saved map to <a href=\"%1\">%2</a>" )`
`408`		`- .arg( QUrl::fromLocalFile( QFileInfo( fileNameAndFilter.first ).path() ).toString(), QDir::toNativeSeparators( fileNameAndFilter.first ) ) );`
	`408`	`+ .arg( QUrl::fromLocalFile( fileNameAndFilter.first ).toString(), QDir::toNativeSeparators( fileNameAndFilter.first ) ) );`
`409`	`409`	`} );`
`410`	`410`	`connect( mapRendererTask, &QgsMapRendererTask::errorOccurred, [ = ]( int error )`
`411`	`411`	`{`
`@@ -456,7 +456,7 @@ void QgsMapSaveDialog::onAccepted()`
`456`	`456`	`connect( mapRendererTask, &QgsMapRendererTask::renderingComplete, [ = ]`
`457`	`457`	`{`
`458`	`458`	`QgisApp::instance()->messageBar()->pushSuccess( tr( "Save as PDF" ), tr( "Successfully saved map to <a href=\"%1\">%2</a>" )`
`459`		`- .arg( QUrl::fromLocalFile( QFileInfo( fileName ).path() ).toString(), QDir::toNativeSeparators( fileName ) ) );`
	`459`	`+ .arg( QUrl::fromLocalFile( fileName ).toString(), QDir::toNativeSeparators( fileName ) ) );`
`460`	`460`	`} );`
`461`	`461`	`connect( mapRendererTask, &QgsMapRendererTask::errorOccurred, [ = ]( int )`
`462`	`462`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`class NATIVE_EXPORT QgsLinuxNative : public QgsNative`
`24`	`24`	`{`
`25`	`25`	`public:`
	`26`	`+ void openFileExplorerAndSelectFile( const QString &path ) override;`
`26`	`27`	`};`
`27`	`28`
`28`	`29`	`#endif // QGSLINUXNATIVE_H`