From b97c0d6777048d69d97a9f8bcd0e6f66434fa351 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Tue, 10 Feb 2009 14:47:03 +0000 Subject: [PATCH] Set font and size toolbuttons font size to large. pmo-trunk-r7449 --- src/hildon2/modest-msg-edit-window.c | 12 ++++++++---- src/hildon2/ui/modest-msg-edit-window-ui.xml | 4 ++-- src/widgets/modest-msg-edit-window-ui.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 27fbcc3..de57534 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -1335,6 +1335,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) /* Toolbar */ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); + gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE); gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER); hildon_window_add_toolbar (HILDON_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar)); @@ -1345,6 +1346,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) /* font color */ priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ()); priv->font_color_button = hildon_color_button_new (); + gtk_widget_set_size_request (priv->font_color_button, -1, 48); GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS); GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS); gtk_container_add (GTK_CONTAINER (priv->font_color_toolitem), priv->font_color_button); @@ -1367,6 +1369,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) size_text,"", NULL); gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup); g_free (markup); + hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont"); gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->size_tool_button_label); sizes_menu = gtk_menu_new (); priv->size_items_group = NULL; @@ -1395,8 +1398,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), sizes_menu); g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL); gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE); menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item)); priv->font_size_toolitem = tool_item; @@ -1406,6 +1409,7 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) markup = g_strconcat ("Tt", NULL); gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup); g_free(markup); + hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont"); gtk_tool_button_set_label_widget (GTK_TOOL_BUTTON (tool_item), priv->font_tool_button_label); fonts_menu = gtk_menu_new (); priv->font_items_group = NULL; @@ -1438,8 +1442,8 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), fonts_menu); g_signal_connect (G_OBJECT (tool_item), "clicked", G_CALLBACK (menu_tool_button_clicked_popup), NULL); gtk_toolbar_insert (GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE); menu_tool_button_dont_expand (GTK_MENU_TOOL_BUTTON (tool_item)); priv->font_face_toolitem = tool_item; diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml index 8a8f8ff..e455f95 100644 --- a/src/hildon2/ui/modest-msg-edit-window-ui.xml +++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml @@ -79,12 +79,12 @@ - - + + diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h index 4aa9895..1443eb8 100644 --- a/src/widgets/modest-msg-edit-window-ui.h +++ b/src/widgets/modest-msg-edit-window-ui.h @@ -101,7 +101,7 @@ static const GtkActionEntry modest_msg_edit_action_entries [] = { { "CloseWindowShortcut", NULL, NULL, "Escape", NULL, NULL }, /* TOOLBAR ACTIONS */ - { "ToolbarSend", MODEST_STOCK_MAIL_SEND, N_("qgn_toolb_messagin_send"), "Return", NULL, G_CALLBACK (modest_ui_actions_on_send) }, + { "ToolbarSend", MODEST_TOOLBAR_ICON_MAIL_SEND, MODEST_TOOLBAR_ICON_MAIL_SEND, "Return", NULL, G_CALLBACK (modest_ui_actions_on_send) }, #ifdef MODEST_TOOLKIT_HILDON2 /* Find in page. This is a normal menu option in Hildon2, and a checkbox in the others */ -- 1.7.9.5