X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=70bade850e06f1d293c1acda75b879adec90bf63;hp=481ef1ee00a5a72ade2225d7ab1e4cd52f0b6419;hb=ad4a6b87edebd6ef1974d67cea855f5a9fdd39ac;hpb=a64425d29d0b4fface1637f04be59974b2b301ce

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 481ef1e..70bade8 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -308,6 +308,7 @@ struct _ModestMsgEditWindowPrivate {
 	GtkWidget   *app_menu;
 	GtkWidget   *cc_button;
 	GtkWidget   *bcc_button;
+	GtkWidget   *find_toolbar_button;
 };
 
 #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -3450,12 +3451,11 @@ static void
 modest_msg_edit_window_find_toolbar_close (GtkWidget *widget,
 					   ModestMsgEditWindow *window)
 {
-	GtkToggleAction *toggle;
-	ModestWindowPrivate *parent_priv;
-	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+	ModestMsgEditWindowPrivate *priv;
 
-	toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
-	gtk_toggle_action_set_active (toggle, FALSE);
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+
+	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), FALSE);
 }
 
 gboolean 
@@ -3924,6 +3924,36 @@ static void add_to_menu (ModestMsgEditWindow *self,
 	add_button_to_menu (self, menu, GTK_BUTTON (button), group, dimming_callback);
 }
 
+static void
+on_cc_button_toggled (HildonCheckButton *button,
+		      ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+	modest_msg_edit_window_show_cc (MODEST_MSG_EDIT_WINDOW (window),
+					hildon_check_button_get_active (button));
+}
+
+static void
+on_bcc_button_toggled (HildonCheckButton *button,
+		      ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+	modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
+					hildon_check_button_get_active (button));
+}
+
+static void
+on_find_toolbar_button_toggled (HildonCheckButton *button,
+				ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+	modest_msg_edit_window_toggle_find_toolbar (MODEST_MSG_EDIT_WINDOW (window),
+						    hildon_check_button_get_active (button));
+
+}
+
 static void 
 setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 {
@@ -3944,17 +3974,21 @@ setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 		     group, NULL);
 
 	priv->cc_button = hildon_check_button_new (0);
-	gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("TODO: Show CC"));
+	gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
 	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
 					FALSE);
 	add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->cc_button),
 			    group, NULL);
+	g_signal_connect (G_OBJECT (priv->cc_button), "toggled",
+			  G_CALLBACK (on_cc_button_toggled), (gpointer) self);
 	priv->bcc_button = hildon_check_button_new (0);
-	gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("TODO: Show BCC"));
+	gtk_button_set_label (GTK_BUTTON (priv->bcc_button), _("mcen_me_editor_showbcc"));
 	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->bcc_button),
 					FALSE);
 	add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->bcc_button),
 			    group, NULL);
+	g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
+			  G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
 
 	add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_attach_inlineimage"),
 		     G_CALLBACK (modest_ui_actions_on_insert_image),
@@ -3965,8 +3999,14 @@ setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 	add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("TODO: Message settings..."),
 		     G_CALLBACK (on_message_settings),
 		     group, NULL);
-
-	/* TODO: find in toolbar check button */
+	priv->find_toolbar_button = hildon_check_button_new (0);
+	gtk_button_set_label (GTK_BUTTON (priv->find_toolbar_button), _("mcen_me_viewer_find"));
+	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button),
+					FALSE);
+	add_button_to_menu (self, HILDON_APP_MENU (priv->app_menu), GTK_BUTTON (priv->find_toolbar_button),
+			    group, NULL);
+	g_signal_connect (G_OBJECT (priv->find_toolbar_button), "toggled",
+			  G_CALLBACK (on_find_toolbar_button_toggled), (gpointer) self);
 
 	hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
 					       HILDON_APP_MENU (priv->app_menu));