prev, next 기능 활성화

미소장 마크 코리스 창 채우기 기능 오류 수정 완료
마크정리화면에 에디터창 붙이기 작업시작(컨트롤 정리작업 중)

unimarc/unimarc/Main.Designer.cs

@@ -112,6 +112,7 @@
             this.마크설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.일괄처리관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btDevDb = new System.Windows.Forms.ToolStripMenuItem();
+            this.menu_allclose = new System.Windows.Forms.ToolStripMenuItem();
             this.panel1 = new System.Windows.Forms.Panel();
             this.ShortCut12 = new System.Windows.Forms.Button();
             this.ShortCut11 = new System.Windows.Forms.Button();
@@ -138,7 +139,6 @@
             this.mdiTabControl = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.tabPage2 = new System.Windows.Forms.TabPage();
-            this.menu_allclose = new System.Windows.Forms.ToolStripMenuItem();
             this.menuStrip1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.toolStrip1.SuspendLayout();
@@ -147,6 +147,7 @@
             // 
             // menuStrip1
             // 
+            this.menuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.홈ToolStripMenuItem,
             this.납품관리ToolStripMenuItem,
@@ -158,7 +159,8 @@
             this.menu_allclose});
             this.menuStrip1.Location = new System.Drawing.Point(0, 0);
             this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(1259, 24);
+            this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2);
+            this.menuStrip1.Size = new System.Drawing.Size(1902, 30);
             this.menuStrip1.TabIndex = 0;
             this.menuStrip1.Text = "menuStrip1";
             // 
@@ -173,34 +175,34 @@
             this.도서정보관리,
             this.사용대장});
             this.홈ToolStripMenuItem.Name = "홈ToolStripMenuItem";
-            this.홈ToolStripMenuItem.Size = new System.Drawing.Size(31, 20);
+            this.홈ToolStripMenuItem.Size = new System.Drawing.Size(38, 26);
             this.홈ToolStripMenuItem.Text = "홈";
             // 
             // 사업체정보
             // 
             this.사업체정보.Name = "사업체정보";
-            this.사업체정보.Size = new System.Drawing.Size(175, 22);
+            this.사업체정보.Size = new System.Drawing.Size(218, 26);
             this.사업체정보.Text = "사업체 정보";
             this.사업체정보.Click += new System.EventHandler(this.사용자정보ToolStripMenuItem_Click);
             // 
             // 사용자관리
             // 
             this.사용자관리.Name = "사용자관리";
-            this.사용자관리.Size = new System.Drawing.Size(175, 22);
+            this.사용자관리.Size = new System.Drawing.Size(218, 26);
             this.사용자관리.Text = "사용자 관리";
             this.사용자관리.Click += new System.EventHandler(this.사용자관리ToolStripMenuItem_Click);
             // 
             // 납품거래처관리
             // 
             this.납품거래처관리.Name = "납품거래처관리";
-            this.납품거래처관리.Size = new System.Drawing.Size(175, 22);
+            this.납품거래처관리.Size = new System.Drawing.Size(218, 26);
             this.납품거래처관리.Text = "납품 / 거래처 관리";
             this.납품거래처관리.Click += new System.EventHandler(this.납품거래처관리ToolStripMenuItem_Click);
             // 
             // 주문처관리
             // 
             this.주문처관리.Name = "주문처관리";
-            this.주문처관리.Size = new System.Drawing.Size(175, 22);
+            this.주문처관리.Size = new System.Drawing.Size(218, 26);
             this.주문처관리.Text = "주문처 관리";
             this.주문처관리.Click += new System.EventHandler(this.주문처관리ToolStripMenuItem_Click);
             // 
@@ -208,14 +210,14 @@
             // 
             this.비밀번호변경.Enabled = false;
             this.비밀번호변경.Name = "비밀번호변경";
-            this.비밀번호변경.Size = new System.Drawing.Size(175, 22);
+            this.비밀번호변경.Size = new System.Drawing.Size(218, 26);
             this.비밀번호변경.Text = "비밀번호 변경";
             this.비밀번호변경.Click += new System.EventHandler(this.비밀번호변경ToolStripMenuItem_Click);
             // 
             // 도서정보관리
             // 
             this.도서정보관리.Name = "도서정보관리";
-            this.도서정보관리.Size = new System.Drawing.Size(175, 22);
+            this.도서정보관리.Size = new System.Drawing.Size(218, 26);
             this.도서정보관리.Text = "도서정보 관리";
             this.도서정보관리.Click += new System.EventHandler(this.도서정보관리ToolStripMenuItem_Click);
             // 
@@ -223,7 +225,7 @@
             // 
             this.사용대장.Enabled = false;
             this.사용대장.Name = "사용대장";
-            this.사용대장.Size = new System.Drawing.Size(175, 22);
+            this.사용대장.Size = new System.Drawing.Size(218, 26);
             this.사용대장.Text = "사용대장";
             this.사용대장.Click += new System.EventHandler(this.사용대장ToolStripMenuItem_Click);
             // 
@@ -238,55 +240,55 @@
             this.재고입력및조회,
             this.반품처리});
             this.납품관리ToolStripMenuItem.Name = "납품관리ToolStripMenuItem";
-            this.납품관리ToolStripMenuItem.Size = new System.Drawing.Size(67, 20);
+            this.납품관리ToolStripMenuItem.Size = new System.Drawing.Size(83, 26);
             this.납품관리ToolStripMenuItem.Text = "납품관리";
             // 
             // 목록등록
             // 
             this.목록등록.Name = "목록등록";
-            this.목록등록.Size = new System.Drawing.Size(166, 22);
+            this.목록등록.Size = new System.Drawing.Size(207, 26);
             this.목록등록.Text = "물품등록";
             this.목록등록.Click += new System.EventHandler(this.물품등록ToolStripMenuItem_Click);
             // 
             // 목록조회
             // 
             this.목록조회.Name = "목록조회";
-            this.목록조회.Size = new System.Drawing.Size(166, 22);
+            this.목록조회.Size = new System.Drawing.Size(207, 26);
             this.목록조회.Text = "목록조회";
             this.목록조회.Click += new System.EventHandler(this.목록등록편의ToolStripMenuItem_Click);
             // 
             // 목록집계
             // 
             this.목록집계.Name = "목록집계";
-            this.목록집계.Size = new System.Drawing.Size(166, 22);
+            this.목록집계.Size = new System.Drawing.Size(207, 26);
             this.목록집계.Text = "목록집계";
             this.목록집계.Click += new System.EventHandler(this.목록집계ToolStripMenuItem_Click);
             // 
             // 주문입력
             // 
             this.주문입력.Name = "주문입력";
-            this.주문입력.Size = new System.Drawing.Size(166, 22);
+            this.주문입력.Size = new System.Drawing.Size(207, 26);
             this.주문입력.Text = "주문입력";
             this.주문입력.Click += new System.EventHandler(this.주문입력ToolStripMenuItem_Click);
             // 
             // 입고작업
             // 
             this.입고작업.Name = "입고작업";
-            this.입고작업.Size = new System.Drawing.Size(166, 22);
+            this.입고작업.Size = new System.Drawing.Size(207, 26);
             this.입고작업.Text = "입고작업";
             this.입고작업.Click += new System.EventHandler(this.매입ToolStripMenuItem_Click);
             // 
             // 재고입력및조회
             // 
             this.재고입력및조회.Name = "재고입력및조회";
-            this.재고입력및조회.Size = new System.Drawing.Size(166, 22);
+            this.재고입력및조회.Size = new System.Drawing.Size(207, 26);
             this.재고입력및조회.Text = "재고입력 및 조회";
             this.재고입력및조회.Click += new System.EventHandler(this.재고입력및조회ToolStripMenuItem_Click);
             // 
             // 반품처리
             // 
             this.반품처리.Name = "반품처리";
-            this.반품처리.Size = new System.Drawing.Size(166, 22);
+            this.반품처리.Size = new System.Drawing.Size(207, 26);
             this.반품처리.Text = "반품처리";
             this.반품처리.Click += new System.EventHandler(this.반품처리ToolStripMenuItem_Click);
             // 
@@ -299,20 +301,20 @@
             this.매출,
             this.파트타임관리});
             this.회계ToolStripMenuItem.Name = "회계ToolStripMenuItem";
-            this.회계ToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+            this.회계ToolStripMenuItem.Size = new System.Drawing.Size(53, 26);
             this.회계ToolStripMenuItem.Text = "회계";
             // 
             // 송금내역조회
             // 
             this.송금내역조회.Name = "송금내역조회";
-            this.송금내역조회.Size = new System.Drawing.Size(154, 22);
+            this.송금내역조회.Size = new System.Drawing.Size(192, 26);
             this.송금내역조회.Text = "송금 내역 조회";
             this.송금내역조회.Click += new System.EventHandler(this.송금내역조회ToolStripMenuItem_Click);
             // 
             // 송금등록
             // 
             this.송금등록.Name = "송금등록";
-            this.송금등록.Size = new System.Drawing.Size(154, 22);
+            this.송금등록.Size = new System.Drawing.Size(192, 26);
             this.송금등록.Text = "송금 등록";
             this.송금등록.Click += new System.EventHandler(this.송금등록ToolStripMenuItem_Click);
             // 
@@ -323,20 +325,20 @@
             this.매입장부,
             this.매입미결제ToolStripMenuItem});
             this.매입.Name = "매입";
-            this.매입.Size = new System.Drawing.Size(154, 22);
+            this.매입.Size = new System.Drawing.Size(192, 26);
             this.매입.Text = "매입";
             // 
             // 매입집계
             // 
             this.매입집계.Name = "매입집계";
-            this.매입집계.Size = new System.Drawing.Size(138, 22);
+            this.매입집계.Size = new System.Drawing.Size(172, 26);
             this.매입집계.Text = "매입 집계";
             this.매입집계.Click += new System.EventHandler(this.매입집계ToolStripMenuItem_Click);
             // 
             // 매입장부
             // 
             this.매입장부.Name = "매입장부";
-            this.매입장부.Size = new System.Drawing.Size(138, 22);
+            this.매입장부.Size = new System.Drawing.Size(172, 26);
             this.매입장부.Text = "매입 장부";
             this.매입장부.Click += new System.EventHandler(this.매입장부ToolStripMenuItem1_Click);
             // 
@@ -344,7 +346,7 @@
             // 
             this.매입미결제ToolStripMenuItem.Enabled = false;
             this.매입미결제ToolStripMenuItem.Name = "매입미결제ToolStripMenuItem";
-            this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+            this.매입미결제ToolStripMenuItem.Size = new System.Drawing.Size(172, 26);
             this.매입미결제ToolStripMenuItem.Text = "매입 미결제";
             this.매입미결제ToolStripMenuItem.Click += new System.EventHandler(this.매입미결제ToolStripMenuItem_Click);
             // 
@@ -356,41 +358,41 @@
             this.매출조회,
             this.매출집계});
             this.매출.Name = "매출";
-            this.매출.Size = new System.Drawing.Size(154, 22);
+            this.매출.Size = new System.Drawing.Size(192, 26);
             this.매출.Text = "매출";
             // 
             // 매출입력
             // 
             this.매출입력.Name = "매출입력";
-            this.매출입력.Size = new System.Drawing.Size(126, 22);
+            this.매출입력.Size = new System.Drawing.Size(157, 26);
             this.매출입력.Text = "매출 입력";
             this.매출입력.Click += new System.EventHandler(this.매출입력ToolStripMenuItem1_Click);
             // 
             // 매출입금
             // 
             this.매출입금.Name = "매출입금";
-            this.매출입금.Size = new System.Drawing.Size(126, 22);
+            this.매출입금.Size = new System.Drawing.Size(157, 26);
             this.매출입금.Text = "매출 입금";
             this.매출입금.Click += new System.EventHandler(this.매출입금toolStripMenuItem1_Click_1);
             // 
             // 매출조회
             // 
             this.매출조회.Name = "매출조회";
-            this.매출조회.Size = new System.Drawing.Size(126, 22);
+            this.매출조회.Size = new System.Drawing.Size(157, 26);
             this.매출조회.Text = "매출 조회";
             this.매출조회.Click += new System.EventHandler(this.매출장부ToolStripMenuItem_Click);
             // 
             // 매출집계
             // 
             this.매출집계.Name = "매출집계";
-            this.매출집계.Size = new System.Drawing.Size(126, 22);
+            this.매출집계.Size = new System.Drawing.Size(157, 26);
             this.매출집계.Text = "매출 집계";
             this.매출집계.Click += new System.EventHandler(this.매출입금ToolStripMenuItem1_Click);
             // 
             // 파트타임관리
             // 
             this.파트타임관리.Name = "파트타임관리";
-            this.파트타임관리.Size = new System.Drawing.Size(154, 22);
+            this.파트타임관리.Size = new System.Drawing.Size(192, 26);
             this.파트타임관리.Text = "파트타임 관리";
             this.파트타임관리.Click += new System.EventHandler(this.파트타임관리ToolStripMenuItem_Click);
             // 
@@ -405,7 +407,7 @@
             this.DLS,
             this.마크기타});
             this.마크ToolStripMenuItem.Name = "마크ToolStripMenuItem";
-            this.마크ToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
+            this.마크ToolStripMenuItem.Size = new System.Drawing.Size(53, 26);
             this.마크ToolStripMenuItem.Text = "마크";
             // 
             // 마크설정
@@ -416,13 +418,13 @@
             this.불용어,
             this.작업지시서});
             this.마크설정.Name = "마크설정";
-            this.마크설정.Size = new System.Drawing.Size(180, 22);
+            this.마크설정.Size = new System.Drawing.Size(193, 26);
             this.마크설정.Text = "설정";
             // 
             // 단축키설정
             // 
             this.단축키설정.Name = "단축키설정";
-            this.단축키설정.Size = new System.Drawing.Size(138, 22);
+            this.단축키설정.Size = new System.Drawing.Size(172, 26);
             this.단축키설정.Text = "단축키";
             this.단축키설정.Visible = false;
             this.단축키설정.Click += new System.EventHandler(this.단축키설정ToolStripMenuItem_Click);
@@ -430,14 +432,14 @@
             // 매크로문구
             // 
             this.매크로문구.Name = "매크로문구";
-            this.매크로문구.Size = new System.Drawing.Size(138, 22);
+            this.매크로문구.Size = new System.Drawing.Size(172, 26);
             this.매크로문구.Text = "매크로 문구";
             this.매크로문구.Click += new System.EventHandler(this.매크로문구설정ToolStripMenuItem_Click);
             // 
             // 불용어
             // 
             this.불용어.Name = "불용어";
-            this.불용어.Size = new System.Drawing.Size(138, 22);
+            this.불용어.Size = new System.Drawing.Size(172, 26);
             this.불용어.Text = "불용어";
             this.불용어.Visible = false;
             this.불용어.Click += new System.EventHandler(this.불용어ToolStripMenuItem_Click);
@@ -445,7 +447,7 @@
             // 작업지시서
             // 
             this.작업지시서.Name = "작업지시서";
-            this.작업지시서.Size = new System.Drawing.Size(138, 22);
+            this.작업지시서.Size = new System.Drawing.Size(172, 26);
             this.작업지시서.Text = "작업지시서";
             this.작업지시서.Visible = false;
             this.작업지시서.Click += new System.EventHandler(this.작업지시서ToolStripMenuItem_Click);
@@ -461,13 +463,13 @@
             this.복본조사2,
             this.iSBN조회});
             this.마크작업.Name = "마크작업";
-            this.마크작업.Size = new System.Drawing.Size(180, 22);
+            this.마크작업.Size = new System.Drawing.Size(193, 26);
             this.마크작업.Text = "마크 작업";
             // 
             // 마크작성
             // 
             this.마크작성.Name = "마크작성";
-            this.마크작성.Size = new System.Drawing.Size(180, 22);
+            this.마크작성.Size = new System.Drawing.Size(192, 26);
             this.마크작성.Text = "신규마크 작성";
             this.마크작성.ToolTipText = "마크 작성(2)";
             this.마크작성.Click += new System.EventHandler(this.마크작성ToolStripMenuItem_Click);
@@ -475,42 +477,42 @@
             // 마크목록
             // 
             this.마크목록.Name = "마크목록";
-            this.마크목록.Size = new System.Drawing.Size(180, 22);
+            this.마크목록.Size = new System.Drawing.Size(192, 26);
             this.마크목록.Text = "마크 목록";
             this.마크목록.Click += new System.EventHandler(this.마크목록ToolStripMenuItem_Click);
             // 
             // 소장자료검색
             // 
             this.소장자료검색.Name = "소장자료검색";
-            this.소장자료검색.Size = new System.Drawing.Size(180, 22);
+            this.소장자료검색.Size = new System.Drawing.Size(192, 26);
             this.소장자료검색.Text = "소장자료검색";
             this.소장자료검색.Click += new System.EventHandler(this.소장자료검색ToolStripMenuItem_Click);
             // 
             // 마크정리
             // 
             this.마크정리.Name = "마크정리";
-            this.마크정리.Size = new System.Drawing.Size(180, 22);
+            this.마크정리.Size = new System.Drawing.Size(192, 26);
             this.마크정리.Text = "마크 정리";
             this.마크정리.Click += new System.EventHandler(this.마크정리ToolStripMenuItem_Click);
             // 
             // 복본조사1
             // 
             this.복본조사1.Name = "복본조사1";
-            this.복본조사1.Size = new System.Drawing.Size(180, 22);
+            this.복본조사1.Size = new System.Drawing.Size(192, 26);
             this.복본조사1.Text = "복본조사";
             this.복본조사1.Click += new System.EventHandler(this.복본조사ToolStripMenuItem1_Click);
             // 
             // 복본조사2
             // 
             this.복본조사2.Name = "복본조사2";
-            this.복본조사2.Size = new System.Drawing.Size(180, 22);
+            this.복본조사2.Size = new System.Drawing.Size(192, 26);
             this.복본조사2.Text = "복본조사(New)";
             this.복본조사2.Click += new System.EventHandler(this.복본조사2_Click);
             // 
             // iSBN조회
             // 
             this.iSBN조회.Name = "iSBN조회";
-            this.iSBN조회.Size = new System.Drawing.Size(180, 22);
+            this.iSBN조회.Size = new System.Drawing.Size(192, 26);
             this.iSBN조회.Text = "ISBN 조회";
             this.iSBN조회.Click += new System.EventHandler(this.iSBN조회ToolStripMenuItem_Click);
             // 
@@ -520,21 +522,21 @@
             this.목록,
             this.편목});
             this.dVDCDLPToolStripMenuItem.Name = "dVDCDLPToolStripMenuItem";
-            this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.dVDCDLPToolStripMenuItem.Size = new System.Drawing.Size(193, 26);
             this.dVDCDLPToolStripMenuItem.Text = "DVD / CD / LP";
             // 
             // 목록
             // 
             this.목록.Enabled = false;
             this.목록.Name = "목록";
-            this.목록.Size = new System.Drawing.Size(180, 22);
+            this.목록.Size = new System.Drawing.Size(122, 26);
             this.목록.Text = "목록";
             this.목록.Click += new System.EventHandler(this.목록_Click);
             // 
             // 편목
             // 
             this.편목.Name = "편목";
-            this.편목.Size = new System.Drawing.Size(180, 22);
+            this.편목.Size = new System.Drawing.Size(122, 26);
             this.편목.Text = "편목";
             this.편목.Click += new System.EventHandler(this.편목ToolStripMenuItem_Click);
             // 
@@ -544,20 +546,20 @@
             this.마크반입,
             this.마크반출});
             this.반입및반출.Name = "반입및반출";
-            this.반입및반출.Size = new System.Drawing.Size(180, 22);
+            this.반입및반출.Size = new System.Drawing.Size(193, 26);
             this.반입및반출.Text = "반입 및 반출";
             // 
             // 마크반입
             // 
             this.마크반입.Name = "마크반입";
-            this.마크반입.Size = new System.Drawing.Size(98, 22);
+            this.마크반입.Size = new System.Drawing.Size(122, 26);
             this.마크반입.Text = "반입";
             this.마크반입.Click += new System.EventHandler(this.반입ToolStripMenuItem_Click);
             // 
             // 마크반출
             // 
             this.마크반출.Name = "마크반출";
-            this.마크반출.Size = new System.Drawing.Size(98, 22);
+            this.마크반출.Size = new System.Drawing.Size(122, 26);
             this.마크반출.Text = "반출";
             this.마크반출.Click += new System.EventHandler(this.반출ToolStripMenuItem_Click);
             // 
@@ -569,14 +571,14 @@
             this.검수,
             this.저자기호});
             this.부가기능.Name = "부가기능";
-            this.부가기능.Size = new System.Drawing.Size(180, 22);
+            this.부가기능.Size = new System.Drawing.Size(193, 26);
             this.부가기능.Text = "부가기능";
             // 
             // 마크수집
             // 
             this.마크수집.Enabled = false;
             this.마크수집.Name = "마크수집";
-            this.마크수집.Size = new System.Drawing.Size(122, 22);
+            this.마크수집.Size = new System.Drawing.Size(152, 26);
             this.마크수집.Text = "마크수집";
             this.마크수집.Visible = false;
             this.마크수집.Click += new System.EventHandler(this.마크수집ToolStripMenuItem_Click);
@@ -584,7 +586,7 @@
             // 전집관리
             // 
             this.전집관리.Name = "전집관리";
-            this.전집관리.Size = new System.Drawing.Size(122, 22);
+            this.전집관리.Size = new System.Drawing.Size(152, 26);
             this.전집관리.Text = "전집관리";
             this.전집관리.Click += new System.EventHandler(this.전집관리ToolStripMenuItem1_Click);
             // 
@@ -592,7 +594,7 @@
             // 
             this.검수.Enabled = false;
             this.검수.Name = "검수";
-            this.검수.Size = new System.Drawing.Size(122, 22);
+            this.검수.Size = new System.Drawing.Size(152, 26);
             this.검수.Text = "검수";
             this.검수.Visible = false;
             this.검수.Click += new System.EventHandler(this.검수ToolStripMenuItem_Click);
@@ -600,7 +602,7 @@
             // 저자기호
             // 
             this.저자기호.Name = "저자기호";
-            this.저자기호.Size = new System.Drawing.Size(122, 22);
+            this.저자기호.Size = new System.Drawing.Size(152, 26);
             this.저자기호.Text = "저자기호";
             this.저자기호.Click += new System.EventHandler(this.저자기호ToolStripMenuItem_Click);
             // 
@@ -610,20 +612,20 @@
             this.DLS조회,
             this.dLS복본조사});
             this.DLS.Name = "DLS";
-            this.DLS.Size = new System.Drawing.Size(180, 22);
+            this.DLS.Size = new System.Drawing.Size(193, 26);
             this.DLS.Text = "DLS";
             // 
             // DLS조회
             // 
             this.DLS조회.Name = "DLS조회";
-            this.DLS조회.Size = new System.Drawing.Size(180, 22);
+            this.DLS조회.Size = new System.Drawing.Size(190, 26);
             this.DLS조회.Text = "DLS_조회/입력";
             this.DLS조회.Click += new System.EventHandler(this.dLS조회ToolStripMenuItem_Click);
             // 
             // dLS복본조사
             // 
             this.dLS복본조사.Name = "dLS복본조사";
-            this.dLS복본조사.Size = new System.Drawing.Size(180, 22);
+            this.dLS복본조사.Size = new System.Drawing.Size(190, 26);
             this.dLS복본조사.Text = "DLS 복본조사";
             this.dLS복본조사.Click += new System.EventHandler(this.dLS복본조사ToolStripMenuItem_Click);
             // 
@@ -634,14 +636,14 @@
             this.마크통계,
             this.장비관리});
             this.마크기타.Name = "마크기타";
-            this.마크기타.Size = new System.Drawing.Size(180, 22);
+            this.마크기타.Size = new System.Drawing.Size(193, 26);
             this.마크기타.Text = "기타";
             // 
             // 서류작성
             // 
             this.서류작성.Enabled = false;
             this.서류작성.Name = "서류작성";
-            this.서류작성.Size = new System.Drawing.Size(122, 22);
+            this.서류작성.Size = new System.Drawing.Size(152, 26);
             this.서류작성.Text = "서류작성";
             this.서류작성.Visible = false;
             this.서류작성.Click += new System.EventHandler(this.서류작성ToolStripMenuItem_Click);
@@ -649,7 +651,7 @@
             // 마크통계
             // 
             this.마크통계.Name = "마크통계";
-            this.마크통계.Size = new System.Drawing.Size(122, 22);
+            this.마크통계.Size = new System.Drawing.Size(152, 26);
             this.마크통계.Text = "마크통계";
             this.마크통계.Click += new System.EventHandler(this.마크통계ToolStripMenuItem_Click);
             // 
@@ -657,7 +659,7 @@
             // 
             this.장비관리.Enabled = false;
             this.장비관리.Name = "장비관리";
-            this.장비관리.Size = new System.Drawing.Size(122, 22);
+            this.장비관리.Size = new System.Drawing.Size(152, 26);
             this.장비관리.Text = "장비관리";
             this.장비관리.Visible = false;
             this.장비관리.Click += new System.EventHandler(this.장비관리ToolStripMenuItem1_Click);
@@ -666,7 +668,7 @@
             // 
             this.작업일지ToolStripMenuItem.Enabled = false;
             this.작업일지ToolStripMenuItem.Name = "작업일지ToolStripMenuItem";
-            this.작업일지ToolStripMenuItem.Size = new System.Drawing.Size(67, 20);
+            this.작업일지ToolStripMenuItem.Size = new System.Drawing.Size(83, 26);
             this.작업일지ToolStripMenuItem.Text = "작업일지";
             this.작업일지ToolStripMenuItem.Click += new System.EventHandler(this.작업일지ToolStripMenuItem_Click);
             // 
@@ -680,20 +682,20 @@
             this.공지발송,
             this.판매});
             this.편의기능ToolStripMenuItem.Name = "편의기능ToolStripMenuItem";
-            this.편의기능ToolStripMenuItem.Size = new System.Drawing.Size(67, 20);
+            this.편의기능ToolStripMenuItem.Size = new System.Drawing.Size(83, 26);
             this.편의기능ToolStripMenuItem.Text = "편의기능";
             // 
             // 캘린더
             // 
             this.캘린더.Name = "캘린더";
-            this.캘린더.Size = new System.Drawing.Size(122, 22);
+            this.캘린더.Size = new System.Drawing.Size(152, 26);
             this.캘린더.Text = "캘린더";
             this.캘린더.Click += new System.EventHandler(this.캘린더ToolStripMenuItem_Click);
             // 
             // 채팅
             // 
             this.채팅.Name = "채팅";
-            this.채팅.Size = new System.Drawing.Size(122, 22);
+            this.채팅.Size = new System.Drawing.Size(152, 26);
             this.채팅.Text = "채팅";
             this.채팅.Visible = false;
             this.채팅.Click += new System.EventHandler(this.채팅ToolStripMenuItem_Click);
@@ -701,14 +703,14 @@
             // 퀵메뉴
             // 
             this.퀵메뉴.Name = "퀵메뉴";
-            this.퀵메뉴.Size = new System.Drawing.Size(122, 22);
+            this.퀵메뉴.Size = new System.Drawing.Size(152, 26);
             this.퀵메뉴.Text = "퀵메뉴";
             this.퀵메뉴.Click += new System.EventHandler(this.퀵메뉴ToolStripMenuItem_Click);
             // 
             // 게시판
             // 
             this.게시판.Name = "게시판";
-            this.게시판.Size = new System.Drawing.Size(122, 22);
+            this.게시판.Size = new System.Drawing.Size(152, 26);
             this.게시판.Text = "게시판";
             this.게시판.Visible = false;
             this.게시판.Click += new System.EventHandler(this.게시판ToolStripMenuItem_Click);
@@ -716,7 +718,7 @@
             // 공지발송
             // 
             this.공지발송.Name = "공지발송";
-            this.공지발송.Size = new System.Drawing.Size(122, 22);
+            this.공지발송.Size = new System.Drawing.Size(152, 26);
             this.공지발송.Text = "공지발송";
             this.공지발송.Visible = false;
             this.공지발송.Click += new System.EventHandler(this.공지발송ToolStripMenuItem_Click);
@@ -729,35 +731,35 @@
             this.판매마감,
             this.회원관리});
             this.판매.Name = "판매";
-            this.판매.Size = new System.Drawing.Size(122, 22);
+            this.판매.Size = new System.Drawing.Size(152, 26);
             this.판매.Text = "판매";
             this.판매.Visible = false;
             // 
             // 판매1
             // 
             this.판매1.Name = "판매1";
-            this.판매1.Size = new System.Drawing.Size(122, 22);
+            this.판매1.Size = new System.Drawing.Size(152, 26);
             this.판매1.Text = "판매";
             this.판매1.Click += new System.EventHandler(this.판매ToolStripMenuItem1_Click);
             // 
             // 정산
             // 
             this.정산.Name = "정산";
-            this.정산.Size = new System.Drawing.Size(122, 22);
+            this.정산.Size = new System.Drawing.Size(152, 26);
             this.정산.Text = "정산";
             this.정산.Click += new System.EventHandler(this.정산ToolStripMenuItem_Click);
             // 
             // 판매마감
             // 
             this.판매마감.Name = "판매마감";
-            this.판매마감.Size = new System.Drawing.Size(122, 22);
+            this.판매마감.Size = new System.Drawing.Size(152, 26);
             this.판매마감.Text = "판매마감";
             this.판매마감.Click += new System.EventHandler(this.판매마감ToolStripMenuItem_Click);
             // 
             // 회원관리
             // 
             this.회원관리.Name = "회원관리";
-            this.회원관리.Size = new System.Drawing.Size(122, 22);
+            this.회원관리.Size = new System.Drawing.Size(152, 26);
             this.회원관리.Text = "회원관리";
             this.회원관리.Click += new System.EventHandler(this.회원관리ToolStripMenuItem_Click);
             // 
@@ -772,7 +774,7 @@
             this.일괄처리관리ToolStripMenuItem,
             this.btDevDb});
             this.마스터ToolStripMenuItem.Name = "마스터ToolStripMenuItem";
-            this.마스터ToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
+            this.마스터ToolStripMenuItem.Size = new System.Drawing.Size(68, 26);
             this.마스터ToolStripMenuItem.Text = "마스터";
             // 
             // 이용자관리ToolStripMenuItem
@@ -780,48 +782,48 @@
             this.이용자관리ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.신규사업자등록ToolStripMenuItem});
             this.이용자관리ToolStripMenuItem.Name = "이용자관리ToolStripMenuItem";
-            this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.이용자관리ToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
             this.이용자관리ToolStripMenuItem.Text = "이용자 관리";
             // 
             // 신규사업자등록ToolStripMenuItem
             // 
             this.신규사업자등록ToolStripMenuItem.Name = "신규사업자등록ToolStripMenuItem";
-            this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+            this.신규사업자등록ToolStripMenuItem.Size = new System.Drawing.Size(172, 26);
             this.신규사업자등록ToolStripMenuItem.Text = "사업자 관리";
             this.신규사업자등록ToolStripMenuItem.Click += new System.EventHandler(this.신규사업자등록ToolStripMenuItem_Click);
             // 
             // 공지발송ToolStripMenuItem1
             // 
             this.공지발송ToolStripMenuItem1.Name = "공지발송ToolStripMenuItem1";
-            this.공지발송ToolStripMenuItem1.Size = new System.Drawing.Size(202, 22);
+            this.공지발송ToolStripMenuItem1.Size = new System.Drawing.Size(252, 26);
             this.공지발송ToolStripMenuItem1.Text = "공지 발송";
             this.공지발송ToolStripMenuItem1.Click += new System.EventHandler(this.공지발송ToolStripMenuItem1_Click);
             // 
             // 매출내역ToolStripMenuItem
             // 
             this.매출내역ToolStripMenuItem.Name = "매출내역ToolStripMenuItem";
-            this.매출내역ToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.매출내역ToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
             this.매출내역ToolStripMenuItem.Text = "매출내역";
             this.매출내역ToolStripMenuItem.Click += new System.EventHandler(this.매출내역ToolStripMenuItem_Click);
             // 
             // 이용자거래처조회ToolStripMenuItem
             // 
             this.이용자거래처조회ToolStripMenuItem.Name = "이용자거래처조회ToolStripMenuItem";
-            this.이용자거래처조회ToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.이용자거래처조회ToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
             this.이용자거래처조회ToolStripMenuItem.Text = "이용자 거래처 조회";
             this.이용자거래처조회ToolStripMenuItem.Click += new System.EventHandler(this.이용자거래처조회ToolStripMenuItem_Click);
             // 
             // 마크설정ToolStripMenuItem
             // 
             this.마크설정ToolStripMenuItem.Name = "마크설정ToolStripMenuItem";
-            this.마크설정ToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.마크설정ToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
             this.마크설정ToolStripMenuItem.Text = "마크설정";
             this.마크설정ToolStripMenuItem.Click += new System.EventHandler(this.마크설정ToolStripMenuItem_Click);
             // 
             // 일괄처리관리ToolStripMenuItem
             // 
             this.일괄처리관리ToolStripMenuItem.Name = "일괄처리관리ToolStripMenuItem";
-            this.일괄처리관리ToolStripMenuItem.Size = new System.Drawing.Size(202, 22);
+            this.일괄처리관리ToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
             this.일괄처리관리ToolStripMenuItem.Text = "일괄처리 관리";
             this.일괄처리관리ToolStripMenuItem.Click += new System.EventHandler(this.일괄처리관리ToolStripMenuItem_Click);
             // 
@@ -829,11 +831,19 @@
             // 
             this.btDevDb.ForeColor = System.Drawing.Color.Blue;
             this.btDevDb.Name = "btDevDb";
-            this.btDevDb.Size = new System.Drawing.Size(202, 22);
+            this.btDevDb.Size = new System.Drawing.Size(252, 26);
             this.btDevDb.Text = "데이터베이스편집(개발)";
             this.btDevDb.Visible = false;
             this.btDevDb.Click += new System.EventHandler(this.btDevDb_Click);
             // 
+            // menu_allclose
+            // 
+            this.menu_allclose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.menu_allclose.Name = "menu_allclose";
+            this.menu_allclose.Size = new System.Drawing.Size(108, 26);
+            this.menu_allclose.Text = "전체 창 닫기";
+            this.menu_allclose.Click += new System.EventHandler(this.menu_allclose_Click);
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.SystemColors.ControlDark;
@@ -851,9 +861,10 @@
             this.panel1.Controls.Add(this.ShortCut2);
             this.panel1.Controls.Add(this.ShortCut1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel1.Location = new System.Drawing.Point(0, 24);
+            this.panel1.Location = new System.Drawing.Point(0, 30);
+            this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1259, 64);
+            this.panel1.Size = new System.Drawing.Size(1902, 80);
             this.panel1.TabIndex = 2;
             // 
             // ShortCut12
@@ -862,9 +873,10 @@
             this.ShortCut12.Enabled = false;
             this.ShortCut12.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut12.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut12.Location = new System.Drawing.Point(859, 1);
+            this.ShortCut12.Location = new System.Drawing.Point(982, 1);
+            this.ShortCut12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut12.Name = "ShortCut12";
-            this.ShortCut12.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut12.Size = new System.Drawing.Size(69, 75);
             this.ShortCut12.TabIndex = 2;
             this.ShortCut12.Text = "즐겨찾기12";
             this.ShortCut12.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -876,9 +888,10 @@
             this.ShortCut11.Enabled = false;
             this.ShortCut11.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut11.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut11.Location = new System.Drawing.Point(782, 1);
+            this.ShortCut11.Location = new System.Drawing.Point(894, 1);
+            this.ShortCut11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut11.Name = "ShortCut11";
-            this.ShortCut11.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut11.Size = new System.Drawing.Size(69, 75);
             this.ShortCut11.TabIndex = 2;
             this.ShortCut11.Text = "즐겨찾기11";
             this.ShortCut11.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -890,9 +903,10 @@
             this.ShortCut10.Enabled = false;
             this.ShortCut10.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut10.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut10.Location = new System.Drawing.Point(705, 1);
+            this.ShortCut10.Location = new System.Drawing.Point(806, 1);
+            this.ShortCut10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut10.Name = "ShortCut10";
-            this.ShortCut10.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut10.Size = new System.Drawing.Size(69, 75);
             this.ShortCut10.TabIndex = 2;
             this.ShortCut10.Text = "즐겨찾기10";
             this.ShortCut10.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -904,9 +918,10 @@
             this.ShortCut9.Enabled = false;
             this.ShortCut9.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut9.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut9.Location = new System.Drawing.Point(628, 1);
+            this.ShortCut9.Location = new System.Drawing.Point(718, 1);
+            this.ShortCut9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut9.Name = "ShortCut9";
-            this.ShortCut9.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut9.Size = new System.Drawing.Size(69, 75);
             this.ShortCut9.TabIndex = 2;
             this.ShortCut9.Text = "즐겨찾기9";
             this.ShortCut9.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -918,9 +933,10 @@
             this.ShortCut8.Enabled = false;
             this.ShortCut8.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut8.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut8.Location = new System.Drawing.Point(551, 1);
+            this.ShortCut8.Location = new System.Drawing.Point(630, 1);
+            this.ShortCut8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut8.Name = "ShortCut8";
-            this.ShortCut8.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut8.Size = new System.Drawing.Size(69, 75);
             this.ShortCut8.TabIndex = 1;
             this.ShortCut8.Text = "즐겨찾기8";
             this.ShortCut8.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -932,9 +948,10 @@
             this.ShortCut6.Enabled = false;
             this.ShortCut6.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut6.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut6.Location = new System.Drawing.Point(397, 1);
+            this.ShortCut6.Location = new System.Drawing.Point(454, 1);
+            this.ShortCut6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut6.Name = "ShortCut6";
-            this.ShortCut6.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut6.Size = new System.Drawing.Size(69, 75);
             this.ShortCut6.TabIndex = 2;
             this.ShortCut6.Text = "즐겨찾기6";
             this.ShortCut6.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -946,9 +963,10 @@
             this.ShortCut5.Enabled = false;
             this.ShortCut5.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut5.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut5.Location = new System.Drawing.Point(320, 1);
+            this.ShortCut5.Location = new System.Drawing.Point(366, 1);
+            this.ShortCut5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut5.Name = "ShortCut5";
-            this.ShortCut5.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut5.Size = new System.Drawing.Size(69, 75);
             this.ShortCut5.TabIndex = 1;
             this.ShortCut5.Text = "즐겨찾기5";
             this.ShortCut5.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -960,9 +978,10 @@
             this.ShortCut7.Enabled = false;
             this.ShortCut7.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut7.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut7.Location = new System.Drawing.Point(474, 1);
+            this.ShortCut7.Location = new System.Drawing.Point(542, 1);
+            this.ShortCut7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut7.Name = "ShortCut7";
-            this.ShortCut7.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut7.Size = new System.Drawing.Size(69, 75);
             this.ShortCut7.TabIndex = 0;
             this.ShortCut7.Text = "즐겨찾기7";
             this.ShortCut7.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -974,9 +993,10 @@
             this.ShortCut3.Enabled = false;
             this.ShortCut3.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut3.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut3.Location = new System.Drawing.Point(166, 1);
+            this.ShortCut3.Location = new System.Drawing.Point(190, 1);
+            this.ShortCut3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut3.Name = "ShortCut3";
-            this.ShortCut3.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut3.Size = new System.Drawing.Size(69, 75);
             this.ShortCut3.TabIndex = 2;
             this.ShortCut3.Text = "즐겨찾기3";
             this.ShortCut3.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -988,9 +1008,10 @@
             this.ShortCut4.Enabled = false;
             this.ShortCut4.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut4.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut4.Location = new System.Drawing.Point(243, 1);
+            this.ShortCut4.Location = new System.Drawing.Point(278, 1);
+            this.ShortCut4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut4.Name = "ShortCut4";
-            this.ShortCut4.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut4.Size = new System.Drawing.Size(69, 75);
             this.ShortCut4.TabIndex = 0;
             this.ShortCut4.Text = "즐겨찾기4";
             this.ShortCut4.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -1002,9 +1023,10 @@
             this.ShortCut2.Enabled = false;
             this.ShortCut2.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut2.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut2.Location = new System.Drawing.Point(89, 1);
+            this.ShortCut2.Location = new System.Drawing.Point(102, 1);
+            this.ShortCut2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut2.Name = "ShortCut2";
-            this.ShortCut2.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut2.Size = new System.Drawing.Size(69, 75);
             this.ShortCut2.TabIndex = 1;
             this.ShortCut2.Text = "즐겨찾기2";
             this.ShortCut2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -1016,9 +1038,10 @@
             this.ShortCut1.Enabled = false;
             this.ShortCut1.Font = new System.Drawing.Font("굴림", 1.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.ShortCut1.ForeColor = System.Drawing.Color.Transparent;
-            this.ShortCut1.Location = new System.Drawing.Point(12, 1);
+            this.ShortCut1.Location = new System.Drawing.Point(14, 1);
+            this.ShortCut1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.ShortCut1.Name = "ShortCut1";
-            this.ShortCut1.Size = new System.Drawing.Size(60, 60);
+            this.ShortCut1.Size = new System.Drawing.Size(69, 75);
             this.ShortCut1.TabIndex = 0;
             this.ShortCut1.Text = "즐겨찾기1";
             this.ShortCut1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
@@ -1029,6 +1052,7 @@
             // 
             this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolStripLabel2,
             this.VersionText,
@@ -1038,58 +1062,58 @@
             this.toolStripSeparator3,
             this.IPText,
             this.lblStatus});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 681);
+            this.toolStrip1.Location = new System.Drawing.Point(0, 1002);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1259, 25);
+            this.toolStrip1.Size = new System.Drawing.Size(1902, 31);
             this.toolStrip1.TabIndex = 4;
             this.toolStrip1.Text = "toolStrip1";
             // 
             // toolStripLabel2
             // 
             this.toolStripLabel2.Name = "toolStripLabel2";
-            this.toolStripLabel2.Size = new System.Drawing.Size(43, 22);
+            this.toolStripLabel2.Size = new System.Drawing.Size(54, 28);
             this.toolStripLabel2.Text = "회사명";
             // 
             // VersionText
             // 
             this.VersionText.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.VersionText.Name = "VersionText";
-            this.VersionText.Size = new System.Drawing.Size(116, 22);
+            this.VersionText.Size = new System.Drawing.Size(143, 28);
             this.VersionText.Text = "UniMarc Ver 0.0000";
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31);
             // 
             // botUserLabel
             // 
             this.botUserLabel.Name = "botUserLabel";
-            this.botUserLabel.Size = new System.Drawing.Size(43, 22);
+            this.botUserLabel.Size = new System.Drawing.Size(54, 28);
             this.botUserLabel.Text = "이용자";
             // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31);
             // 
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 31);
             // 
             // IPText
             // 
             this.IPText.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.IPText.Name = "IPText";
-            this.IPText.Size = new System.Drawing.Size(154, 22);
+            this.IPText.Size = new System.Drawing.Size(183, 28);
             this.IPText.Text = "접속 아이피 : 0.000.00.000";
             // 
             // lblStatus
             // 
             this.lblStatus.Name = "lblStatus";
-            this.lblStatus.Size = new System.Drawing.Size(27, 22);
+            this.lblStatus.Size = new System.Drawing.Size(34, 28);
             this.lblStatus.Text = "WD";
             // 
             // mdiTabControl
@@ -1097,45 +1121,40 @@
             this.mdiTabControl.Controls.Add(this.tabPage1);
             this.mdiTabControl.Controls.Add(this.tabPage2);
             this.mdiTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mdiTabControl.Location = new System.Drawing.Point(0, 88);
+            this.mdiTabControl.Location = new System.Drawing.Point(0, 110);
+            this.mdiTabControl.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.mdiTabControl.Name = "mdiTabControl";
             this.mdiTabControl.SelectedIndex = 0;
-            this.mdiTabControl.Size = new System.Drawing.Size(1259, 593);
+            this.mdiTabControl.Size = new System.Drawing.Size(1902, 892);
             this.mdiTabControl.TabIndex = 5;
             // 
             // tabPage1
             // 
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Location = new System.Drawing.Point(4, 25);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tabPage1.Size = new System.Drawing.Size(1251, 567);
+            this.tabPage1.Size = new System.Drawing.Size(1894, 863);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // tabPage2
             // 
-            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Location = new System.Drawing.Point(4, 25);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.tabPage2.Size = new System.Drawing.Size(1251, 567);
+            this.tabPage2.Size = new System.Drawing.Size(1894, 871);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
-            // menu_allclose
-            // 
-            this.menu_allclose.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
-            this.menu_allclose.Name = "menu_allclose";
-            this.menu_allclose.Size = new System.Drawing.Size(87, 20);
-            this.menu_allclose.Text = "전체 창 닫기";
-            this.menu_allclose.Click += new System.EventHandler(this.menu_allclose_Click);
-            // 
             // Main
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1259, 706);
+            this.ClientSize = new System.Drawing.Size(1902, 1033);
             this.Controls.Add(this.mdiTabControl);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.panel1);
@@ -1143,7 +1162,9 @@
             this.HelpButton = true;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
+            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.Name = "Main";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "메인";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.Load += new System.EventHandler(this.Main_Load);

unimarc/unimarc/Main.cs

@@ -47,6 +47,11 @@ namespace WindowsFormsApp1
             this.mdiTabControl.DrawItem += MdiTabControl_DrawItem;
             PUB.Init();
             this.btDevDb.Visible = System.Diagnostics.Debugger.IsAttached;
+            if(System.Diagnostics.Debugger.IsAttached)
+            {
+                this.Size = new Size(1920, 1080);
+                this.WindowState = FormWindowState.Normal;
+            }
         }
 
         public string User_Name { get; internal set; }

unimarc/unimarc/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2025.12.29.2200")]
+[assembly: AssemblyVersion("2026.01.21.2318")]
-[assembly: AssemblyFileVersion("2025.12.29.2200")]
+[assembly: AssemblyFileVersion("2026.01.21.2318")]

unimarc/unimarc/UniMarc.csproj

@@ -352,6 +352,7 @@
     <Compile Include="마크\Help_008.Designer.cs">
       <DependentUpon>Help_008.cs</DependentUpon>
     </Compile>
+    <Compile Include="마크\MacEditorParameter.cs" />
     <Compile Include="마크\Mac_List_Add.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -511,6 +512,12 @@
     <Compile Include="마크\Marc_Plan_PrintLabel.Designer.cs">
       <DependentUpon>Marc_Plan_PrintLabel.cs</DependentUpon>
     </Compile>
+    <Compile Include="마크\Marc_Plan_Sub_MarcEdit2.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="마크\Marc_Plan_Sub_MarcEdit2.Designer.cs">
+      <DependentUpon>Marc_Plan_Sub_MarcEdit2.cs</DependentUpon>
+    </Compile>
     <Compile Include="마크\Marc_Plan_Sub_MarcEdit.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1070,6 +1077,9 @@
     <EmbeddedResource Include="마크\Marc.resx">
       <DependentUpon>Marc.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="마크\MarcEditorControl.resx">
+      <DependentUpon>MarcEditorControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="마크\Marc_FillBlank.resx">
       <DependentUpon>Marc_FillBlank.cs</DependentUpon>
     </EmbeddedResource>
@@ -1136,6 +1146,9 @@
     <EmbeddedResource Include="마크\Marc_Plan_PrintLabel.resx">
       <DependentUpon>Marc_Plan_PrintLabel.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="마크\Marc_Plan_Sub_MarcEdit2.resx">
+      <DependentUpon>Marc_Plan_Sub_MarcEdit2.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="마크\Marc_Plan_Sub_MarcEdit.resx">
       <DependentUpon>Marc_Plan_Sub_MarcEdit.cs</DependentUpon>
     </EmbeddedResource>

unimarc/unimarc/UniMarc.csproj.user

@@ -9,7 +9,7 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>ko-KR</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

unimarc/unimarc/마크/MacEditorParameter.cs

@@ -0,0 +1,25 @@
+//using Microsoft.Office.Interop.Excel;
+namespace ExcelTest
+{
+   
+        public class MacEditorParameter
+        {
+            public string ISBN13 { get; set; }
+            public string URL { get; set; }
+            public string MarcIdx { get; set; }
+            public string Grade { get; set; }
+            public string User { get; set; }
+            public string SaveDate { get; set; }
+            public string ListIdx { get; set; }
+
+            public string BookName { get; set; }
+            public string Author { get; set; }
+            public string Publisher { get; set; }
+            public string Price { get; set; }
+
+        public string Remark1 { get; set; }
+        public string Remark2 { get; set; } 
+
+    }
+    
+}

unimarc/unimarc/마크/Mac_List.Designer.cs

@@ -60,9 +60,20 @@
             this.btn_Delete = new System.Windows.Forms.Button();
             this.btn_AddList = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.btnSearchISBN = new System.Windows.Forms.Button();
+            this.panel12 = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
             this.chkEditorTest = new System.Windows.Forms.CheckBox();
+            this.panel13 = new System.Windows.Forms.Panel();
+            this.panel11 = new System.Windows.Forms.Panel();
+            this.btnSearchISBN = new System.Windows.Forms.Button();
+            this.panel10 = new System.Windows.Forms.Panel();
+            this.panel9 = new System.Windows.Forms.Panel();
+            this.panel8 = new System.Windows.Forms.Panel();
+            this.panel7 = new System.Windows.Forms.Panel();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.panel2 = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
@@ -70,18 +81,21 @@
             // 
             // label1
             // 
-            this.label1.AutoSize = true;
+            this.label1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.label1.Location = new System.Drawing.Point(14, 13);
+            this.label1.Location = new System.Drawing.Point(0, 5);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(57, 12);
+            this.label1.Size = new System.Drawing.Size(63, 27);
             this.label1.TabIndex = 5;
             this.label1.Text = "목록 검색";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // tb_Search
             // 
-            this.tb_Search.Location = new System.Drawing.Point(73, 9);
+            this.tb_Search.Dock = System.Windows.Forms.DockStyle.Left;
+            this.tb_Search.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.tb_Search.Location = new System.Drawing.Point(63, 5);
             this.tb_Search.Name = "tb_Search";
-            this.tb_Search.Size = new System.Drawing.Size(241, 21);
+            this.tb_Search.Size = new System.Drawing.Size(269, 25);
             this.tb_Search.TabIndex = 6;
             this.tb_Search.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_Search_KeyDown);
             // 
@@ -131,7 +145,7 @@
             this.dataGridView1.RowHeadersWidth = 40;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dataGridView1.Size = new System.Drawing.Size(1179, 623);
+            this.dataGridView1.Size = new System.Drawing.Size(1638, 624);
             this.dataGridView1.TabIndex = 48;
             this.dataGridView1.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellDoubleClick);
             this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.dataGridView1_RowPostPaint);
@@ -140,44 +154,57 @@
             // idx
             // 
             this.idx.HeaderText = "idx";
+            this.idx.MinimumWidth = 6;
             this.idx.Name = "idx";
             this.idx.Visible = false;
+            this.idx.Width = 125;
             // 
             // start_date
             // 
             this.start_date.HeaderText = "목록일자";
+            this.start_date.MinimumWidth = 6;
             this.start_date.Name = "start_date";
+            this.start_date.Width = 125;
             // 
             // end_date
             // 
             this.end_date.HeaderText = "완료일자";
+            this.end_date.MinimumWidth = 6;
             this.end_date.Name = "end_date";
+            this.end_date.Width = 125;
             // 
             // dvc_custname
             // 
             this.dvc_custname.HeaderText = "납품처";
+            this.dvc_custname.MinimumWidth = 6;
             this.dvc_custname.Name = "dvc_custname";
+            this.dvc_custname.Width = 125;
             // 
             // list_name
             // 
             this.list_name.HeaderText = "목록명";
+            this.list_name.MinimumWidth = 6;
             this.list_name.Name = "list_name";
             this.list_name.Width = 200;
             // 
             // work_name
             // 
             this.work_name.HeaderText = "작업명";
+            this.work_name.MinimumWidth = 6;
             this.work_name.Name = "work_name";
+            this.work_name.Width = 125;
             // 
             // count
             // 
             this.count.HeaderText = "수량";
+            this.count.MinimumWidth = 6;
             this.count.Name = "count";
             this.count.Width = 80;
             // 
             // stock
             // 
             this.stock.HeaderText = "입고";
+            this.stock.MinimumWidth = 6;
             this.stock.Name = "stock";
             this.stock.Visible = false;
             this.stock.Width = 70;
@@ -185,6 +212,7 @@
             // unstock
             // 
             this.unstock.HeaderText = "미입고";
+            this.unstock.MinimumWidth = 6;
             this.unstock.Name = "unstock";
             this.unstock.Visible = false;
             this.unstock.Width = 70;
@@ -192,57 +220,67 @@
             // state
             // 
             this.state.HeaderText = "상태";
+            this.state.MinimumWidth = 6;
             this.state.Name = "state";
             this.state.Width = 70;
             // 
             // etc
             // 
             this.etc.HeaderText = "비고";
+            this.etc.MinimumWidth = 6;
             this.etc.Name = "etc";
             this.etc.Width = 280;
             // 
             // charge
             // 
             this.charge.HeaderText = "담당자";
+            this.charge.MinimumWidth = 6;
             this.charge.Name = "charge";
             this.charge.Width = 70;
             // 
             // dvc_cust
             // 
             this.dvc_cust.HeaderText = "CustomerIDX";
+            this.dvc_cust.MinimumWidth = 6;
             this.dvc_cust.Name = "dvc_cust";
             this.dvc_cust.Visible = false;
+            this.dvc_cust.Width = 125;
             // 
             // check
             // 
             this.check.HeaderText = "V";
+            this.check.MinimumWidth = 6;
             this.check.Name = "check";
             this.check.Width = 35;
             // 
             // cb_state
             // 
+            this.cb_state.Dock = System.Windows.Forms.DockStyle.Left;
             this.cb_state.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_state.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
             this.cb_state.FormattingEnabled = true;
-            this.cb_state.Location = new System.Drawing.Point(354, 9);
+            this.cb_state.Location = new System.Drawing.Point(364, 5);
             this.cb_state.Name = "cb_state";
-            this.cb_state.Size = new System.Drawing.Size(74, 20);
+            this.cb_state.Size = new System.Drawing.Size(100, 25);
             this.cb_state.TabIndex = 49;
             // 
             // label2
             // 
-            this.label2.AutoSize = true;
+            this.label2.Dock = System.Windows.Forms.DockStyle.Left;
-            this.label2.Location = new System.Drawing.Point(323, 13);
+            this.label2.Location = new System.Drawing.Point(332, 5);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(29, 12);
+            this.label2.Size = new System.Drawing.Size(32, 27);
             this.label2.TabIndex = 5;
             this.label2.Text = "상태";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // btn_Lookup
             // 
-            this.btn_Lookup.Location = new System.Drawing.Point(502, 3);
+            this.btn_Lookup.Dock = System.Windows.Forms.DockStyle.Left;
+            this.btn_Lookup.Location = new System.Drawing.Point(586, 5);
             this.btn_Lookup.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Lookup.Name = "btn_Lookup";
-            this.btn_Lookup.Size = new System.Drawing.Size(61, 32);
+            this.btn_Lookup.Size = new System.Drawing.Size(61, 27);
             this.btn_Lookup.TabIndex = 50;
             this.btn_Lookup.Text = "조   회";
             this.btn_Lookup.UseVisualStyleBackColor = true;
@@ -250,10 +288,11 @@
             // 
             // btn_Excel
             // 
-            this.btn_Excel.Location = new System.Drawing.Point(1008, 3);
+            this.btn_Excel.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Excel.Location = new System.Drawing.Point(1482, 5);
             this.btn_Excel.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Excel.Name = "btn_Excel";
-            this.btn_Excel.Size = new System.Drawing.Size(61, 32);
+            this.btn_Excel.Size = new System.Drawing.Size(74, 27);
             this.btn_Excel.TabIndex = 50;
             this.btn_Excel.Text = "엑셀반출";
             this.btn_Excel.UseVisualStyleBackColor = true;
@@ -261,10 +300,11 @@
             // 
             // btn_Close
             // 
-            this.btn_Close.Location = new System.Drawing.Point(1071, 3);
+            this.btn_Close.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Close.Location = new System.Drawing.Point(1564, 5);
             this.btn_Close.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Close.Name = "btn_Close";
-            this.btn_Close.Size = new System.Drawing.Size(61, 32);
+            this.btn_Close.Size = new System.Drawing.Size(74, 27);
             this.btn_Close.TabIndex = 50;
             this.btn_Close.Text = "닫   기";
             this.btn_Close.UseVisualStyleBackColor = true;
@@ -272,21 +312,23 @@
             // 
             // btn_Save
             // 
-            this.btn_Save.Location = new System.Drawing.Point(945, 3);
+            this.btn_Save.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Save.Location = new System.Drawing.Point(1378, 5);
             this.btn_Save.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Save.Name = "btn_Save";
-            this.btn_Save.Size = new System.Drawing.Size(61, 32);
+            this.btn_Save.Size = new System.Drawing.Size(96, 27);
             this.btn_Save.TabIndex = 50;
-            this.btn_Save.Text = "체크사항\r\n저장";
+            this.btn_Save.Text = "체크사항저장";
             this.btn_Save.UseVisualStyleBackColor = true;
             this.btn_Save.Click += new System.EventHandler(this.btn_Save_Click);
             // 
             // btn_Merge
             // 
-            this.btn_Merge.Location = new System.Drawing.Point(691, 3);
+            this.btn_Merge.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Merge.Location = new System.Drawing.Point(1050, 5);
             this.btn_Merge.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Merge.Name = "btn_Merge";
-            this.btn_Merge.Size = new System.Drawing.Size(61, 32);
+            this.btn_Merge.Size = new System.Drawing.Size(74, 27);
             this.btn_Merge.TabIndex = 51;
             this.btn_Merge.Text = "목록병합";
             this.btn_Merge.UseVisualStyleBackColor = true;
@@ -294,10 +336,11 @@
             // 
             // btn_Progress
             // 
-            this.btn_Progress.Location = new System.Drawing.Point(756, 3);
+            this.btn_Progress.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Progress.Location = new System.Drawing.Point(1132, 5);
             this.btn_Progress.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Progress.Name = "btn_Progress";
-            this.btn_Progress.Size = new System.Drawing.Size(61, 32);
+            this.btn_Progress.Size = new System.Drawing.Size(74, 27);
             this.btn_Progress.TabIndex = 51;
             this.btn_Progress.Text = "진행처리";
             this.btn_Progress.UseVisualStyleBackColor = true;
@@ -305,10 +348,11 @@
             // 
             // btn_Completion
             // 
-            this.btn_Completion.Location = new System.Drawing.Point(819, 3);
+            this.btn_Completion.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Completion.Location = new System.Drawing.Point(1214, 5);
             this.btn_Completion.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Completion.Name = "btn_Completion";
-            this.btn_Completion.Size = new System.Drawing.Size(61, 32);
+            this.btn_Completion.Size = new System.Drawing.Size(74, 27);
             this.btn_Completion.TabIndex = 51;
             this.btn_Completion.Text = "완료처리";
             this.btn_Completion.UseVisualStyleBackColor = true;
@@ -316,10 +360,11 @@
             // 
             // btn_Delete
             // 
-            this.btn_Delete.Location = new System.Drawing.Point(882, 3);
+            this.btn_Delete.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_Delete.Location = new System.Drawing.Point(1296, 5);
             this.btn_Delete.Margin = new System.Windows.Forms.Padding(1);
             this.btn_Delete.Name = "btn_Delete";
-            this.btn_Delete.Size = new System.Drawing.Size(61, 32);
+            this.btn_Delete.Size = new System.Drawing.Size(74, 27);
             this.btn_Delete.TabIndex = 51;
             this.btn_Delete.Text = "목록삭제";
             this.btn_Delete.UseVisualStyleBackColor = true;
@@ -327,10 +372,11 @@
             // 
             // btn_AddList
             // 
-            this.btn_AddList.Location = new System.Drawing.Point(628, 3);
+            this.btn_AddList.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btn_AddList.Location = new System.Drawing.Point(968, 5);
             this.btn_AddList.Margin = new System.Windows.Forms.Padding(1);
             this.btn_AddList.Name = "btn_AddList";
-            this.btn_AddList.Size = new System.Drawing.Size(61, 32);
+            this.btn_AddList.Size = new System.Drawing.Size(74, 27);
             this.btn_AddList.TabIndex = 50;
             this.btn_AddList.Text = "목록생성";
             this.btn_AddList.UseVisualStyleBackColor = true;
@@ -338,64 +384,178 @@
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.chkEditorTest);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.btn_Delete);
-            this.panel1.Controls.Add(this.label2);
-            this.panel1.Controls.Add(this.btn_Completion);
-            this.panel1.Controls.Add(this.tb_Search);
-            this.panel1.Controls.Add(this.btn_Progress);
-            this.panel1.Controls.Add(this.cb_state);
-            this.panel1.Controls.Add(this.btn_Merge);
-            this.panel1.Controls.Add(this.btnSearchISBN);
             this.panel1.Controls.Add(this.btn_Lookup);
-            this.panel1.Controls.Add(this.btn_Close);
+            this.panel1.Controls.Add(this.panel12);
+            this.panel1.Controls.Add(this.chkEditorTest);
+            this.panel1.Controls.Add(this.panel13);
+            this.panel1.Controls.Add(this.cb_state);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.tb_Search);
+            this.panel1.Controls.Add(this.panel11);
+            this.panel1.Controls.Add(this.btnSearchISBN);
+            this.panel1.Controls.Add(this.panel10);
             this.panel1.Controls.Add(this.btn_AddList);
-            this.panel1.Controls.Add(this.btn_Excel);
+            this.panel1.Controls.Add(this.panel9);
+            this.panel1.Controls.Add(this.btn_Merge);
+            this.panel1.Controls.Add(this.panel8);
+            this.panel1.Controls.Add(this.btn_Progress);
+            this.panel1.Controls.Add(this.panel7);
+            this.panel1.Controls.Add(this.btn_Completion);
+            this.panel1.Controls.Add(this.panel6);
+            this.panel1.Controls.Add(this.btn_Delete);
+            this.panel1.Controls.Add(this.panel5);
             this.panel1.Controls.Add(this.btn_Save);
+            this.panel1.Controls.Add(this.panel4);
+            this.panel1.Controls.Add(this.btn_Excel);
+            this.panel1.Controls.Add(this.panel3);
+            this.panel1.Controls.Add(this.label1);
+            this.panel1.Controls.Add(this.btn_Close);
             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(1179, 38);
+            this.panel1.Padding = new System.Windows.Forms.Padding(0, 5, 0, 2);
+            this.panel1.Size = new System.Drawing.Size(1638, 34);
             this.panel1.TabIndex = 52;
             // 
+            // panel12
+            // 
+            this.panel12.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel12.Location = new System.Drawing.Point(578, 5);
+            this.panel12.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel12.Name = "panel12";
+            this.panel12.Size = new System.Drawing.Size(8, 27);
+            this.panel12.TabIndex = 62;
+            // 
+            // chkEditorTest
+            // 
+            this.chkEditorTest.AutoSize = true;
+            this.chkEditorTest.BackColor = System.Drawing.SystemColors.Control;
+            this.chkEditorTest.Dock = System.Windows.Forms.DockStyle.Left;
+            this.chkEditorTest.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.chkEditorTest.ForeColor = System.Drawing.Color.Blue;
+            this.chkEditorTest.Location = new System.Drawing.Point(472, 5);
+            this.chkEditorTest.Name = "chkEditorTest";
+            this.chkEditorTest.Size = new System.Drawing.Size(106, 27);
+            this.chkEditorTest.TabIndex = 52;
+            this.chkEditorTest.Text = "Editor (OLD)";
+            this.chkEditorTest.UseVisualStyleBackColor = false;
+            // 
+            // panel13
+            // 
+            this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel13.Location = new System.Drawing.Point(464, 5);
+            this.panel13.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel13.Name = "panel13";
+            this.panel13.Size = new System.Drawing.Size(8, 27);
+            this.panel13.TabIndex = 63;
+            // 
+            // panel11
+            // 
+            this.panel11.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel11.Location = new System.Drawing.Point(878, 5);
+            this.panel11.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel11.Name = "panel11";
+            this.panel11.Size = new System.Drawing.Size(8, 27);
+            this.panel11.TabIndex = 61;
+            // 
             // btnSearchISBN
             // 
-            this.btnSearchISBN.Location = new System.Drawing.Point(565, 3);
+            this.btnSearchISBN.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnSearchISBN.Location = new System.Drawing.Point(886, 5);
             this.btnSearchISBN.Margin = new System.Windows.Forms.Padding(1);
             this.btnSearchISBN.Name = "btnSearchISBN";
-            this.btnSearchISBN.Size = new System.Drawing.Size(61, 32);
+            this.btnSearchISBN.Size = new System.Drawing.Size(74, 27);
             this.btnSearchISBN.TabIndex = 50;
-            this.btnSearchISBN.Text = "ISBN   조회";
+            this.btnSearchISBN.Text = "ISBN조회";
             this.btnSearchISBN.UseVisualStyleBackColor = true;
             this.btnSearchISBN.Click += new System.EventHandler(this.btnSearchISBN_Click);
             // 
+            // panel10
+            // 
+            this.panel10.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel10.Location = new System.Drawing.Point(960, 5);
+            this.panel10.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel10.Name = "panel10";
+            this.panel10.Size = new System.Drawing.Size(8, 27);
+            this.panel10.TabIndex = 60;
+            // 
+            // panel9
+            // 
+            this.panel9.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel9.Location = new System.Drawing.Point(1042, 5);
+            this.panel9.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel9.Name = "panel9";
+            this.panel9.Size = new System.Drawing.Size(8, 27);
+            this.panel9.TabIndex = 59;
+            // 
+            // panel8
+            // 
+            this.panel8.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel8.Location = new System.Drawing.Point(1124, 5);
+            this.panel8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel8.Name = "panel8";
+            this.panel8.Size = new System.Drawing.Size(8, 27);
+            this.panel8.TabIndex = 58;
+            // 
+            // panel7
+            // 
+            this.panel7.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel7.Location = new System.Drawing.Point(1206, 5);
+            this.panel7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(8, 27);
+            this.panel7.TabIndex = 57;
+            // 
+            // panel6
+            // 
+            this.panel6.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel6.Location = new System.Drawing.Point(1288, 5);
+            this.panel6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(8, 27);
+            this.panel6.TabIndex = 56;
+            // 
+            // panel5
+            // 
+            this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel5.Location = new System.Drawing.Point(1370, 5);
+            this.panel5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(8, 27);
+            this.panel5.TabIndex = 55;
+            // 
+            // panel4
+            // 
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel4.Location = new System.Drawing.Point(1474, 5);
+            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(8, 27);
+            this.panel4.TabIndex = 54;
+            // 
+            // panel3
+            // 
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel3.Location = new System.Drawing.Point(1556, 5);
+            this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(8, 27);
+            this.panel3.TabIndex = 53;
+            // 
             // panel2
             // 
             this.panel2.Controls.Add(this.dataGridView1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(0, 38);
+            this.panel2.Location = new System.Drawing.Point(0, 34);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1179, 623);
+            this.panel2.Size = new System.Drawing.Size(1638, 624);
             this.panel2.TabIndex = 53;
             // 
-            // chkEditorTest
-            // 
-            this.chkEditorTest.AutoSize = true;
-            this.chkEditorTest.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.chkEditorTest.ForeColor = System.Drawing.Color.Red;
-            this.chkEditorTest.Location = new System.Drawing.Point(436, 7);
-            this.chkEditorTest.Name = "chkEditorTest";
-            this.chkEditorTest.Size = new System.Drawing.Size(65, 28);
-            this.chkEditorTest.TabIndex = 52;
-            this.chkEditorTest.Text = "Editor\r\n(Test)";
-            this.chkEditorTest.UseVisualStyleBackColor = true;
-            // 
             // Mac_List
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1179, 661);
+            this.ClientSize = new System.Drawing.Size(1638, 658);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Name = "Mac_List";
@@ -445,5 +605,16 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dvc_cust;
         private System.Windows.Forms.DataGridViewTextBoxColumn check;
         private System.Windows.Forms.CheckBox chkEditorTest;
+        private System.Windows.Forms.Panel panel12;
+        private System.Windows.Forms.Panel panel11;
+        private System.Windows.Forms.Panel panel10;
+        private System.Windows.Forms.Panel panel9;
+        private System.Windows.Forms.Panel panel8;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.Panel panel6;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Panel panel13;
     }
 }

unimarc/unimarc/마크/Mac_List.cs

@@ -312,7 +312,7 @@ namespace WindowsFormsApp1.Mac
             int idx_col = e.ColumnIndex;
             if (3 <= idx_col && idx_col <= 8)
             {
-                if (chkEditorTest.Checked)
+                if (chkEditorTest.Checked == false)
                 {
                     var marc = this.main.OpenFormInTab(() => new ExcelTest.Marc2(this), allowMultiple: true);
                     marc.input_list(
@@ -371,6 +371,7 @@ namespace WindowsFormsApp1.Mac
 
         private void btnSearchISBN_Click(object sender, EventArgs e)
         {
+            if (this.dataGridView1.RowCount < 1) return;
             if (dataGridView1.SelectedRows[0].Index < 0) return;
             string tSearchText = dataGridView1.SelectedRows[0].Cells["list_name"].Value.ToString();
             string tSearchIDX = dataGridView1.SelectedRows[0].Cells["idx"].Value.ToString();

unimarc/unimarc/마크/Mac_List.resx

@@ -163,6 +163,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>51</value>
+    <value>55</value>
   </metadata>
 </root>

unimarc/unimarc/마크/Marc.cs

@@ -435,11 +435,11 @@ namespace ExcelTest
                 MessageBox.Show("[칸채우기]가 아닌 [마크 편집] 탭에서 저장해주세요!");
                 return;
             }
-            if (grade == 3)
+            //if (grade == 3)
-            {
+            //{
-                MessageBox.Show("등급을 설정해주세요. (C 이상)");
+            //    MessageBox.Show("등급을 설정해주세요. (C 이상)");
-                return;
+            //    return;
-            }
+            //}
             string table_name = "Marc";
             string BaseText = richTextBox1.Text;
             string lblisbn = lbl_ISBN.Text.Replace("[", "").Replace("]", "");
@@ -455,9 +455,11 @@ namespace ExcelTest
 
             if (BaseText.IndexOf(lblisbn) < 0)
             {
-                MessageBox.Show("ISBN 상태를 확인해주세요.");
+                 UTIL.MsgE("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다");
+                //if (dlg != DialogResult.Yes) return;
                 return;
             }
+
             string tag056 = Tag056();
             string[] grid_data = {
                 List_Book.Rows[SaveRowIdx].Cells["ISBN13"].Value.ToString(),
@@ -469,6 +471,7 @@ namespace ExcelTest
             string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦");
             string Midx = List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value.ToString();
+
             // 필수태그 확인
             if (!isMustTag(orimarc))
             {
@@ -485,24 +488,11 @@ namespace ExcelTest
                 // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인
                 TimeSpan sp = spspsp(SaveDate, date);
                 IsCoverDate = IsCoverData(sp.Days, SaveUser);
-
-                //    if (IsCoverDate) {
-                //        etc2.Text = etc2.Text.Replace(SaveDate, date);
-                //    }
-                //    else {
-                //        etc2.Text += string.Format("{0}\t{1}\n", date, mUserName);
-                //    }
             }
-            //else
-            //{
-            //    etc2.Text += string.Format("{0}\t{1}\n", date, mUserName);
-            //}
 
             // true일 경우 INSERT, false일 경우 UPDATE
-            bool isNewData = true;
+            bool isNewData = Midx != "" ? false : true;
 
-            if (Midx != "")
-                isNewData = false;
 
             if (List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Orange ||
                 List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Red)
@@ -540,36 +530,7 @@ namespace ExcelTest
                     MessageBox.Show("ISBN 데이터가 없습니다.");
                     return;
                 }
-                //if (grid_data[0] != null && grid_data[0] != "")
-                //{
-                //    int marcChk = Sub_marc_chk(grid_data[0]);
-                //    if (IsCoverDate)
-                //        marcChk--;
 
-                //    switch (marcChk)
-                //    {
-                //        case 0:
-                //            Edit_tbl[1] = "marc1";
-                //            Edit_tbl[2] = "marc_chk1";
-                //            Edit_tbl[3] = "marc_chk";
-                //            break;
-                //        case 1:
-                //            Edit_tbl[1] = "marc2";
-                //            Edit_tbl[2] = "marc_chk2";
-                //            Edit_tbl[3] = "marc_chk1";
-                //            break;
-                //        case 2:
-                //            Edit_tbl[1] = "marc";
-                //            Edit_tbl[2] = "marc_chk";
-                //            Edit_tbl[3] = "marc_chk2";
-                //            break;
-                //        default:
-                //            Edit_tbl[1] = "marc";
-                //            Edit_tbl[2] = "marc_chk";
-                //            Edit_tbl[3] = "marc_chk2";
-                //            break;
-                //    }
-                //}
                 string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col);
                 PUB.log.Add("Update", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor, U_cmd.Replace("\r", " ").Replace("\n", " ")));
                 db.DB_Send_CMD_reVoid(U_cmd);
@@ -845,60 +806,7 @@ namespace ExcelTest
             cb_grade.SelectedIndex = grade;
             OnSaveData(row_idx);
         }
-        //private void List_Book_CellClick(object sender, DataGridViewCellEventArgs e)
+     
-        //{
-        //    //if (e.RowIndex == -1) { return; }
-        //    //int row_idx = e.RowIndex;
-        //    //SaveRowIdx = row_idx;
-        //    //int col_idx = e.ColumnIndex;
-
-        //    //string isbn = List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString();
-        //    //if (isbn != "") {
-        //    //    string CountQuery = string.Format("SELECT Count(isbn) FROM Marc WHERE isbn = {0} GROUP BY isbn;", isbn);
-        //    //    string CountResult = db.self_Made_Cmd(CountQuery).Replace("|", "");
-
-        //    //    if (CountResult == "")
-        //    //        btn_CopySelect.Text = "0";
-
-        //    //    if (CountResult == "0") {
-        //    //        btn_CopySelect.Enabled = false;
-        //    //        btn_CopySelect.BackColor = Color.Silver;
-        //    //    }
-        //    //    else {
-        //    //        btn_CopySelect.Enabled = true;
-        //    //        btn_CopySelect.BackColor = Color.Khaki;
-        //    //    }
-
-        //    //    btn_CopySelect.Text = CountResult;
-        //    //}
-
-        //    //tabControl1.SelectedIndex = 0;
-
-        //    //if (check_V(row_idx, col_idx))
-        //    //    return;
-
-        //    //Save_data(row_idx);
-        //    //richTextBox1.Text = "";
-
-        //    //bool check_Marc = click_Marc(row_idx);
-
-        //    //if (!check_Marc)
-        //    //    richTextBox1.Text = Make_Empty();
-        //    //else
-        //    //    ReadRemark(row_idx);
-
-        //    //input_picture(row_idx);
-        //    //Create_008();
-        //    //st.Color_change("▼", richTextBox1);
-        //    //st.Color_change("▲", richTextBox1);
-
-        //    //int grade = 2;
-        //    //if (List_Book.Rows[row_idx].Cells["grade"].Value != null || List_Book.Rows[row_idx].Cells["grade"].Value.ToString() != "") {
-        //    //    grade = Convert.ToInt32(List_Book.Rows[row_idx].Cells["grade"].Value.ToString());
-        //    //}
-        //    //cb_grade.SelectedIndex = grade;
-        //    //OnSaveData(row_idx);
-        //}
         #region CellClick_Sub
 
         void OnSaveData(int row)
@@ -1013,8 +921,8 @@ namespace ExcelTest
             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[3] = List_Book.Rows[row].Cells["book_comp"].Value.ToString(); //publichser
-            data_book[4] = List_Book.Rows[row].Cells["pay"].Value.ToString();
+            data_book[4] = List_Book.Rows[row].Cells["pay"].Value.ToString();   //price
         }
         void input_picture(int row)
         {
@@ -1321,47 +1229,48 @@ namespace ExcelTest
 
         private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
-            string name = ((CheckBox)sender).Name;
+            var chk = sender as CheckBox;   
-            if (((CheckBox)sender).Checked == true)
+            string name = chk.Name;
+            if (chk.Checked == true)
             {
                 switch (name)
                 {
                     case "checkBox1":
-                        ((CheckBox)sender).InvokeText("회의간행물o");
+                        chk.InvokeText("회의간행물o");
                         break;
                     case "checkBox2":
-                        ((CheckBox)sender).InvokeText("기념논문집o");
+                        chk.InvokeText("기념논문집o");
                         break;
                     case "checkBox4":
-                        ((CheckBox)sender).InvokeText("색인o");
+                        chk.InvokeText("색인o");
                         break;
                 }
             }
-            else if (((CheckBox)sender).Checked == false)
+            else if (chk.Checked == false)
             {
                 switch (name)
                 {
                     case "checkBox1":
-                        ((CheckBox)sender).InvokeText("회의간행물x");
+                        chk.InvokeText("회의간행물x");
                         break;
                     case "checkBox2":
-                        ((CheckBox)sender).InvokeText("기념논문집x");
+                        chk.InvokeText("기념논문집x");
                         break;
                     case "checkBox4":
-                        ((CheckBox)sender).InvokeText("색인x");
+                        chk.InvokeText("색인x");
                         break;
                 }
             }
             switch (name)
             {
-                case "checkBox1":
+                case "checkBox1":   //회의간행물
-                    Publication(checkBox1.Checked, 29);
+                    Publication(chk.Checked, 29);
                     break;
-                case "checkBox2":
+                case "checkBox2":   //기념논문집
-                    Publication(checkBox2.Checked, 30);
+                    Publication(chk.Checked, 30);
                     break;
-                case "checkBox4":
+                case "checkBox4":   //색인
-                    Publication(checkBox4.Checked, 31);
+                    Publication(chk.Checked, 31);
                     break;
             }
         }
@@ -2319,6 +2228,7 @@ namespace ExcelTest
                 str = str.Trim();
                 if (TagNum == "300a")
                 {
+                    //gu = new char[] { ',', '=', ':', ';', '/', '+', ' ' };
                     gu = new char[] { '.', ',', '=', ':', ';', '/', '+', ' ' };
                     for (int i = 0; i < gu.Length; i++)
                     {
@@ -3694,5 +3604,10 @@ namespace ExcelTest
             newRow.Selected = true;
             List_Book.FirstDisplayedScrollingRowIndex = nRow;
         }
+
+        private void button1_Click_1(object sender, EventArgs e)
+        {
+            this.Close();
+        }
     }
 }

unimarc/unimarc/마크/Marc.resx

@@ -298,4 +298,7 @@
   <metadata name="text490v.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

unimarc/unimarc/마크/Marc2.cs

@@ -1,6 +1,7 @@
 //using Microsoft.Office.Interop.Excel;
 using AR;
 using OpenQA.Selenium.DevTools.V136.Animation;
+using Org.BouncyCastle.Asn1.CryptoPro;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -44,6 +45,13 @@ namespace ExcelTest
         String_Text st = new String_Text();
         Mac_List ml;
 
+        //목록다시불러오기를 위해서 임시로 추가
+        string p_lidx = "";
+        string p_value = "";
+        string p_cidx = "";
+        string p_cust = "";
+        string p_name = "";
+
         public Marc2()
         {
             InitializeComponent();
@@ -52,7 +60,35 @@ namespace ExcelTest
             marcEditorControl1.db = this.db;
             marcEditorControl1.BookSaved += MarcEditorControl_BookSaved;
             marcEditorControl1.FillBlankClicked += MarcEditorControl_FillBlankClicked;
+            marcEditorControl1.PrevButton += MarcEditorControl1_PrevButton;
+            marcEditorControl1.NextButton += MarcEditorControl1_NextButton;
         }
+
+        private void MarcEditorControl1_NextButton(object sender, EventArgs e)
+        {
+            int row_idx = List_Book.CurrentCell.RowIndex;
+            int col_idx = List_Book.CurrentCell.ColumnIndex;
+            if (row_idx == -1 || col_idx == -1) { return; }
+
+            //다음데이터가 존재한다
+            if(row_idx < List_Book.RowCount-1)
+            {
+                List_Book.CurrentCell = List_Book.Rows[row_idx + 1].Cells[col_idx];
+            }
+        }
+
+        private void MarcEditorControl1_PrevButton(object sender, EventArgs e)
+        {
+            int row_idx = List_Book.CurrentCell.RowIndex;
+            int col_idx = List_Book.CurrentCell.ColumnIndex;
+            if (row_idx == -1 || col_idx == -1) { return; }
+
+            if (row_idx > 0)
+            {
+                List_Book.CurrentCell = List_Book.Rows[row_idx - 1].Cells[col_idx];
+            }
+        }
+
         public Marc2(Mac_List _ml)
         {
             InitializeComponent();
@@ -61,15 +97,48 @@ namespace ExcelTest
             marcEditorControl1.db = this.db;
             marcEditorControl1.BookSaved += MarcEditorControl_BookSaved;
             marcEditorControl1.FillBlankClicked += MarcEditorControl_FillBlankClicked;
+            marcEditorControl1.PrevButton += MarcEditorControl1_PrevButton;
+            marcEditorControl1.NextButton += MarcEditorControl1_NextButton;
         }
 
         string l_idx = string.Empty;
         string c_idx = string.Empty;
         private void Marc_Load(object sender, EventArgs e)
         {
-            
+            // 콤보박스 정렬및 필터
+            string[] combo8 = { "등급", "복본" };
+            comboBox8.Items.AddRange(combo8);
+
+            comboBox8.SelectedIndex = 0;
         }
 
+        public void input_list()
+        {
+            var dlg = UTIL.MsgQ("데이터베이스 내용을 다시 불러옵니다\n저장되지 않은 사항은 손실됩니다.다시 불러올까요?");
+            if (dlg != DialogResult.Yes) return;
+            input_list(p_lidx, p_value, p_cidx, p_cust, p_name);
+        }
+
+        (string remark1, string remark2) ReadRemark(int row)
+        {
+            string[] sear_tbl = { "idx" };
+            string[] sear_col = { List_Book.Rows[row].Cells["marc_idx"].Value.ToString() };
+            string cmd = db.More_DB_Search("Marc", sear_tbl, sear_col, "`비고1`, `비고2`");
+            string res = db.DB_Send_CMD_Search(cmd);
+
+            string[] ary = res.Split('|');
+            if (res.Length < 1)
+            {
+                //etc1.Text = res;
+                //etc2.Text = "";
+                return (res, "");
+            }
+            //etc1.Text = ary[0];
+            //etc2.Text = ary[1];
+            return (ary[0], ary[1]);
+        }
+
+
         /// <summary>
         /// 가져온 목록을 책목록과 연동하여 Grid에 집어넣음.
         /// </summary>
@@ -77,7 +146,14 @@ namespace ExcelTest
         /// <param name="value">목록명</param>
         public void input_list(string l_idx, string value, string C_idx, string custidx, string custname)
         {
+            p_lidx = l_idx;
+            p_value = value;
+            p_cidx = C_idx;
+            p_cust = custidx;
+            p_name = custname;
+
             db.DBcon();
+            this.List_Book.Rows.Clear();
             if (value.isEmpty() == false)
             {
                 if (value.IndexOf("]") != -1)
@@ -142,9 +218,10 @@ namespace ExcelTest
                 //}
             }
             chk_Marc();
-            mLoadCompleted = true;
 
             List_Book.ClearSelection();
+            mLoadCompleted = true;
+
             if (this.List_Book.RowCount > 0)
                 List_Book.Rows[0].Selected = true;
         }
@@ -278,8 +355,16 @@ namespace ExcelTest
         private void List_Book_SelectionChanged(object sender, EventArgs e)
         {
             if (!mLoadCompleted) return;
+            if (List_Book.CurrentCell == null) return;
             int row_idx = List_Book.CurrentCell.RowIndex;
             int col_idx = List_Book.CurrentCell.ColumnIndex;
+
+            if (List_Book.SelectedCells.Count > 0)
+            {
+                row_idx = List_Book.SelectedCells[0].RowIndex;
+                col_idx = List_Book.SelectedCells[0].ColumnIndex;
+            }
+
             if (row_idx == -1 || col_idx == -1) { return; }
             SaveRowIdx = row_idx;
 
@@ -322,63 +407,25 @@ namespace ExcelTest
             string user = List_Book.Rows[row_idx].Cells["user"].Value?.ToString() ?? "";
             string saveDate = List_Book.Rows[row_idx].Cells["SaveDate"].Value?.ToString() ?? "";
             string listIdx = List_Book.Rows[row_idx].Cells["list_idx"].Value?.ToString() ?? ""; // verify this column name in input_list
-
+            var remark = ReadRemark(row_idx);
-            marcEditorControl1.LoadBookData(isbn13, bookName, author, publisher, price, url, marcIdx, dbMarc, grade, user, saveDate, listIdx);
+            var p = new MacEditorParameter
+            {
+                ISBN13 = isbn13,
+                URL = url,
+                Grade = grade,
+                ListIdx = listIdx,
+                MarcIdx = marcIdx,
+                SaveDate = saveDate,
+                User = user,
+                BookName = bookName,
+                Author = author,
+                Publisher = publisher,
+                Price = price,
+                Remark1 = remark.remark1,
+                Remark2 = remark.remark2
+            };
+            marcEditorControl1.LoadBookData(dbMarc, p);
         }
-        //private void List_Book_CellClick(object sender, DataGridViewCellEventArgs e)
-        //{
-        //    //if (e.RowIndex == -1) { return; }
-        //    //int row_idx = e.RowIndex;
-        //    //SaveRowIdx = row_idx;
-        //    //int col_idx = e.ColumnIndex;
-
-        //    //string isbn = List_Book.Rows[row_idx].Cells["ISBN13"].Value.ToString();
-        //    //if (isbn != "") {
-        //    //    string CountQuery = string.Format("SELECT Count(isbn) FROM Marc WHERE isbn = {0} GROUP BY isbn;", isbn);
-        //    //    string CountResult = db.self_Made_Cmd(CountQuery).Replace("|", "");
-
-        //    //    if (CountResult == "")
-        //    //        btn_CopySelect.Text = "0";
-
-        //    //    if (CountResult == "0") {
-        //    //        btn_CopySelect.Enabled = false;
-        //    //        btn_CopySelect.BackColor = Color.Silver;
-        //    //    }
-        //    //    else {
-        //    //        btn_CopySelect.Enabled = true;
-        //    //        btn_CopySelect.BackColor = Color.Khaki;
-        //    //    }
-
-        //    //    btn_CopySelect.Text = CountResult;
-        //    //}
-
-        //    //tabControl1.SelectedIndex = 0;
-
-        //    //if (check_V(row_idx, col_idx))
-        //    //    return;
-
-        //    //Save_data(row_idx);
-        //    //richTextBox1.Text = "";
-
-        //    //bool check_Marc = click_Marc(row_idx);
-
-        //    //if (!check_Marc)
-        //    //    richTextBox1.Text = Make_Empty();
-        //    //else
-        //    //    ReadRemark(row_idx);
-
-        //    //input_picture(row_idx);
-        //    //Create_008();
-        //    //st.Color_change("▼", richTextBox1);
-        //    //st.Color_change("▲", richTextBox1);
-
-        //    //int grade = 2;
-        //    //if (List_Book.Rows[row_idx].Cells["grade"].Value != null || List_Book.Rows[row_idx].Cells["grade"].Value.ToString() != "") {
-        //    //    grade = Convert.ToInt32(List_Book.Rows[row_idx].Cells["grade"].Value.ToString());
-        //    //}
-        //    //cb_grade.SelectedIndex = grade;
-        //    //OnSaveData(row_idx);
-        //}
 
 
         bool check_V(int row, int col)
@@ -507,24 +554,132 @@ namespace ExcelTest
 
         private void MarcEditorControl_BookSaved(object sender, ExcelTest.MarcEditorControl.BookSavedEventArgs e)
         {
-            if (SaveRowIdx >= 0 && SaveRowIdx < List_Book.Rows.Count)
+            string table_name = "Marc";
-            {
-                string currentListIdx = List_Book.Rows[SaveRowIdx].Cells["list_idx"].Value?.ToString();
-                // If list_idx column name differs, check input_list. Assuming "list_idx" or "idx".
-                // In input_list: grid[0] = db_data[a]; (idx). 
-                // And MarcEditorControl uses "list_idx" passed from List_Book_SelectionChanged.
-                // We need to match what we passed.
 
-                // Just update based on SaveRowIdx for now, assuming modal blocking or single user interaction.
+            //string[] grid_data = {
-                List_Book.Rows[SaveRowIdx].Cells["grade"].Value = e.Grade;
+            //   e.griddata[0],// List_Book.Rows[SaveRowIdx].Cells["ISBN13"].Value.ToString(),
-                List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value = e.SaveDate;
+            //   e.griddata[1],//List_Book.Rows[SaveRowIdx].Cells["book_name"].Value.ToString(),
-                List_Book.Rows[SaveRowIdx].Cells["user"].Value = e.User;
+            //   e.griddata[2],//List_Book.Rows[SaveRowIdx].Cells["author"].Value.ToString(),
-                List_Book.Rows[SaveRowIdx].Cells["db_marc"].Value = e.DBMarc;
+            //   e.griddata[3],//List_Book.Rows[SaveRowIdx].Cells["book_comp"].Value.ToString(),
-                List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = e.MarcIdx;
+            //   e.griddata[4],//List_Book.Rows[SaveRowIdx].Cells["pay"].Value.ToString(),
-                List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(e.Grade);
+            //   e.griddata[5]//List_Book.Rows[SaveRowIdx].Cells["url"].Value.ToString()
+            //};
+            string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string orimarc = e.DBMarc;// st.made_Ori_marc(richTextBox1).Replace(@"\", "￦");
+            string Midx = List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value.ToString();
+
+            string SaveDate = List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value.ToString();
+            string SaveUser = List_Book.Rows[SaveRowIdx].Cells["user"].Value.ToString();
+            bool IsCoverDate = false;
+
+
+            if (SaveDate != "")
+            {
+                // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인
+                TimeSpan sp = spspsp(SaveDate, date);
+                IsCoverDate = IsCoverData(sp.Days, SaveUser);
             }
+
+            // true일 경우 INSERT, false일 경우 UPDATE
+            bool isNewData = Midx != "" ? false : true;
+
+
+            if (List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Orange ||
+                List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor == Color.Red)
+            {
+                string[] Insert_tbl = {
+                    "ISBN", "서명", "저자", "출판사",
+                    "가격", "marc", "비고1", "비고2", "url",
+                    "grade", "marc_chk", "user", "division", "008tag",
+                    "date", "compidx" };
+                string[] Insert_col = {
+                    e.griddata.ISBN13, e.griddata.BookName, e.griddata.Author, e.griddata.Publisher,
+                    e.griddata.Price, orimarc, e.griddata.Remark1, e.griddata.Remark2, e.griddata.URL,
+                    e.griddata.Grade, "1", mUserName, e.tag056, e.text008,
+                    date, mCompidx };
+
+                string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col);
+                PUB.log.Add("INSERT", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor, Incmd));
+                db.DB_Send_CMD_reVoid(Incmd);
+                isNewData = true;
+            }
+            else
+            {
+                string[] Edit_tbl = {
+                    "compidx", "marc", "marc_chk", "marc1", "marc_chk1", "비고1",
+                    "비고2", "url", "division", "008tag", "date",
+                    "user", "grade" };
+                string[] Edit_col = {
+                    mCompidx, orimarc, "1", mOldMarc , "0", e.griddata.Remark1,
+                    e.griddata.Remark2, e.griddata.URL, e.tag056,e.text008, date,
+                    mUserName, e.griddata.Grade };
+                string[] Sear_tbl = { "idx", "compidx" };
+                string[] Sear_col = { Midx, mCompidx };
+                if (e.griddata.ISBN13 == null || e.griddata.ISBN13 == "")
+                {
+                    MessageBox.Show("ISBN 데이터가 없습니다.");
+                    return;
+                }
+
+                string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col);
+                PUB.log.Add("Update", string.Format("{0}({1},{2}) : {3}", mUserName, mCompidx, List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor, U_cmd.Replace("\r", " ").Replace("\n", " ")));
+                db.DB_Send_CMD_reVoid(U_cmd);
+                isNewData = false;
+            }
+
+            List_Book.Rows[SaveRowIdx].Cells["grade"].Value = e.griddata.Grade;
+            List_Book.Rows[SaveRowIdx].Cells["SaveDate"].Value = e.SaveDate;
+            List_Book.Rows[SaveRowIdx].Cells["user"].Value = mUserName;
+            List_Book.Rows[SaveRowIdx].Cells["db_marc"].Value = e.DBMarc;
+
+            List_Book.Rows[SaveRowIdx].DefaultCellStyle.ForeColor = SetGradeColor(grade.ToString());
+
+            if (isNewData)
+            {
+                string MidxQuery = string.Format("SELECT `idx` FROM Marc WHERE isbn = {0} AND `compidx` = {1};", e.griddata.ISBN13, mCompidx);
+                PUB.log.Add("MarcInsert", string.Format("{0}({1}) : {2}", mUserName, mCompidx, MidxQuery));
+                Midx = db.DB_Send_CMD_Search(MidxQuery).Replace("|", "");
+                List_Book.Rows[SaveRowIdx].Cells["marc_idx"].Value = Midx;
+            }
+
+            string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND 'compidx' ={2};",
+                Midx, List_Book.Rows[SaveRowIdx].Cells["list_idx"].Value.ToString(), mCompidx);
+            PUB.log.Add("MarcUpdate", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpdateListIndex));
+            db.DB_Send_CMD_reVoid(UpdateListIndex);
+            MessageBox.Show("저장되었습니다!");
+
+
         }
 
+        #region Save_Click_Sub
+
+        /// <summary>
+        /// 마크 저장시 사용하며, 마지막 수정일과 수정자를 가져와 덮어씌울지 백업데이터를 만들지 구분
+        /// </summary>
+        /// <param name="TimeSpanDaysValue">저장할 마크의 마지막 수정일</param>
+        /// <param name="user">저장할 마크의 마지막 수정자</param>
+        /// <returns>마지막 수정일로부터 2일이 지나지않고, 마지막 수정자와 해당 유저가 동일 할 경우 true 반환</returns>
+        private bool IsCoverData(int TimeSpanDaysValue, string user)
+        {
+            if (TimeSpanDaysValue < -1)
+                return false;
+            if (user != mUserName)
+                return false;
+
+            return true;
+        }
+
+        private TimeSpan spspsp(string LastDate, string SaveDate)
+        {
+            DateTime date1 = Convert.ToDateTime(LastDate);
+            DateTime date2 = Convert.ToDateTime(SaveDate);
+
+            TimeSpan result = date1 - date2;
+            return result;
+        }
+
+        #endregion
+
         private void MarcEditorControl_FillBlankClicked(object sender, EventArgs e)
         {
             if (List_Book.CurrentRow == null) return;
@@ -537,7 +692,7 @@ namespace ExcelTest
                 return;
             }
 
-            UniMarc.Marc_FillBlank fb = new UniMarc.Marc_FillBlank(this);
+            var fb = new UniMarc.Marc_FillBlank(this);
             for (int a = 0; a < List_Book.Rows.Count; a++)
             {
                 if (List_Book.Rows[a].DefaultCellStyle.ForeColor == Color.Red)
@@ -559,32 +714,8 @@ namespace ExcelTest
             fb.Show();
         }
 
-        private void comboBox8_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            comboBox9.Items.Clear();
 
-            ComboBox cb = sender as ComboBox;
-            if (cb.SelectedIndex == 0)
-            {
-                comboBox9.Enabled = true;
-                string[] grade = { "전체", "A", "B", "C", "D" };
-                comboBox9.Items.AddRange(grade);
-                comboBox9.SelectedIndex = 0;
-            }
-            else
-                comboBox9.Enabled = false;
-        }
 
-        private void Radio_Sort_CheckedChanged(object sender, EventArgs e)
-        {
-            RadioButton rb = sender as RadioButton;
-            string text = rb.Text;
-            if (text == "정렬")
-                comboBox9.Enabled = false;
-
-            else
-                comboBox9.Enabled = true;
-        }
 
 
         private void btn_mk_marcList_Click(object sender, EventArgs e)
@@ -726,7 +857,7 @@ namespace ExcelTest
             return true;
         }
 
-       
+
         private void btn_FilterReturn_Click(object sender, EventArgs e)
         {
             rb_Filter.Checked = false;
@@ -813,5 +944,53 @@ namespace ExcelTest
             newRow.Selected = true;
             List_Book.FirstDisplayedScrollingRowIndex = nRow;
         }
+
+        private void btClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void Marc2_SizeChanged(object sender, EventArgs e)
+        {
+            // this.toolStripStatusLabel1.Text = $"{this.Size}";
+        }
+
+        private void rb_Sort_CheckedChanged(object sender, EventArgs e)
+        {
+            RadioButton rb = sender as RadioButton;
+            string text = rb.Text;
+            if (text == "정렬")
+                comboBox9.Enabled = false;
+
+            else
+                comboBox9.Enabled = true;
+        }
+
+        private void comboBox8_SelectedIndexChanged_1(object sender, EventArgs e)
+        {
+            comboBox9.Items.Clear();
+
+            ComboBox cb = sender as ComboBox;
+            if (cb.SelectedIndex == 0)
+            {
+                comboBox9.Enabled = true;
+                string[] grade = { "전체", "A", "B", "C", "D" };
+                comboBox9.Items.AddRange(grade);
+                comboBox9.SelectedIndex = 0;
+            }
+            else
+                comboBox9.Enabled = false;
+        }
+
+        private void marcEditorControl1_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void button1_Click_1(object sender, EventArgs e)
+        {
+            //re load data
+            input_list();
+        }
     }
 }

unimarc/unimarc/마크/Marc2.designer.cs

@@ -38,11 +38,10 @@
             System.Windows.Forms.Label label25;
             System.Windows.Forms.Label label26;
             System.Windows.Forms.Label label27;
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            this.marcEditorControl1 = new ExcelTest.MarcEditorControl();
             this.List_Book = new System.Windows.Forms.DataGridView();
             this.list_idx = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ISBN13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -71,8 +70,14 @@
             this.checkBox3 = new System.Windows.Forms.CheckBox();
             this.tbCustName = new System.Windows.Forms.Button();
             this.lbCustIDX = new System.Windows.Forms.Label();
-            this.lbl_BookList = new System.Windows.Forms.Label();
             this.btCopy = new System.Windows.Forms.Button();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.lbl_BookList = new System.Windows.Forms.ToolStripStatusLabel();
+            this.btClose = new System.Windows.Forms.Button();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.marcEditorControl1 = new ExcelTest.MarcEditorControl();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
             label31 = new System.Windows.Forms.Label();
             label30 = new System.Windows.Forms.Label();
             label33 = new System.Windows.Forms.Label();
@@ -85,28 +90,11 @@
             label27 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.List_Book)).BeginInit();
             this.panel1.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
             this.SuspendLayout();
             // 
-            // marcEditorControl1
-            // 
-            this.marcEditorControl1.BackColor = System.Drawing.Color.Gray;
-            this.marcEditorControl1.CurrentAuthor = null;
-            this.marcEditorControl1.CurrentBookName = null;
-            this.marcEditorControl1.CurrentDBMarc = null;
-            this.marcEditorControl1.CurrentGrade = null;
-            this.marcEditorControl1.CurrentISBN13 = null;
-            this.marcEditorControl1.CurrentListIdx = null;
-            this.marcEditorControl1.CurrentMarcIdx = null;
-            this.marcEditorControl1.CurrentPrice = null;
-            this.marcEditorControl1.CurrentPublisher = null;
-            this.marcEditorControl1.CurrentSaveDate = null;
-            this.marcEditorControl1.CurrentURL = null;
-            this.marcEditorControl1.CurrentUser = null;
-            this.marcEditorControl1.Location = new System.Drawing.Point(562, 7);
-            this.marcEditorControl1.Name = "marcEditorControl1";
-            this.marcEditorControl1.Size = new System.Drawing.Size(1230, 892);
-            this.marcEditorControl1.TabIndex = 0;
-            // 
             // label31
             // 
             label31.Location = new System.Drawing.Point(0, 0);
@@ -182,17 +170,20 @@
             this.List_Book.AllowDrop = true;
             this.List_Book.AllowUserToAddRows = false;
             this.List_Book.AllowUserToDeleteRows = false;
-            this.List_Book.AllowUserToResizeColumns = false;
+            this.List_Book.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            this.List_Book.BackgroundColor = System.Drawing.Color.Gray;
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.List_Book.BackgroundColor = System.Drawing.Color.SkyBlue;
             this.List_Book.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle29.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
+            this.List_Book.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
+            this.List_Book.ColumnHeadersHeight = 29;
             this.List_Book.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.list_idx,
             this.ISBN13,
@@ -210,21 +201,22 @@
             this.user,
             this.SaveDate});
             this.List_Book.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
-            this.List_Book.Location = new System.Drawing.Point(12, 74);
+            this.List_Book.Location = new System.Drawing.Point(5, 73);
             this.List_Book.MultiSelect = false;
             this.List_Book.Name = "List_Book";
             this.List_Book.ReadOnly = true;
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.ControlDark;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.ControlDark;
-            dataGridViewCellStyle32.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle32;
+            this.List_Book.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
+            this.List_Book.RowHeadersWidth = 51;
             this.List_Book.RowTemplate.Height = 23;
             this.List_Book.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.List_Book.Size = new System.Drawing.Size(543, 822);
+            this.List_Book.Size = new System.Drawing.Size(543, 556);
             this.List_Book.TabIndex = 217;
             this.List_Book.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.List_Book_RowPostPaint);
             this.List_Book.SelectionChanged += new System.EventHandler(this.List_Book_SelectionChanged);
@@ -237,6 +229,7 @@
             // list_idx
             // 
             this.list_idx.HeaderText = "list_idx";
+            this.list_idx.MinimumWidth = 6;
             this.list_idx.Name = "list_idx";
             this.list_idx.ReadOnly = true;
             this.list_idx.Visible = false;
@@ -246,13 +239,16 @@
             // 
             this.ISBN13.FillWeight = 136.2398F;
             this.ISBN13.HeaderText = "ISBN13";
+            this.ISBN13.MinimumWidth = 6;
             this.ISBN13.Name = "ISBN13";
             this.ISBN13.ReadOnly = true;
             this.ISBN13.Visible = false;
+            this.ISBN13.Width = 125;
             // 
             // num
             // 
             this.num.HeaderText = "연번";
+            this.num.MinimumWidth = 6;
             this.num.Name = "num";
             this.num.ReadOnly = true;
             this.num.Width = 50;
@@ -261,6 +257,7 @@
             // 
             this.book_name.FillWeight = 135.5107F;
             this.book_name.HeaderText = "도서명";
+            this.book_name.MinimumWidth = 6;
             this.book_name.Name = "book_name";
             this.book_name.ReadOnly = true;
             this.book_name.Width = 150;
@@ -269,6 +266,7 @@
             // 
             this.author.FillWeight = 67.49011F;
             this.author.HeaderText = "저자";
+            this.author.MinimumWidth = 6;
             this.author.Name = "author";
             this.author.ReadOnly = true;
             this.author.Width = 80;
@@ -277,6 +275,7 @@
             // 
             this.book_comp.FillWeight = 76.49199F;
             this.book_comp.HeaderText = "출판사";
+            this.book_comp.MinimumWidth = 6;
             this.book_comp.Name = "book_comp";
             this.book_comp.ReadOnly = true;
             this.book_comp.Width = 80;
@@ -284,6 +283,7 @@
             // count
             // 
             this.count.HeaderText = "C";
+            this.count.MinimumWidth = 6;
             this.count.Name = "count";
             this.count.ReadOnly = true;
             this.count.Width = 30;
@@ -292,6 +292,7 @@
             // 
             this.pay.FillWeight = 84.26746F;
             this.pay.HeaderText = "정가";
+            this.pay.MinimumWidth = 6;
             this.pay.Name = "pay";
             this.pay.ReadOnly = true;
             this.pay.Width = 62;
@@ -299,13 +300,16 @@
             // url
             // 
             this.url.HeaderText = "url";
+            this.url.MinimumWidth = 6;
             this.url.Name = "url";
             this.url.ReadOnly = true;
             this.url.Visible = false;
+            this.url.Width = 125;
             // 
             // marc_idx
             // 
             this.marc_idx.HeaderText = "marc_idx";
+            this.marc_idx.MinimumWidth = 6;
             this.marc_idx.Name = "marc_idx";
             this.marc_idx.ReadOnly = true;
             this.marc_idx.Visible = false;
@@ -314,16 +318,19 @@
             // db_marc
             // 
             this.db_marc.HeaderText = "marc";
+            this.db_marc.MinimumWidth = 6;
             this.db_marc.Name = "db_marc";
             this.db_marc.ReadOnly = true;
             this.db_marc.Visible = false;
+            this.db_marc.Width = 125;
             // 
             // grade
             // 
-            dataGridViewCellStyle30.Format = "N0";
+            dataGridViewCellStyle2.Format = "N0";
-            dataGridViewCellStyle30.NullValue = null;
+            dataGridViewCellStyle2.NullValue = null;
-            this.grade.DefaultCellStyle = dataGridViewCellStyle30;
+            this.grade.DefaultCellStyle = dataGridViewCellStyle2;
             this.grade.HeaderText = "등급";
+            this.grade.MinimumWidth = 6;
             this.grade.Name = "grade";
             this.grade.ReadOnly = true;
             this.grade.Visible = false;
@@ -331,9 +338,10 @@
             // 
             // colCheck
             // 
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colCheck.DefaultCellStyle = dataGridViewCellStyle31;
+            this.colCheck.DefaultCellStyle = dataGridViewCellStyle3;
             this.colCheck.HeaderText = "V";
+            this.colCheck.MinimumWidth = 6;
             this.colCheck.Name = "colCheck";
             this.colCheck.ReadOnly = true;
             this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
@@ -342,16 +350,20 @@
             // user
             // 
             this.user.HeaderText = "작업자";
+            this.user.MinimumWidth = 6;
             this.user.Name = "user";
             this.user.ReadOnly = true;
             this.user.Visible = false;
+            this.user.Width = 125;
             // 
             // SaveDate
             // 
             this.SaveDate.HeaderText = "저장시각";
+            this.SaveDate.MinimumWidth = 6;
             this.SaveDate.Name = "SaveDate";
             this.SaveDate.ReadOnly = true;
             this.SaveDate.Visible = false;
+            this.SaveDate.Width = 125;
             // 
             // rb_Sort
             // 
@@ -360,6 +372,7 @@
             this.rb_Sort.Size = new System.Drawing.Size(48, 24);
             this.rb_Sort.TabIndex = 320;
             this.rb_Sort.Text = "정렬";
+            this.rb_Sort.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged);
             // 
             // rb_Filter
             // 
@@ -368,16 +381,20 @@
             this.rb_Filter.Size = new System.Drawing.Size(48, 24);
             this.rb_Filter.TabIndex = 322;
             this.rb_Filter.Text = "필터";
+            this.rb_Filter.CheckedChanged += new System.EventHandler(this.rb_Sort_CheckedChanged);
             // 
             // comboBox8
             // 
+            this.comboBox8.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox8.Location = new System.Drawing.Point(176, 6);
             this.comboBox8.Name = "comboBox8";
             this.comboBox8.Size = new System.Drawing.Size(107, 20);
             this.comboBox8.TabIndex = 323;
+            this.comboBox8.SelectedIndexChanged += new System.EventHandler(this.comboBox8_SelectedIndexChanged_1);
             // 
             // comboBox9
             // 
+            this.comboBox9.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox9.Location = new System.Drawing.Point(286, 6);
             this.comboBox9.Name = "comboBox9";
             this.comboBox9.Size = new System.Drawing.Size(52, 20);
@@ -395,16 +412,16 @@
             this.panel1.Controls.Add(this.comboBox9);
             this.panel1.Controls.Add(this.rb_Filter);
             this.panel1.Controls.Add(this.comboBox8);
-            this.panel1.Location = new System.Drawing.Point(12, 36);
+            this.panel1.Location = new System.Drawing.Point(5, 34);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(524, 35);
+            this.panel1.Size = new System.Drawing.Size(544, 35);
             this.panel1.TabIndex = 226;
             // 
             // btn_mk_marcList
             // 
             this.btn_mk_marcList.Location = new System.Drawing.Point(433, 5);
             this.btn_mk_marcList.Name = "btn_mk_marcList";
-            this.btn_mk_marcList.Size = new System.Drawing.Size(85, 23);
+            this.btn_mk_marcList.Size = new System.Drawing.Size(106, 23);
             this.btn_mk_marcList.TabIndex = 227;
             this.btn_mk_marcList.Text = "마크목록생성";
             this.btn_mk_marcList.UseVisualStyleBackColor = true;
@@ -448,7 +465,7 @@
             this.checkBox3.BackColor = System.Drawing.Color.White;
             this.checkBox3.Checked = true;
             this.checkBox3.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.checkBox3.Location = new System.Drawing.Point(514, 79);
+            this.checkBox3.Location = new System.Drawing.Point(507, 78);
             this.checkBox3.Name = "checkBox3";
             this.checkBox3.Size = new System.Drawing.Size(15, 14);
             this.checkBox3.TabIndex = 227;
@@ -459,9 +476,9 @@
             // 
             this.tbCustName.BackColor = System.Drawing.Color.LightGray;
             this.tbCustName.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
-            this.tbCustName.Location = new System.Drawing.Point(309, 7);
+            this.tbCustName.Location = new System.Drawing.Point(115, 6);
             this.tbCustName.Name = "tbCustName";
-            this.tbCustName.Size = new System.Drawing.Size(161, 26);
+            this.tbCustName.Size = new System.Drawing.Size(275, 26);
             this.tbCustName.TabIndex = 33;
             this.tbCustName.Text = "     ";
             this.tbCustName.UseVisualStyleBackColor = false;
@@ -472,25 +489,13 @@
             this.lbCustIDX.BackColor = System.Drawing.Color.LightGray;
             this.lbCustIDX.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.lbCustIDX.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
-            this.lbCustIDX.Location = new System.Drawing.Point(476, 7);
+            this.lbCustIDX.Location = new System.Drawing.Point(396, 6);
             this.lbCustIDX.Name = "lbCustIDX";
             this.lbCustIDX.Size = new System.Drawing.Size(60, 26);
             this.lbCustIDX.TabIndex = 319;
             this.lbCustIDX.Text = "     ";
             this.lbCustIDX.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // lbl_BookList
-            // 
-            this.lbl_BookList.BackColor = System.Drawing.Color.LightGray;
-            this.lbl_BookList.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lbl_BookList.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
-            this.lbl_BookList.Location = new System.Drawing.Point(12, 7);
-            this.lbl_BookList.Name = "lbl_BookList";
-            this.lbl_BookList.Size = new System.Drawing.Size(293, 26);
-            this.lbl_BookList.TabIndex = 320;
-            this.lbl_BookList.Text = "     ";
-            this.lbl_BookList.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // btCopy
             // 
             this.btCopy.ForeColor = System.Drawing.Color.Red;
@@ -502,27 +507,107 @@
             this.btCopy.UseVisualStyleBackColor = true;
             this.btCopy.Click += new System.EventHandler(this.button1_Click);
             // 
+            // statusStrip1
+            // 
+            this.statusStrip1.BackColor = System.Drawing.SystemColors.Control;
+            this.statusStrip1.Font = new System.Drawing.Font("굴림체", 14.25F, System.Drawing.FontStyle.Bold);
+            this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.lbl_BookList});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 634);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
+            this.statusStrip1.Size = new System.Drawing.Size(1638, 24);
+            this.statusStrip1.TabIndex = 322;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // lbl_BookList
+            // 
+            this.lbl_BookList.Name = "lbl_BookList";
+            this.lbl_BookList.Size = new System.Drawing.Size(119, 19);
+            this.lbl_BookList.Text = "{booklist}";
+            // 
+            // btClose
+            // 
+            this.btClose.Location = new System.Drawing.Point(460, 6);
+            this.btClose.Name = "btClose";
+            this.btClose.Size = new System.Drawing.Size(88, 26);
+            this.btClose.TabIndex = 324;
+            this.btClose.Text = "닫  기";
+            this.btClose.UseVisualStyleBackColor = true;
+            this.btClose.Click += new System.EventHandler(this.btClose_Click);
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.marcEditorControl1);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel2.Location = new System.Drawing.Point(555, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1083, 634);
+            this.panel2.TabIndex = 325;
+            // 
+            // marcEditorControl1
+            // 
+            this.marcEditorControl1.BackColor = System.Drawing.Color.Gray;
+            this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.marcEditorControl1.Location = new System.Drawing.Point(0, 0);
+            this.marcEditorControl1.Name = "marcEditorControl1";
+            this.marcEditorControl1.Size = new System.Drawing.Size(1083, 634);
+            this.marcEditorControl1.TabIndex = 0;
+            this.marcEditorControl1.Load += new System.EventHandler(this.marcEditorControl1_Load);
+            // 
+            // panel3
+            // 
+            this.panel3.BackColor = System.Drawing.Color.White;
+            this.panel3.Controls.Add(this.button1);
+            this.panel3.Controls.Add(this.checkBox3);
+            this.panel3.Controls.Add(this.tbCustName);
+            this.panel3.Controls.Add(this.panel1);
+            this.panel3.Controls.Add(this.btClose);
+            this.panel3.Controls.Add(this.List_Book);
+            this.panel3.Controls.Add(this.lbCustIDX);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel3.Location = new System.Drawing.Point(0, 0);
+            this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(555, 634);
+            this.panel3.TabIndex = 325;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(9, 7);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(100, 23);
+            this.button1.TabIndex = 324;
+            this.button1.Text = "다시불러오기";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click_1);
+            // 
             // Marc2
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.SkyBlue;
-            this.ClientSize = new System.Drawing.Size(1808, 908);
+            this.ClientSize = new System.Drawing.Size(1638, 658);
-            this.Controls.Add(this.marcEditorControl1);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel3);
+            this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.btCopy);
-            this.Controls.Add(this.lbl_BookList);
-            this.Controls.Add(this.lbCustIDX);
-            this.Controls.Add(this.checkBox3);
-            this.Controls.Add(this.List_Book);
-            this.Controls.Add(this.tbCustName);
-            this.Controls.Add(this.panel1);
             this.KeyPreview = true;
             this.Name = "Marc2";
             this.Text = "마크 작성(1)";
             this.Load += new System.EventHandler(this.Marc_Load);
+            this.SizeChanged += new System.EventHandler(this.Marc2_SizeChanged);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Marc_KeyDown);
             ((System.ComponentModel.ISupportInitialize)(this.List_Book)).EndInit();
             this.panel1.ResumeLayout(false);
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -561,8 +646,13 @@
         private System.Windows.Forms.Button btn_CopySelect;
         public System.Windows.Forms.Button tbCustName;
         public System.Windows.Forms.Label lbCustIDX;
-        public System.Windows.Forms.Label lbl_BookList;
         private System.Windows.Forms.Button btCopy;
-        private ExcelTest.MarcEditorControl marcEditorControl1;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel lbl_BookList;
+        private System.Windows.Forms.Button btClose;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Button button1;
+        public MarcEditorControl marcEditorControl1;
     }
 }

unimarc/unimarc/마크/Marc2.resx

@@ -192,4 +192,7 @@
   <metadata name="SaveDate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

unimarc/unimarc/마크/MarcEditorControl.cs

@@ -1,10 +1,14 @@
 //using Microsoft.Office.Interop.Excel;
 using AR;
+using Microsoft.VisualBasic.ApplicationServices;
+using Org.BouncyCastle.Pkcs;
+using Org.BouncyCastle.Tls.Crypto;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Web.UI.WebControls.WebParts;
 using System.Windows.Forms;
 using UniMarc;
 using UniMarc.ListOfValue;
@@ -18,9 +22,8 @@ namespace ExcelTest
         /// <summary>
         /// isbn / 도서명 / 저자 / 출판사 / 가격
         /// </summary>
-        string[] data_book = { "", "", "", "", "" };
+        //string[] data_book = { "", "", "", "", "" };
         int SaveRowIdx = -1; // Keep for now but might be unused if we rely on properties
-        public string mUserName;
         string mCompidx = UniMarc.Properties.Settings.Default.compidx;
         string mListIdx = "";
         public string find;
@@ -30,40 +33,34 @@ namespace ExcelTest
         private bool mLoadCompleted = false;
         string tbName = "";
         public int checkCout = 0;
-        // public bool gridViewChk = false; // Removed
         public Helper_DB db;// = new Helper_DB();
         Help008Tag tag008 = new Help008Tag();
         Skill_Search_Text search_Text = new Skill_Search_Text();
         String_Text st = new String_Text();
-        // Mac_List ml; // Removed
+        string l_idx = string.Empty;
+        string c_idx = string.Empty;
+        MacEditorParameter Param = null;
+        //public string CurrentISBN13 { get; set; }
+
+
+
+        //public string CurrentMarcIdx { get; set; }
+
+        //public string CurrentUser { get; set; }
+        //public string CurrentSaveDate { get; set; }
+        //public string CurrentListIdx { get; set; }
+
+
+        public event EventHandler FillBlankClicked;
+
+        public event EventHandler PrevButton;
+        public event EventHandler NextButton;
 
-        // Properties to replace List_Book row access
-        public string CurrentISBN13 { get; set; }
-        public string CurrentBookName { get; set; }
-        public string CurrentAuthor { get; set; }
-        public string CurrentPublisher { get; set; }
-        public string CurrentPrice { get; set; } // pay
-        public string CurrentURL { get; set; } // image_url?
-        public string CurrentMarcIdx { get; set; }
-        public string CurrentDBMarc { get; set; } // db_marc
-        public string CurrentGrade { get; set; }
-        public string CurrentUser { get; set; }
-        public string CurrentSaveDate { get; set; }
-        public string CurrentListIdx { get; set; }
-        
         public MarcEditorControl()
         {
             InitializeComponent();
-            mUserName = string.Empty;
         }
 
-        public void SetUser(string userName)
-        {
-            mUserName = userName;
-        }
-
-        string l_idx = string.Empty;
-        string c_idx = string.Empty;
         private void Marc_Load(object sender, EventArgs e)
         {
             #region ComboBox Item Setting
@@ -101,202 +98,72 @@ namespace ExcelTest
             #endregion
         }
 
-        //public void input_list(string l_idx, string value)
-        //{
-        //    db.DBcon();
-
-        //    lbl_BookList.Text = value;
-
-        //    string Area =
-        //        // 0 1 2 3
-        //        "olb.idx, olb.isbn_marc, olb.header, olb.num, " +
-        //        // 4 5 6 7 8 9
-        //        "olb.book_name, olb.author, olb.book_comp, olb.`count`, olb.price, olb.image_url, " +
-        //        // 10 11 12 13 14 15 16
-        //        "mac.idx, mac.marc, mac.marc_chk, mac.marc1, mac.marc_chk1, mac.marc2, mac.marc_chk2, " +
-        //        // 17 18 19 20
-        //        "mac.grade, mac.compidx, mac.`user`, mac.date";
-
-        //    string CMD = string.Format("" +
-        //        "SELECT {0} " +
-        //        "FROM Obj_List_Book AS olb " +
-        //            "LEFT JOIN Marc AS mac " +
-        //            // "ON if (olb.m_idx = 0, mac.ISBN = olb.isbn_marc, mac.idx = olb.m_idx) " +
-        //            "ON mac.ISBN = olb.isbn_marc " +
-        //        "WHERE olb.l_idx = {1} " +
-        //        "GROUP BY olb.book_name " +
-        //        "ORDER BY olb.idx ASC;", Area, l_idx);
-        //    string db_res = db.DB_Send_CMD_Search(CMD);
-        //    string[] db_data = db_res.Split('|');
-
-        //    string[] grid = {
-        //        "", "", "", "", "",
-        //        "", "", "", "", "",
-        //        "", "", "V", "", "" };
-
-        //    string[] MarcData = { "", "", "", "", "", "" };
-
-        //    for (int a = 0; a < db_data.Length; a++)
-        //    {
-        //        if (a % 21 == 00) grid[0] = db_data[a];
-        //        if (a % 21 == 01) grid[1] = db_data[a];
-        //        if (a % 21 == 02) grid[2] = db_data[a];
-        //        if (a % 21 == 03) grid[2] += db_data[a];
-        //        if (a % 21 == 04) grid[3] = db_data[a];
-        //        if (a % 21 == 05) grid[4] = db_data[a];
-        //        if (a % 21 == 06) grid[5] = db_data[a];
-        //        if (a % 21 == 07) grid[6] = db_data[a];
-        //        if (a % 21 == 08) grid[7] = db_data[a];
-        //        if (a % 21 == 09) grid[8] = db_data[a];
-        //        if (a % 21 == 10) grid[9] = db_data[a];
-        //        if (a % 21 == 11) MarcData[0] = db_data[a];
-        //        if (a % 21 == 12) MarcData[1] = db_data[a];
-        //        if (a % 21 == 13) MarcData[2] = db_data[a];
-        //        if (a % 21 == 14) MarcData[3] = db_data[a];
-        //        if (a % 21 == 15) MarcData[4] = db_data[a];
-        //        if (a % 21 == 16) MarcData[5] = db_data[a];
-        //        if (a % 21 == 17)
-        //        {
-        //            grid[10] = RealMarc(MarcData);
-        //            if (grid[10] == "") grid[11] = "3";
-        //            else grid[11] = db_data[a];
-        //        }
-        //        if (a % 21 == 18) {
-        //            if (db_data[a] == "") grid[13] = "";
-        //            else if (mCompidx != db_data[a]) {
-        //                string FindCompCmd = string.Format("SELECT `comp_name` FROM `Comp` WHERE `idx` = {0}", db_data[a]);
-        //                grid[13] = db.DB_Send_CMD_Search(FindCompCmd).Replace("|", "");
-        //            }
-        //        }
-        //        if (a % 21 == 19) {
-        //            if (grid[13] == "")
-        //                grid[13] = db_data[a];
-        //        }
-        //        if (a % 21 == 20)
-        //        {
-        //            grid[14] = db_data[a];
-        //            List_Book.Rows.Add(grid);
-        //        }
-        //    }
-
-        //    for (int a = 0; a < List_Book.Rows.Count; a++)
-        //    {
-        //        string Grade = List_Book.Rows[a].Cells["grade"].Value.ToString();
-        //        string SaveDate = List_Book.Rows[a].Cells["SaveDate"].Value.ToString();
-        //        List_Book.Rows[a].DefaultCellStyle.ForeColor = SetGradeColor(Grade);
-        //        SaveDateCheck(SaveDate, a);
-        //    }
-
-
-        //}
-
-        private string RealMarc(string[] MarcData)
-        {
-            string result = "";
-            if (MarcData[1] == "1")
-                result = MarcData[0];
-
-            if (MarcData[3] == "1")
-                result = MarcData[2];
-
-            if (MarcData[5] == "1")
-                result = MarcData[4];
-
-            return result;
-        }
-
-        public void LoadBookData(string isbn13, string bookName, string author, string publisher, string price, string url, string marcIdx, string dbMarc, string grade, string user, string saveDate, string listIdx)
-        {
-            CurrentISBN13 = isbn13;
-            CurrentBookName = bookName;
-            CurrentAuthor = author;
-            CurrentPublisher = publisher;
-            CurrentPrice = price;
-            CurrentURL = url;
-            CurrentMarcIdx = marcIdx;
-            CurrentDBMarc = dbMarc;
-            CurrentGrade = grade;
-            CurrentUser = user;
-            CurrentSaveDate = saveDate;
-            CurrentListIdx = listIdx;
-
-            lbl_ISBN.Text = $"[{CurrentISBN13}]";
-            
-            // Update data_book for Create_008 or Empty logic
-            data_book[0] = CurrentISBN13;
-            data_book[1] = CurrentBookName; 
-            data_book[2] = CurrentAuthor;
-            data_book[3] = CurrentPublisher;
-            data_book[4] = CurrentPrice;
-
-            LoadMarc(CurrentDBMarc);
-            input_picture();
-            
-            // Set 008 text if present
-            // LoadMarc does this via text008.Text assignment
-
-        
-            Create_008();
-            
-            // Check Ownership
-            if (string.IsNullOrEmpty(CurrentMarcIdx) || CurrentMarcIdx == "0")
-                IsMyData = true; // New record is mine
-            else
-                IsMyData = CheckOwner(CurrentMarcIdx);
-
-            ReadRemark();
-        }
-
-        private bool CheckOwner(string marcIdx)
-        {
-            string query = $"SELECT `compidx` FROM `Marc` WHERE `idx` = '{marcIdx}'";
-            string res = db.DB_Send_CMD_Search(query).Replace("|", "");
-            return res == mCompidx;
-        }
         /// <summary>
-        /// 마크 유무 확인하는 함수
+        /// 입력된 자료를 표시합니다.
         /// </summary>
-
+        /// <param name="isbn13"></param>
-
+        /// <param name="url"></param>
-        private string NewestMarc(string[] marc, string[] marc_chk)
+        /// <param name="marcIdx"></param>
+        /// <param name="dbMarc"></param>
+        /// <param name="grade"></param>
+        /// <param name="user"></param>
+        /// <param name="saveDate"></param>
+        /// <param name="listIdx"></param>
+        public void LoadBookData(string dbMarc,MacEditorParameter _param)
         {
-            string result = "";
+            mLoadCompleted = false;
-            int count = 0;
+            Param = _param;
-            foreach (string chk in marc_chk)
+     
+
+            lbl_SaveData.Text = $"[{Param.User}] [{Param.SaveDate}]";
+            lbl_ISBN.Text = $"[{Param.ISBN13}]";
+
+            LoadMarc(dbMarc);    //여기에서도 008을 설정한다
+
+            try
             {
-                if (chk == "1")
+                //픽쳐박스이미지 업데이트
-                    result = marc[count];
+                string isbn = _param.ISBN13;
-
+                string isbn3 = isbn.Substring(isbn.Length - 3, 3);
-                count++;
+                string tFilePath = string.Format("https://contents.kyobobook.co.kr/sih/fit-in/458x0/pdt/{0}.jpg", isbn);
+                pictureBox1.ImageLocation = tFilePath;
             }
-            return result;
+            catch
-        }
-
-        private Color SetGradeColor(string Grade, bool isMyData = true)
-        {
-            if (!isMyData)
-                return Color.Orange;
-
-            switch (Grade)
             {
-                case "0": // A
+                pictureBox1.Image = null;
-                    return Color.Blue;
+                pictureBox1.ImageLocation = null;
-
+            }
-                case "1": // B
+            finally
-                    return Color.Black;
+            {
-
+                pictureBox1.Tag = _param.URL;
-                case "2": // C
-                    return Color.Gray;
-
-                case "3": // D
-                    return Color.Red;
-
-                default:
-                    return Color.Black;
             }
-        }
 
 
+            richTextBox1.Text = "";
+
+            bool check_Marc = click_Marc(dbMarc); //여기안에서 또 008을 설정한다
+
+            if (!check_Marc)
+                richTextBox1.Text = Make_Empty();
+            else
+            {
+                etc1.Text = Param.Remark1;
+                etc2.Text = Param.Remark2;
+                //ReadRemark();
+            }
+                
+
+            Create_008();
+            st.Color_change("▼", richTextBox1);
+            st.Color_change("▲", richTextBox1);
+
+            //자료의 등급 다시 선택
+            if (int.TryParse(this.Param.Grade, out int gradeNo) == false)
+                gradeNo = 2;
+            cb_grade.SelectedIndex = gradeNo;
+            mLoadCompleted = true;
+        }
+
 
         private void richTextBox1_KeyDown(object sender, KeyEventArgs e)
         {
@@ -335,6 +202,10 @@ namespace ExcelTest
                 richTextBox1.SelectedText = "▼";
             else if (e.KeyCode == Keys.F4)
                 richTextBox1.SelectedText = "▲";
+            else if (e.KeyCode == Keys.F8) //next
+                btNext.PerformClick();
+            else if (e.KeyCode == Keys.F7) //prev
+                btPrev.PerformClick();
         }
 
         /// <summary>
@@ -399,45 +270,38 @@ namespace ExcelTest
         private void Btn_preview_Click(object sender, EventArgs e)
         {
             Marc_Preview mp = new Marc_Preview();
-            mp.isbn = data_book[0];
+            mp.isbn = Param.ISBN13;
             mp.richTextBox1.Text = richTextBox1.Text;
             mp.Show();
         }
         public class BookSavedEventArgs : EventArgs
         {
-            public string ListIdx { get; set; }
-            public string Grade { get; set; }
             public string SaveDate { get; set; }
-            public string User { get; set; }
             public string DBMarc { get; set; }
-            public string MarcIdx { get; set; }
+            public string tag056 { get; set; }
+            public string text008 { get; set; }
+            public MacEditorParameter griddata { get; set; }
         }
 
         public event EventHandler<BookSavedEventArgs> BookSaved;
-        public bool IsMyData = false;
 
         private void Btn_Save_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(CurrentISBN13))
+            if (string.IsNullOrEmpty(Param.ISBN13))
             {
                 MessageBox.Show("마크가 선택되지않았습니다.");
                 return;
             }
             int TabIndex = tabControl1.SelectedIndex;
-            int grade = cb_grade.SelectedIndex;
+       
             if (TabIndex == 1)
             {
                 MessageBox.Show("[칸채우기]가 아닌 [마크 편집] 탭에서 저장해주세요!");
                 return;
             }
-            if (grade == 3)
+
-            {
-                MessageBox.Show("등급을 설정해주세요. (C 이상)");
-                return;
-            }
-            string table_name = "Marc";
             string BaseText = richTextBox1.Text;
-            string lblisbn = CurrentISBN13; // lbl_ISBN.Text.Replace("[", "").Replace("]", "");
+            string lblisbn = Param.ISBN13; // lbl_ISBN.Text.Replace("[", "").Replace("]", "");
 
             if (!BaseText.EndsWith("\n"))
                 BaseText += "\n";
@@ -448,22 +312,16 @@ namespace ExcelTest
                 return;
             }
 
+            //ISBN이 변경되었다면 저장하지 못하게 한다 (경고 후 저장 가능하게 한다 26010?)
             if (BaseText.IndexOf(lblisbn) < 0)
             {
-                MessageBox.Show("ISBN 상태를 확인해주세요.");
+                UTIL.MsgE("저장된 ISBN이 마크데이터에 없습니다.\nISBN값이 변경되었습니다");
                 return;
             }
             string tag056 = Tag056();
-            string[] grid_data = {
-                CurrentISBN13,
-                CurrentBookName,
-                CurrentAuthor,
-                CurrentPublisher,
-                CurrentPrice,
-                CurrentURL };
             string date = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             string orimarc = st.made_Ori_marc(richTextBox1).Replace(@"\", "￦");
-            string Midx = CurrentMarcIdx;
+    
             // 필수태그 확인
             if (!isMustTag(orimarc))
             {
@@ -471,120 +329,23 @@ namespace ExcelTest
                 return;
             }
 
-            string SaveDate = CurrentSaveDate;
+            this.Param.Grade = cb_grade.SelectedIndex.ToString();
-            string SaveUser = CurrentUser;
+            this.Param.Remark1 = etc1.Text;
-            bool IsCoverDate = false;
+            this.Param.Remark2 = etc2.Text;
-
-            if (SaveDate != "")
-            {
-                // 마지막 수정일로부터 2일이 지났는지, 마지막 저장자가 사용자인지 확인
-                TimeSpan sp = spspsp(SaveDate, date);
-                IsCoverDate = IsCoverData(sp.Days, SaveUser);
-            }
-
-            // true일 경우 INSERT, false일 경우 UPDATE
-            bool isNewData = true;
-
-            if (Midx != "")
-                isNewData = false;
-
-            // If not my data, or no data (implied by Midx check but explicit check helps), force Insert (Copy)
-            if (!IsMyData)
-            {
-                string[] Insert_tbl = {
-                    "ISBN", "서명", "저자", "출판사",
-                    "가격", "marc", "비고1", "비고2", "url",
-                    "grade", "marc_chk", "user", "division", "008tag",
-                    "date", "compidx" };
-                string[] Insert_col = {
-                    grid_data[0], grid_data[1], grid_data[2], grid_data[3],
-                    grid_data[4], orimarc, etc1.Text, etc2.Text, grid_data[5],
-                    grade.ToString(), "1", mUserName, tag056, text008.Text,
-                    date, mCompidx };
-
-                string Incmd = db.DB_INSERT(table_name, Insert_tbl, Insert_col);
-                PUB.log.Add("INSERT", string.Format("{0}({1}) : {2}", mUserName, mCompidx, Incmd));
-                db.DB_Send_CMD_reVoid(Incmd);
-                isNewData = true;
-            }
-            else
-            {
-                string[] Edit_tbl = {
-                    "compidx", "marc", "marc_chk", "marc1", "marc_chk1", "비고1",
-                    "비고2", "url", "division", "008tag", "date",
-                    "user", "grade" };
-                string[] Edit_col = {
-                    mCompidx, orimarc, "1", CurrentDBMarc , "0", etc1.Text,
-                    etc2.Text, grid_data[5], tag056, text008.Text, date,
-                    mUserName, grade.ToString() };
-                string[] Sear_tbl = { "idx", "compidx" };
-                string[] Sear_col = { Midx, mCompidx };
-                if (grid_data[0] == null || grid_data[0] == "")
-                {
-                    MessageBox.Show("ISBN 데이터가 없습니다.");
-                    return;
-                }
-                
-                string U_cmd = db.More_Update(table_name, Edit_tbl, Edit_col, Sear_tbl, Sear_col);
-                PUB.log.Add("Update", string.Format("{0}({1}) : {2}", mUserName, mCompidx, U_cmd.Replace("\r", " ").Replace("\n", " ")));
-                db.DB_Send_CMD_reVoid(U_cmd);
-                isNewData = false;
-            }
-
-            if (isNewData)
-            {
-                string MidxQuery = string.Format("SELECT `idx` FROM Marc WHERE isbn = {0} AND `compidx` = {1};", grid_data[0], mCompidx);
-                PUB.log.Add("MarcInsert", string.Format("{0}({1}) : {2}", mUserName, mCompidx, MidxQuery));
-                Midx = db.DB_Send_CMD_Search(MidxQuery).Replace("|", "");
-                CurrentMarcIdx = Midx; // Update local
-            }
-
-            string UpdateListIndex = string.Format("UPDATE `Obj_List_Book` SET `m_idx` = {0} WHERE `idx` = {1} AND 'compidx' ={2};",
-                Midx, CurrentListIdx, mCompidx);
-            PUB.log.Add("MarcUpdate", string.Format("{0}({1}) : {2}", mUserName, mCompidx, UpdateListIndex));
-            db.DB_Send_CMD_reVoid(UpdateListIndex);
-            
             // Raise Event to Update List_Book in Parent
             BookSaved?.Invoke(this, new BookSavedEventArgs
             {
-                ListIdx = CurrentListIdx,
-                Grade = grade.ToString(),
                 SaveDate = date,
-                User = mUserName,
                 DBMarc = orimarc,
-                MarcIdx = Midx
+                tag056 = tag056,
+                text008 = text008.Text,
+                griddata = this.Param
             });
-
-            MessageBox.Show("저장되었습니다!");
         }
 
         #region Save_Click_Sub
 
-        /// <summary>
+       
-        /// 마크 저장시 사용하며, 마지막 수정일과 수정자를 가져와 덮어씌울지 백업데이터를 만들지 구분
-        /// </summary>
-        /// <param name="TimeSpanDaysValue">저장할 마크의 마지막 수정일</param>
-        /// <param name="user">저장할 마크의 마지막 수정자</param>
-        /// <returns>마지막 수정일로부터 2일이 지나지않고, 마지막 수정자와 해당 유저가 동일 할 경우 true 반환</returns>
-        private bool IsCoverData(int TimeSpanDaysValue, string user)
-        {
-            if (TimeSpanDaysValue < -1)
-                return false;
-            if (user != mUserName)
-                return false;
-
-            return true;
-        }
-
-        private TimeSpan spspsp(string LastDate, string SaveDate)
-        {
-            DateTime date1 = Convert.ToDateTime(LastDate);
-            DateTime date2 = Convert.ToDateTime(SaveDate);
-
-            TimeSpan result = date1 - date2;
-            return result;
-        }
-
         /// <summary>
         /// 마크 오류체크 (형식체크)
         /// </summary>
@@ -801,12 +562,69 @@ namespace ExcelTest
         //}
         #region CellClick_Sub
 
-        void OnSaveData(int row)
+        /// <summary>
+        /// 마크데이터가 있는지 확인하고 메모장으로 출력
+        /// </summary>
+        /// <param name="row">해당 데이터의 row값</param>
+        /// <returns></returns>
+        bool click_Marc(string Marc_data)
         {
-           
+            // 마크 데이터
+            //string Marc_data = List_Book.Rows[row].Cells["db_marc"].Value.ToString();
+
+            if (Marc_data.Length < 3) return false;
+
+            string result = string.Empty;
+
+            List<string> TagNum = new List<string>();   // 태그번호
+            List<string> field = new List<string>();    // 가변길이필드 저장
+
+            // 특수기호 육안으로 확인하기 쉽게 변환
+            Marc_data = Marc_data.Replace("", "▼");
+            Marc_data = Marc_data.Replace("", "▲");
+            Marc_data = Marc_data.Replace("￦", "\\");
+            // string leader = Marc_data.Substring(0, 24);
+
+            int startidx = 0;
+            string[] data = Marc_data.Substring(24).Split('▲'); // 리더부를 제외한 디렉터리, 가변길이필드 저장
+
+            // List에 필요한 데이터 집어넣는 작업.
+            for (int a = 1; a < data.Length - 1 && data[0].Length > startidx; a++)
+            {
+                TagNum.Add(data[0].Substring(startidx, 3));
+                startidx += 12;
+                field.Add(data[a] + "▲");
+            }
+
+            // List에 들어간 데이터를 메모장에 출력시키는 작업.
+            for (int a = 0; a < TagNum.Count; a++)
+            {
+                string res = TagNum[a];
+                if (TagNum[a] == "008")
+                {
+                    text008.Text = field[a].Replace("▲", "");
+                    data008 = text008.Text;
+                    continue;
+                }
+                else { }
+                if (field[a].IndexOf("▼") == -1)
+                {
+                    res += "\t  \t" + field[a];
+                }
+                else
+                {
+                    string temp = field[a].Insert(2, "\t");
+                    res += "\t" + temp;
+                }
+                result += res + "\n";
+            }
+            richTextBox1.Text = result;
+            return true;
         }
+
         void ReadRemark()
         {
+            var CurrentMarcIdx = Param.MarcIdx;
             if (string.IsNullOrEmpty(CurrentMarcIdx) || CurrentMarcIdx == "0")
             {
                 etc1.Text = "";
@@ -869,8 +687,9 @@ namespace ExcelTest
                 string res = TagNum[a];
                 if (TagNum[a] == "008")
                 {
-                    text008.Text = field[a].Replace("▲", "");
+                    //0008은 click_marc 에서 실제 적용되므로 제거한다 260121 - chi
-                    data008 = text008.Text;
+                    //text008.Text = field[a].Replace("▲", "");
+                    //data008 = text008.Text;
                     continue;
                 }
                 else { }
@@ -888,40 +707,8 @@ namespace ExcelTest
             richTextBox1.Text = result;
             return true;
         }
-        /// <summary>
-        /// 데이터 임시저장
-        /// </summary>
-        void Save_data()
-        {
-            data_book[0] = CurrentISBN13;
-            data_book[1] = CurrentBookName; 
-            data_book[2] = CurrentAuthor;
-            data_book[3] = CurrentPublisher;
-            data_book[4] = CurrentPrice; 
-        }
-        void input_picture()
-        {
-            try
-            {
-                string isbn = CurrentISBN13;
-                string isbn3 = isbn.Substring(isbn.Length - 3, 3);
-                string tFilePath = string.Format("https://contents.kyobobook.co.kr/sih/fit-in/458x0/pdt/{0}.jpg", isbn);
-                pictureBox1.ImageLocation = tFilePath;
-                //pictureBox1.ImageLocation = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg";
-                //string tFilePath = "http://image.kyobobook.co.kr/images/book/xlarge/" + isbn3 + "/x" + isbn + ".jpg";
-                //WebClient tWebClient = new WebClient();
-                //byte[] tBuffer = tWebClient.DownloadData(tFilePath);
-                //Stream tStream = new MemoryStream();
-                //tStream.Write(tBuffer,0, tBuffer.Length);
-                //pictureBox1.Image = Image.FromStream(tStream);
-                //Application.DoEvents();
 
-            }
+
-            catch
-            {
-                pictureBox1.Image = null;
-            }
-        }
         private string Make_Empty()
         {
             string yyMMdd = DateTime.Now.ToString("yyMMdd");
@@ -939,7 +726,7 @@ namespace ExcelTest
                 "653\t  \t▼a▲\n" +
                 "700\t  \t▼a▲\n" +
                 "950\t  \t▼b\\{5}▲\n",
-                Empty_008, data_book[0], data_book[1], data_book[2], data_book[3], data_book[4]);
+                Empty_008, Param.ISBN13, Param.BookName, Param.Author, Param.Publisher, Param.Price);
             etc1.Text = "";
             etc2.Text = "";
             return Empty_text;
@@ -1014,6 +801,7 @@ namespace ExcelTest
 
             checkBox1.Checked = tag008.CheckBox_008(Tag008[12]);    // 회의간행물
             checkBox2.Checked = tag008.CheckBox_008(Tag008[13]);    // 기념논문집
+            checkBox4.Checked = tag008.CheckBox_008(Tag008[14]);    // 색인 260121
 
             col008res.Text = Tag008[10];
             gov008res.Text = Tag008[19];
@@ -1079,9 +867,9 @@ namespace ExcelTest
             text008.Text = tag008.Combo_Change(text008.Text, comboBox5.Name, comboBox5.SelectedIndex); // 전기 (34) v
             text008.Text = tag008.Combo_Change(text008.Text, comboBox6.Name, comboBox6.SelectedIndex); // 언어 (35-37) v
 
-            Publication(checkBox1.Checked, 29);// 회의간행물 (29) c
+            Publication_008(checkBox1.Checked, 29);// 회의간행물 (29) c
-            Publication(checkBox2.Checked, 30);// 기념논문집 (30) c
+            Publication_008(checkBox2.Checked, 30);// 기념논문집 (30) c
-            Publication(checkBox4.Checked, 31);// 색인 (31)
+            Publication_008(checkBox4.Checked, 31);// 색인 (31)
 
             textArray = text008.Text.ToCharArray();
 
@@ -1160,7 +948,7 @@ namespace ExcelTest
             int comboIdx = ((ComboBox)sender).SelectedIndex;
 
             text008.Text = tag008.Combo_Change(text, comboName, comboIdx);
-            Apply_Main_marc();
+            Apply_Main_marc_008();
         }
 
         private void col008res_TextChanged(object sender, EventArgs e)
@@ -1185,11 +973,16 @@ namespace ExcelTest
             }
             text = new string(textArray);
             text008.Text = text;
-            Apply_Main_marc();
+            Apply_Main_marc_008();
         }
 
         private void input_date_ValueChanged(object sender, EventArgs e)
         {
+            if (mLoadCompleted == false)
+            {
+                Console.WriteLine("초기화중이므로 처리하지 않습니다");
+                return;
+            }
             if (text008.Text.Length < 3) { return; }
             string date = input_date.Value.ToString();
             date = date.Substring(0, 10);
@@ -1199,75 +992,80 @@ namespace ExcelTest
             text008.Text = text008.Text.Remove(0, 6);
             text008.Text = date + text008.Text;
 
-            Apply_Main_marc();
+            Apply_Main_marc_008();
         }
 
         private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
-            string name = ((CheckBox)sender).Name;
+            var chk = sender as CheckBox;
-            if (((CheckBox)sender).Checked == true)
+            string name = chk.Name;
+            if (chk.Checked == true)
             {
                 switch (name)
                 {
                     case "checkBox1":
-                        ((CheckBox)sender).InvokeText("회의간행물o");
+                        chk.InvokeText("회의간행물o");
                         break;
                     case "checkBox2":
-                        ((CheckBox)sender).InvokeText("기념논문집o");
+                        chk.InvokeText("기념논문집o");
                         break;
                     case "checkBox4":
-                        ((CheckBox)sender).InvokeText("색인o");
+                        chk.InvokeText("색인o");
                         break;
                 }
             }
-            else if (((CheckBox)sender).Checked == false)
+            else if (chk.Checked == false)
             {
                 switch (name)
                 {
                     case "checkBox1":
-                        ((CheckBox)sender).InvokeText("회의간행물x");
+                        chk.InvokeText("회의간행물x");
                         break;
                     case "checkBox2":
-                        ((CheckBox)sender).InvokeText("기념논문집x");
+                        chk.InvokeText("기념논문집x");
                         break;
                     case "checkBox4":
-                        ((CheckBox)sender).InvokeText("색인x");
+                        chk.InvokeText("색인x");
                         break;
                 }
             }
             switch (name)
             {
-                case "checkBox1":
+                case "checkBox1":   //회의간행물
-                    Publication(checkBox1.Checked, 29);
+                    Publication_008(chk.Checked, 29);
                     break;
-                case "checkBox2":
+                case "checkBox2":   //기념논문집
-                    Publication(checkBox2.Checked, 30);
+                    Publication_008(chk.Checked, 30);
                     break;
-                case "checkBox4":
+                case "checkBox4":   //색인
-                    Publication(checkBox4.Checked, 31);
+                    Publication_008(chk.Checked, 31);
                     break;
             }
         }
 
-        void Publication(bool check, int idx)
+        void Publication_008(bool check, int idx)
         {
             if (text008.Text == "") { return; }
             char[] ArrayChar = text008.Text.ToCharArray();
             if (check == false) { ArrayChar[idx] = '0'; }
             else if (check == true) { ArrayChar[idx] = '1'; }
             text008.Text = new string(ArrayChar);
-            Apply_Main_marc();
+            Apply_Main_marc_008();
         }
 
         /// <summary>
         /// 008text가 메인 텍스트박스에 적용됨.
         /// </summary>
-        private void Apply_Main_marc()
+        private void Apply_Main_marc_008()
         {
             string text = text008.Text;
             richTextBox1.Text = richTextBox1.Text.Replace(data008, text);
             data008 = text;
         }
+        public void SetMarcString(string marcstr)
+        {
+            this.richTextBox1.Text = marcstr;
+        }
         #endregion
 
         private void Btn_Close_Click(object sender, EventArgs e)
@@ -1278,14 +1076,13 @@ namespace ExcelTest
         private void pictureBox1_DoubleClick(object sender, EventArgs e)
         {
             Zoom_Picture zp = new Zoom_Picture();
+            var CurrentURL = pictureBox1.Tag.ToString();
             zp.url = pictureBox1.ImageLocation ?? CurrentURL;
-            zp.ISBN = CurrentISBN13;
+            zp.ISBN = Param.ISBN13;
             zp.Show();
         }
 
 
-        public event EventHandler FillBlankClicked;
-
         private void FillTextBox_KeyDown(object sender, KeyEventArgs e)
         {
             TextBox tb = sender as TextBox;
@@ -1957,7 +1754,8 @@ namespace ExcelTest
                 str = str.Trim();
                 if (TagNum == "300a")
                 {
-                    gu = new char[] { '.', ',', '=', ':', ';', '/', '+', ' ' };
+                    gu = new char[] { ',', '=', ':', ';', '/', '+', ' ' };
+                    //gu = new char[] { '.', ',', '=', ':', ';', '/', '+', ' ' };
                     for (int i = 0; i < gu.Length; i++)
                     {
                         str = str.TrimEnd(gu[i]);
@@ -2716,19 +2514,19 @@ namespace ExcelTest
             string result = Text;
 
             if (result.IndexOf(", ") > -1)
-                return result + " p.";
+                return result + "p.";
             if (result.IndexOf("p.p.") > -1 || result.IndexOf("p. p.") > -1)
                 return result.Replace("p.p.", "p.").Replace("p. p.", "p.");
 
             if (Regex.IsMatch(result, @"^[0-9]+$"))
-                return result + " p.";
+                return result + "p.";
 
             if (!result.StartsWith("[") && !result.EndsWith("]"))
                 return result;
             else if (Regex.IsMatch(GetMiddelString(result, "[", "]"), @"^[0-9]+$"))
             {
                 string tTest = GetMiddelString(result, "[", "]");
-                return result.Replace("p", "").Trim() + " p."; ;
+                return result.Replace("p", "").Trim() + "p."; ;
             }
 
 
@@ -3246,5 +3044,19 @@ namespace ExcelTest
                 sg.DataGrid_to_Delete(sender, e);
         }
 
+        private void MarcEditorControl_SizeChanged(object sender, EventArgs e)
+        {
+            //this.groupBox5.Text = this.Size.ToString();
+        }
+
+        private void btPrev_Click(object sender, EventArgs e)
+        {
+            PrevButton?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void btNext_Click(object sender, EventArgs e)
+        {
+            NextButton?.Invoke(this, EventArgs.Empty);
+        }
     }
 }

unimarc/unimarc/마크/MarcEditorControl.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

unimarc/unimarc/마크/Marc_FillBlank.Designer.cs

@@ -301,6 +301,7 @@ namespace UniMarc
             this.Controls.Add(this.panel2);
             this.Name = "Marc_FillBlank";
             this.Text = "칸채우기";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.Load += new System.EventHandler(this.Marc_FillBlank_Load);
             this.panel6.ResumeLayout(false);
             this.panel6.PerformLayout();

unimarc/unimarc/마크/Marc_FillBlank.cs

@@ -1,4 +1,5 @@
 using ExcelTest;
+using Org.BouncyCastle.Pkcs;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -69,7 +70,7 @@ namespace UniMarc
         private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
             tb_URL.Text = webBrowser1.Url.AbsoluteUri;
-            
+
             if (isAll)
             {
                 if (tb_URL.Text.Contains("searchResultAllList"))
@@ -181,7 +182,7 @@ namespace UniMarc
                 }
             }
 
-            if(!isAll)
+            if (!isAll)
                 richTextBox1.Text = SplitText(Text);
             else
             {
@@ -243,16 +244,22 @@ namespace UniMarc
         private void btn_Move_Click(object sender, EventArgs e)
         {
             isAll = false;
-            marc.richTextBox1.Text = "";
 
-            if (!tb_URL.Text.Contains("searchResultMarc")) {
+            if (!tb_URL.Text.Contains("searchResultMarc"))
+            {
                 MessageBox.Show("코리스 마크가 있는곳으로 이동해주세요!");
                 return;
             }
             SearchResultMarc();
-
             string Text = richTextBox1.Text;
-            marc.richTextBox1.Text = MakeMarc(Text);
+            if (marc != null)
+            {
+                marc.richTextBox1.Text = MakeMarc(Text);
+            }
+            else if (mae != null)
+            {
+                mae.marcEditorControl1.SetMarcString(MakeMarc(Text));
+            }
         }
 
         private void btn_AllMove_Click(object sender, EventArgs e)
@@ -272,7 +279,8 @@ namespace UniMarc
                 int idx = Convert.ToInt32(dataGridView1.Rows[a].Cells["List_idx"].Value.ToString());
                 string isbn = dataGridView1.Rows[a].Cells["ISBN13"].Value.ToString();
 
-                if (isbn == "") {
+                if (isbn == "")
+                {
                     dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Red;
                     progressBar1.Value += 1;
                     continue;
@@ -293,7 +301,11 @@ namespace UniMarc
                 else
                 {
                     dataGridView1.Rows[a].DefaultCellStyle.ForeColor = Color.Blue;
-                    this.marc.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc));
+
+                    if (this.marc != null)
+                        this.marc.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc));
+                    else if (this.mae != null)
+                        this.mae.List_Book.Rows[idx].Cells["db_marc"].Value = st.made_Ori_marc(MakeMarc(marc));
                 }
 
                 progressBar1.Value += 1;
@@ -320,7 +332,7 @@ namespace UniMarc
 
             return result;
         }
-        
+
 
         /// <summary>
         /// 지연시키는 함수

unimarc/unimarc/마크/Marc_Plan.Designer.cs

@@ -53,6 +53,7 @@
             this.btn_Select_List = new System.Windows.Forms.Button();
             this.chkBox_AllowDrop = new System.Windows.Forms.CheckBox();
             this.panel3 = new System.Windows.Forms.Panel();
+            this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
             this.cb_authorTypeK = new System.Windows.Forms.ComboBox();
             this.cb_divType = new System.Windows.Forms.ComboBox();
             this.cb_divNum = new System.Windows.Forms.ComboBox();
@@ -141,10 +142,10 @@
             this.search_tag2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
-            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.printDocument1 = new System.Drawing.Printing.PrintDocument();
             this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
-            this.cb_authorTypeE = new System.Windows.Forms.ComboBox();
+            this.chkEditorTest = new System.Windows.Forms.CheckBox();
+            this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
             this.panel1.SuspendLayout();
             this.panel4.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -333,6 +334,16 @@
             this.panel3.Size = new System.Drawing.Size(566, 49);
             this.panel3.TabIndex = 7;
             // 
+            // cb_authorTypeE
+            // 
+            this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cb_authorTypeE.Enabled = false;
+            this.cb_authorTypeE.FormattingEnabled = true;
+            this.cb_authorTypeE.Location = new System.Drawing.Point(125, 26);
+            this.cb_authorTypeE.Name = "cb_authorTypeE";
+            this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20);
+            this.cb_authorTypeE.TabIndex = 2;
+            // 
             // cb_authorTypeK
             // 
             this.cb_authorTypeK.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -496,6 +507,7 @@
             // 
             // panel5
             // 
+            this.panel5.Controls.Add(this.chkEditorTest);
             this.panel5.Controls.Add(this.cbTag008_32);
             this.panel5.Controls.Add(this.btnTag008);
             this.panel5.Controls.Add(this.btnTag040);
@@ -1246,15 +1258,6 @@
             this.toolStrip1.TabIndex = 3;
             this.toolStrip1.Text = "toolStrip1";
             // 
-            // toolStripButton1
-            // 
-            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
-            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(59, 22);
-            this.toolStripButton1.Text = "delete";
-            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
-            // 
             // printDocument1
             // 
             this.printDocument1.BeginPrint += new System.Drawing.Printing.PrintEventHandler(this.printDocument1_BeginPrint);
@@ -1270,15 +1273,28 @@
             this.printPreviewDialog1.Name = "printPreviewDialog1";
             this.printPreviewDialog1.Visible = false;
             // 
-            // cb_authorTypeE
+            // chkEditorTest
             // 
-            this.cb_authorTypeE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.chkEditorTest.BackColor = System.Drawing.SystemColors.Control;
-            this.cb_authorTypeE.Enabled = false;
+            this.chkEditorTest.Checked = true;
-            this.cb_authorTypeE.FormattingEnabled = true;
+            this.chkEditorTest.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cb_authorTypeE.Location = new System.Drawing.Point(125, 26);
+            this.chkEditorTest.Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
-            this.cb_authorTypeE.Name = "cb_authorTypeE";
+            this.chkEditorTest.ForeColor = System.Drawing.Color.Blue;
-            this.cb_authorTypeE.Size = new System.Drawing.Size(171, 20);
+            this.chkEditorTest.Location = new System.Drawing.Point(596, 32);
-            this.cb_authorTypeE.TabIndex = 2;
+            this.chkEditorTest.Name = "chkEditorTest";
+            this.chkEditorTest.Size = new System.Drawing.Size(106, 27);
+            this.chkEditorTest.TabIndex = 53;
+            this.chkEditorTest.Text = "Editor (OLD)";
+            this.chkEditorTest.UseVisualStyleBackColor = false;
+            // 
+            // toolStripButton1
+            // 
+            this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+            this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripButton1.Name = "toolStripButton1";
+            this.toolStripButton1.Size = new System.Drawing.Size(59, 22);
+            this.toolStripButton1.Text = "delete";
+            this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
             // 
             // Marc_Plan
             // 
@@ -1424,5 +1440,6 @@
         private System.Windows.Forms.ToolStrip toolStrip1;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ComboBox cb_authorTypeE;
+        private System.Windows.Forms.CheckBox chkEditorTest;
     }
 }

unimarc/unimarc/마크/Marc_Plan.cs

@@ -226,12 +226,22 @@ namespace WindowsFormsApp1.Mac
                     cb_divType.Text, cb_divNum.Text
                 };
 
-                Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this);
+                if (chkEditorTest.Checked)
-                me.row = row;
+                {
-                me.UserName = main.botUserLabel.Text;
+                    Marc_Plan_Sub_MarcEdit me = new Marc_Plan_Sub_MarcEdit(this);
-                me.Init(Marc);
+                    me.row = row;
-                me.SetSymbolType(symbol_Type);
+                    me.UserName = main.botUserLabel.Text;
-                me.Show();
+                    me.Init(Marc);
+                    me.SetSymbolType(symbol_Type);
+                    me.Show();
+                }
+                else
+                {
+                    UTIL.MsgE("test version");
+                    var f = new Marc_Plan_Sub_MarcEdit2("","");
+                    f.Show();
+                }
+           
             }
         }
 
@@ -559,7 +569,7 @@ namespace WindowsFormsApp1.Mac
             }
 
             if (totalerrmsg.isEmpty() == false)
-                UTIL.MsgI("경고 발생\n"+totalerrmsg);
+                UTIL.MsgI("경고 발생\n" + totalerrmsg);
 
             string FileName;
             SaveFileDialog saveFileDialog = new SaveFileDialog();
@@ -594,7 +604,7 @@ namespace WindowsFormsApp1.Mac
             Set_Macro sm = new Set_Macro(this, dataGridView1);
             sm.ViewMarcArray = Make_MarcArray(out string errmessage);
             sm.Show();
-            if(errmessage.isEmpty() == false)
+            if (errmessage.isEmpty() == false)
                 UTIL.MsgI("경고 발생\n" + errmessage);
         }
         private void btnTag040_Click(object sender, EventArgs e)

unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.Designer.cs

@@ -0,0 +1,61 @@
+
+namespace UniMarc.마크
+{
+    partial class Marc_Plan_Sub_MarcEdit2
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.marcEditorControl1 = new ExcelTest.MarcEditorControl();
+            this.SuspendLayout();
+            // 
+            // marcEditorControl1
+            // 
+            this.marcEditorControl1.BackColor = System.Drawing.Color.Gray;
+            this.marcEditorControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.marcEditorControl1.Font = new System.Drawing.Font("돋움", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
+            this.marcEditorControl1.Location = new System.Drawing.Point(0, 0);
+            this.marcEditorControl1.Name = "marcEditorControl1";
+            this.marcEditorControl1.Size = new System.Drawing.Size(1337, 768);
+            this.marcEditorControl1.TabIndex = 1;
+            // 
+            // Marc_Plan_Sub_MarcEdit2
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1337, 768);
+            this.Controls.Add(this.marcEditorControl1);
+            this.Name = "Marc_Plan_Sub_MarcEdit2";
+            this.Text = "마크편집";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        public ExcelTest.MarcEditorControl marcEditorControl1;
+    }
+}

unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using WindowsFormsApp1;
+using WindowsFormsApp1.Mac;
+using ExcelTest;
+using System.Drawing.Drawing2D;
+
+namespace UniMarc.마크
+{
+    public partial class Marc_Plan_Sub_MarcEdit2 : Form
+    {
+        string idx;
+        public int row;
+        public string UserName = "";
+        Marc_Plan mp;
+        Helper_DB db = new Helper_DB();
+        String_Text st = new String_Text();
+        Search_Infor si;
+        Help008Tag tag008 = new Help008Tag();
+        public Marc_Plan_Sub_MarcEdit2(string isbn,string marcstring)
+        {
+            InitializeComponent();
+            db.DBcon();
+        }
+      
+    }
+}

unimarc/unimarc/마크/Marc_Plan_Sub_MarcEdit2.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

unimarc/unimarc/마크/Zoom_Picture.cs

@@ -28,6 +28,7 @@ namespace UniMarc.마크
                 string.Format("http://preview.kyobobook.co.kr/preview.jsp?siteGb=INK&ejkGb=KOR&barcode={0}&loginYn=N&orderClick=JAW",
                 ISBN);
 
+            webBrowser1.ScriptErrorsSuppressed = true;            
             webBrowser1.Navigate(PreViewURL);
         }