diff --git a/src/lib/config.rs b/src/lib/config.rs index 124849d..d705faa 100644 --- a/src/lib/config.rs +++ b/src/lib/config.rs @@ -248,9 +248,6 @@ pub struct Config { #[clap(short = 'O', long = "sort-order")] // todo support this sort_order: Option, - #[clap(short = 'G', long = "gtk-dark")] - gtk_dark: Option, // todo support this - #[clap(short = 'Q', long = "search")] search: Option, // todo support this diff --git a/src/lib/gui.rs b/src/lib/gui.rs index 1d9cbb3..de3caf8 100644 --- a/src/lib/gui.rs +++ b/src/lib/gui.rs @@ -19,11 +19,7 @@ use gtk4::prelude::{ ApplicationExt, ApplicationExtManual, BoxExt, EditableExt, FlowBoxChildExt, GestureSingleExt, GtkWindowExt, ListBoxRowExt, NativeExt, OrientableExt, WidgetExt, }; -use gtk4::{ - Align, EventControllerKey, Expander, FlowBox, FlowBoxChild, GestureClick, Image, Label, - ListBox, ListBoxRow, NaturalWrapMode, Ordering, PolicyType, ScrolledWindow, SearchEntry, - Widget, gdk, -}; +use gtk4::{Align, EventControllerKey, Expander, FlowBox, FlowBoxChild, GestureClick, Image, Label, ListBox, ListBoxRow, NaturalWrapMode, Ordering, PolicyType, ScrolledWindow, SearchEntry, Widget, gdk}; use gtk4::{Application, ApplicationWindow, CssProvider, Orientation}; use gtk4_layer_shell::{Edge, KeyboardMode, LayerShell}; use log; @@ -163,6 +159,7 @@ where T: Clone + 'static + Send, P: ItemProvider + 'static + Clone + Send, { + gtk4::init()?; log::debug!("Starting GUI"); if let Some(ref css) = config.style() { let provider = CssProvider::new(); diff --git a/src/main.rs b/src/main.rs index 6d6d81b..a70c8f1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,8 +4,6 @@ use anyhow::anyhow; use worf_lib::config::Mode; use worf_lib::{config, mode}; fn main() -> anyhow::Result<()> { - gtk4::init()?; - env_logger::Builder::new() .parse_filters(&env::var("RUST_LOG").unwrap_or_else(|_| "error".to_owned())) .format_timestamp_micros()