diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 3c521f6..b297d91 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -142,7 +142,7 @@ void *yon_modules_list_load(main_window *widgets){ int size; config_str modules = yon_config_load(yon_debug_output("%s\n",get_modules_command),&size); for(int i=1;iWindow),NULL,PACKAGE_INFO_LABEL,icon_path,"info-label"); char *package=NULL; package = yon_char_new(gtk_label_get_text(self)); - int size; + int size=0; if (strstr(package,",")){ @@ -288,8 +288,9 @@ void on_kernel_addon_info(GtkLabel *self){ yon_packages_info *info_struct = yon_packages_get_info_struct(YON_PACKAGES_ALL,package); if (!info_struct) return; char* info_string = yon_packages_get_info_string(info_struct); + yon_debug_output("%s\n",info_string); config_str info = yon_char_parse(info_string,&size,"\n"); - if (size!=-1){ + if (size>0){ info_element *element = yon_package_info_element_new(); gtk_box_pack_start(GTK_BOX(window->MainBox),element->MainBox,1,1,0); for (int i=0;iPacmanSoftwareAllCell),"toggled",G_CALLBACK(on_pacman_software_all_toggled),widgets); g_signal_connect(G_OBJECT(widgets->PacmanSoftwareChosenCell),"toggled",G_CALLBACK(on_pacman_software_chosen_toggled),widgets); g_signal_connect(G_OBJECT(widgets->PacmanSoftwareSearchEntry),"icon-press",G_CALLBACK(on_pacman_icon_press),widgets); + g_signal_connect(G_OBJECT(widgets->PacmanSoftwareSearchEntry),"activate",G_CALLBACK(on_pacman_search_enter),widgets); g_signal_connect(G_OBJECT(widgets->BootloadUserAddButton),"clicked",G_CALLBACK(on_bootloader_user_add),widgets); g_signal_connect(G_OBJECT(widgets->BootloadTimerSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->BootloadTimerSpin); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 65cc094..feb9d41 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1519,4 +1519,6 @@ void yon_size_changed(GtkSpinButton *self, main_window *widgets); void yon_pacman_software_update_overall_size(main_window *widgets); int yon_installation_check_packages_size(main_window *widgets); config_str yon_os_components_get_modules(int *size); -int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets); \ No newline at end of file +int yon_os_components_check_packages_size(GtkWidget *, main_window *widgets); +void on_pacman_search_enter(GtkEntry *self, main_window *widgets); +void yon_log_scroll(GtkScrolledWindow* self, GtkScrollType* scroll, gboolean horizontal,log_window *window); \ No newline at end of file diff --git a/ubinstall-gtk-os-row.glade b/ubinstall-gtk-os-row.glade index 1a3da84..a4df9df 100644 --- a/ubinstall-gtk-os-row.glade +++ b/ubinstall-gtk-os-row.glade @@ -22,7 +22,7 @@ False 5 10 - 5 + 3 5 True @@ -111,6 +111,7 @@ True False + start vertical 5 @@ -126,7 +127,7 @@ 0 - True + False True 0 @@ -154,6 +155,7 @@ True False + start 5 @@ -174,7 +176,6 @@ False start True - 15 False 0 @@ -195,6 +196,7 @@ True False + start 5 @@ -206,7 +208,7 @@ 0 - True + False True 0 @@ -301,6 +303,7 @@ diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 4ac0262..14a7516 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -12065,7 +12065,7 @@ separately into the selected partition. True False - OS only + System restore True 0 @@ -12085,7 +12085,7 @@ separately into the selected partition. True False - Installing only OS components without user data + Restore missing or corrupted system files. Users data is not affected True 0