From 6a4ca77009fe70642b6c807284ecadc811dd6d9f Mon Sep 17 00:00:00 2001
From: DYefremov <dmitry.v.yefremov@gmail.com>
Date: Fri, 17 Apr 2026 01:14:31 +0300
Subject: [PATCH] wait dialog refactoring

---
 app/ui/dialogs.glade | 31 +++++++++----------------------
 app/ui/dialogs.py    |  6 +++---
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade
index d6d84213..f0c346dd 100644
--- a/app/ui/dialogs.glade
+++ b/app/ui/dialogs.glade
@@ -158,6 +158,7 @@ Author: Dmitriy Yefremov
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
+    <property name="width-request">100</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">splashscreen</property>
@@ -166,19 +167,19 @@ Author: Dmitriy Yefremov
     <property name="decorated">False</property>
     <child>
       <object class="GtkBox" id="wait_dialog_box">
-        <property name="width_request">100</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">5</property>
-        <property name="margin_bottom">5</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkSpinner" id="spinner">
-            <property name="width_request">150</property>
-            <property name="height_request">45</property>
-            <property name="visible">True</property>
+          <object class="LoadingProgressBar" id="progress">
+            <property name="visible" bind-source="wait_dialog" bind-property="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="active">True</property>
+            <property name="show-text">True</property>
+            <property name="text" translatable="yes">Loading data...</property>
+            <property name="margin-start">10</property>
+            <property name="margin_end">10</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -186,20 +187,6 @@ Author: Dmitriy Yefremov
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkLabel" id="wait_dialog_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="label" translatable="yes">Loading data...</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
       </object>
     </child>                          <!-- NOP -->
     <style>
diff --git a/app/ui/dialogs.py b/app/ui/dialogs.py
index 8f882953..3f938baa 100644
--- a/app/ui/dialogs.py
+++ b/app/ui/dialogs.py
@@ -101,8 +101,8 @@ class WaitDialog:
         builder, dialog = get_dialog_from_xml(DialogType.WAIT, transient)
         self._dialog = dialog
         self._dialog.set_transient_for(transient)
-        self._label = builder.get_object("wait_dialog_label")
-        self._default_text = text or self._label.get_text()
+        self._progress = builder.get_object("progress")
+        self._default_text = text or self._progress.get_text()
 
     def show(self, text=None):
         self.set_text(text)
@@ -110,7 +110,7 @@ class WaitDialog:
 
     @run_idle
     def set_text(self, text):
-        self._label.set_text(translate(text or self._default_text))
+        self._progress.set_text(translate(text or self._default_text))
 
     @run_idle
     def hide(self):