Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-12 08:28:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

8
src/components/base/card_entry.rs
View file

@ -13,7 +13,7 @@ use components::utils::create_dropdown_label_factory;
use re_set_lib::audio::audio_structures::Card;
use crate::components;
use crate::components::utils::{BASE, DBUS_PATH, AUDIO};
use crate::components::utils::{AUDIO, BASE, DBUS_PATH};
use super::card_entry_impl;
@ -66,11 +66,7 @@ impl CardEntry {
fn set_card_profile_of_device(device_index: u32, profile_name: String) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let _: Result<(), Error> = proxy.method_call(
AUDIO,
"SetCardProfileOfDevice",

41
src/components/base/error.rs Normal file
View file

@ -0,0 +1,41 @@
use std::{rc::Rc, sync::Arc};
use adw::glib;
use adw::glib::Object;
use glib::{clone, subclass::types::ObjectSubclassIsExt};
use gtk::{
gdk,
prelude::{ButtonExt, PopoverExt},
Editable, Popover,
};
use super::error_impl;
glib::wrapper! {
pub struct ReSetError(ObjectSubclass<error_impl::ReSetError>)
@extends Popover, gtk::Widget,
@implements Editable,gdk::Popup, gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
}
unsafe impl Send for ReSetError {}
unsafe impl Sync for ReSetError {}
impl ReSetError {
pub fn new() -> Self {
let error: ReSetError = Object::builder().build();
error
.imp()
.reset_error_button
.connect_clicked(clone!(@strong error => move |_| {
println!("pingpangpung");
error.popdown();
}));
error
}
}
impl Default for ReSetError {
fn default() -> Self {
Self::new()
}
}

77
src/components/base/error_impl.rs Normal file
View file

@ -0,0 +1,77 @@
use std::cell::RefCell;
use std::sync::Arc;
use glib::clone;
use gtk::prelude::{ButtonExt, PopoverExt};
use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, Label, PasswordEntry, PasswordEntryBuffer, Popover};
use crate::components::input::source_box::SourceBox;
use super::error;
#[derive(Default, CompositeTemplate)]
#[template(resource = "/org/Xetibo/ReSet/resetError.ui")]
pub struct ReSetError {
#[template_child]
pub reset_error_label: TemplateChild<Label>,
#[template_child]
pub reset_error_button: TemplateChild<Button>,
}
unsafe impl Send for ReSetError {}
unsafe impl Sync for ReSetError {}
#[glib::object_subclass]
impl ObjectSubclass for ReSetError {
const ABSTRACT: bool = false;
const NAME: &'static str = "resetError";
type Type = error::ReSetError;
type ParentType = Popover;
fn class_init(klass: &mut Self::Class) {
klass.bind_template();
}
fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
obj.init_template();
}
}
impl ObjectImpl for ReSetError {
fn constructed(&self) {
self.parent_constructed();
}
}
impl WidgetImpl for ReSetError {}
impl WindowImpl for ReSetError {}
impl PopoverImpl for ReSetError {}
impl ApplicationWindowImpl for ReSetError {}
impl EditableImpl for ReSetError {}
pub fn show_error<T: ReSetErrorImpl + Send + Sync + 'static>(
parent: Arc<T>,
message: &'static str,
) {
glib::spawn_future(async move {
glib::idle_add_once(move || {
let mut error = parent.error();
let parent_ref = parent.clone();
let imp = error.imp();
imp.reset_error_label.set_text(message);
imp.reset_error_button.connect_clicked(move |_| {
parent_ref.error().popdown();
});
error.popup();
});
});
}
pub trait ReSetErrorImpl: Send + Sync {
fn error(&self) -> &TemplateChild<error::ReSetError>;
}

2
src/components/base/mod.rs
View file

@ -1,5 +1,7 @@
pub mod card_entry;
pub mod card_entry_impl;
pub mod error;
pub mod error_impl;
pub mod list_entry;
pub mod list_entry_impl;
pub mod popup;

34
src/components/bluetooth/bluetooth_entry.rs
View file

@ -3,7 +3,7 @@ use std::sync::Arc;
use std::time::Duration;
use crate::components::bluetooth::bluetooth_entry_impl;
use crate::components::utils::{BASE, DBUS_PATH, BLUETOOTH};
use crate::components::utils::{BASE, BLUETOOTH, DBUS_PATH};
use adw::glib::Object;
use adw::prelude::{ActionRowExt, PreferencesRowExt};
use adw::{glib, ActionRow};
@ -87,16 +87,9 @@ impl BluetoothEntry {
fn connect_to_device(entry: Arc<BluetoothEntry>, path: Path<'static>) {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let res: Result<(bool,), Error> = proxy.method_call(
BLUETOOTH,
"ConnectToBluetoothDevice",
(path,),
);
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(bool,), Error> =
proxy.method_call(BLUETOOTH, "ConnectToBluetoothDevice", (path,));
glib::spawn_future(async move {
glib::idle_add_once(move || {
if res.is_err() {
@ -134,16 +127,9 @@ fn connect_to_device(entry: Arc<BluetoothEntry>, path: Path<'static>) {
fn disconnect_from_device(entry: Arc<BluetoothEntry>, path: Path<'static>) {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let res: Result<(bool,), Error> = proxy.method_call(
BLUETOOTH,
"DisconnectFromBluetoothDevice",
(path,),
);
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(bool,), Error> =
proxy.method_call(BLUETOOTH, "DisconnectFromBluetoothDevice", (path,));
glib::spawn_future(async move {
glib::idle_add_once(move || {
let imp = entry.imp();
@ -164,11 +150,7 @@ fn disconnect_from_device(entry: Arc<BluetoothEntry>, path: Path<'static>) {
fn remove_device_pairing(path: Path<'static>) {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let _: Result<(bool,), Error> =
proxy.method_call(BLUETOOTH, "RemoveDevicePairing", (path,));
});

1
src/components/input/mod.rs
View file

@ -4,3 +4,4 @@ pub mod source_box;
pub mod source_box_impl;
pub mod source_entry;
pub mod source_entry_impl;
mod source_box_event_handlers;

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() {

2
src/components/input/source_box_event_handlers.rs
View file

@ -101,7 +101,7 @@ pub fn source_removed_handler(source_box: Arc<SourceBox>, ir: SourceRemoved) ->
}
pub fn source_changed_handler(source_box: Arc<SourceBox>, ir: SourceChanged) -> bool {
let default_source = get_default_source_name();
let default_source = get_default_source_name(source_box.clone());
glib::spawn_future(async move {
glib::idle_add_once(move || {
let input_box = source_box.clone();

3
src/components/input/source_box_impl.rs
View file

@ -5,6 +5,7 @@ use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use std::time::SystemTime;
use crate::components::base::error::{self, ReSetError};
use crate::components::base::list_entry::ListEntry;
use crate::components::input::source_box;
use gtk::subclass::prelude::*;
@ -45,6 +46,8 @@ pub struct SourceBox {
pub reset_input_cards_back_button: TemplateChild<ActionRow>,
#[template_child]
pub reset_cards: TemplateChild<PreferencesGroup>,
#[template_child]
pub error: TemplateChild<ReSetError>,
pub reset_default_check_button: Arc<CheckButton>,
pub reset_default_source: Arc<RefCell<Source>>,
pub reset_source_list: SourceEntryMap,

72
src/components/input/source_entry.rs
View file

@ -1,6 +1,9 @@
use std::sync::Arc;
use std::time::{Duration, SystemTime};
use crate::components::base::error::ReSetError;
use crate::components::base::error_impl::show_error;
use crate::components::utils::set_action_row_ellipsis;
use adw::glib;
use adw::glib::Object;
use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt};
@ -8,11 +11,11 @@ use dbus::blocking::Connection;
use dbus::Error;
use glib::subclass::types::ObjectSubclassIsExt;
use glib::{clone, Propagation};
use gtk::prelude::PopoverExt;
use gtk::{gio, CheckButton};
use re_set_lib::audio::audio_structures::Source;
use crate::components::utils::set_action_row_ellipsis;
use crate::components::utils::{BASE, DBUS_PATH, AUDIO};
use crate::components::utils::{AUDIO, BASE, DBUS_PATH};
use super::source_box::{refresh_default_source, SourceBox};
use super::source_entry_impl;
@ -43,6 +46,8 @@ impl SourceEntry {
let volume = source.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
let input_box_slider = input_box.clone();
let input_box_ref = input_box.clone();
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
imp.source.replace(source);
@ -63,7 +68,7 @@ impl SourceEntry {
}
*time = Some(SystemTime::now());
}
set_source_volume(value, index, channels);
set_source_volume(value, index, channels, input_box_slider.clone());
Propagation::Proceed
}),
);
@ -78,7 +83,7 @@ impl SourceEntry {
if button.is_active() {
let name = name.clone();
gio::spawn_blocking(move || {
let result = set_default_source(name);
let result = set_default_source(name, input_box.clone());
if result.is_none() {
return;
}
@ -97,7 +102,7 @@ impl SourceEntry {
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.clone());
}));
set_action_row_ellipsis(imp.reset_source_name.get());
}
@ -105,58 +110,39 @@ impl SourceEntry {
}
}
pub fn set_source_volume(value: f64, index: u32, channels: u16) -> bool {
pub fn set_source_volume(value: f64, index: u32, channels: u16, input_box: Arc<SourceBox>) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
AUDIO,
"SetSourceVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(), Error> =
proxy.method_call(AUDIO, "SetSourceVolume", (index, channels, value as u32));
if res.is_err() {
// TODO: also log this with LOG/ERROR
show_error::<SourceBox>(input_box.clone(), "Failed to set source volume");
}
});
true
}
pub fn toggle_source_mute(index: u32, muted: bool) -> bool {
pub fn toggle_source_mute(index: u32, muted: bool, input_box: Arc<SourceBox>) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let _: Result<(), Error> =
proxy.method_call(AUDIO, "SetSourceMute", (index, muted));
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(), Error> = proxy.method_call(AUDIO, "SetSourceMute", (index, muted));
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to mute source");
}
});
true
}
pub fn set_default_source(name: Arc<String>) -> Option<Source> {
pub fn set_default_source(name: Arc<String>, input_box: Arc<SourceBox>) -> Option<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,
"SetDefaultSource",
(name.as_str(),),
);
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Source,), Error> =
proxy.method_call(AUDIO, "SetDefaultSource", (name.as_str(),));
if res.is_err() {
show_error::<SourceBox>(input_box.clone(), "Failed to set default source");
return None;
}
Some(res.unwrap().0)

50
src/components/output/sink_box.rs
View file

@ -24,6 +24,8 @@ use gtk::prelude::ActionableExt;
use gtk::{gio, StringObject};
use crate::components::base::card_entry::CardEntry;
use crate::components::base::error_impl::show_error;
use crate::components::base::error_impl::ReSetErrorImpl;
use crate::components::base::list_entry::ListEntry;
use crate::components::output::sink_entry::set_sink_volume;
use crate::components::utils::AUDIO;
@ -50,6 +52,14 @@ glib::wrapper! {
unsafe impl Send for SinkBox {}
unsafe impl Sync for SinkBox {}
impl ReSetErrorImpl for SinkBox {
fn error(
&self,
) -> &gtk::subclass::prelude::TemplateChild<crate::components::base::error::ReSetError> {
&self.imp().error
}
}
impl SinkBox {
pub fn new() -> Self {
let obj: Self = Object::builder().build();
@ -103,7 +113,7 @@ impl Default for SinkBox {
pub fn populate_sinks(output_box: Arc<SinkBox>) {
gio::spawn_blocking(move || {
let sinks = get_sinks();
let sinks = get_sinks(output_box.clone());
{
let output_box_imp = output_box.imp();
let list = output_box_imp.reset_model_list.write().unwrap();
@ -111,7 +121,7 @@ pub fn populate_sinks(output_box: Arc<SinkBox>) {
let mut model_index = output_box_imp.reset_model_index.write().unwrap();
output_box_imp
.reset_default_sink
.replace(get_default_sink());
.replace(get_default_sink(output_box.clone()));
for sink in sinks.iter() {
list.append(&sink.alias);
map.insert(sink.alias.clone(), (sink.index, sink.name.clone()));
@ -142,7 +152,7 @@ fn drop_down_handler(output_box: Arc<SinkBox>, dropdown: &ComboRow) {
}
let new_sink_name = Arc::new(sink.unwrap().1.clone());
gio::spawn_blocking(move || {
let result = set_default_sink(new_sink_name);
let result = set_default_sink(new_sink_name, output_box_ref.clone());
if result.is_none() {
return;
}
@ -151,8 +161,8 @@ fn drop_down_handler(output_box: Arc<SinkBox>, dropdown: &ComboRow) {
});
}
fn volume_slider_handler(output_box_ref_slider: Arc<SinkBox>, value: f64) -> glib::Propagation {
let imp = output_box_ref_slider.imp();
fn volume_slider_handler(output_box: Arc<SinkBox>, value: f64) -> glib::Propagation {
let imp = output_box.imp();
let fraction = (value / 655.36).round();
let percentage = (fraction).to_string() + "%";
imp.reset_volume_percentage.set_text(&percentage);
@ -166,12 +176,12 @@ fn volume_slider_handler(output_box_ref_slider: Arc<SinkBox>, value: f64) -> gli
}
*time = Some(SystemTime::now());
}
set_sink_volume(value, index, channels);
set_sink_volume(value, index, channels, output_box.clone());
Propagation::Proceed
}
fn mute_handler(output_box_ref_mute: Arc<SinkBox>) {
let imp = output_box_ref_mute.imp();
fn mute_handler(output_box: Arc<SinkBox>) {
let imp = output_box.imp();
let mut stream = imp.reset_default_sink.borrow_mut();
stream.muted = !stream.muted;
if stream.muted {
@ -181,7 +191,7 @@ fn mute_handler(output_box_ref_mute: Arc<SinkBox>) {
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
toggle_sink_mute(stream.index, stream.muted);
toggle_sink_mute(stream.index, stream.muted, output_box.clone());
}
fn populate_sink_information(output_box: Arc<SinkBox>, sinks: Vec<Sink>) {
@ -308,7 +318,7 @@ pub fn populate_inputstreams(output_box: Arc<SinkBox>) {
let output_box_ref = output_box.clone();
gio::spawn_blocking(move || {
let streams = get_input_streams();
let streams = get_input_streams(output_box.clone());
glib::spawn_future(async move {
glib::idle_add_once(move || {
let output_box_imp = output_box_ref.imp();
@ -329,7 +339,7 @@ pub fn populate_inputstreams(output_box: Arc<SinkBox>) {
pub fn populate_cards(output_box: Arc<SinkBox>) {
gio::spawn_blocking(move || {
let output_box_ref = output_box.clone();
let cards = get_cards();
let cards = get_cards(output_box.clone());
glib::spawn_future(async move {
glib::idle_add_once(move || {
let imp = output_box_ref.imp();
@ -341,51 +351,56 @@ pub fn populate_cards(output_box: Arc<SinkBox>) {
});
}
fn get_input_streams() -> Vec<InputStream> {
fn get_input_streams(output_box: Arc<SinkBox>) -> Vec<InputStream> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Vec<InputStream>,), Error> = proxy.method_call(AUDIO, "ListInputStreams", ());
if res.is_err() {
show_error::<SinkBox>(output_box.clone(), "Failed to list input streams");
return Vec::new();
}
res.unwrap().0
}
fn get_sinks() -> Vec<Sink> {
fn get_sinks(output_box: Arc<SinkBox>) -> Vec<Sink> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Vec<Sink>,), Error> = proxy.method_call(AUDIO, "ListSinks", ());
if res.is_err() {
show_error::<SinkBox>(output_box.clone(), "Failed to list sinks");
return Vec::new();
}
res.unwrap().0
}
fn get_cards() -> Vec<Card> {
fn get_cards(output_box: Arc<SinkBox>) -> 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::<SinkBox>(output_box.clone(), "Failed to list profiles");
return Vec::new();
}
res.unwrap().0
}
fn get_default_sink_name() -> String {
pub fn get_default_sink_name(output_box: Arc<SinkBox>) -> 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, "GetDefaultSinkName", ());
if res.is_err() {
show_error::<SinkBox>(output_box.clone(), "Failed to get default sink name");
return String::from("");
}
res.unwrap().0
}
fn get_default_sink() -> Sink {
fn get_default_sink(output_box: Arc<SinkBox>) -> Sink {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Sink,), Error> = proxy.method_call(AUDIO, "GetDefaultSink", ());
if res.is_err() {
show_error::<SinkBox>(output_box.clone(), "Failed to get default sink");
return Sink::default();
}
res.unwrap().0
@ -433,8 +448,7 @@ pub fn start_output_box_listener(conn: Connection, sink_box: Arc<SinkBox>) -> Co
}
let res = conn.add_match(sink_changed, move |ir: SinkChanged, _, _| {
let default_sink = get_default_sink_name();
sink_changed_handler(sink_changed_box.clone(), ir, default_sink)
sink_changed_handler(sink_changed_box.clone(), ir)
});
if res.is_err() {
println!("fail on sink change event");

13
src/components/output/sink_box_event_handlers.rs
View file

@ -9,7 +9,11 @@ use re_set_lib::signals::{
use crate::components::base::list_entry::ListEntry;
use super::{input_stream_entry::InputStreamEntry, sink_box::SinkBox, sink_entry::SinkEntry};
use super::{
input_stream_entry::InputStreamEntry,
sink_box::{get_default_sink_name, SinkBox},
sink_entry::SinkEntry,
};
pub fn sink_added_handler(output_box: Arc<SinkBox>, ir: SinkAdded) -> bool {
glib::spawn_future(async move {
@ -100,13 +104,10 @@ pub fn sink_removed_handler(output_box: Arc<SinkBox>, ir: SinkRemoved) -> bool {
true
}
pub fn sink_changed_handler(
output_box: Arc<SinkBox>,
ir: SinkChanged,
default_sink: String,
) -> bool {
pub fn sink_changed_handler(output_box: Arc<SinkBox>, ir: SinkChanged) -> bool {
glib::spawn_future(async move {
glib::idle_add_once(move || {
let default_sink = get_default_sink_name(output_box.clone());
let output_box_imp = output_box.imp();
let is_default = ir.sink.name == default_sink;
let volume = ir.sink.volume.first().unwrap_or(&0_u32);

3
src/components/output/sink_box_impl.rs
View file

@ -5,6 +5,7 @@ use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use std::time::SystemTime;
use crate::components::base::error::ReSetError;
use crate::components::base::list_entry::ListEntry;
use crate::components::output::input_stream_entry::InputStreamEntry;
use gtk::subclass::prelude::*;
@ -45,6 +46,8 @@ pub struct SinkBox {
pub reset_input_cards_back_button: TemplateChild<ActionRow>,
#[template_child]
pub reset_cards: TemplateChild<PreferencesGroup>,
#[template_child]
pub error: TemplateChild<ReSetError>,
pub reset_default_check_button: Arc<CheckButton>,
pub reset_default_sink: Arc<RefCell<Sink>>,
pub reset_sink_list: SinkEntryMap,

65
src/components/output/sink_entry.rs
View file

@ -1,6 +1,8 @@
use std::sync::Arc;
use std::time::{Duration, SystemTime};
use crate::components::base::error_impl::show_error;
use crate::components::utils::set_action_row_ellipsis;
use adw::glib;
use adw::glib::Object;
use adw::prelude::{ButtonExt, CheckButtonExt, PreferencesRowExt, RangeExt};
@ -10,9 +12,8 @@ use glib::subclass::types::ObjectSubclassIsExt;
use glib::{clone, Propagation};
use gtk::{gio, CheckButton};
use re_set_lib::audio::audio_structures::Sink;
use crate::components::utils::set_action_row_ellipsis;
use crate::components::utils::{AUDIO, DBUS_PATH, BASE};
use crate::components::utils::{AUDIO, BASE, DBUS_PATH};
use super::sink_box::{refresh_default_sink, SinkBox};
use super::sink_entry_impl;
@ -42,6 +43,8 @@ impl SinkEntry {
let volume = stream.volume.first().unwrap_or(&0_u32);
let fraction = (*volume as f64 / 655.36).round();
let percentage = (fraction).to_string() + "%";
let output_box_slider = output_box.clone();
let output_box_ref = output_box.clone();
imp.reset_volume_percentage.set_text(&percentage);
imp.reset_volume_slider.set_value(*volume as f64);
imp.stream.replace(stream);
@ -60,7 +63,7 @@ impl SinkEntry {
}
*time = Some(SystemTime::now());
}
set_sink_volume(value, index, channels);
set_sink_volume(value, index, channels, output_box_slider.clone());
Propagation::Proceed
}),
);
@ -75,7 +78,7 @@ impl SinkEntry {
if button.is_active() {
let name = name.clone();
gio::spawn_blocking(move || {
let result = set_default_sink(name);
let result = set_default_sink(name, output_box_ref.clone());
if result.is_none() {
return;
}
@ -95,7 +98,7 @@ impl SinkEntry {
imp.reset_sink_mute
.set_icon_name("audio-volume-high-symbolic");
}
toggle_sink_mute(stream.index, stream.muted);
toggle_sink_mute(stream.index, stream.muted, output_box_ref.clone());
}));
set_action_row_ellipsis(imp.reset_sink_name.get());
}
@ -103,55 +106,37 @@ impl SinkEntry {
}
}
pub fn set_sink_volume(value: f64, index: u32, channels: u16) -> bool {
pub fn set_sink_volume(value: f64, index: u32, channels: u16, output_box: Arc<SinkBox>) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let _: Result<(), Error> = proxy.method_call(
AUDIO,
"SetSinkVolume",
(index, channels, value as u32),
);
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(), Error> =
proxy.method_call(AUDIO, "SetSinkVolume", (index, channels, value as u32));
if res.is_err() {
show_error::<SinkBox>(output_box, "Failed to set sink volume")
}
});
true
}
pub fn toggle_sink_mute(index: u32, muted: bool) -> bool {
pub fn toggle_sink_mute(index: u32, muted: bool, output_box: Arc<SinkBox>) -> bool {
gio::spawn_blocking(move || {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let _: Result<(), Error> =
proxy.method_call(AUDIO, "SetSinkMute", (index, muted));
// if res.is_err() {
// return false;
// }
// res.unwrap().0
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(), Error> = proxy.method_call(AUDIO, "SetSinkMute", (index, muted));
if res.is_err() {
show_error::<SinkBox>(output_box, "Failed to mute sink")
}
});
true
}
pub fn set_default_sink(name: Arc<String>) -> Option<Sink> {
pub fn set_default_sink(name: Arc<String>, output_box: Arc<SinkBox>) -> Option<Sink> {
let conn = Connection::new_session().unwrap();
let proxy = conn.with_proxy(
BASE,
DBUS_PATH,
Duration::from_millis(1000),
);
let res: Result<(Sink,), Error> =
proxy.method_call(AUDIO, "SetDefaultSink", (name.as_str(),));
let proxy = conn.with_proxy(BASE, DBUS_PATH, Duration::from_millis(1000));
let res: Result<(Sink,), Error> = proxy.method_call(AUDIO, "SetDefaultSink", (name.as_str(),));
if res.is_err() {
show_error::<SinkBox>(output_box, "Failed to set default sink");
return None;
}
Some(res.unwrap().0)

15
src/components/window/reset_window.rs
View file

@ -56,6 +56,18 @@ impl ReSetWindow {
})
.build();
let error_popup_action = ActionEntry::builder("show_error")
.activate(move |window: &Self, _, _| {
window.imp().error_popup.popup();
})
.build();
let error_popdown_action = ActionEntry::builder("hide_error")
.activate(move |window: &Self, _, _| {
window.imp().error_popup.popdown();
})
.build();
let vim_up = ActionEntry::builder("up")
.activate(move |window: &Self, _, _| {
window.child_focus(DirectionType::Up);
@ -123,7 +135,8 @@ impl ReSetWindow {
vim_right,
vim_down,
vim_left,
// clear_initial,
error_popup_action,
error_popdown_action,
]);
}

2
src/components/window/reset_window_impl.rs
View file

@ -10,6 +10,7 @@ use gtk::prelude::WidgetExt;
use gtk::subclass::prelude::*;
use gtk::{glib, Button, CompositeTemplate, FlowBox, ListBox, SearchEntry};
use crate::components::base::error::ReSetError;
use crate::components::base::utils::{Listeners, Position};
use crate::components::wifi::wifi_box::WifiBox;
use crate::components::window::reset_window;
@ -38,6 +39,7 @@ pub struct ReSetWindow {
pub default_entry: RefCell<Option<Rc<SidebarEntry>>>,
pub listeners: Arc<Listeners>,
pub position: Rc<RefCell<Position>>,
pub error_popup: ReSetError,
}
unsafe impl Send for ReSetWindow {}

5
src/resources/resetAudioInput.ui
View file

@ -1,11 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>
<template class="resetAudioInput" parent="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">start</property>
<child>
<object class="resetError" id="error"/>
</child>
<child>
<object class="GtkLabel">
<property name="css-classes">resetSettingLabel</property>

5
src/resources/resetAudioOutput.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>
@ -218,5 +218,8 @@
</child>
</object>
</child>
<child>
<object class="resetError" id="error"/>
</child>
</template>
</interface>

2
src/resources/resetBluetooth.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>

2
src/resources/resetBluetoothEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.0"/>

2
src/resources/resetCardEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="libadwaita" version="1.4"/>
<object class="AdwComboRow" id="reset_card_entry">

25
src/resources/resetError.ui Normal file
View file

@ -0,0 +1,25 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<template class="resetError" parent="GtkPopover">
<child>
<object class="GtkBox">
<property name="homogeneous">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="reset_error_label"/>
</child>
<child>
<object class="GtkButton" id="reset_error_button">
<property name="label">ok</property>
<property name="margin-bottom">5</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="margin-top">5</property>
</object>
</child>
</object>
</child>
</template>
</interface>

2
src/resources/resetInputStreamEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>

2
src/resources/resetListBoxRow.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.0"/>
<template class="resetListBoxRow" parent="GtkListBoxRow">

2
src/resources/resetMainWindow.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gio" version="2.0"/>
<requires lib="gtk" version="4.12"/>

2
src/resources/resetOutputStreamEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>

2
src/resources/resetPopup.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<template class="resetPopup" parent="GtkPopover">

2
src/resources/resetSavedWifiEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="libadwaita" version="1.0"/>
<template class="resetSavedWifiEntry" parent="AdwActionRow">

2
src/resources/resetSettingBox.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.0"/>
<template class="resetSettingBox" parent="GtkBox">

2
src/resources/resetShortcuts.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkShortcutsWindow" id="help_overlay">

2
src/resources/resetSidebarEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.0"/>
<template class="resetSidebarEntry" parent="GtkListBoxRow">

2
src/resources/resetSinkEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.3"/>

2
src/resources/resetSourceEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.3"/>

22
src/resources/resetUI.cmb
View file

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
<cambalache-project version="0.13.1" target_tk="gtk-4.0">
<cambalache-project version="0.17.1" target_tk="gtk-4.0">
<ui>
(3,1,None,"resetMainWindow.ui",None,None,None,None,None,None,None),
(4,7,None,"resetWiFi.ui",None,None,None,None,None,None,None),
@ -22,7 +22,8 @@
(21,1,None,"resetWifiOptions.ui",None,None,None,None,None,None,None),
(22,1,None,"resetWifiAddressEntry.ui",None,None,None,None,None,None,None),
(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None),
(24,None,None,"resetShortcuts.ui",None,None,None,None,None,None,None)
(24,None,None,"resetShortcuts.ui",None,None,None,None,None,None,None),
(25,1,None,"resetError.ui",None,None,None,None,None,None,None)
</ui>
<ui_library>
(21,"gtk","4.12",None),
@ -126,6 +127,7 @@
(8,148,"GtkScale","reset_volume_slider",146,None,None,None,1,None),
(8,149,"GtkAdjustment",None,148,None,None,None,None,None),
(8,150,"GtkLabel","reset_volume_percentage",146,None,None,None,2,None),
(8,151,"resetError","error",1,None,None,None,2,None),
(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
(10,119,"AdwNavigationView",None,1,None,None,None,1,None),
(10,120,"AdwNavigationPage",None,119,None,None,None,None,None),
@ -183,6 +185,7 @@
(12,83,"GtkScale","reset_volume_slider",81,None,None,None,1,None),
(12,84,"GtkAdjustment",None,83,None,None,None,None,None),
(12,85,"GtkLabel","reset_volume_percentage",81,None,None,None,2,None),
(12,86,"resetError","error",11,None,None,None,-1,None),
(13,22,"AdwPreferencesGroup","resetOutputStreamEntry",None,None,None,None,None,None),
(13,23,"AdwComboRow","reset_source_selection",22,None,None,None,None,None),
(13,26,"AdwActionRow",None,22,None,None,None,1,None),
@ -303,7 +306,11 @@
(24,3,"GtkShortcutsGroup",None,2,None,None,None,-1,None),
(24,4,"GtkShortcutsShortcut",None,3,None,None,None,-1,None),
(24,5,"GtkShortcutsShortcut",None,3,None,None,None,-1,None),
(24,6,"GtkShortcutsShortcut",None,3,None,None,None,2,None)
(24,6,"GtkShortcutsShortcut",None,3,None,None,None,2,None),
(25,1,"GtkPopover","resetError",None,None,None,None,None,None),
(25,2,"GtkBox",None,1,None,None,None,None,None),
(25,3,"GtkLabel","reset_error_label",2,None,None,None,None,None),
(25,5,"GtkButton","reset_error_button",2,None,None,None,2,None)
</object>
<object_property>
(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@ -962,7 +969,14 @@
(24,6,"GtkShortcutsShortcut","accelerator","&lt;Ctrl&gt;H",None,None,None,None,None,None,None,None,None),
(24,6,"GtkShortcutsShortcut","action-name","win.about",None,None,None,None,None,None,None,None,None),
(24,6,"GtkShortcutsShortcut","icon-set","True",None,None,None,None,None,None,None,None,None),
(24,6,"GtkShortcutsShortcut","title","Show about window",None,None,None,None,None,None,None,None,None)
(24,6,"GtkShortcutsShortcut","title","Show about window",None,None,None,None,None,None,None,None,None),
(25,2,"GtkBox","homogeneous","True",None,None,None,None,None,None,None,None,None),
(25,2,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
(25,5,"GtkButton","label","ok",None,None,None,None,None,None,None,None,None),
(25,5,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
(25,5,"GtkWidget","margin-end","5",None,None,None,None,None,None,None,None,None),
(25,5,"GtkWidget","margin-start","5",None,None,None,None,None,None,None,None,None),
(25,5,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None)
</object_property>
<object_data>
(3,42,"GtkWidget",1,1,None,None,None,None,None,None),

2
src/resources/resetWiFi.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.6"/>
<requires lib="libadwaita" version="1.4"/>

2
src/resources/resetWifiAddressEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.2"/>

2
src/resources/resetWifiEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="libadwaita" version="1.0"/>
<template class="resetWifiEntry" parent="AdwActionRow">

2
src/resources/resetWifiOptions.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.4"/>

2
src/resources/resetWifiRouteEntry.ui
View file

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- Created with Cambalache 0.17.0 -->
<!-- Created with Cambalache 0.17.2 -->
<interface>
<requires lib="gtk" version="4.12"/>
<requires lib="libadwaita" version="1.2"/>

1
src/resources/resources.gresource.xml
View file

@ -27,6 +27,7 @@
<file compressed="true" preprocess="xml-stripblanks">resetSourceEntry.ui</file>
<!--Misc-->
<file compressed="true" preprocess="xml-stripblanks">resetPopup.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetError.ui</file>
<file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">resetShortcuts.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetMenu.ui</file>
<file compressed="true" preprocess="xml-stripblanks">resetCardEntry.ui</file>