clist nicer+ button sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@485 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 41 insertions, 41 deletions

diff --git a/plugins/Clist_nicer/SRC/clcopts.cpp b/plugins/Clist_nicer/SRC/clcopts.cpp
index 110ca15111..d32068818e 100644
--- a/plugins/Clist_nicer/SRC/clcopts.cpp
+++ b/plugins/Clist_nicer/SRC/clcopts.cpp
@@ -1055,29 +1055,29 @@ static INT_PTR CALLBACK DlgProcDspProfiles(HWND hwnd, UINT msg, WPARAM wParam, L
 		{

 			hwndList = GetDlgItem(hwnd, IDC_PROFILELIST);

 

-			HWND hwndAdd = GetDlgItem(hwnd, IDC_DSP_ADD);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

-			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ADDCONTACT), IMAGE_ICON, 16, 16, LR_SHARED));

-			SetWindowText(hwndAdd, TranslateT("Add New..."));

-

-			hwndAdd = GetDlgItem(hwnd, IDC_DSP_DELETE);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

-			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_DELETE), IMAGE_ICON, 16, 16, LR_SHARED));

-			SetWindowText(hwndAdd, TranslateT("Delete"));

-

-			hwndAdd = GetDlgItem(hwnd, IDC_DSP_RENAME);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

-			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_RENAME), IMAGE_ICON, 16, 16, LR_SHARED));

-			SetWindowText(hwndAdd, TranslateT("Rename..."));

-

-			hwndAdd = GetDlgItem(hwnd, IDC_DSP_APPLY);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

-			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_OPTIONS), IMAGE_ICON, 16, 16, LR_SHARED));

-			SetWindowText(hwndAdd, TranslateT("Apply this profile"));

+			HWND hwndBtn = GetDlgItem(hwnd, IDC_DSP_ADD);

+			SendMessage(hwndBtn, BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ADDCONTACT), IMAGE_ICON, 16, 16, LR_SHARED));

+			SetWindowText(hwndBtn, TranslateT("Add New..."));

+

+			hwndBtn = GetDlgItem(hwnd, IDC_DSP_DELETE);

+			SendMessage(hwndBtn, BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_DELETE), IMAGE_ICON, 16, 16, LR_SHARED));

+			SetWindowText(hwndBtn, TranslateT("Delete"));

+

+			hwndBtn = GetDlgItem(hwnd, IDC_DSP_RENAME);

+			SendMessage(hwndBtn, BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_RENAME), IMAGE_ICON, 16, 16, LR_SHARED));

+			SetWindowText(hwndBtn, TranslateT("Rename..."));

+

+			hwndBtn = GetDlgItem(hwnd, IDC_DSP_APPLY);

+			SendMessage(hwndBtn, BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, TRUE, 0);

+			SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_OPTIONS), IMAGE_ICON, 16, 16, LR_SHARED));

+			SetWindowText(hwndBtn, TranslateT("Apply this profile"));

 

 			RECT rcClient;

 			GetClientRect(hwnd, &rcClient);

diff --git a/plugins/Clist_nicer/SRC/clistmenus.cpp b/plugins/Clist_nicer/SRC/clistmenus.cpp
index 58f6a0fcc8..082a655b5b 100644
--- a/plugins/Clist_nicer/SRC/clistmenus.cpp
+++ b/plugins/Clist_nicer/SRC/clistmenus.cpp
@@ -113,16 +113,16 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			SendMessage(hWnd, WM_USER + 120, 0, 0);

 			TranslateDialogDefault(hWnd);

 			hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-			SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

+			SendMessage(hwndAdd, BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(hwndAdd, BUTTONSETASTHEMEDBTN, TRUE, 0);

 

 			SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(210), IMAGE_ICON, 16, 16, LR_SHARED));

 			SetWindowText(hwndAdd, TranslateT("Add permanently"));

 			EnableWindow(hwndAdd, cfg::getByte(hContact, "CList", "NotOnList", 0));

 

             hwndAdd = GetDlgItem(hWnd, IDC_DSP_LOADDEFAULT); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

-            SendMessage(hwndAdd, BUTTONSETASFLATBTN, TRUE, 1);

-            SendMessage(hwndAdd, BUTTONSETASFLATBTN + 10, 0, 1);

+            SendMessage(hwndAdd, BUTTONSETASFLATBTN, FALSE, 0);

+            SendMessage(hwndAdd, BUTTONSETASTHEMEDBTN, TRUE, 0);

 

             SendMessage(hwndAdd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_DELETE), IMAGE_ICON, 16, 16, LR_SHARED));

             SetWindowText(hwndAdd, TranslateT("Revert to default"));

diff --git a/plugins/Clist_nicer/SRC/extBackg.cpp b/plugins/Clist_nicer/SRC/extBackg.cpp
index 4e2f0a852e..5fe9cfb9c8 100644
--- a/plugins/Clist_nicer/SRC/extBackg.cpp
+++ b/plugins/Clist_nicer/SRC/extBackg.cpp
@@ -419,16 +419,16 @@ void SetButtonToSkinned()
     SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BM_SETSKINNED, 0, bSkinned);

     SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BM_SETSKINNED, 0, bSkinned);

     if(bSkinned) {

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN, TRUE, 0);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN, TRUE, 0);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN + 10, 0, 0);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN + 10, 0, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN, FALSE, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN, FALSE, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASTHEMEDBTN, 0, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASTHEMEDBTN, 0, 0);

     }

     else {

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN, TRUE, 1);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN, TRUE, 1);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN + 10, 0, 1);

-        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN + 10, 0, 1);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASFLATBTN, FALSE, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASFLATBTN, FALSE, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBGLOBALSTATUS, BUTTONSETASTHEMEDBTN, TRUE, 0);

+        SendDlgItemMessage(pcli->hwndContactList, IDC_TBMENU, BUTTONSETASTHEMEDBTN, TRUE, 0);

     }

     SendMessage(g_hwndViewModeFrame, WM_USER + 100, 0, 0);

 }

@@ -1235,8 +1235,8 @@ static void BTN_ReadItem(char *itemName, char *file)
     }

     newItem->hWnd = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 5, 5, pcli->hwndContactList, (HMENU)newItem->uId, g_hInst, NULL);

     SendMessage(newItem->hWnd, BM_SETBTNITEM, 0, (LPARAM)newItem);

-    SendMessage(newItem->hWnd, BUTTONSETASFLATBTN, TRUE, 0);

-    SendMessage(newItem->hWnd, BUTTONSETASFLATBTN + 10, 0, 0);

+    SendMessage(newItem->hWnd, BUTTONSETASFLATBTN, FALSE, 0);

+    SendMessage(newItem->hWnd, BUTTONSETASTHEMEDBTN, 0, 0);

     if(newItem->dwFlags & BUTTON_ISTOGGLE)

         SendMessage(newItem->hWnd, BUTTONSETASPUSHBTN, TRUE, 0);

 

diff --git a/plugins/Clist_nicer/SRC/viewmodes.cpp b/plugins/Clist_nicer/SRC/viewmodes.cpp
index aecf8029e6..19297307c9 100644
--- a/plugins/Clist_nicer/SRC/viewmodes.cpp
+++ b/plugins/Clist_nicer/SRC/viewmodes.cpp
@@ -949,12 +949,12 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			while(_buttons[i] != 0) {

 				SendMessage(GetDlgItem(hwnd, _buttons[i]), BM_SETSKINNED, 0, bSkinned);

 				if(bSkinned) {

-					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, TRUE, 0);

-					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN + 10, 0, 0);

+					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, FALSE, 0);

+					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASTHEMEDBTN, 0, 0);

 				}

 				else {

-					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, TRUE, 1);

-					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN + 10, 0, 1);

+					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASFLATBTN, FALSE, 0);

+					SendDlgItemMessage(hwnd, _buttons[i], BUTTONSETASTHEMEDBTN, TRUE, 0);

 				}

 				i++;

 			}