diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index e6485ff..c08b0a3 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -79,5 +79,87 @@ internal static System.Drawing.Bitmap store { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// 查找类似 <!doctype html> + ///<html lang="zh-cmn-Hans"> + /// <head> + /// <meta charset="utf-8"> + /// <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no"/> + /// <meta name="renderer" content="webkit"/> + /// <meta name="force-rendering" content="webkit"/> + /// <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> + /// <!-- MDUI CSS --> + /// <link + /// rel="stylesheet" + /// href="https://cdn.jsdelivr.net/npm/mdui@1.0.1/dist/css/mdui.min.css" + /// integrity="s [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string table_1 { + get { + return ResourceManager.GetString("table_1", resourceCulture); + } + } + + /// + /// 查找类似 <!doctype html> + ///<html lang="zh-cmn-Hans"> + /// <head> + /// <meta charset="utf-8"> + /// <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, shrink-to-fit=no"/> + /// <meta name="renderer" content="webkit"/> + /// <meta name="force-rendering" content="webkit"/> + /// <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> + /// <!-- MDUI CSS --> + /// <link + /// rel="stylesheet" + /// href="https://cdn.jsdelivr.net/npm/mdui@1.0.1/dist/css/mdui.min.css" + /// integrity="s [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string table_1_cn { + get { + return ResourceManager.GetString("table_1_cn", resourceCulture); + } + } + + /// + /// 查找类似 <!-- END CHANGE --> + /// </div> + /// + /// <button class="mdui-btn mdui-btn-raised mdui-ripple mdui-color-indigo mdui-valign mdui-center" + /// onClick="window.location.replace('empty.html');" style="margin-top: 20px;">Okay + /// <i class="mdui-icon material-icons"> + /// check</i></button> + /// </div> + /// <!-- MDUI JavaScript --> + /// <script + /// src="https://cdn.jsdelivr.net/npm/mdui@1.0.1/dist/js/mdui.min.js" + /// integrity="sha384-gCMZcshYKOGRX9r6wbDrvF+TcCCswSHFucUzUPwka+ [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string table_2 { + get { + return ResourceManager.GetString("table_2", resourceCulture); + } + } + + /// + /// 查找类似 <!-- END CHANGE --> + /// </div> + /// + /// <button class="mdui-btn mdui-btn-raised mdui-ripple mdui-color-indigo mdui-valign mdui-center" + /// onClick="window.location.replace('empty.html');" style="margin-top: 20px;">确认 + /// <i class="mdui-icon material-icons"> + /// check</i></button> + /// </div> + /// <!-- MDUI JavaScript --> + /// <script + /// src="https://cdn.jsdelivr.net/npm/mdui@1.0.1/dist/js/mdui.min.js" + /// integrity="sha384-gCMZcshYKOGRX9r6wbDrvF+TcCCswSHFucUzUPwka+Gr [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string table_2_cn { + get { + return ResourceManager.GetString("table_2_cn", resourceCulture); + } + } } } diff --git a/Properties/Resources.resx b/Properties/Resources.resx index d047ffc..b00e70a 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -124,4 +124,16 @@ ..\resources\store.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resource\table\table-1.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312 + + + ..\resource\table\table-1-cn.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + + ..\resource\table\table-2.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;gb2312 + + + ..\resource\table\table-2-cn.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + \ No newline at end of file diff --git a/Windows Store Downloader.csproj b/Windows Store Downloader.csproj index 64ba0bf..5db8a4f 100644 --- a/Windows Store Downloader.csproj +++ b/Windows Store Downloader.csproj @@ -118,9 +118,6 @@ - - Component - @@ -163,6 +160,11 @@ + + + + + diff --git a/code/Form1.cs b/code/Form1.cs index e5aa19e..11dcafe 100644 --- a/code/Form1.cs +++ b/code/Form1.cs @@ -36,7 +36,7 @@ private void AttributeInputReady(object sender, EventArgs e) } - } + }//灰色文本 private void HasText() { @@ -52,7 +52,7 @@ private void HasText() } - } + }//编辑框是否有文字 private void AttributeInputDeselect(object sender, EventArgs e) { HasText(); @@ -66,33 +66,34 @@ private void AttributeInputDeselect(object sender, EventArgs e) { textBoxHasText = true; } - } + }//灰色文本 private string SetAttributeText() { return Language.lang_attributes[typeBox.SelectedIndex]; - } + }//获取当前项的本地化文本 private void DownloadButton_Click(object sender, EventArgs e) { - downloadButton.Enabled = false; + downloadButton.Enabled = false;//禁止重复点击 Form2.complete = false; progressBar1.Value = 0; if (typeBox.SelectedIndex == -1 || routeBox.SelectedIndex == -1 || attributeText.Text == "") { MessageBox.Show(Language.lang_baddown,Language.lang_baddowninfo,MessageBoxButtons.OK,MessageBoxIcon.Error); - } - else - { + return; + }//参数完整 + + if (langText.Text == "") { langText.Text = Thread.CurrentThread.CurrentCulture.Name; }//提交语言 postContent = "type=" + Http_Post.type[typeBox.SelectedIndex] + "&url=" + attributeText.Text + "&ring=" + - Http_Post.ring[routeBox.SelectedIndex] + "&lang=" + langText.Text; + Http_Post.ring[routeBox.SelectedIndex] + "&lang=" + langText.Text; Thread post = new Thread(Form2.Browse); post.SetApartmentState(ApartmentState.STA); - post.Start(); + post.Start(); //POST线程 while (Form2.complete == false) { if(progressBar1.Value <= 99) @@ -109,26 +110,21 @@ private void DownloadButton_Click(object sender, EventArgs e) MessageBox.Show(Language.lang_interr, Language.lang_interr, MessageBoxButtons.OK, MessageBoxIcon.Error); return; }//意外 - new Form2().ShowDialog(); - if (Form2.returnid == 1) + + if (Form2.returnid == 1)//浏览 { try { - - - - - } - catch (InvalidComObjectException) { } - catch (Exception ex) + new Form2().ShowDialog(); + } catch (Exception ex) { Language.InternalErrMsgBox(ex); } } - } - } + + }//下载&浏览 private void ChangeLanguage(object sender, EventArgs e)//更改语言 { @@ -156,7 +152,7 @@ private void Form1_Load(object sender, EventArgs e) User32.AnimateWindow(this.Handle, 200, User32.AW_BLEND | User32.AW_ACTIVE | User32.AW_VER_NEGATIVE); RefreshForm(); - this.Opacity = 0.9; + this.Opacity = 0.95; } diff --git a/code/Form2.Designer.cs b/code/Form2.Designer.cs index 46de13a..b8b8e00 100644 --- a/code/Form2.Designer.cs +++ b/code/Form2.Designer.cs @@ -29,6 +29,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form2)); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.SuspendLayout(); @@ -54,11 +55,11 @@ private void InitializeComponent() this.Controls.Add(this.webBrowser1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Form2"; - this.ShowIcon = false; - this.Text = "Form2"; + this.Text = "Download"; this.Load += new System.EventHandler(this.Form2_Load); this.ResumeLayout(false); diff --git a/code/Form2.cs b/code/Form2.cs index 03d0f75..ee24a8a 100644 --- a/code/Form2.cs +++ b/code/Form2.cs @@ -4,6 +4,7 @@ using System.Data; using System.Diagnostics; using System.Drawing; +using System.IO; using System.Text; using System.Threading; using System.Windows.Forms; @@ -29,7 +30,18 @@ public Form2() Http_Post Http_Post = new Http_Post(); public void Browse() { + zh_CN zh_CN = new zh_CN(); + global global = new global(); WriteToTemp WriteToTemp = new WriteToTemp(); + if (File.Exists(WriteToTemp.tmpPath + @"\" + zh_CN.lang_tablehtm)) + { + File.Delete(WriteToTemp.tmpPath + @"\" + zh_CN.lang_tablehtm); + } + else if (File.Exists(WriteToTemp.tmpPath + @"\" + global.lang_tablehtm)) + { + File.Delete(WriteToTemp.tmpPath + @"\" + global.lang_tablehtm); + }//去除文件缓存 + complete = false; result = ""; string content = Form1.postContent; @@ -54,11 +66,22 @@ public void Browse() complete = true; return; } // 处理错误-1 + string result3 = Mdui(result2); + Debug.WriteLine(result3); + string result4; + if(Language.langUsing == "global")//language + { + result4 = Properties.Resources.table_1 + "\n" + result3 + "\n" + Properties.Resources.table_2; + } else { + result4 = Properties.Resources.table_1_cn + "\n" + result3 + "\n" + Properties.Resources.table_2_cn; + } + + + File.WriteAllText(WriteToTemp.tmpPath + @"\" + Language.lang_tablehtm,result4);//写出合并后的文本 returnid = 1; //成功 - complete = true; - Debug.WriteLine(result2); + complete = true; return; - } + }//POST和格式化等 private string RemoveUselessContent(string old)//格式化 { try @@ -77,12 +100,20 @@ private string RemoveUselessContent(string old)//格式化 } private string Mdui(string old)//加入Mdui格式 { - - return old; + string new1; + new1 = old.Replace("class=\"tftable\" border=\"1\" align=\"center\"", + "class=\"mdui-table\" style=\"margin-left: 20px;margin-right: 20px;margin-top: 20px;\"") + .Replace("style=\"width:180px;\"", "") + .Replace("style=\"width:300px;\"", "") + .Replace("style=\"width:60px;\"", "") + .Replace("style=\"background-color:rgba(255, 255, 255, 0.8)\"", "") + .Replace("style=\"background-color:rgba(188, 235, 240, 0.8)\"", "class=\"mdui-color-blue-100\""); + return new1; } private void Form2_Load(object sender, EventArgs e) { - var urlString = new Uri(WriteToTemp.tmpPath + @"\" + Language.lang_errhtm); + //打开网页 + var urlString = new Uri(WriteToTemp.tmpPath + @"\" + Language.lang_tablehtm); Debug.WriteLine(urlString); if (System.Diagnostics.Debugger.IsAttached == true) { @@ -90,6 +121,7 @@ private void Form2_Load(object sender, EventArgs e) } webBrowser1.Navigate(urlString); + webBrowser1.DocumentTitleChanged += DocTitleClose; } private void DocTitleClose(object sender, EventArgs e) diff --git a/code/Form2.resx b/code/Form2.resx index 69f943d..716d7e2 100644 --- a/code/Form2.resx +++ b/code/Form2.resx @@ -120,4 +120,171 @@ 17, 17 + + + + AAABAAEAMDAAAAAAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAgCUAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + ACMAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAA + ACoAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAAACoAAAAqAAAAKgAA + ACoAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAACAAAAfQAAAPQAAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAC8AAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAwAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAmwAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAuAAAAFIAAABSAAAAUgAA + AFIAAABSAAAAUgAAAOoAAACDAAAAUgAAAFIAAABSAAAAUgAAAFIAAAB8AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAjwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN4AAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAABJAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAABJAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AOAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAkQAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAN8AAABBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAqwAA + ADIAAAAyAAAAMgAAADIAAAAyAAAAMgAAAOYAAABtAAAAMgAAADIAAAAyAAAAMgAAADIAAABkAAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA9gAAAOgAAADoAAAA6AAAAOgAAADoAAAA6AAAAPwAAADvAAAA6AAAAOgAAADoAAAA6AAA + AOgAAADuAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAnAAAAA4AAAAOAAAADgAAAA4AAAAOAAAADgAAAOIAAABTAAAADgAA + AA4AAAAOAAAADgAAAA4AAABIAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AN8AAABFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAOAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAABJAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAjQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN0AAAA6AAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAuAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAygAAAH8AAAB/AAAAfwAAAH8AAAB/AAAAfwAA + AO8AAACjAAAAfwAAAH8AAAB/AAAAfwAAAH8AAACeAAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAlgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA + AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAAmwAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA4AAAA5wAA + AOcAAADnAAAA5wAAAOcAAADnAAAA5wAAAOcAAADnAAAA5wAAAPwAAAD2AAAA6gAAAP8AAADwAAAA5wAA + AOcAAADnAAAA5wAAAOcAAADnAAAA7gAAAP8AAADrAAAA9AAAAPsAAADnAAAA5wAAAOcAAADnAAAA5wAA + AOcAAADnAAAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAADAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAOQAAAClAAAAKgAA + AP8AAABqAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAAVwAAAP8AAAA6AAAAjQAAANgAAAAPAAAACwAA + AAsAAAALAAAACwAAAAsAAAALAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AOUAAACdAAAAGAAAAP8AAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASgAAAP8AAAAuAAAAiQAA + ANQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAANwAAACuAAAABQAAAOYAAAC2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVQAA + AP8AAAAoAAAArAAAAK8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK8AAADkAAAAAAAAAIMAAAD/AAAARAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAlgAAAPUAAAAjAAAAwwAAAFIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAF4AAAD/AAAAWgAAAAIAAADNAAAA+QAA + AEsAAAAAAAAAAAAAAAAAAAAfAAAA8wAAAK0AAABBAAAAlwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAADPAAAA9gAA + ADIAAAANAAAAnAAAAOUAAACbAAAATQAAAE8AAADEAAAA/wAAAEIAAABLAAAAFgAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAApAAAA4AAAAPsAAAB6AAAAJQAAAC8AAABtAAAAqQAAAPkAAAD/AAAAaQAAAAAAAAACAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAALAAAAD/AAAA+wAAAOwAAADrAAAA/wAAANYAAABXAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAdgAAAJYAAACIAAAATQAA + AA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAA= + + \ No newline at end of file diff --git a/code/Language.cs b/code/Language.cs index 11d6157..901cbc4 100644 --- a/code/Language.cs +++ b/code/Language.cs @@ -23,6 +23,8 @@ class Language public static string lang_interr; public static string lang_errhtm; public static string lang_neterr; + public static string lang_tablehtm; + public static string langUsing; public static void Chinese_Lang() { lang_attributes[0] = zh_CN.lang_attributes[0]; @@ -42,7 +44,9 @@ public static void Chinese_Lang() lang_interr = zh_CN.lang_interr; lang_errhtm = zh_CN.lang_errhtm; lang_neterr = zh_CN.lang_neterr; - } + lang_tablehtm = zh_CN.lang_tablehtm; + langUsing = "zh-CN"; + } public static void English_Lang() { lang_attributes[0] = global.lang_attributes[0]; @@ -62,8 +66,11 @@ public static void English_Lang() lang_interr = global.lang_interr; lang_errhtm = global.lang_errhtm; lang_neterr = global.lang_neterr; + lang_tablehtm = global.lang_tablehtm; + langUsing = "global"; } - public static void InternalErrMsgBox(System.Exception ex){ + public static void InternalErrMsgBox(System.Exception ex) + { MessageBox.Show(Language.lang_interr, Language.lang_interr, MessageBoxButtons.OK, MessageBoxIcon.Error); using (System.IO.StreamWriter file = new System.IO.StreamWriter(@WriteToTemp.tmpPath + "\\..\\exception.log", true)) { diff --git a/code/ShapeButton.cs b/code/ShapeButton.cs deleted file mode 100644 index 06f3d66..0000000 --- a/code/ShapeButton.cs +++ /dev/null @@ -1,245 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Windows_Store_Downloader.code -{ - public partial class ShapeButton : Button - { - private Color m_CustomClickColor; - private Color m_CustomDisabledColor; - private Color m_CustomDefaultColor; - private Color m_CustomClickTextColor; - private Color m_CustomDisabledTextColor; - private Color m_CustomDefaultTextColor; - private int m_Fillet; - - public ShapeButton() - { - this.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.FlatAppearance.BorderSize = 0; - this.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; - this.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; - this.Cursor = System.Windows.Forms.Cursors.Hand; - this.MouseEnter += new EventHandler(UserControlRoundButton_MouseEnter); - this.MouseLeave += new EventHandler(UserControlRoundButton_MouseLeave); - this.EnabledChanged += new EventHandler(UserControlCustomButton_EnabledChanged); - - } - - /// - /// 不可用背景颜色 - /// - public Color CustomDisabledColor - { - get - { - return m_CustomDisabledColor; - } - set - { - m_CustomDisabledColor = value; - } - } - - /// - /// 默认背景颜色 - /// - [Browsable(true)] - public Color CustomDefaultColor - { - get - { - return m_CustomDefaultColor; - } - set - { - m_CustomDefaultColor = value; - } - } - - /// - /// 光标放上去时颜色 - /// - [Browsable(true)] - public Color CustomClickColor - { - get - { - return m_CustomClickColor; - } - set - { - m_CustomClickColor = value; - } - } - - - /// - /// 不可用文字颜色 - /// - [Browsable(true)] - public Color CustomDisabledTextColor - { - get - { - return m_CustomDisabledTextColor; - } - set - { - m_CustomDisabledTextColor = value; - } - } - - /// - /// 默认文字颜色 - /// - [Browsable(true)] - public Color CustomDefaultTextColor - { - get - { - return m_CustomDefaultTextColor; - } - set - { - m_CustomDefaultTextColor = value; - } - } - - /// - /// 光标放上去时文字颜色 - /// - [Browsable(true)] - public Color CustomClickTextColor - { - get - { - return m_CustomClickTextColor; - } - set - { - m_CustomClickTextColor = value; - } - } - - - /// - /// 圆角度数、 - /// - [Browsable(true)] - public int Fillet - { - get - { - return m_Fillet; - } - set - { - m_Fillet = value; - } - } - - /// - /// 按钮不可用 - /// - /// - /// - void UserControlCustomButton_EnabledChanged(object sender, EventArgs e) - { - if (!this.Enabled) - { - this.BackColor = m_CustomDisabledColor; - this.ForeColor = m_CustomDisabledTextColor; - } - else - { - this.BackColor = m_CustomDefaultColor; - this.ForeColor = m_CustomDefaultTextColor; - } - } - - /// - /// 鼠标离开 - /// - /// - /// - void UserControlRoundButton_MouseLeave(object sender, EventArgs e) - { - if (!this.Enabled) - return; - - this.BackColor = m_CustomDefaultColor; - this.ForeColor = m_CustomDefaultTextColor; - } - - /// - /// 鼠标进入 - /// - /// - /// - void UserControlRoundButton_MouseEnter(object sender, EventArgs e) - { - this.BackColor = m_CustomClickColor; - this.ForeColor = m_CustomClickTextColor; - this.ResetFlagsandPaint(); - } - - /// - /// 绘制的路径 - /// - /// - /// - /// - private GraphicsPath GetRoundedRectPath(Rectangle rect, int radius) - { - int diameter = radius; - Rectangle arcRect = new Rectangle(rect.Location, new Size(diameter, diameter)); - GraphicsPath path = new GraphicsPath(); - path.AddArc(arcRect, 180, 90); - arcRect.X = rect.Right - diameter; - path.AddArc(arcRect, 270, 90); - arcRect.Y = rect.Bottom - diameter; - path.AddArc(arcRect, 0, 90); - arcRect.X = rect.Left; - path.AddArc(arcRect, 90, 90); - path.CloseFigure(); - return path; - } - - /// - /// 绘制的代码,需要在设计页面声明事件 - /// - /// - /// - private void ShapeButton_Paint(object sender, PaintEventArgs e) - { - - System.Drawing.Drawing2D.GraphicsPath FormPath; - FormPath = new System.Drawing.Drawing2D.GraphicsPath(); - Rectangle rect = new Rectangle(0, 0, this.Width, this.Height);//this.Left-10,this.Top-10,this.Width-10,this.Height-10); - e.Graphics.Clear(Color.White); - FormPath = GetRoundedRectPath(rect, m_Fillet); - e.Graphics.SmoothingMode = SmoothingMode.AntiAlias; - e.Graphics.FillPath(new SolidBrush(this.BackColor), FormPath); - - StringFormat gs = new StringFormat(); - gs.Alignment = StringAlignment.Center; //居中 - gs.LineAlignment = StringAlignment.Center;//垂直居中 - // gs.Alignment = StringAlignment.Far; //右对齐 - string str = "Hello World"; - Rectangle rc = new Rectangle(0, 0, this.Width, this.Height); - Font fo = new Font("宋体", 10.5F); - Brush brush = new SolidBrush(this.ForeColor); - e.Graphics.DrawString(str, fo, brush, rc, gs); - - } - } - -} diff --git a/code/WriteToTemp.cs b/code/WriteToTemp.cs index bafc716..7cb8c99 100644 --- a/code/WriteToTemp.cs +++ b/code/WriteToTemp.cs @@ -76,7 +76,7 @@ public void ReadFrom() } - } + }//读出res.zip public void PostLog() { try diff --git a/code/global.cs b/code/global.cs index 9beac8b..118a1cb 100644 --- a/code/global.cs +++ b/code/global.cs @@ -22,5 +22,6 @@ class global "\\..\\exception.log" + "for technical information."; public string lang_errhtm = "error.html"; public string lang_neterr = "Network error."; + public string lang_tablehtm = "table.html"; } } diff --git a/code/zh-CN.cs b/code/zh-CN.cs index 04e43a4..d7a8857 100644 --- a/code/zh-CN.cs +++ b/code/zh-CN.cs @@ -22,5 +22,6 @@ class zh_CN "\\..\\exception.log" + "以获得技术信息。"; public string lang_errhtm = "error-cn.html"; public string lang_neterr = "网络错误."; + public string lang_tablehtm = "table-cn.html"; } } diff --git a/resource/res.zip b/resource/res.zip index 9716ef9..425b8fd 100644 Binary files a/resource/res.zip and b/resource/res.zip differ diff --git a/resources/table_2.txt b/resources/table_2.txt new file mode 100644 index 0000000..e69de29