개정판 35a96e24
issue #000: BaseClient_GetMarkupInfoItemsCompleted에서 컨트롤을 생성하도록 수정
Change-Id: I378eb435ba6f0c5c45e3af40cb4ebfb6b79c2afa
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 334 | 334 |
|
| 335 | 335 |
var menu = this.ParentOfType<MainWindow>().dzMainMenu; |
| 336 | 336 |
|
| 337 |
//콘솔리 데잇일 경우 |
|
| 338 |
//if (ViewerDataModel.Instance.IsConsolidate && menu.gridViewMarkup.SelectedItems.Count > 1) |
|
| 339 |
//if (ViewerDataModel.Instance.IsConsolidate) |
|
| 340 |
//{
|
|
| 341 |
// ViewerDataModel.Instance.IsConsolidate = false; |
|
| 342 |
// return; |
|
| 343 |
//} |
|
| 344 |
|
|
| 345 |
//코멘트가 없을 경우 |
|
| 346 |
//if (ViewerDataModel.Instance.MarkupControls_USER.Count == 0) |
|
| 347 |
//{
|
|
| 348 |
// foreach (var item in menu.gridViewMarkup.SelectedItems) |
|
| 349 |
// {
|
|
| 350 |
// if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
| 351 |
// {
|
|
| 352 |
// this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem)); |
|
| 353 |
// return; |
|
| 354 |
// } |
|
| 355 |
// } |
|
| 356 |
//} |
|
| 357 |
|
|
| 358 | 337 |
//코멘트가 없을 경우 |
| 359 | 338 |
if (ViewerDataModel.Instance.MarkupList_USER.Count == 0) |
| 360 | 339 |
{
|
| ... | ... | |
| 368 | 347 |
} |
| 369 | 348 |
} |
| 370 | 349 |
|
| 371 |
if (ViewerDataModel.Instance.MarkupList_USER.Count > 0) |
|
| 372 |
{
|
|
| 373 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
|
| 374 |
{
|
|
| 375 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
| 376 |
{
|
|
| 377 |
/* |
|
| 378 |
if (menu.UndoData.Markup_List[0].Markup..GetType().Name == "TextControl" && ((MarkupToPDF.Controls.Text.TextControl)(item as IKCOM.MarkupInfoItem).MarkupList[0].).OverViewText == null) |
|
| 379 |
{
|
|
| 380 |
} |
|
| 381 |
|
|
| 382 |
this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem)); |
|
| 383 |
return;*/ |
|
| 384 |
} |
|
| 385 |
} |
|
| 386 |
} |
|
| 387 |
|
|
| 388 |
|
|
| 389 |
//코멘트가 없을 경우 |
|
| 390 |
//if (ViewerDataModel.Instance.MarkupControls_USER.Count == 0) |
|
| 391 |
//if (ViewerDataModel.Instance.MarkupControls_USER.Count == 0 && menu.gridViewMarkup.SelectedItems.Count == 0) |
|
| 392 |
//{
|
|
| 393 |
// foreach (var item in menu.gridViewMarkup.SelectedItems) |
|
| 394 |
// {
|
|
| 395 |
// if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
| 396 |
// {
|
|
| 397 |
// this.ParentOfType<MainWindow>().dzMainMenu.DeleteItem((item as IKCOM.MarkupInfoItem)); |
|
| 398 |
// return; |
|
| 399 |
// } |
|
| 400 |
// } |
|
| 401 |
//} |
|
| 402 |
|
|
| 403 |
menu.ChangeCommentReact(); |
|
| 350 |
menu.ChangeCommentReact(); |
|
| 404 | 351 |
|
| 405 | 352 |
if (menu.PreviewUserMarkupInfoItem != null && menu.PreviewUserMarkupInfoItem.IsPreviewUser == true) |
| 406 | 353 |
{
|
| ... | ... | |
| 411 | 358 |
this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
|
| 412 | 359 |
return; |
| 413 | 360 |
} |
| 414 |
//else if (menu.gridViewMarkup.SelectedItems.Count == 0 || (menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem).UserID != App.ViewInfo.UserID) |
|
| 415 |
//{
|
|
| 416 |
// this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
|
|
| 417 |
// return; |
|
| 418 |
//} |
|
| 419 |
// 변경 |
|
| 420 | 361 |
else |
| 421 | 362 |
{
|
| 422 | 363 |
foreach (var item in menu.gridViewMarkup.SelectedItems) |
| ... | ... | |
| 446 | 387 |
return; |
| 447 | 388 |
} |
| 448 | 389 |
} |
| 449 |
////강인구 변경 |
|
| 450 |
//this.ParentOfType<MainWindow>().DialogMessage_Alert("Please Select Your Comment List Item", "Alert");
|
|
| 451 | 390 |
} |
| 452 | 391 |
if (sender != null) |
| 453 | 392 |
{
|
내보내기 Unified diff
