Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-23 12:43:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

VCS: Allow to stage and commit all files with Ctrl + Enter

Browse Source
This commit is contained in:
Andrii Doroshenko (Xrayez) 2021-07-13 20:04:47 +03:00
parent 79137a0260
commit d64e7a7299
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editor/plugins/version_control_editor_plugin.cpp
View File

@ -31,6 +31,7 @@
#include "version_control_editor_plugin.h" #include "version_control_editor_plugin.h"
#include "core/object/script_language.h" #include "core/object/script_language.h"
#include "core/os/keyboard.h"
#include "editor/editor_file_system.h" #include "editor/editor_file_system.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
@ -292,6 +293,29 @@ void VersionControlEditorPlugin::_update_commit_button() {
commit_button->set_disabled(commit_message->get_text().strip_edges() == ""); commit_button->set_disabled(commit_message->get_text().strip_edges() == "");
} }
void VersionControlEditorPlugin::_commit_message_gui_input(const Ref<InputEvent> &p_event) {
if (!commit_message->has_focus()) {
return;
}
if (commit_message->get_text().strip_edges().is_empty()) {
// Do not allow empty commit messages.
return;
}
const Ref<InputEventKey> k = p_event;
if (k.is_valid() && k->is_pressed()) {
if (ED_IS_SHORTCUT("version_control/commit", p_event)) {
if (staged_files_count == 0) {
// Stage all files only when no files were previously staged.
_stage_all();
}
_send_commit_msg();
commit_message->accept_event();
return;
}
}
}
void VersionControlEditorPlugin::register_editor() { void VersionControlEditorPlugin::register_editor() {
if (!EditorVCSInterface::get_singleton()) { if (!EditorVCSInterface::get_singleton()) {
EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock); EditorNode::get_singleton()->add_control_to_dock(EditorNode::DOCK_SLOT_RIGHT_UL, version_commit_dock);
@ -462,7 +486,9 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
commit_message->set_custom_minimum_size(Size2(200, 100)); commit_message->set_custom_minimum_size(Size2(200, 100));
commit_message->set_wrap_enabled(true); commit_message->set_wrap_enabled(true);
commit_message->connect("text_changed", callable_mp(this, &VersionControlEditorPlugin::_update_commit_button)); commit_message->connect("text_changed", callable_mp(this, &VersionControlEditorPlugin::_update_commit_button));
commit_message->connect("gui_input", callable_mp(this, &VersionControlEditorPlugin::_commit_message_gui_input));
commit_box_vbc->add_child(commit_message); commit_box_vbc->add_child(commit_message);
ED_SHORTCUT("version_control/commit", TTR("Commit"), KEY_MASK_CMD | KEY_ENTER);
commit_button = memnew(Button); commit_button = memnew(Button);
commit_button->set_text(TTR("Commit Changes")); commit_button->set_text(TTR("Commit Changes"));

1
editor/plugins/version_control_editor_plugin.h
View File

@ -111,6 +111,7 @@ private:
void _update_stage_status(); void _update_stage_status();
void _update_commit_status(); void _update_commit_status();
void _update_commit_button(); void _update_commit_button();
void _commit_message_gui_input(const Ref<InputEvent> &p_event);
friend class EditorVCSInterface; friend class EditorVCSInterface;