Merge pull request 'master' (#35) from YanTheKaller/ubl-settings-keyboard:master into master

Reviewed-on: #35

source/ubl-settings-keyboard.c

@@ -420,30 +420,6 @@ void yon_main_window_complete(main_window *widgets){
     }
     yon_char_parsed_free(models,size);
 
-    // {
-    //     config_str parsed = yon_config_load(tty_layout_command,&size);
-    //     for (int i=0;i<size;i++){
-    //         yon_char_remove_last_symbol(parsed[i],'\n');
-    //         gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYLayoutCombo),parsed[i],parsed[i]);
-    //     }
-    //     yon_char_parsed_free(parsed,size);
-    // }
-    // {
-    //     config_str parsed = yon_config_load(tty_keymap_command,&size);
-    //     for (int i=0;i<size;i++){
-    //         yon_char_remove_last_symbol(parsed[i],'\n');
-    //         gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYKeymapCombo),parsed[i],parsed[i]);
-    //     }
-    //     yon_char_parsed_free(parsed,size);
-    // }
-    // {
-    //     config_str parsed = yon_config_load(tty_font_command,&size);
-    //     for (int i=0;i<size;i++){
-    //         yon_char_remove_last_symbol(parsed[i],'\n');
-    //         gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->TTYFontCombo),parsed[i],parsed[i]);
-    //     }
-    //     yon_char_parsed_free(parsed,size);
-    // }
     yon_root_button_setup((template_main_window*)widgets,main_config.launch_arguments,main_config.launch_size);
     yon_save_window_set_postsave_function(on_save_done,widgets);
     gtk_tree_view_column_clicked(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(widgets->LayoutTree),0)));
@@ -463,14 +439,11 @@ int main(int argc, char *argv[]){
     gtk_init(&argc,&argv);
     template_main_window *widgets = yon_ubl_window_setup(); 
 
-    //turn off if custom presented
-    // yon_ubl_settings_window_set_standard_callbacks(widgets,config_get_global_command,config_get_local_command,yon_config_get_custom_command("./"),config_get_default_command,config_get_global_only_parameters,config_get_local_only_parameters);
-
     yon_main_window_complete((main_window*)widgets);
     char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
-    yon_window_config_load(path);
     main_config.launch_arguments=yon_char_parsed_copy(argv,argc);
     main_config.launch_size=argc;
+    yon_window_config_load(path);
     gtk_main();
     return 0;
 }