Changed Copyright year source to text file instead of hard code

kipr · Jan 22, 2025 · 1e6433d · 1e6433d
1 parent 58ce8a1
commit 1e6433d
Show file tree

Hide file tree

Showing 6 changed files with 740 additions and 15 deletions.
diff --git a/devices/wombat/include/WombatDevice.h b/devices/wombat/include/WombatDevice.h
@@ -14,6 +14,7 @@ namespace Wombat
 
     virtual QString name() const;
     virtual QString version() const;
+    virtual QString copyrightYear() const;
     virtual QString id() const;
     virtual QString serial() const;
     virtual bool isTouchscreen() const;
@@ -38,6 +39,7 @@ namespace Wombat
     SettingsProvider *m_settingsProvider;
     ButtonProvider *m_buttonProvider;
     QString m_version;
+    QString m_copyrightYear;
     QString m_id;
     QString m_serial;
     int m_timerId;

diff --git a/devices/wombat/src/WombatDevice.cpp b/devices/wombat/src/WombatDevice.cpp
@@ -38,12 +38,28 @@ QString getVersionNum()
 	return line;
 }
 
+QString getCopyrightYear()
+{
+  QFile file("/usr/share/kipr/board_copyright_year.txt");
+
+  if(!file.open(QIODevice::ReadOnly)) return QString("??");
+
+  QTextStream in(&file);
+
+    QString line = in.readLine();
+
+  file.close();
+
+  return line;
+}
+
 Wombat::Device::Device()
   : m_compileProvider(new KissCompileProvider(this)),
   m_batteryLevelProvider(new Wombat::BatteryLevelProvider()),
   m_settingsProvider(new Wombat::SettingsProvider()),
   m_buttonProvider(new Wombat::ButtonProvider()),
   m_version(getVersionNum()),
+  m_copyrightYear(getCopyrightYear()),
   m_id(getId()),
   m_serial(getSerial())
 {
@@ -75,6 +91,11 @@ QString Wombat::Device::version() const
   return m_version;
 }
 
+QString Wombat::Device::copyrightYear() const
+{
+  return m_copyrightYear;
+}
+
 QString Wombat::Device::id() const
 {
   return m_id;

diff --git a/include/botui/Device.h b/include/botui/Device.h
@@ -24,6 +24,7 @@ Q_OBJECT
 	virtual QString version() const = 0;
 	virtual QString id() const = 0;
 	virtual QString serial() const = 0;
+	virtual QString copyrightYear() const = 0;
 	virtual bool isTouchscreen() const = 0;
 
 	virtual CompileProvider *compileProvider() const = 0;

diff --git a/src/AboutWidget.cpp b/src/AboutWidget.cpp
@@ -39,6 +39,9 @@ AboutWidget::AboutWidget(Device *device, QWidget *parent)
   // Version Number
   ui->version->setText(device->name() + " v" + device->version());
 
+  //Copyright year
+  ui->CopyrightYearLabel->setText(device->copyrightYear());
+
   // Display Serial Number
   const QString serial = device->serial();
   ui->deviceName->setText("Wombat-" + serial);
@@ -48,7 +51,7 @@ AboutWidget::AboutWidget(Device *device, QWidget *parent)
 
     // Check if eth0 is active (/sys/class/net/eth0/carrier will output 1 if eth0 is active and 0 if it is not)
     QStringList arguments;
-    arguments << "/sys/class/net/eth0/carrier";
+    arguments << "/sys/class/net/eno1/carrier";
 
     QProcess *myProcess = new QProcess(parent);
     myProcess->start("cat", arguments);

diff --git a/ui/AboutWidget.ui b/ui/AboutWidget.ui
@@ -81,23 +81,58 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="label_5">
-       <property name="font">
-        <font>
-         <family>Sans</family>
-         <pointsize>15</pointsize>
-        </font>
-       </property>
-       <property name="text">
-        <string>Copyright © 2012 - 2025</string>
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
+       <property name="spacing">
+        <number>0</number>
        </property>
-       <property name="textFormat">
-        <enum>Qt::MarkdownText</enum>
+       <property name="leftMargin">
+        <number>200</number>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
+       <property name="rightMargin">
+        <number>150</number>
        </property>
-      </widget>
+       <item>
+        <widget class="QLabel" name="CopyrightLabel">
+         <property name="font">
+          <font>
+           <family>Sans</family>
+           <pointsize>15</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Copyright ©</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::MarkdownText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="margin">
+          <number>10</number>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="CopyrightYearLabel">
+         <property name="font">
+          <font>
+           <family>Sans Serif</family>
+           <pointsize>15</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>2012 - 2025</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+         <property name="margin">
+          <number>7</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
       <layout class="QHBoxLayout" name="versionPiTypeHorizontal">