diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-12 20:47:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-12 20:47:36 +0300 |
| commit | 4d2aa11dd85cb7cd5a99b96c540c8b21f0adcdf8 (patch) | |
| tree | 0caf873cb3e35c0059aee9cd1b05e141921b099f /plugins | |
| parent | cd16d042ee670b02ea5b4be5c0776c83a61f94a9 (diff) | |
fixes #1485 (TabSRMM: remove "Enable typing sounds" option)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/TabSRMM/src/chat_window.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/globals.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/globals.h | 1 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdialog.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/translator.cpp | 1 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/version.h | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index f28927637e..c722134c66 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -1182,7 +1182,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) bool isShift, isAlt, isCtrl; KbdState(isShift, isCtrl, isAlt); - if (PluginConfig.m_bSoundOnTyping && !isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab)) + if (!isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab)) Skin_PlaySound("SoundOnTyping"); if (isCtrl && !isAlt && !isShift) @@ -1198,7 +1198,7 @@ LRESULT CChatRoomDlg::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) KbdState(isShift, isCtrl, isAlt); // sound on typing.. - if (PluginConfig.m_bSoundOnTyping && !isAlt && wParam == VK_DELETE) + if (!isAlt && wParam == VK_DELETE) Skin_PlaySound("SoundOnTyping"); if (wParam != VK_ESCAPE) diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 6edea54ef5..e0d2545458 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -205,9 +205,7 @@ void CGlobals::reloadSettings(bool fReloadSkins) void CGlobals::reloadAdv()
{
- m_bSoundOnTyping = M.GetBool("adv_soundontyping", false);
-
- if (m_bSoundOnTyping && m_TypingSoundAdded == false) {
+ if (m_TypingSoundAdded == false) {
g_plugin.addSound("SoundOnTyping", LPGENW("Other"), LPGENW("TabSRMM: typing"));
m_TypingSoundAdded = true;
}
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 6239635fb0..9ae17f3953 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -92,7 +92,6 @@ public: bool m_bLogStatusChanges;
bool m_bUseDividers;
bool m_bDividersUsePopupConfig;
- bool m_bSoundOnTyping;
bool m_bAllowOfflineMultisend;
bool m_bFlashOnClist;
bool m_bAlwaysFullToolbarWidth;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index b63fe36d79..351d1eb83b 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1936,7 +1936,7 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) case WM_CHAR:
KbdState(isShift, isCtrl, isAlt);
- if (PluginConfig.m_bSoundOnTyping && !isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab))
+ if (!isAlt && !isCtrl && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam != VK_ESCAPE && !(wParam == VK_TAB && PluginConfig.m_bAllowTab))
Skin_PlaySound("SoundOnTyping");
if (isCtrl && !isAlt) {
@@ -1989,7 +1989,7 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) case WM_KEYDOWN:
KbdState(isShift, isCtrl, isAlt);
- if (PluginConfig.m_bSoundOnTyping && !isAlt && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam == VK_DELETE)
+ if (!isAlt && !(m_pContainer->dwFlags & CNT_NOSOUND) && wParam == VK_DELETE)
Skin_PlaySound("SoundOnTyping");
if (wParam == VK_INSERT && !isShift && !isCtrl && !isAlt) {
diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index 9cc09517a3..aecc888a91 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -38,7 +38,6 @@ TOptionListGroup m_lvGroupsModPlus[] = TOptionListItem m_lvItemsModPlus[] =
{
- { 0, LPGENW("Enable typing sounds"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_soundontyping", 0 },
{ 0, LPGENW("Close current tab on send"), 0, LOI_TYPE_SETTING, (UINT_PTR)"adv_AutoClose_2", 0 },
{ 0, LPGENW("Enable unattended send (experimental feature, required for multisend and send later) (*)"), 0, LOI_TYPE_SETTING, (UINT_PTR)"sendLaterAvail", 0 },
{ 0, LPGENW("Show client description in info panel"), 1, LOI_TYPE_SETTING, (UINT_PTR)"ShowClientDescription", 0 },
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h index 6f67d44b9d..47b284c14b 100644 --- a/plugins/TabSRMM/src/version.h +++ b/plugins/TabSRMM/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 3
#define __MINOR_VERSION 5
#define __RELEASE_NUM 0
-#define __BUILD_NUM 10
+#define __BUILD_NUM 11
#include <stdver.h>
|