diff --git a/Source/LangCodesHelp.Designer.cs b/Source/LangCodesHelp.Designer.cs index c2ffddc..334cc1f 100644 --- a/Source/LangCodesHelp.Designer.cs +++ b/Source/LangCodesHelp.Designer.cs @@ -29,6 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LangCodesHelp)); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.LangCodesDS = new System.Data.DataSet(); this.aboutEditorFormBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -40,11 +41,8 @@ private void InitializeComponent() // dataGridView1 // this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridView1.Location = new System.Drawing.Point(0, 0); + resources.ApplyResources(this.dataGridView1, "dataGridView1"); this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.Size = new System.Drawing.Size(317, 419); - this.dataGridView1.TabIndex = 0; // // LangCodesDS // @@ -56,12 +54,13 @@ private void InitializeComponent() // // LangCodesHelp // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(317, 419); this.Controls.Add(this.dataGridView1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "LangCodesHelp"; - this.Text = "LangCodesHelp"; this.Load += new System.EventHandler(this.LangCodesHelp_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.LangCodesDS)).EndInit(); diff --git a/Source/LangCodesHelp.resx b/Source/LangCodesHelp.resx index d772fb6..ee0a3d9 100644 --- a/Source/LangCodesHelp.resx +++ b/Source/LangCodesHelp.resx @@ -117,10 +117,79 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + + 0, 0 + + + 3, 4, 3, 4 + + + 284, 461 + + + + 0 + + + dataGridView1 + + + System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + 240, 17 17, 17 + + True + + + 7, 17 + + + 284, 461 + + + Segoe UI, 10pt + + + 3, 4, 3, 4 + + + CenterParent + + + LangCodesHelp + + + LangCodesDS + + + System.Data.DataSet, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + aboutEditorFormBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LangCodesHelp + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/Source/MainUI.Designer.cs b/Source/MainUI.Designer.cs index 1805755..631e382 100644 --- a/Source/MainUI.Designer.cs +++ b/Source/MainUI.Designer.cs @@ -45,7 +45,7 @@ private void InitializeComponent() this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.filenameLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel3 = new System.Windows.Forms.ToolStripStatusLabel(); this.progressBar1 = new System.Windows.Forms.ToolStripProgressBar(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); @@ -56,8 +56,6 @@ private void InitializeComponent() this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.importBtn = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); - this.fileNameLbl = new System.Windows.Forms.Label(); - this.LanguageLbl = new System.Windows.Forms.Label(); this.languageLable = new System.Windows.Forms.Label(); this.menuStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -148,7 +146,7 @@ private void InitializeComponent() // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1, - this.toolStripStatusLabel2, + this.filenameLabel, this.toolStripStatusLabel3, this.progressBar1}); resources.ApplyResources(this.statusStrip1, "statusStrip1"); @@ -159,10 +157,10 @@ private void InitializeComponent() this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1"); // - // toolStripStatusLabel2 + // filenameLabel // - this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - resources.ApplyResources(this.toolStripStatusLabel2, "toolStripStatusLabel2"); + this.filenameLabel.Name = "filenameLabel"; + resources.ApplyResources(this.filenameLabel, "filenameLabel"); // // toolStripStatusLabel3 // @@ -237,16 +235,6 @@ private void InitializeComponent() resources.ApplyResources(this.label1, "label1"); this.label1.Name = "label1"; // - // fileNameLbl - // - resources.ApplyResources(this.fileNameLbl, "fileNameLbl"); - this.fileNameLbl.Name = "fileNameLbl"; - // - // LanguageLbl - // - resources.ApplyResources(this.LanguageLbl, "LanguageLbl"); - this.LanguageLbl.Name = "LanguageLbl"; - // // languageLable // resources.ApplyResources(this.languageLable, "languageLable"); @@ -256,8 +244,6 @@ private void InitializeComponent() // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.LanguageLbl); - this.Controls.Add(this.fileNameLbl); this.Controls.Add(this.languageLable); this.Controls.Add(this.label1); this.Controls.Add(this.importBtn); @@ -293,7 +279,7 @@ private void InitializeComponent() private System.Windows.Forms.OpenFileDialog openFileDialog1; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; - private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel2; + private System.Windows.Forms.ToolStripStatusLabel filenameLabel; private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.Button editBtn; private System.Windows.Forms.Button exportBtn; @@ -307,8 +293,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel3; private System.Windows.Forms.ToolStripProgressBar progressBar1; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label fileNameLbl; - private System.Windows.Forms.Label LanguageLbl; private System.Windows.Forms.Label languageLable; } } diff --git a/Source/MainUI.cs b/Source/MainUI.cs index ea73d2e..5b49fd2 100644 --- a/Source/MainUI.cs +++ b/Source/MainUI.cs @@ -108,15 +108,15 @@ private void openPackageFromOpenFileDialog() { case "CHS": case "ZHI": - toolStripStatusLabel2.Text = "未打开任何文件。"; + filenameLabel.Text = "未打开任何文件。"; break; case "CHT": case "ZHH": case "ZHM": - toolStripStatusLabel2.Text = "未開啟任何檔案。"; + filenameLabel.Text = "未開啟任何檔案。"; break; default: - toolStripStatusLabel2.Text = "No file is opened."; + filenameLabel.Text = "No file is opened."; break; } pathOpened = false; @@ -131,7 +131,7 @@ private void openPackage(string pathToFile) if (pathToFile != null) { stblFilePath = pathToFile; - toolStripStatusLabel2.Text = stblFilePath; + filenameLabel.Text = stblFilePath; publicPath = stblFilePath; pathOpened = fileIsOpened = true; } @@ -390,9 +390,6 @@ private void closeAndSavePackage(bool save = true) SaveSTBLFile(true); } - fileNameLbl.Text = ""; - LanguageLbl.Text = ""; - dataGridView1.DataSource = null; dataGridView1.Columns.Add("Column1", ""); dataGridView1.Columns.Add("Column2", ""); @@ -402,17 +399,19 @@ private void closeAndSavePackage(bool save = true) { case "CHS": case "ZHI": - toolStripStatusLabel2.Text = "未打开任何文件。"; + filenameLabel.Text = "未打开任何文件。"; break; case "CHT": case "ZHH": case "ZHM": - toolStripStatusLabel2.Text = "未開啟任何檔案。"; + filenameLabel.Text = "未開啟任何檔案。"; break; default: - toolStripStatusLabel2.Text = "No file is opened."; + filenameLabel.Text = "No file is opened."; break; } + + languageLable.Text = string.Empty; publicPath = string.Empty; pathOpened = false; canAlsoSave = false; diff --git a/Source/MainUI.resx b/Source/MainUI.resx index 6679ff0..40c8e68 100644 --- a/Source/MainUI.resx +++ b/Source/MainUI.resx @@ -192,7 +192,7 @@ 180, 24 - Show lang codes + &Show lang codes 49, 23 @@ -226,7 +226,7 @@ $this - 9 + 7 122, 18 @@ -240,10 +240,10 @@ STBL File : - + 99, 17 - + No file is opened. @@ -277,7 +277,7 @@ $this - 8 + 6 Top, Bottom, Left, Right @@ -316,7 +316,7 @@ $this - 7 + 5 Bottom, Right @@ -346,7 +346,7 @@ $this - 6 + 4 Bottom, Right @@ -373,7 +373,7 @@ $this - 5 + 3 378, 18 @@ -403,7 +403,7 @@ $this - 4 + 2 True @@ -433,62 +433,8 @@ $this - 3 - - - True - - - NoControl - - - 51, 29 - - - 0, 19 - - - 11 - - - fileNameLbl - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - 1 - - True - - - NoControl - - - 91, 48 - - - 0, 19 - - - 12 - - - LanguageLbl - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - True @@ -499,11 +445,14 @@ 91, 659 - 0, 19 + 41, 19 10 + + + languageLable @@ -514,7 +463,7 @@ $this - 2 + 0 True @@ -4058,10 +4007,10 @@ System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - toolStripStatusLabel2 + + filenameLabel - + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Source/MainUI.zh-Hans.resx b/Source/MainUI.zh-Hans.resx index fd0dec2..dd12f68 100644 --- a/Source/MainUI.zh-Hans.resx +++ b/Source/MainUI.zh-Hans.resx @@ -160,29 +160,38 @@ 文件(&F) + + 181, 24 + 关于(&A) + + 181, 24 + + + 显示语言代码 (&S) + 67, 23 帮助(&H) + + + 72, 17 STBL文件： - - 111, 17 - - - 未打开任何文件。 - - 986, 17 + 998, 17 + + + 字串索引 @@ -190,21 +199,39 @@ 显示文字 + + + 编辑 (&E) + + + 导出 (&X) + + + 导入 (&I) + + + 68, 19 语言类型: + + + + + + AAABAA0AAAAAAAEAIAA2EgEA1gAAAICAAAABACAAKAgBAAwTAQCAgAAAAQAIAChMAAA0GwIAQEAAAAEA @@ -3657,4 +3684,7 @@ 模拟市民4 STBL 编辑器 + + + \ No newline at end of file diff --git a/Source/MainUI.zh-Hant.resx b/Source/MainUI.zh-Hant.resx index 56d3efd..4da0d29 100644 --- a/Source/MainUI.zh-Hant.resx +++ b/Source/MainUI.zh-Hant.resx @@ -166,23 +166,26 @@ 離開(&E) + + 177, 24 + 關於(&A) + + 177, 24 + + + 顯示語言代碼(&S) + 72, 17 STBL檔案： - - 111, 17 - - - 未開啟任何檔案。 - - 986, 17 + 998, 17 字串索引 diff --git a/Source/StringPicker.resx b/Source/StringPicker.resx index 0a59c58..0b84292 100644 --- a/Source/StringPicker.resx +++ b/Source/StringPicker.resx @@ -117,136 +117,136 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 + + + Top, Bottom, Left, Right - - 7, 17 - - - listView1 - - - 0 + + 17, 92 410, 268 - - True - - - 3 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 0 - - Click on the string to paste it + + listView1 - - StringPicker + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 0 - - - $this + + 3 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 14, 11 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 439, 376 + + 186, 19 - - 2 + + 1 - - Right Click on the string to remove it from this list + + Click on the string to paste it label1 - - label2 - - - 3 - - - 315, 19 - - - - Top, Bottom, Left, Right - - - Double Click on the string to paste it and close this window - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + $this - - 372, 19 + + 2 - - $this + + True 14, 42 - - 186, 19 + + 372, 19 2 + + Double Click on the string to paste it and close this window + + + label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + True + 14, 70 - - 17, 92 + + 315, 19 + + + 3 + + + Right Click on the string to remove it from this list label3 - + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + True + + + 7, 17 + + + 439, 376 Segoe UI, 10pt + + CenterParent + StringPicker - - 1 + + StringPicker - - $this + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - zh-Hant - \ No newline at end of file diff --git a/Source/TS4 STBL Editor.csproj b/Source/TS4 STBL Editor.csproj index 241dc49..d0ca5db 100644 --- a/Source/TS4 STBL Editor.csproj +++ b/Source/TS4 STBL Editor.csproj @@ -178,6 +178,12 @@ LangCodesHelp.cs + + LangCodesHelp.cs + + + LangCodesHelp.cs + MainUI.cs diff --git a/Source/Tools.cs b/Source/Tools.cs index 7bbfd5c..3759451 100644 --- a/Source/Tools.cs +++ b/Source/Tools.cs @@ -356,7 +356,7 @@ public void SaveSTBLFile(bool isSaveAs) tempList.Add(textString); publicPath = WriteSTBLFile(tempList, isSaveAs, publicPath); - toolStripStatusLabel2.Text = publicPath; + filenameLabel.Text = publicPath; pathOpened = true; }