mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-06-03 00:42:54 +00:00
LibGUI: Put all classes in the GUI namespace and remove the leading G
This took me a moment. Welcome to the new world of GUI::Widget! :^)
This commit is contained in:
Andreas Kling
parent
2d39da5405
commit
c5bd9d4ed1
Notes:
sideshowbarker
2024-07-19 09:41:33 +09:00
Author: https://github.com/awesomekling
Commit: c5bd9d4ed1
337 changed files with 5400 additions and 4816 deletions
|
|
@ -39,14 +39,16 @@
|
|||
#include <LibGUI/GTextBox.h>
|
||||
#include <LibGUI/GToolBar.h>
|
||||
|
||||
Optional<String> GFilePicker::get_open_filepath(const String& window_title)
|
||||
namespace GUI {
|
||||
|
||||
Optional<String> FilePicker::get_open_filepath(const String& window_title)
|
||||
{
|
||||
auto picker = GFilePicker::construct(Mode::Open);
|
||||
auto picker = FilePicker::construct(Mode::Open);
|
||||
|
||||
if (!window_title.is_null())
|
||||
picker->set_title(window_title);
|
||||
|
||||
if (picker->exec() == GDialog::ExecOK) {
|
||||
if (picker->exec() == Dialog::ExecOK) {
|
||||
String file_path = picker->selected_file().string();
|
||||
|
||||
if (file_path.is_null())
|
||||
|
|
@ -57,11 +59,11 @@ Optional<String> GFilePicker::get_open_filepath(const String& window_title)
|
|||
return {};
|
||||
}
|
||||
|
||||
Optional<String> GFilePicker::get_save_filepath(const String& title, const String& extension)
|
||||
Optional<String> FilePicker::get_save_filepath(const String& title, const String& extension)
|
||||
{
|
||||
auto picker = GFilePicker::construct(Mode::Save, String::format("%s.%s", title.characters(), extension.characters()));
|
||||
auto picker = FilePicker::construct(Mode::Save, String::format("%s.%s", title.characters(), extension.characters()));
|
||||
|
||||
if (picker->exec() == GDialog::ExecOK) {
|
||||
if (picker->exec() == Dialog::ExecOK) {
|
||||
String file_path = picker->selected_file().string();
|
||||
|
||||
if (file_path.is_null())
|
||||
|
|
@ -72,45 +74,45 @@ Optional<String> GFilePicker::get_save_filepath(const String& title, const Strin
|
|||
return {};
|
||||
}
|
||||
|
||||
GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringView& path, Core::Object* parent)
|
||||
: GDialog(parent)
|
||||
, m_model(GFileSystemModel::create())
|
||||
FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView& path, Core::Object* parent)
|
||||
: Dialog(parent)
|
||||
, m_model(FileSystemModel::create())
|
||||
, m_mode(mode)
|
||||
{
|
||||
set_title(m_mode == Mode::Open ? "Open File" : "Save File");
|
||||
set_rect(200, 200, 700, 400);
|
||||
auto horizontal_container = GWidget::construct();
|
||||
auto horizontal_container = Widget::construct();
|
||||
set_main_widget(horizontal_container);
|
||||
horizontal_container->set_layout(make<GHBoxLayout>());
|
||||
horizontal_container->set_layout(make<HBoxLayout>());
|
||||
horizontal_container->layout()->set_margins({ 4, 4, 4, 4 });
|
||||
horizontal_container->set_fill_with_background_color(true);
|
||||
|
||||
auto vertical_container = GWidget::construct(horizontal_container.ptr());
|
||||
vertical_container->set_layout(make<GVBoxLayout>());
|
||||
auto vertical_container = Widget::construct(horizontal_container.ptr());
|
||||
vertical_container->set_layout(make<VBoxLayout>());
|
||||
vertical_container->layout()->set_spacing(4);
|
||||
|
||||
auto upper_container = GWidget::construct(vertical_container.ptr());
|
||||
upper_container->set_layout(make<GHBoxLayout>());
|
||||
auto upper_container = Widget::construct(vertical_container.ptr());
|
||||
upper_container->set_layout(make<HBoxLayout>());
|
||||
upper_container->layout()->set_spacing(4);
|
||||
upper_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
upper_container->set_preferred_size(0, 26);
|
||||
|
||||
auto toolbar = GToolBar::construct(upper_container);
|
||||
auto toolbar = ToolBar::construct(upper_container);
|
||||
toolbar->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
toolbar->set_preferred_size(85, 0);
|
||||
toolbar->set_has_frame(false);
|
||||
|
||||
auto location_textbox = GTextBox::construct(upper_container);
|
||||
auto location_textbox = TextBox::construct(upper_container);
|
||||
location_textbox->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
location_textbox->set_preferred_size(0, 20);
|
||||
|
||||
m_view = GTableView::construct(vertical_container);
|
||||
m_view->set_model(GSortingProxyModel::create(*m_model));
|
||||
m_view->set_column_hidden(GFileSystemModel::Column::Owner, true);
|
||||
m_view->set_column_hidden(GFileSystemModel::Column::Group, true);
|
||||
m_view->set_column_hidden(GFileSystemModel::Column::Permissions, true);
|
||||
m_view->set_column_hidden(GFileSystemModel::Column::Inode, true);
|
||||
m_view->set_column_hidden(GFileSystemModel::Column::SymlinkTarget, true);
|
||||
m_view = TableView::construct(vertical_container);
|
||||
m_view->set_model(SortingProxyModel::create(*m_model));
|
||||
m_view->set_column_hidden(FileSystemModel::Column::Owner, true);
|
||||
m_view->set_column_hidden(FileSystemModel::Column::Group, true);
|
||||
m_view->set_column_hidden(FileSystemModel::Column::Permissions, true);
|
||||
m_view->set_column_hidden(FileSystemModel::Column::Inode, true);
|
||||
m_view->set_column_hidden(FileSystemModel::Column::SymlinkTarget, true);
|
||||
m_model->set_root_path(path);
|
||||
|
||||
location_textbox->on_return_pressed = [&] {
|
||||
|
|
@ -118,28 +120,28 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
clear_preview();
|
||||
};
|
||||
|
||||
auto open_parent_directory_action = GAction::create("Open parent directory", { Mod_Alt, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"), [this](const GAction&) {
|
||||
auto open_parent_directory_action = Action::create("Open parent directory", { Mod_Alt, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"), [this](const Action&) {
|
||||
m_model->set_root_path(String::format("%s/..", m_model->root_path().characters()));
|
||||
clear_preview();
|
||||
});
|
||||
toolbar->add_action(*open_parent_directory_action);
|
||||
|
||||
auto go_home_action = GCommonActions::make_go_home_action([this](auto&) {
|
||||
auto go_home_action = CommonActions::make_go_home_action([this](auto&) {
|
||||
m_model->set_root_path(get_current_user_home_path());
|
||||
});
|
||||
toolbar->add_action(go_home_action);
|
||||
toolbar->add_separator();
|
||||
|
||||
auto mkdir_action = GAction::create("New directory...", GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [this](const GAction&) {
|
||||
auto input_box = GInputBox::construct("Enter name:", "New directory", this);
|
||||
if (input_box->exec() == GInputBox::ExecOK && !input_box->text_value().is_empty()) {
|
||||
auto mkdir_action = Action::create("New directory...", GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [this](const Action&) {
|
||||
auto input_box = InputBox::construct("Enter name:", "New directory", this);
|
||||
if (input_box->exec() == InputBox::ExecOK && !input_box->text_value().is_empty()) {
|
||||
auto new_dir_path = FileSystemPath(String::format("%s/%s",
|
||||
m_model->root_path().characters(),
|
||||
input_box->text_value().characters()))
|
||||
.string();
|
||||
int rc = mkdir(new_dir_path.characters(), 0777);
|
||||
if (rc < 0) {
|
||||
GMessageBox::show(String::format("mkdir(\"%s\") failed: %s", new_dir_path.characters(), strerror(errno)), "Error", GMessageBox::Type::Error, GMessageBox::InputType::OK, this);
|
||||
MessageBox::show(String::format("mkdir(\"%s\") failed: %s", new_dir_path.characters(), strerror(errno)), "Error", MessageBox::Type::Error, MessageBox::InputType::OK, this);
|
||||
} else {
|
||||
m_model->update();
|
||||
}
|
||||
|
|
@ -147,21 +149,21 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
});
|
||||
toolbar->add_action(*mkdir_action);
|
||||
|
||||
auto lower_container = GWidget::construct(vertical_container.ptr());
|
||||
lower_container->set_layout(make<GVBoxLayout>());
|
||||
auto lower_container = Widget::construct(vertical_container.ptr());
|
||||
lower_container->set_layout(make<VBoxLayout>());
|
||||
lower_container->layout()->set_spacing(4);
|
||||
lower_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
lower_container->set_preferred_size(0, 60);
|
||||
|
||||
auto filename_container = GWidget::construct(lower_container.ptr());
|
||||
auto filename_container = Widget::construct(lower_container.ptr());
|
||||
filename_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
filename_container->set_preferred_size(0, 20);
|
||||
filename_container->set_layout(make<GHBoxLayout>());
|
||||
auto filename_label = GLabel::construct("File name:", filename_container);
|
||||
filename_container->set_layout(make<HBoxLayout>());
|
||||
auto filename_label = Label::construct("File name:", filename_container);
|
||||
filename_label->set_text_alignment(TextAlignment::CenterLeft);
|
||||
filename_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
filename_label->set_preferred_size(60, 0);
|
||||
m_filename_textbox = GTextBox::construct(filename_container.ptr());
|
||||
m_filename_textbox = TextBox::construct(filename_container.ptr());
|
||||
if (m_mode == Mode::Save) {
|
||||
m_filename_textbox->set_text(file_name);
|
||||
m_filename_textbox->set_focus(true);
|
||||
|
|
@ -172,9 +174,9 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
};
|
||||
|
||||
m_view->on_selection = [this](auto& index) {
|
||||
auto& filter_model = (GSortingProxyModel&)*m_view->model();
|
||||
auto& filter_model = (SortingProxyModel&)*m_view->model();
|
||||
auto local_index = filter_model.map_to_target(index);
|
||||
const GFileSystemModel::Node& node = m_model->node(local_index);
|
||||
const FileSystemModel::Node& node = m_model->node(local_index);
|
||||
FileSystemPath path { node.full_path(m_model) };
|
||||
|
||||
clear_preview();
|
||||
|
|
@ -184,14 +186,14 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
set_preview(path);
|
||||
};
|
||||
|
||||
auto button_container = GWidget::construct(lower_container.ptr());
|
||||
auto button_container = Widget::construct(lower_container.ptr());
|
||||
button_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
button_container->set_preferred_size(0, 20);
|
||||
button_container->set_layout(make<GHBoxLayout>());
|
||||
button_container->set_layout(make<HBoxLayout>());
|
||||
button_container->layout()->set_spacing(4);
|
||||
button_container->layout()->add_spacer();
|
||||
|
||||
auto cancel_button = GButton::construct(button_container);
|
||||
auto cancel_button = Button::construct(button_container);
|
||||
cancel_button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
cancel_button->set_preferred_size(80, 0);
|
||||
cancel_button->set_text("Cancel");
|
||||
|
|
@ -199,7 +201,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
done(ExecCancel);
|
||||
};
|
||||
|
||||
auto ok_button = GButton::construct(button_container);
|
||||
auto ok_button = Button::construct(button_container);
|
||||
ok_button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
ok_button->set_preferred_size(80, 0);
|
||||
ok_button->set_text(ok_button_name(m_mode));
|
||||
|
|
@ -208,9 +210,9 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
};
|
||||
|
||||
m_view->on_activation = [this](auto& index) {
|
||||
auto& filter_model = (GSortingProxyModel&)*m_view->model();
|
||||
auto& filter_model = (SortingProxyModel&)*m_view->model();
|
||||
auto local_index = filter_model.map_to_target(index);
|
||||
const GFileSystemModel::Node& node = m_model->node(local_index);
|
||||
const FileSystemModel::Node& node = m_model->node(local_index);
|
||||
auto path = node.full_path(m_model);
|
||||
|
||||
if (node.is_directory()) {
|
||||
|
|
@ -221,35 +223,35 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
|
|||
}
|
||||
};
|
||||
|
||||
auto preview_container = GFrame::construct(horizontal_container);
|
||||
auto preview_container = Frame::construct(horizontal_container);
|
||||
preview_container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
|
||||
preview_container->set_preferred_size(180, 0);
|
||||
preview_container->set_frame_shape(FrameShape::Container);
|
||||
preview_container->set_frame_shadow(FrameShadow::Sunken);
|
||||
preview_container->set_frame_thickness(2);
|
||||
preview_container->set_layout(make<GVBoxLayout>());
|
||||
preview_container->set_layout(make<VBoxLayout>());
|
||||
preview_container->layout()->set_margins({ 8, 8, 8, 8 });
|
||||
|
||||
m_preview_image_label = GLabel::construct(preview_container);
|
||||
m_preview_image_label = Label::construct(preview_container);
|
||||
m_preview_image_label->set_should_stretch_icon(true);
|
||||
m_preview_image_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
|
||||
m_preview_image_label->set_preferred_size(160, 160);
|
||||
|
||||
m_preview_name_label = GLabel::construct(preview_container);
|
||||
m_preview_name_label = Label::construct(preview_container);
|
||||
m_preview_name_label->set_font(Font::default_bold_font());
|
||||
m_preview_name_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_preview_name_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());
|
||||
|
||||
m_preview_geometry_label = GLabel::construct(preview_container);
|
||||
m_preview_geometry_label = Label::construct(preview_container);
|
||||
m_preview_geometry_label->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
|
||||
m_preview_geometry_label->set_preferred_size(0, m_preview_name_label->font().glyph_height());
|
||||
}
|
||||
|
||||
GFilePicker::~GFilePicker()
|
||||
FilePicker::~FilePicker()
|
||||
{
|
||||
}
|
||||
|
||||
void GFilePicker::set_preview(const FileSystemPath& path)
|
||||
void FilePicker::set_preview(const FileSystemPath& path)
|
||||
{
|
||||
if (path.has_extension(".png")) {
|
||||
auto bitmap = load_png(path.string());
|
||||
|
|
@ -265,20 +267,20 @@ void GFilePicker::set_preview(const FileSystemPath& path)
|
|||
}
|
||||
}
|
||||
|
||||
void GFilePicker::clear_preview()
|
||||
void FilePicker::clear_preview()
|
||||
{
|
||||
m_preview_image_label->set_icon(nullptr);
|
||||
m_preview_name_label->set_text(String::empty());
|
||||
m_preview_geometry_label->set_text(String::empty());
|
||||
}
|
||||
|
||||
void GFilePicker::on_file_return()
|
||||
void FilePicker::on_file_return()
|
||||
{
|
||||
FileSystemPath path(String::format("%s/%s", m_model->root_path().characters(), m_filename_textbox->text().characters()));
|
||||
|
||||
if (GFilePicker::file_exists(path.string()) && m_mode == Mode::Save) {
|
||||
auto result = GMessageBox::show("File already exists, overwrite?", "Existing File", GMessageBox::Type::Warning, GMessageBox::InputType::OKCancel);
|
||||
if (result == GMessageBox::ExecCancel)
|
||||
if (FilePicker::file_exists(path.string()) && m_mode == Mode::Save) {
|
||||
auto result = MessageBox::show("File already exists, overwrite?", "Existing File", MessageBox::Type::Warning, MessageBox::InputType::OKCancel);
|
||||
if (result == MessageBox::ExecCancel)
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -286,7 +288,7 @@ void GFilePicker::on_file_return()
|
|||
done(ExecOK);
|
||||
}
|
||||
|
||||
bool GFilePicker::file_exists(const StringView& path)
|
||||
bool FilePicker::file_exists(const StringView& path)
|
||||
{
|
||||
struct stat st;
|
||||
int rc = stat(String(path).characters(), &st);
|
||||
|
|
@ -299,3 +301,5 @@ bool GFilePicker::file_exists(const StringView& path)
|
|||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue