Use desktop services to open all types of files but the audio ones.

src/articleview.cc

@@ -168,7 +168,6 @@ void ArticleView::linkClicked( QUrl const & url )
         }
     }
 
-
     QString contentType;
 
     if ( !found && !articleNetMgr.getResource( url, data, contentType ) )
@@ -177,13 +176,9 @@ void ArticleView::linkClicked( QUrl const & url )
       return;
     }
 
-    // Decide the viewer
-
-    QString program, extension;
-
     if ( url.scheme() == "gdau" )
     {
-      #ifdef Q_OS_WIN32
+#ifdef Q_OS_WIN32
       // Windows-only: use system PlaySound function
 
       if ( winWavData.size() )
@@ -194,51 +189,54 @@ void ArticleView::linkClicked( QUrl const & url )
 
       PlaySoundA( &winWavData.front(), 0,
                   SND_ASYNC | SND_MEMORY | SND_NODEFAULT | SND_NOWAIT );
+#else
 
-      return;
+      // Use external viewer to play the file
-      #endif
-      
-      program = "mplayer";
-      extension = "wav";
-    }
-    else
-    if ( url.path().endsWith( ".pdf", Qt::CaseInsensitive ) )
-    {
-      program = "evince";
-      extension = "pdf";
-    }
-    else
-    if ( url.path().endsWith( ".rtf", Qt::CaseInsensitive ) )
-    {
-      program = "oowriter";
-      extension = "rtf";
-    }
-    else
-    {
-      QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Don't know how to handle the specified resource." ) );
-      return;
-    }
-
-    try
-    {
-      ExternalViewer * viewer = new ExternalViewer( this, data, extension, program );
-
       try
       {
-        viewer->start();
+        ExternalViewer * viewer = new ExternalViewer( this, data, ".wav", "play" );
 
-        // Once started, it will erase itself
+        try
+        {
+          viewer->start();
+
+          // Once started, it will erase itself
+        }
+        catch( ... )
+        {
+          delete viewer;
+          throw;
+        }
       }
-      catch( ... )
+      catch( ExternalViewer::Ex & e )
       {
-        delete viewer;
+        QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Failed to run a player to play sound file: %1" ).arg( e.what() ) );
-        throw;
       }
+      
+#endif
+
+      return;
     }
-    catch( ExternalViewer::Ex & e )
+    
+    // Create a temporary file
+    
+    desktopOpenedTempFile.reset();
+
+    desktopOpenedTempFile = new QTemporaryFile( QDir::temp().filePath( "XXXXXX-" + url.path().section( '/', -1 ) ), this );
+
+    if ( !desktopOpenedTempFile->open() || desktopOpenedTempFile->write( &data.front(), data.size() ) != data.size() )
     {
-      printf( "%s\n", e.what() );
+      QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Failed to create temporary file." ) );
+      return;
     }
+
+    // For some reason it loses it after it was closed()
+    QString tempFileName = desktopOpenedTempFile->fileName();
+
+    desktopOpenedTempFile->close();
+
+    if ( !QDesktopServices::openUrl( QUrl::fromLocalFile( tempFileName ) ) )
+      QMessageBox::critical( this, tr( "GoldenDict" ), tr( "Failed to auto-open resource file, try opening manually: %1." ).arg( tempFileName ) );
   }
   else
   if ( url.scheme() == "http" || url.scheme() == "https" ||

src/articleview.hh

@@ -27,6 +27,9 @@ class ArticleView: public QFrame
   vector< char > winWavData;
 #endif
 
+  // For resources opened via desktop services
+  sptr< QTemporaryFile > desktopOpenedTempFile;
+
 public:
   /// The popupView flag influences contents of the context menus to be
   /// appropriate to the context of the view.