diff options
| author | René Schümann <white06tiger@gmail.com> | 2014-12-25 00:30:57 +0000 |
|---|---|---|
| committer | René Schümann <white06tiger@gmail.com> | 2014-12-25 00:30:57 +0000 |
| commit | a58980cb6fcfb7fb81696a72546c1fc4c82ed4f0 (patch) | |
| tree | 1de49cb03d5c9c3bb10f458e9affd29d310ff547 /plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | |
| parent | c0846ad8541a49f1467d32d3208df9671779f5b8 (diff) | |
SendSS:
- removed mir_icolib and replaced with direct calls (using defines to simplify usage, improved performance)
* improved icon define names
* renamed ssClose.ico => ssCancel.ico to better reflect its use
* slight improvement to ssEditOn.ico
!!! this change dramatically changed SendSS's internal icon layout, iconpacks for SendSS must to be adjusted
git-svn-id: http://svn.miranda-ng.org/main/trunk@11610 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SendScreenshotPlus/src/dlg_msgbox.cpp')
| -rw-r--r-- | plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 65df1437a5..702550ad66 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -108,53 +108,53 @@ static void MakePopupAction(POPUPACTION &pa, int id) switch (id) { case IDOK: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = GetIconBtn(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Ok"); break; case IDCLOSE: case IDCANCEL: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = GetIconBtn(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Cancel"); break; case IDABORT: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = GetIconBtn(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Abort"); break; case IDRETRY: - pa.lchIcon = Skin_GetIcon(ICO_BTN_UPDATE); + pa.lchIcon = GetIconBtn(ICO_BTN_UPDATE); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Retry"); break; case IDIGNORE: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = GetIconBtn(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Ignore"); break; case IDYES: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = GetIconBtn(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Yes"); break; case IDNO: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = GetIconBtn(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/No"); break; case IDHELP: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = GetIconBtn(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/Help"); break; case IDALL: - pa.lchIcon = Skin_GetIcon(ICO_BTN_OK); + pa.lchIcon = GetIconBtn(ICO_BTN_OK); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/All"); break; case IDNONE: - pa.lchIcon = Skin_GetIcon(ICO_BTN_CANCEL); + pa.lchIcon = GetIconBtn(ICO_BTN_CANCEL); mir_strcpy(pa.lpzTitle, SZ_SENDSS"/None"); } } @@ -198,8 +198,9 @@ static INT_PTR CALLBACK MsgBoxProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l SendDlgItemMessage(hDlg, TXT_NAME, WM_SETFONT, (WPARAM)hNormalFont, 0); // set infobar's logo icon - SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON, - (LPARAM)((pMsgBox->hiLogo) ? pMsgBox->hiLogo : Skin_GetIcon(ICO_DLG_DETAILS,1))); +// @fixme (White-Tiger#1#): fix details icon +// SendDlgItemMessage(hDlg, ICO_DLGLOGO, STM_SETIMAGE, IMAGE_ICON, +// (LPARAM)((pMsgBox->hiLogo) ? pMsgBox->hiLogo : Skin_GetIcon(ICO_DLG_DETAILS,1))); // anable headerbar ShowWindow(GetDlgItem(hDlg, TXT_NAME), SW_SHOW); @@ -656,7 +657,7 @@ INT_PTR CALLBACK MsgBox(HWND hParent, UINT uType, LPCTSTR pszTitle, LPCTSTR pszI MSGBOX mb = {0}; mb.cbSize = sizeof(MSGBOX); mb.hParent = hParent; - mb.hiLogo = Skin_GetIcon(ICO_COMMON_SSWINDOW1); + mb.hiLogo = GetIcon(ICO_MAIN); mb.hiMsg = NULL; mb.ptszTitle = TranslateTS(pszTitle); mb.ptszInfoText = TranslateTS(pszInfo); @@ -684,7 +685,7 @@ INT_PTR CALLBACK MsgErr(HWND hParent, LPCTSTR pszFormat, ...) MSGBOX mb = {0}; mb.cbSize = sizeof(MSGBOX); mb.hParent = hParent; - mb.hiLogo = Skin_GetIcon(ICO_COMMON_SSWINDOW1); + mb.hiLogo = GetIcon(ICO_MAIN); mb.hiMsg = NULL; mb.ptszTitle = tszTitle; mb.ptszMsg = tszMsg; |