mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 04:47:34 +00:00
Userland: Port to automatic GML initializer where possible
This commit is contained in:
parent
dec066fa5c
commit
adc845e0cb
41 changed files with 148 additions and 245 deletions
|
@ -15,14 +15,7 @@
|
|||
|
||||
namespace Maps {
|
||||
|
||||
ErrorOr<NonnullRefPtr<FavoritesPanel>> FavoritesPanel::create()
|
||||
{
|
||||
auto widget = TRY(try_create());
|
||||
TRY(widget->setup());
|
||||
return widget;
|
||||
}
|
||||
|
||||
ErrorOr<void> FavoritesPanel::setup()
|
||||
ErrorOr<void> FavoritesPanel::initialize()
|
||||
{
|
||||
m_empty_container = *find_descendant_of_type_named<GUI::Frame>("empty_container");
|
||||
m_favorites_list = *find_descendant_of_type_named<GUI::ListView>("favorites_list");
|
||||
|
|
|
@ -22,7 +22,8 @@ public:
|
|||
MapWidget::LatLng latlng;
|
||||
int zoom;
|
||||
};
|
||||
static ErrorOr<NonnullRefPtr<FavoritesPanel>> create();
|
||||
static ErrorOr<NonnullRefPtr<FavoritesPanel>> try_create();
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
void load_favorites();
|
||||
void reset();
|
||||
|
@ -34,10 +35,6 @@ public:
|
|||
protected:
|
||||
FavoritesPanel() = default;
|
||||
|
||||
static ErrorOr<NonnullRefPtr<FavoritesPanel>> try_create();
|
||||
|
||||
ErrorOr<void> setup();
|
||||
|
||||
private:
|
||||
ErrorOr<void> edit_favorite(int row);
|
||||
void favorites_changed();
|
||||
|
|
|
@ -9,14 +9,7 @@
|
|||
|
||||
namespace Maps {
|
||||
|
||||
ErrorOr<NonnullRefPtr<SearchPanel>> SearchPanel::create()
|
||||
{
|
||||
auto widget = TRY(try_create());
|
||||
TRY(widget->setup());
|
||||
return widget;
|
||||
}
|
||||
|
||||
ErrorOr<void> SearchPanel::setup()
|
||||
ErrorOr<void> SearchPanel::initialize()
|
||||
{
|
||||
m_request_client = TRY(Protocol::RequestClient::try_create());
|
||||
|
||||
|
|
|
@ -21,7 +21,8 @@ class SearchPanel final : public GUI::Widget {
|
|||
C_OBJECT(SearchPanel)
|
||||
|
||||
public:
|
||||
static ErrorOr<NonnullRefPtr<SearchPanel>> create();
|
||||
static ErrorOr<NonnullRefPtr<SearchPanel>> try_create();
|
||||
ErrorOr<void> initialize();
|
||||
|
||||
void search(StringView query);
|
||||
void reset();
|
||||
|
@ -37,10 +38,6 @@ public:
|
|||
private:
|
||||
SearchPanel() = default;
|
||||
|
||||
static ErrorOr<NonnullRefPtr<SearchPanel>> try_create();
|
||||
|
||||
ErrorOr<void> setup();
|
||||
|
||||
RefPtr<Protocol::RequestClient> m_request_client;
|
||||
RefPtr<Protocol::Request> m_request;
|
||||
RefPtr<GUI::TextBox> m_search_textbox;
|
||||
|
|
|
@ -72,7 +72,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
int panel_width = Config::read_i32("Maps"sv, "Panel"sv, "Width"sv, INT_MIN);
|
||||
|
||||
// Search panel
|
||||
auto search_panel = TRY(Maps::SearchPanel::create());
|
||||
auto search_panel = TRY(Maps::SearchPanel::try_create());
|
||||
search_panel->on_places_change = [&map_widget](auto) { map_widget.remove_markers_with_name("search"sv); };
|
||||
search_panel->on_selected_place_change = [&map_widget](auto const& place) {
|
||||
// Remove old search marker
|
||||
|
@ -105,7 +105,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
// Favorites panel
|
||||
auto marker_red_image = TRY(Gfx::Bitmap::load_from_file("/res/graphics/maps/marker-red.png"sv));
|
||||
auto favorites_panel = TRY(Maps::FavoritesPanel::create());
|
||||
auto favorites_panel = TRY(Maps::FavoritesPanel::try_create());
|
||||
favorites_panel->on_favorites_change = [&map_widget, marker_red_image](auto const& favorites) {
|
||||
// Sync all favorites markers
|
||||
map_widget.remove_markers_with_name("favorites"sv);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue