From e547ef2a33aa8ae4f331a27730c20d775fd8b73e Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 16 Jan 2024 14:43:17 +0600
Subject: [PATCH] Fixed saving errors

---
 libublsettingsui-gtk3-documentation.glade |  11 +-
 libublsettingsui-gtk3-saving.glade        | 149 +++++++++++-----------
 source/libublsettingsui-gtk3.c            |   5 +-
 source/libublsettingsui-gtk3.h            |   3 +-
 4 files changed, 81 insertions(+), 87 deletions(-)

diff --git a/libublsettingsui-gtk3-documentation.glade b/libublsettingsui-gtk3-documentation.glade
index 359151c..db62c7d 100644
--- a/libublsettingsui-gtk3-documentation.glade
+++ b/libublsettingsui-gtk3-documentation.glade
@@ -5,12 +5,12 @@
   <object class="GtkImage" id="image8">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">process-stop-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-symbolic</property>
   </object>
   <object class="GtkImage" id="image9">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
+    <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
   </object>
   <object class="GtkApplicationWindow" id="helpConfirmationWindow">
     <property name="can-focus">False</property>
@@ -53,14 +53,14 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="margin-top">10</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
-                    <property name="margin-top">10</property>
-                    <property name="margin-bottom">5</property>
                     <property name="label" translatable="yes">Would you like to read documentation in the Web?</property>
                     <property name="wrap">True</property>
                     <property name="xalign">0</property>
@@ -83,11 +83,8 @@
                     <property name="can-focus">False</property>
                     <property name="halign">start</property>
                     <property name="valign">start</property>
-                    <property name="margin-right">10</property>
-                    <property name="margin-end">10</property>
                     <property name="label" translatable="yes">You will be redirected to documentation website where documentation is
 translated and supported by community.</property>
-                    <property name="wrap">True</property>
                     <property name="xalign">0</property>
                     <style>
                       <class name="fgnb"/>
diff --git a/libublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade
index 44df800..7505b4b 100644
--- a/libublsettingsui-gtk3-saving.glade
+++ b/libublsettingsui-gtk3-saving.glade
@@ -44,38 +44,19 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkDialog" id="Window">
+  <object class="GtkWindow" id="Window">
     <property name="width-request">450</property>
     <property name="height-request">500</property>
     <property name="can-focus">False</property>
     <property name="modal">True</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3</property>
     <property name="type-hint">dialog</property>
-    <child internal-child="vbox">
+    <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="margin-bottom">5</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can-focus">False</property>
-            <property name="layout-style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="pack-type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkBox" id="StatusBox">
             <property name="visible">True</property>
@@ -92,83 +73,96 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow">
+          <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="shadow-type">in</property>
+            <property name="can-focus">False</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-bottom">5</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkTreeView" id="ParametersTree">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
-                <property name="model">liststore1</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection">
-                    <property name="mode">none</property>
-                  </object>
-                </child>
+                <property name="shadow-type">in</property>
                 <child>
-                  <object class="GtkTreeViewColumn">
-                    <property name="title" translatable="yes">Save</property>
+                  <object class="GtkTreeView" id="ParametersTree">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="model">liststore1</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection"/>
+                    </child>
                     <child>
-                      <object class="GtkCellRendererToggle" id="ToggleCell"/>
-                      <attributes>
-                        <attribute name="cell-background">4</attribute>
-                        <attribute name="sensitive">5</attribute>
-                        <attribute name="active">0</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Save</property>
+                        <child>
+                          <object class="GtkCellRendererToggle" id="ToggleCell"/>
+                          <attributes>
+                            <attribute name="cell-background">4</attribute>
+                            <attribute name="sensitive">5</attribute>
+                            <attribute name="active">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn">
-                    <property name="resizable">True</property>
-                    <property name="title" translatable="yes">Parameter</property>
                     <child>
-                      <object class="GtkCellRendererText"/>
-                      <attributes>
-                        <attribute name="cell-background">4</attribute>
-                        <attribute name="sensitive">5</attribute>
-                        <attribute name="text">1</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn">
+                        <property name="resizable">True</property>
+                        <property name="title" translatable="yes">Parameter</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="cell-background">4</attribute>
+                            <attribute name="sensitive">5</attribute>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn">
-                    <property name="resizable">True</property>
-                    <property name="sizing">fixed</property>
-                    <property name="title" translatable="yes">Old value</property>
                     <child>
-                      <object class="GtkCellRendererText"/>
-                      <attributes>
-                        <attribute name="cell-background">4</attribute>
-                        <attribute name="sensitive">5</attribute>
-                        <attribute name="text">2</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn">
+                        <property name="resizable">True</property>
+                        <property name="sizing">fixed</property>
+                        <property name="title" translatable="yes">Old value</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="cell-background">4</attribute>
+                            <attribute name="sensitive">5</attribute>
+                            <attribute name="text">2</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkTreeViewColumn">
-                    <property name="sizing">autosize</property>
-                    <property name="title" translatable="yes">New value</property>
                     <child>
-                      <object class="GtkCellRendererText"/>
-                      <attributes>
-                        <attribute name="cell-background">4</attribute>
-                        <attribute name="sensitive">5</attribute>
-                        <attribute name="text">3</attribute>
-                      </attributes>
+                      <object class="GtkTreeViewColumn">
+                        <property name="sizing">autosize</property>
+                        <property name="title" translatable="yes">New value</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="cell-background">4</attribute>
+                            <attribute name="sensitive">5</attribute>
+                            <attribute name="text">3</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>
@@ -177,6 +171,7 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
+        <property name="show-close-button">True</property>
         <child type="title">
           <object class="GtkLabel" id="HeaderTopic">
             <property name="visible">True</property>
diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c
index d97b8e1..6b68b4f 100644
--- a/source/libublsettingsui-gtk3.c
+++ b/source/libublsettingsui-gtk3.c
@@ -171,6 +171,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
         else if (type == YON_CONFIG_BOTH)
             yon_ubl_status_box_render(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
         textdomain(template_app_information.app_locale);
+        return NULL;
     } else {
         char *config_to_save = NULL;
         if (type==YON_CONFIG_GLOBAL) config_to_save="global";
@@ -305,10 +306,10 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
                         if (!yon_char_is_empty(name)&&!strcmp(name,config_keys[i])){
                             if (!yon_config_check_ignore(name)){
                                 gtk_list_store_set(window->list,&iter,3,compare_value,4,NULL,6,section,-1);
-                                if ((value&&!strcmp(value,compare_value))||yon_char_is_empty(compare_value)){
+                                if ((value&&!strcmp(value,compare_value))){ //||yon_char_is_empty(compare_value)
                                     gtk_list_store_set(window->list,&iter,0,0,3,value,5,0,-1);
                                 } else {
-                                    gtk_list_store_set(window->list,&iter,5,1,-1);
+                                    gtk_list_store_set(window->list,&iter,0,1,5,1,-1);
                                     }
                             } else {
                                 printf ("%s ignored\n",name);
diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h
index d3ff959..6c66522 100644
--- a/source/libublsettingsui-gtk3.h
+++ b/source/libublsettingsui-gtk3.h
@@ -9,8 +9,9 @@
 #include <libintl.h>
 #include <getopt.h>
 #include <libintl.h>
+#ifdef WEBKIT_INCLUDE
     #include <webkit2/webkit2.h>
-
+#endif
 #define ui_WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ublsettingsui-gtk3"
 
 #define _(String) gettext(String)