프로젝트

일반

사용자정보

개정판 4fcb686a

ID4fcb686a2d4740f5eee8d44f69429ab17bd7489f
상위 a7bee7cf
하위 5ba8f2d5

김태성이(가) 2년 이상 전에 추가함

issue #000 font가 적용 되지 않아 box size가 작게 출력되는 문제

Change-Id: Ie07531db96d56e8d5c2bbdbf0786d053ad39747c

차이점 보기:

KCOM/App.xaml
1 1
<Application
2
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4
             xmlns:local="clr-namespace:KCOM"
5
             xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
6

  
7
            x:Class="KCOM.App"
8
             StartupUri="MainWindow.xaml">
2
    x:Class="KCOM.App"
3
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5
    xmlns:local="clr-namespace:KCOM"
6
    xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
7
    StartupUri="MainWindow.xaml">
9 8
    <Application.Resources>
10 9
        <ResourceDictionary>
11 10
            <ResourceDictionary.MergedDictionaries>
12
                <ResourceDictionary Source="/Telerik.Windows.Controls;component/Themes/FontResources.xaml"/>
13
                <ResourceDictionary Source="Resources\Theme_Color.xaml"/>
14
                <ResourceDictionary Source="Resources\WindowStyle.xaml"/>
15
                <ResourceDictionary Source="Resources\RadConfirmStyle.xaml"/>
16
                <ResourceDictionary Source="Resources\DecodeImageTemplate.xaml"/>
17
                <ResourceDictionary Source="Resources\Theme_CustomControl.xaml"/>
18
                <ResourceDictionary Source="Resources\SimpleLIstViewStyle.xaml"/>
19
                <ResourceDictionary Source="Resources\ClearTextBoxStyle.xaml"/>
20
                <ResourceDictionary Source="Assets\RadGridViewStyleResourceDictionary.xaml"/>
21
                <ResourceDictionary Source="Messenger\StyleDictionary.xaml"/>
22
                <ResourceDictionary Source="/MarkupToPDF;component/themes/generic.xaml"/>
11
                <ResourceDictionary Source="/Telerik.Windows.Controls;component/Themes/FontResources.xaml" />
12
                <ResourceDictionary Source="Resources\Theme_Color.xaml" />
13
                <ResourceDictionary Source="Resources\WindowStyle.xaml" />
14
                <ResourceDictionary Source="Resources\RadConfirmStyle.xaml" />
15
                <ResourceDictionary Source="Resources\DecodeImageTemplate.xaml" />
16
                <ResourceDictionary Source="Resources\Theme_CustomControl.xaml" />
17
                <ResourceDictionary Source="Resources\SimpleLIstViewStyle.xaml" />
18
                <ResourceDictionary Source="Resources\ClearTextBoxStyle.xaml" />
19
                <ResourceDictionary Source="Assets\RadGridViewStyleResourceDictionary.xaml" />
20
                <ResourceDictionary Source="Messenger\StyleDictionary.xaml" />
21
                <ResourceDictionary Source="/MarkupToPDF;component/themes/generic.xaml" />
23 22
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/System.Windows.xaml"/>
24 23
                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.xaml"/>
25 24
                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.Input.xaml"/>
......
27 26
                <ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>-->
28 27

  
29 28
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.Office2016;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>-->
30
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/System.Windows.xaml"/>
31
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.xaml"/>
32
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Input.xaml"/>
33
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Navigation.xaml"/>
34
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>
35
                <ResourceDictionary Source="Resources\DragAndDropListBoxStyle.xaml"/>
36
                <ResourceDictionary Source="Resources\RadPasswordPromptStyle.xaml"/>
29
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/System.Windows.xaml" />
30
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.xaml" />
31
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Input.xaml" />
32
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Navigation.xaml" />
33
                <ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml" />
34
                <ResourceDictionary Source="Resources\DragAndDropListBoxStyle.xaml" />
35
                <ResourceDictionary Source="Resources\RadPasswordPromptStyle.xaml" />
37 36
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.RibbonView.xaml"/>-->
38 37
                <!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>-->
39 38
            </ResourceDictionary.MergedDictionaries>
40
            <Style TargetType="telerik:AutoHideArea" BasedOn="{StaticResource AutoHideAreaStyle}">
39
            <Style BasedOn="{StaticResource AutoHideAreaStyle}" TargetType="telerik:AutoHideArea">
41 40
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
42 41
            </Style>
43
            <Style TargetType="telerik:RadDocking" BasedOn="{StaticResource RadDockingStyle}">
44
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
42
            <Style BasedOn="{StaticResource RadDockingStyle}" TargetType="telerik:RadDocking">
43
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
45 44
            </Style>
46
            <Style TargetType="telerik:RadGridResizer" BasedOn="{StaticResource RadGridResizerStyle}">
47
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
45
            <Style BasedOn="{StaticResource RadGridResizerStyle}" TargetType="telerik:RadGridResizer">
46
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
48 47
            </Style>
49
            <Style TargetType="telerik:RadSplitContainer" BasedOn="{StaticResource RadSplitContainerStyle}">
50
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
48
            <Style BasedOn="{StaticResource RadSplitContainerStyle}" TargetType="telerik:RadSplitContainer">
49
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
51 50
            </Style>
52
            <Style TargetType="telerik:RadPaneGroup" BasedOn="{StaticResource RadPaneGroupStyle}">
53
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
51
            <Style BasedOn="{StaticResource RadPaneGroupStyle}" TargetType="telerik:RadPaneGroup">
52
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
54 53
            </Style>
55
            <Style TargetType="telerik:PaneHeader" BasedOn="{StaticResource PaneHeaderStyle}">
56
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
54
            <Style BasedOn="{StaticResource PaneHeaderStyle}" TargetType="telerik:PaneHeader">
55
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
57 56
            </Style>
58
            <Style TargetType="telerik:RadTabControl" BasedOn="{StaticResource RadTabControlStyle}">
59
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/>
57
            <Style BasedOn="{StaticResource RadTabControlStyle}" TargetType="telerik:RadTabControl">
58
                <Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" />
60 59
            </Style>
61 60
            <Style x:Key="PathButtonStyle" TargetType="{x:Type Path}">
62
                <Setter Property="Width" Value="12"/>
63
                <Setter Property="Height" Value="12"/>
61
                <Setter Property="Width" Value="12" />
62
                <Setter Property="Height" Value="12" />
64 63
                <Setter Property="Fill" Value="White" />
65 64
                <Setter Property="Stretch" Value="Fill" />
66
                <Setter Property="HorizontalAlignment" Value="Right"/>
65
                <Setter Property="HorizontalAlignment" Value="Right" />
67 66
                <Setter Property="VerticalAlignment" Value="Center" />
68 67
            </Style>
69 68
            <Style x:Key="PathButtonCenterStyle" TargetType="{x:Type Path}">
70
                <Setter Property="Width" Value="12"/>
71
                <Setter Property="Height" Value="12"/>
72
                <Setter Property="Margin" Value="0"/>
69
                <Setter Property="Width" Value="12" />
70
                <Setter Property="Height" Value="12" />
71
                <Setter Property="Margin" Value="0" />
73 72
                <Setter Property="Fill" Value="#FF686868" />
74 73
                <Setter Property="Stretch" Value="Fill" />
75
                <Setter Property="HorizontalAlignment" Value="Center"/>
74
                <Setter Property="HorizontalAlignment" Value="Center" />
76 75
                <Setter Property="VerticalAlignment" Value="Center" />
77 76
            </Style>
78 77
            <Style x:Key="IconPathButton" TargetType="{x:Type telerik:RadPathButton}">
79
                <Setter Property="Padding" Value="0"/>
80
                <Setter Property="PathStyle" Value="{StaticResource PathButtonCenterStyle}"/>
78
                <Setter Property="Padding" Value="0" />
79
                <Setter Property="PathStyle" Value="{StaticResource PathButtonCenterStyle}" />
81 80
            </Style>
82 81
        </ResourceDictionary>
83 82

  

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)