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] 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 -->