mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Nayla Hanegan 2024-06-11 23:33:05 -04:00
commit c924447345
5 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMake/ScmRevGen.cmake
View file

@ -7,7 +7,7 @@ if(GIT_FOUND)
OUTPUT_VARIABLE DOLPHIN_WC_REVISION OUTPUT_VARIABLE DOLPHIN_WC_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
# defines DOLPHIN_WC_DESCRIBE # defines DOLPHIN_WC_DESCRIBE
execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)

2
Source/Core/Common/make_scmrev.h.js
View file

@ -3,7 +3,7 @@ var oFS = new ActiveXObject("Scripting.FileSystemObject");
var outfile = "./scmrev.h"; var outfile = "./scmrev.h";
var cmd_revision = " rev-parse HEAD"; var cmd_revision = " rev-parse HEAD";
var cmd_describe = " describe --always --long --dirty"; var cmd_describe = " rev-parse --short HEAD";
var cmd_branch = " rev-parse --abbrev-ref HEAD"; var cmd_branch = " rev-parse --abbrev-ref HEAD";
var cmd_commits_ahead = " rev-list --count HEAD ^master"; var cmd_commits_ahead = " rev-list --count HEAD ^master";

3
Source/Core/DolphinQt/Settings/GeneralPane.cpp
View file

@ -231,6 +231,9 @@ void GeneralPane::CreateCheats()
code_handler_layout->addRow(code_handler_label, m_combobox_codehandler); code_handler_layout->addRow(code_handler_label, m_combobox_codehandler);
cheats_group_layout->addLayout(code_handler_layout); cheats_group_layout->addLayout(code_handler_layout);
code_handler_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
code_handler_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
} }
void GeneralPane::LoadConfig() void GeneralPane::LoadConfig()

4
Source/Core/DolphinQt/Settings/InterfacePane.cpp
View file

@ -131,7 +131,6 @@ void InterfacePane::CreateUI()
const QString qt_name = QString::fromStdString(PathToFileName(path)); const QString qt_name = QString::fromStdString(PathToFileName(path));
m_combobox_theme->addItem(qt_name); m_combobox_theme->addItem(qt_name);
} }
#ifdef _WIN32
// User Style Combobox // User Style Combobox
m_combobox_userstyle = new QComboBox; m_combobox_userstyle = new QComboBox;
m_label_userstyle = new QLabel(tr("Style:")); m_label_userstyle = new QLabel(tr("Style:"));
@ -140,18 +139,19 @@ void InterfacePane::CreateUI()
auto current = QOperatingSystemVersionBase::current(); auto current = QOperatingSystemVersionBase::current();
#ifdef _WIN32
if (current <= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10)) if (current <= QOperatingSystemVersion(QOperatingSystemVersion::Windows, 10))
{ {
m_combobox_userstyle->addItem(tr("Windows 11"), static_cast<int>(Settings::StyleType::Light)); m_combobox_userstyle->addItem(tr("Windows 11"), static_cast<int>(Settings::StyleType::Light));
m_combobox_userstyle->addItem(tr("Windows 10"), static_cast<int>(Settings::StyleType::Dark)); m_combobox_userstyle->addItem(tr("Windows 10"), static_cast<int>(Settings::StyleType::Dark));
} }
#endif
for (const std::string& path : userstyle_search_results) for (const std::string& path : userstyle_search_results)
{ {
const QFileInfo file_info(QString::fromStdString(path)); const QFileInfo file_info(QString::fromStdString(path));
m_combobox_userstyle->addItem(file_info.completeBaseName(), file_info.fileName()); m_combobox_userstyle->addItem(file_info.completeBaseName(), file_info.fileName());
} }
#endif
// Checkboxes // Checkboxes
m_checkbox_use_builtin_title_database = new QCheckBox(tr("Use Built-In Database of Game Names")); m_checkbox_use_builtin_title_database = new QCheckBox(tr("Use Built-In Database of Game Names"));

16
Source/Core/UICommon/AutoUpdate.cpp
View file

@ -29,10 +29,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if defined(_WIN32) || defined(__APPLE__)
#define OS_SUPPORTS_UPDATER
#endif
// Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process // Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
namespace namespace
@ -81,14 +77,6 @@ std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& fla
return cmdline; return cmdline;
} }
#ifdef __APPLE__
void CleanupFromPreviousUpdate()
{
// Remove the relocated updater file.
File::DeleteDirRecursively(UpdaterPath(true));
}
#endif
#endif #endif
// This ignores i18n because most of the text in there (change descriptions) is only going to be // This ignores i18n because most of the text in there (change descriptions) is only going to be
@ -186,10 +174,6 @@ void AutoUpdateChecker::CheckForUpdate(std::string_view update_track,
if (!SystemSupportsAutoUpdates() || update_track.empty()) if (!SystemSupportsAutoUpdates() || update_track.empty())
return; return;
#ifdef __APPLE__
CleanupFromPreviousUpdate();
#endif
std::string_view version_hash = hash_override.empty() ? Common::GetScmRevGitStr() : hash_override; std::string_view version_hash = hash_override.empty() ? Common::GetScmRevGitStr() : hash_override;
std::string url = fmt::format("{}/update/check/v1/{}/{}/{}", GetUpdateServerUrl(), update_track, std::string url = fmt::format("{}/update/check/v1/{}/{}/{}", GetUpdateServerUrl(), update_track,
version_hash, GetPlatformID()); version_hash, GetPlatformID());