Fixes

source/ubl-settings-video-install.c

@@ -1,5 +1,14 @@
 #include "ubl-settings-video.h"
 
+char *yon_char_extend(char *target, char symbol, size_t length){
+    if (!target||strlen(target)>=length) return target;
+    int size = sizeof(char)*length+1;
+    char *newstring = malloc(size);
+    memset(newstring,0,size);
+    memset(newstring,symbol,length);
+    memcpy(newstring,target,strlen(target));
+    return newstring;
+}
 
 void on_terminal_revealer_open(GtkWidget *, main_window *widgets){
     int opened = gtk_widget_get_visible(widgets->TerminalPaned);
@@ -19,8 +28,6 @@ void on_terminal_revealer_open(GtkWidget *, main_window *widgets){
             gtk_widget_show(widgets->TerminalPaned);
             gtk_widget_show(widgets->TerminalMoveBox);
 
-
-
         } break;
         case 1: { //closes
             gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL);
@@ -61,8 +68,8 @@ void on_install_activate(GtkWidget *self, main_window *widgets){
     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):
+        data->action_text = self == driver->ModuleInstalledCheck?INSTALL_CONFIRMATION_LABEL(install_target):
-                                                                INSTALL_CONFIRMATION_LABEL(install_target);
+                                                                yon_char_unite(INSTALL_CONFIRMATION_LABEL(install_target),"\n",INSTALL_ATTENTION_LABEL,NULL);
     }
     char *command = NULL;
     if (is_installed){
@@ -81,12 +88,12 @@ 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_shell(widgets->InstallTerminal,command,NULL,NULL);
+    yon_terminal_integrated_start_shell(widgets->InstallTerminal,yon_debug_output("%s\n",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)){
+    if (!gtk_widget_get_visible(widgets->TerminalPaned)){
-            on_terminal_revealer_open(NULL,widgets);
+        on_terminal_revealer_open(NULL,widgets);
-        }
+    }
-        g_timeout_add(500,(GSourceFunc)on_terminal_check_progress,widgets);
+    g_timeout_add(500,(GSourceFunc)on_terminal_check_progress,widgets);
 }
 
 void on_install_check(GtkWidget *self,gint ,driver_struct *driver){

source/ubl-settings-video-monitor.c

@@ -260,7 +260,21 @@ void on_port_chosen_changed(GtkWidget *, monitor_edit_window *window){
                 int size;
                 config_str parsed = yon_char_parse(main_config.resolutions_sorted[i],&size,";");
                 if (!yon_char_is_empty(parsed[0])){
-                    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->ResolutionCombo),parsed[0],g_hash_table_lookup(main_config.resolutions,parsed[0]));
+                    char *cur_res = g_hash_table_lookup(main_config.resolutions,parsed[0]);
+                    int res_size;
+                    config_str parsed_res = yon_char_parse(cur_res,&res_size,";");
+                    char *temp = yon_char_extend(parsed_res[0],' ',12);
+                    if (strcmp(temp,parsed_res[0]))free(parsed_res[0]);
+                    parsed_res[0]=temp;
+                    temp = yon_char_extend(parsed_res[1],' ',5);
+                    if (strcmp(temp,parsed_res[1]))free(parsed_res[1]);
+                    parsed_res[1]=temp;
+                    temp = yon_char_extend(parsed_res[2],' ',10);
+                    if (strcmp(temp,parsed_res[2]))free(parsed_res[2]);
+                    parsed_res[2]=temp;
+                    cur_res = yon_char_parsed_to_string(parsed_res,res_size,"\t");
+                    yon_char_parsed_free(parsed_res,res_size);
+                    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(window->ResolutionCombo),parsed[0],cur_res);
                 }
                 yon_char_parsed_free(parsed,size);
             }

source/ubl-settings-video.c

@@ -396,7 +396,7 @@ void yon_all_resolutions_update(){
     for (int i=1;i<main_config.resolutions_size;i++){
         int parsed_size;
         config_str parsed = yon_char_parse(main_config.resolutions_sorted[i],&parsed_size,";");
-        g_hash_table_insert(main_config.resolutions,yon_char_new(parsed[0]),yon_char_replace(main_config.resolutions_sorted[i],";","\t"));
+        g_hash_table_insert(main_config.resolutions,yon_char_new(parsed[0]),yon_char_new(main_config.resolutions_sorted[i]));
         yon_char_parsed_free(parsed,parsed_size);
     }
 }

source/ubl-settings-video.h

@@ -76,9 +76,9 @@ END {\n\
 
 #define get_resolutions_supportable_command "resource:///com/ublinux/csv/resolutions.csv"
 
-#define install_proprietary_command(target) yon_char_append("echo y| pacman --quiet --needed -Sy ",target)
+#define install_proprietary_command(target) yon_char_append("pacinstall --install --yolo ",target)
 
-#define delete_proprietary_command(target) yon_char_append("pacman -R --noconfirm ",target)
+#define delete_proprietary_command(target) yon_char_append("pacinstall --remove --yolo ",target)
 
 #define get_info_proprietary_command(target) yon_char_append("pamac-manager --details=",target)
 
@@ -472,5 +472,6 @@ 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);
+char *yon_char_extend(char *target, char symbol, size_t length);
 
 #endif