bozhihouc/clashN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust font size

Browse Source
This commit is contained in:
2dust
2022-10-04 09:07:48 +08:00
parent c994c7adff
commit 932b155923
11 changed files with 92 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clashN/clashN/App.xaml
View File

@@ -76,6 +76,18 @@
<Style x:Key="ListItemChip" TargetType="{x:Type materialDesign:Chip}">
<Setter Property="FontSize" Value="10" />
</Style>
<Style
x:Key="DefButton"
BasedOn="{StaticResource MaterialDesignRaisedButton}"
TargetType="{x:Type ButtonBase}">
<Setter Property="FontSize" Value="12" />
</Style>
<Style
x:Key="DefMenu"
BasedOn="{StaticResource MaterialDesignContextMenu}"
TargetType="{x:Type ContextMenu}">
<Setter Property="FontSize" Value="12" />
</Style>
</ResourceDictionary>
</Application.Resources>

10
clashN/clashN/ViewModels/MainWindowViewModel.cs
View File

@@ -12,6 +12,7 @@ using Splat;
using System.Drawing;
using System.Reactive;
using System.Windows;
using System.Windows.Forms;
using Application = System.Windows.Application;
namespace clashN.ViewModels
@@ -443,6 +444,15 @@ namespace clashN.ViewModels
if (_config.uiItem.mainWidth > 0 && _config.uiItem.mainHeight > 0)
{
if(_config.uiItem.mainWidth > SystemInformation.WorkingArea.Width)
{
_config.uiItem.mainWidth = SystemInformation.WorkingArea.Width * 2 / 3;
}
if (_config.uiItem.mainHeight > SystemInformation.WorkingArea.Height)
{
_config.uiItem.mainHeight = SystemInformation.WorkingArea.Height * 2 / 3;
}
Application.Current.MainWindow.Width = _config.uiItem.mainWidth;
Application.Current.MainWindow.Height = _config.uiItem.mainHeight;
}

2
clashN/clashN/Views/ConnectionsView.xaml
View File

@@ -59,7 +59,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto">
<ListView.ContextMenu>
<ContextMenu>
<ContextMenu Style="{StaticResource DefMenu}">
<MenuItem x:Name="menuConnectionClose" Header="{x:Static resx:ResUI.menuConnectionClose}" />
<MenuItem x:Name="menuConnectionCloseAll" Header="{x:Static resx:ResUI.menuConnectionCloseAll}" />
</ContextMenu>

21
clashN/clashN/Views/GlobalHotkeySettingWindow.xaml
View File

@@ -52,7 +52,7 @@
Grid.Row="0"
Grid.Column="0"
Margin="8"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource ModuleTitle}"
Text="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
<TextBlock
@@ -60,7 +60,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbDisplayGUI}" />
<TextBox
@@ -78,7 +78,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbClearSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey1"
@@ -95,7 +95,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSetSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey2"
@@ -111,7 +111,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbNotChangeSystemProxy}" />
<TextBox
x:Name="txtGlobalHotkey3"
@@ -129,7 +129,7 @@
Grid.Row="1"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbGlobalHotkeySettingTip}" />
<Grid
@@ -146,19 +146,22 @@
Grid.Column="0"
Margin="8"
Click="btnReset_Click"
Content="{x:Static resx:ResUI.TbReset}" />
Content="{x:Static resx:ResUI.TbReset}"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnSave"
Grid.Column="1"
Margin="8"
Click="btnSave_Click"
Content="{x:Static resx:ResUI.TbConfirm}" />
Content="{x:Static resx:ResUI.TbConfirm}"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"
Grid.Column="2"
Margin="8"
Click="btnCancel_Click"
Content="{x:Static resx:ResUI.TbCancel}" />
Content="{x:Static resx:ResUI.TbCancel}"
Style="{StaticResource DefButton}" />
</Grid>
</Grid>
</ScrollViewer>

16
clashN/clashN/Views/HelpView.xaml
View File

@@ -35,7 +35,7 @@
<TextBlock
Grid.Row="0"
Margin="16,16,16,4"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource TabItemTitle}"
Text="{x:Static resx:ResUI.TbHelpProject}" />
<Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
@@ -52,7 +52,7 @@
Click="btnAbout_Click"
Content="{x:Static resx:ResUI.TbHelpProjectGo}"
DockPanel.Dock="Right"
Style="{StaticResource MaterialDesignRaisedButton}" />
Style="{StaticResource DefButton}" />
</DockPanel>
</Grid>
</DockPanel>
@@ -73,7 +73,7 @@
<TextBlock
Grid.Row="0"
Margin="16,16,16,4"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource TabItemTitle}"
Text="Update ClashN" />
<Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
@@ -89,7 +89,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbHelpCheck}"
DockPanel.Dock="Right"
Style="{StaticResource MaterialDesignRaisedButton}" />
Style="{StaticResource DefButton}" />
</DockPanel>
</Grid>
</DockPanel>
@@ -110,7 +110,7 @@
<TextBlock
Grid.Row="0"
Margin="16,16,16,4"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource TabItemTitle}"
Text="Update Clash Core" />
<Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
@@ -126,7 +126,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbHelpCheck}"
DockPanel.Dock="Right"
Style="{StaticResource MaterialDesignRaisedButton}" />
Style="{StaticResource DefButton}" />
</DockPanel>
</Grid>
</DockPanel>
@@ -147,7 +147,7 @@
<TextBlock
Grid.Row="0"
Margin="16,16,16,4"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource TabItemTitle}"
Text="Update Clash.Meta Core" />
<Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
@@ -163,7 +163,7 @@
Width="100"
Content="{x:Static resx:ResUI.TbHelpCheck}"
DockPanel.Dock="Right"
Style="{StaticResource MaterialDesignRaisedButton}" />
Style="{StaticResource DefButton}" />
</DockPanel>
</Grid>
</DockPanel>

6
clashN/clashN/Views/MainWindow.xaml
View File

@@ -11,8 +11,8 @@
xmlns:tb="http://www.hardcodet.net/taskbar"
xmlns:vms="clr-namespace:clashN.ViewModels"
Title="clashN"
Width="1000"
Height="700"
Width="900"
Height="680"
MinWidth="800"
MinHeight="600"
x:TypeArguments="vms:MainWindowViewModel"
@@ -197,7 +197,7 @@
IconSource="/clashN.ico"
TrayMouseDoubleClick="tbNotify_TrayMouseDoubleClick">
<tb:TaskbarIcon.ContextMenu>
<ContextMenu>
<ContextMenu Style="{StaticResource DefMenu}">
<MenuItem Header="{x:Static resx:ResUI.menuSystemproxy}">
<MenuItem
x:Name="menuSystemProxyClear"

3
clashN/clashN/Views/MessageSampleDialog.xaml
View File

@@ -18,8 +18,7 @@
<TextBlock
x:Name="Message"
Grid.Row="0"
Margin="0,6,0,0"
FontSize="18" />
Margin="0,6,0,0" />
<Button
Grid.Row="1"
Margin="16,16,16,0"

30
clashN/clashN/Views/PorfileEditWindow.xaml
View File

@@ -54,7 +54,7 @@
Grid.Row="0"
Grid.Column="0"
Margin="8"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource ModuleTitle}"
Text="{x:Static resx:ResUI.TbProfiles}" />
<TextBlock
@@ -62,7 +62,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbAlias}" />
<TextBox
@@ -81,7 +81,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbUrlAs}" />
<TextBox
x:Name="txtUrl"
@@ -99,7 +99,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbAddressAs}" />
<TextBox
x:Name="txtAddress"
@@ -120,12 +120,14 @@
x:Name="btnBrowse"
Width="100"
Margin="2,0,8,0"
Content="{x:Static resx:ResUI.TbBrowse}" />
Content="{x:Static resx:ResUI.TbBrowse}"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnEdit"
Width="100"
Margin="2,0,8,0"
Content="{x:Static resx:ResUI.TbEdit}" />
Content="{x:Static resx:ResUI.TbEdit}"
Style="{StaticResource DefButton}" />
</StackPanel>
<TextBlock
@@ -133,7 +135,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbUserAgent}" />
<TextBox
x:Name="txtUserAgent"
@@ -151,7 +153,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbCoreType}" />
<ComboBox
x:Name="cmbCoreType"
@@ -166,7 +168,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbEnableTunAs}" />
<ToggleButton
x:Name="togEnableTun"
@@ -180,7 +182,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbEnableUpdateAs}" />
<ToggleButton
x:Name="togEnabled"
@@ -194,7 +196,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbEnableConvert}" />
<ToggleButton
x:Name="togEnableConvert"
@@ -216,13 +218,15 @@
x:Name="btnSave"
Grid.Column="0"
Margin="8"
Content="{x:Static resx:ResUI.TbConfirm}" />
Content="{x:Static resx:ResUI.TbConfirm}"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnCancel"
Grid.Column="1"
Margin="8"
Click="btnCancel_Click"
Content="{x:Static resx:ResUI.TbCancel}" />
Content="{x:Static resx:ResUI.TbCancel}"
Style="{StaticResource DefButton}" />
</Grid>

2
clashN/clashN/Views/ProfilesView.xaml
View File

@@ -55,7 +55,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Hidden">
<ListView.ContextMenu>
<ContextMenu>
<ContextMenu Style="{StaticResource DefMenu}">
<MenuItem x:Name="menuEditLocalFile" Header="{x:Static resx:ResUI.menuEditLocalFile}" />
<MenuItem x:Name="menuEditProfile" Header="{x:Static resx:ResUI.menuEditProfile}" />
<MenuItem x:Name="menuAddProfile" Header="{x:Static resx:ResUI.menuAddProfile}" />

4
clashN/clashN/Views/ProxiesView.xaml
View File

@@ -88,7 +88,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Hidden">
<ListView.ContextMenu>
<ContextMenu>
<ContextMenu Style="{StaticResource DefMenu}">
<MenuItem x:Name="menuProxiesReload" Header="{x:Static resx:ResUI.menuProxiesReload}" />
<MenuItem x:Name="menuProxiesDelaytest" Header="{x:Static resx:ResUI.menuProxiesDelaytest}" />
</ContextMenu>
@@ -135,7 +135,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Visible">
<ListView.ContextMenu>
<ContextMenu>
<ContextMenu Style="{StaticResource DefMenu}">
<MenuItem x:Name="menuProxiesDelaytestPart" Header="{x:Static resx:ResUI.menuProxiesDelaytestPart}" />
<MenuItem x:Name="menuProxiesSelectActivity" Header="{x:Static resx:ResUI.menuProxiesSelectActivity}" />
</ContextMenu>

47
clashN/clashN/Views/SettingsView.xaml
View File

@@ -87,7 +87,7 @@
Grid.Row="0"
Grid.Column="0"
Margin="8"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource ModuleTitle}"
Text="{x:Static resx:ResUI.TbSettingsCore}" />
<TextBlock
@@ -95,7 +95,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsMixedPort}" />
<TextBox
x:Name="txtMixedPort"
@@ -109,7 +109,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsSocksPort}" />
<TextBox
x:Name="txtSocksPort"
@@ -123,7 +123,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsHttpPort}" />
<TextBox
x:Name="txtHttpPort"
@@ -137,7 +137,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsAPIPort}" />
<TextBox
x:Name="txtAPIPort"
@@ -151,7 +151,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsAllowLAN}" />
<ToggleButton
x:Name="togAllowLANConn"
@@ -165,7 +165,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsIpv6}" />
<ToggleButton
x:Name="togEnableIpv6"
@@ -179,7 +179,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsLogLevel}" />
<ComboBox
x:Name="cmbLogLevel"
@@ -199,7 +199,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsMixin}" />
<ToggleButton
x:Name="togEnableMixinContent"
@@ -212,7 +212,8 @@
Grid.Row="9"
Grid.Column="0"
Margin="2,0,8,0"
Content="{x:Static resx:ResUI.TbSettingsEditMixin}" />
Content="{x:Static resx:ResUI.TbSettingsEditMixin}"
Style="{StaticResource DefButton}" />
</Grid>
</TabItem>
@@ -240,7 +241,7 @@
Grid.Row="0"
Grid.Column="0"
Margin="8"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource ModuleTitle}"
Text="{x:Static resx:ResUI.TbSettingsClashN}" />
<TextBlock
@@ -248,7 +249,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsStartBoot}" />
<ToggleButton
x:Name="togAutoRun"
@@ -262,7 +263,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsStatistics}" />
<ToggleButton
x:Name="togEnableStatistics"
@@ -276,7 +277,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsTLS13}" />
<ToggleButton
x:Name="togEnableSecurityProtocolTls13"
@@ -290,7 +291,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsAutoUpdate}" />
<TextBox
x:Name="txtautoUpdateSubInterval"
@@ -304,7 +305,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsAutoTest}" />
<TextBox
x:Name="txtautoDelayTestInterval"
@@ -318,7 +319,7 @@
Grid.Column="0"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
<ComboBox
x:Name="cmbSubConvertUrl"
@@ -333,13 +334,15 @@
Grid.Row="9"
Grid.Column="0"
Margin="8"
Content="{x:Static resx:ResUI.TbSettingsSetUWP}" />
Content="{x:Static resx:ResUI.TbSettingsSetUWP}"
Style="{StaticResource DefButton}" />
<Button
x:Name="btnSetGlobalHotkey"
Grid.Row="10"
Grid.Column="0"
Margin="8"
Content="{x:Static resx:ResUI.TbGlobalHotkeySetting}" />
Content="{x:Static resx:ResUI.TbGlobalHotkeySetting}"
Style="{StaticResource DefButton}" />
</Grid>
@@ -362,13 +365,13 @@
Grid.Row="0"
Grid.Column="0"
Margin="8"
Style="{StaticResource MaterialDesignHeadline6TextBlock}"
Style="{StaticResource ModuleTitle}"
Text="{x:Static resx:ResUI.TbSettingsSystemproxy}" />
<TextBlock
Grid.Row="1"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsExceptionTip}" />
<TextBox
x:Name="txtsystemProxyExceptions"
@@ -388,7 +391,7 @@
Grid.Row="3"
Margin="8"
VerticalAlignment="Center"
Style="{StaticResource MaterialDesignBody2TextBlock}"
Style="{StaticResource ListItemTitle}"
Text="{x:Static resx:ResUI.TbSettingsAdvancedProtocol}" />
<ComboBox
x:Name="cmbsystemProxyAdvancedProtocol"