diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-13 17:32:08 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-13 17:32:08 +0300 |
| commit | 520fca8c13037c9077e7d372c0d20a2364964ffb (patch) | |
| tree | 9b8594a08387b2e31952e4ece4f92732b50ca38f /plugins/Clist_nicer | |
| parent | d34d3314d9da310469343a0de2f4b3b49c3a56b9 (diff) | |
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
Diffstat (limited to 'plugins/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/res/resource.rc | 28 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clui.cpp | 3 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/resource.h | 1 |
3 files changed, 1 insertions, 31 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
//
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
|