diff --git a/src/app/browser.rs b/src/app/browser.rs index ca16c320..20fba8b2 100644 --- a/src/app/browser.rs +++ b/src/app/browser.rs @@ -1,12 +1,12 @@ mod database; mod header; -mod main; mod widget; +mod wrapper; use database::Database; use header::Header; -use main::Main; use widget::Widget; +use wrapper::Wrapper; use gtk::{ gio::{AppInfo, AppLaunchContext, SimpleAction}, @@ -20,7 +20,7 @@ pub struct Browser { database: Arc, // Components // header: Arc
, - // main: Arc
, + // wrapper: Arc, widget: Arc, } @@ -65,7 +65,7 @@ impl Browser { action_tab_pin.clone(), )); - let main = Arc::new(Main::new( + let main = Arc::new(Wrapper::new( action_tab_page_navigation_base.clone(), action_tab_page_navigation_history_back.clone(), action_tab_page_navigation_history_forward.clone(), diff --git a/src/app/browser/main.rs b/src/app/browser/wrapper.rs similarity index 98% rename from src/app/browser/main.rs rename to src/app/browser/wrapper.rs index 522d2aaa..e14f3233 100644 --- a/src/app/browser/main.rs +++ b/src/app/browser/wrapper.rs @@ -6,12 +6,12 @@ use tab::Tab; use gtk::{gio::SimpleAction, glib::GString, prelude::BoxExt, Box, Orientation}; -pub struct Main { +pub struct Wrapper { tab: Arc, widget: Box, } -impl Main { +impl Wrapper { // Construct pub fn new( action_tab_page_navigation_base: Arc, diff --git a/src/app/browser/main/tab.rs b/src/app/browser/wrapper/tab.rs similarity index 100% rename from src/app/browser/main/tab.rs rename to src/app/browser/wrapper/tab.rs diff --git a/src/app/browser/main/tab/label.rs b/src/app/browser/wrapper/tab/label.rs similarity index 100% rename from src/app/browser/main/tab/label.rs rename to src/app/browser/wrapper/tab/label.rs diff --git a/src/app/browser/main/tab/label/pin.rs b/src/app/browser/wrapper/tab/label/pin.rs similarity index 100% rename from src/app/browser/main/tab/label/pin.rs rename to src/app/browser/wrapper/tab/label/pin.rs diff --git a/src/app/browser/main/tab/label/title.rs b/src/app/browser/wrapper/tab/label/title.rs similarity index 100% rename from src/app/browser/main/tab/label/title.rs rename to src/app/browser/wrapper/tab/label/title.rs diff --git a/src/app/browser/main/tab/page.rs b/src/app/browser/wrapper/tab/page.rs similarity index 100% rename from src/app/browser/main/tab/page.rs rename to src/app/browser/wrapper/tab/page.rs diff --git a/src/app/browser/main/tab/page/content.rs b/src/app/browser/wrapper/tab/page/content.rs similarity index 100% rename from src/app/browser/main/tab/page/content.rs rename to src/app/browser/wrapper/tab/page/content.rs diff --git a/src/app/browser/main/tab/page/content/text.rs b/src/app/browser/wrapper/tab/page/content/text.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text.rs rename to src/app/browser/wrapper/tab/page/content/text.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini.rs b/src/app/browser/wrapper/tab/page/content/text/gemini.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader.rs b/src/app/browser/wrapper/tab/page/content/text/gemini/reader.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader/default.css b/src/app/browser/wrapper/tab/page/content/text/gemini/reader/default.css similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader/default.css rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader/default.css diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader/parser.rs b/src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader/parser.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader/parser/header.rs b/src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/header.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader/parser/header.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/header.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader/parser/link.rs b/src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/link.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader/parser/link.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/link.rs diff --git a/src/app/browser/main/tab/page/content/text/gemini/reader/parser/plain.rs b/src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/plain.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/gemini/reader/parser/plain.rs rename to src/app/browser/wrapper/tab/page/content/text/gemini/reader/parser/plain.rs diff --git a/src/app/browser/main/tab/page/content/text/plain/reader.rs b/src/app/browser/wrapper/tab/page/content/text/plain/reader.rs similarity index 100% rename from src/app/browser/main/tab/page/content/text/plain/reader.rs rename to src/app/browser/wrapper/tab/page/content/text/plain/reader.rs diff --git a/src/app/browser/main/tab/page/meta.rs b/src/app/browser/wrapper/tab/page/meta.rs similarity index 100% rename from src/app/browser/main/tab/page/meta.rs rename to src/app/browser/wrapper/tab/page/meta.rs diff --git a/src/app/browser/main/tab/page/navigation.rs b/src/app/browser/wrapper/tab/page/navigation.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation.rs rename to src/app/browser/wrapper/tab/page/navigation.rs diff --git a/src/app/browser/main/tab/page/navigation/base.rs b/src/app/browser/wrapper/tab/page/navigation/base.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/base.rs rename to src/app/browser/wrapper/tab/page/navigation/base.rs diff --git a/src/app/browser/main/tab/page/navigation/bookmark.rs b/src/app/browser/wrapper/tab/page/navigation/bookmark.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/bookmark.rs rename to src/app/browser/wrapper/tab/page/navigation/bookmark.rs diff --git a/src/app/browser/main/tab/page/navigation/history.rs b/src/app/browser/wrapper/tab/page/navigation/history.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/history.rs rename to src/app/browser/wrapper/tab/page/navigation/history.rs diff --git a/src/app/browser/main/tab/page/navigation/history/back.rs b/src/app/browser/wrapper/tab/page/navigation/history/back.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/history/back.rs rename to src/app/browser/wrapper/tab/page/navigation/history/back.rs diff --git a/src/app/browser/main/tab/page/navigation/history/forward.rs b/src/app/browser/wrapper/tab/page/navigation/history/forward.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/history/forward.rs rename to src/app/browser/wrapper/tab/page/navigation/history/forward.rs diff --git a/src/app/browser/main/tab/page/navigation/reload.rs b/src/app/browser/wrapper/tab/page/navigation/reload.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/reload.rs rename to src/app/browser/wrapper/tab/page/navigation/reload.rs diff --git a/src/app/browser/main/tab/page/navigation/request.rs b/src/app/browser/wrapper/tab/page/navigation/request.rs similarity index 100% rename from src/app/browser/main/tab/page/navigation/request.rs rename to src/app/browser/wrapper/tab/page/navigation/request.rs