wzxjohn
10 years ago
4 changed files with 26 additions and 18 deletions
Unified View
Diff Options
-
+6 -2README.md
-
+15 -11shadowsocks-csharp/Properties/Resources.Designer.cs
-
+1 -1shadowsocks-csharp/app.config
-
+4 -4shadowsocks-csharp/shadowsocks-csharp.csproj
+ 6
- 2
README.md
View File
| @@ -16,6 +16,10 @@ Shadowsocks for Windows | |||||
| Download [latest release]. | Download [latest release]. | ||||
| For Windows 7 and older, please download Shadowsocks-win-x.x.x.zip. | |||||
| For Windows 8.1 and newer, please download Shadowsocks-win-dotnet4.0-x.x.x.zip. | |||||
| ### Usage | ### Usage | ||||
| 1. Find Shadowsocks icon in notification tray | 1. Find Shadowsocks icon in notification tray | ||||
| @@ -25,8 +29,8 @@ Download [latest release]. | |||||
| about the change automatically | about the change automatically | ||||
| 5. Please disable other proxy addons in your browser, or set them to use | 5. Please disable other proxy addons in your browser, or set them to use | ||||
| system proxy | system proxy | ||||
| 6. You may need to install VC 2008 Runtime and .Net 2.0 if Shadowsocks failed to | |||||
| start | |||||
| 6. You may need to install VC 2008 Runtime and .Net framework if Shadowsocks | |||||
| failed to start | |||||
| ### License | ### License | ||||
+ 15
- 11
shadowsocks-csharp/Properties/Resources.Designer.cs
View File
| @@ -113,26 +113,30 @@ namespace Shadowsocks.Properties { | |||||
| /// __QRCODELIB__ | /// __QRCODELIB__ | ||||
| ///</script> | ///</script> | ||||
| ///<style> | ///<style> | ||||
| /// body { | |||||
| /// padding: 10px; | |||||
| /// margin: 0; | |||||
| /// html, body, table, div { | |||||
| /// padding: 0px; | |||||
| /// margin: 0 !important; | |||||
| /// } | /// } | ||||
| /// div#qrcode { | |||||
| /// margin: 5px !important; | |||||
| /// text-align: center; | |||||
| /// vertical-align: center; | |||||
| /// } | |||||
| /// #qrcode { | /// #qrcode { | ||||
| /// width:300px; | |||||
| /// height:300px; | |||||
| /// width:190px; | |||||
| /// height:190px; | |||||
| /// } | /// } | ||||
| /// table { | |||||
| /// width: 100%; | |||||
| /// height:100%; | |||||
| /// } | |||||
| ///</style> | ///</style> | ||||
| ///</head> | ///</head> | ||||
| ///<body> | ///<body> | ||||
| ///<div id="qrcode" name="qrcode"></div> | ///<div id="qrcode" name="qrcode"></div> | ||||
| ///<script type="text/javascript"> | ///<script type="text/javascript"> | ||||
| /// function genCode(code) { | /// function genCode(code) { | ||||
| /// new QRCode("qrcode", { | |||||
| /// text: code, | |||||
| /// width: 300, | |||||
| /// height: 300, | |||||
| /// colorDark : "#000000", | |||||
| /// colorLig [rest of string was truncated]";. | |||||
| /// new QRCode("qrcode" [rest of string was truncated]";. | |||||
| /// </summary> | /// </summary> | ||||
| internal static string qrcode { | internal static string qrcode { | ||||
| get { | get { | ||||
+ 1
- 1
shadowsocks-csharp/app.config
View File
| @@ -1,6 +1,6 @@ | |||||
| <?xml version="1.0"?> | <?xml version="1.0"?> | ||||
| <configuration> | <configuration> | ||||
| <startup> | <startup> | ||||
| <supportedRuntime version="v2.0.50727"/> | |||||
| <supportedRuntime version="v4.0"/> | <supportedRuntime version="v4.0"/> | ||||
| <supportedRuntime version="v2.0.50727"/> | |||||
| </startup></configuration> | </startup></configuration> | ||||
+ 4
- 4
shadowsocks-csharp/shadowsocks-csharp.csproj
View File
| @@ -21,7 +21,8 @@ | |||||
| <UpgradeBackupLocation> | <UpgradeBackupLocation> | ||||
| </UpgradeBackupLocation> | </UpgradeBackupLocation> | ||||
| <OldToolsVersion>3.5</OldToolsVersion> | <OldToolsVersion>3.5</OldToolsVersion> | ||||
| <TargetFrameworkProfile /> | |||||
| <TargetFrameworkProfile> | |||||
| </TargetFrameworkProfile> | |||||
| <PublishUrl>publish\</PublishUrl> | <PublishUrl>publish\</PublishUrl> | ||||
| <Install>true</Install> | <Install>true</Install> | ||||
| <InstallFrom>Disk</InstallFrom> | <InstallFrom>Disk</InstallFrom> | ||||
| @@ -45,6 +46,7 @@ | |||||
| <PlatformTarget>x86</PlatformTarget> | <PlatformTarget>x86</PlatformTarget> | ||||
| <ErrorReport>prompt</ErrorReport> | <ErrorReport>prompt</ErrorReport> | ||||
| <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet> | <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet> | ||||
| <Prefer32Bit>false</Prefer32Bit> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> | <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> | ||||
| <OutputPath>bin\x86\Release\</OutputPath> | <OutputPath>bin\x86\Release\</OutputPath> | ||||
| @@ -54,15 +56,13 @@ | |||||
| <PlatformTarget>x86</PlatformTarget> | <PlatformTarget>x86</PlatformTarget> | ||||
| <ErrorReport>prompt</ErrorReport> | <ErrorReport>prompt</ErrorReport> | ||||
| <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet> | <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet> | ||||
| <Prefer32Bit>false</Prefer32Bit> | |||||
| </PropertyGroup> | </PropertyGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <Reference Include="Microsoft.VisualBasic" /> | |||||
| <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> | |||||
| <Reference Include="System" /> | <Reference Include="System" /> | ||||
| <Reference Include="System.Data" /> | <Reference Include="System.Data" /> | ||||
| <Reference Include="System.Drawing" /> | <Reference Include="System.Drawing" /> | ||||
| <Reference Include="System.Windows.Forms" /> | <Reference Include="System.Windows.Forms" /> | ||||
| <Reference Include="System.Xml" /> | |||||
| </ItemGroup> | </ItemGroup> | ||||
| <ItemGroup> | <ItemGroup> | ||||
| <Compile Include="3rd\QRCodeCS.cs" /> | <Compile Include="3rd\QRCodeCS.cs" /> | ||||