From b22f76d1a80169a1b124d86c61c24e8032344e27 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期五, 21 二月 2025 17:48:28 +0800
Subject: [PATCH] 修复bug
---
Client/DesktopMain/MainWindow/frmMainWindow.cs | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/Client/DesktopMain/MainWindow/frmMainWindow.cs b/Client/DesktopMain/MainWindow/frmMainWindow.cs
index 1d22ad0..2eaea58 100644
--- a/Client/DesktopMain/MainWindow/frmMainWindow.cs
+++ b/Client/DesktopMain/MainWindow/frmMainWindow.cs
@@ -1,4 +1,5 @@
锘縰sing DPumpHydr.WinFrmUI.RLT.Controls;
+using DPumpHydr.WinFrmUI.RLT.Manager;
using System;
using System.Diagnostics;
using System.Drawing;
@@ -13,9 +14,15 @@
InitializeComponent();
this.WindowState = FormWindowState.Maximized;
this.Load += FrmMainWindow_Load;
- this.Icon = DPumpHydr.DesktopMain.Properties.Resources.App;
- }
+ LibraryMenu.Click += Menu_Click;
+ SettingMenu.Click += Menu_Click;
+ FindMenu.Click += Menu_Click;
+ VoluteMenu.Click += Menu_Click;
+ YeLunMenu.Click += Menu_Click;
+ }
+
+
private void FrmMainWindow_Load(object sender, EventArgs e)
{
DPumpHydr.WinFrmUI.Volute.MainViewPage page = new DPumpHydr.WinFrmUI.Volute.MainViewPage();
@@ -23,53 +30,71 @@
page.Name = "MainViewPage";
page.Dock = DockStyle.Fill;
this.mainPanel.Controls.Add(page);
+ VoluteSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ VoluteMenu.Side = NightPanel.PanelSide.Right;
+
+ mainForm.AppIcon = DPumpHydr.DesktopMain.Properties.Resources.AppIcon256;
+
}
private void Menu_Click(object sender, EventArgs e)
{
- NightPanel Menu = sender as NightPanel;
+ NightPanel leftMenu = sender as NightPanel;
- if (Menu.Name == "YeLunMenu")
+ if (leftMenu.Name == "YeLunMenu")
{
- HomeSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = HomePage;
+ YeLunSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ YeLunMenu.Side = NightPanel.PanelSide.Right;
+
+ //metroStyleManager1.Style = DPumpHydr.WinFrmUI.RLT.Enum.Metro.Style.Light;
}
else
{
- HomeSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ YeLunSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
YeLunMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "VoluteMenu")
+ if (leftMenu.Name == "VoluteMenu")
{
- AppSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = AppPage;
+ VoluteSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ VoluteMenu.Side = NightPanel.PanelSide.Right;
}
else
{
- AppSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ VoluteSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
VoluteMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "GameMenu")
+ if (leftMenu.Name == "FindMenu")
{
- GameSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
+ FindSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ FindMenu.Side = NightPanel.PanelSide.Right;
//Pages.SelectedTab = GamePage;
}
else
{
- GameSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- GameMenu.Side = NightPanel.PanelSide.Left;
+ FindSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ FindMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "SettingIcon")
+ if (leftMenu.Name == "SettingMenu")
+ {
+ SettingSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
+ SettingMenu.Side = NightPanel.PanelSide.Right;
+ //Pages.SelectedTab = LibraryPage;
+ }
+ else
+ {
+ SettingSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
+ SettingMenu.Side = NightPanel.PanelSide.Left;
+ }
+
+ if (leftMenu.Name == "LibraryMenu")
{
LibrarySeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = LibraryPage;
+ //HelpImage.Image = DPumpHydr.DesktopMain.Properties.Resources.Help;
+ LibraryMenu.Side = NightPanel.PanelSide.Right;
+ //Pages.SelectedTab = HelpPage;
}
else
{
@@ -77,21 +102,8 @@
LibraryMenu.Side = NightPanel.PanelSide.Left;
}
- if (Menu.Name == "HelpMenu")
- {
- HelpSeparator.Customization = "08aq/9PGqv/Txqr/08aq/w==";
- //HelpImage.Image = DPumpHydr.DesktopMain.Properties.Resources.Help;
- Menu.Side = NightPanel.PanelSide.Right;
- //Pages.SelectedTab = HelpPage;
- }
- else
- {
- HelpSeparator.Customization = "ICAg/yAgIP8gICD/ICAg/w==";
- HelpMenu.Side = NightPanel.PanelSide.Left;
- }
-
- Menu.Refresh();
- Menu.Invalidate();
+ leftMenu.Refresh();
+ leftMenu.Invalidate();
}
private void UserPicture_MouseEnter(object sender, EventArgs e)
--
Gitblit v1.9.3