comparison src/main.c @ 320:c74af1cbd61a

Move more options to ConfOptions.

319:f9611a6cf0e2

	g_free(options->safe_delete_path);
	options->safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);

	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
		{
		color_profile_input_file[i] = NULL;
		color_profile_input_name[i] = NULL;
		}

	options->fullscreen_info = g_strdup("%collection%(%number%/%total%) <b>%name%</b>\n"
				   "%res%|%date%|%size%\n"
				   "%fAperture%|%fShutterSpeed%|%fISOSpeedRating%|%fFocalLength%|%fExposureBias%\n"

		options->show_fullscreen_info = image_osd_get(lw->image, NULL, NULL);
		}

	layout_geometry_get_dividers(NULL, &options->window_hdivider_pos, &options->window_vdivider_pos);

	layout_views_get(NULL, &layout_view_tree, &layout_view_icons);

	options->thumbnails_enabled = layout_thumb_get(NULL);
	layout_sort_get(NULL, &options->file_sort_method, &options->file_sort_ascending);

	layout_geometry_get_tools(NULL, &options->float_window_x, &options->float_window_y,
				  &options->float_window_w, &options->float_window_h, &options->float_window_divider);
	layout_tools_float_get(NULL, &options->tools_float, &options->tools_hidden);
	options->toolbar_hidden = layout_toolbar_hidden(NULL);

	color_profile_enabled = layout_image_color_profile_get_use(NULL);
	layout_image_color_profile_get(NULL,
				       &color_profile_input_type, &color_profile_screen_type,
				       &color_profile_use_image);

	save_options();
	keys_save();

	path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);

#if 1
	printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
#endif
	options = init_options(NULL);
	layout_order = g_strdup("123");
	setup_default_options();
	load_options();

	parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry);

320:c74af1cbd61a

	g_free(options->safe_delete_path);
	options->safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);

	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
		{
		options->color_profile_input_file[i] = NULL;
		options->color_profile_input_name[i] = NULL;
		}

	options->fullscreen_info = g_strdup("%collection%(%number%/%total%) <b>%name%</b>\n"
				   "%res%|%date%|%size%\n"
				   "%fAperture%|%fShutterSpeed%|%fISOSpeedRating%|%fFocalLength%|%fExposureBias%\n"

		options->show_fullscreen_info = image_osd_get(lw->image, NULL, NULL);
		}

	layout_geometry_get_dividers(NULL, &options->window_hdivider_pos, &options->window_vdivider_pos);

	layout_views_get(NULL, &options->layout_view_tree, &options->layout_view_icons);

	options->thumbnails_enabled = layout_thumb_get(NULL);
	layout_sort_get(NULL, &options->file_sort_method, &options->file_sort_ascending);

	layout_geometry_get_tools(NULL, &options->float_window_x, &options->float_window_y,
				  &options->float_window_w, &options->float_window_h, &options->float_window_divider);
	layout_tools_float_get(NULL, &options->tools_float, &options->tools_hidden);
	options->toolbar_hidden = layout_toolbar_hidden(NULL);

	options->color_profile_enabled = layout_image_color_profile_get_use(NULL);
	layout_image_color_profile_get(NULL,
				       &options->color_profile_input_type,
				       &options->color_profile_screen_type,
				       &options->color_profile_use_image);

	save_options();
	keys_save();

	path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/accels", NULL);

#if 1
	printf("%s %s, This is an alpha release.\n", GQ_APPNAME, VERSION);
#endif
	options = init_options(NULL);
	options->layout_order = g_strdup("123"); /* TODO: move to init_options() */
	setup_default_options();
	load_options();

	parse_command_line(argc, argv, &cmd_path, &cmd_file, &cmd_list, &collection_list, &geometry);