ECU Info page / seed key calculator

PeteCarrott · Oct 6, 2020 · a1395cb · a1395cb
1 parent b73fd6d
commit a1395cb
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 5 deletions.
diff --git a/ECUPage.qml b/ECUPage.qml
@@ -6,6 +6,81 @@ import xplatforms.mbseedkey.ecuseedkeydll 1.0
 
 Page
 {
-    title: qsTr("Select Window")
+    title: qsTr("SeedKey Calculator / Generator")
+
+    property ECUSeedKeyDLL ecu
+
+
+    ColumnLayout
+    {
+        anchors.fill: parent
+        anchors.margins: 15
+        spacing: 12
+
+        RowLayout
+        {
+            Layout.fillWidth: true
+
+            Label
+            {
+                id: dlllabelid
+                text: qsTr("Selected DLL:  ")
+                font.weight: Font.DemiBold
+            }
+
+            Label
+            {
+
+                Layout.fillWidth: true
+                text: ecu.DLLName
+            }
+        }
+
+        RowLayout
+        {
+            Layout.fillWidth: true
+
+            Label
+            {
+                Layout.minimumWidth: dlllabelid.width
+                text: qsTr("ECU Name: ")
+                font.weight: Font.DemiBold
+            }
+
+            Label
+            {
+
+                text: ecu.ECUName
+            }
+        }
+
+        RowLayout
+        {
+            Layout.fillWidth: true
+
+            Label
+            {
+                text: qsTr("Comment: ")
+                font.weight: Font.DemiBold
+            }
+        }
+
+        Text
+        {
+            Layout.minimumHeight: 60
+            Layout.fillWidth: true
+            maximumLineCount: 12
+            text: ecu.Comment
+
+        }
+
+
+
+
+        Rectangle
+        {
+            Layout.fillHeight: true
+        }
+    }
 
 }
diff --git a/MainPage.qml b/MainPage.qml
@@ -7,7 +7,7 @@ import xplatforms.mbseedkey.ecuseedkeydll 1.0
 Page
 {
     title: qsTr("Select Window")
-    property ExUTILS exutils: ExUTILS{}
+
 
     function searchFor(text)
     {
@@ -199,7 +199,11 @@ Page
                         Layout.alignment: Qt.AlignBottom
                         text: qsTr(" Select this DLL ")
 
-                        onClicked: stackView.push("ECUPage.qml")
+                        onClicked:
+                        {
+                            // stackView.push("ProfilePage.qml", {"currentprofile": appsettings.getProfileByID(appsettings.defaultProfileID())})
+                            stackView.push("ECUPage.qml", {"ecu": exutils.seedkeydll})
+                        }
                     }
                 }
             }

diff --git a/ecuseedkeydll.cpp b/ecuseedkeydll.cpp
@@ -11,13 +11,15 @@ QString GetLastErrorAsString()
 {
     //Get the error message, if any.
     auto errorMessageID = ::GetLastError();
-    if(errorMessageID == 0)return QStringLiteral(""); //No error message has been recorded
+    if(errorMessageID == 0)return QStringLiteral("No error message has been recorded");
 
     LPWSTR messageBuffer = Q_NULLPTR;
     size_t size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
                                  NULL, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), messageBuffer, 0, NULL);
 
+    qDebug() << " Debug errmsg: " << size << errorMessageID;
     auto message = QString::fromWCharArray(messageBuffer, size);
+    if(message.isEmpty())message.append(QString::number(errorMessageID));
     LocalFree(messageBuffer);
 
     return message;
@@ -133,6 +135,8 @@ void ECUSeedKeyDLL::loadDllfuncs()
     {
         this->setErrorMsg(tr("GenerateKeyExOpt not found in DLL ") + this->p_dllPath);
         qWarning() << this->errorMsg();
+        this->p_ecu_name = tr("not seedkey dll");
+        emit ECUNameChanged();
         return;
     }
 }

diff --git a/exutils.cpp b/exutils.cpp
@@ -37,13 +37,16 @@ void ExUTILS::loadDllsList(QString search_txt)
     QFileInfoList list = dir.entryInfoList(QStringList() << "*.dll", QDir::Files |QDir::NoSymLinks |QDir::NoDotAndDotDot | QDir::Readable, QDir::Name );
     for(qint32 x = 0; x < list.count(); x++)
     {
+        this->dlls_list.append(list.at(x).fileName());
+        /*
         auto ecu_test = new ECUSeedKeyDLL(list.at(x).absoluteFilePath());
         if(ecu_test->isSeedKeyDll())
         {
             this->dlls_list.append(ecu_test->DLLName());
             qDebug() << "Adding DLL to list: " << ecu_test->DLLName();
         }
         delete ecu_test;
+        */
     }
     this->p_bak_dlls_list = dlls_list;
     emit dllsChanged();

diff --git a/main.qml b/main.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Dialogs 1.3
-
+import xplatforms.mbseedkey.exutils 1.0
 
 ApplicationWindow
 {
@@ -12,6 +12,8 @@ ApplicationWindow
     visible: true
     title: qsTr(" Xplatforms / mbseedkey ")
 
+    property ExUTILS exutils: ExUTILS{}
+
     FileDialog
     {
         id: dllselect