Skip to content

Commit 35b37ea

Browse files
bitbeansbitbeans
committed
Re-Order first tab
Main menu is now displayed in the correct and logical order. - Service Parameter - Installing/activating a service - Set network cards
1 parent 0fed37b commit 35b37ea

1 file changed

Lines changed: 89 additions & 90 deletions

File tree

‎SimpleDnsCrypt/Views/MainView.xaml‎

Lines changed: 89 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -61,96 +61,7 @@
6161
Header="{lex:Loc Key=tabitem_mainmenu}">
6262
<TabItem.Content>
6363
<StackPanel Orientation="Vertical" Margin="0,10,0,0">
64-
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,0,0,0">
65-
<Border.BorderBrush>
66-
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
67-
Opacity="0.4">
68-
<DrawingBrush.Drawing>
69-
<DrawingGroup>
70-
<GeometryDrawing Brush="#FF8ab329">
71-
<GeometryDrawing.Geometry>
72-
<GeometryGroup>
73-
<RectangleGeometry Rect="0,0,50,50" />
74-
<RectangleGeometry Rect="50,50,50,50" />
75-
</GeometryGroup>
76-
</GeometryDrawing.Geometry>
77-
</GeometryDrawing>
78-
</DrawingGroup>
79-
</DrawingBrush.Drawing>
80-
</DrawingBrush>
81-
</Border.BorderBrush>
82-
<StackPanel Orientation="Vertical">
83-
<Grid>
84-
<Grid.ColumnDefinitions>
85-
<ColumnDefinition Width="Auto" />
86-
<ColumnDefinition Width="Auto" />
87-
<ColumnDefinition Width="*" />
88-
</Grid.ColumnDefinitions>
89-
<iconPacks:PackIconMaterial Grid.Column="0" Grid.Row="0" Height="20"
90-
Width="20" Kind="Lan" Opacity="0.7"
91-
Foreground="#FF8ab329"
92-
HorizontalAlignment="Left"
93-
VerticalAlignment="Center" />
94-
<TextBlock Grid.Column="1" Grid.Row="0"
95-
Text="{lex:Loc Key=default_settings_network_cards}"
96-
TextWrapping="Wrap" VerticalAlignment="Center"
97-
Foreground="#FF8ab329" FontSize="20"
98-
Opacity="0.7" Margin="5,0,0,3" FontWeight="Bold">
99-
</TextBlock>
100-
<controls:ToggleSwitch Cursor="Hand" IsChecked="{Binding ShowHiddenCards}"
101-
Foreground="#FF575757" Grid.Column="2" Grid.Row="0"
102-
HorizontalAlignment="Right"
103-
OffLabel="{lex:Loc Key=default_settings_show_hidden_cards}"
104-
OnLabel="{lex:Loc Key=default_settings_show_hidden_cards}">
105-
</controls:ToggleSwitch>
106-
</Grid>
107-
<ItemsControl ItemsSource="{Binding LocalNetworkInterfaces}">
108-
<ItemsControl.ItemsPanel>
109-
<ItemsPanelTemplate>
110-
<UniformGrid Columns="4" />
111-
</ItemsPanelTemplate>
112-
</ItemsControl.ItemsPanel>
113-
<ItemsControl.ItemTemplate>
114-
<DataTemplate>
115-
<controls:Tile Cursor="Hand" Title="{Binding Name}"
116-
cal:Message.Attach="[Event Click] = [Action NetworkCardClicked($dataContext)]"
117-
TitleFontSize="{Binding Name, Converter={StaticResource TextLengthToFontSizeConverter}}"
118-
ToolTip="{Binding Description}" Foreground="#FFFFFF"
119-
Background="{Binding Converter={StaticResource InUseToBackgroundConverter}}"
120-
TiltFactor="1" Width="Auto" Height="100"
121-
HorizontalAlignment="Left">
122-
<Grid Margin="15,0,0,0">
123-
<Grid.ColumnDefinitions>
124-
<ColumnDefinition Width="150" />
125-
<ColumnDefinition Width="20" />
126-
</Grid.ColumnDefinitions>
127-
<Grid.RowDefinitions>
128-
<RowDefinition Height="*" />
129-
</Grid.RowDefinitions>
130-
<iconPacks:PackIconMaterial HorizontalAlignment="Center"
131-
VerticalAlignment="Center"
132-
Grid.Column="0" Grid.Row="0"
133-
Kind="{Binding Converter={StaticResource InterfaceTypeToIconConverter}}"
134-
Foreground="#FFFFFF" Width="48"
135-
Height="48"
136-
Margin="15,0,0,0" />
137-
<iconPacks:PackIconMaterial Grid.Column="1" Grid.Row="0"
138-
Kind="Check"
139-
Width="16" Height="16"
140-
VerticalAlignment="Top"
141-
HorizontalAlignment="Right"
142-
Margin="0,-20,7,0"
143-
Foreground="#FFFFFF"
144-
Visibility="{Binding UseDnsCrypt, Converter={StaticResource BoolToVisibilityConverter}}" />
145-
</Grid>
146-
</controls:Tile>
147-
</DataTemplate>
148-
</ItemsControl.ItemTemplate>
149-
</ItemsControl>
150-
</StackPanel>
151-
</Border>
152-
153-
<Border BorderThickness="1" Background="#198AB328" Padding="10,10" Margin="0,14,0,0"
64+
<Border BorderThickness="1" Background="#198AB328" Padding="10,10" Margin="0,0,0,0"
15465
MinHeight="75">
15566
<Border.BorderBrush>
15667
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
@@ -307,6 +218,94 @@
307218
</Grid>
308219
</StackPanel>
309220
</Border>
221+
<Border BorderThickness="1" Background="#198AB328" Padding="10" Margin="0,14,0,0">
222+
<Border.BorderBrush>
223+
<DrawingBrush Viewport="0,0,8,8" ViewportUnits="Absolute" TileMode="Tile"
224+
Opacity="0.4">
225+
<DrawingBrush.Drawing>
226+
<DrawingGroup>
227+
<GeometryDrawing Brush="#FF8ab329">
228+
<GeometryDrawing.Geometry>
229+
<GeometryGroup>
230+
<RectangleGeometry Rect="0,0,50,50" />
231+
<RectangleGeometry Rect="50,50,50,50" />
232+
</GeometryGroup>
233+
</GeometryDrawing.Geometry>
234+
</GeometryDrawing>
235+
</DrawingGroup>
236+
</DrawingBrush.Drawing>
237+
</DrawingBrush>
238+
</Border.BorderBrush>
239+
<StackPanel Orientation="Vertical">
240+
<Grid>
241+
<Grid.ColumnDefinitions>
242+
<ColumnDefinition Width="Auto" />
243+
<ColumnDefinition Width="Auto" />
244+
<ColumnDefinition Width="*" />
245+
</Grid.ColumnDefinitions>
246+
<iconPacks:PackIconMaterial Grid.Column="0" Grid.Row="0" Height="20"
247+
Width="20" Kind="Lan" Opacity="0.7"
248+
Foreground="#FF8ab329"
249+
HorizontalAlignment="Left"
250+
VerticalAlignment="Center" />
251+
<TextBlock Grid.Column="1" Grid.Row="0"
252+
Text="{lex:Loc Key=default_settings_network_cards}"
253+
TextWrapping="Wrap" VerticalAlignment="Center"
254+
Foreground="#FF8ab329" FontSize="20"
255+
Opacity="0.7" Margin="5,0,0,3" FontWeight="Bold">
256+
</TextBlock>
257+
<controls:ToggleSwitch Cursor="Hand" IsChecked="{Binding ShowHiddenCards}"
258+
Foreground="#FF575757" Grid.Column="2" Grid.Row="0"
259+
HorizontalAlignment="Right"
260+
OffLabel="{lex:Loc Key=default_settings_show_hidden_cards}"
261+
OnLabel="{lex:Loc Key=default_settings_show_hidden_cards}">
262+
</controls:ToggleSwitch>
263+
</Grid>
264+
<ItemsControl ItemsSource="{Binding LocalNetworkInterfaces}">
265+
<ItemsControl.ItemsPanel>
266+
<ItemsPanelTemplate>
267+
<UniformGrid Columns="4" />
268+
</ItemsPanelTemplate>
269+
</ItemsControl.ItemsPanel>
270+
<ItemsControl.ItemTemplate>
271+
<DataTemplate>
272+
<controls:Tile Cursor="Hand" Title="{Binding Name}"
273+
cal:Message.Attach="[Event Click] = [Action NetworkCardClicked($dataContext)]"
274+
TitleFontSize="{Binding Name, Converter={StaticResource TextLengthToFontSizeConverter}}"
275+
ToolTip="{Binding Description}" Foreground="#FFFFFF"
276+
Background="{Binding Converter={StaticResource InUseToBackgroundConverter}}"
277+
TiltFactor="1" Width="Auto" Height="100"
278+
HorizontalAlignment="Left">
279+
<Grid Margin="15,0,0,0">
280+
<Grid.ColumnDefinitions>
281+
<ColumnDefinition Width="150" />
282+
<ColumnDefinition Width="20" />
283+
</Grid.ColumnDefinitions>
284+
<Grid.RowDefinitions>
285+
<RowDefinition Height="*" />
286+
</Grid.RowDefinitions>
287+
<iconPacks:PackIconMaterial HorizontalAlignment="Center"
288+
VerticalAlignment="Center"
289+
Grid.Column="0" Grid.Row="0"
290+
Kind="{Binding Converter={StaticResource InterfaceTypeToIconConverter}}"
291+
Foreground="#FFFFFF" Width="48"
292+
Height="48"
293+
Margin="15,0,0,0" />
294+
<iconPacks:PackIconMaterial Grid.Column="1" Grid.Row="0"
295+
Kind="Check"
296+
Width="16" Height="16"
297+
VerticalAlignment="Top"
298+
HorizontalAlignment="Right"
299+
Margin="0,-20,7,0"
300+
Foreground="#FFFFFF"
301+
Visibility="{Binding UseDnsCrypt, Converter={StaticResource BoolToVisibilityConverter}}" />
302+
</Grid>
303+
</controls:Tile>
304+
</DataTemplate>
305+
</ItemsControl.ItemTemplate>
306+
</ItemsControl>
307+
</StackPanel>
308+
</Border>
310309
</StackPanel>
311310
</TabItem.Content>
312311
</TabItem>

0 commit comments

Comments
 (0)