개정판 c5519c44
- convert log 수정
- markus text font 변경시 저장 여부 메시지 나오도록 수정
-
Change-Id: I85fa01d063204c85eb5b70bf34a3773f5cb5fd8f
KCOM/Controls/Sample.xaml.cs | ||
---|---|---|
28 | 28 |
{ |
29 | 29 |
public List<FAVORITE_DOC> _FavoriteSet { get; set; } |
30 | 30 |
public event PropertyChangedEventHandler PropertyChanged; |
31 |
public DelegateCommand SelectCommentCommand { get; private set; } |
|
31 | 32 |
|
32 | 33 |
//PageManager.PageStorage samplePageStorage; |
33 | 34 |
|
... | ... | |
55 | 56 |
if(!_Initialize) |
56 | 57 |
{ |
57 | 58 |
_Initialize = true; |
59 |
|
|
60 |
SelectCommentCommand = new DelegateCommand(SetCommentPages); |
|
61 |
|
|
58 | 62 |
this.SizeChanged += Sample_SizeChanged; |
59 | 63 |
this.lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged); |
60 | 64 |
this.ImgListbox.SelectionChanged += new SelectionChangedEventHandler(ImgListbox_SelectionChanged); |
... | ... | |
105 | 109 |
public event EventHandler<PageChangeEventArgs> PageChanged; |
106 | 110 |
public event EventHandler<PageChangeEventArgs> PageChanging; |
107 | 111 |
|
108 |
private List<UsersCommentPagesMember> _UsersCommentPagesList;
|
|
112 |
private ObservableCollection<UsersCommentPagesMember> _UsersCommentPagesList;
|
|
109 | 113 |
|
110 |
public List<UsersCommentPagesMember> UsersCommentPagesList
|
|
114 |
public ObservableCollection<UsersCommentPagesMember> UsersCommentPagesList
|
|
111 | 115 |
{ |
112 | 116 |
get { |
113 | 117 |
if(_UsersCommentPagesList == null) |
114 | 118 |
{ |
115 |
_UsersCommentPagesList = new List<UsersCommentPagesMember>();
|
|
119 |
_UsersCommentPagesList = new ObservableCollection<UsersCommentPagesMember>();
|
|
116 | 120 |
} |
117 | 121 |
|
118 | 122 |
return _UsersCommentPagesList; } |
... | ... | |
488 | 492 |
{ |
489 | 493 |
SetCommentPages(); |
490 | 494 |
} |
491 |
|
|
492 |
void user_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) |
|
493 |
{ |
|
494 |
SetCommentPages(); |
|
495 |
//System.Diagnostics.Debug.WriteLine(e.PropertyName); |
|
496 |
} |
|
497 | 495 |
|
498 |
public async void SetCommentPages() |
|
496 |
public async void SetCommentPages(object obj = null)
|
|
499 | 497 |
{ |
500 | 498 |
await this.Dispatcher.InvokeAsync(() => ThumbnailSetAsync()); |
501 | 499 |
} |
... | ... | |
535 | 533 |
|
536 | 534 |
UsersCommentPagesList.ForEach(user => |
537 | 535 |
{ |
538 |
user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged); |
|
539 |
user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged); |
|
536 |
//user.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
|
|
537 |
//user.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(user_PropertyChanged);
|
|
540 | 538 |
|
541 | 539 |
var _commLst = this.UsersCommentPagesList.Where(o => o.MarkupInfoID == user.MarkupInfoID); |
542 | 540 |
|
... | ... | |
570 | 568 |
|
571 | 569 |
Logger.sendCheckLog("SetCommentList_SelectComment.ItemsSource 설정", 1); |
572 | 570 |
var data = UsersCommentPagesList.OrderByDescending(p => p.isConSolidation == Convert.ToInt32(true)).ToList(); |
571 |
|
|
573 | 572 |
if (data.Count() != 0) |
574 | 573 |
{ |
575 | 574 |
if (Convert.ToBoolean(data.First().isConSolidation)) |
... | ... | |
578 | 577 |
data.Where(p => p.isConSolidation == Convert.ToInt32(true)).FirstOrDefault().Depart = ""; |
579 | 578 |
this.lstSelectComment.ItemsSource = data; |
580 | 579 |
} |
581 |
else |
|
582 |
{ |
|
583 |
this.lstSelectComment.ItemsSource = this.UsersCommentPagesList; //섬네일 |
|
584 |
} |
|
585 |
} |
|
586 |
else |
|
587 |
{ |
|
588 |
this.lstSelectComment.ItemsSource = this.UsersCommentPagesList; //섬네일 |
|
589 | 580 |
} |
590 | 581 |
|
582 |
this.lstSelectComment.ItemsSource = this.UsersCommentPagesList; //섬네일 |
|
583 |
|
|
591 | 584 |
Logger.sendCheckLog("SetComme6ntList_ImgListbox 설정", 1); |
592 | 585 |
|
593 | 586 |
|
... | ... | |
611 | 604 |
|
612 | 605 |
var items = from page in pageList |
613 | 606 |
let pageLink = uri.Replace("{PageNo}", page.PAGE_NUMBER.ToString()) |
614 |
orderby page.PAGE_NUMBER |
|
615 | 607 |
select new ThumbnailItem |
616 | 608 |
{ |
617 | 609 |
ImageUri = new Uri(pageLink), |
... | ... | |
622 | 614 |
|
623 | 615 |
_thumbnailItems = new ObservableCollection<ThumbnailItem>(items); |
624 | 616 |
FilteredThumbnail = new CollectionViewSource(); |
617 |
FilteredThumbnail.SortDescriptions.Add(new SortDescription { Direction = ListSortDirection.Ascending, PropertyName = "PageNumber" }); |
|
618 |
|
|
625 | 619 |
FilteredThumbnail.Source = _thumbnailItems; |
626 | 620 |
|
627 | 621 |
FilterPages = _thumbnailItems.Select(x=>x.PageNumber).ToList(); |
내보내기 Unified diff