From d0176baeca0f8ff96209560dfdc2a91ec871288a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Jul 2020 18:18:43 +0300 Subject: fixes #2501 (Ability to disable incoming sounds in chats is lost) --- plugins/TabSRMM/src/chat_options.cpp | 100 ++++----------------------- plugins/TabSRMM/src/chat_resource.h | 130 ----------------------------------- plugins/TabSRMM/src/chat_tools.cpp | 3 + plugins/TabSRMM/src/resource.h | 129 +++++++++++++++++++++++++++++++++- 4 files changed, 142 insertions(+), 220 deletions(-) delete mode 100644 plugins/TabSRMM/src/chat_resource.h (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp index 79273619d5..1f3efd7646 100644 --- a/plugins/TabSRMM/src/chat_options.cpp +++ b/plugins/TabSRMM/src/chat_options.cpp @@ -582,6 +582,7 @@ class CChatLogOptionDlg : public CChatBaseOptionDlg CTimer m_timer; CCtrlButton btnBaseDir, btnFontChoose; CCtrlCheck chkLogging; + CCtrlCombo cmbIconType; HWND hPathTip = nullptr; public: @@ -590,7 +591,8 @@ public: m_timer(this, 1), btnBaseDir(this, IDC_MUC_OPENLOGBASEDIR), chkLogging(this, IDC_LOGGING), - btnFontChoose(this, IDC_FONTCHOOSE) + btnFontChoose(this, IDC_FONTCHOOSE), + cmbIconType(this, IDC_LOGICONTYPE) { btnBaseDir.OnClick = Callback(this, &CChatLogOptionDlg::onClick_BaseDir); btnFontChoose.OnClick = Callback(this, &CChatLogOptionDlg::onClick_FontChoose); @@ -618,6 +620,11 @@ public: SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN4, UDM_SETPOS, 0, MAKELONG(db_get_w(0, CHAT_MODULE, "LoggingLimit", 100), 0)); Utils::enableDlgControl(m_hwnd, IDC_LIMIT, g_Settings.bLoggingEnabled); + cmbIconType.AddString(TranslateT("No markers")); + cmbIconType.AddString(TranslateT("Show as icons")); + cmbIconType.AddString(TranslateT("Show as text symbols")); + cmbIconType.SetCurSel((g_Settings.bLogSymbols ? 2 : (g_Settings.dwIconFlags ? 1 : 0))); + CMStringW tszTooltipText(FORMAT, L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n" L"%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n" @@ -716,6 +723,10 @@ public: } else db_unset(0, CHAT_MODULE, "HeaderOutgoing"); + LRESULT lr = cmbIconType.GetCurSel(); + db_set_dw(0, CHAT_MODULE, "IconFlags", lr == 1); + db_set_b(0, CHAT_MODULE, "LogSymbols", lr == 2); + iLen = SendDlgItemMessage(m_hwnd, IDC_CHAT_SPIN2, UDM_GETPOS, 0, 0); db_set_w(0, CHAT_MODULE, "LogLimit", (WORD)iLen); mir_free(pszText); @@ -817,89 +828,6 @@ public: } }; -///////////////////////////////////////////////////////////////////////////////////////// -// Group chat - Events - -#define NR_GC_EVENTS 12 - -static UINT _eventorder[] = -{ - GC_EVENT_ACTION, - GC_EVENT_MESSAGE, - GC_EVENT_NICK, - GC_EVENT_JOIN, - GC_EVENT_PART, - GC_EVENT_TOPIC, - GC_EVENT_ADDSTATUS, - GC_EVENT_INFORMATION, - GC_EVENT_QUIT, - GC_EVENT_KICK, - GC_EVENT_NOTICE, - GC_EVENT_HIGHLIGHT -}; - -class CChatEventOptionDlg : public CChatBaseOptionDlg -{ - -public: - CChatEventOptionDlg() : - CChatBaseOptionDlg(IDD_OPTIONS3) - {} - - bool OnInitDialog() override - { - DWORD dwFilterFlags = db_get_dw(0, CHAT_MODULE, "FilterFlags", GC_EVENT_ALL); - DWORD dwTrayFlags = db_get_dw(0, CHAT_MODULE, "TrayIconFlags", GC_EVENT_HIGHLIGHT); - DWORD dwPopupFlags = db_get_dw(0, CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT); - DWORD dwLogFlags = db_get_dw(0, CHAT_MODULE, "DiskLogFlags", GC_EVENT_ALL); - - for (int i = 0; i < _countof(_eventorder); i++) { - if (_eventorder[i] != GC_EVENT_HIGHLIGHT) { - CheckDlgButton(m_hwnd, IDC_1 + i, dwFilterFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(m_hwnd, IDC_L1 + i, dwLogFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED); - } - CheckDlgButton(m_hwnd, IDC_P1 + i, dwPopupFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(m_hwnd, IDC_T1 + i, dwTrayFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED); - } - - SendDlgItemMessage(m_hwnd, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("No markers")); - SendDlgItemMessage(m_hwnd, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("Show as icons")); - SendDlgItemMessage(m_hwnd, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("Show as text symbols")); - - SendDlgItemMessage(m_hwnd, IDC_LOGICONTYPE, CB_SETCURSEL, (g_Settings.bLogSymbols ? 2 : (g_Settings.dwIconFlags ? 1 : 0)), 0); - - CheckDlgButton(m_hwnd, IDC_TRAYONLYFORINACTIVE, db_get_b(0, CHAT_MODULE, "TrayIconInactiveOnly", 0) ? BST_CHECKED : BST_UNCHECKED); - return true; - } - - bool OnApply() override - { - DWORD dwFilterFlags = 0, dwTrayFlags = 0, - dwPopupFlags = 0, dwLogFlags = 0; - - for (int i = 0; i < _countof(_eventorder); i++) { - if (_eventorder[i] != GC_EVENT_HIGHLIGHT) { - dwFilterFlags |= (IsDlgButtonChecked(m_hwnd, IDC_1 + i) ? _eventorder[i] : 0); - dwLogFlags |= (IsDlgButtonChecked(m_hwnd, IDC_L1 + i) ? _eventorder[i] : 0); - } - dwPopupFlags |= (IsDlgButtonChecked(m_hwnd, IDC_P1 + i) ? _eventorder[i] : 0); - dwTrayFlags |= (IsDlgButtonChecked(m_hwnd, IDC_T1 + i) ? _eventorder[i] : 0); - } - db_set_dw(0, CHAT_MODULE, "FilterFlags", dwFilterFlags); - db_set_dw(0, CHAT_MODULE, "PopupFlags", dwPopupFlags); - db_set_dw(0, CHAT_MODULE, "TrayIconFlags", dwTrayFlags); - db_set_dw(0, CHAT_MODULE, "DiskLogFlags", dwLogFlags); - - LRESULT lr = SendDlgItemMessage(m_hwnd, IDC_LOGICONTYPE, CB_GETCURSEL, 0, 0); - - db_set_dw(0, CHAT_MODULE, "IconFlags", lr == 1 ? 1 : 0); - db_set_b(0, CHAT_MODULE, "LogSymbols", lr == 2 ? 1 : 0); - - db_set_b(0, CHAT_MODULE, "TrayIconInactiveOnly", IsDlgButtonChecked(m_hwnd, IDC_TRAYONLYFORINACTIVE) ? 1 : 0); - return true; - } -}; - ///////////////////////////////////////////////////////////////////////////////////////// // Group chat - Highlight @@ -988,10 +916,6 @@ void Chat_Options(WPARAM wParam) odp.pDialog = new CChatLogOptionDlg(); g_plugin.addOptions(wParam, &odp); - odp.szTab.a = LPGEN("Events and filters"); - odp.pDialog = new CChatEventOptionDlg(); - g_plugin.addOptions(wParam, &odp); - odp.szTab.a = LPGEN("Highlighting"); odp.pDialog = new CHighlighOptionDlg(); g_plugin.addOptions(wParam, &odp); diff --git a/plugins/TabSRMM/src/chat_resource.h b/plugins/TabSRMM/src/chat_resource.h deleted file mode 100644 index 6a6d833b9e..0000000000 --- a/plugins/TabSRMM/src/chat_resource.h +++ /dev/null @@ -1,130 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by chat.rc -// -#define IDD_CHANNEL 401 -#define IDD_OPTIONS1 402 -#define IDD_OPTIONS2 403 -#define IDD_FILTER 404 -#define IDD_OPTIONSPOPUP 405 -#define IDD_OPTIONS3 407 -#define IDD_OPTIONS4 408 -#define IDC_CHECKBOXES 1021 -#define IDC_NICKROW2 1023 -#define IDC_NICKROW 1024 -#define IDC_LOGLIMIT 1024 -#define IDC_CHAT_SPIN2 1029 -#define IDC_CHAT_SPIN3 1030 -#define IDC_CHAT_SPIN4 1031 -#define IDC_PANELNICK 1032 -#define IDC_PANELUIN 1033 -#define IDC_INSTAMP 1041 -#define IDC_OUTSTAMP 1043 -#define IDC_TIMESTAMP 1046 -#define IDC_FONTCHOOSE 1047 -#define IDC_LOGDIRECTORY 1048 -#define IDC_LIMIT 1050 -#define IDC_LOGTIMESTAMP 1051 -#define IDC_GROUP 1057 -#define IDC_RADIO2 1062 -#define IDC_RADIO3 1063 -#define IDC_TEXT 1064 -#define IDC_BKG 1065 -#define IDC_TIMEOUT 1067 -#define IDC_TEXTO 1069 -#define IDC_LOGGING 1069 -#define IDC_TEXTO2 1070 -#define IDC_TEXTO3 1071 -#define IDC_TEXTO4 1072 -#define IDC_STATIC_ADD 1077 -#define IDC_STATIC_ULIST 1078 -#define IDC_STATIC_OTHER 1079 -#define IDC_STATIC110 1082 -#define IDC_STATIC112 1085 -#define IDC_TRAYONLYFORINACTIVE 1086 -#define IDC_LOGICONTYPE 1088 -#define IDC_HIGHLIGHTNICKENABLE 1089 -#define IDC_HIGHLIGHTNICKUID 1090 -#define IDC_HIGHLIGHTNICKPATTERN 1091 -#define IDC_HIGHLIGHTTEXTENABLE 1092 -#define IDC_HIGHLIGHTTEXTPATTERN 1093 -#define IDC_HIGHLIGHTME 1094 -#define IDC_MUC_OPENLOGBASEDIR 1096 -#define IDC_1 1200 -#define IDC_2 1201 -#define IDC_3 1202 -#define IDC_4 1203 -#define IDC_5 1204 -#define IDC_6 1205 -#define IDC_7 1206 -#define IDC_8 1207 -#define IDC_9 1208 -#define IDC_10 1209 -#define IDC_11 1210 -#define IDC_PANELSPLITTER 1216 -#define IDC_P1 1300 -#define IDC_P2 1301 -#define IDC_P3 1302 -#define IDC_P4 1303 -#define IDC_P5 1304 -#define IDC_P6 1305 -#define IDC_P7 1306 -#define IDC_P8 1307 -#define IDC_P9 1308 -#define IDC_P10 1309 -#define IDC_P11 1310 -#define IDC_P12 1311 -#define IDC_T1 1400 -#define IDC_T2 1401 -#define IDC_T3 1402 -#define IDC_T4 1403 -#define IDC_T5 1404 -#define IDC_T6 1405 -#define IDC_T7 1406 -#define IDC_T8 1407 -#define IDC_T9 1408 -#define IDC_T10 1409 -#define IDC_T11 1410 -#define IDC_T12 1411 -#define IDC_L1 1500 -#define IDC_L2 1501 -#define IDC_L3 1502 -#define IDC_L4 1503 -#define IDC_L5 1504 -#define IDC_L6 1505 -#define IDC_L7 1506 -#define IDC_L8 1507 -#define IDC_L9 1508 -#define IDC_L10 1509 -#define IDC_L11 1510 -#define IDC_WHITERECT 1600 -#define ID_MESS 40001 -#define ID_NEW 40002 -#define ID_CURR 40003 -#define ID_COPY 40004 -#define ID_COPYALL 40006 -#define ID_CLEARLOG 40009 -#define ID_MESSAGE_UNDO 40013 -#define ID_MESSAGE_COPY 40014 -#define ID_MESSAGE_CUT 40015 -#define ID_MESSAGE_CLEAR 40017 -#define ID_MESSAGE_SELECTALL 40018 -#define ID_MESSAGE_REDO 40019 -#define ID_MESSAGE_PASTE 40020 -#define ID_CLOSE 40022 -#define ID_CLOSEOTHER 40023 -#define ID_LOCKPOSITION 40024 -#define ID_SEARCH_GOOGLE 40027 -#define ID_SEARCH_WIKIPEDIA 40028 -#define ID_WIKIPEDIA_ 40029 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 163 -#define _APS_NEXT_COMMAND_VALUE 40030 -#define _APS_NEXT_CONTROL_VALUE 1097 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index 9b75597491..cc43998dd8 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -403,6 +403,9 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight params->hNotifyIcon = g_chatApi.hIcons[ICON_TOPIC]; break; } + + if (!(db_get_dw(0, CHAT_MODULE, "SoundFlags", GC_EVENT_HIGHLIGHT) & params->iEvent)) + params->sound = nullptr; } else { switch (params->iEvent) { diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h index aa34e55036..e0e728052a 100644 --- a/plugins/TabSRMM/src/resource.h +++ b/plugins/TabSRMM/src/resource.h @@ -1,8 +1,9 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by w:\miranda-ng\plugins\TabSRMM\res\resource.rc +// Used by w:\miranda-ng\plugins\TabSRMM\res\chat.rc // #define IDD_TEMPLATEEDIT 1 +#define VS_VERSION_INFO 1 #define IDD_USERPREFS 2 #define IDOK2 2 #define IDD_USERPREFS1 3 @@ -55,6 +56,13 @@ #define IDD_SKINTABDIALOG 312 #define IDD_OPT_SKIN 313 #define IDD_OPTIONS_PLUS 333 +#define IDD_CHANNEL 401 +#define IDD_OPTIONS1 402 +#define IDD_OPTIONS2 403 +#define IDD_FILTER 404 +#define IDD_OPTIONSPOPUP 405 +#define IDD_OPTIONS3 407 +#define IDD_OPTIONS4 408 #define IDC_QMGR_REMOVE 1000 #define IDC_EXCEPTION_DETAILS 1000 #define IDC_UNLOAD 1000 @@ -87,13 +95,20 @@ #define IDC_CHKACTL_DISMISS 1019 #define IDC_QUOTE 1020 #define IDC_CHKACTL_OPEN 1021 +#define IDC_CHECKBOXES 1021 #define IDC_NAME 1022 +#define IDC_NICKROW2 1023 #define IDC_CHKACTL_REMOVE 1023 #define IDC_CHKWINDOWCHECK 1024 +#define IDC_NICKROW 1024 +#define IDC_LOGLIMIT 1024 #define IDC_CLOSE 1025 #define IDC_CHKACTR_DISMISS 1026 #define IDC_CHKACTR_OPEN 1028 #define IDC_CONTACTPIC 1029 +#define IDC_CHAT_SPIN2 1029 +#define IDC_CHAT_SPIN3 1030 +#define IDC_CHAT_SPIN4 1031 #define IDC_ST_ENTERMSG 1031 #define IDC_PANELNICK 1032 #define IDC_PANELUIN 1033 @@ -103,20 +118,28 @@ #define IDC_CHKDEFAULTCOL_MESSAGE 1038 #define IDC_CHKDEFAULTCOL_MUC 1039 #define IDC_CHKDEFAULTCOL_ERR 1040 +#define IDC_INSTAMP 1041 #define IDC_COLBACK_MESSAGE 1041 #define IDC_COLTEXT_MESSAGE 1042 #define IDC_COLTEXT_MUC 1043 +#define IDC_OUTSTAMP 1043 #define IDC_COLBACK_MUC 1044 #define IDC_COLTEXT_ERR 1045 #define IDC_COLBACK_ERR 1046 +#define IDC_TIMESTAMP 1046 #define IDC_SHOWNAMES 1047 +#define IDC_FONTCHOOSE 1047 +#define IDC_LOGDIRECTORY 1048 #define IDC_CHKDEFAULTCOL_OTHERS 1050 +#define IDC_LIMIT 1050 #define IDC_COLBACK_OTHERS 1051 +#define IDC_LOGTIMESTAMP 1051 #define IDC_CLOSEONREPLY 1052 #define IDC_COLTEXT_OTHERS 1053 #define IDC_SHOWFILES 1054 #define IDC_MERGEPOPUP 1056 #define IDC_CHKINFINITE_MESSAGE 1057 +#define IDC_GROUP 1057 #define IDC_CHKMERGEPOPUP 1058 #define IDC_IMGTAG 1058 #define IDC_SHOWURLS 1059 @@ -125,44 +148,67 @@ #define IDC_SCROLLFIX 1060 #define IDC_CLIENTINSTATBAR 1061 #define IDC_TYPINGSOUNDS 1062 +#define IDC_RADIO2 1062 #define IDC_OFFLINEMULTI 1063 #define IDC_CLIENTINSTATBAR2 1063 #define IDC_ICONWARNINGS 1063 +#define IDC_RADIO3 1063 #define IDC_AUTOCLOSEV2 1064 +#define IDC_TEXT 1064 #define IDC_RESTART 1065 +#define IDC_BKG 1065 #define IDC_DELAY_OTHERS 1066 #define IDC_CLIST 1067 #define IDC_DELAY_MUC 1067 +#define IDC_TIMEOUT 1067 #define IDC_NUMBERMSG 1068 #define IDC_MULTISPLITTER 1069 +#define IDC_TEXTO 1069 +#define IDC_LOGGING 1069 #define IDC_CHKSHOWDATE 1070 +#define IDC_TEXTO2 1070 #define IDC_SAVEPERCONTACT 1071 +#define IDC_TEXTO3 1071 #define IDC_CHKSHOWTIME 1072 +#define IDC_TEXTO4 1072 #define IDC_CHKSHOWHEADERS 1073 #define IDC_LOADCOUNTN 1074 +#define IDC_TEXTO5 1074 #define IDC_RDNEW 1075 #define IDC_LOADCOUNTSPIN 1076 #define IDC_RDOLD 1077 +#define IDC_STATIC_ADD 1077 #define IDC_SHOWINFOLINE 1078 +#define IDC_STATIC_ULIST 1078 #define IDC_LBNUMBERMSG 1079 +#define IDC_STATIC_OTHER 1079 #define IDC_SHOWBUTTONLINE 1080 #define IDC_CHKINFINITE_URL 1081 #define IDC_LOADUNREAD 1082 +#define IDC_STATIC110 1082 #define IDC_SENDONENTER 1083 #define IDC_CHKINFINITE_FILE 1084 #define IDC_LOADCOUNT 1085 +#define IDC_STATIC112 1085 #define IDC_SENDONDBLENTER 1086 #define IDC_CHKINFINITE_OTHERS 1087 #define IDC_LOADTIMEN 1088 #define IDC_LOADTIMESPIN 1089 +#define IDC_HIGHLIGHTNICKENABLE 1089 #define IDC_LOADTIME 1090 +#define IDC_HIGHLIGHTNICKUID 1090 #define IDC_CMDEDITHEADERS 1091 +#define IDC_HIGHLIGHTNICKPATTERN 1091 #define IDC_TRIM 1091 +#define IDC_HIGHLIGHTTEXTENABLE 1092 #define IDC_FONTLIST 1092 #define IDC_TRIMSPIN 1092 +#define IDC_HIGHLIGHTTEXTPATTERN 1093 #define IDC_USEOSD 1093 +#define IDC_HIGHLIGHTME 1094 #define IDC_CHOOSEFONT 1094 #define IDC_CHKACTTE_DISMISS 1095 +#define IDC_MUC_OPENLOGBASEDIR 1096 #define IDC_CHKACTTE_OPEN 1096 #define IDC_STMINSOLD 1097 #define IDC_CHKACTTE_REMOVE 1098 @@ -261,6 +307,7 @@ #define IDC_PANELSPLITTER 1216 #define IDC_AUTOCREATECONTAINER 1216 #define IDC_LIMITAVATARS 1217 +#define IDC_LOGICONTYPE 1218 #define IDC_DONTREPORT 1219 #define IDC_SPIN1 1220 #define IDC_CNTLIST 1221 @@ -495,6 +542,7 @@ #define IDC_O_STATIC_OWNAVATAR 1502 #define IDC_USEAERO 1531 #define IDC_USEAEROPEEK 1532 +#define IDC_WHITERECT 1600 #define IDC_O_EXPLAINGLOBALNOTIFY 1624 #define IDC_O_AUTOHIDE 1625 #define IDC_O_AUTOHIDESECONDS 1626 @@ -511,8 +559,66 @@ #define IDC_OPTIONSTAB 2111 #define IDC_HEADERBAR 2397 #define IDC_AVATARSONTASKBAR 2735 +#define IDC_SRMM_COLOR 3001 +#define IDC_SRMM_BKGCOLOR 3002 +#define IDC_SRMM_BOLD 3003 +#define IDC_SRMM_ITALICS 3004 +#define IDC_SRMM_UNDERLINE 3005 +#define IDC_SRMM_FILTER 3006 +#define IDC_SRMM_CHANMGR 3007 +#define IDC_SRMM_SHOWNICKLIST 3008 +#define IDC_SRMM_HISTORY 3009 +#define IDC_SRMM_NICKLIST 3010 +#define IDC_SRMM_LOG 3011 +#define IDC_SRMM_MESSAGE 3012 #define IDC_TSLABEL_EXPLAINTHEME 3123 #define IDC_TSLABEL_REOPENWARN 3124 +#define IDC_1 4200 +#define IDC_2 4201 +#define IDC_3 4202 +#define IDC_4 4203 +#define IDC_5 4204 +#define IDC_6 4205 +#define IDC_7 4206 +#define IDC_8 4207 +#define IDC_9 4208 +#define IDC_10 4209 +#define IDC_11 4210 +#define IDC_P1 4300 +#define IDC_P2 4301 +#define IDC_P3 4302 +#define IDC_P4 4303 +#define IDC_P5 4304 +#define IDC_P6 4305 +#define IDC_P7 4306 +#define IDC_P8 4307 +#define IDC_P9 4308 +#define IDC_P10 4309 +#define IDC_P11 4310 +#define IDC_P12 4311 +#define IDC_T1 4400 +#define IDC_T2 4401 +#define IDC_T3 4402 +#define IDC_T4 4403 +#define IDC_T5 4404 +#define IDC_T6 4405 +#define IDC_T7 4406 +#define IDC_T8 4407 +#define IDC_T9 4408 +#define IDC_T10 4409 +#define IDC_T11 4410 +#define IDC_T12 4411 +#define IDC_L1 4500 +#define IDC_L2 4501 +#define IDC_L3 4502 +#define IDC_L4 4503 +#define IDC_L5 4504 +#define IDC_L6 4505 +#define IDC_L7 4506 +#define IDC_L8 4507 +#define IDC_L9 4508 +#define IDC_L10 4509 +#define IDC_L11 4510 #define IDD_OPT_TYPINGNOTIFYPOPUP 30159 #define IDI_START1 30160 #define IDI_STOP1 30161 @@ -563,10 +669,29 @@ #define IDC_ICONS 31623 #define IDC_TIMEOUT_VALUE2 31624 #define IDC_PREVIEW_ALL 31625 +#define ID_MESS 40001 +#define ID_NEW 40002 +#define ID_CURR 40003 +#define ID_COPY 40004 +#define ID_COPYALL 40006 +#define ID_CLEARLOG 40009 +#define ID_MESSAGE_UNDO 40013 +#define ID_MESSAGE_COPY 40014 +#define ID_MESSAGE_CUT 40015 +#define ID_MESSAGE_CLEAR 40017 +#define ID_MESSAGE_SELECTALL 40018 +#define ID_MESSAGE_REDO 40019 +#define ID_MESSAGE_PASTE 40020 +#define ID_CLOSE 40022 +#define ID_CLOSEOTHER 40023 +#define ID_LOCKPOSITION 40024 #define ID_CLOSETAB_DETACHTAB 40025 #define ID_TABCONTEXT_NEXTTAB 40026 +#define ID_SEARCH_GOOGLE 40027 #define ID_TABCONTEXT_ATTACH 40027 +#define ID_SEARCH_WIKIPEDIA 40028 #define ID_TABCONTEXT_CLOSECONTAINER 40028 +#define ID_WIKIPEDIA_ 40029 #define ID_TABCONTEXT_PREVTAB 40029 #define ID_CLOSETAB 40030 #define ID_TABMENU_CLOSETAB 40031 @@ -706,7 +831,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 +#define _APS_NEXT_RESOURCE_VALUE 104 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 -- cgit v1.2.3