aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add version label to Oracle Importer (#2818)

Browse source
This commit is contained in:
John Hill 2017-08-06 11:03:19 -07:00 committed by Zach H
parent 6b1ea9186a
commit 7c8daf68ea
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oracle/src/oraclewizard.cpp
View file

@ -24,6 +24,7 @@
#include "oracleimporter.h" #include "oracleimporter.h"
#include "main.h" #include "main.h"
#include "settingscache.h" #include "settingscache.h"
#include "version_string.h"
#define ZIP_SIGNATURE "PK" #define ZIP_SIGNATURE "PK"
#define ALLSETS_URL_FALLBACK "https://mtgjson.com/json/AllSets.json" #define ALLSETS_URL_FALLBACK "https://mtgjson.com/json/AllSets.json"
@ -118,6 +119,7 @@ IntroPage::IntroPage(QWidget *parent)
label->setWordWrap(true); label->setWordWrap(true);
languageLabel = new QLabel(this); languageLabel = new QLabel(this);
versionLabel = new QLabel(this);
languageBox = new QComboBox(this); languageBox = new QComboBox(this);
QString setLanguage = settingsCache->getLang(); QString setLanguage = settingsCache->getLang();
QStringList qmFiles = findQmFiles(); QStringList qmFiles = findQmFiles();
@ -133,6 +135,7 @@ IntroPage::IntroPage(QWidget *parent)
layout->addWidget(label, 0, 0, 1, 2); layout->addWidget(label, 0, 0, 1, 2);
layout->addWidget(languageLabel, 1, 0); layout->addWidget(languageLabel, 1, 0);
layout->addWidget(languageBox, 1, 1); layout->addWidget(languageBox, 1, 1);
layout->addWidget(versionLabel, 4, 0);
setLayout(layout); setLayout(layout);
} }
@ -169,6 +172,7 @@ void IntroPage::retranslateUi()
"\nYou will need to specify a URL or a filename that " "\nYou will need to specify a URL or a filename that "
"will be used as a source.")); "will be used as a source."));
languageLabel->setText(tr("Language:")); languageLabel->setText(tr("Language:"));
versionLabel->setText(tr("Version: %1").arg(VERSION_STRING));
} }
LoadSetsPage::LoadSetsPage(QWidget *parent) LoadSetsPage::LoadSetsPage(QWidget *parent)

2
oracle/src/oraclewizard.h
View file

@ -64,7 +64,7 @@ private:
QStringList findQmFiles(); QStringList findQmFiles();
QString languageName(const QString &qmFile); QString languageName(const QString &qmFile);
private: private:
QLabel *label, *languageLabel; QLabel *label, *languageLabel, *versionLabel;
QComboBox *languageBox; QComboBox *languageBox;
private slots: private slots:
void languageBoxChanged(int index); void languageBoxChanged(int index);