프로젝트

일반

사용자정보

개정판 90e7968d

ID90e7968da9d5053a78b4cb08170ebddef4a62fad
상위 6c8c6f91
하위 beb36e17, 9322ec12

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

issue #000: daelim source compare 중

Change-Id: I010a1b75dae4b786e1c2a51a34c923eafd384667

차이점 보기:

KCOM/Views/MainMenu.xaml
58 58
        <converter:TeamConsolidateStringConverter x:Key="TeamConsoliStringConverter" />
59 59
        <converter:ConsolidationStringConverter x:Key="ConsoliStringConverter" />
60 60
        <converter:BoolToVisibleConverter x:Key="BoolToVisibleConverter" />
61
        <converter:PreviewerVisibleConverter x:Key="previewerVisibleConverter"/>        
61
        <converter:PreviewerVisibleConverter x:Key="previewerVisibleConverter"/>
62 62
    </UserControl.Resources>
63
    
64
    <Grid Background="{DynamicResource KCOMColor_MainBrush}">        
63
    <Grid Background="{DynamicResource KCOMColor_MainBrush}">
65 64
        <!--<Grid.ColumnDefinitions>
66 65
            <ColumnDefinition Width="Auto"/>
67 66
            <ColumnDefinition Width="*"/>
......
109 108
                                <Popup Name="floatingTip" AllowsTransparency="True" Placement="Relative" PlacementTarget="{Binding ElementName=rect}">
110 109
                                    <TextBlock x:Name="txtBatch" Foreground="Red" FontSize="20" Text="Mark Control을 그립니다."/>
111 110
                                </Popup>
112
                                
113 111
                                <telerik:RadBusyIndicator x:Name="busyIndicator" IsBusy="False" BusyContent="Saving...">
114 112
                                <ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl"
115 113
                                                              MouseWheel="zoomAndPanControl_MouseWheel"
......
124 122
                                                              ConstrainedContentViewportWidth="{Binding ContentViewportWidth, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
125 123
                                                              ConstrainedContentViewportHeight="{Binding ContentViewportHeight, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
126 124
                                                              Background="LightGray">
127
                                    <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">                                            
128
                                            <Canvas x:Name="drawingRotateCanvas"
125
                                    <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">
126

  
127
                                        <Canvas x:Name="drawingRotateCanvas"
129 128
                                                        Panel.ZIndex="1"
130 129
                                                        Background="{Binding BackgroundImage, Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}">
131 130
                                            <Canvas.RenderTransform>
......
791 790
                        </telerik:RadGridView>
792 791
                    </telerik:RadPane>
793 792
                </telerik:RadPaneGroup>
794
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016" telerik:ProportionalStackPanel.RelativeSize="60, 100">
793
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016" telerik:ProportionalStackPanel.RelativeSize="100, 100">
795 794
                    <telerik:RadPane Header="Document History"  CanFloat="False" CanUserClose="False"  ContextMenuTemplate="{x:Null}" telerik:StyleManager.Theme="Office2016"  x:Name="historyPane">
796 795
                        <Grid>
797 796
                            <telerik:RadGridView telerik:StyleManager.Theme="Office2013" ShowGroupPanel="False" ShowGroupFooters="False" AutoExpandGroups="False"  x:Name="gridViewHistory"

내보내기 Unified diff

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