mirror of https://github.com/AxioDL/metaforce.git
Fix Blender 2.83 & Qt 5.15
This commit is contained in:
parent
0dd67e0662
commit
af64349044
|
|
@ -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::NetworkError>(&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::NetworkError>(&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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this,
|
||||
[this, cvar](const QString& value) {
|
||||
cvar->fromInteger(value.toInt());
|
||||
connect(action, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
||||
[this, action, cvar](const int i) {
|
||||
cvar->fromInteger(action->itemText(i).toInt());
|
||||
m_cvarManager.serialize();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
<item row="1" column="0">
|
||||
<widget class="QTabWidget" name="heclTabs">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="dataTab">
|
||||
<attribute name="title">
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
<item row="0" column="0" rowspan="2">
|
||||
<widget class="QGroupBox" name="graphicsOptionsGroup">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
|
|
@ -234,6 +234,12 @@
|
|||
<layout class="QGridLayout" name="gridLayout_6">
|
||||
<item row="4" column="1">
|
||||
<widget class="QComboBox" name="anistropicFilteringBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>1</string>
|
||||
|
|
@ -270,6 +276,12 @@
|
|||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="antialiasingBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>1</string>
|
||||
|
|
@ -457,6 +469,12 @@
|
|||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>396</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Launch Options</string>
|
||||
</property>
|
||||
|
|
@ -499,6 +517,12 @@
|
|||
</item>
|
||||
<item row="4" column="1" rowspan="2">
|
||||
<widget class="QGroupBox" name="tweaksOptionsGroup">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>396</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Tweaks</string>
|
||||
</property>
|
||||
|
|
@ -1096,7 +1120,7 @@
|
|||
<string><!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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue