SVN r880

SVN-Revision: r880

插件库/Lskj.Main/Control/GroupControl.Designer.cs

@@ -42,7 +42,7 @@ namespace Lskj.Main.Control
             this.topTipsPanel.Controls.Add(this.tipsLab);
             this.topTipsPanel.Controls.Add(this.whiteLab);
             this.topTipsPanel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.topTipsPanel.Location = new System.Drawing.Point(0, 0);
+            this.topTipsPanel.Location = new System.Drawing.Point(0, 16);
             this.topTipsPanel.Name = "topTipsPanel";
             this.topTipsPanel.Size = new System.Drawing.Size(757, 26);
             this.topTipsPanel.TabIndex = 3;
@@ -71,4 +71,5 @@ namespace Lskj.Main.Control
             // menuMainPanel
             // 
             this.menuMainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.menuMainPanel.Location = new System
+            this.menuMainPanel.Location = new System.Drawing.Point(0, 42);
+            this.menuMainPanel.Name = "menuMainPane

插件库/Lskj.Main/Control/MainPanelControlEx.Designer.cs

@@ -52,7 +52,7 @@
             this.pl_center_main_middle = new System.Windows.Forms.Panel();
             this.allPanel = new System.Windows.Forms.Panel();
             this.allMenuPanel = new System.Windows.Forms.Panel();
-            this.panel2 = new System.Windows.Forms.Panel();
+            this.botTipsPanel = new System.Windows.Forms.Panel();
             this.allTipsLab = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.panelSplit = new System.Windows.Forms.Panel();
@@ -129,7 +129,7 @@
             this.splitMainControl.SuspendLayout();
             this.pl_center_main_middle.SuspendLayout();
             this.allPanel.SuspendLayout();
-            this.panel2.SuspendLayout();
+            this.botTipsPanel.SuspendLayout();
             this.panelSplit.SuspendLayout();
             this.collectPanel.SuspendLayout();
             this.topTipsPanel.SuspendLayout();
@@ -359,7 +359,7 @@
             // allPanel
             // 
             this.allPanel.Controls.Add(this.allMenuPanel);
-            this.allPanel.Controls.Add(this.panel2);
+            this.allPanel.Controls.Add(this.botTipsPanel);
             this.allPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.allPanel.Location = new System.Drawing.Point(15, 242);
             this.allPanel.Margin = new System.Windows.Forms.Padding(0);
@@ -377,16 +377,16 @@
             this.allMenuPanel.Size = new System.Drawing.Size(866, 301);
             this.allMenuPanel.TabIndex = 6;
             // 
-            // panel2
+            // botTipsPanel
             // 
-            this.panel2.BackColor = System.Drawing.SystemColors.Control;
+            this.botTipsPanel.BackColor = System.Drawing.SystemColors.Control;
-            this.panel2.Controls.Add(this.allTipsLab);
+            this.botTipsPanel.Controls.Add(this.allTipsLab);
-            this.panel2.Controls.Add(this.label4);
+            this.botTipsPanel.Controls.Add(this.label4);
-            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
+            this.botTipsPanel.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.botTipsPanel.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Name = "panel2";
+            this.botTipsPanel.Name = "botTipsPanel";
-            this.panel2.Size = new System.Drawing.Size(866, 26);
+            this.botTipsPanel.Size = new System.Drawing.Size(866, 26);
-            this.panel2.TabIndex = 5;
+            this.botTipsPanel.TabIndex = 5;
             // 
             // allTipsLab
             // 
@@ -459,7 +459,7 @@
             this.collectMenuPanel.Margin = new System.Windows.Forms.Padding(0);
             this.collectMenuPanel.Name = "collectMenuPanel";
             this.collectMenuPanel.Size = new System.Drawing.Size(866, 194);
-            this.collectMenuPanel.TabIndex = 6;
+            this.collectMenuPanel.TabIndex = 7;
             // 
             // topTipsPanel
             // 
@@ -1174,7 +1174,7 @@
             this.splitMainControl.ResumeLayout(false);
             this.pl_center_main_middle.ResumeLayout(false);
             this.allPanel.ResumeLayout(false);
-            this.panel2.ResumeLayout(false);
+            this.botTipsPanel.ResumeLayout(false);
             this.panelSplit.ResumeLayout(false);
             this.collectPanel.ResumeLayout(false);
             this.topTipsPanel.ResumeLayout(false);
@@ -1277,4 +1277,4 @@
         private System.Windows.Forms.Panel pl_center_main_bottom_right_main;
         private System.Windows.Forms.Panel panel6;
         private System.Windows.Forms.Label lblShortcutset;
-        private System.Wi
+        private System.Windows.

插件库/Lskj.Main/Control/MainPanelControlEx.cs

@@ -186,6 +186,10 @@ namespace Lskj.Main.Control
         /// </summary>
         private bool isFlowLayout = false;
         /// <summary>
+        ///分组时快捷菜单是否显示在内部
+        /// </summary>
+        private bool isShowGrallyInTop = false;
+        /// <summary>
         ///模式3打开，上一次点击的时间
         /// </summary>
         public DateTime lastClickTime;
@@ -647,6 +651,12 @@ namespace Lskj.Main.Control
         /// </summary>
         private void SetMenus()
         {
+            string[] menuFiles = null;
+            if (Directory.Exists(PubUtil.ModuleDefaultPath))
+            {
+                menuFiles = Directory.GetFiles(PubUtil.ModuleDefaultPath);
+            }
+            Random rand = new Random();
             DataTable gallerys = MainImpl.GetGallerysByUserId();
             var baseTable = gallerys.Select("grouptagid=1");
             var reportTable = gallerys.Select("grouptagid=2");
@@ -663,7 +673,8 @@ namespace Lskj.Main.Control
             {
                 int buttonTop = Convert.ToInt32(0.05 * DpiY); // 按钮上边距
                 int menuLeft = Convert.ToInt32(0.05 * DpiY), menuTop = Convert.ToInt32(0.05 * DpiY);  // 模块距离左边距,模块距离顶部边距
-                int menuWidth = Convert.ToInt32(2.92 * DpiX), menuHeight = Convert.ToInt32(0.73 * DpiY); // 模块宽度，模块高度
+                int menuWidth = Convert.ToInt32(2.5 * DpiX), menuHeight = Convert.ToInt32(0.73 * DpiY); // 模块宽度，模块高度
+                int buttonWidth = Convert.ToInt32(0.44 * DpiX), buttonHeight = Convert.ToInt32(0.44 * DpiY); // 模块宽度，模块高度
                 //int centerWidth = pl_center_main.Width - pl_center_main_right.Width; // 内容区域宽度-右侧快捷栏宽度
                 int centerWidth = pl_center_main_middle.Width; // 内容区域宽度
                 string defaultParentMenu = string.Empty;
@@ -674,16 +685,28 @@ namespace Lskj.Main.Control
                 {
                     pl_center_left.Width = SystemInfo.Instance.MenuBarWidth;
                 }
-                if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
+                #region 添加我的收藏快捷菜单
+                isShowGrallyInTop = SystemInfo.Instance.ShowGrallyInTop;
+                if (!isShowGrallyInTop)
+                {
+                    collectPanel.Visible = false;
+                    panelSplit.Visible = false;
+                    botTipsPanel.Visible = false;
+                }
+                if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout && isShowGrallyInTop)
                 {
-                    //添加我的收藏快捷菜单
                     GroupControl baseGroupControl = new GroupControl();
+                    baseGroupControl.TipsLabel.ForeColor = Color.DimGray;
                     GroupControl reportGroupControl = new GroupControl();
+                    reportGroupControl.TipsLabel.ForeColor = Color.DimGray;
                     FlowLayoutPanel baseFlowPanel = new FlowLayoutPanel();
                     FlowLayoutPanel reportFlowPanel = new FlowLayoutPanel();
+                    baseFlowPanel.Padding = new Padding(menuLeft, 0, 0, 0);
+                    baseFlowPanel.Margin = new Padding(0, 0, 0, 0);
+                    reportFlowPanel.Padding = new Padding(menuLeft, 0, 0, 0);
+                    reportFlowPanel.Margin = new Padding(0, 0, 0, 0);
                     if (baseTable.Count() > 0)
                     {
-                        baseGroupControl.Dock = DockStyle.Top;
                         baseFlowPanel.Dock = DockStyle.Fill;
                         baseFlowPanel.FlowDirection = FlowDirection.LeftToRight;
                         baseGroupControl.MenuPanel.Controls.Add(baseFlowPanel);
@@ -694,15 +717,29 @@ namespace Lskj.Main.Control
                             string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
                             string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
                             Menu_ItemNew menu = new Menu_ItemNew();
+                            menu.Margin = new Padding(0, 0, 20, 0);
                             menu.Name = groupMenuId;
                             menu.Size = new Size(menuWidth, menuHeight);
+                            menu.GetLabelTitle().ForeColor = Color.FromArgb(88, 85, 85);
+                            menu.GetButton().Size = new Size(buttonWidth, buttonHeight);
                             menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
                             menu.SetSubCaption(dataRow["SubSysName"] + "-" + dataRow["menucaption"]);
                             menu.SetRoundRadius = 20;
                             menu.Tag = menuTag;
                             menu.Click += OnMenuItemClick;
-                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
+                            string randomImage = "";
-                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
+                            if (Directory.Exists(PubUtil.ModuleDefaultPath))
+                            {
+                                string[] files = Directory.GetFiles("Images\\Main\\Module\\Default");
+                                if (files.Length > 0)
+                                {
+                                    int index = rand.Next(files.Length);
+                                    randomImage = files[index];
+                                }
+                            }
+                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : File.Exists(randomImage) ? Image.FromFile(randomImage) : Resources.default_icon);
+                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : File.Exists(PubUtil.ModuleHoverImg) ? Image.FromFile(PubUtil.ModuleHoverImg) : Resources.default_icon);
+                            menu.SetMenuHoverBorderImg(File.Exists(PubUtil.ModuleChooesImg) ? Image.FromFile(PubUtil.ModuleChooesImg) : null);
                             baseFlowPanel.Controls.Add(menu);
                             this._menuItemList.Add(menu);
                             //DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
@@ -713,12 +750,12 @@ namespace Lskj.Main.Control
                                 countSqls.Add(groupMenuId, countSql);
                             }
                         }
+                        baseGroupControl.Dock = DockStyle.Top;
                         collectMenuPanel.Controls.Add(baseGroupControl);
                         baseGroupControl.TipsText = $"快捷操作通道（{baseTable.Count()}）";
                     }
                     if (reportTable.Count() > 0)
                     {
-                        reportGroupControl.Dock = DockStyle.Top;
                         reportFlowPanel.Dock = DockStyle.Fill;
                         reportFlowPanel.FlowDirection = FlowDirection.LeftToRight;
                         reportGroupControl.MenuPanel.Controls.Add(reportFlowPanel);
@@ -729,15 +766,28 @@ namespace Lskj.Main.Control
                             string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
                             string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
                             Menu_ItemNew menu = new Menu_ItemNew();
+                            menu.Margin = new Padding(0, 0, 20, 0);
                             menu.Name = groupMenuId;
                             menu.Size = new Size(menuWidth, menuHeight);
+                            menu.GetLabelTitle().ForeColor = Color.FromArgb(88, 85, 85);
+                            menu.GetButton().Size = new Size(buttonWidth, buttonHeight);
                             menu.SetMenuCaption(dataRow["dllShowCaption"] + "");
                             menu.SetSubCaption(dataRow["SubSysName"] + "-" + dataRow["menucaption"]);
                             menu.SetRoundRadius = 20;
                             menu.Tag = menuTag;
                             menu.Click += OnMenuItemClick;
-                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
+                            string randomImage = "";
-                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
+                            if (Directory.Exists(PubUtil.ModuleDefaultPath))
+                            {
+                                if (menuFiles.Length > 0)
+                                {
+                                    int index = rand.Next(menuFiles.Length);
+                                    randomImage = menuFiles[index];
+                                }
+                            }
+                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : File.Exists(randomImage) ? Image.FromFile(randomImage) : Resources.default_icon);
+                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : File.Exists(PubUtil.ModuleHoverImg) ? Image.FromFile(PubUtil.ModuleHoverImg) : Resources.default_icon);
+                            menu.SetMenuHoverBorderImg(File.Exists(PubUtil.ModuleChooesImg) ? Image.FromFile(PubUtil.ModuleChooesImg) : null);
                             reportFlowPanel.Controls.Add(menu);
                             this._menuItemList.Add(menu);
                             //DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
@@ -748,24 +798,42 @@ namespace Lskj.Main.Control
                                 countSqls.Add(groupMenuId, countSql);
                             }
                         }
+                        reportGroupControl.Dock = DockStyle.Top;
                         collectMenuPanel.Controls.Add(reportGroupControl);
                         reportGroupControl.TipsText = $"快捷报表通道（{reportTable.Count()}）";
                     }
-                    reportGroupControl.Height = reportFlowPanel.Controls[reportFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
+                    if (reportTable.Count() > 0)
-                    baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
-                    collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
-                    collectPanel.SizeChanged += (s, e) =>
                     {
-                        reportGroupControl.Height = reportFlowPanel.Controls[reportFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
+                        reportGroupControl.Height = reportFlowPanel.Controls[reportFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28 + 16;
-                        baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
+                    }
-                        collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
+                    if (baseTable.Count() > 0)
-                    };
+                    {
+                        baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28 + 16;
+                    }
+                    collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
                     if (reportTable.Count() == 0 && baseTable.Count() == 0)
                     {
                         collectPanel.Visible = false;
+                        panelSplit.Visible = false;
+                    }
+                    if (reportTable.Count() > 0 || baseTable.Count() > 0)
+                    {
+                        collectPanel.SizeChanged += (s, e) =>
+                        {
+                            if (reportTable.Count() > 0)
+                            {
+                                reportGroupControl.Height = reportFlowPanel.Controls[reportFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28 + 16;
+                            }
+                            if (baseTable.Count() > 0)
+                            {
+                                baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28 + 16;
+                            }
+                            collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
+                        };
                     }
                     this.splitMainControl.Panel2Collapsed = true;
                 }
+                #endregion
                 foreach (DataRow item in rows)
                 {
                     string menuStruct = item["menustruct"] + "";
@@ -946,14 +1014,20 @@ namespace Lskj.Main.Control
                                 Panel groupPanel = new Panel();
                                 groupPanel.AutoScroll = true;
                                 groupPanel.Dock = DockStyle.Fill;
+                                int groupControlIndex = 0;
                                 foreach (IGrouping<int, DataRow> groupByDataRow in groupByDataRows)
                                 {
                                     int nowRowCount = 1;//当前行数
                                     int minMenuRow = this._allMenus.Columns.Contains("menuRow") ? groupByDataRow.Min(n => Convert.ToInt32(n["menuRow"])) : 1;
                                     int menuGroupLeft = Convert.ToInt32(0.05 * DpiY);
-                                    int menuGroupTop = Convert.ToInt32(0.05 * DpiY);  // 模块距离左边距,模块距离顶部边距
+                                    int menuGroupTop = 0;  // 模块距离左边距,模块距离顶部边距
                                     GroupControl groupControl = new GroupControl();
+                                    groupControl.TipsLabel.ForeColor = Color.DimGray;
                                     groupControl.Dock = DockStyle.Top;
+                                    if (groupControlIndex == groupByDataRows.Count() - 1 && !isShowGrallyInTop)
+                                    {
+                                        groupControl.Padding = new Padding(0, 0, 0, 0);
+                                    }
                                     groupPanel.Controls.Add(groupControl);
                                     List<DataRow> groupOrderDataRow = groupByDataRow.ToList();
                                     if (this._allMenus.Columns.Contains("menuRow"))
@@ -976,6 +1050,7 @@ namespace Lskj.Main.Control
                                                 groupIndex = groupByDataRows.Where(n => !n.Key.Equals(99)).Count() > 0 ? groupByDataRows.Where(n => !n.Key.Equals(99)).Max(n => n.Key) + 1 : 1;
                                             }
                                             Menu_ItemNew menu = new Menu_ItemNew();
+                                            menu.GetLabelTitle().ForeColor = Color.FromArgb(88, 85, 85);
                                             menu.menuRow = dataRow.Table.Columns.Contains("menuRow") && !string.IsNullOrEmpty(dataRow["menuRow"] + "") ? Convert.ToInt32(dataRow["menuRow"] + "") : 1;
                                             menu.menuGroup = groupIndex;
                                             if ((menu.menuRow - minMenuRow + 1) > nowRowCount + 1)
@@ -991,14 +1066,25 @@ namespace Lskj.Main.Control
                                             }
                                             menu.Name = groupMenuId;
                                             menu.Size = new Size(menuWidth, menuHeight);
+                                            menu.GetButton().Size = new Size(buttonWidth, buttonHeight);
                                             menu.menuNode = (dataRow["menustruct"] + "").Substring(0, 2);
                                             menu.SetMenuCaption(dataRow["menucaption"] + "");
                                             menu.SetSubCaption(dataRow["SubSysName"] + "-" + item["menucaption"]);
                                             menu.SetRoundRadius = 20;
                                             menu.Tag = menuTag;
                                             menu.Click += OnMenuItemClick;
-                                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
+                                            string randomImage = "";
-                                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
+                                            if (Directory.Exists(PubUtil.ModuleDefaultPath))
+                                            {
+                                                if (menuFiles.Length > 0)
+                                                {
+                                                    int index = rand.Next(menuFiles.Length);
+                                                    randomImage = menuFiles[index];
+                                                }
+                                            }
+                                            menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : File.Exists(randomImage) ? Image.FromFile(randomImage) : Resources.default_icon);
+                                            menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : File.Exists(PubUtil.ModuleHoverImg) ? Image.FromFile(PubUtil.ModuleHoverImg) : Resources.default_icon);
+                                            menu.SetMenuHoverBorderImg(File.Exists(PubUtil.ModuleChooesImg) ? Image.FromFile(PubUtil.ModuleChooesImg) : null);
                                             // 116
                                             //menuGroupLeft += Convert.ToInt32(1.20 * DpiX);
                                             //后台配置模块所在行数
@@ -1018,7 +1104,7 @@ namespace Lskj.Main.Control
                                                     nowRowCount = (menu.menuRow - minMenuRow + 1);
                                                 }
                                                 menu.Location = new Point(menuGroupLeft, menuGroupTop);
-                                                menuGroupLeft += Convert.ToInt32(2.92 * DpiX);
+                                                menuGroupLeft += Convert.ToInt32(2.5 * DpiX) + 20;
                                                 //int count = _menuItemList.Where(o => o.menuGroup == menu.menuGroup && o.menuRow == menu.menuRow && o.menuNode == menu.menuNode).Count();
                                                 //menuGroupLeft = count == 0 ? 5 : count * Convert.ToInt32(1.20 * DpiX) + 5;
                                                 //menuGroupTop = menuHeight * (menu.menuRow - minMenuRow);
@@ -1027,7 +1113,7 @@ namespace Lskj.Main.Control
                                             else
                                             {
                                                 menu.Location = new Point(menuGroupLeft, menuGroupTop);
-                                                menuGroupLeft += Convert.ToInt32(2.92 * DpiX);
+                                                menuGroupLeft += Convert.ToInt32(2.5 * DpiX) + 20;
                                                 // 换行显示
                                                 if (menuGroupLeft + menuWidth > centerWidth)
                                                 {
@@ -1058,8 +1144,9 @@ namespace Lskj.Main.Control
                                             count += 1;
                                         }
                                     }
+                                    groupControlIndex += 1;
                                     groupControl.TipsText = $"{groupControl.TipsText}({count})";
-                                    groupControl.Height = (int)(menuGroupTop + menuHeight + 28);
+                                    groupControl.Height = (int)(menuGroupTop + menuHeight + 28 + 16);
                                 }
                                 if (groupPanel.Controls.Count == 1)
                                 {
@@ -1072,8 +1159,13 @@ namespace Lskj.Main.Control
                                 // 默认显示
                                 if (defaultParentMenu == menuStruct)
                                 {
-                                    this.allMenuPanel.Controls.Clear();
                                     this.allMenuPanel.Controls.Add(groupPanel);
+                                    groupPanel.Visible = true;
+                                }
+                                else
+                                {
+                                    this.allMenuPanel.Controls.Add(groupPanel);
+                                    groupPanel.Visible = false;
                                 }
                             }
                             #endregion
@@ -2279,6 +2371,7 @@ namespace Lskj.Main.Control
                             if (this._groupItems.ContainsKey(item_after["menustruct"] + ""))
                             {
                                 Panel groupPanel = this._groupItems[item_after["menustruct"] + ""];
+                                groupPanel.Visible = true;
                                 allMenuPanel.Controls.Add(groupPanel);
                             }
                         }
@@ -4160,7 +4253,7 @@ namespace Lskj.Main.Control
                         if (SystemInfo.Instance.DesktopFormatShowGallerys)
                         {
                             this.splitMainControl.Panel2Collapsed = false;
-                            if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout)
+                            if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout && isShowGrallyInTop)
                             {
                                 this.splitMainControl.Panel2Collapsed = true;
                             }
@@ -4178,7 +4271,7 @@ namespace Lskj.Main.Control
                         tabPage.Controls.Add(this.FirstMain);
                         this.webBrowser.Show();
                         this.webBrowser.BringToFront();
-                        if (this.webBrowser.cefBrowserSettings != null) this.webBrowser.cefBrowserSettings.Reload();
+                        //if (this.webBrowser.cefBrowserSettings != null) this.webBrowser.cefBrowserSettings.Reload();
                         int MemuEventType = 1;
                         //左侧二级目录菜单设置为单击切换模式
                         foreach (System.Windows.Forms.Control item in pl_center_left.Controls)

插件库/Lskj.Main/Control/Menu_ItemNew.Designer.cs

@@ -9,7 +9,8 @@
         #region 设计器生成
         private void InitializeComponent()
         {
-            this.toolTip1 = new System.Windows.Forms.ToolTip();
+            this.components = new System.ComponentModel.Container();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.btn_icon = new System.Windows.Forms.Button();
             this.badgeNum = new System.Windows.Forms.Label();
             this.lbl_title = new System.Windows.Forms.Label();
@@ -23,9 +24,10 @@
             this.btn_icon.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.btn_icon.FlatAppearance.BorderSize = 0;
             this.btn_icon.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btn_icon.Location = new System.Drawing.Point(12, 9);
+            this.btn_icon.Location = new System.Drawing.Point(20, 14);
+            this.btn_icon.Margin = new System.Windows.Forms.Padding(0);
             this.btn_icon.Name = "btn_icon";
-            this.btn_icon.Size = new System.Drawing.Size(46, 46);
+            this.btn_icon.Size = new System.Drawing.Size(42, 42);
             this.btn_icon.TabIndex = 0;
             this.btn_icon.TabStop = false;
             this.btn_icon.UseVisualStyleBackColor = false;
@@ -45,8 +47,8 @@
             // lbl_title
             // 
             this.lbl_title.AutoSize = true;
-            this.lbl_title.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold);
+            this.lbl_title.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F, System.Drawing.FontStyle.Bold);
-            this.lbl_title.Location = new System.Drawing.Point(70, 12);
+            this.lbl_title.Location = new System.Drawing.Point(76, 14);
             this.lbl_title.Name = "lbl_title";
             this.lbl_title.Size = new System.Drawing.Size(65, 19);
             this.lbl_title.TabIndex = 3;
@@ -55,11 +57,11 @@
             // lbl_sub
             // 
             this.lbl_sub.AutoSize = true;
-            this.lbl_sub.Font = new System.Drawing.Font("Microsoft YaHei UI", 8.25F);
+            this.lbl_sub.Font = new System.Drawing.Font("Microsoft YaHei UI", 8.5F);
             this.lbl_sub.ForeColor = System.Drawing.Color.DimGray;
-            this.lbl_sub.Location = new System.Drawing.Point(72, 36);
+            this.lbl_sub.Location = new System.Drawing.Point(78, 39);
             this.lbl_sub.Name = "lbl_sub";
-            this.lbl_sub.Size = new System.Drawing.Size(83, 16);
+            this.lbl_sub.Size = new System.Drawing.Size(91, 17);
             this.lbl_sub.TabIndex = 4;
             this.lbl_sub.Text = "模块分类 · 说明";
             // 
@@ -73,10 +75,15 @@
             this.badgeDot.ForeColor = System.Drawing.Color.White;
             this.badgeDot.ImageHover = null;
             this.badgeDot.ImageNormal = null;
-            this.badgeDot.Location = new System.Drawing.Point(47, 0);
+            this.badgeDot.Location = new System.Drawing.Point(48, 8);
             this.badgeDot.Name = "badgeDot";
             this.badgeDot.Number = 0;
             this.badgeDot.Radius = 9;
             this.badgeDot.TabIndex = 1;
             this.badgeDot.UseVisualStyleBackColor = false;
-            this.badgeDot.Visible = f
+            this.badgeDot.Visible = false;
+            // 
+            // Menu_ItemNew
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+   

插件库/Lskj.Main/Control/Menu_ItemNew.cs

@@ -20,7 +20,7 @@ namespace Lskj.Main.Control
 
         /* —— 状态 —— */
         private bool _isHover;
-        private Image _imgDefault, _imgHover;
+        private Image _imgDefault, _imgHover, _imgBorderHover;
         private int _radius = 10;
 
         /* —— 外部信息 —— */
@@ -65,6 +65,7 @@ namespace Lskj.Main.Control
         { _imgDefault = img; btn_icon.BackgroundImage = img; }
 
         public void SetMenuHoverImg(Image img) => _imgHover = img;
+        public void SetMenuHoverBorderImg(Image img) => _imgBorderHover = img;
 
         public void SetMenuNum(int num)
         {
@@ -95,6 +96,8 @@ namespace Lskj.Main.Control
             set => CornerRadius = value;
         }
         public Button GetButton() => btn_icon;
+        public Label GetLabelTitle() => lbl_title;
+        public Label GetLabelTitleSub() => lbl_sub;
 
         /* ===== 悬停逻辑 ===== */
         private void HoverEnter(object s, EventArgs e)
@@ -103,6 +106,10 @@ namespace Lskj.Main.Control
             _isHover = true;
             //BackColor = _hoverBack;
             btn_icon.BackgroundImage = _imgHover ?? _imgDefault;
+            if (_imgBorderHover != null)
+            {
+                this.BackgroundImage = _imgBorderHover;
+            }
             Cursor = Cursors.Hand;
             Invalidate();
         }
@@ -110,21 +117,4 @@ namespace Lskj.Main.Control
         {
             if (ClientRectangle.Contains(PointToClient(System.Windows.Forms.Control.MousePosition))) return;
             _isHover = false;
-            //BackColor = _normalBack;
+            //BackCol
-            btn_icon.BackgroundImage = _imgDefault;
-            Invalidate();
-        }
-        private void BindHover(System.Windows.Forms.Control ctl)
-        {
-            ctl.MouseEnter += HoverEnter;
-            ctl.MouseLeave += HoverLeave;
-        }
-
-        /* ===== 绘制高亮边框（无圆角） ===== */
-        protected override void OnPaint(PaintEventArgs e)
-        {
-            base.OnPaint(e);
-            if (!_isHover) return;
-
-            var rc = new Rectangle(0, 0, Width - 1, Height - 1);
-      

插件库/Lskj.Main/Properties/Resources.Designer.cs

@@ -150,6 +150,16 @@ namespace Lskj.Main.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap chooes {
+            get {
+                object obj = ResourceManager.GetObject("chooes", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

插件库/Lskj.Main/Properties/Resources.resx

@@ -139,24 +139,30 @@
   <data name="max_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\max_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="login_close_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\login_close_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="sub_btn_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sub_btn_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="the_asphalt_world" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\the_asphalt_world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="pumpkin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pumpkin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="whiteprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="workSplit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\whiteprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\分隔符.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="money_twins" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\money_twins.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="office_2007_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\office_2007_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="office_2010_bule" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\office_2010_bule.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="springtime" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\springtime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="newlogin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\newlogin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -172,11 +178,8 @@
   <data name="darkroom" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\darkroom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="office_2007_pink" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="sub_page_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\office_2007_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\sub_page_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="springtime" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\springtime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="left_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\left_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -184,12 +187,12 @@
   <data name="登录" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\登录.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="tab_bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tab_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="search_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\search_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="node2_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\node2_default_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -199,8 +202,8 @@
   <data name="sub_tip_backgound" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_tip_backgound.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sub_sczw" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="node2_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sub_sczw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\node2_child_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="window_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\window_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -211,15 +214,15 @@
   <data name="sub_btn_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_btn_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="node_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\node_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="window_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\window_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="login_btn" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\login_btn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="sub_xkbackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\sub_xkbackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="sub_scgx" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_scgx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -235,14 +238,11 @@
   <data name="darkside" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\darkside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="seven" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\seven.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="login_close_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\login_close_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="node2_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="stardust" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\node2_child_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\stardust.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lilian" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lilian.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -262,14 +262,14 @@
   <data name="devexpress_2013_light_gray" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\devexpress_2013_light_gray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="stardust" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="tab_bg" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\stardust.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\tab_bg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="metropolis_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\metropolis_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="imaginary" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="小红点" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\imaginary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\小红点.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="tab_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tab_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -277,18 +277,15 @@
   <data name="left_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\left_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sub_page_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sub_page_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="workSplit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\分隔符.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="highcontrast" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\highcontrast.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="version" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\version.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="whiteprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\whiteprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="default_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\default_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,6 +310,9 @@
   <data name="split" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="node_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\node_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="sub_khgl" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_khgl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -322,11 +322,11 @@
   <data name="max_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\max_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sub_xkbackground" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="office_2007_pink" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sub_xkbackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\office_2007_pink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="sub_btn_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="node_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\sub_btn_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\node_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sub_btn_min_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_btn_min_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -340,6 +340,9 @@
   <data name="foggy" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\foggy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Whiteprint2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Whiteprint2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="vs_2010" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\vs_2010.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -358,11 +361,11 @@
   <data name="tab_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tab_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="xmas_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="seven" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\xmas_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\seven.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="login_close_default" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="imaginary" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\login_close_default.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\imaginary.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -388,8 +391,8 @@
   <data name="caffee" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\caffee.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="node_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="office_2007_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\node_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\office_2007_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="smail_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\smail_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -409,8 +412,8 @@
   <data name="node2_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\node2_chaild_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Whiteprint2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="xmas_blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Whiteprint2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\xmas_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="sub_scl" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_scl.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -427,8 +430,8 @@
   <data name="sub_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="sub_sczw" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\sub_sczw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="node3_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\node3_select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -451,7 +454,7 @@
   <data name="sub_khgx" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sub_khgx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="小红点" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="chooes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\小红点.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\chooes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>