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 --- src/core/stdclist/res/resource.rc | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/core/stdclist/res') diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index 4e32d4bcf2..0b367c5e78 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -347,33 +347,6 @@ IDC_HYPERLINKHAND CURSOR "hyperlin.cur" IDC_DROP CURSOR "dragcopy.cur" IDC_DROPUSER CURSOR "dropuser.cur" -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_CLISTMENU MENU -BEGIN - POPUP "&Main menu" - BEGIN - MENUITEM SEPARATOR - MENUITEM "E&xit", ID_ICQ_EXIT - END - POPUP "&Status" - BEGIN - MENUITEM "&Offline\tCtrl+0", ID_STATUS_OFFLINE, CHECKED - MENUITEM "On&line\tCtrl+1", ID_STATUS_ONLINE - MENUITEM "&Away\tCtrl+2", ID_STATUS_AWAY - MENUITEM "&Not available\tCtrl+3", ID_STATUS_NA - MENUITEM "Occ&upied\tCtrl+4", ID_STATUS_OCCUPIED - MENUITEM "&Do not disturb\tCtrl+5", ID_STATUS_DND - MENUITEM "&Free for chat\tCtrl+6", ID_STATUS_FREECHAT - MENUITEM "&Invisible\tCtrl+7", ID_STATUS_INVISIBLE - MENUITEM "On the &phone\tCtrl+8", ID_STATUS_ONTHEPHONE - MENUITEM "Out to &lunch\tCtrl+9", ID_STATUS_OUTTOLUNCH - END -END - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3