mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 23:17:45 +00:00
LibGfx: Remove try_
prefix from bitmap creation functions
Those don't have any non-try counterpart, so we might as well just omit it.
This commit is contained in:
parent
1971bff314
commit
82a152b696
186 changed files with 598 additions and 598 deletions
|
@ -56,7 +56,7 @@ ClockWidget::ClockWidget()
|
|||
m_prev_date = navigation_container.add<GUI::Button>();
|
||||
m_prev_date->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_prev_date->set_fixed_size(24, 24);
|
||||
m_prev_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-back.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_prev_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_prev_date->on_click = [&](auto) {
|
||||
unsigned view_month = m_calendar->view_month();
|
||||
unsigned view_year = m_calendar->view_year();
|
||||
|
@ -90,7 +90,7 @@ ClockWidget::ClockWidget()
|
|||
m_next_date = navigation_container.add<GUI::Button>();
|
||||
m_next_date->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_next_date->set_fixed_size(24, 24);
|
||||
m_next_date->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-forward.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_next_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_next_date->on_click = [&](auto) {
|
||||
unsigned view_month = m_calendar->view_month();
|
||||
unsigned view_year = m_calendar->view_year();
|
||||
|
@ -140,7 +140,7 @@ ClockWidget::ClockWidget()
|
|||
m_jump_to_button = settings_container.add<GUI::Button>();
|
||||
m_jump_to_button->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_jump_to_button->set_fixed_size(24, 24);
|
||||
m_jump_to_button->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/calendar-date.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_jump_to_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/calendar-date.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_jump_to_button->set_tooltip("Jump to today");
|
||||
m_jump_to_button->on_click = [this](auto) {
|
||||
jump_to_current_date();
|
||||
|
@ -149,7 +149,7 @@ ClockWidget::ClockWidget()
|
|||
m_calendar_launcher = settings_container.add<GUI::Button>();
|
||||
m_calendar_launcher->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_calendar_launcher->set_fixed_size(24, 24);
|
||||
m_calendar_launcher->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-calendar.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_calendar_launcher->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-calendar.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
m_calendar_launcher->set_tooltip("Calendar");
|
||||
m_calendar_launcher->on_click = [this](auto) {
|
||||
GUI::Process::spawn_or_show_error(window(), "/bin/Calendar"sv);
|
||||
|
@ -199,7 +199,7 @@ void ClockWidget::context_menu_event(GUI::ContextMenuEvent& event)
|
|||
if (!m_context_menu) {
|
||||
m_context_menu = GUI::Menu::construct();
|
||||
|
||||
auto settings_icon = MUST(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/settings.png"sv));
|
||||
auto settings_icon = MUST(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv));
|
||||
auto open_clock_settings_action = GUI::Action::create("Clock &Settings", *settings_icon, [this](auto&) {
|
||||
GUI::Process::spawn_or_show_error(window(), "/bin/ClockSettings"sv, Array { "--open-tab", "clock" });
|
||||
});
|
||||
|
|
|
@ -113,7 +113,7 @@ QuickLaunchWidget::QuickLaunchWidget()
|
|||
|
||||
ErrorOr<void> QuickLaunchWidget::create_context_menu()
|
||||
{
|
||||
auto icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png"sv));
|
||||
auto icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"sv));
|
||||
m_context_menu = GUI::Menu::construct();
|
||||
m_context_menu_default_action = GUI::Action::create("&Remove", icon, [this](auto&) {
|
||||
Config::remove_key("Taskbar"sv, quick_launch, m_context_menu_app_name);
|
||||
|
|
|
@ -63,7 +63,7 @@ ShutdownDialog::ShutdownDialog()
|
|||
icon_wrapper.set_layout<GUI::VerticalBoxLayout>();
|
||||
|
||||
auto& icon_image = icon_wrapper.add<GUI::ImageWidget>();
|
||||
icon_image.set_bitmap(Gfx::Bitmap::try_load_from_file("/res/icons/32x32/shutdown.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
icon_image.set_bitmap(Gfx::Bitmap::load_from_file("/res/icons/32x32/shutdown.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
|
||||
auto& right_container = content_container.add<GUI::Widget>();
|
||||
right_container.set_layout<GUI::VerticalBoxLayout>();
|
||||
|
@ -113,7 +113,7 @@ ShutdownDialog::ShutdownDialog()
|
|||
center_on_screen();
|
||||
set_resizable(false);
|
||||
set_title("Exit SerenityOS");
|
||||
set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"sv).release_value_but_fixme_should_propagate_errors());
|
||||
|
||||
// Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification.
|
||||
refresh_system_theme();
|
||||
|
|
|
@ -83,7 +83,7 @@ ErrorOr<void> TaskbarWindow::populate_taskbar()
|
|||
(void)TRY(m_task_button_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
m_task_button_container->layout()->set_spacing(3);
|
||||
|
||||
m_default_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/window.png"sv));
|
||||
m_default_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"sv));
|
||||
|
||||
m_applet_area_container = TRY(main_widget->try_add<GUI::Frame>());
|
||||
m_applet_area_container->set_frame_thickness(1);
|
||||
|
|
|
@ -119,7 +119,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window& window)
|
|||
Vector<DeprecatedString> const sorted_app_categories = TRY(discover_apps_and_categories());
|
||||
auto system_menu = TRY(GUI::Menu::try_create("\xE2\x9A\xA1")); // HIGH VOLTAGE SIGN
|
||||
|
||||
system_menu->add_action(GUI::Action::create("&About SerenityOS", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/ladyball.png"sv)), [&](auto&) {
|
||||
system_menu->add_action(GUI::Action::create("&About SerenityOS", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/ladyball.png"sv)), [&](auto&) {
|
||||
GUI::Process::spawn_or_show_error(&window, "/bin/About"sv);
|
||||
}));
|
||||
|
||||
|
@ -154,7 +154,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window& window)
|
|||
auto& category_menu = parent_menu->add_submenu(child_category);
|
||||
auto category_icon_path = category_icons->read_entry("16x16", category);
|
||||
if (!category_icon_path.is_empty()) {
|
||||
auto icon_or_error = Gfx::Bitmap::try_load_from_file(category_icon_path);
|
||||
auto icon_or_error = Gfx::Bitmap::load_from_file(category_icon_path);
|
||||
if (!icon_or_error.is_error())
|
||||
category_menu.set_icon(icon_or_error.release_value());
|
||||
}
|
||||
|
@ -221,7 +221,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window& window)
|
|||
g_themes_group.set_unchecking_allowed(false);
|
||||
|
||||
g_themes_menu = &system_menu->add_submenu("&Themes");
|
||||
g_themes_menu->set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/themes.png"sv)));
|
||||
g_themes_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/themes.png"sv)));
|
||||
|
||||
g_themes = TRY(Gfx::list_installed_system_themes());
|
||||
auto current_theme_name = GUI::ConnectionToWindowServer::the().get_system_theme();
|
||||
|
@ -254,15 +254,15 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window& window)
|
|||
}
|
||||
};
|
||||
|
||||
system_menu->add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-settings.png"sv)), [&](auto&) {
|
||||
system_menu->add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-settings.png"sv)), [&](auto&) {
|
||||
GUI::Process::spawn_or_show_error(&window, "/bin/Settings"sv);
|
||||
}));
|
||||
|
||||
system_menu->add_separator();
|
||||
system_menu->add_action(GUI::Action::create("&Help", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-help.png"sv)), [&](auto&) {
|
||||
system_menu->add_action(GUI::Action::create("&Help", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-help.png"sv)), [&](auto&) {
|
||||
GUI::Process::spawn_or_show_error(&window, "/bin/Help"sv);
|
||||
}));
|
||||
system_menu->add_action(GUI::Action::create("&Run...", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-run.png"sv)), [](auto&) {
|
||||
system_menu->add_action(GUI::Action::create("&Run...", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-run.png"sv)), [](auto&) {
|
||||
posix_spawn_file_actions_t spawn_actions;
|
||||
posix_spawn_file_actions_init(&spawn_actions);
|
||||
auto home_directory = Core::StandardPaths::home_directory();
|
||||
|
@ -280,7 +280,7 @@ ErrorOr<NonnullRefPtr<GUI::Menu>> build_system_menu(GUI::Window& window)
|
|||
posix_spawn_file_actions_destroy(&spawn_actions);
|
||||
}));
|
||||
system_menu->add_separator();
|
||||
system_menu->add_action(GUI::Action::create("E&xit...", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/power.png"sv)), [](auto&) {
|
||||
system_menu->add_action(GUI::Action::create("E&xit...", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"sv)), [](auto&) {
|
||||
auto command = ShutdownDialog::show();
|
||||
|
||||
if (command.size() == 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue