We use cookies to ensure you get the best experience on our website
صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
0ct0pu5
/
ladybird
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

Base+Ladybird: Move Ladybird-related HTML files to their own folder

Pages like the new tab page, error page, etc. all belong solely to
Ladybird, but are scattered across a couple of subfolders in Base. This
moves them all to Base/res/ladybird.
Timothy Flynn 1 سال پیش
والد
980e32b4fe
کامیت
05c8d5ba57
11فایلهای تغییر یافته به همراه12 افزوده شده و 12 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 0 0
      Base/res/ladybird/directory.html
  2. 0 0
      Base/res/ladybird/error.html
  3. 0 0
      Base/res/ladybird/inspector.css
  4. 0 0
      Base/res/ladybird/inspector.js
  5. 1 1
      Base/res/ladybird/new-tab.html
  6. 2 2
      Ladybird/Android/src/main/cpp/WebContentService.cpp
  7. 2 2
      Ladybird/WebContent/main.cpp
  8. 2 2
      Ladybird/WebWorker/main.cpp
  9. 1 1
      Userland/Applications/BrowserSettings/Defaults.h
  10. 2 2
      Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp
  11. 2 2
      Userland/Libraries/LibWebView/InspectorClient.cpp

+ 0 - 0
Base/res/html/directory.html → Base/res/ladybird/directory.html
مشاهده فایل


+ 0 - 0
Base/res/html/error.html → Base/res/ladybird/error.html
مشاهده فایل


+ 0 - 0
Base/res/html/inspector/inspector.css → Base/res/ladybird/inspector.css
مشاهده فایل


+ 0 - 0
Base/res/html/inspector/inspector.js → Base/res/ladybird/inspector.js
مشاهده فایل


+ 1 - 1
Base/res/html/misc/new-tab.html → Base/res/ladybird/new-tab.html
مشاهده فایل 

@@ -40,7 +40,7 @@
 
 <body>
 
     <main>
 
         <br>
 
-        <img src="../../icons/32x32/app-browser.png" width="64" height="64"><br><br>
 
+        <img src="../icons/32x32/app-browser.png" width="64" height="64"><br><br>
 
         <form>
 
             <input type="search" name="q" id="user_query"><br><br>
 
             <div id="search-buttons">

+ 2 - 2
Ladybird/Android/src/main/cpp/WebContentService.cpp
مشاهده فایل 

@@ -73,8 +73,8 @@ ErrorOr<int> service_main(int ipc_socket, int fd_passing_socket)
 
     Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode));
 
 
     Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root)));
 
-    Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root)));
 
-    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root)));
 
+    Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root)));
 
+    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root)));
 
 
     TRY(Web::Bindings::initialize_main_thread_vm());

+ 2 - 2
Ladybird/WebContent/main.cpp
مشاهده فایل 

@@ -107,8 +107,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode));
 
 
     Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root)));
 
-    Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root)));
 
-    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root)));
 
+    Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root)));
 
+    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root)));
 
 
     TRY(Web::Bindings::initialize_main_thread_vm());

+ 2 - 2
Ladybird/WebWorker/main.cpp
مشاهده فایل 

@@ -48,8 +48,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     VERIFY(fd_passing_socket >= 0);
 
 
     Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root)));
 
-    Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root)));
 
-    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root)));
 
+    Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root)));
 
+    Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root)));
 
 
     TRY(Web::Bindings::initialize_main_thread_vm());

+ 1 - 1
Userland/Applications/BrowserSettings/Defaults.h
مشاهده فایل 

@@ -33,7 +33,7 @@ inline String const& default_new_tab_url()
 
 {
 
     // FIXME: Teach LibWeb how to load resource:// URLs, rather than converting to a file:// URL here.
 
     static auto default_new_tab_url = []() {
 
-        static constexpr auto url = "resource://html/misc/new-tab.html"sv;
 
+        static constexpr auto url = "resource://ladybird/new-tab.html"sv;
 
         return MUST(Core::Resource::load_from_uri(url))->file_url();
 
     }();

+ 2 - 2
Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp
مشاهده فایل 

@@ -26,7 +26,7 @@ void set_resource_directory_url(String resource_directory_url)
 
     s_resource_directory_url = resource_directory_url;
 
 }
 
 
-static String s_error_page_url = "file:///res/html/error.html"_string;
 
+static String s_error_page_url = "file:///res/ladybird/error.html"_string;
 
 
 String error_page_url()
 
 {
 
@@ -38,7 +38,7 @@ void set_error_page_url(String error_page_url)
 
     s_error_page_url = error_page_url;
 
 }
 
 
-static String s_directory_page_url = "file:///res/html/directory.html"_string;
 
+static String s_directory_page_url = "file:///res/ladybird/directory.html"_string;
 
 
 String directory_page_url()
 
 {

+ 2 - 2
Userland/Libraries/LibWebView/InspectorClient.cpp
مشاهده فایل 

@@ -201,8 +201,8 @@ void InspectorClient::load_inspector()
 
     StringBuilder builder;
 
 
     // FIXME: Teach LibWeb how to load resource:// URIs instead of needing to read these files here.
 
-    auto inspector_css = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.css"sv));
 
-    auto inspector_js = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.js"sv));
 
+    auto inspector_css = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.css"sv));
 
+    auto inspector_js = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.js"sv));
 
 
     builder.append(R"~~~(
 
 <!DOCTYPE html>

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