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

1 files changed, 0 insertions, 28 deletions

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index abc645a9e7..21f242752c 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -580,34 +580,6 @@ IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\
 

 /////////////////////////////////////////////////////////////////////////////

 //

-// 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

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

 // DESIGNINFO

 //