diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index fa7741c..bde2c65 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 76cbf4b..d75279d 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 e03a906..c47dd04 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 1dd3487..83de68c 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.AssemblyReference.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache index b7fdc11..f5e894a 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.AssemblyReference.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index f86692b..1b95f61 100644 Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe index 76cbf4b..d75279d 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 e03a906..c47dd04 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 1dd3487..83de68c 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/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs index 92d5937..00ad377 100644 --- a/unimarc/unimarc/마크/Check_copy.cs +++ b/unimarc/unimarc/마크/Check_copy.cs @@ -193,7 +193,7 @@ namespace WindowsFormsApp1.Mac // 광주 광산구 (장덕, 이야기꽃, 첨단, 신가, 운남어린이, 스마트) else if (URL.IndexOf("lib.gwangsan.go.kr") > -1) { - if (URL.IndexOf("bookSearch") > -1) + if (URL.IndexOf("query") > -1) BookCount = 광주광산구결과(); 광주광산구입력(text); @@ -257,13 +257,21 @@ namespace WindowsFormsApp1.Mac 전남여수입력(text); } - // 전남 무안군 공공도서관 else if (URL.IndexOf("muan.go.kr/lib/data/search") > -1) { BookCount = 전남무안입력(text); } + // 전남 목포 시립도서관 + else if (URL.IndexOf("mokpolib.or.kr/dls_lt/index.php") > -1) + { + if (URL.IndexOf("searchWord") > -1) + BookCount = 전남목포결과(); + + 전남목포입력(text); + } + int tmp = RowCount - 1; if (tmp < 0) tmp = 0; @@ -425,19 +433,19 @@ namespace WindowsFormsApp1.Mac void 광주광산구입력(string text) { - foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("select")) - { - if (he.Name.IndexOf("globalSearchLib") > -1) - { - he.SetAttribute("value", Code); - } - } - webBrowser1.Document.GetElementById("globalSearchText").SetAttribute("value", text); + // foreach (HtmlElement he in webBrowser1.Document.GetElementsByTagName("select")) + // { + // if (he.Name.IndexOf("globalSearchLib") > -1) + // { + // he.SetAttribute("value", Code); + // } + // } + webBrowser1.Document.GetElementById("query").SetAttribute("value", text); foreach (HtmlElement Btn in webBrowser1.Document.GetElementsByTagName("button")) { // if (Btn.GetAttribute("className").IndexOf("btn-search") > -1) - if (Btn.GetAttribute("className") == "btn-search") + if (Btn.GetAttribute("className") == "btn btn-lg") Btn.InvokeMember("click"); } } @@ -800,6 +808,47 @@ namespace WindowsFormsApp1.Mac #endregion + #region 전남 목포 + bool isMokClick = false; + + void 전남목포입력(string text) + { + + foreach (HtmlElement input in webBrowser1.Document.GetElementsByTagName("input")) + { + if (input.Id != null && input.Id.IndexOf(Code) > -1 && !isMokClick) + { + input.InvokeMember("click"); + isMokClick = true; + Delay(500); + } + if (input.Id != null && input.Id.IndexOf("searchWord") > -1) + input.SetAttribute("value", text); + } + + foreach (HtmlElement btn in webBrowser1.Document.GetElementsByTagName("input")) + { + if (btn.GetAttribute("className").IndexOf("btn-search") > -1) + btn.InvokeMember("click"); + } + + } + + string 전남목포결과() + { + string result = ""; + + foreach (HtmlElement strong in webBrowser1.Document.GetElementsByTagName("strong")) + { + if (strong.GetAttribute("className").IndexOf("cyan") > -1) + result = Regex.Replace(strong.InnerText, @"\D", ""); + } + + return result; + } + + #endregion + #endregion public string CopyCount(string Text) diff --git a/unimarc/unimarc/마크/Mac_Input.cs b/unimarc/unimarc/마크/Mac_Input.cs index 5c69b92..d290cc8 100644 --- a/unimarc/unimarc/마크/Mac_Input.cs +++ b/unimarc/unimarc/마크/Mac_Input.cs @@ -141,7 +141,7 @@ namespace WindowsFormsApp1.Mac "ISBN", "서명", "총서명", "저자", "출판사", "가격", "marc", "marc_chk", "compidx", "grade", "date", "user", "008tag" }; - for(int a = 0; a < dataGridView1.Rows.Count; a++) + for (int a = 0; a < dataGridView1.Rows.Count; a++) { foreach (string colName in GridCol) { diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs index 03a1c74..241785e 100644 --- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs @@ -28,13 +28,13 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan)); this.panel1 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); @@ -141,7 +141,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1487, 35); + this.panel1.Size = new System.Drawing.Size(1462, 35); this.panel1.TabIndex = 0; // // panel4 @@ -351,14 +351,14 @@ this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.AppWorkspace; - dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.AppWorkspace; + 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.ColumnHeadersHeight = 25; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -389,7 +389,7 @@ this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1487, 544); + this.dataGridView1.Size = new System.Drawing.Size(1462, 544); this.dataGridView1.TabIndex = 1; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); @@ -417,8 +417,8 @@ // // reg_num // - dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.reg_num.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.reg_num.DefaultCellStyle = dataGridViewCellStyle2; this.reg_num.FillWeight = 130.9363F; this.reg_num.HeaderText = "등록번호"; this.reg_num.Name = "reg_num"; @@ -426,8 +426,8 @@ // // class_code // - dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.class_code.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.class_code.DefaultCellStyle = dataGridViewCellStyle3; this.class_code.FillWeight = 76.41504F; this.class_code.HeaderText = "분류"; this.class_code.Name = "class_code"; @@ -435,8 +435,8 @@ // // author_code // - dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.author_code.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.author_code.DefaultCellStyle = dataGridViewCellStyle4; this.author_code.FillWeight = 77.02635F; this.author_code.HeaderText = "저자기호"; this.author_code.Name = "author_code"; @@ -444,8 +444,8 @@ // // volume // - dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.volume.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.volume.DefaultCellStyle = dataGridViewCellStyle5; this.volume.FillWeight = 38.80909F; this.volume.HeaderText = "V"; this.volume.Name = "volume"; @@ -454,8 +454,8 @@ // // copy // - dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.copy.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.copy.DefaultCellStyle = dataGridViewCellStyle6; this.copy.FillWeight = 40.14827F; this.copy.HeaderText = "C"; this.copy.Name = "copy"; @@ -464,8 +464,8 @@ // // prefix // - dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.prefix.DefaultCellStyle = dataGridViewCellStyle21; + dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.prefix.DefaultCellStyle = dataGridViewCellStyle7; this.prefix.FillWeight = 41.51828F; this.prefix.HeaderText = "F"; this.prefix.Name = "prefix"; @@ -609,7 +609,7 @@ this.panel5.Dock = System.Windows.Forms.DockStyle.Top; this.panel5.Location = new System.Drawing.Point(0, 35); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1487, 40); + this.panel5.Size = new System.Drawing.Size(1462, 40); this.panel5.TabIndex = 9; // // panel6 @@ -654,7 +654,7 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel6.Location = new System.Drawing.Point(0, 619); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1487, 59); + this.panel6.Size = new System.Drawing.Size(1462, 59); this.panel6.TabIndex = 10; // // tb_Left @@ -1010,11 +1010,12 @@ this.panel7.Dock = System.Windows.Forms.DockStyle.Fill; this.panel7.Location = new System.Drawing.Point(0, 75); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1487, 544); + this.panel7.Size = new System.Drawing.Size(1462, 544); this.panel7.TabIndex = 11; // // printDocument1 // + this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint); this.printDocument1.PrintPage += new System.Drawing.Printing.PrintPageEventHandler(this.printDocument1_PrintPage); // // printPreviewDialog1 @@ -1031,7 +1032,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1487, 678); + this.ClientSize = new System.Drawing.Size(1462, 678); this.Controls.Add(this.panel7); this.Controls.Add(this.panel6); this.Controls.Add(this.panel5); diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index a99adcb..085c8b5 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -591,6 +591,11 @@ namespace WindowsFormsApp1.Mac /// 여러장 인쇄인지 /// bool isMorePage; + private void printDocument1_BeginPrint(object sender, System.Drawing.Printing.PrintEventArgs e) + { + Cnt = 0; + isMorePage = false; + } private void printDocument1_PrintPage(object sender, System.Drawing.Printing.PrintPageEventArgs e) { @@ -723,6 +728,7 @@ namespace WindowsFormsApp1.Mac foreach (TextBox tb in MyBox) { tb.Text = Box[count].Text; + count++; } cb_TextFont.SelectedItem = Font; @@ -731,5 +737,6 @@ namespace WindowsFormsApp1.Mac chk_V.Checked = ChkByC_V[1]; } #endregion + } } diff --git a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.Designer.cs b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.Designer.cs index 4e611e7..0cd697c 100644 --- a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.Designer.cs +++ b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.Designer.cs @@ -29,7 +29,7 @@ namespace UniMarc.마크 /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); this.tb_Search = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); @@ -38,9 +38,6 @@ namespace UniMarc.마크 this.btn_Close = new System.Windows.Forms.Button(); this.btn_Empty = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel2 = new System.Windows.Forms.Panel(); this.label18 = new System.Windows.Forms.Label(); this.cb_TextFont = new System.Windows.Forms.ComboBox(); @@ -75,6 +72,9 @@ namespace UniMarc.마크 this.tb_ListName = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.btn_Apply = new System.Windows.Forms.Button(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.user = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.panel2.SuspendLayout(); @@ -155,14 +155,14 @@ namespace UniMarc.마크 // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + 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.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.idx, @@ -175,30 +175,8 @@ namespace UniMarc.마크 this.dataGridView1.Size = new System.Drawing.Size(440, 196); this.dataGridView1.TabIndex = 3; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); - this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // - // idx - // - this.idx.HeaderText = "idx"; - this.idx.Name = "idx"; - this.idx.ReadOnly = true; - this.idx.Visible = false; - // - // name - // - this.name.HeaderText = "목록"; - this.name.Name = "name"; - this.name.ReadOnly = true; - this.name.Width = 300; - // - // user - // - this.user.HeaderText = "저장자"; - this.user.Name = "user"; - this.user.ReadOnly = true; - this.user.Width = 80; - // // panel2 // this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -543,6 +521,28 @@ namespace UniMarc.마크 this.btn_Apply.UseVisualStyleBackColor = true; this.btn_Apply.Click += new System.EventHandler(this.btn_Apply_Click); // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.ReadOnly = true; + this.idx.Visible = false; + this.idx.Width = 50; + // + // name + // + this.name.HeaderText = "목록"; + this.name.Name = "name"; + this.name.ReadOnly = true; + this.name.Width = 300; + // + // user + // + this.user.HeaderText = "저장자"; + this.user.Name = "user"; + this.user.ReadOnly = true; + this.user.Width = 80; + // // Marc_Plan_PrintLabel // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -605,12 +605,12 @@ namespace UniMarc.마크 private System.Windows.Forms.CheckBox chk_C; private System.Windows.Forms.CheckBox chk_V; private System.Windows.Forms.Label label18; - private System.Windows.Forms.DataGridViewTextBoxColumn idx; - private System.Windows.Forms.DataGridViewTextBoxColumn name; - private System.Windows.Forms.DataGridViewTextBoxColumn user; private System.Windows.Forms.Button btn_Apply; private System.Windows.Forms.Button btn_Empty; private System.Windows.Forms.Button btn_Delete; private System.Windows.Forms.Button btn_Save; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; + private System.Windows.Forms.DataGridViewTextBoxColumn name; + private System.Windows.Forms.DataGridViewTextBoxColumn user; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs index 6269fc1..f3bc4e6 100644 --- a/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs +++ b/unimarc/unimarc/마크/Marc_Plan_PrintLabel.cs @@ -28,6 +28,8 @@ namespace UniMarc.마크 string[] Font = { "굴림", "굴림체", "돋움", "바탕체", "맑은 고딕", "HY강B", "HY강M" }; cb_TextFont.Items.AddRange(Font); + + SearchList(); } private void tb_Search_KeyDown(object sender, KeyEventArgs e) @@ -41,9 +43,11 @@ namespace UniMarc.마크 /// private void SearchList() { + dataGridView1.Rows.Clear(); + string Text = tb_Search.Text; - string Area = "`compidx`, `name`, `user`"; + string Area = "`idx`, `name`, `user`"; string Tabel = "PrintLabel"; string compidx = Properties.Settings.Default.compidx; @@ -104,11 +108,10 @@ namespace UniMarc.마크 int count = 0; foreach (string Data in SplitData) { - if (tb.Length <= count) - { - tb[count].Text = Data; - } - else if (count == 8) + if (Data == "") + continue; + + if (count == 8) { if (Data == "0") chk_V.Checked = false; @@ -130,6 +133,10 @@ namespace UniMarc.마크 { tb_TextSize.Text = Data; } + else if (tb.Length > count) + { + tb[count].Text = Data; + } count++; } } @@ -275,10 +282,5 @@ namespace UniMarc.마크 Skill_Grid sg = new Skill_Grid(); sg.Print_Grid_Num(sender, e); } - - private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) - { - - } } }