Re: [Fwd: Re: [evolution-patches] Request review my patch for bug #46017]

[Antonio Xu <antonio xu sun com>]

Sorry for my typo in patch, I have send you a new patch, Please review 
it. If it is possible, I hope the patch can be checked into both trunk 
and branch.

Thanks
Anto
Anna Marie Dirks wrote:

> Hello Anto, 
>
> I am sorry for apparently missing this email the first time. My
> apologies to you. 
>
> This patch looks great, except for one thing: 
> { "nodata_html",
>  
>
> > +	  N_("Evolution checked for settings to import from the following\n"
> > +	     "applications: Pine, Netscape,Pine, Netscape, Elm, iCalendar.\n"
> > +	     "No settings that could be imported where found. If you would\n"
> > +	     "like to try again, please click the \"Back\" button.\n")
> > 	}
> >    
>
> Are my eyes deceiving me, or are you writing both Pine and Netscape
> twice? We likely only need to mention them each once.. 
>
> cheers,
> Anna
>
>
>
> Il gio, 2003-07-17 alle 10:57, Antonio Xu ha scritto:
>  
>
> > Hello All
> > I have to resend this email to request you review my patch.
> >
> > Anto
> > -------- Original Message --------
> > Subject: Re: [evolution-patches] Request review my patch for bug #46017
> > Date: Mon, 14 Jul 2003 13:02:51 +0800
> > From: Antonio Xu <antonio xu sun com>
> > To: Anna Marie Dirks <anna ximian com>
> > CC: Ettore Perazzoli <ettore ximian com>, evolution-patches ximian com
> > References: <1057851044 28496 82 camel anna boston ximian com>
> >
> >
> >
> > I have created a new patch for bug #46017 according to Anna's advice, But I didn't add troubleshooting tips link in log, If you didn't think the error log was appropriate. Can you show me how I can wirte the formal error log? or you can file a new bug to complete error log.
> > Please review my new patch.
> >
> > Thanks
> > Anto
> >
> > Anna Marie Dirks wrote:
> >
> >    
> >
> > > Hi Antonio, Ettore, and hackers.
> > >
> > > So, regarding what label to use in the import wizard: 
> > >
> > > The only issue I have with Ettore's suggestion ("Evolution didn't find
> > > any settings that could be imported from other applications.") 
> > > is that it doesn't offer the user any information about what to do if
> > > she really does think that she has some importable data. That is, it
> > > doesn't offer any troubleshooting tips. It also doesn't explain what
> > > applications Evolution can import from. (Is that explained somewhere
> > > else in the wizard?) 
> > >
> > > Ideally, the message would be something like this: 
> > >
> > > "Evolution checked for settings to import from the following
> > > applications: Pine, Netscape, . No settings that
> > > could be imported where found. If you would like to try again, please
> > > click the "Back" button." (Or whatever troubleshooting tip might be
> > > appropriate, I am just guessing about the "Back" button.) If you wished,
> > > you could include a link to an online support document, in which case
> > > the last sentence would become "Please consult the troubleshooting tips
> > > in the Online Support Center (or whatever we are calling it these days)
> > > for more information about importing your old settings." 
> > >
> > > Does this make sense? 
> > >
> > > Anna
> > >
> > >
> > >
> > >
> > >
> > >
> > >      
> >
> >
> > ______________________________________________________________________
> > Index: shell/e-shell-importer.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
> > retrieving revision 1.56
> > diff -u -r1.56 e-shell-importer.c
> > --- shell/e-shell-importer.c	29 Apr 2003 02:40:56 -0000	1.56
> > +++ shell/e-shell-importer.c	14 Jul 2003 03:38:21 -0000
> > @@ -146,6 +146,12 @@
> > 	},
> > 	{ "intelligent_html",
> > 	  N_("Please select the information that you would like to import:")
> > +	},
> > +	{ "nodata_html",
> > +	  N_("Evolution checked for settings to import from the following\n"
> > +	     "applications: Pine, Netscape,Pine, Netscape, Elm, iCalendar.\n"
> > +	     "No settings that could be imported where found. If you would\n"
> > +	     "like to try again, please click the \"Back\" button.\n")
> > 	}
> > };
> > #define num_info (sizeof (info) / sizeof (info[0]))
> > @@ -734,9 +740,12 @@
> > 	ImportDialogImporterPage *import;
> > 	GList *l, *importers;
> > 	GtkWidget *table;
> > +	GtkLabel *no_data;
> > 	int running = 0;
> >
> > 	if (data->importerpage->prepared == TRUE) {
> > +		if (data->importerpage->running == 0)
> > +			gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
> > 		return TRUE;
> > 	}
> >
> > @@ -763,8 +772,10 @@
> > 		/* No importers, go directly to finish, do not pass go
> > 		   Do not collect $200 */
> > 		import->running = 0;
> > -		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish))
> > -			;
> > +		no_data = create_help ("nodata_html");
> > +		gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), no_data,
> > +				    FALSE, TRUE, 0);
> > +		gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
> > 		gtk_widget_destroy (dialog);
> > 		return TRUE;
> > 	}
> > @@ -887,7 +898,10 @@
> > 	gtk_widget_show_all (table);
> >
> > 	if (running == 0) {
> > -		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish));
> > +		no_data = create_help ("nodata_html");
> > +		gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), no_data,
> > +				    FALSE, TRUE, 0);
> > +		gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
> > 		gtk_widget_destroy (dialog);
> > 		return TRUE;
> > 	}
> > @@ -1194,7 +1208,7 @@
> > 			  G_CALLBACK (next_intelligent_page), data);
> > 	g_signal_connect (data->intelligent, "back",
> > 			  G_CALLBACK (back_intelligent_page), data);
> > -	g_signal_connect (data->intelligent, "prepare",
> > +	g_signal_connect_after (data->intelligent, "prepare",
> > 			  G_CALLBACK (prepare_intelligent_page), data);
> >
> > 	data->importerpage = importer_importer_page_new (data);
> > @@ -1206,7 +1220,7 @@
> > 	
> >
> > 	data->filedialog = glade_xml_get_widget (data->wizard, "page2-file");
> > -	g_signal_connect (data->filedialog, "prepare",
> > +	g_signal_connect_after (data->filedialog, "prepare",
> > 			  G_CALLBACK (prepare_file_page), data);
> > 	g_signal_connect (data->filedialog, "next",
> > 			  G_CALLBACK (next_file_page), data);
> > Index: shell/ChangeLog
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
> > retrieving revision 1.1287
> > diff -u -r1.1287 ChangeLog
> > --- shell/ChangeLog	9 Jul 2003 19:54:25 -0000	1.1287
> > +++ shell/ChangeLog	14 Jul 2003 03:48:20 -0000
> > @@ -1,3 +1,10 @@
> > +2003-07-10  Antonio Xu <antonio xu sun com>
> > +                                                                                        
> > +        * e-shell-importer.c: (show_import_wizard): use
> > +        g_signal_connect_after to connect "prepare" signal.
> > +        (prepare_intelligent_page): Display some error log and disable
> > +        forward button rather than jump to finish page.  [#46017]
> > +
> > 2003-07-09  Ettore Perazzoli  <ettore ximian com>
> >
> > 	* e-shell-folder-commands.c (e_shell_command_rename_folder): Do
> >    


Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1287
diff -u -r1.1287 ChangeLog
--- shell/ChangeLog	9 Jul 2003 19:54:25 -0000	1.1287
+++ shell/ChangeLog	14 Jul 2003 03:48:20 -0000
@@ -1,3 +1,10 @@
+2003-07-10  Antonio Xu <antonio xu sun com>
+                                                                                        
+        * e-shell-importer.c: (show_import_wizard): use
+        g_signal_connect_after to connect "prepare" signal.
+        (prepare_intelligent_page): Display some error log and disable
+        forward button rather than jump to finish page.  [#46017]
+
 2003-07-09  Ettore Perazzoli  <ettore ximian com>
 
 	* e-shell-folder-commands.c (e_shell_command_rename_folder): Do
Index: shell/e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.56
diff -u -r1.56 e-shell-importer.c
--- shell/e-shell-importer.c	29 Apr 2003 02:40:56 -0000	1.56
+++ shell/e-shell-importer.c	18 Jul 2003 06:32:27 -0000
@@ -146,6 +146,12 @@
 	},
 	{ "intelligent_html",
 	  N_("Please select the information that you would like to import:")
+	},
+	{ "nodata_html",
+	  N_("Evolution checked for settings to import from the following\n"
+	     "applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+	     "that could be imported where found. If you would like to\n"
+	     "try again, please click the \"Back\" button.\n")
 	}
 };
 #define num_info (sizeof (info) / sizeof (info[0]))
@@ -734,9 +740,12 @@
 	ImportDialogImporterPage *import;
 	GList *l, *importers;
 	GtkWidget *table;
+	GtkLabel *no_data;
 	int running = 0;
 
 	if (data->importerpage->prepared == TRUE) {
+		if (data->importerpage->running == 0)
+			gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
 		return TRUE;
 	}
 
@@ -763,8 +772,10 @@
 		/* No importers, go directly to finish, do not pass go
 		   Do not collect $200 */
 		import->running = 0;
-		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish))
-			;
+		no_data = create_help ("nodata_html");
+		gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), no_data,
+				    FALSE, TRUE, 0);
+		gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
 		gtk_widget_destroy (dialog);
 		return TRUE;
 	}
@@ -887,7 +898,10 @@
 	gtk_widget_show_all (table);
 
 	if (running == 0) {
-		gnome_druid_set_page (druid, GNOME_DRUID_PAGE (data->finish));
+		no_data = create_help ("nodata_html");
+		gtk_box_pack_start (GTK_BOX (data->importerpage->vbox), no_data,
+				    FALSE, TRUE, 0);
+		gnome_druid_set_buttons_sensitive(druid, TRUE, FALSE, TRUE, FALSE);
 		gtk_widget_destroy (dialog);
 		return TRUE;
 	}
@@ -1194,7 +1208,7 @@
 			  G_CALLBACK (next_intelligent_page), data);
 	g_signal_connect (data->intelligent, "back",
 			  G_CALLBACK (back_intelligent_page), data);
-	g_signal_connect (data->intelligent, "prepare",
+	g_signal_connect_after (data->intelligent, "prepare",
 			  G_CALLBACK (prepare_intelligent_page), data);
 
 	data->importerpage = importer_importer_page_new (data);
@@ -1206,7 +1220,7 @@
 	
 
 	data->filedialog = glade_xml_get_widget (data->wizard, "page2-file");
-	g_signal_connect (data->filedialog, "prepare",
+	g_signal_connect_after (data->filedialog, "prepare",
 			  G_CALLBACK (prepare_file_page), data);
 	g_signal_connect (data->filedialog, "next",
 			  G_CALLBACK (next_file_page), data);