From a6d84908cc8716ce5a96692a3ffe6e0dbfb1c32d Mon Sep 17 00:00:00 2001 From: yggverse Date: Wed, 29 Jan 2025 19:28:42 +0200 Subject: [PATCH] rename identity type from default to common --- .../browser/window/tab/item/page/navigation/request.rs | 2 +- .../tab/item/page/navigation/request/identity.rs | 10 +++++----- .../request/identity/{default.rs => common.rs} | 4 ++-- .../request/identity/{default => common}/widget.rs | 0 .../identity/{default => common}/widget/action.rs | 0 .../{default => common}/widget/action/update.rs | 0 .../identity/{default => common}/widget/form.rs | 0 .../identity/{default => common}/widget/form/drop.rs | 0 .../identity/{default => common}/widget/form/exit.rs | 0 .../identity/{default => common}/widget/form/file.rs | 0 .../identity/{default => common}/widget/form/list.rs | 0 .../{default => common}/widget/form/list/item.rs | 0 .../{default => common}/widget/form/list/item/error.rs | 0 .../{default => common}/widget/form/list/item/imp.rs | 0 .../widget/form/list/item/is_active.rs | 0 .../widget/form/list/item/subtitle.rs | 0 .../{default => common}/widget/form/list/item/title.rs | 0 .../widget/form/list/item/tooltip.rs | 0 .../{default => common}/widget/form/list/item/value.rs | 0 .../identity/{default => common}/widget/form/name.rs | 0 .../identity/{default => common}/widget/form/save.rs | 0 .../widget/form/save/certificate.rs | 0 .../widget/form/save/certificate/error.rs | 0 23 files changed, 8 insertions(+), 8 deletions(-) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default.rs => common.rs} (95%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/action.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/action/update.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/drop.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/exit.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/file.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/error.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/imp.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/is_active.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/subtitle.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/title.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/tooltip.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/list/item/value.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/name.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/save.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/save/certificate.rs (100%) rename src/app/browser/window/tab/item/page/navigation/request/identity/{default => common}/widget/form/save/certificate/error.rs (100%) diff --git a/src/app/browser/window/tab/item/page/navigation/request.rs b/src/app/browser/window/tab/item/page/navigation/request.rs index 1efe86b4..75d60db0 100644 --- a/src/app/browser/window/tab/item/page/navigation/request.rs +++ b/src/app/browser/window/tab/item/page/navigation/request.rs @@ -247,7 +247,7 @@ impl Request for Entry { fn identity(&self, profile: &Rc) { if let Some(uri) = self.uri() { if ["gemini", "titan"].contains(&uri.scheme().as_str()) { - return identity::default( + return identity::common( profile, &uri, &Rc::new({ diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity.rs b/src/app/browser/window/tab/item/page/navigation/request/identity.rs index 42d4fe5b..f2025ff8 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity.rs @@ -1,8 +1,8 @@ -mod default; +mod common; mod unsupported; use adw::AlertDialog; -use default::Default; +use common::Common; use unsupported::Unsupported; use super::Profile; @@ -10,12 +10,12 @@ use gtk::glib::Uri; use std::rc::Rc; /// Create new identity widget for Gemini protocol match given URI -pub fn default( +pub fn common( profile: &Rc, request: &Uri, callback: &Rc, -) -> Default { - Default::build(profile, request, callback) +) -> Common { + Common::build(profile, request, callback) } /// Create new identity widget for unknown request diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs similarity index 95% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common.rs index 8e4ffd37..c27ac36a 100644 --- a/src/app/browser/window/tab/item/page/navigation/request/identity/default.rs +++ b/src/app/browser/window/tab/item/page/navigation/request/identity/common.rs @@ -5,12 +5,12 @@ use super::Profile; use gtk::{glib::Uri, prelude::IsA}; use std::rc::Rc; -pub struct Default { +pub struct Common { // profile: Rc, widget: Rc, } -impl Default { +impl Common { // Construct /// Create new `Self` for given `Profile` diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/action.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/action.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/action.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/action.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/action/update.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/action/update.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/action/update.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/action/update.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/drop.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/drop.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/drop.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/drop.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/exit.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/exit.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/exit.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/exit.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/file.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/file.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/file.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/file.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/error.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/error.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/error.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/error.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/imp.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/imp.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/imp.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/imp.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/is_active.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/is_active.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/is_active.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/is_active.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/subtitle.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/subtitle.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/subtitle.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/subtitle.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/title.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/title.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/title.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/title.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/tooltip.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/tooltip.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/tooltip.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/tooltip.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/value.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/value.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/list/item/value.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/list/item/value.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/name.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/name.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/name.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/name.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save/certificate.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save/certificate.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save/certificate.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save/certificate.rs diff --git a/src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save/certificate/error.rs b/src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save/certificate/error.rs similarity index 100% rename from src/app/browser/window/tab/item/page/navigation/request/identity/default/widget/form/save/certificate/error.rs rename to src/app/browser/window/tab/item/page/navigation/request/identity/common/widget/form/save/certificate/error.rs