From 722896d41f15a8bc78a864f7adcfd0527648073c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 5 Dec 2016 02:29:08 +0100 Subject: NOISSUE Translations model and initial setup wizard work --- application/setupwizard/SetupWizard.cpp | 259 +++++++++++++++++++++++++++- application/setupwizard/SetupWizard.h | 11 +- application/setupwizard/SetupWizard.ui | 289 -------------------------------- 3 files changed, 261 insertions(+), 298 deletions(-) delete mode 100644 application/setupwizard/SetupWizard.ui (limited to 'application/setupwizard') diff --git a/application/setupwizard/SetupWizard.cpp b/application/setupwizard/SetupWizard.cpp index b51b34a7..af6b8c8e 100644 --- a/application/setupwizard/SetupWizard.cpp +++ b/application/setupwizard/SetupWizard.cpp @@ -1,26 +1,273 @@ #include "SetupWizard.h" +#include "translations/TranslationsModel.h" +#include +#include +#include enum Page { Language, Java, Analytics, - Themes, - Accounts + // Themes, + // Accounts }; -#include "ui_SetupWizard.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -SetupWizard::SetupWizard(QWidget *parent):QWizard(parent), ui(new Ui::SetupWizard) +class BaseWizardPage : public QWizardPage { - ui->setupUi(this); +public: + explicit BaseWizardPage(QWidget *parent = Q_NULLPTR) + : QWizardPage(parent) + { + } + virtual ~BaseWizardPage() {}; + +protected: + virtual void retranslate() = 0; + void changeEvent(QEvent * event) override + { + if (event->type() == QEvent::LanguageChange) + { + retranslate(); + } + QWizardPage::changeEvent(event); + } +}; + +class LanguageWizardPage : public BaseWizardPage +{ + Q_OBJECT; +public: + explicit LanguageWizardPage(QWidget *parent = Q_NULLPTR) + : BaseWizardPage(parent) + { + setObjectName(QStringLiteral("languagePage")); + verticalLayout = new QVBoxLayout(this); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); + languageView = new QListView(this); + languageView->setObjectName(QStringLiteral("languageView")); + verticalLayout->addWidget(languageView); + retranslate(); + + auto translations = MMC->translations(); + auto index = translations->selectedIndex(); + languageView->setModel(translations.get()); + languageView->setCurrentIndex(index); + connect(languageView->selectionModel(), &QItemSelectionModel::currentRowChanged, this, &LanguageWizardPage::languageRowChanged); + } + virtual ~LanguageWizardPage() {}; + +protected: + void retranslate() override + { + setTitle(QApplication::translate("LanguageWizardPage", "Language", Q_NULLPTR)); + setSubTitle(QApplication::translate("LanguageWizardPage", "Select the language to use in MultiMC", Q_NULLPTR)); + } + +protected slots: + void languageRowChanged(const QModelIndex ¤t, const QModelIndex &previous) + { + if (current == previous) + { + return; + } + auto translations = MMC->translations(); + QString key = translations->data(current, Qt::UserRole).toString(); + translations->selectLanguage(key); + translations->updateLanguage(key); + } + +private: + QVBoxLayout *verticalLayout = nullptr; + QListView *languageView = nullptr; +}; + +class AnalyticsWizardPage : public BaseWizardPage +{ + Q_OBJECT; +public: + explicit AnalyticsWizardPage(QWidget *parent = Q_NULLPTR) + : BaseWizardPage(parent) + { + setObjectName(QStringLiteral("analyticsPage")); + verticalLayout_3 = new QVBoxLayout(this); + verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3")); + textBrowser = new QTextBrowser(this); + textBrowser->setObjectName(QStringLiteral("textBrowser")); + textBrowser->setAcceptRichText(false); + textBrowser->setOpenExternalLinks(true); + verticalLayout_3->addWidget(textBrowser); + + checkBox = new QCheckBox(this); + checkBox->setObjectName(QStringLiteral("checkBox")); + checkBox->setChecked(true); + verticalLayout_3->addWidget(checkBox); + retranslate(); + } + virtual ~AnalyticsWizardPage() {}; + +protected: + void retranslate() override + { + setTitle(QApplication::translate("AnalyticsWizardPage", "Analytics", Q_NULLPTR)); + setSubTitle(QApplication::translate("AnalyticsWizardPage", "We track some anonymous statistics about users.", Q_NULLPTR)); + textBrowser->setHtml(QApplication::translate("AnalyticsWizardPage", + "" + "

MultiMC sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.

" + "

The data is processed by Google Analytics, see their article on the matter.

" + "

The following data is collected:

" + "
  • A random unique ID of the MultiMC installation.
    It is stored in the application settings (multimc.cfg).
    • " + "
  • Anonymized IP address.
    Last octet is set to 0 by Google and not stored.
    • " + "
  • MultiMC version.
    • " + "
  • Operating system name, version and architecture.
    • " + "
  • CPU architecture (kernel architecture on linux).
    • " + "
  • Size of system memory.
    • " + "
  • Java version, architecture and memory settings.
" + "

The analytics will activate on next start, unless you disable them in the settings.

" + "

If we change the tracked information, analytics won't be active for the first run and you will see this page again.

", Q_NULLPTR)); + checkBox->setText(QApplication::translate("AnalyticsWizardPage", "Enable Analytics", Q_NULLPTR)); + } +private: + QVBoxLayout *verticalLayout_3 = nullptr; + QTextBrowser *textBrowser = nullptr; + QCheckBox *checkBox = nullptr; +}; + +SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent) +{ + setObjectName(QStringLiteral("SetupWizard")); + resize(615, 659); + setOptions(QWizard::NoCancelButton); + if (languageIsRequired()) + { + setPage(Page::Language, new LanguageWizardPage(this)); + } + if(javaIsRequired()) + { + // set up java selection + } + else + { + removePage(Page::Java); + } + if(analyticsIsRequired()) + { + setPage(Page::Analytics, new AnalyticsWizardPage(this)); + } +} + +void SetupWizard::retranslate() +{ + setButtonText(QWizard::NextButton, tr("Next >")); + setButtonText(QWizard::BackButton, tr("< Back")); + setButtonText(QWizard::FinishButton, tr("Finish")); + setWindowTitle(QApplication::translate("SetupWizard", "MultiMC Quick Setup", Q_NULLPTR)); +} + +void SetupWizard::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + retranslate(); + } + QWizard::changeEvent(event); } SetupWizard::~SetupWizard() { } +bool SetupWizard::languageIsRequired() +{ + auto settings = MMC->settings(); + if (settings->get("Language").toString().isEmpty()) + return true; + return false; +} + +bool SetupWizard::javaIsRequired() +{ + QString currentHostName = QHostInfo::localHostName(); + QString oldHostName = MMC->settings()->get("LastHostname").toString(); + if (currentHostName != oldHostName) + { + MMC->settings()->set("LastHostname", currentHostName); + return true; + } + QString currentJavaPath = MMC->settings()->get("JavaPath").toString(); + QString actualPath = FS::ResolveExecutable(currentJavaPath); + if (actualPath.isNull()) + { + return true; + } + return false; +} + +bool SetupWizard::analyticsIsRequired() +{ + auto settings = MMC->settings(); + auto analytics = MMC->analytics(); + if(settings->get("AnalyticsSeen").toInt() < analytics->version()) + { + return true; + } + return false; +} + bool SetupWizard::isRequired() { - return true; + if (languageIsRequired()) + return true; + if (javaIsRequired()) + return true; + if (analyticsIsRequired()) + return true; + return false; } + +/* +void MainWindow::checkSetDefaultJava() +{ + qDebug() << "Java path needs resetting, showing Java selection dialog..."; + + JavaInstallPtr java; + + VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, false); + vselect.setResizeOn(2); + vselect.exec(); + + if (vselect.selectedVersion()) + java = std::dynamic_pointer_cast(vselect.selectedVersion()); + else + { + CustomMessageBox::selectable(this, tr("Invalid version selected"), tr("You didn't select a valid Java version, so MultiMC will " + "select the default. " + "You can change this in the settings dialog."), + QMessageBox::Warning) + ->show(); + + JavaUtils ju; + java = ju.GetDefaultJava(); + } + if (java) + { + MMC->settings()->set("JavaPath", java->path); + } + else + MMC->settings()->set("JavaPath", QString("java")); +} +*/ + +#include "SetupWizard.moc" diff --git a/application/setupwizard/SetupWizard.h b/application/setupwizard/SetupWizard.h index 5dbe90a9..e5c8ad77 100644 --- a/application/setupwizard/SetupWizard.h +++ b/application/setupwizard/SetupWizard.h @@ -30,10 +30,15 @@ public: /* con/destructors */ explicit SetupWizard(QWidget *parent = 0); virtual ~SetupWizard(); + void changeEvent(QEvent * event) override; + public: /* methods */ -static bool isRequired(); + static bool isRequired(); + static bool javaIsRequired(); + static bool languageIsRequired(); + static bool analyticsIsRequired(); -private: /* data */ - Ui::SetupWizard *ui = nullptr; +private: /* methods */ + void retranslate(); }; diff --git a/application/setupwizard/SetupWizard.ui b/application/setupwizard/SetupWizard.ui deleted file mode 100644 index a78f3530..00000000 --- a/application/setupwizard/SetupWizard.ui +++ /dev/null @@ -1,289 +0,0 @@ - - - SetupWizard - - - - 0 - 0 - 628 - 637 - - - - MultiMC Quick Setup - - - QWizard::NoCancelButton - - - - Welcome - - - Hello and welcome the quick setup wizard! - - - Page::Language - - - - - - <html><head/><body><p>Choose your <s>adventure</s> language:</p></body></html> - - - - - - - - - - - Java - - - Your java settings need attention! - - - Page::Java - - - - - - Java Runtime - - - - - - - - - - - - Memory - - - - - - The maximum amount of memory Minecraft is allowed to use. - - - MB - - - 512 - - - 65536 - - - 128 - - - 1024 - - - - - - - Minimum memory allocation: - - - - - - - Maximum memory allocation: - - - - - - - PermGen: - - - - - - - The amount of memory available to store loaded Java classes. - - - MB - - - 64 - - - 999999999 - - - 8 - - - 64 - - - - - - - The amount of memory Minecraft is started with. - - - MB - - - 256 - - - 65536 - - - 128 - - - 256 - - - - - - - - - - - Analytics - - - We track some anonymous statistics about users. - - - Page::Analytics - - - - - - Qt::ScrollBarAlwaysOff - - - QAbstractScrollArea::AdjustToContentsOnFirstShow - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - 0 - 0 - 592 - 477 - - - - - - - <html><head/><body> -<p>MultiMC sends anonymous usage statistics on every start of the application. This helps us decide what platforms and issues to focus on.</p> -<p>The data is processed by Google Analytics, see their <a href="https://support.google.com/analytics/answer/6004245?hl=en">article on the matter</a>.</p> -<p>The following data is collected:</p> -<ul> -<li>A random unique ID of the MultiMC installation.<br />It is stored in the application settings (multimc.cfg).</li> -<li>Anonymized IP address.<br />Last octet is set to 0 by Google and not stored.</li> -<li>MultiMC version.</li> -<li>Operating system name, version and architecture.</li> -<li>CPU architecture (kernel architecture on linux).</li> -<li>Size of system memory.</li> -<li>Java version, architecture and memory settings.</li> -</ul> -<p>The analytics will activate on next start, unless you disable them in the settings.</p> -<p>If we change the tracked information, analytics won't be active for the first run and you will see this page again.</p> -</body></html> - - - true - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - - - - - - - Themes and icons - - - Change how things look. - - - Page::Themes - - - - - 230 - 70 - 151 - 71 - - - - Put stuff here. - - - - - - Minecraft accounts - - - Add your account - or accounts. - - - Page::Accounts - - - - - 60 - 60 - 311 - 131 - - - - Put existing accounts page here. - - - - - - - -- cgit v1.2.3