Resolved jira issues (N_SE-35120, N_SE-35199)

Change-Id: Id544ad5e26a43d479bee87fa435e5fb6df8c05a6

diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp
index 042058a..5434e9b 100644 (file)
--- a/src/ClEventPresentationModel.cpp
+++ b/src/ClEventPresentationModel.cpp
@@ -250,11 +250,11 @@ EventPresentationModel::GetReminderString(int index) const
        {
        case REMINDER_TIME_UNIT_MINUTE:
                format = ResourceManager::GetString(IDS_REMINDER_MINUTE_BEFORE);
-               result.Format(format.GetLength() + 2, format.GetPointer(), pReminder->GetTimeOffset());
+               result.Format(format.GetLength() + 10, format.GetPointer(), pReminder->GetTimeOffset());
                break;
        case REMINDER_TIME_UNIT_HOUR:
                format = ResourceManager::GetString(IDS_REMINDER_HOUR_BEFORE);
-               result.Format(format.GetLength() + 2, format.GetPointer(), pReminder->GetTimeOffset());
+               result.Format(format.GetLength() + 10, format.GetPointer(), pReminder->GetTimeOffset());
                break;
        case REMINDER_TIME_UNIT_DAY:
        {
@@ -267,7 +267,7 @@ EventPresentationModel::GetReminderString(int index) const
                if (startDate.GetMonth() == reminderDate.GetMonth() && startDate.GetDay() == reminderDate.GetDay())
                {
                        format = ResourceManager::GetString(IDS_REMINDER_YEAR_BEFORE);
-                       result.Format(format.GetLength() + 2, format.GetPointer(), startDate.GetYear() - reminderDate.GetYear());
+                       result.Format(format.GetLength() + 10, format.GetPointer(), startDate.GetYear() - reminderDate.GetYear());
                        break;
                }
 
@@ -275,17 +275,17 @@ EventPresentationModel::GetReminderString(int index) const
                if (startDate.GetDay() == reminderDate.GetDay())
                {
                        format = ResourceManager::GetString(IDS_REMINDER_MONTH_BEFORE);
-                       result.Format(format.GetLength() + 2, format.GetPointer(), value);
+                       result.Format(format.GetLength() + 10, format.GetPointer(), value);
                        break;
                }
 
                format = ResourceManager::GetString(IDS_REMINDER_DAY_BEFORE);
-               result.Format(format.GetLength() + 2, format.GetPointer(), pReminder->GetTimeOffset());
+               result.Format(format.GetLength() + 10, format.GetPointer(), pReminder->GetTimeOffset());
                break;
        }
        case REMINDER_TIME_UNIT_WEEK:
                format = ResourceManager::GetString(IDS_REMINDER_WEEK_BEFORE);
-               result.Format(format.GetLength() + 2, format.GetPointer(), pReminder->GetTimeOffset());
+               result.Format(format.GetLength() + 10, format.GetPointer(), pReminder->GetTimeOffset());
                break;
        default:
                break;

diff --git a/src/ClImportForm.cpp b/src/ClImportForm.cpp
index 578d729..41b6783 100644 (file)
--- a/src/ClImportForm.cpp
+++ b/src/ClImportForm.cpp
@@ -153,6 +153,7 @@ ImportForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
                                                                __pListViewContents->SetItemChecked(index, false);
                                                        }
                                                }
+                                               ++index;
                                        }
                                }
                                delete pEnum;
@@ -165,6 +166,12 @@ ImportForm::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
 
                        __pListViewContents->UpdateList();
 
+                       if (IsNoItemChecked() == true)
+                       {
+                               GetFooter()->SetItemEnabled(0, false);
+                               GetFooter()->Invalidate(true);
+                       }
+
                        if (IsAllItemAdded() == true)
                        {
                                GetHeader()->RemoveAllButtons();