Merge pull request 'master' (#354) from YanTheKaller/ubinstall-gtk:master into master

Reviewed-on: #354

source/ubinstall-gtk-config-hub.c

@@ -59,7 +59,7 @@ int yon_installation_check_packages_size(main_window *widgets){
     } else {
         char *part = config(part_parameter);
         for (int i=0;i<main_config.part_size;i++){
-            int parsed_size;
+            int parsed_size=0;
             config_str parsed = yon_char_parse(main_config.partitions[i],&parsed_size,";");
             if (parsed&&parsed_size>2&&!strcmp(parsed[2],part)&&parsed_size>3&&!yon_char_is_empty(parsed[3])){
                 part_size = atol(parsed[3]);

source/ubinstall-gtk-kernel.c

@@ -291,7 +291,7 @@ info_element *yon_package_info_element_new(){
     return element;
 }
 
-void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row){
+gboolean on_kernel_addon_info(GtkLabel *self, char *, kernel_addon_row *row){
     yon_window *window = yon_window_new();
     yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,(GtkWidget*)self==row->PackageLabel?PACKAGE_INFO_LABEL:MODULE_INFO_LABEL,icon_path,"info-label");
     char *package=NULL;
@@ -307,7 +307,7 @@ void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row){
     
     GtkWidget *label = NULL;
     yon_packages_info *info_struct = yon_packages_get_info_struct(YON_PACKAGES_ALL,package);
-    if (!info_struct) return;
+    if (!info_struct) return 0;
     char* info_string = yon_packages_get_info_string(info_struct);
     config_str info = yon_char_parse(info_string,&size,"\n");
     if (size>0){
@@ -330,6 +330,7 @@ void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row){
         gtk_label_set_xalign(GTK_LABEL(label),0);
     }
     gtk_widget_show(window->Window);
+    return 0;
 }
 
 gboolean on_kernel_addon_menu_block(GObject *, GdkEventButton *event){

source/ubinstall-gtk-page-switch.c

@@ -317,9 +317,6 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){
             return yon_install_options_save(widgets->UserdataDevicesTree,widgets->UserdataSysSectionTree,"data_only",widgets);
         break;
         case YON_PAGE_INSTALLATION_BEGIN:
-        case YON_PAGE_RECOVERY_BEGIN:
-            return yon_installation_start(widgets);
-        break;
         case YON_PAGE_CONFIGURE_END:
             int status = yon_config_save(widgets);
             if (status){
@@ -504,6 +501,9 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
                 on_exit_accepted(widgets);
             }
             break;
+        case YON_PAGE_RECOVERY_PROCESS:{
+            yon_installation_start(widgets);
+        } break;
         case YON_PAGE_INSTALL_COMMON: 
         case YON_PAGE_INSTALL_SEPARATE: 
         case YON_PAGE_INSTALL_SAME_PARTITION: 

source/ubinstall-gtk.c

@@ -836,6 +836,15 @@ void yon_main_window_create(main_window *widgets){
     }
     yon_window_config_load(path);
     yon_window_config_add_instant_parameter("fullscreen","window",&fullscreen,YON_TYPE_BOOLEAN);
+    {
+        widgets->debug_button = yon_debug_button_new();
+        GtkWidget *Label = g_object_get_data(G_OBJECT(widgets->debug_button),"Label");
+        yon_gtk_widget_set_translation(Label);
+        gtk_style_context_add_class(gtk_widget_get_style_context(widgets->debug_button),"menuitemmiddle");
+        gtk_style_context_remove_class(gtk_widget_get_style_context(widgets->debug_button),"menuitemtop");
+        gtk_menu_shell_prepend(GTK_MENU_SHELL(gtk_widget_get_parent(widgets->AboutMenuItem)),widgets->debug_button);
+        
+    }
     {
         widgets->EnableRDPMenuItem = gtk_menu_item_new();
         GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5);
@@ -884,15 +893,6 @@ void yon_main_window_create(main_window *widgets){
             gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,0);
         }
     }
-    {
-        widgets->debug_button = yon_debug_button_new();
-        GtkWidget *Label = g_object_get_data(G_OBJECT(widgets->debug_button),"Label");
-        yon_gtk_widget_set_translation(Label);
-        gtk_style_context_add_class(gtk_widget_get_style_context(widgets->debug_button),"menuitemmiddle");
-        gtk_style_context_remove_class(gtk_widget_get_style_context(widgets->debug_button),"menuitemtop");
-        gtk_menu_shell_prepend(GTK_MENU_SHELL(gtk_widget_get_parent(widgets->AboutMenuItem)),widgets->debug_button);
-        
-    }
     {
         widgets->root_button = yon_root_button_new(main_config.argv,main_config.argc);
         GtkWidget *Label = g_object_get_data(G_OBJECT(widgets->root_button),"Label");

source/ubinstall-gtk.h

@@ -1470,7 +1470,7 @@ void *yon_maximize(main_window *widgets);
 kernel_addon_row *yon_kernel_addon_row_new();
 void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules, char *package, char *description);
 void on_kernel_addon_install_enabled(GtkWidget *, kernel_addon_row *row);
-void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row);
+gboolean on_kernel_addon_info(GtkLabel *self, char *, kernel_addon_row *row);
 void yon_license_init(main_window *widgets);
 void on_locale_toggle(GtkCellRenderer *, gchar *path, language_window *window);
 void on_locale_accept(GtkWidget *self, language_window *window);