Sara/api_tester
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated godot version

Browse source
This commit is contained in:
Sara Gerretsen 2026-04-04 19:38:56 +02:00
parent 0c508b0831
commit 42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engine/editor/project_manager/quick_settings_dialog.cpp
View file

@ -30,8 +30,7 @@
#include "quick_settings_dialog.h"
#include "core/object/callable_mp.h"
#include "core/object/class_db.h" // IWYU pragma: keep. `ADD_SIGNAL` macro.
#include "core/string/translation_server.h"
#include "editor/doc/editor_help.h"
#include "editor/editor_string_names.h"
#include "editor/inspector/editor_properties.h"
@ -43,7 +42,6 @@
#include "scene/gui/label.h"
#include "scene/gui/option_button.h"
#include "scene/gui/panel_container.h"
#include "servers/display/display_server.h"
void QuickSettingsDialog::_fetch_setting_values() {
#ifndef ANDROID_ENABLED
@ -61,7 +59,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
EditorSettings::get_singleton()->get_property_list(&editor_settings_properties);
for (const PropertyInfo &pi : editor_settings_properties) {
if (pi.name == "interface/editor/localization/editor_language") {
if (pi.name == "interface/editor/editor_language") {
#ifndef ANDROID_ENABLED
editor_languages = pi.hint_string.split(";", false);
#endif
@ -69,7 +67,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
editor_styles = pi.hint_string.split(",");
} else if (pi.name == "interface/theme/color_preset") {
editor_themes = pi.hint_string.split(",");
} else if (pi.name == "interface/editor/appearance/display_scale") {
} else if (pi.name == "interface/editor/display_scale") {
editor_scales = pi.hint_string.split(",");
} else if (pi.name == "network/connection/network_mode") {
editor_network_modes = pi.hint_string.split(",");
@ -86,7 +84,7 @@ void QuickSettingsDialog::_update_current_values() {
#ifndef ANDROID_ENABLED
// Language options.
{
const String current_lang = EDITOR_GET("interface/editor/localization/editor_language");
const String current_lang = EDITOR_GET("interface/editor/editor_language");
for (int i = 0; i < editor_languages.size(); i++) {
const String &lang_value = editor_languages[i].get_slicec('/', 0);
@ -128,7 +126,7 @@ void QuickSettingsDialog::_update_current_values() {
// Scale options.
{
const int current_scale = EDITOR_GET("interface/editor/appearance/display_scale");
const int current_scale = EDITOR_GET("interface/editor/display_scale");
for (int i = 0; i < editor_scales.size(); i++) {
const String &scale_value = editor_scales[i];
@ -197,7 +195,7 @@ void QuickSettingsDialog::_add_setting_control(const String &p_text, Control *p_
#ifndef ANDROID_ENABLED
void QuickSettingsDialog::_language_selected(int p_id) {
const String selected_language = language_option_button->get_item_metadata(p_id);
_set_setting_value("interface/editor/localization/editor_language", selected_language);
_set_setting_value("interface/editor/editor_language", selected_language);
}
#endif
@ -214,7 +212,7 @@ void QuickSettingsDialog::_theme_selected(int p_id) {
}
void QuickSettingsDialog::_scale_selected(int p_id) {
_set_setting_value("interface/editor/appearance/display_scale", p_id, true);
_set_setting_value("interface/editor/display_scale", p_id, true);
}
void QuickSettingsDialog::_network_mode_selected(int p_id) {
@ -241,7 +239,7 @@ void QuickSettingsDialog::_set_setting_value(const String &p_setting, const Vari
restart_required_label->show();
if (!restart_required_button) {
int ed_swap_cancel_ok = EDITOR_GET("interface/editor/appearance/accept_dialog_cancel_ok_buttons");
int ed_swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
if (ed_swap_cancel_ok == 0) {
ed_swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
}