gtkbuilderdir = $(datadir)/aweather/
dist_gtkbuilder_DATA = main.ui
+configdir = $(datadir)/aweather/
+dist_config_DATA = defaults.ini
+
maintainer-clean-local:
rm -f Makefile.in
--- /dev/null
+[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
</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>
</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"/>
</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>
</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">
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
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;
}