Switch the gui to the on-demand-loader.

[apitrace] / gui / apitracemodel.cpp

diff --git a/gui/apitracemodel.cpp b/gui/apitracemodel.cpp
index 7366ae5d025b69f6c428a402b72c3b66b368ab95..800b5c7457d03781e1f9d25726335922c0dbf9fd 100644 (file)
--- a/gui/apitracemodel.cpp
+++ b/gui/apitracemodel.cpp
@@ -1,7 +1,7 @@
 #include "apitracemodel.h"
 
 #include "apitracecall.h"
-#include "loaderthread.h"
+#include "traceloader.h"
 #include "trace_parser.hpp"
 
 #include <QDebug>
@@ -42,7 +42,7 @@ QVariant ApiTraceModel::data(const QModelIndex &index, int role) const
         const QString stateText = tr("State info available.");
         if (itm->type() == ApiTraceEvent::Call) {
             ApiTraceCall *call = static_cast<ApiTraceCall*>(itm);
-            if (call->state().isEmpty())
+            if (!call->hasState())
                 return QString::fromLatin1("%1)&nbsp;<b>%2</b>")
                     .arg(call->index())
                     .arg(call->name());
@@ -53,12 +53,20 @@ QVariant ApiTraceModel::data(const QModelIndex &index, int role) const
                     .arg(stateText);
         } else {
             ApiTraceFrame *frame = static_cast<ApiTraceFrame*>(itm);
-            QString text = frame->staticText().text();
-            if (frame->state().isEmpty())
-                return QString::fromLatin1("<b>%1</b>").arg(text);
+            QString text = QObject::tr("%1)&nbsp;Frame&nbsp;")
+                           .arg(frame->number);
+            int binaryDataSize = frame->binaryDataSize() / 1024;
+            if (!frame->hasState())
+                return QObject::tr(
+                    "<b>%1&nbsp;</b>(binary&nbsp;data&nbsp;size&nbsp;=&nbsp;%2kB)")
+                    .arg(text)
+                    .arg(binaryDataSize);
             else
-                return QString::fromLatin1("<b>%1</b><br/>%2")
+                return QObject::tr(
+                    "<b>%1&nbsp;(binary&nbsp;data&nbsp;size&nbsp;=&nbsp;%2kB)</b>"
+                    "<br/>%3")
                     .arg(text)
+                    .arg(binaryDataSize)
                     .arg(stateText);
         }
     }