개정판 dbddfdd0
issue #0000 color select 제거
Change-Id: I026e52ed99c0f2ad2b48692a8ae111024aab9d6e
KCOM/Views/MainMenu.xaml | ||
---|---|---|
1294 | 1294 |
VerticalAlignment="Center" |
1295 | 1295 |
telerik:StyleManager.Theme="Office2016" |
1296 | 1296 |
Click="btnColorList_Click" |
1297 |
ToolTipService.ToolTip="Color Change"> |
|
1297 |
ToolTipService.ToolTip="Color Change" |
|
1298 |
Visibility="Collapsed"> |
|
1298 | 1299 |
<Border |
1299 | 1300 |
Background="#E9F0F8" |
1300 | 1301 |
BorderBrush="#839AB3" |
... | ... | |
1375 | 1376 |
<DataTemplate> |
1376 | 1377 |
<Grid> |
1377 | 1378 |
<Grid> |
1379 |
<!--<telerik:RadColorPicker Click="RadColorPicker_Click" SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" />--> |
|
1378 | 1380 |
<Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" /> |
1379 | 1381 |
<TextBlock Foreground="#00000000" Text="Color" /> |
1380 | 1382 |
</Grid> |
... | ... | |
1388 | 1390 |
|
1389 | 1391 |
</DataTemplate> |
1390 | 1392 |
</telerik:GridViewDataColumn.CellTemplate> |
1391 |
<telerik:GridViewDataColumn.CellEditTemplate> |
|
1393 |
<!--<telerik:GridViewDataColumn.CellEditTemplate>
|
|
1392 | 1394 |
<DataTemplate> |
1393 | 1395 |
<telerik:RadColorPicker SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" /> |
1394 | 1396 |
</DataTemplate> |
1395 |
</telerik:GridViewDataColumn.CellEditTemplate> |
|
1397 |
</telerik:GridViewDataColumn.CellEditTemplate>-->
|
|
1396 | 1398 |
</telerik:GridViewDataColumn> |
1397 | 1399 |
<telerik:GridViewDataColumn |
1398 | 1400 |
Width="Auto" |
내보내기 Unified diff