diff --git a/ISBN_Check/Main/ISBN_Check_test.csproj b/ISBN_Check/Main/ISBN_Check_test.csproj index f13fd01..d55226e 100644 --- a/ISBN_Check/Main/ISBN_Check_test.csproj +++ b/ISBN_Check/Main/ISBN_Check_test.csproj @@ -65,32 +65,32 @@ - packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll + ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll - packages\Google.Protobuf.3.14.0\lib\net45\Google.Protobuf.dll + ..\packages\Google.Protobuf.3.14.0\lib\net45\Google.Protobuf.dll - packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll + ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll - packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll + ..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll - packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll + ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll - packages\MySql.Data.8.0.25\lib\net452\MySql.Data.dll + ..\packages\MySql.Data.8.0.25\lib\net452\MySql.Data.dll - packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - packages\SSH.NET.2020.0.1\lib\net40\Renci.SshNet.dll + ..\packages\SSH.NET.2020.0.1\lib\net40\Renci.SshNet.dll - packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -99,14 +99,14 @@ - packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll - packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll - packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll @@ -120,10 +120,10 @@ - packages\MySql.Data.8.0.25\lib\net452\Ubiety.Dns.Core.dll + ..\packages\MySql.Data.8.0.25\lib\net452\Ubiety.Dns.Core.dll - packages\MySql.Data.8.0.25\lib\net452\Zstandard.Net.dll + ..\packages\MySql.Data.8.0.25\lib\net452\Zstandard.Net.dll diff --git a/ISBN_Check/Main/Properties/AssemblyInfo.cs b/ISBN_Check/Main/Properties/AssemblyInfo.cs index 289e559..d2ceb84 100644 --- a/ISBN_Check/Main/Properties/AssemblyInfo.cs +++ b/ISBN_Check/Main/Properties/AssemblyInfo.cs @@ -31,6 +31,6 @@ using System.Runtime.InteropServices; // // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. -[assembly: AssemblyVersion("1.0.0.2")] +[assembly: AssemblyVersion("25.09.24.2340")] // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.2")] +[assembly: AssemblyFileVersion("25.09.24.2340")] diff --git a/ISBN_Check/Main/Yes24.cs b/ISBN_Check/Main/Yes24.cs index 6486707..8a5496b 100644 --- a/ISBN_Check/Main/Yes24.cs +++ b/ISBN_Check/Main/Yes24.cs @@ -12,6 +12,7 @@ using WindowsFormsApp1; using System.Reflection; using System.Text.RegularExpressions; + namespace ISBN_Check_test { public partial class Yes24 : Form @@ -55,16 +56,17 @@ namespace ISBN_Check_test int count = f1.dataGridView1.Rows.Count - 1; string price = ""; - for (int a = 0; a < count; a++) + foreach(DataGridViewRow drowview in f1.dataGridView1.Rows) { - if (f1.dataGridView1.Rows[a].Cells["price"].Value != null) + if (drowview.Cells["price"].Value != null) { - price = f1.dataGridView1.Rows[a].Cells["price"].Value.ToString(); + price = drowview.Cells["price"].Value.ToString(); } - var bookName = f1.dataGridView1.Rows[a].Cells["book_name"].Value?.ToString() ?? string.Empty; - var author = f1.dataGridView1.Rows[a].Cells["author"].Value?.ToString() ?? string.Empty; - var bookComp = f1.dataGridView1.Rows[a].Cells["book_comp"].Value?.ToString() ?? string.Empty; + var bookName = drowview.Cells["book_name"].Value?.ToString() ?? string.Empty; + var author = drowview.Cells["author"].Value?.ToString() ?? string.Empty; + var bookComp = drowview.Cells["book_comp"].Value?.ToString() ?? string.Empty; + if (string.IsNullOrEmpty(bookName) && string.IsNullOrEmpty(author) && string.IsNullOrEmpty(bookComp)) continue; List grid = new List(); grid.Add(bookName); @@ -73,7 +75,7 @@ namespace ISBN_Check_test grid.Add(Replace_target(author, "author")); grid.Add(bookComp); grid.Add(Replace_target(bookComp, "book_comp")); - + grid.Add(price); dataGridView1.Rows.Add(grid.ToArray()); } @@ -124,15 +126,17 @@ namespace ISBN_Check_test private void btn_change_Click(object sender, EventArgs e) { string[,] grid = new string[dataGridView1.Rows.Count, 6]; - for (int a = 0; a < dataGridView1.Rows.Count; a++) + var idx = 0; + foreach (DataGridViewRow drv in dataGridView1.Rows)// int a = 0; a < dataGridView1.Rows.Count; a++) { - string price = dataGridView1.Rows[a].Cells["price"].Value?.ToString() ?? string.Empty; - int count = a + 1; - grid[a, 0] = count.ToString(); - grid[a, 1] = dataGridView1.Rows[a].Cells["after_book_name"].Value.ToString(); - grid[a, 3] = dataGridView1.Rows[a].Cells["after_book_comp"].Value.ToString(); - grid[a, 4] = Regex.Replace(price, @"[^0-9]", ""); - grid[a, 5] = "1"; + string price = drv.Cells["price"].Value?.ToString() ?? string.Empty; + int count = idx + 1; + grid[idx, 0] = count.ToString(); + grid[idx, 1] = drv.Cells["after_book_name"].Value.ToString(); + grid[idx, 3] = drv.Cells["after_book_comp"].Value.ToString(); + grid[idx, 4] = Regex.Replace(price, @"[^0-9]", ""); + grid[idx, 5] = "1"; + idx += 1; } Excel_change(grid); } diff --git a/unimarc/unimarc/Properties/AssemblyInfo.cs b/unimarc/unimarc/Properties/AssemblyInfo.cs index 3fe38ac..4a508cf 100644 --- a/unimarc/unimarc/Properties/AssemblyInfo.cs +++ b/unimarc/unimarc/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2025.09.17.2300")] -[assembly: AssemblyFileVersion("2025.09.17.2300")] +[assembly: AssemblyVersion("2025.09.24.2340")] +[assembly: AssemblyFileVersion("2025.09.24.2340")] diff --git a/unimarc/unimarc/SearchModel/DLSSearcher.cs b/unimarc/unimarc/SearchModel/DLSSearcher.cs index 9bd23ae..60b7ddd 100644 --- a/unimarc/unimarc/SearchModel/DLSSearcher.cs +++ b/unimarc/unimarc/SearchModel/DLSSearcher.cs @@ -13,6 +13,7 @@ using UniMarc.마크; using OpenQA.Selenium.Chromium; using UniMarc.SearchModel; using System.Runtime.CompilerServices; +using AR; namespace BokBonCheck { @@ -169,6 +170,11 @@ namespace BokBonCheck if (_driver.Url.EndsWith("/bookMain") == false) { retrycnt += 1; + if (retrycnt > 3) + { + UTIL.MsgE("3회 연속 로그인 시도로 인해 자동 로그인을 중단합니다\n사용자가 직접 로그인을 하세요"); + break; + } Console.WriteLine($"도서검색화면으로 이동({retrycnt})"); _driver.Navigate().GoToUrl(this.SiteUrl); wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(15)); @@ -190,6 +196,8 @@ namespace BokBonCheck this.SCHOOL = schoolname; this.STYPE = searchtype; } + + string BookMainURL = string.Empty; public async Task SearchAsync(string searchTerm) { var result = new BookSearchResult @@ -247,6 +255,19 @@ namespace BokBonCheck } } + if (string.IsNullOrEmpty(BookMainURL)) + { + BookMainURL = _driver.Url; + } + else + { + //확실하게 하기위해 메인페이지로 다시 이동한다. + _driver.Navigate().GoToUrl(this.SiteUrl); + new WebDriverWait(_driver, TimeSpan.FromSeconds(15)); + await Task.Delay(500); + } + + // 페이지 로딩 대기 var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(15)); @@ -378,23 +399,24 @@ namespace BokBonCheck { SafeClick(buttomelm); var wait = new WebDriverWait(_driver, TimeSpan.FromSeconds(15)); - Thread.Sleep(200); + Thread.Sleep(500); } } - catch - { + catch (Exception ex) + { + Console.WriteLine(ex.Message); } - - errmessage = "검색결과없음"; + + errmessage = "검색결과없음"; return 0; } } } catch (Exception ex) { - + Console.WriteLine(ex.Message); } try { @@ -422,7 +444,7 @@ namespace BokBonCheck } catch (Exception ex) { - + Console.WriteLine(ex.Message); } diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 6f43aa8..14ef1e3 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -327,6 +327,12 @@ Check_Copy_Login.cs + + Form + + + Check_Copy_Sub_Selector.cs + Form @@ -1024,6 +1030,9 @@ Check_Copy_Login.cs + + Check_Copy_Sub_Selector.cs + Help_007.cs diff --git a/unimarc/unimarc/마크/Check_Copy_Sub_Selector.Designer.cs b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.Designer.cs new file mode 100644 index 0000000..dbdc8ce --- /dev/null +++ b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.Designer.cs @@ -0,0 +1,149 @@ + +namespace UniMarc.마크 +{ + partial class Check_Copy_Sub_Selector + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + this.dv1 = new System.Windows.Forms.DataGridView(); + this.lib_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.tbSearch = new System.Windows.Forms.TextBox(); + this.btFind = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // dv1 + // + this.dv1.AllowUserToAddRows = false; + this.dv1.AllowUserToDeleteRows = false; + this.dv1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dv1.BackgroundColor = System.Drawing.SystemColors.Control; + 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.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dv1.ColumnHeadersHeight = 35; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.lib_name}); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 2, 0, 2); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv1.DefaultCellStyle = dataGridViewCellStyle2; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.dv1.Name = "dv1"; + this.dv1.ReadOnly = true; + this.dv1.RowHeadersWidth = 51; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(631, 823); + this.dv1.TabIndex = 0; + this.dv1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); + this.dv1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); + this.dv1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); + // + // lib_name + // + this.lib_name.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.lib_name.HeaderText = "도서관명"; + this.lib_name.MinimumWidth = 6; + this.lib_name.Name = "lib_name"; + this.lib_name.ReadOnly = true; + // + // panel1 + // + this.panel1.Controls.Add(this.tbSearch); + this.panel1.Controls.Add(this.btFind); + this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel1.Location = new System.Drawing.Point(0, 823); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(3); + this.panel1.Size = new System.Drawing.Size(631, 45); + this.panel1.TabIndex = 1; + // + // tbSearch + // + this.tbSearch.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbSearch.Font = new System.Drawing.Font("굴림", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSearch.Location = new System.Drawing.Point(3, 3); + this.tbSearch.Name = "tbSearch"; + this.tbSearch.Size = new System.Drawing.Size(498, 38); + this.tbSearch.TabIndex = 0; + this.tbSearch.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // btFind + // + this.btFind.Dock = System.Windows.Forms.DockStyle.Right; + this.btFind.Location = new System.Drawing.Point(501, 3); + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(127, 39); + this.btFind.TabIndex = 1; + this.btFind.Text = "검색"; + this.btFind.UseVisualStyleBackColor = true; + this.btFind.Click += new System.EventHandler(this.btFind_Click); + // + // Check_Copy_Sub_Selector + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(631, 868); + this.Controls.Add(this.dv1); + this.Controls.Add(this.panel1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Name = "Check_Copy_Sub_Selector"; + this.Text = "도서관 검색"; + this.Load += new System.EventHandler(this.Check_Copy_Sub_Selector_Load); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.DataGridView dv1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Button btFind; + private System.Windows.Forms.TextBox tbSearch; + private System.Windows.Forms.DataGridViewTextBoxColumn lib_name; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_Copy_Sub_Selector.cs b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.cs new file mode 100644 index 0000000..e0eb1b5 --- /dev/null +++ b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.cs @@ -0,0 +1,109 @@ +using AR; +using Org.BouncyCastle.Utilities; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows.Forms.VisualStyles; +using WindowsFormsApp1; +using WindowsFormsApp1.Mac; + +namespace UniMarc.마크 +{ + public partial class Check_Copy_Sub_Selector : Form + { + string[] Items; + public string SelectedValue = string.Empty; + public Check_Copy_Sub_Selector(string[] arrays, string search) + { + InitializeComponent(); + this.KeyPreview = true; + tbSearch.Text = search; + this.Items = arrays; + this.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Escape) this.Close(); + }; + this.tbSearch.ImeMode = ImeMode.Hangul; + this.tbSearch.KeyDown += (s1, e1) => { + if (e1.KeyCode == Keys.Enter) btFind.PerformClick(); + }; + } + + private void dataGridView1_RowPostPaint(object sender, DataGridViewRowPostPaintEventArgs e) + { + Skill_Grid sg = new Skill_Grid(); + sg.Print_Grid_Num(sender, e); + } + + private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) + { + if (e.RowIndex < 0) return; + int row = e.RowIndex; + + SetCode(e.RowIndex); + this.Close(); + } + + void SetCode(int rowindex) + { + var drow = dv1.Rows[rowindex]; + var title = drow.Cells[0].Value?.ToString() ?? string.Empty; + this.SelectedValue = title; + } + + private void dataGridView1_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) + { + if (dv1.Rows.Count <= 0) return; + SetCode(dv1.CurrentRow.Index); + this.Close(); + } + if (e.KeyCode == Keys.Escape) + { + SelectedValue = string.Empty; + this.Close(); + } + + } + + + private void btFind_Click(object sender, EventArgs e) + { + var search = tbSearch.Text.Trim(); + this.dv1.Rows.Clear(); + foreach (var item in this.Items) + { + if (search.isEmpty() || item.ToLower().Contains(search.ToLower())) + this.dv1.Rows.Add(item); + } + if (search.isEmpty() == true) + { + tbSearch.Focus(); + tbSearch.SelectAll(); + } + else if (dv1.Rows.Count > 0) + { + dv1.Focus(); + } + else + { + tbSearch.Focus(); + tbSearch.SelectAll(); + } + + } + + private void Check_Copy_Sub_Selector_Load(object sender, EventArgs e) + { + this.Show(); + Application.DoEvents(); + this.btFind.PerformClick(); + } + } +} diff --git a/unimarc/unimarc/마크/Check_Copy_Sub_Selector.resx b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.resx new file mode 100644 index 0000000..9cadc75 --- /dev/null +++ b/unimarc/unimarc/마크/Check_Copy_Sub_Selector.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_copyWD.Designer.cs b/unimarc/unimarc/마크/Check_copyWD.Designer.cs index 9abb84f..97b7380 100644 --- a/unimarc/unimarc/마크/Check_copyWD.Designer.cs +++ b/unimarc/unimarc/마크/Check_copyWD.Designer.cs @@ -29,8 +29,10 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); + this.label1 = new System.Windows.Forms.Label(); + this.nudAddDelay = new System.Windows.Forms.NumericUpDown(); this.chkShowBrowser = new System.Windows.Forms.CheckBox(); this.chkRetryErrData = new System.Windows.Forms.CheckBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -45,12 +47,17 @@ this.btn_Stop = new System.Windows.Forms.Button(); this.btn_Close = new System.Windows.Forms.Button(); this.tb_SearchTarget = new System.Windows.Forms.ComboBox(); - this.btSearchLibrary = new System.Windows.Forms.Label(); + this.btSearchLibrary = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); this.btn_SiteDenote = new System.Windows.Forms.Button(); this.lbl_PW = new System.Windows.Forms.Label(); this.lbl_ID = new System.Windows.Forms.Label(); this.dv1 = new System.Windows.Forms.DataGridView(); + this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_resulthtml = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.일반문자로붙여넣기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -66,14 +73,8 @@ this.btn_GridReset = new System.Windows.Forms.Button(); this.btn_OpenMemo = new System.Windows.Forms.Button(); this.chk_spChar = new System.Windows.Forms.CheckBox(); - this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_resulthtml = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.nudAddDelay = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).BeginInit(); this.groupBox1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); @@ -82,7 +83,6 @@ this.panel6.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.panel4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).BeginInit(); this.SuspendLayout(); // // panel1 @@ -99,19 +99,39 @@ this.panel1.Controls.Add(this.btn_Start); this.panel1.Controls.Add(this.btn_Stop); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(0, 34); + this.panel1.Location = new System.Drawing.Point(0, 42); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(719, 106); + this.panel1.Size = new System.Drawing.Size(822, 132); this.panel1.TabIndex = 0; // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(639, 104); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(67, 15); + this.label1.TabIndex = 10; + this.label1.Text = "추가지연"; + // + // nudAddDelay + // + this.nudAddDelay.Location = new System.Drawing.Point(706, 99); + this.nudAddDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudAddDelay.Name = "nudAddDelay"; + this.nudAddDelay.Size = new System.Drawing.Size(64, 25); + this.nudAddDelay.TabIndex = 9; + this.nudAddDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // chkShowBrowser // this.chkShowBrowser.AutoSize = true; this.chkShowBrowser.Checked = true; this.chkShowBrowser.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkShowBrowser.Location = new System.Drawing.Point(618, 50); + this.chkShowBrowser.Location = new System.Drawing.Point(706, 62); + this.chkShowBrowser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chkShowBrowser.Name = "chkShowBrowser"; - this.chkShowBrowser.Size = new System.Drawing.Size(96, 16); + this.chkShowBrowser.Size = new System.Drawing.Size(119, 19); this.chkShowBrowser.TabIndex = 8; this.chkShowBrowser.Text = "브라우저표시"; this.chkShowBrowser.UseVisualStyleBackColor = true; @@ -121,9 +141,10 @@ this.chkRetryErrData.AutoSize = true; this.chkRetryErrData.Checked = true; this.chkRetryErrData.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRetryErrData.Location = new System.Drawing.Point(319, 81); + this.chkRetryErrData.Location = new System.Drawing.Point(365, 101); + this.chkRetryErrData.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chkRetryErrData.Name = "chkRetryErrData"; - this.chkRetryErrData.Size = new System.Drawing.Size(188, 16); + this.chkRetryErrData.Size = new System.Drawing.Size(234, 19); this.chkRetryErrData.TabIndex = 7; this.chkRetryErrData.Text = "검색 후 오류 데이터 추가 검색"; this.chkRetryErrData.UseVisualStyleBackColor = true; @@ -134,9 +155,11 @@ this.groupBox1.Controls.Add(this.radTargetEmpty); this.groupBox1.Controls.Add(this.radTargetErrEmpty); this.groupBox1.Controls.Add(this.radTargetAll); - this.groupBox1.Location = new System.Drawing.Point(318, 34); + this.groupBox1.Location = new System.Drawing.Point(363, 42); + this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(294, 39); + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.groupBox1.Size = new System.Drawing.Size(336, 49); this.groupBox1.TabIndex = 6; this.groupBox1.TabStop = false; this.groupBox1.Text = "검색대상"; @@ -144,9 +167,10 @@ // radTargetErr // this.radTargetErr.AutoSize = true; - this.radTargetErr.Location = new System.Drawing.Point(239, 16); + this.radTargetErr.Location = new System.Drawing.Point(273, 20); + this.radTargetErr.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.radTargetErr.Name = "radTargetErr"; - this.radTargetErr.Size = new System.Drawing.Size(47, 16); + this.radTargetErr.Size = new System.Drawing.Size(58, 19); this.radTargetErr.TabIndex = 9; this.radTargetErr.Text = "오류"; this.radTargetErr.UseVisualStyleBackColor = true; @@ -154,9 +178,10 @@ // radTargetEmpty // this.radTargetEmpty.AutoSize = true; - this.radTargetEmpty.Location = new System.Drawing.Point(172, 16); + this.radTargetEmpty.Location = new System.Drawing.Point(197, 20); + this.radTargetEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.radTargetEmpty.Name = "radTargetEmpty"; - this.radTargetEmpty.Size = new System.Drawing.Size(47, 16); + this.radTargetEmpty.Size = new System.Drawing.Size(58, 19); this.radTargetEmpty.TabIndex = 8; this.radTargetEmpty.Text = "없음"; this.radTargetEmpty.UseVisualStyleBackColor = true; @@ -164,9 +189,10 @@ // radTargetErrEmpty // this.radTargetErrEmpty.AutoSize = true; - this.radTargetErrEmpty.Location = new System.Drawing.Point(75, 16); + this.radTargetErrEmpty.Location = new System.Drawing.Point(86, 20); + this.radTargetErrEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.radTargetErrEmpty.Name = "radTargetErrEmpty"; - this.radTargetErrEmpty.Size = new System.Drawing.Size(77, 16); + this.radTargetErrEmpty.Size = new System.Drawing.Size(96, 19); this.radTargetErrEmpty.TabIndex = 7; this.radTargetErrEmpty.Text = "오류+없음"; this.radTargetErrEmpty.UseVisualStyleBackColor = true; @@ -175,9 +201,10 @@ // this.radTargetAll.AutoSize = true; this.radTargetAll.Checked = true; - this.radTargetAll.Location = new System.Drawing.Point(8, 16); + this.radTargetAll.Location = new System.Drawing.Point(9, 20); + this.radTargetAll.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.radTargetAll.Name = "radTargetAll"; - this.radTargetAll.Size = new System.Drawing.Size(47, 16); + this.radTargetAll.Size = new System.Drawing.Size(58, 19); this.radTargetAll.TabIndex = 6; this.radTargetAll.TabStop = true; this.radTargetAll.Text = "전체"; @@ -186,9 +213,10 @@ // rb_isNumber // this.rb_isNumber.AutoSize = true; - this.rb_isNumber.Location = new System.Drawing.Point(394, 8); + this.rb_isNumber.Location = new System.Drawing.Point(450, 10); + this.rb_isNumber.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.rb_isNumber.Name = "rb_isNumber"; - this.rb_isNumber.Size = new System.Drawing.Size(71, 16); + this.rb_isNumber.Size = new System.Drawing.Size(88, 19); this.rb_isNumber.TabIndex = 5; this.rb_isNumber.TabStop = true; this.rb_isNumber.Text = "숫자표출"; @@ -198,9 +226,10 @@ // this.rb_isHave.AutoSize = true; this.rb_isHave.Checked = true; - this.rb_isHave.Location = new System.Drawing.Point(318, 8); + this.rb_isHave.Location = new System.Drawing.Point(363, 10); + this.rb_isHave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.rb_isHave.Name = "rb_isHave"; - this.rb_isHave.Size = new System.Drawing.Size(71, 16); + this.rb_isHave.Size = new System.Drawing.Size(88, 19); this.rb_isHave.TabIndex = 5; this.rb_isHave.TabStop = true; this.rb_isHave.Text = "소장표출"; @@ -208,9 +237,10 @@ // // btn_SearchList // - this.btn_SearchList.Location = new System.Drawing.Point(4, 4); + this.btn_SearchList.Location = new System.Drawing.Point(5, 5); + this.btn_SearchList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_SearchList.Name = "btn_SearchList"; - this.btn_SearchList.Size = new System.Drawing.Size(305, 93); + this.btn_SearchList.Size = new System.Drawing.Size(349, 116); this.btn_SearchList.TabIndex = 3; this.btn_SearchList.Text = "목록 검색"; this.btn_SearchList.UseVisualStyleBackColor = true; @@ -218,9 +248,10 @@ // // btn_Start // - this.btn_Start.Location = new System.Drawing.Point(470, 4); + this.btn_Start.Location = new System.Drawing.Point(537, 5); + this.btn_Start.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Start.Name = "btn_Start"; - this.btn_Start.Size = new System.Drawing.Size(153, 24); + this.btn_Start.Size = new System.Drawing.Size(175, 30); this.btn_Start.TabIndex = 2; this.btn_Start.Text = "검색시작"; this.btn_Start.UseVisualStyleBackColor = true; @@ -228,9 +259,10 @@ // // btn_Stop // - this.btn_Stop.Location = new System.Drawing.Point(631, 4); + this.btn_Stop.Location = new System.Drawing.Point(721, 5); + this.btn_Stop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Stop.Name = "btn_Stop"; - this.btn_Stop.Size = new System.Drawing.Size(75, 24); + this.btn_Stop.Size = new System.Drawing.Size(86, 30); this.btn_Stop.TabIndex = 2; this.btn_Stop.Text = "검색중지"; this.btn_Stop.UseVisualStyleBackColor = true; @@ -238,9 +270,10 @@ // // btn_Close // - this.btn_Close.Location = new System.Drawing.Point(631, 4); + this.btn_Close.Location = new System.Drawing.Point(721, 5); + this.btn_Close.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(75, 24); + this.btn_Close.Size = new System.Drawing.Size(86, 30); this.btn_Close.TabIndex = 2; this.btn_Close.Text = "닫 기"; this.btn_Close.UseVisualStyleBackColor = true; @@ -248,13 +281,14 @@ // // tb_SearchTarget // - this.tb_SearchTarget.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; + this.tb_SearchTarget.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; this.tb_SearchTarget.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; this.tb_SearchTarget.Enabled = false; this.tb_SearchTarget.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tb_SearchTarget.Location = new System.Drawing.Point(66, 6); + this.tb_SearchTarget.Location = new System.Drawing.Point(91, 8); + this.tb_SearchTarget.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_SearchTarget.Name = "tb_SearchTarget"; - this.tb_SearchTarget.Size = new System.Drawing.Size(390, 20); + this.tb_SearchTarget.Size = new System.Drawing.Size(429, 23); this.tb_SearchTarget.TabIndex = 1; this.tb_SearchTarget.SelectedIndexChanged += new System.EventHandler(this.tb_SearchTarget_SelectedIndexChanged); this.tb_SearchTarget.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchTarget_KeyDown); @@ -262,9 +296,9 @@ // btSearchLibrary // this.btSearchLibrary.AutoSize = true; - this.btSearchLibrary.Location = new System.Drawing.Point(7, 10); + this.btSearchLibrary.Location = new System.Drawing.Point(8, 7); this.btSearchLibrary.Name = "btSearchLibrary"; - this.btSearchLibrary.Size = new System.Drawing.Size(53, 12); + this.btSearchLibrary.Size = new System.Drawing.Size(77, 25); this.btSearchLibrary.TabIndex = 0; this.btSearchLibrary.Text = "검색대상"; this.btSearchLibrary.Click += new System.EventHandler(this.btSearchLibrary_Click); @@ -280,15 +314,17 @@ this.panel2.Controls.Add(this.btn_Close); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(719, 34); + this.panel2.Size = new System.Drawing.Size(822, 42); this.panel2.TabIndex = 0; // // btn_SiteDenote // - this.btn_SiteDenote.Location = new System.Drawing.Point(470, 5); + this.btn_SiteDenote.Location = new System.Drawing.Point(537, 6); + this.btn_SiteDenote.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_SiteDenote.Name = "btn_SiteDenote"; - this.btn_SiteDenote.Size = new System.Drawing.Size(155, 23); + this.btn_SiteDenote.Size = new System.Drawing.Size(177, 29); this.btn_SiteDenote.TabIndex = 4; this.btn_SiteDenote.Text = "사이트 표출"; this.btn_SiteDenote.UseVisualStyleBackColor = true; @@ -297,18 +333,18 @@ // lbl_PW // this.lbl_PW.AutoSize = true; - this.lbl_PW.Location = new System.Drawing.Point(379, 10); + this.lbl_PW.Location = new System.Drawing.Point(433, 12); this.lbl_PW.Name = "lbl_PW"; - this.lbl_PW.Size = new System.Drawing.Size(9, 12); + this.lbl_PW.Size = new System.Drawing.Size(12, 15); this.lbl_PW.TabIndex = 3; this.lbl_PW.Text = " "; // // lbl_ID // this.lbl_ID.AutoSize = true; - this.lbl_ID.Location = new System.Drawing.Point(316, 10); + this.lbl_ID.Location = new System.Drawing.Point(361, 12); this.lbl_ID.Name = "lbl_ID"; - this.lbl_ID.Size = new System.Drawing.Size(9, 12); + this.lbl_ID.Size = new System.Drawing.Size(12, 15); this.lbl_ID.TabIndex = 3; this.lbl_ID.Text = " "; // @@ -318,14 +354,14 @@ this.dv1.BackgroundColor = System.Drawing.SystemColors.Control; this.dv1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dv1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - 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.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + 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.dv1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.book_name, @@ -336,40 +372,82 @@ this.dv1.ContextMenuStrip = this.contextMenuStrip1; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dv1.Name = "dv1"; + this.dv1.RowHeadersWidth = 51; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(719, 542); + this.dv1.Size = new System.Drawing.Size(822, 680); this.dv1.TabIndex = 1; this.dv1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dv1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // book_name + // + this.book_name.HeaderText = "도서명(총서명)"; + this.book_name.MinimumWidth = 6; + this.book_name.Name = "book_name"; + this.book_name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.book_name.Width = 300; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.MinimumWidth = 6; + this.book_comp.Name = "book_comp"; + this.book_comp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.book_comp.Width = 120; + // + // Count + // + this.Count.HeaderText = "검색 수"; + this.Count.MinimumWidth = 6; + this.Count.Name = "Count"; + this.Count.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.Count.Width = 50; + // + // dvc_remark + // + this.dvc_remark.HeaderText = "비고"; + this.dvc_remark.MinimumWidth = 6; + this.dvc_remark.Name = "dvc_remark"; + this.dvc_remark.Width = 110; + // + // dvc_resulthtml + // + this.dvc_resulthtml.HeaderText = "결과"; + this.dvc_resulthtml.MinimumWidth = 6; + this.dvc_resulthtml.Name = "dvc_resulthtml"; + this.dvc_resulthtml.Width = 125; + // // contextMenuStrip1 // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem, this.일반문자로붙여넣기ToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(215, 48); + this.contextMenuStrip1.Size = new System.Drawing.Size(254, 52); // // 유니코드문자로붙여넝ㅎ기ToolStripMenuItem // this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem.Name = "유니코드문자로붙여넝ㅎ기ToolStripMenuItem"; - this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem.Size = new System.Drawing.Size(214, 22); + this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem.Size = new System.Drawing.Size(253, 24); this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem.Text = "유니코드 문자로 붙여넣기"; this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem.Click += new System.EventHandler(this.유니코드문자로붙여넝ㅎ기ToolStripMenuItem_Click); // // 일반문자로붙여넣기ToolStripMenuItem // this.일반문자로붙여넣기ToolStripMenuItem.Name = "일반문자로붙여넣기ToolStripMenuItem"; - this.일반문자로붙여넣기ToolStripMenuItem.Size = new System.Drawing.Size(214, 22); + this.일반문자로붙여넣기ToolStripMenuItem.Size = new System.Drawing.Size(253, 24); this.일반문자로붙여넣기ToolStripMenuItem.Text = "일반 문자로 붙여넣기"; this.일반문자로붙여넣기ToolStripMenuItem.Click += new System.EventHandler(this.일반문자로붙여넣기ToolStripMenuItem_Click); // // btn_ApplyFilter // - this.btn_ApplyFilter.Location = new System.Drawing.Point(317, 4); + this.btn_ApplyFilter.Location = new System.Drawing.Point(362, 5); + this.btn_ApplyFilter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_ApplyFilter.Name = "btn_ApplyFilter"; - this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24); + this.btn_ApplyFilter.Size = new System.Drawing.Size(86, 30); this.btn_ApplyFilter.TabIndex = 2; this.btn_ApplyFilter.Text = "필터적용"; this.btn_ApplyFilter.UseVisualStyleBackColor = true; @@ -383,8 +461,9 @@ this.panel3.Controls.Add(this.panel2); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(719, 738); + this.panel3.Size = new System.Drawing.Size(822, 922); this.panel3.TabIndex = 3; // // panel6 @@ -392,32 +471,35 @@ this.panel6.Controls.Add(this.dv1); this.panel6.Controls.Add(this.statusStrip1); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(0, 174); + this.panel6.Location = new System.Drawing.Point(0, 216); + this.panel6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(719, 564); + this.panel6.Size = new System.Drawing.Size(822, 706); this.panel6.TabIndex = 3; // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lblStatus, this.lbSite}); - this.statusStrip1.Location = new System.Drawing.Point(0, 542); + this.statusStrip1.Location = new System.Drawing.Point(0, 680); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(719, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0); + this.statusStrip1.Size = new System.Drawing.Size(822, 26); this.statusStrip1.TabIndex = 2; this.statusStrip1.Text = "statusStrip1"; // // lblStatus // this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(27, 20); + this.lblStatus.Size = new System.Drawing.Size(34, 24); this.lblStatus.Text = "WD"; // // lbSite // this.lbSite.Name = "lbSite"; - this.lbSite.Size = new System.Drawing.Size(55, 17); + this.lbSite.Size = new System.Drawing.Size(68, 20); this.lbSite.Text = "-- Site --"; // // panel4 @@ -430,26 +512,29 @@ this.panel4.Controls.Add(this.btn_ApplyFilter); this.panel4.Controls.Add(this.chk_spChar); this.panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.panel4.Location = new System.Drawing.Point(0, 140); + this.panel4.Location = new System.Drawing.Point(0, 174); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(719, 34); + this.panel4.Size = new System.Drawing.Size(822, 42); this.panel4.TabIndex = 2; // // chk_RemoveBrit // this.chk_RemoveBrit.AutoSize = true; - this.chk_RemoveBrit.Location = new System.Drawing.Point(113, 8); + this.chk_RemoveBrit.Location = new System.Drawing.Point(129, 10); + this.chk_RemoveBrit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chk_RemoveBrit.Name = "chk_RemoveBrit"; - this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16); + this.chk_RemoveBrit.Size = new System.Drawing.Size(159, 19); this.chk_RemoveBrit.TabIndex = 0; this.chk_RemoveBrit.Text = "괄호안의 문자 제거"; this.chk_RemoveBrit.UseVisualStyleBackColor = true; // // btn_ResultEmpty // - this.btn_ResultEmpty.Location = new System.Drawing.Point(471, 4); + this.btn_ResultEmpty.Location = new System.Drawing.Point(538, 5); + this.btn_ResultEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_ResultEmpty.Name = "btn_ResultEmpty"; - this.btn_ResultEmpty.Size = new System.Drawing.Size(75, 24); + this.btn_ResultEmpty.Size = new System.Drawing.Size(86, 30); this.btn_ResultEmpty.TabIndex = 2; this.btn_ResultEmpty.Text = "결과 비움"; this.btn_ResultEmpty.UseVisualStyleBackColor = true; @@ -457,9 +542,10 @@ // // btn_GridReset // - this.btn_GridReset.Location = new System.Drawing.Point(548, 4); + this.btn_GridReset.Location = new System.Drawing.Point(626, 5); + this.btn_GridReset.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_GridReset.Name = "btn_GridReset"; - this.btn_GridReset.Size = new System.Drawing.Size(75, 24); + this.btn_GridReset.Size = new System.Drawing.Size(86, 30); this.btn_GridReset.TabIndex = 2; this.btn_GridReset.Text = "표 비우기"; this.btn_GridReset.UseVisualStyleBackColor = true; @@ -467,9 +553,10 @@ // // btn_OpenMemo // - this.btn_OpenMemo.Location = new System.Drawing.Point(394, 4); + this.btn_OpenMemo.Location = new System.Drawing.Point(450, 5); + this.btn_OpenMemo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_OpenMemo.Name = "btn_OpenMemo"; - this.btn_OpenMemo.Size = new System.Drawing.Size(75, 24); + this.btn_OpenMemo.Size = new System.Drawing.Size(86, 30); this.btn_OpenMemo.TabIndex = 2; this.btn_OpenMemo.Text = ".txt 열기"; this.btn_OpenMemo.UseVisualStyleBackColor = true; @@ -478,74 +565,28 @@ // chk_spChar // this.chk_spChar.AutoSize = true; - this.chk_spChar.Location = new System.Drawing.Point(7, 8); + this.chk_spChar.Location = new System.Drawing.Point(8, 10); + this.chk_spChar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chk_spChar.Name = "chk_spChar"; - this.chk_spChar.Size = new System.Drawing.Size(100, 16); + this.chk_spChar.Size = new System.Drawing.Size(124, 19); this.chk_spChar.TabIndex = 0; this.chk_spChar.Text = "특수문자 제거"; this.chk_spChar.UseVisualStyleBackColor = true; // - // book_name - // - this.book_name.HeaderText = "도서명(총서명)"; - this.book_name.Name = "book_name"; - this.book_name.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.book_name.Width = 300; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.book_comp.Width = 120; - // - // Count - // - this.Count.HeaderText = "검색 수"; - this.Count.Name = "Count"; - this.Count.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.Count.Width = 50; - // - // dvc_remark - // - this.dvc_remark.HeaderText = "비고"; - this.dvc_remark.Name = "dvc_remark"; - this.dvc_remark.Width = 110; - // - // dvc_resulthtml - // - this.dvc_resulthtml.HeaderText = "결과"; - this.dvc_resulthtml.Name = "dvc_resulthtml"; - // - // nudAddDelay - // - this.nudAddDelay.Location = new System.Drawing.Point(618, 79); - this.nudAddDelay.Name = "nudAddDelay"; - this.nudAddDelay.Size = new System.Drawing.Size(56, 21); - this.nudAddDelay.TabIndex = 9; - this.nudAddDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(559, 83); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); - this.label1.TabIndex = 10; - this.label1.Text = "추가지연"; - // // Check_copyWD // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(719, 738); + this.ClientSize = new System.Drawing.Size(822, 922); this.Controls.Add(this.panel3); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Check_copyWD"; this.Text = "복본조사(New)"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Check_copy_FormClosing); this.Load += new System.EventHandler(this.Check_copy_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).EndInit(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); this.panel2.ResumeLayout(false); @@ -559,7 +600,6 @@ this.statusStrip1.PerformLayout(); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).EndInit(); this.ResumeLayout(false); } @@ -567,7 +607,7 @@ #endregion private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label btSearchLibrary; + private System.Windows.Forms.Button btSearchLibrary; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Button btn_Stop; diff --git a/unimarc/unimarc/마크/Check_copyWD.cs b/unimarc/unimarc/마크/Check_copyWD.cs index 044b062..db38991 100644 --- a/unimarc/unimarc/마크/Check_copyWD.cs +++ b/unimarc/unimarc/마크/Check_copyWD.cs @@ -13,6 +13,7 @@ using System.Linq; using UniMarc; using System.Globalization; using System.Threading.Tasks; +using System.Collections.Generic; namespace WindowsFormsApp1.Mac { @@ -554,13 +555,23 @@ namespace WindowsFormsApp1.Mac string Target = tb_SearchTarget.Text; // if (Target == "") { MessageBox.Show("도서관명이 비어있습니다."); return; } - string area = "`Province`, `Area`, `LibName`, `Code`, `URL`, `SearcherNo`"; - string cmd = string.Format("SELECT {0} FROM `lib_CopyCheck` WHERE CONCAT( province , '_' , AREA , '_' , libname) LIKE '%{1}%' and ifnull(searcherno,0) > 0 ;", area, Target); - string data = db.self_Made_Cmd(cmd); - string[] ary = data.Split('|'); - Check_Copy_Sub_Search ccs = new Check_Copy_Sub_Search(this); - ccs.Init(ary, Target); - ccs.Show(); + List items = new List(); + foreach (string item in tb_SearchTarget.Items) + { + if (items.Contains(item) == false) items.Add(item); + } + + + //string area = "`Province`, `Area`, `LibName`, `Code`, `URL`, `SearcherNo`"; + //string cmd = string.Format("SELECT {0} FROM `lib_CopyCheck` WHERE CONCAT( province , '_' , AREA , '_' , libname) LIKE '%{1}%' and ifnull(searcherno,0) > 0 ;", area, Target); + //string data = db.self_Made_Cmd(cmd); + string[] ary = items.ToArray();// data.Split('|'); + using (var ccs = new Check_Copy_Sub_Selector(items.ToArray(), Target)) + { + ccs.ShowDialog(); + if (ccs.SelectedValue.isEmpty() == false) + tb_SearchTarget.Text = ccs.SelectedValue; + } } private void btn_SearchList_Click(object sender, EventArgs e) @@ -712,8 +723,8 @@ namespace WindowsFormsApp1.Mac drow.DefaultCellStyle.BackColor = Color.HotPink; drow.DefaultCellStyle.ForeColor = Color.Blue; } - if(addDelay > 0) - await Task.Delay(addDelay); + if (addDelay > 0) + await Task.Delay(addDelay); } if (_isSearching == true && retry == false && chkRetryErrData.Checked) @@ -1004,7 +1015,7 @@ namespace WindowsFormsApp1.Mac private void 유니코드문자로붙여넝ㅎ기ToolStripMenuItem_Click(object sender, EventArgs e) { Skill_Grid sg = new Skill_Grid(); - var newkey = new KeyEventArgs(Keys.Control | Keys.V | Keys.Alt ); + var newkey = new KeyEventArgs(Keys.Control | Keys.V | Keys.Alt); sg.Excel_to_DataGridView(this.dv1, newkey); } diff --git a/unimarc/unimarc/마크/Check_copyWD.resx b/unimarc/unimarc/마크/Check_copyWD.resx index 59145b0..8b01152 100644 --- a/unimarc/unimarc/마크/Check_copyWD.resx +++ b/unimarc/unimarc/마크/Check_copyWD.resx @@ -138,4 +138,7 @@ 17, 17 + + 17, 17 + \ No newline at end of file diff --git a/unimarc/unimarc/마크/DLS_Copy.Designer.cs b/unimarc/unimarc/마크/DLS_Copy.Designer.cs index f6c4580..5ed57e8 100644 --- a/unimarc/unimarc/마크/DLS_Copy.Designer.cs +++ b/unimarc/unimarc/마크/DLS_Copy.Designer.cs @@ -32,12 +32,18 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel8 = new System.Windows.Forms.Panel(); this.dv1 = new System.Windows.Forms.DataGridView(); + this.Book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel5 = new System.Windows.Forms.Panel(); - this.chkShowBrowser = new System.Windows.Forms.CheckBox(); + this.btn_ResultEmpty = new System.Windows.Forms.Button(); + this.btn_GridReset = new System.Windows.Forms.Button(); this.chk_RemoveBrit = new System.Windows.Forms.CheckBox(); this.chk_spChar = new System.Windows.Forms.CheckBox(); this.btn_ApplyFilter = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); + this.chkShowBrowser = new System.Windows.Forms.CheckBox(); this.label2 = new System.Windows.Forms.Label(); this.rBtn_ISBN = new System.Windows.Forms.RadioButton(); this.btnStop = new System.Windows.Forms.Button(); @@ -53,12 +59,8 @@ this.tb_SearchClient = new System.Windows.Forms.TextBox(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.lblStatus = new System.Windows.Forms.ToolStripLabel(); - this.btn_ResultEmpty = new System.Windows.Forms.Button(); - this.btn_GridReset = new System.Windows.Forms.Button(); - this.Book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_count = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label3 = new System.Windows.Forms.Label(); + this.nudAddDelay = new System.Windows.Forms.NumericUpDown(); this.panel1.SuspendLayout(); this.panel8.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); @@ -66,14 +68,16 @@ this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).BeginInit(); this.SuspendLayout(); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(7, 5); + this.label1.Location = new System.Drawing.Point(8, 6); + this.label1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(63, 22); + this.label1.Size = new System.Drawing.Size(88, 31); this.label1.TabIndex = 0; this.label1.Text = "납품처명"; this.label1.Click += new System.EventHandler(this.label1_Click); @@ -87,17 +91,19 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; 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.Size = new System.Drawing.Size(640, 699); + this.panel1.Size = new System.Drawing.Size(731, 879); this.panel1.TabIndex = 1; // // panel8 // this.panel8.Controls.Add(this.dv1); this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(0, 103); + this.panel8.Location = new System.Drawing.Point(0, 127); + this.panel8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(638, 594); + this.panel8.Size = new System.Drawing.Size(729, 750); this.panel8.TabIndex = 5; // // dv1 @@ -112,14 +118,44 @@ this.dvc_Remark}); this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dv1.Name = "dv1"; this.dv1.RowHeadersWidth = 31; this.dv1.RowTemplate.Height = 23; - this.dv1.Size = new System.Drawing.Size(638, 594); + this.dv1.Size = new System.Drawing.Size(729, 750); this.dv1.TabIndex = 0; this.dv1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); this.dv1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // Book_name + // + this.Book_name.HeaderText = "도서명"; + this.Book_name.MinimumWidth = 6; + this.Book_name.Name = "Book_name"; + this.Book_name.Width = 140; + // + // ISBN + // + this.ISBN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.ISBN.HeaderText = "ISBN"; + this.ISBN.MinimumWidth = 6; + this.ISBN.Name = "ISBN"; + this.ISBN.Width = 140; + // + // dvc_count + // + this.dvc_count.HeaderText = "검색"; + this.dvc_count.MinimumWidth = 6; + this.dvc_count.Name = "dvc_count"; + this.dvc_count.Width = 125; + // + // dvc_Remark + // + this.dvc_Remark.HeaderText = "비고"; + this.dvc_Remark.MinimumWidth = 6; + this.dvc_Remark.Name = "dvc_Remark"; + this.dvc_Remark.Width = 200; + // // panel5 // this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; @@ -129,30 +165,41 @@ this.panel5.Controls.Add(this.chk_spChar); this.panel5.Controls.Add(this.btn_ApplyFilter); this.panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.panel5.Location = new System.Drawing.Point(0, 68); + this.panel5.Location = new System.Drawing.Point(0, 84); + this.panel5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(638, 35); + this.panel5.Size = new System.Drawing.Size(729, 43); this.panel5.TabIndex = 4; // - // chkShowBrowser + // btn_ResultEmpty // - this.chkShowBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkShowBrowser.AutoSize = true; - this.chkShowBrowser.Checked = true; - this.chkShowBrowser.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkShowBrowser.Location = new System.Drawing.Point(354, 9); - this.chkShowBrowser.Name = "chkShowBrowser"; - this.chkShowBrowser.Size = new System.Drawing.Size(96, 16); - this.chkShowBrowser.TabIndex = 209; - this.chkShowBrowser.Text = "브라우저표시"; - this.chkShowBrowser.UseVisualStyleBackColor = true; + this.btn_ResultEmpty.Location = new System.Drawing.Point(546, 5); + this.btn_ResultEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_ResultEmpty.Name = "btn_ResultEmpty"; + this.btn_ResultEmpty.Size = new System.Drawing.Size(86, 30); + this.btn_ResultEmpty.TabIndex = 6; + this.btn_ResultEmpty.Text = "결과 비움"; + this.btn_ResultEmpty.UseVisualStyleBackColor = true; + this.btn_ResultEmpty.Click += new System.EventHandler(this.btn_ResultEmpty_Click); + // + // btn_GridReset + // + this.btn_GridReset.Location = new System.Drawing.Point(634, 5); + this.btn_GridReset.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.btn_GridReset.Name = "btn_GridReset"; + this.btn_GridReset.Size = new System.Drawing.Size(86, 30); + this.btn_GridReset.TabIndex = 7; + this.btn_GridReset.Text = "표 비우기"; + this.btn_GridReset.UseVisualStyleBackColor = true; + this.btn_GridReset.Click += new System.EventHandler(this.btn_GridReset_Click); // // chk_RemoveBrit // this.chk_RemoveBrit.AutoSize = true; - this.chk_RemoveBrit.Location = new System.Drawing.Point(116, 8); + this.chk_RemoveBrit.Location = new System.Drawing.Point(133, 10); + this.chk_RemoveBrit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chk_RemoveBrit.Name = "chk_RemoveBrit"; - this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16); + this.chk_RemoveBrit.Size = new System.Drawing.Size(159, 19); this.chk_RemoveBrit.TabIndex = 3; this.chk_RemoveBrit.Text = "괄호안의 문자 제거"; this.chk_RemoveBrit.UseVisualStyleBackColor = true; @@ -160,9 +207,10 @@ // chk_spChar // this.chk_spChar.AutoSize = true; - this.chk_spChar.Location = new System.Drawing.Point(10, 8); + this.chk_spChar.Location = new System.Drawing.Point(11, 10); + this.chk_spChar.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.chk_spChar.Name = "chk_spChar"; - this.chk_spChar.Size = new System.Drawing.Size(100, 16); + this.chk_spChar.Size = new System.Drawing.Size(124, 19); this.chk_spChar.TabIndex = 4; this.chk_spChar.Text = "특수문자 제거"; this.chk_spChar.UseVisualStyleBackColor = true; @@ -170,9 +218,10 @@ // btn_ApplyFilter // this.btn_ApplyFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_ApplyFilter.Location = new System.Drawing.Point(258, 4); + this.btn_ApplyFilter.Location = new System.Drawing.Point(295, 5); + this.btn_ApplyFilter.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_ApplyFilter.Name = "btn_ApplyFilter"; - this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24); + this.btn_ApplyFilter.Size = new System.Drawing.Size(86, 30); this.btn_ApplyFilter.TabIndex = 5; this.btn_ApplyFilter.Text = "필터적용"; this.btn_ApplyFilter.UseVisualStyleBackColor = true; @@ -181,6 +230,8 @@ // panel3 // this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.label3); + this.panel3.Controls.Add(this.nudAddDelay); this.panel3.Controls.Add(this.chkShowBrowser); this.panel3.Controls.Add(this.label2); this.panel3.Controls.Add(this.rBtn_ISBN); @@ -188,17 +239,32 @@ this.panel3.Controls.Add(this.btn_Search); this.panel3.Controls.Add(this.rBtn_BookName); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(0, 33); + this.panel3.Location = new System.Drawing.Point(0, 41); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(638, 35); + this.panel3.Size = new System.Drawing.Size(729, 43); this.panel3.TabIndex = 4; // + // chkShowBrowser + // + this.chkShowBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowBrowser.AutoSize = true; + this.chkShowBrowser.Checked = true; + this.chkShowBrowser.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkShowBrowser.Location = new System.Drawing.Point(395, 11); + this.chkShowBrowser.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.chkShowBrowser.Name = "chkShowBrowser"; + this.chkShowBrowser.Size = new System.Drawing.Size(119, 19); + this.chkShowBrowser.TabIndex = 209; + this.chkShowBrowser.Text = "브라우저표시"; + this.chkShowBrowser.UseVisualStyleBackColor = true; + // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(7, 11); + this.label2.Location = new System.Drawing.Point(8, 14); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(67, 15); this.label2.TabIndex = 3; this.label2.Text = "검색조건"; // @@ -206,9 +272,10 @@ // this.rBtn_ISBN.AutoSize = true; this.rBtn_ISBN.Checked = true; - this.rBtn_ISBN.Location = new System.Drawing.Point(153, 9); + this.rBtn_ISBN.Location = new System.Drawing.Point(175, 11); + this.rBtn_ISBN.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.rBtn_ISBN.Name = "rBtn_ISBN"; - this.rBtn_ISBN.Size = new System.Drawing.Size(51, 16); + this.rBtn_ISBN.Size = new System.Drawing.Size(60, 19); this.rBtn_ISBN.TabIndex = 4; this.rBtn_ISBN.TabStop = true; this.rBtn_ISBN.Text = "ISBN"; @@ -216,9 +283,10 @@ // // btnStop // - this.btnStop.Location = new System.Drawing.Point(283, 5); + this.btnStop.Location = new System.Drawing.Point(323, 6); + this.btnStop.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(65, 23); + this.btnStop.Size = new System.Drawing.Size(74, 29); this.btnStop.TabIndex = 2; this.btnStop.Text = "중 지"; this.btnStop.UseVisualStyleBackColor = true; @@ -226,9 +294,10 @@ // // btn_Search // - this.btn_Search.Location = new System.Drawing.Point(217, 5); + this.btn_Search.Location = new System.Drawing.Point(248, 6); + this.btn_Search.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Search.Name = "btn_Search"; - this.btn_Search.Size = new System.Drawing.Size(65, 23); + this.btn_Search.Size = new System.Drawing.Size(74, 29); this.btn_Search.TabIndex = 2; this.btn_Search.Text = "검 색"; this.btn_Search.UseVisualStyleBackColor = true; @@ -237,9 +306,10 @@ // rBtn_BookName // this.rBtn_BookName.AutoSize = true; - this.rBtn_BookName.Location = new System.Drawing.Point(68, 9); + this.rBtn_BookName.Location = new System.Drawing.Point(78, 11); + this.rBtn_BookName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.rBtn_BookName.Name = "rBtn_BookName"; - this.rBtn_BookName.Size = new System.Drawing.Size(59, 16); + this.rBtn_BookName.Size = new System.Drawing.Size(73, 19); this.rBtn_BookName.TabIndex = 4; this.rBtn_BookName.Text = "도서명"; this.rBtn_BookName.UseVisualStyleBackColor = true; @@ -257,16 +327,18 @@ this.panel2.Controls.Add(this.tb_SearchClient); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(638, 33); + this.panel2.Size = new System.Drawing.Size(729, 41); this.panel2.TabIndex = 3; // // btn_SiteDenote // this.btn_SiteDenote.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_SiteDenote.Location = new System.Drawing.Point(555, 5); + this.btn_SiteDenote.Location = new System.Drawing.Point(634, 6); + this.btn_SiteDenote.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_SiteDenote.Name = "btn_SiteDenote"; - this.btn_SiteDenote.Size = new System.Drawing.Size(77, 23); + this.btn_SiteDenote.Size = new System.Drawing.Size(88, 29); this.btn_SiteDenote.TabIndex = 6; this.btn_SiteDenote.Text = "사이트 표출"; this.btn_SiteDenote.UseVisualStyleBackColor = true; @@ -275,9 +347,10 @@ // btn_Connect // this.btn_Connect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btn_Connect.Location = new System.Drawing.Point(479, 5); + this.btn_Connect.Location = new System.Drawing.Point(547, 6); + this.btn_Connect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_Connect.Name = "btn_Connect"; - this.btn_Connect.Size = new System.Drawing.Size(70, 23); + this.btn_Connect.Size = new System.Drawing.Size(80, 29); this.btn_Connect.TabIndex = 5; this.btn_Connect.Text = "접속"; this.btn_Connect.UseVisualStyleBackColor = true; @@ -286,36 +359,36 @@ // lbl_PW // this.lbl_PW.AutoSize = true; - this.lbl_PW.Location = new System.Drawing.Point(297, 37); + this.lbl_PW.Location = new System.Drawing.Point(339, 46); this.lbl_PW.Name = "lbl_PW"; - this.lbl_PW.Size = new System.Drawing.Size(23, 12); + this.lbl_PW.Size = new System.Drawing.Size(31, 15); this.lbl_PW.TabIndex = 3; this.lbl_PW.Text = "PW"; // // lbl_Area // this.lbl_Area.AutoSize = true; - this.lbl_Area.Location = new System.Drawing.Point(97, 37); + this.lbl_Area.Location = new System.Drawing.Point(111, 46); this.lbl_Area.Name = "lbl_Area"; - this.lbl_Area.Size = new System.Drawing.Size(31, 12); + this.lbl_Area.Size = new System.Drawing.Size(36, 15); this.lbl_Area.TabIndex = 3; this.lbl_Area.Text = "Area"; // // lbl_ID // this.lbl_ID.AutoSize = true; - this.lbl_ID.Location = new System.Drawing.Point(185, 37); + this.lbl_ID.Location = new System.Drawing.Point(211, 46); this.lbl_ID.Name = "lbl_ID"; - this.lbl_ID.Size = new System.Drawing.Size(16, 12); + this.lbl_ID.Size = new System.Drawing.Size(20, 15); this.lbl_ID.TabIndex = 3; this.lbl_ID.Text = "ID"; // // lbl_Client // this.lbl_Client.AutoSize = true; - this.lbl_Client.Location = new System.Drawing.Point(7, 37); + this.lbl_Client.Location = new System.Drawing.Point(8, 46); this.lbl_Client.Name = "lbl_Client"; - this.lbl_Client.Size = new System.Drawing.Size(37, 12); + this.lbl_Client.Size = new System.Drawing.Size(43, 15); this.lbl_Client.TabIndex = 3; this.lbl_Client.Text = "Client"; // @@ -324,80 +397,58 @@ this.tb_SearchClient.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.tb_SearchClient.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tb_SearchClient.Location = new System.Drawing.Point(76, 6); + this.tb_SearchClient.Location = new System.Drawing.Point(87, 8); + this.tb_SearchClient.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_SearchClient.Name = "tb_SearchClient"; - this.tb_SearchClient.Size = new System.Drawing.Size(397, 21); + this.tb_SearchClient.Size = new System.Drawing.Size(453, 25); this.tb_SearchClient.TabIndex = 1; this.tb_SearchClient.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_SearchClient_KeyDown); // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lblStatus}); - this.statusStrip1.Location = new System.Drawing.Point(0, 699); + this.statusStrip1.Location = new System.Drawing.Point(0, 879); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(640, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 16, 0); + this.statusStrip1.Size = new System.Drawing.Size(731, 22); this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; // // lblStatus // this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(27, 20); + this.lblStatus.Size = new System.Drawing.Size(34, 20); this.lblStatus.Text = "WD"; this.lblStatus.Click += new System.EventHandler(this.lblStatus_Click); // - // btn_ResultEmpty + // label3 // - this.btn_ResultEmpty.Location = new System.Drawing.Point(478, 4); - this.btn_ResultEmpty.Name = "btn_ResultEmpty"; - this.btn_ResultEmpty.Size = new System.Drawing.Size(75, 24); - this.btn_ResultEmpty.TabIndex = 6; - this.btn_ResultEmpty.Text = "결과 비움"; - this.btn_ResultEmpty.UseVisualStyleBackColor = true; - this.btn_ResultEmpty.Click += new System.EventHandler(this.btn_ResultEmpty_Click); + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(591, 13); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(67, 15); + this.label3.TabIndex = 211; + this.label3.Text = "추가지연"; // - // btn_GridReset + // nudAddDelay // - this.btn_GridReset.Location = new System.Drawing.Point(555, 4); - this.btn_GridReset.Name = "btn_GridReset"; - this.btn_GridReset.Size = new System.Drawing.Size(75, 24); - this.btn_GridReset.TabIndex = 7; - this.btn_GridReset.Text = "표 비우기"; - this.btn_GridReset.UseVisualStyleBackColor = true; - this.btn_GridReset.Click += new System.EventHandler(this.btn_GridReset_Click); - // - // Book_name - // - this.Book_name.HeaderText = "도서명"; - this.Book_name.Name = "Book_name"; - this.Book_name.Width = 140; - // - // ISBN - // - this.ISBN.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.ISBN.HeaderText = "ISBN"; - this.ISBN.Name = "ISBN"; - this.ISBN.Width = 140; - // - // dvc_count - // - this.dvc_count.HeaderText = "검색"; - this.dvc_count.Name = "dvc_count"; - // - // dvc_Remark - // - this.dvc_Remark.HeaderText = "비고"; - this.dvc_Remark.Name = "dvc_Remark"; - this.dvc_Remark.Width = 200; + this.nudAddDelay.Location = new System.Drawing.Point(658, 8); + this.nudAddDelay.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.nudAddDelay.Name = "nudAddDelay"; + this.nudAddDelay.Size = new System.Drawing.Size(64, 25); + this.nudAddDelay.TabIndex = 210; + this.nudAddDelay.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // DLS_Copy // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(640, 721); + this.ClientSize = new System.Drawing.Size(731, 901); this.Controls.Add(this.panel1); this.Controls.Add(this.statusStrip1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "DLS_Copy"; this.Text = "DLS 복본조사"; this.Load += new System.EventHandler(this.DLS_Copy_Load); @@ -412,6 +463,7 @@ this.panel2.PerformLayout(); this.statusStrip1.ResumeLayout(false); this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudAddDelay)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -450,5 +502,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn ISBN; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_count; private System.Windows.Forms.DataGridViewTextBoxColumn dvc_Remark; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.NumericUpDown nudAddDelay; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/DLS_Copy.cs b/unimarc/unimarc/마크/DLS_Copy.cs index ee9b8c3..0b50dd2 100644 --- a/unimarc/unimarc/마크/DLS_Copy.cs +++ b/unimarc/unimarc/마크/DLS_Copy.cs @@ -212,6 +212,8 @@ namespace WindowsFormsApp1.Mac var sType = rBtn_ISBN.Checked ? "ea_isbn" : "title"; _searcher.SetParameter(this.lbl_ID.Text, lbl_PW.Text, "유덕초등학교", sType); + int addDelay = (int)nudAddDelay.Value * 1000; //추가 지연시간 : 1개의 레코드 처리 후 추가 지연한다. + foreach (DataGridViewRow dr in this.dv1.Rows) { var title = dr.Cells[0].Value?.ToString() ?? string.Empty; @@ -232,6 +234,9 @@ namespace WindowsFormsApp1.Mac else dr.DefaultCellStyle.BackColor = Color.LightSkyBlue; } + + if (addDelay > 0) + await Task.Delay(addDelay); } diff --git a/unimarc/unimarc/홈/Transaction_manage.Designer.cs b/unimarc/unimarc/홈/Transaction_manage.Designer.cs index b412be8..ece8c95 100644 --- a/unimarc/unimarc/홈/Transaction_manage.Designer.cs +++ b/unimarc/unimarc/홈/Transaction_manage.Designer.cs @@ -77,6 +77,8 @@ this.label = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.program = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.bigo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.btExportList = new System.Windows.Forms.ToolStripMenuItem(); this.tb_man1 = new System.Windows.Forms.TextBox(); this.btn_search = new System.Windows.Forms.Button(); this.tb_id = new System.Windows.Forms.TextBox(); @@ -133,9 +135,8 @@ this.panel7 = new System.Windows.Forms.Panel(); this.panel6 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.btExportList = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + this.contextMenuStrip1.SuspendLayout(); this.panel1.SuspendLayout(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); @@ -147,75 +148,78 @@ this.panel7.SuspendLayout(); this.panel6.SuspendLayout(); this.panel5.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // // NameLabel // this.NameLabel.AutoSize = true; this.NameLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.NameLabel.Location = new System.Drawing.Point(21, 55); + this.NameLabel.Location = new System.Drawing.Point(24, 69); this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(49, 12); + this.NameLabel.Size = new System.Drawing.Size(62, 15); this.NameLabel.TabIndex = 0; this.NameLabel.Text = "업 체 명"; // // tb_sangho // - this.tb_sangho.Location = new System.Drawing.Point(74, 51); + this.tb_sangho.Location = new System.Drawing.Point(85, 64); + this.tb_sangho.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_sangho.Name = "tb_sangho"; - this.tb_sangho.Size = new System.Drawing.Size(138, 21); + this.tb_sangho.Size = new System.Drawing.Size(157, 25); this.tb_sangho.TabIndex = 1; this.tb_sangho.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // // tb_addr // - this.tb_addr.Location = new System.Drawing.Point(164, 147); + this.tb_addr.Location = new System.Drawing.Point(187, 184); + this.tb_addr.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_addr.Name = "tb_addr"; - this.tb_addr.Size = new System.Drawing.Size(388, 21); + this.tb_addr.Size = new System.Drawing.Size(443, 25); this.tb_addr.TabIndex = 26; // // label3 // this.label3.AutoSize = true; this.label3.ForeColor = System.Drawing.SystemColors.ControlText; - this.label3.Location = new System.Drawing.Point(19, 151); + this.label3.Location = new System.Drawing.Point(22, 189); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(53, 12); + this.label3.Size = new System.Drawing.Size(67, 15); this.label3.TabIndex = 24; this.label3.Text = "주 소"; // // tb_man // - this.tb_man.Location = new System.Drawing.Point(74, 123); + this.tb_man.Location = new System.Drawing.Point(85, 154); + this.tb_man.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_man.Name = "tb_man"; - this.tb_man.Size = new System.Drawing.Size(194, 21); + this.tb_man.Size = new System.Drawing.Size(221, 25); this.tb_man.TabIndex = 20; // // label4 // this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.SystemColors.ControlText; - this.label4.Location = new System.Drawing.Point(3, 127); + this.label4.Location = new System.Drawing.Point(3, 159); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(69, 12); + this.label4.Size = new System.Drawing.Size(87, 15); this.label4.TabIndex = 19; this.label4.Text = "담당자 정보"; // // tb_fax // - this.tb_fax.Location = new System.Drawing.Point(358, 99); + this.tb_fax.Location = new System.Drawing.Point(409, 124); + this.tb_fax.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_fax.Name = "tb_fax"; - this.tb_fax.Size = new System.Drawing.Size(194, 21); + this.tb_fax.Size = new System.Drawing.Size(221, 25); this.tb_fax.TabIndex = 16; // // label6 // this.label6.AutoSize = true; this.label6.ForeColor = System.Drawing.SystemColors.ControlText; - this.label6.Location = new System.Drawing.Point(303, 103); + this.label6.Location = new System.Drawing.Point(346, 129); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(53, 12); + this.label6.Size = new System.Drawing.Size(67, 15); this.label6.TabIndex = 15; this.label6.Text = "팩 스"; // @@ -223,9 +227,9 @@ // this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ControlText; - this.label7.Location = new System.Drawing.Point(21, 175); + this.label7.Location = new System.Drawing.Point(24, 219); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(49, 12); + this.label7.Size = new System.Drawing.Size(62, 15); this.label7.TabIndex = 27; this.label7.Text = "아 이 디"; // @@ -234,9 +238,10 @@ this.btn_delete.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_delete.Dock = System.Windows.Forms.DockStyle.Fill; this.btn_delete.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_delete.Location = new System.Drawing.Point(753, 4); + this.btn_delete.Location = new System.Drawing.Point(858, 5); + this.btn_delete.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_delete.Name = "btn_delete"; - this.btn_delete.Size = new System.Drawing.Size(100, 36); + this.btn_delete.Size = new System.Drawing.Size(115, 45); this.btn_delete.TabIndex = 42; this.btn_delete.Text = "삭 제"; this.btn_delete.UseVisualStyleBackColor = true; @@ -247,9 +252,10 @@ this.btn_save.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_save.Dock = System.Windows.Forms.DockStyle.Fill; this.btn_save.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_save.Location = new System.Drawing.Point(646, 4); + this.btn_save.Location = new System.Drawing.Point(736, 5); + this.btn_save.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_save.Name = "btn_save"; - this.btn_save.Size = new System.Drawing.Size(100, 36); + this.btn_save.Size = new System.Drawing.Size(115, 45); this.btn_save.TabIndex = 40; this.btn_save.Text = "수 정"; this.btn_save.UseVisualStyleBackColor = true; @@ -260,9 +266,10 @@ this.btn_add.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btn_add.Dock = System.Windows.Forms.DockStyle.Fill; this.btn_add.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btn_add.Location = new System.Drawing.Point(539, 4); + this.btn_add.Location = new System.Drawing.Point(614, 5); + this.btn_add.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_add.Name = "btn_add"; - this.btn_add.Size = new System.Drawing.Size(100, 36); + this.btn_add.Size = new System.Drawing.Size(115, 45); this.btn_add.TabIndex = 39; this.btn_add.Text = "추 가"; this.btn_add.UseVisualStyleBackColor = true; @@ -272,9 +279,9 @@ // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ControlText; - this.label1.Location = new System.Drawing.Point(303, 55); + this.label1.Location = new System.Drawing.Point(346, 69); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.Size = new System.Drawing.Size(67, 15); this.label1.TabIndex = 3; this.label1.Text = "구 분"; // @@ -282,34 +289,37 @@ // this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.SystemColors.ControlText; - this.label2.Location = new System.Drawing.Point(19, 103); + this.label2.Location = new System.Drawing.Point(22, 129); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); + this.label2.Size = new System.Drawing.Size(67, 15); this.label2.TabIndex = 13; this.label2.Text = "전화번호"; // // tb_tel // - this.tb_tel.Location = new System.Drawing.Point(74, 99); + this.tb_tel.Location = new System.Drawing.Point(85, 124); + this.tb_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_tel.Name = "tb_tel"; - this.tb_tel.Size = new System.Drawing.Size(194, 21); + this.tb_tel.Size = new System.Drawing.Size(221, 25); this.tb_tel.TabIndex = 14; // // cb_gubun2 // this.cb_gubun2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_gubun2.FormattingEnabled = true; - this.cb_gubun2.Location = new System.Drawing.Point(457, 51); + this.cb_gubun2.Location = new System.Drawing.Point(522, 64); + this.cb_gubun2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cb_gubun2.Name = "cb_gubun2"; - this.cb_gubun2.Size = new System.Drawing.Size(95, 20); + this.cb_gubun2.Size = new System.Drawing.Size(108, 23); this.cb_gubun2.TabIndex = 4; // // rtb_etc // this.rtb_etc.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.rtb_etc.Location = new System.Drawing.Point(74, 219); + this.rtb_etc.Location = new System.Drawing.Point(85, 274); + this.rtb_etc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.rtb_etc.Name = "rtb_etc"; - this.rtb_etc.Size = new System.Drawing.Size(762, 186); + this.rtb_etc.Size = new System.Drawing.Size(870, 232); this.rtb_etc.TabIndex = 38; this.rtb_etc.Text = ""; // @@ -358,6 +368,7 @@ this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.dv1.MultiSelect = false; this.dv1.Name = "dv1"; this.dv1.ReadOnly = true; @@ -372,20 +383,23 @@ this.dv1.RowHeadersWidth = 21; this.dv1.RowTemplate.Height = 23; this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(967, 425); + this.dv1.Size = new System.Drawing.Size(1105, 532); this.dv1.TabIndex = 44; this.dv1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); // // idx // this.idx.HeaderText = "idx"; + this.idx.MinimumWidth = 6; this.idx.Name = "idx"; this.idx.ReadOnly = true; this.idx.Visible = false; + this.idx.Width = 125; // // sangho // this.sangho.HeaderText = "업체명"; + this.sangho.MinimumWidth = 6; this.sangho.Name = "sangho"; this.sangho.ReadOnly = true; this.sangho.Width = 150; @@ -393,6 +407,7 @@ // gubun // this.gubun.HeaderText = "구분"; + this.gubun.MinimumWidth = 6; this.gubun.Name = "gubun"; this.gubun.ReadOnly = true; this.gubun.Width = 80; @@ -400,48 +415,63 @@ // boss // this.boss.HeaderText = "대표자명"; + this.boss.MinimumWidth = 6; this.boss.Name = "boss"; this.boss.ReadOnly = true; + this.boss.Width = 125; // // bubin // this.bubin.HeaderText = "등록번호"; + this.bubin.MinimumWidth = 6; this.bubin.Name = "bubin"; this.bubin.ReadOnly = true; + this.bubin.Width = 125; // // uptae // this.uptae.HeaderText = "업태"; + this.uptae.MinimumWidth = 6; this.uptae.Name = "uptae"; this.uptae.ReadOnly = true; + this.uptae.Width = 125; // // jongmok // this.jongmok.HeaderText = "종목"; + this.jongmok.MinimumWidth = 6; this.jongmok.Name = "jongmok"; this.jongmok.ReadOnly = true; + this.jongmok.Width = 125; // // tel // this.tel.HeaderText = "전화번호"; + this.tel.MinimumWidth = 6; this.tel.Name = "tel"; this.tel.ReadOnly = true; + this.tel.Width = 125; // // fax // this.fax.HeaderText = "팩스"; + this.fax.MinimumWidth = 6; this.fax.Name = "fax"; this.fax.ReadOnly = true; + this.fax.Width = 125; // // mail // this.mail.HeaderText = "메일"; + this.mail.MinimumWidth = 6; this.mail.Name = "mail"; this.mail.ReadOnly = true; + this.mail.Width = 125; // // man // this.man.HeaderText = "담당자"; + this.man.MinimumWidth = 6; this.man.Name = "man"; this.man.ReadOnly = true; this.man.Width = 80; @@ -449,6 +479,7 @@ // mantel // this.mantel.HeaderText = "담당자 정보"; + this.mantel.MinimumWidth = 6; this.mantel.Name = "mantel"; this.mantel.ReadOnly = true; this.mantel.Width = 160; @@ -456,18 +487,23 @@ // assumer // this.assumer.HeaderText = "담당직원"; + this.assumer.MinimumWidth = 6; this.assumer.Name = "assumer"; this.assumer.ReadOnly = true; + this.assumer.Width = 125; // // post_num // this.post_num.HeaderText = "우편번호"; + this.post_num.MinimumWidth = 6; this.post_num.Name = "post_num"; this.post_num.ReadOnly = true; + this.post_num.Width = 125; // // addr // this.addr.HeaderText = "주소"; + this.addr.MinimumWidth = 6; this.addr.Name = "addr"; this.addr.ReadOnly = true; this.addr.Width = 200; @@ -475,59 +511,90 @@ // dlsArea // this.dlsArea.HeaderText = "DLS지역"; + this.dlsArea.MinimumWidth = 6; this.dlsArea.Name = "dlsArea"; this.dlsArea.ReadOnly = true; + this.dlsArea.Width = 125; // // DLSid // this.DLSid.HeaderText = "아이디"; + this.DLSid.MinimumWidth = 6; this.DLSid.Name = "DLSid"; this.DLSid.ReadOnly = true; + this.DLSid.Width = 125; // // DLSpw // this.DLSpw.HeaderText = "비밀번호"; + this.DLSpw.MinimumWidth = 6; this.DLSpw.Name = "DLSpw"; this.DLSpw.ReadOnly = true; + this.DLSpw.Width = 125; // // division // this.division.HeaderText = "용지칸수"; + this.division.MinimumWidth = 6; this.division.Name = "division"; this.division.ReadOnly = true; + this.division.Width = 125; // // label // this.label.HeaderText = "띠라벨"; + this.label.MinimumWidth = 6; this.label.Name = "label"; this.label.ReadOnly = true; + this.label.Width = 125; // // program // this.program.HeaderText = "사용프로그램"; + this.program.MinimumWidth = 6; this.program.Name = "program"; this.program.ReadOnly = true; + this.program.Width = 125; // // bigo // this.bigo.HeaderText = "비고"; + this.bigo.MinimumWidth = 6; this.bigo.Name = "bigo"; this.bigo.ReadOnly = true; this.bigo.Visible = false; + this.bigo.Width = 125; + // + // contextMenuStrip1 + // + this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btExportList}); + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(174, 28); + // + // btExportList + // + this.btExportList.Name = "btExportList"; + this.btExportList.Size = new System.Drawing.Size(173, 24); + this.btExportList.Text = "목록 내보내기"; + this.btExportList.Click += new System.EventHandler(this.btExportList_Click); // // tb_man1 // - this.tb_man1.Location = new System.Drawing.Point(271, 123); + this.tb_man1.Location = new System.Drawing.Point(310, 154); + this.tb_man1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_man1.Name = "tb_man1"; - this.tb_man1.Size = new System.Drawing.Size(281, 21); + this.tb_man1.Size = new System.Drawing.Size(321, 25); this.tb_man1.TabIndex = 21; // // btn_search // this.btn_search.Dock = System.Windows.Forms.DockStyle.Fill; - this.btn_search.Location = new System.Drawing.Point(325, 4); + this.btn_search.Location = new System.Drawing.Point(370, 5); + this.btn_search.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_search.Name = "btn_search"; - this.btn_search.Size = new System.Drawing.Size(100, 36); + this.btn_search.Size = new System.Drawing.Size(115, 45); this.btn_search.TabIndex = 2; this.btn_search.Text = "검 색"; this.btn_search.UseVisualStyleBackColor = true; @@ -535,57 +602,61 @@ // // tb_id // - this.tb_id.Location = new System.Drawing.Point(74, 171); + this.tb_id.Location = new System.Drawing.Point(85, 214); + this.tb_id.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_id.Name = "tb_id"; - this.tb_id.Size = new System.Drawing.Size(194, 21); + this.tb_id.Size = new System.Drawing.Size(221, 25); this.tb_id.TabIndex = 28; // // label5 // this.label5.AutoSize = true; this.label5.ForeColor = System.Drawing.SystemColors.ControlText; - this.label5.Location = new System.Drawing.Point(19, 222); + this.label5.Location = new System.Drawing.Point(22, 278); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 12); + this.label5.Size = new System.Drawing.Size(67, 15); this.label5.TabIndex = 37; this.label5.Text = "비 고"; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(303, 175); + this.label8.Location = new System.Drawing.Point(346, 219); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(53, 12); + this.label8.Size = new System.Drawing.Size(67, 15); this.label8.TabIndex = 29; this.label8.Text = "비밀번호"; // // tb_pw // - this.tb_pw.Location = new System.Drawing.Point(358, 171); + this.tb_pw.Location = new System.Drawing.Point(409, 214); + this.tb_pw.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_pw.Name = "tb_pw"; - this.tb_pw.Size = new System.Drawing.Size(194, 21); + this.tb_pw.Size = new System.Drawing.Size(221, 25); this.tb_pw.TabIndex = 30; // // tb_zip // - this.tb_zip.Location = new System.Drawing.Point(74, 147); + this.tb_zip.Location = new System.Drawing.Point(85, 184); + this.tb_zip.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_zip.Name = "tb_zip"; - this.tb_zip.Size = new System.Drawing.Size(87, 21); + this.tb_zip.Size = new System.Drawing.Size(99, 25); this.tb_zip.TabIndex = 25; // // tb_boss // - this.tb_boss.Location = new System.Drawing.Point(642, 51); + this.tb_boss.Location = new System.Drawing.Point(734, 64); + this.tb_boss.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_boss.Name = "tb_boss"; - this.tb_boss.Size = new System.Drawing.Size(194, 21); + this.tb_boss.Size = new System.Drawing.Size(221, 25); this.tb_boss.TabIndex = 6; // // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(587, 55); + this.label9.Location = new System.Drawing.Point(671, 69); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(53, 12); + this.label9.Size = new System.Drawing.Size(67, 15); this.label9.TabIndex = 5; this.label9.Text = "대표자명"; // @@ -593,138 +664,147 @@ // this.label10.AutoSize = true; this.label10.ForeColor = System.Drawing.SystemColors.ControlText; - this.label10.Location = new System.Drawing.Point(19, 79); + this.label10.Location = new System.Drawing.Point(22, 99); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(53, 12); + this.label10.Size = new System.Drawing.Size(67, 15); this.label10.TabIndex = 7; this.label10.Text = "등록번호"; // // tb_bubin // - this.tb_bubin.Location = new System.Drawing.Point(74, 75); + this.tb_bubin.Location = new System.Drawing.Point(85, 94); + this.tb_bubin.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_bubin.Name = "tb_bubin"; - this.tb_bubin.Size = new System.Drawing.Size(138, 21); + this.tb_bubin.Size = new System.Drawing.Size(157, 25); this.tb_bubin.TabIndex = 8; // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(303, 79); + this.label11.Location = new System.Drawing.Point(346, 99); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(53, 12); + this.label11.Size = new System.Drawing.Size(67, 15); this.label11.TabIndex = 9; this.label11.Text = "업 태"; // // tb_uptae // - this.tb_uptae.Location = new System.Drawing.Point(358, 75); + this.tb_uptae.Location = new System.Drawing.Point(409, 94); + this.tb_uptae.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_uptae.Name = "tb_uptae"; - this.tb_uptae.Size = new System.Drawing.Size(194, 21); + this.tb_uptae.Size = new System.Drawing.Size(221, 25); this.tb_uptae.TabIndex = 10; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(587, 79); + this.label12.Location = new System.Drawing.Point(671, 99); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(53, 12); + this.label12.Size = new System.Drawing.Size(67, 15); this.label12.TabIndex = 11; this.label12.Text = "종 목"; // // tb_jongmok // - this.tb_jongmok.Location = new System.Drawing.Point(642, 75); + this.tb_jongmok.Location = new System.Drawing.Point(734, 94); + this.tb_jongmok.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_jongmok.Name = "tb_jongmok"; - this.tb_jongmok.Size = new System.Drawing.Size(194, 21); + this.tb_jongmok.Size = new System.Drawing.Size(221, 25); this.tb_jongmok.TabIndex = 12; // // tb_mail // - this.tb_mail.Location = new System.Drawing.Point(642, 99); + this.tb_mail.Location = new System.Drawing.Point(734, 124); + this.tb_mail.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_mail.Name = "tb_mail"; - this.tb_mail.Size = new System.Drawing.Size(194, 21); + this.tb_mail.Size = new System.Drawing.Size(221, 25); this.tb_mail.TabIndex = 18; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(587, 103); + this.label13.Location = new System.Drawing.Point(671, 129); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(53, 12); + this.label13.Size = new System.Drawing.Size(67, 15); this.label13.TabIndex = 17; this.label13.Text = "메 일"; // // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(587, 127); + this.label14.Location = new System.Drawing.Point(671, 159); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(53, 12); + this.label14.Size = new System.Drawing.Size(67, 15); this.label14.TabIndex = 22; this.label14.Text = "담당직원"; // // tb_user // - this.tb_user.Location = new System.Drawing.Point(642, 123); + this.tb_user.Location = new System.Drawing.Point(734, 154); + this.tb_user.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_user.Name = "tb_user"; - this.tb_user.Size = new System.Drawing.Size(194, 21); + this.tb_user.Size = new System.Drawing.Size(221, 25); this.tb_user.TabIndex = 23; // // label15 // this.label15.AutoSize = true; this.label15.ForeColor = System.Drawing.SystemColors.ControlText; - this.label15.Location = new System.Drawing.Point(19, 199); + this.label15.Location = new System.Drawing.Point(22, 249); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(53, 12); + this.label15.Size = new System.Drawing.Size(67, 15); this.label15.TabIndex = 31; this.label15.Text = "용지칸수"; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(305, 199); + this.label16.Location = new System.Drawing.Point(349, 249); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(49, 12); + this.label16.Size = new System.Drawing.Size(62, 15); this.label16.TabIndex = 33; this.label16.Text = "띠 라 벨"; // // tb_division // - this.tb_division.Location = new System.Drawing.Point(74, 195); + this.tb_division.Location = new System.Drawing.Point(85, 244); + this.tb_division.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_division.Name = "tb_division"; - this.tb_division.Size = new System.Drawing.Size(194, 21); + this.tb_division.Size = new System.Drawing.Size(221, 25); this.tb_division.TabIndex = 32; // // tb_label // - this.tb_label.Location = new System.Drawing.Point(358, 195); + this.tb_label.Location = new System.Drawing.Point(409, 244); + this.tb_label.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_label.Name = "tb_label"; - this.tb_label.Size = new System.Drawing.Size(194, 21); + this.tb_label.Size = new System.Drawing.Size(221, 25); this.tb_label.TabIndex = 34; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(563, 199); + this.label17.Location = new System.Drawing.Point(643, 249); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(77, 12); + this.label17.Size = new System.Drawing.Size(97, 15); this.label17.TabIndex = 35; this.label17.Text = "사용프로그램"; // // tb_program // - this.tb_program.Location = new System.Drawing.Point(642, 195); + this.tb_program.Location = new System.Drawing.Point(734, 244); + this.tb_program.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_program.Name = "tb_program"; - this.tb_program.Size = new System.Drawing.Size(194, 21); + this.tb_program.Size = new System.Drawing.Size(221, 25); this.tb_program.TabIndex = 36; // // btn_close // this.btn_close.Dock = System.Windows.Forms.DockStyle.Fill; - this.btn_close.Location = new System.Drawing.Point(860, 4); + this.btn_close.Location = new System.Drawing.Point(980, 5); + this.btn_close.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(103, 36); + this.btn_close.Size = new System.Drawing.Size(121, 45); this.btn_close.TabIndex = 43; this.btn_close.Text = "닫 기"; this.btn_close.UseVisualStyleBackColor = true; @@ -734,17 +814,19 @@ // this.cb_gubun1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_gubun1.FormattingEnabled = true; - this.cb_gubun1.Location = new System.Drawing.Point(358, 51); + this.cb_gubun1.Location = new System.Drawing.Point(409, 64); + this.cb_gubun1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cb_gubun1.Name = "cb_gubun1"; - this.cb_gubun1.Size = new System.Drawing.Size(95, 20); + this.cb_gubun1.Size = new System.Drawing.Size(108, 23); this.cb_gubun1.TabIndex = 45; this.cb_gubun1.SelectedIndexChanged += new System.EventHandler(this.cb_gubun1_SelectedIndexChanged); // // btn_marc_expand // - this.btn_marc_expand.Location = new System.Drawing.Point(852, 50); + this.btn_marc_expand.Location = new System.Drawing.Point(974, 62); + this.btn_marc_expand.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btn_marc_expand.Name = "btn_marc_expand"; - this.btn_marc_expand.Size = new System.Drawing.Size(75, 355); + this.btn_marc_expand.Size = new System.Drawing.Size(86, 444); this.btn_marc_expand.TabIndex = 46; this.btn_marc_expand.Text = "마크 비고 >>"; this.btn_marc_expand.UseVisualStyleBackColor = true; @@ -757,17 +839,19 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; 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.Size = new System.Drawing.Size(969, 844); + this.panel1.Size = new System.Drawing.Size(1107, 1055); this.panel1.TabIndex = 47; // // panel3 // this.panel3.Controls.Add(this.dv1); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 417); + this.panel3.Location = new System.Drawing.Point(0, 521); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(967, 425); + this.panel3.Size = new System.Drawing.Size(1105, 532); this.panel3.TabIndex = 49; // // panel2 @@ -818,8 +902,9 @@ this.panel2.Controls.Add(this.tb_fax); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(967, 417); + this.panel2.Size = new System.Drawing.Size(1105, 521); this.panel2.TabIndex = 48; // // tableLayoutPanel1 @@ -845,10 +930,11 @@ this.tableLayoutPanel1.Controls.Add(this.btnInit, 4, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 1; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(967, 44); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1105, 55); this.tableLayoutPanel1.TabIndex = 49; // // label19 @@ -857,7 +943,7 @@ this.label19.ForeColor = System.Drawing.SystemColors.ControlText; this.label19.Location = new System.Drawing.Point(4, 1); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(100, 42); + this.label19.Size = new System.Drawing.Size(115, 53); this.label19.TabIndex = 0; this.label19.Text = "업 체 명"; this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -867,10 +953,10 @@ this.tableLayoutPanel1.SetColumnSpan(this.tbSearch, 2); this.tbSearch.Dock = System.Windows.Forms.DockStyle.Fill; this.tbSearch.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbSearch.Location = new System.Drawing.Point(108, 6); - this.tbSearch.Margin = new System.Windows.Forms.Padding(0, 5, 0, 5); + this.tbSearch.Location = new System.Drawing.Point(123, 7); + this.tbSearch.Margin = new System.Windows.Forms.Padding(0, 6, 0, 6); this.tbSearch.Name = "tbSearch"; - this.tbSearch.Size = new System.Drawing.Size(213, 32); + this.tbSearch.Size = new System.Drawing.Size(243, 38); this.tbSearch.TabIndex = 1; this.tbSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_sangho_KeyDown); // @@ -879,9 +965,10 @@ this.btnInit.DialogResult = System.Windows.Forms.DialogResult.Abort; this.btnInit.Dock = System.Windows.Forms.DockStyle.Fill; this.btnInit.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnInit.Location = new System.Drawing.Point(432, 4); + this.btnInit.Location = new System.Drawing.Point(492, 5); + this.btnInit.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnInit.Name = "btnInit"; - this.btnInit.Size = new System.Drawing.Size(100, 36); + this.btnInit.Size = new System.Drawing.Size(115, 45); this.btnInit.TabIndex = 39; this.btnInit.Text = "초기화"; this.btnInit.UseVisualStyleBackColor = true; @@ -890,27 +977,28 @@ // lbl_idx // this.lbl_idx.AutoSize = true; - this.lbl_idx.Location = new System.Drawing.Point(21, 233); + this.lbl_idx.Location = new System.Drawing.Point(24, 291); this.lbl_idx.Name = "lbl_idx"; - this.lbl_idx.Size = new System.Drawing.Size(0, 12); + this.lbl_idx.Size = new System.Drawing.Size(0, 15); this.lbl_idx.TabIndex = 48; // // cb_dlsArea // this.cb_dlsArea.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cb_dlsArea.FormattingEnabled = true; - this.cb_dlsArea.Location = new System.Drawing.Point(642, 171); + this.cb_dlsArea.Location = new System.Drawing.Point(734, 214); + this.cb_dlsArea.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.cb_dlsArea.Name = "cb_dlsArea"; - this.cb_dlsArea.Size = new System.Drawing.Size(194, 20); + this.cb_dlsArea.Size = new System.Drawing.Size(221, 23); this.cb_dlsArea.TabIndex = 47; // // label18 // this.label18.AutoSize = true; this.label18.ForeColor = System.Drawing.SystemColors.ControlText; - this.label18.Location = new System.Drawing.Point(587, 175); + this.label18.Location = new System.Drawing.Point(671, 219); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(52, 12); + this.label18.Size = new System.Drawing.Size(65, 15); this.label18.TabIndex = 24; this.label18.Text = "DLS지역"; // @@ -933,10 +1021,11 @@ this.Column3}); this.marcGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.marcGrid.Location = new System.Drawing.Point(0, 0); + this.marcGrid.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.marcGrid.Name = "marcGrid"; this.marcGrid.RowHeadersWidth = 31; this.marcGrid.RowTemplate.Height = 23; - this.marcGrid.Size = new System.Drawing.Size(830, 502); + this.marcGrid.Size = new System.Drawing.Size(949, 628); this.marcGrid.TabIndex = 48; this.marcGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); this.marcGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); @@ -946,12 +1035,14 @@ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.Column1.DefaultCellStyle = dataGridViewCellStyle4; this.Column1.HeaderText = "내용"; + this.Column1.MinimumWidth = 6; this.Column1.Name = "Column1"; this.Column1.Width = 150; // // Column2 // this.Column2.HeaderText = "내용"; + this.Column2.MinimumWidth = 6; this.Column2.Name = "Column2"; this.Column2.Width = 450; // @@ -960,6 +1051,7 @@ dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.Column3.DefaultCellStyle = dataGridViewCellStyle5; this.Column3.HeaderText = "내용"; + this.Column3.MinimumWidth = 6; this.Column3.Name = "Column3"; this.Column3.Width = 150; // @@ -968,9 +1060,9 @@ this.marcLabel.AutoSize = true; this.marcLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.marcLabel.ForeColor = System.Drawing.Color.Red; - this.marcLabel.Location = new System.Drawing.Point(9, 6); + this.marcLabel.Location = new System.Drawing.Point(10, 8); this.marcLabel.Name = "marcLabel"; - this.marcLabel.Size = new System.Drawing.Size(130, 21); + this.marcLabel.Size = new System.Drawing.Size(164, 27); this.marcLabel.TabIndex = 49; this.marcLabel.Text = "마 크 부 분"; // @@ -979,9 +1071,9 @@ this.gearLabel.AutoSize = true; this.gearLabel.Font = new System.Drawing.Font("굴림", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.gearLabel.ForeColor = System.Drawing.Color.Red; - this.gearLabel.Location = new System.Drawing.Point(9, 6); + this.gearLabel.Location = new System.Drawing.Point(10, 8); this.gearLabel.Name = "gearLabel"; - this.gearLabel.Size = new System.Drawing.Size(130, 21); + this.gearLabel.Size = new System.Drawing.Size(164, 27); this.gearLabel.TabIndex = 49; this.gearLabel.Text = "장 비 부 분"; // @@ -1004,10 +1096,11 @@ this.dataGridViewTextBoxColumn3}); this.gearGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.gearGrid.Location = new System.Drawing.Point(0, 0); + this.gearGrid.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.gearGrid.Name = "gearGrid"; this.gearGrid.RowHeadersWidth = 31; this.gearGrid.RowTemplate.Height = 23; - this.gearGrid.Size = new System.Drawing.Size(830, 272); + this.gearGrid.Size = new System.Drawing.Size(949, 341); this.gearGrid.TabIndex = 48; this.gearGrid.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.marcGrid_RowPostPaint); this.gearGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Grid_KeyDown); @@ -1017,12 +1110,14 @@ dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle7; this.dataGridViewTextBoxColumn1.HeaderText = "내용"; + this.dataGridViewTextBoxColumn1.MinimumWidth = 6; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.Width = 150; // // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.HeaderText = "내용"; + this.dataGridViewTextBoxColumn2.MinimumWidth = 6; this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.Width = 450; // @@ -1031,14 +1126,16 @@ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridViewTextBoxColumn3.HeaderText = "내용"; + this.dataGridViewTextBoxColumn3.MinimumWidth = 6; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.Width = 150; // // tb_marcEmpty // - this.tb_marcEmpty.Location = new System.Drawing.Point(719, 5); + this.tb_marcEmpty.Location = new System.Drawing.Point(822, 6); + this.tb_marcEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_marcEmpty.Name = "tb_marcEmpty"; - this.tb_marcEmpty.Size = new System.Drawing.Size(101, 23); + this.tb_marcEmpty.Size = new System.Drawing.Size(115, 29); this.tb_marcEmpty.TabIndex = 50; this.tb_marcEmpty.Text = "마크 내용지우기"; this.tb_marcEmpty.UseVisualStyleBackColor = true; @@ -1046,9 +1143,10 @@ // // tb_gearEmpty // - this.tb_gearEmpty.Location = new System.Drawing.Point(717, 5); + this.tb_gearEmpty.Location = new System.Drawing.Point(819, 6); + this.tb_gearEmpty.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_gearEmpty.Name = "tb_gearEmpty"; - this.tb_gearEmpty.Size = new System.Drawing.Size(101, 23); + this.tb_gearEmpty.Size = new System.Drawing.Size(115, 29); this.tb_gearEmpty.TabIndex = 50; this.tb_gearEmpty.Text = "장비 내용지우기"; this.tb_gearEmpty.UseVisualStyleBackColor = true; @@ -1056,9 +1154,10 @@ // // tb_marcSave // - this.tb_marcSave.Location = new System.Drawing.Point(140, 5); + this.tb_marcSave.Location = new System.Drawing.Point(160, 6); + this.tb_marcSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tb_marcSave.Name = "tb_marcSave"; - this.tb_marcSave.Size = new System.Drawing.Size(56, 23); + this.tb_marcSave.Size = new System.Drawing.Size(64, 29); this.tb_marcSave.TabIndex = 50; this.tb_marcSave.Text = "저 장"; this.tb_marcSave.UseVisualStyleBackColor = true; @@ -1071,18 +1170,20 @@ this.panel4.Controls.Add(this.panel6); this.panel4.Controls.Add(this.panel5); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(969, 0); + this.panel4.Location = new System.Drawing.Point(1107, 0); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(830, 844); + this.panel4.Size = new System.Drawing.Size(949, 1055); this.panel4.TabIndex = 51; // // panel8 // this.panel8.Controls.Add(this.gearGrid); this.panel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel8.Location = new System.Drawing.Point(0, 572); + this.panel8.Location = new System.Drawing.Point(0, 714); + this.panel8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(830, 272); + this.panel8.Size = new System.Drawing.Size(949, 341); this.panel8.TabIndex = 54; // // panel7 @@ -1091,18 +1192,20 @@ this.panel7.Controls.Add(this.gearLabel); this.panel7.Controls.Add(this.tb_gearEmpty); this.panel7.Dock = System.Windows.Forms.DockStyle.Top; - this.panel7.Location = new System.Drawing.Point(0, 537); + this.panel7.Location = new System.Drawing.Point(0, 671); + this.panel7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(830, 35); + this.panel7.Size = new System.Drawing.Size(949, 43); this.panel7.TabIndex = 53; // // panel6 // this.panel6.Controls.Add(this.marcGrid); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; - this.panel6.Location = new System.Drawing.Point(0, 35); + this.panel6.Location = new System.Drawing.Point(0, 43); + this.panel6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(830, 502); + this.panel6.Size = new System.Drawing.Size(949, 628); this.panel6.TabIndex = 52; // // panel5 @@ -1113,35 +1216,24 @@ this.panel5.Controls.Add(this.tb_marcSave); this.panel5.Dock = System.Windows.Forms.DockStyle.Top; this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(830, 35); + this.panel5.Size = new System.Drawing.Size(949, 43); this.panel5.TabIndex = 51; // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btExportList}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(181, 48); - // - // btExportList - // - this.btExportList.Name = "btExportList"; - this.btExportList.Size = new System.Drawing.Size(180, 22); - this.btExportList.Text = "목록 내보내기"; - this.btExportList.Click += new System.EventHandler(this.btExportList_Click); - // // Transaction_manage // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1799, 844); + this.ClientSize = new System.Drawing.Size(2056, 1055); this.Controls.Add(this.panel4); this.Controls.Add(this.panel1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "Transaction_manage"; this.Text = "납품 / 거래처 관리"; this.Load += new System.EventHandler(this.Transaction_manage_Load); ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + this.contextMenuStrip1.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel3.ResumeLayout(false); this.panel2.ResumeLayout(false); @@ -1157,7 +1249,6 @@ this.panel6.ResumeLayout(false); this.panel5.ResumeLayout(false); this.panel5.PerformLayout(); - this.contextMenuStrip1.ResumeLayout(false); this.ResumeLayout(false); }