diff --git a/CalendarNotepad/WorkMain.Designer.cs b/CalendarNotepad/WorkMain.Designer.cs index a9957eb..f844605 100644 --- a/CalendarNotepad/WorkMain.Designer.cs +++ b/CalendarNotepad/WorkMain.Designer.cs @@ -47,16 +47,20 @@ radioButton4 = new RadioButton(); radioButton5 = new RadioButton(); mcWorkDay = new MonthCalendar(); + splitContainer2 = new SplitContainer(); rtbMsg = new RichTextBox(); + toolStrip1 = new ToolStrip(); + tsp_Copy = new ToolStripButton(); + tsb_palse = new ToolStripButton(); FileListView = new ListView(); cms_FileList = new ContextMenuStrip(components); 删除ToolStripMenuItem = new ToolStripMenuItem(); 导入ToolStripMenuItem = new ToolStripMenuItem(); 下载ToolStripMenuItem = new ToolStripMenuItem(); - toolStrip1 = new ToolStrip(); - tsp_Copy = new ToolStripButton(); - tsb_palse = new ToolStripButton(); tabPage1 = new TabPage(); + flowLayoutPanel4 = new FlowLayoutPanel(); + bt_m_Backup = new Button(); + label1 = new Label(); flowLayoutPanel3 = new FlowLayoutPanel(); bt_m_ys = new Button(); label3 = new Label(); @@ -66,9 +70,6 @@ panel2 = new Panel(); panel3 = new Panel(); OpenFileDlg = new OpenFileDialog(); - flowLayoutPanel4 = new FlowLayoutPanel(); - label1 = new Label(); - bt_m_Backup = new Button(); tabControl1.SuspendLayout(); tpWorkManage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)splitContainer1).BeginInit(); @@ -80,12 +81,16 @@ flowLayoutPanel1.SuspendLayout(); gbWorkTypes.SuspendLayout(); C_WorkTypes.SuspendLayout(); - cms_FileList.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)splitContainer2).BeginInit(); + splitContainer2.Panel1.SuspendLayout(); + splitContainer2.Panel2.SuspendLayout(); + splitContainer2.SuspendLayout(); toolStrip1.SuspendLayout(); + cms_FileList.SuspendLayout(); tabPage1.SuspendLayout(); + flowLayoutPanel4.SuspendLayout(); flowLayoutPanel3.SuspendLayout(); flowLayoutPanel2.SuspendLayout(); - flowLayoutPanel4.SuspendLayout(); SuspendLayout(); // // tabControl1 @@ -96,7 +101,7 @@ tabControl1.Location = new Point(0,0); tabControl1.Name = "tabControl1"; tabControl1.SelectedIndex = 0; - tabControl1.Size = new Size(717,443); + tabControl1.Size = new Size(719,459); tabControl1.TabIndex = 0; // // tpWorkManage @@ -105,7 +110,7 @@ tpWorkManage.Location = new Point(4,26); tpWorkManage.Name = "tpWorkManage"; tpWorkManage.Padding = new Padding(3); - tpWorkManage.Size = new Size(709,413); + tpWorkManage.Size = new Size(711,429); tpWorkManage.TabIndex = 1; tpWorkManage.Text = "录入记录"; tpWorkManage.UseVisualStyleBackColor = true; @@ -119,6 +124,7 @@ // // splitContainer1.Panel1 // + splitContainer1.Panel1.AutoScroll = true; splitContainer1.Panel1.Controls.Add(groupBox1); splitContainer1.Panel1.Controls.Add(flowLayoutPanel1); splitContainer1.Panel1.Controls.Add(gbWorkTypes); @@ -126,10 +132,8 @@ // // splitContainer1.Panel2 // - splitContainer1.Panel2.Controls.Add(rtbMsg); - splitContainer1.Panel2.Controls.Add(FileListView); - splitContainer1.Panel2.Controls.Add(toolStrip1); - splitContainer1.Size = new Size(703,407); + splitContainer1.Panel2.Controls.Add(splitContainer2); + splitContainer1.Size = new Size(705,423); splitContainer1.SplitterDistance = 236; splitContainer1.TabIndex = 9; // @@ -200,13 +204,13 @@ // // flowLayoutPanel1 // - flowLayoutPanel1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; flowLayoutPanel1.AutoSize = true; flowLayoutPanel1.Controls.Add(btSave); flowLayoutPanel1.Controls.Add(btReset); - flowLayoutPanel1.Location = new Point(6,373); + flowLayoutPanel1.Dock = DockStyle.Bottom; + flowLayoutPanel1.Location = new Point(0,394); flowLayoutPanel1.Name = "flowLayoutPanel1"; - flowLayoutPanel1.Size = new Size(220,29); + flowLayoutPanel1.Size = new Size(236,29); flowLayoutPanel1.TabIndex = 8; // // btSave @@ -317,27 +321,75 @@ mcWorkDay.TitleForeColor = Color.FromArgb(255,128,128); mcWorkDay.DateChanged += mcWorkDay_DateChanged; // + // splitContainer2 + // + splitContainer2.Dock = DockStyle.Fill; + splitContainer2.Location = new Point(0,0); + splitContainer2.Name = "splitContainer2"; + splitContainer2.Orientation = Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + splitContainer2.Panel1.Controls.Add(rtbMsg); + splitContainer2.Panel1.Controls.Add(toolStrip1); + // + // splitContainer2.Panel2 + // + splitContainer2.Panel2.Controls.Add(FileListView); + splitContainer2.Size = new Size(465,423); + splitContainer2.SplitterDistance = 355; + splitContainer2.TabIndex = 10; + // // rtbMsg // rtbMsg.Dock = DockStyle.Fill; rtbMsg.EnableAutoDragDrop = true; rtbMsg.Location = new Point(0,25); rtbMsg.Name = "rtbMsg"; - rtbMsg.Size = new Size(463,297); + rtbMsg.Size = new Size(465,330); rtbMsg.TabIndex = 7; rtbMsg.Text = ""; rtbMsg.LinkClicked += rtbMsg_LinkClicked; rtbMsg.TextChanged += rtbMsg_TextChanged_1; // + // toolStrip1 + // + toolStrip1.Items.AddRange(new ToolStripItem[] { tsp_Copy,tsb_palse }); + toolStrip1.Location = new Point(0,0); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new Size(465,25); + toolStrip1.TabIndex = 8; + toolStrip1.Text = "toolStrip1"; + // + // tsp_Copy + // + tsp_Copy.DisplayStyle = ToolStripItemDisplayStyle.Text; + tsp_Copy.ImageTransparentColor = Color.Magenta; + tsp_Copy.Name = "tsp_Copy"; + tsp_Copy.Size = new Size(36,22); + tsp_Copy.Text = "复制"; + tsp_Copy.TextAlign = ContentAlignment.MiddleRight; + tsp_Copy.Click += tsp_Copy_Click; + // + // tsb_palse + // + tsb_palse.DisplayStyle = ToolStripItemDisplayStyle.Text; + tsb_palse.Image = (Image)resources.GetObject("tsb_palse.Image"); + tsb_palse.ImageTransparentColor = Color.Magenta; + tsb_palse.Name = "tsb_palse"; + tsb_palse.Size = new Size(36,22); + tsb_palse.Text = "粘贴"; + tsb_palse.Click += tsb_palse_Click; + // // FileListView // FileListView.ContextMenuStrip = cms_FileList; - FileListView.Dock = DockStyle.Bottom; + FileListView.Dock = DockStyle.Fill; FileListView.FullRowSelect = true; FileListView.GridLines = true; - FileListView.Location = new Point(0,322); + FileListView.Location = new Point(0,0); FileListView.Name = "FileListView"; - FileListView.Size = new Size(463,85); + FileListView.Size = new Size(465,64); FileListView.TabIndex = 9; FileListView.UseCompatibleStateImageBehavior = false; FileListView.View = View.Details; @@ -369,35 +421,6 @@ 下载ToolStripMenuItem.Text = "下载"; 下载ToolStripMenuItem.Click += 下载ToolStripMenuItem_Click; // - // toolStrip1 - // - toolStrip1.Items.AddRange(new ToolStripItem[] { tsp_Copy,tsb_palse }); - toolStrip1.Location = new Point(0,0); - toolStrip1.Name = "toolStrip1"; - toolStrip1.Size = new Size(463,25); - toolStrip1.TabIndex = 8; - toolStrip1.Text = "toolStrip1"; - // - // tsp_Copy - // - tsp_Copy.DisplayStyle = ToolStripItemDisplayStyle.Text; - tsp_Copy.ImageTransparentColor = Color.Magenta; - tsp_Copy.Name = "tsp_Copy"; - tsp_Copy.Size = new Size(36,22); - tsp_Copy.Text = "复制"; - tsp_Copy.TextAlign = ContentAlignment.MiddleRight; - tsp_Copy.Click += tsp_Copy_Click; - // - // tsb_palse - // - tsb_palse.DisplayStyle = ToolStripItemDisplayStyle.Text; - tsb_palse.Image = (Image)resources.GetObject("tsb_palse.Image"); - tsb_palse.ImageTransparentColor = Color.Magenta; - tsb_palse.Name = "tsb_palse"; - tsb_palse.Size = new Size(36,22); - tsb_palse.Text = "粘贴"; - tsb_palse.Click += tsb_palse_Click; - // // tabPage1 // tabPage1.Controls.Add(flowLayoutPanel4); @@ -408,11 +431,43 @@ tabPage1.Location = new Point(4,26); tabPage1.Name = "tabPage1"; tabPage1.Padding = new Padding(3); - tabPage1.Size = new Size(709,413); + tabPage1.Size = new Size(711,429); tabPage1.TabIndex = 2; tabPage1.Text = "管理"; tabPage1.UseVisualStyleBackColor = true; // + // flowLayoutPanel4 + // + flowLayoutPanel4.AutoSize = true; + flowLayoutPanel4.Controls.Add(bt_m_Backup); + flowLayoutPanel4.Controls.Add(label1); + flowLayoutPanel4.Dock = DockStyle.Top; + flowLayoutPanel4.Location = new Point(3,81); + flowLayoutPanel4.Name = "flowLayoutPanel4"; + flowLayoutPanel4.Padding = new Padding(5); + flowLayoutPanel4.Size = new Size(705,39); + flowLayoutPanel4.TabIndex = 5; + // + // bt_m_Backup + // + bt_m_Backup.Location = new Point(8,8); + bt_m_Backup.Name = "bt_m_Backup"; + bt_m_Backup.Size = new Size(75,23); + bt_m_Backup.TabIndex = 0; + bt_m_Backup.Text = "备份"; + bt_m_Backup.UseVisualStyleBackColor = true; + bt_m_Backup.Click += bt_m_Backup_Click; + // + // label1 + // + label1.AutoSize = true; + label1.Font = new Font("微软雅黑",12F,FontStyle.Regular,GraphicsUnit.Point); + label1.Location = new Point(89,5); + label1.Name = "label1"; + label1.Size = new Size(266,21); + label1.TabIndex = 1; + label1.Text = "备份数据文件,以便将来出错时还原"; + // // flowLayoutPanel3 // flowLayoutPanel3.AutoSize = true; @@ -422,7 +477,7 @@ flowLayoutPanel3.Location = new Point(3,42); flowLayoutPanel3.Name = "flowLayoutPanel3"; flowLayoutPanel3.Padding = new Padding(5); - flowLayoutPanel3.Size = new Size(703,39); + flowLayoutPanel3.Size = new Size(705,39); flowLayoutPanel3.TabIndex = 4; // // bt_m_ys @@ -455,7 +510,7 @@ flowLayoutPanel2.Location = new Point(3,3); flowLayoutPanel2.Name = "flowLayoutPanel2"; flowLayoutPanel2.Padding = new Padding(5); - flowLayoutPanel2.Size = new Size(703,39); + flowLayoutPanel2.Size = new Size(705,39); flowLayoutPanel2.TabIndex = 3; // // bt_m_Clean @@ -484,7 +539,7 @@ panel2.Dock = DockStyle.Top; panel2.Location = new Point(3,3); panel2.Name = "panel2"; - panel2.Size = new Size(703,0); + panel2.Size = new Size(705,0); panel2.TabIndex = 2; // // panel3 @@ -493,50 +548,18 @@ panel3.Dock = DockStyle.Top; panel3.Location = new Point(3,3); panel3.Name = "panel3"; - panel3.Size = new Size(703,0); + panel3.Size = new Size(705,0); panel3.TabIndex = 1; // // OpenFileDlg // OpenFileDlg.Multiselect = true; // - // flowLayoutPanel4 - // - flowLayoutPanel4.AutoSize = true; - flowLayoutPanel4.Controls.Add(bt_m_Backup); - flowLayoutPanel4.Controls.Add(label1); - flowLayoutPanel4.Dock = DockStyle.Top; - flowLayoutPanel4.Location = new Point(3,81); - flowLayoutPanel4.Name = "flowLayoutPanel4"; - flowLayoutPanel4.Padding = new Padding(5); - flowLayoutPanel4.Size = new Size(703,39); - flowLayoutPanel4.TabIndex = 5; - // - // label1 - // - label1.AutoSize = true; - label1.Font = new Font("微软雅黑",12F,FontStyle.Regular,GraphicsUnit.Point); - label1.Location = new Point(89,5); - label1.Name = "label1"; - label1.Size = new Size(266,21); - label1.TabIndex = 1; - label1.Text = "备份数据文件,以便将来出错时还原"; - // - // bt_m_Backup - // - bt_m_Backup.Location = new Point(8,8); - bt_m_Backup.Name = "bt_m_Backup"; - bt_m_Backup.Size = new Size(75,23); - bt_m_Backup.TabIndex = 0; - bt_m_Backup.Text = "备份"; - bt_m_Backup.UseVisualStyleBackColor = true; - bt_m_Backup.Click += bt_m_Backup_Click; - // // WorkMain // AutoScaleDimensions = new SizeF(7F,17F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(717,443); + ClientSize = new Size(719,459); Controls.Add(tabControl1); Name = "WorkMain"; StartPosition = FormStartPosition.CenterScreen; @@ -548,7 +571,6 @@ splitContainer1.Panel1.ResumeLayout(false); splitContainer1.Panel1.PerformLayout(); splitContainer1.Panel2.ResumeLayout(false); - splitContainer1.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)splitContainer1).EndInit(); splitContainer1.ResumeLayout(false); groupBox1.ResumeLayout(false); @@ -558,17 +580,22 @@ gbWorkTypes.ResumeLayout(false); C_WorkTypes.ResumeLayout(false); C_WorkTypes.PerformLayout(); - cms_FileList.ResumeLayout(false); + splitContainer2.Panel1.ResumeLayout(false); + splitContainer2.Panel1.PerformLayout(); + splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)splitContainer2).EndInit(); + splitContainer2.ResumeLayout(false); toolStrip1.ResumeLayout(false); toolStrip1.PerformLayout(); + cms_FileList.ResumeLayout(false); tabPage1.ResumeLayout(false); tabPage1.PerformLayout(); + flowLayoutPanel4.ResumeLayout(false); + flowLayoutPanel4.PerformLayout(); flowLayoutPanel3.ResumeLayout(false); flowLayoutPanel3.PerformLayout(); flowLayoutPanel2.ResumeLayout(false); flowLayoutPanel2.PerformLayout(); - flowLayoutPanel4.ResumeLayout(false); - flowLayoutPanel4.PerformLayout(); ResumeLayout(false); } @@ -616,5 +643,6 @@ private FlowLayoutPanel flowLayoutPanel4; private Button bt_m_Backup; private Label label1; + private SplitContainer splitContainer2; } } \ No newline at end of file diff --git a/CalendarNotepad/WorkMain.resx b/CalendarNotepad/WorkMain.resx index 82e70d6..264df2d 100644 --- a/CalendarNotepad/WorkMain.resx +++ b/CalendarNotepad/WorkMain.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 127, 17 - 17, 17 @@ -133,6 +130,9 @@ AAAAAElFTkSuQmCC + + 127, 17 + 248, 17