diff --git a/hecl-gui/DownloadManager.cpp b/hecl-gui/DownloadManager.cpp index 9f243ca9d..fb359c263 100644 --- a/hecl-gui/DownloadManager.cpp +++ b/hecl-gui/DownloadManager.cpp @@ -58,8 +58,7 @@ void DownloadManager::fetchIndex() { m_indexInProgress = m_netManager.get(QNetworkRequest(url)); connect(m_indexInProgress, &QNetworkReply::finished, this, &DownloadManager::indexFinished); - connect(m_indexInProgress, qOverload(&QNetworkReply::error), this, - &DownloadManager::indexError); + connect(m_indexInProgress, &QNetworkReply::errorOccurred, this, &DownloadManager::indexError); connect(m_indexInProgress, &QNetworkReply::encrypted, this, &DownloadManager::indexValidateCert); } @@ -75,8 +74,7 @@ void DownloadManager::fetchBinary(const QString& str, const QString& outPath) { const auto url = QUrl(QStringLiteral("%1%2/%3/%4").arg(Domain, track, CurPlatformString, str)); m_binaryInProgress = m_netManager.get(QNetworkRequest(url)); connect(m_binaryInProgress, &QNetworkReply::finished, this, &DownloadManager::binaryFinished); - connect(m_binaryInProgress, qOverload(&QNetworkReply::error), this, - &DownloadManager::binaryError); + connect(m_binaryInProgress, &QNetworkReply::errorOccurred, this, &DownloadManager::binaryError); connect(m_binaryInProgress, &QNetworkReply::encrypted, this, &DownloadManager::binaryValidateCert); connect(m_binaryInProgress, &QNetworkReply::downloadProgress, this, &DownloadManager::binaryDownloadProgress); diff --git a/hecl-gui/FindBlender.cpp b/hecl-gui/FindBlender.cpp index 68bd490e8..3482d9ad7 100644 --- a/hecl-gui/FindBlender.cpp +++ b/hecl-gui/FindBlender.cpp @@ -12,7 +12,7 @@ namespace hecl::blender { #define DEFAULT_BLENDER_BIN "blender" #endif -static const std::regex regBlenderVersion(R"(Blender ([0-9]+).([0-9]+) )", +static const std::regex regBlenderVersion(R"(Blender (\d+)\.(\d+)(?:\.(\d+))?)", std::regex::ECMAScript | std::regex::optimize); static bool RegFileExists(const hecl::SystemChar* path) { diff --git a/hecl-gui/MainWindow.cpp b/hecl-gui/MainWindow.cpp index 50cfa55f3..fa2a0662c 100644 --- a/hecl-gui/MainWindow.cpp +++ b/hecl-gui/MainWindow.cpp @@ -503,7 +503,7 @@ void MainWindow::setPath(const QString& path) { } void MainWindow::initSlots() { - connect(&m_heclProc, &QProcess::readyRead, [=]() { + connect(&m_heclProc, &QProcess::readyRead, [this]() { const QByteArray bytes = m_heclProc.readAll(); setTextTermFormatting(QString::fromUtf8(bytes)); }); @@ -512,7 +512,7 @@ void MainWindow::initSlots() { connect(m_ui->packageBtn, &QPushButton::clicked, this, &MainWindow::onPackage); connect(m_ui->launchBtn, &QPushButton::clicked, this, &MainWindow::onLaunch); - connect(m_ui->browseBtn, &QPushButton::clicked, [=]() { + connect(m_ui->browseBtn, &QPushButton::clicked, [this]() { FileDirDialog dialog(this); dialog.setDirectory(m_path); dialog.setWindowTitle(tr("Select Working Directory")); @@ -690,9 +690,9 @@ void MainWindow::initNumberComboOption(QComboBox* action, hecl::CVar* cvar) { } } action->setToolTip(QString::fromUtf8(cvar->rawHelp().data())); - connect(action, static_cast(&QComboBox::currentIndexChanged), this, - [this, cvar](const QString& value) { - cvar->fromInteger(value.toInt()); + connect(action, static_cast(&QComboBox::currentIndexChanged), this, + [this, action, cvar](const int i) { + cvar->fromInteger(action->itemText(i).toInt()); m_cvarManager.serialize(); }); } diff --git a/hecl-gui/MainWindow.ui b/hecl-gui/MainWindow.ui index a9e4d3562..6ca9f184d 100644 --- a/hecl-gui/MainWindow.ui +++ b/hecl-gui/MainWindow.ui @@ -79,7 +79,7 @@ - 0 + 1 @@ -223,7 +223,7 @@ - + 0 0 @@ -234,6 +234,12 @@ + + + 0 + 0 + + 1 @@ -270,6 +276,12 @@ + + + 0 + 0 + + 1 @@ -457,6 +469,12 @@ 0 + + + 396 + 0 + + Launch Options @@ -499,6 +517,12 @@ + + + 396 + 0 + + Tweaks @@ -1096,7 +1120,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Noto Sans'; font-size:10pt; font-weight:600;">About HECL Frontend</span></p> <p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Noto Sans'; font-size:10pt;"><br />The HECL frontend UI is designed and built by </span><a href="https://axiodl.com"><span style=" font-family:'Noto Sans'; font-size:10pt; text-decoration: underline; color:#007af4;">Axiomatic Data Laboratories</span></a><span style=" font-family:'Noto Sans'; font-size:10pt;"> Copyright 2020<br /><br /></span><span style=" font-family:'Noto Sans'; font-size:10pt; font-weight:600;">Authors:</span><span style=" font-family:'Noto Sans'; font-size:10pt;"><br />Phillip &quot;Antidote&quot; Stephens<br />Jack &quot;jackoalan&quot; Andersen<br />Luke &quot;encounter&quot; Street</span></p> <p style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New'; font-size:10pt;">The MIT License</span></p>