개정판 c3bb196c
issue #0003 SearchPanel.xaml Textbox style 수정
Change-Id: I2e32a2dca3fced1a0ab800ef948e735a1a92a746
KCOM/Controls/SearchPanel.xaml | ||
---|---|---|
28 | 28 |
<ColumnDefinition Width="8*"/> |
29 | 29 |
<ColumnDefinition Width="2*"/> |
30 | 30 |
</Grid.ColumnDefinitions> |
31 |
<TextBox HorizontalAlignment="Stretch" Style="{StaticResource ClearTextBoxStyle}" Margin="2,0" telerik:StyleManager.Theme="Office2016" AcceptsReturn="False" Background="#FFF3F3F3" BorderThickness="0.5" VerticalContentAlignment="Center" x:Name="tbSearch" IsTabStop="True"/> |
|
31 |
<TextBox HorizontalAlignment="Stretch" IsEnabled="{Binding IsIndeterminate, Converter={StaticResource InvertedBooleanConverter}, ElementName=searchIndicator}" |
|
32 |
Style="{StaticResource ClearTextBoxStyle}" Margin="2,0" telerik:StyleManager.Theme="Office2016" AcceptsReturn="False" Background="#FFF3F3F3" BorderThickness="0.5" VerticalContentAlignment="Center" x:Name="tbSearch" IsTabStop="True"/> |
|
32 | 33 |
<!--<telerik:RadMaskedTextInput Mask="" |
33 | 34 |
HorizontalAlignment="Stretch" Margin="2,0" AcceptsReturn="False" EmptyContent="Input Search Text" IsClearButtonVisible="True" Background="#FFF3F3F3" BorderThickness="0.5" VerticalContentAlignment="Center" x:Name="tbSearch" IsTabStop="True"/>--> |
34 | 35 |
<Button Content="Search" Grid.Column="1" Padding="5" Background="#3d3d3d" Foreground="White" x:Name="btnSearch"/> |
... | ... | |
51 | 52 |
</StackPanel> |
52 | 53 |
<Grid Grid.Row="1"> |
53 | 54 |
<Grid.RowDefinitions> |
54 |
<RowDefinition Height="*"/> |
|
55 | 55 |
<RowDefinition Height="Auto"/> |
56 |
<RowDefinition Height="*"/> |
|
56 | 57 |
</Grid.RowDefinitions> |
57 |
<ListView Style="{StaticResource SimpleListViewStyle}" x:Name="lstSearchWord" ScrollViewer.HorizontalScrollBarVisibility="Disabled" |
|
58 |
BorderThickness="1" Margin="0,10" ItemsSource="{Binding SearchSet}" SelectionChanged="lstSearchWord_SelectionChanged"> |
|
58 |
<StackPanel Orientation="Horizontal" VerticalAlignment="Top"> |
|
59 |
<TextBlock FontSize="11" x:Name="txtSearchMsg" Foreground="#FF6A6A6A"/> |
|
60 |
<telerik:RadProgressBar x:Name="searchIndicator" HorizontalAlignment="Right" Visibility="{Binding IsIndeterminate, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=searchIndicator}" |
|
61 |
telerik:StyleManager.Theme="Office2016" IsIndeterminate="False" /> |
|
62 |
</StackPanel> |
|
63 |
<ListView Style="{StaticResource SimpleListViewStyle}" Grid.Row="1" x:Name="lstSearchWord" ScrollViewer.HorizontalScrollBarVisibility="Disabled" |
|
64 |
BorderThickness="1" Margin="0,2" ItemsSource="{Binding SearchSet}" SelectionChanged="lstSearchWord_SelectionChanged"> |
|
59 | 65 |
<i:Interaction.Behaviors> |
60 | 66 |
<Behaviors:ListViewColumnSizeAutoBehavior/> |
61 | 67 |
</i:Interaction.Behaviors> |
... | ... | |
91 | 97 |
<DataTemplate> |
92 | 98 |
<Border BorderBrush="Black" Margin="-12,5,-17,1" BorderThickness="0,0,0,1" > |
93 | 99 |
<StackPanel Orientation="Horizontal" Margin="15,0,0,1"> |
94 |
<TextBlock Text="{Binding searchResult.Left, StringFormat=N0}" VerticalAlignment="Center"/> |
|
95 |
<TextBlock Text="," FontWeight="DemiBold" VerticalAlignment="Center"/> |
|
96 |
<TextBlock Text="{Binding searchResult.Top, StringFormat=N0}" VerticalAlignment="Center"/> |
|
100 |
<TextBlock Text="{Binding searchResult.Left, StringFormat=N0}" VerticalAlignment="Center"/>
|
|
101 |
<TextBlock Text="," FontWeight="DemiBold" VerticalAlignment="Center"/>
|
|
102 |
<TextBlock Text="{Binding searchResult.Top, StringFormat=N0}" VerticalAlignment="Center"/>
|
|
97 | 103 |
</StackPanel> |
98 | 104 |
</Border> |
99 | 105 |
</DataTemplate> |
... | ... | |
102 | 108 |
</GridView> |
103 | 109 |
</ListView.View> |
104 | 110 |
</ListView> |
105 |
<StackPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Top"> |
|
106 |
<TextBlock FontSize="11" x:Name="txtSearchMsg" Foreground="#FF6A6A6A"/> |
|
107 |
<telerik:RadProgressBar x:Name="searchIndicator" HorizontalAlignment="Right" Visibility="{Binding IsIndeterminate, Converter={StaticResource BooleanToVisibilityConverter}, ElementName=searchIndicator}" |
|
108 |
telerik:StyleManager.Theme="Office2016" IsIndeterminate="False" /> |
|
109 |
</StackPanel> |
|
111 |
|
|
110 | 112 |
</Grid> |
111 |
<!--Visibility="{Binding Instance.IsDownloadOriginal, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"--> |
|
112 | 113 |
<Border Background="Black" Grid.RowSpan="2" Opacity="0.7" Margin="-10" x:Name="border_Overlap" |
113 |
Visibility="Hidden"
|
|
114 |
Visibility="{Binding Instance.IsDownloadOriginal, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"
|
|
114 | 115 |
DataContext="{DynamicResource viewDataModel}"> |
115 | 116 |
<StackPanel VerticalAlignment="Center"> |
116 | 117 |
<TextBlock x:Name="tlDonwloadState" Text="원활한 검색을 위해 데이터를 준비합니다" Foreground="White" HorizontalAlignment="Center" Margin="0,10" FontWeight="Bold"/> |
KCOM/Events/Implementation/TopMenuEvent.cs | ||
---|---|---|
447 | 447 |
} |
448 | 448 |
|
449 | 449 |
/// Tile Source URL을 구한다 |
450 |
|
|
450 | 451 |
string sImageURL = ViewerDataModel.Instance.SystemMain.dzMainMenu.GetImageURL(App.ViewInfo.DocumentItemID, this.ParentOfType<MainWindow>().dzMainMenu.pageNavigator.CurrentPage.PageNumber); |
451 | 452 |
var url = new Uri(sImageURL); |
452 | 453 |
string sFolder = App.ViewInfo.DocumentItemID.All(char.IsDigit) ? (Convert.ToInt64(App.ViewInfo.DocumentItemID) / 100).ToString() : App.ViewInfo.DocumentItemID.Substring(0, 5); |
KCOM/Resources/ClearTextBoxStyle.xaml | ||
---|---|---|
2 | 2 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
3 | 3 |
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" |
4 | 4 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
5 |
<ResourceDictionary.MergedDictionaries> |
|
6 |
<ResourceDictionary Source="/Telerik.Windows.Controls;component/Themes/FontResources.xaml"/> |
|
7 |
</ResourceDictionary.MergedDictionaries> |
|
5 | 8 |
<!--Control colors.--> |
6 | 9 |
<Color x:Key="WindowColor">#FFE8EDF9</Color> |
7 | 10 |
<Color x:Key="ContentAreaColorLight">#FFC5CBF9</Color> |
... | ... | |
126 | 129 |
<VisualState x:Name="MouseOver" /> |
127 | 130 |
</VisualStateGroup> |
128 | 131 |
</VisualStateManager.VisualStateGroups> |
129 |
<Border BorderBrush="#DDE2E5" Background="Transparent" BorderThickness="1"> |
|
132 |
<Border BorderBrush="#FFDDE2E5" Background="Transparent" BorderThickness="1">
|
|
130 | 133 |
<Grid> |
131 | 134 |
<Grid.ColumnDefinitions> |
132 | 135 |
<ColumnDefinition/> |
133 | 136 |
<ColumnDefinition Width="Auto"/> |
134 | 137 |
</Grid.ColumnDefinitions> |
135 | 138 |
<ScrollViewer Margin="0" BorderThickness="0" x:Name="PART_ContentHost" /> |
136 |
<telerik:RadPathButton BorderThickness="0" Background="Transparent" Grid.Column="1" x:Name="ClearButton" |
|
137 |
PathGeometry="{telerik:RadGlyph Glyph={StaticResource GlyphClose}, Foreground=White}"> |
|
138 |
</telerik:RadPathButton> |
|
139 |
<!--<telerik:RadPathButton BorderThickness="0" Background="Transparent" Grid.Column="1" x:Name="ClearButton" |
|
140 |
Content="{StaticResource GlyphCloseCircle}" |
|
141 |
FontFamily="{StaticResource TelerikWebUI}"> |
|
142 |
</telerik:RadPathButton>--> |
|
143 |
<Button BorderThickness="0" IsEnabled="{TemplateBinding IsEnabled}" Background="Transparent" Grid.Column="1" x:Name="ClearButton" |
|
144 |
Content="{StaticResource GlyphCloseCircle}" |
|
145 |
FontFamily="{StaticResource TelerikWebUI}"> |
|
146 |
</Button> |
|
139 | 147 |
</Grid> |
140 | 148 |
</Border> |
141 | 149 |
</Border> |
내보내기 Unified diff