From 645743a20bced370f665b5a28ccc91d6ca1ccf1f Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Fri, 7 Aug 2009 01:19:06 +0000
Subject: [PATCH] adding default settings

---
 data/Makefile.am    |  3 +++
 data/defaults.ini   | 16 ++++++++++++++++
 data/main.ui        | 10 +++++++---
 src/gis/Makefile.am |  7 +++++--
 src/gis/gis-prefs.c | 22 ++++++++++++++++++++--
 5 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 data/defaults.ini

diff --git a/data/Makefile.am b/data/Makefile.am
index 3ceed01..79d45bb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,8 @@
 gtkbuilderdir = $(datadir)/aweather/
 dist_gtkbuilder_DATA = main.ui
 
+configdir = $(datadir)/aweather/
+dist_config_DATA = defaults.ini
+
 maintainer-clean-local:
 	rm -f Makefile.in
diff --git a/data/defaults.ini b/data/defaults.ini
new file mode 100644
index 0000000..085cd4f
--- /dev/null
+++ b/data/defaults.ini
@@ -0,0 +1,16 @@
+[aweather]
+initial_site=KIND
+nexrad_url=http://mesonet.agron.iastate.edu/data/
+log_level=7
+
+[gis]
+offline=false
+
+[example]
+enabled=true
+
+[ridge]
+enabled=true
+
+[radar]
+enabled=true
diff --git a/data/main.ui b/data/main.ui
index cd889cd..0dded89 100644
--- a/data/main.ui
+++ b/data/main.ui
@@ -25,6 +25,7 @@
     </columns>
   </object>
   <object class="GtkWindow" id="main_window">
+    <property name="title" translatable="yes">AWeather</property>
     <child>
       <object class="GtkVBox" id="body">
         <property name="visible">True</property>
@@ -398,7 +399,9 @@
   </object>
   <object class="GtkDialog" id="prefs_window">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences - AWeather</property>
     <property name="type_hint">normal</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
     <signal name="response" handler="gtk_widget_hide" object="prefs_window"/>
     <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
@@ -622,10 +625,11 @@
   </object>
   <object class="GtkAboutDialog" id="about_window">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">About AWeather</property>
+    <property name="title" translatable="yes">About - AWeather</property>
     <property name="resizable">False</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
+    <property name="transient_for">main_window</property>
     <property name="has_separator">False</property>
     <property name="program_name">AWeather</property>
     <property name="version">0.1</property>
@@ -903,9 +907,9 @@ The hypothetical commands `show w' and `show c' should show the appropriate part
   </object>
   <object class="GtkSizeGroup" id="prefs_size">
     <widgets>
-      <widget name="site_label"/>
-      <widget name="nexrad_label"/>
       <widget name="log_label"/>
+      <widget name="nexrad_label"/>
+      <widget name="site_label"/>
     </widgets>
   </object>
   <object class="GtkAdjustment" id="adjustment">
diff --git a/src/gis/Makefile.am b/src/gis/Makefile.am
index 5dc04a5..fb12f5e 100644
--- a/src/gis/Makefile.am
+++ b/src/gis/Makefile.am
@@ -19,8 +19,11 @@ libgis_la_SOURCES = \
 	gis-plugin.c  gis-plugin.h \
 	gis-data.c    gis-data.h   \
 	gis-marshal.c gis-marshal.h
-libgis_la_CPPFLAGS = -DPLUGINDIR="\"$(libdir)/gis\"" $(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
-libgis_la_LIBADD = $(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+libgis_la_CPPFLAGS = \
+	-DDATADIR="\"$(datadir)\"" -DPLUGINDIR="\"$(libdir)/gis\"" \
+	$(SOUP_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+libgis_la_LIBADD = \
+	$(SOUP_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgis.pc
diff --git a/src/gis/gis-prefs.c b/src/gis/gis-prefs.c
index 2b3829a..ea3f05a 100644
--- a/src/gis/gis-prefs.c
+++ b/src/gis/gis-prefs.c
@@ -94,9 +94,27 @@ GisPrefs *gis_prefs_new(const gchar *prog)
 	GError *error = NULL;
 	g_key_file_load_from_file(self->key_file, self->key_path,
 			G_KEY_FILE_KEEP_COMMENTS, &error);
-	if (error)
-		g_warning("GisPrefs: init - Unable to load key file `%s': %s",
+	if (error) {
+		g_debug("GisPrefs: new - Trying %s defaults", prog);
+		g_clear_error(&error);
+		gchar *tmp = g_build_filename(DATADIR, prog, "defaults.ini", NULL);
+		g_key_file_load_from_file(self->key_file, tmp,
+				G_KEY_FILE_KEEP_COMMENTS, &error);
+		g_free(tmp);
+	}
+	if (error) {
+		g_debug("GisPrefs: new - Trying GIS defaults");
+		g_clear_error(&error);
+		gchar *tmp = g_build_filename(DATADIR, "gis", "defaults.ini", NULL);
+		g_key_file_load_from_file(self->key_file, tmp,
+				G_KEY_FILE_KEEP_COMMENTS, &error);
+		g_free(tmp);
+	}
+	if (error) {
+		g_clear_error(&error);
+		g_warning("GisPrefs: new - Unable to load key file `%s': %s",
 			self->key_path, error->message);
+	}
 	return self;
 }
 
-- 
2.43.2