diff --git a/Cargo.lock b/Cargo.lock index 4f7c19d..be5a877 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,9 +968,9 @@ dependencies = [ [[package]] name = "re_set-lib" -version = "3.3.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e610c5187314da0f61fe746ca0102e6d4ca2914f7f8f99ce3723af49c9673dc" +checksum = "d25cf78a85f7e39ca17fd755a370044d828b1d99998f41a6778d4d707e278c74" dependencies = [ "dbus", "dbus-crossroads", @@ -1005,7 +1005,7 @@ dependencies = [ [[package]] name = "reset" -version = "1.1.1" +version = "1.2.0" dependencies = [ "dbus", "fork", @@ -1021,9 +1021,9 @@ dependencies = [ [[package]] name = "reset_daemon" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3634f15c02c4a1394d4e26c10b12df4e1e6d5eff3a3cd5afe9b574e98f322a" +checksum = "130fefb02b41748af697f67ff201fffe5e73864331a177442e7cd9910b538fb1" dependencies = [ "crossbeam", "dbus", diff --git a/Cargo.toml b/Cargo.toml index b4b4dc2..2a47db9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,16 +1,14 @@ [package] name = "reset" -version = "1.1.1" +version = "1.2.0" edition = "2021" description = "A wip universal Linux settings application." repository = "https://github.com/Xetibo/ReSet" license = "GPL-3.0-or-later" [dependencies] -#reset_daemon = { git = "https://github.com/Xetibo/ReSet-Daemon", branch = "dashie" } -reset_daemon = "1.2.1" -#re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" , branch = "audioobject"} -re_set-lib = "3.3.0" +reset_daemon = "1.3.1" +re_set-lib = "3.4.1" adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] } dbus = "0.9.7" gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] } diff --git a/src/components/audio/audio_box_utils.rs b/src/components/audio/audio_box_utils.rs index 9d18eea..a1ef8bc 100644 --- a/src/components/audio/audio_box_utils.rs +++ b/src/components/audio/audio_box_utils.rs @@ -15,8 +15,12 @@ use gtk::{ use re_set_lib::{ audio::audio_structures::{Card, TAudioObject, TAudioStreamObject}, signals::{TAudioEventRemoved, TAudioObjectEvent, TAudioStreamEvent}, + ERROR, }; +#[cfg(debug_assertions)] +use re_set_lib::{utils::macros::ErrorLevel, write_log_to_file}; + use crate::components::{ base::{card_entry::CardEntry, error_impl::ReSetErrorImpl, list_entry::ListEntry}, utils::{create_dropdown_label_factory, set_combo_row_ellipsis, BASE, DBUS_PATH}, @@ -365,8 +369,7 @@ pub fn start_audio_box_listener< >(object_added_box.clone(), ir, dummy_name) }); if res.is_err() { - // TODO: handle this with the log/error macro - println!("fail on source add event"); + ERROR!("fail on source add event", ErrorLevel::PartialBreakage); return conn; } @@ -384,7 +387,7 @@ pub fn start_audio_box_listener< >(object_changed_box.clone(), ir, get_default_name_function) }); if res.is_err() { - println!("fail on source change event"); + ERROR!("fail on source change event", ErrorLevel::PartialBreakage); return conn; } @@ -402,7 +405,7 @@ pub fn start_audio_box_listener< >(object_removed_box.clone(), ir, dummy_name) }); if res.is_err() { - println!("fail on source remove event"); + ERROR!("fail on source remove event", ErrorLevel::PartialBreakage); return conn; } @@ -420,7 +423,10 @@ pub fn start_audio_box_listener< >(stream_added_box.clone(), ir) }); if res.is_err() { - println!("fail on output stream add event"); + ERROR!( + "fail on output stream add event", + ErrorLevel::PartialBreakage + ); return conn; } @@ -438,7 +444,10 @@ pub fn start_audio_box_listener< >(stream_changed_box.clone(), ir) }); if res.is_err() { - println!("fail on output stream change event"); + ERROR!( + "fail on output stream change event", + ErrorLevel::PartialBreakage + ); return conn; } @@ -456,7 +465,10 @@ pub fn start_audio_box_listener< >(stream_removed_box.clone(), ir) }); if res.is_err() { - println!("fail on output stream remove event"); + ERROR!( + "fail on output stream remove event", + ErrorLevel::PartialBreakage + ); return conn; } diff --git a/src/components/base/error.rs b/src/components/base/error.rs index d7c2dc4..84afc07 100644 --- a/src/components/base/error.rs +++ b/src/components/base/error.rs @@ -24,7 +24,6 @@ impl ReSetError { .imp() .reset_error_button .connect_clicked(clone!(@strong error => move |_| { - println!("pingpangpung"); error.popdown(); })); error diff --git a/src/components/bluetooth/bluetooth_box.rs b/src/components/bluetooth/bluetooth_box.rs index 0765268..4f41cf9 100644 --- a/src/components/bluetooth/bluetooth_box.rs +++ b/src/components/bluetooth/bluetooth_box.rs @@ -14,8 +14,14 @@ use glib::{clone, ControlFlow}; use gtk::glib::Variant; use gtk::prelude::{ActionableExt, ButtonExt, ListBoxRowExt, WidgetExt}; use gtk::{gio, StringObject}; -use re_set_lib::bluetooth::bluetooth_structures::{BluetoothAdapter, BluetoothDevice}; -use re_set_lib::signals::{BluetoothDeviceAdded, BluetoothDeviceChanged, BluetoothDeviceRemoved}; +use re_set_lib::{ + bluetooth::bluetooth_structures::{BluetoothAdapter, BluetoothDevice}, + signals::{BluetoothDeviceAdded, BluetoothDeviceChanged, BluetoothDeviceRemoved}, + ERROR +}; + +#[cfg(debug_assertions)] +use re_set_lib::{utils::macros::ErrorLevel, write_log_to_file}; use crate::components::base::error_impl::{show_error, ReSetErrorImpl}; use crate::components::base::utils::Listeners; @@ -318,7 +324,10 @@ pub fn start_bluetooth_listener(listeners: Arc, bluetooth_box: Arc, bluetooth_box: Arc, bluetooth_box: Arc, wifi_box: Arc) { access_point_added_handler(added_ref.clone(), ir) }); if res.is_err() { - println!("fail on access point add event"); + ERROR!( + "fail on access point add event", + ErrorLevel::PartialBreakage + ); return; } let res = conn.add_match(access_point_removed, move |ir: AccessPointRemoved, _, _| { access_point_removed_handler(removed_ref.clone(), ir) }); if res.is_err() { - println!("fail on access point remove event"); + ERROR!( + "fail on access point remove event", + ErrorLevel::PartialBreakage + ); return; } let res = conn.add_match(access_point_changed, move |ir: AccessPointChanged, _, _| { access_point_changed_handler(changed_ref.clone(), ir) }); if res.is_err() { - println!("fail on access point change event"); + ERROR!( + "fail on access point change event", + ErrorLevel::PartialBreakage + ); return; } let res = conn.add_match(device_changed, move |ir: WifiDeviceChanged, _, _| { wifi_device_changed_handler(wifi_changed_ref.clone(), ir) }); if res.is_err() { - println!("fail on wifi device change event"); + ERROR!( + "fail on wifi device change event", + ErrorLevel::PartialBreakage + ); return; } let res = conn.add_match(devices_reset, move |ir: WifiDeviceReset, _, _| { wifi_device_reset_handler(wifi_reset_ref.clone(), ir) }); if res.is_err() { - println!("fail on wifi device change event"); + ERROR!( + "fail on wifi device change event", + ErrorLevel::PartialBreakage + ); return; } diff --git a/src/components/window/reset_window.rs b/src/components/window/reset_window.rs index 8c4c0e0..fa39a91 100644 --- a/src/components/window/reset_window.rs +++ b/src/components/window/reset_window.rs @@ -144,11 +144,10 @@ impl ReSetWindow { let mut plugin_sidebar_list = vec![]; unsafe { for plugin in FRONTEND_PLUGINS.iter() { - let plugin_capabilities = &plugin.capabilities; - + (plugin.frontend_startup)(); - + let (sidebar_info, plugin_boxes) = (plugin.frontend_data)(); let listeners = self_imp.listeners.clone(); @@ -241,6 +240,17 @@ impl ReSetWindow { }) .build(); + let banner_action = ActionEntry::builder("banner") + .parameter_type(Some(&String::static_variant_type())) + .activate(move |window: &Self, _, text| { + let imp = window.imp(); + if let Some(text) = text { + imp.reset_banner.set_title(&text.to_string()); + } + imp.reset_banner.set_revealed(true); + }) + .build(); + let close_action = ActionEntry::builder("close") .activate(move |window: &Self, _, _| { window.close(); @@ -320,6 +330,7 @@ impl ReSetWindow { self.add_action_entries([ search_action, + banner_action, close_action, about_action, vim_up, @@ -385,6 +396,12 @@ fn setup_callback(window: Rc) -> Rc { self_imp.reset_close.connect_clicked(move |_| { close_ref.close(); }); + + self_imp.reset_banner.connect_button_clicked(|banner| { + banner.set_revealed(false); + banner.set_title("Info"); + }); + window } diff --git a/src/components/window/reset_window_impl.rs b/src/components/window/reset_window_impl.rs index 6dfac0d..730c6a7 100644 --- a/src/components/window/reset_window_impl.rs +++ b/src/components/window/reset_window_impl.rs @@ -25,6 +25,8 @@ pub struct ReSetWindow { #[template_child] pub reset_main: TemplateChild, #[template_child] + pub reset_banner: TemplateChild, + #[template_child] pub reset_sidebar_breakpoint: TemplateChild, #[template_child] pub reset_overlay_split_view: TemplateChild, @@ -36,6 +38,8 @@ pub struct ReSetWindow { pub reset_sidebar_toggle: TemplateChild