diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index bc4be21..9c02835 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2026.02.04.2230")] -[assembly: AssemblyFileVersion("2026.02.04.2230")] +[assembly: AssemblyVersion("2026.02.23.2400")] +[assembly: AssemblyFileVersion("2026.02.23.2400")] diff --git a/unimarc/unimarc/마크/Search_Infor2.cs b/unimarc/unimarc/마크/Search_Infor2.cs index 44e07a2..236dde3 100644 --- a/unimarc/unimarc/마크/Search_Infor2.cs +++ b/unimarc/unimarc/마크/Search_Infor2.cs @@ -344,7 +344,12 @@ namespace UniMarc if (item == null) return; var v_grade = 2; - int.TryParse(item.grade, out v_grade); + if (item.grade == "A") v_grade = 0; + else if (item.grade == "B") v_grade = 1; + else if (item.grade == "C") v_grade = 2; + else if (item.grade == "D") v_grade = 3; + + //int.TryParse(item.grade, out v_grade); var me = new fMarc_Editor(item.ISBN, item.Marc, SaveTarget.MasterMarc, item.etc1, item.etc2, v_grade); me.row = e.RowIndex; diff --git a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs index e8800df..f2a29be 100644 --- a/unimarc/unimarc/마크/fMarc_Editor.Designer.cs +++ b/unimarc/unimarc/마크/fMarc_Editor.Designer.cs @@ -84,6 +84,7 @@ namespace UniMarc this.etc1.Size = new System.Drawing.Size(260, 224); this.etc1.TabIndex = 32; this.etc1.Text = "Remark1"; + this.etc1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc1_KeyDown); // // etc2 // @@ -95,6 +96,7 @@ namespace UniMarc this.etc2.Size = new System.Drawing.Size(260, 224); this.etc2.TabIndex = 32; this.etc2.Text = "Remark2"; + this.etc2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc1_KeyDown); // // panel6 // diff --git a/unimarc/unimarc/마크/fMarc_Editor.cs b/unimarc/unimarc/마크/fMarc_Editor.cs index f9653cc..bdc7ae3 100644 --- a/unimarc/unimarc/마크/fMarc_Editor.cs +++ b/unimarc/unimarc/마크/fMarc_Editor.cs @@ -52,6 +52,7 @@ namespace UniMarc marcEditorControl1.Dock = DockStyle.Fill; this.StartPosition = FormStartPosition.CenterScreen; this.Controls.Add(marcEditorControl1); + marcEditorControl1.BringToFront(); this.KeyPreview = true; this.KeyDown += (s1, e1) => { @@ -271,5 +272,15 @@ namespace UniMarc { } + + private void etc1_KeyDown(object sender, KeyEventArgs e) + { + var rt = sender as RichTextBox; + if (rt == null) return; + if (e.KeyCode == Keys.F5) + { + rt.AppendText("[" + DateTime.Now.ToString("yy-MM-dd") + "]"); + } + } } }