개정판 316d0f5c
- 페이지 이동 시 변경된 코멘트가 있을 경우 저장
- 프로그램 종료 할때 변경된 코멘트 없을 경우 예외 처리
- 사용자가 직접적인 저장을 할때에만 저장 되었다는 Alert가 표시 되도록 변경
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 459 | 459 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
| 460 | 460 |
this.dzMainMenu.currentControl = null; |
| 461 | 461 |
|
| 462 |
this.dzTopMenu.SaveEvent(null, null); |
|
| 462 |
//this.dzTopMenu.SaveEvent(null, null); |
|
| 463 |
|
|
| 464 |
this.dzTopMenu.SaveEvent(new object(), null); |
|
| 463 | 465 |
} |
| 464 | 466 |
} |
| 465 | 467 |
break; |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 353 | 353 |
menu.gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList; |
| 354 | 354 |
menu.gridViewMarkup.SelectedItem = item; |
| 355 | 355 |
|
| 356 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
|
|
| 356 |
if (sender != null) |
|
| 357 |
{
|
|
| 358 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
|
|
| 359 |
} |
|
| 357 | 360 |
return; |
| 358 | 361 |
} |
| 359 | 362 |
} |
| 360 | 363 |
////강인구 변경 |
| 361 | 364 |
//this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
|
| 362 | 365 |
} |
| 363 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
|
|
| 366 |
if (sender != null) |
|
| 367 |
{
|
|
| 368 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Save 가 완료되었습니다.", "Alert");
|
|
| 369 |
} |
|
| 364 | 370 |
} |
| 365 | 371 |
|
| 366 | 372 |
public void RefactoryCommentReact(MainMenu menu) |
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 237 | 237 |
break; |
| 238 | 238 |
case ("X"):
|
| 239 | 239 |
{
|
| 240 |
DateTime undoTime = ViewerDataModel.Instance.UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
|
| 241 |
DateTime updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 242 |
|
|
| 243 |
if(undoTime > updatetime) |
|
| 240 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
| 244 | 241 |
{
|
| 242 |
DateTime undoTime = ViewerDataModel.Instance.UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
|
| 243 |
DateTime updatetime = ViewerDataModel.Instance._markupInfoList.OrderByDescending(order => order.UpdateTime).FirstOrDefault().UpdateTime; |
|
| 244 |
|
|
| 245 |
if (undoTime > updatetime) |
|
| 246 |
{
|
|
| 245 | 247 |
var box = new TextBlock(); |
| 246 | 248 |
box.MinWidth = 400; |
| 247 | 249 |
box.FontSize = 11; |
| ... | ... | |
| 258 | 260 |
}; |
| 259 | 261 |
RadWindow.Confirm(parameters); |
| 260 | 262 |
} |
| 261 |
|
|
| 263 |
} |
|
| 262 | 264 |
this.Close(); |
| 263 | 265 |
} |
| 264 | 266 |
break; |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 460 | 460 |
|
| 461 | 461 |
private void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e) |
| 462 | 462 |
{
|
| 463 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
|
| 464 |
{
|
|
| 465 |
this.ParentOfType<MainWindow>().dzTopMenu.SaveEvent(null, null); |
|
| 466 |
} |
|
| 467 |
|
|
| 463 | 468 |
ViewerDataModel.Instance.UndoDataList.Clear(); |
| 464 | 469 |
|
| 465 | 470 |
InkControl_Convert(); |
내보내기 Unified diff
