From 07d5678e99d656e7f5c38dd8359099bd5b3aa948 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 22 Jul 2024 14:23:54 +0600
Subject: [PATCH] Test fix for parameter removal; Test fix for log scrolling

---
 source/ubinstall-gtk.c       | 22 ++++++++++++++--------
 source/ubinstall-gtk.h       |  1 +
 ubinstall-gtk-log-view.glade |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 7a597e5..743f070 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -813,6 +813,7 @@ log_window *yon_log_window_new(){
     log_window *window = malloc(sizeof(log_window));
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_log_view);
     window->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
+    window->ScrollWindow = yon_gtk_builder_get_widget(builder,"ScrollWindow");
     window->HeadLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
     window->LogLabel = yon_gtk_builder_get_widget(builder,"LogLabel");
     window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
@@ -835,6 +836,7 @@ if (window->Window){
         gtk_label_set_text(GTK_LABEL(window->LogLabel),final);
         free(final);
         yon_char_parsed_free(parsed,size);
+        gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow)),gtk_adjustment_get_upper(gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(window->ScrollWindow))));
     }
     return 1;
 }
@@ -984,12 +986,14 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                     } else {
                         yon_config_remove_by_key(xkblayout_parameter);
                     }
-                    char *model = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))?(char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo)):"";
-                    // char *layout_switch;
-                    if (!yon_char_is_empty(model))
-                        yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,model);
-                    else
+                    if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))){
+                        char *model = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo));
+                        // char *layout_switch;
+                        if (!yon_char_is_empty(model))
+                            yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,model);
+                    } else{
                         yon_config_remove_by_key(xkbmodel_parameter);
+                    }
                     if (!yon_char_is_empty(layouts_list))
                         yon_config_register(locale_parameter,locale_parameter_command,layouts_list);
                     else
@@ -1139,11 +1143,12 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                             return;
                         } else {
                             char *password = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->PasswordEntry));
+                            
                             yon_config_register(user_password_parameter,user_password_parameter_command,password);
                             
                         }
                     } else {
-                        yon_config_register(user_password_parameter,user_password_parameter_command,PASSWORD_DEFAULT);
+                        yon_config_remove_by_key(user_password_parameter);
                     }
 
                     if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->AdminPasswordCombo))==1){
@@ -1202,12 +1207,13 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                         yon_config_remove_by_key(xkbmodel_parameter);
                     }
 
-                    char *options = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LayoutBindingCombo));
-                    if (!yon_char_is_empty(options)){
+                    if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo))){
+                        char *options = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LayoutBindingCombo));
                         yon_config_register(xkboptions_parameter,xkboptions_parameter_command,options);
                     } else {
                         yon_config_remove_by_key(xkboptions_parameter);
                     }
+                    
                     if (!main_config.configure_mode){
                         if (!main_config.install_complete){
                             gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index f329812..6727f1b 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -402,6 +402,7 @@ typedef struct{
 
 typedef struct {
 	GtkWidget *Window;
+	GtkWidget *ScrollWindow;
 	GtkWidget *StatusBox;
 	GtkWidget *HeadLabel;
 	GtkWidget *LogLabel;
diff --git a/ubinstall-gtk-log-view.glade b/ubinstall-gtk-log-view.glade
index 88255a9..42d453e 100644
--- a/ubinstall-gtk-log-view.glade
+++ b/ubinstall-gtk-log-view.glade
@@ -42,7 +42,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">5</property>
             <child>
-              <object class="GtkScrolledWindow">
+              <object class="GtkScrolledWindow" id="ScrollWindow">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="shadow-type">in</property>