- add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new folder"),
- G_CALLBACK (modest_ui_actions_on_new_folder));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_user_renamefolder"),
- G_CALLBACK (set_rename_edit_mode));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: move folder"),
- G_CALLBACK (set_moveto_edit_mode));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: delete folder"),
- G_CALLBACK (set_delete_edit_mode));
-
- /* new message */
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
- G_CALLBACK (modest_ui_actions_on_new_msg));
-
- /* send receive actions should be only one visible always */
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
- G_CALLBACK (modest_ui_actions_on_send_receive));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"),
- G_CALLBACK (modest_ui_actions_cancel_send));
-
- /* Settings menu buttons */
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new account"),
- G_CALLBACK (modest_ui_actions_on_new_account));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: edit accounts"),
- G_CALLBACK (modest_ui_actions_on_accounts));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_options"),
- G_CALLBACK (modest_ui_actions_on_settings));
- add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_globalsmtpservers"),
- G_CALLBACK (modest_ui_actions_on_smtp_servers));
-
- hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self),
- HILDON_APP_MENU (app_menu));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_new_folder),
+ NULL);
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
+ APP_MENU_CALLBACK (set_rename_edit_mode),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
+ APP_MENU_CALLBACK (set_moveto_edit_mode),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL,
+ APP_MENU_CALLBACK (set_delete_edit_mode),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
+
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
+ APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+ dngettext(GETTEXT_PACKAGE,
+ "mcen_me_edit_account",
+ "mcen_me_edit_accounts",
+ 1),
+ NULL, APP_MENU_CALLBACK (edit_account),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));