mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 03:14:06 +00:00
Code Issues Releases Wiki Activity

Fix duplicate filename in what() message. Use newly create cfgError

Browse source 
utility function consistently throughout code.
This commit is contained in:
cfcohen 2015-11-26 01:49:14 -05:00
parent 7605912ece
commit 046538984c
1 changed files with 38 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
apps/launcher/maindialog.cpp
View file

@ -24,6 +24,15 @@
using namespace Process; using namespace Process;
void cfgError(const QString& title, const QString& msg) {
QMessageBox msgBox;
msgBox.setWindowTitle(title);
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(msg);
msgBox.exec();
}
Launcher::MainDialog::MainDialog(QWidget *parent) Launcher::MainDialog::MainDialog(QWidget *parent)
: QMainWindow(parent), mGameSettings (mCfgMgr) : QMainWindow(parent), mGameSettings (mCfgMgr)
{ {
@ -261,14 +270,10 @@ bool Launcher::MainDialog::setupLauncherSettings()
QFile file(path); QFile file(path);
if (file.exists()) { if (file.exists()) {
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QMessageBox msgBox; cfgError(tr("Error opening OpenMW configuration file"),
msgBox.setWindowTitle(tr("Error opening OpenMW configuration file")); tr("<br><b>Could not open %0 for reading</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(file.fileName()));
msgBox.setText(tr("<br><b>Could not open %0 for reading</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>").arg(file.fileName()));
msgBox.exec();
return false; return false;
} }
QTextStream stream(&file); QTextStream stream(&file);
@ -296,14 +301,10 @@ bool Launcher::MainDialog::setupGameSettings()
if (file.exists()) { if (file.exists()) {
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QMessageBox msgBox; cfgError(tr("Error opening OpenMW configuration file"),
msgBox.setWindowTitle(tr("Error opening OpenMW configuration file")); tr("<br><b>Could not open %0 for reading</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(file.fileName()));
msgBox.setText(tr("<br><b>Could not open %0 for reading</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>").arg(file.fileName()));
msgBox.exec();
return false; return false;
} }
QTextStream stream(&file); QTextStream stream(&file);
@ -324,14 +325,10 @@ bool Launcher::MainDialog::setupGameSettings()
QFile file(path); QFile file(path);
if (file.exists()) { if (file.exists()) {
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QMessageBox msgBox; cfgError(tr("Error opening OpenMW configuration file"),
msgBox.setWindowTitle(tr("Error opening OpenMW configuration file")); tr("<br><b>Could not open %0 for reading</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(file.fileName()));
msgBox.setText(tr("<br><b>Could not open %0 for reading</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>").arg(file.fileName()));
msgBox.exec();
return false; return false;
} }
QTextStream stream(&file); QTextStream stream(&file);
@ -381,15 +378,6 @@ bool Launcher::MainDialog::setupGameSettings()
return true; return true;
} }
void cfgError(const QString& title, const QString& msg) {
QMessageBox msgBox;
msgBox.setWindowTitle(title);
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(msg);
msgBox.exec();
}
bool Launcher::MainDialog::setupGraphicsSettings() bool Launcher::MainDialog::setupGraphicsSettings()
{ {
// This method is almost a copy of OMW::Engine::loadSettings(). They should definitely // This method is almost a copy of OMW::Engine::loadSettings(). They should definitely
@ -420,8 +408,7 @@ bool Launcher::MainDialog::setupGraphicsSettings()
mEngineSettings.loadDefault(defaultPath); mEngineSettings.loadDefault(defaultPath);
} }
catch (std::exception& e) { catch (std::exception& e) {
std::string msg = "<br><b>Error reading settings-default.cfg</b><br><br>" + std::string msg = std::string("<br><b>Error reading settings-default.cfg</b><br><br>") + e.what();
defaultPath + "<br><br>" + e.what();
cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str())); cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str()));
return false; return false;
} }
@ -435,8 +422,7 @@ bool Launcher::MainDialog::setupGraphicsSettings()
mEngineSettings.loadUser(userPath); mEngineSettings.loadUser(userPath);
} }
catch (std::exception& e) { catch (std::exception& e) {
std::string msg = "<br><b>Error reading settings-default.cfg</b><br><br>" + std::string msg = std::string("<br><b>Error reading settings.cfg</b><br><br>") + e.what();
defaultPath + "<br><br>" + e.what();
cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str())); cfgError(tr("Error reading OpenMW configuration file"), tr(msg.c_str()));
return false; return false;
} }
@ -487,15 +473,11 @@ bool Launcher::MainDialog::writeSettings()
if (!dir.exists()) { if (!dir.exists()) {
if (!dir.mkpath(userPath)) { if (!dir.mkpath(userPath)) {
QMessageBox msgBox; cfgError(tr("Error creating OpenMW configuration directory"),
msgBox.setWindowTitle(tr("Error creating OpenMW configuration directory")); tr("<br><b>Could not create %0</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(userPath));
msgBox.setText(tr("<br><b>Could not create %0</b><br><br> \ return false;
Please make sure you have the right permissions \
and try again.<br>").arg(userPath));
msgBox.exec();
return false;
} }
} }
@ -504,15 +486,11 @@ bool Launcher::MainDialog::writeSettings()
if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) { if (!file.open(QIODevice::ReadWrite | QIODevice::Text)) {
// File cannot be opened or created // File cannot be opened or created
QMessageBox msgBox; cfgError(tr("Error writing OpenMW configuration file"),
msgBox.setWindowTitle(tr("Error writing OpenMW configuration file")); tr("<br><b>Could not open or create %0 for writing</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(file.fileName()));
msgBox.setText(tr("<br><b>Could not open or create %0 for writing</b><br><br> \ return false;
Please make sure you have the right permissions \
and try again.<br>").arg(file.fileName()));
msgBox.exec();
return false;
} }
@ -536,15 +514,11 @@ bool Launcher::MainDialog::writeSettings()
if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) { if (!file.open(QIODevice::ReadWrite | QIODevice::Text | QIODevice::Truncate)) {
// File cannot be opened or created // File cannot be opened or created
QMessageBox msgBox; cfgError(tr("Error writing Launcher configuration file"),
msgBox.setWindowTitle(tr("Error writing Launcher configuration file")); tr("<br><b>Could not open or create %0 for writing</b><br><br> \
msgBox.setIcon(QMessageBox::Critical); Please make sure you have the right permissions \
msgBox.setStandardButtons(QMessageBox::Ok); and try again.<br>").arg(file.fileName()));
msgBox.setText(tr("<br><b>Could not open or create %0 for writing</b><br><br> \ return false;
Please make sure you have the right permissions \
and try again.<br>").arg(file.fileName()));
msgBox.exec();
return false;
} }
QTextStream stream(&file); QTextStream stream(&file);