From 4fafc27775bc8d7ae23fd8d15bae54547d706830 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 15 十一月 2024 09:21:12 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 75bfce1..21935a5 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -12,6 +12,9 @@
#include "UserManager.h"
#include "LoginDlg.h"
+// test
+#include "AxisSettingsDlg.h"
+
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -195,6 +198,9 @@
m_pTopToolbar->Create(IDD_TOP_TOOLBAR, this);
m_pTopToolbar->ShowWindow(SW_SHOW);
m_pTopToolbar->GetBtn(IDC_BUTTON_STOP)->EnableWindow(FALSE);
+ HMENU hMenu = m_pTopToolbar->GetOperatorMenu();
+ ASSERT(hMenu);
+ ::EnableMenuItem(hMenu, ID_OPEATOR_SWITCH, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
// 设备面板
@@ -535,6 +541,9 @@
userManager.logout();
m_pTopToolbar->SetOperatorBtnText(_T("未登录"));
}
+
+ CAxisSettingsDlg loginDlg;
+ loginDlg.DoModal();
}
}
--
Gitblit v1.9.3