godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable "Commit" button in VCS plugin if there's no commit message

Browse Source
This commit is contained in:
Michael Alexsander 2020-12-20 13:43:50 -03:00
parent d3ff3dc6ce
commit 221738fb81
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/plugins/version_control_editor_plugin.cpp
View File

@ -119,19 +119,13 @@ void VersionControlEditorPlugin::_initialize_vcs() {
} }
void VersionControlEditorPlugin::_send_commit_msg() { void VersionControlEditorPlugin::_send_commit_msg() {
String msg = commit_message->get_text();
if (msg == "") {
commit_status->set_text(TTR("No commit message was provided"));
return;
}
if (EditorVCSInterface::get_singleton()) { if (EditorVCSInterface::get_singleton()) {
if (staged_files_count == 0) { if (staged_files_count == 0) {
commit_status->set_text(TTR("No files added to stage")); commit_status->set_text(TTR("No files added to stage"));
return; return;
} }
EditorVCSInterface::get_singleton()->commit(msg); EditorVCSInterface::get_singleton()->commit(commit_message->get_text());
commit_message->set_text(""); commit_message->set_text("");
version_control_dock_button->set_pressed(false); version_control_dock_button->set_pressed(false);
@ -294,6 +288,10 @@ void VersionControlEditorPlugin::_update_commit_status() {
staged_files_count = 0; staged_files_count = 0;
} }
void VersionControlEditorPlugin::_update_commit_button() {
commit_button->set_disabled(commit_message->get_text().strip_edges() == "");
}
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);
@ -463,10 +461,12 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
commit_message->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END); commit_message->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
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_box_vbc->add_child(commit_message); commit_box_vbc->add_child(commit_message);
commit_button = memnew(Button); commit_button = memnew(Button);
commit_button->set_text(TTR("Commit Changes")); commit_button->set_text(TTR("Commit Changes"));
commit_button->set_disabled(true);
commit_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_send_commit_msg)); commit_button->connect("pressed", callable_mp(this, &VersionControlEditorPlugin::_send_commit_msg));
commit_box_vbc->add_child(commit_button); commit_box_vbc->add_child(commit_button);

1
editor/plugins/version_control_editor_plugin.h
View File

@ -110,6 +110,7 @@ private:
void _clear_file_diff(); void _clear_file_diff();
void _update_stage_status(); void _update_stage_status();
void _update_commit_status(); void _update_commit_status();
void _update_commit_button();
friend class EditorVCSInterface; friend class EditorVCSInterface;