From 84de229b2326081d2e00e3ffb6654baca72b7969 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期一, 16 十二月 2024 10:03:33 +0800
Subject: [PATCH] 1. 添加配方列表对话框
---
SourceCode/Bond/BondEq/Resource.h | 0
SourceCode/Bond/BondEq/BondEq.rc | 0
SourceCode/Bond/BondEq/View/RecipeLiseDlg.h | 28 ++++++++++++++
SourceCode/Bond/BondEq/View/RecipeLiseDlg.cpp | 35 +++++++++++++++++
SourceCode/Bond/BondEq/BondEqDlg.cpp | 8 +++
SourceCode/Bond/BondEq/BondEq.vcxproj | 2 +
6 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.rc b/SourceCode/Bond/BondEq/BondEq.rc
index a0dffc3..250728b 100644
--- a/SourceCode/Bond/BondEq/BondEq.rc
+++ b/SourceCode/Bond/BondEq/BondEq.rc
Binary files differ
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index a43d4f8..0a2cb62 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -263,6 +263,7 @@
<ClInclude Include="View\ChangePasswordDlg.h" />
<ClInclude Include="View\IOMonitoringDlg.h" />
<ClInclude Include="View\LoginDlg.h" />
+ <ClInclude Include="View\RecipeLiseDlg.h" />
<ClInclude Include="View\SystemLogManagerDlg.h" />
<ClInclude Include="View\UserManagerDlg.h" />
</ItemGroup>
@@ -343,6 +344,7 @@
<ClCompile Include="View\ChangePasswordDlg.cpp" />
<ClCompile Include="View\IOMonitoringDlg.cpp" />
<ClCompile Include="View\LoginDlg.cpp" />
+ <ClCompile Include="View\RecipeLiseDlg.cpp" />
<ClCompile Include="View\SystemLogManagerDlg.cpp" />
<ClCompile Include="View\UserManagerDlg.cpp" />
</ItemGroup>
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index e30ac6f..d4c6c60 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -16,6 +16,8 @@
#include "UserManagerDlg.h"
#include "SystemLogManagerDlg.h"
+// 测试
+#include "RecipeLiseDlg.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -538,8 +540,12 @@
void CBondEqDlg::OnMenuFileSettings()
{
- CSettingsDlg dlg;
+
+ CRecipeLiseDlg dlg;
dlg.DoModal();
+
+ //CSettingsDlg dlg;
+ //dlg.DoModal();
}
void CBondEqDlg::OnUpdateMenuFileSettings(CCmdUI* pCmdUI)
diff --git a/SourceCode/Bond/BondEq/Resource.h b/SourceCode/Bond/BondEq/Resource.h
index 38eeaf8..90ab0eb 100644
--- a/SourceCode/Bond/BondEq/Resource.h
+++ b/SourceCode/Bond/BondEq/Resource.h
Binary files differ
diff --git a/SourceCode/Bond/BondEq/View/RecipeLiseDlg.cpp b/SourceCode/Bond/BondEq/View/RecipeLiseDlg.cpp
new file mode 100644
index 0000000..a0c3848
--- /dev/null
+++ b/SourceCode/Bond/BondEq/View/RecipeLiseDlg.cpp
@@ -0,0 +1,35 @@
+锘�// RecipeLiseDlg.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "BondEq.h"
+#include "afxdialogex.h"
+#include "RecipeLiseDlg.h"
+
+
+// CRecipeLiseDlg 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CRecipeLiseDlg, CDialogEx)
+
+CRecipeLiseDlg::CRecipeLiseDlg(CWnd* pParent /*=nullptr*/)
+ : CDialogEx(IDD_DIALOG_RECIPE_LIST, pParent)
+{
+
+}
+
+CRecipeLiseDlg::~CRecipeLiseDlg()
+{
+}
+
+void CRecipeLiseDlg::DoDataExchange(CDataExchange* pDX)
+{
+ CDialogEx::DoDataExchange(pDX);
+ DDX_Control(pDX, IDC_CUSTOM_RECIPE_LIST, m_grid);
+}
+
+
+BEGIN_MESSAGE_MAP(CRecipeLiseDlg, CDialogEx)
+END_MESSAGE_MAP()
+
+
+// CRecipeLiseDlg 娑堟伅澶勭悊绋嬪簭
diff --git a/SourceCode/Bond/BondEq/View/RecipeLiseDlg.h b/SourceCode/Bond/BondEq/View/RecipeLiseDlg.h
new file mode 100644
index 0000000..230844b
--- /dev/null
+++ b/SourceCode/Bond/BondEq/View/RecipeLiseDlg.h
@@ -0,0 +1,28 @@
+锘�#pragma once
+#include "afxdialogex.h"
+#include "GridCtrl.h"
+
+
+// CRecipeLiseDlg 瀵硅瘽妗�
+
+class CRecipeLiseDlg : public CDialogEx
+{
+ DECLARE_DYNAMIC(CRecipeLiseDlg)
+
+public:
+ CRecipeLiseDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CRecipeLiseDlg();
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+ enum { IDD = IDD_DIALOG_RECIPE_LIST };
+#endif
+
+private:
+ CGridCtrl m_grid;
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+
+ DECLARE_MESSAGE_MAP()
+};
--
Gitblit v1.9.3