Skip to content

Commit 58f5a9e

Browse files
bitbeansbitbeans
committed
Added forwarding view
1 parent bb8382f commit 58f5a9e

2 files changed

Lines changed: 204 additions & 2 deletions

File tree

‎SimpleDnsCrypt/Views/MainView.xaml‎

Lines changed: 203 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,10 @@
11431143
<RowDefinition Height="Auto" />
11441144
<RowDefinition Height="Auto" />
11451145
<RowDefinition Height="Auto" />
1146+
<RowDefinition Height="Auto" />
1147+
<RowDefinition Height="Auto" />
1148+
<RowDefinition Height="Auto" />
1149+
<RowDefinition Height="Auto" />
11461150
</Grid.RowDefinitions>
11471151
<iconPacks:PackIconMaterial Grid.Column="0" Grid.Row="0" Height="20"
11481152
Width="20" Kind="AccountConvert"
@@ -1179,7 +1183,7 @@
11791183
<Button Grid.Column="2" x:Name="ChangeCloakingRulesFile"
11801184
cal:Message.Attach="ChangeCloakingRulesFile"
11811185
Background="White"
1182-
IsEnabled="{Binding IsBlacklistEnabled, Converter={StaticResource ReverseBoolToEnabledConverter}}"
1186+
IsEnabled="{Binding IsCloakingEnabled, Converter={StaticResource ReverseBoolToEnabledConverter}}"
11831187
Width="30"
11841188
Height="30"
11851189
Cursor="Hand"
@@ -1342,6 +1346,204 @@
13421346
</Button>
13431347
</StackPanel>
13441348
</Grid>
1349+
<iconPacks:PackIconMaterial Grid.Column="0" Grid.Row="4" Height="20"
1350+
Width="20" Kind="Radar"
1351+
Opacity="0.7"
1352+
Foreground="#FF8ab329"
1353+
HorizontalAlignment="Left"
1354+
VerticalAlignment="Center" />
1355+
<TextBlock Grid.Column="1" Grid.Row="4"
1356+
Text="{lex:Loc Key=forwarding}"
1357+
TextWrapping="Wrap" VerticalAlignment="Center"
1358+
Foreground="#FF8ab329" FontSize="20"
1359+
Opacity="0.7" Margin="5,0,0,0" FontWeight="Bold">
1360+
</TextBlock>
1361+
<controls:ToggleSwitchButton HorizontalAlignment="Right" Margin="0,0,5,0"
1362+
Cursor="Hand"
1363+
IsChecked="{Binding IsForwardingEnabled}"
1364+
Grid.Column="1" Grid.Row="4" />
1365+
<Grid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" Margin="0,10,0,0">
1366+
<Grid.ColumnDefinitions>
1367+
<ColumnDefinition Width="Auto" />
1368+
<ColumnDefinition Width="*" />
1369+
<ColumnDefinition Width="Auto" />
1370+
</Grid.ColumnDefinitions>
1371+
1372+
<Label MinWidth="120" Grid.Column="0" VerticalContentAlignment="Center"
1373+
Foreground="#FF575757" Content="{lex:Loc Key=forwarding_path}"
1374+
Height="30" VerticalAlignment="Top" />
1375+
<TextBox Grid.Column="1" Text="{Binding ForwardingRulesFile}"
1376+
Background="#FF8ab329"
1377+
Opacity="0.4" BorderBrush="#FF575757"
1378+
MinWidth="560" IsReadOnly="True"
1379+
VerticalContentAlignment="Center"
1380+
Margin="0,0,0,0" />
1381+
<Button Grid.Column="2" x:Name="ChangeForwardingRulesFile"
1382+
cal:Message.Attach="ChangeForwardingRulesFile"
1383+
Background="White"
1384+
IsEnabled="{Binding IsForwardingEnabled, Converter={StaticResource ReverseBoolToEnabledConverter}}"
1385+
Width="30"
1386+
Height="30"
1387+
Cursor="Hand"
1388+
HorizontalContentAlignment="Center"
1389+
VerticalContentAlignment="Center"
1390+
BorderBrush="{DynamicResource AccentColorBrush}"
1391+
FocusVisualStyle="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}"
1392+
Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
1393+
Margin="15,0,0,0">
1394+
<iconPacks:PackIconMaterial
1395+
Kind="DotsHorizontal"
1396+
Width="15"
1397+
Height="15"
1398+
HorizontalContentAlignment="Center"
1399+
VerticalContentAlignment="Center"
1400+
Foreground="{DynamicResource AccentColorBrush}" />
1401+
<Button.ToolTip>
1402+
<Label
1403+
Content="{lex:Loc Key=button_select_path}"
1404+
FontWeight="DemiBold" />
1405+
</Button.ToolTip>
1406+
</Button>
1407+
</Grid>
1408+
<StackPanel Orientation="Horizontal" Grid.ColumnSpan="2" Grid.Column="0"
1409+
Grid.Row="6">
1410+
<Label Foreground="#FF575757"
1411+
FontSize="16" FontWeight="Bold"
1412+
Content="{lex:Loc Key=forwarding_rules_header}"
1413+
VerticalAlignment="Center" />
1414+
<Label Foreground="#FF575757"
1415+
FontSize="12"
1416+
Content="{lex:Loc Key=forwarding_rules_sub_header}"
1417+
Margin="0,2,0,0"
1418+
VerticalAlignment="Center" />
1419+
</StackPanel>
1420+
<Grid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2">
1421+
<Grid.ColumnDefinitions>
1422+
<ColumnDefinition Width="*" />
1423+
<ColumnDefinition Width="Auto" />
1424+
</Grid.ColumnDefinitions>
1425+
<ListView BorderBrush="#198AB328" Grid.Column="0"
1426+
IsEnabled="{Binding IsWorking, Converter={StaticResource ReverseBoolToEnabledConverter}}"
1427+
ScrollViewer.VerticalScrollBarVisibility="Visible"
1428+
ScrollViewer.CanContentScroll="True"
1429+
MinHeight="180" MinWidth="680"
1430+
SelectedItem="{Binding Path=SelectedForwardingEntry}"
1431+
ItemsSource="{Binding Path=ForwardingRules}">
1432+
<ListView.ItemTemplate>
1433+
<DataTemplate>
1434+
<UniformGrid Columns="2">
1435+
<Label Content="{Binding Key}"
1436+
FontSize="10"
1437+
Foreground="#FF575757" />
1438+
<Label Content="{Binding Value}"
1439+
FontSize="10"
1440+
Foreground="#FF575757" />
1441+
</UniformGrid>
1442+
</DataTemplate>
1443+
</ListView.ItemTemplate>
1444+
</ListView>
1445+
<StackPanel Orientation="Vertical" Margin="15,0,0,0" Grid.Column="1">
1446+
<Button x:Name="AddForwardingRule"
1447+
cal:Message.Attach="AddForwardingRule"
1448+
Background="White"
1449+
Width="30"
1450+
Height="30"
1451+
Cursor="Hand"
1452+
HorizontalContentAlignment="Center"
1453+
VerticalContentAlignment="Center"
1454+
BorderBrush="{DynamicResource AccentColorBrush}"
1455+
FocusVisualStyle="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}"
1456+
Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}">
1457+
<iconPacks:PackIconMaterial
1458+
Kind="Plus"
1459+
Width="15"
1460+
Height="15"
1461+
HorizontalContentAlignment="Center"
1462+
VerticalContentAlignment="Center"
1463+
Foreground="{DynamicResource AccentColorBrush}" />
1464+
<Button.ToolTip>
1465+
<Label
1466+
Content="{lex:Loc Key=button_forwarding_add}"
1467+
FontWeight="DemiBold" />
1468+
</Button.ToolTip>
1469+
</Button>
1470+
<Button x:Name="RemoveForwardingRule"
1471+
cal:Message.Attach="RemoveForwardingRule"
1472+
Background="White"
1473+
Width="30"
1474+
Height="30"
1475+
Cursor="Hand"
1476+
HorizontalContentAlignment="Center"
1477+
VerticalContentAlignment="Center"
1478+
BorderBrush="{DynamicResource AccentColorBrush}"
1479+
FocusVisualStyle="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}"
1480+
Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
1481+
Margin="0,7,0,0">
1482+
<iconPacks:PackIconMaterial
1483+
Kind="Minus"
1484+
Width="15"
1485+
Height="15"
1486+
HorizontalContentAlignment="Center"
1487+
VerticalContentAlignment="Center"
1488+
Foreground="{DynamicResource AccentColorBrush}" />
1489+
<Button.ToolTip>
1490+
<Label
1491+
Content="{lex:Loc Key=button_forwarding_remove}"
1492+
FontWeight="DemiBold" />
1493+
</Button.ToolTip>
1494+
</Button>
1495+
<Button x:Name="ImportForwardingRules"
1496+
cal:Message.Attach="ImportForwardingRules"
1497+
Background="White"
1498+
Width="30"
1499+
Height="30"
1500+
Cursor="Hand"
1501+
HorizontalContentAlignment="Center"
1502+
VerticalContentAlignment="Center"
1503+
BorderBrush="{DynamicResource AccentColorBrush}"
1504+
FocusVisualStyle="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}"
1505+
Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
1506+
Margin="0,7,0,0">
1507+
<iconPacks:PackIconMaterial
1508+
Kind="FileImport"
1509+
Width="15"
1510+
Height="15"
1511+
HorizontalContentAlignment="Center"
1512+
VerticalContentAlignment="Center"
1513+
Foreground="{DynamicResource AccentColorBrush}" />
1514+
<Button.ToolTip>
1515+
<Label
1516+
Content="{lex:Loc Key=button_forwarding_import}"
1517+
FontWeight="DemiBold" />
1518+
</Button.ToolTip>
1519+
</Button>
1520+
<Button x:Name="ExportForwardingRules"
1521+
cal:Message.Attach="ExportForwardingRules"
1522+
Background="White"
1523+
Width="30"
1524+
Height="30"
1525+
Cursor="Hand"
1526+
HorizontalContentAlignment="Center"
1527+
VerticalContentAlignment="Center"
1528+
BorderBrush="{DynamicResource AccentColorBrush}"
1529+
FocusVisualStyle="{DynamicResource MahApps.Metro.Styles.MetroCircleFocusVisual}"
1530+
Style="{DynamicResource MahApps.Metro.Styles.MetroCircleButtonStyle}"
1531+
Margin="0,7,0,0">
1532+
<iconPacks:PackIconMaterial
1533+
Kind="FileExport"
1534+
Width="15"
1535+
Height="15"
1536+
HorizontalContentAlignment="Center"
1537+
VerticalContentAlignment="Center"
1538+
Foreground="{DynamicResource AccentColorBrush}" />
1539+
<Button.ToolTip>
1540+
<Label
1541+
Content="{lex:Loc Key=button_forwarding_export}"
1542+
FontWeight="DemiBold" />
1543+
</Button.ToolTip>
1544+
</Button>
1545+
</StackPanel>
1546+
</Grid>
13451547
</Grid>
13461548
</Border>
13471549
</DockPanel>

‎SimpleDnsCrypt/Windows/AddRuleWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public AddRuleWindow(RuleWindowType ruleWindowType)
2929
else
3030
{
3131
Title = LocalizationEx.GetUiString("forwarding", Thread.CurrentThread.CurrentCulture);
32-
RuleHeaderIcon.Kind = PackIconMaterialKind.AccountConvert;
32+
RuleHeaderIcon.Kind = PackIconMaterialKind.Radar;
3333
RuleHeader.Text = LocalizationEx.GetUiString("rule_window_forwarding_header", Thread.CurrentThread.CurrentCulture);
3434
RuleKeyDescription.Text = LocalizationEx.GetUiString("rule_window_forwarding_key_text", Thread.CurrentThread.CurrentCulture);
3535
RuleValueDescription.Text = LocalizationEx.GetUiString("rule_window_forwarding_value_text", Thread.CurrentThread.CurrentCulture);

0 commit comments

Comments
 (0)