Change this to let the Wizard provide an array of title/icon/control

	* Evolution-Wizard.idl: Change this to let the Wizard provide an
	array of title/icon/control triplets, instead of just controls, so
	the shell doesn't need to know the name of each page a priori.

	* glade/evolution-startup-wizard.glade: Remove the mailer-specific
	pages, which are now inserted at run time based on info from the
	mailer.

	* evolution-wizard.c: Update for new idl.
	(evolution_wizard_new): Now takes no arguments.
	(evolution_wizard_add_page): New function to add page info to the
	wizard.

	* e-shell-startup-wizard.c: Various renamings to make this
	slightly less mailer-centric, though it still explicitly launches
	the mailer startup wizard.
	(make_corba_page): Replaces make_identity_page, make_receive_page,
	etc. Uses the new Wizard idl to generically create a page and
	insert it into the druid.
	(e_shell_startup_wizard_create): Update

svn path=/trunk/; revision=20053

1 files changed, 96 insertions, 244 deletions

diff --git a/shell/glade/evolution-startup-wizard.glade b/shell/glade/evolution-startup-wizard.glade
index 73c8c987a3..2e06c7c04e 100644
--- a/shell/glade/evolution-startup-wizard.glade
+++ b/shell/glade/evolution-startup-wizard.glade
@@ -1,255 +1,107 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd" >
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
-  <requires lib="gnome" />
-
-  <widget class="GtkWindow" id="startup-wizard">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">Evolution Setup Assistant</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="modal">no</property>
-    <property name="allow_shrink">no</property>
-    <property name="allow_grow">yes</property>
-    <property name="window-position">GTK_WIN_POS_NONE</property>
-
-    <child>
-      <widget class="GnomeDruid" id="startup-druid">
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GnomeDruidPageEdge" id="start-page">
-            <property name="title" translatable="yes">Welcome</property>
-            <property name="text" translatable="yes">Welcome to Evolution. The next few screens will allow
+<requires lib="gnome"/>
+
+<widget class="GtkWindow" id="startup-wizard">
+  <property name="title" translatable="yes">Evolution Setup Assistant</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+
+  <child>
+    <widget class="GnomeDruid" id="startup-druid">
+      <property name="border_width">4</property>
+      <property name="visible">True</property>
+      <property name="show_help">False</property>
+
+      <child>
+	<widget class="GnomeDruidPageEdge" id="start-page">
+	  <property name="visible">True</property>
+	  <property name="position">GNOME_EDGE_START</property>
+	  <property name="title" translatable="yes">Welcome</property>
+	  <property name="text" translatable="yes">Welcome to Evolution. The next few screens will allow
 Evolution to connect to your email accounts, and to import
 files from other applications. 
 
 Please click the &quot;Forward&quot; button to continue. </property>
-            <property name="logo_image">evolution.png</property>
-            <property name="position">GNOME_EDGE_START</property>
-            <property name="visible">yes</property>
-            <property name="title_color">#ffffff</property>
-            <property name="text_color">#000000</property>
-            <property name="background_color">#000001</property>
-            <property name="logo_background_color">#010101</property>
-            <property name="textbox_color">#ffffff</property>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="identity-page">
-            <property name="title" translatable="yes">Identity</property>
-            <property name="logo">mail-config-druid-identity.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox2">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="receive-page">
-            <property name="title" translatable="yes">Receiving Email</property>
-            <property name="logo">mail-config-druid-receive.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox3">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="extra-page">
-            <property name="title" translatable="yes">Receiving Email</property>
-            <property name="logo">mail-config-druid-receive.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox8">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="send-page">
-            <property name="title" translatable="yes">Sending Email</property>
-            <property name="logo">mail-config-druid-send.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox5">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="management-page">
-            <property name="title" translatable="yes">Account Management</property>
-            <property name="logo">mail-config-druid-account-name.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox9">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="timezone-page">
-            <property name="title" translatable="yes">Timezone </property>
-            <property name="logo">timezone-48.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox6">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageStandard" id="import-page">
-            <property name="title" translatable="yes">Importing Files</property>
-            <property name="logo">import.png</property>
-            <property name="visible">yes</property>
-            <property name="title_foreground">#ffffff</property>
-            <property name="background">#000001</property>
-            <property name="logo_background">#010101</property>
-
-            <child internal-child="vbox">
-              <widget class="GtkVBox" id="druid-vbox7">
-                <property name="homogeneous">no</property>
-                <property name="spacing">0</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <placeholder />
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">0</property>
-                <property name="expand">yes</property>
-                <property name="fill">yes</property>
-              </packing>
-            </child>
-          </widget>
-        </child>
-
-        <child>
-          <widget class="GnomeDruidPageEdge" id="done-page">
-            <property name="title" translatable="yes">Done</property>
-            <property name="text" translatable="yes">You have successfully entered all of the information
+	  <property name="title_color">#ffffffffffff</property>
+	  <property name="text_color">#000000000000</property>
+	  <property name="background_color">#000000000101</property>
+	  <property name="logo_background_color">#010101010101</property>
+	  <property name="textbox_color">#ffffffffffff</property>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GnomeDruidPageStandard" id="timezone-page">
+	  <property name="visible">True</property>
+	  <property name="title" translatable="yes">Timezone </property>
+	  <property name="title_foreground">#e9e0bfffe798</property>
+	  <property name="background">#08c8082be798</property>
+	  <property name="logo_background">#6b18081ce1d3</property>
+	  <property name="logo">timezone-48.png</property>
+
+	  <child internal-child="vbox">
+	    <widget class="GtkVBox" id="druid-vbox6">
+	      <property name="border_width">16</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<placeholder/>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GnomeDruidPageStandard" id="import-page">
+	  <property name="visible">True</property>
+	  <property name="title" translatable="yes">Importing Files</property>
+	  <property name="title_foreground">#e9e0bfffe798</property>
+	  <property name="background">#0ad8082be798</property>
+	  <property name="logo_background">#6b18081ce1d3</property>
+	  <property name="logo">import.png</property>
+
+	  <child internal-child="vbox">
+	    <widget class="GtkVBox" id="druid-vbox7">
+	      <property name="border_width">16</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<placeholder/>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+      </child>
+
+      <child>
+	<widget class="GnomeDruidPageEdge" id="done-page">
+	  <property name="visible">True</property>
+	  <property name="position">GNOME_EDGE_FINISH</property>
+	  <property name="title" translatable="yes">Done</property>
+	  <property name="text" translatable="yes">You have successfully entered all of the information
 needed to set up Evolution. 
 
 Click the &quot;Apply&quot; button to save your settings. </property>
-            <property name="logo_image">evolution.png</property>
-            <property name="position">GNOME_EDGE_FINISH</property>
-            <property name="visible">yes</property>
-            <property name="title_color">#ffffff</property>
-            <property name="text_color">#000000</property>
-            <property name="background_color">#000001</property>
-            <property name="logo_background_color">#010101</property>
-            <property name="textbox_color">#ffffff</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-  </widget>
+	  <property name="title_color">#ffffffffffff</property>
+	  <property name="text_color">#000000000000</property>
+	  <property name="background_color">#000000000101</property>
+	  <property name="logo_background_color">#010101010101</property>
+	  <property name="textbox_color">#ffffffffffff</property>
+	</widget>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>