From 362434bea66654c74c1bfda83cb23a37d7f50fbb Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 4 Sep 2020 03:33:46 -0400 Subject: [PATCH] Require Blender 2.90 & other fixes --- hecl-gui/FindBlender.cpp | 2 +- hecl-gui/MainWindow.cpp | 6 +++++- hecl-gui/SysReqTableView.hpp | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hecl-gui/FindBlender.cpp b/hecl-gui/FindBlender.cpp index 3482d9ad7..222bb3ed9 100644 --- a/hecl-gui/FindBlender.cpp +++ b/hecl-gui/FindBlender.cpp @@ -51,7 +51,7 @@ hecl::SystemString FindBlender(int& major, int& minor) { /* No steam; try default */ wchar_t progFiles[256]; if (GetEnvironmentVariableW(L"ProgramFiles", progFiles, 256)) { - _snwprintf(BLENDER_BIN_BUF, 2048, L"%s\\Blender Foundation\\Blender 2.83\\blender.exe", progFiles); + _snwprintf(BLENDER_BIN_BUF, 2048, L"%s\\Blender Foundation\\Blender 2.90\\blender.exe", progFiles); blenderBin = BLENDER_BIN_BUF; if (!RegFileExists(blenderBin)) blenderBin = nullptr; diff --git a/hecl-gui/MainWindow.cpp b/hecl-gui/MainWindow.cpp index fa2a0662c..428fabced 100644 --- a/hecl-gui/MainWindow.cpp +++ b/hecl-gui/MainWindow.cpp @@ -83,7 +83,8 @@ MainWindow::MainWindow(QWidget* parent) m_ui->processOutput->setFont(mFont); m_cursor = QTextCursor(m_ui->processOutput->document()); connect(m_ui->saveLogButton, &QPushButton::pressed, this, [this] { - QString defaultFileName = QStringLiteral("urde-") + QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate); + QString defaultFileName = QStringLiteral("urde-") + QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate) + + QStringLiteral(".log"); defaultFileName.replace(QLatin1Char(':'), QLatin1Char('-')); const QString fileName = QFileDialog::getSaveFileName(this, tr("Save Log"), defaultFileName, QStringLiteral("*.log")); @@ -525,6 +526,9 @@ void MainWindow::initSlots() { setPath(dialog.selectedFiles().at(0)); }); + connect(m_ui->pathEdit, &QLineEdit::editingFinished, [this]() { + setPath(m_ui->pathEdit->text()); + }); connect(m_ui->downloadButton, &QPushButton::clicked, this, &MainWindow::onDownloadPressed); } diff --git a/hecl-gui/SysReqTableView.hpp b/hecl-gui/SysReqTableView.hpp index 14b980638..1d8e03d99 100644 --- a/hecl-gui/SysReqTableView.hpp +++ b/hecl-gui/SysReqTableView.hpp @@ -31,7 +31,7 @@ public: int columnCount(const QModelIndex& parent = QModelIndex()) const override; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - bool isBlenderVersionOk() const { return m_blendMajor == 2 && m_blendMinor == 83; } + bool isBlenderVersionOk() const { return m_blendMajor == 2 && m_blendMinor == 90; } void updateFreeDiskSpace(const QString& path); };