diff --git a/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx b/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx new file mode 100644 index 0000000..8ff9199 Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/31d8301f-dacd-4c74-b60d-25dd79fc1ee0.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/fea3be1a-e7a4-4414-96fe-8b0096b367a7.vsidx b/unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx similarity index 57% rename from unimarc/.vs/unimarc/FileContentIndex/fea3be1a-e7a4-4414-96fe-8b0096b367a7.vsidx rename to unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx index b23e18c..596085e 100644 Binary files a/unimarc/.vs/unimarc/FileContentIndex/fea3be1a-e7a4-4414-96fe-8b0096b367a7.vsidx and b/unimarc/.vs/unimarc/FileContentIndex/387a1cf3-665f-4996-9af8-a42fbfa1c2ce.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/6d0f4805-e512-43eb-af05-32108ca7fb2a.vsidx b/unimarc/.vs/unimarc/FileContentIndex/6d0f4805-e512-43eb-af05-32108ca7fb2a.vsidx deleted file mode 100644 index 8389cd2..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/6d0f4805-e512-43eb-af05-32108ca7fb2a.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx b/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx new file mode 100644 index 0000000..ef5377d Binary files /dev/null and b/unimarc/.vs/unimarc/FileContentIndex/f9ac97b0-8443-403b-917b-26a944e43fe8.vsidx differ diff --git a/unimarc/.vs/unimarc/FileContentIndex/ff517e42-4b3f-4a76-9696-cd3b3eb4967e.vsidx b/unimarc/.vs/unimarc/FileContentIndex/ff517e42-4b3f-4a76-9696-cd3b3eb4967e.vsidx deleted file mode 100644 index 74e4b44..0000000 Binary files a/unimarc/.vs/unimarc/FileContentIndex/ff517e42-4b3f-4a76-9696-cd3b3eb4967e.vsidx and /dev/null differ diff --git a/unimarc/.vs/unimarc/v17/.suo b/unimarc/.vs/unimarc/v17/.suo index 08984e2..77d9c13 100644 Binary files a/unimarc/.vs/unimarc/v17/.suo and b/unimarc/.vs/unimarc/v17/.suo differ diff --git a/unimarc/unimarc/Login.Designer.cs b/unimarc/unimarc/Login.Designer.cs index 632df2e..40d5763 100644 --- a/unimarc/unimarc/Login.Designer.cs +++ b/unimarc/unimarc/Login.Designer.cs @@ -151,12 +151,14 @@ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; this.richTextBox1.Size = new System.Drawing.Size(378, 348); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; // // panel1 // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.lbl_IP); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel1.Location = new System.Drawing.Point(0, 463); diff --git a/unimarc/unimarc/Login.cs b/unimarc/unimarc/Login.cs index e182809..1499382 100644 --- a/unimarc/unimarc/Login.cs +++ b/unimarc/unimarc/Login.cs @@ -49,6 +49,7 @@ namespace WindowsFormsApp1 dataGridView1.Rows.Add(Grid); } } + richTextBox1.Text = dataGridView1.Rows[0].Cells["Content"].Value.ToString(); } private void Login_Click(object sender, EventArgs e) diff --git a/unimarc/unimarc/Login.resx b/unimarc/unimarc/Login.resx index b01df2d..2949462 100644 --- a/unimarc/unimarc/Login.resx +++ b/unimarc/unimarc/Login.resx @@ -123,4 +123,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/unimarc/unimarc/Main.cs b/unimarc/unimarc/Main.cs index fc1a738..20cfea6 100644 --- a/unimarc/unimarc/Main.cs +++ b/unimarc/unimarc/Main.cs @@ -977,7 +977,7 @@ namespace WindowsFormsApp1 #endregion - #region DVD / CD / LP (TODO: 개발중) + #region DVD / CD / LP CD_LP cl; CD_LP_List cll; diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 94d01f6..32a9999 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 33bb1c5..15261a5 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 c4bb3b4..e04cae4 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 390f764..a3af23b 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 94d01f6..32a9999 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 33bb1c5..15261a5 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 c4bb3b4..e04cae4 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/마크/CD_LP.Designer.cs b/unimarc/unimarc/마크/CD_LP.Designer.cs index 2fd562e..a7d2290 100644 --- a/unimarc/unimarc/마크/CD_LP.Designer.cs +++ b/unimarc/unimarc/마크/CD_LP.Designer.cs @@ -42,9 +42,7 @@ namespace UniMarc.마크 this.tb_Num = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.tb_T008 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); this.tb_T007 = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); this.tb_T005 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); @@ -83,7 +81,7 @@ namespace UniMarc.마크 this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(0, 68); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(977, 666); + this.panel3.Size = new System.Drawing.Size(959, 666); this.panel3.TabIndex = 6; // // richTextBox1 @@ -93,7 +91,7 @@ namespace UniMarc.마크 this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(975, 664); + this.richTextBox1.Size = new System.Drawing.Size(957, 664); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; this.richTextBox1.TextChanged += new System.EventHandler(this.richTextBox1_TextChanged); @@ -111,7 +109,7 @@ namespace UniMarc.마크 this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(977, 33); + this.panel2.Size = new System.Drawing.Size(959, 33); this.panel2.TabIndex = 5; // // Btn_New @@ -141,6 +139,7 @@ namespace UniMarc.마크 this.button2.TabIndex = 2; this.button2.Text = "닫 기"; this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); // // Btn_SaveMarc // @@ -190,39 +189,21 @@ namespace UniMarc.마크 // // tb_T008 // - this.tb_T008.Location = new System.Drawing.Point(716, 6); + this.tb_T008.Location = new System.Drawing.Point(705, 6); this.tb_T008.Name = "tb_T008"; this.tb_T008.Size = new System.Drawing.Size(189, 21); this.tb_T008.TabIndex = 1; // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(683, 10); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(31, 12); - this.label4.TabIndex = 0; - this.label4.Text = "T008"; - // // tb_T007 // - this.tb_T007.Location = new System.Drawing.Point(409, 6); + this.tb_T007.Location = new System.Drawing.Point(437, 6); this.tb_T007.Name = "tb_T007"; this.tb_T007.Size = new System.Drawing.Size(177, 21); this.tb_T007.TabIndex = 1; // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(376, 10); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 12); - this.label3.TabIndex = 0; - this.label3.Text = "T007"; - // // tb_T005 // - this.tb_T005.Location = new System.Drawing.Point(207, 6); + this.tb_T005.Location = new System.Drawing.Point(196, 6); this.tb_T005.Name = "tb_T005"; this.tb_T005.Size = new System.Drawing.Size(146, 21); this.tb_T005.TabIndex = 1; @@ -230,7 +211,7 @@ namespace UniMarc.마크 // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(174, 10); + this.label1.Location = new System.Drawing.Point(163, 10); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(31, 12); this.label1.TabIndex = 0; @@ -244,20 +225,18 @@ namespace UniMarc.마크 this.panel1.Controls.Add(this.tb_Num); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.tb_T008); - this.panel1.Controls.Add(this.label4); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.tb_T007); this.panel1.Controls.Add(this.tb_T005); - this.panel1.Controls.Add(this.label3); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 33); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(977, 35); + this.panel1.Size = new System.Drawing.Size(959, 35); this.panel1.TabIndex = 4; // // Btn_Help008 // - this.Btn_Help008.Location = new System.Drawing.Point(910, 5); + this.Btn_Help008.Location = new System.Drawing.Point(656, 5); this.Btn_Help008.Name = "Btn_Help008"; this.Btn_Help008.Size = new System.Drawing.Size(47, 23); this.Btn_Help008.TabIndex = 2; @@ -267,7 +246,7 @@ namespace UniMarc.마크 // // Btn_Help007 // - this.Btn_Help007.Location = new System.Drawing.Point(592, 5); + this.Btn_Help007.Location = new System.Drawing.Point(388, 5); this.Btn_Help007.Name = "Btn_Help007"; this.Btn_Help007.Size = new System.Drawing.Size(47, 23); this.Btn_Help007.TabIndex = 2; @@ -320,6 +299,7 @@ namespace UniMarc.마크 this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.ReadOnly = true; + this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(332, 701); this.dataGridView1.TabIndex = 0; @@ -425,14 +405,14 @@ namespace UniMarc.마크 this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(332, 0); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(977, 734); + this.panel5.Size = new System.Drawing.Size(959, 734); this.panel5.TabIndex = 8; // // CD_LP // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1309, 734); + this.ClientSize = new System.Drawing.Size(1291, 734); this.Controls.Add(this.panel5); this.Controls.Add(this.panel4); this.Name = "CD_LP"; @@ -459,8 +439,6 @@ namespace UniMarc.마크 private System.Windows.Forms.Panel panel2; private System.Windows.Forms.TextBox tb_Num; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; private System.Windows.Forms.TextBox tb_T005; private System.Windows.Forms.Label label1; private System.Windows.Forms.Panel panel1; diff --git a/unimarc/unimarc/마크/CD_LP.cs b/unimarc/unimarc/마크/CD_LP.cs index 5658026..237d3b2 100644 --- a/unimarc/unimarc/마크/CD_LP.cs +++ b/unimarc/unimarc/마크/CD_LP.cs @@ -31,7 +31,7 @@ namespace UniMarc.마크 string[] Site = { "교보문고", "알라딘" }; cb_SiteCon.Items.AddRange(Site); - cb_SiteCon.SelectedIndex = 0; + cb_SiteCon.SelectedIndex = 1; string[] Type = { "음반", "DVD" }; cb_Type.Items.AddRange(Type); @@ -101,15 +101,26 @@ namespace UniMarc.마크 private void Btn_SaveMarc_Click(object sender, EventArgs e) { String_Text st = new String_Text(); - bool isAdd = false; + bool isAdd = true; string Type = cb_Type.SelectedText; string num = tb_Num.Text; string listtitle = lbl_ListTitle.Text; string date = lbl_date.Text; - if (num.Length == 0) - isAdd = true; + for (int a = 0; a < dataGridView1.RowCount; a++) + { + if (num.Length == 0) { + isAdd = true; + break; + } + if (num != dataGridView1.Rows[a].Cells["num"].Value.ToString()) + isAdd = true; + else { + isAdd = false; + break; + } + } string t005 = tb_T005.Text; string t007 = tb_T007.Text; @@ -123,8 +134,8 @@ namespace UniMarc.마크 string[] ContentTag = st.Take_Tag(orimarc, SearchTag); string[] artistTag = { "100a", "110a", "111a" }; - string[] Contentartist = st.Take_Tag(orimarc, artistTag); - string artist = Takeartist(Contentartist); + string[] ContentArtist = st.Take_Tag(orimarc, artistTag); + string artist = Takeartist(ContentArtist); if (isAdd) { @@ -158,7 +169,7 @@ namespace UniMarc.마크 marcidx = dataGridView1.Rows[a].Cells["idx"].Value.ToString(); dataGridView1.Rows[a].Cells["code"].Value = ContentTag[0]; dataGridView1.Rows[a].Cells["title"].Value = ContentTag[2]; - dataGridView1.Rows[a].Cells["artist"].Value = artist; + dataGridView1.Rows[a].Cells["author"].Value = artist; dataGridView1.Rows[a].Cells["comp"].Value = ContentTag[3]; dataGridView1.Rows[a].Cells["price"].Value = ContentTag[1]; dataGridView1.Rows[a].Cells["marc"].Value = orimarc; @@ -206,8 +217,11 @@ namespace UniMarc.마크 private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) { int row = e.RowIndex; + string SelectNum = dataGridView1.Rows[row].Cells["num"].Value.ToString(); string SelectMarc = dataGridView1.Rows[row].Cells["marc"].Value.ToString(); + tb_Num.Text = SelectNum; + String_Text st = new String_Text(); string ViewMarc = st.ConvertMarcType(SelectMarc); @@ -253,8 +267,8 @@ namespace UniMarc.마크 private void Btn_New_Click(object sender, EventArgs e) { - - tb_Num.Text = dataGridView1.RowCount.ToString().PadLeft(3, '0'); + int count = dataGridView1.RowCount + 1; + tb_Num.Text = count.ToString().PadLeft(3, '0'); richTextBox1.Text = "020\t \t▼a:▼c▲\n" + @@ -296,5 +310,10 @@ namespace UniMarc.마크 } + + private void button2_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/unimarc/unimarc/마크/CD_LP_List.Designer.cs b/unimarc/unimarc/마크/CD_LP_List.Designer.cs index 9ce84a0..f38ec08 100644 --- a/unimarc/unimarc/마크/CD_LP_List.Designer.cs +++ b/unimarc/unimarc/마크/CD_LP_List.Designer.cs @@ -28,15 +28,16 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); this.Btn_SelectList = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.cb_EncodingType = new System.Windows.Forms.ComboBox(); this.lbl_ListTitle = new System.Windows.Forms.Label(); this.lbl_date = new System.Windows.Forms.Label(); this.Btn_OutPut = new System.Windows.Forms.Button(); @@ -48,7 +49,6 @@ this.panel2 = new System.Windows.Forms.Panel(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.panel3 = new System.Windows.Forms.Panel(); this.Check = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Num = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -64,7 +64,8 @@ this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Type = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cb_EncodingType = new System.Windows.Forms.ComboBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.Btn_SelectRemove = new System.Windows.Forms.Button(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); @@ -73,7 +74,7 @@ // // Btn_SelectList // - this.Btn_SelectList.Location = new System.Drawing.Point(7, 6); + this.Btn_SelectList.Location = new System.Drawing.Point(7, 5); this.Btn_SelectList.Name = "Btn_SelectList"; this.Btn_SelectList.Size = new System.Drawing.Size(75, 23); this.Btn_SelectList.TabIndex = 0; @@ -84,6 +85,7 @@ // panel1 // this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.Btn_SelectRemove); this.panel1.Controls.Add(this.cb_EncodingType); this.panel1.Controls.Add(this.lbl_ListTitle); this.panel1.Controls.Add(this.lbl_date); @@ -97,14 +99,27 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1199, 36); + this.panel1.Size = new System.Drawing.Size(1290, 35); this.panel1.TabIndex = 1; // + // cb_EncodingType + // + this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_EncodingType.FormattingEnabled = true; + this.cb_EncodingType.Items.AddRange(new object[] { + "ANSI", + "UTF-8", + "UniCode"}); + this.cb_EncodingType.Location = new System.Drawing.Point(788, 6); + this.cb_EncodingType.Name = "cb_EncodingType"; + this.cb_EncodingType.Size = new System.Drawing.Size(75, 20); + this.cb_EncodingType.TabIndex = 4; + // // lbl_ListTitle // this.lbl_ListTitle.AutoSize = true; this.lbl_ListTitle.Font = new System.Drawing.Font("굴림", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.lbl_ListTitle.Location = new System.Drawing.Point(88, 11); + this.lbl_ListTitle.Location = new System.Drawing.Point(88, 10); this.lbl_ListTitle.Name = "lbl_ListTitle"; this.lbl_ListTitle.Size = new System.Drawing.Size(0, 13); this.lbl_ListTitle.TabIndex = 2; @@ -112,7 +127,7 @@ // lbl_date // this.lbl_date.AutoSize = true; - this.lbl_date.Location = new System.Drawing.Point(88, 17); + this.lbl_date.Location = new System.Drawing.Point(88, 16); this.lbl_date.Name = "lbl_date"; this.lbl_date.Size = new System.Drawing.Size(111, 12); this.lbl_date.TabIndex = 3; @@ -121,7 +136,7 @@ // // Btn_OutPut // - this.Btn_OutPut.Location = new System.Drawing.Point(760, 6); + this.Btn_OutPut.Location = new System.Drawing.Point(864, 5); this.Btn_OutPut.Name = "Btn_OutPut"; this.Btn_OutPut.Size = new System.Drawing.Size(75, 23); this.Btn_OutPut.TabIndex = 0; @@ -131,7 +146,7 @@ // // Btn_Excel // - this.Btn_Excel.Location = new System.Drawing.Point(522, 6); + this.Btn_Excel.Location = new System.Drawing.Point(626, 5); this.Btn_Excel.Name = "Btn_Excel"; this.Btn_Excel.Size = new System.Drawing.Size(75, 23); this.Btn_Excel.TabIndex = 0; @@ -141,17 +156,17 @@ // // Btn_CheckTrue // - this.Btn_CheckTrue.Location = new System.Drawing.Point(341, 6); + this.Btn_CheckTrue.Location = new System.Drawing.Point(341, 5); this.Btn_CheckTrue.Name = "Btn_CheckTrue"; this.Btn_CheckTrue.Size = new System.Drawing.Size(75, 23); this.Btn_CheckTrue.TabIndex = 0; - this.Btn_CheckTrue.Text = "전체선택"; + this.Btn_CheckTrue.Text = "전체 선택"; this.Btn_CheckTrue.UseVisualStyleBackColor = true; this.Btn_CheckTrue.Click += new System.EventHandler(this.Btn_SelectGrid); // // Btn_Close // - this.Btn_Close.Location = new System.Drawing.Point(844, 6); + this.Btn_Close.Location = new System.Drawing.Point(948, 5); this.Btn_Close.Name = "Btn_Close"; this.Btn_Close.Size = new System.Drawing.Size(75, 23); this.Btn_Close.TabIndex = 0; @@ -161,7 +176,7 @@ // // Btn_ViewMarc // - this.Btn_ViewMarc.Location = new System.Drawing.Point(603, 6); + this.Btn_ViewMarc.Location = new System.Drawing.Point(707, 5); this.Btn_ViewMarc.Name = "Btn_ViewMarc"; this.Btn_ViewMarc.Size = new System.Drawing.Size(75, 23); this.Btn_ViewMarc.TabIndex = 0; @@ -171,11 +186,11 @@ // // Btn_CheckFalse // - this.Btn_CheckFalse.Location = new System.Drawing.Point(419, 6); + this.Btn_CheckFalse.Location = new System.Drawing.Point(419, 5); this.Btn_CheckFalse.Name = "Btn_CheckFalse"; this.Btn_CheckFalse.Size = new System.Drawing.Size(75, 23); this.Btn_CheckFalse.TabIndex = 0; - this.Btn_CheckFalse.Text = "전체해제"; + this.Btn_CheckFalse.Text = "선택 해제"; this.Btn_CheckFalse.UseVisualStyleBackColor = true; this.Btn_CheckFalse.Click += new System.EventHandler(this.Btn_SelectGrid); // @@ -185,7 +200,7 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; this.panel2.Location = new System.Drawing.Point(0, 713); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1199, 1); + this.panel2.Size = new System.Drawing.Size(1290, 1); this.panel2.TabIndex = 1; // // richTextBox1 @@ -194,7 +209,7 @@ this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBox1.Location = new System.Drawing.Point(0, 0); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1199, 1); + this.richTextBox1.Size = new System.Drawing.Size(1290, 1); this.richTextBox1.TabIndex = 0; this.richTextBox1.Text = ""; // @@ -202,14 +217,14 @@ // this.dataGridView1.AllowUserToAddRows = false; this.dataGridView1.AllowUserToDeleteRows = false; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; + 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; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.Check, this.idx, @@ -229,21 +244,13 @@ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1199, 677); + this.dataGridView1.Size = new System.Drawing.Size(1290, 678); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint); // - // panel3 - // - this.panel3.Controls.Add(this.dataGridView1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 36); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1199, 677); - this.panel3.TabIndex = 2; - // // Check // this.Check.FalseValue = "F"; @@ -268,48 +275,48 @@ // // RegNum // - dataGridViewCellStyle30.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.RegNum.DefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.RegNum.DefaultCellStyle = dataGridViewCellStyle16; this.RegNum.HeaderText = "등록번호"; this.RegNum.Name = "RegNum"; this.RegNum.Width = 120; // // ClassNum // - dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.ClassNum.DefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.ClassNum.DefaultCellStyle = dataGridViewCellStyle17; this.ClassNum.HeaderText = "분류기호"; this.ClassNum.Name = "ClassNum"; this.ClassNum.Width = 80; // // AuthorSymbol // - dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.AuthorSymbol.DefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.AuthorSymbol.DefaultCellStyle = dataGridViewCellStyle18; this.AuthorSymbol.HeaderText = "저자기호"; this.AuthorSymbol.Name = "AuthorSymbol"; this.AuthorSymbol.Width = 80; // // Vol // - dataGridViewCellStyle33.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Vol.DefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Vol.DefaultCellStyle = dataGridViewCellStyle19; this.Vol.HeaderText = "볼륨"; this.Vol.Name = "Vol"; this.Vol.Width = 60; // // Copy // - dataGridViewCellStyle34.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Copy.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Copy.DefaultCellStyle = dataGridViewCellStyle20; this.Copy.HeaderText = "복본"; this.Copy.Name = "Copy"; this.Copy.Width = 50; // // Fix // - dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.Fix.DefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.Fix.DefaultCellStyle = dataGridViewCellStyle21; this.Fix.HeaderText = "별치"; this.Fix.Name = "Fix"; this.Fix.Width = 60; @@ -346,24 +353,30 @@ this.Marc.Name = "Marc"; this.Marc.Visible = false; // - // cb_EncodingType + // panel3 // - this.cb_EncodingType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_EncodingType.FormattingEnabled = true; - this.cb_EncodingType.Items.AddRange(new object[] { - "ANSI", - "UTF-8", - "UniCode"}); - this.cb_EncodingType.Location = new System.Drawing.Point(684, 7); - this.cb_EncodingType.Name = "cb_EncodingType"; - this.cb_EncodingType.Size = new System.Drawing.Size(75, 20); - this.cb_EncodingType.TabIndex = 4; + this.panel3.Controls.Add(this.dataGridView1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 35); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1290, 678); + this.panel3.TabIndex = 2; + // + // Btn_SelectRemove + // + this.Btn_SelectRemove.Location = new System.Drawing.Point(497, 5); + this.Btn_SelectRemove.Name = "Btn_SelectRemove"; + this.Btn_SelectRemove.Size = new System.Drawing.Size(75, 23); + this.Btn_SelectRemove.TabIndex = 5; + this.Btn_SelectRemove.Text = "선택 삭제"; + this.Btn_SelectRemove.UseVisualStyleBackColor = true; + this.Btn_SelectRemove.Click += new System.EventHandler(this.Btn_SelectRemove_Click); // // CD_LP_List // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1199, 714); + this.ClientSize = new System.Drawing.Size(1290, 714); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -411,5 +424,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Type; private System.Windows.Forms.DataGridViewTextBoxColumn Marc; private System.Windows.Forms.ComboBox cb_EncodingType; + private System.Windows.Forms.Button Btn_SelectRemove; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/CD_LP_List.cs b/unimarc/unimarc/마크/CD_LP_List.cs index a041de0..3311550 100644 --- a/unimarc/unimarc/마크/CD_LP_List.cs +++ b/unimarc/unimarc/마크/CD_LP_List.cs @@ -340,39 +340,37 @@ namespace UniMarc.마크 break; } } - - // String_Text st = new String_Text(); - // Set_Macro sm = new Set_Macro(); - // - // string FileEncodingType = ""; - // - // switch (cb_EncodingType.SelectedIndex) - // { - // case 0: FileEncodingType = "ANSI"; break; - // case 1: FileEncodingType = "UTF-8"; break; - // case 2: FileEncodingType = "UniCode"; break; - // default: break; - // } - // - // string[] MarcArray = new string[dataGridView1.RowCount]; - // for (int a = 0; a < dataGridView1.Rows.Count; a++) - // { - // if (dataGridView1.Rows[a].Cells["marc"].Value.ToString() == "" && - // dataGridView1.Rows[a].Cells["marc"].Value == null) - // continue; - // - // if (dataGridView1.Rows[a].Cells["colCheck"].Value.ToString() != "T") - // continue; - // - // string marc = dataGridView1.Rows[a].Cells["Marc"].Value.ToString().Replace("₩", "\\"); - // marc = st.ConvertMarcType(marc); - // - // MarcArray[a] = marc; - // } - // - // sm.ViewMarcArray = MarcArray; - // sm.FileType = FileEncodingType; - // sm.Show(); } + + private void Btn_SelectRemove_Click(object sender, EventArgs e) + { + if (MessageBox.Show("정말 삭제하시겠습니까?", "삭제", MessageBoxButtons.YesNo) == DialogResult.No) + return; + + List SelectIndex = new List(); + + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (dataGridView1.Rows[a].Cells["Check"].Value.ToString() == "T") + { + SelectIndex.Add(a); + } + } + + if (SelectIndex.Count <= 0) { + MessageBox.Show("선택 사항이 없습니다."); + return; + } + + for (int a = SelectIndex.Count - 1; a >= 0; a--) + { + dataGridView1.Rows.RemoveAt(SelectIndex[a]); + db.DB_Send_CMD_reVoid( + db.DB_Delete("DVD_List_Product", "idx", dataGridView1.Rows[SelectIndex[a]].Cells["idx"].Value.ToString(), "compidx", compidx) + ); + } + MessageBox.Show("삭제되었습니다"); + } + } } diff --git a/unimarc/unimarc/마크/CD_LP_Sub.cs b/unimarc/unimarc/마크/CD_LP_Sub.cs index e7466b2..af7cc88 100644 --- a/unimarc/unimarc/마크/CD_LP_Sub.cs +++ b/unimarc/unimarc/마크/CD_LP_Sub.cs @@ -672,8 +672,6 @@ namespace UniMarc.마크 } } - MessageBox.Show(string.Format("title\n{0}\nArtist\n{1}\nActor\n{2}\ncomp\n{3}\nprice\n{4}\nyears\n{5}\ncount\n{6}\noriTitle\n{7}", - title, Artist, Actor, comp, price, Years, count, oriTitle)); /// [0]title, [1]artist, [2]subArtist, [3]comp, [4]price, [5]PubYear, [6]count, [7]oriTitle string[] Result = { title, Artist, Actor, comp, price, Years, count, oriTitle }; return Result; diff --git a/unimarc/unimarc/마크/Marc_Plan.cs b/unimarc/unimarc/마크/Marc_Plan.cs index a233a84..53fc415 100644 --- a/unimarc/unimarc/마크/Marc_Plan.cs +++ b/unimarc/unimarc/마크/Marc_Plan.cs @@ -77,11 +77,10 @@ namespace WindowsFormsApp1.Mac // L V C F A B string[] GetTag = { "049v", "049c", "049f" }; string[] GetTag2 = { "090a", "090b" }; - // idx - // 연번 등록번호 분류기호 저자기호 V(049v,볼륨) - // C(049c,복본) F(049f,별치) 구분(이용자) ISBN 도서명 - // 총서명 총서번호 총서명1 총서명1 저자 - // 출판사 정가 midx 마크 + // idx 연번 등록번호 분류기호 저자기호 + // V(049v,볼륨) C(049c,복본) F(049f,별치) 구분(이용자) ISBN + // 도서명 총서명 총서번호 총서명1 총서명1 + // 저자 출판사 정가 midx 마크 // idx // 연번 등록번호 분류기호 저자기호 ISBN