added Susan's new icons for service registration and configuration upload

       added Susan's new icons for service registration and configuration
       upload

8 files changed, 57 insertions, 5 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 07f84d12b..c8c66ba3e 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,22 @@
+2000-04-13  Andy Hertzfeld <andy@eazel.com>
+
+	added Susan's images to service registration and configuration upload
+	
+	* configure.in:
+	added components/services/startup/icons/Makefile
+	* components/services/startup/Makefile.am
+	added icons directory to Makefile
+	* components/services/startup/icons/Makefile.am
+	Makefile for a new directory to hold the images
+	* components/services/startup/icons/.cvsignore
+	.cvsignore file for the new directory
+	* components/services/startup/icons/config-gather.png:
+	new icon for configuration gathering form
+	* components/services/startup/icons/register.png:
+	new icon for registration form
+	* components/services/startup/nautilus-service-startup-view.c:
+	added code to display the new icons
+
 2000-04-13  Darin Adler  <darin@eazel.com>
 
 	Updated for new GNOME VFS.
diff --git a/components/services/startup/Makefile.am b/components/services/startup/Makefile.am
index 01b063d01..518ba52dc 100644
--- a/components/services/startup/Makefile.am
+++ b/components/services/startup/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=icons
+
 CPPFLAGS =					\
 	-DPREFIX=\"$(prefix)\"
 	-DG_LOG_DOMAIN=\"Nautilus-Services\"
diff --git a/components/services/startup/icons/.cvsignore b/components/services/startup/icons/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/components/services/startup/icons/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/components/services/startup/icons/Makefile.am b/components/services/startup/icons/Makefile.am
new file mode 100644
index 000000000..3d5ebcb96
--- /dev/null
+++ b/components/services/startup/icons/Makefile.am
@@ -0,0 +1,7 @@
+icondir = $(datadir)/pixmaps/nautilus
+
+icon_DATA =					\
+	config-gather.png			\
+	register.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/startup/icons/config-gather.png b/components/services/startup/icons/config-gather.png
new file mode 100644
index 000000000..0791294b5
--- /dev/null
+++ b/components/services/startup/icons/config-gather.png
diff --git a/components/services/startup/icons/register.png b/components/services/startup/icons/register.png
new file mode 100644
index 000000000..bd56b4d2f
--- /dev/null
+++ b/components/services/startup/icons/register.png
diff --git a/components/services/startup/nautilus-service-startup-view.c b/components/services/startup/nautilus-service-startup-view.c
index 7ead4bf3c..b9ccf6c5c 100644
--- a/components/services/startup/nautilus-service-startup-view.c
+++ b/components/services/startup/nautilus-service-startup-view.c
@@ -440,7 +440,7 @@ static void setup_form_title(GtkBox *container, const gchar* title_text)
 
 static void setup_signup_form(NautilusServicesContentView *view)
 {
-	gchar *message;
+	gchar *message, *file_name;
 	GtkTable *table;
 	GtkWidget *temp_widget;
 	GtkWidget *temp_box, *config_button, *config_label;
@@ -453,13 +453,23 @@ static void setup_signup_form(NautilusServicesContentView *view)
 	/* set up the title */	
 	setup_form_title(GTK_BOX(view->details->form), "Eazel Service Registration Form");
 	
-	/* display a descriptive message */
+	/* display an image and a descriptive message */
 	/* FIXME: get the text from a file or from the service */
+	temp_box = gtk_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(view->details->form), temp_box, 0, 0, 12);			
+ 	gtk_widget_show (temp_box);
+
+ 	file_name = gnome_pixmap_file ("nautilus/register.png");
+  	temp_widget = GTK_WIDGET (gnome_pixmap_new_from_file (file_name));
+	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 8);		
+  	gtk_widget_show(temp_widget);
+  	g_free (file_name);
+	
 	message = "Use this form to register for the Eazel Service, free of charge.  It will give you a storage space on the web that is easily accessed from Nautilus, and access to a customized software catalog that will allow you to install new applications with a single click.";
 	temp_widget = gtk_label_new (message);
  	gtk_label_set_line_wrap(GTK_LABEL(temp_widget), TRUE);
 	
-	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
+	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
 
 	/* allocate a table to hold the signup form */
@@ -544,7 +554,7 @@ static void setup_signup_form(NautilusServicesContentView *view)
 
 static void setup_config_form(NautilusServicesContentView *view)
 {
-	gchar *message;
+	gchar *message, *file_name;
 	GtkWidget *temp_widget;
 	GtkWidget *temp_box, *config_button, *config_label;
 	
@@ -569,11 +579,22 @@ static void setup_config_form(NautilusServicesContentView *view)
 	
 	/* make label containing text about uploading the configuration data */
 	/* FIXME: It should get this text from a file or from the service */
+	
+	temp_box = gtk_hbox_new(FALSE, 4);
+	gtk_box_pack_start(GTK_BOX(view->details->form), temp_box, 0, 0, 12);			
+ 	gtk_widget_show (temp_box);
+
+ 	file_name = gnome_pixmap_file ("nautilus/config-gather.png");
+  	temp_widget = GTK_WIDGET (gnome_pixmap_new_from_file (file_name));
+	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 8);		
+  	gtk_widget_show(temp_widget);
+  	g_free (file_name);
+	
 	message = "With your permission, the Eazel service will gather data about the hardware and software configuration of your system so it can provide you with a customized software catalog with one-click installation.  Your configuration data will be kept strictly confidential and will not be used for any other purpose.  Click the button below to begin gathering the data.";
 	temp_widget = gtk_label_new (message);
  	gtk_label_set_line_wrap(GTK_LABEL(temp_widget), TRUE);
 	
-	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
+	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
 
 	/* add buttons for accepting and declining */	
diff --git a/configure.in b/configure.in
index 7be1aeac1..087023daa 100644
--- a/configure.in
+++ b/configure.in
@@ -171,6 +171,7 @@ components/rpmview/Makefile
 components/sample/Makefile
 components/services/Makefile
 components/services/startup/Makefile
+components/services/startup/icons/Makefile
 po/Makefile.in
 intl/Makefile
 ])