개정판 92442e4a
image load 수정
Change-Id: I35e6802b9bde1cd6a7c9787f3a71fb53d6ea10ad
| ConvertService/ServiceBase/Markus.Service.StationController/MainWindow.xaml | ||
|---|---|---|
| 18 | 18 |
<!--<materialDesign:DrawerHost.LeftDrawerContent> |
| 19 | 19 |
<materialEx:SideNavigation Items="{Binding NavigationItems,Mode=OneTime}" Width="280"/>
|
| 20 | 20 |
</materialDesign:DrawerHost.LeftDrawerContent>--> |
| 21 |
<Grid> |
|
| 22 |
<Grid.ColumnDefinitions> |
|
| 23 |
<ColumnDefinition Width="Auto"/> |
|
| 24 |
<ColumnDefinition/> |
|
| 25 |
</Grid.ColumnDefinitions> |
|
| 21 | 26 |
<Grid> |
| 22 | 27 |
<Grid.ColumnDefinitions> |
| 23 | 28 |
<ColumnDefinition Width="Auto" /> |
| ... | ... | |
| 27 | 32 |
<RowDefinition Height="Auto" /> |
| 28 | 33 |
<RowDefinition Height="*" /> |
| 29 | 34 |
</Grid.RowDefinitions> |
| 30 |
<!--<materialEx:AppBar x:Name="appBar" Grid.ColumnSpan="2" Title="MARKUS CONVERT SERVICE" ShowNavigationDrawerButton="True">
|
|
| 35 |
<materialEx:AppBar x:Name="appBar" Grid.ColumnSpan="2" Title="MARKUS CONVERT SERVICE" ShowNavigationDrawerButton="True"> |
|
| 31 | 36 |
<Button Style="{StaticResource MaterialDesignToolForegroundButton}" Margin="8,0" ToolTip="Material Design Exentions on GitHub">
|
| 32 | 37 |
</Button> |
| 33 | 38 |
<Button Style="{StaticResource MaterialDesignToolForegroundButton}" Margin="8,0" ToolTip="Documentation">
|
| 34 | 39 |
</Button> |
| 35 |
</materialEx:AppBar>-->
|
|
| 36 |
<!--<Border Grid.Row="1" BorderThickness="0,0,1,0" BorderBrush="{DynamicResource MaterialDesignDivider}">
|
|
| 40 |
</materialEx:AppBar> |
|
| 41 |
<Border BorderThickness="0,0,1,0" BorderBrush="{DynamicResource MaterialDesignDivider}">
|
|
| 37 | 42 |
<materialEx:SideNavigation Items="{Binding NavigationItems,Mode=OneTime}" DataContext="{Binding Mode=OneWay}"/>
|
| 38 |
</Border>--> |
|
| 39 |
<Grid Grid.Column="1" Grid.Row="1"> |
|
| 43 |
</Border> |
|
| 44 |
</Grid> |
|
| 45 |
<Grid Grid.Column="1"> |
|
| 40 | 46 |
<DataGrid ItemsSource="{Binding AliveItems}" AutoGenerateColumns="False"
|
| 41 | 47 |
x:Name="DataGrid" ScrollViewer.CanContentScroll="False"> |
| 42 | 48 |
<DataGrid.Columns> |
| ... | ... | |
| 52 | 58 |
</DataGrid> |
| 53 | 59 |
</Grid> |
| 54 | 60 |
</Grid> |
| 55 |
</materialDesign:DrawerHost>
|
|
| 61 |
</materialDesign:DrawerHost> |
|
| 56 | 62 |
</materialDesign:DialogHost> |
| 57 | 63 |
</Window> |
내보내기 Unified diff
