프로젝트

일반

사용자정보

개정판 78d91584

ID78d915845673968772c07c2d552108475e0f06a4
상위 22c025b3
하위 19abb0c0

이지연이(가) 5년 이상 전에 추가함

issue #1033: 폰트 목록 Text 수정 및 TopMenu 디자인 수정

Change-Id: I803173025fcfd626a5be04e389d77213f93c6c4f

차이점 보기:

KCOM/Views/TopMenu.xaml
491 491
                    
492 492
                    <telerik:RadOrderedWrapPanel>
493 493
                        <StackPanel Orientation="Horizontal">
494
						<!--강인구 추가-->
495 494
                            <telerik:RadRibbonComboBox Width="60" Name="comboFontFamily" SelectedIndex="0" telerik:ScreenTip.Title="Font" telerik:ScreenTip.Description="Change the font face." 
496
                                                       SelectionChanged="RadRibbonComboBox_SelectionChanged" />
497
                            <!--    <telerik:RadRibbonComboBoxItem Content="Arial"/>
498
                                <telerik:RadRibbonComboBoxItem Content="Calibri (Body)" />
499
                                <telerik:RadRibbonComboBoxItem Content="Tahoma" />
500
                                <telerik:RadRibbonComboBoxItem Content="Verdana"  />
501
                                <telerik:RadRibbonComboBoxItem Content="Times New Roman" />
502
                                <telerik:RadRibbonComboBoxItem Content="Cambria" />
503
                            </telerik:RadRibbonComboBox>-->
504
                                                        <!--강인구 추가(이벤트)-->
505
                            <!--<telerik:RadRibbonComboBox Name="comboFontSize" Width="45" SelectedIndex="0" telerik:ScreenTip.Title="Font Size"  telerik:ScreenTip.Description="Change the font size." SelectionChanged="comboFontSize_SelectionChanged">
506
                                <telerik:RadRibbonComboBoxItem Content="8" />
507
                                <telerik:RadRibbonComboBoxItem Content="9" />
508
                                <telerik:RadRibbonComboBoxItem Content="10" />
509
                                <telerik:RadRibbonComboBoxItem Content="11" />
510
                                <telerik:RadRibbonComboBoxItem Content="12" />
511
                                <telerik:RadRibbonComboBoxItem Content="14" />
512
                                <telerik:RadRibbonComboBoxItem Content="16" />
513
                                <telerik:RadRibbonComboBoxItem Content="18" />
514
                                <telerik:RadRibbonComboBoxItem Content="20" />
515
                                <telerik:RadRibbonComboBoxItem Content="30" />
516
                                <telerik:RadRibbonComboBoxItem Content="40" />
517
                                <telerik:RadRibbonComboBoxItem Content="50" />
518
                                <telerik:RadRibbonComboBoxItem Content="60" />
519
                                <telerik:RadRibbonComboBoxItem Content="70" />
520
                                <telerik:RadRibbonComboBoxItem Content="80" />
521
                                <telerik:RadRibbonComboBoxItem Content="90" />
522
                                <telerik:RadRibbonComboBoxItem Content="100" />
523
                            </telerik:RadRibbonComboBox>-->
524

  
525

  
495
                                                       SelectionChanged="RadRibbonComboBox_SelectionChanged" Background="Transparent"/>
526 496
                            <telerik:RadNumericUpDown x:Name="comboFontSize"
527 497
                                                      Width="35"
528 498
                                                      HorizontalContentAlignment="Center"
......
532 502
                                                      telerik:StyleManager.Theme="Windows7"
533 503
                                                      ToolTipService.ToolTip="Stroke Value"
534 504
													  ValueChanged="comboFontSize_ValueChanged"
535
                                                      Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}"
536
                                                      />
537

  
538

  
505
                                                      Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}"/>
539 506
                        </StackPanel>
540
                        <!--<telerik:RadButtonGroup>
541
                            <telerik:RadRibbonButton SmallImage="/KCOM;component/Resources/Images/MenuImage/bold.png" telerik:ScreenTip.Title="Grow Font" />
542
                            <telerik:RadRibbonButton SmallImage="/RadRibbonViewSample;component/Images/IconMSOffice/16/font-decreasesize.png" telerik:ScreenTip.Title="Shrink Font" />
543
                        </telerik:RadButtonGroup>-->
544
                        <!--<telerik:RadButtonGroup>
545
                            <telerik:RadRibbonButton SmallImage="/RadRibbonViewSample;component/Images/IconMSOffice/16/ClearFormatting16.png" Text="Clear Formatting" telerik:ScreenTip.Title="Clear Formatting" />
546
                        </telerik:RadButtonGroup>-->
547
                        <!--<telerik:RadButtonGroup telerik:StyleManager.Theme="Office2016">-->
548
                        <!--강인구 추가(이벤트)-->
549
                        <!--<CheckBox HorizontalAlignment="Left" Content="Highlight" Grid.Column="3" VerticalAlignment="Center" Margin="2,5,2,0" Checked="HighlightEvent" Unchecked="HighlightEvent" IsChecked="{Binding checkHighlight, Source={x:Static common:ViewerDataModel.Instance}}" />-->
550
                        <telerik:RadToggleButton x:Name="btnBold" telerik:ScreenTip.Title="Bold" telerik:ScreenTip.Description="Make the selected text bold." Width="32" Height="32" Checked="btnBold_Checked"  Unchecked="btnBold_Checked" IsChecked="{Binding checkTextWeight, Source={x:Static common:ViewerDataModel.Instance}}">
507
                        <StackPanel Orientation="Horizontal">
508
                            <telerik:RadToggleButton x:Name="btnBold" telerik:ScreenTip.Title="Bold" telerik:ScreenTip.Description="Make the selected text bold." Width="32" Height="32" Checked="btnBold_Checked"  Unchecked="btnBold_Checked" IsChecked="{Binding checkTextWeight, Source={x:Static common:ViewerDataModel.Instance}}">
551 509
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/bold.png" />
552
                            </telerik:RadToggleButton>
553
                        <!--강인구 추가(이벤트)-->
554
                        <telerik:RadToggleButton  x:Name="btnItalic"  telerik:ScreenTip.Title="Italic" telerik:ScreenTip.Description="Italicize the selected text." Width="32" Height="32" Checked="btnItalic_Checked"  Unchecked="btnItalic_Checked" IsChecked="{Binding checkTextStyle, Source={x:Static common:ViewerDataModel.Instance}}">
510
                            </telerik:RadToggleButton>                            
511
                            <telerik:RadToggleButton  x:Name="btnItalic"  telerik:ScreenTip.Title="Italic" telerik:ScreenTip.Description="Italicize the selected text." Width="32" Height="32" Checked="btnItalic_Checked"  Unchecked="btnItalic_Checked" IsChecked="{Binding checkTextStyle, Source={x:Static common:ViewerDataModel.Instance}}">
555 512
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/italic.png"/>
556
                            </telerik:RadToggleButton>
557
						<!--강인구 추가(이벤트)-->
558
                        <telerik:RadToggleButton  x:Name="btnUnderLine" Width="32" Height="32" telerik:ScreenTip.Title="Underline" telerik:ScreenTip.Description="Underline the selected text." Checked="btnUnderLine_Checked"  Unchecked="btnUnderLine_Checked" IsChecked="{Binding checkUnderLine, Source={x:Static common:ViewerDataModel.Instance}}">
513
                            </telerik:RadToggleButton>                           
514
                            <telerik:RadToggleButton  x:Name="btnUnderLine" Width="32" Height="32" telerik:ScreenTip.Title="Underline" telerik:ScreenTip.Description="Underline the selected text." Checked="btnUnderLine_Checked"  Unchecked="btnUnderLine_Checked" IsChecked="{Binding checkUnderLine, Source={x:Static common:ViewerDataModel.Instance}}">
559 515
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/underline.png"/>
560 516
                            </telerik:RadToggleButton>
561
                        <!--</telerik:RadButtonGroup>-->
562
                        <!--<CheckBox Margin="10,3,5,0" HorizontalAlignment="Left" Content="Highlight" VerticalAlignment="Center"/>--><!--
563
                        <telerik:RadButton Content="LIBRARY" Background="{DynamicResource KCOMColor_MarkerBrush}" Foreground="White" Margin="5,5,0,0" Padding="3"/>-->
517
                        </StackPanel>
564 518
                    </telerik:RadOrderedWrapPanel>
565 519
                </telerik:RadRibbonGroup>
566 520
                

내보내기 Unified diff

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