diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-05-17 15:38:59 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-05-17 15:38:59 +0000 |
| commit | 4d7fb80e18aa7b131bae7a0a55efb5d4a5097866 (patch) | |
| tree | 03007949bce748696d2f6120ab4cc116aea060be /plugins/Scriver/src/msgdialog.cpp | |
| parent | 8d525f2f68c3c079f2888fdc911f0b5d7cfc8557 (diff) | |
Scriver:
- fix for toolbar icons;
- horror with buffers replaced with CMString;
- unused code removed;
git-svn-id: http://svn.miranda-ng.org/main/trunk@16839 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src/msgdialog.cpp')
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 8f15fc1be7..22b05043b8 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -29,17 +29,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HCURSOR hCurSplitNS, hCurSplitWE, hCurHyperlinkHand, hDragCursor;
extern HANDLE hHookWinEvt;
-extern HANDLE hHookWinPopup;
static void UpdateReadChars(HWND hwndDlg, SrmmWindowData * dat);
-static ToolbarButton toolbarButtons[] = {
- {LPGENT("Quote"), IDC_QUOTE, 0, 4, 24},
- {LPGENT("Add contact"), IDC_ADD, 0, 10, 24},
- {LPGENT("User menu"), IDC_USERMENU, 1, 0, 24},
- {LPGENT("User details"), IDC_DETAILS, 1, 0, 24},
- {LPGENT("History"), IDC_HISTORY, 1, 0, 24},
- {LPGENT("Send"), IDOK, 1, 0, 38}
+static ToolbarButton toolbarButtons[] =
+{
+ { LPGENT("Quote"), IDC_QUOTE, 0, 4, 24 },
+ { LPGENT("Add contact"), IDC_ADD, 0, 10, 24 },
+ { LPGENT("User menu"), IDC_USERMENU, 1, 0, 24 },
+ { LPGENT("User details"), IDC_DETAILS, 1, 0, 24 },
+ { LPGENT("History"), IDC_HISTORY, 1, 0, 24 },
+ { LPGENT("Send"), IDOK, 1, 0, 38 }
};
static TCHAR* GetIEViewSelection(SrmmWindowData *dat)
@@ -453,7 +453,7 @@ static void SubclassLogEdit(HWND hwnd) static void MessageDialogResize(HWND hwndDlg, SrmmWindowData *dat, int w, int h)
{
ParentWindowData *pdat = dat->parent;
- int hSplitterPos = dat->splitterPos, toolbarHeight = pdat->flags2&SMF2_SHOWTOOLBAR ? IsToolbarVisible(_countof(toolbarButtons), g_dat.buttonVisibility) ? dat->toolbarSize.cy : dat->toolbarSize.cy / 3 : 0;
+ int hSplitterPos = dat->splitterPos, toolbarHeight = (pdat->flags2 & SMF2_SHOWTOOLBAR) ? IsToolbarVisible(_countof(toolbarButtons), g_dat.buttonVisibility) ? dat->toolbarSize.cy : dat->toolbarSize.cy / 3 : 0;
int hSplitterMinTop = toolbarHeight + dat->minLogBoxHeight, hSplitterMinBottom = dat->minEditBoxHeight;
int infobarInnerHeight = INFO_BAR_INNER_HEIGHT;
int infobarHeight = INFO_BAR_HEIGHT;
@@ -1009,9 +1009,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP TabControlData tcd;
tcd.iFlags = TCDF_TEXT | TCDF_ICON;
tcd.hIcon = GetTabIcon(dat);
- tcd.pszText = GetTabName(dat->hContact);
+ tcd.pszText = pcli->pfnGetContactDisplayName(dat->hContact, 0);
SendMessage(dat->hwndParent, CM_UPDATETABCONTROL, (WPARAM)&tcd, (LPARAM)hwndDlg);
- mir_free(tcd.pszText);
break;
}
@@ -1355,11 +1354,9 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP mir_sntprintf(szText, TranslateT("Sending in progress: %d message(s) left..."), dat->messagesInProgress);
}
else if (dat->nTypeSecs) {
- TCHAR *szContactName = GetNickname(dat->hContact, dat->szProto);
sbd.hIcon = GetCachedIcon("scriver_TYPING");
sbd.pszText = szText;
- mir_sntprintf(szText, TranslateT("%s is typing a message..."), szContactName);
- mir_free(szContactName);
+ mir_sntprintf(szText, TranslateT("%s is typing a message..."), pcli->pfnGetContactDisplayName(dat->hContact, 0));
dat->nTypeSecs--;
}
else if (dat->lastMessage) {
|