diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_options.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/res/resource.rc | 5 | ||||
| -rw-r--r-- | src/mir_app/src/chat_ui.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/resource.h | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index c047169cd9..cd3f03b3b3 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -34,7 +34,6 @@ static branch_t branch1[] = { { LPGENW("Flash window when someone speaks"), "FlashWindow", 0, false }, { LPGENW("Flash window when a word is highlighted"), "FlashWindowHighlight", 0, true }, { LPGENW("Show list of users in the chat room"), "ShowNicklist", 0, true }, - { LPGENW("Show button menus when right clicking the buttons"), "RightClickFilter", 0, false }, { LPGENW("Show the topic of the room on your contact list (if supported)"), "TopicOnClist", 0, false }, { LPGENW("Do not play sounds when the chat room is focused"), "SoundsFocus", 0, false }, { LPGENW("Do not pop up the window when joining a chat room"), "PopupOnJoin", 0, false }, diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 84368c873e..4cb7074fd7 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -793,7 +793,7 @@ BEGIN CONTROL "",IDC_HIDEOFFLINEOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,183,24,105,104
END
-IDD_OPT_CHAT_EVENTS DIALOGEX 0, 0, 306, 194
+IDD_OPT_CHAT_EVENTS DIALOGEX 0, 0, 306, 201
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -867,6 +867,8 @@ BEGIN LTEXT "Highlight event",IDC_STATIC,42,139,100,12
CONTROL "Show popups only when the chat room is not active",IDC_POPUPONLYFORINACTIVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,176,279,8
+ CONTROL "Show button menus when right clicking the buttons",IDC_RIGHTCLICK,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,187,279,10
END
IDD_EMPTY DIALOGEX 0, 0, 212, 131
@@ -1109,6 +1111,7 @@ BEGIN IDD_OPT_CHAT_EVENTS, DIALOG
BEGIN
+ BOTTOMMARGIN, 194
END
END
#endif // APSTUDIO_INVOKED
diff --git a/src/mir_app/src/chat_ui.cpp b/src/mir_app/src/chat_ui.cpp index f692d9b36e..da53dc625e 100644 --- a/src/mir_app/src/chat_ui.cpp +++ b/src/mir_app/src/chat_ui.cpp @@ -50,7 +50,7 @@ static UINT _eventorder[] = class CChatEventOptionDlg : public CDlgBase { - CCtrlCheck chkTray, chkPopup; + CCtrlCheck chkTray, chkPopup, chkRightClick; CCtrlMButton btn1, btn2, btn3, btn4; void InvertColumn(int ctrlId) @@ -66,6 +66,7 @@ public: CDlgBase(g_plugin, IDD_OPT_CHAT_EVENTS), chkTray(this, IDC_TRAYONLYFORINACTIVE), chkPopup(this, IDC_POPUPONLYFORINACTIVE), + chkRightClick(this, IDC_RIGHTCLICK), btn1(this, IDC_ICON1, SKINICON_OTHER_POPUP, LPGEN("Popup")), btn2(this, IDC_ICON2, SKINICON_OTHER_MIRANDA, LPGEN("Tray")), btn3(this, IDC_ICON3, SKINICON_OTHER_SOUND, LPGEN("Sound")), @@ -73,6 +74,7 @@ public: { CreateLink(chkTray, g_bChatTrayInactive); CreateLink(chkPopup, g_bChatPopupInactive); + CreateLink(chkRightClick, g_chatApi.bRightClickFilter); btn1.OnClick = Callback(this, &CChatEventOptionDlg::onClick_Popup); btn2.OnClick = Callback(this, &CChatEventOptionDlg::onClick_Tray); diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index b104c2ef1e..adeb0c7925 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -565,6 +565,7 @@ #define IDC_LANGUAGES 1747
#define IDC_GENMENU_MODULE 1748
#define IDC_LOGROTATE 1749
+#define IDC_RIGHTCLICK 1751
#define IDC_EFFECT_COLOUR_TEXT1 1853
#define IDC_EFFECT_COLOUR_SPIN1 1854
#define IDC_EXTRAORDER 1889
@@ -673,7 +674,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 333
#define _APS_NEXT_COMMAND_VALUE 40018
-#define _APS_NEXT_CONTROL_VALUE 1751
+#define _APS_NEXT_CONTROL_VALUE 1752
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
|