diff options
| author | Tannin <devnull@localhost> | 2014-04-24 22:07:42 +0200 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2014-04-24 22:07:42 +0200 |
| commit | 264da609298c3bb533d32e53f39659d9c7e09bbf (patch) | |
| tree | e857b10c2d5dec0421a9354cf9397bfc49f1cc68 /src | |
| parent | 2db33523a1c8497657963a88f70fe1726cbf8fc9 (diff) | |
- updated installer
- prettified a few log messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | src/pluginlist.cpp | 3 | ||||
| -rw-r--r-- | src/pluginlist.h | 3 |
4 files changed, 14 insertions, 11 deletions
diff --git a/src/main.cpp b/src/main.cpp index 994dfd29..aafb1992 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -529,7 +529,11 @@ int main(int argc, char *argv[]) arguments.removeAt(profileIndex); arguments.removeAt(profileIndex); } - qDebug("configured profile: %s", qPrintable(selectedProfileName)); + if (selectedProfileName.isEmpty()) { + qDebug("no configured profile"); + } else { + qDebug("configured profile: %s", qPrintable(selectedProfileName)); + } // if we have a command line parameter, it is either a nxm link or // a binary to start diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 7960183c..2ca5adc6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2347,7 +2347,7 @@ QList<IOrganizer::FileInfo> MainWindow::findFileInfos(const QString &path, const } } } else { - qWarning("directory %s not found", qPrintable(path)); + qDebug("directory %s not found", qPrintable(path)); } return result; } @@ -4323,7 +4323,9 @@ void MainWindow::installTranslator(const QString &name) QTranslator *translator = new QTranslator(this); QString fileName = name + "_" + m_CurrentLanguage; if (!translator->load(fileName, qApp->applicationDirPath() + "/translations")) { - qWarning("localization file %s not found", qPrintable(fileName)); + if (m_CurrentLanguage != "en-US") { + qWarning("localization file %s not found", qPrintable(fileName)); + } // we don't actually expect localization files for english } qApp->installTranslator(translator); m_Translators.push_back(translator); @@ -5334,6 +5336,8 @@ void MainWindow::on_bossButton_clicked() std::string reportURL; std::string errorMessages; + m_CurrentProfile->writeModlistNow(); + try { this->setEnabled(false); ON_BLOCK_EXIT([&] () { this->setEnabled(true); }); @@ -5343,8 +5347,8 @@ void MainWindow::on_bossButton_clicked() dialog.show(); QStringList parameters; - parameters << "--game" << ToQString(GameInfo::instance().getGameName()) - << "--gamePath" << ToQString(GameInfo::instance().getGameDirectory()); + parameters << "--game" << ToQString(GameInfo::instance().getGameShortName()) + << "--gamePath" << QString("\"%1\"").arg(ToQString(GameInfo::instance().getGameDirectory())); HANDLE stdOutWrite = INVALID_HANDLE_VALUE; HANDLE stdOutRead = INVALID_HANDLE_VALUE; @@ -5395,7 +5399,6 @@ void MainWindow::on_bossButton_clicked() qWarning("report file missing"); } } - refreshESPList(); if (GameInfo::instance().getLoadOrderMechanism() == GameInfo::TYPE_FILETIME) { diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp index 1f4ed9b1..534017cd 100644 --- a/src/pluginlist.cpp +++ b/src/pluginlist.cpp @@ -589,10 +589,7 @@ void PluginList::refreshLoadOrder() } -void PluginList::lootSort() -{ -} IPluginList::PluginState PluginList::state(const QString &name) const { diff --git a/src/pluginlist.h b/src/pluginlist.h index 5e8557e2..606d6c68 100644 --- a/src/pluginlist.h +++ b/src/pluginlist.h @@ -181,9 +181,8 @@ public: void refreshLoadOrder(); - void lootSort(); - public: + virtual PluginState state(const QString &name) const; virtual int priority(const QString &name) const; virtual int loadOrder(const QString &name) const; |
