set title to just Evolution (show_development_warning): ditto for warning

2004-05-10  JP Rosevear  <jpr@ximian.com>

	* main.c (show_development_warning): set title to just Evolution
	(show_development_warning): ditto for warning
	(idle_cb): ditto for title

	* e-shell-window.c (update_offline_toggle_status): set tooltip to
	just Evolution
	(e_shell_window_new): ditto for window title

	* e-shell-window-commands.c (command_about_box): set title to
	just Evolution

svn path=/trunk/; revision=25835

6 files changed, 24 insertions, 533 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 658dbc471f..7d09b2ffa0 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-10  JP Rosevear  <jpr@ximian.com>
+
+	* main.c (show_development_warning): set title to just Evolution
+	(show_development_warning): ditto for warning
+	(idle_cb): ditto for title
+
+	* e-shell-window.c (update_offline_toggle_status): set tooltip to
+	just Evolution
+	(e_shell_window_new): ditto for window title
+
+	* e-shell-window-commands.c (command_about_box): set title to
+	just Evolution
+
 2004-05-05  Dan Winship  <danw@ximian.com>
 
 	* e-sidebar.c (layout_buttons): Change the algorithm so that if
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 855a59dd5f..6904db3c4b 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -167,7 +167,7 @@ command_about_box (BonoboUIComponent *uih,
 			  G_CALLBACK (about_box_event_callback), &about_box_window);
 
 	gtk_window_set_transient_for (GTK_WINDOW (about_box_window), GTK_WINDOW (window));
-	gtk_window_set_title (GTK_WINDOW (about_box_window), _("About Ximian Evolution"));
+	gtk_window_set_title (GTK_WINDOW (about_box_window), _("About Evolution"));
 	gtk_container_add (GTK_CONTAINER (about_box_window), about_box);
 	gtk_widget_show (about_box_window);
 }
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 14ad005ca9..04d096334f 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -333,20 +333,20 @@ update_offline_toggle_status (EShellWindow *window)
 		icon_pixmap = online_pixmap;
 		icon_mask   = online_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Ximian Evolution is currently online.  "
+		tooltip     = _("Evolution is currently online.  "
 				"Click on this button to work offline.");
 		break;
 	case E_SHELL_LINE_STATUS_GOING_OFFLINE:
 		icon_pixmap = online_pixmap;
 		icon_mask   = online_mask;
 		sensitive   = FALSE;
-		tooltip     = _("Ximian Evolution is in the process of going offline.");
+		tooltip     = _("Evolution is in the process of going offline.");
 		break;
 	case E_SHELL_LINE_STATUS_OFFLINE:
 		icon_pixmap = offline_pixmap;
 		icon_mask   = offline_mask;
 		sensitive   = TRUE;
-		tooltip     = _("Ximian Evolution is currently offline.  "
+		tooltip     = _("Evolution is currently offline.  "
 				"Click on this button to work online.");
 		break;
 	default:
@@ -693,7 +693,7 @@ e_shell_window_new (EShell *shell,
 
 	if (bonobo_window_construct (BONOBO_WINDOW (window),
 				     bonobo_ui_container_new (),
-				     "evolution", "Ximian Evolution") == NULL) {
+				     "evolution", "Evolution") == NULL) {
 		g_object_unref (window);
 		g_object_unref (gconf_client);
 		return NULL;
diff --git a/shell/e-splash.c b/shell/e-splash.c
deleted file mode 100644
index 7168e2b387..0000000000
--- a/shell/e-splash.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-splash.c
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-splash.h"
-
-#include "e-util/e-gtk-utils.h"
-
-#include <gtk/gtkframe.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <libgnomecanvas/gnome-canvas-pixbuf.h>
-#include <libgnomeui/gnome-window-icon.h>
-#include <gal/util/e-util.h>
-
-
-
-#define PARENT_TYPE gtk_window_get_type ()
-static GtkWindowClass *parent_class = NULL;
-
-struct _Icon {
-	GdkPixbuf *dark_pixbuf;
-	GdkPixbuf *light_pixbuf;
-	GnomeCanvasItem *canvas_item;
-};
-typedef struct _Icon Icon;
-
-struct _ESplashPrivate {
-	GnomeCanvas *canvas;
-	GdkPixbuf *splash_image_pixbuf;
-
-	GList *icons;		/* (Icon *) */
-	int num_icons;
-
-	int layout_idle_id;
-};
-
-
-/* Layout constants.  These need to be changed if the splash changes.  */
-
-#define ICON_Y    280
-#define ICON_SIZE 32
-
-
-/* Icon management.  */
-
-static GdkPixbuf *
-create_darkened_pixbuf (GdkPixbuf *pixbuf)
-{
-	GdkPixbuf *new;
-	unsigned char *rowp;
-	int width, height;
-	int rowstride;
-	int i, j;
-
-	new = gdk_pixbuf_copy (pixbuf);
-	if (! gdk_pixbuf_get_has_alpha (new))
-		return new;
-
-	width     = gdk_pixbuf_get_width (new);
-	height    = gdk_pixbuf_get_height (new);
-	rowstride = gdk_pixbuf_get_rowstride (new);
-
-	rowp = gdk_pixbuf_get_pixels (new);
-	for (i = 0; i < height; i ++) {
-		unsigned char *p;
-
-		p = rowp;
-		for (j = 0; j < width; j++) {
-			p[3] *= .25;
-			p += 4;
-		}
-
-		rowp += rowstride;
-	}
-
-	return new;
-}
-
-static Icon *
-icon_new (ESplash *splash,
-	  GdkPixbuf *image_pixbuf)
-{
-	ESplashPrivate *priv;
-	GnomeCanvasGroup *canvas_root_group;
-	Icon *icon;
-
-	priv = splash->priv;
-
-	icon = g_new (Icon, 1);
-
-	icon->light_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, ICON_SIZE, ICON_SIZE);
-	gdk_pixbuf_scale (image_pixbuf, icon->light_pixbuf,
-			  0, 0,
-			  ICON_SIZE, ICON_SIZE,
-			  0, 0,
-			  (double) ICON_SIZE / gdk_pixbuf_get_width (image_pixbuf),
-			  (double) ICON_SIZE / gdk_pixbuf_get_height (image_pixbuf),
-			  GDK_INTERP_HYPER);
-
-	icon->dark_pixbuf  = create_darkened_pixbuf (icon->light_pixbuf);
-
-	/* Set up the canvas item to point to the dark pixbuf initially.  */
-
-	canvas_root_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (priv->canvas)->root);
-
-	icon->canvas_item = gnome_canvas_item_new (canvas_root_group,
-						   GNOME_TYPE_CANVAS_PIXBUF,
-						   "pixbuf", icon->dark_pixbuf,
-						   NULL);
-
-	return icon;
-}
-
-static void
-icon_free (Icon *icon)
-{
-	g_object_unref (icon->dark_pixbuf);
-	g_object_unref (icon->light_pixbuf);
-
-/*  	g_object_unref (icon->canvas_item); */
-
-	g_free (icon);
-}
-
-
-/* Icon layout management.  */
-
-static void
-layout_icons (ESplash *splash)
-{
-	ESplashPrivate *priv;
-	GList *p;
-	double x_step;
-	double x, y;
-
-	priv = splash->priv;
-
-	x_step = ((double) gdk_pixbuf_get_width (priv->splash_image_pixbuf)) / priv->num_icons;
-
-	x = (x_step - ICON_SIZE) / 2.0;
-	y = ICON_Y;
-
-	for (p = priv->icons; p != NULL; p = p->next) {
-		Icon *icon;
-
-		icon = (Icon *) p->data;
-
-		g_object_set((icon->canvas_item),
-				"x", (double) x,
-				"y", (double) ICON_Y,
-				NULL);
-
-		x += x_step;
-	}
-}
-
-static int
-layout_idle_cb (void *data)
-{
-	ESplash *splash;
-	ESplashPrivate *priv;
-
-	splash = E_SPLASH (data);
-	priv = splash->priv;
-
-	layout_icons (splash);
-
-	priv->layout_idle_id = 0;
-
-	return FALSE;
-}
-
-static void
-schedule_relayout (ESplash *splash)
-{
-	ESplashPrivate *priv;
-
-	priv = splash->priv;
-
-	if (priv->layout_idle_id != 0)
-		return;
-
-	priv->layout_idle_id = gtk_idle_add (layout_idle_cb, splash);
-}
-
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	ESplash *splash;
-	ESplashPrivate *priv;
-
-	splash = E_SPLASH (object);
-	priv = splash->priv;
-
-	if (priv->splash_image_pixbuf != NULL) {
-		g_object_unref (priv->splash_image_pixbuf);
-		priv->splash_image_pixbuf = NULL;
-	}
-
-	if (priv->layout_idle_id != 0) {
-		gtk_idle_remove (priv->layout_idle_id);
-		priv->layout_idle_id = 0;
-	}
-
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	ESplash *splash;
-	ESplashPrivate *priv;
-	GList *p;
-
-	splash = E_SPLASH (object);
-	priv = splash->priv;
-
-	for (p = priv->icons; p != NULL; p = p->next) {
-		Icon *icon;
-
-		icon = (Icon *) p->data;
-		icon_free (icon);
-	}
-
-	g_list_free (priv->icons);
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-
-static void
-class_init (ESplashClass *klass)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-
-	parent_class = g_type_class_ref(gtk_window_get_type ());
-}
-
-static void
-init (ESplash *splash)
-{
-	ESplashPrivate *priv;
-
-	priv = g_new (ESplashPrivate, 1);
-	priv->canvas              = NULL;
-	priv->splash_image_pixbuf = NULL;
-	priv->icons               = NULL;
-	priv->num_icons           = 0;
-	priv->layout_idle_id      = 0;
-
-	splash->priv = priv;
-}
-
-static gboolean
-button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	ESplash *splash;
-
-	splash = E_SPLASH (data);
-
-	gtk_widget_hide (GTK_WIDGET (splash));
-	
-	return TRUE;
-}
-
-
-/**
- * e_splash_construct:
- * @splash: A pointer to an ESplash widget
- * @splash_image_pixbuf: The pixbuf for the image to appear in the splash dialog
- * 
- * Construct @splash with @splash_image_pixbuf as the splash image.
- **/
-void
-e_splash_construct (ESplash *splash,
-		    GdkPixbuf *splash_image_pixbuf)
-{
-	ESplashPrivate *priv;
-	GtkWidget *canvas, *frame;
-	int image_width, image_height;
-
-	g_return_if_fail (splash != NULL);
-	g_return_if_fail (E_IS_SPLASH (splash));
-	g_return_if_fail (splash_image_pixbuf != NULL);
-
-	priv = splash->priv;
-
-	priv->splash_image_pixbuf = g_object_ref (splash_image_pixbuf);
-
-	canvas = gnome_canvas_new_aa ();
-	priv->canvas = GNOME_CANVAS (canvas);
-
-	e_make_widget_backing_stored (canvas);
-
-	image_width = gdk_pixbuf_get_width (splash_image_pixbuf);
-	image_height = gdk_pixbuf_get_height (splash_image_pixbuf);
-
-	gtk_widget_set_size_request (canvas, image_width, image_height);
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, image_width, image_height);
-	gtk_widget_show (canvas);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_container_add (GTK_CONTAINER (frame), canvas);
-	gtk_widget_show (frame);
-
-	gtk_container_add (GTK_CONTAINER (splash), frame);
-
-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (priv->canvas->root),
-			       GNOME_TYPE_CANVAS_PIXBUF,
-			       "pixbuf", splash_image_pixbuf,
-			       NULL);
-	
-	g_signal_connect (splash, "button-press-event",
-			  G_CALLBACK (button_press_event), splash);
-	
-	g_object_set((splash), "type", GTK_WINDOW_TOPLEVEL, NULL);
-	gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
-	gtk_window_set_resizable (GTK_WINDOW (splash), FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height);
-	gtk_window_set_wmclass (GTK_WINDOW (splash), "evolution-splash", "Evolution");
-	gnome_window_icon_set_from_file (GTK_WINDOW (splash), EVOLUTION_DATADIR "/pixmaps/evolution.png");
-	gtk_window_set_title (GTK_WINDOW (splash), "Ximian Evolution");
-
-}
-
-/**
- * e_splash_new:
- *
- * Create a new ESplash widget.
- * 
- * Return value: A pointer to the newly created ESplash widget.
- **/
-GtkWidget *
-e_splash_new (void)
-{
-	ESplash *new;
-	GdkPixbuf *splash_image_pixbuf;
-
-	splash_image_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/splash.png", NULL);
-
-	if (splash_image_pixbuf == NULL) {
-		g_warning("Cannot find splash image: %s", EVOLUTION_IMAGES "/splash.png");
-		return NULL;
-	}
-
-	new = g_object_new (e_splash_get_type (), NULL);
-	e_splash_construct (new, splash_image_pixbuf);
-
-	g_object_unref (splash_image_pixbuf);
-
-	return GTK_WIDGET (new);
-}
-
-
-/**
- * e_splash_add_icon:
- * @splash: A pointer to an ESplash widget
- * @icon_pixbuf: Pixbuf for the icon to be added
- * 
- * Add @icon_pixbuf to the @splash.
- * 
- * Return value: The total number of icons in the splash after the new icon has
- * been added.
- **/
-int
-e_splash_add_icon (ESplash *splash,
-		   GdkPixbuf *icon_pixbuf)
-{
-	ESplashPrivate *priv;
-	Icon *icon;
-
-	g_return_val_if_fail (splash != NULL, 0);
-	g_return_val_if_fail (E_IS_SPLASH (splash), 0);
-	g_return_val_if_fail (icon_pixbuf != NULL, 0);
-
-	priv = splash->priv;
-
-	icon = icon_new (splash, icon_pixbuf);
-	priv->icons = g_list_append (priv->icons, icon);
-
-	priv->num_icons ++;
-
-	schedule_relayout (splash);
-
-	return priv->num_icons;
-}
-
-/**
- * e_splash_set_icon_highlight:
- * @splash: A pointer to an ESplash widget
- * @num: Number of the icon whose highlight state must be changed
- * @highlight: Whether the icon must be highlit or not
- * 
- * Change the highlight state of the @num-th icon.
- **/
-void
-e_splash_set_icon_highlight  (ESplash *splash,
-			      int num,
-			      gboolean highlight)
-{
-	ESplashPrivate *priv;
-	Icon *icon;
-
-	g_return_if_fail (splash != NULL);
-	g_return_if_fail (E_IS_SPLASH (splash));
-
-	priv = splash->priv;
-
-	icon = (Icon *) g_list_nth_data (priv->icons, num);
-	g_return_if_fail (icon != NULL);
-
-	g_object_set((icon->canvas_item),
-			"pixbuf", highlight ? icon->light_pixbuf : icon->dark_pixbuf,
-			NULL);
-}
-
-
-E_MAKE_TYPE (e_splash, "ESplash", ESplash, class_init, init, PARENT_TYPE)
diff --git a/shell/e-splash.h b/shell/e-splash.h
deleted file mode 100644
index 209b815bfe..0000000000
--- a/shell/e-splash.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-splash.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SPLASH_H_
-#define _E_SPLASH_H_
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwindow.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SPLASH			(e_splash_get_type ())
-#define E_SPLASH(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SPLASH, ESplash))
-#define E_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SPLASH, ESplashClass))
-#define E_IS_SPLASH(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SPLASH))
-#define E_IS_SPLASH_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SPLASH))
-
-
-typedef struct _ESplash        ESplash;
-typedef struct _ESplashPrivate ESplashPrivate;
-typedef struct _ESplashClass   ESplashClass;
-
-struct _ESplash {
-	GtkWindow parent;
-
-	ESplashPrivate *priv;
-};
-
-struct _ESplashClass {
-	GtkWindowClass parent_class;
-};
-
-
-GtkType    e_splash_get_type            (void);
-void       e_splash_construct           (ESplash   *splash,
-					 GdkPixbuf *splash_image);
-GtkWidget *e_splash_new                 (void);
-
-int        e_splash_add_icon            (ESplash   *splash,
-					 GdkPixbuf *icon);
-void       e_splash_set_icon_highlight  (ESplash   *splash,
-					 int        num,
-					 gboolean   highlight);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_SPLASH_H_ */
diff --git a/shell/main.c b/shell/main.c
index 5cc459e528..215a5e0ce0 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -209,7 +209,7 @@ show_development_warning (GtkWindow *parent)
 	g_object_unref (client);
 
 	warning_dialog = gtk_dialog_new ();
-	gtk_window_set_title (GTK_WINDOW (warning_dialog), "Ximian Evolution " VERSION);
+	gtk_window_set_title (GTK_WINDOW (warning_dialog), "Evolution " VERSION);
 	gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE);
 	gtk_dialog_add_button (GTK_DIALOG (warning_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
 	e_dialog_set_transient_for (GTK_WINDOW (warning_dialog), GTK_WIDGET (parent));
@@ -228,9 +228,9 @@ show_development_warning (GtkWindow *parent)
 		/* xgettext:no-c-format */
 		/* Preview/Alpha/Beta version warning message */
 		_("Hi.  Thanks for taking the time to download this preview release\n"
-		  "of the Ximian Evolution groupware suite.\n"
+		  "of the Evolution groupware suite.\n"
 		  "\n"
-		  "This version of Ximian Evolution is not yet complete. It is getting close,\n"
+		  "This version of Evolution is not yet complete. It is getting close,\n"
 		  "but some features are either unfinished or do not work properly.\n"
 		  "\n"
 		  "If you want a stable version of Evolution, we urge you to uninstall\n"
@@ -252,7 +252,7 @@ show_development_warning (GtkWindow *parent)
 	gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
 	label = gtk_label_new (_("Thanks\n"
-				 "The Ximian Evolution Team\n"));
+				 "The Evolution Team\n"));
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
 	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
 
@@ -388,7 +388,7 @@ idle_cb (void *data)
 		corba_shell = bonobo_activation_activate_from_id (E_SHELL_OAFIID, 0, NULL, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION || corba_shell == CORBA_OBJECT_NIL) {
 			e_notice (NULL, GTK_MESSAGE_ERROR,
-				  _("Cannot register the Ximian Evolution shell."));
+				  _("Cannot register the Evolution shell."));
 			CORBA_exception_free (&ev);
 			bonobo_main_quit ();
 			return FALSE;
@@ -397,7 +397,7 @@ idle_cb (void *data)
 
 	default:
 		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  _("Cannot initialize the Ximian Evolution shell: %s"),
+			  _("Cannot initialize the Evolution shell: %s"),
 			  e_shell_construct_result_to_string (result));
 		CORBA_exception_free (&ev);
 		bonobo_main_quit ();