|
|
|
@ -19,6 +19,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
|
|
|
|
main_config.startup_config = NULL;
|
|
|
|
main_config.startup_config = NULL;
|
|
|
|
yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL);
|
|
|
|
yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL);
|
|
|
|
main_config.config_load_path = yon_char_new("system");
|
|
|
|
main_config.config_load_path = yon_char_new("system");
|
|
|
|
|
|
|
|
main_config.config_save_path = main_config.config_load_path;
|
|
|
|
yon_config_load_config(type,config_get_command("system"),NULL);
|
|
|
|
yon_config_load_config(type,config_get_command("system"),NULL);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case YON_CONFIG_CUSTOM:
|
|
|
|
case YON_CONFIG_CUSTOM:
|
|
|
|
@ -27,6 +28,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
|
|
|
|
path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN);
|
|
|
|
path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN);
|
|
|
|
if (!yon_char_is_empty(path)){
|
|
|
|
if (!yon_char_is_empty(path)){
|
|
|
|
main_config.config_load_path = yon_char_new(path);
|
|
|
|
main_config.config_load_path = yon_char_new(path);
|
|
|
|
|
|
|
|
main_config.config_save_path = main_config.config_load_path;
|
|
|
|
yon_config_clean();
|
|
|
|
yon_config_clean();
|
|
|
|
yon_config_load_config(type,config_get_command(path),NULL);
|
|
|
|
yon_config_load_config(type,config_get_command(path),NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -61,6 +63,7 @@ void on_config_custom_load(GtkWidget *,main_window *){
|
|
|
|
if (!yon_char_is_empty(main_config.config_load_path)){
|
|
|
|
if (!yon_char_is_empty(main_config.config_load_path)){
|
|
|
|
temp_custom_path = main_config.config_load_path;
|
|
|
|
temp_custom_path = main_config.config_load_path;
|
|
|
|
main_config.config_load_path = NULL;
|
|
|
|
main_config.config_load_path = NULL;
|
|
|
|
|
|
|
|
main_config.config_save_path = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
yon_load_proceed(YON_CONFIG_CUSTOM);
|
|
|
|
yon_load_proceed(YON_CONFIG_CUSTOM);
|
|
|
|
if (!yon_char_is_empty(main_config.config_load_path)){
|
|
|
|
if (!yon_char_is_empty(main_config.config_load_path)){
|
|
|
|
@ -68,6 +71,7 @@ void on_config_custom_load(GtkWidget *,main_window *){
|
|
|
|
free(temp_custom_path);
|
|
|
|
free(temp_custom_path);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
main_config.config_load_path = temp_custom_path;
|
|
|
|
main_config.config_load_path = temp_custom_path;
|
|
|
|
|
|
|
|
main_config.config_save_path = main_config.config_load_path;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|