From ac3079b43301c1fcf0de3ed8bfaea427fb55391c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 6 Oct 2019 21:59:46 +0200 Subject: [PATCH] LibGUI: Add "Go home" to GCommonActions --- Applications/FileManager/main.cpp | 2 +- Libraries/LibGUI/GAction.cpp | 5 +++++ Libraries/LibGUI/GAction.h | 1 + Libraries/LibGUI/GFilePicker.cpp | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index fb4025877f..bcd61b19b2 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -257,7 +257,7 @@ int main(int argc, char** argv) directory_view->open_next_directory(); }); - auto go_home_action = GAction::create("Go to Home Directory", GraphicsBitmap::load_from_file("/res/icons/16x16/go-home.png"), [&](auto&) { + auto go_home_action = GCommonActions::make_go_home_action([&](auto&) { directory_view->open(get_current_user_home_path()); }); diff --git a/Libraries/LibGUI/GAction.cpp b/Libraries/LibGUI/GAction.cpp index 73376b0977..451da3ab7f 100644 --- a/Libraries/LibGUI/GAction.cpp +++ b/Libraries/LibGUI/GAction.cpp @@ -71,6 +71,11 @@ NonnullRefPtr make_go_forward_action(Function callback, return GAction::create("Go forward", { Mod_Alt, Key_Right }, GraphicsBitmap::load_from_file("/res/icons/16x16/go-forward.png"), move(callback), widget); } +NonnullRefPtr make_go_home_action(Function callback, GWidget* widget) +{ + return GAction::create("Go home", GraphicsBitmap::load_from_file("/res/icons/16x16/go-home.png"), move(callback), widget); +} + NonnullRefPtr make_reload_action(Function callback, GWidget* widget) { return GAction::create("Reload", { Mod_Ctrl, Key_R }, GraphicsBitmap::load_from_file("/res/icons/16x16/reload.png"), move(callback), widget); diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h index cb3e4752f2..285df968db 100644 --- a/Libraries/LibGUI/GAction.h +++ b/Libraries/LibGUI/GAction.h @@ -32,6 +32,7 @@ NonnullRefPtr make_fullscreen_action(Function, GWidget* NonnullRefPtr make_quit_action(Function); NonnullRefPtr make_go_back_action(Function, GWidget* widget = nullptr); NonnullRefPtr make_go_forward_action(Function, GWidget* widget = nullptr); +NonnullRefPtr make_go_home_action(Function callback, GWidget* widget = nullptr); NonnullRefPtr make_reload_action(Function, GWidget* widget = nullptr); }; diff --git a/Libraries/LibGUI/GFilePicker.cpp b/Libraries/LibGUI/GFilePicker.cpp index 9d649cf5af..f0648916d2 100644 --- a/Libraries/LibGUI/GFilePicker.cpp +++ b/Libraries/LibGUI/GFilePicker.cpp @@ -95,7 +95,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie }); toolbar->add_action(*open_parent_directory_action); - auto go_home_action = GAction::create("Go to Home Directory", GraphicsBitmap::load_from_file("/res/icons/16x16/go-home.png"), [this](auto&) { + auto go_home_action = GCommonActions::make_go_home_action([this](auto&) { m_model->open(get_current_user_home_path()); }); toolbar->add_action(go_home_action);