diff --git a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo index 2b20525..3a74898 100644 Binary files a/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo and b/ISBN_Check_test/.vs/ISBN_Check_test/v16/.suo differ diff --git a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache index 3aa4a5d..f5bb0f6 100644 Binary files a/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache and b/ISBN_Check_test/obj/Debug/ISBN_Check_test.csprojAssemblyReference.cache differ diff --git a/unimarc/.vs/unimarc/v16/.suo b/unimarc/.vs/unimarc/v16/.suo index d8603f8..053ff13 100644 Binary files a/unimarc/.vs/unimarc/v16/.suo and b/unimarc/.vs/unimarc/v16/.suo differ diff --git a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z b/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z new file mode 100644 index 0000000..9ba2008 Binary files /dev/null and b/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.7z differ diff --git a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi b/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi index b49aa4a..eb43855 100644 Binary files a/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi and b/unimarc/Setup_UniMarc/Debug/Setup_UniMarc.msi differ diff --git a/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj b/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj index 5daae82..14330cb 100644 --- a/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj +++ b/unimarc/Setup_UniMarc/Setup_UniMarc.vdproj @@ -15,13 +15,13 @@ { "Entry" { - "MsmKey" = "8:_54DD35E8B8A147EE90B9C5640DA30A75" + "MsmKey" = "8:_753344FE1F09410C9D0F442B1279C21F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_97C67F305EF84E6D844C2A7173FC86DC" + "MsmKey" = "8:_E78196A0B332402DB05AB7FEB1E4F799" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -34,7 +34,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_97C67F305EF84E6D844C2A7173FC86DC" + "OwnerKey" = "8:_753344FE1F09410C9D0F442B1279C21F" "MsmSig" = "8:_UNDEFINED" } } @@ -55,6 +55,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } + } } "Release" { @@ -71,6 +87,22 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } + } } } "Deployable" @@ -100,7 +132,7 @@ } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_54DD35E8B8A147EE90B9C5640DA30A75" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E78196A0B332402DB05AB7FEB1E4F799" { "SourcePath" = "8:C:\\Update\\Update.inf" "TargetName" = "8:Update.inf" @@ -317,7 +349,7 @@ } "Shortcut" { - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_1C26978710F94E498E42F03968523BA9" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_1D92A7BDFE934874B5946396343F58EA" { "Name" = "8:UniMarc" "Arguments" = "8:" @@ -325,13 +357,13 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_97C67F305EF84E6D844C2A7173FC86DC" - "Folder" = "8:_74D25C29FA384AD0AAE9D733594F6B6A" + "Target" = "8:_753344FE1F09410C9D0F442B1279C21F" + "Folder" = "8:_C702D9CCA84A4CB990260A30151CE064" "WorkingFolder" = "8:_5AFD85B9101B47DB9537A694229E7941" "Icon" = "8:_F0CD886B86254771BEA61BF625DE2CE1" "Feature" = "8:" } - "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_281B981BE2C94D2AA375902366E61251" + "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_C05FDEA084D04D1A859017F1814945E5" { "Name" = "8:UniMarc" "Arguments" = "8:" @@ -339,8 +371,8 @@ "ShowCmd" = "3:1" "IconIndex" = "3:0" "Transitive" = "11:FALSE" - "Target" = "8:_97C67F305EF84E6D844C2A7173FC86DC" - "Folder" = "8:_C702D9CCA84A4CB990260A30151CE064" + "Target" = "8:_753344FE1F09410C9D0F442B1279C21F" + "Folder" = "8:_74D25C29FA384AD0AAE9D733594F6B6A" "WorkingFolder" = "8:_5AFD85B9101B47DB9537A694229E7941" "Icon" = "8:_F0CD886B86254771BEA61BF625DE2CE1" "Feature" = "8:" @@ -744,7 +776,7 @@ } "ProjectOutput" { - "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_97C67F305EF84E6D844C2A7173FC86DC" + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_753344FE1F09410C9D0F442B1279C21F" { "SourcePath" = "8:..\\Factory_Client\\obj\\Debug\\Factory_Client.exe" "TargetName" = "8:" diff --git a/unimarc/unimarc/App.config b/unimarc/unimarc/App.config index d432de2..01d393c 100644 --- a/unimarc/unimarc/App.config +++ b/unimarc/unimarc/App.config @@ -1,24 +1,24 @@ - + - - + + - + - + - - + + - \ No newline at end of file + diff --git a/unimarc/unimarc/Login.Designer.cs b/unimarc/unimarc/Login.Designer.cs index 4a52b47..8757eec 100644 --- a/unimarc/unimarc/Login.Designer.cs +++ b/unimarc/unimarc/Login.Designer.cs @@ -115,6 +115,7 @@ this.Controls.Add(this.PW_text); this.Controls.Add(this.ID_text); this.Name = "login"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "로그인"; this.Load += new System.EventHandler(this.login_Load); this.ResumeLayout(false); diff --git a/unimarc/unimarc/UniMarc.csproj b/unimarc/unimarc/UniMarc.csproj index 5895625..19037c0 100644 --- a/unimarc/unimarc/UniMarc.csproj +++ b/unimarc/unimarc/UniMarc.csproj @@ -10,10 +10,12 @@ UniMarc v4.7.2 512 - true + false true + false + 게시\ true Disk @@ -26,7 +28,6 @@ true 0 1.0.0.%2a - false false true @@ -39,6 +40,7 @@ DEBUG;TRACE prompt 4 + false AnyCPU @@ -48,6 +50,7 @@ TRACE prompt 4 + false false @@ -142,6 +145,12 @@ Mac_List_Merge.cs + + Form + + + Mac_Preview.cs + Form @@ -154,12 +163,24 @@ Marc.cs + + Form + + + Marc_memo.cs + Form Search_Infor_Sub.cs + + Form + + + Zoom_Picture.cs + Form @@ -615,15 +636,24 @@ Mac_List_Merge.cs + + Mac_Preview.cs + Make_Document.cs Marc.cs + + Marc_memo.cs + Search_Infor_Sub.cs + + Zoom_Picture.cs + Bill_manage.cs diff --git a/unimarc/unimarc/bin/Debug/UniMarc.exe b/unimarc/unimarc/bin/Debug/UniMarc.exe index 4d847ac..3e7e2a7 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.exe.config b/unimarc/unimarc/bin/Debug/UniMarc.exe.config index d432de2..01d393c 100644 --- a/unimarc/unimarc/bin/Debug/UniMarc.exe.config +++ b/unimarc/unimarc/bin/Debug/UniMarc.exe.config @@ -1,24 +1,24 @@ - + - - + + - + - + - - + + - \ No newline at end of file + diff --git a/unimarc/unimarc/bin/Debug/UniMarc.pdb b/unimarc/unimarc/bin/Debug/UniMarc.pdb index 83c54d7..622a9e7 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 29ec63a..4fc0670 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/DesignTimeResolveAssemblyReferences.cache b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache index b5def2d..44776dd 100644 Binary files a/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/unimarc/unimarc/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll b/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll index e300179..0c1ec0e 100644 Binary files a/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll and b/unimarc/unimarc/obj/Debug/TempPE/Connected Services.BaroService_API.Reference.cs.dll differ diff --git a/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index ade6d52..9f225b5 100644 Binary files a/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/unimarc/unimarc/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache index fec96fa..415914d 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fd1f9401e10f8f29708f7e2ae31942e82288bb81 +d98a511ed220a7ba53ba614a163ba7572f3f0277 diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt index 1cf7c53..b1f1809 100644 --- a/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt +++ b/unimarc/unimarc/obj/Debug/UniMarc.csproj.FileListAbsolute.txt @@ -111,3 +111,6 @@ C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\bin\Debug\ko\UniMarc.reso C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\ko\UniMarc.resources.dll C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.exe C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.pdb +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Marc_memo.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Zoom_Picture.resources +C:\Users\Administrator\Desktop\unimarc\unimarc\UniMarc\obj\Debug\UniMarc.마크.Mac_Preview.resources diff --git a/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache b/unimarc/unimarc/obj/Debug/UniMarc.csproj.GenerateResource.cache index 7ab64d3..36646bb 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 4d847ac..3e7e2a7 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 83c54d7..622a9e7 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/UniMarc.마크.Mac_Preview.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Mac_Preview.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Mac_Preview.resources differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_memo.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_memo.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Marc_memo.resources differ diff --git a/unimarc/unimarc/obj/Debug/UniMarc.마크.Zoom_Picture.resources b/unimarc/unimarc/obj/Debug/UniMarc.마크.Zoom_Picture.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/unimarc/unimarc/obj/Debug/UniMarc.마크.Zoom_Picture.resources differ diff --git a/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll b/unimarc/unimarc/obj/Debug/ko/UniMarc.resources.dll index 29ec63a..4fc0670 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/납품관리/Bring_Back.Designer.cs b/unimarc/unimarc/납품관리/Bring_Back.Designer.cs index 801d98c..eca6d76 100644 --- a/unimarc/unimarc/납품관리/Bring_Back.Designer.cs +++ b/unimarc/unimarc/납품관리/Bring_Back.Designer.cs @@ -37,6 +37,7 @@ namespace WindowsFormsApp1.납품관리 this.btn_Close = new System.Windows.Forms.Button(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.panel1 = new System.Windows.Forms.Panel(); + this.idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.author = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -88,6 +89,7 @@ namespace WindowsFormsApp1.납품관리 this.btn_Return.TabIndex = 2; this.btn_Return.Text = "반품처리"; this.btn_Return.UseVisualStyleBackColor = true; + this.btn_Return.Click += new System.EventHandler(this.btn_Return_Click); // // btn_Close // @@ -97,6 +99,7 @@ namespace WindowsFormsApp1.납품관리 this.btn_Close.TabIndex = 2; this.btn_Close.Text = "닫 기"; this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); // // dataGridView1 // @@ -111,6 +114,7 @@ namespace WindowsFormsApp1.납품관리 dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.idx, this.num, this.book_name, this.author, @@ -145,6 +149,13 @@ namespace WindowsFormsApp1.납품관리 this.panel1.Size = new System.Drawing.Size(633, 45); this.panel1.TabIndex = 4; // + // idx + // + this.idx.HeaderText = "idx"; + this.idx.Name = "idx"; + this.idx.Visible = false; + this.idx.Width = 50; + // // num // this.num.HeaderText = "번호"; @@ -235,6 +246,7 @@ namespace WindowsFormsApp1.납품관리 private System.Windows.Forms.Button btn_Close; private System.Windows.Forms.Panel panel1; public System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.DataGridViewTextBoxColumn idx; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; private System.Windows.Forms.DataGridViewTextBoxColumn author; diff --git a/unimarc/unimarc/납품관리/Bring_Back.cs b/unimarc/unimarc/납품관리/Bring_Back.cs index 629fa06..7d9f0f1 100644 --- a/unimarc/unimarc/납품관리/Bring_Back.cs +++ b/unimarc/unimarc/납품관리/Bring_Back.cs @@ -32,13 +32,16 @@ namespace WindowsFormsApp1.납품관리 string db_data = db.More_DB_Search("Obj_List", sear_col, sear_data, Area); string[] arr_data = db_data.Split('|'); - cb_list_name.Items.AddRange(arr_data); + for(int a = 0; a < arr_data.Length - 1; a++) + { + cb_list_name.Items.Add(arr_data[a]); + } } private void btn_Lookup_Click(object sender, EventArgs e) { dataGridView1.Rows.Clear(); - string Area = "`num`, `book_name`, `author`, `book_comp`, `isbn`, " + - "`price`, `count`, `total`, `list_name`, `etc`"; + string Area = "`idx`, `num`, `book_name`, `author`, `book_comp`, " + + "`isbn`, `price`, `count`, `total`, `list_name`, `etc`"; string[] sear_col = { "compidx", "list_name" }; string[] sear_data = { compidx, cb_list_name.Text }; string db_data = db.More_DB_Search("Obj_List_Book", sear_col, sear_data, Area); @@ -50,8 +53,8 @@ namespace WindowsFormsApp1.납품관리 private void input_Grid(string[] data) { string[] grid = { "", "", "", "", "", - "", "", "", "", "" }; - int c = 10; + "", "", "", "", "", "" }; + int c = grid.Length; for(int a = 0; a < data.Length; a++) { if (a % c == 0) { grid[0] = data[a]; } @@ -63,12 +66,36 @@ namespace WindowsFormsApp1.납품관리 if (a % c == 6) { grid[6] = data[a]; } if (a % c == 7) { grid[7] = data[a]; } if (a % c == 8) { grid[8] = data[a]; } - if (a % c == 9) { grid[9] = data[a]; + if (a % c == 9) { grid[9] = data[a]; } + if (a % c == 10) { grid[10] = data[a]; dataGridView1.Rows.Add(grid); } } } #endregion + private void btn_Return_Click(object sender, EventArgs e) + { + if (dataGridView1.Rows.Count <= 0) { + return; + } + for (int a = 0; a < dataGridView1.Rows.Count; a++) + { + if (Convert.ToBoolean(dataGridView1.Rows[a].Cells["chkbox"].Value) == true) + { + Return(a); + } + } + } + #region Btn_Return_Click_Sub + private void Return(int a) + { + string[] sear_col = { "idx", "compidx" }; + string[] sear_data = { dataGridView1.Rows[a].Cells["idx"].Value.ToString(), compidx }; + string[] edit_col = { "import", "etc" }; + string[] edit_data = { "미입고", "반품처리 " + dataGridView1.Rows[a].Cells["etc"].Value.ToString() }; + db.More_Update("Obj_List_Book", edit_col, edit_data, sear_col, sear_data); + } + #endregion private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { int col = e.ColumnIndex; @@ -92,5 +119,9 @@ namespace WindowsFormsApp1.납품관리 dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = true; } } + private void btn_Close_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/unimarc/unimarc/납품관리/Bring_Back.resx b/unimarc/unimarc/납품관리/Bring_Back.resx index 59d82ca..19529c4 100644 --- a/unimarc/unimarc/납품관리/Bring_Back.resx +++ b/unimarc/unimarc/납품관리/Bring_Back.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True diff --git a/unimarc/unimarc/마크/Check_ISBN.Designer.cs b/unimarc/unimarc/마크/Check_ISBN.Designer.cs index a13084f..394469d 100644 --- a/unimarc/unimarc/마크/Check_ISBN.Designer.cs +++ b/unimarc/unimarc/마크/Check_ISBN.Designer.cs @@ -32,6 +32,17 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.btn_lookup = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); + this.tb_list_name = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.btn_Save = new System.Windows.Forms.Button(); + this.btn_Close = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); + this.cb_api = new System.Windows.Forms.ComboBox(); + this.progressBar1 = new System.Windows.Forms.ProgressBar(); + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.num = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -52,17 +63,6 @@ this.sold_out = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.image = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.api_data = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btn_lookup = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.tb_list_name = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.btn_Save = new System.Windows.Forms.Button(); - this.btn_Close = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.cb_api = new System.Windows.Forms.ComboBox(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.richTextBox1 = new System.Windows.Forms.RichTextBox(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -115,12 +115,111 @@ dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(1615, 547); + this.dataGridView1.Size = new System.Drawing.Size(1608, 547); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellClick); this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); this.dataGridView1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView1_KeyDown); // + // btn_lookup + // + this.btn_lookup.Location = new System.Drawing.Point(709, 7); + this.btn_lookup.Name = "btn_lookup"; + this.btn_lookup.Size = new System.Drawing.Size(99, 23); + this.btn_lookup.TabIndex = 1; + this.btn_lookup.Text = "ISBN 자동 조회"; + this.btn_lookup.UseVisualStyleBackColor = true; + this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(516, 8); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(161, 20); + this.cb_filter.TabIndex = 2; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(16, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(41, 12); + this.label1.TabIndex = 3; + this.label1.Text = "목록명"; + // + // tb_list_name + // + this.tb_list_name.Enabled = false; + this.tb_list_name.Location = new System.Drawing.Point(59, 8); + this.tb_list_name.Name = "tb_list_name"; + this.tb_list_name.Size = new System.Drawing.Size(199, 21); + this.tb_list_name.TabIndex = 4; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(457, 12); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(57, 12); + this.label2.TabIndex = 3; + this.label2.Text = "검색 조건"; + // + // btn_Save + // + this.btn_Save.Location = new System.Drawing.Point(819, 7); + this.btn_Save.Name = "btn_Save"; + this.btn_Save.Size = new System.Drawing.Size(99, 23); + this.btn_Save.TabIndex = 1; + this.btn_Save.Text = "전 체 저 장"; + this.btn_Save.UseVisualStyleBackColor = true; + this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); + // + // btn_Close + // + this.btn_Close.Location = new System.Drawing.Point(929, 7); + this.btn_Close.Name = "btn_Close"; + this.btn_Close.Size = new System.Drawing.Size(99, 23); + this.btn_Close.TabIndex = 1; + this.btn_Close.Text = "닫 기"; + this.btn_Close.UseVisualStyleBackColor = true; + this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(278, 12); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(57, 12); + this.label3.TabIndex = 5; + this.label3.Text = "검색 엔진"; + // + // cb_api + // + this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_api.FormattingEnabled = true; + this.cb_api.Location = new System.Drawing.Point(337, 8); + this.cb_api.Name = "cb_api"; + this.cb_api.Size = new System.Drawing.Size(93, 20); + this.cb_api.TabIndex = 6; + this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); + // + // progressBar1 + // + this.progressBar1.Location = new System.Drawing.Point(1060, 7); + this.progressBar1.Name = "progressBar1"; + this.progressBar1.Size = new System.Drawing.Size(219, 23); + this.progressBar1.TabIndex = 7; + // + // richTextBox1 + // + this.richTextBox1.Location = new System.Drawing.Point(12, 589); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(1608, 123); + this.richTextBox1.TabIndex = 8; + this.richTextBox1.Text = ""; + // // num // this.num.HeaderText = "번호"; @@ -222,6 +321,7 @@ // this.image.HeaderText = "이미지"; this.image.Name = "image"; + this.image.Visible = false; // // api_data // @@ -229,110 +329,11 @@ this.api_data.Name = "api_data"; this.api_data.Visible = false; // - // btn_lookup - // - this.btn_lookup.Location = new System.Drawing.Point(709, 7); - this.btn_lookup.Name = "btn_lookup"; - this.btn_lookup.Size = new System.Drawing.Size(99, 23); - this.btn_lookup.TabIndex = 1; - this.btn_lookup.Text = "ISBN 자동 조회"; - this.btn_lookup.UseVisualStyleBackColor = true; - this.btn_lookup.Click += new System.EventHandler(this.btn_lookup_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(516, 8); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(161, 20); - this.cb_filter.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(16, 12); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); - this.label1.TabIndex = 3; - this.label1.Text = "목록명"; - // - // tb_list_name - // - this.tb_list_name.Enabled = false; - this.tb_list_name.Location = new System.Drawing.Point(59, 8); - this.tb_list_name.Name = "tb_list_name"; - this.tb_list_name.Size = new System.Drawing.Size(199, 21); - this.tb_list_name.TabIndex = 4; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(457, 12); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(57, 12); - this.label2.TabIndex = 3; - this.label2.Text = "검색 조건"; - // - // btn_Save - // - this.btn_Save.Location = new System.Drawing.Point(819, 7); - this.btn_Save.Name = "btn_Save"; - this.btn_Save.Size = new System.Drawing.Size(99, 23); - this.btn_Save.TabIndex = 1; - this.btn_Save.Text = "전 체 저 장"; - this.btn_Save.UseVisualStyleBackColor = true; - this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click); - // - // btn_Close - // - this.btn_Close.Location = new System.Drawing.Point(929, 7); - this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(99, 23); - this.btn_Close.TabIndex = 1; - this.btn_Close.Text = "닫 기"; - this.btn_Close.UseVisualStyleBackColor = true; - this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(278, 12); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(57, 12); - this.label3.TabIndex = 5; - this.label3.Text = "검색 엔진"; - // - // cb_api - // - this.cb_api.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_api.FormattingEnabled = true; - this.cb_api.Location = new System.Drawing.Point(337, 8); - this.cb_api.Name = "cb_api"; - this.cb_api.Size = new System.Drawing.Size(93, 20); - this.cb_api.TabIndex = 6; - this.cb_api.SelectedIndexChanged += new System.EventHandler(this.cb_api_SelectedIndexChanged); - // - // progressBar1 - // - this.progressBar1.Location = new System.Drawing.Point(1060, 7); - this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(219, 23); - this.progressBar1.TabIndex = 7; - // - // richTextBox1 - // - this.richTextBox1.Location = new System.Drawing.Point(12, 589); - this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1615, 123); - this.richTextBox1.TabIndex = 8; - this.richTextBox1.Text = ""; - // // Check_ISBN // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1639, 724); + this.ClientSize = new System.Drawing.Size(1632, 724); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.cb_api); @@ -367,6 +368,7 @@ private System.Windows.Forms.ComboBox cb_api; private System.Windows.Forms.ProgressBar progressBar1; public System.Windows.Forms.DataGridView dataGridView1; + private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.DataGridViewTextBoxColumn num; private System.Windows.Forms.DataGridViewTextBoxColumn isbn; private System.Windows.Forms.DataGridViewTextBoxColumn book_name; @@ -387,6 +389,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn sold_out; private System.Windows.Forms.DataGridViewTextBoxColumn image; private System.Windows.Forms.DataGridViewTextBoxColumn api_data; - private System.Windows.Forms.RichTextBox richTextBox1; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Check_ISBN.cs b/unimarc/unimarc/마크/Check_ISBN.cs index 43eb73e..c8ac048 100644 --- a/unimarc/unimarc/마크/Check_ISBN.cs +++ b/unimarc/unimarc/마크/Check_ISBN.cs @@ -472,9 +472,9 @@ namespace WindowsFormsApp1.Mac if (a % sdc == 5) { grid[6] = data[a]; } // 출판사 if (a % sdc == 6) { grid[8] = data[a]; } // 수량 if (a % sdc == 7) { grid[9] = data[a]; } // 단가 - if (a % sdc == 8) { grid[10] = data[a]; } // 합계 - if (a % sdc == 9) { grid[11] = data[a]; } // 상태 - if (a % sdc == 10) { grid[12] = data[a]; } // 정가 + if (a % sdc == 8) { grid[10] = data[a]; } // 합계 + if (a % sdc == 9) { grid[11] = data[a]; } // 상태 + if (a % sdc == 10) { grid[12] = data[a]; } // 정가 if (a % sdc == 11) { grid[13] = data[a]; } // 비고 if (a % sdc == 12) { grid[14] = data[a]; } // 발행일 if (a % sdc == 13) { grid[15] = data[a]; } // % diff --git a/unimarc/unimarc/마크/Mac_Input.Designer.cs b/unimarc/unimarc/마크/Mac_Input.Designer.cs index 52f557e..05be142 100644 --- a/unimarc/unimarc/마크/Mac_Input.Designer.cs +++ b/unimarc/unimarc/마크/Mac_Input.Designer.cs @@ -30,12 +30,12 @@ { System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panel1 = new System.Windows.Forms.Panel(); - this.label1 = new System.Windows.Forms.Label(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.btn_FileOpen = new System.Windows.Forms.Button(); - this.tb_filePath = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.tb_filePath = new System.Windows.Forms.TextBox(); + this.btn_FileOpen = new System.Windows.Forms.Button(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label1 = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); this.isbn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -62,23 +62,30 @@ this.panel1.Size = new System.Drawing.Size(1273, 40); this.panel1.TabIndex = 0; // - // label1 + // button2 // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(11, 14); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(29, 12); - this.label1.TabIndex = 1; - this.label1.Text = "구분"; + this.button2.Location = new System.Drawing.Point(784, 8); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(89, 23); + this.button2.TabIndex = 4; + this.button2.Text = "DB 저장"; + this.button2.UseVisualStyleBackColor = true; // - // comboBox1 + // button1 // - this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(45, 10); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 20); - this.comboBox1.TabIndex = 2; + this.button1.Location = new System.Drawing.Point(689, 8); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(89, 23); + this.button1.TabIndex = 4; + this.button1.Text = "파일로 저장"; + this.button1.UseVisualStyleBackColor = true; + // + // tb_filePath + // + this.tb_filePath.Location = new System.Drawing.Point(277, 9); + this.tb_filePath.Name = "tb_filePath"; + this.tb_filePath.Size = new System.Drawing.Size(371, 21); + this.tb_filePath.TabIndex = 1; // // btn_FileOpen // @@ -90,30 +97,23 @@ this.btn_FileOpen.UseVisualStyleBackColor = true; this.btn_FileOpen.Click += new System.EventHandler(this.btn_FileOpen_Click); // - // tb_filePath + // comboBox1 // - this.tb_filePath.Location = new System.Drawing.Point(277, 9); - this.tb_filePath.Name = "tb_filePath"; - this.tb_filePath.Size = new System.Drawing.Size(371, 21); - this.tb_filePath.TabIndex = 1; + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(45, 10); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(121, 20); + this.comboBox1.TabIndex = 2; // - // button1 + // label1 // - this.button1.Location = new System.Drawing.Point(689, 8); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(89, 23); - this.button1.TabIndex = 4; - this.button1.Text = "파일로 저장"; - this.button1.UseVisualStyleBackColor = true; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(784, 8); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(89, 23); - this.button2.TabIndex = 4; - this.button2.Text = "DB 저장"; - this.button2.UseVisualStyleBackColor = true; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(11, 14); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(29, 12); + this.label1.TabIndex = 1; + this.label1.Text = "구분"; // // dataGridView1 // @@ -137,6 +137,7 @@ this.Marc}); this.dataGridView1.Location = new System.Drawing.Point(13, 59); this.dataGridView1.Name = "dataGridView1"; + this.dataGridView1.RowHeadersWidth = 20; this.dataGridView1.RowTemplate.Height = 23; this.dataGridView1.Size = new System.Drawing.Size(1273, 600); this.dataGridView1.TabIndex = 1; @@ -152,7 +153,7 @@ // this.isbn.HeaderText = "isbn"; this.isbn.Name = "isbn"; - this.isbn.Width = 90; + this.isbn.Width = 110; // // book_name // diff --git a/unimarc/unimarc/마크/Mac_Preview.Designer.cs b/unimarc/unimarc/마크/Mac_Preview.Designer.cs new file mode 100644 index 0000000..de15e39 --- /dev/null +++ b/unimarc/unimarc/마크/Mac_Preview.Designer.cs @@ -0,0 +1,61 @@ + +namespace UniMarc.마크 +{ + partial class Mac_Preview + { + /// + /// 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() + { + this.webBrowser1 = new System.Windows.Forms.WebBrowser(); + this.SuspendLayout(); + // + // 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.Size = new System.Drawing.Size(800, 450); + this.webBrowser1.TabIndex = 0; + // + // Mac_Preview + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.webBrowser1); + this.Name = "Mac_Preview"; + this.Text = "미리보기"; + this.Load += new System.EventHandler(this.Mac_Preview_Load); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.WebBrowser webBrowser1; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Mac_Preview.cs b/unimarc/unimarc/마크/Mac_Preview.cs new file mode 100644 index 0000000..f8139c5 --- /dev/null +++ b/unimarc/unimarc/마크/Mac_Preview.cs @@ -0,0 +1,26 @@ +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; + +namespace UniMarc.마크 +{ + public partial class Mac_Preview : Form + { + public string url_isbn = ""; + public Mac_Preview() + { + InitializeComponent(); + } + + private void Mac_Preview_Load(object sender, EventArgs e) + { + webBrowser1.Navigate("https://preview.kyobobook.co.kr/preview.jsp?siteGb=INK&ejkGb=KOR&barcode=" + url_isbn + "&loginYn=N&orderClick=JAW"); + } + } +} diff --git a/unimarc/unimarc/마크/Mac_Preview.resx b/unimarc/unimarc/마크/Mac_Preview.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/unimarc/unimarc/마크/Mac_Preview.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.cs b/unimarc/unimarc/마크/Marc.cs index 615563b..e147832 100644 --- a/unimarc/unimarc/마크/Marc.cs +++ b/unimarc/unimarc/마크/Marc.cs @@ -5,13 +5,14 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Windows.Forms; - +using UniMarc.마크; using WindowsFormsApp1; namespace ExcelTest { public partial class Marc : Form { + string[] data_book = { "", "", "", "", "" }; public string find; public string change; public string call = ""; @@ -1132,13 +1133,23 @@ namespace ExcelTest } } - private void Btn_Helper_Click(object sender, EventArgs e) + private void Btn_Memo_Click(object sender, EventArgs e) { - // TODO: 폼 새로 추가해서 메모장 단축키 및 기타 편의기능 설명추가할것. + Marc_memo memo = new Marc_memo(); + memo.StartPosition = FormStartPosition.Manual; + memo.Location = new Point(1018, 8); + memo.TopMost = true; + memo.Show(); + } + private void Btn_preview_Click(object sender, EventArgs e) + { + Mac_Preview mp = new Mac_Preview(); + mp.url_isbn = data_book[0]; + mp.TopMost = true; + mp.Show(); } private void Btn_Save_Click(object sender, EventArgs e) { - // TODO: 마크DB에 저장이 되어야 함. 새로 만든 마크의 경우 INSERT / 기존 마크 수정의 경우 UPDATE string table_name = "Marc"; int row_idx = List_Book.CurrentCell.RowIndex; string[] grid_data = { List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString(), @@ -1173,13 +1184,28 @@ namespace ExcelTest richTextBox1.Text = ""; if (!click_Marc(row_idx)) { richTextBox1.Text = Make_Empty(); } input_picture(row_idx); + Save_data(row_idx); Create_008(); Color_change("▼"); Color_change("▲"); } + void Save_data(int row) + { + data_book[0] = List_Book.Rows[row].Cells["ISBN13"].Value.ToString(); + data_book[1] = List_Book.Rows[row].Cells["book_name"].Value.ToString(); + data_book[2] = List_Book.Rows[row].Cells["author"].Value.ToString(); + data_book[3] = List_Book.Rows[row].Cells["book_comp"].Value.ToString(); + data_book[4] = List_Book.Rows[row].Cells["pay"].Value.ToString(); + } void input_picture(int row) { - pictureBox1.ImageLocation = List_Book.Rows[row].Cells["url"].Value.ToString(); + try + { + string isbn = List_Book.Rows[row].Cells["ISBN13"].Value.ToString(); + string isbn3 = isbn.Substring(isbn.Length - 3, 3); + pictureBox1.ImageLocation = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg"; + } + catch { } } private string Make_Empty() { @@ -1267,7 +1293,6 @@ namespace ExcelTest int comboIdx = ((ComboBox)sender).SelectedIndex; text008.Text = tag008.Combo_Change(text, comboName, comboIdx); - Apply_Main_marc(); } /// @@ -2030,5 +2055,11 @@ namespace ExcelTest GridView505.CurrentCell = null; } + private void pictureBox1_DoubleClick(object sender, EventArgs e) + { + Zoom_Picture zp = new Zoom_Picture(); + zp.url = pictureBox1.ImageLocation; + zp.Show(); + } } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc.designer.cs b/unimarc/unimarc/마크/Marc.designer.cs index 5b660b8..0cd2fcf 100644 --- a/unimarc/unimarc/마크/Marc.designer.cs +++ b/unimarc/unimarc/마크/Marc.designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.button2 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); @@ -139,17 +139,9 @@ this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); this.comboBox7 = new System.Windows.Forms.ComboBox(); - this.Btn_Helper = new System.Windows.Forms.Button(); + this.Btn_Memo = new System.Windows.Forms.Button(); this.Btn_interlock = new System.Windows.Forms.Button(); this.List_Book = new System.Windows.Forms.DataGridView(); - this.btn_Save = new System.Windows.Forms.Button(); - this.panel2 = new System.Windows.Forms.Panel(); - this.label4 = new System.Windows.Forms.Label(); - this.text008 = new System.Windows.Forms.TextBox(); - this.panel3 = new System.Windows.Forms.Panel(); - this.btn_close = new System.Windows.Forms.Button(); - this.input_date = new System.Windows.Forms.DateTimePicker(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -160,6 +152,15 @@ this.marc_idx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.db_marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btn_Save = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label4 = new System.Windows.Forms.Label(); + this.text008 = new System.Windows.Forms.TextBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.btn_close = new System.Windows.Forms.Button(); + this.input_date = new System.Windows.Forms.DateTimePicker(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.btn_preview = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.GridView020)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.GridView246)).BeginInit(); this.panel1.SuspendLayout(); @@ -177,12 +178,13 @@ // richTextBox1 // this.richTextBox1.AcceptsTab = true; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.richTextBox1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.richTextBox1.Location = new System.Drawing.Point(386, 89); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(621, 643); + this.richTextBox1.Size = new System.Drawing.Size(621, 649); this.richTextBox1.TabIndex = 32; - this.richTextBox1.Text = " "; + this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); // // button2 @@ -209,6 +211,7 @@ // // etc1 // + this.etc1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.etc1.Location = new System.Drawing.Point(1013, 321); this.etc1.Name = "etc1"; @@ -219,6 +222,7 @@ // // etc2 // + this.etc2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.etc2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.etc2.Location = new System.Drawing.Point(1013, 531); this.etc2.Name = "etc2"; @@ -1184,16 +1188,15 @@ this.comboBox7.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); this.comboBox7.MouseClick += new System.Windows.Forms.MouseEventHandler(this.comboBox1_MouseClick); // - // Btn_Helper + // Btn_Memo // - this.Btn_Helper.Location = new System.Drawing.Point(1239, 7); - this.Btn_Helper.Name = "Btn_Helper"; - this.Btn_Helper.Size = new System.Drawing.Size(75, 23); - this.Btn_Helper.TabIndex = 215; - this.Btn_Helper.Text = "도움말"; - this.Btn_Helper.UseVisualStyleBackColor = true; - this.Btn_Helper.Visible = false; - this.Btn_Helper.Click += new System.EventHandler(this.Btn_Helper_Click); + this.Btn_Memo.Location = new System.Drawing.Point(1239, 7); + this.Btn_Memo.Name = "Btn_Memo"; + this.Btn_Memo.Size = new System.Drawing.Size(75, 23); + this.Btn_Memo.TabIndex = 215; + this.Btn_Memo.Text = "메모장"; + this.Btn_Memo.UseVisualStyleBackColor = true; + this.Btn_Memo.Click += new System.EventHandler(this.Btn_Memo_Click); // // Btn_interlock // @@ -1210,14 +1213,14 @@ this.List_Book.AllowUserToAddRows = false; this.List_Book.AllowUserToDeleteRows = false; this.List_Book.AllowUserToResizeColumns = false; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle3.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.list_idx, this.ISBN13, @@ -1243,9 +1246,79 @@ this.List_Book.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.List_Book_CellContentClick); this.List_Book.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridView8_KeyDown); // + // list_idx + // + this.list_idx.HeaderText = "list_idx"; + this.list_idx.Name = "list_idx"; + this.list_idx.ReadOnly = true; + this.list_idx.Visible = false; + this.list_idx.Width = 30; + // + // ISBN13 + // + this.ISBN13.HeaderText = "ISBN13"; + this.ISBN13.Name = "ISBN13"; + this.ISBN13.ReadOnly = true; + // + // book_name + // + this.book_name.HeaderText = "도서명"; + this.book_name.Name = "book_name"; + this.book_name.ReadOnly = true; + // + // author + // + this.author.HeaderText = "저자"; + this.author.Name = "author"; + this.author.ReadOnly = true; + this.author.Width = 50; + // + // book_comp + // + this.book_comp.HeaderText = "출판사"; + this.book_comp.Name = "book_comp"; + this.book_comp.ReadOnly = true; + this.book_comp.Width = 50; + // + // pay + // + this.pay.HeaderText = "정가"; + this.pay.Name = "pay"; + this.pay.ReadOnly = true; + this.pay.Width = 50; + // + // url + // + this.url.HeaderText = "url"; + this.url.Name = "url"; + this.url.ReadOnly = true; + this.url.Visible = false; + // + // marc_idx + // + this.marc_idx.HeaderText = "marc_idx"; + this.marc_idx.Name = "marc_idx"; + this.marc_idx.ReadOnly = true; + this.marc_idx.Visible = false; + this.marc_idx.Width = 30; + // + // db_marc + // + this.db_marc.HeaderText = "marc"; + this.db_marc.Name = "db_marc"; + this.db_marc.ReadOnly = true; + this.db_marc.Visible = false; + // + // grade + // + this.grade.HeaderText = "등급"; + this.grade.Name = "grade"; + this.grade.ReadOnly = true; + this.grade.Visible = false; + // // btn_Save // - this.btn_Save.Location = new System.Drawing.Point(1239, 33); + this.btn_Save.Location = new System.Drawing.Point(1239, 59); this.btn_Save.Name = "btn_Save"; this.btn_Save.Size = new System.Drawing.Size(75, 23); this.btn_Save.TabIndex = 215; @@ -1345,7 +1418,7 @@ // // btn_close // - this.btn_close.Location = new System.Drawing.Point(1239, 59); + this.btn_close.Location = new System.Drawing.Point(1239, 85); this.btn_close.Name = "btn_close"; this.btn_close.Size = new System.Drawing.Size(75, 23); this.btn_close.TabIndex = 215; @@ -1365,82 +1438,25 @@ // // pictureBox1 // - this.pictureBox1.Location = new System.Drawing.Point(1075, 89); + this.pictureBox1.BackColor = System.Drawing.SystemColors.ControlLight; + this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.pictureBox1.Location = new System.Drawing.Point(1023, 59); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(176, 226); + this.pictureBox1.Size = new System.Drawing.Size(204, 256); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 221; this.pictureBox1.TabStop = false; + this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick); // - // list_idx + // btn_preview // - this.list_idx.HeaderText = "list_idx"; - this.list_idx.Name = "list_idx"; - this.list_idx.ReadOnly = true; - this.list_idx.Visible = false; - this.list_idx.Width = 30; - // - // ISBN13 - // - this.ISBN13.HeaderText = "ISBN13"; - this.ISBN13.Name = "ISBN13"; - this.ISBN13.ReadOnly = true; - // - // book_name - // - this.book_name.HeaderText = "도서명"; - this.book_name.Name = "book_name"; - this.book_name.ReadOnly = true; - // - // author - // - this.author.HeaderText = "저자"; - this.author.Name = "author"; - this.author.ReadOnly = true; - this.author.Width = 50; - // - // book_comp - // - this.book_comp.HeaderText = "출판사"; - this.book_comp.Name = "book_comp"; - this.book_comp.ReadOnly = true; - this.book_comp.Width = 50; - // - // pay - // - this.pay.HeaderText = "정가"; - this.pay.Name = "pay"; - this.pay.ReadOnly = true; - this.pay.Width = 50; - // - // url - // - this.url.HeaderText = "url"; - this.url.Name = "url"; - this.url.ReadOnly = true; - this.url.Visible = false; - // - // marc_idx - // - this.marc_idx.HeaderText = "marc_idx"; - this.marc_idx.Name = "marc_idx"; - this.marc_idx.ReadOnly = true; - this.marc_idx.Visible = false; - this.marc_idx.Width = 30; - // - // db_marc - // - this.db_marc.HeaderText = "marc"; - this.db_marc.Name = "db_marc"; - this.db_marc.ReadOnly = true; - this.db_marc.Visible = false; - // - // grade - // - this.grade.HeaderText = "등급"; - this.grade.Name = "grade"; - this.grade.ReadOnly = true; - this.grade.Visible = false; + this.btn_preview.Location = new System.Drawing.Point(1239, 33); + this.btn_preview.Name = "btn_preview"; + this.btn_preview.Size = new System.Drawing.Size(75, 23); + this.btn_preview.TabIndex = 215; + this.btn_preview.Text = "미리보기"; + this.btn_preview.UseVisualStyleBackColor = true; + this.btn_preview.Click += new System.EventHandler(this.Btn_preview_Click); // // Marc // @@ -1454,7 +1470,8 @@ this.Controls.Add(this.List_Book); this.Controls.Add(this.btn_close); this.Controls.Add(this.btn_Save); - this.Controls.Add(this.Btn_Helper); + this.Controls.Add(this.btn_preview); + this.Controls.Add(this.Btn_Memo); this.Controls.Add(this.checkBox2); this.Controls.Add(this.checkBox1); this.Controls.Add(this.comboBox6); @@ -1605,7 +1622,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn text440v; private System.Windows.Forms.DataGridViewTextBoxColumn Column13; private System.Windows.Forms.DataGridViewTextBoxColumn text440x; - private System.Windows.Forms.Button Btn_Helper; + private System.Windows.Forms.Button Btn_Memo; private System.Windows.Forms.DataGridViewComboBoxColumn Column10; private System.Windows.Forms.DataGridViewTextBoxColumn Column5; private System.Windows.Forms.DataGridViewTextBoxColumn Column6; @@ -1641,5 +1658,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn marc_idx; private System.Windows.Forms.DataGridViewTextBoxColumn db_marc; private System.Windows.Forms.DataGridViewTextBoxColumn grade; + private System.Windows.Forms.Button btn_preview; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_memo.Designer.cs b/unimarc/unimarc/마크/Marc_memo.Designer.cs new file mode 100644 index 0000000..f8282ce --- /dev/null +++ b/unimarc/unimarc/마크/Marc_memo.Designer.cs @@ -0,0 +1,79 @@ + +namespace UniMarc.마크 +{ + partial class Marc_memo + { + /// + /// 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() + { + this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.SystemColors.Control; + this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.Font = new System.Drawing.Font("굴림", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.Size = new System.Drawing.Size(800, 450); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel2.Controls.Add(this.richTextBox1); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(800, 450); + this.panel2.TabIndex = 2; + // + // Marc_memo + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.panel2); + this.Name = "Marc_memo"; + this.Text = "메모장"; + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + public System.Windows.Forms.RichTextBox richTextBox1; + private System.Windows.Forms.Panel panel2; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Marc_memo.cs b/unimarc/unimarc/마크/Marc_memo.cs new file mode 100644 index 0000000..4a56fb0 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_memo.cs @@ -0,0 +1,43 @@ +using ExcelTest; +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; + +namespace UniMarc.마크 +{ + public partial class Marc_memo : Form + { + public Marc_memo() + { + InitializeComponent(); + } + + private void richTextBox1_KeyDown(object sender, KeyEventArgs e) + { + if (e.Control) + { + switch (e.KeyValue) + { + case 72: // h + findNchange fnc = new findNchange(this); + fnc.call = ((RichTextBox)sender).Name; + fnc.TopMost = true; + fnc.Show(); + break; + default: + break; + } + } + if (e.KeyCode == Keys.Escape) + { + this.Close(); + } + } + } +} diff --git a/unimarc/unimarc/마크/Marc_memo.resx b/unimarc/unimarc/마크/Marc_memo.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/unimarc/unimarc/마크/Marc_memo.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/Search_Infor.Designer.cs b/unimarc/unimarc/마크/Search_Infor.Designer.cs index b5948f2..8d07fac 100644 --- a/unimarc/unimarc/마크/Search_Infor.Designer.cs +++ b/unimarc/unimarc/마크/Search_Infor.Designer.cs @@ -31,11 +31,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); - this.label2 = new System.Windows.Forms.Label(); - this.tb_search = new System.Windows.Forms.TextBox(); - this.btn_search = new System.Windows.Forms.Button(); - this.cb_filter = new System.Windows.Forms.ComboBox(); - this.btn_close = new System.Windows.Forms.Button(); this.grade = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ISBN = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.book_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -46,6 +41,11 @@ this.etc1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.etc2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Marc = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.label2 = new System.Windows.Forms.Label(); + this.tb_search = new System.Windows.Forms.TextBox(); + this.btn_search = new System.Windows.Forms.Button(); + this.cb_filter = new System.Windows.Forms.ComboBox(); + this.btn_close = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); // @@ -90,52 +90,6 @@ this.dataGridView1.TabIndex = 49; this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick); // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(271, 11); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 12); - this.label2.TabIndex = 5; - this.label2.Text = "검색어"; - // - // tb_search - // - this.tb_search.Location = new System.Drawing.Point(318, 7); - this.tb_search.Name = "tb_search"; - this.tb_search.Size = new System.Drawing.Size(222, 21); - this.tb_search.TabIndex = 6; - this.tb_search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_search_KeyDown); - // - // btn_search - // - this.btn_search.Location = new System.Drawing.Point(551, 6); - this.btn_search.Name = "btn_search"; - this.btn_search.Size = new System.Drawing.Size(75, 23); - this.btn_search.TabIndex = 7; - this.btn_search.Text = "검 색"; - this.btn_search.UseVisualStyleBackColor = true; - this.btn_search.Click += new System.EventHandler(this.btn_search_Click); - // - // cb_filter - // - this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_filter.FormattingEnabled = true; - this.cb_filter.Location = new System.Drawing.Point(71, 7); - this.cb_filter.Name = "cb_filter"; - this.cb_filter.Size = new System.Drawing.Size(161, 20); - this.cb_filter.TabIndex = 50; - // - // btn_close - // - this.btn_close.Location = new System.Drawing.Point(639, 6); - this.btn_close.Name = "btn_close"; - this.btn_close.Size = new System.Drawing.Size(75, 23); - this.btn_close.TabIndex = 51; - this.btn_close.Text = "닫 기"; - this.btn_close.UseVisualStyleBackColor = true; - this.btn_close.Click += new System.EventHandler(this.btn_close_Click); - // // grade // this.grade.HeaderText = "등급"; @@ -194,6 +148,52 @@ this.Marc.Name = "Marc"; this.Marc.Visible = false; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(271, 11); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(41, 12); + this.label2.TabIndex = 5; + this.label2.Text = "검색어"; + // + // tb_search + // + this.tb_search.Location = new System.Drawing.Point(318, 7); + this.tb_search.Name = "tb_search"; + this.tb_search.Size = new System.Drawing.Size(222, 21); + this.tb_search.TabIndex = 6; + this.tb_search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_search_KeyDown); + // + // btn_search + // + this.btn_search.Location = new System.Drawing.Point(551, 6); + this.btn_search.Name = "btn_search"; + this.btn_search.Size = new System.Drawing.Size(75, 23); + this.btn_search.TabIndex = 7; + this.btn_search.Text = "검 색"; + this.btn_search.UseVisualStyleBackColor = true; + this.btn_search.Click += new System.EventHandler(this.btn_search_Click); + // + // cb_filter + // + this.cb_filter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_filter.FormattingEnabled = true; + this.cb_filter.Location = new System.Drawing.Point(71, 7); + this.cb_filter.Name = "cb_filter"; + this.cb_filter.Size = new System.Drawing.Size(161, 20); + this.cb_filter.TabIndex = 50; + // + // btn_close + // + this.btn_close.Location = new System.Drawing.Point(639, 6); + this.btn_close.Name = "btn_close"; + this.btn_close.Size = new System.Drawing.Size(75, 23); + this.btn_close.TabIndex = 51; + this.btn_close.Text = "닫 기"; + this.btn_close.UseVisualStyleBackColor = true; + this.btn_close.Click += new System.EventHandler(this.btn_close_Click); + // // Search_Infor // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/unimarc/unimarc/마크/Search_Infor.cs b/unimarc/unimarc/마크/Search_Infor.cs index 1b1850d..f7bc9b1 100644 --- a/unimarc/unimarc/마크/Search_Infor.cs +++ b/unimarc/unimarc/마크/Search_Infor.cs @@ -38,6 +38,7 @@ namespace WindowsFormsApp1.Mac } private void btn_search_Click(object sender, EventArgs e) { + dataGridView1.Rows.Clear(); string target = string.Empty; string Area = "`grade`, `ISBN`, `서명`, `저자`, `출판사`, `출판년월`, `가격`, `비고1`, `비고2`, `marc`"; if (cb_filter.SelectedIndex == -1) { @@ -99,9 +100,11 @@ namespace WindowsFormsApp1.Mac private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { int row = e.RowIndex; - int col = e.ColumnIndex; - Search_Infor_Sub sis = new Search_Infor_Sub(); + Search_Infor_Sub sis = new Search_Infor_Sub(this); + sis.isbn = dataGridView1.Rows[row].Cells["ISBN"].Value.ToString(); + sis.marc = dataGridView1.Rows[row].Cells["Marc"].Value.ToString(); + sis.Show(); } private void tb_search_KeyDown(object sender, KeyEventArgs e) { diff --git a/unimarc/unimarc/마크/Search_Infor_Sub.Designer.cs b/unimarc/unimarc/마크/Search_Infor_Sub.Designer.cs index 1865c2a..1f576d9 100644 --- a/unimarc/unimarc/마크/Search_Infor_Sub.Designer.cs +++ b/unimarc/unimarc/마크/Search_Infor_Sub.Designer.cs @@ -31,194 +31,38 @@ namespace WindowsFormsApp1.마크 { this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.comboBox1 = new System.Windows.Forms.ComboBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.comboBox2 = new System.Windows.Forms.ComboBox(); - this.label2 = new System.Windows.Forms.Label(); - this.comboBox3 = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.comboBox4 = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.comboBox5 = new System.Windows.Forms.ComboBox(); - this.label6 = new System.Windows.Forms.Label(); - this.comboBox6 = new System.Windows.Forms.ComboBox(); - this.label7 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.panel1.SuspendLayout(); this.SuspendLayout(); // // pictureBox1 // - this.pictureBox1.Location = new System.Drawing.Point(13, 13); + this.pictureBox1.Location = new System.Drawing.Point(864, 12); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(161, 222); + this.pictureBox1.Size = new System.Drawing.Size(318, 403); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.TabIndex = 0; this.pictureBox1.TabStop = false; + this.pictureBox1.DoubleClick += new System.EventHandler(this.pictureBox1_DoubleClick); // // richTextBox1 // - this.richTextBox1.Location = new System.Drawing.Point(13, 241); + this.richTextBox1.Location = new System.Drawing.Point(12, 12); this.richTextBox1.Name = "richTextBox1"; - this.richTextBox1.Size = new System.Drawing.Size(1169, 310); + this.richTextBox1.Size = new System.Drawing.Size(846, 578); this.richTextBox1.TabIndex = 1; this.richTextBox1.Text = ""; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 7); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 12); - this.label1.TabIndex = 2; - this.label1.Text = "이용자"; - // - // comboBox1 - // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(9, 22); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(121, 20); - this.comboBox1.TabIndex = 3; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; - this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.label7); - this.panel1.Controls.Add(this.label6); - this.panel1.Controls.Add(this.label5); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.comboBox6); - this.panel1.Controls.Add(this.label4); - this.panel1.Controls.Add(this.comboBox5); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.comboBox4); - this.panel1.Controls.Add(this.comboBox3); - this.panel1.Controls.Add(this.comboBox2); - this.panel1.Controls.Add(this.comboBox1); - this.panel1.Location = new System.Drawing.Point(180, 13); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(499, 94); - this.panel1.TabIndex = 4; - // - // comboBox2 - // - this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(144, 22); - this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(166, 20); - this.comboBox2.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(144, 7); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 12); - this.label2.TabIndex = 2; - this.label2.Text = "자료형식"; - // - // comboBox3 - // - this.comboBox3.FormattingEnabled = true; - this.comboBox3.Location = new System.Drawing.Point(322, 22); - this.comboBox3.Name = "comboBox3"; - this.comboBox3.Size = new System.Drawing.Size(166, 20); - this.comboBox3.TabIndex = 3; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(322, 7); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(53, 12); - this.label3.TabIndex = 2; - this.label3.Text = "내용형식"; - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(9, 68); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(121, 21); - this.textBox1.TabIndex = 4; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(9, 53); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(29, 12); - this.label4.TabIndex = 2; - this.label4.Text = "대학"; - // - // comboBox4 - // - this.comboBox4.FormattingEnabled = true; - this.comboBox4.Location = new System.Drawing.Point(142, 68); - this.comboBox4.Name = "comboBox4"; - this.comboBox4.Size = new System.Drawing.Size(102, 20); - this.comboBox4.TabIndex = 3; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(142, 53); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 12); - this.label5.TabIndex = 2; - this.label5.Text = "문학형식"; - // - // comboBox5 - // - this.comboBox5.FormattingEnabled = true; - this.comboBox5.Location = new System.Drawing.Point(260, 68); - this.comboBox5.Name = "comboBox5"; - this.comboBox5.Size = new System.Drawing.Size(102, 20); - this.comboBox5.TabIndex = 3; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(260, 53); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(29, 12); - this.label6.TabIndex = 2; - this.label6.Text = "전기"; - // - // comboBox6 - // - this.comboBox6.FormattingEnabled = true; - this.comboBox6.Location = new System.Drawing.Point(374, 68); - this.comboBox6.Name = "comboBox6"; - this.comboBox6.Size = new System.Drawing.Size(114, 20); - this.comboBox6.TabIndex = 3; - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(374, 53); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(29, 12); - this.label7.TabIndex = 2; - this.label7.Text = "언어"; - // // Search_Infor_Sub // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1194, 683); - this.Controls.Add(this.panel1); + this.ClientSize = new System.Drawing.Size(1194, 604); this.Controls.Add(this.richTextBox1); this.Controls.Add(this.pictureBox1); this.Name = "Search_Infor_Sub"; this.Text = "Search_Infor_Sub"; + this.Load += new System.EventHandler(this.Search_Infor_Sub_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.ResumeLayout(false); } @@ -227,20 +71,5 @@ namespace WindowsFormsApp1.마크 private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.RichTextBox richTextBox1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.ComboBox comboBox6; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.ComboBox comboBox5; - private System.Windows.Forms.ComboBox comboBox4; - private System.Windows.Forms.ComboBox comboBox3; - private System.Windows.Forms.ComboBox comboBox2; } } \ No newline at end of file diff --git a/unimarc/unimarc/마크/Search_Infor_Sub.cs b/unimarc/unimarc/마크/Search_Infor_Sub.cs index 221fa16..e35932e 100644 --- a/unimarc/unimarc/마크/Search_Infor_Sub.cs +++ b/unimarc/unimarc/마크/Search_Infor_Sub.cs @@ -7,14 +7,37 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using UniMarc.마크; +using WindowsFormsApp1.Mac; namespace WindowsFormsApp1.마크 { public partial class Search_Infor_Sub : Form { - public Search_Infor_Sub() + Search_Infor si; + public string isbn = ""; + public string marc = ""; + public Search_Infor_Sub(Search_Infor _si) { InitializeComponent(); + si = _si; + } + private void Search_Infor_Sub_Load(object sender, EventArgs e) + { + try + { + string pic_url = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn.Substring(isbn.Length - 3, 3) + "/x" + isbn + ".jpg"; + pictureBox1.ImageLocation = pic_url; + + richTextBox1.Text = marc.Replace("", "\n"); + } + catch { } + } + private void pictureBox1_DoubleClick(object sender, EventArgs e) + { + Zoom_Picture zp = new Zoom_Picture(); + zp.url = pictureBox1.ImageLocation; + zp.Show(); } } } diff --git a/unimarc/unimarc/마크/Zoom_Picture.Designer.cs b/unimarc/unimarc/마크/Zoom_Picture.Designer.cs new file mode 100644 index 0000000..5741287 --- /dev/null +++ b/unimarc/unimarc/마크/Zoom_Picture.Designer.cs @@ -0,0 +1,65 @@ + +namespace UniMarc.마크 +{ + partial class Zoom_Picture + { + /// + /// 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() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(331, 446); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // Zoom_Picture + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(331, 446); + this.Controls.Add(this.pictureBox1); + this.Name = "Zoom_Picture"; + this.Text = "크게보기"; + this.Load += new System.EventHandler(this.Zoom_Picture_Load); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Zoom_Picture_KeyDown); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Zoom_Picture.cs b/unimarc/unimarc/마크/Zoom_Picture.cs new file mode 100644 index 0000000..c31441c --- /dev/null +++ b/unimarc/unimarc/마크/Zoom_Picture.cs @@ -0,0 +1,30 @@ +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; + +namespace UniMarc.마크 +{ + public partial class Zoom_Picture : Form + { + public string url = ""; + public Zoom_Picture() + { + InitializeComponent(); + } + private void Zoom_Picture_Load(object sender, EventArgs e) + { + pictureBox1.ImageLocation = url; + } + + private void Zoom_Picture_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Escape) { this.Close(); } + } + } +} \ No newline at end of file diff --git a/unimarc/unimarc/마크/Zoom_Picture.resx b/unimarc/unimarc/마크/Zoom_Picture.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/unimarc/unimarc/마크/Zoom_Picture.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/unimarc/unimarc/마크/findNchange.cs b/unimarc/unimarc/마크/findNchange.cs index b113c69..db88f7f 100644 --- a/unimarc/unimarc/마크/findNchange.cs +++ b/unimarc/unimarc/마크/findNchange.cs @@ -8,6 +8,7 @@ using System.Runtime.Remoting.Channels; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using UniMarc.마크; namespace ExcelTest { @@ -17,17 +18,25 @@ namespace ExcelTest public bool buttonClick2 = false; string find = ""; string change = ""; + public string call = ""; Marc mac; + Marc_memo mmm; public findNchange(Marc _mac) { InitializeComponent(); mac = _mac; + call = mac.call; + } + public findNchange(Marc_memo _mmm) + { + InitializeComponent(); + mmm = _mmm; } private void findNchange_Load(object sender, EventArgs e) { - } + } private void textBox2_KeyDown(object sender, KeyEventArgs e) { if (e.KeyCode == Keys.Escape) @@ -43,11 +52,13 @@ namespace ExcelTest private void button1_Click(object sender, EventArgs e) { buttonClick1 = true; - find = this.textBox1.Text; - change = this.textBox2.Text; + find = textBox1.Text; + change = textBox2.Text; textChange(find, change); - mac.Color_change("▼"); - mac.Color_change("▲"); + if (mac != null) { + mac.Color_change("▼"); + mac.Color_change("▲"); + } Close(); } @@ -59,17 +70,11 @@ namespace ExcelTest public void textChange(string ftext, string ctext) { - var temp=""; - if (mac.call == "richTextBox1") - { - //mac.richTextBox1.Text = mac.richTextBox1.Text.Replace(ftext, ctext); - temp = mac.Controls[mac.call].Text.Replace(ftext, ctext); - mac.Controls[mac.call].Text = temp; + if (mac != null) { + mac.Controls[call].Text = mac.Controls[call].Text.Replace(ftext, ctext); } - else - { - // mac.text245e.Text = mac.text245e.Text.Replace(ftext, ctext); - mac.Controls[mac.call].Text = mac.Controls[mac.call].Text.Replace(ftext, ctext); + if (mmm != null) { + mmm.Controls[call].Text = mmm.Controls[call].Text.Replace(ftext, ctext); } }