Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
conffile fix
  • Loading branch information
pchilds committed Sep 14, 2012
1 parent 03af815 commit 8f4c95f
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 14 deletions.
2 changes: 0 additions & 2 deletions configure.ac
Expand Up @@ -11,11 +11,9 @@ AC_CONFIG_HEADERS([config.h])
case "$host_os" in
mingw*)
AC_DEFINE([DLMT],["\r\n"],[End Of Line delimiter])
AC_DEFINE([CONFFILE],["%APPDATA%\istib.conf"],[configuration file location for package])
;;
*)
AC_DEFINE([DLMT],["\n"],[End Of Line delimiter])
AC_DEFINE([CONFFILE],["~/.istib.conf"],[configuration file location for package])
;;
esac
gtk_rqr="gtk+-2.0 >= 2.14 gtkplot-2.0"
Expand Down
43 changes: 31 additions & 12 deletions src/data.c
Expand Up @@ -677,7 +677,8 @@ void sav(GtkWidget *wgt, gpointer dta)

void ssr(GtkWidget *wgt, gpointer dta)
{
gchar *str, *str2;
gchar *str, *str2, *fout;
gdouble mny, mxy, xf, xi;
GError *Err=NULL;
GKeyFile *key;
GSList *lst;
Expand All @@ -686,7 +687,8 @@ void ssr(GtkWidget *wgt, gpointer dta)
PangoFontDescription *ds1, *ds2;

key=g_key_file_new();
if (g_key_file_load_from_file(key, CONFFILE, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, &Err))
fout=g_build_filename(g_get_user_config_dir(), PACKAGE, "session.conf", NULL);
if (g_key_file_load_from_file(key, fout, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, &Err))
{
if (g_key_file_has_key(key, "MenuItems", "DomainFirst", &Err)) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(wk), g_key_file_get_boolean(key, "MenuItems", "DomainFirst", &Err));
else if (Err) g_error_free(Err);
Expand Down Expand Up @@ -778,6 +780,8 @@ void ssr(GtkWidget *wgt, gpointer dta)
}
gtk_plot_set_font(pt, ds1, ds2);
{pango_font_description_free(ds1); pango_font_description_free(ds2);}
g_object_get(G_OBJECT(pt1), "xmin", &xi, "xmax", &xf, "ymin", &mny, "ymax", &mxy, NULL);
gtk_plot_linear_update_scale(plt, xi, xf, mny, mxy);
plt=GTK_PLOT_LINEAR(pt2);
pt=GTK_PLOT(pt2);
if (g_key_file_has_key(key, "Plot", "SpatialTextX", &Err)) str=g_key_file_get_string(key, "Plot", "SpatialTextX", &Err);
Expand Down Expand Up @@ -808,19 +812,22 @@ void ssr(GtkWidget *wgt, gpointer dta)
}
gtk_plot_set_font(pt, ds1, ds2);
{pango_font_description_free(ds1); pango_font_description_free(ds2);}
g_object_get(G_OBJECT(pt2), "xmin", &xi, "xmax", &xf, "ymin", &mny, "ymax", &mxy, NULL);
gtk_plot_linear_update_scale(plt, xi, xf, mny, mxy);
g_key_file_free(key);
}
else
{
str=g_strdup_printf(_("Loading failed for file: %s, Error: %s."), CONFFILE, (Err->message));
str=g_strdup_printf(_("Loading failed for file: %s, Error: %s."), fout, (Err->message));
gtk_statusbar_push(GTK_STATUSBAR(sbr), gtk_statusbar_get_context_id(GTK_STATUSBAR(sbr), str), str);
{g_free(str); g_error_free(Err);}
}
g_free(fout);
}

void sss(GtkWidget *wgt, gpointer dta)
{
gchar *str;
gchar *fout, *pdr, *str;
GError *Err=NULL;
GKeyFile *key;
gsize size;
Expand Down Expand Up @@ -860,7 +867,7 @@ void sss(GtkWidget *wgt, gpointer dta)
g_key_file_set_string(key, "Plot", "SpectrumTextX", str);
g_free(str);
str=g_strdup(plt->ylab);
g_key_file_set_string(key, "Plot", "SpectrumTextX", str);
g_key_file_set_string(key, "Plot", "SpectrumTextY", str);
g_free(str);
str=pango_font_description_to_string(pt->lfont);
g_key_file_set_string(key, "Plot", "SpectrumLabel", str);
Expand All @@ -874,21 +881,33 @@ void sss(GtkWidget *wgt, gpointer dta)
g_key_file_set_string(key, "Plot", "SpatialTextX", str);
g_free(str);
str=g_strdup(plt->ylab);
g_key_file_set_string(key, "Plot", "SpatialTextX", str);
g_key_file_set_string(key, "Plot", "SpatialTextY", str);
g_free(str);
str=pango_font_description_to_string(pt->lfont);
g_key_file_set_string(key, "Plot", "SpatialLabel", str);
g_free(str);
str=pango_font_description_to_string(pt->afont);
g_key_file_set_string(key, "Plot", "SpatialAxis", str);
g_free(str);
str=g_key_file_to_data(key, &size, NULL);
g_file_set_contents(CONFFILE, str, size, &Err);
{g_key_file_free(key); g_free(str);}
if (Err)
pdr=g_build_filename(g_get_user_config_dir(), PACKAGE, NULL);
if (g_mkdir_with_parents (pdr, 0700) == 0)
{
str=g_key_file_to_data(key, &size, NULL);
fout=g_build_filename(pdr, "session.conf", NULL);
g_file_set_contents(fout, str, size, &Err);
{g_free(str); g_free(fout);}
if (Err)
{
str=g_strdup_printf(_("Error Saving file: %s."), (Err->message));
gtk_statusbar_push(GTK_STATUSBAR(sbr), gtk_statusbar_get_context_id(GTK_STATUSBAR(sbr), str), str);
{g_free(str); g_error_free(Err);}
}
}
else
{
str=g_strdup_printf(_("Error Saving file: %s."), (Err->message));
str=g_strdup(_("Error Creating config directory."));
gtk_statusbar_push(GTK_STATUSBAR(sbr), gtk_statusbar_get_context_id(GTK_STATUSBAR(sbr), str), str);
{g_free(str); g_error_free(Err);}
g_free(str);
}
{g_free(pdr); g_key_file_free(key);}
}

0 comments on commit 8f4c95f

Please sign in to comment.