diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index 35eaaf1..422d6d3 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 5e20ede..eab2f5d 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 b4344a6..df99e0e 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 ebd6db8..d5364f9 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 d4e5d1c..2acd9f3 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.csprojAssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csprojAssemblyReference.cache index 52abccd..ae138ca 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csprojAssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csprojAssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 5e20ede..eab2f5d 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 b4344a6..df99e0e 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 ebd6db8..d5364f9 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/마크/Mac_Input.Designer.cs b/unimarc/unimarc/마크/Mac_Input.Designer.cs index 0583505..1964e31 100644 --- a/unimarc/unimarc/마크/Mac_Input.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Input.Designer.cs @@ -30,20 +30,21 @@ { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); - this.button2 = new System.Windows.Forms.Button(); - this.button1 = new System.Windows.Forms.Button(); + this.btn_db_save = new System.Windows.Forms.Button(); + this.btn_file_save = new System.Windows.Forms.Button(); this.tb_filePath = new System.Windows.Forms.TextBox(); this.btn_FileOpen = new System.Windows.Forms.Button(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.series = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); @@ -51,37 +52,39 @@ // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.button2); - this.panel1.Controls.Add(this.button1); + this.panel1.Controls.Add(this.btn_db_save); + this.panel1.Controls.Add(this.btn_file_save); this.panel1.Controls.Add(this.tb_filePath); this.panel1.Controls.Add(this.btn_FileOpen); this.panel1.Controls.Add(this.comboBox1); this.panel1.Controls.Add(this.label1); - this.panel1.Location = new System.Drawing.Point(13, 13); + this.panel1.Location = new System.Drawing.Point(12, 12); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(1273, 40); this.panel1.TabIndex = 0; // - // button2 + // btn_db_save // - this.button2.Location = new System.Drawing.Point(784, 8); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(89, 23); - this.button2.TabIndex = 4; - this.button2.Text = "DB 저장"; - this.button2.UseVisualStyleBackColor = true; + this.btn_db_save.Location = new System.Drawing.Point(784, 8); + this.btn_db_save.Name = "btn_db_save"; + this.btn_db_save.Size = new System.Drawing.Size(89, 23); + this.btn_db_save.TabIndex = 4; + this.btn_db_save.Text = "DB 저장"; + this.btn_db_save.UseVisualStyleBackColor = true; + this.btn_db_save.Click += new System.EventHandler(this.btn_db_save_Click); // - // button1 + // btn_file_save // - this.button1.Location = new System.Drawing.Point(689, 8); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(89, 23); - this.button1.TabIndex = 4; - this.button1.Text = "파일로 저장"; - this.button1.UseVisualStyleBackColor = true; + this.btn_file_save.Location = new System.Drawing.Point(689, 8); + this.btn_file_save.Name = "btn_file_save"; + this.btn_file_save.Size = new System.Drawing.Size(89, 23); + this.btn_file_save.TabIndex = 4; + this.btn_file_save.Text = "파일로 저장"; + this.btn_file_save.UseVisualStyleBackColor = true; // // tb_filePath // + this.tb_filePath.Enabled = false; this.tb_filePath.Location = new System.Drawing.Point(277, 9); this.tb_filePath.Name = "tb_filePath"; this.tb_filePath.Size = new System.Drawing.Size(371, 21); @@ -131,11 +134,12 @@ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.isbn, this.book_name, + this.series, this.author, this.book_comp, this.price, this.Marc}); - this.dataGridView1.Location = new System.Drawing.Point(13, 59); + this.dataGridView1.Location = new System.Drawing.Point(12, 58); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersWidth = 20; this.dataGridView1.RowTemplate.Height = 23; @@ -143,6 +147,12 @@ this.dataGridView1.TabIndex = 1; this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // + // openFileDialog1 + // + this.openFileDialog1.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*"; + this.openFileDialog1.InitialDirectory = "C:"; + this.openFileDialog1.Title = "열기"; + // // isbn // this.isbn.HeaderText = "isbn"; @@ -155,6 +165,12 @@ this.book_name.Name = "book_name"; this.book_name.Width = 300; // + // series + // + this.series.HeaderText = "총서명"; + this.series.Name = "series"; + this.series.Width = 200; + // // author // this.author.HeaderText = "저자"; @@ -174,15 +190,9 @@ // // Marc // - this.Marc.HeaderText = "Marc"; + this.Marc.HeaderText = "마크"; this.Marc.Name = "Marc"; - this.Marc.Width = 500; - // - // openFileDialog1 - // - this.openFileDialog1.Filter = "마크 파일 (*.mrc)|*.mrc|모든 파일 (*.*)|*.*"; - this.openFileDialog1.InitialDirectory = "C:"; - this.openFileDialog1.Title = "열기"; + this.Marc.Width = 300; // // Mac_Input // @@ -206,14 +216,15 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label label1; private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button btn_db_save; + private System.Windows.Forms.Button btn_file_save; private System.Windows.Forms.TextBox tb_filePath; private System.Windows.Forms.Button btn_FileOpen; private System.Windows.Forms.DataGridView dataGridView1; private System.Windows.Forms.OpenFileDialog openFileDialog1; private System.Windows.Forms.DataGridViewTextBoxColumn isbn; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn series; private System.Windows.Forms.DataGridViewTextBoxColumn author; private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; private System.Windows.Forms.DataGridViewTextBoxColumn price; diff --git a/unimarc/unimarc/마크/Mac_Input.cs b/unimarc/unimarc/마크/Mac_Input.cs index 4fb5777..ba25c7c 100644 --- a/unimarc/unimarc/마크/Mac_Input.cs +++ b/unimarc/unimarc/마크/Mac_Input.cs @@ -14,6 +14,7 @@ namespace WindowsFormsApp1.Mac { public partial class Mac_Input : Form { + Helper_DB db = new Helper_DB(); Main main; public Mac_Input(Main _main) { @@ -22,17 +23,23 @@ namespace WindowsFormsApp1.Mac } private void Mac_Input_Load(object sender, EventArgs e) { + db.DBcon(); + string[] com_list = { "표준Marc", "라인Marc" }; comboBox1.Items.AddRange(com_list); comboBox1.SelectedIndex = 0; - } private void btn_FileOpen_Click(object sender, EventArgs e) { string file_path = string.Empty; + if (tb_filePath.Text != "") + { + openFileDialog1.InitialDirectory = tb_filePath.Text; + } if (openFileDialog1.ShowDialog() == DialogResult.OK) { file_path = openFileDialog1.FileName; + dataGridView1.Rows.Clear(); try { StreamReader r = new StreamReader(file_path, Encoding.Default); @@ -53,8 +60,11 @@ namespace WindowsFormsApp1.Mac string[] grid = text.Split(''); for (int a = 0; a < grid.Length - 1; a++) { + if (comboBox1.SelectedIndex != 0) + grid[a] = grid[a].Replace("\r\n", ""); + string[] data = Split_Marc(grid[a]); - data[5] = grid[a] + ""; + data[6] = grid[a] + ""; dataGridView1.Rows.Add(data); } } @@ -63,28 +73,32 @@ namespace WindowsFormsApp1.Mac string tmp_string = text.Remove(0, 24); string[] Marc = tmp_string.Split(''); string[] dir = made_Directory(Marc[0]); - string[] data = { "", "", "", "", "", "" }; // isbn, 도서명, 저자, 출판사, 정가 + string[] data = { "", "", "", "", "", "", "" }; // isbn, 도서명, 총서명, 저자, 출판사, 정가, marc String_Text st = new String_Text(); for(int a = 0; a < dir.Length; a++) { if (dir[a] == "020") { - data[0] = st.GetMiddelString(Marc[a + 1], "a", ""); // isbn - data[4] = st.GetMiddelString(Marc[a + 1], "c", ""); // 정가 + data[0] = st.GetMiddelString(Marc[a + 1], "a", ""); // isbn + data[5] = st.GetMiddelString(Marc[a + 1], "c", ""); // 정가 } if (dir[a] == "245") { - data[1] = st.GetMiddelString(Marc[a + 1], "a", ""); // 도서명 - data[2] = st.GetMiddelString(Marc[a + 1], "d", ""); // 저자 + data[1] = st.GetMiddelString(Marc[a + 1], "a", ""); // 도서명 + data[3] = st.GetMiddelString(Marc[a + 1], "d", ""); // 저자 } if (dir[a] == "260") { - data[3] = st.GetMiddelString(Marc[a + 1], "b", ""); // 출판사 + data[4] = st.GetMiddelString(Marc[a + 1], "b", ""); // 출판사 + } + if (dir[a] == "440") + { + data[2] = st.GetMiddelString(Marc[a + 1], "a", ""); // 총서명 } if (dir[a] == "950") { - data[4] = st.GetMiddelString(Marc[a + 1], "b", ""); + data[5] = st.GetMiddelString(Marc[a + 1], "b", ""); // 정가 } } return data; @@ -109,5 +123,25 @@ namespace WindowsFormsApp1.Mac Skill_Grid sg = new Skill_Grid(); sg.Print_Grid_Num(sender, e); } + private void btn_db_save_Click(object sender, EventArgs e) + { + string table = "Marc"; + string[] col = { "grade", "ISBN", "서명", "총서명", "저자", "출판사", "가격", "marc", "marc_chk" }; + for(int a = 0; a < dataGridView1.Rows.Count; a++) + { + string Marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString(); + Marc = Marc.Replace(@"'", "'"); + Marc = Marc.Replace(@"""", "\"\""); + string[] data = { "2", dataGridView1.Rows[a].Cells["isbn"].Value.ToString(), + dataGridView1.Rows[a].Cells["book_name"].Value.ToString(), + dataGridView1.Rows[a].Cells["series"].Value.ToString(), + dataGridView1.Rows[a].Cells["author"].Value.ToString(), + dataGridView1.Rows[a].Cells["book_comp"].Value.ToString(), + dataGridView1.Rows[a].Cells["price"].Value.ToString(), + Marc, "1" }; + db.DB_INSERT(table, col, data); + } + MessageBox.Show("DB 저장 완료!"); + } } } diff --git a/unimarc/unimarc/마크/Mac_Input.resx b/unimarc/unimarc/마크/Mac_Input.resx index 68ccbcb..a355628 100644 --- a/unimarc/unimarc/마크/Mac_Input.resx +++ b/unimarc/unimarc/마크/Mac_Input.resx @@ -123,6 +123,9 @@ True + + True + True diff --git a/unimarc/unimarc/마크/Mac_List.cs b/unimarc/unimarc/마크/Mac_List.cs index 3fe3a93..622a331 100644 --- a/unimarc/unimarc/마크/Mac_List.cs +++ b/unimarc/unimarc/마크/Mac_List.cs @@ -231,7 +231,7 @@ namespace WindowsFormsApp1.Mac int idx_row = e.RowIndex; int idx_col = e.ColumnIndex; if (3 <= idx_col && idx_col <= 8) { - ExcelTest.Marc marc = new ExcelTest.Marc(); + ExcelTest.Marc marc = new ExcelTest.Marc(this); marc.WindowState = FormWindowState.Maximized; marc.Show(); marc.input_list(dataGridView1.Rows[idx_row].Cells[1].Value.ToString(), diff --git a/unimarc/unimarc/마크/Mac_Output.Designer.cs b/unimarc/unimarc/마크/Mac_Output.Designer.cs index 5d8860f..4624fd0 100644 --- a/unimarc/unimarc/마크/Mac_Output.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Output.Designer.cs @@ -28,33 +28,222 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.series = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.btn_db_save = new System.Windows.Forms.Button(); + this.btn_file_save = new System.Windows.Forms.Button(); + this.cb_state = new System.Windows.Forms.ComboBox(); this.label1 = new System.Windows.Forms.Label(); + this.cb_years = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); + this.cb_list = new System.Windows.Forms.ComboBox(); + this.connect_list = new System.Windows.Forms.ComboBox(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // + // dataGridView1 + // + this.dataGridView1.AllowUserToAddRows = false; + this.dataGridView1.AllowUserToDeleteRows = false; + 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.False; + this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.isbn, + this.book_name, + this.series, + this.author, + this.book_comp, + this.price, + this.Marc}); + this.dataGridView1.Location = new System.Drawing.Point(12, 58); + this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 20; + this.dataGridView1.RowTemplate.Height = 23; + this.dataGridView1.Size = new System.Drawing.Size(1273, 600); + this.dataGridView1.TabIndex = 9; + // + // isbn + // + this.isbn.HeaderText = "isbn"; + this.isbn.Name = "isbn"; + this.isbn.Width = 110; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.Width = 300; + // + // series + // + this.series.HeaderText = "총서명"; + this.series.Name = "series"; + this.series.Width = 200; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.Width = 150; + // + // price + // + this.price.HeaderText = "정가"; + this.price.Name = "price"; + this.price.Width = 70; + // + // Marc + // + this.Marc.HeaderText = "마크"; + this.Marc.Name = "Marc"; + this.Marc.Width = 300; + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.connect_list); + this.panel1.Controls.Add(this.cb_list); + this.panel1.Controls.Add(this.btn_db_save); + this.panel1.Controls.Add(this.btn_file_save); + this.panel1.Controls.Add(this.cb_years); + this.panel1.Controls.Add(this.cb_state); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.label1); + this.panel1.Location = new System.Drawing.Point(12, 12); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1273, 40); + this.panel1.TabIndex = 10; + // + // btn_db_save + // + this.btn_db_save.Location = new System.Drawing.Point(784, 8); + this.btn_db_save.Name = "btn_db_save"; + this.btn_db_save.Size = new System.Drawing.Size(89, 23); + this.btn_db_save.TabIndex = 4; + this.btn_db_save.Text = "DB 저장"; + this.btn_db_save.UseVisualStyleBackColor = true; + // + // btn_file_save + // + this.btn_file_save.Location = new System.Drawing.Point(689, 8); + this.btn_file_save.Name = "btn_file_save"; + this.btn_file_save.Size = new System.Drawing.Size(89, 23); + this.btn_file_save.TabIndex = 4; + this.btn_file_save.Text = "파일로 저장"; + this.btn_file_save.UseVisualStyleBackColor = true; + // + // cb_state + // + this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_state.FormattingEnabled = true; + this.cb_state.Location = new System.Drawing.Point(45, 10); + this.cb_state.Name = "cb_state"; + this.cb_state.Size = new System.Drawing.Size(75, 20); + this.cb_state.TabIndex = 2; + this.cb_state.SelectedIndexChanged += new System.EventHandler(this.cb_state_SelectedIndexChanged); + // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(371, 219); + this.label1.Location = new System.Drawing.Point(11, 14); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(111, 12); - this.label1.TabIndex = 5; - this.label1.Text = "마크관리_마크 반출"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 1; + this.label1.Text = "구분"; + // + // cb_years + // + this.cb_years.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_years.Enabled = false; + this.cb_years.FormattingEnabled = true; + this.cb_years.Location = new System.Drawing.Point(126, 10); + this.cb_years.Name = "cb_years"; + this.cb_years.Size = new System.Drawing.Size(90, 20); + this.cb_years.TabIndex = 2; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(244, 14); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(58, 12); + this.label2.TabIndex = 1; + this.label2.Text = "Marc목록"; + // + // cb_list + // + this.cb_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_list.FormattingEnabled = true; + this.cb_list.Location = new System.Drawing.Point(308, 10); + this.cb_list.Name = "cb_list"; + this.cb_list.Size = new System.Drawing.Size(375, 20); + this.cb_list.TabIndex = 5; + this.cb_list.SelectedIndexChanged += new System.EventHandler(this.cb_list_SelectedIndexChanged); + // + // connect_list + // + this.connect_list.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.connect_list.FormattingEnabled = true; + this.connect_list.Location = new System.Drawing.Point(911, 10); + this.connect_list.Name = "connect_list"; + this.connect_list.Size = new System.Drawing.Size(121, 20); + this.connect_list.TabIndex = 6; // // Mac_Output // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.label1); + this.ClientSize = new System.Drawing.Size(1298, 671); + this.Controls.Add(this.panel1); + this.Controls.Add(this.dataGridView1); this.Name = "Mac_Output"; this.Text = "마크 반출"; + this.Load += new System.EventHandler(this.Mac_Output_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - + private System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn isbn; + private System.Windows.Forms.DataGridViewTextBoxColumn book_name; + private System.Windows.Forms.DataGridViewTextBoxColumn series; + private System.Windows.Forms.DataGridViewTextBoxColumn author; + private System.Windows.Forms.DataGridViewTextBoxColumn book_comp; + private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn Marc; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button btn_db_save; + private System.Windows.Forms.Button btn_file_save; + private System.Windows.Forms.ComboBox cb_state; private System.Windows.Forms.Label label1; + private System.Windows.Forms.ComboBox cb_years; + private System.Windows.Forms.ComboBox cb_list; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.ComboBox connect_list; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_Output.cs b/unimarc/unimarc/마크/Mac_Output.cs index 2c457ea..0e0a79c 100644 --- a/unimarc/unimarc/마크/Mac_Output.cs +++ b/unimarc/unimarc/마크/Mac_Output.cs @@ -12,11 +12,96 @@ namespace WindowsFormsApp1.Mac { public partial class Mac_Output : Form { + Helper_DB db = new Helper_DB(); Main main; + string compidx = string.Empty; public Mac_Output(Main _main) { InitializeComponent(); main = _main; + compidx = main.com_idx; + } + + private void Mac_Output_Load(object sender, EventArgs e) + { + db.DBcon(); + + string[] state = { "진행", "완료" }; + cb_state.Items.AddRange(state); + cb_state.SelectedIndex = 0; + } + + private void cb_state_SelectedIndexChanged(object sender, EventArgs e) + { + if (cb_state.SelectedIndex == 0) + { + cb_years.Enabled = false; + } + else + { + cb_years.Enabled = true; + + int start_years = 2009; + int now_years = Convert.ToInt32(DateTime.Now.ToString("yyyy")); + int years_count = now_years - start_years; + List l_years = new List(); + for (int a = 0; a <= years_count; a++) + { + l_years.Add(start_years.ToString()); + start_years += 1; + } + string[] years = l_years.ToArray(); + cb_years.Items.AddRange(years); + cb_years.SelectedIndex = cb_years.Items.Count - 1; + } + Input_list_combo(); + } + + #region cb_state 선택 시 Sub함수 + private void Input_list_combo() + { + cb_list.Items.Clear(); + string area = "`date`, `list_name`, `connect_data`"; + string[] table = { "compidx", "state" }; + string[] data = { compidx, cb_state.Text }; + string temp = db.More_DB_Search("Obj_List_Marc", table, data, area); + string[] marc_list = temp.Split('|'); + + string[] tmp = { "", "", "" }; + bool years = true; + + for(int a = 0; a < marc_list.Length - 1; a++) + { + if (a % 3 == 0) { tmp[0] = marc_list[a]; + years = years_UpAndDown(tmp[0]); + if (cb_state.SelectedIndex == 0) years = true; + } + if (a % 3 == 1) { tmp[1] = marc_list[a]; } + if (a % 3 == 2) { tmp[2] = marc_list[a]; + if (years) { + cb_list.Items.Add(tmp[1]); + connect_list.Items.Add(tmp[2]); + } + } + } + } + private bool years_UpAndDown(string years) + { + if(cb_years.Text == "") { return false; } + int select = Convert.ToInt32(cb_years.Text); + int year = Convert.ToInt32(years.Substring(0, 4)); + + if (select != year) + return false; + else + return true; + } + #endregion + + private void cb_list_SelectedIndexChanged(object sender, EventArgs e) + { + connect_list.SelectedIndex = cb_list.SelectedIndex; + } } } diff --git a/unimarc/unimarc/마크/Mac_Output.resx b/unimarc/unimarc/마크/Mac_Output.resx index 1af7de1..338af23 100644 --- a/unimarc/unimarc/마크/Mac_Output.resx +++ b/unimarc/unimarc/마크/Mac_Output.resx @@ -117,4 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index e147832..16a634c 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -7,6 +7,7 @@ using System.Text.RegularExpressions; using System.Windows.Forms; using UniMarc.마크; using WindowsFormsApp1; +using WindowsFormsApp1.Mac; namespace ExcelTest { @@ -23,11 +24,17 @@ namespace ExcelTest Helper_DB db = new Helper_DB(); Help008Tag tag008 = new Help008Tag(); Skill_Search_Text search_Text = new Skill_Search_Text(); + Mac_List ml; public Marc() { InitializeComponent(); } + public Marc(Mac_List _ml) + { + InitializeComponent(); + ml = _ml; + } private void Marc_Load(object sender, EventArgs e) { @@ -858,6 +865,13 @@ namespace ExcelTest } } } + private void etc_KeyDown(object sender, KeyEventArgs e) + { + if(e.KeyCode == Keys.F8) + { + ((RichTextBox)sender).Text += DateTime.Now.ToString("yyyy-MM-dd HH:mm"); + } + } private void comboBox1_MouseClick(object sender, MouseEventArgs e) { @@ -1160,34 +1174,80 @@ namespace ExcelTest List_Book.Rows[row_idx].Cells["url"].Value.ToString() }; if (List_Book.Rows[row_idx].Cells["db_marc"].Value.ToString() != "") { - string[] Edit_tbl = { "`marc`", "`비고1`", "`비고2`", "`url`" }; - string[] Edit_col = { made_Ori_marc(), etc1.Text, etc2.Text, grid_data[5] }; - string[] Sear_tbl = { "`idx`" }; - string[] Sear_col = { List_Book.Rows[row_idx].Cells["list_idx"].Value.ToString() }; + string[] Edit_tbl = { "marc", "marc_chk", "marc_chk1", "비고1", "비고2", "url" }; + string[] Edit_col = { made_Ori_marc(), "1", "0", etc1.Text, etc2.Text, grid_data[5] }; + string[] Sear_tbl = { "ISBN" }; + string[] Sear_col = { List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString() }; + string res = Sub_marc_chk(grid_data[0]); + switch (res) + { + case "0": + Edit_tbl[0] = "marc1"; + Edit_tbl[1] = "marc_chk1"; + Edit_tbl[2] = "marc_chk"; + break; + case "1": + Edit_tbl[0] = "marc2"; + Edit_tbl[1] = "marc_chk2"; + Edit_tbl[2] = "marc_chk1"; + break; + case "2": + Edit_tbl[0] = "marc"; + Edit_tbl[1] = "marc_chk"; + Edit_tbl[2] = "marc_chk2"; + break; + default: + break; + } + db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col); + MessageBox.Show(res + ": 업데이트"); } else { - string[] Insert_tbl = { "`ISBN`", "`서명`", "`저자`", "`출판사`", "`가격`", - "`marc`", "`비고1`", "`비고2`", "`url`" }; - string[] Insert_col = { grid_data[0], grid_data[1], grid_data[2], grid_data[3], grid_data[4], - made_Ori_marc(), etc1.Text, etc2.Text, grid_data[5] }; + string[] Insert_tbl = { "ISBN", "서명", "저자", "출판사", "가격", + "marc", "비고1", "비고2", "url", "grade", "marc_chk" }; + string[] Insert_col = { grid_data[0], grid_data[1], grid_data[2], grid_data[3], grid_data[4], + made_Ori_marc(), etc1.Text, etc2.Text, grid_data[5], cb_grade.SelectedIndex.ToString(), "1" }; - db.DB_INSERT(table_name, Insert_col, Insert_tbl); + db.DB_INSERT(table_name, Insert_tbl, Insert_col); + MessageBox.Show("추가"); } + + MessageBox.Show("저장되었습니다!"); + } + private string Sub_marc_chk(string isbn) + { + string Area = "`marc_chk`, `marc_chk1`, `marc_chk2`"; + string db_chk = db.DB_Select_Search(Area, "Marc", "compidx", ml.compidx, "ISBN", isbn); + string[] chk_ary = db_chk.Split('|'); + + for(int a= 0; a < chk_ary.Length; a++) + { + if (chk_ary[a] == "1") { + return a.ToString(); + } + } + return "0"; } private void List_Book_CellContentClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex == -1) { return; } int row_idx = e.RowIndex; + Save_data(row_idx); richTextBox1.Text = ""; if (!click_Marc(row_idx)) { richTextBox1.Text = Make_Empty(); } input_picture(row_idx); - Save_data(row_idx); Create_008(); Color_change("▼"); Color_change("▲"); + + int grade = 2; + if (List_Book.Rows[row_idx].Cells["grade"].Value != null) { + grade = Convert.ToInt32(List_Book.Rows[row_idx].Cells["grade"].Value.ToString()); + } + cb_grade.SelectedIndex = grade; } void Save_data(int row) { @@ -1237,9 +1297,16 @@ namespace ExcelTest string Empty_008 = yyMMdd + "s" + yyyy + " 000 kor ▲"; text008.Text = Empty_008.Replace("▲", ""); data008 = text008.Text; - string Empty_text = "008\t \t" + Empty_008 + "\n020\t \t▲\n" + "056\t \t▲\n" + "100\t \t▲\n" + - "245\t \t▲\n" + "260\t \t▲\n" + "300\t \t▲\n" + - "653\t \t▲\n" + "700\t \t▲\n" + "950\t \t▲\n"; + string Empty_text = string.Format("008\t \t{0}\n" + + "020\t \t▼a{1}▼c{5}▲\n" + + "245\t \t▼a{2}▲\n" + + "260\t \t▼b{4}▲\n" + + "700\t \t▼a{3}▲\n" + + "950\t \t▼b{5}▲\n", + Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]); +/* "008\t \t" + Empty_008 + "\n020\t \t▼a" + data_book[0] + "▲\n" + + "245\t \t▼a" + data_book[1] + " ▲\n" + "260\t \t▼b" + data_book[3] + " ▲\n" + + "653\t \t▼▲\n" + "700\t \t▼▲\n" + "950\t \t▼▲\n";*/ return Empty_text; } bool click_Marc(int row) @@ -1391,6 +1458,10 @@ namespace ExcelTest string[] str_num = num.ToArray(); for(int a = 0; a < str_num.Length; a++) { + if (count[a].Length == 3) { count[a] = count[a].Insert(0, "0"); } + else if (count[a].Length == 2) { count[a] = count[a].Insert(0, "00"); } + else if (count[a].Length == 1) { count[a] = count[a].Insert(0, "000"); } + if (total[a].Length == 4) { total[a] = total[a].Insert(0, "0"); } else if (total[a].Length == 3) { total[a] = total[a].Insert(0, "00"); } else if (total[a].Length == 2) { total[a] = total[a].Insert(0, "000"); } @@ -1402,10 +1473,10 @@ namespace ExcelTest " ", "2", "2", "00000", " ", "k", " ", "4", "5", "0", "0" }; - 디렉토리 += "▲"; + 디렉토리 += ""; 디렉토리 = 디렉토리.Replace("\n", ""); - 가변길이 += "↔"; + 가변길이 += ""; 가변길이 = 가변길이.Replace("\n", ""); string dp = 가변길이 + 디렉토리; @@ -1422,6 +1493,8 @@ namespace ExcelTest } result += 디렉토리 + 가변길이; + result = result.Replace("▲", ""); + result = result.Replace("▼", ""); return result; } diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 0cd2fcf..867086b 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); @@ -161,6 +161,8 @@ this.input_date = new System.Windows.Forms.DateTimePicker(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.btn_preview = new System.Windows.Forms.Button(); + this.cb_grade = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.GridView020)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.GridView246)).BeginInit(); this.panel1.SuspendLayout(); @@ -218,7 +220,7 @@ this.etc1.Size = new System.Drawing.Size(301, 204); this.etc1.TabIndex = 32; this.etc1.Text = "Remark1"; - this.etc1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); + this.etc1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc_KeyDown); // // etc2 // @@ -229,7 +231,7 @@ this.etc2.Size = new System.Drawing.Size(301, 201); this.etc2.TabIndex = 32; this.etc2.Text = "Remark2"; - this.etc2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); + this.etc2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.etc_KeyDown); // // label1 // @@ -1190,7 +1192,7 @@ // // Btn_Memo // - this.Btn_Memo.Location = new System.Drawing.Point(1239, 7); + this.Btn_Memo.Location = new System.Drawing.Point(1239, 89); this.Btn_Memo.Name = "Btn_Memo"; this.Btn_Memo.Size = new System.Drawing.Size(75, 23); this.Btn_Memo.TabIndex = 215; @@ -1213,14 +1215,14 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -1318,7 +1320,7 @@ // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(1239, 59); + this.btn_Save.Location = new System.Drawing.Point(1239, 117); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(75, 23); this.btn_Save.TabIndex = 215; @@ -1418,7 +1420,7 @@ // // btn_close // - this.btn_close.Location = new System.Drawing.Point(1239, 85); + this.btn_close.Location = new System.Drawing.Point(1239, 146); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(75, 23); this.btn_close.TabIndex = 215; @@ -1450,7 +1452,7 @@ // // btn_preview // - this.btn_preview.Location = new System.Drawing.Point(1239, 33); + this.btn_preview.Location = new System.Drawing.Point(1239, 60); this.btn_preview.Name = "btn_preview"; this.btn_preview.Size = new System.Drawing.Size(75, 23); this.btn_preview.TabIndex = 215; @@ -1458,11 +1460,36 @@ this.btn_preview.UseVisualStyleBackColor = true; this.btn_preview.Click += new System.EventHandler(this.Btn_preview_Click); // + // cb_grade + // + this.cb_grade.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_grade.FormattingEnabled = true; + this.cb_grade.Items.AddRange(new object[] { + "A", + "B", + "C", + "D"}); + this.cb_grade.Location = new System.Drawing.Point(910, 59); + this.cb_grade.Name = "cb_grade"; + this.cb_grade.Size = new System.Drawing.Size(75, 20); + this.cb_grade.TabIndex = 222; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(847, 63); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(57, 12); + this.label6.TabIndex = 223; + this.label6.Text = "마크 등급"; + // // Marc // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1322, 753); + this.Controls.Add(this.label6); + this.Controls.Add(this.cb_grade); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.input_date); this.Controls.Add(this.panel3); @@ -1659,5 +1686,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn db_marc; private System.Windows.Forms.DataGridViewTextBoxColumn grade; private System.Windows.Forms.Button btn_preview; + private System.Windows.Forms.ComboBox cb_grade; + private System.Windows.Forms.Label label6; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.resx b/unimarc/unimarc/마크/Marc.resx index 1658798..f0eac14 100644 --- a/unimarc/unimarc/마크/Marc.resx +++ b/unimarc/unimarc/마크/Marc.resx @@ -129,36 +129,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True @@ -183,18 +153,6 @@ True - - True - - - True - - - True - - - True - True @@ -219,48 +177,12 @@ True - - True - - - True - - - True - - - True - - - True - - - True - True True - - True - - - True - - - True - - - True - - - True - - - True - True diff --git a/unimarc/unimarc/홈/Home_User_manage.Designer.cs b/unimarc/unimarc/홈/Home_User_manage.Designer.cs index 672be64..d9a9e13 100644 --- a/unimarc/unimarc/홈/Home_User_manage.Designer.cs +++ b/unimarc/unimarc/홈/Home_User_manage.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Home_User_manage)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.panel12 = new System.Windows.Forms.Panel(); this.check20_2 = new System.Windows.Forms.CheckBox(); @@ -136,14 +136,14 @@ this.tb_position = new System.Windows.Forms.TextBox(); this.tb_Name = new System.Windows.Forms.TextBox(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.btn_close = new System.Windows.Forms.Button(); this.Per_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Rank = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Phone = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.PW = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.right = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.btn_close = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel12.SuspendLayout(); this.panel11.SuspendLayout(); @@ -900,14 +900,14 @@ this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + 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.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Per_name, this.Rank, @@ -922,19 +922,6 @@ this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); // - // btn_lookup - // - resources.ApplyResources(this.btn_lookup, "btn_lookup"); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // btn_close - // - resources.ApplyResources(this.btn_close, "btn_close"); - this.btn_close.Name = "btn_close"; - this.btn_close.UseVisualStyleBackColor = true; - // // Per_name // resources.ApplyResources(this.Per_name, "Per_name"); @@ -969,6 +956,20 @@ resources.ApplyResources(this.right, "right"); this.right.Name = "right"; // + // btn_lookup + // + resources.ApplyResources(this.btn_lookup, "btn_lookup"); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // btn_close + // + resources.ApplyResources(this.btn_close, "btn_close"); + this.btn_close.Name = "btn_close"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // // Home_User_manage // resources.ApplyResources(this, "$this"); diff --git a/unimarc/unimarc/홈/Home_User_manage.cs b/unimarc/unimarc/홈/Home_User_manage.cs index 48161b5..b29247c 100644 --- a/unimarc/unimarc/홈/Home_User_manage.cs +++ b/unimarc/unimarc/홈/Home_User_manage.cs @@ -467,5 +467,10 @@ namespace WindowsFormsApp1.Home init_check(); } #endregion + + private void btn_close_Click(object sender, EventArgs e) + { + this.Close(); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/홈/Home_User_manage.resx b/unimarc/unimarc/홈/Home_User_manage.resx index 5d73067..248df90 100644 --- a/unimarc/unimarc/홈/Home_User_manage.resx +++ b/unimarc/unimarc/홈/Home_User_manage.resx @@ -117,401 +117,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - panel12 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - ALL_check2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - ALL_check1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 2 - - - panel11 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - - - panel13 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 4 - - - panel10 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 5 - - - panel14 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 6 - - - panel9 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 7 - - - panel15 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 8 - - - panel8 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 9 - - - panel16 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 10 - - - panel7 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 11 - - - panel17 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 12 - - - panel6 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 13 - - - panel18 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 14 - - - panel5 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 15 - - - panel19 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 16 - - - panel4 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 17 - - - panel20 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 18 - - - panel3 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 19 - - - panel21 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 20 - - - panel2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 21 - - - label5 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 22 - - - label3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 23 - - - label2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 24 - - - label1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 25 - - - - 416, 12 - - - 818, 536 - - - 4 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - - - check20_2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel12 - - - 0 - - - check20_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel12 - - - 1 - - - label37 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel12 - - - 2 - - - -1, 511 - - - 818, 24 - - - 5 - - - panel12 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - True + 738, 4 @@ -584,6 +194,27 @@ 2 + + -1, 511 + + + 818, 24 + + + 5 + + + panel12 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 0 + True @@ -638,63 +269,6 @@ 2 - - check10_2 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel11 - - - 0 - - - check10_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel11 - - - 1 - - - label36 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel11 - - - 2 - - - -1, 281 - - - 818, 24 - - - 4 - - - panel11 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 3 - True @@ -770,62 +344,26 @@ 2 - - check19_2 + + -1, 281 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel13 - - - 0 - - - check19_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel13 - - - 1 - - - label38 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel13 - - - 2 - - - -1, 488 - - + 818, 24 - - 6 + + 4 - - panel13 + + panel11 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 4 + + 3 True @@ -902,62 +440,26 @@ 2 - - check9_2 + + -1, 488 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel10 - - - 0 - - - check9_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel10 - - - 1 - - - label35 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel10 - - - 2 - - - -1, 258 - - + 818, 24 - - 4 + + 6 - - panel10 + + panel13 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 5 + + 4 True @@ -1034,62 +536,26 @@ 2 - - check18_2 + + -1, 258 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel14 - - - 0 - - - check18_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel14 - - - 1 - - - label39 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel14 - - - 2 - - - -1, 465 - - + 818, 24 - - 7 + + 4 - - panel14 + + panel10 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 6 + + 5 True @@ -1166,74 +632,26 @@ 2 - - check8_2 + + -1, 465 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel9 - - - 0 - - - check8_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel9 - - - 1 - - - label34 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel9 - - - 2 - - - label27 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel9 - - - 3 - - - -1, 235 - - + 818, 24 - - 4 + + 7 - - panel9 + + panel14 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 7 + + 6 True @@ -1337,62 +755,26 @@ 3 - - check17_2 + + -1, 235 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel15 - - - 0 - - - check17_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel15 - - - 1 - - - label40 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel15 - - - 2 - - - -1, 442 - - + 818, 24 - - 8 + + 4 - - panel15 + + panel9 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 8 + + 7 True @@ -1469,62 +851,26 @@ 2 - - check7_2 + + -1, 442 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel8 - - - 0 - - - check7_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel8 - - - 1 - - - label33 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel8 - - - 2 - - - -1, 212 - - + 818, 24 - - 4 + + 8 - - panel8 + + panel15 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 9 + + 8 True @@ -1601,62 +947,26 @@ 2 - - check16_2 + + -1, 212 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel16 - - - 0 - - - check16_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel16 - - - 1 - - - label41 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel16 - - - 2 - - - -1, 419 - - + 818, 24 - - 9 + + 4 - - panel16 + + panel8 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 10 + + 9 True @@ -1733,62 +1043,26 @@ 2 - - check6_2 + + -1, 419 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel7 - - - 0 - - - check6_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel7 - - - 1 - - - label32 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel7 - - - 2 - - - -1, 189 - - + 818, 24 - - 4 + + 9 - - panel7 + + panel16 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 11 + + 10 True @@ -1865,62 +1139,26 @@ 2 - - check15_2 + + -1, 189 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel17 - - - 0 - - - check15_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel17 - - - 1 - - - label42 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel17 - - - 2 - - - -1, 396 - - + 818, 24 - - 10 + + 4 - - panel17 + + panel7 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 12 + + 11 True @@ -1997,74 +1235,26 @@ 2 - - check5_2 + + -1, 396 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel6 - - - 0 - - - check5_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel6 - - - 1 - - - label31 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel6 - - - 2 - - - label26 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel6 - - - 3 - - - -1, 166 - - + 818, 24 - - 4 + + 10 - - panel6 + + panel17 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 13 + + 12 True @@ -2168,62 +1358,26 @@ 3 - - check14_2 + + -1, 166 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel18 - - - 0 - - - check14_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel18 - - - 1 - - - label43 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel18 - - - 2 - - - -1, 373 - - + 818, 24 - - 11 + + 4 - - panel18 + + panel6 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 14 + + 13 True @@ -2300,62 +1454,26 @@ 2 - - check4_2 + + -1, 373 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 0 - - - check4_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 1 - - - label30 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel5 - - - 2 - - - -1, 143 - - + 818, 24 - - 4 + + 11 - - panel5 + + panel18 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 15 + + 14 True @@ -2432,62 +1550,26 @@ 2 - - check13_2 + + -1, 143 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel19 - - - 0 - - - check13_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel19 - - - 1 - - - label44 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel19 - - - 2 - - - -1, 350 - - + 818, 24 - - 12 + + 4 - - panel19 + + panel5 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 16 + + 15 True @@ -2564,62 +1646,26 @@ 2 - - check3_2 + + -1, 350 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 0 - - - check3_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 1 - - - label29 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel4 - - - 2 - - - -1, 120 - - + 818, 24 - - 4 + + 12 - - panel4 + + panel19 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 17 + + 16 True @@ -2696,62 +1742,26 @@ 2 - - check12_2 + + -1, 120 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel20 - - - 0 - - - check12_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel20 - - - 1 - - - label45 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel20 - - - 2 - - - -1, 327 - - + 818, 24 - - 13 + + 4 - - panel20 + + panel4 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 18 + + 17 True @@ -2828,62 +1838,26 @@ 2 - - check2_2 + + -1, 327 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 0 - - - check2_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 1 - - - label28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel3 - - - 2 - - - -1, 97 - - + 818, 24 - - 4 + + 13 - - panel3 + + panel20 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 19 + + 18 True @@ -2960,62 +1934,26 @@ 2 - - check11_2 + + -1, 97 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel21 - - - 0 - - - check11_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel21 - - - 1 - - - label46 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel21 - - - 2 - - - -1, 304 - - + 818, 24 - - 14 + + 4 - - panel21 + + panel3 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 20 + + 19 True @@ -3092,62 +2030,26 @@ 2 - - check1_2 + + -1, 304 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 0 - - - check1_1 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 1 - - - label6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel2 - - - 2 - - - -1, 74 - - + 818, 24 - - 4 + + 14 - - panel2 + + panel21 - + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + panel1 - - 21 + + 20 True @@ -3224,6 +2126,27 @@ 2 + + -1, 74 + + + 818, 24 + + + 4 + + + panel2 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + panel1 + + + 21 + True @@ -3344,6 +2267,27 @@ 25 + + 416, 12 + + + 818, 536 + + + 4 + + + panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + 173, 103