apply new fmt version

This commit is contained in:
yggverse 2025-03-16 21:56:18 +02:00
parent e4eecb3489
commit cc7df23f39
94 changed files with 139 additions and 155 deletions

View file

@ -10,12 +10,12 @@ use widget::Widget;
use window::Window;
use crate::Profile;
use adw::{prelude::AdwDialogExt, AboutDialog, Application};
use adw::{AboutDialog, Application, prelude::AdwDialogExt};
use anyhow::Result;
use gtk::{
FileLauncher,
gio::{Cancellable, File},
prelude::GtkWindowExt,
FileLauncher,
};
use sqlite::Transaction;
use std::{rc::Rc, sync::Arc};
@ -146,7 +146,7 @@ impl Browser {
pub fn init(&self, application: Option<&Application>) -> &Self {
// Assign browser window to this application
self.widget.application_window.set_application(application); // @TODO
// Init main window
// Init main window
self.window.init();
self
}

View file

@ -12,7 +12,7 @@ use profile::Profile;
use gtk::{
gio::{SimpleAction, SimpleActionGroup},
glib::{uuid_string_random, GString},
glib::{GString, uuid_string_random},
prelude::ActionMapExt,
};
use std::rc::Rc;

View file

@ -8,7 +8,7 @@ use crate::Profile;
use action::{Action, Position};
use adw::ToolbarView;
use anyhow::Result;
use gtk::{prelude::BoxExt, Box, Orientation};
use gtk::{Box, Orientation, prelude::BoxExt};
use header::Header;
use sqlite::Transaction;
use std::{rc::Rc, sync::Arc};

View file

@ -30,7 +30,7 @@ use source::Source;
use gtk::{
gio::SimpleActionGroup,
glib::{uuid_string_random, GString},
glib::{GString, uuid_string_random},
prelude::ActionMapExt,
};
use std::rc::Rc;

View file

@ -1,6 +1,6 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, Variant},
glib::{Variant, uuid_string_random},
prelude::{ActionExt, ToVariant},
};

View file

@ -2,7 +2,7 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, SignalHandlerId},
glib::{SignalHandlerId, uuid_string_random},
prelude::StaticVariantType,
};

View file

@ -55,7 +55,7 @@ impl Open {
/// Formatted action connector for external implementation
pub fn on_activate(&self, callback: impl Fn(Option<i32>, &str) + 'static) -> SignalHandlerId {
use gtk::{prelude::FileExt, FileDialog, Window};
use gtk::{FileDialog, Window, prelude::FileExt};
use std::rc::Rc;
let cancellable = self.cancellable();

View file

@ -8,7 +8,7 @@ use tab::Tab;
use super::{BrowserAction, Profile, WindowAction};
use adw::{TabBar, TabView};
use gtk::{prelude::BoxExt, Box, MenuButton, Orientation};
use gtk::{Box, MenuButton, Orientation, prelude::BoxExt};
use std::{rc::Rc, sync::Arc};
pub trait Bar {

View file

@ -1,9 +1,9 @@
use super::{BrowserAction, Profile, WindowAction};
use gtk::{
Align, MenuButton,
gio::{self},
glib::{GString, Uri, UriFlags},
prelude::{ActionExt, ToVariant},
Align, MenuButton,
};
use indexmap::IndexMap;
use std::{rc::Rc, sync::Arc};

View file

@ -1,5 +1,5 @@
use super::WindowAction;
use gtk::{prelude::ButtonExt, Align, Button};
use gtk::{Align, Button, prelude::ButtonExt};
use std::rc::Rc;
pub trait Append {

View file

@ -8,7 +8,7 @@ use crate::Profile;
use action::Action;
use adw::{TabPage, TabView};
use anyhow::Result;
use gtk::{gio::Icon, glib::Propagation, prelude::ActionExt, Box, Orientation};
use gtk::{Box, Orientation, gio::Icon, glib::Propagation, prelude::ActionExt};
pub use item::Item;
use menu::Menu;
use sourceview::prelude::IsA;

View file

@ -1,6 +1,6 @@
use gtk::{
gio::SimpleActionGroup,
glib::{uuid_string_random, GString},
glib::{GString, uuid_string_random},
};
/// [SimpleActionGroup](https://docs.gtk.org/gio/class.SimpleActionGroup.html) wrapper for `Tab` actions

View file

@ -10,8 +10,8 @@ use adw::TabPage;
use anyhow::Result;
use client::Client;
use gtk::{
prelude::{ActionExt, ActionMapExt, BoxExt},
Box,
prelude::{ActionExt, ActionMapExt, BoxExt},
};
use page::Page;
use sqlite::Transaction;

View file

@ -36,31 +36,19 @@ impl Cursor {
let i = len2i(len)?;
let n = self.0.unwrap_or_default();
if n < i {
Some(n + 1)
} else {
None
}
if n < i { Some(n + 1) } else { None }
}
pub fn back(&self, len: usize) -> Option<usize> {
len2i(len)?;
let n = self.0.unwrap_or_default();
if n > 0 {
Some(n - 1)
} else {
None
}
if n > 0 { Some(n - 1) } else { None }
}
}
// Tools
fn len2i(len: usize) -> Option<usize> {
if len > 0 {
Some(len - 1)
} else {
None
}
if len > 0 { Some(len - 1) } else { None }
}

View file

@ -1,6 +1,6 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, GString},
glib::{GString, uuid_string_random},
prelude::{ActionExt, StaticVariantType, ToVariant},
};

View file

@ -1,7 +1,7 @@
use super::{Feature, Page};
use ggemini::client::connection::response::{
failure::{Permanent, Temporary},
Certificate, Failure, Input, Redirect,
failure::{Permanent, Temporary},
};
use ggemini::{
client::{Client, Request, Response},

View file

@ -10,11 +10,11 @@ use text::Text;
use super::{ItemAction, TabAction, WindowAction};
use adw::StatusPage;
use gtk::{
Box, Orientation,
gdk::Paintable,
gio::{Cancellable, File},
glib::Uri,
prelude::{BoxExt, IsA, WidgetExt},
Box, Orientation,
};
use std::{rc::Rc, time::Duration};

View file

@ -1,6 +1,6 @@
mod column;
use gtk::{gio::File, ScrolledWindow};
use gtk::{ScrolledWindow, gio::File};
pub struct Directory; // @TODO save settings
@ -15,8 +15,7 @@ impl Directory {
use gtk::gio::FileInfo;
// Init model
const ATTRIBUTES: &str =
"standard::type,standard::display-name,standard::symbolic-icon,standard::size,standard::content-type,time::modified,time::created,time::access";
const ATTRIBUTES: &str = "standard::type,standard::display-name,standard::symbolic-icon,standard::size,standard::content-type,time::modified,time::created,time::access";
let directory_list = gtk::DirectoryList::builder()
.file(file)

View file

@ -5,9 +5,9 @@ use display::Display;
use format::Format;
use gtk::{
ColumnViewColumn, Label, ListItem, SignalListItemFactory,
gio::{File, FileInfo, FileQueryInfoFlags},
glib::{GString, Priority},
ColumnViewColumn, Label, ListItem, SignalListItemFactory,
};
pub trait Column {
@ -23,9 +23,9 @@ pub trait Column {
impl Column for ColumnViewColumn {
fn icon() -> Self {
use gtk::{
Align, ColumnViewColumn, ListItem, SignalListItemFactory,
gio::FileInfo,
prelude::{BoxExt, Cast, ListItemExt, WidgetExt},
Align, ColumnViewColumn, ListItem, SignalListItemFactory,
};
ColumnViewColumn::builder()

View file

@ -1,7 +1,7 @@
use gtk::{
ContentFit, Picture,
gdk::Paintable,
prelude::{IsA, WidgetExt},
ContentFit, Picture,
};
pub struct Image {

View file

@ -14,9 +14,9 @@ use status::Status;
use adw::StatusPage;
use gtk::{
Box, FileDialog, FileLauncher, Orientation, Window,
gio::{Cancellable, File},
prelude::{BoxExt, CancellableExt, WidgetExt},
Box, FileDialog, FileLauncher, Orientation, Window,
};
use std::rc::Rc;

View file

@ -2,7 +2,7 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, SignalHandlerId},
glib::{SignalHandlerId, uuid_string_random},
prelude::{ActionExt, StaticVariantType, ToVariant},
};

View file

@ -2,7 +2,7 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, SignalHandlerId},
glib::{SignalHandlerId, uuid_string_random},
prelude::{ActionExt, StaticVariantType, ToVariant},
};

View file

@ -2,7 +2,7 @@
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, SignalHandlerId},
glib::{SignalHandlerId, uuid_string_random},
prelude::{ActionExt, StaticVariantType, ToVariant},
};

View file

@ -1,4 +1,4 @@
use gtk::{glib::SignalHandlerId, prelude::ButtonExt, Align, Button};
use gtk::{Align, Button, glib::SignalHandlerId, prelude::ButtonExt};
// Defaults

View file

@ -1,7 +1,7 @@
use gtk::{
Align, Button,
glib::SignalHandlerId,
prelude::{ButtonExt, WidgetExt},
Align, Button,
};
// Defaults

View file

@ -1,4 +1,4 @@
use gtk::{glib::SignalHandlerId, prelude::ButtonExt, Align, Button};
use gtk::{Align, Button, glib::SignalHandlerId, prelude::ButtonExt};
// Defaults

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Spinner}; // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+
use gtk::{Spinner, prelude::WidgetExt}; // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+
// Defaults

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Label};
use gtk::{Label, prelude::WidgetExt};
// Defaults

View file

@ -1,6 +1,6 @@
use super::{ItemAction, TabAction};
use adw::StatusPage;
use gtk::{prelude::ActionExt, Align, Button};
use gtk::{Align, Button, prelude::ActionExt};
use std::rc::Rc;
// Defaults

View file

@ -1,8 +1,8 @@
use adw::StatusPage;
use gtk::{
glib::{timeout_add_local, ControlFlow},
prelude::WidgetExt,
Spinner, // use adw::Spinner; @TODO adw 1.6 / ubuntu 24.10+
glib::{ControlFlow, timeout_add_local},
prelude::WidgetExt,
};
use std::time::Duration;

View file

@ -1,6 +1,6 @@
use super::ItemAction;
use adw::StatusPage;
use gtk::{glib::Uri, prelude::ButtonExt, Align, Button};
use gtk::{Align, Button, glib::Uri, prelude::ButtonExt};
use std::rc::Rc;
/// Create new default `GObject` preset for mime issue

View file

@ -5,7 +5,7 @@ mod source;
use super::{ItemAction, WindowAction};
use adw::ClampScrollable;
use gemini::Gemini;
use gtk::{glib::Uri, ScrolledWindow, TextView};
use gtk::{ScrolledWindow, TextView, glib::Uri};
use plain::Plain;
use source::Source;
use std::rc::Rc;
@ -72,7 +72,7 @@ impl Text {
// Grab focus into the `TextView` on click empty `ClampScrollable` area
fn grab_focus_patch(clamp_scrollable: &ClampScrollable, text_view: &TextView) {
use gtk::{prelude::WidgetExt, GestureClick};
use gtk::{GestureClick, prelude::WidgetExt};
let controller = GestureClick::new();
controller.connect_pressed({

View file

@ -19,12 +19,12 @@ use ggemtext::line::{
link::Link,
};
use gtk::{
EventControllerMotion, GestureClick, TextBuffer, TextTag, TextView, TextWindowType,
UriLauncher, Window, WrapMode,
gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY, RGBA},
gio::Cancellable,
glib::{TimeZone, Uri},
prelude::{TextBufferExt, TextBufferExtManual, TextTagExt, TextViewExt, WidgetExt},
EventControllerMotion, GestureClick, TextBuffer, TextTag, TextView, TextWindowType,
UriLauncher, Window, WrapMode,
};
use std::{cell::Cell, collections::HashMap, rc::Rc};

View file

@ -4,7 +4,7 @@ mod tag;
use tag::Tag;
use ansi_parser::{AnsiParser, AnsiSequence, Output};
use gtk::{prelude::TextTagExt, TextTag};
use gtk::{TextTag, prelude::TextTagExt};
/// Apply ANSI/SGR format to new buffer
pub fn format(source_code: &str) -> Vec<(TextTag, String)> {

View file

@ -1,8 +1,8 @@
use gtk::{
glib::{timeout_add_local_once, Uri},
Align, Label, TextView, TextWindowType,
glib::{Uri, timeout_add_local_once},
pango::EllipsizeMode,
prelude::{TextViewExt, WidgetExt},
Align, Label, TextView, TextWindowType,
};
use std::{cell::Cell, rc::Rc, time::Duration};

View file

@ -1,4 +1,4 @@
use gtk::{gdk::Display, IconLookupFlags, IconPaintable, IconTheme, TextDirection};
use gtk::{IconLookupFlags, IconPaintable, IconTheme, TextDirection, gdk::Display};
const SIZE: i32 = 16;

View file

@ -6,10 +6,10 @@ use tag::Tag;
use adw::StyleManager;
use gtk::{
TextTag,
gdk::RGBA,
pango::{Style, Underline},
prelude::TextTagExt,
TextTag,
};
use syntect::{
easy::HighlightLines,

View file

@ -5,9 +5,9 @@ mod titan;
use super::ItemAction;
use adw::Clamp;
use gtk::{
Widget,
glib::{Bytes, Uri},
prelude::{IsA, WidgetExt},
Widget,
};
use response::Response;
use sensitive::Sensitive;

View file

@ -8,10 +8,10 @@ use title::Title;
use super::ItemAction;
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, Uri, UriHideFlags},
prelude::{ActionExt, BoxExt, DisplayExt, WidgetExt},
Box, Label, Orientation, TextView,
gio::SimpleAction,
glib::{Uri, UriHideFlags, uuid_string_random},
prelude::{ActionExt, BoxExt, DisplayExt, WidgetExt},
};
use std::rc::Rc;
@ -94,9 +94,10 @@ impl Response for Box {
form.add_controller({
const SHORTCUT: &str = "<Primary>Return"; // @TODO optional
/*control
.send
.set_tooltip_text(Some(&format!("Shortcut: {SHORTCUT}")));*/
.send
.set_tooltip_text(Some(&format!("Shortcut: {SHORTCUT}")));*/
let c = gtk::ShortcutController::new();
c.add_shortcut(
gtk::Shortcut::builder()

View file

@ -2,7 +2,7 @@ mod counter;
mod send;
use counter::Counter;
use gtk::{gio::SimpleAction, prelude::BoxExt, Align, Box, Button, Label, Orientation};
use gtk::{Align, Box, Button, Label, Orientation, gio::SimpleAction, prelude::BoxExt};
use send::Send;
const SPACING: i32 = 8;

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Label};
use gtk::{Label, prelude::WidgetExt};
use plurify::Plurify;
pub trait Counter {

View file

@ -1,7 +1,7 @@
use gtk::{
Button,
gio::SimpleAction,
prelude::{ActionExt, ButtonExt, WidgetExt},
Button,
};
pub trait Send {

View file

@ -1,8 +1,8 @@
use gtk::{
TextView, WrapMode,
gio::SimpleAction,
glib::GString,
prelude::{ActionExt, TextBufferExt, TextViewExt, WidgetExt},
TextView, WrapMode,
};
use libspelling::{Checker, TextBufferAdapter};
use sourceview::Buffer;

View file

@ -3,10 +3,10 @@ mod form;
use super::ItemAction;
use form::Form;
use gtk::{
gio::SimpleAction,
glib::{uuid_string_random, Uri, UriHideFlags},
prelude::{BoxExt, EditableExt, WidgetExt},
Box, Orientation,
gio::SimpleAction,
glib::{Uri, UriHideFlags, uuid_string_random},
prelude::{BoxExt, EditableExt, WidgetExt},
};
use std::rc::Rc;

View file

@ -1,6 +1,6 @@
use adw::{
prelude::{EntryRowExt, PreferencesRowExt},
PasswordEntryRow,
prelude::{EntryRowExt, PreferencesRowExt},
};
use gtk::{
gio::SimpleAction,

View file

@ -7,9 +7,9 @@ mod text;
use control::Control;
use file::File;
use gtk::{
Notebook,
glib::Bytes,
prelude::{DisplayExt, WidgetExt},
Notebook,
};
pub use header::Header;
use tab::Tab;
@ -21,7 +21,7 @@ pub trait Titan {
impl Titan for gtk::Box {
fn titan(callback: impl Fn(Header, Bytes, Box<dyn Fn()>) + 'static) -> Self {
use gtk::{glib::uuid_string_random, prelude::ButtonExt, Label};
use gtk::{Label, glib::uuid_string_random, prelude::ButtonExt};
use std::rc::Rc;
// Init components
@ -57,7 +57,7 @@ impl Titan for gtk::Box {
// Init main widget
let g_box = {
use gtk::{prelude::BoxExt, Box, Orientation};
use gtk::{Box, Orientation, prelude::BoxExt};
let g_box = {
const MARGIN: i32 = 8;
@ -182,4 +182,4 @@ fn notebook_css_patch(notebook: &Notebook) {
gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
);
} // @TODO replace `Notebook` with `ToggleGroup` in Adw 1.7 / Ubuntu 26.04
// https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.ToggleGroup.html
// https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.ToggleGroup.html

View file

@ -4,8 +4,8 @@ mod upload;
use counter::Counter;
use gtk::{
prelude::{BoxExt, WidgetExt},
Align, Box, Button, Label, Orientation,
prelude::{BoxExt, WidgetExt},
};
use options::Options;
pub use upload::Upload;

View file

@ -1,6 +1,6 @@
use gtk::{
prelude::{ButtonExt, WidgetExt},
Button,
prelude::{ButtonExt, WidgetExt},
};
pub trait Upload {

View file

@ -1,8 +1,8 @@
use super::{Control, Header};
use gtk::{
Button,
gio::FileQueryInfoFlags,
glib::{Bytes, Priority},
Button,
};
use std::{cell::RefCell, rc::Rc};
@ -15,9 +15,9 @@ pub struct File {
impl File {
pub fn build(control: &Rc<Control>) -> Self {
use gtk::{
Button, FileDialog, Window,
gio::Cancellable,
prelude::{ButtonExt, FileExt, WidgetExt},
Button, FileDialog, Window,
};
// Init components

View file

@ -1,6 +1,6 @@
mod form;
use gtk::{glib::GString, prelude::IsA, Widget};
use gtk::{Widget, glib::GString, prelude::IsA};
#[derive(Default, Clone)]
pub struct Header {
@ -13,8 +13,8 @@ impl Header {
/// * takes ownership of `Self`, return new updated copy in `callback` function
pub fn dialog(self, widget: Option<&impl IsA<Widget>>, callback: impl Fn(Self) + 'static) {
use adw::{
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
AlertDialog, ResponseAppearance,
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
};
use form::Form;

View file

@ -5,9 +5,9 @@ use mime::Mime;
use token::Token;
use gtk::{
Box, Entry, Orientation,
glib::GString,
prelude::{BoxExt, EditableExt},
Box, Entry, Orientation,
};
pub struct Form {
@ -48,9 +48,5 @@ impl Form {
fn value(label: &Entry) -> Option<GString> {
let text = label.text();
if !text.is_empty() {
Some(text)
} else {
None
}
if !text.is_empty() { Some(text) } else { None }
}

View file

@ -2,9 +2,9 @@ mod form;
use super::{Control, Header};
use gtk::{
TextBuffer, TextView,
glib::{Bytes, GString},
prelude::{TextBufferExt, TextViewExt},
TextBuffer, TextView,
};
use std::{cell::RefCell, rc::Rc};

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, TextView, WrapMode};
use gtk::{TextView, WrapMode, prelude::WidgetExt};
use libspelling::{Checker, TextBufferAdapter};
use sourceview::Buffer;

View file

@ -9,9 +9,9 @@ use super::{ItemAction, Profile, TabAction, WindowAction};
use anyhow::Result;
use bookmark::Bookmark;
use gtk::{
Box, Button, Orientation,
glib::{GString, Uri},
prelude::{BoxExt, EditableExt, EntryExt, WidgetExt},
Box, Button, Orientation,
};
use history::History;
use home::Home;

View file

@ -1,7 +1,7 @@
use super::{Profile, WindowAction};
use gtk::{
prelude::{ActionExt, ButtonExt, EditableExt, WidgetExt},
Button, Entry,
prelude::{ActionExt, ButtonExt, EditableExt, WidgetExt},
};
use std::{rc::Rc, sync::Arc};

View file

@ -5,7 +5,7 @@ pub use back::Back;
pub use forward::Forward;
use super::{ItemAction, TabAction, WindowAction};
use gtk::{prelude::BoxExt, Box, Button, Orientation};
use gtk::{Box, Button, Orientation, prelude::BoxExt};
use std::rc::Rc;
pub trait History {

View file

@ -1,9 +1,9 @@
use super::{ItemAction, TabAction, WindowAction};
use crate::app::browser::window::action::Position;
use gtk::{
Button, GestureClick,
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
};
use std::rc::Rc;

View file

@ -1,9 +1,9 @@
use super::{ItemAction, TabAction, WindowAction};
use crate::app::browser::window::action::Position;
use gtk::{
Button, GestureClick,
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
};
use std::rc::Rc;

View file

@ -1,9 +1,9 @@
use super::{ItemAction, Request, TabAction, WindowAction};
use crate::app::browser::window::action::Position;
use gtk::{
Button, GestureClick,
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
};
use std::rc::Rc;

View file

@ -1,9 +1,9 @@
use super::{ItemAction, Request, TabAction, WindowAction};
use crate::app::browser::window::action::Position;
use gtk::{
Button, GestureClick,
gdk::BUTTON_MIDDLE,
prelude::{ActionExt, WidgetExt},
Button, GestureClick,
};
use std::rc::Rc;

View file

@ -5,12 +5,12 @@ mod search;
mod suggestion;
use super::{ItemAction, Profile};
use adw::{prelude::AdwDialogExt, AlertDialog};
use adw::{AlertDialog, prelude::AdwDialogExt};
use anyhow::Result;
use gtk::{
glib::{gformat, GString, Uri, UriFlags},
prelude::{EditableExt, EntryExt, WidgetExt},
Entry, EntryIconPosition, StateFlags,
glib::{GString, Uri, UriFlags, gformat},
prelude::{EditableExt, EntryExt, WidgetExt},
};
use primary_icon::PrimaryIcon;
use sqlite::Transaction;

View file

@ -27,10 +27,10 @@ impl Common for AlertDialog {
callback: &Rc<impl Fn(bool) + 'static>,
) -> Self {
use adw::{
prelude::{AlertDialogExt, AlertDialogExtManual},
ResponseAppearance,
prelude::{AlertDialogExt, AlertDialogExtManual},
};
use form::{list::item::value::Value, Form};
use form::{Form, list::item::value::Value};
// Response variants
const RESPONSE_APPLY: (&str, &str) = ("apply", "Apply");

View file

@ -8,16 +8,16 @@ mod save;
use drop::Drop;
use exit::Exit;
use file::File;
use list::{item::value::Value, List};
use list::{List, item::value::Value};
use name::Name;
use save::Save;
use super::WidgetAction;
use crate::Profile;
use gtk::{
Box, Button, Entry, Orientation,
glib::Uri,
prelude::{BoxExt, WidgetExt},
Box, Button, Entry, Orientation,
};
use std::{rc::Rc, sync::Arc};

View file

@ -1,13 +1,13 @@
use super::list::{item::Value, List};
use super::list::{List, item::Value};
use crate::profile::Profile;
use adw::{
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
AlertDialog, ResponseAppearance,
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
};
use gtk::{
Button,
glib::timeout_add_seconds_local_once,
prelude::{ButtonExt, WidgetExt},
Button,
};
use std::{rc::Rc, sync::Arc};

View file

@ -1,12 +1,12 @@
use super::{
list::{item::Value, List},
WidgetAction,
list::{List, item::Value},
};
use crate::Profile;
use gtk::{
glib::{timeout_add_seconds_local_once, Uri},
prelude::{ButtonExt, WidgetExt},
Button,
glib::{Uri, timeout_add_seconds_local_once},
prelude::{ButtonExt, WidgetExt},
};
use std::{rc::Rc, sync::Arc};
@ -30,8 +30,8 @@ impl Exit for Button {
request: &Uri,
) -> Self {
use adw::{
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
AlertDialog, ResponseAppearance,
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
};
const LABEL: &str = "Disconnect";

View file

@ -1,9 +1,9 @@
use super::WidgetAction;
use gtk::{
gio::{Cancellable, ListStore, TlsCertificate},
glib::{gformat, GString},
prelude::{ButtonExt, FileExt, TlsCertificateExt, WidgetExt},
Button, FileDialog, FileFilter, Window,
gio::{Cancellable, ListStore, TlsCertificate},
glib::{GString, gformat},
prelude::{ButtonExt, FileExt, TlsCertificateExt, WidgetExt},
};
use std::{cell::RefCell, rc::Rc};

View file

@ -6,14 +6,14 @@ use item::Item;
use super::WidgetAction;
use crate::profile::Profile;
use gtk::{
Align, Box, DropDown, Image, Label, ListItem, Orientation, SignalListItemFactory,
gdk::Cursor,
gio::{
prelude::{Cast, CastNone},
ListStore,
prelude::{Cast, CastNone},
},
glib::Uri,
prelude::{BoxExt, ListItemExt, ObjectExt, WidgetExt},
Align, Box, DropDown, Image, Label, ListItem, Orientation, SignalListItemFactory,
};
pub struct List {

View file

@ -1,7 +1,7 @@
use super::WidgetAction;
use gtk::{
prelude::{EditableExt, EntryExt, WidgetExt},
Entry,
prelude::{EditableExt, EntryExt, WidgetExt},
};
use std::rc::Rc;

View file

@ -1,13 +1,13 @@
mod certificate;
use certificate::Certificate;
use super::list::{item::Value, List};
use super::list::{List, item::Value};
use crate::profile::Profile;
use gtk::{
gio::{Cancellable, FileCreateFlags, ListStore},
glib::{timeout_add_seconds_local_once, Priority},
prelude::{ButtonExt, FileExt, OutputStreamExtManual, WidgetExt},
Button, FileDialog, FileFilter, Window,
gio::{Cancellable, FileCreateFlags, ListStore},
glib::{Priority, timeout_add_seconds_local_once},
prelude::{ButtonExt, FileExt, OutputStreamExtManual, WidgetExt},
};
use std::{path::MAIN_SEPARATOR, rc::Rc, sync::Arc};

View file

@ -1,4 +1,4 @@
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use crate::profile::Profile;
use gtk::{gio::TlsCertificate, prelude::TlsCertificateExt};

View file

@ -3,10 +3,10 @@ mod form;
use crate::Profile;
use adw::AlertDialog;
use adw::{
prelude::{AlertDialogExt, AlertDialogExtManual},
ResponseAppearance,
prelude::{AlertDialogExt, AlertDialogExtManual},
};
use form::{list::item::Value, list::Item, Form, Query};
use form::{Form, Query, list::Item, list::item::Value};
use gtk::prelude::{EditableExt, WidgetExt};
use sourceview::prelude::CastNone;
use std::rc::Rc;

View file

@ -4,7 +4,7 @@ pub mod query;
use crate::Profile;
use drop::Drop;
use gtk::{prelude::BoxExt, Box, Button, Entry, Orientation};
use gtk::{Box, Button, Entry, Orientation, prelude::BoxExt};
use list::List;
pub use query::Query;
use std::{rc::Rc, sync::Arc};

View file

@ -1,13 +1,13 @@
use super::list::{item::Value, List};
use super::list::{List, item::Value};
use crate::profile::Profile;
use adw::{
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
AlertDialog, ResponseAppearance,
prelude::{AdwDialogExt, AlertDialogExt, AlertDialogExtManual},
};
use gtk::{
Button,
glib::timeout_add_seconds_local_once,
prelude::{ButtonExt, WidgetExt},
Button,
};
use std::{rc::Rc, sync::Arc};

View file

@ -2,12 +2,12 @@ pub mod item;
use crate::profile::Profile;
use gtk::{
Align, Box, DropDown, Label, ListItem, Orientation, SignalListItemFactory,
gio::{
prelude::{Cast, CastNone},
ListStore,
prelude::{Cast, CastNone},
},
prelude::{BoxExt, ListItemExt, ObjectExt, WidgetExt},
Align, Box, DropDown, Label, ListItem, Orientation, SignalListItemFactory,
};
pub use item::Item;
use std::sync::Arc;

View file

@ -1,7 +1,7 @@
use gtk::{
Entry,
glib::{Uri, UriFlags},
prelude::{EditableExt, EntryExt},
Entry,
};
const MIN_LENGTH: u16 = 1;

View file

@ -2,18 +2,18 @@ mod item;
use super::Profile;
use adw::{
prelude::{ActionRowExt, PopoverExt, PreferencesRowExt},
ActionRow,
prelude::{ActionRowExt, PopoverExt, PreferencesRowExt},
};
use gtk::{
Align, Entry, INVALID_LIST_POSITION, ListItem, ListView, Popover, SignalListItemFactory,
SingleSelection,
gio::{
prelude::{Cast, CastNone},
ListStore,
prelude::{Cast, CastNone},
},
glib::{GString, SignalHandlerId},
prelude::{EditableExt, EntryExt, ListItemExt, WidgetExt},
Align, Entry, ListItem, ListView, Popover, SignalListItemFactory, SingleSelection,
INVALID_LIST_POSITION,
};
pub use item::Item;
use sourceview::prelude::ListModelExt;

View file

@ -8,8 +8,8 @@ use placeholder::Placeholder;
use subject::Subject;
use gtk::{
prelude::{BoxExt, ButtonExt, WidgetExt},
Align, Box, Orientation, TextView,
prelude::{BoxExt, ButtonExt, WidgetExt},
};
use std::{cell::RefCell, rc::Rc};

View file

@ -10,11 +10,11 @@ use navigation::Navigation;
use result::Result;
use gtk::{
Align, Box, Orientation, TextIter, TextSearchFlags, TextView,
prelude::{
BoxExt, ButtonExt, CheckButtonExt, DisplayExt, EditableExt, EntryExt, TextBufferExt,
TextViewExt, WidgetExt,
},
Align, Box, Orientation, TextIter, TextSearchFlags, TextView,
};
use std::{cell::RefCell, rc::Rc};

View file

@ -1,6 +1,6 @@
use gtk::{
prelude::{EditableExt, EntryExt, WidgetExt},
Align, Entry, EntryIconPosition,
prelude::{EditableExt, EntryExt, WidgetExt},
};
const MARGIN: i32 = 6;

View file

@ -8,8 +8,8 @@ use model::Model;
use super::Subject;
use gtk::{
prelude::{BoxExt, TextBufferExt, TextViewExt},
Box, Orientation, TextIter,
prelude::{BoxExt, TextBufferExt, TextViewExt},
};
use std::cell::RefCell;

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Align, Button};
use gtk::{Align, Button, prelude::WidgetExt};
pub struct Back {
pub button: Button,

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Align, Button};
use gtk::{Align, Button, prelude::WidgetExt};
pub struct Forward {
pub button: Button,

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Label};
use gtk::{Label, prelude::WidgetExt};
const MARGIN: i32 = 3;

View file

@ -1,4 +1,4 @@
use gtk::{prelude::WidgetExt, Align, Label};
use gtk::{Align, Label, prelude::WidgetExt};
const MARGIN: i32 = 6;

View file

@ -3,8 +3,8 @@ mod tag;
use tag::Tag;
use gtk::{
prelude::{TextBufferExt, TextViewExt},
TextView,
prelude::{TextBufferExt, TextViewExt},
};
pub struct Subject {

View file

@ -1,4 +1,4 @@
use gtk::{gdk::RGBA, TextTag};
use gtk::{TextTag, gdk::RGBA};
pub fn new() -> TextTag {
TextTag::builder()

View file

@ -1,4 +1,4 @@
use gtk::{gdk::RGBA, TextTag};
use gtk::{TextTag, gdk::RGBA};
pub fn new() -> TextTag {
TextTag::builder()

View file

@ -7,7 +7,7 @@ mod search;
use anyhow::Result;
use bookmark::Bookmark;
use database::Database;
use gtk::glib::{user_config_dir, DateTime};
use gtk::glib::{DateTime, user_config_dir};
use history::History;
use identity::Identity;
use r2d2::Pool;

View file

@ -1,4 +1,4 @@
use super::{item::Event, Item};
use super::{Item, item::Event};
use anyhow::Result;
use gtk::glib::DateTime;
use r2d2::Pool;

View file

@ -4,7 +4,7 @@ mod database;
mod item;
mod memory;
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use auth::Auth;
use database::Database;
use gtk::glib::DateTime;

View file

@ -1,6 +1,6 @@
pub mod auth;
use anyhow::{bail, Result};
use anyhow::{Result, bail};
pub use auth::Auth;
use std::{collections::HashMap, sync::RwLock};

View file

@ -1,4 +1,4 @@
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use gtk::gio::TlsCertificate;
/// Gemini identity holder for cached record in application-wide struct format.

View file

@ -1,4 +1,4 @@
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use std::{collections::HashMap, sync::RwLock};
/// Reduce disk usage by cache index in memory