]> git.cworth.org Git - apitrace/commitdiff
Show important retrace messages long enough to read.
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Tue, 27 Mar 2012 23:13:55 +0000 (00:13 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Tue, 27 Mar 2012 23:13:55 +0000 (00:13 +0100)
gui/mainwindow.cpp
gui/mainwindow.h
gui/retracer.cpp

index eeab447137c5c58eec6581b505dafe2e7fe235e4..5e2a55db7fc7af4e4e3df59dfc010b0394ff0e35 100644 (file)
@@ -212,7 +212,7 @@ void MainWindow::newTraceFile(const QString &fileName)
     }
 }
 
-void MainWindow::replayFinished(const QString &output)
+void MainWindow::replayFinished(const QString &message)
 {
     m_ui.actionStop->setEnabled(false);
     m_ui.actionReplay->setEnabled(true);
@@ -220,18 +220,13 @@ void MainWindow::replayFinished(const QString &output)
     m_ui.actionShowThumbnails->setEnabled(true);
 
     m_progressBar->hide();
-    if (output.length() < 80) {
-        statusBar()->showMessage(output);
-    }
+    statusBar()->showMessage(message, 2000);
     m_stateEvent = 0;
     m_ui.actionShowErrorsDock->setEnabled(m_trace->hasErrors());
     m_ui.errorsDock->setVisible(m_trace->hasErrors());
     if (!m_trace->hasErrors()) {
         m_ui.errorsTreeWidget->clear();
     }
-
-    statusBar()->showMessage(
-        tr("Replaying finished!"), 2000);
 }
 
 void MainWindow::replayError(const QString &message)
index d65aa0e84749ea6df648d2b9f2a79ff628e0565a..a8f8c1d4658f3ccfc36f45223a7164e3991cbe38 100644 (file)
@@ -48,7 +48,7 @@ private slots:
     void openTrace();
     void replayStart();
     void replayStop();
-    void replayFinished(const QString &output);
+    void replayFinished(const QString &message);
     void replayStateFound(ApiTraceState *state);
     void replayThumbnailsFound(const QList<QImage> &thumbnails);
     void replayError(const QString &msg);
index d0e07ef9f4d54066e56042ed8df7ae16fd036427..84f974244943b45a551fd561a1f01ce8d8e108ac 100644 (file)
@@ -220,7 +220,7 @@ void Retracer::setCaptureThumbnails(bool enable)
  */
 void Retracer::run()
 {
-    QString msg;
+    QString msg = QLatin1String("Replay finished!");
 
     /*
      * Construct command line
@@ -349,7 +349,9 @@ void Retracer::run()
         } else {
             QByteArray output;
             output = process.readAllStandardOutput();
-            msg = QString::fromUtf8(output);
+            if (output.length() < 80) {
+                msg = QString::fromUtf8(output);
+            }
         }
     }