application: add Qt version to Revision (#290)

* application: add Qt version to Revision

* update translations

* application: code cleanup

* videoview: code cleanup

Author: machinekoder

src/application/revisionsingleton.h

@@ -12,16 +12,18 @@ class RevisionSingleton : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(RevisionSingleton)
-    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
+    Q_PROPERTY(QString name READ name CONSTANT)
+    Q_PROPERTY(QString runtimeQtVersion READ runtimeQtVersion CONSTANT)
+    Q_PROPERTY(QString compiledQtVersion READ compiledQtVersion CONSTANT)
 
     RevisionSingleton() {
     }
 
 public:
     static QObject *qmlInstance(QQmlEngine *engine, QJSEngine *scriptEngine)
     {
-        Q_UNUSED(engine);
-        Q_UNUSED(scriptEngine);
+        Q_UNUSED(engine)
+        Q_UNUSED(scriptEngine)
 
         return new RevisionSingleton;
     }
@@ -31,8 +33,16 @@ class RevisionSingleton : public QObject
         return QStringLiteral(REVISION);
     }
 
-signals:
-    void nameChanged(const QString &name);
+    QString runtimeQtVersion() const
+    {
+        return qVersion();
+    }
+
+    QString compiledQtVersion() const
+    {
+        return QT_VERSION_STR;
+    }
+
 }; // class RevisionSingleton
 } // namespace qtquickvcp
 

src/applicationcontrols/translations/machinekitapplicationcontrols_de.ts

@@ -208,6 +208,10 @@
         <source>TLO</source>
         <translation>TLO</translation>
     </message>
+    <message>
+        <source>S:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditToolTableAction</name>

src/applicationcontrols/translations/machinekitapplicationcontrols_en.ts

@@ -195,6 +195,10 @@
         <source>TLO</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>S:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditToolTableAction</name>

src/applicationcontrols/translations/machinekitapplicationcontrols_es.ts

@@ -195,6 +195,10 @@
         <source>TLO</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>S:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditToolTableAction</name>

src/applicationcontrols/translations/machinekitapplicationcontrols_ru.ts

@@ -195,6 +195,10 @@
         <source>TLO</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>S:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditToolTableAction</name>

src/videoview/mjpegstreamerclient.cpp

@@ -260,12 +260,12 @@ void MjpegStreamerClient::updateMessageReceived(const QList<QByteArray> &message
 #endif
 
         streamBufferItem.image = QImage::fromData(data, "JPG");
-        streamBufferItem.timestamp = (double)frame.timestamp_s()*1000 +  (double)frame.timestamp_us() / 1000.0;
+        streamBufferItem.timestamp = static_cast<double>(frame.timestamp_s())*1000.0 +  static_cast<double>(frame.timestamp_us()) / 1000.0;
 
-        dateTime.setMSecsSinceEpoch((quint64)frame.timestamp_unix()*(quint64)1000);
+        dateTime.setMSecsSinceEpoch(static_cast<qint64>(frame.timestamp_unix()) * 1000);
         dateTime = dateTime.toLocalTime();
         time = dateTime.time();
-        streamBufferItem.time = time.addMSecs(frame.timestamp_us()/1000.0);
+        streamBufferItem.time = time.addMSecs(static_cast<int>(frame.timestamp_us() / 1000));
 
 #ifdef QT_DEBUG
         qDebug() << "time: " << streamBufferItem.time;
@@ -301,7 +301,7 @@ void MjpegStreamerClient::updateStreamBuffer()
         m_currentStreamBufferItem = m_streamBuffer.dequeue();
         interval = m_currentStreamBufferItem.timestamp - timestamp;
 
-        m_streamBufferTimer->start(qMax((int)interval, 0));
+        m_streamBufferTimer->start(qMax(static_cast<int>(interval), 0));
     }
 
 }