#include <config.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <glib/gstdio.h>
#include <math.h>
-#include <gis.h>
+#include <grits.h>
#include "aweather-gui.h"
#include "aweather-location.h"
if (event->keyval == GDK_q)
gtk_widget_destroy(GTK_WIDGET(self));
else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
- gis_viewer_refresh(self->viewer);
+ grits_viewer_refresh(self->viewer);
else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(self, "main_tabs"));
gint num_tabs = gtk_notebook_get_n_pages(tabs);
return FALSE;
}
+static void cleancache_r(gchar *path)
+{
+ GDir *dir = g_dir_open(path, 0, NULL);
+ if (!dir)
+ return;
+ const gchar *child;
+ while ((child = g_dir_read_name(dir))) {
+ gchar *child_path = g_build_filename(path, child, NULL);
+ if (g_file_test(child_path, G_FILE_TEST_IS_DIR)) {
+ cleancache_r(child_path);
+ } else {
+ struct stat st;
+ g_stat(child_path, &st);
+ if (st.st_atime < time(NULL)-60*60*24)
+ g_remove(child_path);
+ }
+ g_free(child_path);
+ }
+ g_dir_close(dir);
+ g_rmdir(path);
+}
+G_MODULE_EXPORT void on_cleancache(GtkMenuItem *menu, AWeatherGui *self)
+{
+ g_debug("AWeatherGui: on_cleancache");
+ /* Todo: move this to grits */
+ gchar *cache = g_build_filename(g_get_user_cache_dir(), "grits", NULL);
+ cleancache_r(cache);
+}
+
+G_MODULE_EXPORT void on_contents(GtkMenuItem *menu, AWeatherGui *self)
+{
+ GError *err = NULL;
+ gchar *path = g_strdup(HTMLDIR "/aweather.html");
+ g_strdelimit(path, "/", G_DIR_SEPARATOR);
+ gchar *argv[] = {"xdg-open", path, NULL};
+ g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err);
+ if (err) {
+ g_warning("Unable to open help page: %s - %s",
+ argv[1], err->message);
+ g_error_free(err);
+ }
+ g_free(path);
+}
+
G_MODULE_EXPORT void on_quit(GtkMenuItem *menu, AWeatherGui *self)
{
gtk_widget_destroy(GTK_WIDGET(self));
G_MODULE_EXPORT void on_zoomin(GtkAction *action, AWeatherGui *self)
{
- gis_viewer_zoom(self->viewer, 3./4);
+ grits_viewer_zoom(self->viewer, 3./4);
}
G_MODULE_EXPORT void on_zoomout(GtkAction *action, AWeatherGui *self)
{
- gis_viewer_zoom(self->viewer, 4./3);
+ grits_viewer_zoom(self->viewer, 4./3);
}
G_MODULE_EXPORT void on_refresh(GtkAction *action, AWeatherGui *self)
{
- gis_viewer_refresh(self->viewer);
+ grits_viewer_refresh(self->viewer);
}
G_MODULE_EXPORT void on_plugin_toggled(GtkCellRendererToggle *cell, gchar *path_str, AWeatherGui *self)
G_MODULE_EXPORT void on_time_changed(AWeatherGui *self)
{
g_debug("AWeatherGui: on_time_changed");
- struct tm tm = {};
+ struct tm tm = {.tm_isdst = -1};
GtkWidget *cal = aweather_gui_get_widget(self, "main_date_cal");
gtk_calendar_get_date(GTK_CALENDAR(cal), (guint*)&tm.tm_year,
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, 1, &tm.tm_hour, 2, &tm.tm_min, -1);
- gis_viewer_set_time(self->viewer, mktime(&tm));
+ grits_viewer_set_time(self->viewer, mktime(&tm));
}
static gboolean gtk_tree_model_find_string(GtkTreeModel *model,
return FALSE;
}
-static void update_time_widget(GisViewer *viewer, time_t time, AWeatherGui *self)
+static void update_time_widget(GritsViewer *viewer, time_t time, AWeatherGui *self)
{
g_debug("AWeatherGui: update_time_widget - time=%u", (guint)time);
// FIXME
{
gboolean value = gtk_toggle_action_get_active(action);
g_debug("AWeatherGui: on_offline - offline=%d", value);
- gis_viewer_set_offline(self->viewer, value);
+ grits_viewer_set_offline(self->viewer, value);
}
G_MODULE_EXPORT void on_initial_site_changed(GtkComboBox *combo, AWeatherGui *self)
gtk_combo_box_get_active_iter(combo, &iter);
gtk_tree_model_get(model, &iter, 0, &code, -1);
g_debug("AWeatherGui: on_initial_site_changed - code=%s", code);
- gis_prefs_set_string(self->prefs, "aweather/initial_site", code);
+ grits_prefs_set_string(self->prefs, "aweather/initial_site", code);
g_free(code);
}
{
const gchar *text = gtk_entry_get_text(entry);
g_debug("AWeatherGui: on_nexrad_url_changed - url=%s", text);
- gis_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
+ grits_prefs_set_string(self->prefs, "aweather/nexrad_url", text);
}
G_MODULE_EXPORT int on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
{
gint value = gtk_spin_button_get_value_as_int(spinner);
g_debug("AWeatherGui: on_log_level_changed - %p, level=%d", self, value);
- gis_prefs_set_integer(self->prefs, "aweather/log_level", value);
+ grits_prefs_set_integer(self->prefs, "aweather/log_level", value);
return TRUE;
}
{
GtkTreeIter state, city;
GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(self, "sites"));
+ gtk_tree_store_append(store, &state, NULL);
+ gtk_tree_store_set (store, &state, 0, "", 1, "None", -1);
for (int i = 0; cities[i].type; i++) {
if (cities[i].type == LOCATION_STATE) {
gtk_tree_store_append(store, &state, NULL);
static void prefs_setup(AWeatherGui *self)
{
/* Set values */
- gchar *nu = gis_prefs_get_string (self->prefs, "aweather/nexrad_url", NULL);
- gint ll = gis_prefs_get_integer(self->prefs, "aweather/log_level", NULL);
- gchar *is = gis_prefs_get_string (self->prefs, "aweather/initial_site", NULL);
+ gchar *nu = grits_prefs_get_string (self->prefs, "aweather/nexrad_url", NULL);
+ gint ll = grits_prefs_get_integer(self->prefs, "aweather/log_level", NULL);
+ gchar *is = grits_prefs_get_string (self->prefs, "aweather/initial_site", NULL);
GtkWidget *nuw = aweather_gui_get_widget(self, "prefs_general_url");
GtkWidget *llw = aweather_gui_get_widget(self, "prefs_general_log");
GtkWidget *isw = aweather_gui_get_widget(self, "prefs_general_site");
"Plugin", rend1, "text", 0, NULL);
GtkTreeViewColumn *col2 = gtk_tree_view_column_new_with_attributes(
"Enabled", rend2, "active", 1, NULL);
- g_object_set(rend2, "xalign", 0, NULL);
+ g_object_set(rend2, "xalign", 0.0, NULL);
gtk_tree_view_append_column(tview, col1);
gtk_tree_view_append_column(tview, col2);
g_signal_connect(rend2, "toggled", G_CALLBACK(on_plugin_toggled), self);
static void time_setup(AWeatherGui *self)
{
- /* Setup UI */
- GtkCalendar *cal = GTK_CALENDAR(aweather_gui_get_widget(self, "main_date_cal"));
- GtkTreeView *view = GTK_TREE_VIEW(aweather_gui_get_widget(self, "main_time"));
- GtkCellRenderer *rend = gtk_cell_renderer_text_new();
- GtkTreeViewColumn *col = gtk_tree_view_column_new_with_attributes(
- "Time", rend, "text", 0, NULL);
- gtk_tree_view_append_column(view, col);
- g_object_set(rend, "size-points", 8.0, NULL);
-
/* Add times */
- GtkListStore *store = GTK_LIST_STORE(aweather_gui_get_object(self, "times"));
+ GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(self, "times"));
for (int hour = 0; hour < 24; hour++) {
- for (int min = 0; min < 60; min += 10) {
- GtkTreeIter iter;
- gchar *str = g_strdup_printf("%02d:%02d", hour, min);
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, str, 1, hour, 2, min, -1);
+ GtkTreeIter hour_iter;
+ gchar *str = g_strdup_printf("%02d:00Z", hour);
+ gtk_tree_store_append(store, &hour_iter, NULL);
+ gtk_tree_store_set(store, &hour_iter, 0, str, 1, hour, 2, 0, -1);
+ g_free(str);
+ for (int min = 5; min < 60; min += 5) {
+ GtkTreeIter min_iter;
+ gchar *str = g_strdup_printf("%02d:%02dZ", hour, min);
+ gtk_tree_store_append(store, &min_iter, &hour_iter);
+ gtk_tree_store_set(store, &min_iter, 0, str, 1, hour, 2, min, -1);
g_free(str);
}
}
/* Connect signals */
+ GtkWidget *cal = aweather_gui_get_widget(self, "main_date_cal");
+ GtkWidget *view = aweather_gui_get_widget(self, "main_time");
g_signal_connect_swapped(cal, "day-selected-double-click",
G_CALLBACK(on_time_changed), self);
g_signal_connect_swapped(view, "row-activated",
g_debug("AWeatherGui: new");
return g_object_new(AWEATHER_TYPE_GUI, NULL);
}
-GisViewer *aweather_gui_get_viewer(AWeatherGui *self)
+GritsViewer *aweather_gui_get_viewer(AWeatherGui *self)
{
g_assert(AWEATHER_IS_GUI(self));
return self->viewer;
}
void aweather_gui_attach_plugin(AWeatherGui *self, const gchar *name)
{
- GisPlugin *plugin = gis_plugins_enable(self->plugins, name,
+ GritsPlugin *plugin = grits_plugins_enable(self->plugins, name,
self->viewer, self->prefs);
- GtkWidget *body = gis_plugin_get_config(plugin);
+ GtkWidget *body = grits_plugin_get_config(plugin);
if (body) {
GtkWidget *config = aweather_gui_get_widget(self, "main_tabs");
GtkWidget *tab = gtk_label_new(name);
if (tab_name && g_str_equal(name, tab_name))
gtk_notebook_remove_page(GTK_NOTEBOOK(config), i);
}
- gis_plugins_disable(self->plugins, name);
+ grits_plugins_disable(self->plugins, name);
gtk_widget_queue_draw(GTK_WIDGET(self->viewer));
}
/****************
* GObject code *
****************/
-G_DEFINE_TYPE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW);
-static void aweather_gui_init(AWeatherGui *self)
+static void aweather_gui_parser_finished(GtkBuildable *_self, GtkBuilder *builder)
{
- g_debug("AWeatherGui: init");
+ g_debug("AWeatherGui: parser finished");
+ AWeatherGui *self = AWEATHER_GUI(_self);
+ self->builder = builder;
/* Simple things */
gchar *config = g_build_filename(g_get_user_config_dir(), PACKAGE, "config.ini", NULL);
gchar *defaults = g_build_filename(PKGDATADIR, "defaults.ini", NULL);
- self->prefs = gis_prefs_new(config, defaults);
- self->plugins = gis_plugins_new(PLUGINSDIR, self->prefs);
- self->viewer = gis_opengl_new(self->plugins, self->prefs);
+ self->prefs = grits_prefs_new(config, defaults);
+ self->plugins = grits_plugins_new(PLUGINSDIR, self->prefs);
+ self->viewer = GRITS_VIEWER(aweather_gui_get_widget(self, "main_viewer"));
+ grits_viewer_setup(self->viewer, self->plugins, self->prefs);
g_free(config);
g_free(defaults);
- /* Setup window */
- self->builder = gtk_builder_new();
- GError *error = NULL;
- if (!gtk_builder_add_from_file(self->builder, PKGDATADIR "/main.ui", &error))
- g_error("Failed to create gtk builder: %s", error->message);
- gtk_widget_reparent(aweather_gui_get_widget(self, "main_body"), GTK_WIDGET(self));
- GtkWidget *paned = aweather_gui_get_widget(self, "main_paned");
- gtk_widget_destroy(gtk_paned_get_child1(GTK_PANED(paned)));
- gtk_paned_pack1(GTK_PANED(paned), GTK_WIDGET(self->viewer), TRUE, FALSE);
- gtk_widget_set_size_request(GTK_WIDGET(self->viewer), 600, 400);
- gtk_widget_show_all(GTK_WIDGET(self));
-
/* Plugins */
GtkTreeIter iter;
self->gtk_plugins = GTK_LIST_STORE(aweather_gui_get_object(self, "plugins"));
- for (GList *cur = gis_plugins_available(self->plugins); cur; cur = cur->next) {
+ for (GList *cur = grits_plugins_available(self->plugins); cur; cur = cur->next) {
gchar *name = cur->data;
GError *error = NULL;
- gboolean enabled = gis_prefs_get_boolean_v(self->prefs, "plugins", cur->data, &error);
+ gboolean enabled = grits_prefs_get_boolean_v(self->prefs, "plugins", cur->data, &error);
if (error && error->code == G_KEY_FILE_ERROR_GROUP_NOT_FOUND)
enabled = TRUE;
gtk_list_store_append(self->gtk_plugins, &iter);
G_CALLBACK(gtk_toggle_action_set_active),
aweather_gui_get_object(self, "offline"));
}
+static void aweather_gui_buildable_init(GtkBuildableIface *iface)
+{
+ iface->parser_finished = aweather_gui_parser_finished;
+}
+G_DEFINE_TYPE_WITH_CODE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW,
+ G_IMPLEMENT_INTERFACE(GTK_TYPE_BUILDABLE,
+ aweather_gui_buildable_init));
+static void aweather_gui_init(AWeatherGui *self)
+{
+ g_debug("AWeatherGui: init");
+ /* Do all the real work in parser_finished */
+}
static GObject *aweather_gui_constructor(GType gtype, guint n_properties,
GObjectConstructParam *properties)
{
- g_debug("aweather_gui: constructor");
+ g_debug("AWeatherGui: constructor");
GObjectClass *parent_class = G_OBJECT_CLASS(aweather_gui_parent_class);
return parent_class->constructor(gtype, n_properties, properties);
}
g_debug("AWeatherGui: dispose");
AWeatherGui *self = AWEATHER_GUI(_self);
if (self->plugins) {
- gis_plugins_free(self->plugins);
+ grits_plugins_free(self->plugins);
self->plugins = NULL;
}
if (self->builder) {
{
g_debug("AWeatherGui: finalize");
G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(_self);
- gtk_main_quit();
}
static void aweather_gui_class_init(AWeatherGuiClass *klass)