X-Git-Url: http://pileus.org/git/?p=grits;a=blobdiff_plain;f=src%2Faweather-view.c;h=2f240a73d4bd0f059605b445d1b3c7d5d8c877bd;hp=c8fc01b205f0a1ecba6494a2fd2ac73aa81f8206;hb=d97d97d3896bc8299adf2e7aaa5cc38e2611f395;hpb=d527bfdb9682b1824e1c2df318a92291aaa48860 diff --git a/src/aweather-view.c b/src/aweather-view.c index c8fc01b..2f240a7 100644 --- a/src/aweather-view.c +++ b/src/aweather-view.c @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2009 Andy Spencer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include #include "aweather-view.h" @@ -13,6 +30,7 @@ enum { enum { SIG_TIME_CHANGED, SIG_LOCATION_CHANGED, + SIG_REFRESH, NUM_SIGNALS, }; @@ -21,30 +39,30 @@ static guint signals[NUM_SIGNALS]; /* Constructor / destructors */ static void aweather_view_init(AWeatherView *self) { - g_message("aweather_view_init"); + //g_message("aweather_view_init"); /* Default values */ - self->time = 0; - self->location = g_strdup("IND"); + self->time = g_strdup(""); //g_strdup("LATEST"); + self->location = g_strdup(""); //g_strdup("IND"); } static GObject *aweather_view_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties) { - g_message("aweather_view_constructor"); + //g_message("aweather_view_constructor"); GObjectClass *parent_class = G_OBJECT_CLASS(aweather_view_parent_class); return parent_class->constructor(gtype, n_properties, properties); } static void aweather_view_dispose (GObject *gobject) { - g_message("aweather_view_dispose"); + //g_message("aweather_view_dispose"); /* Drop references to other GObjects */ G_OBJECT_CLASS(aweather_view_parent_class)->dispose(gobject); } static void aweather_view_finalize(GObject *gobject) { - g_message("aweather_view_finalize"); + //g_message("aweather_view_finalize"); AWeatherView *self = AWEATHER_VIEW(gobject); g_free(self->location); G_OBJECT_CLASS(aweather_view_parent_class)->finalize(gobject); @@ -53,10 +71,10 @@ static void aweather_view_finalize(GObject *gobject) static void aweather_view_set_property(GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - g_message("aweather_view_set_property"); + //g_message("aweather_view_set_property"); AWeatherView *self = AWEATHER_VIEW(object); switch (property_id) { - case PROP_TIME: aweather_view_set_time (self, g_value_get_int (value)); break; + case PROP_TIME: aweather_view_set_time (self, g_value_get_string(value)); break; case PROP_LOCATION: aweather_view_set_location(self, g_value_get_string(value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } @@ -65,10 +83,10 @@ static void aweather_view_set_property(GObject *object, guint property_id, static void aweather_view_get_property(GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - g_message("aweather_view_get_property"); + //g_message("aweather_view_get_property"); AWeatherView *self = AWEATHER_VIEW(object); switch (property_id) { - case PROP_TIME: g_value_set_int (value, aweather_view_get_time (self)); break; + case PROP_TIME: g_value_set_string(value, aweather_view_get_time (self)); break; case PROP_LOCATION: g_value_set_string(value, aweather_view_get_location(self)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); } @@ -76,7 +94,7 @@ static void aweather_view_get_property(GObject *object, guint property_id, static void aweather_view_class_init(AWeatherViewClass *klass) { - g_message("aweather_view_class_init"); + //g_message("aweather_view_class_init"); GObjectClass *gobject_class = G_OBJECT_CLASS(klass); gobject_class->constructor = aweather_view_constructor; gobject_class->dispose = aweather_view_dispose; @@ -84,11 +102,10 @@ static void aweather_view_class_init(AWeatherViewClass *klass) gobject_class->get_property = aweather_view_get_property; gobject_class->set_property = aweather_view_set_property; g_object_class_install_property(gobject_class, PROP_TIME, - g_param_spec_int( + g_param_spec_pointer( "time", "time of the current frame", "(format unknown)", - G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE)); g_object_class_install_property(gobject_class, PROP_LOCATION, g_param_spec_pointer( @@ -106,7 +123,7 @@ static void aweather_view_class_init(AWeatherViewClass *klass) g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, - G_TYPE_INT); + G_TYPE_STRING); signals[SIG_LOCATION_CHANGED] = g_signal_new( "location-changed", G_TYPE_FROM_CLASS(gobject_class), @@ -117,33 +134,47 @@ static void aweather_view_class_init(AWeatherViewClass *klass) g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, - G_TYPE_GSTRING); + G_TYPE_STRING); + signals[SIG_REFRESH] = g_signal_new( + "refresh", + G_TYPE_FROM_CLASS(gobject_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); } /* Methods */ AWeatherView *aweather_view_new() { - g_message("aweather_view_new"); + //g_message("aweather_view_new"); return g_object_new(AWEATHER_TYPE_VIEW, NULL); } -void aweather_view_set_time(AWeatherView *view, int time) +void aweather_view_set_time(AWeatherView *view, const char *time) { - g_message("aweather_view_set_time"); - view->time = time; + g_assert(AWEATHER_IS_VIEW(view)); + //g_message("aweather_view:set_time: setting time to %s", time); + g_free(view->time); + view->time = g_strdup(time); g_signal_emit(view, signals[SIG_TIME_CHANGED], 0, time); } -int aweather_view_get_time(AWeatherView *view) +gchar *aweather_view_get_time(AWeatherView *view) { - g_message("aweather_view_get_time"); + g_assert(AWEATHER_IS_VIEW(view)); + //g_message("aweather_view_get_time"); return view->time; } void aweather_view_set_location(AWeatherView *view, const gchar *location) { - g_message("aweather_view_set_location"); + g_assert(AWEATHER_IS_VIEW(view)); + //g_message("aweather_view_set_location"); g_free(view->location); view->location = g_strdup(location); g_signal_emit(view, signals[SIG_LOCATION_CHANGED], 0, view->location); @@ -151,6 +182,23 @@ void aweather_view_set_location(AWeatherView *view, const gchar *location) gchar *aweather_view_get_location(AWeatherView *view) { - g_message("aweather_view_get_location"); + g_assert(AWEATHER_IS_VIEW(view)); + //g_message("aweather_view_get_location"); return view->location; } + +void aweather_view_refresh(AWeatherView *view) +{ + g_message("aweather_view_refresh: .."); + g_signal_emit(view, signals[SIG_REFRESH], 0); +} + +void aweather_view_zoomin(AWeatherView *view) +{ + g_message("aweather_view_zoomin: .."); +} + +void aweather_view_zoomout(AWeatherView *view) +{ + g_message("aweather_view_zoomout: .."); +}