diff --git a/metaforce-gui/CMakeLists.txt b/metaforce-gui/CMakeLists.txt index e7cee6f89..5433bf099 100644 --- a/metaforce-gui/CMakeLists.txt +++ b/metaforce-gui/CMakeLists.txt @@ -146,10 +146,10 @@ elseif (APPLE) ) add_custom_command( TARGET metaforce-gui POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy $ $ + COMMAND ${CMAKE_COMMAND} -E copy $ $ COMMAND ${CMAKE_COMMAND} -E copy $ $ COMMAND ${CMAKE_COMMAND} -E copy $ $ - DEPENDS urde hecl visigen + DEPENDS metaforce hecl visigen ) if (NOT "${SENTRY_DSN}" STREQUAL "") add_custom_command( diff --git a/metaforce-gui/Common.cpp b/metaforce-gui/Common.cpp index 404799a4d..2a8d1b04b 100644 --- a/metaforce-gui/Common.cpp +++ b/metaforce-gui/Common.cpp @@ -159,10 +159,10 @@ QString URDEVersion::fileString(bool withExtension) const { } if (withExtension && !m_extension.isEmpty()) { - return QStringLiteral("urde-%1-%2-%3%4%5") + return QStringLiteral("metaforce-%1-%2-%3%4%5") .arg(m_version, PlatformToString(m_platform), ArchitectureToString(m_architecture), m_extra, m_extension); } else { - return QStringLiteral("urde-%1-%2-%3%4") + return QStringLiteral("metaforce-%1-%2-%3%4") .arg(m_version, PlatformToString(m_platform), ArchitectureToString(m_architecture), m_extra); } } diff --git a/metaforce-gui/MainWindow.cpp b/metaforce-gui/MainWindow.cpp index 15de3f569..db25b476d 100644 --- a/metaforce-gui/MainWindow.cpp +++ b/metaforce-gui/MainWindow.cpp @@ -89,7 +89,7 @@ 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("metaforce-") + QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate) + QStringLiteral(".log"); defaultFileName.replace(QLatin1Char(':'), QLatin1Char('-')); const QString fileName = @@ -141,7 +141,7 @@ void MainWindow::onExtract() { } const QString imgPath = - QFileDialog::getOpenFileName(this, tr("Extract Image"), m_path, tr("Images (*.iso *.wbfs *.gcm)")); + QFileDialog::getOpenFileName(this, tr("Extract Game"), m_path, tr("Images (*.iso *.wbfs *.gcm)")); if (imgPath.isEmpty()) { return; } @@ -358,7 +358,7 @@ void MainWindow::enableOperations() { if (!m_ui->sysReqTable->isBlenderVersionOk()) { insertContinueNote(tr("Blender 2.90 or greater must be installed. Please download via Steam or blender.org.")); } else if (m_ui->launchBtn->isEnabled()) { - insertContinueNote(tr("Package complete - Press 'Launch' to start URDE.")); + insertContinueNote(tr("Package complete - Press 'Launch' to start Metaforce.")); } else if (m_ui->packageBtn->isEnabled()) { insertContinueNote(tr("Extract complete - Press 'Package' to continue.")); } else if (m_ui->extractBtn->isEnabled()) { @@ -413,16 +413,16 @@ bool MainWindow::checkDownloadedBinary() { const QString dir = QApplication::instance()->applicationDirPath(); #if _WIN32 - QString urdePath = dir + QStringLiteral("/urde.exe"); + QString urdePath = dir + QStringLiteral("/metaforce.exe"); QString heclPath = dir + QStringLiteral("/hecl.exe"); QString visigenPath = dir + QStringLiteral("/visigen.exe"); if (!QFileInfo::exists(urdePath) || !QFileInfo::exists(heclPath) || !QFileInfo::exists(visigenPath)) { - urdePath = m_path + QStringLiteral("/urde.exe"); + urdePath = m_path + QStringLiteral("/metaforce.exe"); heclPath = m_path + QStringLiteral("/hecl.exe"); visigenPath = m_path + QStringLiteral("/visigen.exe"); } #else - QString urdePath = dir + QStringLiteral("/urde"); + QString urdePath = dir + QStringLiteral("/metaforce"); QString heclPath = dir + QStringLiteral("/hecl"); QString visigenPath = dir + QStringLiteral("/visigen"); #endif @@ -449,7 +449,7 @@ bool MainWindow::checkDownloadedBinary() { m_ui->currentBinaryLabel->setText(tr("none")); m_ui->heclTabs->setCurrentIndex(2); - m_ui->downloadErrorLabel->setText(tr("Press 'Download' to fetch latest URDE binary."), true); + m_ui->downloadErrorLabel->setText(tr("Press 'Download' to fetch latest Metaforce binary."), true); enableOperations(); return false; } diff --git a/metaforce-gui/MainWindow.ui b/metaforce-gui/MainWindow.ui index 2747beaf7..f8a7ca099 100644 --- a/metaforce-gui/MainWindow.ui +++ b/metaforce-gui/MainWindow.ui @@ -17,7 +17,7 @@ - HECL + Metaforce @@ -251,8 +251,8 @@ 0 0 - 450 - 633 + 428 + 592 @@ -402,8 +402,8 @@ 0 0 - 174 - 111 + 161 + 89 @@ -451,8 +451,8 @@ 0 0 - 450 - 633 + 212 + 47 @@ -486,8 +486,8 @@ 0 0 - 226 - 482 + 210 + 366 @@ -785,7 +785,7 @@ - Downloaded URDE version: + Downloaded Metaforce version: @@ -799,7 +799,7 @@ - Recommended URDE version: + Recommended Metaforce version: @@ -1205,12 +1205,12 @@ <!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:'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> +</style></head><body style=" font-family:'.AppleSystemUIFont'; font-size:13pt; 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 Metaforce</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 Metaforce 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> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; 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;">Copyright (c) 2015-2018 URDE Contributors</span></p> +<p style=" margin-top:0px; 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;">Copyright (c) 2015-2021 Metaforce Contributors</span></p> <p style=" margin-top:0px; 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;">Original Authors: Jack Andersen and Phillip &quot;Antidote&quot; Stephens</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Courier New'; font-size:10pt;"><br /></p> <p style=" margin-top:0px; 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;">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the &quot;Software&quot;), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</span></p> diff --git a/metaforce-gui/platforms/freedesktop/CMakeLists.txt b/metaforce-gui/platforms/freedesktop/CMakeLists.txt index 54c714032..49359e607 100644 --- a/metaforce-gui/platforms/freedesktop/CMakeLists.txt +++ b/metaforce-gui/platforms/freedesktop/CMakeLists.txt @@ -7,11 +7,11 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/metaforce-gui/platforms/freedeskto COMMAND $ ARGS ${CMAKE_BINARY_DIR}/metaforce-gui/platforms/freedesktop/mainicon_qt.bin DEPENDS - ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/128x128/apps/hecl.png - ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/64x64/apps/hecl.png - ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/48x48/apps/hecl.png - ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/32x32/apps/hecl.png - ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/16x16/apps/hecl.png + ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/128x128/apps/metaforce-gui.png + ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/64x64/apps/metaforce-gui.png + ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/48x48/apps/metaforce-gui.png + ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/32x32/apps/metaforce-gui.png + ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop/16x16/apps/metaforce-gui.png WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/metaforce-gui/platforms/freedesktop COMMENT "Generating mainicon_qt.bin") bintoc(mainicon_qt.cpp ${CMAKE_BINARY_DIR}/metaforce-gui/platforms/freedesktop/mainicon_qt.bin MAINICON_QT) diff --git a/metaforce-gui/platforms/freedesktop/mkqticon.c b/metaforce-gui/platforms/freedesktop/mkqticon.c index 2f9f873a4..1eb80fa95 100644 --- a/metaforce-gui/platforms/freedesktop/mkqticon.c +++ b/metaforce-gui/platforms/freedesktop/mkqticon.c @@ -36,7 +36,7 @@ int main(int argc, char* argv[]) printf("Rendering main icon @%dx%d\n", *d, *d); fflush(stdout); - snprintf(command, 2048, "%dx%d/apps/hecl.png", *d, *d); + snprintf(command, 2048, "%dx%d/apps/metaforce-gui.png", *d, *d); FILE* fp = fopen(command, "rb"); if (!fp) {