Merge pull request #43 from scratchcpp/library_info

Add library info to the about dialog

Author: adazem009

src/app/CMakeLists.txt

@@ -6,6 +6,8 @@ qt_add_executable(${APP_TARGET}
     app.h
     appmenubar.cpp
     appmenubar.h
+    libraryinfo.cpp
+    libraryinfo.h
 )
 
 qt_add_qml_module(${APP_TARGET}

src/app/libraryinfo.cpp

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include <scratchcpp/scratchconfiguration.h>
+#include <scratchcpp-render/scratchcpp-render.h>
+
+#include "libraryinfo.h"
+
+using namespace scratchcpp;
+
+LibraryInfo::LibraryInfo(QObject *parent) :
+    QObject(parent)
+{
+}
+
+QString LibraryInfo::libscratchcppVersion() const
+{
+    return QString::fromStdString(libscratchcpp::ScratchConfiguration::version());
+}
+
+QString LibraryInfo::scratchcppRenderVersion() const
+{
+    return QString::fromStdString(scratchcpprender::version());
+}

src/app/libraryinfo.h

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QQmlEngine>
+
+namespace scratchcpp
+{
+
+class LibraryInfo : public QObject
+{
+        Q_OBJECT
+        QML_ELEMENT
+        QML_SINGLETON
+    public:
+        explicit LibraryInfo(QObject *parent = nullptr);
+
+        Q_INVOKABLE QString libscratchcppVersion() const;
+        Q_INVOKABLE QString scratchcppRenderVersion() const;
+};
+
+} // namespace scratchcpp

src/app/qml/dialogs/AboutDialog.qml

@@ -3,6 +3,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import ScratchCPP
 import ScratchCPP.Ui
 import ScratchCPP.UiComponents
 
@@ -33,6 +34,16 @@ CustomDialog {
                 text: qsTr("Version: %1").arg(Qt.application.version)
             }
 
+            Label {
+                //: For example "SomeLibrary version: 0.1.0"
+                text: qsTr("%1 version: %2").arg("libscratchcpp").arg(LibraryInfo.libscratchcppVersion())
+            }
+
+            Label {
+                //: For example "SomeLibrary version: 0.1.0"
+                text: qsTr("%1 version: %2").arg("ScratchCPP Render").arg(LibraryInfo.scratchcppRenderVersion())
+            }
+
             Label {
                 text: qsTr("Revision: %1").arg(AppInfo.revision())
             }

src/global/internal/appinfo.cpp

@@ -13,7 +13,12 @@ AppInfo::AppInfo(QObject *parent) :
 
 QString scratchcpp::AppInfo::revision() const
 {
-    return git_CommitSHA1();
+    QString rev = git_CommitSHA1();
+
+    if (rev.size() >= 8)
+        return rev.first(8);
+
+    return "";
 }
 
 int scratchcpp::AppInfo::buildYear() const

src/global/test/appinfo.cpp

@@ -15,7 +15,9 @@ using namespace scratchcpp::test;
 TEST(AppInfoTest, Revision)
 {
     AppInfo info;
-    ASSERT_EQ(info.revision(), git_CommitSHA1());
+    QString rev = git_CommitSHA1();
+    ASSERT_GE(rev.size(), 8);
+    ASSERT_EQ(info.revision(), rev.first(8));
 }
 
 TEST(AppInfoTest, BuildYear)