diff --git a/unimarc/.vs/unimarc/FileContentIndex/9486b2eb-3f19-4a0d-a1a7-8592882c0895.vsidx b/unimarc/.vs/unimarc/FileContentIndex/9486b2eb-3f19-4a0d-a1a7-8592882c0895.vsidx
deleted file mode 100644
index 89486af..0000000
Binary files a/unimarc/.vs/unimarc/FileContentIndex/9486b2eb-3f19-4a0d-a1a7-8592882c0895.vsidx and /dev/null differ
diff --git a/unimarc/.vs/unimarc/FileContentIndex/a7cea060-a0f6-43df-a2da-7901ddfd0d07.vsidx b/unimarc/.vs/unimarc/FileContentIndex/a7cea060-a0f6-43df-a2da-7901ddfd0d07.vsidx
new file mode 100644
index 0000000..4e6797c
Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/a7cea060-a0f6-43df-a2da-7901ddfd0d07.vsidx differ
diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo
index 7c9cb04..c32f2d1 100644
Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe
index 4c07773..fb65919 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.exe and b/unimarc/unimarc/bin/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb
index 5905068..7ab0008 100644
Binary files a/unimarc/unimarc/bin/Debug/UniMarc.pdb and b/unimarc/unimarc/bin/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll
index b6b9a66..c2d5713 100644
Binary files a/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/bin/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache
index 3537805..1c6083d 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache and b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.exe b/unimarc/unimarc/obj/Debug/UniMarc.exe
index 4c07773..fb65919 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.exe and b/unimarc/unimarc/obj/Debug/UniMarc.exe differ
diff --git a/unimarc/unimarc/obj/Debug/UniMarc.pdb b/unimarc/unimarc/obj/Debug/UniMarc.pdb
index 5905068..7ab0008 100644
Binary files a/unimarc/unimarc/obj/Debug/UniMarc.pdb and b/unimarc/unimarc/obj/Debug/UniMarc.pdb differ
diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll
index b6b9a66..c2d5713 100644
Binary files a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll and b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll differ
diff --git a/unimarc/unimarc/마크/Check_ISBN.cs b/unimarc/unimarc/마크/Check_ISBN.cs
index 575cfd2..313914c 100644
--- a/unimarc/unimarc/마크/Check_ISBN.cs
+++ b/unimarc/unimarc/마크/Check_ISBN.cs
@@ -53,7 +53,7 @@ namespace WindowsFormsApp1.Mac
tb_list_name.Text = list_name;
cb_api.Items.Clear();
- string[] list_combo = { "알라딘", "네이버", "다음" };
+ string[] list_combo = { "알라딘", "네이버 (사용중단)", "다음" };
cb_api.Items.AddRange(list_combo);
db.DBcon();
@@ -76,7 +76,7 @@ namespace WindowsFormsApp1.Mac
list_name = ListName;
- string[] list_combo = { "알라딘", "네이버", "다음" };
+ string[] list_combo = { "알라딘", "네이버 (사용중단)", "다음" };
cb_api.Items.AddRange(list_combo);
db.DBcon();
@@ -179,7 +179,7 @@ namespace WindowsFormsApp1.Mac
Aladin_API(dataGridView1);
break;
case 1:
- Naver_API(dataGridView1);
+ // Naver_API(dataGridView1);
break;
case 2:
Daum_API(dataGridView1);
diff --git a/unimarc/unimarc/마크/Check_copy.Designer.cs b/unimarc/unimarc/마크/Check_copy.Designer.cs
index 3a7ab88..58da2a6 100644
--- a/unimarc/unimarc/마크/Check_copy.Designer.cs
+++ b/unimarc/unimarc/마크/Check_copy.Designer.cs
@@ -47,7 +47,6 @@
this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.book_comp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
- this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.btn_ApplyFilter = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.panel6 = new System.Windows.Forms.Panel();
@@ -58,6 +57,7 @@
this.btn_OpenMemo = new System.Windows.Forms.Button();
this.chk_spChar = new System.Windows.Forms.CheckBox();
this.panel5 = new System.Windows.Forms.Panel();
+ this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.SearchCount)).BeginInit();
this.panel2.SuspendLayout();
@@ -117,7 +117,7 @@
//
// btn_Start
//
- this.btn_Start.Location = new System.Drawing.Point(473, 4);
+ this.btn_Start.Location = new System.Drawing.Point(476, 4);
this.btn_Start.Name = "btn_Start";
this.btn_Start.Size = new System.Drawing.Size(75, 24);
this.btn_Start.TabIndex = 2;
@@ -137,7 +137,7 @@
//
// SearchCount
//
- this.SearchCount.Location = new System.Drawing.Point(494, 6);
+ this.SearchCount.Location = new System.Drawing.Point(497, 6);
this.SearchCount.Maximum = new decimal(new int[] {
10000,
0,
@@ -161,7 +161,7 @@
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(447, 10);
+ this.label2.Location = new System.Drawing.Point(450, 10);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(45, 12);
this.label2.TabIndex = 0;
@@ -267,19 +267,9 @@
this.Count.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Count.Width = 70;
//
- // webBrowser1
- //
- this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.webBrowser1.Location = new System.Drawing.Point(0, 0);
- this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
- this.webBrowser1.Name = "webBrowser1";
- this.webBrowser1.ScriptErrorsSuppressed = true;
- this.webBrowser1.Size = new System.Drawing.Size(673, 738);
- this.webBrowser1.TabIndex = 2;
- //
// btn_ApplyFilter
//
- this.btn_ApplyFilter.Location = new System.Drawing.Point(311, 4);
+ this.btn_ApplyFilter.Location = new System.Drawing.Point(322, 4);
this.btn_ApplyFilter.Name = "btn_ApplyFilter";
this.btn_ApplyFilter.Size = new System.Drawing.Size(75, 24);
this.btn_ApplyFilter.TabIndex = 2;
@@ -326,9 +316,7 @@
// chk_RemoveBrit
//
this.chk_RemoveBrit.AutoSize = true;
- this.chk_RemoveBrit.Checked = true;
- this.chk_RemoveBrit.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chk_RemoveBrit.Location = new System.Drawing.Point(131, 8);
+ this.chk_RemoveBrit.Location = new System.Drawing.Point(113, 8);
this.chk_RemoveBrit.Name = "chk_RemoveBrit";
this.chk_RemoveBrit.Size = new System.Drawing.Size(128, 16);
this.chk_RemoveBrit.TabIndex = 0;
@@ -337,7 +325,7 @@
//
// btn_ResultEmpty
//
- this.btn_ResultEmpty.Location = new System.Drawing.Point(473, 4);
+ this.btn_ResultEmpty.Location = new System.Drawing.Point(476, 4);
this.btn_ResultEmpty.Name = "btn_ResultEmpty";
this.btn_ResultEmpty.Size = new System.Drawing.Size(75, 24);
this.btn_ResultEmpty.TabIndex = 2;
@@ -357,7 +345,7 @@
//
// btn_OpenMemo
//
- this.btn_OpenMemo.Location = new System.Drawing.Point(392, 4);
+ this.btn_OpenMemo.Location = new System.Drawing.Point(399, 4);
this.btn_OpenMemo.Name = "btn_OpenMemo";
this.btn_OpenMemo.Size = new System.Drawing.Size(75, 24);
this.btn_OpenMemo.TabIndex = 2;
@@ -368,9 +356,7 @@
// chk_spChar
//
this.chk_spChar.AutoSize = true;
- this.chk_spChar.Checked = true;
- this.chk_spChar.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chk_spChar.Location = new System.Drawing.Point(12, 8);
+ this.chk_spChar.Location = new System.Drawing.Point(7, 8);
this.chk_spChar.Name = "chk_spChar";
this.chk_spChar.Size = new System.Drawing.Size(100, 16);
this.chk_spChar.TabIndex = 0;
@@ -383,14 +369,24 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(635, 0);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(673, 738);
+ this.panel5.Size = new System.Drawing.Size(656, 738);
this.panel5.TabIndex = 4;
//
+ // webBrowser1
+ //
+ this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.webBrowser1.Location = new System.Drawing.Point(0, 0);
+ this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
+ this.webBrowser1.Name = "webBrowser1";
+ this.webBrowser1.ScriptErrorsSuppressed = true;
+ this.webBrowser1.Size = new System.Drawing.Size(656, 738);
+ this.webBrowser1.TabIndex = 2;
+ //
// Check_copy
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1308, 738);
+ this.ClientSize = new System.Drawing.Size(1291, 738);
this.Controls.Add(this.panel5);
this.Controls.Add(this.panel3);
this.Name = "Check_copy";
diff --git a/unimarc/unimarc/마크/Check_copy.cs b/unimarc/unimarc/마크/Check_copy.cs
index e5c2d3c..dedfb65 100644
--- a/unimarc/unimarc/마크/Check_copy.cs
+++ b/unimarc/unimarc/마크/Check_copy.cs
@@ -74,6 +74,8 @@ namespace WindowsFormsApp1.Mac
}
}
+ //UPDATE: [22.09.21] 굳이 있을 필요가 없어서 일단 주석처리
+ /*
DialogResult MsgResult = MessageBox.Show("선택된 필터를 적용하시겠습니까?", "필터 적용", MessageBoxButtons.YesNoCancel);
if (MsgResult == DialogResult.Yes)
{
@@ -90,6 +92,7 @@ namespace WindowsFormsApp1.Mac
}
else if (MsgResult == DialogResult.Cancel)
return;
+ */
dataGridView1.CurrentCell = dataGridView1.Rows[0].Cells[0];
@@ -1379,7 +1382,7 @@ namespace WindowsFormsApp1.Mac
private void Check_copy_Load(object sender, EventArgs e)
{
- string[] Grid = { "빈칸", "----- 빈칸으로 놔주세요 -----", "" };
+ string[] Grid = { "----- 빈칸으로 놔주세요 -----", "빈칸", "" };
dataGridView1.Rows.Add(Grid);
}
}
diff --git a/unimarc/unimarc/마크/Marc_Plan.Designer.cs b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
index d1fc187..21770a5 100644
--- a/unimarc/unimarc/마크/Marc_Plan.Designer.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.Designer.cs
@@ -28,13 +28,13 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Marc_Plan));
this.panel1 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
@@ -83,7 +83,9 @@
this.checkBox1 = new System.Windows.Forms.CheckBox();
this.panel2 = new System.Windows.Forms.Panel();
this.panel5 = new System.Windows.Forms.Panel();
+ this.chkBox_AllowDrop = new System.Windows.Forms.CheckBox();
this.panel6 = new System.Windows.Forms.Panel();
+ this.chk_Alignment = new System.Windows.Forms.CheckBox();
this.tb_Left = new System.Windows.Forms.TextBox();
this.btn_Bring = new System.Windows.Forms.Button();
this.btn_PrintView = new System.Windows.Forms.Button();
@@ -92,6 +94,8 @@
this.chk_Num = new System.Windows.Forms.CheckBox();
this.label23 = new System.Windows.Forms.Label();
this.label22 = new System.Windows.Forms.Label();
+ this.tb_NumSize = new System.Windows.Forms.TextBox();
+ this.label24 = new System.Windows.Forms.Label();
this.tb_TextSize = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label();
@@ -123,10 +127,8 @@
this.panel7 = new System.Windows.Forms.Panel();
this.printDocument1 = new System.Drawing.Printing.PrintDocument();
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
- this.chkBox_AllowDrop = new System.Windows.Forms.CheckBox();
- this.chk_Alignment = new System.Windows.Forms.CheckBox();
- this.label24 = new System.Windows.Forms.Label();
- this.tb_NumSize = new System.Windows.Forms.TextBox();
+ this.WorkCopy = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.WorkFix = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.panel1.SuspendLayout();
this.panel4.SuspendLayout();
this.panel3.SuspendLayout();
@@ -355,14 +357,14 @@
this.dataGridView1.BackgroundColor = System.Drawing.SystemColors.Control;
this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dataGridView1.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
- dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.AppWorkspace;
- dataGridViewCellStyle15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+ dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.AppWorkspace;
+ dataGridViewCellStyle8.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
this.dataGridView1.ColumnHeadersHeight = 25;
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -387,7 +389,9 @@
this.midx,
this.marc,
this.search_tag,
- this.colCheck});
+ this.colCheck,
+ this.WorkCopy,
+ this.WorkFix});
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.GridColor = System.Drawing.SystemColors.ActiveCaptionText;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
@@ -398,11 +402,7 @@
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick);
this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
- this.dataGridView1.DragDrop += new System.Windows.Forms.DragEventHandler(this.dataGridView1_DragDrop);
- this.dataGridView1.DragOver += new System.Windows.Forms.DragEventHandler(this.dataGridView1_DragOver);
this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown);
- this.dataGridView1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dataGridView1_MouseDown);
- this.dataGridView1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGridView1_MouseMove);
//
// idx
//
@@ -421,8 +421,8 @@
//
// reg_num
//
- dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.reg_num.DefaultCellStyle = dataGridViewCellStyle16;
+ dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.reg_num.DefaultCellStyle = dataGridViewCellStyle9;
this.reg_num.FillWeight = 130.9363F;
this.reg_num.HeaderText = "등록번호";
this.reg_num.Name = "reg_num";
@@ -430,8 +430,8 @@
//
// class_code
//
- dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.class_code.DefaultCellStyle = dataGridViewCellStyle17;
+ dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.class_code.DefaultCellStyle = dataGridViewCellStyle10;
this.class_code.FillWeight = 76.41504F;
this.class_code.HeaderText = "분류";
this.class_code.Name = "class_code";
@@ -439,8 +439,8 @@
//
// author_code
//
- dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.author_code.DefaultCellStyle = dataGridViewCellStyle18;
+ dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.author_code.DefaultCellStyle = dataGridViewCellStyle11;
this.author_code.FillWeight = 77.02635F;
this.author_code.HeaderText = "저자기호";
this.author_code.Name = "author_code";
@@ -448,8 +448,8 @@
//
// volume
//
- dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.volume.DefaultCellStyle = dataGridViewCellStyle19;
+ dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.volume.DefaultCellStyle = dataGridViewCellStyle12;
this.volume.FillWeight = 38.80909F;
this.volume.HeaderText = "V";
this.volume.Name = "volume";
@@ -458,8 +458,8 @@
//
// copy
//
- dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.copy.DefaultCellStyle = dataGridViewCellStyle20;
+ dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.copy.DefaultCellStyle = dataGridViewCellStyle13;
this.copy.FillWeight = 40.14827F;
this.copy.HeaderText = "C";
this.copy.Name = "copy";
@@ -468,8 +468,8 @@
//
// prefix
//
- dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.prefix.DefaultCellStyle = dataGridViewCellStyle21;
+ dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.prefix.DefaultCellStyle = dataGridViewCellStyle14;
this.prefix.FillWeight = 41.51828F;
this.prefix.HeaderText = "F";
this.prefix.Name = "prefix";
@@ -617,6 +617,17 @@
this.panel5.Size = new System.Drawing.Size(1462, 35);
this.panel5.TabIndex = 9;
//
+ // chkBox_AllowDrop
+ //
+ this.chkBox_AllowDrop.AutoSize = true;
+ this.chkBox_AllowDrop.Location = new System.Drawing.Point(1023, 10);
+ this.chkBox_AllowDrop.Name = "chkBox_AllowDrop";
+ this.chkBox_AllowDrop.Size = new System.Drawing.Size(147, 16);
+ this.chkBox_AllowDrop.TabIndex = 10;
+ this.chkBox_AllowDrop.Text = "표 드래그 앤 드롭 OFF";
+ this.chkBox_AllowDrop.UseVisualStyleBackColor = true;
+ this.chkBox_AllowDrop.CheckedChanged += new System.EventHandler(this.chkBox_AllowDrop_CheckedChanged);
+ //
// panel6
//
this.panel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
@@ -665,6 +676,16 @@
this.panel6.Size = new System.Drawing.Size(1462, 59);
this.panel6.TabIndex = 10;
//
+ // chk_Alignment
+ //
+ this.chk_Alignment.AutoSize = true;
+ this.chk_Alignment.Location = new System.Drawing.Point(987, 7);
+ this.chk_Alignment.Name = "chk_Alignment";
+ this.chk_Alignment.Size = new System.Drawing.Size(88, 16);
+ this.chk_Alignment.TabIndex = 85;
+ this.chk_Alignment.Text = "가운데 정렬";
+ this.chk_Alignment.UseVisualStyleBackColor = true;
+ //
// tb_Left
//
this.tb_Left.Location = new System.Drawing.Point(41, 6);
@@ -709,7 +730,7 @@
//
this.cb_TextFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_TextFont.FormattingEnabled = true;
- this.cb_TextFont.Location = new System.Drawing.Point(726, 6);
+ this.cb_TextFont.Location = new System.Drawing.Point(712, 6);
this.cb_TextFont.Name = "cb_TextFont";
this.cb_TextFont.Size = new System.Drawing.Size(168, 20);
this.cb_TextFont.TabIndex = 78;
@@ -745,9 +766,29 @@
this.label22.TabIndex = 54;
this.label22.Text = "mm";
//
+ // tb_NumSize
+ //
+ this.tb_NumSize.Enabled = false;
+ this.tb_NumSize.Location = new System.Drawing.Point(850, 33);
+ this.tb_NumSize.Name = "tb_NumSize";
+ this.tb_NumSize.Size = new System.Drawing.Size(30, 21);
+ this.tb_NumSize.TabIndex = 79;
+ this.tb_NumSize.Text = "10";
+ this.tb_NumSize.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+ this.label24.Location = new System.Drawing.Point(767, 37);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(83, 12);
+ this.label24.TabIndex = 60;
+ this.label24.Text = "등록번호크기";
+ //
// tb_TextSize
//
- this.tb_TextSize.Location = new System.Drawing.Point(739, 33);
+ this.tb_TextSize.Location = new System.Drawing.Point(725, 33);
this.tb_TextSize.Name = "tb_TextSize";
this.tb_TextSize.Size = new System.Drawing.Size(30, 21);
this.tb_TextSize.TabIndex = 79;
@@ -758,7 +799,7 @@
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label20.Location = new System.Drawing.Point(680, 37);
+ this.label20.Location = new System.Drawing.Point(666, 37);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(57, 12);
this.label20.TabIndex = 60;
@@ -777,7 +818,7 @@
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label18.Location = new System.Drawing.Point(680, 10);
+ this.label18.Location = new System.Drawing.Point(666, 10);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(44, 12);
this.label18.TabIndex = 62;
@@ -787,7 +828,7 @@
//
this.chk_C.AutoSize = true;
this.chk_C.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.chk_C.Location = new System.Drawing.Point(623, 35);
+ this.chk_C.Location = new System.Drawing.Point(609, 35);
this.chk_C.Name = "chk_C";
this.chk_C.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.chk_C.Size = new System.Drawing.Size(37, 16);
@@ -809,7 +850,7 @@
//
this.chk_V.AutoSize = true;
this.chk_V.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.chk_V.Location = new System.Drawing.Point(563, 35);
+ this.chk_V.Location = new System.Drawing.Point(549, 35);
this.chk_V.Name = "chk_V";
this.chk_V.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.chk_V.Size = new System.Drawing.Size(36, 16);
@@ -837,7 +878,7 @@
//
// tb_StartPosition
//
- this.tb_StartPosition.Location = new System.Drawing.Point(612, 6);
+ this.tb_StartPosition.Location = new System.Drawing.Point(598, 6);
this.tb_StartPosition.Name = "tb_StartPosition";
this.tb_StartPosition.Size = new System.Drawing.Size(59, 21);
this.tb_StartPosition.TabIndex = 77;
@@ -856,7 +897,7 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label7.Location = new System.Drawing.Point(553, 10);
+ this.label7.Location = new System.Drawing.Point(539, 10);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(57, 12);
this.label7.TabIndex = 61;
@@ -883,7 +924,7 @@
//
// tb_SeroGap
//
- this.tb_SeroGap.Location = new System.Drawing.Point(479, 6);
+ this.tb_SeroGap.Location = new System.Drawing.Point(465, 6);
this.tb_SeroGap.Name = "tb_SeroGap";
this.tb_SeroGap.Size = new System.Drawing.Size(30, 21);
this.tb_SeroGap.TabIndex = 74;
@@ -911,7 +952,7 @@
//
// tb_Sero
//
- this.tb_Sero.Location = new System.Drawing.Point(479, 33);
+ this.tb_Sero.Location = new System.Drawing.Point(465, 33);
this.tb_Sero.Name = "tb_Sero";
this.tb_Sero.Size = new System.Drawing.Size(30, 21);
this.tb_Sero.TabIndex = 76;
@@ -920,7 +961,7 @@
//
// tb_GaroGap
//
- this.tb_GaroGap.Location = new System.Drawing.Point(345, 6);
+ this.tb_GaroGap.Location = new System.Drawing.Point(336, 6);
this.tb_GaroGap.Name = "tb_GaroGap";
this.tb_GaroGap.Size = new System.Drawing.Size(30, 21);
this.tb_GaroGap.TabIndex = 73;
@@ -930,7 +971,7 @@
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(377, 10);
+ this.label12.Location = new System.Drawing.Point(368, 10);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(27, 12);
this.label12.TabIndex = 66;
@@ -940,7 +981,7 @@
//
this.label15.AutoSize = true;
this.label15.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label15.Location = new System.Drawing.Point(420, 10);
+ this.label15.Location = new System.Drawing.Point(406, 10);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(57, 12);
this.label15.TabIndex = 57;
@@ -949,7 +990,7 @@
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(377, 37);
+ this.label16.Location = new System.Drawing.Point(368, 37);
this.label16.Name = "label16";
this.label16.Size = new System.Drawing.Size(17, 12);
this.label16.TabIndex = 65;
@@ -959,7 +1000,7 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label6.Location = new System.Drawing.Point(420, 37);
+ this.label6.Location = new System.Drawing.Point(406, 37);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(57, 12);
this.label6.TabIndex = 56;
@@ -968,7 +1009,7 @@
// label17
//
this.label17.AutoSize = true;
- this.label17.Location = new System.Drawing.Point(511, 37);
+ this.label17.Location = new System.Drawing.Point(497, 37);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(17, 12);
this.label17.TabIndex = 64;
@@ -977,7 +1018,7 @@
// label13
//
this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(511, 10);
+ this.label13.Location = new System.Drawing.Point(497, 10);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(27, 12);
this.label13.TabIndex = 59;
@@ -987,7 +1028,7 @@
//
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label14.Location = new System.Drawing.Point(286, 10);
+ this.label14.Location = new System.Drawing.Point(277, 10);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(57, 12);
this.label14.TabIndex = 55;
@@ -997,7 +1038,7 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label5.Location = new System.Drawing.Point(286, 37);
+ this.label5.Location = new System.Drawing.Point(277, 37);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(57, 12);
this.label5.TabIndex = 53;
@@ -1005,7 +1046,7 @@
//
// tb_Garo
//
- this.tb_Garo.Location = new System.Drawing.Point(345, 33);
+ this.tb_Garo.Location = new System.Drawing.Point(336, 33);
this.tb_Garo.Name = "tb_Garo";
this.tb_Garo.Size = new System.Drawing.Size(30, 21);
this.tb_Garo.TabIndex = 75;
@@ -1037,46 +1078,15 @@
this.printPreviewDialog1.Name = "printPreviewDialog1";
this.printPreviewDialog1.Visible = false;
//
- // chkBox_AllowDrop
+ // WorkCopy
//
- this.chkBox_AllowDrop.AutoSize = true;
- this.chkBox_AllowDrop.Location = new System.Drawing.Point(1023, 10);
- this.chkBox_AllowDrop.Name = "chkBox_AllowDrop";
- this.chkBox_AllowDrop.Size = new System.Drawing.Size(147, 16);
- this.chkBox_AllowDrop.TabIndex = 10;
- this.chkBox_AllowDrop.Text = "표 드래그 앤 드롭 OFF";
- this.chkBox_AllowDrop.UseVisualStyleBackColor = true;
- this.chkBox_AllowDrop.CheckedChanged += new System.EventHandler(this.chkBox_AllowDrop_CheckedChanged);
+ this.WorkCopy.HeaderText = "복본 작업용 열";
+ this.WorkCopy.Name = "WorkCopy";
//
- // chk_Alignment
+ // WorkFix
//
- this.chk_Alignment.AutoSize = true;
- this.chk_Alignment.Location = new System.Drawing.Point(987, 7);
- this.chk_Alignment.Name = "chk_Alignment";
- this.chk_Alignment.Size = new System.Drawing.Size(88, 16);
- this.chk_Alignment.TabIndex = 85;
- this.chk_Alignment.Text = "가운데 정렬";
- this.chk_Alignment.UseVisualStyleBackColor = true;
- //
- // label24
- //
- this.label24.AutoSize = true;
- this.label24.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
- this.label24.Location = new System.Drawing.Point(781, 37);
- this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(83, 12);
- this.label24.TabIndex = 60;
- this.label24.Text = "등록번호크기";
- //
- // tb_NumSize
- //
- this.tb_NumSize.Enabled = false;
- this.tb_NumSize.Location = new System.Drawing.Point(864, 33);
- this.tb_NumSize.Name = "tb_NumSize";
- this.tb_NumSize.Size = new System.Drawing.Size(30, 21);
- this.tb_NumSize.TabIndex = 79;
- this.tb_NumSize.Text = "10";
- this.tb_NumSize.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.WorkFix.HeaderText = "별치 작업용 열";
+ this.WorkFix.Name = "WorkFix";
//
// Marc_Plan
//
@@ -1200,5 +1210,7 @@
private System.Windows.Forms.CheckBox chk_Alignment;
private System.Windows.Forms.TextBox tb_NumSize;
private System.Windows.Forms.Label label24;
+ private System.Windows.Forms.DataGridViewTextBoxColumn WorkCopy;
+ private System.Windows.Forms.DataGridViewTextBoxColumn WorkFix;
}
}
\ No newline at end of file
diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs
index 05d835a..2d9ca2b 100644
--- a/unimarc/unimarc/마크/Marc_Plan.cs
+++ b/unimarc/unimarc/마크/Marc_Plan.cs
@@ -65,7 +65,7 @@ namespace WindowsFormsApp1.Mac
}
#region SelectList_Sub
- public void mk_Grid(string ListName, string date)
+ public void mk_Grid(string ListName, string date, string[] Grid)
{
btn_Select_List.Text = ListName;
this.date = date;
@@ -97,35 +97,44 @@ namespace WindowsFormsApp1.Mac
string res = db.DB_Send_CMD_Search(cmd);
string[] ary = res.Split('|');
+
+ for (int a = 0; a < ary.Length; a++)
+ {
+ if (a % 16 == 0) Grid[0] = ary[a]; // idx
+ if (a % 16 == 1) Grid[1] = ary[a]; // num
+ if (a % 16 == 2) Grid[2] = ary[a]; // r_num
+ if (a % 16 == 3) Grid[3] = ary[a]; // class_symbol
+ if (a % 16 == 4) Grid[4] = ary[a]; // author_symbol
+ if (a % 16 == 5) Grid[9] = ary[a]; // ISBN
+ if (a % 16 == 6) Grid[10] = ary[a]; // book_name
+ if (a % 16 == 7) Grid[11] = ary[a]; // s_book_name1
+ if (a % 16 == 8) Grid[12] = ary[a]; // s_book_num1
+ if (a % 16 == 9) Grid[13] = ary[a]; // s_book_name2
+ if (a % 16 == 10) Grid[14] = ary[a]; // s_book_num2
+ if (a % 16 == 11) Grid[15] = ary[a]; // author
+ if (a % 16 == 12) Grid[16] = ary[a]; // book_comp
+ if (a % 16 == 13) Grid[17] = ary[a]; // price
+ if (a % 16 == 14) Grid[18] = ary[a]; // midx
+ if (a % 16 == 15) { Grid[19] = ary[a]; // marc
+ string[] vcf = st.Take_Tag(ary[a], GetTag);
+ Grid[5] = vcf[0];
+ Grid[6] = vcf[1];
+ Grid[7] = vcf[2];
+ dataGridView1.Rows.Add(Grid);
+ }
+ }
+ }
+ public void mk_Grid(string ListName, string date)
+ {
string[] grid = {
"", "", "", "", "",
"", "", "", "", "",
"", "", "", "", "",
"", "", "", "", "",
- "", "T" };
+ "", "T", "", ""
+ };
- for (int a = 0; a < ary.Length; a++)
- {
- if (a % 16 == 0) grid[0] = ary[a]; // idx
- if (a % 16 == 1) grid[1] = ary[a]; // num
- if (a % 16 == 2) grid[2] = ary[a]; // r_num
- if (a % 16 == 3) grid[3] = ary[a]; // class_symbol
- if (a % 16 == 4) grid[4] = ary[a]; // author_symbol
- if (a % 16 == 5) grid[9] = ary[a]; // ISBN
- if (a % 16 == 6) grid[10] = ary[a]; // book_name
- if (a % 16 == 7) grid[11] = ary[a]; // s_book_name1
- if (a % 16 == 8) grid[12] = ary[a]; // s_book_num1
- if (a % 16 == 9) grid[13] = ary[a]; // s_book_name2
- if (a % 16 == 10) grid[14] = ary[a]; // s_book_num2
- if (a % 16 == 11) grid[15] = ary[a]; // author
- if (a % 16 == 12) grid[16] = ary[a]; // book_comp
- if (a % 16 == 13) grid[17] = ary[a]; // price
- if (a % 16 == 14) grid[18] = ary[a]; // midx
- if (a % 16 == 15) { grid[19] = ary[a]; // marc
-
- dataGridView1.Rows.Add(grid);
- }
- }
+ mk_Grid(ListName, date, grid);
}
public void mk_Panel(string idx, string ListName, string date)
{
@@ -579,7 +588,6 @@ namespace WindowsFormsApp1.Mac
if (F != "")
F = string.Format("▼f{0}", F);
-
AddTag = string.Format("049\t \t{0}{1}{2}{3}▲", L, V, C, F);
}
if (col == 3 || col == 4 || col == 5)
diff --git a/unimarc/unimarc/마크/Marc_Plan.resx b/unimarc/unimarc/마크/Marc_Plan.resx
index 7ec5387..fcf79f2 100644
--- a/unimarc/unimarc/마크/Marc_Plan.resx
+++ b/unimarc/unimarc/마크/Marc_Plan.resx
@@ -117,6 +117,12 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ True
+
6, 7
diff --git a/unimarc/unimarc/마크/Marc_mkList.cs b/unimarc/unimarc/마크/Marc_mkList.cs
index 82efcf7..cbb9f92 100644
--- a/unimarc/unimarc/마크/Marc_mkList.cs
+++ b/unimarc/unimarc/마크/Marc_mkList.cs
@@ -174,10 +174,9 @@ namespace UniMarc.마크
if (Author_res[1].Length > 1) Author[0] = Author_res[1];
if (Author_res[2].Length > 1) Author[0] = Author_res[2];
- // 245d에 [외]가 있는 경우 저자가 아닌 출판사로 저자기호 생성
+ //UPDATE: [22.09.20 추가] 245d에 [외]가 있는 경우 저자가 아닌 출판사로 저자기호 생성
if (Author_res[3].IndexOf("[외]") > -1) Author[0] = Marc[5];
-
for (int b = 0; b < Marc.Length; b++)
{
insert_marc_data[b + 3] = Marc[b];