[gnome-panel] clock: remove timezone menu
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] clock: remove timezone menu
- Date: Tue, 1 Mar 2022 11:17:22 +0000 (UTC)
commit 233d5aff76d378fffc0f303976f9a23d9f5b751b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Mar 1 13:12:01 2022 +0200
clock: remove timezone menu
It not used since cd1a0db671b6.
modules/clock/clock-applet.c | 59 +----
modules/clock/clock.ui | 532 +++++++++++++++++++++----------------------
2 files changed, 260 insertions(+), 331 deletions(-)
---
diff --git a/modules/clock/clock-applet.c b/modules/clock/clock-applet.c
index bfa8d596c..51ab62d79 100644
--- a/modules/clock/clock-applet.c
+++ b/modules/clock/clock-applet.c
@@ -89,7 +89,6 @@ struct _ClockApplet
GtkWidget *prefs_location_remove_button;
GWeatherLocationEntry *location_entry;
- GWeatherTimezoneMenu *zone_combo;
GtkWidget *time_settings_button;
GAppInfo *datetime_appinfo;
@@ -1077,7 +1076,6 @@ edit_clear (ClockApplet *cd)
/* clear out the old data */
gweather_location_entry_set_location (cd->location_entry, NULL);
- gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
gtk_entry_set_text (GTK_ENTRY (lat_entry), "");
gtk_entry_set_text (GTK_ENTRY (lon_entry), "");
@@ -1154,7 +1152,7 @@ run_prefs_edit_save (GtkButton *button,
GtkWidget *lat_combo = _clock_get_widget (cd, "edit-location-latitude-combo");
GtkWidget *lon_combo = _clock_get_widget (cd, "edit-location-longitude-combo");
- const gchar *timezone, *weather_code;
+ const char *weather_code;
gchar *city, *name;
GWeatherLocation *gloc, *station_loc;
@@ -1166,12 +1164,6 @@ run_prefs_edit_save (GtkButton *button,
g_object_unref (loc);
}
- timezone = gweather_timezone_menu_get_tzid (cd->zone_combo);
- if (!timezone) {
- edit_hide (NULL, cd);
- return;
- }
-
city = NULL;
weather_code = NULL;
name = NULL;
@@ -1268,31 +1260,17 @@ update_coords (ClockApplet *cd,
update_coords_helper (lon, lon_entry, lon_combo);
}
-static void
-fill_timezone_combo_from_location (ClockApplet *cd,
- ClockLocation *loc)
-{
- if (loc != NULL) {
- gweather_timezone_menu_set_tzid (cd->zone_combo,
- clock_location_get_timezone (loc));
- } else {
- gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
- }
-}
-
static void
location_update_ok_sensitivity (ClockApplet *cd)
{
GtkWidget *ok_button;
- const gchar *timezone;
gchar *name;
ok_button = _clock_get_widget (cd, "edit-location-ok-button");
- timezone = gweather_timezone_menu_get_tzid (cd->zone_combo);
name = gtk_editable_get_chars (GTK_EDITABLE (cd->location_entry), 0, -1);
- if (timezone && name && name[0] != '\0') {
+ if (name && name[0] != '\0') {
gtk_widget_set_sensitive (ok_button, TRUE);
} else {
gtk_widget_set_sensitive (ok_button, FALSE);
@@ -1308,7 +1286,6 @@ location_changed (GObject *object,
{
GWeatherLocationEntry *entry = GWEATHER_LOCATION_ENTRY (object);
GWeatherLocation *gloc;
- GWeatherTimezone *zone;
gboolean latlon_valid;
double latitude = 0.0, longitude = 0.0;
@@ -1319,12 +1296,6 @@ location_changed (GObject *object,
gweather_location_get_coords (gloc, &latitude, &longitude);
update_coords (cd, latlon_valid, latitude, longitude);
- zone = gloc ? gweather_location_get_timezone (gloc) : NULL;
- if (zone)
- gweather_timezone_menu_set_tzid (cd->zone_combo, gweather_timezone_get_tzid (zone));
- else
- gweather_timezone_menu_set_tzid (cd->zone_combo, NULL);
-
if (gloc)
gweather_location_unref (gloc);
}
@@ -1336,14 +1307,6 @@ location_name_changed (GObject *object,
location_update_ok_sensitivity (cd);
}
-static void
-location_timezone_changed (GObject *object,
- GParamSpec *param,
- ClockApplet *cd)
-{
- location_update_ok_sensitivity (cd);
-}
-
static gboolean
edit_delete (GtkWidget *unused,
GdkEvent *event,
@@ -1424,8 +1387,6 @@ run_prefs_locations_add (GtkButton *button,
{
GtkWidget *edit_window = _clock_get_widget (cd, "edit-location-window");
- fill_timezone_combo_from_location (cd, NULL);
-
g_object_set_data (G_OBJECT (edit_window), "clock-location", NULL);
gtk_window_set_title (GTK_WINDOW (edit_window), _("Choose Location"));
gtk_window_set_transient_for (GTK_WINDOW (edit_window), GTK_WINDOW (cd->prefs_window));
@@ -1477,8 +1438,6 @@ edit_tree_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoint
clock_location_get_coords (loc, &lat, &lon);
- fill_timezone_combo_from_location (cd, loc);
-
tmp = g_strdup_printf ("%f", fabs (lat));
gtk_entry_set_text (GTK_ENTRY (lat_entry), tmp);
g_free (tmp);
@@ -1672,9 +1631,7 @@ ensure_prefs_window_is_created (ClockApplet *cd)
GtkWidget *edit_cancel_button;
GtkWidget *edit_ok_button;
GtkWidget *location_box;
- GtkWidget *zone_box;
GtkWidget *location_name_label;
- GtkWidget *timezone_label;
GtkTreeSelection *selection;
if (cd->prefs_window)
@@ -1689,8 +1646,6 @@ ensure_prefs_window_is_created (ClockApplet *cd)
clock_options = _clock_get_widget (cd, "clock-options");
cd->prefs_locations = GTK_TREE_VIEW (_clock_get_widget (cd, "cities_list"));
location_name_label = _clock_get_widget (cd, "location-name-label");
- timezone_label = _clock_get_widget (cd, "timezone-label");
-
if (!clock_locale_supports_am_pm ())
gtk_widget_hide (clock_options);
@@ -1747,16 +1702,6 @@ ensure_prefs_window_is_created (ClockApplet *cd)
g_signal_connect (G_OBJECT (cd->location_entry), "changed",
G_CALLBACK (location_name_changed), cd);
- zone_box = _clock_get_widget (cd, "edit-location-timezone-box");
- cd->zone_combo = GWEATHER_TIMEZONE_MENU (gweather_timezone_menu_new (cd->world));
- gtk_widget_show (GTK_WIDGET (cd->zone_combo));
- gtk_container_add (GTK_CONTAINER (zone_box), GTK_WIDGET (cd->zone_combo));
- gtk_label_set_mnemonic_widget (GTK_LABEL (timezone_label),
- GTK_WIDGET (cd->zone_combo));
-
- g_signal_connect (G_OBJECT (cd->zone_combo), "notify::tzid",
- G_CALLBACK (location_timezone_changed), cd);
-
g_signal_connect (G_OBJECT (edit_cancel_button), "clicked",
G_CALLBACK (edit_hide), cd);
diff --git a/modules/clock/clock.ui b/modules/clock/clock.ui
index af3881691..056447391 100644
--- a/modules/clock/clock.ui
+++ b/modules/clock/clock.ui
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.38.2 -->
<interface>
- <requires lib="gtk+" version="3.12"/>
+ <requires lib="gtk+" version="3.16"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">59</property>
<property name="value">59</property>
- <property name="step_increment">1</property>
- <property name="page_increment">30</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">30</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
<property name="upper">59</property>
<property name="value">59</property>
- <property name="step_increment">1</property>
- <property name="page_increment">30</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">30</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">23</property>
<property name="value">23</property>
- <property name="step_increment">1</property>
- <property name="page_increment">12</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">12</property>
</object>
<object class="GtkListStore" id="liststore1">
<columns>
@@ -49,27 +49,27 @@
</data>
</object>
<object class="GtkDialog" id="edit-location-window">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">5</property>
<property name="resizable">False</property>
- <property name="type_hint">dialog</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkButton" id="edit-location-cancel-button">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -81,10 +81,10 @@
<object class="GtkButton" id="edit-location-ok-button">
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -96,31 +96,31 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox34">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow12">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="vscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="shadow-type">none</property>
<child>
<object class="GtkImage" id="image30">
- <property name="can_focus">False</property>
- <property name="icon_name">missing-image</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">missing-image</property>
</object>
</child>
</object>
@@ -133,201 +133,172 @@
</packing>
</child>
<child>
+ <!-- n-columns=4 n-rows=4 -->
<object class="GtkGrid" id="table27">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">5</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkBox" id="edit-location-name-box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
<property name="width">3</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="edit-location-timezone-box">
+ <object class="GtkLabel" id="location-name-label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">_Location Name:</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="edit-location-latitude-entry">
+ <object class="GtkLabel" id="label243">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="invisible_char">•</property>
+ <property name="vexpand">True</property>
+ <property name="label" translatable="yes" comments="Languages that have a single word
that translates as either 'state' or 'province' should use that instead of 'region'.">Type a city, region, or
country name and then select a match from the pop-up.</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ <attribute name="scale" value="0.82999999999999996"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="edit-location-latitude-combo">
+ <object class="GtkLabel" id="label237">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore2</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">L_atitude:</property>
+ <property name="use-underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label240">
+ <object class="GtkLabel" id="label238">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">L_ongitude:</property>
+ <property name="use-underline">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">(optional)</property>
- <attributes>
- <attribute name="style" value="italic"/>
- </attributes>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label239">
+ <object class="GtkEntry" id="edit-location-latitude-entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">(optional)</property>
- <attributes>
- <attribute name="style" value="italic"/>
- </attributes>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible-char">•</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="edit-location-longitude-combo">
+ <object class="GtkComboBox" id="edit-location-latitude-combo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore1</property>
+ <property name="can-focus">False</property>
+ <property name="model">liststore2</property>
<child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="edit-location-longitude-entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="location-name-label">
+ <object class="GtkLabel" id="label240">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">(optional)</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Location Name:</property>
- <property name="use_underline">True</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">3</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label237">
+ <object class="GtkEntry" id="edit-location-longitude-entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">L_atitude:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">edit-location-latitude-entry</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible-char">•</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label238">
+ <object class="GtkComboBox" id="edit-location-longitude-combo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">L_ongitude:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">edit-location-longitude-entry</property>
+ <property name="can-focus">False</property>
+ <property name="model">liststore1</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">2</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label243">
+ <object class="GtkLabel" id="label239">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">(optional)</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Languages that have a single word
that translates as either 'state' or 'province' should use that instead of 'region'.">Type a city, region, or
country name and then select a match from the pop-up.</property>
<attributes>
<attribute name="style" value="italic"/>
- <attribute name="scale" value="0.82999999999999996"/>
</attributes>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="timezone-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Timezone:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">3</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
@@ -355,30 +326,30 @@
</action-widgets>
</object>
<object class="GtkDialog" id="prefs-window">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">5</property>
<property name="title" translatable="yes">Clock Preferences</property>
<property name="resizable">False</property>
- <property name="window_position">center</property>
- <property name="type_hint">dialog</property>
+ <property name="window-position">center</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkButton" id="prefs-help-button">
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -390,10 +361,10 @@
<object class="GtkButton" id="time-settings-button">
<property name="label" translatable="yes">Time _Settings</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -405,11 +376,11 @@
<object class="GtkButton" id="prefs-close-button">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -421,34 +392,34 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
+ <property name="can-focus">True</property>
+ <property name="border-width">5</property>
<child>
<object class="GtkBox" id="vbox17">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="clock-options">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label210">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Clock Format</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -462,19 +433,19 @@
<child>
<object class="GtkBox" id="hbox49">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
<property name="spacing">13</property>
<child>
<object class="GtkRadioButton" id="12hr_radio">
<property name="label" translatable="yes">_12 hour format</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -486,11 +457,11 @@
<object class="GtkRadioButton" id="24hr_radio">
<property name="label" translatable="yes">_24 hour format</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">12hr_radio</property>
</object>
<packing>
@@ -516,15 +487,15 @@
<child>
<object class="GtkBox" id="vbox29">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label229">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Panel Display</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -538,19 +509,19 @@
<child>
<object class="GtkBox" id="vbox30">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="date_check">
<property name="label" translatable="yes">Show the _date</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -562,11 +533,11 @@
<object class="GtkCheckButton" id="seconds_check">
<property name="label" translatable="yes">Show seco_nds</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -578,11 +549,11 @@
<object class="GtkCheckButton" id="weather_check">
<property name="label" translatable="yes">Show _weather</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -594,11 +565,11 @@
<object class="GtkCheckButton" id="temperature_check">
<property name="label" translatable="yes">Show _temperature</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -625,39 +596,39 @@
<child type="tab">
<object class="GtkLabel" id="label209">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">General</property>
</object>
<packing>
- <property name="tab_fill">False</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox24">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="hbox54">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow10">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
+ <property name="can-focus">True</property>
+ <property name="hscrollbar-policy">never</property>
+ <property name="vscrollbar-policy">never</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="cities_list">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="vexpand">True</property>
- <property name="headers_visible">False</property>
- <property name="hover_expand">True</property>
+ <property name="headers-visible">False</property>
+ <property name="hover-expand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
@@ -673,18 +644,18 @@
<child>
<object class="GtkButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
- <property name="layout_style">start</property>
+ <property name="layout-style">start</property>
<child>
<object class="GtkButton" id="prefs-locations-add-button">
<property name="label" translatable="yes">_Add</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -696,10 +667,10 @@
<object class="GtkButton" id="prefs-locations-edit-button">
<property name="label" translatable="yes">_Edit</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -711,10 +682,10 @@
<object class="GtkButton" id="prefs-locations-remove-button">
<property name="label" translatable="yes">_Remove</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -744,33 +715,33 @@
<child type="tab">
<object class="GtkLabel" id="label220">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Locations</property>
</object>
<packing>
<property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox27">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">12</property>
<property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="vbox28">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label224">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Display</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -782,108 +753,121 @@
</packing>
</child>
<child>
+ <!-- n-columns=3 n-rows=4 -->
<object class="GtkGrid" id="table25">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkComboBox" id="visibility_combo">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label232">
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">_Visibility unit:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">visibility_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">visibility_combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="pressure_combo">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label231">
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">_Pressure unit:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">pressure_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">pressure_combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="wind_speed_combo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="temperature_combo">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label227">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">_Temperature unit:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">temperature_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">temperature_combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label228">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">_Wind speed unit:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">wind_speed_combo</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">wind_speed_combo</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -906,12 +890,12 @@
<child type="tab">
<object class="GtkLabel" id="label223">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Weather</property>
</object>
<packing>
<property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="tab-fill">False</property>
</packing>
</child>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
