From: Jose Dapena Paz Date: Tue, 17 Nov 2009 16:58:16 +0000 (+0100) Subject: Global settings layout with vertical captions in gtk X-Git-Tag: jdapena-ppa-3.90.4-modest0~244 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=f1de0a0bda7f91db62329d11e2df31bea2ea68b4;p=modest Global settings layout with vertical captions in gtk --- diff --git a/src/hildon2/modest-hildon2-global-settings-dialog.c b/src/hildon2/modest-hildon2-global-settings-dialog.c index 901175f..ca02740 100644 --- a/src/hildon2/modest-hildon2-global-settings-dialog.c +++ b/src/hildon2/modest-hildon2-global-settings-dialog.c @@ -226,9 +226,9 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self) if (GTK_IS_COMBO_BOX (ppriv->default_account_selector)) { GtkWidget *caption; - caption = modest_maemo_utils_create_captioned (title_size_group, NULL, - _("mcen_ti_default_account"), FALSE, - ppriv->default_account_selector); + caption = modest_maemo_utils_create_vcaptioned (title_size_group, + _("mcen_ti_default_account"), FALSE, + ppriv->default_account_selector); gtk_widget_show (caption); gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0); @@ -249,9 +249,9 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self) ppriv->msg_format_list, g_int_equal); if (GTK_IS_COMBO_BOX (ppriv->msg_format)) { GtkWidget *caption; - caption = modest_maemo_utils_create_captioned (title_size_group, NULL, - _("mcen_fi_options_messageformat"), FALSE, - ppriv->msg_format); + caption = modest_maemo_utils_create_vcaptioned (title_size_group, + _("mcen_fi_options_messageformat"), FALSE, + ppriv->msg_format); gtk_widget_show (caption); gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0); } else { @@ -283,9 +283,9 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self) ppriv->connect_via_list, g_int_equal); if (GTK_IS_COMBO_BOX (ppriv->connect_via)) { GtkWidget *caption; - caption = modest_maemo_utils_create_captioned (title_size_group, NULL, - _("mcen_fi_options_connectiontype"), FALSE, - ppriv->connect_via); + caption = modest_maemo_utils_create_vcaptioned (title_size_group, + _("mcen_fi_options_connectiontype"), FALSE, + ppriv->connect_via); gtk_widget_show (caption); gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0); } else { @@ -305,9 +305,9 @@ create_updating_page (ModestHildon2GlobalSettingsDialog *self) ppriv->update_interval_list, g_int_equal); if (GTK_IS_COMBO_BOX (ppriv->update_interval)) { GtkWidget *caption; - caption = modest_maemo_utils_create_captioned (title_size_group, NULL, - _("mcen_fi_options_updateinterval"), FALSE, - ppriv->update_interval); + caption = modest_maemo_utils_create_vcaptioned (title_size_group, + _("mcen_fi_options_updateinterval"), FALSE, + ppriv->update_interval); gtk_widget_show (caption); gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, 0); } else { diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c index 02e110e..939a199 100644 --- a/src/hildon2/modest-maemo-utils.c +++ b/src/hildon2/modest-maemo-utils.c @@ -296,6 +296,19 @@ modest_maemo_utils_create_captioned (GtkSizeGroup *title_size_group, 0); } +GtkWidget * +modest_maemo_utils_create_vcaptioned (GtkSizeGroup *size_group, + const gchar *title, + gboolean use_markup, + GtkWidget *control) +{ + return modest_maemo_utils_create_vcaptioned_with_size_type (size_group, + title, + use_markup, + control, + 0); +} + /** * modest_maemo_utils_create_captioned_with_size_type: * @title_size_group: a #GtkSizeGroup @@ -352,6 +365,47 @@ modest_maemo_utils_create_captioned_with_size_type (GtkSizeGroup *title_size_ return box; } +GtkWidget * +modest_maemo_utils_create_vcaptioned_with_size_type (GtkSizeGroup *size_group, + const gchar *title, + gboolean use_markup, + GtkWidget *control, + HildonSizeType size_type) +{ + GtkWidget *label; + GtkWidget *align; + GtkWidget *box; + + if (use_markup) { + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), title); + } else { + label = gtk_label_new (title); + } + align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE); + + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + hildon_gtk_widget_set_theme_size (label, HILDON_SIZE_FINGER_HEIGHT); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_show (label); + gtk_widget_show (align); + box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (align), label); + gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0); + if (size_group) { + gtk_size_group_add_widget (size_group, label); + gtk_size_group_add_widget (size_group, control); + } + + hildon_gtk_widget_set_theme_size (control, size_type); + + g_object_set_data (G_OBJECT (box), CAPTIONED_LABEL_CHILD, label); + + return box; +} + /** * modest_maemo_utils_captioned_set_label: * @captioned: a #GtkWidget built as captioned diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h index 00667a5..de7fd49 100644 --- a/src/hildon2/modest-maemo-utils.h +++ b/src/hildon2/modest-maemo-utils.h @@ -110,6 +110,10 @@ GtkWidget *modest_maemo_utils_create_captioned (GtkSizeGroup *title_size_grou const gchar *title, gboolean use_markup, GtkWidget *control); +GtkWidget *modest_maemo_utils_create_vcaptioned (GtkSizeGroup *size_group, + const gchar *title, + gboolean use_markup, + GtkWidget *control); GtkWidget *modest_maemo_utils_create_captioned_with_size_type (GtkSizeGroup *title_size_group, GtkSizeGroup *value_size_group, @@ -118,6 +122,12 @@ GtkWidget *modest_maemo_utils_create_captioned_with_size_type (GtkSizeGroup * GtkWidget *control, HildonSizeType size_type); +GtkWidget *modest_maemo_utils_create_vcaptioned_with_size_type (GtkSizeGroup *size_group, + const gchar *title, + gboolean use_markup, + GtkWidget *control, + HildonSizeType size_type); + void modest_maemo_utils_captioned_set_label (GtkWidget *captioned, const gchar *new_label, gboolean use_markup);