From 74937453bad18ddc9e0cd09cc953a47f621186c9 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Mon, 14 Jun 2021 12:24:20 -0400
Subject: [PATCH] Done with system info dialog

Works well, will have strange formatting is no InkBox version is known,
probably due to checkconfig_str_val being null if no  value is detected.
---
 functions.h       | 22 ++++++++++++++--
 generaldialog.cpp |  1 +
 generaldialog.ui  |  4 +--
 settings.cpp      |  6 +++++
 settings.ui       | 64 +++++++++++++++++++++++------------------------
 textwidget.cpp    |  3 +++
 textwidget.ui     |  9 ++++++-
 7 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/functions.h b/functions.h
index c91de0e..f41e23c 100644
--- a/functions.h
+++ b/functions.h
@@ -58,6 +58,7 @@ namespace {
     QString checkconfig_str_val;
     QString deviceUID;
     QString batt_level;
+    QString kernelVersion;
     int batt_level_int;
     bool checked_box = false;
     bool checkconfig(QString file) {
@@ -145,6 +146,7 @@ namespace {
         fhandler.close();
     }
     void string_checkconfig(QString file) {
+        checkconfig_str_val = "";
         QFile config(file);
         config.open(QIODevice::ReadWrite);
         QTextStream in (&config);
@@ -152,6 +154,7 @@ namespace {
         config.close();
     }
     void string_checkconfig_ro(QString file) {
+        checkconfig_str_val = "";
         QFile config(file);
         config.open(QIODevice::ReadOnly);
         QTextStream in (&config);
@@ -262,14 +265,29 @@ namespace {
         deviceUID = proc->readAllStandardOutput();
         deviceUID = deviceUID.left(256);
     }
+    void getKernelVersion() {
+        QString prog ("uname");
+        QStringList args;
+        args << "-r";
+        QProcess *proc = new QProcess();
+        proc->start(prog, args);
+        proc->waitForFinished();
+
+        kernelVersion = proc->readAllStandardOutput();
+    }
     void getSystemInfo() {
         getUID();
-        global::systemInfoText = "InkBox OS version ";
+        getKernelVersion();
+        global::systemInfoText = "<b>InkBox OS version ";
         string_checkconfig_ro("/external_root/opt/isa/version");
         global::systemInfoText.append(checkconfig_str_val);
-        global::systemInfoText.append("Device UID: ");
+        global::systemInfoText.append("</b>");
+        global::systemInfoText.append("\n<b>Device UID:</b> ");
         global::systemInfoText.append(deviceUID);
         global::systemInfoText.append("\n");
+        global::systemInfoText.append("<b>Kernel version:</b> ");
+        global::systemInfoText.append(kernelVersion);
+        global::systemInfoText.append("\n");
     }
 }
 #endif // FUNCTIONS_H
diff --git a/generaldialog.cpp b/generaldialog.cpp
index 65b26b3..bfb4a26 100644
--- a/generaldialog.cpp
+++ b/generaldialog.cpp
@@ -97,6 +97,7 @@ generalDialog::generalDialog(QWidget *parent) :
     else if(global::text::textBrowserDialog == true) {
         textwidgetWindow = new textwidget();
         ui->headerLabel->setText("Information");
+        ui->stackedWidget->setCurrentIndex(1);
         ui->mainStackedWidget->insertWidget(1, textwidgetWindow);
         ui->mainStackedWidget->setCurrentIndex(1);
         this->adjustSize();
diff --git a/generaldialog.ui b/generaldialog.ui
index 82f1a02..14eaa8c 100644
--- a/generaldialog.ui
+++ b/generaldialog.ui
@@ -43,7 +43,7 @@
      <item row="8" column="0">
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="page">
         <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -151,7 +151,7 @@
      <item row="6" column="0">
       <widget class="QStackedWidget" name="mainStackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="page_3">
         <layout class="QVBoxLayout" name="verticalLayout_4">
diff --git a/settings.cpp b/settings.cpp
index c89f17a..a49ad98 100644
--- a/settings.cpp
+++ b/settings.cpp
@@ -653,4 +653,10 @@ void settings::on_showSystemInfoBtn_clicked()
 {
     getSystemInfo();
     global::text::textBrowserContents = global::systemInfoText;
+    global::text::textBrowserDialog = true;
+
+    // Show a system info dialog
+    generalDialogWindow = new generalDialog();
+    generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
+    generalDialogWindow->show();
 }
diff --git a/settings.ui b/settings.ui
index 5e07aed..fa9c5f5 100644
--- a/settings.ui
+++ b/settings.ui
@@ -163,7 +163,7 @@ OK
      <item row="26" column="0">
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="page">
         <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -731,6 +731,26 @@ OK
              <property name="verticalSpacing">
               <number>0</number>
              </property>
+             <item row="1" column="2">
+              <widget class="QPushButton" name="updateBtn">
+               <property name="font">
+                <font>
+                 <weight>75</weight>
+                 <bold>true</bold>
+                </font>
+               </property>
+               <property name="text">
+                <string>Update</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QLabel" name="label_9">
+               <property name="text">
+                <string>System info</string>
+               </property>
+              </widget>
+             </item>
              <item row="0" column="1">
               <spacer name="horizontalSpacer_6">
                <property name="orientation">
@@ -744,36 +764,6 @@ OK
                </property>
               </spacer>
              </item>
-             <item row="0" column="0">
-              <widget class="QLabel" name="updateLabel">
-               <property name="text">
-                <string>Update InkBox</string>
-               </property>
-               <property name="alignment">
-                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QLabel" name="label_9">
-               <property name="text">
-                <string>System info</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="2">
-              <widget class="QPushButton" name="updateBtn">
-               <property name="font">
-                <font>
-                 <weight>75</weight>
-                 <bold>true</bold>
-                </font>
-               </property>
-               <property name="text">
-                <string>Update</string>
-               </property>
-              </widget>
-             </item>
              <item row="1" column="1">
               <spacer name="horizontalSpacer_10">
                <property name="orientation">
@@ -787,7 +777,17 @@ OK
                </property>
               </spacer>
              </item>
-             <item row="1" column="2">
+             <item row="1" column="0">
+              <widget class="QLabel" name="updateLabel">
+               <property name="text">
+                <string>Update InkBox</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
               <widget class="QPushButton" name="showSystemInfoBtn">
                <property name="font">
                 <font>
diff --git a/textwidget.cpp b/textwidget.cpp
index 78c9c14..0dbd307 100644
--- a/textwidget.cpp
+++ b/textwidget.cpp
@@ -17,6 +17,9 @@ textwidget::textwidget(QWidget *parent) :
     this->setStyleSheet(stylesheetFile.readAll());
     stylesheetFile.close();
 
+    if(global::text::textBrowserDialog == true) {
+        ui->textBrowser->setStyleSheet("font-size: 9pt");
+    }
     ui->textBrowser->setText(global::text::textBrowserContents);
 }
 
diff --git a/textwidget.ui b/textwidget.ui
index fcc5b51..59a098d 100644
--- a/textwidget.ui
+++ b/textwidget.ui
@@ -29,7 +29,14 @@
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
-      <widget class="QTextBrowser" name="textBrowser"/>
+      <widget class="QTextEdit" name="textBrowser">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+         <horstretch>50</horstretch>
+         <verstretch>50</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>