[gnome-control-center/wip/datetime-redesign: 9/13] datetime: Implement new design for the time subdialog
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/datetime-redesign: 9/13] datetime: Implement new design for the time subdialog
- Date: Mon, 19 Aug 2013 11:13:15 +0000 (UTC)
commit 940769e9ff8f9bea145fdaf1e51ce403d5f18412
Author: Kalev Lember <kalevlember gmail com>
Date: Sat Aug 3 09:48:33 2013 +0200
datetime: Implement new design for the time subdialog
https://bugzilla.gnome.org/show_bug.cgi?id=694985
panels/datetime/cc-datetime-panel.c | 314 +++++++++++++++++++--------
panels/datetime/datetime.ui | 402 +++++++++++++++--------------------
2 files changed, 396 insertions(+), 320 deletions(-)
---
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index 079a736..f020ded 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -83,6 +83,8 @@ struct _CcDateTimePanelPrivate
GSettings *settings;
GDesktopClockFormat clock_format;
gboolean ampm_available;
+ GtkWidget *am_label;
+ GtkWidget *pm_label;
GnomeWallClock *clock_tracker;
@@ -93,6 +95,8 @@ struct _CcDateTimePanelPrivate
};
static void update_time (CcDateTimePanel *self);
+static void change_time (CcDateTimePanel *self);
+
static void
cc_date_time_panel_get_property (GObject *object,
@@ -229,47 +233,93 @@ clock_settings_changed_cb (GSettings *settings,
g_signal_handlers_unblock_by_func (format_combo, change_clock_settings, panel);
}
+static gboolean
+am_pm_button_clicked (GtkWidget *button,
+ CcDateTimePanel *self)
+{
+ CcDateTimePanelPrivate *priv = self->priv;
+ GtkWidget *stack;
+ GtkWidget *visible_child;
+
+ stack = W ("am_pm_stack");
+
+ visible_child = gtk_stack_get_visible_child (GTK_STACK (stack));
+ if (visible_child == priv->am_label)
+ gtk_stack_set_visible_child (GTK_STACK (stack), priv->pm_label);
+ else
+ gtk_stack_set_visible_child (GTK_STACK (stack), priv->am_label);
+
+ change_time (self);
+
+ return TRUE;
+}
+
+/* Update the widgets based on the system time */
static void
update_time (CcDateTimePanel *self)
{
CcDateTimePanelPrivate *priv = self->priv;
+ GtkWidget *h_spinbutton;
+ GtkWidget *m_spinbutton;
+ GtkWidget *am_pm_button;
char *label;
- char *am_pm_widgets[] = {"ampm_up_button", "ampm_down_button", "ampm_label" };
- guint i;
+ gint hour;
+ gint minute;
gboolean use_ampm;
+ h_spinbutton = W("h_spinbutton");
+ m_spinbutton = W("m_spinbutton");
+ am_pm_button = W("am_pm_button");
+
+ g_signal_handlers_block_by_func (h_spinbutton, change_time, self);
+ g_signal_handlers_block_by_func (m_spinbutton, change_time, self);
+ g_signal_handlers_block_by_func (am_pm_button, am_pm_button_clicked, self);
+
if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H && priv->ampm_available)
use_ampm = TRUE;
else
use_ampm = FALSE;
+ hour = g_date_time_get_hour (priv->date);
+ minute = g_date_time_get_minute (priv->date);
+
if (!use_ampm)
{
- /* Update the hours label */
- label = g_date_time_format (priv->date, "%H");
- gtk_label_set_text (GTK_LABEL (W("hours_label")), label);
- g_free (label);
+ /* Update the hours spinbutton */
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (h_spinbutton), 0, 23);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (h_spinbutton), hour);
}
else
{
- /* Update the hours label */
- label = g_date_time_format (priv->date, "%I");
- gtk_label_set_text (GTK_LABEL (W("hours_label")), label);
- g_free (label);
-
- /* Set AM/PM */
- label = g_date_time_format (priv->date, "%p");
- gtk_label_set_text (GTK_LABEL (W("ampm_label")), label);
- g_free (label);
+ GtkWidget *am_pm_stack;
+ gboolean is_pm_time;
+
+ is_pm_time = (hour >= 12);
+
+ /* Update the AM/PM button */
+ am_pm_stack = W ("am_pm_stack");
+ if (is_pm_time)
+ gtk_stack_set_visible_child (GTK_STACK (am_pm_stack), priv->pm_label);
+ else
+ gtk_stack_set_visible_child (GTK_STACK (am_pm_stack), priv->am_label);
+
+ /* Update the hours spinbutton */
+ if (is_pm_time)
+ hour -= 12;
+ if (hour == 0)
+ hour = 12;
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (h_spinbutton), hour);
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (h_spinbutton), 1, 12);
}
- for (i = 0; i < G_N_ELEMENTS (am_pm_widgets); i++)
- gtk_widget_set_visible (W(am_pm_widgets[i]), use_ampm);
+ gtk_widget_set_visible (am_pm_button, use_ampm);
- /* Update the minutes label */
- label = g_date_time_format (priv->date, "%M");
- gtk_label_set_text (GTK_LABEL (W("minutes_label")), label);
- g_free (label);
+ /* Update the minutes spinbutton */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (m_spinbutton), minute);
+
+ g_signal_handlers_unblock_by_func (h_spinbutton, change_time, self);
+ g_signal_handlers_unblock_by_func (m_spinbutton, change_time, self);
+ g_signal_handlers_unblock_by_func (am_pm_button, am_pm_button_clicked, self);
/* Update the time on the listbow row */
if (use_ampm)
@@ -756,40 +806,41 @@ on_clock_changed (GnomeWallClock *clock,
}
static void
-change_time (GtkButton *button,
- CcDateTimePanel *panel)
+change_time (CcDateTimePanel *panel)
{
CcDateTimePanelPrivate *priv = panel->priv;
- const gchar *widget_name;
- gint direction;
+ guint h, m;
GDateTime *old_date;
old_date = priv->date;
- widget_name = gtk_buildable_get_name (GTK_BUILDABLE (button));
+ h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("h_spinbutton")));
+ m = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (W ("m_spinbutton")));
- if (strstr (widget_name, "up"))
- direction = 1;
- else
- direction = -1;
-
- if (widget_name[0] == 'h')
- {
- priv->date = g_date_time_add_hours (old_date, direction);
- }
- else if (widget_name[0] == 'm')
- {
- priv->date = g_date_time_add_minutes (old_date, direction);
- }
- else
+ if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H && priv->ampm_available)
{
- int hour;
- hour = g_date_time_get_hour (old_date);
- if (hour >= 12)
- priv->date = g_date_time_add_hours (old_date, -12);
+ gboolean is_pm_time;
+ GtkWidget *am_pm_stack;
+ GtkWidget *visible_child;
+
+ am_pm_stack = W ("am_pm_stack");
+ visible_child = gtk_stack_get_visible_child (GTK_STACK (am_pm_stack));
+ if (visible_child == priv->pm_label)
+ is_pm_time = TRUE;
else
- priv->date = g_date_time_add_hours (old_date, 12);
+ is_pm_time = FALSE;
+
+ if (h == 12)
+ h = 0;
+ if (is_pm_time)
+ h += 12;
}
+
+ priv->date = g_date_time_new_local (g_date_time_get_year (old_date),
+ g_date_time_get_month (old_date),
+ g_date_time_get_day_of_month (old_date),
+ h, m,
+ g_date_time_get_second (old_date));
g_date_time_unref (old_date);
update_time (panel);
@@ -929,40 +980,6 @@ on_timedated_properties_changed (GDBusProxy *proxy,
}
static void
-reorder_date_widget (DateEndianess endianess,
- CcDateTimePanelPrivate *priv)
-{
- GtkWidget *month, *day, *year;
- GtkBox *box;
-
- if (endianess == DATE_ENDIANESS_MIDDLE)
- return;
-
- month = W ("month-combobox");
- day = W ("day-spinbutton");
- year = W("year-spinbutton");
-
- box = GTK_BOX (W("table1"));
-
- switch (endianess) {
- case DATE_ENDIANESS_LITTLE:
- gtk_box_reorder_child (box, month, 0);
- gtk_box_reorder_child (box, day, 0);
- gtk_box_reorder_child (box, year, -1);
- break;
- case DATE_ENDIANESS_BIG:
- gtk_box_reorder_child (box, month, 0);
- gtk_box_reorder_child (box, year, 0);
- gtk_box_reorder_child (box, day, -1);
- break;
- case DATE_ENDIANESS_MIDDLE:
- /* Let's please GCC */
- g_assert_not_reached ();
- break;
- }
-}
-
-static void
update_header (GtkListBoxRow *row,
GtkListBoxRow *before,
gpointer user_data)
@@ -1037,6 +1054,50 @@ setup_main_listview (CcDateTimePanel *self)
G_CALLBACK (list_box_row_activated), self);
}
+static gboolean
+format_minutes_combobox (GtkSpinButton *spin,
+ gpointer data)
+{
+ GtkAdjustment *adjustment;
+ char *text;
+ int value;
+
+ adjustment = gtk_spin_button_get_adjustment (spin);
+ value = (int)gtk_adjustment_get_value (adjustment);
+ text = g_strdup_printf ("%02d", value);
+ gtk_entry_set_text (GTK_ENTRY (spin), text);
+ g_free (text);
+
+ return TRUE;
+}
+
+static gboolean
+format_hours_combobox (GtkSpinButton *spin,
+ CcDateTimePanel *panel)
+{
+ CcDateTimePanelPrivate *priv = panel->priv;
+ GtkAdjustment *adjustment;
+ char *text;
+ int hour;
+ gboolean use_ampm;
+
+ if (priv->clock_format == G_DESKTOP_CLOCK_FORMAT_12H && priv->ampm_available)
+ use_ampm = TRUE;
+ else
+ use_ampm = FALSE;
+
+ adjustment = gtk_spin_button_get_adjustment (spin);
+ hour = (int)gtk_adjustment_get_value (adjustment);
+ if (use_ampm)
+ text = g_strdup_printf ("%d", hour);
+ else
+ text = g_strdup_printf ("%02d", hour);
+ gtk_entry_set_text (GTK_ENTRY (spin), text);
+ g_free (text);
+
+ return TRUE;
+}
+
static void
setup_timezone_dialog (CcDateTimePanel *self)
{
@@ -1053,12 +1114,70 @@ setup_timezone_dialog (CcDateTimePanel *self)
}
static void
+setup_am_pm_button (CcDateTimePanel *self)
+{
+ CcDateTimePanelPrivate *priv = self->priv;
+ GtkCssProvider *provider;
+ GtkStyleContext *context;
+ GtkWidget *am_pm_button;
+ GtkWidget *stack;
+ GDateTime *date;
+ char *text;
+
+ date = g_date_time_new_utc (1, 1, 1, 0, 0, 0);
+ text = g_date_time_format (date, "%p");
+ priv->am_label = gtk_label_new (text);
+ g_free (text);
+ g_date_time_unref (date);
+
+ date = g_date_time_new_utc (1, 1, 1, 12, 0, 0);
+ text = g_date_time_format (date, "%p");
+ priv->pm_label = gtk_label_new (text);
+ g_free (text);
+ g_date_time_unref (date);
+
+ stack = W ("am_pm_stack");
+ gtk_container_add (GTK_CONTAINER (stack), priv->am_label);
+ gtk_container_add (GTK_CONTAINER (stack), priv->pm_label);
+ gtk_widget_show_all (stack);
+
+ am_pm_button = W ("am_pm_button");
+ g_signal_connect (am_pm_button, "clicked",
+ G_CALLBACK (am_pm_button_clicked), self);
+
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
+ ".gnome-control-center-ampm-toggle-button {\n"
+ " font-size: 18px;\n"
+ "}", -1, NULL);
+ context = gtk_widget_get_style_context (am_pm_button);
+ gtk_style_context_add_provider (context,
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+}
+
+static void
setup_datetime_dialog (CcDateTimePanel *self)
{
CcDateTimePanelPrivate *priv = self->priv;
+ GtkCssProvider *provider;
+ GtkStyleContext *context;
GtkWidget *button;
GtkWidget *dialog;
+ setup_am_pm_button (self);
+
+ /* Big time buttons */
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
+ ".gnome-control-center-datetime-setup-time {\n"
+ " font-size: 32px;\n"
+ "}", -1, NULL);
+ context = gtk_widget_get_style_context (GTK_WIDGET (W ("time_grid")));
+ gtk_style_context_add_provider (context,
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
button = W ("datetime-close-button");
dialog = W ("datetime-dialog");
g_signal_connect_swapped (button, "clicked",
@@ -1071,17 +1190,14 @@ static void
cc_date_time_panel_init (CcDateTimePanel *self)
{
CcDateTimePanelPrivate *priv;
- char *buttons[] = { "hour_up_button", "hour_down_button", "min_up_button",
- "min_down_button", "ampm_up_button", "ampm_down_button" };
GtkWidget *widget;
GtkAdjustment *adjustment;
GError *err = NULL;
GtkTreeModelFilter *city_modelfilter;
GtkTreeModelSort *city_modelsort;
const char *ampm;
- guint i, num_days;
+ guint num_days;
int ret;
- DateEndianess endianess;
GError *error;
priv = self->priv = DATE_TIME_PANEL_PRIVATE (self);
@@ -1126,27 +1242,19 @@ cc_date_time_panel_init (CcDateTimePanel *self)
g_signal_connect (W("network_time_switch"), "notify::active",
G_CALLBACK (change_ntp), self);
- /* set up time editing widgets */
- for (i = 0; i < G_N_ELEMENTS (buttons); i++)
- {
- g_signal_connect (W(buttons[i]), "clicked",
- G_CALLBACK (change_time), self);
- }
-
/* set up date editing widgets */
priv->date = g_date_time_new_now_local ();
- endianess = date_endian_get_default (FALSE);
- reorder_date_widget (endianess, priv);
/* Force the direction for the time, so that the time
* is presented correctly for RTL languages */
- gtk_widget_set_direction (W("table2"), GTK_TEXT_DIR_LTR);
+ gtk_widget_set_direction (W("time_grid"), GTK_TEXT_DIR_LTR);
gtk_combo_box_set_active (GTK_COMBO_BOX (W ("month-combobox")),
g_date_time_get_month (priv->date) - 1);
g_signal_connect (G_OBJECT (W("month-combobox")), "changed",
G_CALLBACK (month_year_changed), self);
+ /* Day */
num_days = g_date_get_days_in_month (g_date_time_get_month (priv->date),
g_date_time_get_year (priv->date));
adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_day_of_month (priv->date), 1,
@@ -1156,6 +1264,7 @@ cc_date_time_panel_init (CcDateTimePanel *self)
g_signal_connect (G_OBJECT (W("day-spinbutton")), "value-changed",
G_CALLBACK (day_changed), self);
+ /* Year */
adjustment = (GtkAdjustment*) gtk_adjustment_new (g_date_time_get_year (priv->date),
G_MINDOUBLE, G_MAXDOUBLE, 1,
10, 1);
@@ -1205,8 +1314,27 @@ cc_date_time_panel_init (CcDateTimePanel *self)
g_signal_connect (W("format_combobox"), "notify::active-id",
G_CALLBACK (change_clock_settings), self);
+ g_signal_connect (W("h_spinbutton"), "output",
+ G_CALLBACK (format_hours_combobox), self);
+ g_signal_connect (W("m_spinbutton"), "output",
+ G_CALLBACK (format_minutes_combobox), self);
+
+ gtk_spin_button_set_increments (GTK_SPIN_BUTTON (W("h_spinbutton")), 1, 0);
+ gtk_spin_button_set_increments (GTK_SPIN_BUTTON (W("m_spinbutton")), 1, 0);
+
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (W("h_spinbutton")), 0, 23);
+ gtk_spin_button_set_range (GTK_SPIN_BUTTON (W("m_spinbutton")), 0, 59);
+
update_time (self);
+ /* Hour */
+ g_signal_connect_swapped (W("h_spinbutton"), "value-changed",
+ G_CALLBACK (change_time), self);
+
+ /* Minute */
+ g_signal_connect_swapped (W("m_spinbutton"), "value-changed",
+ G_CALLBACK (change_time), self);
+
priv->locations = (GtkTreeModel*) gtk_builder_get_object (priv->builder,
"region-liststore");
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index 96ee2dd..ff8383b 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -117,271 +117,194 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="time-box">
+ <object class="GtkBox" id="time-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="margin_top">6</property>
+ <property name="margin_bottom">6</property>
+ <property name="spacing">24</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkGrid" id="time_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0</property>
+ <property name="halign">start</property>
+ <property name="margin_left">12</property>
+ <property name="margin_right">12</property>
+ <property name="margin_top">12</property>
+ <property name="margin_bottom">12</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">6</property>
+ <style>
+ <class name="gnome-control-center-datetime-setup-time"/>
+ </style>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkSpinButton" id="h_spinbutton">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" comments="Translator: this is the
separator between hours and minutes, like in HH:MM">:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.5"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel" id="hours_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">16</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.5"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="minutes_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">45</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.5"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="hour_up_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="hour_up_accessible">
- <property name="accessible-description" translatable="yes">Set the time one hour
ahead.</property>
- </object>
- </child>
- <child>
- <object class="GtkArrow" id="arrow1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="hour_down_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="hour_down_accessible">
- <property name="accessible-description" translatable="yes">Set the time one hour
back.</property>
- </object>
- </child>
- <child>
- <object class="GtkArrow" id="arrow2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</property>
- </object>
- </child>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property name="xalign">0.5</property>
+ <property name="input_purpose">number</property>
+ <property name="orientation">vertical</property>
+ <property name="numeric">True</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="hour-accessible">
+ <property name="accessible-description" translatable="yes">Hour</property>
</object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="min_up_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="min_up_accessible">
- <property name="accessible-description" translatable="yes">Set the time one
minute ahead.</property>
- </object>
- </child>
- <child>
- <object class="GtkArrow" id="arrow4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="Translator: this is the separator
between hours and minutes, like in HH∶MM">∶</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="m_spinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="invisible_char">●</property>
+ <property name="width_chars">2</property>
+ <property name="xalign">0.5</property>
+ <property name="input_purpose">number</property>
+ <property name="orientation">vertical</property>
+ <property name="numeric">True</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="minute-accessible">
+ <property name="accessible-description" translatable="yes">Minute</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="am_pm_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">6</property>
<child>
- <object class="GtkButton" id="min_down_button">
+ <object class="GtkButton" id="am_pm_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="relief">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="min_down_accessible">
- <property name="accessible-description" translatable="yes">Set the time one
minute back.</property>
- </object>
- </child>
- <child>
- <object class="GtkArrow" id="arrow3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">down</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="ampm_label">
- <property name="can_focus">False</property>
- <property name="label">AM</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="scale" value="2.5"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ampm_up_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
+ <style>
+ <class name="gnome-control-center-ampm-toggle-button"/>
+ </style>
<child internal-child="accessible">
<object class="AtkObject" id="ampm_up_accessible">
<property name="accessible-description" translatable="yes">Switch between AM and
PM.</property>
</object>
</child>
<child>
- <object class="GtkArrow" id="arrow5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="arrow_type">up</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="ampm_down_button">
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ampm_down_accessible">
- <property name="accessible-description" translatable="yes">Switch between AM and
PM.</property>
- </object>
- </child>
- <child>
- <object class="GtkArrow" id="arrow6">
+ <object class="GtkStack" id="am_pm_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="arrow_type">down</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">12</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="table1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="valign">center</property>
+ <property name="row_spacing">9</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
<child>
- <object class="GtkComboBox" id="month-combobox">
+ <object class="GtkLabel" id="day_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">month-liststore</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="month-accessible">
- <property name="accessible-description" translatable="yes">Month</property>
- </object>
- </child>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Day</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="month_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_focus">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Month</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="year_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Year</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -399,9 +322,34 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="month-combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">month-liststore</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="month-accessible">
+ <property name="accessible-description" translatable="yes">Month</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -419,16 +367,16 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">12</property>
<property name="position">1</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
