summaryrefslogtreecommitdiff
path: root/Userland/Applications/Browser
diff options
context:
space:
mode:
Diffstat (limited to 'Userland/Applications/Browser')
-rw-r--r--Userland/Applications/Browser/BookmarksBarWidget.cpp4
-rw-r--r--Userland/Applications/Browser/DownloadWidget.cpp14
-rw-r--r--Userland/Applications/Browser/DownloadWidget.h4
-rw-r--r--Userland/Applications/Browser/Tab.cpp18
-rw-r--r--Userland/Applications/Browser/Tab.gml6
-rw-r--r--Userland/Applications/Browser/Tab.h6
6 files changed, 26 insertions, 26 deletions
diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp
index a84975debe..671530fa44 100644
--- a/Userland/Applications/Browser/BookmarksBarWidget.cpp
+++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp
@@ -131,7 +131,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable
set_visible(false);
m_additional = GUI::Button::construct();
- m_additional->set_button_style(Gfx::ButtonStyle::CoolBar);
+ m_additional->set_button_style(Gfx::ButtonStyle::Coolbar);
m_additional->set_text(">");
m_additional->set_fixed_size(14, 20);
m_additional->set_focus_policy(GUI::FocusPolicy::TabFocus);
@@ -208,7 +208,7 @@ void BookmarksBarWidget::model_did_update(unsigned)
auto& button = add<GUI::Button>();
m_bookmarks.append(button);
- button.set_button_style(Gfx::ButtonStyle::CoolBar);
+ button.set_button_style(Gfx::ButtonStyle::Coolbar);
button.set_text(title);
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png"));
button.set_fixed_size(font().width(title) + 32, 20);
diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp
index 54c872eb2c..d9bf01f9f4 100644
--- a/Userland/Applications/Browser/DownloadWidget.cpp
+++ b/Userland/Applications/Browser/DownloadWidget.cpp
@@ -36,7 +36,7 @@
#include <LibGUI/ImageWidget.h>
#include <LibGUI/Label.h>
#include <LibGUI/MessageBox.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
#include <LibGUI/Window.h>
#include <LibProtocol/Client.h>
#include <LibWeb/Loader/ResourceLoader.h>
@@ -91,8 +91,8 @@ DownloadWidget::DownloadWidget(const URL& url)
source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
source_label.set_fixed_height(16);
- m_progress_bar = add<GUI::ProgressBar>();
- m_progress_bar->set_fixed_height(20);
+ m_progressbar = add<GUI::Progressbar>();
+ m_progressbar->set_fixed_height(20);
m_progress_label = add<GUI::Label>();
m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
@@ -127,15 +127,15 @@ DownloadWidget::~DownloadWidget()
void DownloadWidget::did_progress(Optional<u32> total_size, u32 downloaded_size)
{
- m_progress_bar->set_min(0);
+ m_progressbar->set_min(0);
if (total_size.has_value()) {
int percent = roundf(((float)downloaded_size / (float)total_size.value()) * 100.0f);
window()->set_progress(percent);
- m_progress_bar->set_max(total_size.value());
+ m_progressbar->set_max(total_size.value());
} else {
- m_progress_bar->set_max(0);
+ m_progressbar->set_max(0);
}
- m_progress_bar->set_value(downloaded_size);
+ m_progressbar->set_value(downloaded_size);
{
StringBuilder builder;
diff --git a/Userland/Applications/Browser/DownloadWidget.h b/Userland/Applications/Browser/DownloadWidget.h
index 44fc21c60d..10f839a68c 100644
--- a/Userland/Applications/Browser/DownloadWidget.h
+++ b/Userland/Applications/Browser/DownloadWidget.h
@@ -29,7 +29,7 @@
#include <AK/URL.h>
#include <LibCore/ElapsedTimer.h>
#include <LibCore/FileStream.h>
-#include <LibGUI/ProgressBar.h>
+#include <LibGUI/Progressbar.h>
#include <LibGUI/Widget.h>
#include <LibProtocol/Download.h>
@@ -50,7 +50,7 @@ private:
URL m_url;
String m_destination_path;
RefPtr<Protocol::Download> m_download;
- RefPtr<GUI::ProgressBar> m_progress_bar;
+ RefPtr<GUI::Progressbar> m_progressbar;
RefPtr<GUI::Label> m_progress_label;
RefPtr<GUI::Button> m_cancel_button;
RefPtr<GUI::Button> m_close_button;
diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp
index a24a19a37a..d976378843 100644
--- a/Userland/Applications/Browser/Tab.cpp
+++ b/Userland/Applications/Browser/Tab.cpp
@@ -39,12 +39,12 @@
#include <LibGUI/Button.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/Menu.h>
-#include <LibGUI/MenuBar.h>
-#include <LibGUI/StatusBar.h>
+#include <LibGUI/Menubar.h>
+#include <LibGUI/Statusbar.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/TextBox.h>
-#include <LibGUI/ToolBar.h>
-#include <LibGUI/ToolBarContainer.h>
+#include <LibGUI/Toolbar.h>
+#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h>
#include <LibJS/Interpreter.h>
#include <LibWeb/Dump.h>
@@ -99,8 +99,8 @@ Tab::Tab(Type type)
{
load_from_gml(tab_gml);
- m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
- auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
+ m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
+ auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
@@ -136,7 +136,7 @@ Tab::Tab(Type type)
}));
m_bookmark_button = toolbar.add<GUI::Button>();
- m_bookmark_button->set_button_style(Gfx::ButtonStyle::CoolBar);
+ m_bookmark_button->set_button_style(Gfx::ButtonStyle::Coolbar);
m_bookmark_button->set_focus_policy(GUI::FocusPolicy::TabFocus);
m_bookmark_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/bookmark-contour.png"));
m_bookmark_button->set_fixed_size(22, 22);
@@ -280,7 +280,7 @@ Tab::Tab(Type type)
},
this);
- m_statusbar = *find_descendant_of_type_named<GUI::StatusBar>("statusbar");
+ m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
hooks().on_link_hover = [this](auto& url) {
if (url.is_valid())
@@ -293,7 +293,7 @@ Tab::Tab(Type type)
load(url);
};
- m_menubar = GUI::MenuBar::construct();
+ m_menubar = GUI::Menubar::construct();
auto& app_menu = m_menubar->add_menu("&File");
app_menu.add_action(WindowActions::the().create_new_tab_action());
diff --git a/Userland/Applications/Browser/Tab.gml b/Userland/Applications/Browser/Tab.gml
index 24c7456d77..96dfba65be 100644
--- a/Userland/Applications/Browser/Tab.gml
+++ b/Userland/Applications/Browser/Tab.gml
@@ -2,10 +2,10 @@
layout: @GUI::VerticalBoxLayout {
}
- @GUI::ToolBarContainer {
+ @GUI::ToolbarContainer {
name: "toolbar_container"
- @GUI::ToolBar {
+ @GUI::Toolbar {
name: "toolbar"
}
}
@@ -16,7 +16,7 @@
}
}
- @GUI::StatusBar {
+ @GUI::Statusbar {
name: "statusbar"
}
}
diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h
index 8a2c008686..8c806dcfb9 100644
--- a/Userland/Applications/Browser/Tab.h
+++ b/Userland/Applications/Browser/Tab.h
@@ -103,9 +103,9 @@ private:
RefPtr<GUI::Button> m_bookmark_button;
RefPtr<GUI::Window> m_dom_inspector_window;
RefPtr<GUI::Window> m_console_window;
- RefPtr<GUI::StatusBar> m_statusbar;
- RefPtr<GUI::MenuBar> m_menubar;
- RefPtr<GUI::ToolBarContainer> m_toolbar_container;
+ RefPtr<GUI::Statusbar> m_statusbar;
+ RefPtr<GUI::Menubar> m_menubar;
+ RefPtr<GUI::ToolbarContainer> m_toolbar_container;
RefPtr<GUI::Menu> m_link_context_menu;
RefPtr<GUI::Action> m_link_context_menu_default_action;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:26:27 +0000