diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 15 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 14 |
3 files changed, 33 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f85830fc8d..dd1d05d9df 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2004-04-14 Not Zed <NotZed@Ximian.com> + + * gui/tasks-component.c (impl_createControls): Same as below for + the tasks component. + + * gui/calendar-component.c (impl_createControls): add the info + area label widget to the sidebar control (c&p the addressbook + code). + 2004-04-12 Gary Ekker <gekker@novell.com> Fixes #56628 diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index f4f5149eb4..3ea1d99f46 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -48,7 +48,7 @@ #include "dialogs/copy-source-dialog.h" #include "dialogs/event-editor.h" #include "widgets/misc/e-source-selector.h" - +#include "widgets/misc/e-info-label.h" /* IDs for user creatable items */ #define CREATE_EVENT_ID "event" @@ -810,7 +810,7 @@ impl_createControls (PortableServer_Servant servant, { CalendarComponent *calendar_component = CALENDAR_COMPONENT (bonobo_object_from_servant (servant)); CalendarComponentPrivate *priv; - GtkWidget *selector_scrolled_window; + GtkWidget *selector_scrolled_window, *vbox, *info; GtkWidget *statusbar_widget; BonoboControl *sidebar_control; BonoboControl *statusbar_control; @@ -843,7 +843,16 @@ impl_createControls (PortableServer_Servant servant, GTK_SHADOW_IN); gtk_widget_show (selector_scrolled_window); - sidebar_control = bonobo_control_new (selector_scrolled_window); + info = e_info_label_new("evolution-calendar-mini.png"); + e_info_label_set_info((EInfoLabel *)info, _("Calendars"), ""); + gtk_widget_show (info); + + vbox = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0); + gtk_widget_show (vbox); + + sidebar_control = bonobo_control_new (vbox); /* Create main calendar view */ /* FIXME Instead of returning, we should make a control with a diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 12383124f4..b577bae97c 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -45,6 +45,7 @@ #include "dialogs/copy-source-dialog.h" #include "dialogs/task-editor.h" #include "widgets/misc/e-source-selector.h" +#include "widgets/misc/e-info-label.h" #define CREATE_TASK_ID "task" @@ -477,7 +478,7 @@ impl_createControls (PortableServer_Servant servant, { TasksComponent *component = TASKS_COMPONENT (bonobo_object_from_servant (servant)); TasksComponentPrivate *priv; - GtkWidget *selector_scrolled_window, *statusbar_widget; + GtkWidget *selector_scrolled_window, *statusbar_widget, *vbox, *info; BonoboControl *sidebar_control, *statusbar_control; guint not; @@ -495,7 +496,16 @@ impl_createControls (PortableServer_Servant servant, GTK_SHADOW_IN); gtk_widget_show (selector_scrolled_window); - sidebar_control = bonobo_control_new (selector_scrolled_window); + info = e_info_label_new("evolution-tasks-mini.png"); + e_info_label_set_info((EInfoLabel *)info, _("Tasks"), ""); + gtk_widget_show (info); + + vbox = gtk_vbox_new(FALSE, 0); + gtk_box_pack_start(GTK_BOX (vbox), info, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX (vbox), selector_scrolled_window, TRUE, TRUE, 0); + gtk_widget_show (vbox); + + sidebar_control = bonobo_control_new (vbox); /* create the tasks view */ priv->view_control = tasks_control_new (); |