diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-05-01 06:00:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-01 06:00:26 -0700 |
| commit | 43a3964edd1dd087e53b53dc651a509bee77cfae (patch) | |
| tree | 40107f24d870d02106705a261c6d9b424723556c /src/dialog | |
| parent | 05f4766f0c3f26610a7ea6ec004483c01cbe5961 (diff) | |
| parent | 3e5412107e728656f2dfea0d5db781b228504dfe (diff) | |
Merge pull request #3816 from Holzhaus/version-date
Show Commit Date in About Dialog / Git Describe Format Improvements
Diffstat (limited to 'src/dialog')
| -rw-r--r-- | src/dialog/dlgabout.cpp | 3 | ||||
| -rw-r--r-- | src/dialog/dlgaboutdlg.ui | 40 |
2 files changed, 30 insertions, 13 deletions
diff --git a/src/dialog/dlgabout.cpp b/src/dialog/dlgabout.cpp index 735307b35c..4389c89945 100644 --- a/src/dialog/dlgabout.cpp +++ b/src/dialog/dlgabout.cpp @@ -1,6 +1,7 @@ #include "dialog/dlgabout.h" #include <QFile> +#include <QLocale> #include "defs_urls.h" #include "moc_dlgabout.cpp" @@ -17,6 +18,8 @@ DlgAbout::DlgAbout(QWidget* parent) : QDialog(parent), Ui::DlgAboutDlg() { QStringLiteral(" ") + VersionStore::version()); git_version_label->setText(VersionStore::gitVersion()); platform_label->setText(VersionStore::platform()); + QLocale locale; + date_label->setText(locale.toString(VersionStore::date().toLocalTime(), QLocale::LongFormat)); QFile licenseFile(":/LICENSE"); if (!licenseFile.open(QIODevice::ReadOnly)) { diff --git a/src/dialog/dlgaboutdlg.ui b/src/dialog/dlgaboutdlg.ui index 5c32afa878..22cf96e868 100644 --- a/src/dialog/dlgaboutdlg.ui +++ b/src/dialog/dlgaboutdlg.ui @@ -78,14 +78,8 @@ </item> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="1"> - <widget class="QLabel" name="git_version_label"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <item row="2" column="1"> + <widget class="QLabel" name="platform_label"> <property name="text"> <string>Unknown</string> </property> @@ -94,6 +88,13 @@ </property> </widget> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Git Commit Date:</string> + </property> + </widget> + </item> <item row="0" column="0"> <widget class="QLabel" name="label"> <property name="sizePolicy"> @@ -107,8 +108,21 @@ </property> </widget> </item> - <item row="1" column="1"> - <widget class="QLabel" name="platform_label"> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Platform:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="git_version_label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text"> <string>Unknown</string> </property> @@ -117,10 +131,10 @@ </property> </widget> </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_3"> + <item row="1" column="1"> + <widget class="QLabel" name="date_label"> <property name="text"> - <string>Platform:</string> + <string>Unknown</string> </property> </widget> </item> |