diff --git a/src/app/browser/window/tab/item/page.rs b/src/app/browser/window/tab/item/page.rs index 5101704d..57c7a175 100644 --- a/src/app/browser/window/tab/item/page.rs +++ b/src/app/browser/window/tab/item/page.rs @@ -1,14 +1,14 @@ mod content; mod database; +mod input; mod meta; mod navigation; -mod request; mod widget; use content::Content; use database::Database; +use input::Input; use navigation::Navigation; -use request::Request; use widget::Widget; use meta::{Meta, Mime, Status}; @@ -37,7 +37,7 @@ pub struct Page { // Components navigation: Arc, content: Arc, - request: Arc, + input: Arc, // Extras meta: Arc>, // GTK @@ -75,14 +75,14 @@ impl Page { action_update.clone(), ); - let request = Request::new_arc(); + let input = Input::new_arc(); let widget = Widget::new_arc( &id, action_page_open.clone(), navigation.gobject(), content.gobject(), - request.gobject(), + input.gobject(), ); // Init async mutable Meta object @@ -117,7 +117,7 @@ impl Page { // Components content, navigation, - request, + input, // Extras meta, // GTK @@ -165,7 +165,7 @@ impl Page { let id = self.id.to_variant(); let navigation = self.navigation.clone(); let content = self.content.clone(); - let request = self.request.clone(); + let input = self.input.clone(); let meta = self.meta.clone(); let action_update = self.action_update.clone(); @@ -279,7 +279,7 @@ impl Page { meta.borrow_mut().description = None; // @TODO meta.borrow_mut().title = Some(gformat!("Input expected")); - request.show(&placeholder, false); + input.show(&placeholder, false); }, None => todo!(), } @@ -294,7 +294,7 @@ impl Page { meta.borrow_mut().description = None; // @TODO meta.borrow_mut().title = Some(gformat!("Input expected")); - request.show(&placeholder, true); + input.show(&placeholder, true); }, None => todo!(), } diff --git a/src/app/browser/window/tab/item/page/request.rs b/src/app/browser/window/tab/item/page/input.rs similarity index 94% rename from src/app/browser/window/tab/item/page/request.rs rename to src/app/browser/window/tab/item/page/input.rs index faa5d995..01c1f766 100644 --- a/src/app/browser/window/tab/item/page/request.rs +++ b/src/app/browser/window/tab/item/page/input.rs @@ -7,12 +7,12 @@ use widget::Widget; use adw::ToolbarView; use std::sync::Arc; -pub struct Request { +pub struct Input { content: Arc, widget: Arc, } -impl Request { +impl Input { // Construct pub fn new_arc() -> Arc { // Init components diff --git a/src/app/browser/window/tab/item/page/request/content.rs b/src/app/browser/window/tab/item/page/input/content.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content.rs rename to src/app/browser/window/tab/item/page/input/content.rs diff --git a/src/app/browser/window/tab/item/page/request/content/response.rs b/src/app/browser/window/tab/item/page/input/content/response.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content/response.rs rename to src/app/browser/window/tab/item/page/input/content/response.rs diff --git a/src/app/browser/window/tab/item/page/request/content/response/widget.rs b/src/app/browser/window/tab/item/page/input/content/response/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content/response/widget.rs rename to src/app/browser/window/tab/item/page/input/content/response/widget.rs diff --git a/src/app/browser/window/tab/item/page/request/content/send.rs b/src/app/browser/window/tab/item/page/input/content/send.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content/send.rs rename to src/app/browser/window/tab/item/page/input/content/send.rs diff --git a/src/app/browser/window/tab/item/page/request/content/send/widget.rs b/src/app/browser/window/tab/item/page/input/content/send/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content/send/widget.rs rename to src/app/browser/window/tab/item/page/input/content/send/widget.rs diff --git a/src/app/browser/window/tab/item/page/request/content/widget.rs b/src/app/browser/window/tab/item/page/input/content/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/content/widget.rs rename to src/app/browser/window/tab/item/page/input/content/widget.rs diff --git a/src/app/browser/window/tab/item/page/request/widget.rs b/src/app/browser/window/tab/item/page/input/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/request/widget.rs rename to src/app/browser/window/tab/item/page/input/widget.rs