From 35e9446027cadc695ff13f383f039f681c63d39d Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 4 Aug 2025 10:32:31 +0600
Subject: [PATCH 1/5] Fixed parameter loading

---
 source/ubl-settings-video-monitor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/ubl-settings-video-monitor.c b/source/ubl-settings-video-monitor.c
index 1a3d4a8..3193f41 100644
--- a/source/ubl-settings-video-monitor.c
+++ b/source/ubl-settings-video-monitor.c
@@ -23,6 +23,7 @@ void on_monitor_delete(GtkWidget *,monitor_data *window){
 void on_monitor_switch(GtkWidget *,monitor_data *window){
     if(window){
         const char *name = gtk_label_get_text(GTK_LABEL(window->NameLabel));
+        if (yon_char_is_empty(name)) return;
         char *parameter = config(XORG_MONITOR(name));
         int size;
         config_str parsed = yon_char_parse(parameter,&size,",");
@@ -312,6 +313,8 @@ void on_monitor_configure(GtkWidget *,monitor_data *window){
         monitors->ParameterLineEntry = yon_gtk_builder_get_widget(builder, "ParameterLineEntry");
         monitors->CancelButton = yon_gtk_builder_get_widget(builder, "CancelButton");
         monitors->SaveButton = yon_gtk_builder_get_widget(builder, "SaveButton");
+        monitors->resolutions = NULL;
+        monitors->resolutionssize=0;
 
         char *title;
         char *cur_port = (char*)gtk_label_get_text(GTK_LABEL(window->NameLabel));

From 3366ed7dde678c27b3ea304c861e08162473d5b5 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Mon, 4 Aug 2025 11:31:34 +0600
Subject: [PATCH 2/5] Crash fix

---
 source/ubl-settings-video-monitor.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/ubl-settings-video-monitor.c b/source/ubl-settings-video-monitor.c
index 3193f41..0889870 100644
--- a/source/ubl-settings-video-monitor.c
+++ b/source/ubl-settings-video-monitor.c
@@ -402,13 +402,17 @@ void on_monitor_configure(GtkWidget *,monitor_data *window){
                     resolution = current;
                 }
 
-                if (!yon_char_is_empty(target)&&!yon_char_is_empty(resolutions)&&!strstr(resolutions,resolution)){
+                if (!yon_char_is_empty(resolution)&&!yon_char_is_empty(target)&&!yon_char_is_empty(resolutions)&&!strstr(resolutions,resolution)){
                     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(monitors->UnsupportedCheck),1);
                     while(gtk_events_pending()) gtk_main_iteration();
 
                 }
 
+                if (!yon_char_is_empty(resolution)){
                     gtk_combo_box_set_active_id(GTK_COMBO_BOX(monitors->ResolutionCombo),resolution);
+                }else{
+                    gtk_combo_box_set_active(GTK_COMBO_BOX(monitors->ResolutionCombo),0);
+                }
             }
         }
         gtk_widget_show(monitors->MainWindow);

From 109293222b7951d22ef3f51c4bbc91404d907bf7 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 5 Aug 2025 15:32:27 +0600
Subject: [PATCH 3/5] Localisation fixed

---
 ubl-settings-video.glade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade
index f0740bb..2bff3a5 100644
--- a/ubl-settings-video.glade
+++ b/ubl-settings-video.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-video">
   <requires lib="gtk+" version="3.24"/>
   <requires lib="vte-2.91" version="0.76"/>
@@ -952,7 +952,7 @@
                                     <property name="sensitive">False</property>
                                     <property name="can-focus">True</property>
                                     <property name="receives-default">True</property>
-                                    <property name="tooltip-text" translatable="yes">Supported Devices</property>
+                                    <property name="tooltip-text" translatable="yes">Supported devices</property>
                                     <property name="image">image4</property>
                                     <style>
                                       <class name="thin"/>

From 3d04e071563e4098707f833a74cf508b32669bae Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 5 Aug 2025 16:32:48 +0600
Subject: [PATCH 4/5] Added confirmation dialogs

---
 source/ubl-settings-video-install.c | 18 +++++++++++++++---
 source/ubl-settings-video.h         |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/source/ubl-settings-video-install.c b/source/ubl-settings-video-install.c
index dde113f..f090b5e 100644
--- a/source/ubl-settings-video-install.c
+++ b/source/ubl-settings-video-install.c
@@ -47,19 +47,31 @@ void on_install_activate(GtkWidget *self, main_window *widgets){
     g_signal_handlers_block_by_func(G_OBJECT(self),G_CALLBACK(on_install_activate),widgets);
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(self),!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self)));
     g_signal_handlers_unblock_by_func(G_OBJECT(self),G_CALLBACK(on_install_activate),widgets);
-
+    int is_installed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
     driver_struct *driver = g_object_get_data(G_OBJECT(self),"driver_struct");
     char *install_target = NULL;
+    dialog_confirmation_data *data = yon_confirmation_dialog_data_new();
     if (self == driver->ModuleInstalledCheck){
         install_target = driver->module;
+        data->title = is_installed?MODULE_REMOVE_PROCESS_LABEL(install_target):MODULE_INSTALL_PROCESS_LABEL(install_target);
     } else if (self == driver->PackageInstalledCheck){
         install_target = driver->package;
+        data->title = is_installed?PACKAGE_REMOVE_PROCESS_LABEL(install_target):PACKAGE_INSTALL_PROCESS_LABEL(install_target);
+    }
+    if (is_installed){
+        data->action_text = REMOVE_CONFIRMATION_LABEL(install_target);
+    } else {
+        data->action_text = self == driver->ModuleInstalledCheck?yon_char_unite(INSTALL_CONFIRMATION_LABEL(install_target),"\n",INSTALL_ATTENTION_LABEL,NULL):
+                                                                INSTALL_CONFIRMATION_LABEL(install_target);
     }
     char *command = NULL;
-    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self))){
+    if (is_installed){
         command = delete_proprietary_command(install_target);
     } else {
         command = install_proprietary_command(install_target);
+    }
+    if (yon_confirmation_dialog_call(widgets->Window,data)!=GTK_RESPONSE_ACCEPT){
+        return;
     }
         g_mutex_lock(&main_config.progress_mutex);
         main_config.progress_active=1;
@@ -69,7 +81,7 @@ void on_install_activate(GtkWidget *self, main_window *widgets){
     vte_terminal_reset(VTE_TERMINAL(widgets->InstallTerminal),0,1);
     g_signal_connect_after(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_install_check),driver); 
     yon_install_buttons_set_sensitive(widgets,0);
-    yon_terminal_integrated_start(widgets->InstallTerminal,command);
+    yon_terminal_integrated_start_shell(widgets->InstallTerminal,command,NULL,NULL);
     // g_signal_connect(G_OBJECT(widgets->InstallTerminal),"contents-changed",G_CALLBACK(on_terminal_check_progress),widgets);
         if (!gtk_widget_get_visible(widgets->TerminalPaned)){
             on_terminal_revealer_open(NULL,widgets);
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index 9bfa0e8..d17ecd1 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -76,7 +76,7 @@ END {\n\
 
 #define get_resolutions_supportable_command "resource:///com/ublinux/csv/resolutions.csv"
 
-#define install_proprietary_command(target) yon_char_append("pacman --quiet --needed -Sy ",target)
+#define install_proprietary_command(target) yon_char_append("echo y| pacman --quiet --needed -Sy ",target)
 
 #define delete_proprietary_command(target) yon_char_append("pacman -R --noconfirm ",target)
 

From 831fca90149d5608e679bc470e8bdf09c94a47ab Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 5 Aug 2025 17:38:29 +0600
Subject: [PATCH 5/5] Fixes; port sorting added

---
 source/ubl-settings-video-monitor.c    | 12 ++++++++++++
 source/ubl-settings-video.h            |  1 +
 ubl-settings-video-configuration.glade |  8 +++++++-
 ubl-settings-video.glade               | 12 ++++++++++--
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/source/ubl-settings-video-monitor.c b/source/ubl-settings-video-monitor.c
index 0889870..a0f71d8 100644
--- a/source/ubl-settings-video-monitor.c
+++ b/source/ubl-settings-video-monitor.c
@@ -283,6 +283,15 @@ void on_port_chosen_changed(GtkWidget *, monitor_edit_window *window){
         }
 }
 
+int yon_string_compare(char **a, char **b){
+    gchar *key_a = g_utf8_collate_key(*a, -1);
+    gchar *key_b = g_utf8_collate_key(*b, -1);
+    gint result = strcmp(key_a, key_b);
+    g_free(key_a);
+    g_free(key_b);
+
+    return result;
+}
 
 void on_monitor_configure(GtkWidget *,monitor_data *window){
     if(window){
@@ -349,6 +358,9 @@ void on_monitor_configure(GtkWidget *,monitor_data *window){
         }
         guint ports_size;
         config_str ports = (config_str)g_hash_table_get_keys_as_array(main_config.ports_table,&ports_size);
+        // for (guint i=0;i<ports_size;i++){
+            qsort(ports,ports_size,sizeof(*ports),(int(*)(const void*,const void*))yon_string_compare);
+        // }
         for (guint i=0;i<ports_size;i++){
             int found = yon_char_parsed_check_exist(config_ports,config_size,ports[i]);
             if (found==-1||(!yon_char_is_empty(target)&&!strcmp(target,ports[i]))||yon_config_get_status(XORG_MONITOR(ports[i]))==-1){
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index d17ecd1..6d9a0c2 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -471,5 +471,6 @@ char *yon_optirun_default(char *target);
 char *yon_primusrun_default(char *target);
 void yon_all_resolutions_update();
 void yon_monitor_port_manual(GtkToggleButton *self,monitor_edit_window *monitors);
+int yon_string_compare(char **a, char **b);
 
 #endif
\ No newline at end of file
diff --git a/ubl-settings-video-configuration.glade b/ubl-settings-video-configuration.glade
index 9dbdd34..7fd24f2 100644
--- a/ubl-settings-video-configuration.glade
+++ b/ubl-settings-video-configuration.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="ubl-settings-video">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-video.css -->
@@ -550,4 +550,10 @@
       </object>
     </child>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="MainCheck"/>
+      <widget name="UnsupportedCheck"/>
+    </widgets>
+  </object>
 </interface>
diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade
index 2bff3a5..ceba046 100644
--- a/ubl-settings-video.glade
+++ b/ubl-settings-video.glade
@@ -207,10 +207,11 @@
                                             <property name="can-focus">False</property>
                                             <property name="spacing">5</property>
                                             <child>
-                                              <object class="GtkLabel">
+                                              <object class="GtkLabel" id="label4">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
                                                 <property name="label" translatable="yes">Choose driver automatically:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -247,10 +248,11 @@
                                             <property name="can-focus">False</property>
                                             <property name="spacing">5</property>
                                             <child>
-                                              <object class="GtkLabel">
+                                              <object class="GtkLabel" id="label5">
                                                 <property name="visible">True</property>
                                                 <property name="can-focus">False</property>
                                                 <property name="label" translatable="yes">Failsafe Nvidia driver:</property>
+                                                <property name="xalign">0</property>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
@@ -1633,6 +1635,12 @@
       <widget name="label3"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup">
+    <widgets>
+      <widget name="label4"/>
+      <widget name="label5"/>
+    </widgets>
+  </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name is_installed -->