RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 22:08:12 +00:00
Code Issues Activity Actions

LibGUI: Rename Action::long_text to Action::status_tip

Browse source 
This feels a bit more descriptive.
This commit is contained in:
Andreas Kling 2021-04-18 00:17:04 +02:00
parent aa254ffd66
commit a2086ad56e
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/Browser/Tab.cpp
View file

@ -486,7 +486,7 @@ Tab::Tab(Type type)
m_web_content_view->debug_request("spoof-user-agent", Web::default_user_agent); m_web_content_view->debug_request("spoof-user-agent", Web::default_user_agent);
} }
}); });
m_disable_user_agent_spoofing->set_long_text(Web::default_user_agent); m_disable_user_agent_spoofing->set_status_tip(Web::default_user_agent);
spoof_user_agent_menu.add_action(*m_disable_user_agent_spoofing); spoof_user_agent_menu.add_action(*m_disable_user_agent_spoofing);
m_user_agent_spoof_actions.add_action(*m_disable_user_agent_spoofing); m_user_agent_spoof_actions.add_action(*m_disable_user_agent_spoofing);
m_disable_user_agent_spoofing->set_checked(true); m_disable_user_agent_spoofing->set_checked(true);
@ -499,7 +499,7 @@ Tab::Tab(Type type)
m_web_content_view->debug_request("spoof-user-agent", user_agent); m_web_content_view->debug_request("spoof-user-agent", user_agent);
} }
}); });
action->set_long_text(user_agent); action->set_status_tip(user_agent);
spoof_user_agent_menu.add_action(action); spoof_user_agent_menu.add_action(action);
m_user_agent_spoof_actions.add_action(action); m_user_agent_spoof_actions.add_action(action);
}; };
@ -521,7 +521,7 @@ Tab::Tab(Type type)
} else { } else {
m_web_content_view->debug_request("spoof-user-agent", user_agent); m_web_content_view->debug_request("spoof-user-agent", user_agent);
} }
action.set_long_text(user_agent); action.set_status_tip(user_agent);
}); });
spoof_user_agent_menu.add_action(custom_user_agent); spoof_user_agent_menu.add_action(custom_user_agent);
m_user_agent_spoof_actions.add_action(custom_user_agent); m_user_agent_spoof_actions.add_action(custom_user_agent);
@ -661,8 +661,8 @@ void Tab::action_entered(GUI::Action& action)
m_user_agent_spoof_actions.for_each_action([&](GUI::Action& user_agent_action) { m_user_agent_spoof_actions.for_each_action([&](GUI::Action& user_agent_action) {
if (&action != &user_agent_action) if (&action != &user_agent_action)
return IterationDecision::Continue; return IterationDecision::Continue;
if (!user_agent_action.long_text().is_empty()) if (!user_agent_action.status_tip().is_empty())
m_statusbar->set_override_text(user_agent_action.long_text()); m_statusbar->set_override_text(user_agent_action.status_tip());
return IterationDecision::Break; return IterationDecision::Break;
}); });
} }

2
Userland/Applications/TextEditor/TextEditorWidget.cpp
View file

@ -276,7 +276,7 @@ TextEditorWidget::TextEditorWidget()
m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar"); m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
GUI::Application::the()->on_action_enter = [this](GUI::Action& action) { GUI::Application::the()->on_action_enter = [this](GUI::Action& action) {
auto text = action.long_text(); auto text = action.status_tip();
if (text.is_empty()) if (text.is_empty())
text = Gfx::parse_ampersand_string(action.text()); text = Gfx::parse_ampersand_string(action.text());
m_statusbar->set_override_text(move(text)); m_statusbar->set_override_text(move(text));

6
Userland/Libraries/LibGUI/Action.cpp
View file

@ -49,21 +49,21 @@ NonnullRefPtr<Action> make_about_action(const String& app_name, const Icon& app_
NonnullRefPtr<Action> make_open_action(Function<void(Action&)> callback, Core::Object* parent) NonnullRefPtr<Action> make_open_action(Function<void(Action&)> callback, Core::Object* parent)
{ {
auto action = Action::create("&Open...", { Mod_Ctrl, Key_O }, Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"), move(callback), parent); auto action = Action::create("&Open...", { Mod_Ctrl, Key_O }, Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"), move(callback), parent);
action->set_long_text("Open an existing file"); action->set_status_tip("Open an existing file");
return action; return action;
} }
NonnullRefPtr<Action> make_save_action(Function<void(Action&)> callback, Core::Object* parent) NonnullRefPtr<Action> make_save_action(Function<void(Action&)> callback, Core::Object* parent)
{ {
auto action = Action::create("&Save", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), move(callback), parent); auto action = Action::create("&Save", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), move(callback), parent);
action->set_long_text("Save the current file"); action->set_status_tip("Save the current file");
return action; return action;
} }
NonnullRefPtr<Action> make_save_as_action(Function<void(Action&)> callback, Core::Object* parent) NonnullRefPtr<Action> make_save_as_action(Function<void(Action&)> callback, Core::Object* parent)
{ {
auto action = Action::create("Save &As...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), move(callback), parent); auto action = Action::create("Save &As...", { Mod_Ctrl | Mod_Shift, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/save.png"), move(callback), parent);
action->set_long_text("Save the current file with a new name"); action->set_status_tip("Save the current file with a new name");
return action; return action;
} }

6
Userland/Libraries/LibGUI/Action.h
View file

@ -88,8 +88,8 @@ public:
String text() const { return m_text; } String text() const { return m_text; }
void set_text(String text) { m_text = move(text); } void set_text(String text) { m_text = move(text); }
String const& long_text() const { return m_long_text; } String const& status_tip() const { return m_status_tip; }
void set_long_text(String long_text) { m_long_text = move(long_text); } void set_status_tip(String status_tip) { m_status_tip = move(status_tip); }
Shortcut shortcut() const { return m_shortcut; } Shortcut shortcut() const { return m_shortcut; }
const Gfx::Bitmap* icon() const { return m_icon.ptr(); } const Gfx::Bitmap* icon() const { return m_icon.ptr(); }
@ -138,7 +138,7 @@ private:
void for_each_menu_item(Callback); void for_each_menu_item(Callback);
String m_text; String m_text;
String m_long_text; String m_status_tip;
RefPtr<Gfx::Bitmap> m_icon; RefPtr<Gfx::Bitmap> m_icon;
Shortcut m_shortcut; Shortcut m_shortcut;
bool m_enabled { true }; bool m_enabled { true };