개정판 2089959a
issue #0005 마크업Search 기능 수정
Change-Id: If5fac484e99a53574be03b4422ca1373d558f379
| KCOM/Controls/Sample.xaml | ||
|---|---|---|
| 5 | 5 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:common="clr-namespace:KCOM.Common" |
| 6 | 6 |
xmlns:local="clr-namespace:KCOM.Controls" xmlns:System="clr-namespace:System;assembly=mscorlib" |
| 7 | 7 |
mc:Ignorable="d" Background="#f5f5f5" xmlns:converter="clr-namespace:KCOM.Common.Converter" |
| 8 |
d:DesignHeight="600" d:DesignWidth="250">
|
|
| 8 |
d:DesignHeight="600" d:DesignWidth="200">
|
|
| 9 | 9 |
<UserControl.Resources> |
| 10 |
<Style x:Key="PathButtonStyle" TargetType="Path"> |
|
| 11 |
<Setter Property="Width" Value="12"/> |
|
| 12 |
<Setter Property="Height" Value="12"/> |
|
| 13 |
<Setter Property="Fill" Value="White" /> |
|
| 14 |
<Setter Property="Stretch" Value="Fill" /> |
|
| 15 |
<Setter Property="HorizontalAlignment" Value="Right"/> |
|
| 16 |
<Setter Property="VerticalAlignment" Value="Center" /> |
|
| 17 |
</Style> |
|
| 10 | 18 |
<converter:CommentTypeImgConverter x:Key="converterTypeImageConverter"/> |
| 11 | 19 |
<converter:MarkupDataToConverter x:Key="markupDataConverter"/> |
| 12 | 20 |
<converter:MarginCorrectionConverter x:Key="marginConverter"/> |
| ... | ... | |
| 433 | 441 |
</CheckBox> |
| 434 | 442 |
</DataTemplate> |
| 435 | 443 |
</UserControl.Resources> |
| 436 |
<Grid x:Name="grid"> |
|
| 444 |
<Grid x:Name="grid" VerticalAlignment="Stretch">
|
|
| 437 | 445 |
<!--<TextBlock Text="Sort By:" Foreground="{DynamicResource KCOMColor_MarkerBrush}"/>-->
|
| 438 |
<telerik:RadTabControl BorderThickness="0" telerik:StyleManager.Theme="Office2016" HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
|
|
| 446 |
<telerik:RadTabControl Margin="0,6,0,0" BorderThickness="0" telerik:StyleManager.Theme="VisualStudio2013" HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
|
|
| 439 | 447 |
ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" > |
| 440 | 448 |
|
| 441 |
<telerik:RadTabItem Header="Thumbnail" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="10">
|
|
| 449 |
<telerik:RadTabItem Header="Thumbnail" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="12">
|
|
| 442 | 450 |
<Grid> |
| 443 | 451 |
<Grid.RowDefinitions> |
| 444 | 452 |
<RowDefinition Height="Auto"/> |
| 453 |
<RowDefinition Height="Auto"/> |
|
| 445 | 454 |
<RowDefinition Height="*"/> |
| 446 | 455 |
</Grid.RowDefinitions> |
| 447 |
<Border BorderThickness="0,0,0,1" BorderBrush="#e6e6e6" Background="#f5f5f5"> |
|
| 456 |
<telerik:RadPathButton ContentPlacement="Left" telerik:StyleManager.Theme="Office2016" CornerRadius="3" |
|
| 457 |
PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphGrid}, Foreground=White}" Height="24" Width="120" PathStyle="{StaticResource PathButtonStyle}"
|
|
| 458 |
Margin="2" Foreground="White" Content="Show All Pages" x:Name="btnPanorama" Click="btnPanorama_Click" Background="#FF0054B9" HorizontalAlignment="Right"/> |
|
| 459 |
<Border BorderThickness="1" Margin="1" Grid.Row="1" BorderBrush="#FFC9C9C9" Background="White"> |
|
| 448 | 460 |
<StackPanel> |
| 449 | 461 |
<RadioButton Content="All Pages" IsChecked="True" telerik:StyleManager.Theme="Office2013" FontSize="10" Margin="5,3" x:Name="rdoAllPages"/> |
| 450 | 462 |
<RadioButton Content="Favorited Pages" FontSize="10" Margin="5,3" x:Name="rdoFavoritePages" Checked="rdoFavoritePages_Checked"/> |
| ... | ... | |
| 468 | 480 |
</Grid> |
| 469 | 481 |
</StackPanel> |
| 470 | 482 |
</Border> |
| 471 |
|
|
| 472 |
<telerik:RadListBox x:Name="ImgListbox" |
|
| 483 |
<telerik:RadListBox x:Name="ImgListbox" Margin="1" |
|
| 473 | 484 |
ItemTemplate="{StaticResource ThumbnailDataTemplate}"
|
| 474 |
Grid.Row="1"
|
|
| 485 |
Grid.Row="2"
|
|
| 475 | 486 |
Background="{DynamicResource KCOMColor_AlternativeBrush}"
|
| 476 | 487 |
ItemContainerStyle="{StaticResource ItemContainerStyle}"
|
| 477 | 488 |
BorderBrush="#FFC2C2C2" BorderThickness="0" |
| ... | ... | |
| 504 | 515 |
</telerik:RadListBox.ItemTemplate>--> |
| 505 | 516 |
</telerik:RadListBox> |
| 506 | 517 |
</Grid> |
| 507 |
|
|
| 508 | 518 |
</telerik:RadTabItem> |
| 509 |
|
|
| 510 |
<telerik:RadTabItem Header="Markup List" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="10" >
|
|
| 519 |
<telerik:RadTabItem Header="Markup List" HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="12" >
|
|
| 511 | 520 |
<Grid HorizontalAlignment="Stretch"> |
| 512 | 521 |
<Grid.ColumnDefinitions> |
| 513 | 522 |
<ColumnDefinition Width="*"/> |
| ... | ... | |
| 541 | 550 |
ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Show All" SelectionChanged="commentPage_SelectionChanged"/> |
| 542 | 551 |
</Grid> |
| 543 | 552 |
</Border> |
| 544 |
<Border Grid.Row="1" Background="#f5f5f5" >
|
|
| 553 |
<Border Grid.Row="1" Background="#FFE6E6E6">
|
|
| 545 | 554 |
<StackPanel> |
| 546 | 555 |
<Border> |
| 547 |
<Grid> |
|
| 556 |
<Grid Height="28" Margin="0,4">
|
|
| 548 | 557 |
<Grid.ColumnDefinitions> |
| 549 |
<ColumnDefinition Width="7*"/>
|
|
| 550 |
<ColumnDefinition Width="3*"/>
|
|
| 558 |
<ColumnDefinition Width="*"/> |
|
| 559 |
<ColumnDefinition Width="Auto"/>
|
|
| 551 | 560 |
</Grid.ColumnDefinitions> |
| 552 |
<TextBox Background="#FFF3F3F3" BorderThickness="0.5" VerticalContentAlignment="Center" x:Name="tbSearch"/> |
|
| 553 |
|
|
| 554 |
<Border Background="#FF1258B6" CornerRadius="5" Grid.Column="1" Padding="5" Margin="10"> |
|
| 555 |
<Button Background="Transparent" Foreground="White" Content="Search" BorderThickness="0" x:Name="btnSearch" Click="btnSearch_Click"/> |
|
| 556 |
</Border> |
|
| 557 |
|
|
| 561 |
<TextBox HorizontalAlignment="Stretch" Style="{StaticResource ClearTextBoxStyle}" Margin="2" x:Name="txtSearch"
|
|
| 562 |
telerik:StyleManager.Theme="Office2016" AcceptsReturn="False" Background="#FFF3F3F3" |
|
| 563 |
BorderThickness="1" VerticalContentAlignment="Center" IsTabStop="True" KeyDown="TxtSearch_KeyDown"/> |
|
| 564 |
<telerik:RadPathButton Grid.Column="1" ContentPlacement="Left" VerticalContentAlignment="Center" telerik:StyleManager.Theme="Office2016" |
|
| 565 |
PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphZoom}, Foreground=White}"
|
|
| 566 |
Width="80" PathStyle="{StaticResource PathButtonStyle}" CornerRadius="3"
|
|
| 567 |
Margin="2" Foreground="White" Content="SEARCH" x:Name="btnSearch" Click="btnSearch_Click" Background="#FF0054B9"/> |
|
| 558 | 568 |
</Grid> |
| 559 | 569 |
</Border> |
| 560 | 570 |
</StackPanel> |
| ... | ... | |
| 572 | 582 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_New/arrow.png" Margin="5"/> |
| 573 | 583 |
|
| 574 | 584 |
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="10" VerticalAlignment="Center"> |
| 575 |
<TextBlock Text="조장원 대리" FontWeight="DemiBold" Foreground="#3d3d3d"/>
|
|
| 576 |
<TextBlock Text="3 Page"/>
|
|
| 585 |
<TextBlock Text="" FontWeight="DemiBold" Foreground="#3d3d3d"/> |
|
| 586 |
<TextBlock Text=""/> |
|
| 577 | 587 |
</StackPanel> |
| 578 | 588 |
|
| 579 | 589 |
|
| ... | ... | |
| 586 | 596 |
</Border> |
| 587 | 597 |
|
| 588 | 598 |
<Border VerticalAlignment="Stretch" Margin="0" Grid.Row="2" BorderThickness="0,0,0,0.5" BorderBrush="#828282" x:Name="gogo"> |
| 589 |
<telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" HorizontalAlignment="Stretch" x:Name="MarkupList" ScrollViewer.VerticalScrollBarVisibility="Auto" |
|
| 590 |
Background="Transparent" ItemsSource="{Binding MarkupInfoSmallList}" Loaded="MarkupList_Loaded">
|
|
| 599 |
<telerik:RadListBox telerik:StyleManager.Theme="Office2016" Padding="0" Margin="2" HorizontalAlignment="Stretch" x:Name="MarkupList" ScrollViewer.VerticalScrollBarVisibility="Auto"
|
|
| 600 |
Background="White" ItemsSource="{Binding MarkupInfoSmallList}" Loaded="MarkupList_Loaded">
|
|
| 591 | 601 |
<telerik:RadListBox.ItemContainerStyle> |
| 592 | 602 |
<Style TargetType="telerik:RadListBoxItem"> |
| 593 | 603 |
<Setter Property="Padding" Value="0,0,0,0"/> |
| ... | ... | |
| 596 | 606 |
<telerik:RadListBox.ItemTemplate> |
| 597 | 607 |
<DataTemplate> |
| 598 | 608 |
<StackPanel> |
| 599 |
<Border> |
|
| 609 |
<Border BorderBrush="#EBFBFCFD" BorderThickness="1" Margin="1" Padding="1,3">
|
|
| 600 | 610 |
<Grid> |
| 601 | 611 |
<Grid.ColumnDefinitions> |
| 612 |
<ColumnDefinition Width="5"/> |
|
| 602 | 613 |
<ColumnDefinition Width="36"/> |
| 603 | 614 |
<ColumnDefinition Width="*"/> |
| 604 | 615 |
<ColumnDefinition Width="Auto"/> |
| 605 | 616 |
</Grid.ColumnDefinitions> |
| 606 |
|
|
| 607 |
<Image Source="{Binding Data_Type, Converter={StaticResource converterTypeImageConverter}}" Margin="5" Width="28" Height="28"/>
|
|
| 608 |
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.Column="1" Margin="10" VerticalAlignment="Center"> |
|
| 617 |
<Border Width="5" Background="#CE3D5DA0"> |
|
| 618 |
<Border.Style> |
|
| 619 |
<Style TargetType="Border"> |
|
| 620 |
<Setter Property="Visibility" Value="Collapsed"/> |
|
| 621 |
<Style.Triggers> |
|
| 622 |
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource AncestorType=telerik:RadListBoxItem, AncestorLevel=1}}" Value="True">
|
|
| 623 |
<Setter Property="Visibility" Value="Visible"/> |
|
| 624 |
</DataTrigger> |
|
| 625 |
</Style.Triggers> |
|
| 626 |
</Style> |
|
| 627 |
</Border.Style> |
|
| 628 |
</Border> |
|
| 629 |
<Image Grid.Column="1" Source="{Binding Data_Type, Converter={StaticResource converterTypeImageConverter}}" Margin="5,0" Width="28" Height="28"/>
|
|
| 630 |
<StackPanel Orientation="Vertical" Grid.Row="0" Grid.Column="2" Margin="5,0" VerticalAlignment="Center"> |
|
| 609 | 631 |
<TextBlock Text="{Binding UserName}" FontWeight="DemiBold" Foreground="#3d3d3d"/>
|
| 610 | 632 |
<StackPanel Orientation="Horizontal"> |
| 611 | 633 |
<TextBlock Text="{Binding PageNumber}"/>
|
| 612 | 634 |
<TextBlock Text=" Page"/> |
| 613 | 635 |
</StackPanel> |
| 614 | 636 |
</StackPanel> |
| 615 |
|
|
| 616 |
<Border Background="#FF1258B6" CornerRadius="5" Grid.Column="2" Padding="5" Margin="10"> |
|
| 617 |
<telerik:RadButton Background="Transparent" Foreground="White" Content="Move" BorderThickness="0" Click="RadButton_Click" CommandParameter="{Binding}"/>
|
|
| 618 |
</Border> |
|
| 637 |
<telerik:RadPathButton Grid.Column="3" ContentPlacement="Left" VerticalContentAlignment="Center" telerik:StyleManager.Theme="Office2016" |
|
| 638 |
PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphFrontElement}, Foreground=White}"
|
|
| 639 |
Width="60" Height="28" PathStyle="{StaticResource PathButtonStyle}" CornerRadius="3"
|
|
| 640 |
Margin="2" Foreground="White" Content="Move" x:Name="btnSearch" Click="btGotoMarkup_Click" Background="#FF0054B9" CommandParameter="{Binding}">
|
|
| 641 |
</telerik:RadPathButton> |
|
| 642 |
<!--<telerik:RadButton Background="Transparent" Foreground="White" Content="Move" BorderThickness="0" Click="btGotoMarkup_Click" CommandParameter="{Binding}"/>-->
|
|
| 619 | 643 |
</Grid> |
| 620 | 644 |
</Border> |
| 621 | 645 |
</StackPanel> |
| ... | ... | |
| 659 | 683 |
</Border>--> |
| 660 | 684 |
</Grid> |
| 661 | 685 |
</telerik:RadTabItem> |
| 662 |
<telerik:RadTabItem HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="9">
|
|
| 686 |
<!--<telerik:RadTabItem HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="9">
|
|
| 663 | 687 |
<telerik:RadTabItem.Header> |
| 664 |
<telerik:RadRibbonButton Content="Panorama" telerik:StyleManager.Theme="Office2016" FontSize="10" Margin="0,0,0,1" Background="#FF0054B9" Foreground="White" |
|
| 665 |
BorderThickness="0" CornerRadius="3" Padding="5" x:Name="btnPanorama" Click="btnPanorama_Click"/> |
|
| 688 |
--><!--<telerik:RadRibbonButton Content="Panorama" telerik:StyleManager.Theme="Office2016" FontSize="10" Margin="0,0,0,1" Background="#FF0054B9" Foreground="White" |
|
| 689 |
BorderThickness="0" CornerRadius="3" Padding="5" x:Name="btnPanorama" Click="btnPanorama_Click"/>--><!-- |
|
| 690 |
<telerik:RadPathButton Grid.Column="1" ContentPlacement="Left" VerticalContentAlignment="Center" telerik:StyleManager.Theme="Office2016" |
|
| 691 |
PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphZoom}, Foreground=White}"
|
|
| 692 |
FontFamily="{StaticResource TelerikWebUI}" Width="80" PathStyle="{StaticResource PathButtonStyle}"
|
|
| 693 |
Margin="2" Foreground="White" Content="Panorama" x:Name="btnPanorama" Click="btnPanorama_Click" Background="#FF0054B9"/> |
|
| 666 | 694 |
</telerik:RadTabItem.Header> |
| 667 |
</telerik:RadTabItem> |
|
| 695 |
</telerik:RadTabItem>-->
|
|
| 668 | 696 |
</telerik:RadTabControl> |
| 697 |
|
|
| 669 | 698 |
</Grid> |
| 670 | 699 |
</UserControl> |
내보내기 Unified diff
