[baobab/reroot-view] Drop the chart spinner



commit f47985f0ccdbbe7d64bd0483c7fdf24d837eec32
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Thu Jun 25 19:43:19 2020 +0200

    Drop the chart spinner
    
    It's no longer needed now that we have a separate progress page.

 data/ui/baobab-main-window.ui | 57 +++++++++++++++----------------------------
 src/baobab-window.vala        |  8 ------
 2 files changed, 19 insertions(+), 46 deletions(-)
---
diff --git a/data/ui/baobab-main-window.ui b/data/ui/baobab-main-window.ui
index 175b547..3d458d7 100644
--- a/data/ui/baobab-main-window.ui
+++ b/data/ui/baobab-main-window.ui
@@ -379,55 +379,38 @@
                       <property name="hexpand">True</property>
                       <property name="vexpand">True</property>
                       <child>
-                        <object class="GtkStack" id="spinner_stack">
+                        <object class="GtkStack" id="chart_stack">
                           <property name="visible">True</property>
+                          <property name="can_focus">True</property>
+                          <property name="transition_type">crossfade</property>
                           <child>
-                            <object class="GtkStack" id="chart_stack">
+                            <object class="BaobabRingschart" id="rings_chart">
                               <property name="visible">True</property>
-                              <property name="can_focus">True</property>
-                              <property name="transition_type">crossfade</property>
-                              <child>
-                                <object class="BaobabRingschart" id="rings_chart">
-                                  <property name="visible">True</property>
-                                  <property name="hexpand">True</property>
-                                  <property name="vexpand">True</property>
-                                </object>
-                                <packing>
-                                  <property name="name">rings</property>
-                                  <property name="title" translatable="yes">Rings Chart</property>
-                                  <property name="icon_name">view-ringschart-symbolic</property>
-                                </packing>
-                              </child>
-                              <child>
-                                <object class="BaobabTreemap" id="treemap_chart">
-                                  <property name="visible">True</property>
-                                  <property name="hexpand">True</property>
-                                  <property name="vexpand">True</property>
-                                </object>
-                                <packing>
-                                  <property name="name">treemap</property>
-                                  <property name="title" translatable="yes">Treemap Chart</property>
-                                  <property name="icon_name">view-treemap-symbolic</property>
-                                </packing>
-                              </child>
+                              <property name="hexpand">True</property>
+                              <property name="vexpand">True</property>
                             </object>
+                            <packing>
+                              <property name="name">rings</property>
+                              <property name="title" translatable="yes">Rings Chart</property>
+                              <property name="icon_name">view-ringschart-symbolic</property>
+                            </packing>
                           </child>
                           <child>
-                            <object class="GtkSpinner" id="spinner">
+                            <object class="BaobabTreemap" id="treemap_chart">
                               <property name="visible">True</property>
-                              <property name="can_focus">False</property>
-                              <property name="width_request">128</property>
-                              <property name="height_request">128</property>
-                              <property name="halign">GTK_ALIGN_CENTER</property>
-                              <property name="valign">GTK_ALIGN_CENTER</property>
+                              <property name="hexpand">True</property>
+                              <property name="vexpand">True</property>
                             </object>
+                            <packing>
+                              <property name="name">treemap</property>
+                              <property name="title" translatable="yes">Treemap Chart</property>
+                              <property name="icon_name">view-treemap-symbolic</property>
+                            </packing>
                           </child>
                         </object>
                         <packing>
                           <property name="left_attach">0</property>
                           <property name="top_attach">0</property>
-                          <property name="width">1</property>
-                          <property name="height">1</property>
                         </packing>
                       </child>
                       <child>
@@ -443,8 +426,6 @@
                         <packing>
                           <property name="left_attach">0</property>
                           <property name="top_attach">1</property>
-                          <property name="width">1</property>
-                          <property name="height">1</property>
                         </packing>
                       </child>
                     </object>
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index 05ef296..d91defa 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -77,15 +77,11 @@ namespace Baobab {
         [GtkChild]
         private Gtk.Stack chart_stack;
         [GtkChild]
-        private Gtk.Stack spinner_stack;
-        [GtkChild]
         private Gtk.StackSwitcher chart_stack_switcher;
         [GtkChild]
         private Chart rings_chart;
         [GtkChild]
         private Chart treemap_chart;
-        [GtkChild]
-        private Gtk.Spinner spinner;
 
         private Location? active_location = null;
         private ulong scan_completed_handler = 0;
@@ -533,12 +529,8 @@ namespace Baobab {
                 cursor = busy_cursor;
                 disable_drop ();
                 chart_stack_switcher.sensitive = false;
-                spinner_stack.visible_child = spinner;
-                spinner.start ();
             } else {
                 enable_drop ();
-                spinner.stop ();
-                spinner_stack.visible_child = chart_stack;
                 chart_stack_switcher.sensitive = true;
             }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]