mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 17:39:42 +00:00
Code Issues Releases Wiki Activity

Changing "New Installation" to "Retail CD/DVD" for clarity

Browse source
This commit is contained in:
Thunderforge 2017-08-09 00:20:49 -05:00
parent af9db74010
commit f41a4bb937
7 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/wizard/componentselectionpage.cpp
View file

@ -2,7 +2,6 @@
#include <QDebug> #include <QDebug>
#include <QPushButton> #include <QPushButton>
#include <QAbstractButton>
#include <QMessageBox> #include <QMessageBox>
#include "mainwizard.hpp" #include "mainwizard.hpp"
@ -26,7 +25,7 @@ Wizard::ComponentSelectionPage::ComponentSelectionPage(QWidget *parent) :
void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem*) void Wizard::ComponentSelectionPage::updateButton(QListWidgetItem*)
{ {
if (field(QLatin1String("installation.new")).toBool() == true) if (field(QLatin1String("installation.retailDisc")).toBool() == true)
return; // Morrowind is always checked here return; // Morrowind is always checked here
bool unchecked = true; bool unchecked = true;
@ -60,7 +59,7 @@ void Wizard::ComponentSelectionPage::initializePage()
QListWidgetItem *tribunalItem = new QListWidgetItem(QLatin1String("Tribunal")); QListWidgetItem *tribunalItem = new QListWidgetItem(QLatin1String("Tribunal"));
QListWidgetItem *bloodmoonItem = new QListWidgetItem(QLatin1String("Bloodmoon")); QListWidgetItem *bloodmoonItem = new QListWidgetItem(QLatin1String("Bloodmoon"));
if (field(QLatin1String("installation.new")).toBool() == true) if (field(QLatin1String("installation.retailDisc")).toBool() == true)
{ {
morrowindItem->setFlags((morrowindItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable); morrowindItem->setFlags((morrowindItem->flags() & ~Qt::ItemIsEnabled) | Qt::ItemIsUserCheckable);
morrowindItem->setData(Qt::CheckStateRole, Qt::Checked); morrowindItem->setData(Qt::CheckStateRole, Qt::Checked);
@ -117,7 +116,7 @@ bool Wizard::ComponentSelectionPage::validatePage()
// qDebug() << components << path << mWizard->mInstallations[path]; // qDebug() << components << path << mWizard->mInstallations[path];
if (field(QLatin1String("installation.new")).toBool() == false) { if (field(QLatin1String("installation.retailDisc")).toBool() == false) {
if (components.contains(QLatin1String("Tribunal")) && !components.contains(QLatin1String("Bloodmoon"))) if (components.contains(QLatin1String("Tribunal")) && !components.contains(QLatin1String("Bloodmoon")))
{ {
if (mWizard->mInstallations[path].hasBloodmoon) if (mWizard->mInstallations[path].hasBloodmoon)

6
apps/wizard/conclusionpage.cpp
View file

@ -16,14 +16,14 @@ Wizard::ConclusionPage::ConclusionPage(QWidget *parent) :
void Wizard::ConclusionPage::initializePage() void Wizard::ConclusionPage::initializePage()
{ {
// Write the path to openmw.cfg // Write the path to openmw.cfg
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
QString path(field(QLatin1String("installation.path")).toString()); QString path(field(QLatin1String("installation.path")).toString());
mWizard->addInstallation(path); mWizard->addInstallation(path);
} }
if (!mWizard->mError) if (!mWizard->mError)
{ {
if ((field(QLatin1String("installation.new")).toBool() == true) if ((field(QLatin1String("installation.retailDisc")).toBool() == true)
|| (field(QLatin1String("installation.import-settings")).toBool() == true)) || (field(QLatin1String("installation.import-settings")).toBool() == true))
{ {
qDebug() << "IMPORT SETTINGS"; qDebug() << "IMPORT SETTINGS";
@ -33,7 +33,7 @@ void Wizard::ConclusionPage::initializePage()
if (!mWizard->mError) if (!mWizard->mError)
{ {
if (field(QLatin1String("installation.new")).toBool() == true) if (field(QLatin1String("installation.retailDisc")).toBool() == true)
{ {
textLabel->setText(tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \ textLabel->setText(tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \
<p>Click Finish to close the Wizard.</p></body></html>")); <p>Click Finish to close the Wizard.</p></body></html>"));

7
apps/wizard/installationpage.cpp
View file

@ -7,7 +7,6 @@
#include <QMessageBox> #include <QMessageBox>
#include "mainwizard.hpp" #include "mainwizard.hpp"
#include "inisettings.hpp"
Wizard::InstallationPage::InstallationPage(QWidget *parent) : Wizard::InstallationPage::InstallationPage(QWidget *parent) :
QWizardPage(parent) QWizardPage(parent)
@ -76,7 +75,7 @@ void Wizard::InstallationPage::initializePage()
// That way installing all three components would yield 300% // That way installing all three components would yield 300%
// When one component is done the bar will be filled by 33% // When one component is done the bar will be filled by 33%
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
installProgressBar->setMaximum((components.count() * 100)); installProgressBar->setMaximum((components.count() * 100));
} else { } else {
if (components.contains(QLatin1String("Tribunal")) if (components.contains(QLatin1String("Tribunal"))
@ -96,7 +95,7 @@ void Wizard::InstallationPage::startInstallation()
QStringList components(field(QLatin1String("installation.components")).toStringList()); QStringList components(field(QLatin1String("installation.components")).toStringList());
QString path(field(QLatin1String("installation.path")).toString()); QString path(field(QLatin1String("installation.path")).toString());
if (field(QLatin1String("installation.new")).toBool() == true) if (field(QLatin1String("installation.retailDisc")).toBool() == true)
{ {
// Always install Morrowind // Always install Morrowind
mUnshield->setInstallComponent(Wizard::Component_Morrowind, true); mUnshield->setInstallComponent(Wizard::Component_Morrowind, true);
@ -227,7 +226,7 @@ bool Wizard::InstallationPage::isComplete() const
int Wizard::InstallationPage::nextId() const int Wizard::InstallationPage::nextId() const
{ {
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
return MainWizard::Page_Conclusion; return MainWizard::Page_Conclusion;
} else { } else {
if (!mWizard->mError) { if (!mWizard->mError) {

2
apps/wizard/languageselectionpage.cpp
View file

@ -30,7 +30,7 @@ void Wizard::LanguageSelectionPage::initializePage()
int Wizard::LanguageSelectionPage::nextId() const int Wizard::LanguageSelectionPage::nextId() const
{ {
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
return MainWizard::Page_ComponentSelection; return MainWizard::Page_ComponentSelection;
} else { } else {
QString path(field(QLatin1String("installation.path")).toString()); QString path(field(QLatin1String("installation.path")).toString());

5
apps/wizard/mainwizard.cpp
View file

@ -3,7 +3,6 @@
#include <QDebug> #include <QDebug>
#include <QTime> #include <QTime>
#include <QDateTime>
#include <QCloseEvent> #include <QCloseEvent>
#include <QMessageBox> #include <QMessageBox>
#include <QTextCodec> #include <QTextCodec>
@ -258,7 +257,7 @@ void Wizard::MainWizard::runSettingsImporter()
QStringList arguments; QStringList arguments;
// Import plugin selection? // Import plugin selection?
if (field(QLatin1String("installation.new")).toBool() == true if (field(QLatin1String("installation.retailDisc")).toBool() == true
|| field(QLatin1String("installation.import-addons")).toBool() == true) || field(QLatin1String("installation.import-addons")).toBool() == true)
arguments.append(QLatin1String("--game-files")); arguments.append(QLatin1String("--game-files"));
@ -278,7 +277,7 @@ void Wizard::MainWizard::runSettingsImporter()
// Now the paths // Now the paths
arguments.append(QLatin1String("--ini")); arguments.append(QLatin1String("--ini"));
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
arguments.append(path + QDir::separator() + QLatin1String("Morrowind.ini")); arguments.append(path + QDir::separator() + QLatin1String("Morrowind.ini"));
} else { } else {
arguments.append(mInstallations[path].iniPath); arguments.append(mInstallations[path].iniPath);

7
apps/wizard/methodselectionpage.cpp
View file

@ -1,5 +1,4 @@
#include "methodselectionpage.hpp" #include "methodselectionpage.hpp"
#include <QDebug>
#include "mainwizard.hpp" #include "mainwizard.hpp"
Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) : Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
@ -10,16 +9,16 @@ Wizard::MethodSelectionPage::MethodSelectionPage(QWidget *parent) :
setupUi(this); setupUi(this);
#ifndef OPENMW_USE_UNSHIELD #ifndef OPENMW_USE_UNSHIELD
newLocationRadioButton->setEnabled(false); retailDiscRadioButton->setEnabled(false);
existingLocationRadioButton->setChecked(true); existingLocationRadioButton->setChecked(true);
#endif #endif
registerField(QLatin1String("installation.new"), newLocationRadioButton); registerField(QLatin1String("installation.retailDisc"), retailDiscRadioButton);
} }
int Wizard::MethodSelectionPage::nextId() const int Wizard::MethodSelectionPage::nextId() const
{ {
if (field(QLatin1String("installation.new")).toBool() == true) { if (field(QLatin1String("installation.retailDisc")).toBool() == true) {
return MainWizard::Page_InstallationTarget; return MainWizard::Page_InstallationTarget;
} else { } else {
return MainWizard::Page_ExistingInstallation; return MainWizard::Page_ExistingInstallation;

18
files/ui/wizard/methodselectionpage.ui
View file

@ -17,16 +17,16 @@
<string>Select Installation Method</string> <string>Select Installation Method</string>
</property> </property>
<property name="subTitle"> <property name="subTitle">
<string>Select how OpenMW should get the required Morrowind installation files.</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select how you would like to install &lt;i&gt;The Elder Scrolls III: Morrowind&lt;/i&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QRadioButton" name="newLocationRadioButton"> <widget class="QRadioButton" name="retailDiscRadioButton">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">font-weight:bold;</string> <string notr="true">font-weight:bold;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Install Morrowind to a new location</string> <string>Retail CD/DVD</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
@ -34,7 +34,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="newLocationLayout"> <layout class="QHBoxLayout" name="retailDiscLayout">
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -72,14 +72,14 @@
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>newLocationRadioButton</cstring> <cstring>retailDiscRadioButton</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="newLocationLabel"> <widget class="QLabel" name="retailDiscLabel">
<property name="text"> <property name="text">
<string>Install Morrowind from a retail disk to a new location for OpenMW to use.</string> <string>Install from a retail disc to a new location.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>
@ -94,7 +94,7 @@
<string notr="true">font-weight:bold</string> <string notr="true">font-weight:bold</string>
</property> </property>
<property name="text"> <property name="text">
<string>Select an existing Morrowind installation</string> <string>Existing Installation</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -138,7 +138,7 @@
<item> <item>
<widget class="QLabel" name="existingLocationLabel"> <widget class="QLabel" name="existingLocationLabel">
<property name="text"> <property name="text">
<string>Select an existing Morrowind installation for OpenMW to use.</string> <string>Select an existing installation.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>