diff options
| author | 2018-07-30 10:11:43 -0700 | |
|---|---|---|
| committer | 2018-07-30 10:11:43 -0700 | |
| commit | 884a4e1e1936f36e215d091940b52be4fa2b0a99 (patch) | |
| tree | b05a24ac457c89ea0e2271f28c31487153e052dd | |
| parent | Port #3769 from Citra: "Update Dark theme to latest version" (diff) | |
| parent | Port #3837 from Citra: "Add build date in about dialog" (diff) | |
| download | yuzu-884a4e1e1936f36e215d091940b52be4fa2b0a99.tar.gz yuzu-884a4e1e1936f36e215d091940b52be4fa2b0a99.tar.xz yuzu-884a4e1e1936f36e215d091940b52be4fa2b0a99.zip | |
Merge pull request #859 from FearlessTobi/port-3837
Port #3837 from Citra: "citra-qt: Add build date in about dialog"
| -rw-r--r-- | src/yuzu/about_dialog.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/aboutdialog.ui | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/yuzu/about_dialog.cpp b/src/yuzu/about_dialog.cpp index d6647eeea..39ed3bccf 100644 --- a/src/yuzu/about_dialog.cpp +++ b/src/yuzu/about_dialog.cpp | |||
| @@ -10,8 +10,9 @@ | |||
| 10 | AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { | 10 | AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDialog) { |
| 11 | ui->setupUi(this); | 11 | ui->setupUi(this); |
| 12 | ui->labelLogo->setPixmap(QIcon::fromTheme("yuzu").pixmap(200)); | 12 | ui->labelLogo->setPixmap(QIcon::fromTheme("yuzu").pixmap(200)); |
| 13 | ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( | 13 | ui->labelBuildInfo->setText( |
| 14 | Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); | 14 | ui->labelBuildInfo->text().arg(Common::g_build_name, Common::g_scm_branch, |
| 15 | Common::g_scm_desc, QString(Common::g_build_date).left(10))); | ||
| 15 | } | 16 | } |
| 16 | 17 | ||
| 17 | AboutDialog::~AboutDialog() {} | 18 | AboutDialog::~AboutDialog() {} |
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui index 012ce90bf..f122ba39d 100644 --- a/src/yuzu/aboutdialog.ui +++ b/src/yuzu/aboutdialog.ui | |||
| @@ -70,7 +70,7 @@ | |||
| 70 | </sizepolicy> | 70 | </sizepolicy> |
| 71 | </property> | 71 | </property> |
| 72 | <property name="text"> | 72 | <property name="text"> |
| 73 | <string><html><head/><body><p>%1 | %2-%3</p></body></html></string> | 73 | <string><html><head/><body><p>%1 | %2-%3 (%4)</p></body></html></string> |
| 74 | </property> | 74 | </property> |
| 75 | </widget> | 75 | </widget> |
| 76 | </item> | 76 | </item> |