[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-11-19 19:48:27
Message-ID: 20101119194827.08C68AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1198797 by djarvie:

Fix reminder time shown when editing a non-recurring alarm's deferred reminder.


 M  +6 -3      editdlgtypes.cpp  


--- trunk/KDE/kdepim/kalarm/editdlgtypes.cpp #1198796:1198797
@@ -280,16 +280,19 @@
 		mConfirmAck->setChecked(event->confirmAck());
 		bool recurs = event->recurs();
 		int reminderMins = event->reminder();
-		if (!reminderMins  &&  event->reminderDeferral()  &&  !recurs)
+		if (!reminderMins)
 		{
-			reminderMins = event->reminderDeferral();
+			if (event->reminderDeferral()  &&  !recurs)
+			{
+				reminderMins = event->deferDateTime().minsTo(event->mainDateTime());
 			mReminderDeferral = true;
 		}
-		if (!reminderMins  &&  event->reminderArchived()  &&  recurs)
+			else if (event->reminderArchived()  &&  recurs)
 		{
 			reminderMins = event->reminderArchived();
 			mReminderArchived = true;
 		}
+		}
 		reminder()->setMinutes(reminderMins, dateOnly());
 		reminder()->setOnceOnly(event->reminderOnceOnly());
 		reminder()->enableOnceOnly(recurs);
[prev in list] [next in list] [prev in thread] [next in thread]