From 520fca8c13037c9077e7d372c0d20a2364964ffb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 13 Jul 2018 17:32:08 +0300 Subject: Contacts lists: - duplicate IDR_CLISTMENU resources removed, the only copy remains in mir_app.dll; - local variable g_hMenuMain removed from Clist_Modern and replaced with g_clistApi.hMenuMain; - duplicate code removed from Clist_Modern (CLUI::CreateCluiFrames()) - fixes #1465 (StdClist: "Status" menu cannot change language on the fly); - fixes #1467 (Clist_blind: menu cannot change language on the fly); - fixes menu-related part in #1471 --- plugins/Clist_nicer/src/clui.cpp | 3 +-- plugins/Clist_nicer/src/resource.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/Clist_nicer/src') diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index cf269c7bf4..d025bd8496 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -733,8 +733,7 @@ static void ShowCLUI(HWND hwnd) int onTop = db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT); SendMessage(hwnd, WM_SETREDRAW, FALSE, FALSE); - if (!db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT)) - SetMenu(g_clistApi.hwndContactList, nullptr); + if (state == SETTING_STATE_NORMAL) { SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); ShowWindow(g_clistApi.hwndContactList, SW_SHOWNORMAL); diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h index 5e9cabe936..176986c10d 100644 --- a/plugins/Clist_nicer/src/resource.h +++ b/plugins/Clist_nicer/src/resource.h @@ -14,7 +14,6 @@ #define IDI_CLVM_OPTIONS 176 #define IDI_CLVM_SELECT 177 #define IDC_DROP 183 -#define IDR_CLISTMENU 199 #define IDI_BLANK 200 #define IDI_ADDCONTACT 210 #define IDC_HYPERLINKHAND 214 -- cgit v1.2.3