add a custom widget created with e_url_button_new

2002-02-08  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/task-details-page.glade: add a custom widget created
	with e_url_button_new

	* gui/dialogs/task-details-page.c (task_details_page_init): init
	url_button member to NULL
	(init_widgets): set the url button entry
	(get_widgets): get the url button

	* gui/calendar-commands.c (pixmaps): use new all day event icon

svn path=/trunk/; revision=15610

4 files changed, 56 insertions, 10 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index fa741e5894..d087f746bf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,15 @@
+2002-02-08  JP Rosevear  <jpr@ximian.com>
+
+	* gui/dialogs/task-details-page.glade: add a custom widget created
+	with e_url_button_new
+
+	* gui/dialogs/task-details-page.c (task_details_page_init): init
+	url_button member to NULL
+	(init_widgets): set the url button entry
+	(get_widgets): get the url button
+
+	* gui/calendar-commands.c (pixmaps): use new all day event icon
+
 2002-02-07  JP Rosevear  <jpr@ximian.com>
 
 	* gui/e-day-view.c: pass meeting boolean for
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index ffa81de654..779e2b9441 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -718,7 +718,7 @@ static EPixmap pixmaps [] =
 	E_PIXMAP ("/menu/File/Print/Print",				      "print.xpm"),
 	E_PIXMAP ("/menu/File/Print/PrintPreview",			      "print-preview.xpm"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewAppointment", "new_appointment.xpm"),
-	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewEvent",       "new_appointment.xpm"),
+	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewEvent",       "new_all_day_event.png"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewMeeting",     "meeting.xpm"),
 	E_PIXMAP ("/menu/ComponentActionsPlaceholder/Actions/NewTask",        "new_task-16.png"),
 	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/CalendarSettings",        "configure_16_calendar.xpm"),
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 47fbf3a945..adc0bdaf3c 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -30,6 +30,7 @@
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
 #include <widgets/misc/e-dateedit.h>
+#include <widgets/misc/e-url-button.h>
 #include "e-util/e-dialog-widgets.h"
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
@@ -53,6 +54,7 @@ struct _TaskDetailsPagePrivate {
 	GtkWidget *completed_date;
 
 	GtkWidget *url;
+	GtkWidget *url_button;
 
 	gboolean updating;
 };
@@ -168,6 +170,7 @@ task_details_page_init (TaskDetailsPage *tdpage)
 	
 	priv->completed_date = NULL;
 	priv->url = NULL;
+	priv->url_button = NULL;
 
 	priv->updating = FALSE;
 }
@@ -477,7 +480,8 @@ get_widgets (TaskDetailsPage *tdpage)
 	priv->completed_date = GW ("completed-date");
 
 	priv->url = GW ("url");
-
+	priv->url_button = GW ("url_button");
+	
 #undef GW
 
 	return (priv->status
@@ -668,6 +672,9 @@ init_widgets (TaskDetailsPage *tdpage)
 					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
 					   tdpage, NULL);
 
+	/* Connect the url button to the url entry */
+	e_url_button_set_entry (E_URL_BUTTON (priv->url_button), priv->url);
+	
 	/* Connect signals. The Status, Percent Complete & Date Completed
 	   properties are closely related so whenever one changes we may need
 	   to update the other 2. */
@@ -764,3 +771,4 @@ task_details_page_create_date_edit (void)
 
 	return dedit;
 }
+
diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade
index 54ba5d35b5..48ecfdfdca 100644
--- a/calendar/gui/dialogs/task-details-page.glade
+++ b/calendar/gui/dialogs/task-details-page.glade
@@ -281,13 +281,10 @@ Undefined
       </widget>
 
       <widget>
-	<class>GtkEntry</class>
-	<name>url</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
+	<class>GtkHBox</class>
+	<name>hbox2</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
 	<child>
 	  <left_attach>1</left_attach>
 	  <right_attach>2</right_attach>
@@ -300,8 +297,37 @@ Undefined
 	  <xshrink>False</xshrink>
 	  <yshrink>False</yshrink>
 	  <xfill>True</xfill>
-	  <yfill>False</yfill>
+	  <yfill>True</yfill>
 	</child>
+
+	<widget>
+	  <class>GtkEntry</class>
+	  <name>url</name>
+	  <can_focus>True</can_focus>
+	  <editable>True</editable>
+	  <text_visible>True</text_visible>
+	  <text_max_length>0</text_max_length>
+	  <text></text>
+	  <child>
+	    <padding>0</padding>
+	    <expand>True</expand>
+	    <fill>True</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>Custom</class>
+	  <name>url_button</name>
+	  <creation_function>e_url_button_new</creation_function>
+	  <int1>0</int1>
+	  <int2>0</int2>
+	  <last_modification_time>Fri, 08 Feb 2002 16:56:48 GMT</last_modification_time>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
       </widget>
     </widget>
   </widget>