Re: [evolution-patches] patch for fixing 41569, 41567, and partial fix for 41038

[Anna Marie Dirks <anna ximian com>]

Sooo. 

I'd like to submit for your consideration a re-worked version of this
patch which: 

a) breaks fewer strings

b) uses the "hig-approved" notion of the difference between add/remove
and new/delete. (the main point being that you ought to use "delete"
with items where after it is gone, it cannot be recovered; and
similarly, you ought to use "remove" with items which can be restored.
Considered in this way, we delete folders, but we remove shortcut
groups. since the partner of "Delete" is supposed to be "New", and the
partner of "Remove" is supposed to be "Add", I changed the "new
shortcut" item to "add shortcut".) 

c) the order of menuitems in the folder and shortcuts context menus was
oddly different (..<sep>/Delete/Rename/New<sep>... vs.
<sep>New/Delete/Remove</sep>..) , so I straightened that out too. 


give me the word, kind sirs.
Anna



On Mon, 2003-04-21 at 08:56, Ettore Perazzoli wrote:
> On Fri, 2003-04-18 at 16:53, Anna Marie Dirks wrote:
> > This patch fixes 41569, 41567 and part of 41038 -- basically, it just
> > capitalizes some titles that were formerlly lower case. 
> 
> Looks good.
> 
> -- Ettore
-- 
Anna Marie Dirks <anna ximian com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1251
diff -u -u -w -r1.1251 ChangeLog
--- ChangeLog	21 Apr 2003 20:00:56 -0000	1.1251
+++ ChangeLog	21 Apr 2003 21:44:26 -0000
@@ -1,3 +1,15 @@
+2003-04-21  Anna Marie Dirks  <anna ximian com>
+	
+	* e-shortcuts-view.c
+	(destroy_group_cb): Set the border width of the message dialog 
+	to 6. Also corrected the capitalization for "Remove Shortcut 
+	Dialog". Fixes 41569
+	(show_new_group_dialog): Fixed the title of "Create New Shortcut
+	Group" . Partially fixes 41038.
+	(rename_shortcut_cb): Corrected the label capitalization for 
+	Rename dialog. Fixes 41567.
+
+
 2003-04-21  Ettore Perazzoli  <ettore ximian com>
 
 	* e-local-storage.c (create_folder_directory): Don't signal an
Index: e-shortcuts-view.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shortcuts-view.c,v
retrieving revision 1.64
diff -u -u -w -r1.64 e-shortcuts-view.c
--- e-shortcuts-view.c	6 Feb 2003 07:25:48 -0000	1.64
+++ e-shortcuts-view.c	21 Apr 2003 21:44:26 -0000
@@ -77,7 +77,7 @@
 	char *group_name;
 
 	group_name = e_request_string (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
-				       _("Create new shortcut group"),
+				       _("Create New Shortcut Group"),
 				       _("Group name:"),
 				       NULL);
 
@@ -184,6 +184,13 @@
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_DELETE, GTK_RESPONSE_OK,
 				NULL);
+
+	gtk_window_set_title (GTK_WINDOW (message_dialog), "Remove Shortcut Group"); 
+
+	gtk_container_set_border_width (GTK_CONTAINER (message_dialog), 6); 
+	
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (message_dialog)->vbox), 6);
+
 	gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK);
 
 	response = gtk_dialog_run (GTK_DIALOG (message_dialog));
@@ -260,7 +267,7 @@
 
 	GNOMEUIINFO_SEPARATOR,
 
-	{ GNOME_APP_UI_ITEM, N_("_New Group..."),
+	{ GNOME_APP_UI_ITEM, N_("_Add Group..."),
 	  N_("Create a new shortcut group"), create_new_group_cb, NULL,
 	  NULL, 0, 0, 0, 0 },
 	{ GNOME_APP_UI_ITEM, N_("_Remove this Group..."),
@@ -398,7 +405,7 @@
 	shortcut_item = e_shortcuts_get_shortcut (shortcuts, menu_data->group_num, menu_data->item_num);
 
 	new_name = e_request_string (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (shortcuts_view))),
-				     _("Rename shortcut"),
+				     _("Rename Shortcut"),
 				     _("Rename selected shortcut to:"),
 				     shortcut_item->name);
 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.332
diff -u -u -w -r1.332 ChangeLog
--- ChangeLog	7 Apr 2003 23:19:19 -0000	1.332
+++ ChangeLog	21 Apr 2003 21:31:19 -0000
@@ -1,3 +1,9 @@
+2003-04-21  Anna Marie Dirks  <anna ximian com>
+
+	* evolution.xml: Changed the placement and label of "Create New Folder"
+	to be consistent with the terms/layout used for other (namely
+	the shortcut bar) pop-up menus. 
+
 2003-04-07  Chris Toshok  <toshok ximian com>
 
 	[ fixes bug #39763 ]
Index: evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.75
diff -u -u -w -r1.75 evolution.xml
--- evolution.xml	20 Mar 2003 22:10:39 -0000	1.75
+++ evolution.xml	21 Apr 2003 21:31:19 -0000
@@ -266,6 +266,11 @@
 
       <separator f="" name="eshell2"/>
 
+      <menuitem name="CreateNewFolder"
+                verb="NewFolder"
+                _label="_New Folder..."
+                _tip="Create a new folder"/>
+
       <menuitem name="DeleteFolder"
                 verb="DeleteFolder"
                 _label="_Delete"
@@ -275,11 +280,6 @@
                 verb="RenameFolder"
                 _label="_Rename..."
                 _tip="Change the name of this folder"/>
-
-      <menuitem name="CreateNewFolder"
-                verb="NewFolder"
-                _label="Create _New Folder..."
-                _tip="Create a new folder"/>
 
       <separator f="" name="eshell3"/>