UI: show git commit date (#26240)

* show version description while offroad

* ui fixups

* parse date

* cleanup
old-commit-hash: 4639862bae

selfdrive/ui/qt/home.cc

@@ -1,11 +1,9 @@
 #include "selfdrive/ui/qt/home.h"
 
-#include <QDateTime>
 #include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QVBoxLayout>
 
-#include "common/params.h"
 #include "selfdrive/ui/qt/util.h"
 #include "selfdrive/ui/qt/widgets/drive_stats.h"
 #include "selfdrive/ui/qt/widgets/prime.h"
@@ -109,22 +107,20 @@ OffroadHome::OffroadHome(QWidget* parent) : QFrame(parent) {
   header_layout->setContentsMargins(15, 15, 15, 0);
   header_layout->setSpacing(16);
 
-  date = new QLabel();
-  header_layout->addWidget(date, 1, Qt::AlignHCenter | Qt::AlignLeft);
-
   update_notif = new QPushButton(tr("UPDATE"));
   update_notif->setVisible(false);
   update_notif->setStyleSheet("background-color: #364DEF;");
   QObject::connect(update_notif, &QPushButton::clicked, [=]() { center_layout->setCurrentIndex(1); });
-  header_layout->addWidget(update_notif, 0, Qt::AlignHCenter | Qt::AlignRight);
+  header_layout->addWidget(update_notif, 0, Qt::AlignHCenter | Qt::AlignLeft);
 
   alert_notif = new QPushButton();
   alert_notif->setVisible(false);
   alert_notif->setStyleSheet("background-color: #E22C2C;");
   QObject::connect(alert_notif, &QPushButton::clicked, [=] { center_layout->setCurrentIndex(2); });
-  header_layout->addWidget(alert_notif, 0, Qt::AlignHCenter | Qt::AlignRight);
+  header_layout->addWidget(alert_notif, 0, Qt::AlignHCenter | Qt::AlignLeft);
 
-  header_layout->addWidget(new QLabel(getBrandVersion()), 0, Qt::AlignHCenter | Qt::AlignRight);
+  version = new ElidedLabel();
+  header_layout->addWidget(version, 0, Qt::AlignHCenter | Qt::AlignRight);
 
   main_layout->addLayout(header_layout);
 
@@ -184,9 +180,7 @@ void OffroadHome::hideEvent(QHideEvent *event) {
 }
 
 void OffroadHome::refresh() {
-  QString locale_name = QString(uiState()->language).replace("main_", "");
-  QString dateString = QLocale(locale_name).toString(QDateTime::currentDateTime(), "dddd, MMMM d");
-  date->setText(dateString);
+  version->setText(getBrand() + " " +  QString::fromStdString(params.get("UpdaterCurrentDescription")));
 
   bool updateAvailable = update_widget->refresh();
   int alerts = alerts_widget->refresh();

selfdrive/ui/qt/home.h

@@ -7,10 +7,12 @@
 #include <QTimer>
 #include <QWidget>
 
+#include "common/params.h"
 #include "selfdrive/ui/qt/offroad/driverview.h"
 #include "selfdrive/ui/qt/body.h"
 #include "selfdrive/ui/qt/onroad.h"
 #include "selfdrive/ui/qt/sidebar.h"
+#include "selfdrive/ui/qt/widgets/controls.h"
 #include "selfdrive/ui/qt/widgets/offroad_alerts.h"
 #include "selfdrive/ui/ui.h"
 
@@ -25,8 +27,10 @@ private:
   void hideEvent(QHideEvent *event) override;
   void refresh();
 
+  Params params;
+
   QTimer* timer;
-  QLabel* date;
+  ElidedLabel* version;
   QStackedLayout* center_layout;
   UpdateAlert *update_widget;
   OffroadAlert* alerts_widget;

selfdrive/ui/qt/offroad/software_settings.cc

@@ -145,11 +145,11 @@ void SoftwarePanel::updateLabels() {
   targetBranchBtn->setValue(QString::fromStdString(params.get("UpdaterTargetBranch")));
 
   // current + new versions
-  versionLbl->setText(QString::fromStdString(params.get("UpdaterCurrentDescription")).left(40));
+  versionLbl->setText(QString::fromStdString(params.get("UpdaterCurrentDescription")));
   versionLbl->setDescription(QString::fromStdString(params.get("UpdaterCurrentReleaseNotes")));
 
   installBtn->setVisible(!is_onroad && params.getBool("UpdateAvailable"));
-  installBtn->setValue(QString::fromStdString(params.get("UpdaterNewDescription")).left(35));
+  installBtn->setValue(QString::fromStdString(params.get("UpdaterNewDescription")));
   installBtn->setDescription(QString::fromStdString(params.get("UpdaterNewReleaseNotes")));
 
   update();

selfdrive/ui/qt/util.cc

@@ -21,10 +21,6 @@ QString getBrand() {
   return Params().getBool("Passive") ? QObject::tr("dashcam") : QObject::tr("openpilot");
 }
 
-QString getBrandVersion() {
-  return getBrand() + " v" + getVersion().left(14).trimmed();
-}
-
 QString getUserAgent() {
   return "openpilot-" + getVersion();
 }

selfdrive/ui/qt/util.h

@@ -11,7 +11,6 @@
 
 QString getVersion();
 QString getBrand();
-QString getBrandVersion();
 QString getUserAgent();
 std::optional<QString> getDongleId();
 QMap<QString, QString> getSupportedLanguages();

selfdrive/ui/qt/widgets/controls.cc

@@ -41,7 +41,7 @@ AbstractControl::AbstractControl(const QString &title, const QString &desc, cons
   hlayout->addWidget(title_label);
 
   // value next to control button
-  value = new QLabel();
+  value = new ElidedLabel();
   value->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
   value->setStyleSheet("color: #aaaaaa");
   hlayout->addWidget(value);
@@ -70,7 +70,7 @@ AbstractControl::AbstractControl(const QString &title, const QString &desc, cons
 }
 
 void AbstractControl::hideEvent(QHideEvent *e) {
-  if(description != nullptr) {
+  if (description != nullptr) {
     description->hide();
   }
 }

selfdrive/ui/qt/widgets/controls.h

@@ -65,7 +65,7 @@ protected:
   QPushButton *title_label;
 
 private:
-  QLabel *value;
+  ElidedLabel *value;
   QLabel *description = nullptr;
 };
 

selfdrive/ui/qt/widgets/scrollview.cc

@@ -3,6 +3,8 @@
 #include <QScrollBar>
 #include <QScroller>
 
+// TODO: disable horizontal scrolling and resize
+
 ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent) {
   setWidget(w);
   setWidgetResizable(true);

selfdrive/updated.py

@@ -280,17 +280,25 @@ class Updater:
 
     # Write out current and new version info
     def get_description(basedir: str) -> str:
+      if not os.path.exists(basedir):
+        return ""
+
       version = ""
       branch = ""
       commit = ""
+      commit_date = ""
       try:
         branch = self.get_branch(basedir)
-        commit = self.get_commit_hash(basedir)
+        commit = self.get_commit_hash(basedir)[:7]
         with open(os.path.join(basedir, "common", "version.h")) as f:
           version = f.read().split('"')[1]
+
+        commit_unix_ts = run(["git", "show", "-s", "--format=%ct", "HEAD"], basedir).rstrip()
+        dt = datetime.datetime.fromtimestamp(int(commit_unix_ts))
+        commit_date = dt.strftime("%b %d")
       except Exception:
-        pass
-      return f"{version} / {branch} / {commit[:7]}"
+        cloudlog.exception("updater.get_description")
+      return f"{version} / {branch} / {commit} / {commit_date}"
     self.params.put("UpdaterCurrentDescription", get_description(BASEDIR))
     self.params.put("UpdaterCurrentReleaseNotes", parse_release_notes(BASEDIR))
     self.params.put("UpdaterNewDescription", get_description(FINALIZED))