diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 7c2642c..5a97fd5 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/Main.Designer.cs b/unimarc/unimarc/Main.Designer.cs index 1206e4b..68e077e 100644 --- a/unimarc/unimarc/Main.Designer.cs +++ b/unimarc/unimarc/Main.Designer.cs @@ -397,8 +397,9 @@ this.불용어, this.작업지시서}); this.마크설정.Name = "마크설정"; - this.마크설정.Size = new System.Drawing.Size(142, 22); + this.마크설정.Size = new System.Drawing.Size(180, 22); this.마크설정.Text = "설정"; + this.마크설정.Visible = false; // // 단축키설정 // @@ -437,7 +438,7 @@ this.복본조사1, this.iSBN조회}); this.마크작업.Name = "마크작업"; - this.마크작업.Size = new System.Drawing.Size(142, 22); + this.마크작업.Size = new System.Drawing.Size(180, 22); this.마크작업.Text = "마크 작업"; // // 마크목록 @@ -481,7 +482,7 @@ this.마크반입, this.마크반출}); this.반입및반출.Name = "반입및반출"; - this.반입및반출.Size = new System.Drawing.Size(142, 22); + this.반입및반출.Size = new System.Drawing.Size(180, 22); this.반입및반출.Text = "반입 및 반출"; // // 마크반입 @@ -506,34 +507,36 @@ this.검수, this.저자기호}); this.부가기능.Name = "부가기능"; - this.부가기능.Size = new System.Drawing.Size(142, 22); + this.부가기능.Size = new System.Drawing.Size(180, 22); this.부가기능.Text = "부가기능"; // // 마크수집 // + this.마크수집.Enabled = false; this.마크수집.Name = "마크수집"; - this.마크수집.Size = new System.Drawing.Size(122, 22); + this.마크수집.Size = new System.Drawing.Size(180, 22); this.마크수집.Text = "마크수집"; this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click); // // 전집관리 // this.전집관리.Name = "전집관리"; - this.전집관리.Size = new System.Drawing.Size(122, 22); + this.전집관리.Size = new System.Drawing.Size(180, 22); this.전집관리.Text = "전집관리"; this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click); // // 검수 // + this.검수.Enabled = false; this.검수.Name = "검수"; - this.검수.Size = new System.Drawing.Size(122, 22); + this.검수.Size = new System.Drawing.Size(180, 22); this.검수.Text = "검수"; this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click); // // 저자기호 // this.저자기호.Name = "저자기호"; - this.저자기호.Size = new System.Drawing.Size(122, 22); + this.저자기호.Size = new System.Drawing.Size(180, 22); this.저자기호.Text = "저자기호"; this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click); // @@ -543,20 +546,20 @@ this.DLS조회, this.dLS복본조사}); this.DLS.Name = "DLS"; - this.DLS.Size = new System.Drawing.Size(142, 22); + this.DLS.Size = new System.Drawing.Size(180, 22); this.DLS.Text = "DLS"; // // DLS조회 // this.DLS조회.Name = "DLS조회"; - this.DLS조회.Size = new System.Drawing.Size(154, 22); + this.DLS조회.Size = new System.Drawing.Size(180, 22); this.DLS조회.Text = "DLS_조회/입력"; this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click); // // dLS복본조사 // this.dLS복본조사.Name = "dLS복본조사"; - this.dLS복본조사.Size = new System.Drawing.Size(154, 22); + this.dLS복본조사.Size = new System.Drawing.Size(180, 22); this.dLS복본조사.Text = "DLS 복본조사"; this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click); // @@ -567,27 +570,27 @@ this.마크통계, this.장비관리}); this.마크기타.Name = "마크기타"; - this.마크기타.Size = new System.Drawing.Size(142, 22); + this.마크기타.Size = new System.Drawing.Size(180, 22); this.마크기타.Text = "기타"; // // 서류작성 // this.서류작성.Name = "서류작성"; - this.서류작성.Size = new System.Drawing.Size(122, 22); + this.서류작성.Size = new System.Drawing.Size(180, 22); this.서류작성.Text = "서류작성"; this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click); // // 마크통계 // this.마크통계.Name = "마크통계"; - this.마크통계.Size = new System.Drawing.Size(122, 22); + this.마크통계.Size = new System.Drawing.Size(180, 22); this.마크통계.Text = "마크통계"; this.마크통계.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click); // // 장비관리 // this.장비관리.Name = "장비관리"; - this.장비관리.Size = new System.Drawing.Size(122, 22); + this.장비관리.Size = new System.Drawing.Size(180, 22); this.장비관리.Text = "장비관리"; this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click); // @@ -622,8 +625,9 @@ // 채팅 // this.채팅.Name = "채팅"; - this.채팅.Size = new System.Drawing.Size(122, 22); + this.채팅.Size = new System.Drawing.Size(180, 22); this.채팅.Text = "채팅"; + this.채팅.Visible = false; this.채팅.Click += new System.EventHandler(this.채팅ToolStripMenuItem_Click); // // 퀵메뉴 @@ -636,15 +640,17 @@ // 게시판 // this.게시판.Name = "게시판"; - this.게시판.Size = new System.Drawing.Size(122, 22); + this.게시판.Size = new System.Drawing.Size(180, 22); this.게시판.Text = "게시판"; + this.게시판.Visible = false; this.게시판.Click += new System.EventHandler(this.게시판ToolStripMenuItem_Click); // // 공지발송 // this.공지발송.Name = "공지발송"; - this.공지발송.Size = new System.Drawing.Size(122, 22); + this.공지발송.Size = new System.Drawing.Size(180, 22); this.공지발송.Text = "공지발송"; + this.공지발송.Visible = false; this.공지발송.Click += new System.EventHandler(this.공지발송ToolStripMenuItem_Click); // // 판매 @@ -655,8 +661,9 @@ this.판매마감, this.회원관리}); this.판매.Name = "판매"; - this.판매.Size = new System.Drawing.Size(122, 22); + this.판매.Size = new System.Drawing.Size(180, 22); this.판매.Text = "판매"; + this.판매.Visible = false; // // 판매1 // diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 38ae77e..9ddcf61 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 353cfdf..e427d59 100644 Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll index b1dc4f6..32d85e1 100644 Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index f709921..f0628ae 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 38ae77e..9ddcf61 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb index 353cfdf..e427d59 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index b1dc4f6..32d85e1 100644 Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 9c4526f..cf52d1e 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -240,7 +240,6 @@ namespace ExcelTest DateTime TargetDate = DateTime.Today.AddDays(-14); int result = DateTime.Compare(SaveDate, TargetDate); - if (result >= 0) // SaveDate가 같거나 큼 List_Book.Rows[row].DefaultCellStyle.BackColor = Color.Yellow; @@ -598,7 +597,24 @@ namespace ExcelTest return; } - if (List_Book.Rows[row_idx].DefaultCellStyle.ForeColor != Color.Orange) + if (List_Book.Rows[row_idx].DefaultCellStyle.ForeColor == Color.Orange || + List_Book.Rows[row_idx].DefaultCellStyle.ForeColor == Color.Red) + { + 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", user_name, tag056, text008.Text, + date, compidx }; + + string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); + db.DB_Send_CMD_reVoid(Incmd); + } + else { string[] Edit_tbl = { "compidx", "marc", "marc_chk", "marc_chk1", "비고1", @@ -636,22 +652,6 @@ namespace ExcelTest string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col); db.DB_Send_CMD_reVoid(U_cmd); } - else - { - 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", user_name, tag056, text008.Text, - date, compidx }; - - string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col); - db.DB_Send_CMD_reVoid(Incmd); - } List_Book.Rows[row_idx].Cells["grade"].Value = grade.ToString(); List_Book.Rows[row_idx].Cells["SaveDate"].Value = date; @@ -1171,8 +1171,7 @@ namespace ExcelTest { string Result = ""; - ContentTag = ContentTag.Replace("[", ""); - ContentTag = ContentTag.Replace("]", ""); + ContentTag = ContentTag.Replace("[", "").Replace("]", "").Trim(); // string cmd = db.DB_Select_Search("`Code`", "Tag008_Country", "Area", ContentTag); string cmd = string.Format( @@ -3430,5 +3429,11 @@ namespace ExcelTest List_Book.Sort(list_idx, System.ComponentModel.ListSortDirection.Ascending); } + + private void List_Book_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 0031c01..ede56b9 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -29,10 +29,10 @@ private void InitializeComponent() { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc)); - 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(); @@ -40,6 +40,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.etc1 = new System.Windows.Forms.RichTextBox(); this.etc2 = new System.Windows.Forms.RichTextBox(); @@ -299,7 +300,7 @@ // this.etc1.BackColor = System.Drawing.SystemColors.ScrollBar; 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(1470, 348); + this.etc1.Location = new System.Drawing.Point(1512, 348); this.etc1.Name = "etc1"; this.etc1.Size = new System.Drawing.Size(287, 187); this.etc1.TabIndex = 32; @@ -310,7 +311,7 @@ // this.etc2.BackColor = System.Drawing.SystemColors.ScrollBar; 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(1470, 541); + this.etc2.Location = new System.Drawing.Point(1512, 541); this.etc2.Name = "etc2"; this.etc2.Size = new System.Drawing.Size(287, 184); this.etc2.TabIndex = 32; @@ -320,7 +321,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(891, 11); + this.label1.Location = new System.Drawing.Point(933, 11); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(53, 12); this.label1.TabIndex = 14; @@ -329,7 +330,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(1060, 11); + this.label2.Location = new System.Drawing.Point(1102, 11); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(41, 12); this.label2.TabIndex = 206; @@ -339,7 +340,7 @@ // this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(1101, 7); + this.comboBox1.Location = new System.Drawing.Point(1143, 7); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(79, 20); this.comboBox1.TabIndex = 207; @@ -349,7 +350,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(1191, 11); + this.label3.Location = new System.Drawing.Point(1233, 11); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(53, 12); this.label3.TabIndex = 206; @@ -359,7 +360,7 @@ // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(1245, 7); + this.comboBox2.Location = new System.Drawing.Point(1287, 7); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(79, 20); this.comboBox2.TabIndex = 207; @@ -369,7 +370,7 @@ // label98 // this.label98.AutoSize = true; - this.label98.Location = new System.Drawing.Point(1332, 11); + this.label98.Location = new System.Drawing.Point(1374, 11); this.label98.Name = "label98"; this.label98.Size = new System.Drawing.Size(53, 12); this.label98.TabIndex = 14; @@ -379,7 +380,7 @@ // this.comboBox3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(1386, 7); + this.comboBox3.Location = new System.Drawing.Point(1428, 7); this.comboBox3.Name = "comboBox3"; this.comboBox3.Size = new System.Drawing.Size(118, 20); this.comboBox3.TabIndex = 207; @@ -389,7 +390,7 @@ // label99 // this.label99.AutoSize = true; - this.label99.Location = new System.Drawing.Point(1633, 11); + this.label99.Location = new System.Drawing.Point(1675, 11); this.label99.Name = "label99"; this.label99.Size = new System.Drawing.Size(29, 12); this.label99.TabIndex = 206; @@ -398,7 +399,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(1662, 7); + this.text008col.Location = new System.Drawing.Point(1704, 7); this.text008col.Name = "text008col"; this.text008col.Size = new System.Drawing.Size(41, 21); this.text008col.TabIndex = 204; @@ -407,7 +408,7 @@ // label100 // this.label100.AutoSize = true; - this.label100.Location = new System.Drawing.Point(1191, 33); + this.label100.Location = new System.Drawing.Point(1233, 33); this.label100.Name = "label100"; this.label100.Size = new System.Drawing.Size(53, 12); this.label100.TabIndex = 206; @@ -417,7 +418,7 @@ // this.comboBox4.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(1245, 29); + this.comboBox4.Location = new System.Drawing.Point(1287, 29); this.comboBox4.Name = "comboBox4"; this.comboBox4.Size = new System.Drawing.Size(79, 20); this.comboBox4.TabIndex = 207; @@ -427,7 +428,7 @@ // label101 // this.label101.AutoSize = true; - this.label101.Location = new System.Drawing.Point(1356, 33); + this.label101.Location = new System.Drawing.Point(1398, 33); this.label101.Name = "label101"; this.label101.Size = new System.Drawing.Size(29, 12); this.label101.TabIndex = 206; @@ -437,7 +438,7 @@ // this.comboBox5.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(1386, 29); + this.comboBox5.Location = new System.Drawing.Point(1428, 29); this.comboBox5.Name = "comboBox5"; this.comboBox5.Size = new System.Drawing.Size(97, 20); this.comboBox5.TabIndex = 207; @@ -447,7 +448,7 @@ // label102 // this.label102.AutoSize = true; - this.label102.Location = new System.Drawing.Point(1496, 33); + this.label102.Location = new System.Drawing.Point(1538, 33); this.label102.Name = "label102"; this.label102.Size = new System.Drawing.Size(29, 12); this.label102.TabIndex = 206; @@ -457,7 +458,7 @@ // this.comboBox6.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(1526, 29); + this.comboBox6.Location = new System.Drawing.Point(1568, 29); this.comboBox6.Name = "comboBox6"; this.comboBox6.Size = new System.Drawing.Size(97, 20); this.comboBox6.TabIndex = 207; @@ -467,7 +468,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(1662, 29); + this.text008gov.Location = new System.Drawing.Point(1704, 29); this.text008gov.Name = "text008gov"; this.text008gov.Size = new System.Drawing.Size(41, 21); this.text008gov.TabIndex = 204; @@ -476,7 +477,7 @@ // label103 // this.label103.AutoSize = true; - this.label103.Location = new System.Drawing.Point(1633, 33); + this.label103.Location = new System.Drawing.Point(1675, 33); this.label103.Name = "label103"; this.label103.Size = new System.Drawing.Size(29, 12); this.label103.TabIndex = 206; @@ -487,7 +488,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(1705, 11); + this.col008res.Location = new System.Drawing.Point(1747, 11); this.col008res.Name = "col008res"; this.col008res.Size = new System.Drawing.Size(13, 12); this.col008res.TabIndex = 206; @@ -499,7 +500,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(1705, 33); + this.gov008res.Location = new System.Drawing.Point(1747, 33); this.gov008res.Name = "gov008res"; this.gov008res.Size = new System.Drawing.Size(13, 12); this.gov008res.TabIndex = 206; @@ -509,7 +510,7 @@ // checkBox1 // this.checkBox1.AutoSize = true; - this.checkBox1.Location = new System.Drawing.Point(889, 31); + this.checkBox1.Location = new System.Drawing.Point(931, 31); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(112, 16); this.checkBox1.TabIndex = 213; @@ -520,7 +521,7 @@ // checkBox2 // this.checkBox2.AutoSize = true; - this.checkBox2.Location = new System.Drawing.Point(1017, 31); + this.checkBox2.Location = new System.Drawing.Point(1059, 31); this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(112, 16); this.checkBox2.TabIndex = 213; @@ -532,7 +533,7 @@ // this.comboBox7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox7.FormattingEnabled = true; - this.comboBox7.Location = new System.Drawing.Point(1505, 7); + this.comboBox7.Location = new System.Drawing.Point(1547, 7); this.comboBox7.Name = "comboBox7"; this.comboBox7.Size = new System.Drawing.Size(118, 20); this.comboBox7.TabIndex = 207; @@ -541,7 +542,7 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(1470, 158); + this.Btn_Memo.Location = new System.Drawing.Point(1512, 158); this.Btn_Memo.Name = "Btn_Memo"; this.Btn_Memo.Size = new System.Drawing.Size(77, 23); this.Btn_Memo.TabIndex = 215; @@ -584,13 +585,20 @@ this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; - this.List_Book.RowHeadersVisible = false; - this.List_Book.RowHeadersWidth = 10; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark; + dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.List_Book.Size = new System.Drawing.Size(502, 822); + this.List_Book.Size = new System.Drawing.Size(543, 822); this.List_Book.TabIndex = 217; this.List_Book.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellClick); + this.List_Book.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.List_Book_RowPostPaint); this.List_Book.DragDrop += new System.Windows.Forms.DragEventHandler(this.List_Book_DragDrop); this.List_Book.DragOver += new System.Windows.Forms.DragEventHandler(this.List_Book_DragOver); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.List_Book_KeyDown); @@ -718,7 +726,7 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(1470, 186); + this.btn_Save.Location = new System.Drawing.Point(1512, 186); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(77, 23); this.btn_Save.TabIndex = 215; @@ -752,7 +760,7 @@ this.panel3.Controls.Add(this.btn_Reflesh008); this.panel3.Controls.Add(this.text008); this.panel3.Controls.Add(this.label4); - this.panel3.Location = new System.Drawing.Point(519, 13); + this.panel3.Location = new System.Drawing.Point(561, 13); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(364, 30); this.panel3.TabIndex = 219; @@ -772,7 +780,7 @@ // // btn_close // - this.btn_close.Location = new System.Drawing.Point(1470, 244); + this.btn_close.Location = new System.Drawing.Point(1512, 244); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(77, 23); this.btn_close.TabIndex = 215; @@ -787,7 +795,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(950, 7); + this.input_date.Location = new System.Drawing.Point(992, 7); this.input_date.Name = "input_date"; this.input_date.ShowCheckBox = true; this.input_date.Size = new System.Drawing.Size(101, 21); @@ -798,7 +806,7 @@ // this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.pictureBox1.Location = new System.Drawing.Point(1549, 53); + this.pictureBox1.Location = new System.Drawing.Point(1591, 53); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(208, 289); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -808,7 +816,7 @@ // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(1470, 215); + this.btn_preview.Location = new System.Drawing.Point(1512, 215); this.btn_preview.Name = "btn_preview"; this.btn_preview.Size = new System.Drawing.Size(77, 23); this.btn_preview.TabIndex = 215; @@ -825,7 +833,7 @@ "B", "C", "D"}); - this.cb_grade.Location = new System.Drawing.Point(1471, 93); + this.cb_grade.Location = new System.Drawing.Point(1513, 93); this.cb_grade.Name = "cb_grade"; this.cb_grade.Size = new System.Drawing.Size(75, 20); this.cb_grade.TabIndex = 222; @@ -834,7 +842,7 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.label6.Location = new System.Drawing.Point(1477, 79); + this.label6.Location = new System.Drawing.Point(1519, 79); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(62, 12); this.label6.TabIndex = 223; @@ -957,7 +965,7 @@ this.checkBox3.BackColor = System.Drawing.Color.White; this.checkBox3.Checked = true; this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox3.Location = new System.Drawing.Point(475, 82); + this.checkBox3.Location = new System.Drawing.Point(516, 82); this.checkBox3.Name = "checkBox3"; this.checkBox3.Size = new System.Drawing.Size(15, 14); this.checkBox3.TabIndex = 227; @@ -966,7 +974,7 @@ // // btn_FillBlank // - this.btn_FillBlank.Location = new System.Drawing.Point(1470, 119); + this.btn_FillBlank.Location = new System.Drawing.Point(1512, 119); this.btn_FillBlank.Name = "btn_FillBlank"; this.btn_FillBlank.Size = new System.Drawing.Size(77, 33); this.btn_FillBlank.TabIndex = 228; @@ -978,7 +986,7 @@ // this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Location = new System.Drawing.Point(520, 57); + this.tabControl1.Location = new System.Drawing.Point(562, 57); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; @@ -1098,8 +1106,8 @@ this.GridView020.Name = "GridView020"; this.GridView020.RowHeadersVisible = false; this.GridView020.RowHeadersWidth = 30; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView020.RowsDefaultCellStyle = dataGridViewCellStyle5; this.GridView020.RowTemplate.Height = 23; this.GridView020.Size = new System.Drawing.Size(408, 80); this.GridView020.TabIndex = 244; @@ -1166,8 +1174,8 @@ this.GridView505.Name = "GridView505"; this.GridView505.RowHeadersVisible = false; this.GridView505.RowHeadersWidth = 30; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView505.RowsDefaultCellStyle = dataGridViewCellStyle6; this.GridView505.RowTemplate.Height = 23; this.GridView505.Size = new System.Drawing.Size(401, 71); this.GridView505.TabIndex = 246; @@ -1299,14 +1307,14 @@ this.GridView246.AllowDrop = true; this.GridView246.AllowUserToAddRows = false; this.GridView246.AllowUserToResizeRows = false; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, 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.GridView246.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.GridView246.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Text246Jisi, this.Text246i, @@ -1318,8 +1326,8 @@ this.GridView246.Name = "GridView246"; this.GridView246.RowHeadersVisible = false; this.GridView246.RowHeadersWidth = 30; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView246.RowsDefaultCellStyle = dataGridViewCellStyle8; this.GridView246.RowTemplate.Height = 23; this.GridView246.Size = new System.Drawing.Size(493, 138); this.GridView246.TabIndex = 250; @@ -1469,14 +1477,14 @@ this.GridView440.AllowDrop = true; this.GridView440.AllowUserToAddRows = false; this.GridView440.AllowUserToResizeRows = false; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView440.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.GridView440.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView440.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text440a, @@ -1489,8 +1497,8 @@ this.GridView440.Name = "GridView440"; this.GridView440.RowHeadersVisible = false; this.GridView440.RowHeadersWidth = 30; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView440.RowsDefaultCellStyle = dataGridViewCellStyle10; this.GridView440.RowTemplate.Height = 23; this.GridView440.Size = new System.Drawing.Size(597, 71); this.GridView440.TabIndex = 245; @@ -1589,14 +1597,14 @@ this.GridView490.AllowDrop = true; this.GridView490.AllowUserToAddRows = false; this.GridView490.AllowUserToResizeRows = false; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.GridView490.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.GridView490.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.GridView490.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.text490a, @@ -1605,8 +1613,8 @@ this.GridView490.Name = "GridView490"; this.GridView490.RowHeadersVisible = false; this.GridView490.RowHeadersWidth = 30; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.GridView490.RowsDefaultCellStyle = dataGridViewCellStyle12; this.GridView490.RowTemplate.Height = 23; this.GridView490.Size = new System.Drawing.Size(321, 71); this.GridView490.TabIndex = 247; @@ -2480,7 +2488,7 @@ this.tag, this.jisi, this.MarcValue}); - this.dataGridView1.Location = new System.Drawing.Point(1470, 731); + this.dataGridView1.Location = new System.Drawing.Point(1512, 731); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; @@ -2516,7 +2524,7 @@ this.lbl_SaveData.AutoSize = true; this.lbl_SaveData.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbl_SaveData.ForeColor = System.Drawing.Color.PaleTurquoise; - this.lbl_SaveData.Location = new System.Drawing.Point(848, 53); + this.lbl_SaveData.Location = new System.Drawing.Point(890, 53); this.lbl_SaveData.Name = "lbl_SaveData"; this.lbl_SaveData.Size = new System.Drawing.Size(64, 19); this.lbl_SaveData.TabIndex = 318; @@ -2526,7 +2534,7 @@ // this.lbl_ISBN.AutoSize = true; this.lbl_ISBN.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbl_ISBN.Location = new System.Drawing.Point(680, 53); + this.lbl_ISBN.Location = new System.Drawing.Point(722, 53); this.lbl_ISBN.Name = "lbl_ISBN"; this.lbl_ISBN.Size = new System.Drawing.Size(31, 19); this.lbl_ISBN.TabIndex = 33; diff --git a/unimarc/unimarc/마크/Marc_FillBlank.cs b/unimarc/unimarc/마크/Marc_FillBlank.cs index 91408b1..7950da1 100644 --- a/unimarc/unimarc/마크/Marc_FillBlank.cs +++ b/unimarc/unimarc/마크/Marc_FillBlank.cs @@ -166,6 +166,7 @@ namespace UniMarc { string[] Tag = Line[a].Split('\t'); int Length = Tag.Length; + if (Tag[0].StartsWith("00")) continue; result += Tag[Length - 3] + "\t" + Tag[Length - 2] + "\t" + Tag[Length - 1] + "\n"; } diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index cb9f14c..d7ded69 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -106,6 +106,8 @@ this.cb_gubun1 = new System.Windows.Forms.ComboBox(); this.btn_marc_expand = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); this.cb_dlsArea = new System.Windows.Forms.ComboBox(); this.label18 = new System.Windows.Forms.Label(); this.marcGrid = new System.Windows.Forms.DataGridView(); @@ -121,15 +123,13 @@ this.tb_marcEmpty = new System.Windows.Forms.Button(); this.tb_gearEmpty = new System.Windows.Forms.Button(); this.tb_marcSave = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel1.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).BeginInit(); - this.panel2.SuspendLayout(); - this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); this.SuspendLayout(); // @@ -731,7 +731,7 @@ this.btn_marc_expand.Name = "btn_marc_expand"; this.btn_marc_expand.Size = new System.Drawing.Size(75, 74); this.btn_marc_expand.TabIndex = 46; - this.btn_marc_expand.Text = "마크 확장 >>"; + this.btn_marc_expand.Text = "마크 비고 >>"; this.btn_marc_expand.UseVisualStyleBackColor = true; this.btn_marc_expand.Click += new System.EventHandler(this.btn_marc_expand_Click); // @@ -746,6 +746,71 @@ this.panel1.Size = new System.Drawing.Size(969, 675); this.panel1.TabIndex = 47; // + // panel3 + // + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 367); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(967, 306); + this.panel3.TabIndex = 49; + // + // panel2 + // + this.panel2.Controls.Add(this.NameLabel); + this.panel2.Controls.Add(this.cb_dlsArea); + this.panel2.Controls.Add(this.btn_add); + this.panel2.Controls.Add(this.label14); + this.panel2.Controls.Add(this.tb_sangho); + this.panel2.Controls.Add(this.btn_save); + this.panel2.Controls.Add(this.btn_marc_expand); + this.panel2.Controls.Add(this.label5); + this.panel2.Controls.Add(this.label1); + this.panel2.Controls.Add(this.btn_edit); + this.panel2.Controls.Add(this.cb_gubun1); + this.panel2.Controls.Add(this.label13); + this.panel2.Controls.Add(this.label2); + this.panel2.Controls.Add(this.btn_delete); + this.panel2.Controls.Add(this.btn_close); + this.panel2.Controls.Add(this.label12); + this.panel2.Controls.Add(this.cb_gubun2); + this.panel2.Controls.Add(this.tb_tel); + this.panel2.Controls.Add(this.label17); + this.panel2.Controls.Add(this.tb_bubin); + this.panel2.Controls.Add(this.rtb_etc); + this.panel2.Controls.Add(this.label18); + this.panel2.Controls.Add(this.label10); + this.panel2.Controls.Add(this.label3); + this.panel2.Controls.Add(this.label16); + this.panel2.Controls.Add(this.tb_jongmok); + this.panel2.Controls.Add(this.btn_search); + this.panel2.Controls.Add(this.tb_addr); + this.panel2.Controls.Add(this.label11); + this.panel2.Controls.Add(this.tb_uptae); + this.panel2.Controls.Add(this.tb_id); + this.panel2.Controls.Add(this.label4); + this.panel2.Controls.Add(this.label8); + this.panel2.Controls.Add(this.tb_user); + this.panel2.Controls.Add(this.tb_division); + this.panel2.Controls.Add(this.tb_man); + this.panel2.Controls.Add(this.label15); + this.panel2.Controls.Add(this.tb_mail); + this.panel2.Controls.Add(this.tb_pw); + this.panel2.Controls.Add(this.tb_man1); + this.panel2.Controls.Add(this.label9); + this.panel2.Controls.Add(this.tb_boss); + this.panel2.Controls.Add(this.tb_label); + this.panel2.Controls.Add(this.label6); + this.panel2.Controls.Add(this.label7); + this.panel2.Controls.Add(this.tb_zip); + this.panel2.Controls.Add(this.tb_program); + this.panel2.Controls.Add(this.tb_fax); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(967, 367); + this.panel2.TabIndex = 48; + // // cb_dlsArea // this.cb_dlsArea.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -911,71 +976,6 @@ this.tb_marcSave.UseVisualStyleBackColor = true; this.tb_marcSave.Click += new System.EventHandler(this.tb_marcSave_Click); // - // panel2 - // - this.panel2.Controls.Add(this.NameLabel); - this.panel2.Controls.Add(this.cb_dlsArea); - this.panel2.Controls.Add(this.btn_add); - this.panel2.Controls.Add(this.label14); - this.panel2.Controls.Add(this.tb_sangho); - this.panel2.Controls.Add(this.btn_save); - this.panel2.Controls.Add(this.btn_marc_expand); - this.panel2.Controls.Add(this.label5); - this.panel2.Controls.Add(this.label1); - this.panel2.Controls.Add(this.btn_edit); - this.panel2.Controls.Add(this.cb_gubun1); - this.panel2.Controls.Add(this.label13); - this.panel2.Controls.Add(this.label2); - this.panel2.Controls.Add(this.btn_delete); - this.panel2.Controls.Add(this.btn_close); - this.panel2.Controls.Add(this.label12); - this.panel2.Controls.Add(this.cb_gubun2); - this.panel2.Controls.Add(this.tb_tel); - this.panel2.Controls.Add(this.label17); - this.panel2.Controls.Add(this.tb_bubin); - this.panel2.Controls.Add(this.rtb_etc); - this.panel2.Controls.Add(this.label18); - this.panel2.Controls.Add(this.label10); - this.panel2.Controls.Add(this.label3); - this.panel2.Controls.Add(this.label16); - this.panel2.Controls.Add(this.tb_jongmok); - this.panel2.Controls.Add(this.btn_search); - this.panel2.Controls.Add(this.tb_addr); - this.panel2.Controls.Add(this.label11); - this.panel2.Controls.Add(this.tb_uptae); - this.panel2.Controls.Add(this.tb_id); - this.panel2.Controls.Add(this.label4); - this.panel2.Controls.Add(this.label8); - this.panel2.Controls.Add(this.tb_user); - this.panel2.Controls.Add(this.tb_division); - this.panel2.Controls.Add(this.tb_man); - this.panel2.Controls.Add(this.label15); - this.panel2.Controls.Add(this.tb_mail); - this.panel2.Controls.Add(this.tb_pw); - this.panel2.Controls.Add(this.tb_man1); - this.panel2.Controls.Add(this.label9); - this.panel2.Controls.Add(this.tb_boss); - this.panel2.Controls.Add(this.tb_label); - this.panel2.Controls.Add(this.label6); - this.panel2.Controls.Add(this.label7); - this.panel2.Controls.Add(this.tb_zip); - this.panel2.Controls.Add(this.tb_program); - this.panel2.Controls.Add(this.tb_fax); - this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(967, 367); - this.panel2.TabIndex = 48; - // - // panel3 - // - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 367); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(967, 306); - this.panel3.TabIndex = 49; - // // panel4 // this.panel4.Controls.Add(this.marcLabel); @@ -1003,11 +1003,11 @@ this.Load += new System.EventHandler(this.Transaction_manage_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); this.panel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).EndInit(); + this.panel3.ResumeLayout(false); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.marcGrid)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gearGrid)).EndInit(); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); this.ResumeLayout(false); diff --git a/unimarc/unimarc/홈/Transaction_manage.cs b/unimarc/unimarc/홈/Transaction_manage.cs index a853ee0..6142de8 100644 --- a/unimarc/unimarc/홈/Transaction_manage.cs +++ b/unimarc/unimarc/홈/Transaction_manage.cs @@ -397,12 +397,12 @@ namespace WindowsFormsApp1.Home if (!panel4.Visible) { - btn_marc_expand.Text = "마크 확장 >>"; + btn_marc_expand.Text = "마크 비고 >>"; panel4.Visible = true; } else { - btn_marc_expand.Text = "마크 확장 <<"; + btn_marc_expand.Text = "마크 비고 <<"; panel4.Visible = false; }