fix for badly working font color button in tabsrmm

6 files changed, 10 insertions, 47 deletions

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 18b2aa5846..15feb901b0 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -888,13 +888,6 @@ void CB_InitDefaultButtons()
 	bbd.ptszTooltip = LPGENW("Strike-through text");
 	CB_AddButton(0, (LPARAM)&bbd);
 
-	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID;
-	bbd.dwButtonID = IDC_FONTFACE;
-	bbd.dwDefPos = 80;
-	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[14];
-	bbd.ptszTooltip = LPGENW("Select font color");
-	CB_AddButton(0, (LPARAM)&bbd);
-
 	bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISRSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID;
 	bbd.dwButtonID = IDOK;
 	bbd.dwDefPos = 10;
@@ -971,8 +964,15 @@ void CB_InitDefaultButtons()
 	CB_AddButton(0, (LPARAM)&bbd);
 
 	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID;
-	bbd.dwButtonID = IDC_BKGCOLOR;
+	bbd.dwButtonID = IDC_COLOR;
 	bbd.pszModuleName = "Tabsrmm";
+	bbd.dwDefPos = 80;
+	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[14];
+	bbd.ptszTooltip = LPGENW("Select font color");
+	CB_AddButton(0, (LPARAM)&bbd);
+
+	bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID;
+	bbd.dwButtonID = IDC_BKGCOLOR;
 	bbd.dwDefPos = 81;
 	bbd.iButtonWidth = 22;
 	bbd.hIcon = PluginConfig.g_buttonBarIconHandles[16];
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index f0789ef23f..f67ccbdcc2 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -1636,9 +1636,6 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			BroadCastContainer(dat->pContainer, DM_REFRESHTABINDEX, 0, 0);
 
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETOLECALLBACK, 0, (LPARAM)&reOleCallback);
-
-			SendDlgItemMessage(hwndDlg, IDC_COLOR, BUTTONSETASPUSHBTN, TRUE, 0);
-
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_AUTOURLDETECT, 1, 0);
 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_PANELSPLITTER), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc);
 			TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_OPENING, 0);
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index deabffb765..1d636d1fe3 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -248,39 +248,6 @@ LRESULT TSAPI DM_MsgWindowCmdHandler(HWND hwndDlg, TContainerData *pContainer, T
 		}
 		break;
 
-	case IDC_FONTFACE:
-		submenu = GetSubMenu(PluginConfig.g_hMenuContext, 7);
-		{
-			CHARFORMAT2 cf;
-			memset(&cf, 0, sizeof(CHARFORMAT2));
-			cf.cbSize = sizeof(CHARFORMAT2);
-			cf.dwMask = CFM_COLOR;
-
-			GetWindowRect(GetDlgItem(hwndDlg, IDC_FONTFACE), &rc);
-			iSelection = TrackPopupMenu(submenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, hwndDlg, NULL);
-			if (iSelection == ID_FONT_CLEARALLFORMATTING) {
-				cf.dwMask = CFM_BOLD | CFM_COLOR | CFM_ITALIC | CFM_UNDERLINE | CFM_STRIKEOUT;
-				cf.crTextColor = M.GetDword(FONTMODULE, "Font16Col", 0);
-				SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
-				break;
-			}
-			if (iSelection == ID_FONT_DEFAULTCOLOR) {
-				cf.crTextColor = M.GetDword(FONTMODULE, "Font16Col", 0);
-				for (int i = 0; i < Utils::rtf_ctable_size; i++)
-					if (Utils::rtf_ctable[i].clr == cf.crTextColor)
-						cf.crTextColor = RGB(GetRValue(cf.crTextColor), GetGValue(cf.crTextColor), GetBValue(cf.crTextColor) == 0 ? GetBValue(cf.crTextColor) + 1 : GetBValue(cf.crTextColor) - 1);
-
-				SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
-				break;
-			}
-			for (int i = 0; i < RTF_CTABLE_DEFSIZE; i++)
-				if (Utils::rtf_ctable[i].menuid == iSelection) {
-					cf.crTextColor = Utils::rtf_ctable[i].clr;
-					SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);
-				}
-		}
-		break;
-
 	case IDCANCEL:
 		ShowWindow(hwndContainer, SW_MINIMIZE);
 		return FALSE;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index ff2c514826..ef331896f4 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -35,7 +35,7 @@ bool IsStringValidLink(wchar_t* pszText);
 const wchar_t *pszIDCSAVE_close = 0, *pszIDCSAVE_save = 0;

 

 static const UINT sendControls[] = { IDC_MESSAGE, IDC_LOG };

-static const UINT formatControls[] = { IDC_SMILEYBTN, IDC_FONTBOLD, IDC_FONTITALIC, IDC_FONTUNDERLINE, IDC_FONTFACE, IDC_FONTSTRIKEOUT };

+static const UINT formatControls[] = { IDC_SMILEYBTN, IDC_FONTBOLD, IDC_FONTITALIC, IDC_FONTUNDERLINE, IDC_FONTSTRIKEOUT };

 static const UINT addControls[] = { IDC_ADD, IDC_CANCELADD };

 static const UINT btnControls[] = { IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER, IDC_ADD, IDC_CANCELADD };

 static const UINT errorControls[] = { IDC_STATICERRORICON, IDC_STATICTEXT, IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER };

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 0404527a22..a0a896b99e 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1224,7 +1224,7 @@ void TSAPI PlayIncomingSound(const TWindowData *dat)
 

 void TSAPI GetSendFormat(TWindowData *dat)

 {

-	UINT controls[5] = { IDC_FONTBOLD, IDC_FONTITALIC, IDC_FONTUNDERLINE, IDC_FONTSTRIKEOUT, IDC_FONTFACE };

+	UINT controls[5] = { IDC_FONTBOLD, IDC_FONTITALIC, IDC_FONTUNDERLINE, IDC_FONTSTRIKEOUT };

 

 	dat->SendFormat = M.GetDword(dat->hContact, "sendformat", PluginConfig.m_SendFormat);

 	if (dat->SendFormat == -1)          // per contact override to disable it..

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index b2e6a88804..59b4511dfc 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -184,7 +184,6 @@
 #define IDC_FONTBOLD                    1106

 #define IDC_FONTITALIC                  1107

 #define IDC_FONTUNDERLINE               1108

-#define IDC_FONTFACE                    1110

 #define IDC_HISTORY                     1111

 #define IDC_CANCELADD                   1112

 #define IDC_FONTSTRIKEOUT               1113