diff --git a/crypto/crypto.c b/crypto/crypto.c index ed99bec41..b12b48eab 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -31,8 +31,8 @@ see ecryption-doc.txt for details #include "rijndael-api-fst.h" #include "crypto.h" -//extern HINSTANCE g_hInstance; extern HMODULE g_hLngResContainer; +extern HICON g_hDlgIcon; #define WKEY_LEN 256 #define KEY_LEN 512 @@ -112,6 +112,7 @@ INT_PTR CALLBACK SetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lPar case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } SetDlgItemText(hDlg, IDC_PWD_EDIT1, unicodeFileKey); SetDlgItemText(hDlg, IDC_PWD_EDIT2, unicodeMasterKey); ShowWindow(GetDlgItem(hDlg, IDC_PWD_CHECK3), hasMasterFileKey); @@ -238,15 +239,16 @@ INT_PTR CALLBACK GetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lPar case WM_INITDIALOG: { - int vis = masterKeyAvailable ? SW_SHOW : SW_HIDE; - ShowWindow(GetDlgItem(hDlg, IDC_PWD_STATMPW), vis); - ShowWindow(GetDlgItem(hDlg, IDC_PWD_CHECK3), vis); - //@@@SetDlgItemText( hDlg, IDC_PWD_EDIT3, fileKey ); - SetDlgItemText(hDlg, IDC_PWD_EDIT3, unicodeFileKey); - CheckDlgButton(hDlg, IDC_PWD_CHECK3, BST_UNCHECKED); - CenterDlgInParent(hDlg); - // Don't use: SetFocus( GetDlgItem( hDlg, IDC_PWD_EDIT3 ) ); - SetDialogFocus(hDlg, GetDlgItem(hDlg, IDC_PWD_EDIT3)); + if (g_hDlgIcon) { SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + int vis = masterKeyAvailable ? SW_SHOW : SW_HIDE; + ShowWindow(GetDlgItem(hDlg, IDC_PWD_STATMPW), vis); + ShowWindow(GetDlgItem(hDlg, IDC_PWD_CHECK3), vis); + //@@@SetDlgItemText( hDlg, IDC_PWD_EDIT3, fileKey ); + SetDlgItemText(hDlg, IDC_PWD_EDIT3, unicodeFileKey); + CheckDlgButton(hDlg, IDC_PWD_CHECK3, BST_UNCHECKED); + CenterDlgInParent(hDlg); + // Don't use: SetFocus( GetDlgItem( hDlg, IDC_PWD_EDIT3 ) ); + SetDialogFocus(hDlg, GetDlgItem(hDlg, IDC_PWD_EDIT3)); } return true; break; diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index f2a8bab8e..a5cbc90f3 100644 Binary files a/language/np3_de_de/dialogs_de_de.rc and b/language/np3_de_de/dialogs_de_de.rc differ diff --git a/minipath/src/Dialogs.c b/minipath/src/Dialogs.c index 4da812e7b..779439caa 100644 --- a/minipath/src/Dialogs.c +++ b/minipath/src/Dialogs.c @@ -43,6 +43,8 @@ // extern HWND hwndMain; extern LANGID g_iPrefLngLocID; +extern HICON g_hDlgIcon; + int ErrorMessage(int iLevel, UINT uIdMsg, ...) { @@ -195,15 +197,16 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) case WM_INITDIALOG: { - DLITEM dli; - LPWSTR psz; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } MakeBitmapButton(hwnd,IDC_SEARCHEXE,g_hInstance,IDB_OPEN); + DLITEM dli; + ZeroMemory(&dli, sizeof(DLITEM)); dli.mask = DLI_FILENAME; if (DirList_GetItem(hwndDirList,-1,&dli) != -1) { - psz = GetFilenameStr(dli.szFileName); + LPWSTR psz = GetFilenameStr(dli.szFileName); QuotateFilenameStr(psz); SetDlgItemText(hwnd,IDC_COMMANDLINE,psz); } @@ -379,11 +382,9 @@ INT_PTR CALLBACK GotoDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) case WM_INITDIALOG: { - int i; - RECT rc; WCHAR tch[64]; - int cGrip; + RECT rc; GetClientRect(hwnd,&rc); cxClient = rc.right - rc.left; cyClient = rc.bottom - rc.top; @@ -399,6 +400,8 @@ INT_PTR CALLBACK GotoDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) SetWindowLongPtr(hwnd,GWL_STYLE,GetWindowLongPtr(hwnd,GWL_STYLE)|WS_THICKFRAME); SetWindowPos(hwnd,NULL,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + GetMenuString(GetSystemMenu(GetParent(hwnd),FALSE),SC_SIZE,tch,COUNTOF(tch),MF_BYCOMMAND); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_STRING|MF_ENABLED,SC_SIZE,tch); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_SEPARATOR,0,NULL); @@ -406,14 +409,14 @@ INT_PTR CALLBACK GotoDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) SetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP),GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP),GWL_STYLE)|SBS_SIZEGRIP|WS_CLIPSIBLINGS); - cGrip = GetSystemMetrics(SM_CXHTHUMB); + int cGrip = GetSystemMetrics(SM_CXHTHUMB); SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP),NULL,cxClient-cGrip, cyClient-cGrip,cGrip,cGrip,SWP_NOZORDER); SendDlgItemMessage(hwnd,IDC_GOTO,CB_LIMITTEXT,MAX_PATH-1,0); SendDlgItemMessage(hwnd,IDC_GOTO,CB_SETEXTENDEDUI,TRUE,0); - for (i = 0; i < HISTORY_ITEMS; i++) { + for (int i = 0; i < HISTORY_ITEMS; i++) { if (mHistory.psz[i]) { int iItem = (int)SendDlgItemMessage(hwnd,IDC_GOTO, CB_FINDSTRINGEXACT,(WPARAM)-1,(LPARAM)mHistory.psz[i]); @@ -567,6 +570,8 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) WCHAR wch[256]; LOGFONT lf; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SetDlgItemText(hwnd,IDC_VERSION,VERSION_FILEVERSION_LONG); SetDlgItemText(hwnd,IDC_COPYRIGHT,VERSION_LEGALCOPYRIGHT_LONG); SetDlgItemText(hwnd,IDC_AUTHORNAME,VERSION_AUTHORNAME); @@ -675,6 +680,8 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam case WM_INITDIALOG: + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + if (lstrlen(g_wchIniFile)) { if (bSaveSettings) CheckDlgButton(hwnd,IDC_SAVESETTINGS,BST_CHECKED); @@ -782,6 +789,8 @@ INT_PTR CALLBACK AdvancedPageProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara case WM_INITDIALOG: + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + if (bClearReadOnly) CheckDlgButton(hwnd,IDC_CLEARREADONLY,BST_CHECKED); @@ -948,6 +957,8 @@ INT_PTR CALLBACK ItemsPageProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) case WM_INITDIALOG: + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + m_bDefCrNoFilt = bDefCrNoFilt; m_bDefCrFilter = bDefCrFilter; @@ -1109,6 +1120,8 @@ INT_PTR CALLBACK ProgPageProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) WCHAR tch[MAX_PATH]; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + MakeBitmapButton(hwnd,IDC_BROWSE_Q,g_hInstance,IDB_OPEN); MakeBitmapButton(hwnd,IDC_BROWSE_F,g_hInstance,IDB_OPEN); @@ -1253,11 +1266,7 @@ extern BOOL bNegFilter; INT_PTR OptionsPropSheet(HWND hwnd,HINSTANCE hInstance) { - PROPSHEETHEADER psh; PROPSHEETPAGE psp[4]; - INT_PTR nResult; - - ZeroMemory(&psh,sizeof(PROPSHEETHEADER)); ZeroMemory(psp,sizeof(PROPSHEETPAGE)*4); psp[0].dwSize = sizeof(PROPSHEETPAGE); @@ -1284,17 +1293,19 @@ INT_PTR OptionsPropSheet(HWND hwnd,HINSTANCE hInstance) psp[3].pResource = LoadThemedDialogTemplate(MAKEINTRESOURCE(IDPP_PROG),hInstance); psp[3].pfnDlgProc = ProgPageProc; + PROPSHEETHEADER psh; + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | \ - PSH_PROPTITLE; + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW | PSH_PROPTITLE | PSH_USEHICON; psh.hwndParent = hwnd; psh.hInstance = hInstance; + psh.hIcon = g_hDlgIcon; psh.pszCaption = L"MiniPath"; psh.nPages = 4; psh.nStartPage = 0; psh.ppsp = psp; - nResult = PropertySheet(&psh); + INT_PTR nResult = PropertySheet(&psh); if (psp[0].pResource) LocalFree((HLOCAL)psp[0].pResource); if (psp[1].pResource) LocalFree((HLOCAL)psp[1].pResource); @@ -1304,7 +1315,6 @@ INT_PTR OptionsPropSheet(HWND hwnd,HINSTANCE hInstance) // Apply the results if (nResult) { - if (bAlwaysOnTop) SetWindowPos(hwnd,HWND_TOPMOST,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE); else @@ -1342,9 +1352,7 @@ INT_PTR OptionsPropSheet(HWND hwnd,HINSTANCE hInstance) } } - return(nResult); - } @@ -1365,6 +1373,8 @@ INT_PTR CALLBACK GetFilterDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + MakeBitmapButton(hwnd,IDC_BROWSEFILTER,NULL,OBM_COMBO); SendDlgItemMessage(hwnd,IDC_FILTER,EM_LIMITTEXT,COUNTOF(tchFilter)-1,0); @@ -1561,6 +1571,8 @@ INT_PTR CALLBACK RenameFileDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar lpfod = (LPFILEOPDLGDATA)lParam; SetWindowLongPtr(hwnd,DWLP_USER,(LONG_PTR)lpfod); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SetDlgItemText(hwnd,IDC_OLDNAME,lpfod->szSource); SetDlgItemText(hwnd,IDC_NEWNAME,lpfod->szSource); SendDlgItemMessage(hwnd,IDC_NEWNAME,EM_LIMITTEXT,MAX_PATH-1,0); @@ -1714,6 +1726,8 @@ INT_PTR CALLBACK CopyMoveDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam SetWindowLongPtr(hwnd,GWL_STYLE,GetWindowLongPtr(hwnd,GWL_STYLE)|WS_THICKFRAME); SetWindowPos(hwnd,NULL,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + GetMenuString(GetSystemMenu(GetParent(hwnd),FALSE),SC_SIZE,tch,COUNTOF(tch),MF_BYCOMMAND); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_STRING|MF_ENABLED,SC_SIZE,tch); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_SEPARATOR,0,NULL); @@ -1999,6 +2013,8 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam SetWindowLongPtr(hwnd,GWL_STYLE,GetWindowLongPtr(hwnd,GWL_STYLE)|WS_THICKFRAME); SetWindowPos(hwnd,NULL,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + GetMenuString(GetSystemMenu(GetParent(hwnd),FALSE),SC_SIZE,tch,COUNTOF(tch),MF_BYCOMMAND); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_STRING|MF_ENABLED,SC_SIZE,tch); InsertMenu(GetSystemMenu(hwnd,FALSE),SC_CLOSE,MF_BYCOMMAND|MF_SEPARATOR,0,NULL); @@ -2275,6 +2291,8 @@ INT_PTR CALLBACK NewDirDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) lpfod = (LPFILEOPDLGDATA)lParam; SetWindowLongPtr(hwnd,DWLP_USER,(LONG_PTR)lpfod); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SendDlgItemMessage(hwnd,IDC_NEWDIR,EM_LIMITTEXT,MAX_PATH-1,0); CenterDlgInParent(hwnd); @@ -2362,6 +2380,9 @@ INT_PTR CALLBACK FindWinDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) hIconCross1 = LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_CROSS1)); hIconCross2 = LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_CROSS2)); hCursorCross = LoadCursor(g_hInstance,MAKEINTRESOURCE(IDC_CROSSHAIR)); + + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + CenterDlgInParent(hwnd); bHasCapture = FALSE; return TRUE; @@ -2544,6 +2565,8 @@ INT_PTR CALLBACK FindTargetDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPar //if (!SendMessage(hwndToolTip,TTM_ADDTOOL,0,(LPARAM)&ti)) // DestroyWindow(hwndToolTip); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + // Bitmap für den Browse-Button MakeBitmapButton(hwnd,IDC_BROWSE,g_hInstance,IDB_OPEN); //MakeBitmapButton(hwnd,IDC_FINDWIN,g_hInstance,IDB_BROWSE); diff --git a/minipath/src/minipath.c b/minipath/src/minipath.c index 73e8369ca..8bafcdea5 100644 --- a/minipath/src/minipath.c +++ b/minipath/src/minipath.c @@ -30,15 +30,17 @@ #include "resource.h" +HICON g_hDlgIcon = NULL; /****************************************************************************** * * Local Variables for minipath.c * */ -HWND hwndStatus; -HWND hwndToolbar; -HWND hwndReBar; +static HWND hwndStatus; +static HWND hwndToolbar; +static HWND hwndReBar; + #define NUMTOOLBITMAPS 15 #define NUMINITIALTOOLS 6 @@ -376,9 +378,9 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInst,LPSTR lpCmdLine,int n // BOOL InitApplication(HINSTANCE hInstance) { - static HICON hIcon = NULL; - if (!hIcon) { - hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, 256, 256, LR_DEFAULTCOLOR); + if (!g_hDlgIcon) { + g_hDlgIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); } WNDCLASS wc; @@ -389,7 +391,7 @@ BOOL InitApplication(HINSTANCE hInstance) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstance; - wc.hIcon = hIcon; + wc.hIcon = g_hDlgIcon; wc.hCursor = LoadCursor(hInstance,IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_3DFACE+1); wc.lpszMenuName = NULL; diff --git a/src/Dialogs.c b/src/Dialogs.c index 0c6d782e1..d76969bc1 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -54,6 +54,7 @@ extern HWND g_hwndMain; extern HINSTANCE g_hInstance; extern HMODULE g_hLngResContainer; extern LANGID g_iPrefLngLocID; +extern HICON g_hDlgIcon; extern WCHAR g_wchWorkingDirectory[]; extern WCHAR g_wchCurFile[]; @@ -189,15 +190,17 @@ INT_PTR CALLBACK InfoBoxDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lPar switch (umsg) { case WM_INITDIALOG: - lpib = (LPINFOBOX)lParam; - SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); - SendDlgItemMessage(hwnd, IDC_INFOBOXICON, STM_SETICON, - (WPARAM)LoadIcon(NULL, IDI_EXCLAMATION), 0); - SetDlgItemText(hwnd, IDC_INFOBOXTEXT, lpib->lpstrMessage); - if (lpib->bDisableCheckBox) - DialogEnableWindow(hwnd, IDC_INFOBOXCHECK, false); - LocalFree(lpib->lpstrMessage); - CenterDlgInParent(hwnd); + { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + lpib = (LPINFOBOX)lParam; + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); + SendDlgItemMessage(hwnd, IDC_INFOBOXICON, STM_SETICON, (WPARAM)LoadIcon(NULL, IDI_EXCLAMATION), 0); + SetDlgItemText(hwnd, IDC_INFOBOXTEXT, lpib->lpstrMessage); + if (lpib->bDisableCheckBox) + DialogEnableWindow(hwnd, IDC_INFOBOXCHECK, false); + LocalFree(lpib->lpstrMessage); + CenterDlgInParent(hwnd); + } return true; case WM_COMMAND: @@ -639,11 +642,10 @@ INT_PTR CALLBACK RunDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) switch(umsg) { - case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } // MakeBitmapButton(hwnd,IDC_SEARCHEXE,g_hInstance,IDB_OPEN); - SendDlgItemMessage(hwnd,IDC_COMMANDLINE,EM_LIMITTEXT,MAX_PATH - 1,0); SetDlgItemText(hwnd,IDC_COMMANDLINE,(LPCWSTR)lParam); SHAutoComplete(GetDlgItem(hwnd,IDC_COMMANDLINE),SHACF_FILESYSTEM); @@ -814,6 +816,8 @@ INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; ResizeDlg_Init(hwnd,cxOpenWithDlg,cyOpenWithDlg,IDC_RESIZEGRIP3); @@ -1012,6 +1016,8 @@ INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; ResizeDlg_Init(hwnd,cxFavoritesDlg,cyFavoritesDlg,IDC_RESIZEGRIP3); @@ -1174,55 +1180,45 @@ bool FavoritesDlg(HWND hwnd,LPWSTR lpstrFile) // // Controls: 100 Edit // -INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { - - switch(umsg) - { - + switch (umsg) { WCHAR *pszName; - case WM_INITDIALOG: + case WM_INITDIALOG: + { pszName = (LPWSTR)lParam; - SetWindowLongPtr(hwnd,DWLP_USER,(LONG_PTR)pszName); + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)pszName); - SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,MAX_PATH-1,0); - SetDlgItemText(hwnd,100,pszName); + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SendDlgItemMessage(hwnd, 100, EM_LIMITTEXT, MAX_PATH - 1, 0); + SetDlgItemText(hwnd, 100, pszName); CenterDlgInParent(hwnd); - return true; + } + return true; - case WM_COMMAND: + case WM_COMMAND: + switch (LOWORD(wParam)) { + case 100: + DialogEnableWindow(hwnd, IDOK, GetWindowTextLength(GetDlgItem(hwnd, 100))); + break; - switch(LOWORD(wParam)) - { - - case 100: - DialogEnableWindow(hwnd,IDOK,GetWindowTextLength(GetDlgItem(hwnd,100))); - break; - - - case IDOK: - pszName = (LPWSTR)GetWindowLongPtr(hwnd,DWLP_USER); - GetDlgItemText(hwnd,100,pszName, - MAX_PATH-1); - EndDialog(hwnd,IDOK); - break; - - - case IDCANCEL: - EndDialog(hwnd,IDCANCEL); - break; - - } - - return true; + case IDOK: + pszName = (LPWSTR)GetWindowLongPtr(hwnd, DWLP_USER); + GetDlgItemText(hwnd, 100, pszName, + MAX_PATH - 1); + EndDialog(hwnd, IDOK); + break; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + return true; } - return false; - } @@ -1373,15 +1369,15 @@ DWORD WINAPI FileMRUIconThread(LPVOID lpParam) { INT_PTR CALLBACK FileMRUDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) { - switch(umsg) { - case WM_INITDIALOG: { SHFILEINFO shfi; LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + LPICONTHREADINFO lpit = (LPICONTHREADINFO)GlobalAlloc(GPTR,sizeof(ICONTHREADINFO)); SetProp(hwnd,L"it",(HANDLE)lpit); lpit->hwnd = GetDlgItem(hwnd,IDC_FILEMRU); @@ -1740,40 +1736,41 @@ extern int g_iFileWatchingMode; extern bool g_bResetFileWatching; extern bool g_bChasingDocTail; -INT_PTR CALLBACK ChangeNotifyDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK ChangeNotifyDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { - switch(umsg) - { - case WM_INITDIALOG: - CheckRadioButton(hwnd,100,102,100+g_iFileWatchingMode); + switch (umsg) { + case WM_INITDIALOG: + { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + CheckRadioButton(hwnd, 100, 102, 100 + g_iFileWatchingMode); if (g_bResetFileWatching) - CheckDlgButton(hwnd,103,BST_CHECKED); + CheckDlgButton(hwnd, 103, BST_CHECKED); CenterDlgInParent(hwnd); - return true; + } + return true; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDOK: - if (IsDlgButtonChecked(hwnd,100) == BST_CHECKED) - g_iFileWatchingMode = 0; - else if (IsDlgButtonChecked(hwnd,101) == BST_CHECKED) - g_iFileWatchingMode = 1; - else - g_iFileWatchingMode = 2; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDOK: + if (IsDlgButtonChecked(hwnd, 100) == BST_CHECKED) + g_iFileWatchingMode = 0; + else if (IsDlgButtonChecked(hwnd, 101) == BST_CHECKED) + g_iFileWatchingMode = 1; + else + g_iFileWatchingMode = 2; - g_bResetFileWatching = (IsDlgButtonChecked(hwnd,103) == BST_CHECKED) ? true : false; + g_bResetFileWatching = (IsDlgButtonChecked(hwnd, 103) == BST_CHECKED) ? true : false; - if (g_bChasingDocTail) { SendMessage(g_hwndMain, WM_COMMAND, MAKELONG(IDM_VIEW_CHASING_DOCTAIL, 1), 0); } + if (g_bChasingDocTail) { SendMessage(g_hwndMain, WM_COMMAND, MAKELONG(IDM_VIEW_CHASING_DOCTAIL, 1), 0); } - EndDialog(hwnd,IDOK); - break; + EndDialog(hwnd, IDOK); + break; - case IDCANCEL: - EndDialog(hwnd,IDCANCEL); - break; - } - return true; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + return true; } UNUSED(lParam); @@ -1808,65 +1805,49 @@ bool ChangeNotifyDlg(HWND hwnd) // // Controls: Edit IDC_COLUMNWRAP // -INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK ColumnWrapDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { static UINT *piNumber; - switch(umsg) - { + switch (umsg) { + case WM_INITDIALOG: + { + piNumber = (UINT*)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SetDlgItemInt(hwnd, IDC_COLUMNWRAP, *piNumber, false); + SendDlgItemMessage(hwnd, IDC_COLUMNWRAP, EM_LIMITTEXT, 15, 0); + CenterDlgInParent(hwnd); + } + return true; - case WM_INITDIALOG: + + case WM_COMMAND: + + switch (LOWORD(wParam)) { + + case IDOK: { - - piNumber = (UINT*)lParam; - - SetDlgItemInt(hwnd, IDC_COLUMNWRAP,*piNumber,false); - SendDlgItemMessage(hwnd, IDC_COLUMNWRAP,EM_LIMITTEXT,15,0); - - CenterDlgInParent(hwnd); - + BOOL fTranslated; + UINT iNewNumber = GetDlgItemInt(hwnd, IDC_COLUMNWRAP, &fTranslated, FALSE); + if (fTranslated) { + *piNumber = iNewNumber; + EndDialog(hwnd, IDOK); + } + else + PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, IDC_COLUMNWRAP)), 1); } - return true; + break; - case WM_COMMAND: - - switch(LOWORD(wParam)) - { - - case IDOK: { - - BOOL fTranslated; - - UINT iNewNumber = GetDlgItemInt(hwnd, IDC_COLUMNWRAP,&fTranslated,FALSE); - - if (fTranslated) - { - *piNumber = iNewNumber; - - EndDialog(hwnd,IDOK); - } - - else - PostMessage(hwnd,WM_NEXTDLGCTL,(WPARAM)(GetDlgItem(hwnd, IDC_COLUMNWRAP)),1); - - } - break; - - - case IDCANCEL: - EndDialog(hwnd,IDCANCEL); - break; - - } - - return true; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + return true; } - return false; - } @@ -1908,85 +1889,77 @@ extern int iWordWrapIndent; extern int iWordWrapSymbols; extern bool bShowWordWrapSymbols; -INT_PTR CALLBACK WordWrapSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK WordWrapSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { - - switch(umsg) - { - - case WM_INITDIALOG: - { - - WCHAR tch[512]; - int i; - - for (i = 0; i < 4; i++) { - GetDlgItemText(hwnd,200+i,tch,COUNTOF(tch)); - StringCchCat(tch,COUNTOF(tch),L"|"); - WCHAR* p1 = tch; - WCHAR* p2 = StrChr(p1, L'|'); - while (p2) { - *p2++ = L'\0'; - if (*p1) - SendDlgItemMessage(hwnd,100+i,CB_ADDSTRING,0,(LPARAM)p1); - p1 = p2; - p2 = StrChr(p1, L'|'); - } - - SendDlgItemMessage(hwnd,100+i,CB_SETEXTENDEDUI,true,0); - } - - SendDlgItemMessage(hwnd,100,CB_SETCURSEL,(WPARAM)iWordWrapIndent,0); - SendDlgItemMessage(hwnd,101,CB_SETCURSEL,(WPARAM)(bShowWordWrapSymbols) ? iWordWrapSymbols%10 : 0,0); - SendDlgItemMessage(hwnd,102,CB_SETCURSEL,(WPARAM)(bShowWordWrapSymbols) ? ((iWordWrapSymbols%100)-(iWordWrapSymbols%10))/10 : 0,0); - SendDlgItemMessage(hwnd,103,CB_SETCURSEL,(WPARAM)iWordWrapMode,0); - - CenterDlgInParent(hwnd); - - } - return true; - - - case WM_COMMAND: - - switch(LOWORD(wParam)) - { - - case IDOK: { - - int iSel, iSel2; - - iSel = (int)SendDlgItemMessage(hwnd,100,CB_GETCURSEL,0,0); - iWordWrapIndent = iSel; - - bShowWordWrapSymbols = false; - iSel = (int)SendDlgItemMessage(hwnd,101,CB_GETCURSEL,0,0); - iSel2 = (int)SendDlgItemMessage(hwnd,102,CB_GETCURSEL,0,0); - if (iSel > 0 || iSel2 > 0) { - bShowWordWrapSymbols = true; - iWordWrapSymbols = iSel + iSel2*10; - } - - iSel = (int)SendDlgItemMessage(hwnd,103,CB_GETCURSEL,0,0); - iWordWrapMode = iSel; - - EndDialog(hwnd,IDOK); - } - break; - - - case IDCANCEL: - EndDialog(hwnd,IDCANCEL); - break; - - } - - return true; - - } - UNUSED(lParam); + switch (umsg) { + + case WM_INITDIALOG: + { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + WCHAR tch[512]; + for (int i = 0; i < 4; i++) { + GetDlgItemText(hwnd, 200 + i, tch, COUNTOF(tch)); + StringCchCat(tch, COUNTOF(tch), L"|"); + WCHAR* p1 = tch; + WCHAR* p2 = StrChr(p1, L'|'); + while (p2) { + *p2++ = L'\0'; + if (*p1) + SendDlgItemMessage(hwnd, 100 + i, CB_ADDSTRING, 0, (LPARAM)p1); + p1 = p2; + p2 = StrChr(p1, L'|'); + } + SendDlgItemMessage(hwnd, 100 + i, CB_SETEXTENDEDUI, true, 0); + } + SendDlgItemMessage(hwnd, 100, CB_SETCURSEL, (WPARAM)iWordWrapIndent, 0); + SendDlgItemMessage(hwnd, 101, CB_SETCURSEL, (WPARAM)(bShowWordWrapSymbols) ? iWordWrapSymbols % 10 : 0, 0); + SendDlgItemMessage(hwnd, 102, CB_SETCURSEL, (WPARAM)(bShowWordWrapSymbols) ? ((iWordWrapSymbols % 100) - (iWordWrapSymbols % 10)) / 10 : 0, 0); + SendDlgItemMessage(hwnd, 103, CB_SETCURSEL, (WPARAM)iWordWrapMode, 0); + + CenterDlgInParent(hwnd); + } + return true; + + + case WM_COMMAND: + + switch (LOWORD(wParam)) { + + case IDOK: + { + + int iSel, iSel2; + + iSel = (int)SendDlgItemMessage(hwnd, 100, CB_GETCURSEL, 0, 0); + iWordWrapIndent = iSel; + + bShowWordWrapSymbols = false; + iSel = (int)SendDlgItemMessage(hwnd, 101, CB_GETCURSEL, 0, 0); + iSel2 = (int)SendDlgItemMessage(hwnd, 102, CB_GETCURSEL, 0, 0); + if (iSel > 0 || iSel2 > 0) { + bShowWordWrapSymbols = true; + iWordWrapSymbols = iSel + iSel2 * 10; + } + + iSel = (int)SendDlgItemMessage(hwnd, 103, CB_GETCURSEL, 0, 0); + iWordWrapMode = iSel; + + EndDialog(hwnd, IDOK); + } + break; + + + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + + } + + return true; + + } return false; } @@ -2021,72 +1994,64 @@ bool WordWrapSettingsDlg(HWND hwnd,UINT uidDlg,int *iNumber) // extern int iLongLineMode; -INT_PTR CALLBACK LongLineSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam) +INT_PTR CALLBACK LongLineSettingsDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { - static int *piNumber; - switch(umsg) - { + switch (umsg) { - case WM_INITDIALOG: + case WM_INITDIALOG: + { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + piNumber = (int*)lParam; + SetDlgItemInt(hwnd, 100, *piNumber, false); + SendDlgItemMessage(hwnd, 100, EM_LIMITTEXT, 15, 0); + + if (iLongLineMode == EDGE_LINE) + CheckRadioButton(hwnd, 101, 102, 101); + else + CheckRadioButton(hwnd, 101, 102, 102); + + CenterDlgInParent(hwnd); + + } + return true; + + + case WM_COMMAND: + + switch (LOWORD(wParam)) { + + case IDOK: { - piNumber = (int*)lParam; + BOOL fTranslated; - SetDlgItemInt(hwnd,100,*piNumber,false); - SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,15,0); + UINT iNewNumber = GetDlgItemInt(hwnd, 100, &fTranslated, FALSE); + + if (fTranslated) { + *piNumber = iNewNumber; + + iLongLineMode = (IsDlgButtonChecked(hwnd, 101)) ? EDGE_LINE : EDGE_BACKGROUND; + + EndDialog(hwnd, IDOK); + } - if (iLongLineMode == EDGE_LINE) - CheckRadioButton(hwnd,101,102,101); else - CheckRadioButton(hwnd,101,102,102); - - CenterDlgInParent(hwnd); + PostMessage(hwnd, WM_NEXTDLGCTL, (WPARAM)(GetDlgItem(hwnd, 100)), 1); } - return true; + break; - case WM_COMMAND: - - switch(LOWORD(wParam)) - { - - case IDOK: { - - BOOL fTranslated; - - UINT iNewNumber = GetDlgItemInt(hwnd,100,&fTranslated,FALSE); - - if (fTranslated) - { - *piNumber = iNewNumber; - - iLongLineMode = (IsDlgButtonChecked(hwnd,101)) ? EDGE_LINE : EDGE_BACKGROUND; - - EndDialog(hwnd,IDOK); - } - - else - PostMessage(hwnd,WM_NEXTDLGCTL,(WPARAM)(GetDlgItem(hwnd,100)),1); - - } - break; - - - case IDCANCEL: - EndDialog(hwnd,IDCANCEL); - break; - - } - - return true; + case IDCANCEL: + EndDialog(hwnd, IDCANCEL); + break; + } + return true; } - return false; - } @@ -2134,6 +2099,7 @@ INT_PTR CALLBACK TabSettingsDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPa case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } SetDlgItemInt(hwnd,100,g_iTabWidth,false); SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,15,0); @@ -2249,8 +2215,10 @@ INT_PTR CALLBACK SelectDefEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR HIMAGELIST himl; pdd = (PENCODEDLG)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } hbmp = LoadImage(g_hInstance,MAKEINTRESOURCE(IDB_ENCODING),IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + himl = ImageList_Create(16,16,ILC_COLOR32|ILC_MASK,0,0); ImageList_AddMasked(himl,hbmp,CLR_DEFAULT); DeleteObject(hbmp); @@ -2368,6 +2336,8 @@ INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM pdd = (PENCODEDLG)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + ResizeDlg_Init(hwnd,pdd->cxDlg,pdd->cyDlg,IDC_RESIZEGRIP4); hwndLV = GetDlgItem(hwnd,IDC_ENCODINGLIST); @@ -2573,6 +2543,8 @@ INT_PTR CALLBACK SelectDefLineEndingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LP piOption = (int*)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + // Load options for (i = 0; i < 3; i++) { GetLngString(IDS_EOL_WIN+i,wch,COUNTOF(wch)); diff --git a/src/Edit.c b/src/Edit.c index 55efa6ded..830fa3818 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -61,10 +61,11 @@ extern HMODULE g_hLngResContainer; -extern HWND g_hwndMain; -extern HWND g_hwndStatus; -extern HWND g_hwndDlgFindReplace; +extern HWND g_hwndMain; +extern HWND g_hwndStatus; +extern HWND g_hwndDlgFindReplace; extern WININFO g_WinInfo; +extern HICON g_hDlgIcon; //extern LPMALLOC g_lpMalloc; @@ -4981,6 +4982,9 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA { // the global static Find/Replace data structure SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); + + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + //sg_pefrData = (LPEDITFINDREPLACE)lParam; sg_pefrData = (LPEDITFINDREPLACE)GetWindowLongPtr(hwnd, DWLP_USER); @@ -6872,6 +6876,8 @@ INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPa { case WM_INITDIALOG: { + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + DocLn iCurLine = SciCall_LineFromPosition(SciCall_GetCurrentPos())+1; DocPos iCurColumn = SciCall_GetColumn(SciCall_GetCurrentPos()) + 1; @@ -6986,6 +6992,8 @@ INT_PTR CALLBACK EditModifyLinesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM id_hover = 0; id_capture = 0; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + if (NULL == (hFontNormal = (HFONT)SendDlgItemMessage(hwnd,200,WM_GETFONT,0,0))) hFontNormal = GetStockObject(DEFAULT_GUI_FONT); GetObject(hFontNormal,sizeof(LOGFONT),&lf); @@ -7178,6 +7186,7 @@ INT_PTR CALLBACK EditAlignDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lPara case WM_INITDIALOG: { piAlignMode = (int*)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } CheckRadioButton(hwnd,100,104,*piAlignMode+100); CenterDlgInParent(hwnd); } @@ -7252,6 +7261,7 @@ INT_PTR CALLBACK EditEncloseSelectionDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,L case WM_INITDIALOG: { pdata = (PENCLOSESELDATA)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,255,0); SetDlgItemTextW(hwnd,100,pdata->pwsz1); SendDlgItemMessage(hwnd,101,EM_LIMITTEXT,255,0); @@ -7322,6 +7332,7 @@ INT_PTR CALLBACK EditInsertTagDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM l case WM_INITDIALOG: { pdata = (PTAGSDATA)lParam; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } SendDlgItemMessage(hwnd,100,EM_LIMITTEXT,254,0); SetDlgItemTextW(hwnd,100,L""); SendDlgItemMessage(hwnd,101,EM_LIMITTEXT,255,0); @@ -7449,6 +7460,8 @@ INT_PTR CALLBACK EditSortDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM lParam *piSortFlags = SORT_ASCENDING | SORT_REMZEROLEN; } + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + if (*piSortFlags & SORT_DESCENDING) { CheckRadioButton(hwnd, 100, 102, 101); } diff --git a/src/Notepad3.c b/src/Notepad3.c index f0be4f32c..1ac56c71b 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -66,6 +66,7 @@ HWND g_hwndDlgCustomizeSchemes = NULL; HWND g_hwndReBar = NULL; HWND hwndEditFrame = NULL; HWND hwndNextCBChain = NULL; +HICON g_hDlgIcon = NULL; bool g_bExternalBitmap = false; @@ -165,6 +166,7 @@ static WCHAR g_tchToolbarBitmap[MAX_PATH] = { L'\0' }; static WCHAR g_tchToolbarBitmapHot[MAX_PATH] = { L'\0' }; static WCHAR g_tchToolbarBitmapDisabled[MAX_PATH] = { L'\0' }; + int iPathNameFormat; bool g_bWordWrap; bool bWordWrapG; @@ -779,9 +781,9 @@ int WINAPI WinMain(HINSTANCE hInstance,HINSTANCE hPrevInst,LPSTR lpCmdLine,int n // static bool __fastcall _RegisterWndClass(HINSTANCE hInstance) { - static HICON hIcon = NULL; - if (!hIcon) { - hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, 256, 256, LR_DEFAULTCOLOR); + if (!g_hDlgIcon) { + g_hDlgIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); } WNDCLASS wc; @@ -791,7 +793,7 @@ static bool __fastcall _RegisterWndClass(HINSTANCE hInstance) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstance; - wc.hIcon = hIcon; + wc.hIcon = g_hDlgIcon; wc.hCursor = LoadCursor(NULL,IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_3DFACE+1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MUI_MAINMENU); @@ -9609,7 +9611,8 @@ void ShowNotifyIcon(HWND hwnd,bool bAdd) { static HICON hIcon = NULL; if (!hIcon) { - hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND128), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + hIcon = LoadImage(g_hInstance, MAKEINTRESOURCE(IDR_MAINWND128), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); } NOTIFYICONDATA nid; ZeroMemory(&nid,sizeof(NOTIFYICONDATA)); diff --git a/src/Print.cpp b/src/Print.cpp index a5c256393..d88c42abd 100644 --- a/src/Print.cpp +++ b/src/Print.cpp @@ -44,6 +44,7 @@ extern "C" { extern "C" HINSTANCE g_hInstance; extern "C" HMODULE g_hLngResContainer; +extern "C" HICON g_hDlgIcon; extern "C" HWND g_hwndEdit; @@ -477,6 +478,8 @@ extern "C" UINT_PTR CALLBACK PageSetupHook(HWND hwnd, UINT uiMsg, WPARAM wParam, WCHAR tch[512]; WCHAR *p1,*p2; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + SendDlgItemMessage(hwnd,30,EM_LIMITTEXT,32,0); SendDlgItemMessage(hwnd,31,UDM_SETRANGE,0,MAKELONG((short)20,(short)-10)); diff --git a/src/Styles.c b/src/Styles.c index c9e0893da..1ad09d8f8 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -45,6 +45,7 @@ extern HINSTANCE g_hInstance; extern HMODULE g_hLngResContainer; +extern HICON g_hDlgIcon; extern HWND g_hwndMain; extern HWND g_hwndDlgCustomizeSchemes; @@ -5906,6 +5907,7 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam case WM_INITDIALOG: { // Backup Styles + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } ZeroMemory(&Style_StylesBackup, NUMLEXERS * AVG_NUM_OF_STYLES_PER_LEXER * sizeof(WCHAR*)); int cnt = 0; for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer) { @@ -6527,15 +6529,13 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR { case WM_INITDIALOG: { - int lvItems; - LVITEM lvi; - SHFILEINFO shfi; LVCOLUMN lvc = { LVCF_FMT|LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; - RECT rc; WCHAR tch[MAX_PATH] = { L'\0' }; - int cGrip; + if (g_hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)g_hDlgIcon); } + + RECT rc; GetClientRect(hwnd,&rc); cxClient = rc.right - rc.left; cyClient = rc.bottom - rc.top; @@ -6560,12 +6560,14 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR SetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP3),GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP3),GWL_STYLE)|SBS_SIZEGRIP|WS_CLIPSIBLINGS); - cGrip = GetSystemMetrics(SM_CXHTHUMB); + int cGrip = GetSystemMetrics(SM_CXHTHUMB); SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP3),NULL,cxClient-cGrip, cyClient-cGrip,cGrip,cGrip,SWP_NOZORDER); hwndLV = GetDlgItem(hwnd,IDC_STYLELIST); + SHFILEINFO shfi; + ZeroMemory(&shfi, sizeof(SHFILEINFO)); ListView_SetImageList(hwndLV, (HIMAGELIST)SHGetFileInfo(L"C:\\",FILE_ATTRIBUTE_DIRECTORY, &shfi,sizeof(SHFILEINFO),SHGFI_SMALLICON | SHGFI_SYSICONINDEX | SHGFI_USEFILEATTRIBUTES), @@ -6587,7 +6589,8 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR ListView_SetColumnWidth(hwndLV,0,LVSCW_AUTOSIZE_USEHEADER); // Select current lexer - lvItems = ListView_GetItemCount(hwndLV); + int lvItems = ListView_GetItemCount(hwndLV); + LVITEM lvi; lvi.mask = LVIF_PARAM; for (int i = 0; i < lvItems; i++) { lvi.iItem = i;