--- gnome-panel/gnome-panel/gnome-panel-screenshot.c-bak	Mon Apr 29 22:30:10 2002
+++ gnome-panel/gnome-panel/gnome-panel-screenshot.c	Sun May 12 17:01:10 2002
@@ -56,6 +56,9 @@
 #include <langinfo.h>
 #endif
 
+#include <gtk/gtktogglebutton.h>
+#include <gtk/gtkspinbutton.h>
+
 /* How far down the window tree will we search when looking for top-level
  * windows? Some window managers doubly-reparent the client, so account
  * for that, and add some slop.
@@ -67,6 +70,8 @@
 static GtkWidget *preview = NULL;
 static GdkPixbuf *screenshot = NULL;
 static GdkPixbuf *preview_image = NULL;
+static gboolean window = TRUE;
+static guint delay = 0;
 static char *web_dir;
 static char *desktop_dir;
 static const char *home_dir;
@@ -79,6 +84,9 @@
 	  { "text/uri-list", 0, 0 } };
 
 /* some prototypes for the glade autoconnecting sutff */
+void on_window_rbutton_toggled (GtkWidget *toggle, gpointer data);
+void on_screen_rbutton_toggled (GtkWidget *toggle, gpointer data);
+void on_delay_spin_value_changed (GtkWidget *spin, gpointer data);
 void on_save_rbutton_toggled (GtkWidget *toggle, gpointer data);
 void on_preview_expose_event (GtkWidget *drawing_area,
 			      GdkEventExpose *event,
@@ -91,8 +99,13 @@
 int on_toplevel_key_press_event (GtkWidget *widget, GdkEventKey *key);
 
 /* some local prototypes */
+static void setup_busy (gboolean busy);
+
 static gchar * add_file_to_path (const gchar *path);
 
+static void take_window_shot (void);
+static void take_screen_shot (void);
+
 /* helper functions */
 /* This code is copied from gdk-pixbuf-HEAD.  It does no memory management and
  * is very hard-coded.  Please do not use it anywhere else. */
@@ -583,6 +596,79 @@
 
 /* Callbacks */
 void
+on_window_rbutton_toggled (GtkWidget *toggle, gpointer data)
+{
+	gfloat width, height;
+	GtkWidget *toplevel, *frame, *preview;
+
+	window = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
+
+	setup_busy (TRUE);
+
+	if (window)
+		take_window_shot ();
+
+	width = gdk_pixbuf_get_width (screenshot);
+	height = gdk_pixbuf_get_height (screenshot);
+
+	width /= 5;
+	height /= 5;
+
+	toplevel = glade_xml_get_widget (xml, "toplevel");
+	frame = glade_xml_get_widget (xml, "aspect_frame");
+	preview = glade_xml_get_widget (xml, "preview");
+
+	gtk_window_set_default_size (GTK_WINDOW (toplevel), width * 2, -1);
+	gtk_widget_set_size_request (preview, width, height);
+	gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5,
+			      gdk_pixbuf_get_width (screenshot)/
+			      (gfloat) gdk_pixbuf_get_height (screenshot),
+			      FALSE);
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+
+	setup_busy (FALSE);
+}
+
+void
+on_screen_rbutton_toggled (GtkWidget *toggle, gpointer data)
+{
+	gfloat width, height;
+	GtkWidget *toplevel, *frame, *preview;
+
+	window = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle));
+
+	setup_busy (TRUE);
+
+	if (!window)
+		take_screen_shot ();
+
+	width = gdk_pixbuf_get_width (screenshot);
+	height = gdk_pixbuf_get_height (screenshot);
+
+	width /= 5;
+	height /= 5;
+
+	toplevel = glade_xml_get_widget (xml, "toplevel");
+	frame = glade_xml_get_widget (xml, "aspect_frame");
+	preview = glade_xml_get_widget (xml, "preview");
+
+	gtk_window_set_default_size (GTK_WINDOW (toplevel), width * 2, -1);
+	gtk_widget_set_size_request (preview, width, height);
+	gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5,
+			      gdk_pixbuf_get_width (screenshot)/
+			      (gfloat) gdk_pixbuf_get_height (screenshot),
+			      FALSE);
+
+	setup_busy (FALSE);
+}
+
+void
+on_delay_spin_value_changed (GtkWidget *spin, gpointer data)
+{
+	delay = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
+}
+
+void
 on_save_rbutton_toggled (GtkWidget *toggle, gpointer data)
 {
 	GtkWidget *save_fileentry = glade_xml_get_widget (xml, "save_fileentry");
@@ -744,6 +830,11 @@
 
 	setup_busy (TRUE);
 
+	if (window)
+		take_window_shot ();
+	else
+		take_screen_shot ();
+
 	button = glade_xml_get_widget (xml, "save_rbutton");
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
 		GtkWidget *entry;
@@ -765,6 +856,7 @@
 		setup_busy (FALSE);
 		return;
 	}
+
 #ifdef HAVE_GNOME_PRINT
 	button = glade_xml_get_widget (xml, "print_rbutton");
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
@@ -1013,9 +1105,7 @@
 	GnomeClient *client;
 	struct stat s;
 	gchar *file;
-	gboolean window = FALSE;
 	gint width, height; 
-	guint delay = 0;
 
 	struct poptOption opts[] = {
 		{"window", '\0', POPT_ARG_NONE, &window, 0, N_("Grab a window instead of the entire screen"), NULL},
--- gnome-panel/gnome-panel/gnome-panel-screenshot.glade2-bak	Thu Mar 21 14:48:07 2002
+++ gnome-panel/gnome-panel/gnome-panel-screenshot.glade2	Sat May 11 18:30:52 2002
@@ -1,234 +1,433 @@
 <?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" />
+<requires lib="gnome"/>
+
+<widget class="GtkWindow" id="toplevel">
+  <property name="title" translatable="yes">Screenshot</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>
+  <signal name="delete_event" handler="gtk_main_quit"/>
+  <signal name="key_press_event" handler="on_toplevel_key_press_event"/>
+
+  <child>
+    <widget class="GtkVBox" id="vbox1">
+      <property name="border_width">8</property>
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">8</property>
+
+      <child>
+	<widget class="GtkFrame" id="frame3">
+	  <property name="visible">True</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	  <child>
+	    <widget class="GtkAspectFrame" id="aspect_frame">
+	      <property name="border_width">8</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="ratio">1</property>
+	      <property name="obey_child">True</property>
+
+	      <child>
+		<widget class="GtkDrawingArea" id="preview">
+		  <property name="visible">True</property>
+		  <signal name="expose_event" handler="on_preview_expose_event"/>
+		  <signal name="configure_event" handler="on_preview_configure_event"/>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Preview</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</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="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkFrame" id="picture_frame">
+	  <property name="visible">True</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox4">
+	      <property name="border_width">8</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">4</property>
+
+	      <child>
+		<widget class="GtkRadioButton" id="window_rbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Single window</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>
+		  <signal name="toggled" handler="on_window_rbutton_toggled" last_modification_time="Sat, 11 May 2002 16:28:06 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkRadioButton" id="screen_rbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Whole screen</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">window_rbutton</property>
+		  <signal name="toggled" handler="on_screen_rbutton_toggled" last_modification_time="Sat, 11 May 2002 16:28:12 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label5">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">After:</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</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="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSpinButton" id="delay_spin">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="climb_rate">1</property>
+		      <property name="digits">0</property>
+		      <property name="numeric">True</property>
+		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		      <property name="snap_to_ticks">False</property>
+		      <property name="wrap">False</property>
+		      <property name="adjustment">1 0 100 1 10 10</property>
+		      <signal name="value_changed" handler="on_delay_spin_value_changed" last_modification_time="Sat, 11 May 2002 16:28:27 GMT"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label6">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">seconds</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</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="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label3">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Picture</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</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="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkFrame" id="options_frame">
+	  <property name="visible">True</property>
+	  <property name="label_xalign">0</property>
+	  <property name="label_yalign">0.5</property>
+	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox2">
+	      <property name="border_width">8</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">4</property>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox1">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">4</property>
+
+		  <child>
+		    <widget class="GtkRadioButton" id="save_rbutton">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Save screenshot to file:</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>
+		      <signal name="toggled" handler="on_save_rbutton_toggled"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GnomeFileEntry" id="save_fileentry">
+		      <property name="visible">True</property>
+		      <property name="max_saved">10</property>
+		      <property name="directory_entry">True</property>
+		      <property name="modal">False</property>
+
+		      <child internal-child="entry">
+			<widget class="GtkEntry" id="save_entry">
+			  <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">0</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>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkRadioButton" id="desktop_rbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Save screenshot to _desktop</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">save_rbutton</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkRadioButton" id="web_rbutton">
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Save screenshot to _web page (save in ~/public__html)</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">save_rbutton</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkRadioButton" id="print_rbutton">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">_Print screenshot...</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">save_rbutton</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label2">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Options</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</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="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHButtonBox" id="hbuttonbox1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+	  <property name="spacing">25</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancel_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">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>
+	      <signal name="clicked" handler="on_cancel_button_clicked"/>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="ok_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <signal name="clicked" handler="on_ok_button_clicked"/>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
 
-  <widget class="GtkWindow" id="toplevel">
-    <property name="visible">no</property>
-    <property name="title" translatable="yes">Screenshot</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>
-
-    <signal name="delete_event" handler="gtk_main_quit" />
-    <signal name="key_press_event" handler="on_toplevel_key_press_event" />
-
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="border_width">8</property>
-        <property name="homogeneous">no</property>
-        <property name="spacing">8</property>
-        <property name="visible">yes</property>
-
-        <child>
-          <widget class="GtkFrame" id="frame3">
-            <property name="label" translatable="yes">Preview</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkAspectFrame" id="aspect_frame">
-                <property name="border_width">8</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="ratio">1</property>
-                <property name="obey_child">yes</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkDrawingArea" id="preview">
-                    <property name="visible">yes</property>
-
-                    <signal name="expose_event" handler="on_preview_expose_event" />
-                    <signal name="configure_event" handler="on_preview_configure_event" />
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">yes</property>
-            <property name="fill">yes</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkFrame" id="options_frame">
-            <property name="label" translatable="yes">Options</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow">GTK_SHADOW_ETCHED_IN</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="border_width">8</property>
-                <property name="homogeneous">no</property>
-                <property name="spacing">4</property>
-                <property name="visible">yes</property>
-
-                <child>
-                  <widget class="GtkHBox" id="hbox1">
-                    <property name="homogeneous">no</property>
-                    <property name="spacing">4</property>
-                    <property name="visible">yes</property>
-
-                    <child>
-                      <widget class="GtkRadioButton" id="save_rbutton">
-                        <property name="can_focus">yes</property>
-                        <property name="label" translatable="yes">_Save screenshot to file:</property>
-                        <property name="active">no</property>
-                        <property name="draw_indicator">yes</property>
-                        <property name="visible">yes</property>
-                        <property name="use_underline">yes</property>
-
-                        <signal name="toggled" handler="on_save_rbutton_toggled" />
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">no</property>
-                        <property name="fill">no</property>
-                      </packing>
-                    </child>
-
-                    <child>
-                      <widget class="GnomeFileEntry" id="save_fileentry">
-                        <property name="modal">no</property>
-                        <property name="directory_entry">yes</property>
-                        <property name="visible">yes</property>
-
-                        <child internal-child="entry">
-                          <widget class="GtkEntry" id="save_entry">
-                            <property name="can_focus">yes</property>
-                            <property name="editable">yes</property>
-                            <property name="text" translatable="yes"></property>
-                            <property name="max-length">0</property>
-                            <property name="visibility">yes</property>
-                            <property name="visible">yes</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">yes</property>
-                        <property name="fill">yes</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkRadioButton" id="desktop_rbutton">
-                    <property name="can_focus">yes</property>
-                    <property name="label" translatable="yes">Save screenshot to _desktop</property>
-                    <property name="active">no</property>
-                    <property name="draw_indicator">yes</property>
-                    <property name="visible">yes</property>
-                    <property name="group">save_rbutton</property>
-                    <property name="use_underline">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkRadioButton" id="web_rbutton">
-                    <property name="visible">no</property>
-                    <property name="can_focus">yes</property>
-                    <property name="label" translatable="yes">Save screenshot to _web page (save in ~/public__html)</property>
-                    <property name="active">no</property>
-                    <property name="draw_indicator">yes</property>
-                    <property name="group">save_rbutton</property>
-                    <property name="use_underline">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-
-                <child>
-                  <widget class="GtkRadioButton" id="print_rbutton">
-                    <property name="can_focus">yes</property>
-                    <property name="label" translatable="yes">_Print screenshot...</property>
-                    <property name="active">no</property>
-                    <property name="draw_indicator">yes</property>
-                    <property name="visible">yes</property>
-                    <property name="group">save_rbutton</property>
-                    <property name="use_underline">yes</property>
-                  </widget>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">no</property>
-                    <property name="fill">no</property>
-                  </packing>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">no</property>
-            <property name="fill">no</property>
-          </packing>
-        </child>
-
-        <child>
-          <widget class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <property name="spacing">25</property>
-            <property name="visible">yes</property>
-
-            <child>
-              <widget class="GtkButton" id="cancel_button">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-cancel</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-
-                <signal name="clicked" handler="on_cancel_button_clicked" />
-              </widget>
-            </child>
-
-            <child>
-              <widget class="GtkButton" id="ok_button">
-                <property name="can_default">yes</property>
-                <property name="can_focus">yes</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="visible">yes</property>
-                <property name="label">gtk-ok</property>
-                <property name="use_stock">yes</property>
-                <property name="use_underline">yes</property>
-
-                <signal name="clicked" handler="on_ok_button_clicked" />
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">no</property>
-            <property name="fill">no</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
 </glade-interface>
--- gnome-panel/ChangeLog-bak	Thu May  9 03:53:10 2002
+++ gnome-panel/ChangeLog	Sun May 12 17:02:30 2002
@@ -0,0 +1,7 @@
+2002-05-12 Pier Luigi Fiorini <plfiorini@supereva.it>
+
+	* gnome-panel/gnome-panel-screenshot.glade2: Added graphical delay and
+	screenshot type (window or whole screen) options.
+	* gnome-panel/gnome-panel-screenshot.c (on_ok_button_clicked):
+	Take a screenshot of single window or whole screen.
+
