Skip to content

Commit

Permalink
BasicHistory: decapitalization (except TopToolBar button)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dartraiden
dartraiden committed Dec 4, 2017
1 parent 7e1cfed commit b6cb9d8
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 81 deletions.
28 changes: 14 additions & 14 deletions plugins/BasicHistory/res/BasicHistory.rc
View file
Expand Up @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_HISTORY DIALOGEX 0, 0, 496, 366
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_CONTROLPARENT
CAPTION "Message History"
CAPTION "Message history"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_LIST,WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHOWSELALWAYS | LVS_SINGLESEL | LVS_SHAREIMAGELISTS ,102,27,387,73
Expand All @@ -55,10 +55,10 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,23,270,10
CONTROL "Show groups in contact list",IDC_SHOWCONTACTGROUPS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,34,270,10
CONTROL "Do not show Find control border",IDC_FINDNOBORDER,
CONTROL "Do not show find control border",IDC_FINDNOBORDER,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,45,270,10
COMBOBOX IDC_DEFFILTER,172,56,122,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Default Event Filter",IDC_STATIC,12,59,145,8
LTEXT "Default event filter",IDC_STATIC,12,59,145,8
GROUPBOX "Custom filters",IDC_STATIC,12,78,282,86
LISTBOX IDC_LIST_FILTERS,20,92,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL
LISTBOX IDC_LIST_EVENTS,20,124,133,30, WS_TABSTOP | LBS_NOINTEGRALHEIGHT | WS_BORDER | WS_VSCROLL
Expand Down Expand Up @@ -117,7 +117,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,65,270,10
CONTROL "Show event icons",IDC_SHOWEVENTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,270,10
CONTROL "Enable Smileys",IDC_SHOWSMILEYS,
CONTROL "Enable smileys",IDC_SHOWSMILEYS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,270,10
END

Expand All @@ -131,17 +131,17 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,23,270,10
CONTROL "Search forward in message window",IDC_FORMES,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,37,270,10
CONTROL "Match Case",IDC_MATCHCASE,
CONTROL "Match case",IDC_MATCHCASE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,51,270,10
CONTROL "Match Whole Word",IDC_MATCHWHOLE,
CONTROL "Match whole word",IDC_MATCHWHOLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,65,270,10
CONTROL "Only Incoming Messages",IDC_ONLYIN,
CONTROL "Only incoming messages",IDC_ONLYIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,270,10
CONTROL "Only Outgoing Messages",IDC_ONLYOUT,
CONTROL "Only outgoing messages",IDC_ONLYOUT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,270,10
CONTROL "Only Selected Group",IDC_ONLYGROUP,
CONTROL "Only selected group",IDC_ONLYGROUP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,107,270,10
CONTROL "All Contacts",IDC_ALLCONTACTS,
CONTROL "All contacts",IDC_ALLCONTACTS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,121,270,10
END

Expand All @@ -150,20 +150,20 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Export To Txt",IDC_STATIC,4,5,298,37
GROUPBOX "Export to txt",IDC_STATIC,4,5,298,37
COMBOBOX IDC_TXTENC,142,20,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "File encoding*",IDC_STATIC,12,23,115,8
GROUPBOX "Export To Plain Html",IDC_STATIC,4,47,298,50
GROUPBOX "Export to plain HTML",IDC_STATIC,4,47,298,50
COMBOBOX IDC_HTML1ENC,142,62,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "File encoding*",IDC_STATIC,12,65,115,8
CONTROL "Show date in timestamps",IDC_HTML1DATE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,80,270,10
GROUPBOX "Export To Rich Html",IDC_STATIC,4,102,298,80
GROUPBOX "Export to rich HTML",IDC_STATIC,4,102,298,80
COMBOBOX IDC_HTML2ENC,142,117,152,30,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "File encoding*",IDC_STATIC,12,120,115,8
CONTROL "Show date in timestamps",IDC_HTML2DATE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,270,10
CONTROL "Enable Smileys",IDC_HTML2SHOWSMILEYS,
CONTROL "Enable smileys",IDC_HTML2SHOWSMILEYS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,270,10
CONTROL "External CSS file",IDC_HTML2EXTCSS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,163,115,10
Expand Down
12 changes: 6 additions & 6 deletions plugins/BasicHistory/src/BasicHistory.cpp
View file
Expand Up @@ -101,7 +101,7 @@ void InitMenuItems()
SET_UID(mi, 0x28848d7a, 0x6995, 0x4799, 0x82, 0xd7, 0x18, 0x40, 0x3d, 0xe3, 0x71, 0xc4);
mi.position = 1000090000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("View &History");
mi.name.a = LPGEN("View &history");
mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;
hContactMenu = Menu_AddContactMenuItem(&mi);

Expand All @@ -112,7 +112,7 @@ void InitMenuItems()
SET_UID(mi, 0x63929694, 0x2d3d, 0x4c5d, 0xa5, 0x2b, 0x64, 0x59, 0x72, 0x23, 0xe, 0x66);
mi.position = 1000090001;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);
mi.name.a = LPGEN("Delete All User History");
mi.name.a = LPGEN("Delete all user history");
mi.pszService = MS_HISTORY_DELETEALLCONTACTHISTORY;
hDeleteContactMenu = Menu_AddContactMenuItem(&mi);

Expand Down Expand Up @@ -160,10 +160,10 @@ IconItem iconList[] =
{ LPGEN("Incoming message"), "BasicHistory_in", IDI_INM },
{ LPGEN("Outgoing message"), "BasicHistory_out", IDI_OUTM },
{ LPGEN("Status change"), "BasicHistory_status", IDI_STATUS },
{ LPGEN("Show Contacts"), "BasicHistory_show", IDI_SHOW },
{ LPGEN("Hide Contacts"), "BasicHistory_hide", IDI_HIDE },
{ LPGEN("Find Next"), "BasicHistory_findnext", IDI_FINDNEXT },
{ LPGEN("Find Previous"), "BasicHistory_findprev", IDI_FINDPREV },
{ LPGEN("Show contacts"), "BasicHistory_show", IDI_SHOW },
{ LPGEN("Hide contacts"), "BasicHistory_hide", IDI_HIDE },
{ LPGEN("Find next"), "BasicHistory_findnext", IDI_FINDNEXT },
{ LPGEN("Find previous"), "BasicHistory_findprev", IDI_FINDPREV },
{ LPGEN("Plus in export"), "BasicHistory_plusex", IDI_PLUSEX },
{ LPGEN("Minus in export"), "BasicHistory_minusex", IDI_MINUSEX },
};
Expand Down
2 changes: 1 addition & 1 deletion plugins/BasicHistory/src/EventList.cpp
View file
Expand Up @@ -447,7 +447,7 @@ std::wstring HistoryEventList::GetContactId()
static void GetMessageDescription(DBEVENTINFO *dbei, wchar_t* buf, int cbBuf)
{
wchar_t *msg = DbEvent_GetTextW(dbei, CP_ACP);
wcsncpy_s(buf, cbBuf, msg ? msg : TranslateT("Invalid Message"), _TRUNCATE);
wcsncpy_s(buf, cbBuf, msg ? msg : TranslateT("Invalid message"), _TRUNCATE);
buf[cbBuf - 1] = 0;
mir_free(msg);
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/BasicHistory/src/ExportManager.cpp
View file
Expand Up @@ -41,7 +41,7 @@ std::wstring GetFile(const wchar_t* ext, HWND hwnd, bool open)

wcscpy_s(extUpper, ext);
extUpper[0] = std::toupper(ext[0], loc);
mir_snwprintf(filter, TranslateT("%s Files (*.%s)"), extUpper, ext);
mir_snwprintf(filter, TranslateT("%s files (*.%s)"), extUpper, ext);
size_t len = mir_wstrlen(filter) + 1;
mir_snwprintf(filter + len, _countof(filter) - len, L"*.%s", ext);
len += mir_wstrlen(filter + len);
Expand Down
56 changes: 28 additions & 28 deletions plugins/BasicHistory/src/HistoryWindow.cpp
View file
Expand Up @@ -389,7 +389,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM hContact, LPARAM)
}

wchar_t *message = TranslateT("This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?");
if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK)
if (MessageBox(hWnd, message, TranslateT("Are you sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK)
return FALSE;

db_set_safety_mode(FALSE);
Expand All @@ -402,7 +402,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM hContact, LPARAM)

if (HistoryEventList::IsImportedHistory(hContact)) {
message = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES)
if (MessageBox(hWnd, message, TranslateT("Are you sure?"), MB_YESNO | MB_ICONERROR) == IDYES)
HistoryEventList::DeleteImporter(hContact);
}

Expand Down Expand Up @@ -551,14 +551,14 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP
if (HIWORD(wParam) == BN_CLICKED) {
if (Button_GetCheck(GetDlgItem(hwndDlg, IDC_SHOWHIDE)) & BST_CHECKED) {
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)historyWindow->minusIco);
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide Contacts"), BATF_UNICODE);
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide contacts"), BATF_UNICODE);
historyWindow->isContactList = true;
ShowWindow(GetDlgItem(hwndDlg, IDC_LIST_CONTACTS), SW_SHOW);
ShowWindow(historyWindow->splitterYhWnd, SW_SHOW);
}
else {
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)historyWindow->plusIco);
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show Contacts"), BATF_UNICODE);
SendDlgItemMessage(hwndDlg, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show contacts"), BATF_UNICODE);
historyWindow->isContactList = false;
ShowWindow(GetDlgItem(hwndDlg, IDC_LIST_CONTACTS), SW_HIDE);
ShowWindow(historyWindow->splitterYhWnd, SW_HIDE);
Expand Down Expand Up @@ -656,10 +656,10 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP
AppendMenu(hPopupMenu, MF_STRING, IDM_COPY, TranslateT("Copy"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETE, TranslateT("Delete"));
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr);
AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send Message"));
AppendMenu(hPopupMenu, MF_STRING, IDM_QUOTE, TranslateT("Reply &Quoted"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History"));
AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send message"));
AppendMenu(hPopupMenu, MF_STRING, IDM_QUOTE, TranslateT("Reply &quoted"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history"));
}

int selected = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, clicked.x, clicked.y, 0, hwndDlg, nullptr);
Expand Down Expand Up @@ -833,10 +833,10 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP
HMENU hPopupMenu = CreatePopupMenu();
if (hPopupMenu != nullptr) {
AppendMenu(hPopupMenu, MF_STRING, IDM_COPY, TranslateT("Copy"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group"));
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr);
AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send Message"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History"));
AppendMenu(hPopupMenu, MF_STRING, IDM_MESSAGE, TranslateT("Send message"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history"));

int selected = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, clicked.x, clicked.y, 0, hwndDlg, nullptr);
switch (selected) {
Expand Down Expand Up @@ -973,13 +973,13 @@ void HistoryWindow::Initialise()
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONSETASFLATBTN, TRUE, 0);
if (m_hContact == NULL || Options::instance->showContacts) {
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)minusIco);
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide Contacts"), BATF_UNICODE);
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Hide contacts"), BATF_UNICODE);
Button_SetCheck(GetDlgItem(m_hWnd, IDC_SHOWHIDE), BST_CHECKED);
isContactList = true;
}
else {
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BM_SETIMAGE, IMAGE_ICON, (LPARAM)plusIco);
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show Contacts"), BATF_UNICODE);
SendDlgItemMessage(m_hWnd, IDC_SHOWHIDE, BUTTONADDTOOLTIP, (WPARAM)LPGENW("Show contacts"), BATF_UNICODE);
Button_SetCheck(GetDlgItem(m_hWnd, IDC_SHOWHIDE), BST_UNCHECKED);
ShowWindow(GetDlgItem(m_hWnd, IDC_LIST_CONTACTS), SW_HIDE);
ShowWindow(splitterYhWnd, SW_HIDE);
Expand Down Expand Up @@ -1061,7 +1061,7 @@ void HistoryWindow::Initialise()

TBBUTTON tbButtons[] =
{
{ 0, IDM_FIND, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Find Next") },
{ 0, IDM_FIND, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Find next") },
{ 3, IDM_DELETE, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Delete")},
{ 2, IDM_CONFIG, TBSTATE_ENABLED, BTNS_DROPDOWN, {0}, 0, (INT_PTR)TranslateT("Options")},
};
Expand Down Expand Up @@ -1657,15 +1657,15 @@ void HistoryWindow::FindToolbarClicked(LPNMTOOLBAR lpnmTB)
MapWindowPoints(lpnmTB->hdr.hwndFrom, HWND_DESKTOP, (LPPOINT)&rc, 2);
HMENU hPopupMenu = CreatePopupMenu();
if (hPopupMenu != nullptr) {
AppendMenu(hPopupMenu, MF_STRING, IDM_FINDNEXT, TranslateT("Find Next"));
AppendMenu(hPopupMenu, MF_STRING, IDM_FINDPREV, TranslateT("Find Previous"));
AppendMenu(hPopupMenu, MF_STRING, IDM_FINDNEXT, TranslateT("Find next"));
AppendMenu(hPopupMenu, MF_STRING, IDM_FINDPREV, TranslateT("Find previous"));
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr);
AppendMenu(hPopupMenu, searcher.IsMatchCase() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHCASE, TranslateT("Match Case"));
AppendMenu(hPopupMenu, searcher.IsMatchWholeWords() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHWHOLE, TranslateT("Match Whole Word"));
AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only Incoming Messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyOut() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYOUT, TranslateT("Only Outgoing Messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyGroup() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYGROUP, TranslateT("Only Selected Group"));
AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All Contacts"));
AppendMenu(hPopupMenu, searcher.IsMatchCase() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHCASE, TranslateT("Match case"));
AppendMenu(hPopupMenu, searcher.IsMatchWholeWords() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHWHOLE, TranslateT("Match whole word"));
AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only incoming messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyOut() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYOUT, TranslateT("Only outgoing messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyGroup() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYGROUP, TranslateT("Only selected group"));
AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All contacts"));
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr);
HMENU hFilterMenu = CreatePopupMenu();
int filter = GetFilterNr();
Expand Down Expand Up @@ -1745,8 +1745,8 @@ void HistoryWindow::ConfigToolbarClicked(LPNMTOOLBAR lpnmTB)
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr);

HMENU hExportMenu = CreatePopupMenu();
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTRHTML, TranslateT("Rich Html"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTPHTML, TranslateT("Plain Html"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTRHTML, TranslateT("Rich HTML"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTPHTML, TranslateT("Plain HTML"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTTXT, TranslateT("Txt"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTBINARY, TranslateT("Binary"));
AppendMenu(hExportMenu, MF_STRING, IDM_EXPORTDAT, TranslateT("Dat (mContacts)"));
Expand Down Expand Up @@ -1873,8 +1873,8 @@ void HistoryWindow::DeleteToolbarClicked(LPNMTOOLBAR lpnmTB)
HMENU hPopupMenu = CreatePopupMenu();
if (hPopupMenu != nullptr) {
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETE, TranslateT("Delete"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete Group"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete All User History"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEGROUP, TranslateT("Delete group"));
AppendMenu(hPopupMenu, MF_STRING, IDM_DELETEUSER, TranslateT("Delete all user history"));
SetMenuDefaultItem(hPopupMenu, IDM_DELETE, FALSE);

int iResult = TrackPopupMenu(hPopupMenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, m_hWnd, nullptr);
Expand Down Expand Up @@ -1931,7 +1931,7 @@ void HistoryWindow::Delete(int what)

wchar_t message[256];
mir_snwprintf(message, TranslateT("Number of history items to delete: %d.\nAre you sure you want to do this?"), toDelete);
if (MessageBox(m_hWnd, message, TranslateT("Are You sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK)
if (MessageBox(m_hWnd, message, TranslateT("Are you sure?"), MB_OKCANCEL | MB_ICONERROR) != IDOK)
return;

bool areImpMessages = false;
Expand All @@ -1946,7 +1946,7 @@ void HistoryWindow::Delete(int what)

if (areImpMessages) {
wchar_t *ptszMsg = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
if (MessageBox(m_hWnd, ptszMsg, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES) {
if (MessageBox(m_hWnd, ptszMsg, TranslateT("Are you sure?"), MB_YESNO | MB_ICONERROR) == IDYES) {
HistoryEventList::DeleteImporter(m_hContact);
rebuild = true;
}
Expand Down

0 comments on commit b6cb9d8

Please sign in to comment.