OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

chaki: Commit


Commit MetaInfo

Revision607 (tree)
Time2018-02-10 15:09:50
Authortomorita

Log Message

・Text2Corpus: GUIの調整(ResizeableとHeight制限, Show/Hide Log, Window Widthの記憶)
・Text2Corpus: Chamame modeではOut DBではなくOut Folderに

Change Summary

Incremental Difference

--- trunk/ChaKi.NET/src/ChaKiCommon/Settings/Text2CorpusSettings.cs (revision 606)
+++ trunk/ChaKi.NET/src/ChaKiCommon/Settings/Text2CorpusSettings.cs (revision 607)
@@ -55,6 +55,7 @@
5555 this.DoZenkakuConversion = true;
5656 this.MecabOutputFormat = "default";
5757 this.DoOutputBunruiGoiId = false;
58+ this.WindowWidth = -1;
5859 }
5960
6061 public bool DoSentenceSeparation;
@@ -83,7 +84,7 @@
8384
8485 public bool DoOutputBunruiGoiId;
8586
86-
87+ public int WindowWidth;
8788 }
8889
8990 public enum CRLFModes
--- trunk/ChaKi.NET/src/ImportWordRelation/Properties/AssemblyInfo.cs (revision 606)
+++ trunk/ChaKi.NET/src/ImportWordRelation/Properties/AssemblyInfo.cs (revision 607)
@@ -12,5 +12,5 @@
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("6a95808a-d1e3-47de-bb62-7ed7a281ac0b")]
15-[assembly: AssemblyVersion("3.11.602.0")]
16-[assembly: AssemblyFileVersion("3.11.602.0")]
15+[assembly: AssemblyVersion("3.11.606.0")]
16+[assembly: AssemblyFileVersion("3.11.606.0")]
--- trunk/ChaKi.NET/src/Text2Corpus/Properties/AssemblyInfo.cs (revision 606)
+++ trunk/ChaKi.NET/src/Text2Corpus/Properties/AssemblyInfo.cs (revision 607)
@@ -12,5 +12,5 @@
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("a8cf8403-eb88-418f-bf54-56aeaef39268")]
15-[assembly: AssemblyVersion("3.11.605.0")]
16-[assembly: AssemblyFileVersion("3.11.605.0")]
15+[assembly: AssemblyVersion("3.11.606.0")]
16+[assembly: AssemblyFileVersion("3.11.606.0")]
--- trunk/ChaKi.NET/src/Text2Corpus/Properties/Resources.Designer.cs (revision 606)
+++ trunk/ChaKi.NET/src/Text2Corpus/Properties/Resources.Designer.cs (revision 607)
@@ -61,6 +61,24 @@
6161 }
6262
6363 /// <summary>
64+ /// File... に類似しているローカライズされた文字列を検索します。
65+ /// </summary>
66+ internal static string File {
67+ get {
68+ return ResourceManager.GetString("File", resourceCulture);
69+ }
70+ }
71+
72+ /// <summary>
73+ /// Folder... に類似しているローカライズされた文字列を検索します。
74+ /// </summary>
75+ internal static string Folder {
76+ get {
77+ return ResourceManager.GetString("Folder", resourceCulture);
78+ }
79+ }
80+
81+ /// <summary>
6482 /// ⚻ Hide Detailed Log に類似しているローカライズされた文字列を検索します。
6583 /// </summary>
6684 internal static string HideDetailedLog {
@@ -70,6 +88,15 @@
7088 }
7189
7290 /// <summary>
91+ /// Output に類似しているローカライズされた文字列を検索します。
92+ /// </summary>
93+ internal static string OutputLabel {
94+ get {
95+ return ResourceManager.GetString("OutputLabel", resourceCulture);
96+ }
97+ }
98+
99+ /// <summary>
73100 /// Input file or folder does not exist: {0}. Please specify an existing file or folder. に類似しているローカライズされた文字列を検索します。
74101 /// </summary>
75102 internal static string S001 {
@@ -268,6 +295,15 @@
268295 }
269296
270297 /// <summary>
298+ /// Select... に類似しているローカライズされた文字列を検索します。
299+ /// </summary>
300+ internal static string Select {
301+ get {
302+ return ResourceManager.GetString("Select", resourceCulture);
303+ }
304+ }
305+
306+ /// <summary>
271307 /// ⚺ Show Detailed Log に類似しているローカライズされた文字列を検索します。
272308 /// </summary>
273309 internal static string ShowDetailedLog {
--- trunk/ChaKi.NET/src/Text2Corpus/TextToCorpus.Designer.cs (revision 606)
+++ trunk/ChaKi.NET/src/Text2Corpus/TextToCorpus.Designer.cs (revision 607)
@@ -328,9 +328,7 @@
328328 this.Controls.Add(this.groupBox3);
329329 this.Controls.Add(this.groupBox2);
330330 this.Controls.Add(this.groupBox1);
331- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
332331 this.Name = "TextToCorpus";
333- this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
334332 this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TextToCorpus_FormClosing);
335333 this.Load += new System.EventHandler(this.TextToCorpus_Load);
336334 this.DragDrop += new System.Windows.Forms.DragEventHandler(this.TextToCorpus_DragDrop);
--- trunk/ChaKi.NET/src/Text2Corpus/TextToCorpus.cs (revision 606)
+++ trunk/ChaKi.NET/src/Text2Corpus/TextToCorpus.cs (revision 607)
@@ -243,12 +243,21 @@
243243 this.label5.Enabled = true;
244244 this.comboBox4.Enabled = true;
245245 this.checkBox6.Enabled = true;
246+ this.groupBox5.Text = Resources.OutputLabel;
247+ this.button3.Text = Resources.Folder;
246248 #endif
249+ this.MaximumSize = new Size(SystemInformation.MaxWindowTrackSize.Width, this.Size.Height);
250+ var w = settings.WindowWidth;
251+ if (w > 400 && w < SystemInformation.MaxWindowTrackSize.Width)
252+ {
253+ this.Width = w;
254+ }
247255 }
248256
249257 private void TextToCorpus_FormClosing(object sender, FormClosingEventArgs e)
250258 {
251259 var settings = Text2CorpusSettings.Instance;
260+ settings.WindowWidth = this.Width;
252261 settings.DoSentenceSeparation = this.checkBox1.Checked;
253262 //settings.DoWordAnalysis = this.checkBox2.Checked;
254263 settings.DoChunkAnalysis = this.checkBox3.Checked;
@@ -314,17 +323,23 @@
314323 {
315324 if (!m_ShowDetail)
316325 {
326+ // Detailを表示する
317327 var sz = this.Size;
318328 var dy = this.textBox5.Bottom - this.button6.Bottom;
329+ this.MaximumSize = new Size(0, 0);
319330 this.Size = new Size(sz.Width, sz.Height + dy);
331+ this.textBox5.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
320332 this.button6.Text = Resources.HideDetailedLog;
321333 m_ShowDetail = true;
322334 }
323335 else
324336 {
337+ // Detailを非表示にする
325338 var sz = this.Size;
326- var dy = this.textBox5.Bottom - this.button6.Bottom;
327- this.Size = new Size(sz.Width, sz.Height - dy);
339+ var height = this.button6.Bottom + 54;
340+ this.textBox5.Anchor = AnchorStyles.Top | AnchorStyles.Left;
341+ this.MaximumSize = new Size(SystemInformation.MaxWindowTrackSize.Width, height);
342+ this.Size = new Size(sz.Width, height);
328343 this.button6.Text = Resources.ShowDetailedLog;
329344 m_ShowDetail = false;
330345 }
--- trunk/ChaKi.NET/src/Timings/Properties/AssemblyInfo.cs (revision 606)
+++ trunk/ChaKi.NET/src/Timings/Properties/AssemblyInfo.cs (revision 607)
@@ -12,5 +12,5 @@
1212 [assembly: AssemblyCulture("")]
1313 [assembly: ComVisible(false)]
1414 [assembly: Guid("ff6652ed-b932-466b-944b-ce88d698979b")]
15-[assembly: AssemblyVersion("3.11.602.0")]
16-[assembly: AssemblyFileVersion("3.11.602.0")]
15+[assembly: AssemblyVersion("3.11.606.0")]
16+[assembly: AssemblyFileVersion("3.11.606.0")]
Show on old repository browser