diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index bcb6cb1..14d6916 100644 Binary files a/server/2015Remote/2015Remote.rc and b/server/2015Remote/2015Remote.rc differ diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index c3db3e2..86b267b 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -653,6 +653,9 @@ CMy2015RemoteDlg::CMy2015RemoteDlg(CWnd* pParent): CDialogLangEx(CMy2015RemoteDl m_bmOnline[60].LoadBitmap(IDB_BITMAP_DEBUG); m_bmOnline[61].LoadBitmap(IDB_BITMAP_CLIENTLOG); m_bmOnline[62].LoadBitmap(IDB_BITMAP_FORBIDDEN); + m_bmOnline[63].LoadBitmap(IDB_BITMAP_HISTORY_ACTIVITY); // 历史活动 + m_bmOnline[64].LoadBitmap(IDB_BITMAP_VIEW_WND); // 浏览窗口 + m_bmOnline[65].LoadBitmap(IDB_BITMAP_PROXY_AUTORUN); // 代理端口-自启 for (int i = 0; i < PAYLOAD_MAXTYPE; i++) { m_ServerDLL[i] = nullptr; m_ServerBin[i] = nullptr; @@ -4160,6 +4163,8 @@ void CMy2015RemoteDlg::OnNMRClickOnline(NMHDR *pNMHDR, LRESULT *pResult) Menu.SetMenuItemBitmaps(ID_ONLINE_ACTIVE_WND, MF_BYCOMMAND, &m_bmOnline[59], &m_bmOnline[59]); Menu.SetMenuItemBitmaps(ID_ONLINE_CLIENT_LOG, MF_BYCOMMAND, &m_bmOnline[61], &m_bmOnline[61]); Menu.SetMenuItemBitmaps(ID_ONLINE_FORBIDDEN, MF_BYCOMMAND, &m_bmOnline[62], &m_bmOnline[62]); + Menu.SetMenuItemBitmaps(ID_ONLINE_VIEW_WND, MF_BYCOMMAND, &m_bmOnline[64], &m_bmOnline[64]); + Menu.SetMenuItemBitmaps(ID_PROXY_PORT_AUTORUN, MF_BYCOMMAND, &m_bmOnline[65], &m_bmOnline[65]); Menu.ModifyMenuL(ID_ONLINE_AUTHORIZE, MF_BYCOMMAND | MF_STRING, ID_ONLINE_AUTHORIZE, _T("发送授权")); @@ -4255,6 +4260,7 @@ void CMy2015RemoteDlg::OnNMRClickOnline(NMHDR *pNMHDR, LRESULT *pResult) CMenu* pClientMenu = FindSubMenuByCommand(SubMenu, ID_ONLINE_ASSIGN_TO); if (pClientMenu) { pClientMenu->InsertMenu(0, MF_BYPOSITION | MF_STRING, ID_ONLINE_HISTORY_ACTIVITY, _TR("历史活动")); + pClientMenu->SetMenuItemBitmaps(ID_ONLINE_HISTORY_ACTIVITY, MF_BYCOMMAND, &m_bmOnline[63], &m_bmOnline[63]); } // 创建一个新的子菜单 diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index 357b355..b2c7f66 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -390,7 +390,7 @@ public: bool IsDllRequestLimited(const std::string& ip); void RecordDllRequest(const std::string& ip); CMenu m_MainMenu; - CBitmap m_bmOnline[63]; + CBitmap m_bmOnline[66]; uint64_t m_superID; std::map m_RemoteWnds; FileTransformCmd m_CmdList; diff --git a/server/2015Remote/res/Bitmap/BrowseWnd.bmp b/server/2015Remote/res/Bitmap/BrowseWnd.bmp new file mode 100644 index 0000000..33e1c12 Binary files /dev/null and b/server/2015Remote/res/Bitmap/BrowseWnd.bmp differ diff --git a/server/2015Remote/res/Bitmap/HistoryActivity.bmp b/server/2015Remote/res/Bitmap/HistoryActivity.bmp new file mode 100644 index 0000000..8d0ee2b Binary files /dev/null and b/server/2015Remote/res/Bitmap/HistoryActivity.bmp differ diff --git a/server/2015Remote/res/Bitmap/PortProxyAuto.bmp b/server/2015Remote/res/Bitmap/PortProxyAuto.bmp new file mode 100644 index 0000000..ef4007d Binary files /dev/null and b/server/2015Remote/res/Bitmap/PortProxyAuto.bmp differ diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index 4a97fca..407c1ee 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -277,6 +277,9 @@ #define IDB_BITMAP_CLIENTLOG 395 #define IDI_CLIENTLOG 396 #define IDB_BITMAP_FORBIDDEN 397 +#define IDB_BITMAP_HISTORY_ACTIVITY 398 +#define IDB_BITMAP_VIEW_WND 399 +#define IDB_BITMAP_PROXY_AUTORUN 400 #define IDC_MESSAGE 1000 #define IDC_ONLINE 1001 #define IDC_STATIC_TIPS 1002 @@ -1035,7 +1038,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 398 +#define _APS_NEXT_RESOURCE_VALUE 401 #define _APS_NEXT_COMMAND_VALUE 33083 #define _APS_NEXT_CONTROL_VALUE 2542 #define _APS_NEXT_SYMED_VALUE 105