Merge pull request #26 from Xetibo/ina

Ina
This commit is contained in:
takotori 2023-10-28 17:21:04 +02:00 committed by GitHub
commit 721e7d3f4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions

View file

@ -1,5 +1,7 @@
use gtk::{Button, CompositeTemplate, DropDown, TemplateChild, glib};
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use crate::audio::AudioSourceEntry;
#[allow(non_snake_case)]
#[derive(Default, CompositeTemplate)]
@ -19,6 +21,7 @@ impl ObjectSubclass for AudioBox {
type ParentType = gtk::Box;
fn class_init(klass: &mut Self::Class) {
AudioSourceEntry::ensure_type();
klass.bind_template();
}

View file

@ -14,6 +14,8 @@ pub struct AudioSourceEntry {
#[template_child]
pub resetVolumeSlider: TemplateChild<Scale>,
#[template_child]
pub resetVolumePercentage: TemplateChild<Label>,
#[template_child]
pub resetVolumeMeter: TemplateChild<ProgressBar>,
}
@ -36,10 +38,4 @@ impl BoxImpl for AudioSourceEntry {}
impl ObjectImpl for AudioSourceEntry {}
impl ListBoxRowImpl for AudioSourceEntry {}
impl WidgetImpl for AudioSourceEntry {}
impl WindowImpl for AudioSourceEntry {}
impl ApplicationWindowImpl for AudioSourceEntry {}
impl WidgetImpl for AudioSourceEntry {}

View file

@ -4,7 +4,6 @@
<requires lib="gtk" version="4.12"/>
<template class="resetAudio" parent="GtkBox">
<property name="halign">start</property>
<property name="margin-end">5</property>
<property name="margin-start">5</property>
<property name="orientation">vertical</property>
<property name="valign">start</property>
@ -29,6 +28,9 @@
<child>
<object class="GtkSeparator"/>
</child>
<child>
<object class="resetAudioSourceEntry" id="asdf"/>
</child>
<child>
<object class="GtkButton" id="resetAllOutputDevices">
<property name="halign">start</property>

View file

@ -67,11 +67,12 @@
(7,11,"GtkButton","resetSourceMute",8,None,None,None,None,None),
(7,12,"GtkLabel","resetVolumePercentage",8,None,None,None,2,None),
(8,1,"GtkBox","resetAudio",None,None,None,None,None,None),
(8,13,"GtkButton","resetAllOutputDevices",1,None,None,None,2,None),
(8,13,"GtkButton","resetAllOutputDevices",1,None,None,None,3,None),
(8,14,"GtkBox",None,1,None,None,None,None,None),
(8,15,"GtkLabel",None,14,None,None,None,None,None),
(8,16,"GtkDropDown","resetOutputDevice",14,None,None,None,1,None),
(8,18,"GtkSeparator",None,1,None,None,None,1,None),
(8,19,"resetAudioSourceEntry","asdf",1,None,None,None,2,None),
(10,1,"GtkBox","resetBluetooth",None,None,None,None,None,None),
(10,2,"AdwClampScrollable",None,1,None,None,None,1,None),
(10,3,"GtkBox",None,2,None,None,None,None,None),