diff options
| author | Jeremy Rimpo <jeremy.rimpo@servermonkey.com> | 2018-01-05 10:16:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 10:16:34 -0600 |
| commit | d2f90e6a761da3742789ce25779fe176e2a11aaf (patch) | |
| tree | 51d0134ab3af06a52290ce9cb16409c714fd1e3b /src | |
| parent | d06972729d8410451266988a650633085b6441e8 (diff) | |
| parent | 785852cf2120f2643a0476b43600ab7ef5c07638 (diff) | |
Merge pull request #193 from erasmux/dev
Log MO version + remove downloads auto scrolling
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 20 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 4 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4c5ac75c..3e02a4a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -419,10 +419,28 @@ void setupPath() ::SetEnvironmentVariableW(L"PATH", newPath.c_str());
}
+static QString getVersionDisplayString()
+{
+ VS_FIXEDFILEINFO version = GetFileVersion(ToWString(QApplication::applicationFilePath()));
+ return VersionInfo(version.dwFileVersionMS >> 16,
+ version.dwFileVersionMS & 0xFFFF,
+ version.dwFileVersionLS >> 16,
+ version.dwFileVersionLS & 0xFFFF).displayString();
+}
+
int runApplication(MOApplication &application, SingleInstance &instance,
const QString &splashPath)
{
- qDebug("start main application");
+
+ qDebug("Starting Mod Organizer version %s revision %s", qPrintable(getVersionDisplayString()),
+#if defined(HGID)
+ HGID
+#elif defined(GITID)
+ GITID
+#else
+ "unknown"
+#endif
+ );
QString dataPath = application.property("dataPath").toString();
qDebug("data path: %s", qPrintable(dataPath));
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ddc4fe23..11693568 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -331,8 +331,6 @@ MainWindow::MainWindow(QSettings &initSettings connect(m_OrganizerCore.directoryRefresher(), SIGNAL(progress(int)), this, SLOT(refresher_progress(int)));
connect(m_OrganizerCore.directoryRefresher(), SIGNAL(error(QString)), this, SLOT(showError(QString)));
- connect(m_OrganizerCore.downloadManager(), SIGNAL(downloadAdded()), ui->downloadView, SLOT(scrollToBottom()));
-
connect(&m_SavesWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(refreshSavesIfOpen()));
connect(&m_OrganizerCore.settings(), SIGNAL(languageChanged(QString)), this, SLOT(languageChange(QString)));
@@ -1682,8 +1680,6 @@ void MainWindow::on_tabWidget_currentChanged(int index) refreshDataTree();
} else if (index == 3) {
refreshSaveList();
- } else if (index == 4) {
- ui->downloadView->scrollToBottom();
}
}
|