Fixes #271679

2005-05-06  Rodrigo Moya <rodrigo@novell.com>

	Fixes #271679

	* gui/dialogs/comp-editor.c (save_comp):
	* gui/e-week-view.c (e_week_view_on_editing_stopped,
	e_week_view_change_event_time): set correct start/end times for
	individual instances and remove all rules and exceptions.
	(e_week_view_reshape_event_span): show recurrence icons for
	detached instances also.

	* gui/e-day-view.c (e_day_view_finish_resize,
	e_day_view_finish_long_event_resize, e_day_view_on_editing_stopped,
	e_day_view_on_top_canvas_drag_data_received,
	e_day_view_on_main_canvas_drag_data_received,
	e_day_view_change_event_time): set the correct start/end times when
	modifying individual instances and remove all rules and exceptions.
	(e_day_view_on_top_canvas_motion, e_day_view_on_main_canvas_motion):
	disable D&D for recurring events.
	(e_day_view_reshape_long_event, e_day_view_reshape_day_event):
	check for detached instances and show recurrence icons for them also.

	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):
	check for detached instances and show recurrence icons for them also.

	* gui/e-cal-model.c (set_instance_times): don't use the RECURRENCE-ID
	to get the datetime.

	* gui/e-calendar-view.c (e_calendar_view_delete_selected_occurrence):
	exceptions need to be date only.
	(e_calendar_view_copy_clipboard): remove RECURRENCE-IDs from components
	we copy to the clipboard.
	(e_calendar_view_cut_clipboard): when cutting instances, remove only
	the selected instances.
	(on_unrecur_appointment): use MOD_ALL to modify the master object and
	remove recurrence-id from detached event.

	* gui/dialogs/recur-comp.c (recur_component_dialog): re-enabled.

svn path=/trunk/; revision=29276

1 files changed, 109 insertions, 12 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index c5af654028..e7c924fb01 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3486,7 +3486,7 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 		cursor = day_view->normal_cursor;
 
 		/* Recurring events can't be resized. */
-		if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp))  {
+		if (event && !e_cal_util_component_has_recurrences (event->comp_data->icalcomp)) {
 			switch (pos) {
 			case E_CALENDAR_VIEW_POS_LEFT_EDGE:
 			case E_CALENDAR_VIEW_POS_RIGHT_EDGE:
@@ -3854,16 +3854,37 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 		e_cal_component_set_dtend (comp, &date);
 	}
 	
+	e_cal_component_commit_sequence (comp);
  	if (e_cal_component_is_instance (comp)) {
  		if (!recur_component_dialog (client, comp, &mod, NULL)) {
  			gtk_widget_queue_draw (day_view->top_canvas);
 			goto out;
  		}
+
+		if (mod == CALOBJ_MOD_THIS) {
+			/* set the correct DTSTART/DTEND on the individual recurrence */
+			if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
+				*date.value = icaltime_from_timet_with_zone (
+					event->comp_data->instance_end, FALSE,
+					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+				e_cal_component_set_dtend (comp, &date);
+			} else {
+				*date.value = icaltime_from_timet_with_zone (
+					event->comp_data->instance_start, FALSE,
+					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+				e_cal_component_set_dtstart (comp, &date);
+			}
+
+			e_cal_component_set_rdate_list (comp, NULL);
+			e_cal_component_set_rrule_list (comp, NULL);
+			e_cal_component_set_exdate_list (comp, NULL);
+			e_cal_component_set_exrule_list (comp, NULL);
+
+			e_cal_component_commit_sequence (comp);
+		}
 	}
 	
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-	
-	e_cal_component_commit_sequence (comp);
 	e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
 	
  out:
@@ -3945,6 +3966,26 @@ e_day_view_finish_resize (EDayView *day_view)
  			gtk_widget_queue_draw (day_view->top_canvas);
 			goto out;
  		}
+
+		if (mod == CALOBJ_MOD_THIS) {
+			/* set the correct DTSTART/DTEND on the individual recurrence */
+			if (day_view->resize_drag_pos == E_CALENDAR_VIEW_POS_TOP_EDGE) {
+				*date.value = icaltime_from_timet_with_zone (
+					event->comp_data->instance_end, FALSE,
+					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+				e_cal_component_set_dtend (comp, &date);
+			} else {
+				*date.value = icaltime_from_timet_with_zone (
+					event->comp_data->instance_start, FALSE,
+					e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+				e_cal_component_set_dtstart (comp, &date);
+			}
+
+			e_cal_component_set_rdate_list (comp, NULL);
+			e_cal_component_set_rrule_list (comp, NULL);
+			e_cal_component_set_exdate_list (comp, NULL);
+			e_cal_component_set_exrule_list (comp, NULL);
+		}
 	}
 	
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
@@ -4281,7 +4322,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 
 		if (e_cal_component_has_alarms (comp))
 			num_icons++;
-		if (e_cal_component_has_recurrences (comp))
+		if (e_cal_component_has_recurrences (comp) || e_cal_component_is_instance (comp))
 			num_icons++;
 		if (event->different_timezone)
 			num_icons++;
@@ -4451,7 +4492,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 
 			if (e_cal_component_has_alarms (comp))
 				num_icons++;
-			if (e_cal_component_has_recurrences (comp))
+			if (e_cal_component_has_recurrences (comp) || e_cal_component_is_instance (comp))
 				num_icons++;
 			if (e_cal_component_has_attachments (comp))
 				num_icons++;
@@ -5820,6 +5861,13 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
  			gtk_widget_queue_draw (day_view->top_canvas);
 			goto out;
  		}
+
+		if (mod == CALOBJ_MOD_THIS) {
+			e_cal_component_set_rdate_list (comp, NULL);
+			e_cal_component_set_rrule_list (comp, NULL);
+			e_cal_component_set_exdate_list (comp, NULL);
+			e_cal_component_set_exrule_list (comp, NULL);
+		}
 	}
 	
 	toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
@@ -6035,6 +6083,45 @@ e_day_view_on_editing_stopped (EDayView *day_view,
 				if (!recur_component_dialog (client, comp, &mod, NULL)) {
 					goto out;
 				}
+
+				if (mod == CALOBJ_MOD_THIS) {
+					ECalComponentDateTime dt;
+
+					e_cal_component_get_dtstart (comp, &dt);
+					if (dt.value->zone) {
+						*dt.value = icaltime_from_timet_with_zone (
+							event->comp_data->instance_start,
+							dt.value->is_date,
+							dt.value->zone);
+					} else {
+						*dt.value = icaltime_from_timet_with_zone (
+							event->comp_data->instance_start,
+							dt.value->is_date,
+							e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+					}
+					e_cal_component_set_dtstart (comp, &dt);
+
+					e_cal_component_get_dtend (comp, &dt);
+					if (dt.value->zone) {
+						*dt.value = icaltime_from_timet_with_zone (
+							event->comp_data->instance_end,
+							dt.value->is_date,
+							dt.value->zone);
+					} else {
+						*dt.value = icaltime_from_timet_with_zone (
+							event->comp_data->instance_end,
+							dt.value->is_date,
+							e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
+					}
+					e_cal_component_set_dtend (comp, &dt);
+
+					e_cal_component_set_rdate_list (comp, NULL);
+					e_cal_component_set_rrule_list (comp, NULL);
+					e_cal_component_set_exdate_list (comp, NULL);
+					e_cal_component_set_exrule_list (comp, NULL);
+
+					e_cal_component_commit_sequence (comp);
+				}
 			}
 			
 			/* FIXME When sending here, what exactly should we send? */
@@ -6997,9 +7084,7 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 
 		vcal = e_cal_util_new_top_level ();
 		e_cal_util_add_timezones_from_component (vcal, event->comp_data->icalcomp);
-		icalcomponent_add_component (
-			vcal,
-			icalcomponent_new_clone (event->comp_data->icalcomp));
+		icalcomponent_add_component (vcal, icalcomponent_new_clone (event->comp_data->icalcomp));
 
 		comp_str = icalcomponent_as_ical_string (vcal);
 		if (comp_str) {
@@ -7136,14 +7221,20 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 			if (event->canvas_item)
 				gnome_canvas_item_show (event->canvas_item);
 
+			e_cal_component_commit_sequence (comp);
 			if (e_cal_component_is_instance (comp)) {
 				if (!recur_component_dialog (client, comp, &mod, NULL))
 					return;
+
+				if (mod == CALOBJ_MOD_THIS) {
+					e_cal_component_set_rdate_list (comp, NULL);
+					e_cal_component_set_rrule_list (comp, NULL);
+					e_cal_component_set_exdate_list (comp, NULL);
+					e_cal_component_set_exrule_list (comp, NULL);
+				}
 			}
 
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_cal_component_commit_sequence (comp);
-	
 			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
 			
 			g_object_unref (comp);
@@ -7325,16 +7416,22 @@ e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 			if (event->canvas_item)
 				gnome_canvas_item_show (event->canvas_item);
 
+			e_cal_component_commit_sequence (comp);
 			if (e_cal_component_is_instance (comp)) {
 				if (!recur_component_dialog (client, comp, &mod, NULL)) {
 					g_object_unref (comp);
 					return;
 				}
+
+				if (mod == CALOBJ_MOD_THIS) {
+					e_cal_component_set_rdate_list (comp, NULL);
+					e_cal_component_set_rrule_list (comp, NULL);
+					e_cal_component_set_exdate_list (comp, NULL);
+					e_cal_component_set_exrule_list (comp, NULL);
+				}
 			}
 
 			toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (day_view)));
-			e_cal_component_commit_sequence (comp);
-	
 			e_calendar_view_modify_and_send (comp, client, mod, toplevel, FALSE);
 
 			g_object_unref (comp);