diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index a7fe7bd..a3d2c21 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("20.05.26.1300")] -[assembly: AssemblyFileVersion("20.05.26.1300")] +[assembly: AssemblyVersion("20.06.05.1030")] +[assembly: AssemblyFileVersion("20.06.05.1030")] diff --git a/Project/Setting.cs b/Project/Setting.cs index 433bff5..462cb58 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -15,6 +15,14 @@ namespace Project 재고관리, 재고현황, } + public enum eToolPosition + { + Left = 0, + Right, + Top, + Bottom, + Hide, + } public class Setting : arUtil.Setting { #region "log" @@ -54,6 +62,9 @@ namespace Project public string lastdept { get; set; } public int CamIndex { get; set; } + [DisplayName("Tool Bar")] + public eToolPosition HideToolbar { get; set; } + public Setting() : this(Util.CurrentPath + "setting.xml") {} public Setting(string file) @@ -75,6 +86,9 @@ namespace Project if (Password_User.isEmpty()) Password_User = "9999"; if (lastdept == "") lastdept = "제조본부 장비기술팀 K4장비기술1파트"; + var str_toolbar = Xml.get_Data("enum", "HideToolbar", "0"); + this.HideToolbar = (eToolPosition)int.Parse(str_toolbar); + //시작폼가져오기 var 시작품 = Xml.get_Data("startForm"); var list = Enum.GetNames(typeof(eFormList)); @@ -92,9 +106,8 @@ namespace Project } public override void AfterSave() { - //throw new NotImplementedException(); - //Xml.set_Data("Font", "Font_Content", GetfontString(Font_Content)); - //Xml.Save(); + Xml.set_Data("enum", "HideToolbar", ((int)HideToolbar).ToString()); + Xml.Save(); } } diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 3bc9208..1d66b6e 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -101,9 +101,15 @@ this.pMP데이터베이스업데이트ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mailBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); + this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // tmDisplay @@ -219,14 +225,14 @@ // this.codesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("codesToolStripMenuItem.Image"))); this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.codesToolStripMenuItem.Text = "공용코드"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.itemsToolStripMenuItem.Text = "품목정보"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // @@ -237,41 +243,41 @@ this.myAccouserToolStripMenuItem, this.권한설정ToolStripMenuItem}); this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.userInfoToolStripMenuItem.Text = "사용자"; // // userAccountToolStripMenuItem // this.userAccountToolStripMenuItem.Name = "userAccountToolStripMenuItem"; - this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.userAccountToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.userAccountToolStripMenuItem.Text = "계정정보"; this.userAccountToolStripMenuItem.Click += new System.EventHandler(this.userAccountToolStripMenuItem_Click); // // myAccouserToolStripMenuItem // this.myAccouserToolStripMenuItem.Name = "myAccouserToolStripMenuItem"; - this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.myAccouserToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.myAccouserToolStripMenuItem.Text = "계정목록"; this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); // // 권한설정ToolStripMenuItem // this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); this.권한설정ToolStripMenuItem.Text = "권한설정"; this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); // // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.customerToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.customerToolStripMenuItem.Text = "업체정보"; this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); // // mn_kuntae // this.mn_kuntae.Name = "mn_kuntae"; - this.mn_kuntae.Size = new System.Drawing.Size(180, 24); + this.mn_kuntae.Size = new System.Drawing.Size(153, 24); this.mn_kuntae.Text = "월별 근무표"; this.mn_kuntae.Click += new System.EventHandler(this.월별근무표ToolStripMenuItem_Click); // @@ -279,7 +285,7 @@ // this.메일양식ToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("메일양식ToolStripMenuItem.Image"))); this.메일양식ToolStripMenuItem.Name = "메일양식ToolStripMenuItem"; - this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일양식ToolStripMenuItem.Size = new System.Drawing.Size(153, 24); this.메일양식ToolStripMenuItem.Text = "메일 양식"; this.메일양식ToolStripMenuItem.Click += new System.EventHandler(this.메일양식ToolStripMenuItem_Click); // @@ -302,7 +308,7 @@ // this.mn_purchase.Image = ((System.Drawing.Image)(resources.GetObject("mn_purchase.Image"))); this.mn_purchase.Name = "mn_purchase"; - this.mn_purchase.Size = new System.Drawing.Size(180, 24); + this.mn_purchase.Size = new System.Drawing.Size(162, 24); this.mn_purchase.Text = "구매신청"; this.mn_purchase.Click += new System.EventHandler(this.nRPurchaseToolStripMenuItem_Click); // @@ -310,7 +316,7 @@ // this.mn_project.Image = ((System.Drawing.Image)(resources.GetObject("mn_project.Image"))); this.mn_project.Name = "mn_project"; - this.mn_project.Size = new System.Drawing.Size(180, 24); + this.mn_project.Size = new System.Drawing.Size(162, 24); this.mn_project.Text = "프로젝트"; this.mn_project.Click += new System.EventHandler(this.프로젝트ToolStripMenuItem_Click); // @@ -318,7 +324,7 @@ // this.mn_dailyhistory.Image = ((System.Drawing.Image)(resources.GetObject("mn_dailyhistory.Image"))); this.mn_dailyhistory.Name = "mn_dailyhistory"; - this.mn_dailyhistory.Size = new System.Drawing.Size(180, 24); + this.mn_dailyhistory.Size = new System.Drawing.Size(162, 24); this.mn_dailyhistory.Text = "업무일지"; this.mn_dailyhistory.Click += new System.EventHandler(this.업무일지ToolStripMenuItem1_Click); // @@ -330,7 +336,7 @@ this.pMP현황ToolStripMenuItem}); this.mn_jago.Image = ((System.Drawing.Image)(resources.GetObject("mn_jago.Image"))); this.mn_jago.Name = "mn_jago"; - this.mn_jago.Size = new System.Drawing.Size(180, 24); + this.mn_jago.Size = new System.Drawing.Size(162, 24); this.mn_jago.Text = "품목재고"; this.mn_jago.Click += new System.EventHandler(this.재고관리ToolStripMenuItem_Click); // @@ -365,7 +371,7 @@ this.라인코드관리ToolStripMenuItem}); this.mn_eq.Image = ((System.Drawing.Image)(resources.GetObject("mn_eq.Image"))); this.mn_eq.Name = "mn_eq"; - this.mn_eq.Size = new System.Drawing.Size(180, 24); + this.mn_eq.Size = new System.Drawing.Size(162, 24); this.mn_eq.Text = "장비 목록"; // // dataFOLToolStripMenuItem @@ -405,7 +411,7 @@ // this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; - this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(162, 24); this.personalInventoryToolStripMenuItem.Text = "개인별 물품"; this.personalInventoryToolStripMenuItem.Visible = false; this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); @@ -414,7 +420,7 @@ // this.메일전송ToolStripMenuItem1.Image = ((System.Drawing.Image)(resources.GetObject("메일전송ToolStripMenuItem1.Image"))); this.메일전송ToolStripMenuItem1.Name = "메일전송ToolStripMenuItem1"; - this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem1.Size = new System.Drawing.Size(162, 24); this.메일전송ToolStripMenuItem1.Text = "메일자동발신"; this.메일전송ToolStripMenuItem1.Click += new System.EventHandler(this.메일전송ToolStripMenuItem1_Click); // @@ -442,26 +448,26 @@ // 메모장ToolStripMenuItem // this.메모장ToolStripMenuItem.Name = "메모장ToolStripMenuItem"; - this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메모장ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메모장ToolStripMenuItem.Text = "메모장"; this.메모장ToolStripMenuItem.Click += new System.EventHandler(this.메모장ToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(162, 6); // // 패치내역ToolStripMenuItem1 // this.패치내역ToolStripMenuItem1.Name = "패치내역ToolStripMenuItem1"; - this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(180, 24); + this.패치내역ToolStripMenuItem1.Size = new System.Drawing.Size(165, 24); this.패치내역ToolStripMenuItem1.Text = "패치 내역"; this.패치내역ToolStripMenuItem1.Click += new System.EventHandler(this.패치내역ToolStripMenuItem1_Click); // // 메일내역ToolStripMenuItem // this.메일내역ToolStripMenuItem.Name = "메일내역ToolStripMenuItem"; - this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일내역ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일내역ToolStripMenuItem.Text = "메일 내역"; this.메일내역ToolStripMenuItem.Click += new System.EventHandler(this.메일내역ToolStripMenuItem_Click); // @@ -469,20 +475,20 @@ // this.holidayToolStripMenuItem.ForeColor = System.Drawing.Color.Black; this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.holidayToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.holidayToolStripMenuItem.Text = "휴가 내역"; this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(177, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(162, 6); // // minutesToolStripMenuItem // this.minutesToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.minutesToolStripMenuItem.Text = "회의록"; this.minutesToolStripMenuItem.Visible = false; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); @@ -491,7 +497,7 @@ // this.requestITemToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.requestITemToolStripMenuItem.Text = "견적요청"; this.requestITemToolStripMenuItem.Visible = false; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); @@ -500,7 +506,7 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.freeBoardToolStripMenuItem.Text = "Free Board"; this.freeBoardToolStripMenuItem.Visible = false; // @@ -508,7 +514,7 @@ // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.bugReportToolStripMenuItem.Text = "Bug Report"; this.bugReportToolStripMenuItem.Visible = false; // @@ -516,7 +522,7 @@ // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.todoListToolStripMenuItem.Text = "Todo List"; this.todoListToolStripMenuItem.Visible = false; this.todoListToolStripMenuItem.Click += new System.EventHandler(this.todoListToolStripMenuItem_Click); @@ -525,7 +531,7 @@ // this.메일전송ToolStripMenuItem.ForeColor = System.Drawing.Color.Red; this.메일전송ToolStripMenuItem.Name = "메일전송ToolStripMenuItem"; - this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(180, 24); + this.메일전송ToolStripMenuItem.Size = new System.Drawing.Size(165, 24); this.메일전송ToolStripMenuItem.Text = "메일전송"; this.메일전송ToolStripMenuItem.Visible = false; this.메일전송ToolStripMenuItem.Click += new System.EventHandler(this.메일전송ToolStripMenuItem_Click); @@ -534,7 +540,7 @@ // this.toolStripMenuItem5.ForeColor = System.Drawing.Color.Red; this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(180, 24); + this.toolStripMenuItem5.Size = new System.Drawing.Size(165, 24); this.toolStripMenuItem5.Text = "(test)휴가등록"; this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click); // @@ -685,17 +691,74 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; this.tabControl1.ShowToolTips = true; - this.tabControl1.Size = new System.Drawing.Size(1034, 594); + this.tabControl1.Size = new System.Drawing.Size(1005, 594); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); // + // toolStrip1 + // + this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Right; + this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItem8, + this.toolStripMenuItem7, + this.toolStripMenuItem6, + this.toolStripButton4}); + this.toolStrip1.Location = new System.Drawing.Point(1006, 28); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(29, 594); + this.toolStrip1.TabIndex = 35; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem6.Image"))); + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem6.Text = "프로젝트"; + this.toolStripMenuItem6.ToolTipText = "프로젝트"; + this.toolStripMenuItem6.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem7.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem7.Image"))); + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem7.Text = "구매신청"; + this.toolStripMenuItem7.ToolTipText = "구매신청"; + this.toolStripMenuItem7.Click += new System.EventHandler(this.toolStripMenuItem7_Click); + // + // toolStripMenuItem8 + // + this.toolStripMenuItem8.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripMenuItem8.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem8.Image"))); + this.toolStripMenuItem8.Name = "toolStripMenuItem8"; + this.toolStripMenuItem8.Size = new System.Drawing.Size(29, 20); + this.toolStripMenuItem8.Text = "업무일지"; + this.toolStripMenuItem8.ToolTipText = "업무일지"; + this.toolStripMenuItem8.Click += new System.EventHandler(this.toolStripMenuItem8_Click); + // + // toolStripButton4 + // + this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image"))); + this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton4.Name = "toolStripButton4"; + this.toolStripButton4.Size = new System.Drawing.Size(29, 20); + this.toolStripButton4.Text = "PMP 자료 보기(베타)"; + this.toolStripButton4.ToolTipText = "PMP 자료 보기(베타)"; + this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click_1); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.ClientSize = new System.Drawing.Size(1036, 647); this.Controls.Add(this.tabControl1); + this.Controls.Add(this.toolStrip1); this.Controls.Add(this.menuStrip1); this.Controls.Add(this.statusStrip1); this.Font = new System.Drawing.Font("Calibri", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -712,6 +775,8 @@ this.statusStrip1.PerformLayout(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -790,6 +855,11 @@ private System.Windows.Forms.ToolStripMenuItem mailBackupToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 메모장ToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton4; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem6; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem7; + private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem8; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index cc76729..06af9b7 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -68,6 +68,10 @@ namespace Project { this.Text = Application.ProductName + " v" + Application.ProductVersion; Pub.init(); + + setToolbar(); + + _SetLang(); if (Pub.setting.FullScreen) this.WindowState = FormWindowState.Maximized; else this.WindowState = FormWindowState.Normal; @@ -217,9 +221,28 @@ namespace Project Pub.log.AddI("Setting Save"); Pub.log.Add(Pub.setting.ToString()); UpdateControls(); + setToolbar(); } } + void setToolbar() + { + if (Pub.setting.HideToolbar == eToolPosition.Hide) + { + this.toolStrip1.Visible = false; + } + else + { + switch (Pub.setting.HideToolbar) + { + case eToolPosition.Bottom: this.toolStrip1.Dock = DockStyle.Bottom; break; + case eToolPosition.Top: this.toolStrip1.Dock = DockStyle.Top; break; + case eToolPosition.Left: this.toolStrip1.Dock = DockStyle.Left; break; + case eToolPosition.Right: this.toolStrip1.Dock = DockStyle.Right; break; + } + this.toolStrip1.Visible = true; + } + } #region "util" @@ -934,5 +957,27 @@ namespace Project { Menu_Note(); } + + private void toolStripMenuItem7_Click(object sender, EventArgs e) + { + menu_nrpurchase(); + } + + private void toolStripMenuItem6_Click(object sender, EventArgs e) + { + menu_projecT_list(); + } + + private void toolStripMenuItem8_Click(object sender, EventArgs e) + { + menu_work_report(); + } + + private void toolStripButton4_Click_1(object sender, EventArgs e) + { + string formkey = "PMPDB"; + if (!ShowForm(formkey)) + AddForm(formkey, new FPM0000.fSPMaster()); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 3a3149e..e4ebf34 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -153,6 +153,43 @@ Mi4wAwEBAAAh+QQBAAAXACwAAAAAEAAQAAAIggAvCBwo0IJBCwQTFqwAAQEDhAoXTpgoYQDEhBYqTKDA kYKEBRclciRAoMEDCREuZtw40oKCCihVauxIIYEBmCkJruxYoWfMggYPsOyJU+WAABMqCJDgM+eFg0iV Aigg4WfBo0kFADAYwWnBABSkQjSIcYDYiAMtBHCwFW3ag24HBgQAOw== + + + + + R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O + fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo + oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E + RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== @@ -173,15 +210,6 @@ gYDHjyAJKNjogQIBChoQZAgQAEGCiQUOKFxAIEMEDhsQPEDAQEKDBzI9dKiZIYOFowwENPg5QeHQlRIi SJAwYIADBwWaegCQIMAACQEEKK2KFYNCrgMihBXbwEHVBGY9GFCQIEGBu3jvKrhw1oBfCBAOHJgwAQOG CyQdKlaIsLHjggEBADs= - - - - - R0lGODlhEAAQAIQfAP/umP/eN//kV//riOuzSuujJ+usOuu3VuvKgf/0uf/yq+ucF//bJf/pfOvOiO/O - fP/52//ZGP/UAP/haf/ma//hR//ncevDceu8YP39/OuuQP/rp//pdP/nZf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo - oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E - RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 @@ -256,32 +284,64 @@ CyQdKlaIsLHjggEBADs= - + + 709, 17 + + - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= + 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 + AABJRU5ErkJggg== - + - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow== + R0lGODlhEAAQAIQAANnq+K7T5HiUsMHb+v/vlOXs9IyzzHWs1/T5/1ZtjUlVa+z1/+3x9uTx/6a2ysng + +FFhe0NLXIDG/fD4/ykxQz5FVf/41vr8/6TI3MvM0XHG/vbHQPn8//b8/4PL/f///yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIugA/CLSwQaDBDwQPAghAYIMAAxAFCGiYQIDAAA4aCgDA + EUBGhxAuLjhwwIOEkydJOkggEAMDDzBjxtRQgOUHDAU46OTQoQOCnxMKhPxggMEFnj2BTgg6tOjRBz4f + SF2woIACgQZySkXwYALVAQ2sCjxQoOcDrlQbgC0QQaCAslwnPFjQQC0Atm7hdl0woG/HCm4n+PRKt0FH + BoA/JHjAoACDx5AfZ6DgNoFlCBAUKIgQoUIFCkMPih4dEAA7 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJESURBVDhPjVPtS1NxGP1B7i/oY/9DH9KVEEFCWJkKUZTQ + kMJFIVQjayuauiDaQPogpCayL01ZJCVFYF0GEkLvUcSa0b4tCDZ1xDbv7l0vp+f87pUlKvTAw/1w73nO + 85xzrvrfynqU/6tHzcuzIG2nPeq39B/39eYlH49lPCpPQL7nGBZDZ7E0cB7LkQDkHdzP1pew+RYaVC7X + vB2LwTMo3gigNBJEKbwHK9Fm/JztRzW0yYDsFhUXRjN/ugvFaB9+XG2FGfPCHtmF2pjTv1IDsK9tMCDb + oKZltdpS/zmUbgdRiexAzQXaU3thPetA9dVx2LlRlN82rh1AZoKXBy+gPBGCdcvrAJMtqD4/AjPdDfPL + Kd3293GU33vrA3gz1yYzwfbwTg22nrTB/OjToG9pHx687EQ41YLRD4PYFv/nBArGm7n2KrNldMLMnMSK + gKdfdMA/uxttj5uw/1EjYu/C2DrhDqBV9LR48yIq15vqzAIufO7G0Nw+tLvAE4kgeseTSBifcOjyjDOA + PtOqSvyKFow3c20yE3xAgIfvH0XvnSQmjQymjAXcfZpxBgi7nyGhz7SK7Fowd20yExxJpDQwNvkGPVFD + wPesg30zrynePBPGkNBnWkW1KRhv5tpkJjgwPKeB7ZceturVWbJBgfFkwvTt4jPZqTYF481cm8wEu7B6 + yQCb2WY89foSEg6gVZpdBCM7117DvFq8nz8Gs63jKQljSOgzraLajmAbsLNon2yhfwxmm/FkwhgS+kyl + 2VqwdaXUXw9z9ScDat5eAAAAAElFTkSuQmCC