mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Browser: Add more intuitive search

Browse source
This commit is contained in:
Cameron Youell 2023-06-07 11:02:02 +10:00 committed by Sam Atkins
parent d68433653a
commit d972338208
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Browser/CMakeLists.txt
View file

@ -41,5 +41,5 @@ set(GENERATED_SOURCES
) )
serenity_app(Browser ICON app-browser) serenity_app(Browser ICON app-browser)
target_link_libraries(Browser PRIVATE LibCore LibFileSystem LibWebView LibWeb LibProtocol LibGUI LibDesktop LibConfig LibGfx LibIPC LibJS LibLocale LibMain LibSyntax LibSQL) target_link_libraries(Browser PRIVATE LibCore LibFileSystem LibWebView LibWeb LibProtocol LibPublicSuffix LibGUI LibDesktop LibConfig LibGfx LibIPC LibJS LibLocale LibMain LibSyntax LibSQL)
link_with_locale_data(Browser) link_with_locale_data(Browser)

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

@ -35,6 +35,7 @@
#include <LibGUI/Toolbar.h> #include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h> #include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibPublicSuffix/URL.h>
#include <LibWeb/HTML/BrowsingContext.h> #include <LibWeb/HTML/BrowsingContext.h>
#include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h> #include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h>
#include <LibWeb/Layout/BlockContainer.h> #include <LibWeb/Layout/BlockContainer.h>
@ -51,9 +52,6 @@ Tab::~Tab()
URL url_from_user_input(DeprecatedString const& input) URL url_from_user_input(DeprecatedString const& input)
{ {
if (input.starts_with('?') && !g_search_engine.is_empty())
return URL(g_search_engine.replace("{}"sv, URL::percent_encode(input.substring_view(1)), ReplaceMode::FirstOnly));
URL url_with_http_schema = URL(DeprecatedString::formatted("https://{}", input)); URL url_with_http_schema = URL(DeprecatedString::formatted("https://{}", input));
if (url_with_http_schema.is_valid() && url_with_http_schema.port().has_value()) if (url_with_http_schema.is_valid() && url_with_http_schema.port().has_value())
return url_with_http_schema; return url_with_http_schema;
@ -169,7 +167,7 @@ Tab::Tab(BrowserWindow& window)
toolbar.add_action(window.reload_action()); toolbar.add_action(window.reload_action());
m_location_box = toolbar.add<GUI::UrlBox>(); m_location_box = toolbar.add<GUI::UrlBox>();
m_location_box->set_placeholder("Address"sv); m_location_box->set_placeholder("Search or enter address"sv);
m_location_box->on_return_pressed = [this] { m_location_box->on_return_pressed = [this] {
auto url = url_from_location_bar(); auto url = url_from_location_bar();
@ -647,11 +645,6 @@ void Tab::update_reset_zoom_button()
Optional<URL> Tab::url_from_location_bar(MayAppendTLD may_append_tld) Optional<URL> Tab::url_from_location_bar(MayAppendTLD may_append_tld)
{ {
if (m_location_box->text().starts_with('?') && g_search_engine.is_empty()) {
GUI::MessageBox::show(&this->window(), "Select a search engine in the Settings menu before searching."sv, "No search engine selected"sv, GUI::MessageBox::Type::Information);
return {};
}
DeprecatedString text = m_location_box->text(); DeprecatedString text = m_location_box->text();
StringBuilder builder; StringBuilder builder;
@ -664,8 +657,17 @@ Optional<URL> Tab::url_from_location_bar(MayAppendTLD may_append_tld)
} }
auto final_text = builder.to_deprecated_string(); auto final_text = builder.to_deprecated_string();
auto url = url_from_user_input(final_text); auto error_or_absolute_url = PublicSuffix::absolute_url(final_text);
return url; if (error_or_absolute_url.is_error()) {
if (g_search_engine.is_empty()) {
GUI::MessageBox::show(&this->window(), "Select a search engine in the Settings menu before searching."sv, "No search engine selected"sv, GUI::MessageBox::Type::Information);
return {};
}
return URL(g_search_engine.replace("{}"sv, URL::percent_encode(final_text), ReplaceMode::FirstOnly));
}
return URL(error_or_absolute_url.release_value());
} }
void Tab::load(const URL& url, LoadType load_type) void Tab::load(const URL& url, LoadType load_type)

2
Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml
View file

@ -129,7 +129,7 @@
} }
@GUI::CheckBox { @GUI::CheckBox {
text: "Search using '?' in the URL box" text: "Search in the URL box"
name: "enable_search_engine_checkbox" name: "enable_search_engine_checkbox"
} }
} }

2
Userland/Applications/BrowserSettings/Defaults.h
View file

@ -12,7 +12,7 @@ namespace Browser {
static constexpr StringView default_homepage_url = "file:///res/html/misc/welcome.html"sv; static constexpr StringView default_homepage_url = "file:///res/html/misc/welcome.html"sv;
static constexpr StringView default_new_tab_url = "file:///res/html/misc/new-tab.html"sv; static constexpr StringView default_new_tab_url = "file:///res/html/misc/new-tab.html"sv;
static constexpr StringView default_search_engine = ""sv; static constexpr StringView default_search_engine = "https://www.google.com/search?q={}"sv;
static constexpr StringView default_color_scheme = "auto"sv; static constexpr StringView default_color_scheme = "auto"sv;
static constexpr bool default_enable_content_filters = true; static constexpr bool default_enable_content_filters = true;
static constexpr bool default_show_bookmarks_bar = true; static constexpr bool default_show_bookmarks_bar = true;