diff --git a/unimarc/unimarc/UniMarc.csproj.user b/unimarc/unimarc/UniMarc.csproj.user index f0d6d75..a66c462 100644 --- a/unimarc/unimarc/UniMarc.csproj.user +++ b/unimarc/unimarc/UniMarc.csproj.user @@ -9,7 +9,7 @@ ko-KR false - ShowAllFiles + ProjectFiles false diff --git a/unimarc/unimarc/마크/Mac_List.Designer.cs b/unimarc/unimarc/마크/Mac_List.Designer.cs index a923a7c..4f9f36c 100644 --- a/unimarc/unimarc/마크/Mac_List.Designer.cs +++ b/unimarc/unimarc/마크/Mac_List.Designer.cs @@ -82,9 +82,9 @@ // label1 // this.label1.Dock = System.Windows.Forms.DockStyle.Left; - this.label1.Location = new System.Drawing.Point(0, 6); + this.label1.Location = new System.Drawing.Point(0, 5); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(72, 34); + this.label1.Size = new System.Drawing.Size(63, 27); this.label1.TabIndex = 5; this.label1.Text = "목록 검색"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -93,10 +93,9 @@ // this.tb_Search.Dock = System.Windows.Forms.DockStyle.Left; this.tb_Search.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tb_Search.Location = new System.Drawing.Point(72, 6); - this.tb_Search.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tb_Search.Location = new System.Drawing.Point(63, 5); this.tb_Search.Name = "tb_Search"; - this.tb_Search.Size = new System.Drawing.Size(307, 25); + this.tb_Search.Size = new System.Drawing.Size(269, 25); this.tb_Search.TabIndex = 6; this.tb_Search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_Search_KeyDown); // @@ -141,13 +140,12 @@ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); - this.dataGridView1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 40; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView1.Size = new System.Drawing.Size(1872, 780); + this.dataGridView1.Size = new System.Drawing.Size(1638, 624); this.dataGridView1.TabIndex = 48; this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); @@ -261,18 +259,17 @@ this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_state.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cb_state.FormattingEnabled = true; - this.cb_state.Location = new System.Drawing.Point(416, 6); - this.cb_state.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.cb_state.Location = new System.Drawing.Point(364, 5); this.cb_state.Name = "cb_state"; - this.cb_state.Size = new System.Drawing.Size(114, 25); + this.cb_state.Size = new System.Drawing.Size(100, 25); this.cb_state.TabIndex = 49; // // label2 // this.label2.Dock = System.Windows.Forms.DockStyle.Left; - this.label2.Location = new System.Drawing.Point(379, 6); + this.label2.Location = new System.Drawing.Point(332, 5); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(37, 34); + this.label2.Size = new System.Drawing.Size(32, 27); this.label2.TabIndex = 5; this.label2.Text = "상태"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -280,10 +277,10 @@ // btn_Lookup // this.btn_Lookup.Dock = System.Windows.Forms.DockStyle.Left; - this.btn_Lookup.Location = new System.Drawing.Point(654, 6); + this.btn_Lookup.Location = new System.Drawing.Point(586, 5); this.btn_Lookup.Margin = new System.Windows.Forms.Padding(1); this.btn_Lookup.Name = "btn_Lookup"; - this.btn_Lookup.Size = new System.Drawing.Size(70, 34); + this.btn_Lookup.Size = new System.Drawing.Size(61, 27); this.btn_Lookup.TabIndex = 50; this.btn_Lookup.Text = "조 회"; this.btn_Lookup.UseVisualStyleBackColor = true; @@ -292,10 +289,10 @@ // btn_Excel // this.btn_Excel.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Excel.Location = new System.Drawing.Point(1693, 6); + this.btn_Excel.Location = new System.Drawing.Point(1482, 5); this.btn_Excel.Margin = new System.Windows.Forms.Padding(1); this.btn_Excel.Name = "btn_Excel"; - this.btn_Excel.Size = new System.Drawing.Size(85, 34); + this.btn_Excel.Size = new System.Drawing.Size(74, 27); this.btn_Excel.TabIndex = 50; this.btn_Excel.Text = "엑셀반출"; this.btn_Excel.UseVisualStyleBackColor = true; @@ -304,10 +301,10 @@ // btn_Close // this.btn_Close.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Close.Location = new System.Drawing.Point(1787, 6); + this.btn_Close.Location = new System.Drawing.Point(1564, 5); this.btn_Close.Margin = new System.Windows.Forms.Padding(1); this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(85, 34); + this.btn_Close.Size = new System.Drawing.Size(74, 27); this.btn_Close.TabIndex = 50; this.btn_Close.Text = "닫 기"; this.btn_Close.UseVisualStyleBackColor = true; @@ -316,10 +313,10 @@ // btn_Save // this.btn_Save.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Save.Location = new System.Drawing.Point(1574, 6); + this.btn_Save.Location = new System.Drawing.Point(1378, 5); this.btn_Save.Margin = new System.Windows.Forms.Padding(1); this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(110, 34); + this.btn_Save.Size = new System.Drawing.Size(96, 27); this.btn_Save.TabIndex = 50; this.btn_Save.Text = "체크사항저장"; this.btn_Save.UseVisualStyleBackColor = true; @@ -328,10 +325,10 @@ // btn_Merge // this.btn_Merge.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Merge.Location = new System.Drawing.Point(1198, 6); + this.btn_Merge.Location = new System.Drawing.Point(1050, 5); this.btn_Merge.Margin = new System.Windows.Forms.Padding(1); this.btn_Merge.Name = "btn_Merge"; - this.btn_Merge.Size = new System.Drawing.Size(85, 34); + this.btn_Merge.Size = new System.Drawing.Size(74, 27); this.btn_Merge.TabIndex = 51; this.btn_Merge.Text = "목록병합"; this.btn_Merge.UseVisualStyleBackColor = true; @@ -340,10 +337,10 @@ // btn_Progress // this.btn_Progress.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Progress.Location = new System.Drawing.Point(1292, 6); + this.btn_Progress.Location = new System.Drawing.Point(1132, 5); this.btn_Progress.Margin = new System.Windows.Forms.Padding(1); this.btn_Progress.Name = "btn_Progress"; - this.btn_Progress.Size = new System.Drawing.Size(85, 34); + this.btn_Progress.Size = new System.Drawing.Size(74, 27); this.btn_Progress.TabIndex = 51; this.btn_Progress.Text = "진행처리"; this.btn_Progress.UseVisualStyleBackColor = true; @@ -352,10 +349,10 @@ // btn_Completion // this.btn_Completion.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Completion.Location = new System.Drawing.Point(1386, 6); + this.btn_Completion.Location = new System.Drawing.Point(1214, 5); this.btn_Completion.Margin = new System.Windows.Forms.Padding(1); this.btn_Completion.Name = "btn_Completion"; - this.btn_Completion.Size = new System.Drawing.Size(85, 34); + this.btn_Completion.Size = new System.Drawing.Size(74, 27); this.btn_Completion.TabIndex = 51; this.btn_Completion.Text = "완료처리"; this.btn_Completion.UseVisualStyleBackColor = true; @@ -364,10 +361,10 @@ // btn_Delete // this.btn_Delete.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_Delete.Location = new System.Drawing.Point(1480, 6); + this.btn_Delete.Location = new System.Drawing.Point(1296, 5); this.btn_Delete.Margin = new System.Windows.Forms.Padding(1); this.btn_Delete.Name = "btn_Delete"; - this.btn_Delete.Size = new System.Drawing.Size(85, 34); + this.btn_Delete.Size = new System.Drawing.Size(74, 27); this.btn_Delete.TabIndex = 51; this.btn_Delete.Text = "목록삭제"; this.btn_Delete.UseVisualStyleBackColor = true; @@ -376,10 +373,10 @@ // btn_AddList // this.btn_AddList.Dock = System.Windows.Forms.DockStyle.Right; - this.btn_AddList.Location = new System.Drawing.Point(1104, 6); + this.btn_AddList.Location = new System.Drawing.Point(968, 5); this.btn_AddList.Margin = new System.Windows.Forms.Padding(1); this.btn_AddList.Name = "btn_AddList"; - this.btn_AddList.Size = new System.Drawing.Size(85, 34); + this.btn_AddList.Size = new System.Drawing.Size(74, 27); this.btn_AddList.TabIndex = 50; this.btn_AddList.Text = "목록생성"; this.btn_AddList.UseVisualStyleBackColor = true; @@ -415,18 +412,18 @@ this.panel1.Controls.Add(this.btn_Close); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 3); - this.panel1.Size = new System.Drawing.Size(1872, 43); + this.panel1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 2); + this.panel1.Size = new System.Drawing.Size(1638, 34); this.panel1.TabIndex = 52; // // panel12 // this.panel12.Dock = System.Windows.Forms.DockStyle.Left; - this.panel12.Location = new System.Drawing.Point(645, 6); + this.panel12.Location = new System.Drawing.Point(578, 5); + this.panel12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(9, 34); + this.panel12.Size = new System.Drawing.Size(8, 27); this.panel12.TabIndex = 62; // // chkEditorTest @@ -436,10 +433,9 @@ this.chkEditorTest.Dock = System.Windows.Forms.DockStyle.Left; 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(539, 6); - this.chkEditorTest.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.chkEditorTest.Location = new System.Drawing.Point(472, 5); this.chkEditorTest.Name = "chkEditorTest"; - this.chkEditorTest.Size = new System.Drawing.Size(106, 34); + this.chkEditorTest.Size = new System.Drawing.Size(106, 27); this.chkEditorTest.TabIndex = 52; this.chkEditorTest.Text = "Editor (OLD)"; this.chkEditorTest.UseVisualStyleBackColor = false; @@ -447,26 +443,28 @@ // panel13 // this.panel13.Dock = System.Windows.Forms.DockStyle.Left; - this.panel13.Location = new System.Drawing.Point(530, 6); + this.panel13.Location = new System.Drawing.Point(464, 5); + this.panel13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(9, 34); + this.panel13.Size = new System.Drawing.Size(8, 27); this.panel13.TabIndex = 63; // // panel11 // this.panel11.Dock = System.Windows.Forms.DockStyle.Right; - this.panel11.Location = new System.Drawing.Point(1001, 6); + this.panel11.Location = new System.Drawing.Point(878, 5); + this.panel11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(9, 34); + this.panel11.Size = new System.Drawing.Size(8, 27); this.panel11.TabIndex = 61; // // btnSearchISBN // this.btnSearchISBN.Dock = System.Windows.Forms.DockStyle.Right; - this.btnSearchISBN.Location = new System.Drawing.Point(1010, 6); + this.btnSearchISBN.Location = new System.Drawing.Point(886, 5); this.btnSearchISBN.Margin = new System.Windows.Forms.Padding(1); this.btnSearchISBN.Name = "btnSearchISBN"; - this.btnSearchISBN.Size = new System.Drawing.Size(85, 34); + this.btnSearchISBN.Size = new System.Drawing.Size(74, 27); this.btnSearchISBN.TabIndex = 50; this.btnSearchISBN.Text = "ISBN조회"; this.btnSearchISBN.UseVisualStyleBackColor = true; @@ -475,85 +473,91 @@ // panel10 // this.panel10.Dock = System.Windows.Forms.DockStyle.Right; - this.panel10.Location = new System.Drawing.Point(1095, 6); + this.panel10.Location = new System.Drawing.Point(960, 5); + this.panel10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(9, 34); + this.panel10.Size = new System.Drawing.Size(8, 27); this.panel10.TabIndex = 60; // // panel9 // this.panel9.Dock = System.Windows.Forms.DockStyle.Right; - this.panel9.Location = new System.Drawing.Point(1189, 6); + this.panel9.Location = new System.Drawing.Point(1042, 5); + this.panel9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(9, 34); + this.panel9.Size = new System.Drawing.Size(8, 27); this.panel9.TabIndex = 59; // // panel8 // this.panel8.Dock = System.Windows.Forms.DockStyle.Right; - this.panel8.Location = new System.Drawing.Point(1283, 6); + this.panel8.Location = new System.Drawing.Point(1124, 5); + this.panel8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(9, 34); + this.panel8.Size = new System.Drawing.Size(8, 27); this.panel8.TabIndex = 58; // // panel7 // this.panel7.Dock = System.Windows.Forms.DockStyle.Right; - this.panel7.Location = new System.Drawing.Point(1377, 6); + this.panel7.Location = new System.Drawing.Point(1206, 5); + this.panel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(9, 34); + this.panel7.Size = new System.Drawing.Size(8, 27); this.panel7.TabIndex = 57; // // panel6 // this.panel6.Dock = System.Windows.Forms.DockStyle.Right; - this.panel6.Location = new System.Drawing.Point(1471, 6); + this.panel6.Location = new System.Drawing.Point(1288, 5); + this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(9, 34); + this.panel6.Size = new System.Drawing.Size(8, 27); this.panel6.TabIndex = 56; // // panel5 // this.panel5.Dock = System.Windows.Forms.DockStyle.Right; - this.panel5.Location = new System.Drawing.Point(1565, 6); + this.panel5.Location = new System.Drawing.Point(1370, 5); + this.panel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(9, 34); + this.panel5.Size = new System.Drawing.Size(8, 27); this.panel5.TabIndex = 55; // // panel4 // this.panel4.Dock = System.Windows.Forms.DockStyle.Right; - this.panel4.Location = new System.Drawing.Point(1684, 6); + this.panel4.Location = new System.Drawing.Point(1474, 5); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(9, 34); + this.panel4.Size = new System.Drawing.Size(8, 27); this.panel4.TabIndex = 54; // // panel3 // this.panel3.Dock = System.Windows.Forms.DockStyle.Right; - this.panel3.Location = new System.Drawing.Point(1778, 6); + this.panel3.Location = new System.Drawing.Point(1556, 5); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(9, 34); + this.panel3.Size = new System.Drawing.Size(8, 27); this.panel3.TabIndex = 53; // // panel2 // this.panel2.Controls.Add(this.dataGridView1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(0, 43); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel2.Location = new System.Drawing.Point(0, 34); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1872, 780); + this.panel2.Size = new System.Drawing.Size(1638, 624); this.panel2.TabIndex = 53; // // Mac_List // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1872, 823); + this.ClientSize = new System.Drawing.Size(1638, 658); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Mac_List"; this.ShowIcon = false; this.Text = "마크목록"; diff --git a/unimarc/unimarc/마크/Marc2.cs b/unimarc/unimarc/마크/Marc2.cs index a8ffb61..b01a002 100644 --- a/unimarc/unimarc/마크/Marc2.cs +++ b/unimarc/unimarc/마크/Marc2.cs @@ -67,7 +67,11 @@ namespace ExcelTest string c_idx = string.Empty; private void Marc_Load(object sender, EventArgs e) { - + // 콤보박스 정렬및 필터 + string[] combo8 = { "등급", "복본" }; + comboBox8.Items.AddRange(combo8); + + comboBox8.SelectedIndex = 0; } /// @@ -325,6 +329,7 @@ namespace ExcelTest marcEditorControl1.LoadBookData(isbn13, bookName, author, publisher, price, url, marcIdx, dbMarc, grade, user, saveDate, listIdx); } + bool check_V(int row, int col) { @@ -504,33 +509,9 @@ namespace ExcelTest fb.Show(); } - private void comboBox8_SelectedIndexChanged(object sender, EventArgs e) - { - comboBox9.Items.Clear(); - - ComboBox cb = sender as ComboBox; - if (cb.SelectedIndex == 0) - { - comboBox9.Enabled = true; - string[] grade = { "전체", "A", "B", "C", "D" }; - comboBox9.Items.AddRange(grade); - comboBox9.SelectedIndex = 0; - } - else - comboBox9.Enabled = false; - } - - private void Radio_Sort_CheckedChanged(object sender, EventArgs e) - { - RadioButton rb = sender as RadioButton; - string text = rb.Text; - if (text == "정렬") - comboBox9.Enabled = false; - - else - comboBox9.Enabled = true; - } + + private void btn_mk_marcList_Click(object sender, EventArgs e) { @@ -768,5 +749,34 @@ namespace ExcelTest { // this.toolStripStatusLabel1.Text = $"{this.Size}"; } + + private void rb_Sort_CheckedChanged(object sender, EventArgs e) + { + RadioButton rb = sender as RadioButton; + string text = rb.Text; + if (text == "정렬") + comboBox9.Enabled = false; + + else + comboBox9.Enabled = true; + } + + private void comboBox8_SelectedIndexChanged_1(object sender, EventArgs e) + { + comboBox9.Items.Clear(); + + ComboBox cb = sender as ComboBox; + if (cb.SelectedIndex == 0) + { + comboBox9.Enabled = true; + string[] grade = { "전체", "A", "B", "C", "D" }; + comboBox9.Items.AddRange(grade); + comboBox9.SelectedIndex = 0; + } + else + comboBox9.Enabled = false; + } + + } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc2.designer.cs b/unimarc/unimarc/마크/Marc2.designer.cs index 51d6181..68b75f6 100644 --- a/unimarc/unimarc/마크/Marc2.designer.cs +++ b/unimarc/unimarc/마크/Marc2.designer.cs @@ -38,10 +38,10 @@ System.Windows.Forms.Label label25; System.Windows.Forms.Label label26; System.Windows.Forms.Label label27; - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = 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 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(); this.List_Book = new System.Windows.Forms.DataGridView(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -73,11 +73,11 @@ this.btCopy = new System.Windows.Forms.Button(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.lbl_BookList = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.btClose = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.marcEditorControl1 = new ExcelTest.MarcEditorControl(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); label31 = new System.Windows.Forms.Label(); label30 = new System.Windows.Forms.Label(); label33 = new System.Windows.Forms.Label(); @@ -176,14 +176,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.List_Book.BackgroundColor = System.Drawing.Color.SkyBlue; this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, 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.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.List_Book.ColumnHeadersHeight = 29; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, @@ -202,23 +202,22 @@ this.user, this.SaveDate}); this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; - this.List_Book.Location = new System.Drawing.Point(6, 91); - this.List_Book.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.List_Book.Location = new System.Drawing.Point(5, 73); this.List_Book.MultiSelect = false; this.List_Book.Name = "List_Book"; this.List_Book.ReadOnly = true; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.ControlDark; - dataGridViewCellStyle12.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + 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.RowHeadersWidth = 51; this.List_Book.RowTemplate.Height = 23; this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.List_Book.Size = new System.Drawing.Size(621, 695); + this.List_Book.Size = new System.Drawing.Size(543, 556); this.List_Book.TabIndex = 217; this.List_Book.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.List_Book_RowPostPaint); this.List_Book.SelectionChanged += new System.EventHandler(this.List_Book_SelectionChanged); @@ -328,9 +327,9 @@ // // grade // - dataGridViewCellStyle10.Format = "N0"; - dataGridViewCellStyle10.NullValue = null; - this.grade.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Format = "N0"; + dataGridViewCellStyle2.NullValue = null; + this.grade.DefaultCellStyle = dataGridViewCellStyle2; this.grade.HeaderText = "등급"; this.grade.MinimumWidth = 6; this.grade.Name = "grade"; @@ -340,8 +339,8 @@ // // colCheck // - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.colCheck.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.colCheck.DefaultCellStyle = dataGridViewCellStyle3; this.colCheck.HeaderText = "V"; this.colCheck.MinimumWidth = 6; this.colCheck.Name = "colCheck"; @@ -369,36 +368,37 @@ // // rb_Sort // - this.rb_Sort.Location = new System.Drawing.Point(78, 5); - this.rb_Sort.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rb_Sort.Location = new System.Drawing.Point(68, 4); this.rb_Sort.Name = "rb_Sort"; - this.rb_Sort.Size = new System.Drawing.Size(55, 30); + this.rb_Sort.Size = new System.Drawing.Size(48, 24); this.rb_Sort.TabIndex = 320; this.rb_Sort.Text = "정렬"; + this.rb_Sort.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); // // rb_Filter // - this.rb_Filter.Location = new System.Drawing.Point(139, 5); - this.rb_Filter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.rb_Filter.Location = new System.Drawing.Point(122, 4); this.rb_Filter.Name = "rb_Filter"; - this.rb_Filter.Size = new System.Drawing.Size(55, 30); + this.rb_Filter.Size = new System.Drawing.Size(48, 24); this.rb_Filter.TabIndex = 322; this.rb_Filter.Text = "필터"; + this.rb_Filter.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged); // // comboBox8 // - this.comboBox8.Location = new System.Drawing.Point(201, 8); - this.comboBox8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.comboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox8.Location = new System.Drawing.Point(176, 6); this.comboBox8.Name = "comboBox8"; - this.comboBox8.Size = new System.Drawing.Size(122, 23); + this.comboBox8.Size = new System.Drawing.Size(107, 20); this.comboBox8.TabIndex = 323; + this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged_1); // // comboBox9 // - this.comboBox9.Location = new System.Drawing.Point(327, 8); - this.comboBox9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.comboBox9.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox9.Location = new System.Drawing.Point(286, 6); this.comboBox9.Name = "comboBox9"; - this.comboBox9.Size = new System.Drawing.Size(59, 23); + this.comboBox9.Size = new System.Drawing.Size(52, 20); this.comboBox9.TabIndex = 321; // // panel1 @@ -413,18 +413,16 @@ this.panel1.Controls.Add(this.comboBox9); this.panel1.Controls.Add(this.rb_Filter); this.panel1.Controls.Add(this.comboBox8); - this.panel1.Location = new System.Drawing.Point(6, 43); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panel1.Location = new System.Drawing.Point(5, 34); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(621, 43); + this.panel1.Size = new System.Drawing.Size(544, 35); this.panel1.TabIndex = 226; // // btn_mk_marcList // - this.btn_mk_marcList.Location = new System.Drawing.Point(495, 6); - this.btn_mk_marcList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_mk_marcList.Location = new System.Drawing.Point(433, 5); this.btn_mk_marcList.Name = "btn_mk_marcList"; - this.btn_mk_marcList.Size = new System.Drawing.Size(121, 29); + this.btn_mk_marcList.Size = new System.Drawing.Size(106, 23); this.btn_mk_marcList.TabIndex = 227; this.btn_mk_marcList.Text = "마크목록생성"; this.btn_mk_marcList.UseVisualStyleBackColor = true; @@ -434,10 +432,9 @@ // this.btn_CopySelect.BackColor = System.Drawing.Color.Khaki; this.btn_CopySelect.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btn_CopySelect.Location = new System.Drawing.Point(457, 6); - this.btn_CopySelect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_CopySelect.Location = new System.Drawing.Point(400, 5); this.btn_CopySelect.Name = "btn_CopySelect"; - this.btn_CopySelect.Size = new System.Drawing.Size(34, 29); + this.btn_CopySelect.Size = new System.Drawing.Size(30, 23); this.btn_CopySelect.TabIndex = 319; this.btn_CopySelect.Text = "0"; this.btn_CopySelect.UseVisualStyleBackColor = false; @@ -445,10 +442,9 @@ // // btn_FilterReturn // - this.btn_FilterReturn.Location = new System.Drawing.Point(3, 5); - this.btn_FilterReturn.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_FilterReturn.Location = new System.Drawing.Point(3, 4); this.btn_FilterReturn.Name = "btn_FilterReturn"; - this.btn_FilterReturn.Size = new System.Drawing.Size(72, 29); + this.btn_FilterReturn.Size = new System.Drawing.Size(63, 23); this.btn_FilterReturn.TabIndex = 229; this.btn_FilterReturn.Text = "원래대로"; this.btn_FilterReturn.UseVisualStyleBackColor = true; @@ -456,10 +452,9 @@ // // btn_Search // - this.btn_Search.Location = new System.Drawing.Point(387, 6); - this.btn_Search.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_Search.Location = new System.Drawing.Point(339, 5); this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(65, 29); + this.btn_Search.Size = new System.Drawing.Size(57, 23); this.btn_Search.TabIndex = 227; this.btn_Search.Text = "검 색"; this.btn_Search.UseVisualStyleBackColor = true; @@ -471,10 +466,9 @@ 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(579, 97); - this.checkBox3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.checkBox3.Location = new System.Drawing.Point(507, 78); this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(18, 17); + this.checkBox3.Size = new System.Drawing.Size(15, 14); this.checkBox3.TabIndex = 227; this.checkBox3.UseVisualStyleBackColor = false; this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged); @@ -483,10 +477,9 @@ // this.tbCustName.BackColor = System.Drawing.Color.LightGray; this.tbCustName.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.tbCustName.Location = new System.Drawing.Point(6, 7); - this.tbCustName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.tbCustName.Location = new System.Drawing.Point(5, 6); this.tbCustName.Name = "tbCustName"; - this.tbCustName.Size = new System.Drawing.Size(440, 32); + this.tbCustName.Size = new System.Drawing.Size(385, 26); this.tbCustName.TabIndex = 33; this.tbCustName.Text = " "; this.tbCustName.UseVisualStyleBackColor = false; @@ -497,9 +490,9 @@ this.lbCustIDX.BackColor = System.Drawing.Color.LightGray; this.lbCustIDX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lbCustIDX.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold); - this.lbCustIDX.Location = new System.Drawing.Point(452, 7); + this.lbCustIDX.Location = new System.Drawing.Point(396, 6); this.lbCustIDX.Name = "lbCustIDX"; - this.lbCustIDX.Size = new System.Drawing.Size(68, 32); + this.lbCustIDX.Size = new System.Drawing.Size(60, 26); this.lbCustIDX.TabIndex = 319; this.lbCustIDX.Text = " "; this.lbCustIDX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -507,10 +500,9 @@ // btCopy // this.btCopy.ForeColor = System.Drawing.Color.Red; - this.btCopy.Location = new System.Drawing.Point(1728, 319); - this.btCopy.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btCopy.Location = new System.Drawing.Point(1512, 255); this.btCopy.Name = "btCopy"; - this.btCopy.Size = new System.Drawing.Size(88, 29); + this.btCopy.Size = new System.Drawing.Size(77, 23); this.btCopy.TabIndex = 321; this.btCopy.Text = "복 사"; this.btCopy.UseVisualStyleBackColor = true; @@ -524,24 +516,30 @@ this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lbl_BookList, this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 793); + this.statusStrip1.Location = new System.Drawing.Point(0, 634); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(1872, 30); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0); + this.statusStrip1.Size = new System.Drawing.Size(1638, 24); this.statusStrip1.TabIndex = 322; this.statusStrip1.Text = "statusStrip1"; // // lbl_BookList // this.lbl_BookList.Name = "lbl_BookList"; - this.lbl_BookList.Size = new System.Drawing.Size(140, 24); + this.lbl_BookList.Size = new System.Drawing.Size(119, 19); this.lbl_BookList.Text = "{booklist}"; // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(240, 19); + this.toolStripStatusLabel1.Text = "toolStripStatusLabel1"; + // // btClose // - this.btClose.Location = new System.Drawing.Point(526, 7); - this.btClose.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btClose.Location = new System.Drawing.Point(460, 6); this.btClose.Name = "btClose"; - this.btClose.Size = new System.Drawing.Size(101, 32); + this.btClose.Size = new System.Drawing.Size(88, 26); this.btClose.TabIndex = 324; this.btClose.Text = "닫 기"; this.btClose.UseVisualStyleBackColor = true; @@ -551,9 +549,10 @@ // this.panel2.Controls.Add(this.marcEditorControl1); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(634, 0); + this.panel2.Location = new System.Drawing.Point(555, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1238, 793); + this.panel2.Size = new System.Drawing.Size(1083, 634); this.panel2.TabIndex = 325; // // panel3 @@ -567,8 +566,9 @@ this.panel3.Controls.Add(this.lbCustIDX); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(634, 793); + this.panel3.Size = new System.Drawing.Size(555, 634); this.panel3.TabIndex = 325; // // marcEditorControl1 @@ -587,30 +587,23 @@ 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.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.marcEditorControl1.Name = "marcEditorControl1"; - this.marcEditorControl1.Size = new System.Drawing.Size(1238, 793); + this.marcEditorControl1.Size = new System.Drawing.Size(1083, 634); this.marcEditorControl1.TabIndex = 0; // - // toolStripStatusLabel1 - // - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(283, 24); - this.toolStripStatusLabel1.Text = "toolStripStatusLabel1"; - // // Marc2 // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.SkyBlue; - this.ClientSize = new System.Drawing.Size(1872, 823); + this.ClientSize = new System.Drawing.Size(1638, 658); this.Controls.Add(this.panel2); this.Controls.Add(this.panel3); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.btCopy); this.KeyPreview = true; - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Marc2"; this.Text = "마크 작성(1)"; this.Load += new System.EventHandler(this.Marc_Load); diff --git a/unimarc/unimarc/마크/MarcEditorControl.cs b/unimarc/unimarc/마크/MarcEditorControl.cs index f54e850..7123e1c 100644 --- a/unimarc/unimarc/마크/MarcEditorControl.cs +++ b/unimarc/unimarc/마크/MarcEditorControl.cs @@ -231,20 +231,28 @@ namespace ExcelTest LoadMarc(CurrentDBMarc); input_picture(); - - // Set 008 text if present - // LoadMarc does this via text008.Text assignment - + richTextBox1.Text = ""; + + bool check_Marc = click_Marc(dbMarc); + + if (!check_Marc) + richTextBox1.Text = Make_Empty(); + else + ReadRemark(); + + Create_008(); - + 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); - ReadRemark(); + } private bool CheckOwner(string marcIdx) @@ -801,6 +809,66 @@ namespace ExcelTest //} #region CellClick_Sub + /// + /// 마크데이터가 있는지 확인하고 메모장으로 출력 + /// + /// 해당 데이터의 row값 + /// + bool click_Marc(string Marc_data) + { + // 마크 데이터 + //string Marc_data = List_Book.Rows[row].Cells["db_marc"].Value.ToString(); + + if (Marc_data.Length < 3) return false; + + string result = string.Empty; + + List TagNum = new List(); // 태그번호 + List field = new List(); // 가변길이필드 저장 + + // 특수기호 육안으로 확인하기 쉽게 변환 + Marc_data = Marc_data.Replace("", "▼"); + Marc_data = Marc_data.Replace("", "▲"); + Marc_data = Marc_data.Replace("￦", "\\"); + // string leader = Marc_data.Substring(0, 24); + + int startidx = 0; + string[] data = Marc_data.Substring(24).Split('▲'); // 리더부를 제외한 디렉터리, 가변길이필드 저장 + + // List에 필요한 데이터 집어넣는 작업. + for (int a = 1; a < data.Length - 1 && data[0].Length > startidx; a++) + { + TagNum.Add(data[0].Substring(startidx, 3)); + startidx += 12; + field.Add(data[a] + "▲"); + } + + // List에 들어간 데이터를 메모장에 출력시키는 작업. + for (int a = 0; a < TagNum.Count; a++) + { + string res = TagNum[a]; + if (TagNum[a] == "008") + { + text008.Text = field[a].Replace("▲", ""); + data008 = text008.Text; + continue; + } + else { } + if (field[a].IndexOf("▼") == -1) + { + res += "\t \t" + field[a]; + } + else + { + string temp = field[a].Insert(2, "\t"); + res += "\t" + temp; + } + result += res + "\n"; + } + richTextBox1.Text = result; + return true; + } + void OnSaveData(int row) {