- tweak: SVG think
This commit is contained in:
@@ -52,10 +52,9 @@
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate DataType="{x:Type models:ListItemTemplate}">
|
||||
<StackPanel Orientation="Horizontal" Spacing="17">
|
||||
<PathIcon
|
||||
Data="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
|
||||
Height="40"
|
||||
Width="40" />
|
||||
<Svg Path="{Binding IconKey, Converter={x:Static converters:TypeConverters.IconConverter}}"
|
||||
Height="40"
|
||||
Width="40"/>
|
||||
<TextBlock Text="{Binding Label}" VerticalAlignment="Center" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
|
||||
@@ -78,10 +78,10 @@
|
||||
Padding="15">
|
||||
<Panel>
|
||||
<StackPanel IsVisible="{Binding !IsLogged}" Spacing="15">
|
||||
<Image
|
||||
<Svg
|
||||
Height="100"
|
||||
Margin="0,0,0,20"
|
||||
Source="/Assets/account.png" />
|
||||
Path="/Assets/svg/user.svg"/>
|
||||
<StackPanel HorizontalAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Label VerticalAlignment="Center">
|
||||
@@ -141,19 +141,19 @@
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel IsVisible="{Binding IsLogged}">
|
||||
<Image
|
||||
<Svg
|
||||
Height="100"
|
||||
Margin="0,0,0,20"
|
||||
Source="/Assets/account.png" />
|
||||
Path="/Assets/svg/user.svg"/>
|
||||
<Label>
|
||||
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
|
||||
<TextBlock>Hello:</TextBlock>
|
||||
<TextBlock>Hello,</TextBlock>
|
||||
<TextBlock Text="{Binding CurrentLogin}" />
|
||||
</StackPanel>
|
||||
</Label>
|
||||
<StackPanel
|
||||
HorizontalAlignment="Center"
|
||||
Margin="5"
|
||||
Margin="5,20,5,5"
|
||||
Orientation="Horizontal"
|
||||
Spacing="5">
|
||||
<Button Command="{Binding Logout}">
|
||||
|
||||
@@ -15,10 +15,9 @@
|
||||
|
||||
<Grid
|
||||
ColumnDefinitions="*,2*,40,40"
|
||||
Margin="5,5,5,0"
|
||||
Margin="8"
|
||||
RowDefinitions="40,*">
|
||||
<Border
|
||||
BorderThickness="2,0,0,0"
|
||||
CornerRadius="10,10,0,0"
|
||||
Grid.ColumnSpan="4" />
|
||||
<TextBox
|
||||
@@ -40,14 +39,14 @@
|
||||
Grid.Column="2"
|
||||
Grid.Row="0"
|
||||
Padding="10">
|
||||
<Image Source="/Assets/back.png" />
|
||||
<Svg Path="/Assets/svg/undo.svg"></Svg>
|
||||
</Button>
|
||||
<Button
|
||||
Command="{Binding OnGoEnter}"
|
||||
Grid.Column="3"
|
||||
Grid.Row="0"
|
||||
Padding="10">
|
||||
<Image Source="/Assets/go.png" />
|
||||
<Svg Path="/Assets/svg/next.svg"></Svg>
|
||||
</Button>
|
||||
|
||||
<ScrollViewer
|
||||
@@ -71,10 +70,10 @@
|
||||
Background="#00000000"
|
||||
BorderThickness="0,0,2,0"
|
||||
CornerRadius="0">
|
||||
<Image
|
||||
<Svg
|
||||
Height="15"
|
||||
Margin="10,0,10,0"
|
||||
Source="{Binding IconPath}" />
|
||||
Path="{Binding IconPath}" />
|
||||
</Border>
|
||||
<Label>
|
||||
<TextBlock Text="{Binding Name}" VerticalAlignment="Center" />
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
<Grid
|
||||
ColumnDefinitions="*"
|
||||
Margin="5,0,5,5"
|
||||
Margin="8,0,8,5"
|
||||
RowDefinitions="*,40">
|
||||
<ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2">
|
||||
<ItemsControl
|
||||
@@ -41,13 +41,13 @@
|
||||
Command="{Binding FilterRequired}"
|
||||
Grid.Column="1"
|
||||
Padding="10">
|
||||
<Image Source="/Assets/filter.png" />
|
||||
<Svg Path="/Assets/svg/filter.svg"></Svg>
|
||||
</Button>
|
||||
<Button
|
||||
Command="{Binding UpdateRequired}"
|
||||
Grid.Column="2"
|
||||
Padding="10">
|
||||
<Image Source="/Assets/refresh.png" />
|
||||
<Svg Path="/Assets/svg/refresh.svg"></Svg>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Border>
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
<StackPanel Orientation="Horizontal" Spacing="5" Margin="0">
|
||||
<Border MinWidth="100"
|
||||
Background="{Binding CategoryColor}"
|
||||
CornerRadius="5,0,0,5"
|
||||
Padding="10,0,12,0" BorderThickness="2,0,2,0">
|
||||
CornerRadius="5"
|
||||
Padding="10,0,12,0" >
|
||||
<Label FontSize="15" VerticalAlignment="Center">
|
||||
<TextBlock Text="{Binding Category }" />
|
||||
</Label>
|
||||
|
||||
@@ -10,13 +10,14 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:system="clr-namespace:System;assembly=System.Runtime"
|
||||
xmlns:viewModels="clr-namespace:Nebula.Launcher.ViewModels"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:converters="clr-namespace:Nebula.Launcher.Converters">
|
||||
<Design.DataContext>
|
||||
<viewModels:ServerEntryModelView />
|
||||
</Design.DataContext>
|
||||
|
||||
<Border CornerRadius="10" Margin="0,5,0,5">
|
||||
<Grid ColumnDefinitions="30,*,80,120" RowDefinitions="35,*,*">
|
||||
<Grid ColumnDefinitions="30,*,80,90" RowDefinitions="35,*,*">
|
||||
<Border
|
||||
BorderThickness="0,0,0,2"
|
||||
CornerRadius="10"
|
||||
@@ -31,9 +32,7 @@
|
||||
Grid.Row="0"
|
||||
Grid.RowSpan="3"
|
||||
VerticalAlignment="Stretch">
|
||||
<Label VerticalAlignment="Center">
|
||||
^
|
||||
</Label>
|
||||
<Label VerticalAlignment="Bottom" Margin="5,0,5,2">i</Label>
|
||||
</Button>
|
||||
<ScrollViewer
|
||||
Grid.Column="1"
|
||||
@@ -68,31 +67,26 @@
|
||||
HorizontalAlignment="Stretch"
|
||||
IsVisible="{Binding RunVisible}"
|
||||
VerticalAlignment="Stretch">
|
||||
<Label HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
Play
|
||||
</Label>
|
||||
<Svg Path="/Assets/svg/play.svg"/>
|
||||
</Button>
|
||||
<Grid Grid.ColumnDefinitions="*,*" IsVisible="{Binding !RunVisible}">
|
||||
<Grid ColumnDefinitions="*,*"
|
||||
IsVisible="{Binding !RunVisible}">
|
||||
<Button
|
||||
Command="{Binding ReadLog}"
|
||||
CornerRadius="10,0,0,10"
|
||||
HorizontalAlignment="Stretch"
|
||||
Margin="0,0,1,0"
|
||||
Margin="0,0,2,0"
|
||||
VerticalAlignment="Stretch">
|
||||
<Label HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
Log
|
||||
</Label>
|
||||
<Svg Path="/Assets/svg/newspaper.svg"/>
|
||||
</Button>
|
||||
<Button
|
||||
Command="{Binding StopInstance}"
|
||||
CornerRadius="10,0,10,0"
|
||||
CornerRadius="0,10,10,0"
|
||||
Grid.Column="1"
|
||||
HorizontalAlignment="Stretch"
|
||||
Margin="1,0,0,0"
|
||||
Margin="2,0,0,0"
|
||||
VerticalAlignment="Stretch">
|
||||
<Label HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||
Stop
|
||||
</Label>
|
||||
<Svg Path="/Assets/svg/stop.svg"/>
|
||||
</Button>
|
||||
</Grid>
|
||||
</Panel>
|
||||
|
||||
Reference in New Issue
Block a user