mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 02:37:36 +00:00
HackStudio: Add new multiline commit dialog
This new commit dialog features multi-line input and a line and column indicator. A great improvement over the last one, if you ask me! :^)
This commit is contained in:
parent
e92b6047ad
commit
4cfc992125
5 changed files with 141 additions and 6 deletions
50
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.cpp
Normal file
50
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.cpp
Normal file
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Conor Byrne <conor@cbyrne.dev>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "GitCommitDialog.h"
|
||||
#include <DevTools/HackStudio/Dialogs/Git/GitCommitDialogGML.h>
|
||||
|
||||
namespace HackStudio {
|
||||
|
||||
GitCommitDialog::GitCommitDialog(GUI::Window* parent)
|
||||
: Dialog(parent)
|
||||
{
|
||||
resize(400, 260);
|
||||
center_within(*parent);
|
||||
set_modal(true);
|
||||
set_title("Commit");
|
||||
set_icon(parent->icon());
|
||||
|
||||
auto& widget = set_main_widget<GUI::Widget>();
|
||||
widget.load_from_gml(git_commit_dialog_gml);
|
||||
|
||||
m_message_editor = widget.find_descendant_of_type_named<GUI::TextEditor>("message_editor");
|
||||
m_cancel_button = widget.find_descendant_of_type_named<GUI::Button>("cancel_button");
|
||||
m_commit_button = widget.find_descendant_of_type_named<GUI::Button>("commit_button");
|
||||
m_line_and_col_label = widget.find_descendant_of_type_named<GUI::Label>("line_and_col_label");
|
||||
|
||||
m_message_editor->on_change = [this]() {
|
||||
m_commit_button->set_enabled(!m_message_editor->text().is_empty() && on_commit);
|
||||
};
|
||||
m_message_editor->on_cursor_change = [this]() {
|
||||
auto line = m_message_editor->cursor().line() + 1;
|
||||
auto col = m_message_editor->cursor().column();
|
||||
|
||||
m_line_and_col_label->set_text(String::formatted("Line: {}, Col: {}", line, col));
|
||||
};
|
||||
|
||||
m_commit_button->set_enabled(!m_message_editor->text().is_empty() && on_commit);
|
||||
m_commit_button->on_click = [this](auto) {
|
||||
on_commit(m_message_editor->text());
|
||||
done(ExecResult::ExecOK);
|
||||
};
|
||||
|
||||
m_cancel_button->on_click = [this](auto) {
|
||||
done(ExecResult::ExecCancel);
|
||||
};
|
||||
}
|
||||
|
||||
}
|
42
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml
Normal file
42
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml
Normal file
|
@ -0,0 +1,42 @@
|
|||
@GUI::Frame {
|
||||
fill_with_background_color: true
|
||||
|
||||
layout: @GUI::VerticalBoxLayout {
|
||||
spacing: 4
|
||||
margins: [4, 4, 4, 4]
|
||||
}
|
||||
|
||||
@GUI::Label {
|
||||
text: "Enter commit message:"
|
||||
text_alignment: "CenterLeft"
|
||||
fixed_height: 20
|
||||
}
|
||||
|
||||
@GUI::TextEditor {
|
||||
name: "message_editor"
|
||||
}
|
||||
|
||||
@GUI::Widget {
|
||||
layout: @GUI::HorizontalBoxLayout
|
||||
shrink_to_fit: true
|
||||
|
||||
@GUI::Label {
|
||||
name: "line_and_col_label"
|
||||
text: "Line: 1, Col: 0"
|
||||
text_alignment: "CenterLeft"
|
||||
fixed_height: 20
|
||||
}
|
||||
|
||||
@GUI::Button {
|
||||
name: "commit_button"
|
||||
text: "Commit"
|
||||
fixed_width: 75
|
||||
}
|
||||
|
||||
@GUI::Button {
|
||||
name: "cancel_button"
|
||||
text: "Cancel"
|
||||
fixed_width: 75
|
||||
}
|
||||
}
|
||||
}
|
35
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.h
Normal file
35
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.h
Normal file
|
@ -0,0 +1,35 @@
|
|||
/*
|
||||
* Copyright (c) 2021, Conor Byrne <conor@cbyrne.dev>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/RefPtr.h>
|
||||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/Dialog.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/TextEditor.h>
|
||||
#include <LibGUI/Window.h>
|
||||
|
||||
namespace HackStudio {
|
||||
|
||||
using OnCommitCallback = Function<void(String const& message)>;
|
||||
|
||||
class GitCommitDialog final : public GUI::Dialog {
|
||||
C_OBJECT(GitCommitDialog);
|
||||
|
||||
public:
|
||||
OnCommitCallback on_commit;
|
||||
|
||||
private:
|
||||
GitCommitDialog(GUI::Window* parent);
|
||||
|
||||
RefPtr<GUI::Button> m_commit_button;
|
||||
RefPtr<GUI::Button> m_cancel_button;
|
||||
RefPtr<GUI::TextEditor> m_message_editor;
|
||||
RefPtr<GUI::Label> m_line_and_col_label;
|
||||
};
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue