From 209dc7f0aff25adc7a3e56b28e770cef955676f6 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Mon, 11 Dec 2023 21:54:36 +0100
Subject: [PATCH] remove progress bars from audio entries

---
 .../input/output_stream_entry_impl.rs         |  2 -
 src/components/input/source_box_impl.rs       |  3 +-
 .../output/input_stream_entry_impl.rs         |  2 -
 src/components/output/sink_box_impl.rs        |  2 -
 src/components/output/sink_entry_impl.rs      |  2 -
 src/resources/resetAudioInput.ui              |  5 ---
 src/resources/resetAudioOutput.ui             |  5 ---
 src/resources/resetInputStreamEntry.ui        |  5 ---
 src/resources/resetOutputStreamEntry.ui       |  5 ---
 src/resources/resetSinkEntry.ui               |  5 ---
 src/resources/resetSourceEntry.ui             |  5 ---
 src/resources/resetUI.cmb                     | 38 ++-----------------
 12 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/src/components/input/output_stream_entry_impl.rs b/src/components/input/output_stream_entry_impl.rs
index 8b63808..037562d 100644
--- a/src/components/input/output_stream_entry_impl.rs
+++ b/src/components/input/output_stream_entry_impl.rs
@@ -20,8 +20,6 @@ pub struct OutputStreamEntry {
     pub reset_volume_slider: TemplateChild<Scale>,
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
-    #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
     pub stream: Arc<RefCell<OutputStream>>,
     pub associated_source: Arc<RefCell<(u32, String)>>,
     pub volume_time_stamp: RefCell<Option<SystemTime>>,
diff --git a/src/components/input/source_box_impl.rs b/src/components/input/source_box_impl.rs
index 54c4451..61bb3fa 100644
--- a/src/components/input/source_box_impl.rs
+++ b/src/components/input/source_box_impl.rs
@@ -33,8 +33,7 @@ pub struct SourceBox {
     pub reset_volume_slider: TemplateChild<Scale>,
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
-    #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
+
     #[template_child]
     pub reset_sources: TemplateChild<gtk::Box>,
     #[template_child]
diff --git a/src/components/output/input_stream_entry_impl.rs b/src/components/output/input_stream_entry_impl.rs
index 8c9a515..e48cad4 100644
--- a/src/components/output/input_stream_entry_impl.rs
+++ b/src/components/output/input_stream_entry_impl.rs
@@ -21,8 +21,6 @@ pub struct InputStreamEntry {
     pub reset_volume_slider: TemplateChild<Scale>,
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
-    #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
     pub stream: Arc<RefCell<InputStream>>,
     pub associated_sink: Arc<RefCell<(u32, String)>>,
     pub volume_time_stamp: RefCell<Option<SystemTime>>,
diff --git a/src/components/output/sink_box_impl.rs b/src/components/output/sink_box_impl.rs
index 9dfef74..464f96d 100644
--- a/src/components/output/sink_box_impl.rs
+++ b/src/components/output/sink_box_impl.rs
@@ -36,8 +36,6 @@ pub struct SinkBox {
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
     #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
-    #[template_child]
     pub reset_sinks: TemplateChild<Box>,
     #[template_child]
     pub reset_input_stream_button: TemplateChild<ActionRow>,
diff --git a/src/components/output/sink_entry_impl.rs b/src/components/output/sink_entry_impl.rs
index 70bf22b..fc29adb 100644
--- a/src/components/output/sink_entry_impl.rs
+++ b/src/components/output/sink_entry_impl.rs
@@ -22,8 +22,6 @@ pub struct SinkEntry {
     pub reset_volume_slider: TemplateChild<Scale>,
     #[template_child]
     pub reset_volume_percentage: TemplateChild<Label>,
-    #[template_child]
-    pub reset_volume_meter: TemplateChild<ProgressBar>,
     pub stream: Arc<RefCell<Sink>>,
     pub volume_time_stamp: RefCell<Option<SystemTime>>,
 }
diff --git a/src/resources/resetAudioInput.ui b/src/resources/resetAudioInput.ui
index 9721989..b853c34 100644
--- a/src/resources/resetAudioInput.ui
+++ b/src/resources/resetAudioInput.ui
@@ -97,11 +97,6 @@
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkProgressBar" id="reset_volume_meter">
-                        <property name="margin-top">5</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>
diff --git a/src/resources/resetAudioOutput.ui b/src/resources/resetAudioOutput.ui
index 382a99c..53807c2 100644
--- a/src/resources/resetAudioOutput.ui
+++ b/src/resources/resetAudioOutput.ui
@@ -97,11 +97,6 @@
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkProgressBar" id="reset_volume_meter">
-                        <property name="margin-top">5</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>
diff --git a/src/resources/resetInputStreamEntry.ui b/src/resources/resetInputStreamEntry.ui
index 07a51af..ca13274 100644
--- a/src/resources/resetInputStreamEntry.ui
+++ b/src/resources/resetInputStreamEntry.ui
@@ -59,11 +59,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkProgressBar" id="reset_volume_meter">
-                <property name="margin-top">5</property>
-              </object>
-            </child>
           </object>
         </property>
         <property name="css-classes">audioRow
diff --git a/src/resources/resetOutputStreamEntry.ui b/src/resources/resetOutputStreamEntry.ui
index 32b3734..3152406 100644
--- a/src/resources/resetOutputStreamEntry.ui
+++ b/src/resources/resetOutputStreamEntry.ui
@@ -58,11 +58,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkProgressBar" id="reset_volume_meter">
-                <property name="margin-top">5</property>
-              </object>
-            </child>
           </object>
         </property>
         <property name="css-classes">audioRow
diff --git a/src/resources/resetSinkEntry.ui b/src/resources/resetSinkEntry.ui
index 6735711..1f572bc 100644
--- a/src/resources/resetSinkEntry.ui
+++ b/src/resources/resetSinkEntry.ui
@@ -60,11 +60,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkProgressBar" id="reset_volume_meter">
-                <property name="margin-top">5</property>
-              </object>
-            </child>
           </object>
         </property>
         <property name="css-classes">audioRow
diff --git a/src/resources/resetSourceEntry.ui b/src/resources/resetSourceEntry.ui
index eeb16c8..ce35bf1 100644
--- a/src/resources/resetSourceEntry.ui
+++ b/src/resources/resetSourceEntry.ui
@@ -60,11 +60,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="GtkProgressBar" id="reset_volume_meter">
-                <property name="margin-top">5</property>
-              </object>
-            </child>
           </object>
         </property>
         <property name="css-classes">audioRow
diff --git a/src/resources/resetUI.cmb b/src/resources/resetUI.cmb
index 07ab7d9..1466ff8 100644
--- a/src/resources/resetUI.cmb
+++ b/src/resources/resetUI.cmb
@@ -21,8 +21,7 @@
 	(20,None,None,"resetCardEntry.ui",None,None,None,None,None,None,None),
 	(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),
-	(25,None,None,None,None,None,None,None,None,None,None)
+	(23,1,None,"resetWifiRouteEntry.ui",None,None,None,None,None,None,None)
   </ui>
   <ui_library>
 	(21,"gtk","4.12",None),
@@ -85,7 +84,6 @@
 	(7,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
 	(7,21,"GtkAdjustment",None,20,None,None,None,None,None),
 	(7,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
-	(7,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
 	(7,24,"GtkSeparator",None,14,None,None,None,-1,None),
 	(8,1,"GtkBox","resetAudioOutput",None,None,None,None,None,None),
 	(8,53,"GtkLabel",None,1,None,None,None,None,None),
@@ -104,7 +102,6 @@
 	(8,98,"GtkButton","reset_sink_mute",97,None,None,None,None,None),
 	(8,99,"GtkScale","reset_volume_slider",97,None,None,None,1,None),
 	(8,101,"GtkLabel","reset_volume_percentage",97,None,None,None,2,None),
-	(8,102,"GtkProgressBar","reset_volume_meter",93,None,None,None,1,None),
 	(8,103,"GtkSeparator",None,56,None,None,None,3,None),
 	(8,115,"GtkAdjustment",None,99,None,None,None,-1,None),
 	(8,116,"AdwNavigationPage",None,54,None,None,None,2,None),
@@ -156,7 +153,6 @@
 	(12,24,"GtkButton","reset_source_mute",23,None,None,None,None,None),
 	(12,25,"GtkScale","reset_volume_slider",23,None,None,None,1,None),
 	(12,27,"GtkLabel","reset_volume_percentage",23,None,None,None,2,None),
-	(12,28,"GtkProgressBar","reset_volume_meter",22,None,None,None,1,None),
 	(12,29,"GtkSeparator",None,15,None,None,None,3,None),
 	(12,30,"GtkBox","reset_output_streams",15,None,None,None,4,None),
 	(12,31,"GtkLabel",None,30,None,None,None,None,None),
@@ -190,7 +186,6 @@
 	(13,38,"GtkScale","reset_volume_slider",36,None,None,None,1,None),
 	(13,39,"GtkAdjustment",None,38,None,None,None,None,None),
 	(13,40,"GtkLabel","reset_volume_percentage",36,None,None,None,2,None),
-	(13,41,"GtkProgressBar","reset_volume_meter",27,None,None,None,1,None),
 	(13,42,"GtkSeparator",None,22,None,None,None,-1,None),
 	(14,3,"GtkBox","resetSettingBox",None,None,None,None,-1,None),
 	(15,1,"GtkListBoxRow","resetListBoxRow",None,None,None,None,None,None),
@@ -211,7 +206,6 @@
 	(18,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
 	(18,21,"GtkAdjustment",None,20,None,None,None,None,None),
 	(18,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
-	(18,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
 	(18,24,"GtkSeparator",None,13,None,None,None,2,None),
 	(19,13,"AdwPreferencesGroup","resetSourceEntry",None,None,None,None,None,None),
 	(19,14,"AdwActionRow","reset_source_name",13,None,None,None,None,None),
@@ -223,7 +217,6 @@
 	(19,20,"GtkScale","reset_volume_slider",18,None,None,None,1,None),
 	(19,21,"GtkAdjustment",None,20,None,None,None,None,None),
 	(19,22,"GtkLabel","reset_volume_percentage",18,None,None,None,2,None),
-	(19,23,"GtkProgressBar","reset_volume_meter",17,None,None,None,1,None),
 	(19,24,"GtkSeparator",None,13,None,None,None,2,None),
 	(20,2,"AdwComboRow","reset_card_entry",None,None,None,None,None,None),
 	(21,1,"AdwNavigationPage","resetWifiOptions",None,None,None,None,-1,None),
@@ -291,11 +284,7 @@
 	(23,8,"AdwEntryRow","reset_route_metric",6,None,None,None,1,None),
 	(23,9,"GtkBox",None,2,None,None,None,None,None),
 	(23,10,"AdwEntryRow","reset_route_address",9,None,None,None,None,None),
-	(23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None),
-	(25,1,"GtkBox",None,None,None,None,None,None,None),
-	(25,2,"GtkLabel","reset_saved_wifi_label",1,None,None,None,None,None),
-	(25,3,"GtkButton","reset_edit_saved_wifi_button",1,None,None,None,1,None),
-	(25,4,"GtkButton","reset_delete_saved_wifi_button",1,None,None,None,2,None)
+	(23,11,"AdwEntryRow","reset_route_prefix",9,None,None,None,1,None)
   </object>
   <object_property>
 	(3,1,"GtkWidget","height-request","200",None,None,None,None,None,None,None,None,None),
@@ -416,7 +405,6 @@
 	(7,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(7,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(7,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(7,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(7,24,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(8,1,"GtkWidget","valign","start",None,None,None,None,None,None,None,None,None),
@@ -457,7 +445,6 @@
 	(8,101,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(8,101,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(8,102,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","page-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","step-increment","2005.4016",None,None,None,None,None,None,None,None,None),
 	(8,115,"GtkAdjustment","upper","100270.08",None,None,None,None,None,None,None,None,None),
@@ -591,7 +578,6 @@
 	(12,27,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(12,27,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(12,27,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(12,28,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(12,30,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(12,30,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(12,31,"GtkLabel","label","Input Streams",None,None,None,None,None,None,None,None,None),
@@ -649,7 +635,6 @@
 	(13,40,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(13,40,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(13,40,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(13,41,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(13,42,"GtkWidget","margin-top","10",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkOrientable","orientation","vertical",None,None,None,None,None,None,None,None,None),
 	(14,3,"GtkWidget","css-classes","settings-box",None,None,None,None,None,None,None,None,None),
@@ -696,7 +681,6 @@
 	(18,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(18,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(18,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(18,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(18,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(18,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(19,14,"AdwActionRow","title-lines","3",None,None,None,None,None,None,None,None,None),
@@ -723,7 +707,6 @@
 	(19,22,"GtkLabel","label","100%",None,None,None,None,None,None,None,None,None),
 	(19,22,"GtkLabel","lines","1",None,None,None,None,None,None,None,None,None),
 	(19,22,"GtkWidget","width-request","40",None,None,None,None,None,None,None,None,None),
-	(19,23,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(19,24,"GtkWidget","margin-bottom","5",None,None,None,None,None,None,None,None,None),
 	(19,24,"GtkWidget","margin-top","5",None,None,None,None,None,None,None,None,None),
 	(20,2,"AdwComboRow","use-subtitle","True",None,None,None,None,None,None,None,None,None),
@@ -821,22 +804,7 @@
 	(23,10,"AdwPreferencesRow","title","Address",None,None,None,None,None,None,None,None,None),
 	(23,10,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
 	(23,11,"AdwPreferencesRow","title","Prefix",None,None,None,None,None,None,None,None,None),
-	(23,11,"GtkEditable","max-width-chars","5",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkLabel","ellipsize","end",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkLabel","label","LoremIpsumInternet",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkLabel","single-line-mode","True",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkLabel","xalign","0.0",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkWidget","margin-end","10",None,None,None,None,None,None,None,None,None),
-	(25,2,"GtkWidget","width-request","200",None,None,None,None,None,None,None,None,None),
-	(25,3,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(25,3,"GtkButton","icon-name","document-edit-symbolic",None,None,None,None,None,None,None,None,None),
-	(25,3,"GtkWidget","halign","end",None,None,None,None,None,None,None,None,None),
-	(25,3,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None),
-	(25,4,"GtkButton","has-frame","False",None,None,None,None,None,None,None,None,None),
-	(25,4,"GtkButton","icon-name","user-trash-symbolic",None,None,None,None,None,None,None,None,None),
-	(25,4,"GtkWidget","halign","start",None,None,None,None,None,None,None,None,None),
-	(25,4,"GtkWidget","valign","center",None,None,None,None,None,None,None,None,None)
+	(23,11,"GtkEditable","max-width-chars","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),