diff --git a/README.md b/README.md index 9be979a..4f52c91 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,10 @@ Shadowsocks for Windows 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 1. Find Shadowsocks icon in notification tray @@ -25,8 +29,8 @@ Download [latest release]. about the change automatically 5. Please disable other proxy addons in your browser, or set them to use 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 diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs index 077a5ff..36db144 100755 --- a/shadowsocks-csharp/Properties/Resources.Designer.cs +++ b/shadowsocks-csharp/Properties/Resources.Designer.cs @@ -113,26 +113,30 @@ namespace Shadowsocks.Properties { /// __QRCODELIB__ ///</script> ///<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 { - /// width:300px; - /// height:300px; + /// width:190px; + /// height:190px; /// } + /// table { + /// width: 100%; + /// height:100%; + /// } ///</style> ///</head> ///<body> ///<div id="qrcode" name="qrcode"></div> ///<script type="text/javascript"> /// 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]";. /// internal static string qrcode { get { diff --git a/shadowsocks-csharp/app.config b/shadowsocks-csharp/app.config index dde978a..867ff46 100755 --- a/shadowsocks-csharp/app.config +++ b/shadowsocks-csharp/app.config @@ -1,6 +1,6 @@ - + diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 8bf700e..9e7c755 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -21,7 +21,8 @@ 3.5 - + + publish\ true Disk @@ -45,6 +46,7 @@ x86 prompt ManagedMinimumRules.ruleset + false bin\x86\Release\ @@ -54,15 +56,13 @@ x86 prompt ManagedMinimumRules.ruleset + false - - -