Update error dialogs to be HIGy, and use the new eel message dialog api.

2003-12-11  Alexander Larsson  <alexl@redhat.com>

	* components/emblem/nautilus-emblem-view.c:
	* components/music/nautilus-music-view.c:
	* components/news/nautilus-news.c:
	* libnautilus-private/nautilus-desktop-link-monitor.c:
	* libnautilus-private/nautilus-emblem-utils.c:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-icon-dnd.c:
	* libnautilus-private/nautilus-program-chooser.c:
	* libnautilus-private/nautilus-program-choosing.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-error-reporting.c:
	* src/file-manager/fm-icon-view.c:
	* src/file-manager/fm-properties-window.c:
	* src/file-manager/fm-search-list-view.c:
	* src/file-manager/nautilus-indexing-info.c:
	* src/nautilus-application.c:
	* src/nautilus-connect-server-dialog.c:
	* src/nautilus-information-panel.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-navigation-window-menus.c:
	* src/nautilus-navigation-window.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window.c:
	Update error dialogs to be HIGy, and use the new
	eel message dialog api.
	Based on patch from dennis_cranston@yahoo.com

3 files changed, 25 insertions, 18 deletions

diff --git a/components/emblem/nautilus-emblem-view.c b/components/emblem/nautilus-emblem-view.c
index a19219214..e572677a7 100644
--- a/components/emblem/nautilus-emblem-view.c
+++ b/components/emblem/nautilus-emblem-view.c
@@ -200,8 +200,9 @@ nautilus_emblem_view_delete_cb (GtkWidget *menu_item,
 	if (nautilus_emblem_remove_emblem (emblem_view->details->popup_emblem_keyword)) {
 		nautilus_emblem_view_refresh (emblem_view);
 	} else {
-		error = g_strdup_printf (_("Couldn't remove emblem with name '%s'.  This is probably because the emblem is a permanent one, and not one you added yourself."), emblem_view->details->popup_emblem_display_name);
-		eel_show_error_dialog (error, _("Couldn't remove emblem"),
+		error = g_strdup_printf (_("Couldn't remove emblem with name '%s'."), emblem_view->details->popup_emblem_display_name);
+		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one you added yourself."),
+				       _("Couldn't Remove Emblem"),
 				       NULL);
 		g_free (error);
 	}
@@ -235,8 +236,9 @@ rename_dialog_response_cb (GtkWidget *dialog, int response,
 	if (nautilus_emblem_rename_emblem (keyword, name)) {
 		nautilus_emblem_view_refresh (emblem_view);
 	} else {
-		error = g_strdup_printf (_("Couldn't rename emblem with name '%s'.  This is probably because the emblem is a permanent one, and not one that you added yourself."), name);
-		eel_show_error_dialog (error, _("Couldn't rename emblem"),
+		error = g_strdup_printf (_("Couldn't rename emblem with name '%s'."), name);
+		eel_show_error_dialog (error, _("This is probably because the emblem is a permanent one, and not one that you added yourself."),
+				       _("Couldn't Rename Emblem"),
 				       NULL);
 		g_free (error);
 	}
@@ -737,9 +739,9 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 		nautilus_icon_dnd_uri_list_free_strings (uris);
 
 		if (had_failure && emblems != NULL) {
-			eel_show_error_dialog (_("Some of the files could not be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
+			eel_show_error_dialog (_("Some of the files could not be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
 		} else if (had_failure && emblems == NULL) {
-			eel_show_error_dialog (_("None of the files could be added as emblems because they did not appear to be valid images."), _("Couldn't add emblems"), NULL);
+			eel_show_error_dialog (_("None of the files could be added as emblems."), _("The emblems do not appear to be valid images."), _("Couldn't Add Emblems"), NULL);
 
 		}
  
@@ -760,7 +762,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 		uri = g_strndup (data->data, data->length);
 
 		if (!eel_is_valid_uri (uri)) {
-			eel_show_error_dialog (_("The dragged text was not a valid file location."), _("Couldn't add emblem"), NULL);
+			eel_show_error_dialog (_("The emblem cannot be added."), _("The dragged text was not a valid file location."), _("Couldn't Add Emblem"), NULL);
 			break;
 		}
 
@@ -785,7 +787,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 			} else {
 				error = g_strdup (_("The dragged file does not appear to be a valid image."));
 			}
-			eel_show_error_dialog (error, _("Couldn't add emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
 					       NULL);
 			g_free (error);
 			g_free (uri_utf8);
@@ -835,7 +837,7 @@ nautilus_emblem_view_drag_received_cb (GtkWidget *widget,
 			g_warning ("Tried to load '%s', but failed.\n",
 				   uri);
 			error = g_strdup_printf (_("The file '%s' does not appear to be a valid image."), uri);
-			eel_show_error_dialog (error, _("Couldn't add emblem"),
+			eel_show_error_dialog (_("The emblem cannot be added."), error, _("Couldn't Add Emblem"),
 					       NULL);
 			g_free (error);
 		}
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index c5e691443..d74eb4d97 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -742,7 +742,8 @@ set_album_cover (GtkWidget *widget, gpointer *data)
 		char *message = g_strdup_printf
 			(_("Sorry, but '%s' is not a usable image file."),
 			 path_name);
-		eel_show_error_dialog (message, _("Not an Image"), NULL);
+		eel_show_error_dialog (message, _("Please select an image file and try again."),
+		                       _("Not an Image"), NULL);
 		g_free (message);
 		
 		g_free (path_uri);
@@ -1213,8 +1214,8 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 	g_object_unref (client);
 
 	if (!enable_esd) {
-		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
-					      "This is because the Enable sound server startup setting "
+		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now."),
+					    _("This is because the Enable sound server startup setting "
 					      "in the Sound section of the Control Center is turned off."),
 				            _("Unable to Play File"),
 					    //GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (&music_view->details->event_box->parent))));
@@ -1224,8 +1225,8 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 	}
 
 	if (!esdout_can_play ()) {
-		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
-					      "Either another program is using or blocking the sound card, "
+		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now."),
+					    _("Either another program is using or blocking the sound card, "
 					      "or your sound card is not configured properly. Try quitting any "
 					      "applications that may be blocking use of the sound card."),
 				            _("Unable to Play File"),
@@ -1253,6 +1254,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
         if (song_filename == NULL) {
                 eel_show_error_dialog
                         ( _("Sorry, but the music view can't play non-local files yet."),
+			  _("Remote files are not supported."),
                           _("Can't Play Remote Files"),
                           NULL);
                 return;
@@ -1765,7 +1767,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 	if (result != GNOME_VFS_OK) {
 		path = gnome_vfs_get_local_path_from_uri (uri);
 		message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
-		eel_show_error_dialog (message, _("Can't Read Folder"), 
+		eel_show_error_dialog (message, _("The folder cannot be read."), _("Can't Read Folder"), 
                                        GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view->details->event_box))));
 		g_free (path);
 		g_free (message);
diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c
index 6fbb5c754..93710e608 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -1755,11 +1755,13 @@ add_site_from_fields (GtkWidget *widget, News *news)
 
 	/* make sure there's something in the fields */
 	if (site_name == NULL || strlen (site_name) == 0) {
-		eel_show_error_dialog (_("Sorry, but you have not specified a name for the site!"), _("Missing Site Name Error"), NULL);
+		eel_show_error_dialog (_("Sorry, but you have not specified a name for the site."),
+		                       _("Please specify a name and try again."), _("Missing Site Name Error"), NULL);
 		return;
 	}
 	if (site_location == NULL || strlen (site_location) == 0) {
-		eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site!"), _("Missing URL Error"), NULL);
+		eel_show_error_dialog (_("Sorry, but you have not specified a URL for the site."),
+		                       _("Please specify a URL and try again."), _("Missing URL Error"), NULL);
 		return;
 	}
 	
@@ -1776,7 +1778,8 @@ add_site_from_fields (GtkWidget *widget, News *news)
 	g_free (buffer);
 	if (!got_xml_file) {
 		g_free (site_uri);
-		eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file!"), _("Invalid RSS URL"), NULL);
+		eel_show_error_dialog (_("Sorry, but the specified url doesn't seem to be a valid RSS file."), 
+		                       _("Please check the spelling of the url."), _("Invalid RSS URL"), NULL);
 		return;
 	}