From 7b5e7e7f07c5bb57ed7ec4cd968a2ecfb8608fd8 Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 30 Sep 2024 02:00:14 +0300 Subject: [PATCH] enshort namespaces, define in header --- src/main.rs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8dd0df0a..3acab26e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,14 +1,18 @@ mod browser; -use std::fs; +use browser::Browser; -use gtk::prelude::{ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt}; +use gtk::{ + glib::{user_config_dir, ExitCode}, + prelude::{ApplicationExt, ApplicationExtManual, GtkApplicationExt, GtkWindowExt}, + Application, +}; -use gtk::{glib, Application}; +use std::fs::create_dir_all; const APP_ID: &str = "io.github.yggverse.Yoda"; -fn main() -> glib::ExitCode { +fn main() -> ExitCode { // Init app let app = Application::builder().application_id(APP_ID).build(); @@ -28,11 +32,11 @@ fn main() -> glib::ExitCode { // Create new window app.connect_activate({ // Init profile directory - let mut fs = glib::user_config_dir(); + let mut fs = user_config_dir(); fs.push(APP_ID); - if let Err(e) = fs::create_dir_all(&fs) { + if let Err(e) = create_dir_all(&fs) { panic!("Failed to create profile directory: {e}") } @@ -48,7 +52,7 @@ fn main() -> glib::ExitCode { };*/ move |this: &Application| { - browser::Browser::new(this, /*db.clone(),*/ 640, 480) + Browser::new(this, /*db.clone(),*/ 640, 480) .widget() .present(); }