beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 15:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Base: Update to new project logo

Browse source 
This removes the existing 16x16 and 32x32 app icons with 48x48 and
128x128 versions, as the new logo is not well suited to such small
resolutions.
This commit is contained in:
Jamie Mansfield 2024-07-07 16:30:22 +01:00 committed by Andreas Kling
parent 4ef76f3198
commit fe551d3eff
Notes: sideshowbarker 2024-07-16 21:30:46 +09:00 
Author: https://github.com/jamierocks
Commit: https://github.com/LadybirdBrowser/ladybird/commit/fe551d3eff
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/494
Reviewed-by: https://github.com/tcl3
10 changed files with 37 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Base/res/icons/128x128/app-browser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
Base/res/icons/16x16/app-browser.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 634 B

BIN
Base/res/icons/32x32/app-browser.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Base/res/icons/48x48/app-browser.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

4
Base/res/ladybird/templates/version.html
View file

@ -6,8 +6,8 @@
<style>
img {
float: left;
image-rendering: pixelated;
margin-right: 10px;
height: 48px;
}
th {
text-align: right;
@ -19,7 +19,7 @@
</head>
<body>
<header>
<img src="resource://icons/32x32/app-browser.png">
<img src="resource://icons/128x128/app-browser.png">
<h1>About @browser_name@</h1>
</header>
<table>

2
Ladybird/Android/src/main/cpp/LadybirdActivity.cpp
View file

@ -43,7 +43,7 @@ Java_org_serenityos_ladybird_LadybirdActivity_initNativeCode(JNIEnv* env, jobjec
dbgln("Set resource dir to {}", s_serenity_resource_root);
auto file_or_error = Core::System::open(MUST(String::formatted("{}/res/icons/16x16/app-browser.png", s_serenity_resource_root)), O_RDONLY);
auto file_or_error = Core::System::open(MUST(String::formatted("{}/res/icons/48x48/app-browser.png", s_serenity_resource_root)), O_RDONLY);
if (file_or_error.is_error()) {
dbgln("No resource files, extracting assets...");
MUST(extract_tar_archive(MUST(String::formatted("{}/ladybird-assets.tar", s_serenity_resource_root)), s_serenity_resource_root));

2
Ladybird/AppKit/UI/Tab.mm
View file

@ -50,7 +50,7 @@ static constexpr CGFloat const WINDOW_HEIGHT = 800;
static dispatch_once_t token;
dispatch_once(&token, ^{
auto default_favicon_path = MUST(Core::Resource::load_from_uri("resource://icons/16x16/app-browser.png"sv));
auto default_favicon_path = MUST(Core::Resource::load_from_uri("resource://icons/48x48/app-browser.png"sv));
auto* ns_default_favicon_path = Ladybird::string_to_ns_string(default_favicon_path->filesystem_path());
default_favicon = [[NSImage alloc] initWithContentsOfFile:ns_default_favicon_path];

2
Ladybird/Qt/Tab.cpp
View file

@ -43,7 +43,7 @@ namespace Ladybird {
static QIcon default_favicon()
{
static QIcon icon = load_icon_from_uri("resource://icons/16x16/app-browser.png"sv);
static QIcon icon = load_icon_from_uri("resource://icons/48x48/app-browser.png"sv);
return icon;
}

20
Ladybird/cmake/ResourceFiles.cmake
View file

@ -7,7 +7,6 @@ set(FONTS
list(TRANSFORM FONTS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/fonts/")
set(16x16_ICONS
app-browser.png
app-system-monitor.png
audio-volume-high.png
audio-volume-muted.png
@ -38,12 +37,17 @@ set(16x16_ICONS
zoom-reset.png
)
set(32x32_ICONS
app-browser.png
app-system-monitor.png
filetype-folder.png
filetype-unknown.png
msgbox-warning.png
)
set(48x48_ICONS
app-browser.png
)
set(128x128_ICONS
app-browser.png
)
set(BROWSER_ICONS
clear-cache.png
cookie.png
@ -52,6 +56,8 @@ set(BROWSER_ICONS
)
list(TRANSFORM 16x16_ICONS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/icons/16x16/")
list(TRANSFORM 32x32_ICONS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/icons/32x32/")
list(TRANSFORM 48x48_ICONS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/icons/48x48/")
list(TRANSFORM 128x128_ICONS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/icons/128x128/")
list(TRANSFORM BROWSER_ICONS PREPEND "${LADYBIRD_SOURCE_DIR}/Base/res/icons/browser/")
set(WEB_RESOURCES
@ -137,6 +143,14 @@ function(copy_resources_to_build base_directory bundle_target)
DESTINATION ${base_directory} TARGET ${bundle_target}
)
copy_resource_set(icons/48x48 RESOURCES ${48x48_ICONS}
DESTINATION ${base_directory} TARGET ${bundle_target}
)
copy_resource_set(icons/128x128 RESOURCES ${128x128_ICONS}
DESTINATION ${base_directory} TARGET ${bundle_target}
)
copy_resource_set(icons/browser RESOURCES ${BROWSER_ICONS}
DESTINATION ${base_directory} TARGET ${bundle_target}
)
@ -169,6 +183,8 @@ function(install_ladybird_resources destination component)
install(FILES ${FONTS} DESTINATION "${destination}/fonts" COMPONENT ${component})
install(FILES ${16x16_ICONS} DESTINATION "${destination}/icons/16x16" COMPONENT ${component})
install(FILES ${32x32_ICONS} DESTINATION "${destination}/icons/32x32" COMPONENT ${component})
install(FILES ${48x48_ICONS} DESTINATION "${destination}/icons/48x48" COMPONENT ${component})
install(FILES ${128x128_ICONS} DESTINATION "${destination}/icons/128x128" COMPONENT ${component})
install(FILES ${BROWSER_ICONS} DESTINATION "${destination}/icons/browser" COMPONENT ${component})
install(FILES ${THEMES} DESTINATION "${destination}/themes" COMPONENT ${component})
install(FILES ${WEB_RESOURCES} DESTINATION "${destination}/ladybird" COMPONENT ${component})

16
Meta/gn/secondary/Ladybird/BUILD.gn
View file

@ -210,7 +210,6 @@ foreach(file, _emoji) {
fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ]
icons_16x16 = [
"//Base/res/icons/16x16/app-browser.png",
"//Base/res/icons/16x16/app-system-monitor.png",
"//Base/res/icons/16x16/audio-volume-high.png",
"//Base/res/icons/16x16/audio-volume-muted.png",
@ -242,13 +241,16 @@ icons_16x16 = [
]
icons_32x32 = [
"//Base/res/icons/32x32/app-browser.png",
"//Base/res/icons/32x32/app-system-monitor.png",
"//Base/res/icons/32x32/filetype-folder.png",
"//Base/res/icons/32x32/filetype-unknown.png",
"//Base/res/icons/32x32/msgbox-warning.png",
]
icons_48x48 = [ "//Base/res/icons/48x48/app-browser.png" ]
icons_128x128 = [ "//Base/res/icons/128x128/app-browser.png" ]
icons_browser = [
"//Base/res/icons/browser/clear-cache.png",
"//Base/res/icons/browser/cookie.png",
@ -301,6 +303,16 @@ if (current_os != "mac") {
outputs = [ "$root_out_dir/share/Lagom/icons/32x32/{{source_file_part}}" ]
}
copy("ladybird_copy_icons_48x48") {
sources = icons_48x48
outputs = [ "$root_out_dir/share/Lagom/icons/48x48/{{source_file_part}}" ]
}
copy("ladybird_copy_icons_128x128") {
sources = icons_128x128
outputs = [ "$root_out_dir/share/Lagom/icons/128x128/{{source_file_part}}" ]
}
copy("ladybird_copy_icons_browser") {
sources = icons_browser
outputs = [ "$root_out_dir/share/Lagom/icons/browser/{{source_file_part}}" ]