From 50a42e5d72e2f8cf92ff9b2273e0442977dbcefd Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期三, 18 十二月 2024 18:28:02 +0800
Subject: [PATCH] 1. 对话框基类添加动态控件管理 2. 对话框基类主题切换功能

---
 SourceCode/Bond/BondEq/BondEqDlg.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index e30ac6f..5c78256 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -16,6 +16,8 @@
 #include "UserManagerDlg.h"
 #include "SystemLogManagerDlg.h"
 
+// 测试
+#include "RecipeListDlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -251,10 +253,12 @@
 
 	// 设置配方文件夹路径
 	RecipeManager& recipeManager = RecipeManager::getInstance();
-	std::string strRecipePath =  CToolUnits::getCurrentExePath() + _T("\\Recipe");
+	std::string strRecipePath =  CToolUnits::getRecipePath();
 	CToolUnits::createDir(strRecipePath.c_str());
 	recipeManager.setRecipeFolder(strRecipePath);
-
+	if (!recipeManager.loadRecipe("Default")) {
+		AfxMessageBox("Default 配方加载失败!");
+	}
 
 	// 菜单
 	CMenu menu;
@@ -538,8 +542,11 @@
 
 void CBondEqDlg::OnMenuFileSettings()
 {
-	CSettingsDlg dlg;
+	CRecipeListDlg dlg;
 	dlg.DoModal();
+
+	//CSettingsDlg dlg;
+	//dlg.DoModal();
 }
 
 void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)

--
Gitblit v1.9.3