--ini replaced with --file from library

pull/113/head
parent d011fff5cf
commit dcd63f3dc5
No known key found for this signature in database
GPG Key ID: FF1D842BF4DDE92B

@ -293,7 +293,7 @@ void yon_switch_page_render(main_window *widgets){
void yon_configuration_mode_check(main_window *widgets){ void yon_configuration_mode_check(main_window *widgets){
enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); enum YON_PAGES page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
if (page==YON_PAGE_WELCOME){ if (page==YON_PAGE_WELCOME&&!main_config.force_ini){
gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1); gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,1);
} else { } else {
gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,0); gtk_widget_set_sensitive(widgets->ConfigurationModeMenuItem,0);

@ -1183,22 +1183,15 @@ int main(int argc, char *argv[]){
int option_index = 0; int option_index = 0;
struct option long_options[] = { struct option long_options[] = {
{"dry-run", 0, 0, 'D'}, {"dry-run", 0, 0, 'D'},
{"ini", 1, 0, 'I'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
optind = 1; optind = 1;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
int argument = getopt_long(argc, argv, "DI:", long_options, &option_index); int argument = getopt_long(argc, argv, "D", long_options, &option_index);
switch (argument) { switch (argument) {
case 'D': case 'D':
main_config.dry_run = 1; main_config.dry_run = 1;
break; break;
case 'I':
main_config.force_ini = yon_char_new(optarg);
main_config.config_load_path = main_config.force_ini;
main_config.config_save_path = main_config.force_ini;
main_config.configure_mode = 1;
break;
default: default:
break; break;
} }

@ -395,11 +395,8 @@ typedef struct {
GHashTable *network_types; GHashTable *network_types;
GtkWidget *kernel_unchosen_radio; GtkWidget *kernel_unchosen_radio;
char *config_load_path;
char *config_save_path;
unsigned int cur_slide; unsigned int cur_slide;
gboolean dry_run; gboolean dry_run;
char *force_ini;
} config; } config;
extern config main_config; extern config main_config;

Loading…
Cancel
Save