프로젝트

일반

사용자정보

개정판 9380813b

ID9380813b9b02f7fd57d09215872fa478da512b60
상위 57ae0756
하위 b5f9f7fb

임예철이(가) 9달 전에 추가함

Search Panel 방향키 수정
Text생성시 여러번 클릭 할 경우 입력값이 없으면 생성된 객체 삭제
Font Size에 한글입력 방지

Change-Id: I3b8e47c313869b6e03f0c634cb8ea340c189812d

차이점 보기:

KCOM/Views/TopMenu.xaml
1 1
<UserControl
2
    x:Class="KCOM.Views.TopMenu"
3 2
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4 3
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5 4
    xmlns:common="clr-namespace:KCOM.Common"
......
8 7
    xmlns:local="clr-namespace:KCOM.Views"
9 8
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10 9
    xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
10
    xmlns:Globalization="clr-namespace:System.Globalization;assembly=mscorlib"
11
    x:Class="KCOM.Views.TopMenu"
11 12
    d:DesignHeight="250"
12 13
    d:DesignWidth="1600"
13 14
    mc:Ignorable="d">
14 15
    <!--  d:DesignHeight="250" d:DesignWidth="1600">  -->
15 16
    <UserControl.Resources>
16
        <Style TargetType="telerik:RadToggleButton">
17
        <Style TargetType="{x:Type telerik:RadToggleButton}">
17 18
            <Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
18 19
            <Setter Property="BorderThickness" Value="0" />
19 20
            <Setter Property="Background" Value="Transparent" />
20 21
        </Style>
21
        <Style TargetType="telerik:RadRibbonComboBox">
22
        <Style TargetType="{x:Type telerik:RadRibbonComboBox}">
22 23
            <Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
23 24
        </Style>
24
        <Style TargetType="telerik:RadRibbonButton">
25
        <Style TargetType="{x:Type telerik:RadRibbonButton}">
25 26
            <Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
26 27
        </Style>
27
        <Style TargetType="telerik:RadRibbonToggleButton">
28
        <Style TargetType="{x:Type telerik:RadRibbonToggleButton}">
28 29
            <Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" />
29 30
        </Style>
30 31
    </UserControl.Resources>
......
136 137
                                        NumberDecimalDigits="0"
137 138
                                        ToolTipService.ToolTip="Save Interval Value"
138 139
                                        ValueChanged="cbSaveInterval_ValueChanged"
139
                                        Value="{Binding SaveInterval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
140
                                        Value="{Binding SaveInterval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
140 141
                                </telerik:RadButtonGroup>
141 142

  
142 143
                            </Grid>
......
449 450
                                NumberDecimalDigits="0"
450 451
                                ToolTipService.ToolTip="Interval Value"
451 452
                                ValueChanged="cbIntervalSize_ValueChanged"
452
                                Value="{Binding Interval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
453
                                Value="{Binding Interval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
453 454
                        </telerik:RadButtonGroup>
454 455

  
455 456

  
......
499 500
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_new/cloudRect.png" />
500 501
                        </telerik:RadToggleButton>
501 502

  
503

  
504

  
505
                        <!--<telerik:RadButtonGroup Height="20" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Width="120" Margin="-30,6,10,-1"
506
                                                BorderThickness="1"
507
                                                telerik:StyleManager.Theme="Windows8">
508
                            <TextBlock Width="50"
509
                                       Margin="2"
510
                                       HorizontalAlignment="Center"
511
                                       VerticalAlignment="Center"
512
                                       FontSize="10"
513
                                       Text="ArcSize"
514
                                       TextAlignment="Center" />
515
                            <telerik:RadNumericUpDown x:Name="cbArcSize"
516
                                                      Width="66"
517
                                                      Height="22"
518
                                                      Margin="2"
519
                                                      HorizontalAlignment="Stretch"
520
                                                      VerticalAlignment="Center"
521
                                                      HorizontalContentAlignment="Center"
522
                                                      Maximum="10"
523
                                                      Minimum="1"
524
                                                      NumberDecimalDigits="0"
525
                                                      telerik:StyleManager.Theme="Windows7"
526
                                                      ToolTipService.ToolTip="Stroke Value"
527
													  ValueChanged="cbLineSize_ValueChanged"
528

  
529
                                                      Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}"
530
                                                      />
531
                        </telerik:RadButtonGroup>-->
502 532
                        <!--  강인구 추가  -->
503 533
                        <CheckBox
504 534
                            x:Name="cbFillShape"
......
611 641
                                NumberDecimalDigits="0"
612 642
                                ToolTipService.ToolTip="Interval Value"
613 643
                                ValueChanged="cbArcLength_ValueChanged"
614
                                Value="{Binding ArcLength, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
644
                                Value="{Binding ArcLength, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
615 645
                        </telerik:RadDockPanel>
616 646

  
617 647

  
618 648

  
619
                        <!--<telerik:RadButtonGroup Height="20" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Width="120" Margin="-30,6,10,-1"
620
                                                BorderThickness="1"
621
                                                telerik:StyleManager.Theme="Windows8">
622
                            <TextBlock Width="50"
623
                                       Margin="2"
624
                                       HorizontalAlignment="Center"
625
                                       VerticalAlignment="Center"
626
                                       FontSize="10"
627
                                       Text="ArcSize"
628
                                       TextAlignment="Center" />
629
                            <telerik:RadNumericUpDown x:Name="cbArcSize"
630
                                                      Width="66"
631
                                                      Height="22"
632
                                                      Margin="2"
633
                                                      HorizontalAlignment="Stretch"
634
                                                      VerticalAlignment="Center"
635
                                                      HorizontalContentAlignment="Center"
636
                                                      Maximum="10"
637
                                                      Minimum="1"
638
                                                      NumberDecimalDigits="0"
639
                                                      telerik:StyleManager.Theme="Windows7"
640
                                                      ToolTipService.ToolTip="Stroke Value"
641
													  ValueChanged="cbLineSize_ValueChanged"
642

  
643
                                                      Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}"
644
                                                      />
645
                        </telerik:RadButtonGroup>-->
646 649
                    </Grid>
647 650
                </telerik:RadRibbonGroup>
648 651
                <telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed" Header="MACRO">
......
789 792
                    <telerik:RadOrderedWrapPanel>
790 793
                        <StackPanel Orientation="Horizontal">
791 794
                            <telerik:RadRibbonComboBox
792
                                Name="comboFontFamily"
795
                                x:Name="comboFontFamily"
793 796
                                Width="60"
794 797
                                telerik:ScreenTip.Description="Change the font face."
795 798
                                telerik:ScreenTip.Title="Font"
......
817 820
                                NumberDecimalDigits="0"
818 821
                                ToolTipService.ToolTip="Stroke Value"
819 822
                                ValueChanged="comboFontSize_ValueChanged"
820
                                Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" />
823
                                Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" PreviewTextInput="comboFontSize_PreviewTextInput" PreviewKeyDown="comboFontSize_PreviewKeyDown" >
824
                            </telerik:RadNumericUpDown>
821 825
                        </StackPanel>
822 826
                        <StackPanel Orientation="Horizontal">
823 827
                            <telerik:RadToggleButton
......
1223 1227
                        <TextBlock
1224 1228
                            Grid.Row="0"
1225 1229
                            Grid.Column="1"
1226
                            Margin="0,7,5,0">
1230
                            Margin="0,7,5,0"><InlineUIContainer>
1227 1231
                            <TextBlock
1228 1232
                                Padding="3"
1229 1233
                                HorizontalAlignment="Center"
1230 1234
                                VerticalAlignment="Center"
1231 1235
                                Text="/" />
1236
                            </InlineUIContainer><Run Text=" "/><InlineUIContainer>
1232 1237
                            <TextBlock
1233 1238
                                x:Name="tlPageCount"
1234 1239
                                Padding="3"
1235 1240
                                HorizontalAlignment="Center"
1236 1241
                                VerticalAlignment="Center"
1237 1242
                                Text="{Binding Document_Info.Count, Source={x:Static common:ViewerDataModel.Instance}}" />
1238
                        </TextBlock>
1243
                            </InlineUIContainer></TextBlock>
1239 1244

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

  
1795 1794
                        <telerik:RadButton
......
1800 1799
                            BorderThickness="0"
1801 1800
                            Click="PageGoEvent"
1802 1801
                            CommandParameter="Up">
1803
                            <telerik:RadButton.Content>
1804
                                <Image
1802
                            <Image
1805 1803
                                    Width="20"
1806 1804
                                    Height="20"
1807 1805
                                    RenderTransformOrigin="0.5,0.5"
1808 1806
                                    Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png"
1809 1807
                                    Stretch="Uniform">
1810
                                    <Image.RenderTransform>
1811
                                        <RotateTransform Angle="180" />
1812
                                    </Image.RenderTransform>
1813
                                </Image>
1814
                            </telerik:RadButton.Content>
1808
                                <Image.RenderTransform>
1809
                                    <RotateTransform Angle="180" />
1810
                                </Image.RenderTransform>
1811
                            </Image>
1815 1812
                        </telerik:RadButton>
1816 1813
                    </StackPanel>
1817 1814
                    <!--<Grid Margin="0,-1,0,0">
......
2417 2414
                                BorderThickness="0"
2418 2415
                                Click="CheckEvent"
2419 2416
                                CommandParameter="Check">
2420
                                <telerik:RadButton.Content>
2421
                                    <Image
2417
                                <Image
2422 2418
                                        Width="26"
2423 2419
                                        Height="26"
2424 2420
                                        Source="/KCOM;component/Resources/Images/MenuImage_new/checklist.png"
2425 2421
                                        Stretch="Uniform" />
2426
                                </telerik:RadButton.Content>
2427 2422
                            </telerik:RadButton>
2428 2423
                        </StackPanel>
2429 2424
                    </telerik:RadOrderedWrapPanel>
......
2460 2455
                                Margin="0,0,5,0"
2461 2456
                                BorderThickness="0"
2462 2457
                                Click="SignManagerEvent">
2463
                                <telerik:RadButton.Content>
2464
                                    <Image
2458
                                <Image
2465 2459
                                        Width="26"
2466 2460
                                        Height="26"
2467 2461
                                        Source="/KCOM;component/Resources/Images/MenuImage_new/signReal.png"
2468 2462
                                        Stretch="Uniform" />
2469
                                </telerik:RadButton.Content>
2470 2463
                            </telerik:RadButton>
2471 2464
                        </StackPanel>
2472 2465
                    </telerik:RadOrderedWrapPanel>

내보내기 Unified diff

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