We use cookies to ensure you get the best experience on our website
Home Verkennen Help
Registreren Inloggen
0ct0pu5
/
ladybird
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Base: Update to new project logo

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.
Jamie Mansfield 1 jaar geleden
bovenliggende
4ef76f3198
commit
fe551d3eff
10 gewijzigde bestanden met toevoegingen van 37 en 9 verwijderingen
Gecombineerde weergave Toon Diff Stats
  1. BIN
      Base/res/icons/128x128/app-browser.png
  2. BIN
      Base/res/icons/16x16/app-browser.png
  3. BIN
      Base/res/icons/32x32/app-browser.png
  4. BIN
      Base/res/icons/48x48/app-browser.png
  5. 2 2
      Base/res/ladybird/templates/version.html
  6. 1 1
      Ladybird/Android/src/main/cpp/LadybirdActivity.cpp
  7. 1 1
      Ladybird/AppKit/UI/Tab.mm
  8. 1 1
      Ladybird/Qt/Tab.cpp
  9. 18 2
      Ladybird/cmake/ResourceFiles.cmake
  10. 14 2
      Meta/gn/secondary/Ladybird/BUILD.gn

BIN
Base/res/icons/128x128/app-browser.png
Bestand weergeven


BIN
Base/res/icons/16x16/app-browser.png
Bestand weergeven


BIN
Base/res/icons/32x32/app-browser.png
Bestand weergeven


BIN
Base/res/icons/48x48/app-browser.png
Bestand weergeven


+ 2 - 2
Base/res/ladybird/templates/version.html
Bestand weergeven 

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

+ 1 - 1
Ladybird/Android/src/main/cpp/LadybirdActivity.cpp
Bestand weergeven 

@@ -43,7 +43,7 @@ Java_org_serenityos_ladybird_LadybirdActivity_initNativeCode(JNIEnv* env, jobjec
 
 
 
     dbgln("Set resource dir to {}", s_serenity_resource_root);
 
     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()) {
 
     if (file_or_error.is_error()) {
 
         dbgln("No resource files, extracting assets...");
 
         dbgln("No resource files, extracting assets...");
 
         MUST(extract_tar_archive(MUST(String::formatted("{}/ladybird-assets.tar", s_serenity_resource_root)), s_serenity_resource_root));
 
         MUST(extract_tar_archive(MUST(String::formatted("{}/ladybird-assets.tar", s_serenity_resource_root)), s_serenity_resource_root));

+ 1 - 1
Ladybird/AppKit/UI/Tab.mm
Bestand weergeven 

@@ -50,7 +50,7 @@ static constexpr CGFloat const WINDOW_HEIGHT = 800;
 
     static dispatch_once_t token;
 
     static dispatch_once_t token;
 
 
 
     dispatch_once(&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());
 
         auto* ns_default_favicon_path = Ladybird::string_to_ns_string(default_favicon_path->filesystem_path());
 
 
 
         default_favicon = [[NSImage alloc] initWithContentsOfFile:ns_default_favicon_path];
 
         default_favicon = [[NSImage alloc] initWithContentsOfFile:ns_default_favicon_path];

+ 1 - 1
Ladybird/Qt/Tab.cpp
Bestand weergeven 

@@ -43,7 +43,7 @@ namespace Ladybird {
 
 
 
 static QIcon default_favicon()
 
 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;
 
     return icon;
 
 }
 
 }

+ 18 - 2
Ladybird/cmake/ResourceFiles.cmake
Bestand weergeven 

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

+ 14 - 2
Meta/gn/secondary/Ladybird/BUILD.gn
Bestand weergeven 

@@ -210,7 +210,6 @@ foreach(file, _emoji) {
 
 fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ]
 
 fonts = [ "//Base/res/fonts/SerenitySans-Regular.ttf" ]
 
 
 
 icons_16x16 = [
 
 icons_16x16 = [
 
-  "//Base/res/icons/16x16/app-browser.png",
 
   "//Base/res/icons/16x16/app-system-monitor.png",
 
   "//Base/res/icons/16x16/app-system-monitor.png",
 
   "//Base/res/icons/16x16/audio-volume-high.png",
 
   "//Base/res/icons/16x16/audio-volume-high.png",
 
   "//Base/res/icons/16x16/audio-volume-muted.png",
 
   "//Base/res/icons/16x16/audio-volume-muted.png",
 
@@ -242,13 +241,16 @@ icons_16x16 = [
 
 ]
 
 ]
 
 
 
 icons_32x32 = [
 
 icons_32x32 = [
 
-  "//Base/res/icons/32x32/app-browser.png",
 
   "//Base/res/icons/32x32/app-system-monitor.png",
 
   "//Base/res/icons/32x32/app-system-monitor.png",
 
   "//Base/res/icons/32x32/filetype-folder.png",
 
   "//Base/res/icons/32x32/filetype-folder.png",
 
   "//Base/res/icons/32x32/filetype-unknown.png",
 
   "//Base/res/icons/32x32/filetype-unknown.png",
 
   "//Base/res/icons/32x32/msgbox-warning.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 = [
 
 icons_browser = [
 
   "//Base/res/icons/browser/clear-cache.png",
 
   "//Base/res/icons/browser/clear-cache.png",
 
   "//Base/res/icons/browser/cookie.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}}" ]
 
     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") {
 
   copy("ladybird_copy_icons_browser") {
 
     sources = icons_browser
 
     sources = icons_browser
 
     outputs = [ "$root_out_dir/share/Lagom/icons/browser/{{source_file_part}}" ]
 
     outputs = [ "$root_out_dir/share/Lagom/icons/browser/{{source_file_part}}" ]

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5