프로젝트

일반

사용자정보

개정판 8acc4862

ID8acc48628a74e0d8f4fad6f3d04651af56c241b3
상위 3e416e48
하위 80069f57, a9a82876

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

issue #00000 ZoomAndPanControl OnApplyTemplate 호출 수정

Change-Id: I923686647377c67c1dc0bac05d59329dbadda75e

차이점 보기:

KCOM/Views/TopMenu.xaml
1 1
<UserControl
2
    x:Class="KCOM.Views.TopMenu"
2 3
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 4
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5
    xmlns:Globalization="clr-namespace:System.Globalization;assembly=mscorlib"
4 6
    xmlns:common="clr-namespace:KCOM.Common"
5 7
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6 8
    xmlns:fonts="clr-namespace:Markus.Fonts;assembly=Markus.Fonts"
7 9
    xmlns:local="clr-namespace:KCOM.Views"
8 10
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9 11
    xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
10
    xmlns:Globalization="clr-namespace:System.Globalization;assembly=mscorlib"
11
    x:Class="KCOM.Views.TopMenu"
12 12
    d:DesignHeight="250"
13 13
    d:DesignWidth="1600"
14 14
    mc:Ignorable="d">
......
448 448
                                Maximum="100"
449 449
                                Minimum="5"
450 450
                                NumberDecimalDigits="0"
451
                                PreviewKeyDown="cbIntervalSize_PreviewKeyDown"
452
                                PreviewTextInput="cbIntervalSize_PreviewTextInput"
451 453
                                ToolTipService.ToolTip="Interval Value"
452 454
                                ValueChanged="cbIntervalSize_ValueChanged"
453
                                Value="{Binding Interval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" PreviewKeyDown="cbIntervalSize_PreviewKeyDown" PreviewTextInput="cbIntervalSize_PreviewTextInput" />
455
                                Value="{Binding Interval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
454 456
                        </telerik:RadButtonGroup>
455 457

  
456 458

  
......
639 641
                                Maximum="100"
640 642
                                Minimum="5"
641 643
                                NumberDecimalDigits="0"
644
                                PreviewKeyDown="cbArcLength_PreviewKeyDown"
645
                                PreviewTextInput="cbArcLength_PreviewTextInput"
642 646
                                ToolTipService.ToolTip="Interval Value"
643 647
                                ValueChanged="cbArcLength_ValueChanged"
644
                                Value="{Binding ArcLength, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" PreviewKeyDown="cbArcLength_PreviewKeyDown" PreviewTextInput="cbArcLength_PreviewTextInput" />
648
                                Value="{Binding ArcLength, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
645 649
                        </telerik:RadDockPanel>
646 650

  
647 651

  
......
817 821
                                Maximum="999"
818 822
                                Minimum="1"
819 823
                                NumberDecimalDigits="0"
824
                                PreviewKeyDown="comboFontSize_PreviewKeyDown"
825
                                PreviewTextInput="comboFontSize_PreviewTextInput"
820 826
                                ToolTipService.ToolTip="Stroke Value"
821 827
                                ValueChanged="comboFontSize_ValueChanged"
822
                                Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" PreviewTextInput="comboFontSize_PreviewTextInput" PreviewKeyDown="comboFontSize_PreviewKeyDown" >
823
                            </telerik:RadNumericUpDown>
828
                                Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" />
824 829
                        </StackPanel>
825 830
                        <StackPanel Orientation="Horizontal">
826 831
                            <telerik:RadToggleButton
......
1186 1191
                                Maximum="99"
1187 1192
                                Minimum="1"
1188 1193
                                NumberDecimalDigits="0"
1194
                                PreviewKeyDown="cbLineSize_PreviewKeyDown"
1195
                                PreviewTextInput="cbLineSize_PreviewTextInput"
1189 1196
                                ToolTipService.ToolTip="Stroke Value"
1190 1197
                                ValueChanged="cbLineSize_ValueChanged"
1191
                                Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}" PreviewKeyDown="cbLineSize_PreviewKeyDown" PreviewTextInput="cbLineSize_PreviewTextInput" />
1198
                                Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}" />
1192 1199
                        </telerik:RadButtonGroup>
1193 1200
                    </telerik:RadOrderedWrapPanel>
1194 1201
                </telerik:RadRibbonGroup>
......
1227 1234
                            Grid.Row="0"
1228 1235
                            Grid.Column="1"
1229 1236
                            Margin="0,7,5,0"><InlineUIContainer>
1230
                            <TextBlock
1231
                                Padding="3"
1232
                                HorizontalAlignment="Center"
1233
                                VerticalAlignment="Center"
1234
                                Text="/" />
1235
                            </InlineUIContainer><Run Text=" "/><InlineUIContainer>
1236
                            <TextBlock
1237
                                x:Name="tlPageCount"
1238
                                Padding="3"
1239
                                HorizontalAlignment="Center"
1240
                                VerticalAlignment="Center"
1241
                                Text="{Binding Document_Info.Count, Source={x:Static common:ViewerDataModel.Instance}}" />
1237
                                <TextBlock
1238
                                    Padding="3"
1239
                                    HorizontalAlignment="Center"
1240
                                    VerticalAlignment="Center"
1241
                                    Text="/" />
1242
                            </InlineUIContainer><Run Text=" " /><InlineUIContainer>
1243
                                <TextBlock
1244
                                    x:Name="tlPageCount"
1245
                                    Padding="3"
1246
                                    HorizontalAlignment="Center"
1247
                                    VerticalAlignment="Center"
1248
                                    Text="{Binding Document_Info.Count, Source={x:Static common:ViewerDataModel.Instance}}" />
1242 1249
                            </InlineUIContainer></TextBlock>
1243 1250

  
1244 1251
                        <telerik:RadButton
......
1249 1256
                            Click="PageGoEvent"
1250 1257
                            CommandParameter="Down">
1251 1258
                            <Image
1252
                                    Width="20"
1253
                                    Height="20"
1254
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1255
                                    Stretch="Uniform" />
1259
                                Width="20"
1260
                                Height="20"
1261
                                Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1262
                                Stretch="Uniform" />
1256 1263
                        </telerik:RadButton>
1257 1264
                        <telerik:RadButton
1258 1265
                            Grid.Row="1"
......
1262 1269
                            Click="PageGoEvent"
1263 1270
                            CommandParameter="Up">
1264 1271
                            <Image
1265
                                    Width="20"
1266
                                    Height="20"
1267
                                    RenderTransformOrigin="0.5,0.5"
1268
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1269
                                    Stretch="Uniform">
1272
                                Width="20"
1273
                                Height="20"
1274
                                RenderTransformOrigin="0.5,0.5"
1275
                                Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1276
                                Stretch="Uniform">
1270 1277
                                <Image.RenderTransform>
1271 1278
                                    <RotateTransform Angle="180" />
1272 1279
                                </Image.RenderTransform>
......
1778 1785
                            Click="PageGoEvent"
1779 1786
                            CommandParameter="Down">
1780 1787
                            <Image
1781
                                    Width="20"
1782
                                    Height="20"
1783
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1784
                                    Stretch="Uniform" />
1788
                                Width="20"
1789
                                Height="20"
1790
                                Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1791
                                Stretch="Uniform" />
1785 1792
                        </telerik:RadButton>
1786 1793

  
1787 1794
                        <telerik:RadButton
......
1793 1800
                            Click="PageGoEvent"
1794 1801
                            CommandParameter="Up">
1795 1802
                            <Image
1796
                                    Width="20"
1797
                                    Height="20"
1798
                                    RenderTransformOrigin="0.5,0.5"
1799
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1800
                                    Stretch="Uniform">
1803
                                Width="20"
1804
                                Height="20"
1805
                                RenderTransformOrigin="0.5,0.5"
1806
                                Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1807
                                Stretch="Uniform">
1801 1808
                                <Image.RenderTransform>
1802 1809
                                    <RotateTransform Angle="180" />
1803 1810
                                </Image.RenderTransform>
......
2408 2415
                                Click="CheckEvent"
2409 2416
                                CommandParameter="Check">
2410 2417
                                <Image
2411
                                        Width="26"
2412
                                        Height="26"
2413
                                        Source="/KCOM;component/Resources/Images/MenuImage_new/checklist.png"
2414
                                        Stretch="Uniform" />
2418
                                    Width="26"
2419
                                    Height="26"
2420
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/checklist.png"
2421
                                    Stretch="Uniform" />
2415 2422
                            </telerik:RadButton>
2416 2423
                        </StackPanel>
2417 2424
                    </telerik:RadOrderedWrapPanel>
......
2437 2444
                    </telerik:RadOrderedWrapPanel>-->
2438 2445
                </telerik:RadRibbonGroup>
2439 2446
                <telerik:RadRibbonGroup
2440
                    telerik:ScreenTip.Description="Show the File Task options."
2441
                    telerik:ScreenTip.Title="File"
2447
                    telerik:ScreenTip.Description="Sign Manager."
2448
                    telerik:ScreenTip.Title="Sign Manager"
2442 2449
                    DialogLauncherVisibility="Collapsed"
2443 2450
                    Header="Sign Manager"
2444 2451
                    Visibility="Visible">
......
2449 2456
                                BorderThickness="0"
2450 2457
                                Click="SignManagerEvent">
2451 2458
                                <Image
2452
                                        Width="26"
2453
                                        Height="26"
2454
                                        Source="/KCOM;component/Resources/Images/MenuImage_new/signReal.png"
2455
                                        Stretch="Uniform" />
2459
                                    Width="26"
2460
                                    Height="26"
2461
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/signReal.png"
2462
                                    Stretch="Uniform" />
2456 2463
                            </telerik:RadButton>
2457 2464
                        </StackPanel>
2458 2465
                    </telerik:RadOrderedWrapPanel>
2459 2466
                </telerik:RadRibbonGroup>
2467
                <telerik:RadRibbonGroup
2468
                    telerik:ScreenTip.Description="Brightness."
2469
                    telerik:ScreenTip.Title="Brightness"
2470
                    DialogLauncherVisibility="Collapsed"
2471
                    Header="Brightness"
2472
                    Visibility="Visible">
2473
                    <telerik:RadOrderedWrapPanel>
2474
                        <StackPanel Orientation="Horizontal">
2475
                            <telerik:RadNumericUpDown ValueChanged="BrightnessValueChanged" Value="1" />
2476
                        </StackPanel>
2477
                    </telerik:RadOrderedWrapPanel>
2478
                </telerik:RadRibbonGroup>
2460 2479
                <!--<telerik:RadButton Margin="0,0,5,0" BorderThickness="0" Click="CheckEvent">-->
2461 2480
                <!--<telerik:RadButton.Content>
2462 2481
                                    <Image Source="/KCOM;component/Resources/Images/MenuImage_new/minus.png" Stretch="Uniform" Width="26" Height="26"/>

내보내기 Unified diff

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