From 52d9b7024689d1f2f5d9932d8bee5cb6e25ce88b Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Sun, 21 Mar 2010 01:14:13 +0100 Subject: Move configuration options to the walls_config_t. This closes feature #7. --- window_config.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'window_config.c') diff --git a/window_config.c b/window_config.c index a8de897..ba3f6b2 100644 --- a/window_config.c +++ b/window_config.c @@ -15,9 +15,6 @@ struct window_config_t *window_config_new(GtkWindow *parent) { GtkCellRenderer *cell; struct window_config_t *wct; - int interp_mode = conf_get_int("walls", "interpolation_mode", GDK_INTERP_NEAREST); - int max_preload = conf_get_int("walls", "max_preload", 2); - builder = gtk_builder_new(); if(!gtk_builder_add_from_string(builder, config_ui_string, -1, &error)) { g_warning("%s", error->message); @@ -47,7 +44,7 @@ struct window_config_t *window_config_new(GtkWindow *parent) { gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(interp_combo), cell, TRUE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(interp_combo), cell, "text", 0, NULL); - switch(interp_mode) { + switch(config.interp_type) { case GDK_INTERP_TILES: gtk_combo_box_set_active(interp_combo, 1); break; @@ -62,7 +59,7 @@ struct window_config_t *window_config_new(GtkWindow *parent) { } preload_scale = GTK_HSCALE(gtk_builder_get_object(builder, "preload_scale")); - gtk_range_set_value(GTK_RANGE(preload_scale), max_preload); + gtk_range_set_value(GTK_RANGE(preload_scale), config.max_preload); dialog = GTK_DIALOG(gtk_builder_get_object(builder, "config_dialog")); gtk_window_set_transient_for(GTK_WINDOW(dialog), parent); @@ -80,21 +77,14 @@ struct window_config_t *window_config_new(GtkWindow *parent) { void window_config_save(struct window_config_t *wct) { GValue value = {0}; - int interp_mode = GDK_INTERP_NEAREST; - int max_preload = 2; - GtkListStore *liststore = GTK_LIST_STORE(gtk_combo_box_get_model(wct->interp_combo)); GtkTreeIter iter; gtk_combo_box_get_active_iter(wct->interp_combo, &iter); gtk_tree_model_get_value(GTK_TREE_MODEL(liststore), &iter, 1, &value); - interp_mode = g_value_get_int(&value); + config.interp_type = g_value_get_int(&value); g_value_unset(&value); - max_preload = gtk_range_get_value(wct->preload_scale); - - g_key_file_set_integer(keyfile, "walls", "interpolation_mode", interp_mode); - interp_type = interp_mode; + config.max_preload = gtk_range_get_value(wct->preload_scale); - g_key_file_set_integer(keyfile, "walls", "max_preload", max_preload); - preload_max = max_preload; + conf_save(); } -- cgit v1.2.3