X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=031db11c86158cd07ddf1607f7112e4707057649;hp=cae4d0a856e7df3315afa822b0b55df6fbe519fb;hb=b05259100d320623438bf679794dbffb9d132748;hpb=398619d3a47d8221eececa6c25a32d58b22e8013

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index cae4d0a..031db11 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;
+
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
 
-	toggle = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/FindInMessageMenu"));
-	gtk_toggle_action_set_active (toggle, FALSE);
+	hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->find_toolbar_button), FALSE);
 }
 
 gboolean 
@@ -3944,6 +3944,16 @@ on_bcc_button_toggled (HildonCheckButton *button,
 					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)
 {
@@ -3961,10 +3971,10 @@ setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 		     group, NULL);
 	add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_undo"),
 		     G_CALLBACK (modest_ui_actions_on_undo),
-		     group, NULL);
+		     group, G_CALLBACK (modest_ui_dimming_rules_on_undo));
 
 	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),
@@ -3972,7 +3982,7 @@ setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 	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),
@@ -3982,15 +3992,21 @@ setup_menu (ModestMsgEditWindow *self, ModestDimmingRulesGroup *group)
 
 	add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_editor_attach_inlineimage"),
 		     G_CALLBACK (modest_ui_actions_on_insert_image),
-		     group, NULL);
+		     group, G_CALLBACK (modest_ui_dimming_rules_on_set_style));
 	add_to_menu (self, HILDON_APP_MENU (priv->app_menu), _("mcen_me_inbox_remove_attachments"),
 		     G_CALLBACK (modest_ui_actions_on_remove_attachments),
-		     group, NULL);
+		     group, G_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment));
 	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));