From aa5f33eedb4b3fc8853153b8ef214695915ad484 Mon Sep 17 00:00:00 2001 From: LGram16 Date: Tue, 20 Jan 2026 22:13:56 +0900 Subject: [PATCH] =?UTF-8?q?Marc2=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=EC=8B=9C=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=EC=9D=B4=20=EC=A0=80=EC=9E=A5=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=ED=95=A8=20=EB=AF=B8=EC=86=8C=EC=9E=A5=20?= =?UTF-8?q?=EB=A7=88=ED=81=AC=20=EC=BD=94=EB=A6=AC=EC=8A=A4=20=EC=B0=BD=20?= =?UTF-8?q?=EC=B1=84=EC=9A=B0=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=A0=95=EB=A6=AC=ED=99=94=EB=A9=B4=EC=97=90=20?= =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=EC=B0=BD=20=EB=B6=99=EC=9D=B4?= =?UTF-8?q?=EA=B8=B0=20=EC=9E=91=EC=97=85=EC=8B=9C=EC=9E=91(=EC=BB=A8?= =?UTF-8?q?=ED=8A=B8=EB=A1=A4=20=EC=A0=95=EB=A6=AC=EC=9E=91=EC=97=85=20?= =?UTF-8?q?=EC=A4=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unimarc/unimarc/Properties/AssemblyInfo.cs | 4 +- unimarc/unimarc/UniMarc.csproj | 9 + unimarc/unimarc/마크/Marc2.cs | 6 +- unimarc/unimarc/마크/Marc2.designer.cs | 46 ++-- .../마크/MarcEditorControl.Designer.cs | 233 +++++++++------- unimarc/unimarc/마크/MarcEditorControl.cs | 254 +++--------------- unimarc/unimarc/마크/Marc_FillBlank.cs | 30 ++- unimarc/unimarc/마크/Marc_Plan.Designer.cs | 55 ++-- unimarc/unimarc/마크/Marc_Plan.cs | 26 +- .../마크/Marc_Plan_Sub_MarcEdit2.Designer.cs | 69 +++++ .../unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs | 34 +++ .../unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx | 120 +++++++++ 12 files changed, 499 insertions(+), 387 deletions(-) create mode 100644 unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.Designer.cs create mode 100644 unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs create mode 100644 unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index 7c8d023..d16216a 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.01.15.2015")] -[assembly: AssemblyFileVersion("2026.01.15.2015")] +[assembly: AssemblyVersion("2026.01.20.2130")] +[assembly: AssemblyFileVersion("2026.01.20.2130")] diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 9ac3803..2389090 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -511,6 +511,12 @@ Marc_Plan_PrintLabel.cs + + Form + + + Marc_Plan_Sub_MarcEdit2.cs + Form @@ -1139,6 +1145,9 @@ Marc_Plan_PrintLabel.cs + + Marc_Plan_Sub_MarcEdit2.cs + Marc_Plan_Sub_MarcEdit.cs diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index 0d96b32..5ef03a3 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -351,7 +351,7 @@ namespace ExcelTest string saveDate = List_Book.Rows[row_idx].Cells["SaveDate"].Value?.ToString() ?? ""; string listIdx = List_Book.Rows[row_idx].Cells["list_idx"].Value?.ToString() ?? ""; // verify this column name in input_list - marcEditorControl1.LoadBookData(isbn13, bookName, author, publisher, price, url, marcIdx, dbMarc, grade, user, saveDate, listIdx); + marcEditorControl1.LoadBookData(isbn13, url, marcIdx, dbMarc, grade, user, saveDate, listIdx); } @@ -556,7 +556,7 @@ namespace ExcelTest List_Book.Rows[SaveRowIdx].Cells["grade"].Value = e.Grade; List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value = e.SaveDate; - List_Book.Rows[SaveRowIdx].Cells["user"].Value = e.User; + List_Book.Rows[SaveRowIdx].Cells["user"].Value = mUserName; List_Book.Rows[SaveRowIdx].Cells["db_marc"].Value = e.DBMarc; List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString()); @@ -619,7 +619,7 @@ namespace ExcelTest return; } - UniMarc.Marc_FillBlank fb = new UniMarc.Marc_FillBlank(this); + var fb = new UniMarc.Marc_FillBlank(this); for (int a = 0; a < List_Book.Rows.Count; a++) { if (List_Book.Rows[a].DefaultCellStyle.ForeColor == Color.Red) diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs index 8cbe6a6..917cee3 100644 --- a/unimarc/unimarc/마크/Marc2.designer.cs +++ b/unimarc/unimarc/마크/Marc2.designer.cs @@ -75,9 +75,9 @@ this.lbl_BookList = new System.Windows.Forms.ToolStripStatusLabel(); this.btClose = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); + this.marcEditorControl1 = new ExcelTest.MarcEditorControl(); this.panel3 = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); - this.marcEditorControl1 = new ExcelTest.MarcEditorControl(); label31 = new System.Windows.Forms.Label(); label30 = new System.Windows.Forms.Label(); label33 = new System.Windows.Forms.Label(); @@ -547,6 +547,25 @@ this.panel2.Size = new System.Drawing.Size(1083, 634); this.panel2.TabIndex = 325; // + // marcEditorControl1 + // + this.marcEditorControl1.BackColor = System.Drawing.Color.Gray; + this.marcEditorControl1.CurrentDBMarc = null; + this.marcEditorControl1.CurrentGrade = null; + this.marcEditorControl1.CurrentISBN13 = null; + this.marcEditorControl1.CurrentListIdx = null; + this.marcEditorControl1.CurrentMarcIdx = null; + this.marcEditorControl1.CurrentSaveDate = null; + this.marcEditorControl1.CurrentURL = null; + this.marcEditorControl1.CurrentUser = null; + this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); + this.marcEditorControl1.Name = "marcEditorControl1"; + this.marcEditorControl1.Size = new System.Drawing.Size(1083, 634); + this.marcEditorControl1.TabIndex = 0; + this.marcEditorControl1.Load += new System.EventHandler(this.marcEditorControl1_Load); + // // panel3 // this.panel3.BackColor = System.Drawing.Color.White; @@ -574,29 +593,6 @@ this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click_1); // - // marcEditorControl1 - // - this.marcEditorControl1.BackColor = System.Drawing.Color.Gray; - this.marcEditorControl1.CurrentAuthor = null; - this.marcEditorControl1.CurrentBookName = null; - this.marcEditorControl1.CurrentDBMarc = null; - this.marcEditorControl1.CurrentGrade = null; - this.marcEditorControl1.CurrentISBN13 = null; - this.marcEditorControl1.CurrentListIdx = null; - this.marcEditorControl1.CurrentMarcIdx = null; - this.marcEditorControl1.CurrentPrice = null; - this.marcEditorControl1.CurrentPublisher = null; - this.marcEditorControl1.CurrentSaveDate = null; - this.marcEditorControl1.CurrentURL = null; - this.marcEditorControl1.CurrentUser = null; - this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); - this.marcEditorControl1.Name = "marcEditorControl1"; - this.marcEditorControl1.Size = new System.Drawing.Size(1083, 634); - this.marcEditorControl1.TabIndex = 0; - this.marcEditorControl1.Load += new System.EventHandler(this.marcEditorControl1_Load); - // // Marc2 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -659,12 +655,12 @@ public System.Windows.Forms.Button tbCustName; public System.Windows.Forms.Label lbCustIDX; private System.Windows.Forms.Button btCopy; - private ExcelTest.MarcEditorControl marcEditorControl1; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel lbl_BookList; private System.Windows.Forms.Button btClose; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Button button1; + public MarcEditorControl marcEditorControl1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs index a261f68..a359568 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.Designer.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.Designer.cs @@ -28,14 +28,14 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle137 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle138 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle139 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle140 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle141 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle142 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle143 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle144 = new System.Windows.Forms.DataGridViewCellStyle(); this.label31 = new System.Windows.Forms.Label(); this.label30 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); @@ -221,6 +221,8 @@ this.panel1 = new System.Windows.Forms.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel2 = new System.Windows.Forms.Panel(); + this.btNext = new System.Windows.Forms.Button(); + this.btPrev = new System.Windows.Forms.Button(); this.panel5 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); this.panel3.SuspendLayout(); @@ -360,7 +362,7 @@ this.richTextBox1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.richTextBox1.Location = new System.Drawing.Point(3, 3); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1003, 1021); + this.richTextBox1.Size = new System.Drawing.Size(935, 779); this.richTextBox1.TabIndex = 32; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); @@ -372,7 +374,7 @@ this.etc1.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.etc1.Location = new System.Drawing.Point(3, 3); this.etc1.Name = "etc1"; - this.etc1.Size = new System.Drawing.Size(386, 246); + this.etc1.Size = new System.Drawing.Size(386, 279); this.etc1.TabIndex = 32; this.etc1.Text = "Remark1"; this.etc1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc_KeyDown); @@ -382,9 +384,9 @@ this.etc2.BackColor = System.Drawing.SystemColors.ScrollBar; this.etc2.Dock = System.Windows.Forms.DockStyle.Fill; this.etc2.Font = new System.Drawing.Font("굴림체", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.etc2.Location = new System.Drawing.Point(3, 255); + this.etc2.Location = new System.Drawing.Point(3, 288); this.etc2.Name = "etc2"; - this.etc2.Size = new System.Drawing.Size(386, 246); + this.etc2.Size = new System.Drawing.Size(386, 279); this.etc2.TabIndex = 32; this.etc2.Text = "Remark2"; this.etc2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc_KeyDown); @@ -392,7 +394,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(407, 14); + this.label1.Location = new System.Drawing.Point(509, 13); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(63, 14); this.label1.TabIndex = 14; @@ -401,7 +403,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(615, 14); + this.label2.Location = new System.Drawing.Point(737, 13); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(49, 14); this.label2.TabIndex = 206; @@ -411,9 +413,9 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(678, 10); + this.comboBox1.Location = new System.Drawing.Point(789, 10); this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(79, 21); + this.comboBox1.Size = new System.Drawing.Size(116, 21); this.comboBox1.TabIndex = 207; this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -421,7 +423,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(762, 14); + this.label3.Location = new System.Drawing.Point(515, 38); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(63, 14); this.label3.TabIndex = 206; @@ -431,7 +433,7 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(826, 10); + this.comboBox2.Location = new System.Drawing.Point(579, 35); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(87, 21); this.comboBox2.TabIndex = 207; @@ -441,7 +443,7 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(921, 14); + this.label98.Location = new System.Drawing.Point(513, 62); this.label98.Name = "label98"; this.label98.Size = new System.Drawing.Size(63, 14); this.label98.TabIndex = 14; @@ -451,7 +453,7 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(987, 10); + this.comboBox3.Location = new System.Drawing.Point(579, 59); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(118, 21); this.comboBox3.TabIndex = 207; @@ -461,7 +463,7 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(1228, 14); + this.label99.Location = new System.Drawing.Point(826, 62); this.label99.Name = "label99"; this.label99.Size = new System.Drawing.Size(35, 14); this.label99.TabIndex = 206; @@ -470,7 +472,7 @@ // text008col // this.text008col.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.text008col.Location = new System.Drawing.Point(1266, 9); + this.text008col.Location = new System.Drawing.Point(864, 58); this.text008col.Name = "text008col"; this.text008col.Size = new System.Drawing.Size(41, 23); this.text008col.TabIndex = 204; @@ -479,7 +481,7 @@ // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(762, 40); + this.label100.Location = new System.Drawing.Point(723, 38); this.label100.Name = "label100"; this.label100.Size = new System.Drawing.Size(63, 14); this.label100.TabIndex = 206; @@ -489,9 +491,9 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(826, 36); + this.comboBox4.Location = new System.Drawing.Point(789, 35); this.comboBox4.Name = "comboBox4"; - this.comboBox4.Size = new System.Drawing.Size(87, 21); + this.comboBox4.Size = new System.Drawing.Size(116, 21); this.comboBox4.TabIndex = 207; this.comboBox4.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox4.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); @@ -499,7 +501,7 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(949, 40); + this.label101.Location = new System.Drawing.Point(541, 86); this.label101.Name = "label101"; this.label101.Size = new System.Drawing.Size(35, 14); this.label101.TabIndex = 206; @@ -509,7 +511,7 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(987, 36); + this.comboBox5.Location = new System.Drawing.Point(579, 83); this.comboBox5.Name = "comboBox5"; this.comboBox5.Size = new System.Drawing.Size(97, 21); this.comboBox5.TabIndex = 207; @@ -519,7 +521,7 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(1089, 40); + this.label102.Location = new System.Drawing.Point(681, 86); this.label102.Name = "label102"; this.label102.Size = new System.Drawing.Size(35, 14); this.label102.TabIndex = 206; @@ -529,7 +531,7 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(1127, 36); + this.comboBox6.Location = new System.Drawing.Point(719, 83); this.comboBox6.Name = "comboBox6"; this.comboBox6.Size = new System.Drawing.Size(97, 21); this.comboBox6.TabIndex = 207; @@ -539,7 +541,7 @@ // text008gov // this.text008gov.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.text008gov.Location = new System.Drawing.Point(1266, 35); + this.text008gov.Location = new System.Drawing.Point(864, 82); this.text008gov.Name = "text008gov"; this.text008gov.Size = new System.Drawing.Size(41, 23); this.text008gov.TabIndex = 204; @@ -548,7 +550,7 @@ // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(1228, 40); + this.label103.Location = new System.Drawing.Point(826, 86); this.label103.Name = "label103"; this.label103.Size = new System.Drawing.Size(35, 14); this.label103.TabIndex = 206; @@ -559,7 +561,7 @@ this.col008res.AutoSize = true; this.col008res.BackColor = System.Drawing.SystemColors.ActiveBorder; this.col008res.ForeColor = System.Drawing.Color.Blue; - this.col008res.Location = new System.Drawing.Point(1314, 14); + this.col008res.Location = new System.Drawing.Point(912, 62); this.col008res.Name = "col008res"; this.col008res.Size = new System.Drawing.Size(17, 14); this.col008res.TabIndex = 206; @@ -571,7 +573,7 @@ this.gov008res.AutoSize = true; this.gov008res.BackColor = System.Drawing.SystemColors.ActiveBorder; this.gov008res.ForeColor = System.Drawing.Color.Blue; - this.gov008res.Location = new System.Drawing.Point(1314, 40); + this.gov008res.Location = new System.Drawing.Point(912, 86); this.gov008res.Name = "gov008res"; this.gov008res.Size = new System.Drawing.Size(17, 14); this.gov008res.TabIndex = 206; @@ -581,22 +583,22 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(404, 38); + this.checkBox1.Location = new System.Drawing.Point(405, 11); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(129, 18); + this.checkBox1.Size = new System.Drawing.Size(96, 18); this.checkBox1.TabIndex = 213; - this.checkBox1.Text = "회의간행물 여부"; + this.checkBox1.Text = "회의간행물"; this.checkBox1.UseVisualStyleBackColor = true; this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(551, 38); + this.checkBox2.Location = new System.Drawing.Point(405, 36); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(129, 18); + this.checkBox2.Size = new System.Drawing.Size(96, 18); this.checkBox2.TabIndex = 213; - this.checkBox2.Text = "기념논문집 여부"; + this.checkBox2.Text = "기념논문집"; this.checkBox2.UseVisualStyleBackColor = true; this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); // @@ -604,7 +606,7 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(1106, 10); + this.comboBox7.Location = new System.Drawing.Point(698, 59); this.comboBox7.Name = "comboBox7"; this.comboBox7.Size = new System.Drawing.Size(118, 21); this.comboBox7.TabIndex = 207; @@ -613,9 +615,9 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(14, 130); + this.Btn_Memo.Location = new System.Drawing.Point(14, 118); this.Btn_Memo.Name = "Btn_Memo"; - this.Btn_Memo.Size = new System.Drawing.Size(77, 30); + this.Btn_Memo.Size = new System.Drawing.Size(77, 33); this.Btn_Memo.TabIndex = 215; this.Btn_Memo.Text = "메모장"; this.Btn_Memo.UseVisualStyleBackColor = true; @@ -623,11 +625,11 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(14, 167); + this.btn_Save.Location = new System.Drawing.Point(14, 153); this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(77, 30); + this.btn_Save.Size = new System.Drawing.Size(77, 33); this.btn_Save.TabIndex = 215; - this.btn_Save.Text = "저 장"; + this.btn_Save.Text = "저장(F9)"; this.btn_Save.UseVisualStyleBackColor = true; this.btn_Save.Click += new System.EventHandler(this.Btn_Save_Click); // @@ -637,7 +639,7 @@ this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(40, 64); + this.label4.Size = new System.Drawing.Size(40, 109); this.label4.TabIndex = 206; this.label4.Text = "008"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -650,7 +652,7 @@ this.text008.Location = new System.Drawing.Point(40, 0); this.text008.Margin = new System.Windows.Forms.Padding(3); this.text008.Name = "text008"; - this.text008.Size = new System.Drawing.Size(328, 64); + this.text008.Size = new System.Drawing.Size(328, 109); this.text008.TabIndex = 204; this.text008.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -665,7 +667,7 @@ this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(0); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(398, 66); + this.panel3.Size = new System.Drawing.Size(398, 111); this.panel3.TabIndex = 219; // // btn_Reflesh008 @@ -676,16 +678,16 @@ this.btn_Reflesh008.Location = new System.Drawing.Point(368, 0); this.btn_Reflesh008.Margin = new System.Windows.Forms.Padding(0); this.btn_Reflesh008.Name = "btn_Reflesh008"; - this.btn_Reflesh008.Size = new System.Drawing.Size(28, 64); + this.btn_Reflesh008.Size = new System.Drawing.Size(28, 109); this.btn_Reflesh008.TabIndex = 207; this.btn_Reflesh008.UseVisualStyleBackColor = false; this.btn_Reflesh008.Click += new System.EventHandler(this.btn_Reflesh008_Click); // // btn_close // - this.btn_close.Location = new System.Drawing.Point(14, 241); + this.btn_close.Location = new System.Drawing.Point(14, 223); this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(77, 30); + this.btn_close.Size = new System.Drawing.Size(77, 33); this.btn_close.TabIndex = 215; this.btn_close.Text = "닫 기"; this.btn_close.UseVisualStyleBackColor = true; @@ -698,7 +700,7 @@ this.input_date.Checked = false; this.input_date.CustomFormat = "yyyy-MM-dd"; this.input_date.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.input_date.Location = new System.Drawing.Point(477, 9); + this.input_date.Location = new System.Drawing.Point(579, 9); this.input_date.Name = "input_date"; this.input_date.ShowCheckBox = true; this.input_date.Size = new System.Drawing.Size(127, 23); @@ -707,9 +709,9 @@ // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(14, 204); + this.btn_preview.Location = new System.Drawing.Point(14, 188); this.btn_preview.Name = "btn_preview"; - this.btn_preview.Size = new System.Drawing.Size(77, 30); + this.btn_preview.Size = new System.Drawing.Size(77, 33); this.btn_preview.TabIndex = 215; this.btn_preview.Text = "미리보기"; this.btn_preview.UseVisualStyleBackColor = true; @@ -741,7 +743,7 @@ // // btn_FillBlank // - this.btn_FillBlank.Location = new System.Drawing.Point(14, 63); + this.btn_FillBlank.Location = new System.Drawing.Point(14, 56); this.btn_FillBlank.Name = "btn_FillBlank"; this.btn_FillBlank.Size = new System.Drawing.Size(77, 60); this.btn_FillBlank.TabIndex = 228; @@ -753,7 +755,6 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Multiline = true; @@ -767,10 +768,10 @@ // this.tabPage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.tabPage1.Controls.Add(this.richTextBox1); - this.tabPage1.Location = new System.Drawing.Point(4, 25); + this.tabPage1.Location = new System.Drawing.Point(4, 23); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1009, 1027); + this.tabPage1.Size = new System.Drawing.Size(941, 785); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "마크 편집"; // @@ -781,7 +782,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 23); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(941, 785); + this.tabPage2.Size = new System.Drawing.Size(941, 783); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "마크 칸채우기"; // @@ -834,7 +835,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(935, 779); + this.panel4.Size = new System.Drawing.Size(935, 777); this.panel4.TabIndex = 0; // // Btn_interlock @@ -876,8 +877,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle137.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle137; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 0; @@ -951,8 +952,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle138.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle138; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 2; @@ -1091,14 +1092,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle139.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle139.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle139.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle139.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle139.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle139.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle139.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle139; this.GridView246.ColumnHeadersHeight = 29; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, @@ -1111,8 +1112,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle140.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle140; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 31; @@ -1271,14 +1272,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle5.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle141.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle141.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle141.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle141.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle141.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle141.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle141.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle141; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1291,8 +1292,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle142.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle142; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 18; @@ -1400,14 +1401,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle7.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle143.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle143.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle143.Font = new System.Drawing.Font("돋움", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle143.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle143.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle143.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle143.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle143; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1416,8 +1417,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle144.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle144; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 19; @@ -2237,7 +2238,7 @@ // checkBox4 // this.checkBox4.AutoSize = true; - this.checkBox4.Location = new System.Drawing.Point(698, 38); + this.checkBox4.Location = new System.Drawing.Point(405, 60); this.checkBox4.Name = "checkBox4"; this.checkBox4.Size = new System.Drawing.Size(54, 18); this.checkBox4.TabIndex = 213; @@ -2251,9 +2252,9 @@ | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox1.Location = new System.Drawing.Point(101, 10); + this.pictureBox1.Location = new System.Drawing.Point(98, 10); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(283, 287); + this.pictureBox1.Size = new System.Drawing.Size(283, 250); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 221; this.pictureBox1.TabStop = false; @@ -2264,9 +2265,9 @@ this.panel1.Controls.Add(this.tableLayoutPanel1); this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(949, 66); + this.panel1.Location = new System.Drawing.Point(949, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(392, 812); + this.panel1.Size = new System.Drawing.Size(392, 878); this.panel1.TabIndex = 319; // // tableLayoutPanel1 @@ -2281,11 +2282,13 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(392, 504); + this.tableLayoutPanel1.Size = new System.Drawing.Size(392, 570); this.tableLayoutPanel1.TabIndex = 0; // // panel2 // + this.panel2.Controls.Add(this.btNext); + this.panel2.Controls.Add(this.btPrev); this.panel2.Controls.Add(this.pictureBox1); this.panel2.Controls.Add(this.btn_Save); this.panel2.Controls.Add(this.btn_preview); @@ -2300,15 +2303,35 @@ this.panel2.Size = new System.Drawing.Size(392, 308); this.panel2.TabIndex = 1; // + // btNext + // + this.btNext.Location = new System.Drawing.Point(274, 266); + this.btNext.Name = "btNext"; + this.btNext.Size = new System.Drawing.Size(107, 33); + this.btNext.TabIndex = 230; + this.btNext.Text = "다 음(F12)"; + this.btNext.UseVisualStyleBackColor = true; + this.btNext.Click += new System.EventHandler(this.btNext_Click); + // + // btPrev + // + this.btPrev.Location = new System.Drawing.Point(98, 266); + this.btPrev.Name = "btPrev"; + this.btPrev.Size = new System.Drawing.Size(107, 33); + this.btPrev.TabIndex = 229; + this.btPrev.Text = "이 전(F11)"; + this.btPrev.UseVisualStyleBackColor = true; + this.btPrev.Click += new System.EventHandler(this.btPrev_Click); + // // panel5 // this.panel5.Controls.Add(this.lbl_ISBN); this.panel5.Controls.Add(this.lbl_SaveData); this.panel5.Controls.Add(this.tabControl1); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(0, 66); + this.panel5.Location = new System.Drawing.Point(0, 111); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(949, 812); + this.panel5.Size = new System.Drawing.Size(949, 767); this.panel5.TabIndex = 320; // // panel6 @@ -2342,15 +2365,15 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1341, 66); + this.panel6.Size = new System.Drawing.Size(949, 111); this.panel6.TabIndex = 321; // // MarcEditorControl // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.Controls.Add(this.panel5); - this.Controls.Add(this.panel1); this.Controls.Add(this.panel6); + this.Controls.Add(this.panel1); this.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.Name = "MarcEditorControl"; this.Size = new System.Drawing.Size(1341, 878); @@ -2592,5 +2615,7 @@ private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.Button btNext; + private System.Windows.Forms.Button btPrev; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index 66fdfe8..996a8d9 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -31,19 +31,12 @@ namespace ExcelTest private bool mLoadCompleted = false; string tbName = ""; public int checkCout = 0; - // public bool gridViewChk = false; // Removed public Helper_DB db;// = new Helper_DB(); Help008Tag tag008 = new Help008Tag(); Skill_Search_Text search_Text = new Skill_Search_Text(); String_Text st = new String_Text(); - // Mac_List ml; // Removed - - // Properties to replace List_Book row access public string CurrentISBN13 { get; set; } - public string CurrentBookName { get; set; } - public string CurrentAuthor { get; set; } - public string CurrentPublisher { get; set; } - public string CurrentPrice { get; set; } // pay + public string CurrentURL { get; set; } // image_url? public string CurrentMarcIdx { get; set; } public string CurrentDBMarc { get; set; } // db_marc @@ -102,94 +95,6 @@ namespace ExcelTest #endregion } - //public void input_list(string l_idx, string value) - //{ - // db.DBcon(); - - // lbl_BookList.Text = value; - - // string Area = - // // 0 1 2 3 - // "olb.idx, olb.isbn_marc, olb.header, olb.num, " + - // // 4 5 6 7 8 9 - // "olb.book_name, olb.author, olb.book_comp, olb.`count`, olb.price, olb.image_url, " + - // // 10 11 12 13 14 15 16 - // "mac.idx, mac.marc, mac.marc_chk, mac.marc1, mac.marc_chk1, mac.marc2, mac.marc_chk2, " + - // // 17 18 19 20 - // "mac.grade, mac.compidx, mac.`user`, mac.date"; - - // string CMD = string.Format("" + - // "SELECT {0} " + - // "FROM Obj_List_Book AS olb " + - // "LEFT JOIN Marc AS mac " + - // // "ON if (olb.m_idx = 0, mac.ISBN = olb.isbn_marc, mac.idx = olb.m_idx) " + - // "ON mac.ISBN = olb.isbn_marc " + - // "WHERE olb.l_idx = {1} " + - // "GROUP BY olb.book_name " + - // "ORDER BY olb.idx ASC;", Area, l_idx); - // string db_res = db.DB_Send_CMD_Search(CMD); - // string[] db_data = db_res.Split('|'); - - // string[] grid = { - // "", "", "", "", "", - // "", "", "", "", "", - // "", "", "V", "", "" }; - - // string[] MarcData = { "", "", "", "", "", "" }; - - // for (int a = 0; a < db_data.Length; a++) - // { - // if (a % 21 == 00) grid[0] = db_data[a]; - // if (a % 21 == 01) grid[1] = db_data[a]; - // if (a % 21 == 02) grid[2] = db_data[a]; - // if (a % 21 == 03) grid[2] += db_data[a]; - // if (a % 21 == 04) grid[3] = db_data[a]; - // if (a % 21 == 05) grid[4] = db_data[a]; - // if (a % 21 == 06) grid[5] = db_data[a]; - // if (a % 21 == 07) grid[6] = db_data[a]; - // if (a % 21 == 08) grid[7] = db_data[a]; - // if (a % 21 == 09) grid[8] = db_data[a]; - // if (a % 21 == 10) grid[9] = db_data[a]; - // if (a % 21 == 11) MarcData[0] = db_data[a]; - // if (a % 21 == 12) MarcData[1] = db_data[a]; - // if (a % 21 == 13) MarcData[2] = db_data[a]; - // if (a % 21 == 14) MarcData[3] = db_data[a]; - // if (a % 21 == 15) MarcData[4] = db_data[a]; - // if (a % 21 == 16) MarcData[5] = db_data[a]; - // if (a % 21 == 17) - // { - // grid[10] = RealMarc(MarcData); - // if (grid[10] == "") grid[11] = "3"; - // else grid[11] = db_data[a]; - // } - // if (a % 21 == 18) { - // if (db_data[a] == "") grid[13] = ""; - // else if (mCompidx != db_data[a]) { - // string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", db_data[a]); - // grid[13] = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", ""); - // } - // } - // if (a % 21 == 19) { - // if (grid[13] == "") - // grid[13] = db_data[a]; - // } - // if (a % 21 == 20) - // { - // grid[14] = db_data[a]; - // List_Book.Rows.Add(grid); - // } - // } - - // for (int a = 0; a < List_Book.Rows.Count; a++) - // { - // string Grade = List_Book.Rows[a].Cells["grade"].Value.ToString(); - // string SaveDate = List_Book.Rows[a].Cells["SaveDate"].Value.ToString(); - // List_Book.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(Grade); - // SaveDateCheck(SaveDate, a); - // } - - - //} private string RealMarc(string[] MarcData) { @@ -206,13 +111,9 @@ namespace ExcelTest return result; } - public void LoadBookData(string isbn13, string bookName, string author, string publisher, string price, string url, string marcIdx, string dbMarc, string grade, string user, string saveDate, string listIdx) + public void LoadBookData(string isbn13, string url, string marcIdx, string dbMarc, string grade, string user, string saveDate, string listIdx) { CurrentISBN13 = isbn13; - CurrentBookName = bookName; - CurrentAuthor = author; - CurrentPublisher = publisher; - CurrentPrice = price; CurrentURL = url; CurrentMarcIdx = marcIdx; CurrentDBMarc = dbMarc; @@ -226,10 +127,10 @@ namespace ExcelTest // Update data_book for Create_008 or Empty logic data_book[0] = CurrentISBN13; - data_book[1] = CurrentBookName; - data_book[2] = CurrentAuthor; - data_book[3] = CurrentPublisher; - data_book[4] = CurrentPrice; + data_book[1] = "";// CurrentBookName; + data_book[2] ="";//CurrentAuthor; + data_book[3] ="";//CurrentPublisher; + data_book[4] = "";//CurrentPrice; LoadMarc(CurrentDBMarc); input_picture(); @@ -248,21 +149,11 @@ namespace ExcelTest st.Color_change("▼", richTextBox1); st.Color_change("▲", richTextBox1); - // Check Ownership - if (string.IsNullOrEmpty(CurrentMarcIdx) || CurrentMarcIdx == "0") - IsMyData = true; // New record is mine - else - IsMyData = CheckOwner(CurrentMarcIdx); - + } - private bool CheckOwner(string marcIdx) - { - string query = $"SELECT `compidx` FROM `Marc` WHERE `idx` = '{marcIdx}'"; - string res = db.DB_Send_CMD_Search(query).Replace("|", ""); - return res == mCompidx; - } + /// /// 마크 유무 확인하는 함수 /// @@ -429,7 +320,6 @@ namespace ExcelTest } public event EventHandler BookSaved; - public bool IsMyData = false; private void Btn_Save_Click(object sender, EventArgs e) { @@ -445,12 +335,7 @@ namespace ExcelTest MessageBox.Show("[칸채우기]가 아닌 [마크 편집] 탭에서 저장해주세요!"); return; } - //if (grade == 3) - //{ - // MessageBox.Show("등급을 설정해주세요. (C 이상)"); - // return; - //} - string table_name = "Marc"; + string BaseText = richTextBox1.Text; string lblisbn = CurrentISBN13; // lbl_ISBN.Text.Replace("[", "").Replace("]", ""); @@ -463,7 +348,7 @@ namespace ExcelTest return; } - //ISBN이 변경되었다면 저장하지 못하게 한다 + //ISBN이 변경되었다면 저장하지 못하게 한다 (경고 후 저장 가능하게 한다 26010?) if (BaseText.IndexOf(lblisbn) < 0) { var dlg = UTIL.MsgQ("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다\n그래도 저장 할까요?"); @@ -473,14 +358,14 @@ namespace ExcelTest string tag056 = Tag056(); string[] grid_data = { CurrentISBN13, - CurrentBookName, - CurrentAuthor, - CurrentPublisher, - CurrentPrice, + "",//CurrentBookName, + "",// CurrentAuthor, + "",// CurrentPublisher, + "",// CurrentPrice, CurrentURL }; string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦"); - string Midx = CurrentMarcIdx; + string marcIDX = CurrentMarcIdx; // 필수태그 확인 if (!isMustTag(orimarc)) { @@ -490,73 +375,9 @@ namespace ExcelTest string SaveDate = CurrentSaveDate; string SaveUser = CurrentUser; - bool IsCoverDate = false; - - if (SaveDate != "") - { - // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인 - TimeSpan sp = spspsp(SaveDate, date); - IsCoverDate = IsCoverData(sp.Days, SaveUser); - } - + // true일 경우 INSERT, false일 경우 UPDATE - bool isNewData = Midx != "" ? false : true; - - //// If not my data, or no data (implied by Midx check but explicit check helps), force Insert (Copy) - //if (!IsMyData) - //{ - // string[] Insert_tbl = { - // "ISBN", "서명", "저자", "출판사", - // "가격", "marc", "비고1", "비고2", "url", - // "grade", "marc_chk", "user", "division", "008tag", - // "date", "compidx" }; - // string[] Insert_col = { - // grid_data[0], grid_data[1], grid_data[2], grid_data[3], - // grid_data[4], orimarc, etc1.Text, etc2.Text, grid_data[5], - // grade.ToString(), "1", mUserName, tag056, text008.Text, - // date, mCompidx }; - - // string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); - // PUB.log.Add("INSERT", string.Format("{0}({1}) : {2}", mUserName, mCompidx, Incmd)); - // db.DB_Send_CMD_reVoid(Incmd); - // isNewData = true; - //} - //else - //{ - // string[] Edit_tbl = { - // "compidx", "marc", "marc_chk", "marc1", "marc_chk1", "비고1", - // "비고2", "url", "division", "008tag", "date", - // "user", "grade" }; - // string[] Edit_col = { - // mCompidx, orimarc, "1", CurrentDBMarc , "0", etc1.Text, - // etc2.Text, grid_data[5], tag056, text008.Text, date, - // mUserName, grade.ToString() }; - // string[] Sear_tbl = { "idx", "compidx" }; - // string[] Sear_col = { Midx, mCompidx }; - // if (grid_data[0] == null || grid_data[0] == "") - // { - // MessageBox.Show("ISBN 데이터가 없습니다."); - // return; - // } - - // string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col); - // PUB.log.Add("Update", string.Format("{0}({1}) : {2}", mUserName, mCompidx, U_cmd.Replace("\r", " ").Replace("\n", " "))); - // db.DB_Send_CMD_reVoid(U_cmd); - // isNewData = false; - //} - - //if (isNewData) - //{ - // string MidxQuery = string.Format("SELECT `idx` FROM Marc WHERE isbn = {0} AND `compidx` = {1};", grid_data[0], mCompidx); - // PUB.log.Add("MarcInsert", string.Format("{0}({1}) : {2}", mUserName, mCompidx, MidxQuery)); - // Midx = db.DB_Send_CMD_Search(MidxQuery).Replace("|", ""); - // CurrentMarcIdx = Midx; // Update local - //} - - //string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND 'compidx' ={2};", - // Midx, CurrentListIdx, mCompidx); - //PUB.log.Add("MarcUpdate", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpdateListIndex)); - //db.DB_Send_CMD_reVoid(UpdateListIndex); + bool isNewData = marcIDX != "" ? false : true; // Raise Event to Update List_Book in Parent BookSaved?.Invoke(this, new BookSavedEventArgs @@ -566,15 +387,13 @@ namespace ExcelTest SaveDate = date, User = mUserName, DBMarc = orimarc, - MarcIdx = Midx, + MarcIdx = marcIDX, etc1 = etc1.Text, etc2 = etc2.Text, tag056 = tag056, text008 = text008.Text, griddata = grid_data }); - - } #region Save_Click_Sub @@ -967,17 +786,10 @@ namespace ExcelTest richTextBox1.Text = result; return true; } + /// - /// 데이터 임시저장 + /// 픽쳐박스 이미지 갱신 /// - void Save_data() - { - data_book[0] = CurrentISBN13; - data_book[1] = CurrentBookName; - data_book[2] = CurrentAuthor; - data_book[3] = CurrentPublisher; - data_book[4] = CurrentPrice; - } void input_picture() { try @@ -986,15 +798,6 @@ namespace ExcelTest string isbn3 = isbn.Substring(isbn.Length - 3, 3); string tFilePath = string.Format("https://contents.kyobobook.co.kr/sih/fit-in/458x0/pdt/{0}.jpg", isbn); pictureBox1.ImageLocation = tFilePath; - //pictureBox1.ImageLocation = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg"; - //string tFilePath = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg"; - //WebClient tWebClient = new WebClient(); - //byte[] tBuffer = tWebClient.DownloadData(tFilePath); - //Stream tStream = new MemoryStream(); - //tStream.Write(tBuffer,0, tBuffer.Length); - //pictureBox1.Image = Image.FromStream(tStream); - //Application.DoEvents(); - } catch { @@ -1347,6 +1150,10 @@ namespace ExcelTest richTextBox1.Text = richTextBox1.Text.Replace(data008, text); data008 = text; } + public void SetMarcString(string marcstr) + { + this.richTextBox1.Text = marcstr; + } #endregion private void Btn_Close_Click(object sender, EventArgs e) @@ -1365,6 +1172,9 @@ namespace ExcelTest public event EventHandler FillBlankClicked; + public event EventHandler PrevButton; + public event EventHandler NextButton; + private void FillTextBox_KeyDown(object sender, KeyEventArgs e) { TextBox tb = sender as TextBox; @@ -3330,5 +3140,15 @@ namespace ExcelTest { //this.groupBox5.Text = this.Size.ToString(); } + + private void btPrev_Click(object sender, EventArgs e) + { + PrevButton?.Invoke(this, EventArgs.Empty); + } + + private void btNext_Click(object sender, EventArgs e) + { + NextButton?.Invoke(this, EventArgs.Empty); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_FillBlank.cs b/unimarc/unimarc/마크/Marc_FillBlank.cs index b83518b..8f676e2 100644 --- a/unimarc/unimarc/마크/Marc_FillBlank.cs +++ b/unimarc/unimarc/마크/Marc_FillBlank.cs @@ -1,4 +1,5 @@ using ExcelTest; +using Org.BouncyCastle.Pkcs; using System; using System.Collections.Generic; using System.ComponentModel; @@ -69,7 +70,7 @@ namespace UniMarc private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e) { tb_URL.Text = webBrowser1.Url.AbsoluteUri; - + if (isAll) { if (tb_URL.Text.Contains("searchResultAllList")) @@ -181,7 +182,7 @@ namespace UniMarc } } - if(!isAll) + if (!isAll) richTextBox1.Text = SplitText(Text); else { @@ -243,16 +244,22 @@ namespace UniMarc private void btn_Move_Click(object sender, EventArgs e) { isAll = false; - marc.richTextBox1.Text = ""; - if (!tb_URL.Text.Contains("searchResultMarc")) { + if (!tb_URL.Text.Contains("searchResultMarc")) + { MessageBox.Show("코리스 마크가 있는곳으로 이동해주세요!"); return; } SearchResultMarc(); - string Text = richTextBox1.Text; - marc.richTextBox1.Text = MakeMarc(Text); + if (marc != null) + { + marc.richTextBox1.Text = MakeMarc(Text); + } + else if (mae != null) + { + mae.marcEditorControl1.SetMarcString(MakeMarc(Text)); + } } private void btn_AllMove_Click(object sender, EventArgs e) @@ -272,7 +279,8 @@ namespace UniMarc int idx = Convert.ToInt32(dataGridView1.Rows[a].Cells["List_idx"].Value.ToString()); string isbn = dataGridView1.Rows[a].Cells["ISBN13"].Value.ToString(); - if (isbn == "") { + if (isbn == "") + { dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Red; progressBar1.Value += 1; continue; @@ -293,7 +301,11 @@ namespace UniMarc else { dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Blue; - this.marc.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc)); + + if (this.marc != null) + this.marc.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc)); + else if (this.mae != null) + this.mae.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc)); } progressBar1.Value += 1; @@ -320,7 +332,7 @@ namespace UniMarc return result; } - + /// /// 지연시키는 함수 diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index 59d32f4..672ccc6 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -53,6 +53,7 @@ this.btn_Select_List = new System.Windows.Forms.Button(); this.chkBox_AllowDrop = new System.Windows.Forms.CheckBox(); this.panel3 = new System.Windows.Forms.Panel(); + this.cb_authorTypeE = new System.Windows.Forms.ComboBox(); this.cb_authorTypeK = new System.Windows.Forms.ComboBox(); this.cb_divType = new System.Windows.Forms.ComboBox(); this.cb_divNum = new System.Windows.Forms.ComboBox(); @@ -141,10 +142,10 @@ this.search_tag2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.printDocument1 = new System.Drawing.Printing.PrintDocument(); this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog(); - this.cb_authorTypeE = new System.Windows.Forms.ComboBox(); + this.chkEditorTest = new System.Windows.Forms.CheckBox(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.panel1.SuspendLayout(); this.panel4.SuspendLayout(); this.panel3.SuspendLayout(); @@ -333,6 +334,16 @@ this.panel3.Size = new System.Drawing.Size(566, 49); this.panel3.TabIndex = 7; // + // cb_authorTypeE + // + this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_authorTypeE.Enabled = false; + this.cb_authorTypeE.FormattingEnabled = true; + this.cb_authorTypeE.Location = new System.Drawing.Point(125, 26); + this.cb_authorTypeE.Name = "cb_authorTypeE"; + this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20); + this.cb_authorTypeE.TabIndex = 2; + // // cb_authorTypeK // this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -496,6 +507,7 @@ // // panel5 // + this.panel5.Controls.Add(this.chkEditorTest); this.panel5.Controls.Add(this.cbTag008_32); this.panel5.Controls.Add(this.btnTag008); this.panel5.Controls.Add(this.btnTag040); @@ -1246,15 +1258,6 @@ this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // - // toolStripButton1 - // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(59, 22); - this.toolStripButton1.Text = "delete"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); - // // printDocument1 // this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint); @@ -1270,15 +1273,28 @@ this.printPreviewDialog1.Name = "printPreviewDialog1"; this.printPreviewDialog1.Visible = false; // - // cb_authorTypeE + // chkEditorTest // - this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_authorTypeE.Enabled = false; - this.cb_authorTypeE.FormattingEnabled = true; - this.cb_authorTypeE.Location = new System.Drawing.Point(125, 26); - this.cb_authorTypeE.Name = "cb_authorTypeE"; - this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20); - this.cb_authorTypeE.TabIndex = 2; + this.chkEditorTest.BackColor = System.Drawing.SystemColors.Control; + this.chkEditorTest.Checked = true; + this.chkEditorTest.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkEditorTest.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.chkEditorTest.ForeColor = System.Drawing.Color.Blue; + this.chkEditorTest.Location = new System.Drawing.Point(596, 32); + this.chkEditorTest.Name = "chkEditorTest"; + this.chkEditorTest.Size = new System.Drawing.Size(106, 27); + this.chkEditorTest.TabIndex = 53; + this.chkEditorTest.Text = "Editor (OLD)"; + this.chkEditorTest.UseVisualStyleBackColor = false; + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(59, 22); + this.toolStripButton1.Text = "delete"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // // Marc_Plan // @@ -1424,5 +1440,6 @@ private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ComboBox cb_authorTypeE; + private System.Windows.Forms.CheckBox chkEditorTest; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index 554e8a1..221e90d 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -226,12 +226,22 @@ namespace WindowsFormsApp1.Mac cb_divType.Text, cb_divNum.Text }; - Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this); - me.row = row; - me.UserName = main.botUserLabel.Text; - me.Init(Marc); - me.SetSymbolType(symbol_Type); - me.Show(); + if (chkEditorTest.Checked) + { + Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this); + me.row = row; + me.UserName = main.botUserLabel.Text; + me.Init(Marc); + me.SetSymbolType(symbol_Type); + me.Show(); + } + else + { + UTIL.MsgE("test version"); + var f = new Marc_Plan_Sub_MarcEdit2("",""); + f.Show(); + } + } } @@ -559,7 +569,7 @@ namespace WindowsFormsApp1.Mac } if (totalerrmsg.isEmpty() == false) - UTIL.MsgI("경고 발생\n"+totalerrmsg); + UTIL.MsgI("경고 발생\n" + totalerrmsg); string FileName; SaveFileDialog saveFileDialog = new SaveFileDialog(); @@ -594,7 +604,7 @@ namespace WindowsFormsApp1.Mac Set_Macro sm = new Set_Macro(this, dataGridView1); sm.ViewMarcArray = Make_MarcArray(out string errmessage); sm.Show(); - if(errmessage.isEmpty() == false) + if (errmessage.isEmpty() == false) UTIL.MsgI("경고 발생\n" + errmessage); } private void btnTag040_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.Designer.cs new file mode 100644 index 0000000..d33cdc3 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.Designer.cs @@ -0,0 +1,69 @@ + +namespace UniMarc.마크 +{ + partial class Marc_Plan_Sub_MarcEdit2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.marcEditorControl1 = new ExcelTest.MarcEditorControl(); + this.SuspendLayout(); + // + // marcEditorControl1 + // + this.marcEditorControl1.BackColor = System.Drawing.Color.Gray; + this.marcEditorControl1.CurrentDBMarc = null; + this.marcEditorControl1.CurrentGrade = null; + this.marcEditorControl1.CurrentISBN13 = null; + this.marcEditorControl1.CurrentListIdx = null; + this.marcEditorControl1.CurrentMarcIdx = null; + this.marcEditorControl1.CurrentSaveDate = null; + this.marcEditorControl1.CurrentURL = null; + this.marcEditorControl1.CurrentUser = null; + this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.marcEditorControl1.Location = new System.Drawing.Point(0, 0); + this.marcEditorControl1.Name = "marcEditorControl1"; + this.marcEditorControl1.Size = new System.Drawing.Size(1337, 768); + this.marcEditorControl1.TabIndex = 1; + // + // Marc_Plan_Sub_MarcEdit2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1337, 768); + this.Controls.Add(this.marcEditorControl1); + this.Name = "Marc_Plan_Sub_MarcEdit2"; + this.Text = "마크편집"; + this.ResumeLayout(false); + + } + + #endregion + + public ExcelTest.MarcEditorControl marcEditorControl1; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs new file mode 100644 index 0000000..0665a06 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using WindowsFormsApp1; +using WindowsFormsApp1.Mac; +using ExcelTest; +using System.Drawing.Drawing2D; + +namespace UniMarc.마크 +{ + public partial class Marc_Plan_Sub_MarcEdit2 : Form + { + string idx; + public int row; + public string UserName = ""; + Marc_Plan mp; + Helper_DB db = new Helper_DB(); + String_Text st = new String_Text(); + Search_Infor si; + Help008Tag tag008 = new Help008Tag(); + public Marc_Plan_Sub_MarcEdit2(string isbn,string marcstring) + { + InitializeComponent(); + db.DBcon(); + } + + } +} diff --git a/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file