From 06f2e0e499abf502b24a4d7f0a453b4029dc2500 Mon Sep 17 00:00:00 2001 From: yggverse Date: Thu, 17 Oct 2024 05:06:22 +0300 Subject: [PATCH] rename components --- src/app/browser/window/tab/item/page.rs | 2 +- src/app/browser/window/tab/item/page/input.rs | 8 +++---- .../page/input/{default.rs => response.rs} | 22 +++++++++---------- .../input/{default => response}/control.rs | 0 .../{default => response}/control/counter.rs | 0 .../control/counter/widget.rs | 0 .../{default => response}/control/send.rs | 0 .../control/send/widget.rs | 0 .../{default => response}/control/widget.rs | 0 .../{default/response.rs => response/form.rs} | 4 ++-- .../response => response/form}/widget.rs | 0 .../page/input/{default => response}/title.rs | 0 .../{default => response}/title/widget.rs | 0 .../input/{default => response}/widget.rs | 0 14 files changed, 18 insertions(+), 18 deletions(-) rename src/app/browser/window/tab/item/page/input/{default.rs => response.rs} (76%) rename src/app/browser/window/tab/item/page/input/{default => response}/control.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/control/counter.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/control/counter/widget.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/control/send.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/control/send/widget.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/control/widget.rs (100%) rename src/app/browser/window/tab/item/page/input/{default/response.rs => response/form.rs} (94%) rename src/app/browser/window/tab/item/page/input/{default/response => response/form}/widget.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/title.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/title/widget.rs (100%) rename src/app/browser/window/tab/item/page/input/{default => response}/widget.rs (100%) diff --git a/src/app/browser/window/tab/item/page.rs b/src/app/browser/window/tab/item/page.rs index 8d3e0ff3..c06703a5 100644 --- a/src/app/browser/window/tab/item/page.rs +++ b/src/app/browser/window/tab/item/page.rs @@ -284,7 +284,7 @@ impl Page { let description = gformat!("{placeholder}"); // Make input form - input.set_default(action_page_open, uri, Some(&description), Some(1024)); + input.use_response(action_page_open, uri, Some(&description), Some(1024)); input.show(); // Update meta diff --git a/src/app/browser/window/tab/item/page/input.rs b/src/app/browser/window/tab/item/page/input.rs index 1edfb6e4..6097f6e4 100644 --- a/src/app/browser/window/tab/item/page/input.rs +++ b/src/app/browser/window/tab/item/page/input.rs @@ -1,8 +1,8 @@ -mod default; +mod response; mod widget; -use default::Default; use gtk::{gio::SimpleAction, glib::Uri}; +use response::Response; use widget::Widget; use adw::Clamp; @@ -31,7 +31,7 @@ impl Input { self.widget.hide() } - pub fn set_default( + pub fn use_response( &self, action_page_open: Arc, base: Uri, @@ -39,7 +39,7 @@ impl Input { size_limit: Option, ) { self.widget.set_child(Some( - &Default::new_arc(action_page_open, base, title, size_limit).gobject(), + &Response::new_arc(action_page_open, base, title, size_limit).gobject(), )); } diff --git a/src/app/browser/window/tab/item/page/input/default.rs b/src/app/browser/window/tab/item/page/input/response.rs similarity index 76% rename from src/app/browser/window/tab/item/page/input/default.rs rename to src/app/browser/window/tab/item/page/input/response.rs index 6e7b35a4..5c0138fe 100644 --- a/src/app/browser/window/tab/item/page/input/default.rs +++ b/src/app/browser/window/tab/item/page/input/response.rs @@ -1,10 +1,10 @@ mod control; -mod response; +mod form; mod title; mod widget; use control::Control; -use response::Response; +use form::Form; use title::Title; use widget::Widget; @@ -16,12 +16,12 @@ use gtk::{ }; use std::sync::Arc; -pub struct Default { +pub struct Response { // Components widget: Arc, } -impl Default { +impl Response { // Construct pub fn new_arc( action_page_open: Arc, @@ -35,23 +35,23 @@ impl Default { // Init components let control = Control::new_arc(action_send.clone()); - let response = Response::new_arc(action_update.clone()); + let form = Form::new_arc(action_update.clone()); let title = Title::new_arc(title); // Init widget - let widget = Widget::new_arc(title.gobject(), response.gobject(), control.gobject()); + let widget = Widget::new_arc(title.gobject(), form.gobject(), control.gobject()); // Init events action_update.connect_activate({ let base = base.clone(); let control = control.clone(); - let response = response.clone(); + let form = form.clone(); move |_, _| { control.update(match size_limit { Some(limit) => Some( limit as i32 - (base.to_string_partial(UriHideFlags::QUERY).len() as i32 - + Uri::escape_string(response.text().as_str(), None, false).len() + + Uri::escape_string(form.text().as_str(), None, false).len() as i32), ), None => None, @@ -60,20 +60,20 @@ impl Default { }); action_send.connect_activate({ - let response = response.clone(); + let form = form.clone(); move |_, _| { action_page_open.activate(Some( &format!( "{}?{}", base.to_string_partial(UriHideFlags::QUERY), - Uri::escape_string(response.text().as_str(), None, false), + Uri::escape_string(form.text().as_str(), None, false), ) .to_variant(), )); } }); - widget.gobject().connect_realize(move |_| response.focus()); + widget.gobject().connect_realize(move |_| form.focus()); // Return activated struct Arc::new(Self { widget }) diff --git a/src/app/browser/window/tab/item/page/input/default/control.rs b/src/app/browser/window/tab/item/page/input/response/control.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control.rs rename to src/app/browser/window/tab/item/page/input/response/control.rs diff --git a/src/app/browser/window/tab/item/page/input/default/control/counter.rs b/src/app/browser/window/tab/item/page/input/response/control/counter.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control/counter.rs rename to src/app/browser/window/tab/item/page/input/response/control/counter.rs diff --git a/src/app/browser/window/tab/item/page/input/default/control/counter/widget.rs b/src/app/browser/window/tab/item/page/input/response/control/counter/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control/counter/widget.rs rename to src/app/browser/window/tab/item/page/input/response/control/counter/widget.rs diff --git a/src/app/browser/window/tab/item/page/input/default/control/send.rs b/src/app/browser/window/tab/item/page/input/response/control/send.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control/send.rs rename to src/app/browser/window/tab/item/page/input/response/control/send.rs diff --git a/src/app/browser/window/tab/item/page/input/default/control/send/widget.rs b/src/app/browser/window/tab/item/page/input/response/control/send/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control/send/widget.rs rename to src/app/browser/window/tab/item/page/input/response/control/send/widget.rs diff --git a/src/app/browser/window/tab/item/page/input/default/control/widget.rs b/src/app/browser/window/tab/item/page/input/response/control/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/control/widget.rs rename to src/app/browser/window/tab/item/page/input/response/control/widget.rs diff --git a/src/app/browser/window/tab/item/page/input/default/response.rs b/src/app/browser/window/tab/item/page/input/response/form.rs similarity index 94% rename from src/app/browser/window/tab/item/page/input/default/response.rs rename to src/app/browser/window/tab/item/page/input/response/form.rs index 132647a3..a80d7fd1 100644 --- a/src/app/browser/window/tab/item/page/input/default/response.rs +++ b/src/app/browser/window/tab/item/page/input/response/form.rs @@ -5,11 +5,11 @@ use widget::Widget; use gtk::{gio::SimpleAction, glib::GString, TextView}; use std::sync::Arc; -pub struct Response { +pub struct Form { widget: Arc, } -impl Response { +impl Form { // Construct pub fn new_arc(action_update: Arc) -> Arc { // Init widget diff --git a/src/app/browser/window/tab/item/page/input/default/response/widget.rs b/src/app/browser/window/tab/item/page/input/response/form/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/response/widget.rs rename to src/app/browser/window/tab/item/page/input/response/form/widget.rs diff --git a/src/app/browser/window/tab/item/page/input/default/title.rs b/src/app/browser/window/tab/item/page/input/response/title.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/title.rs rename to src/app/browser/window/tab/item/page/input/response/title.rs diff --git a/src/app/browser/window/tab/item/page/input/default/title/widget.rs b/src/app/browser/window/tab/item/page/input/response/title/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/title/widget.rs rename to src/app/browser/window/tab/item/page/input/response/title/widget.rs diff --git a/src/app/browser/window/tab/item/page/input/default/widget.rs b/src/app/browser/window/tab/item/page/input/response/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/input/default/widget.rs rename to src/app/browser/window/tab/item/page/input/response/widget.rs