asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VCS plugin: SSH key dialog defaults to HOME

Browse source 
Fixes #65691.

(cherry picked from commit fc227ea919)
This commit is contained in:
Rémi Verschelde 2022-09-12 16:58:40 +02:00
parent 577b562428
commit c8a748e7b6
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/plugins/version_control_editor_plugin.cpp
View file

@ -1064,6 +1064,8 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
set_up_password->connect("text_changed", this, "_update_set_up_warning"); set_up_password->connect("text_changed", this, "_update_set_up_warning");
set_up_password_input->add_child(set_up_password); set_up_password_input->add_child(set_up_password);
const String home_dir = OS::get_singleton()->has_environment("HOME") ? OS::get_singleton()->get_environment("HOME") : OS::get_singleton()->get_system_dir(OS::SYSTEM_DIR_DOCUMENTS);
HBoxContainer *set_up_ssh_public_key_input = memnew(HBoxContainer); HBoxContainer *set_up_ssh_public_key_input = memnew(HBoxContainer);
set_up_ssh_public_key_input->set_h_size_flags(Control::SIZE_EXPAND_FILL); set_up_ssh_public_key_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
set_up_settings_vbc->add_child(set_up_ssh_public_key_input); set_up_settings_vbc->add_child(set_up_ssh_public_key_input);
@ -1087,10 +1089,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
set_up_ssh_public_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); set_up_ssh_public_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
set_up_ssh_public_key_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE); set_up_ssh_public_key_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE);
set_up_ssh_public_key_file_dialog->set_show_hidden_files(true); set_up_ssh_public_key_file_dialog->set_show_hidden_files(true);
// TODO: Make this start at the user's home folder set_up_ssh_public_key_file_dialog->set_current_dir(home_dir);
DirAccess *d = DirAccess::open(OS::get_singleton()->get_system_dir(OS::SystemDir::SYSTEM_DIR_DOCUMENTS));
d->change_dir("../");
set_up_ssh_public_key_file_dialog->set_current_dir(d->get_current_dir());
set_up_ssh_public_key_file_dialog->connect("file_selected", this, "_ssh_public_key_selected"); set_up_ssh_public_key_file_dialog->connect("file_selected", this, "_ssh_public_key_selected");
set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_file_dialog); set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_file_dialog);
@ -1123,9 +1122,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
set_up_ssh_private_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); set_up_ssh_private_key_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
set_up_ssh_private_key_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE); set_up_ssh_private_key_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE);
set_up_ssh_private_key_file_dialog->set_show_hidden_files(true); set_up_ssh_private_key_file_dialog->set_show_hidden_files(true);
// TODO: Make this start at the user's home folder set_up_ssh_private_key_file_dialog->set_current_dir(home_dir);
set_up_ssh_private_key_file_dialog->set_current_dir(d->get_current_dir());
memdelete(d);
set_up_ssh_private_key_file_dialog->connect("file_selected", this, "_ssh_private_key_selected"); set_up_ssh_private_key_file_dialog->connect("file_selected", this, "_ssh_private_key_selected");
set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_file_dialog); set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_file_dialog);