Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-12-15 18:11:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Add Error popup

Browse source
This commit is contained in:
Fabio Lenherr / DashieTM 2024-03-11 17:19:38 +01:00
parent cc73c425f7
commit 16a30a7bdd
40 changed files with 422 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

204
src/components/input/source_box.rs
View file

@ -21,6 +21,8 @@ use gtk::prelude::ActionableExt;
use gtk::{gio, StringObject};
use crate::components::base::card_entry::CardEntry;
use crate::components::base::error::{self, ReSetError};
use crate::components::base::error_impl::{show_error, ReSetErrorImpl};
use crate::components::base::list_entry::ListEntry;
use crate::components::input::source_box_impl;
use crate::components::input::source_entry::set_source_volume;
@ -44,6 +46,12 @@ glib::wrapper! {
unsafe impl Send for SourceBox {}
unsafe impl Sync for SourceBox {}
impl ReSetErrorImpl for SourceBox {
fn error(&self) -> &gtk::subclass::prelude::TemplateChild<error::ReSetError> {
&self.imp().error
}
}
impl SourceBox {
pub fn new() -> Self {
let obj: Self = Object::builder().build();
@ -97,7 +105,7 @@ impl Default for SourceBox {
pub fn populate_sources(input_box: Arc<SourceBox>) {
gio::spawn_blocking(move || {
let sources = get_sources();
let sources = get_sources(input_box.clone());
{
let input_box_imp = input_box.imp();
let list = input_box_imp.reset_model_list.write().unwrap();
@ -105,7 +113,7 @@ pub fn populate_sources(input_box: Arc<SourceBox>) {
let mut model_index = input_box_imp.reset_model_index.write().unwrap();
input_box_imp
.reset_default_source
.replace(get_default_source());
.replace(get_default_source(input_box.clone()));
for source in sources.iter() {
list.append(&source.alias);
map.insert(source.alias.clone(), (source.index, source.name.clone()));
@ -126,94 +134,85 @@ fn populate_source_information(input_box: Arc<SourceBox>, sources: Vec<Source>)
let input_box_ref_toggle = input_box.clone();
let input_box_ref_mute = input_box.clone();
let input_box_ref = input_box.clone();
{
let input_box_imp = input_box_ref.imp();
let default_sink = input_box_imp.reset_default_source.clone();
let source = default_sink.borrow();
let input_box_imp = input_box.imp();
let default_sink = input_box_imp.reset_default_source.clone();
let source = default_sink.borrow();
if source.muted {
input_box_imp
.reset_source_mute
.set_icon_name("microphone-disabled-symbolic");
} else {
input_box_imp
.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic");
}
let volume = source.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
input_box_imp.reset_volume_percentage.set_text(&percentage);
input_box_imp.reset_volume_slider.set_value(*volume as f64);
let mut list = input_box_imp.reset_source_list.write().unwrap();
for source in sources {
let index = source.index;
let alias = source.alias.clone();
let mut is_default = false;
if input_box_imp.reset_default_source.borrow().name == source.name {
is_default = true;
}
let source_entry = Arc::new(SourceEntry::new(
is_default,
input_box_imp.reset_default_check_button.clone(),
source,
input_box.clone(),
));
let source_clone = source_entry.clone();
let entry = Arc::new(ListEntry::new(&*source_entry));
entry.set_activatable(false);
list.insert(index, (entry.clone(), source_clone, alias));
input_box_imp.reset_sources.append(&*entry);
}
let list = input_box_imp.reset_model_list.read().unwrap();
input_box_imp.reset_source_dropdown.set_model(Some(&*list));
let name = input_box_imp.reset_default_source.borrow();
let index = input_box_imp.reset_model_index.read().unwrap();
let model_list = input_box_imp.reset_model_list.read().unwrap();
for entry in 0..*index {
if model_list.string(entry) == Some(name.alias.clone().into()) {
input_box_imp.reset_source_dropdown.set_selected(entry);
break;
}
}
if source.muted {
input_box_imp
.reset_source_dropdown
.connect_selected_notify(move |dropdown| {
if let ControlFlow::Break() =
dropdown_handler(input_box_ref_toggle, dropdown, input_box_imp)
{
return;
}
});
.reset_source_mute
.set_icon_name("microphone-disabled-symbolic");
} else {
input_box_imp
.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic");
}
input_box_ref
.imp()
let volume = source.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
input_box_imp.reset_volume_percentage.set_text(&percentage);
input_box_imp.reset_volume_slider.set_value(*volume as f64);
let mut list = input_box_imp.reset_source_list.write().unwrap();
for source in sources {
let index = source.index;
let alias = source.alias.clone();
let mut is_default = false;
if input_box_imp.reset_default_source.borrow().name == source.name {
is_default = true;
}
let source_entry = Arc::new(SourceEntry::new(
is_default,
input_box_imp.reset_default_check_button.clone(),
source,
input_box.clone(),
));
let source_clone = source_entry.clone();
let entry = Arc::new(ListEntry::new(&*source_entry));
entry.set_activatable(false);
list.insert(index, (entry.clone(), source_clone, alias));
input_box_imp.reset_sources.append(&*entry);
}
let list = input_box_imp.reset_model_list.read().unwrap();
input_box_imp.reset_source_dropdown.set_model(Some(&*list));
let name = input_box_imp.reset_default_source.borrow();
let index = input_box_imp.reset_model_index.read().unwrap();
let model_list = input_box_imp.reset_model_list.read().unwrap();
for entry in 0..*index {
if model_list.string(entry) == Some(name.alias.clone().into()) {
input_box_imp.reset_source_dropdown.set_selected(entry);
break;
}
}
input_box_imp
.reset_source_dropdown
.connect_selected_notify(move |dropdown| {
if let ControlFlow::Break =
dropdown_handler(input_box_ref_toggle.clone(), dropdown)
{
return;
}
});
input_box_imp
.reset_volume_slider
.connect_change_value(move |_, _, value| {
volume_slider_handler(input_box_ref_slider, value)
volume_slider_handler(input_box_ref_slider.clone(), value)
});
input_box_ref
.imp()
.reset_source_mute
.connect_clicked(move |_| {
mute_clicked_handler(input_box_ref_mute);
});
input_box_imp.reset_source_mute.connect_clicked(move |_| {
mute_clicked_handler(input_box_ref_mute.clone());
});
});
});
}
fn dropdown_handler(
input_box_ref_toggle: Arc<SourceBox>,
dropdown: &adw::ComboRow,
input_box_imp: &source_box_impl::SourceBox,
) -> ControlFlow<()> {
let input_box = input_box_ref_toggle.clone();
fn dropdown_handler(input_box: Arc<SourceBox>, dropdown: &adw::ComboRow) -> ControlFlow {
let input_box_imp = input_box.imp();
let input_box_ref = input_box.clone();
let selected = dropdown.selected_item();
if selected.is_none() {
return ControlFlow::Break(());
return ControlFlow::Break;
}
let selected = selected.unwrap();
let selected = selected.downcast_ref::<StringObject>().unwrap();
@ -221,22 +220,22 @@ fn dropdown_handler(
let source = input_box_imp.reset_source_map.read().unwrap();
let source = source.get(&selected);
if source.is_none() {
return ControlFlow::Break(());
return ControlFlow::Break;
}
let source = Arc::new(source.unwrap().1.clone());
gio::spawn_blocking(move || {
let result = set_default_source(source);
let result = set_default_source(source, input_box_ref.clone());
if result.is_none() {
return ControlFlow::Break(());
return ControlFlow::Break;
}
refresh_default_source(result.unwrap(), input_box.clone(), false);
refresh_default_source(result.unwrap(), input_box_ref.clone(), false);
ControlFlow::Continue
});
ControlFlow::Continue(())
ControlFlow::Continue
}
fn volume_slider_handler(input_box_ref_slider: Arc<SourceBox>, value: f64) -> Propagation {
let imp = input_box_ref_slider.imp();
fn volume_slider_handler(input_box: Arc<SourceBox>, value: f64) -> Propagation {
let imp = input_box.imp();
let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.reset_volume_percentage.set_text(&percentage);
@ -250,7 +249,7 @@ fn volume_slider_handler(input_box_ref_slider: Arc<SourceBox>, value: f64) -> Pr
}
*time = Some(SystemTime::now());
}
set_source_volume(value, index, channels);
set_source_volume(value, index, channels, input_box.clone());
Propagation::Proceed
}
@ -265,7 +264,7 @@ fn mute_clicked_handler(input_box_ref_mute: Arc<SourceBox>) {
imp.reset_source_mute
.set_icon_name("audio-input-microphone-symbolic");
}
toggle_source_mute(source.index, source.muted);
toggle_source_mute(source.index, source.muted, input_box_ref_mute.clone());
}
pub fn refresh_default_source(new_source: Source, input_box: Arc<SourceBox>, entry: bool) {
@ -310,7 +309,7 @@ pub fn populate_outputstreams(input_box: Arc<SourceBox>) {
let input_box_ref = input_box.clone();
gio::spawn_blocking(move || {
let streams = get_output_streams();
let streams = get_output_streams(input_box.clone());
glib::spawn_future(async move {
glib::idle_add_once(move || {
let input_box_imp = input_box_ref.imp();
@ -332,7 +331,7 @@ pub fn populate_outputstreams(input_box: Arc<SourceBox>) {
pub fn populate_cards(input_box: Arc<SourceBox>) {
gio::spawn_blocking(move || {
let input_box_ref = input_box.clone();
let cards = get_cards();
let cards = get_cards(input_box.clone());
glib::spawn_future(async move {
glib::idle_add_once(move || {
let imp = input_box_ref.imp();
@ -344,52 +343,57 @@ pub fn populate_cards(input_box: Arc<SourceBox>) {
});
}
fn get_output_streams() -> Vec<OutputStream> {
fn get_output_streams(input_box: Arc<SourceBox>) -> Vec<OutputStream> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Vec<OutputStream>,), Error> =
proxy.method_call(AUDIO, "ListOutputStreams", ());
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to get output streams");
return Vec::new();
}
res.unwrap().0
}
fn get_sources() -> Vec<Source> {
fn get_sources(input_box: Arc<SourceBox>) -> Vec<Source> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Vec<Source>,), Error> = proxy.method_call(AUDIO, "ListSources", ());
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to get sources");
return Vec::new();
}
res.unwrap().0
}
fn get_cards() -> Vec<Card> {
fn get_cards(input_box: Arc<SourceBox>) -> Vec<Card> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Vec<Card>,), Error> = proxy.method_call(AUDIO, "ListCards", ());
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to get profiles");
return Vec::new();
}
res.unwrap().0
}
pub fn get_default_source_name() -> String {
pub fn get_default_source_name(input_box: Arc<SourceBox>) -> String {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(String,), Error> = proxy.method_call(AUDIO, "GetDefaultSourceName", ());
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to get default source name");
return String::from("");
}
res.unwrap().0
}
fn get_default_source() -> Source {
fn get_default_source(input_box: Arc<SourceBox>) -> Source {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Source,), Error> = proxy.method_call(AUDIO, "GetDefaultSource", ());
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to get default source");
return Source::default();
}
res.unwrap().0
@ -420,7 +424,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
let output_stream_changed_box = source_box.clone();
let res = conn.add_match(source_added, move |ir: SourceAdded, _, _| {
source_added_handler(source_box, ir)
source_added_handler(source_added_box.clone(), ir)
});
if res.is_err() {
// TODO: handle this with the log/error macro
@ -429,7 +433,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
}
let res = conn.add_match(source_removed, move |ir: SourceRemoved, _, _| {
source_removed_handler(source_box, ir)
source_removed_handler(source_removed_box.clone(), ir)
});
if res.is_err() {
println!("fail on source remove event");
@ -437,7 +441,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
}
let res = conn.add_match(source_changed, move |ir: SourceChanged, _, _| {
source_changed_handler(source_box, ir)
source_changed_handler(source_changed_box.clone(), ir)
});
if res.is_err() {
println!("fail on source change event");
@ -445,7 +449,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
}
let res = conn.add_match(output_stream_added, move |ir: OutputStreamAdded, _, _| {
output_stream_added_handler(output_stream_added_box, ir)
output_stream_added_handler(output_stream_added_box.clone(), ir)
});
if res.is_err() {
println!("fail on output stream add event");
@ -455,7 +459,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
let res = conn.add_match(
output_stream_changed,
move |ir: OutputStreamChanged, _, _| {
output_stream_changed_handler(output_stream_changed_box, ir)
output_stream_changed_handler(output_stream_changed_box.clone(), ir)
},
);
if res.is_err() {
@ -466,7 +470,7 @@ pub fn start_input_box_listener(conn: Connection, source_box: Arc<SourceBox>) ->
let res = conn.add_match(
output_stream_removed,
move |ir: OutputStreamRemoved, _, _| {
output_stream_removed_handler(output_stream_removed_box, ir)
output_stream_removed_handler(output_stream_removed_box.clone(), ir)
},
);
if res.is_err() {