From aac3b319965967f465881f3a8961904d57b6f337 Mon Sep 17 00:00:00 2001
From: zxd <zxdvslxy@gmail.com>
Date: 星期四, 28 九月 2023 17:01:41 +0800
Subject: [PATCH] 节前提交，包含部分图码的转换，提出单独函数专做转换
---
MTerm1/MainFrm.h | 90 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 68 insertions(+), 22 deletions(-)
diff --git a/MTerm1/MainFrm.h b/MTerm1/MainFrm.h
index a0daa96..abe45d0 100644
--- a/MTerm1/MainFrm.h
+++ b/MTerm1/MainFrm.h
@@ -3,10 +3,18 @@
//
#pragma once
-#include "FileView.h"
-#include "ClassView.h"
-#include "OutputWnd.h"
-#include "PropertiesWnd.h"
+#include "NavView.h"
+#include "MyPaneLog.h"
+
+//class CMyPaneLog;
+#include "MyDialogLog.h"
+#include "../MyLib/StaticEx.h"
+#include "CMyFuncKeyToolBar.h"
+#include "MyDlgBarFuncKey.h"
+#include "MyDialogLog.h"
+#include "MyDlgBarInputShow.h"
+#include "CMyPaneInputShow.h"
+
class CMainFrame : public CMDIFrameWndEx
{
@@ -23,8 +31,7 @@
// 閲嶅啓
public:
virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
- virtual BOOL LoadFrame(UINT nIDResource, DWORD dwDefaultStyle = WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, CWnd* pParentWnd = nullptr, CCreateContext* pContext = nullptr);
-
+ CMFCStatusBar m_wndStatusBar;
// 瀹炵幇
public:
virtual ~CMainFrame();
@@ -34,28 +41,67 @@
#endif
protected: // 鎺т欢鏉″祵鍏ユ垚鍛�
- CMFCMenuBar m_wndMenuBar;
- CMFCToolBar m_wndToolBar;
- CMFCStatusBar m_wndStatusBar;
- CMFCToolBarImages m_UserImages;
- CFileView m_wndFileView;
- CClassView m_wndClassView;
- COutputWnd m_wndOutput;
- CPropertiesWnd m_wndProperties;
+ CMFCToolBar m_wndToolBar;
+
+// CMyFuncKeyToolBar m_wndToolBar_Func_Key;
+// CMyDlgBarFuncKey m_wndDlgBar_Func_Key;
+// CToolBar m_wndTBar_Edit_Key;
+// CToolBar m_wndTBar_Num_Key;
+// CToolBar m_wndTBar_InputShow;
+// CMyDlgBarInputShow m_wndDlgBar_InputShow;
+
+// CToolBar m_wndToolBar_Comments;
+
+ CNavView m_wndNavView;
+
+// CEdit m_InputShowEdit;
+// CStaticEx m_InputShowStatic;
+
+
+ CMyPaneLog m_wndMyPaneLog;
+// CMyDialogLog m_dlgMyLog;
+
+
+ CMyPaneInputShow m_wndMyPaneInputShow;
// 鐢熸垚鐨勬秷鎭槧灏勫嚱鏁�
protected:
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
- afx_msg void OnWindowManager();
- afx_msg void OnViewCustomize();
- afx_msg LRESULT OnToolbarCreateNew(WPARAM wp, LPARAM lp);
- afx_msg void OnApplicationLook(UINT id);
- afx_msg void OnUpdateApplicationLook(CCmdUI* pCmdUI);
- afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection);
DECLARE_MESSAGE_MAP()
- BOOL CreateDockingWindows();
- void SetDockingWindowIcons(BOOL bHiColorIcons);
+public:
+ afx_msg void OnUploadFromPlc();
+ afx_msg void OnViewFunckeyBar();
+ afx_msg void OnUpdateViewFunckeyBar(CCmdUI *pCmdUI);
+ afx_msg void OnViewInputBar();
+ afx_msg void OnUpdateViewInputBar(CCmdUI *pCmdUI);
+ afx_msg void OnViewNumkeyBar();
+ afx_msg void OnUpdateViewNumkeyBar(CCmdUI *pCmdUI);
+ afx_msg void OnViewInputsegBar();
+ afx_msg void OnUpdateViewInputsegBar(CCmdUI *pCmdUI);
+ afx_msg void OnViewCommentsBar();
+ afx_msg void OnUpdateViewCommentsBar(CCmdUI *pCmdUI);
+// afx_msg void OnMenuViewLds();
+// afx_msg void OnMenuViewBld();
+// afx_msg void OnMenuViewBnl();
+
+ int SetDisplayInfo(int Info);
+
+ CMyFormInputShow* GetInputWnd() {
+ return m_wndMyPaneInputShow.m_pMyFormInputShow;
+ };
+
+ int SetCellInfo(int info);
+ int GetInputInfo(int inputInfo);
+ int GetInputCell(tagInputCell inputCell);
+
+ afx_msg void OnMenuShowLog();
+ virtual BOOL OnCmdMsg(UINT nID, int nCode, void* pExtra, AFX_CMDHANDLERINFO* pHandlerInfo);
+
+ afx_msg void OnMenuShowDev();
+
+ afx_msg void OnMenuShownav();
};
+
--
Gitblit v1.9.1