--- rmm-utils/Changelog	Sat May 31 07:07:17 2003
+++ rmm-utils-new/Changelog	Mon May 19 15:51:29 2003
@@ -1,3 +1,13 @@
+2002-05-31  Narayana Pattipati  <narayana.pattipati@wipro.com>
+
+	* gmedia_format.c/Makefile.am :
+	* gmedia_format.c/gmedia_format.c :
+	* gmedia_format.c/gformat_stubs.c :
+	* gmedia_format.c/gmedia_format.h :
+	* gmedia_format.c/gmedia_format.glade2 : New file
+	Fix the UI review comments on gmedia_format.
+	Fixes bugtraq bug#4816531/bugzilla bug#105796.
+
 2002-03-06  Narayana Pattipati  <narayana.pattipati@wipro.com>
 
 	* configure.in :
--- rmm-utils/gmedia_format/Makefile.am	Sat May 31 07:09:03 2003
+++ rmm-utils-new/gmedia_format/Makefile.am	Mon May 19 15:56:06 2003
@@ -8,10 +8,12 @@ INCLUDES = \
         -DGTK_DISABLE_DEPRECATED                                \
         -DGDK_PIXBUF_DISABLE_DEPRECATED                         \
         -DGNOME_DISABLE_DEPRECATED                              \
+	-DGMEDIA_FORMAT_GLADEDIR=\""$(gladedir)"\"		\
 	-L/usr/dt/lib						\
         -DSERVERDIR=\"$(libexecdir)\"				\
         $(rmm_utils_CFLAGS)
 
+gladedir = $(datadir)/gnome/rmm-utils/glade/
 
 libexec_PROGRAMS = gmedia_format
 
@@ -22,5 +24,9 @@ gmedia_format_SOURCES = \
 	gcommand.c gcommand.h \
 	gutils_fmt.c gutils_fmt.h
 
+glade_DATA =	\
+	gmedia_format.glade2
+
 gmedia_format_LDADD = $(rmm_utils_LIBS)  -lSDtRmedia
 
+EXTRA_DIST = $(glade_DATA)
--- rmm-utils/gmedia_format/gmedia_format.c	Sat May 31 07:09:03 2003
+++ rmm-utils-new/gmedia_format/gmedia_format.c	Sat May 31 07:03:39 2003
@@ -23,14 +23,15 @@
 
 #include <gnome.h>
 #include <libgnomeui/gnome-about.h>
+#include <glade/glade-xml.h>
 #include <stdio.h>
 #include <string.h>
 #include "gmedia_format.h"
 #include "gformat_stubs.h"
 
-void			make_gui();
+void			make_gui(GladeXML *gui);
 static void		set_relation(GtkWidget *widget, GtkLabel *label);
-gboolean		delete_cb(GtkDialog *dialog, GdkEventAny *event, gpointer data);
+gboolean		delete_cb(GtkWindow *window, GdkEventAny *event, gpointer data);
 static GtkWidget*	rmm_dialog_add_buttons (GtkDialog *dialog, const gchar* text,
 						const gchar* stock_id, gint response_id);
 
@@ -42,6 +43,7 @@ int main(int argc, char *argv[])
 	static char     *mountpointarg, *devpatharg = NULL;
 	char            *title;
 	poptContext     ctx;
+	GladeXML	*gui;
 	struct poptOption options[] = {
 		{
 			NULL,
@@ -86,207 +88,93 @@ int main(int argc, char *argv[])
 	}
 	fApp = (FormatApp *) g_malloc(sizeof(FormatApp));
 
+	gui = glade_xml_new(GMEDIA_FORMAT_GLADEDIR "gmedia_format.glade2",
+				"Gmedia_Format", NULL);
+	if (!gui) {
+		g_warning("Could not find gmedia_format.glade2, reinstall gmedia_format.\n");
+		return NULL;
+	}
+
 	/* Copying the device name to a variable which can be used Later */ 
 	device_name = g_strdup (argv[2]);
 
-	title = g_malloc (strlen ("Gnome Media Format - ") + strlen (argv[2]) + 1);
-	strcpy (title, "Gnome Media Format - ");
-	title = strcat (title, (const char *)argv[2]);
+	title = g_malloc(strlen (argv[2]) + strlen (_(" Format Media")) + 1);
+	strcpy(title, (const char *)argv[2]);
+	title = strcat(title, _(" Format Media"));
+
 	format_in_progress = FALSE;
 
-	fApp->dlg = gtk_dialog_new_with_buttons(title,
-						 NULL,
-						 GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-						 NULL); 
+	fApp->window = glade_xml_get_widget(gui, "Gmedia_Format");
+	gtk_window_set_title(GTK_WINDOW (fApp->window), title);
 
-	g_signal_connect(G_OBJECT(fApp->dlg), "delete_event",
+	g_signal_connect(G_OBJECT(fApp->window), "delete_event",
 			   G_CALLBACK(delete_cb), NULL);
 
-	make_gui();
+	make_gui(gui);
 	init_ui_values();
 
 	gtk_main();
+
 	free(title);
+	g_object_unref (G_OBJECT (gui));
 
 	return 0;
 }
 
 
-void make_gui()
+void make_gui(GladeXML *gui)
 {
-	GtkTooltips *tooltips;
-
-	/*
-	 * Try setting a table as the main container for all the seperate
-	 * parts
-	 */
-	fApp->table = gtk_table_new(5, 1, FALSE);
-
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG (fApp->dlg)->vbox), fApp->table,
-		 FALSE, FALSE,0);
-
-	/*
-	 * Define the label for the warning and attach to the table what are
-	 * the 5's for??
-	 */
-
-	fApp->intro_label = gtk_label_new(_("Formatting is a two stage process involving a Low-level Format\n which prepares the medium for a file system, and then\n construction of the file system.\n\nWARNING:  THIS PROCESS IS NOT REVERSIBLE."));
+	fApp->table = glade_xml_get_widget (gui, "table1");
 
-	gtk_table_attach(GTK_TABLE(fApp->table), fApp->intro_label, 0, 1, 0, 1,
-		       GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 20);
+	fApp->quick_radio_button = glade_xml_get_widget (gui, "quick_rb");
 
+	g_signal_connect (G_OBJECT (fApp->quick_radio_button), "toggled",
+			  G_CALLBACK (quick_radio_cb), NULL);
 
-	fApp->vbox = gtk_vbox_new(FALSE, 10);	/* check params */
-	fApp->vbox1 = gtk_vbox_new(FALSE, 10);	/* check what the parameters*/
-	fApp->table1 = gtk_table_new(5, 7, FALSE);
+	fApp->long_radio_button = glade_xml_get_widget (gui, "long_rb");
 
+	g_signal_connect (G_OBJECT (fApp->long_radio_button), "toggled",
+			  G_CALLBACK (long_radio_cb), NULL);
 
-	
-	fApp->lowlevel_label = gtk_label_new(_("Low level formatting"));
-	gtk_label_set_justify(GTK_LABEL(fApp->lowlevel_label), GTK_JUSTIFY_LEFT);
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->lowlevel_label, 1, 2, 0, 1,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->quick_radio_button = gtk_radio_button_new_with_mnemonic(NULL, _("_Quick Format"));
+	fApp->fs_type_label = glade_xml_get_widget (gui, "fs_label");
+	fApp->option_menu = glade_xml_get_widget (gui, "optionmenu");
 
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->quick_radio_button, 1, 2, 1, 2,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
+	set_relation (fApp->option_menu, GTK_LABEL (fApp->fs_type_label));
 
-	g_signal_connect(G_OBJECT(fApp->quick_radio_button), "toggled",
-			   G_CALLBACK(quick_radio_cb), NULL);
+	fApp->volume_label = glade_xml_get_widget (gui, "volume_label");
 
-	fApp->long_radio_button = gtk_radio_button_new_with_mnemonic(gtk_radio_button_get_group(GTK_RADIO_BUTTON(fApp->quick_radio_button)), _("_Long Format"));
+	fApp->entry = glade_xml_get_widget (gui, "volume_entry");
 
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fApp->quick_radio_button) , TRUE);
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->long_radio_button, 1, 2, 2, 3,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-	g_signal_connect(G_OBJECT(fApp->long_radio_button), "toggled",
-			 G_CALLBACK(long_radio_cb), NULL);
+	set_relation (fApp->entry, GTK_LABEL(fApp->volume_label));
 
+	fApp->slice_button = glade_xml_get_widget (gui, "slice_button");
 
+	g_signal_connect (G_OBJECT(fApp->slice_button), "clicked",
+			  G_CALLBACK (slice_cb), NULL);
 
-	/*
-	 * define a vbox to put the label, button and text area into then add
-	 * vbox to table
-	 */
+	/* Adding Help, Format, Cancel buttons */
 
-	fApp->fs_label = gtk_label_new(_("Construct File System"));
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->fs_label, 4, 5, 0, 1,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
+	fApp->help_button = glade_xml_get_widget (gui, "help_button");
+	g_signal_connect (GTK_BUTTON (fApp->help_button),
+			  "clicked",
+			  G_CALLBACK (help_cb),
+			  fApp->window);
 	
-	fApp->separator1 = gtk_vseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator1, 0, 1, 0, 5,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator2 = gtk_vseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator2, 2, 3, 0, 5,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator3 = gtk_vseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator3, 3, 4, 0, 5,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator4 = gtk_vseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator4, 6, 7, 0, 5,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator5 = gtk_hseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator5, 0, 3, 4, 5,
-			 GTK_EXPAND | GTK_FILL | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator6 = gtk_hseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator6, 3, 7, 4, 5,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	fApp->separator7 = gtk_hseparator_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->separator7, 5, 7, 0, 1,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-
-	fApp->fs_type_label = gtk_label_new_with_mnemonic(_("_File System Type: "));
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->fs_type_label, 4, 5, 1, 2,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	/*
-	 * Create the option menu here, but create the menu items dynamically
-	 * when init_ui_values calls init_fs_buttons
-	 */
-
-	fApp->option_menu = gtk_option_menu_new();
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->option_menu, 5, 6, 1, 2,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	set_relation(fApp->option_menu, GTK_LABEL(fApp->fs_type_label));
-
-	fApp->volume_label = gtk_label_new_with_mnemonic(_("_Volume Label: "));
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->volume_label, 4, 5, 2, 3,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	/*
-	 * Create the option menu here, but create the menu items dynamically
-	 * when init_ui_values calls init_fs_buttons
-	 */
-
-	fApp->entry = gtk_entry_new();
-	/*gtk_entry_set_max_length(GTK_ENTRY(fApp->entry),50);*/
-	gtk_entry_set_max_length(GTK_ENTRY(fApp->entry),11);
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->entry, 5, 6, 2, 3,
-			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-	set_relation(fApp->entry, GTK_LABEL(fApp->volume_label));
-
-	gtk_box_pack_start(GTK_BOX(fApp->vbox1), fApp->table1, FALSE, FALSE, 0);
-
-	fApp->slice_button = gtk_button_new_with_mnemonic(_("Slice _Editor..."));
-	gtk_table_attach(GTK_TABLE(fApp->table1), fApp->slice_button, 5, 6, 3, 4,
-				GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-	g_signal_connect(G_OBJECT(fApp->slice_button), "clicked",
-			   G_CALLBACK(slice_cb), NULL);
-
-
-	gtk_table_attach(GTK_TABLE(fApp->table), fApp->vbox1, 0, 1, 1, 2,
-		       GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 10);
-
-  	gtk_button_box_set_layout (GTK_BUTTON_BOX 
-		(GTK_DIALOG(fApp->dlg)->action_area), GTK_BUTTONBOX_SPREAD);
-
-	/*
-	 *   Adding Help, Format, Cancel buttons 
- 	*/
-
-	fApp->help_button =  gtk_dialog_add_button(GTK_DIALOG (fApp->dlg), GTK_STOCK_HELP, GTK_RESPONSE_YES);
-	gtk_widget_ref (fApp->help_button);
-	g_object_set_data_full (G_OBJECT(fApp->dlg),"fApp->help_button",
-	fApp->help_button , (GtkDestroyNotify) gtk_widget_unref);
-
-	fApp->cancel_button = rmm_dialog_add_buttons(GTK_DIALOG (fApp->dlg),_("_Cancel"),
-						     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_widget_ref (fApp->cancel_button);
-	g_object_set_data_full (G_OBJECT(fApp->dlg),"fApp->cancel_button",
-				fApp->cancel_button , (GtkDestroyNotify) gtk_widget_unref);
-
-	fApp->format_button =rmm_dialog_add_buttons(GTK_DIALOG (fApp->dlg),_("_Format"),
-						    GTK_STOCK_APPLY,GTK_RESPONSE_APPLY);
-	gtk_widget_ref (fApp->format_button);
-	g_object_set_data_full (G_OBJECT(fApp->dlg),"fApp->format_button",
-				fApp->format_button , (GtkDestroyNotify) gtk_widget_unref);
-	gtk_dialog_set_default_response (GTK_DIALOG(fApp->dlg), GTK_RESPONSE_HELP);
-
-	tooltips = gtk_tooltips_new();
-	gtk_tooltips_set_tip(tooltips, fApp->format_button,
-				_("Press button to format"), NULL);
-
-
-	g_signal_connect(GTK_BUTTON(fApp->cancel_button),"clicked",G_CALLBACK(button_delete_cb),fApp->dlg);
-	g_signal_connect(GTK_BUTTON(fApp->help_button),"clicked",G_CALLBACK(help_cb),fApp->dlg);
-	g_signal_connect(GTK_BUTTON(fApp->format_button),"clicked",G_CALLBACK(format_cb),GTK_ENTRY(fApp->entry));
-
-
-	gtk_widget_show_all(fApp->dlg);
-
-	gtk_widget_set_sensitive(GTK_WIDGET(fApp->slice_button), 0);
+	fApp->cancel_button = glade_xml_get_widget (gui, "cancel_button");
+	g_signal_connect (GTK_BUTTON (fApp->cancel_button),
+			  "clicked",
+			  G_CALLBACK (button_delete_cb),
+			  fApp->window);
+
+	fApp->format_button = glade_xml_get_widget (gui, "format_button");
+	g_signal_connect (GTK_BUTTON (fApp->format_button),
+			  "clicked",
+			  G_CALLBACK (format_cb),
+			  GTK_ENTRY (fApp->entry));
 
+	gtk_widget_show_all (fApp->window);
 
+	gtk_widget_set_sensitive (GTK_WIDGET (fApp->slice_button), 0);
 }
 
 void init_fs_buttons(FileSystem * fs_list, int ntypes)
@@ -473,19 +361,27 @@ static void set_relation(GtkWidget *widg
 
 void create_progress_bar()
 {
+	GtkWidget *hbox;
 
- 	fApp->progress_bar = gtk_progress_bar_new();
-
-
-	fApp->progress_bar_label = gtk_label_new(_("Low Level Format Progress "));
-	gtk_table_attach(GTK_TABLE(fApp->table), fApp->progress_bar_label, 0, 1, 2, 3,
-			GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_SHRINK, 0, 0);
-
-	gtk_table_attach(GTK_TABLE(fApp->table), fApp->progress_bar, 0, 1, 3, 4,
-			GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL, 5, 20);
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_widget_show(hbox);
+	gtk_table_attach(GTK_TABLE (fApp->table), hbox, 0, 1, 3, 4,
+			 (GtkAttachOptions) (GTK_SHRINK | GTK_FILL),
+			 (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), 
+			  0, 0);
+	gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
+
+	fApp->progress_bar_label = gtk_label_new(_("Progress:"));
+	gtk_widget_show(fApp->progress_bar_label);
+	gtk_box_pack_start(GTK_BOX(hbox), fApp->progress_bar_label, FALSE, FALSE, 5);
+	gtk_label_set_justify(GTK_LABEL(fApp->progress_bar_label), GTK_JUSTIFY_LEFT);
+	fApp->progress_bar = gtk_progress_bar_new ();
+	gtk_widget_show (fApp->progress_bar);
+	gtk_box_pack_start (GTK_BOX (hbox), fApp->progress_bar, TRUE, TRUE, 0);
 
 	gtk_progress_set_show_text (GTK_PROGRESS_BAR (fApp->progress_bar), TRUE);
-	gtk_widget_show (fApp->progress_bar_label);
+	set_relation (fApp->progress_bar, GTK_LABEL (fApp->progress_bar_label));
+
 	gtk_widget_show (fApp->progress_bar);
 }
 
@@ -586,7 +482,7 @@ gboolean show_message(GtkWindow *window)
 }
 
 
-gboolean delete_cb(GtkDialog *w, GdkEventAny *e, gpointer data)
+gboolean delete_cb(GtkWindow *w, GdkEventAny *e, gpointer data)
 {
 	if (format_in_progress) {
 
--- rmm-utils/gmedia_format/gformat_stubs.c	Sat May 31 07:09:03 2003
+++ rmm-utils-new/gmedia_format/gformat_stubs.c	Mon May 19 15:56:06 2003
@@ -90,7 +90,7 @@ void format_cb(GtkWidget * widget, gpoin
 	enable_ui_vol_name_entry(FALSE);
 
 	g_signal_handlers_block_by_func(G_OBJECT(fApp->cancel_button),
-					button_delete_cb,fApp->dlg);
+					button_delete_cb,fApp->window);
 
 	create_progress_warn_file();
 	status = determine_media_type();
@@ -130,7 +130,7 @@ void format_cb(GtkWidget * widget, gpoin
 	}
 
 	g_signal_handlers_unblock_by_func(G_OBJECT(fApp->cancel_button),
-					  button_delete_cb,fApp->dlg);
+					  button_delete_cb,fApp->window);
 
 }
 
@@ -207,12 +207,12 @@ void show_modal_message(int message_code
 	}
 
 	if (message_code == MSG_FORMAT_DONE)
-		dialog = gtk_message_dialog_new (GTK_WINDOW (fApp->dlg), 							 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+		dialog = gtk_message_dialog_new (GTK_WINDOW (fApp->window), 							 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_INFO,
 						 GTK_BUTTONS_OK,
 						 "%s", dialog_msg);
 	else
-		dialog = gtk_message_dialog_new (GTK_WINDOW (fApp->dlg),
+		dialog = gtk_message_dialog_new (GTK_WINDOW (fApp->window),
 						 GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						 GTK_MESSAGE_ERROR,
 						 GTK_BUTTONS_OK,
--- rmm-utils/gmedia_format/gmedia_format.h	Sat May 31 07:09:03 2003
+++ rmm-utils-new/gmedia_format/gmedia_format.h	Mon May 19 15:56:06 2003
@@ -22,34 +22,15 @@
 #include "format_utils.h"
 
 typedef struct {
-	GtkWidget      *dlg;
+	GtkWidget      *window;
 	GtkWidget      *table;
-	GtkWidget      *table1;
-	GtkWidget	   *table2;
-	GtkWidget	   *table3;
-	GtkWidget      *intro_label;
-	GtkWidget      *lowlevel_label;
-	GtkWidget      *radio_label;
-	GtkWidget      *fs_label;
 	GtkWidget      *fs_type_label;
 	GtkWidget      *volume_label;
-	GtkWidget      *separator1;
-	GtkWidget      *separator2;
-	GtkWidget      *separator3;
-	GtkWidget      *separator4;
-	GtkWidget      *separator5;
-	GtkWidget      *separator6;
-	GtkWidget      *separator7;
-	GtkWidget      *vbox;
-	GtkWidget      *vbox1;
 	GtkWidget      *menu;
 	GtkWidget      *option_menu;
 	GtkWidget      *quick_radio_button;
 	GtkWidget      *long_radio_button;
-	GSList         *group;
 	GtkWidget      *progress_bar;
-	GtkWidget      *hbox;
-	GtkWidget      *hbox1;
 	GtkWidget     **fs_buttons;
 	GtkWidget      *entry;
 	GtkWidget      *format_button;
--- /dev/null	Sat May 31 07:11:47 2003
+++ rmm-utils-new/gmedia_format/gmedia_format.glade2	Sat May 31 07:03:45 2003
@@ -0,0 +1,385 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkWindow" id="Gmedia_Format">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">False</property>
+  <property name="default_width">390</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+
+  <child>
+    <widget class="GtkVBox" id="vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkTable" id="table1">
+	  <property name="visible">True</property>
+	  <property name="n_rows">5</property>
+	  <property name="n_columns">1</property>
+	  <property name="homogeneous">False</property>
+	  <property name="row_spacing">3</property>
+	  <property name="column_spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="intro_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Warning:  This process is not reversible.</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_CENTER</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_padding">1</property>
+	      <property name="y_padding">15</property>
+	      <property name="x_options">expand|shrink</property>
+	      <property name="y_options">expand|shrink|fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame2">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkTable" id="table3">
+		  <property name="border_width">5</property>
+		  <property name="visible">True</property>
+		  <property name="n_rows">3</property>
+		  <property name="n_columns">2</property>
+		  <property name="homogeneous">False</property>
+		  <property name="row_spacing">8</property>
+		  <property name="column_spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="fs_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">File _system type:</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_CENTER</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">1</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">10</property>
+		      <property name="ypad">0</property>
+		      <property name="mnemonic_widget">optionmenu</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkEntry" id="volume_entry">
+		      <property name="height_request">23</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">True</property>
+		      <property name="visibility">True</property>
+		      <property name="max_length">11</property>
+		      <property name="text" translatable="yes"></property>
+		      <property name="has_frame">True</property>
+		      <property name="invisible_char" translatable="yes">*</property>
+		      <property name="activates_default">False</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="slice_button">
+		      <property name="height_request">27</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Slice _Editor...</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
+		      <property name="y_padding">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="volume_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Volume name:</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_CENTER</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">1</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">10</property>
+		      <property name="ypad">0</property>
+		      <property name="mnemonic_widget">volume_entry</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkOptionMenu" id="optionmenu">
+		      <property name="height_request">27</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="history">-1</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options">fill</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="construct_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Construct File System&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">2</property>
+	      <property name="bottom_attach">3</property>
+	      <property name="x_padding">10</property>
+	      <property name="y_padding">10</property>
+	      <property name="x_options">expand|shrink|fill</property>
+	      <property name="y_options">expand|shrink|fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFixed" id="fixed1">
+	      <property name="visible">True</property>
+
+	      <child>
+		<widget class="GtkButton" id="help_button">
+		  <property name="width_request">83</property>
+		  <property name="height_request">32</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-help</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		</widget>
+		<packing>
+		  <property name="x">0</property>
+		  <property name="y">4</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="format_button">
+		  <property name="width_request">83</property>
+		  <property name="height_request">32</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">_Format</property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		</widget>
+		<packing>
+		  <property name="x">286</property>
+		  <property name="y">4</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkButton" id="cancel_button">
+		  <property name="width_request">83</property>
+		  <property name="height_request">32</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label">gtk-cancel</property>
+		  <property name="use_stock">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		</widget>
+		<packing>
+		  <property name="x">190</property>
+		  <property name="y">4</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
+	      <property name="x_padding">10</property>
+	      <property name="y_padding">6</property>
+	      <property name="x_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame1">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkTable" id="table2">
+		  <property name="border_width">5</property>
+		  <property name="visible">True</property>
+		  <property name="n_rows">1</property>
+		  <property name="n_columns">2</property>
+		  <property name="homogeneous">False</property>
+		  <property name="row_spacing">0</property>
+		  <property name="column_spacing">0</property>
+
+		  <child>
+		    <widget class="GtkRadioButton" id="quick_rb">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Quick format</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_padding">8</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkRadioButton" id="long_rb">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Long format</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		      <property name="group">quick_rb</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_padding">8</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="lowlevel_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Low Level Formatting&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_padding">10</property>
+	      <property name="y_padding">4</property>
+	      <property name="x_options">expand|shrink|fill</property>
+	      <property name="y_options">expand|shrink|fill</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
