Changeset 57688 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 10, 2015 12:08:52 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7837: Runtime UI: Taking immediate screenshot of VM, before asking for filename to save.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1646 +1646 @@
         return;
 
+    /* Formatting default and temporary filenames for screenshot accroding to current time: */
+    const QFileInfo fi(machine().GetSettingsFilePath());
+    const QString strCurrentTime = QDateTime::currentDateTime().toString("dd_MM_yyyy_hh_mm_ss");
+    const QString strFormatDefaultFileName = QString("VirtualBox").append("_").append(machine().GetName()).append("_").
+            append(strCurrentTime);
+    const QString strDefaultFileName = QDir(fi.absolutePath()).absoluteFilePath(strFormatDefaultFileName);
+    const QString strTempFile = QDir(fi.absolutePath()).absoluteFilePath("temp").append(strCurrentTime).append(".png");
+
+    /* Do the screenshot: */
+    takeScreenshot(strTempFile, "png");
+
     /* Which image formats for writing does this Qt version know of? */
     QList<QByteArray> formats = QImageWriter::supportedImageFormats();
     QStringList filters;
-    /* Build a filters list out of it. */
+    /* Build a filters list out of it: */
     for (int i = 0; i < formats.size(); ++i)
     {
@@ -1657 +1668 @@
             filters << s;
     }
-    /* Try to select some common defaults. */
+    /* Try to select some common defaults: */
     QString strFilter;
     int i = filters.indexOf(QRegExp(".*png.*", Qt::CaseInsensitive));
@@ -1681 +1692 @@
 #endif /* Q_WS_WIN */
 
-    /* Request the filename from the user. */
-    QFileInfo fi(machine().GetSettingsFilePath());
-    QString strAbsolutePath(fi.absolutePath());
-    QString strCompleteBaseName(fi.completeBaseName());
-    QString strStart = QDir(strAbsolutePath).absoluteFilePath(strCompleteBaseName);
-    QString strFilename = QIFileDialog::getSaveFileName(strStart,
+    /* Request the filename from the user: */
+    const QString strFilename = QIFileDialog::getSaveFileName(strDefaultFileName,
                                                         filters.join(";;"),
                                                         activeMachineWindow(),
@@ -1704 +1711 @@
 #endif /* Q_WS_WIN */
 
-    /* Do the screenshot. */
     if (!strFilename.isEmpty())
-        takeScreenshot(strFilename, strFilter.split(" ").value(0, "png"));
+    {
+        const QString strFormat = strFilter.split(" ").value(0, "png");
+        const QImage tmpImage(strTempFile);
+
+    /* On X11 Qt Filedialog returns the filepath without the filetype suffix,
+     * so adding it ourselves: */
+    #ifdef Q_WS_X11
+        tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(QString("%1.%2").arg(strFilename, strFormat))),
+                    strFormat.toAscii().constData());
+    #else /* !Q_WS_X11 */
+        tmpImage.save(QDir::toNativeSeparators(QFile::encodeName(strFilename)),
+                    strFormat.toAscii().constData());
+    #endif /* !Q_WS_X11 */
+    }
+    QFile::remove(strTempFile);
 }