Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make project naming setting available in project manager #89788

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Make project naming setting available in project manager #89788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/project_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ void ProjectManager::_dim_window() {
// Quick settings.

void ProjectManager::_show_quick_settings() {
quick_settings_dialog->popup_centered(Size2(600, 200) * EDSCALE);
quick_settings_dialog->popup_centered(Size2(640, 200) * EDSCALE);
}

void ProjectManager::_restart_confirmed() {
Expand Down
34 changes: 34 additions & 0 deletions editor/project_manager/quick_settings_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
editor_themes.clear();
editor_scales.clear();
editor_network_modes.clear();
editor_directory_naming_conventions.clear();

{
List<PropertyInfo> editor_settings_properties;
Expand All @@ -61,6 +62,8 @@ void QuickSettingsDialog::_fetch_setting_values() {
editor_scales = pi.hint_string.split(",");
} else if (pi.name == "network/connection/network_mode") {
editor_network_modes = pi.hint_string.split(",");
} else if (pi.name == "project_manager/directory_naming_convention") {
editor_directory_naming_conventions = pi.hint_string.split(",");
}
}
}
Expand Down Expand Up @@ -120,6 +123,19 @@ void QuickSettingsDialog::_update_current_values() {
}
}
}

// Project directory naming options.
{
const int current_directory_naming = EDITOR_GET("project_manager/directory_naming_convention");

for (int i = 0; i < editor_directory_naming_conventions.size(); i++) {
const String &directory_naming_value = editor_directory_naming_conventions[i];
if (current_directory_naming == i) {
directory_naming_convention_button->set_text(directory_naming_value);
directory_naming_convention_button->select(i);
}
}
}
}

void QuickSettingsDialog::_add_setting_control(const String &p_text, Control *p_control) {
Expand Down Expand Up @@ -155,6 +171,10 @@ void QuickSettingsDialog::_network_mode_selected(int p_id) {
_set_setting_value("network/connection/network_mode", p_id);
}

void QuickSettingsDialog::_directory_naming_convention_selected(int p_id) {
_set_setting_value("project_manager/directory_naming_convention", p_id);
}

void QuickSettingsDialog::_set_setting_value(const String &p_setting, const Variant &p_value, bool p_restart_required) {
EditorSettings::get_singleton()->set(p_setting, p_value);
EditorSettings::get_singleton()->notify_changes();
Expand Down Expand Up @@ -284,6 +304,20 @@ QuickSettingsDialog::QuickSettingsDialog() {
_add_setting_control(TTR("Network Mode"), network_mode_option_button);
}

// Project directory naming options.
{
directory_naming_convention_button = memnew(OptionButton);
directory_naming_convention_button->set_fit_to_longest_item(false);
directory_naming_convention_button->connect(SceneStringName(item_selected), callable_mp(this, &QuickSettingsDialog::_directory_naming_convention_selected));

for (int i = 0; i < editor_directory_naming_conventions.size(); i++) {
const String &directory_naming_convention = editor_directory_naming_conventions[i];
directory_naming_convention_button->add_item(directory_naming_convention, i);
}

_add_setting_control(TTR("Directory Naming Convention"), directory_naming_convention_button);
}

_update_current_values();

#ifdef ANDROID_ENABLED
Expand Down
3 changes: 3 additions & 0 deletions editor/project_manager/quick_settings_dialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class QuickSettingsDialog : public AcceptDialog {
Vector<String> editor_themes;
Vector<String> editor_scales;
Vector<String> editor_network_modes;
Vector<String> editor_directory_naming_conventions;

void _fetch_setting_values();
void _update_current_values();
Expand All @@ -60,13 +61,15 @@ class QuickSettingsDialog : public AcceptDialog {
OptionButton *theme_option_button = nullptr;
OptionButton *scale_option_button = nullptr;
OptionButton *network_mode_option_button = nullptr;
OptionButton *directory_naming_convention_button = nullptr;

Label *custom_theme_label = nullptr;

void _language_selected(int p_id);
void _theme_selected(int p_id);
void _scale_selected(int p_id);
void _network_mode_selected(int p_id);
void _directory_naming_convention_selected(int p_id);
void _set_setting_value(const String &p_setting, const Variant &p_value, bool p_restart_required = false);

Label *restart_required_label = nullptr;
Expand Down
Loading