개정판 29010418
issue #000: daelim source compare 중
Change-Id: Icba4b84746c71502e895fde47f4c14f82b179230
KCOM/MainWindow.xaml.cs | ||
---|---|---|
1 | 1 |
using KCOM.Common; |
2 |
using KCOM.Controls; |
|
3 | 2 |
using KCOMDataModel; |
4 | 3 |
using KCOMDataModel.DataModel; |
5 | 4 |
using MarkupToPDF.Common; |
6 |
using MarkupToPDF.Controls.Common; |
|
7 |
using MarkupToPDF.Controls.Text; |
|
8 | 5 |
using MarkupToPDF.Serialize.Core; |
9 | 6 |
using MarkupToPDF.Serialize.S_Control; |
10 | 7 |
using System; |
... | ... | |
40 | 37 |
this.KeyDown += new KeyEventHandler(KeyEventDownAction); |
41 | 38 |
this.KeyUp += new KeyEventHandler(KeyEventUpAction); |
42 | 39 |
this.SourceInitialized += new EventHandler(win_SourceInitialized); |
40 |
|
|
43 | 41 |
} |
44 | 42 |
|
45 | 43 |
public static BitmapImage CursorChange() |
... | ... | |
495 | 493 |
internal static extern IntPtr MonitorFromWindow(IntPtr handle, int flags); |
496 | 494 |
|
497 | 495 |
private void WindowKeyDown(object sender, KeyEventArgs e) |
498 |
{
|
|
496 |
{ |
|
499 | 497 |
if (e.Key == Key.V && Keyboard.Modifiers == ModifierKeys.Control) //Ctrl + V |
500 | 498 |
{ |
501 | 499 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission)) |
502 | 500 |
{ |
503 | 501 |
if (Clipboard.GetText().Contains("|OR||DZ|")) |
504 | 502 |
{ |
505 |
TextBox_Paste_Start();
|
|
503 |
TextBox_Paste_Start(); |
|
506 | 504 |
} |
507 |
|
|
505 |
|
|
508 | 506 |
} |
509 | 507 |
} |
510 | 508 |
} |
... | ... | |
547 | 545 |
|
548 | 546 |
System.Windows.Controls.Control item = layer.markupParse_Paste(data2[0], ViewerDataModel.Instance.MarkupControls_USER); |
549 | 547 |
|
550 |
var controldata = JsonSerializerHelper.UnCompressString(data2[0]);
|
|
548 |
var controldata = JsonSerializerHelper.UnCompressString(data2[0]); |
|
551 | 549 |
var unkownControl = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(controldata); //복호화작업 |
552 |
if (unkownControl.Name == "TextControl" || unkownControl.Name == "ArrowTextControl") |
|
553 |
{ |
|
554 |
ViewerDataModel.Instance.IsPressCtrl = false; |
|
550 |
ViewerDataModel.Instance.IsPressCtrl = false; |
|
555 | 551 |
|
556 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid();
|
|
557 |
if (data2.Length >= 2)
|
|
558 |
{
|
|
559 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1];
|
|
560 |
}
|
|
552 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
553 |
if (data2.Length >= 2) |
|
554 |
{ |
|
555 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
|
556 |
} |
|
561 | 557 |
|
562 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo);
|
|
563 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo);
|
|
558 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
559 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
564 | 560 |
|
565 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo);
|
|
561 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
|
566 | 562 |
|
567 |
multi_Undo_Data = dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo);
|
|
563 |
multi_Undo_Data = dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
568 | 564 |
|
569 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
570 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
571 |
} |
|
565 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
566 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
572 | 567 |
} |
573 | 568 |
} |
574 | 569 |
|
... | ... | |
580 | 575 |
|
581 | 576 |
if (final.MemberSet.Where(type => type.Drawingtype == MarkupToPDF.Controls.Common.ControlType.TextControl).FirstOrDefault() != null) |
582 | 577 |
{ |
583 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(0.001, 0.001));
|
|
578 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(0.001, 0.001)); |
|
584 | 579 |
} |
585 | 580 |
|
586 | 581 |
this.dzMainMenu.SelectLayer.Children.Add(final); |
587 | 582 |
|
588 |
}
|
|
583 |
} |
|
589 | 584 |
else if (Clipboard.GetImage() != null) //외부 이미지 붙여넣기 |
590 | 585 |
{ |
591 | 586 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
내보내기 Unified diff