From df2c6c922a5700d261717a1e11a33a04ff5f98a6 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 17 Aug 2000 17:53:36 +0000 Subject: Move menu items around, fix some GUI bits. svn path=/trunk/; revision=4867 --- mail/ChangeLog | 24 +++++++++++ mail/folder-browser-factory.c | 95 +++++++++++++++++++++++++++---------------- mail/local-config.glade | 2 +- mail/mail-config-gui.c | 12 ++++-- mail/mail-vfolder.c | 5 ++- mail/main.c | 2 + 6 files changed, 98 insertions(+), 42 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 1cbdce64c8..19ffe49f04 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,27 @@ +2000-08-17 Ettore Perazzoli + + * mail-vfolder.c (vfolder_gui_add_rule): Use stock OK/Cancel + buttons and add i18n support. + + * folder-browser-factory.c (control_activate): Changed menu item + label from "Mark all messages seen" to "Mark All Messages as + Read". Changed capitalization of some other menu items. + (control_activate): Put the message- and folder- related menu + items in new "Message" and "Folder" subtrees which are created in + the `' item created by the shell. + (control_deactivate): Updated accordingly. + (control_activate): Put the filter and vfolder editors, the mail + configuration and the "forget password" command into the + "settings" menu. + (control_deactivate): Updated accordingly. + + * mail-config-gui.c (transport_page_new): Add translation mark. + (service_page_new): Show the menu items before appending them. + (service_page_item_new): Use `GTK_FILL' for the "Detect supported + types..." button. + + * local-config.glade: Change the apply button into an ok button. + 2000-08-17 Peter Williams Implement filtering on demand. diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c index 9a71dbe8ab..4cdc7109e5 100644 --- a/mail/folder-browser-factory.c +++ b/mail/folder-browser-factory.c @@ -134,7 +134,7 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, NULL); bonobo_ui_handler_menu_new_item (uih, "/File//Print message...", - _("_Print message"), + _("_Print Message"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_MENU_PRINT, @@ -142,63 +142,80 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, bonobo_ui_handler_menu_new_separator (uih, "/File//separator1", -1); - bonobo_ui_handler_menu_new_item (uih, "/Actions/Edit Message", _("E_dit Message"), + bonobo_ui_handler_menu_new_subtree (uih, "//Folder", + _("F_older"), + NULL, -1, + BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, + 0, 0); + + bonobo_ui_handler_menu_new_item (uih, "//Folder/Expunge", + _("_Expunge"), + NULL, -1, + BONOBO_UI_HANDLER_PIXMAP_STOCK, + GNOME_STOCK_MENU_TRASH, + 0, 0, expunge_folder, folder_browser); + + bonobo_ui_handler_menu_new_item (uih, "/Folder/Configure Folder", + _("_Configure Folder"), + NULL, -1, + BONOBO_UI_HANDLER_PIXMAP_NONE, + 0, + 0, 0, configure_folder, folder_browser); + + bonobo_ui_handler_menu_new_subtree (uih, "//Message", + _("_Message"), + NULL, -1, + BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, + 0, 0); + + bonobo_ui_handler_menu_new_item (uih, "//Message/Edit", + _("E_dit"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_STOCK, - GNOME_STOCK_MENU_MAIL_NEW, + GNOME_STOCK_MENU_MAIL, 0, 0, edit_message, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Actions/View Message", - _("_View Message"), + bonobo_ui_handler_menu_new_item (uih, "//Message/View", + _("_View"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_STOCK, - GNOME_STOCK_MENU_MAIL_NEW, + GNOME_STOCK_MENU_MAIL, 0, 0, view_message, folder_browser); - bonobo_ui_handler_menu_new_separator (uih, "/Actions/separator1", -1); - - bonobo_ui_handler_menu_new_item (uih, "/Actions/Mark all seen", - _("_Mark all messages seen"), + bonobo_ui_handler_menu_new_item (uih, "//Message/Mark as Read", + _("_Mark as Read"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, NULL, - 0, 0, mark_all_seen, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Actions/Expunge", _("_Expunge"), - NULL, -1, - BONOBO_UI_HANDLER_PIXMAP_STOCK, - GNOME_STOCK_MENU_TRASH, - 0, 0, expunge_folder, folder_browser); + 0, 0, mark_all_seen, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Filters ...", _("Mail _Filters ..."), + bonobo_ui_handler_menu_new_item (uih, "/Settings/Mail Filters ...", + _("Mail _Filters ..."), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, 0, 0, filter_edit, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Tools/vFolder Editor ...", _("_vFolder Editor ..."), + bonobo_ui_handler_menu_new_item (uih, "/Settings/vFolder Editor ...", + _("_vFolder Editor ..."), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, 0, 0, vfolder_edit_vfolders, folder_browser); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Mail Configuration ...", _("_Mail Configuration ..."), + bonobo_ui_handler_menu_new_item (uih, "/Settings/Mail Configuration ...", + _("_Mail Configuration ..."), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, 0, 0, (void *) mail_config, NULL); - bonobo_ui_handler_menu_new_item (uih, "/Tools/Forget Passwords", _("Forget _Passwords"), + bonobo_ui_handler_menu_new_item (uih, "/Settings/Forget Passwords", + _("Forget _Passwords"), NULL, -1, BONOBO_UI_HANDLER_PIXMAP_NONE, 0, 0, 0, forget_passwords, NULL); - - bonobo_ui_handler_menu_new_item (uih, "/Tools/Configure Folder", _("_Configure Folder"), - NULL, -1, - BONOBO_UI_HANDLER_PIXMAP_NONE, - 0, - 0, 0, configure_folder, folder_browser); - create_ondemand_hooks (fb, uih); toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, @@ -242,15 +259,21 @@ control_deactivate (BonoboControl *control, bonobo_ui_handler_menu_remove (uih, "/File//Print message..."); bonobo_ui_handler_menu_remove (uih, "/View/Threaded"); - bonobo_ui_handler_menu_remove (uih, "/Actions/Mark all seen"); - bonobo_ui_handler_menu_remove (uih, "/Actions/Edit Message"); - bonobo_ui_handler_menu_remove (uih, "/Actions/View Message"); - bonobo_ui_handler_menu_remove (uih, "/Actions/Expunge"); - bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Filters ..."); - bonobo_ui_handler_menu_remove (uih, "/Tools/vFolder Editor ..."); - bonobo_ui_handler_menu_remove (uih, "/Tools/Mail Configuration ..."); - bonobo_ui_handler_menu_remove (uih, "/Tools/Forget Passwords"); - bonobo_ui_handler_menu_remove (uih, "/Tools/Configure Folder"); + + bonobo_ui_handler_menu_remove (uih, "//Folder"); + bonobo_ui_handler_menu_remove (uih, "//Folder/Expunge"); + + bonobo_ui_handler_menu_remove (uih, "//Message"); + bonobo_ui_handler_menu_remove (uih, "//Message/Edit"); + bonobo_ui_handler_menu_remove (uih, "//Message/View"); + bonobo_ui_handler_menu_remove (uih, "//Message/Mark as Read"); + + bonobo_ui_handler_menu_remove (uih, "/Settings/Mail Filters ..."); + bonobo_ui_handler_menu_remove (uih, "/Settings/vFolder Editor ..."); + bonobo_ui_handler_menu_remove (uih, "/Settings/Mail Configuration ..."); + bonobo_ui_handler_menu_remove (uih, "/Settings/Forget Passwords"); + bonobo_ui_handler_menu_remove (uih, "/Settings/Configure Folder"); + bonobo_ui_handler_dock_remove (uih, toolbar_name); g_free (toolbar_name); diff --git a/mail/local-config.glade b/mail/local-config.glade index 3eaadbc833..8f3a1a4cda 100644 --- a/mail/local-config.glade +++ b/mail/local-config.glade @@ -58,7 +58,7 @@ apply_format True True - GNOME_STOCK_BUTTON_APPLY + GNOME_STOCK_BUTTON_OK diff --git a/mail/mail-config-gui.c b/mail/mail-config-gui.c index 7e4c090971..955c457e7c 100644 --- a/mail/mail-config-gui.c +++ b/mail/mail-config-gui.c @@ -924,12 +924,14 @@ service_page_item_new (MailDialogServicePage *page, MailService *mcs) gtk_table_attach (GTK_TABLE (table), item->auth_optionmenu, 1, 2, row, row + 1, - GTK_FILL | GTK_EXPAND, - 0, 0, 0); + GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, + 0, 0); item->auth_detect = gtk_button_new_with_label (_("Detect supported types...")); gtk_table_attach (GTK_TABLE (table), item->auth_detect, - 2, 3, row, row + 1, 0, 0, 0, 0); + 2, 3, row, row + 1, + GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, + 0, 0); gtk_widget_set_sensitive (item->auth_detect, FALSE); gtk_signal_connect (GTK_OBJECT (item->auth_detect), "clicked", @@ -1069,6 +1071,8 @@ service_page_new (const char *label_text, GSList *services) gtk_menu_append (GTK_MENU (menu), spitem->item); page->items = g_list_append (page->items, spitem); + + gtk_widget_show (spitem->item); } gtk_option_menu_set_menu (GTK_OPTION_MENU (page->optionmenu), menu); @@ -1135,7 +1139,7 @@ transport_page_new (GSList *transports) MailDialogTransportPage *page = g_new0 (MailDialogTransportPage, 1); GtkWidget *html; - page->page = service_page_new ("Mail transport type:", transports); + page->page = service_page_new (_("Mail transport type:"), transports); page->vbox = page->page->vbox; html = html_new (FALSE); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index b33c5d9660..b425fe7bec 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -295,7 +295,10 @@ vfolder_gui_add_rule(VfolderRule *rule) GnomeDialog *gd; w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context); - gd = (GnomeDialog *)gnome_dialog_new("New VFolder", "Ok", "Cancel", NULL); + gd = (GnomeDialog *)gnome_dialog_new(_("New VFolder"), + GNOME_STOCK_BUTTON_OK, + GNOME_STOCK_BUTTON_CANCEL, + NULL); gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0); gtk_widget_show((GtkWidget *)gd); gtk_object_set_data_full((GtkObject *)gd, "rule", rule, (GtkDestroyNotify)gtk_object_unref); diff --git a/mail/main.c b/mail/main.c index 9b51756d33..a88117b2c3 100644 --- a/mail/main.c +++ b/mail/main.c @@ -31,6 +31,8 @@ int main (int argc, char *argv []) { CORBA_ORB orb; + + /* free (malloc (10));*/ bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR); textdomain (PACKAGE); -- cgit v1.2.3