Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: Improve weather setting sensitivity

Browse Source
This commit is contained in:
Florian Brosch
2017-12-11 21:32:01 -02:00
committed by Georges Basile Stavracas Neto
parent f4f0c3a38d
commit 12da918357
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/ui/menus.ui
+1 -1
View File
@@ -125,7 +125,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox" id="auto-location-box">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">5</property> <!-- TODO: check HIG for right value --> <property name="spacing">5</property> <!-- TODO: check HIG for right value -->
src/gcal-window.c
+10 -5
View File
@@ -177,10 +177,11 @@ struct _GcalWindow
gint open_edit_dialog_timeout_id; gint open_edit_dialog_timeout_id;
/* weather management */ /* weather management */
GcalWeatherService *weather_service; /* owned */ GcalWeatherService *weather_service; /* owned */
GtkSwitch *weather; /* unowned */ GtkSwitch *weather; /* unowned */
GtkSwitch *auto_location; /* unowned */ GtkSwitch *auto_location; /* unowned */
GWeatherLocationEntry *location_entry; /* unowned */ GtkBox *auto_location_box; /* unowned */
GWeatherLocationEntry *location_entry; /* unowned */
WeatherSigs weather_cb_ids[5]; WeatherSigs weather_cb_ids[5];
/* temp to keep event_creation */ /* temp to keep event_creation */
@@ -1617,6 +1618,7 @@ gcal_window_init (GcalWindow *self)
/* Weather menu: */ /* Weather menu: */
self->weather_service = NULL; self->weather_service = NULL;
self->weather = GTK_SWITCH(gtk_builder_get_object (builder, "show-weather-switch")); self->weather = GTK_SWITCH(gtk_builder_get_object (builder, "show-weather-switch"));
self->auto_location_box = GTK_BOX (gtk_builder_get_object (builder, "auto-location-box"));
self->auto_location = GTK_SWITCH(gtk_builder_get_object (builder, "auto-location-switch")); self->auto_location = GTK_SWITCH(gtk_builder_get_object (builder, "auto-location-switch"));
self->location_entry = GWEATHER_LOCATION_ENTRY (gtk_builder_get_object (builder, "fixed-weather-location")); self->location_entry = GWEATHER_LOCATION_ENTRY (gtk_builder_get_object (builder, "fixed-weather-location"));
location_completion = gtk_entry_get_completion (GTK_ENTRY (self->location_entry)); location_completion = gtk_entry_get_completion (GTK_ENTRY (self->location_entry));
@@ -1894,7 +1896,7 @@ update_menu_weather_sensitivity (GcalWindow *self)
weather_enabled = gtk_switch_get_active (self->weather); weather_enabled = gtk_switch_get_active (self->weather);
autoloc_enabled = gtk_switch_get_active (self->auto_location); autoloc_enabled = gtk_switch_get_active (self->auto_location);
gtk_widget_set_sensitive (GTK_WIDGET (self->auto_location), weather_enabled); gtk_widget_set_sensitive (GTK_WIDGET (self->auto_location_box), weather_enabled);
gtk_widget_set_sensitive (GTK_WIDGET (self->location_entry), weather_enabled && !autoloc_enabled); gtk_widget_set_sensitive (GTK_WIDGET (self->location_entry), weather_enabled && !autoloc_enabled);
} }
@@ -1991,6 +1993,9 @@ load_weather_settings (GcalWindow *self)
gtk_switch_set_active (self->auto_location, auto_location); gtk_switch_set_active (self->auto_location, auto_location);
if (location == NULL) if (location == NULL)
{ {
GtkStyleContext *context; /* unowned */
context = gtk_widget_get_style_context (GTK_WIDGET (self->location_entry));
gtk_entry_set_text (GTK_ENTRY (self->location_entry), location_name); gtk_entry_set_text (GTK_ENTRY (self->location_entry), location_name);
gtk_style_context_add_class (context, "error"); gtk_style_context_add_class (context, "error");
} }