RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 10:28:13 +00:00
Code Issues Activity Actions

Browser: Have the bookmark button use the editor dialog

Browse source 
Now when the bookmark button that has not yet bookmarked the current
URL is pressed, it will add the bookmark but also prompt the user
with the BookmarkEditor dialog in case they wish to make final
touches to their bookmark title or URL. If they cancel or escape
the dialog, the bookmark will be removed.
This commit is contained in:
Kemal Zebari 2023-02-24 01:10:57 -08:00 • committed by Sam Atkins
parent 5ec727deb4
commit 3918a8492b
3 changed files with 55 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Userland/Applications/Browser/BookmarksBarWidget.cpp
View file

@ -30,10 +30,14 @@ class BookmarkEditor final : public GUI::Dialog {
public:
static Vector<JsonValue>
edit_bookmark(Window* parent_window, StringView title, StringView url)
edit_bookmark(Window* parent_window, StringView title, StringView url, BookmarksBarWidget::PerformEditOn perform_edit_on)
{
auto editor = BookmarkEditor::construct(parent_window, title, url);
editor->set_title("Edit Bookmark");
if (perform_edit_on == BookmarksBarWidget::PerformEditOn::NewBookmark) {
editor->set_title("Add Bookmark");
} else {
editor->set_title("Edit Bookmark");
}
editor->set_icon(g_icon_bag.bookmark_filled);
if (editor->exec() == ExecResult::OK) {
@ -306,37 +310,53 @@ bool BookmarksBarWidget::add_bookmark(DeprecatedString const& url, DeprecatedStr
values.append(title);
values.append(url);
auto& json_model = *static_cast<GUI::JsonArrayModel*>(model());
if (json_model.add(move(values))) {
json_model.store();
auto was_bookmark_added = update_model(values, [](auto& model, auto&& values) {
return model.add(move(values));
});
if (!was_bookmark_added)
return false;
if (on_bookmark_add)
on_bookmark_add(url);
if (edit_bookmark(url, PerformEditOn::NewBookmark))
return true;
}
remove_bookmark(url);
return false;
}
bool BookmarksBarWidget::edit_bookmark(DeprecatedString const& url)
bool BookmarksBarWidget::edit_bookmark(DeprecatedString const& url, PerformEditOn perform_edit_on)
{
for (int item_index = 0; item_index < model()->row_count(); ++item_index) {
auto item_title = model()->index(item_index, 0).data().to_deprecated_string();
auto item_url = model()->index(item_index, 1).data().to_deprecated_string();
if (item_url == url) {
auto values = BookmarkEditor::edit_bookmark(window(), item_title, item_url);
bool item_replaced = false;
if (!values.is_empty()) {
auto& json_model = *static_cast<GUI::JsonArrayModel*>(model());
item_replaced = json_model.set(item_index, move(values));
if (item_replaced)
json_model.store();
}
return item_replaced;
auto values = BookmarkEditor::edit_bookmark(window(), item_title, item_url, perform_edit_on);
return update_model(values, [item_index](auto& model, auto&& values) {
return model.set(item_index, move(values));
});
}
}
return false;
}
bool BookmarksBarWidget::update_model(Vector<JsonValue>& values, Function<bool(GUI::JsonArrayModel& model, Vector<JsonValue>&& values)> perform_model_change)
{
bool has_model_changed = false;
if (!values.is_empty()) {
auto& json_model = *static_cast<GUI::JsonArrayModel*>(model());
has_model_changed = perform_model_change(json_model, move(values));
if (has_model_changed)
json_model.store();
}
return has_model_changed;
}
}