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

Reviewed-on: #278

source/ubinstall-gtk-installation.c

@@ -357,10 +357,7 @@ void on_device_selection_changed(GtkWidget *self, main_window *widgets){
 void yon_devices_setup(main_window *widgets){
     GtkTreeIter iter;
     gtk_list_store_clear(widgets->DevicesList);
-    gtk_list_store_clear(widgets->PartitionsList);
+    // gtk_list_store_clear(widgets->PartitionsList);
-    // int size;
-    // config_str parameters = NULL;
-    // parameters = yon_config_load(yon_debug_output("%s\n",get_devices_command),&size);
     for (int i=1;i<main_config.devices_size;i++){
         yon_char_remove_last_symbol(main_config.devices[i],'\n');
         int parsed_size;
@@ -490,6 +487,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
             gtk_tree_model_get(model,&iter,0,&target,-1);
             if (!yon_char_is_empty(target)&&!strcmp(target,device)){
                 gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(device_tree)),&iter);
+                on_device_selection_changed(device_tree,widgets);
                 break;
             }
         }
@@ -498,7 +496,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
             for_iter(model,&iter){
                 char *target;
                 gtk_tree_model_get(model,&iter,0,&target,-1);
-                if (!yon_char_is_empty(target)&&!strcmp(target,device)){
+                if (!yon_char_is_empty(target)&&!strcmp(target,part)){
                     gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(partition_tree)),&iter);
                     break;
                 }
@@ -560,7 +558,7 @@ void yon_install_init(main_window *widgets, enum YON_PAGES page){
                 gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(partition_size_combo),"G",_("Gb"));
                 gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(partition_size_combo),"T",_("Tb"));
                 gtk_combo_box_set_active(GTK_COMBO_BOX(partition_size_combo),0);
-                char *parameter = config(part_size_parameter);
+                char *parameter = yon_config_get(part_size_parameter);
                 if (!yon_char_is_empty(parameter)){
                     gtk_spin_button_set_value(GTK_SPIN_BUTTON(partition_size_spin),atol(parameter));
                     gtk_combo_box_set_active(GTK_COMBO_BOX(partition_size_combo),yon_get_size_get_from_letter(parameter[strlen(parameter)-1])-1);

source/ubinstall-gtk.c

@@ -866,6 +866,9 @@ void yon_main_window_create(main_window *widgets){
         gtk_style_context_add_class(gtk_widget_get_style_context(widgets->ConfigurationModeMenuItem),"menuitemmiddle");
         gtk_widget_show_all(widgets->ConfigurationModeMenuItem);
         gtk_menu_shell_prepend(GTK_MENU_SHELL(widgets->menu2),widgets->ConfigurationModeMenuItem);
+        if (getuid()){
+            gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,0);
+        }
     }
     {
 
@@ -963,6 +966,8 @@ int main(int argc, char *argv[]){
     yon_ubl_connect_config((_template_config*)&main_config);
     textdomain(LocaleName);
     config_init();
+    gtk_init(&argc,&argv);
+    yon_ubl_window_init(TITLE_LABEL,"",LocaleName,CssPath,LocaleName,version_application,WIKI_LINK);
 	yon_ubl_setup_arguments(argc,argv,&unfound,&size,ADDITIONAL_ARGS);
     if (size) {
         int option_index = 0;
@@ -986,8 +991,6 @@ int main(int argc, char *argv[]){
             }
         }
     }
-    gtk_init(&argc,&argv);
-    yon_ubl_window_init(TITLE_LABEL,"",LocaleName,CssPath,LocaleName,version_application,WIKI_LINK);
     main_window *widgets = NULL;
     GtkCssProvider *css=gtk_css_provider_new();
     gtk_css_provider_load_from_resource(css,CssPath);