mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-25 22:56:09 +03:00
Code Issues Projects Releases Wiki Activity

添加免翻资源

Browse Source
This commit is contained in:
ProxySU 2020-10-22 19:44:35 +08:00
parent 9e25c10b18
commit 80323e4c6f
7 changed files with 66 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ProxySU/MainWindow.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySU" xmlns:local="clr-namespace:ProxySU"
mc:Ignorable="d" mc:Ignorable="d"
Title="ProxySU - v2.4.8" Height="675" Width="650"> Title="ProxySU - v2.4.9" Height="675" Width="650">
<!--以下样式参考自：https://yq.aliyun.com/articles/331878 <!--以下样式参考自：https://yq.aliyun.com/articles/331878
https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview--> https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
<Window.Resources> <Window.Resources>
@ -677,75 +677,43 @@
<TabItem Header="{DynamicResource TabItemHeaderResourceTools}" Width="110" Height="30"> <TabItem Header="{DynamicResource TabItemHeaderResourceTools}" Width="110" Height="30">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button x:Name="ButtonWebBrowserHomePage" Content="{DynamicResource ButtonWebBrowserHomePage}" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonWebBrowserHomePage_Click"></Button> <Button x:Name="ButtonWebBrowserHomePage" Content="{DynamicResource ButtonWebBrowserHomePage}" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonWebBrowserHomePage_Click"></Button>
<Button x:Name="ButtonWebBrowserForward" Content="{DynamicResource ButtonWebBrowserForward}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonWebBrowserForward_Click"></Button> <Button x:Name="ButtonWebBrowserForward" Content="{DynamicResource ButtonWebBrowserForward}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonWebBrowserForward_Click"></Button>
<Button x:Name="ButtonWebBrowserBack" Content="{DynamicResource ButtonWebBrowserBack}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonWebBrowserBack_Click"/> <Button x:Name="ButtonWebBrowserBack" Content="{DynamicResource ButtonWebBrowserBack}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonWebBrowserBack_Click"/>
<TextBlock Text="{DynamicResource TextBlockWebExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="0" Grid.ColumnSpan="4"></TextBlock> <TextBlock Text="{DynamicResource TextBlockWebExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="0" Margin="8"></TextBlock>
<!--<TextBox x:Name="TextBoxWebBrowserProxyUrl" Style="{StaticResource TitleText}" Tag="粘贴被墙的网址到这里点击 GO(下面被墙网址右击==复制快捷方式)" Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="5" Margin="5"></TextBox> <!--<TextBox x:Name="TextBoxWebBrowserProxyUrl" Style="{StaticResource TitleText}" Tag="粘贴被墙的网址到这里点击 GO(下面被墙网址右击==复制快捷方式)" Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="5" Margin="5"></TextBox>
<Button x:Name="ButtonWebBrowserProxyGo" Content="Go" Grid.Column="8" Grid.Row="0" Margin="5" Click="ButtonWebBrowserProxyGo_Click"></Button>--> <Button x:Name="ButtonWebBrowserProxyGo" Content="Go" Grid.Column="8" Grid.Row="0" Margin="5" Click="ButtonWebBrowserProxyGo_Click"></Button>-->
<WebBrowser x:Name="WebBrowserResourcesAndTools" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="9" Grid.RowSpan="13" Source="https://github.com/proxysu/windows/wiki/ResourcesAndTools" /> <WebBrowser x:Name="WebBrowserResourcesAndTools" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" Source="https://github.com/proxysu/windows/wiki/ResourcesAndTools" />
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="关于" Width="110" Height="30" Visibility="Collapsed"> <TabItem Header="{DynamicResource TabItemHeaderFreeWallURL}" Width="110" Height="30">
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="0.3*"></ColumnDefinition> <ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition> <ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0.3*"></RowDefinition> <RowDefinition Height="40"></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition> <RowDefinition></RowDefinition>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2"> <Button x:Name="ButtonWebBrowserHomePageFreeWallURL" Content="{DynamicResource ButtonWebBrowserHomePage}" Grid.Column="0" Grid.Row="0" Margin="5" Click="ButtonWebBrowserHomePageFreeWallURL_Click"></Button>
<Grid.ColumnDefinitions> <Button x:Name="ButtonWebBrowserForwardFreeWallURL" Content="{DynamicResource ButtonWebBrowserForward}" Grid.Column="2" Grid.Row="0" Margin="5" Click="ButtonWebBrowserForwardFreeWallURL_Click"></Button>
<ColumnDefinition></ColumnDefinition> <Button x:Name="ButtonWebBrowserBackFreeWallURL" Content="{DynamicResource ButtonWebBrowserBack}" Grid.Column="1" Grid.Row="0" Margin="5" Click="ButtonWebBrowserBackFreeWallURL_Click"></Button>
<TextBlock Text="{DynamicResource TextBlockWebExplain}" TextWrapping="Wrap" Grid.Column="4" Grid.Row="0" Margin="8"></TextBlock>
</Grid.ColumnDefinitions> <!--<TextBox x:Name="TextBoxWebBrowserProxyUrl" Style="{StaticResource TitleText}" Tag="粘贴被墙的网址到这里点击 GO(下面被墙网址右击==复制快捷方式)" Grid.Column="3" Grid.Row="0" Grid.ColumnSpan="5" Margin="5"></TextBox>
<Grid.RowDefinitions> <Button x:Name="ButtonWebBrowserProxyGo" Content="Go" Grid.Column="8" Grid.Row="0" Margin="5" Click="ButtonWebBrowserProxyGo_Click"></Button>-->
<RowDefinition></RowDefinition> <WebBrowser x:Name="WebBrowserResourcesAndToolsFreeWallURL" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="4" Source="https://github.com/proxysu/windows/wiki/FreeWallURL" />
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
<TextBlock Text="程序版本：1.8.3" Grid.Column="0" Grid.Row="0"></TextBlock>
</Grid>
</Grid> </Grid>
</TabItem> </TabItem>

46
ProxySU/MainWindow.xaml.cs
View File

@ -6047,6 +6047,18 @@ namespace ProxySU
#endregion #endregion
#region 资源工具标签页控制 #region 资源工具标签页控制
private void ButtonWebBrowserHomePage_Click(object sender, RoutedEventArgs e)
{
try
{
WebBrowserResourcesAndTools.Source = new Uri("https://github.com/proxysu/windows/wiki/ResourcesAndTools");
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
}
private void ButtonWebBrowserBack_Click(object sender, RoutedEventArgs e) private void ButtonWebBrowserBack_Click(object sender, RoutedEventArgs e)
{ {
try try
@ -6071,11 +6083,14 @@ namespace ProxySU
} }
} }
private void ButtonWebBrowserHomePage_Click(object sender, RoutedEventArgs e) #endregion
#region 免翻网址资源标签
private void ButtonWebBrowserHomePageFreeWallURL_Click(object sender, RoutedEventArgs e)
{ {
try try
{ {
WebBrowserResourcesAndTools.Source = new Uri("https://github.com/proxysu/windows/wiki/ResourcesAndTools"); WebBrowserResourcesAndToolsFreeWallURL.Source = new Uri("https://github.com/proxysu/windows/wiki/FreeWallURL");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -6083,10 +6098,32 @@ namespace ProxySU
} }
} }
private void ButtonWebBrowserBackFreeWallURL_Click(object sender, RoutedEventArgs e)
{
try
{
WebBrowserResourcesAndToolsFreeWallURL.GoBack();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
}
private void ButtonWebBrowserForwardFreeWallURL_Click(object sender, RoutedEventArgs e)
{
try
{
WebBrowserResourcesAndToolsFreeWallURL.GoForward();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message);
}
}
#endregion #endregion
#region 三合一安装过程 #region 三合一安装过程
// //生成三合一的v2ray路径 // //生成三合一的v2ray路径
@ -8287,9 +8324,10 @@ namespace ProxySU
//生成客户端配置 96--98 //生成客户端配置 96--98
#endregion #endregion
} }
} }

4
ProxySU/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.8.0")] [assembly: AssemblyVersion("2.4.9.0")]
[assembly: AssemblyFileVersion("2.4.8.0")] [assembly: AssemblyFileVersion("2.4.9.0")]

1
ProxySU/Translations/ProxySU.en-US.xaml
View File

@ -11,6 +11,7 @@
<sys:String x:Key="MainWindowsLanguage">界面語言:</sys:String> <sys:String x:Key="MainWindowsLanguage">界面語言:</sys:String>
<sys:String x:Key="TabItemHeaderAppDeployment">Deployment</sys:String> <sys:String x:Key="TabItemHeaderAppDeployment">Deployment</sys:String>
<sys:String x:Key="TabItemHeaderResourceTools">Resources</sys:String> <sys:String x:Key="TabItemHeaderResourceTools">Resources</sys:String>
<sys:String x:Key="TabItemHeaderFreeWallURL">Free Wall URL</sys:String>
<sys:String x:Key="TextBlockHostName">Host:</sys:String> <sys:String x:Key="TextBlockHostName">Host:</sys:String>
<sys:String x:Key="TextBoxHostNamePrompt">IP or Domain (Not empty)</sys:String> <sys:String x:Key="TextBoxHostNamePrompt">IP or Domain (Not empty)</sys:String>
<sys:String x:Key="TextBlockHostPart">Port:</sys:String> <sys:String x:Key="TextBlockHostPart">Port:</sys:String>

1
ProxySU/Translations/ProxySU.zh-CN.xaml
View File

@ -11,6 +11,7 @@
<sys:String x:Key="MainWindowsLanguage">Languages:</sys:String> <sys:String x:Key="MainWindowsLanguage">Languages:</sys:String>
<sys:String x:Key="TabItemHeaderAppDeployment">应用布署</sys:String> <sys:String x:Key="TabItemHeaderAppDeployment">应用布署</sys:String>
<sys:String x:Key="TabItemHeaderResourceTools">资源工具</sys:String> <sys:String x:Key="TabItemHeaderResourceTools">资源工具</sys:String>
<sys:String x:Key="TabItemHeaderFreeWallURL">免翻网址资源</sys:String>
<sys:String x:Key="TextBlockHostName">主机:</sys:String> <sys:String x:Key="TextBlockHostName">主机:</sys:String>
<sys:String x:Key="TextBoxHostNamePrompt">IP或域名(不可为空)</sys:String> <sys:String x:Key="TextBoxHostNamePrompt">IP或域名(不可为空)</sys:String>
<sys:String x:Key="TextBlockHostPart">端口:</sys:String> <sys:String x:Key="TextBlockHostPart">端口:</sys:String>

1
ProxySU/Translations/ProxySU.zh-TW.xaml
View File

@ -11,6 +11,7 @@
<sys:String x:Key="MainWindowsLanguage">Languages:</sys:String> <sys:String x:Key="MainWindowsLanguage">Languages:</sys:String>
<sys:String x:Key="TabItemHeaderAppDeployment">應用佈署</sys:String> <sys:String x:Key="TabItemHeaderAppDeployment">應用佈署</sys:String>
<sys:String x:Key="TabItemHeaderResourceTools">資源工具</sys:String> <sys:String x:Key="TabItemHeaderResourceTools">資源工具</sys:String>
<sys:String x:Key="TabItemHeaderFreeWallURL">免翻網址資源</sys:String>
<sys:String x:Key="TextBlockHostName">主機:</sys:String> <sys:String x:Key="TextBlockHostName">主機:</sys:String>
<sys:String x:Key="TextBoxHostNamePrompt">IP或域名(不可為空)</sys:String> <sys:String x:Key="TextBoxHostNamePrompt">IP或域名(不可為空)</sys:String>
<sys:String x:Key="TextBlockHostPart">端口:</sys:String> <sys:String x:Key="TextBlockHostPart">端口:</sys:String>

BIN
ProxySU/bin/Beta/Beta.zip
View File

Binary file not shown.