citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #3837 from zhaowenlan1779/aboutdialog-builddate 

citra-qt: Add build date in about dialog
This commit is contained in:
James Rowe 2018-06-19 11:57:40 -06:00 committed by GitHub
parent f410974644 6c4f3257b7
commit e27bb6394d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/citra_qt/aboutdialog.cpp
View File

@ -12,8 +12,9 @@ AboutDialog::AboutDialog(QWidget* parent)
ui(new Ui::AboutDialog) { ui(new Ui::AboutDialog) {
ui->setupUi(this); ui->setupUi(this);
ui->labelLogo->setPixmap(QIcon::fromTheme("citra").pixmap(200)); ui->labelLogo->setPixmap(QIcon::fromTheme("citra").pixmap(200));
ui->labelBuildInfo->setText(ui->labelBuildInfo->text().arg( ui->labelBuildInfo->setText(
Common::g_build_name, Common::g_scm_branch, Common::g_scm_desc)); ui->labelBuildInfo->text().arg(Common::g_build_name, Common::g_scm_branch,
Common::g_scm_desc, QString(Common::g_build_date).left(10)));
} }
AboutDialog::~AboutDialog() { AboutDialog::~AboutDialog() {

2
src/citra_qt/aboutdialog.ui
View File

@ -70,7 +70,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;%1 | %2-%3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;%1 | %2-%3 (%4)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>