Saving interface changes

libublsettingsui-gtk3-saving.glade

@@ -42,6 +42,8 @@
       <column type="gboolean"/>
       <!-- column-name Section -->
       <column type="gchararray"/>
+      <!-- column-name CompareString -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkWindow" id="Window">
@@ -128,6 +130,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="OldValueColumn">
+                        <property name="visible">False</property>
                         <property name="resizable">True</property>
                         <property name="sizing">fixed</property>
                         <property name="title" translatable="yes">Old value</property>
@@ -145,6 +148,7 @@
                     </child>
                     <child>
                       <object class="GtkTreeViewColumn" id="NewValueColumn">
+                        <property name="visible">False</property>
                         <property name="sizing">autosize</property>
                         <property name="title" translatable="yes">New value</property>
                         <child>
@@ -159,6 +163,18 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <property name="title" translatable="yes">Value
+(Old/New)</property>
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="markup">7</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

libublsettingsui-gtk3.pot

@@ -137,26 +137,44 @@ msgstr ""
 msgid "New value"
 msgstr ""
 
+#: source/libublsettingsui-gtk3.h:69
+msgid ""
+"Value\n"
+"(Old/New)"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:71
+msgid "Saving into local configuration"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:72
+msgid "Saving into global configuration"
+msgstr ""
+
 #: source/libublsettingsui-gtk3.h:73
+msgid "Saving into global and local configuration"
+msgstr ""
+
+#: source/libublsettingsui-gtk3.h:78
 msgid "Full saving mode"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:74
+#: source/libublsettingsui-gtk3.h:79
 msgid "Saving into module"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:75
+#: source/libublsettingsui-gtk3.h:80
 msgid "Sandbox mode"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:76
+#: source/libublsettingsui-gtk3.h:81
 msgid "Sandbox with profile saving"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:77
+#: source/libublsettingsui-gtk3.h:82
 msgid "HDD sandbox"
 msgstr ""
 
-#: source/libublsettingsui-gtk3.h:78
+#: source/libublsettingsui-gtk3.h:83
 msgid "HDD sandbox with profile saving"
 msgstr ""

libublsettingsui-gtk3_ru.po

@@ -141,26 +141,44 @@ msgstr "Старое значение"
 msgid "New value"
 msgstr "Новое значение"
 
+#: source/libublsettingsui-gtk3.h:69
+msgid ""
+"Value\n"
+"(Old/New)"
+msgstr "Значение(Старое/Новое)"
+
+#: source/libublsettingsui-gtk3.h:71
+msgid "Saving into local configuration"
+msgstr "Сохранение в локальный конфигурационный файл"
+
+#: source/libublsettingsui-gtk3.h:72
+msgid "Saving into global configuration"
+msgstr "Сохранение в глобальный конфигурационный файл"
+
 #: source/libublsettingsui-gtk3.h:73
+msgid "Saving into global and local configuration"
+msgstr "Сохранение в глобальный локальный конфигурационный файл"
+
+#: source/libublsettingsui-gtk3.h:78
 msgid "Full saving mode"
 msgstr "Полное сохранение"
 
-#: source/libublsettingsui-gtk3.h:74
+#: source/libublsettingsui-gtk3.h:79
 msgid "Saving into module"
 msgstr "Сохранение в модуль"
 
-#: source/libublsettingsui-gtk3.h:75
+#: source/libublsettingsui-gtk3.h:80
 msgid "Sandbox mode"
 msgstr "Полная песочница в ОЗУ"
 
-#: source/libublsettingsui-gtk3.h:76
+#: source/libublsettingsui-gtk3.h:81
 msgid "Sandbox with profile saving"
 msgstr "Песочница с сохранением профиля пользователя"
 
-#: source/libublsettingsui-gtk3.h:77
+#: source/libublsettingsui-gtk3.h:82
 msgid "HDD sandbox"
 msgstr "Полная песочница на HDD"
 
-#: source/libublsettingsui-gtk3.h:78
+#: source/libublsettingsui-gtk3.h:83
 msgid "HDD sandbox with profile saving"
 msgstr "Полная песочница на HDD с сохранением профиля пользователя"

source/libublsettingsui-gtk3.c

@@ -312,6 +312,17 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
         window->OldValueCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"OldValueCell"));
         window->NewValueColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"NewValueColumn"));
         window->NewValueCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"NewValueCell"));
+        textdomain(template_ui_LocaleName);
+        if (type==YON_CONFIG_BOTH){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_GLOBAL_LOCAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
+        } else if (type==YON_CONFIG_GLOBAL){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_GLOBAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
+
+        } else if (type==YON_CONFIG_LOCAL){
+            yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_LOCAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE);
+
+        }
+        textdomain(template_app_information.app_locale);
         window->type=type;
         window->filteredModel = GTK_TREE_MODEL(gtk_builder_get_object(builder,"listfilter1"));
         gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(window->filteredModel),5);
@@ -375,7 +386,9 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
                             gtk_tree_model_get(GTK_TREE_MODEL(window->list),&iter,1,&name,2,&value,-1);
                         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);
+                                char *combined = yon_char_unite("<s>",value,"</s>\n",compare_value,NULL);
+                                gtk_list_store_set(window->list,&iter,3,compare_value,4,NULL,6,section,7,combined,-1);
+                                free(combined);
                                 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 {
@@ -390,7 +403,9 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
                         if (!yon_config_check_ignore(compare_name)&&!yon_char_is_empty(compare_value)){
                             GtkTreeIter itar;
                             gtk_list_store_append(window->list,&itar);
-                            gtk_list_store_set(window->list,&itar,0,1,1,compare_name,3,compare_value,5,1,6,section,-1);
+                                char *combined = yon_char_append("\n",compare_value);
+                            gtk_list_store_set(window->list,&itar,0,1,1,compare_name,3,compare_value,5,1,6,section,7,combined,-1);
+                            free(combined);
                         }
                     }
                     free(compare_value);

source/libublsettingsui-gtk3.h

@@ -66,6 +66,11 @@
     #define PARAMETER_LABEL _("Parameter")
     #define OLD_VALUE_LABEL _("Old value")
     #define NEW_VALUE_LABEL _("New value")
+    #define COMPARE_VALUE_LABEL _("Value\n(Old/New)")
+
+    #define SAVING_LOCAL_STATE_LABEL _("Saving into local configuration")
+    #define SAVING_GLOBAL_STATE_LABEL _("Saving into global configuration")
+    #define SAVING_GLOBAL_LOCAL_STATE_LABEL _("Saving into global and local configuration")
 
     #define SYSTEMBOOT_STATEMODE "SYSTEMBOOT_STATEMODE"
     #define SYSTEMBOOT_STATEMODE_SECTION "[system]"