From bdec351588a1210ea06264c9b1612383010576aa Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Fri, 13 Dec 2024 17:28:19 +0600
Subject: [PATCH] Update tab interface changes

---
 source/ubl-settings-update.c              |  3 +-
 source/ubl-strings.h                      |  1 +
 ubl-settings-update-mirror-path-add.glade | 12 ++-
 ubl-settings-update-repo-add.glade        | 68 +++++++----------
 ubl-settings-update.glade                 | 92 +++++++++++++++--------
 ubl-settings-update.pot                   |  4 +
 ubl-settings-update_ru.po                 |  4 +
 7 files changed, 109 insertions(+), 75 deletions(-)

diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c
index 556beaa..06991d7 100644
--- a/source/ubl-settings-update.c
+++ b/source/ubl-settings-update.c
@@ -1396,7 +1396,7 @@ repo_add_window *yon_repo_add_window_new(){
     g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableSearchCheck);
     g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageEnableUpdateCheck);
     g_signal_connect(G_OBJECT(window->UsageDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->UsageSysupgradeCheck);
-    g_signal_connect(G_OBJECT(window->SourceListBox),"size-allocate",G_CALLBACK(on_scrolled_window_size_allocate),window);
+    // g_signal_connect(G_OBJECT(window->SourceListBox),"size-allocate",G_CALLBACK(on_scrolled_window_size_allocate),window);
     gtk_widget_show(window->Window);
     gtk_label_set_text(GTK_LABEL(window->SignLevelLabel),SIGN_LEVEL_LABEL);
     
@@ -1625,6 +1625,7 @@ void yon_main_window_complete(main_window *widgets){
         g_signal_connect(G_OBJECT(widgets->PublicationCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->PublicationUpdateButton);
         g_signal_connect(G_OBJECT(widgets->UpdateIntervalDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->UpdateIntervalCombo);
         g_signal_connect(G_OBJECT(widgets->UpdateIntervalDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->UpdateIntervalSpin);
+        g_signal_connect(G_OBJECT(widgets->UpdateIntervalDefaultCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->BootCheck);
 
 
         g_signal_connect(G_OBJECT(widgets->BootCheck),"toggled",G_CALLBACK(on_toggle_button_toggled),widgets);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 01f71f3..d36784d 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -39,6 +39,7 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
 \t- PackageTrustAll - If signature is verified only for packages\n\
 \t- DatabaseTrustAll - If signature is verified only for database\n")
     /*
+    #define _LABEL _("every")
     #define _LABEL _("Resource link of file path")
     #define _LABEL _("Open file explorer")
     #define _LABEL _("Add source")
diff --git a/ubl-settings-update-mirror-path-add.glade b/ubl-settings-update-mirror-path-add.glade
index 36a0308..bc6bbf8 100644
--- a/ubl-settings-update-mirror-path-add.glade
+++ b/ubl-settings-update-mirror-path-add.glade
@@ -38,12 +38,22 @@
         <property name="position">0</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkComboBoxText">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkEntry" id="PathEntry">
         <property name="visible">True</property>
         <property name="can-focus">True</property>
         <property name="editable">False</property>
-        <property name="has-frame">False</property>
         <property name="caps-lock-warning">False</property>
         <style>
           <class name="nobackground"/>
diff --git a/ubl-settings-update-repo-add.glade b/ubl-settings-update-repo-add.glade
index 1e99605..bb4fed7 100644
--- a/ubl-settings-update-repo-add.glade
+++ b/ubl-settings-update-repo-add.glade
@@ -231,54 +231,40 @@ Configuration - configuration path</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkScrolledWindow">
+                                  <object class="GtkBox" id="SourceListBox">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="min-content-height">0</property>
-                                    <property name="max-content-height">100</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="spacing">5</property>
                                     <child>
-                                      <object class="GtkViewport">
+                                      <object class="GtkBox" id="box1">
                                         <property name="visible">True</property>
                                         <property name="can-focus">False</property>
+                                        <property name="orientation">vertical</property>
                                         <child>
-                                          <object class="GtkBox" id="SourceListBox">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <property name="spacing">5</property>
-                                            <child>
-                                              <object class="GtkBox" id="box1">
-                                                <property name="visible">True</property>
-                                                <property name="can-focus">False</property>
-                                                <property name="orientation">vertical</property>
-                                                <child>
-                                                  <placeholder/>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkBox" id="SourceBox">
-                                                <property name="visible">True</property>
-                                                <property name="can-focus">False</property>
-                                                <property name="orientation">vertical</property>
-                                                <property name="spacing">5</property>
-                                                <child>
-                                                  <placeholder/>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
+                                          <placeholder/>
                                         </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox" id="SourceBox">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">5</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade
index 2743c34..2a59e9b 100644
--- a/ubl-settings-update.glade
+++ b/ubl-settings-update.glade
@@ -208,21 +208,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="BootCheck">
-                        <property name="label" translatable="yes">Check system updates at system startup</property>
-                        <property name="visible">True</property>
-                        <property name="can-focus">True</property>
-                        <property name="receives-default">False</property>
-                        <property name="halign">start</property>
-                        <property name="draw-indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkEntry" id="DateEntry">
                         <property name="visible">True</property>
@@ -232,6 +217,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="pack-type">end</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -297,6 +283,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         <property name="can-focus">False</property>
                         <property name="label" translatable="yes">Update interval:</property>
                         <property name="xalign">0</property>
+                        <property name="yalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -308,7 +295,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                       <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="spacing">5</property>
+                        <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkCheckButton" id="UpdateIntervalDefaultCheck">
                             <property name="label" translatable="yes">Default</property>
@@ -326,32 +313,73 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="UpdateIntervalSpin">
+                          <object class="GtkCheckButton" id="BootCheck">
+                            <property name="label" translatable="yes">Check system updates at system startup</property>
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can-focus">True</property>
-                            <property name="tooltip-text" translatable="yes">Update interval</property>
-                            <property name="adjustment">adjustment1</property>
+                            <property name="receives-default">False</property>
+                            <property name="halign">start</property>
+                            <property name="draw-indicator">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
+                            <property name="expand">True</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBoxText" id="UpdateIntervalCombo">
+                          <object class="GtkBox">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
-                            <property name="tooltip-text" translatable="yes">Update interval</property>
-                            <property name="active">0</property>
-                            <items>
-                              <item translatable="yes">Minutes</item>
-                              <item translatable="yes">Hours</item>
-                              <item translatable="yes">Days</item>
-                              <item translatable="yes">Months</item>
-                            </items>
+                            <property name="spacing">5</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-start">2</property>
+                                <property name="label" translatable="yes">every</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="UpdateIntervalSpin">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can-focus">True</property>
+                                <property name="tooltip-text" translatable="yes">Update interval</property>
+                                <property name="text" translatable="yes">0</property>
+                                <property name="adjustment">adjustment1</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="UpdateIntervalCombo">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can-focus">False</property>
+                                <property name="tooltip-text" translatable="yes">Update interval</property>
+                                <property name="active">0</property>
+                                <items>
+                                  <item translatable="yes">Minutes</item>
+                                  <item translatable="yes">Hours</item>
+                                  <item translatable="yes">Days</item>
+                                  <item translatable="yes">Months</item>
+                                </items>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -361,7 +389,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
diff --git a/ubl-settings-update.pot b/ubl-settings-update.pot
index cee86a5..abe6c28 100644
--- a/ubl-settings-update.pot
+++ b/ubl-settings-update.pot
@@ -84,6 +84,10 @@ msgstr ""
 msgid "Resource link of file path"
 msgstr ""
 
+#: source/ubl-strings.h:28
+msgid "every"
+msgstr ""
+
 #: source/ubl-strings.h:28
 msgid "Open file explorer"
 msgstr ""
diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po
index 3f1f813..0ea5267 100644
--- a/ubl-settings-update_ru.po
+++ b/ubl-settings-update_ru.po
@@ -123,6 +123,10 @@ msgstr ""
 "Полный адрес места, где можно найти базу данных, пакеты и подписа (если "
 "доступны) для этого репозитория. Возможно указать несколько через запятую (,)"
 
+#: source/ubl-strings.h:28
+msgid "every"
+msgstr "каждые"
+
 #: source/ubl-strings.h:34 source/ubl-strings.h:64
 msgid "Update"
 msgstr "Обновить"