diff --git a/CommonLibrary/UserSystem.cs b/CommonLibrary/UserSystem.cs index 9e8475e..76797da 100644 --- a/CommonLibrary/UserSystem.cs +++ b/CommonLibrary/UserSystem.cs @@ -44,7 +44,7 @@ namespace CommonLibrary **************************************************************************/ - SoftBasic.FrameworkVersion = new SystemVersion("1.7.2"); + SoftBasic.FrameworkVersion = new SystemVersion("1.7.3"); } diff --git a/软件系统客户端模版/FormMainWindow.Designer.cs b/软件系统客户端模版/FormMainWindow.Designer.cs index bcc39a7..a1a5d8e 100644 --- a/软件系统客户端模版/FormMainWindow.Designer.cs +++ b/软件系统客户端模版/FormMainWindow.Designer.cs @@ -38,6 +38,7 @@ this.toolStripStatusLabel_time = new System.Windows.Forms.ToolStripStatusLabel(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.panel_right = new System.Windows.Forms.Panel(); + this.panel_right_mini = new System.Windows.Forms.Panel(); this.netClientOnline1 = new ClientsLibrary.BasicSupport.NetClientOnline(); this.label_file_count = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); @@ -59,7 +60,6 @@ this.panel_left = new System.Windows.Forms.Panel(); this.label10 = new System.Windows.Forms.Label(); this.panel_main = new System.Windows.Forms.Panel(); - this.panel_right_mini = new System.Windows.Forms.Panel(); this.linkLabel_logout = new System.Windows.Forms.LinkLabel(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox_right_profile = new System.Windows.Forms.PictureBox(); @@ -84,15 +84,17 @@ this.更新日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号说明ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.意见反馈ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pictureBox_right_file = new System.Windows.Forms.PictureBox(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.panel_right.SuspendLayout(); - this.panel_left.SuspendLayout(); this.panel_right_mini.SuspendLayout(); + this.panel_left.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_profile)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_restore)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_shrink)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_file)).BeginInit(); this.SuspendLayout(); // // statusStrip1 @@ -199,6 +201,17 @@ this.panel_right.Size = new System.Drawing.Size(224, 419); this.panel_right.TabIndex = 2; // + // panel_right_mini + // + this.panel_right_mini.Controls.Add(this.pictureBox_right_file); + this.panel_right_mini.Controls.Add(this.pictureBox_right_profile); + this.panel_right_mini.Controls.Add(this.pictureBox_right_restore); + this.panel_right_mini.Location = new System.Drawing.Point(0, 0); + this.panel_right_mini.Name = "panel_right_mini"; + this.panel_right_mini.Size = new System.Drawing.Size(25, 418); + this.panel_right_mini.TabIndex = 21; + this.panel_right_mini.Visible = false; + // // netClientOnline1 // this.netClientOnline1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -397,16 +410,6 @@ this.panel_main.Size = new System.Drawing.Size(557, 419); this.panel_main.TabIndex = 5; // - // panel_right_mini - // - this.panel_right_mini.Controls.Add(this.pictureBox_right_profile); - this.panel_right_mini.Controls.Add(this.pictureBox_right_restore); - this.panel_right_mini.Location = new System.Drawing.Point(0, 0); - this.panel_right_mini.Name = "panel_right_mini"; - this.panel_right_mini.Size = new System.Drawing.Size(25, 418); - this.panel_right_mini.TabIndex = 21; - this.panel_right_mini.Visible = false; - // // linkLabel_logout // this.linkLabel_logout.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -444,7 +447,7 @@ // pictureBox_right_restore // this.pictureBox_right_restore.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBox_right_restore.Image = global::软件系统客户端模版.Properties.Resources.Constant_495; + this.pictureBox_right_restore.Image = global::软件系统客户端模版.Properties.Resources.Association; this.pictureBox_right_restore.Location = new System.Drawing.Point(3, 4); this.pictureBox_right_restore.Name = "pictureBox_right_restore"; this.pictureBox_right_restore.Size = new System.Drawing.Size(17, 17); @@ -455,8 +458,8 @@ // pictureBox_right_shrink // this.pictureBox_right_shrink.Cursor = System.Windows.Forms.Cursors.Hand; - this.pictureBox_right_shrink.Image = global::软件系统客户端模版.Properties.Resources.Constant_495; - this.pictureBox_right_shrink.Location = new System.Drawing.Point(200, 2); + this.pictureBox_right_shrink.Image = global::软件系统客户端模版.Properties.Resources.Association; + this.pictureBox_right_shrink.Location = new System.Drawing.Point(201, 4); this.pictureBox_right_shrink.Name = "pictureBox_right_shrink"; this.pictureBox_right_shrink.Size = new System.Drawing.Size(17, 17); this.pictureBox_right_shrink.TabIndex = 20; @@ -613,6 +616,17 @@ this.意见反馈ToolStripMenuItem.Text = "意见反馈"; this.意见反馈ToolStripMenuItem.Click += new System.EventHandler(this.意见反馈ToolStripMenuItem_Click); // + // pictureBox_right_file + // + this.pictureBox_right_file.Cursor = System.Windows.Forms.Cursors.Hand; + this.pictureBox_right_file.Image = global::软件系统客户端模版.Properties.Resources.RolesNode_Valid_Closed; + this.pictureBox_right_file.Location = new System.Drawing.Point(3, 44); + this.pictureBox_right_file.Name = "pictureBox_right_file"; + this.pictureBox_right_file.Size = new System.Drawing.Size(17, 17); + this.pictureBox_right_file.TabIndex = 23; + this.pictureBox_right_file.TabStop = false; + this.pictureBox_right_file.Click += new System.EventHandler(this.pictureBox_right_file_Click); + // // FormMainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -640,12 +654,13 @@ this.menuStrip1.PerformLayout(); this.panel_right.ResumeLayout(false); this.panel_right.PerformLayout(); - this.panel_left.ResumeLayout(false); this.panel_right_mini.ResumeLayout(false); + this.panel_left.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_profile)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_restore)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_shrink)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_right_file)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -709,6 +724,7 @@ private System.Windows.Forms.PictureBox pictureBox_right_restore; private System.Windows.Forms.LinkLabel linkLabel_logout; private System.Windows.Forms.PictureBox pictureBox_right_profile; + private System.Windows.Forms.PictureBox pictureBox_right_file; } } diff --git a/软件系统客户端模版/FormMainWindow.cs b/软件系统客户端模版/FormMainWindow.cs index 5bf12d6..feb18fa 100644 --- a/软件系统客户端模版/FormMainWindow.cs +++ b/软件系统客户端模版/FormMainWindow.cs @@ -647,12 +647,7 @@ namespace 软件系统客户端模版 if (control != null) SetShowRenderControl(control); } - private void label_file_count_Click(object sender, EventArgs e) - { - //点击查看了共享文件 - SetShowRenderControl(UIControls_Files); - UIControls_Files.UpdateFiles(); - } + @@ -763,6 +758,7 @@ namespace 软件系统客户端模版 toolTipSystem.SetToolTip(pictureBox_right_shrink, "隐藏右边的信息栏，显示精简界面。"); toolTipSystem.SetToolTip(pictureBox_right_restore, "显示右边的信息栏，隐藏精简界面。"); toolTipSystem.SetToolTip(pictureBox_right_profile, "我的账户信息"); + toolTipSystem.SetToolTip(pictureBox_right_file, "共享文件信息"); } @@ -789,7 +785,21 @@ namespace 软件系统客户端模版 // 点击我的信息 我的信息ToolStripMenuItem_Click(sender, e); } - + private void pictureBox_right_file_Click(object sender, EventArgs e) + { + // 点击共享文件图标 + label_file_count_Click(sender, e); + } + + private void label_file_count_Click(object sender, EventArgs e) + { + // 点击查看了共享文件 + SetShowRenderControl(UIControls_Files); + UIControls_Files.UpdateFiles(); + } + #endregion + + } } diff --git a/软件系统客户端模版/Properties/Resources.Designer.cs b/软件系统客户端模版/Properties/Resources.Designer.cs index 2cda4ac..96a3939 100644 --- a/软件系统客户端模版/Properties/Resources.Designer.cs +++ b/软件系统客户端模版/Properties/Resources.Designer.cs @@ -70,6 +70,16 @@ namespace 软件系统客户端模版.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap Association { + get { + object obj = ResourceManager.GetObject("Association", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -90,6 +100,16 @@ namespace 软件系统客户端模版.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap RolesNode_Valid_Closed { + get { + object obj = ResourceManager.GetObject("RolesNode_Valid_Closed", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/软件系统客户端模版/Properties/Resources.resx b/软件系统客户端模版/Properties/Resources.resx index 67a02d7..8444960 100644 --- a/软件系统客户端模版/Properties/Resources.resx +++ b/软件系统客户端模版/Properties/Resources.resx @@ -121,6 +121,9 @@ ..\Resources\Constant_495.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\UserProfilenode_8706.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Team_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -131,7 +134,10 @@ ..\Resources\ASCube_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\UserProfilenode_8706.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Association.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\RolesNode_Valid_Closed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/软件系统客户端模版/Resources/Association.png b/软件系统客户端模版/Resources/Association.png new file mode 100644 index 0000000..6b819ae Binary files /dev/null and b/软件系统客户端模版/Resources/Association.png differ diff --git a/软件系统客户端模版/Resources/RolesNode_Valid_Closed.png b/软件系统客户端模版/Resources/RolesNode_Valid_Closed.png new file mode 100644 index 0000000..95f7588 Binary files /dev/null and b/软件系统客户端模版/Resources/RolesNode_Valid_Closed.png differ diff --git a/软件系统客户端模版/软件系统客户端模版.csproj b/软件系统客户端模版/软件系统客户端模版.csproj index 122307a..6866d61 100644 --- a/软件系统客户端模版/软件系统客户端模版.csproj +++ b/软件系统客户端模版/软件系统客户端模版.csproj @@ -131,6 +131,8 @@ + +