diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index f6b5841..3b4dd71 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -246,7 +246,7 @@ void on_kernel_addon_info(GtkLabel *self){ yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PACKAGE_INFO_LABEL,icon_path,"info-label"); char *package=NULL; package = yon_char_new(gtk_label_get_text(self)); - int size; + // int size; if (strstr(package,",")){ @@ -256,18 +256,34 @@ void on_kernel_addon_info(GtkLabel *self){ } GtkWidget *label = NULL; - config_str info = yon_config_load(get_package_info_command(package),&size); - if (size!=-1){ - char *final_text = yon_char_parsed_to_string(info,size,""); - label = gtk_label_new(final_text); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); - free(final_text); - } else { - label = gtk_label_new(PACKAGE_NOT_FOUND_LABEL); - gtk_widget_show(label); - gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); + { + yon_packages_info *info = yon_packages_get_info_struct(YON_PACKAGES_ALL,package); + char *info_string = yon_packages_get_info_string(info); + + if (!yon_char_is_empty(info_string)){ + label = gtk_label_new(NULL); + char *temp = yon_char_replace(info_string,"@",""); + gtk_label_set_markup(GTK_LABEL(label),temp); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); + } else { + label = gtk_label_new(PACKAGE_NOT_FOUND_LABEL); + gtk_widget_show(label); + gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); + } } + // config_str info = yon_config_load(get_package_info_command(package),&size); + // if (size!=-1){ + // char *final_text = yon_char_parsed_to_string(info,size,""); + // label = gtk_label_new(final_text); + // gtk_widget_show(label); + // gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); + // free(final_text); + // } else { + // label = gtk_label_new(PACKAGE_NOT_FOUND_LABEL); + // gtk_widget_show(label); + // gtk_box_pack_start(GTK_BOX(window->MainBox),label,0,0,0); + // } gtk_label_set_xalign(GTK_LABEL(label),0); gtk_widget_show(window->Window); } diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index 77c8e17..a469abd 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -292,6 +292,9 @@ void *on_setup_system_configuration(void * data){ if (!main_config.dry_run){ char *parameter_string = yon_char_parsed_to_string(all_parameters,size," "); char *command = set_user_config_command(parameter_string); + // if (main_config.debug_mode){ + // yon_launch(ubinstall_dry_run_command); + // } if (system(yon_debug_output("%s\n",command))){}; yon_char_parsed_free(all_parameters,size); free(command); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 1f7819d..bc8a49a 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -142,6 +142,7 @@ layout && /description:/ {\ }\ \" | sort -u\ " +#define ubinstall_dry_run_command "ubinstall2 --dry-run" #define os_name_get_command "sed -En 's/^PRETTY_NAME=[\"]*([^\"]+)[\"]*/\\1/p' /etc/os-release" #define get_keyboard_layout_change_command "grep \"grp:\" /usr/share/X11/xkb/rules/base.lst | awk '{$1=$1; sub(/^!.*$/, \"\"); if ($1 ~ /^grp:/) {opt=$1; $1=\"\"; print opt \"|\" substr($0,2)}}'" diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 80d5e8e..4cb9099 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -947,7 +947,7 @@ agreement True False - 32 + 24 com.ublinux.ubinstall-gtk.translation-symbolic