프로젝트

일반

사용자정보

개정판 3abe8d4e

ID3abe8d4e3d2c884be03d4a20fb39e967d1d1f077
상위 f1f822e9
하위 7c257f8d

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

issue #00000 자신의 마크업이 없는 경우 GotoMarkup에서 오류발생

Change-Id: Ideebbe7797a790e55dfa96e24fe5a6a528eeb784

차이점 보기:

KCOM/Views/MainMenu.xaml
14 14
    xmlns:telerikGrid="clr-namespace:Telerik.Windows.Controls.GridView;assembly=Telerik.Windows.Controls.GridView"
15 15
    xmlns:toggle="clr-namespace:ToggleSwitch;assembly=ToggleSwitch"
16 16
    d:DesignHeight="768"
17
    d:DesignWidth="1080"
17
    d:DesignWidth="1200"
18 18
    IsTabStop="True"
19 19
    mc:Ignorable="d">
20 20
    <UserControl.Resources>
......
59 59
        </Style>
60 60
        <converter:PDFVisibleConverter x:Key="PDFVisibleConverter" />
61 61
        <converter:ConsolidationBackgroudConverter x:Key="ConsolidationBackgroudConverter" />
62
        <converter:StringToColorBrushConverter x:Key="StringToColorBrushConverter" />
62 63
        <converter:StringToColorConverter x:Key="StringToColorConverter" />
63 64
        <converter:AvoidStringConverter x:Key="AvoidStringConverter" />
64 65
        <converter:TeamConsolidateStringConverter x:Key="TeamConsoliStringConverter" />
......
291 292
                </VisualStateManager.VisualStateGroups>
292 293
            </Grid>
293 294
        </ControlTemplate>
295
        <!--  App.xaml에 선언됨  -->
296
        <!--<Style BasedOn="{StaticResource PaneHeaderStyle}" TargetType="telerik:PaneHeader">-->
297
        <!--<Style TargetType="telerik:PaneHeader">
298
            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
299
            <Setter Property="HorizontalAlignment" Value="Stretch" />
300
        </Style>-->
294 301
    </UserControl.Resources>
295 302
    <Grid Background="{DynamicResource KCOMColor_MainBrush}">
296 303
        <!--<Grid.ColumnDefinitions>
......
906 913
                                                    <DataTemplate>
907 914
                                                        <Grid>
908 915
                                                            <Grid>
909
                                                                <Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
916
                                                                <Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />
910 917
                                                                <TextBlock Foreground="#00000000" Text="Color" />
911 918
                                                            </Grid>
912 919
                                                            <Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
......
1173 1180
                        Header="User information List">
1174 1181
                        <telerik:RadPane.TitleTemplate>
1175 1182
                            <DataTemplate>
1176
                                <Grid>
1183
                                <Grid HorizontalAlignment="Stretch">
1177 1184
                                    <Grid.ColumnDefinitions>
1178 1185
                                        <ColumnDefinition Width="*" />
1179 1186
                                        <ColumnDefinition Width="Auto" />
1187
                                        <ColumnDefinition Width="*" />
1180 1188
                                    </Grid.ColumnDefinitions>
1181

  
1182
                                    <StackPanel Orientation="Horizontal">
1189
                                    <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
1183 1190
                                        <TextBlock
1184 1191
                                            Margin="1"
1185 1192
                                            VerticalAlignment="Center"
......
1270 1277
                                            </Border>
1271 1278
                                        </telerik:RadRibbonButton>
1272 1279
                                    </StackPanel>
1280
                                    <Line
1281
                                        Grid.Column="1"
1282
                                        Width="2"
1283
                                        Margin="5,0"
1284
                                        VerticalAlignment="Center"
1285
                                        Stroke="Black"
1286
                                        X1="2"
1287
                                        X2="2"
1288
                                        Y1="2"
1289
                                        Y2="24" />
1290
                                    <telerik:RadRibbonButton
1291
                                        x:Name="btnColorList"
1292
                                        Grid.Column="2"
1293
                                        HorizontalAlignment="Right"
1294
                                        VerticalAlignment="Center"
1295
                                        telerik:StyleManager.Theme="Office2016"
1296
                                        Click="btnColorList_Click"
1297
                                        ToolTipService.ToolTip="Color Change">
1298
                                        <Border
1299
                                            Background="#E9F0F8"
1300
                                            BorderBrush="#839AB3"
1301
                                            BorderThickness="1">
1302
                                            <Image Width="22" Source="/Resources/Images/MenuImage_New/rgb.png" />
1303
                                        </Border>
1304
                                    </telerik:RadRibbonButton>
1273 1305
                                    <!--<StackPanel Grid.Column="1"
1274 1306
                                                HorizontalAlignment="Right"
1275 1307
                                                Orientation="Horizontal">
......
1306 1338
                            CanUserInsertRows="False"
1307 1339
                            CanUserSortColumns="True"
1308 1340
                            IsFilteringAllowed="False"
1309
                            IsReadOnly="True"
1341
                            IsReadOnly="False"
1342
                            MouseRightButtonDown="gridViewMarkup_MouseRightButtonDown"
1310 1343
                            RowIndicatorVisibility="Collapsed"
1311 1344
                            SelectionChanged="gridViewMarkup_SelectionChanged"
1312 1345
                            SelectionMode="Multiple"
1346
                            SelectionUnit="FullRow"
1313 1347
                            ShowGroupFooters="False"
1314 1348
                            ShowGroupPanel="True"
1315 1349
                            Sorted="GridViewMarkup_Sorted"
1316 1350
                            Sorting="GridViewMarkup_Sorting">
1351
                            <!--  SelectedCellsChanged="gridViewMarkup_SelectedCellsChanged"  -->
1317 1352
                            <!--<telerik:RadGridView.GroupDescriptors>
1318 1353
                                <telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT" x:Name="gDept">
1319 1354
                                    <telerik:GroupDescriptor.AggregateFunctions>
......
1335 1370
                                        <CheckBox telerik:StyleManager.Theme="Office_Black" Click="gridViewMarkupAllSelect_Click" />
1336 1371
                                    </telerik:GridViewSelectColumn.Header>
1337 1372
                                </telerik:GridViewSelectColumn>
1338
                                <telerik:GridViewDataColumn
1339
                                    Width="Auto"
1340
                                    Header="Color"
1341
                                    IsReadOnly="True">
1373
                                <telerik:GridViewDataColumn Width="Auto" Header="Color">
1342 1374
                                    <telerik:GridViewDataColumn.CellTemplate>
1343 1375
                                        <DataTemplate>
1344 1376
                                            <Grid>
1345 1377
                                                <Grid>
1346
                                                    <Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
1378
                                                    <Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />
1347 1379
                                                    <TextBlock Foreground="#00000000" Text="Color" />
1348 1380
                                                </Grid>
1349 1381
                                                <Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
......
1356 1388

  
1357 1389
                                        </DataTemplate>
1358 1390
                                    </telerik:GridViewDataColumn.CellTemplate>
1391
                                    <telerik:GridViewDataColumn.CellEditTemplate>
1392
                                        <DataTemplate>
1393
                                            <telerik:RadColorPicker SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" />
1394
                                        </DataTemplate>
1395
                                    </telerik:GridViewDataColumn.CellEditTemplate>
1359 1396
                                </telerik:GridViewDataColumn>
1360 1397
                                <telerik:GridViewDataColumn
1361 1398
                                    Width="Auto"

내보내기 Unified diff

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