diff --git a/crypto/crypto.c b/crypto/crypto.c index ccc315b86..1a11f1641 100644 --- a/crypto/crypto.c +++ b/crypto/crypto.c @@ -234,92 +234,92 @@ INT_PTR CALLBACK SetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lPar // INT_PTR CALLBACK GetKeysDlgProc(HWND hDlg, UINT umsg, WPARAM wParam, LPARAM lParam) { - UNUSED(lParam); + UNUSED(lParam); - const WCHAR wDot = (WCHAR)0x25CF; + const WCHAR wDot = (WCHAR)0x25CF; - switch (umsg) { + switch (umsg) { - case WM_INITDIALOG: + case WM_INITDIALOG: + { + SET_NP3_DLG_ICON_SMALL(hDlg); + 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, NULL); + // Don't use: SetFocus( GetDlgItem( hDlg, IDC_PWD_EDIT3 ) ); + SetDialogFocus(hDlg, GetDlgItem(hDlg, IDC_PWD_EDIT3)); + } + return !0; + + case WM_DPICHANGED: + UpdateWindowLayoutForDPI(hDlg, (RECT*)lParam, NULL); + return !0; + + case WM_COMMAND: + + switch (LOWORD(wParam)) + { + case IDC_PWD_CHECK4: { - SET_NP3_DLG_ICON_SMALL(hDlg); - 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, NULL); - // Don't use: SetFocus( GetDlgItem( hDlg, IDC_PWD_EDIT3 ) ); - SetDialogFocus(hDlg, GetDlgItem(hDlg, IDC_PWD_EDIT3)); + if (IsButtonChecked(hDlg, IDC_PWD_CHECK4)) { + SendDlgItemMessage(hDlg, IDC_PWD_EDIT3, EM_SETPASSWORDCHAR, 0, 0); + } + else { + SendDlgItemMessage(hDlg, IDC_PWD_EDIT3, EM_SETPASSWORDCHAR, (WPARAM)wDot, 0); + } + InvalidateRect(hDlg, NULL, TRUE); } return !0; - case WM_DPICHANGED: - UpdateWindowLayoutForDPI(hDlg, (RECT*)lParam, NULL); + case IDOK: + { + bool const useMas = IsButtonChecked(hDlg, IDC_PWD_CHECK3); + WCHAR newKey[WKEY_LEN] = { L'\0' }; + GetDlgItemText(hDlg, IDC_PWD_EDIT3, newKey, COUNTOF(newKey)); + + if (useMas) { + memcpy(unicodeMasterKey, newKey, sizeof(unicodeMasterKey)); + unicodeStringCpy(masterKey, unicodeMasterKey, sizeof(masterKey)); + useFileKey = false; + useMasterKey = true; + } + else { + memcpy(unicodeFileKey, newKey, sizeof(unicodeFileKey)); + unicodeStringCpy(fileKey, unicodeFileKey, sizeof(fileKey)); + useFileKey = true; + useMasterKey = false; + } + EndDialog(hDlg, IDOK); + } return !0; - case WM_COMMAND: - - switch (LOWORD(wParam)) - { - case IDC_PWD_CHECK4: - { - if (IsButtonChecked(hDlg, IDC_PWD_CHECK4)) { - SendDlgItemMessage(hDlg, IDC_PWD_EDIT3, EM_SETPASSWORDCHAR, 0, 0); - } - else { - SendDlgItemMessage(hDlg, IDC_PWD_EDIT3, EM_SETPASSWORDCHAR, (WPARAM)wDot, 0); - } - InvalidateRect(hDlg, NULL, TRUE); - } - return !0; - - case IDOK: - { - bool const useMas = IsButtonChecked(hDlg, IDC_PWD_CHECK3); - WCHAR newKey[WKEY_LEN] = { L'\0' }; - GetDlgItemText(hDlg, IDC_PWD_EDIT3, newKey, COUNTOF(newKey)); - - if (useMas) { - memcpy(unicodeMasterKey, newKey, sizeof(unicodeMasterKey)); - unicodeStringCpy(masterKey, unicodeMasterKey, sizeof(masterKey)); - useFileKey = false; - useMasterKey = true; - } - else { - memcpy(unicodeFileKey, newKey, sizeof(unicodeFileKey)); - unicodeStringCpy(fileKey, unicodeFileKey, sizeof(fileKey)); - useFileKey = true; - useMasterKey = false; - } - EndDialog(hDlg, IDOK); - } - return !0; - - case IDCANCEL: - EndDialog(hDlg, IDCANCEL); - break; - } - break; + case IDCANCEL: + EndDialog(hDlg, IDCANCEL); + break; } - return 0; + break; + } + return 0; } // set passphrases for output bool GetFileKey(HWND hwnd) { - return (IDOK == DialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_PASSWORDS), - GetParent(hwnd), SetKeysDlgProc, (LPARAM)hwnd)); + return (IDOK == ThemedDialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_PASSWORDS), + GetParent(hwnd), SetKeysDlgProc, (LPARAM)hwnd)); } // set passphrases for file being input bool ReadFileKey(HWND hwnd, bool master) { masterKeyAvailable = master; - return (IDOK == DialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_READPW), - GetParent(hwnd), GetKeysDlgProc, (LPARAM)hwnd)); + return (IDOK == ThemedDialogBoxParam(Globals.hLngResContainer, MAKEINTRESOURCE(IDD_MUI_READPW), + GetParent(hwnd), GetKeysDlgProc, (LPARAM)hwnd)); } diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index 766694b20..1527e5e86 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -285,19 +285,18 @@ BEGIN PUSHBUTTON "Kanselleer",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Kies Skema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Stel geselekteerde skema as &standaard.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,150,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,150,10 CONTROL "&Outo-kies volgens lêernaam uitbreiding.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,130,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Kanselleer",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,130,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Kanselleer",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -806,7 +805,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 4b53b9e0c..c8e2f0c36 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -285,19 +285,18 @@ BEGIN PUSHBUTTON "Скасаваць",IDCANCEL,156,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Выбраць схему" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "&Прадвызначыць схему",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,93,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,93,10 CONTROL "&Аўтавыбар згодна пашырэнню файла",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,145,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Скасаваць",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,145,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Скасаваць",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -806,7 +805,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index e80151a86..b507ce402 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Abbrechen",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 200, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 200, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Syntax Schema auswählen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,184,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,184,130 CONTROL "Setze gewähltes Schema als Voreinstellung.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,180,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,180,10 CONTROL "&Auto-Auswahl entsprechend Dateinamen-Erweiterung.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,180,10 - DEFPUSHBUTTON "OK",IDOK,86,113,50,14,WS_DISABLED - PUSHBUTTON "Abbrechen",IDCANCEL,141,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,180,10 + DEFPUSHBUTTON "OK",IDOK,86,173,50,14,WS_DISABLED + PUSHBUTTON "Abbrechen",IDCANCEL,141,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index a488df187..1fd531edb 100644 --- a/language/np3_en_gb/dialogs_en_gb.rc +++ b/language/np3_en_gb/dialogs_en_gb.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 726b043fd..23b2200ba 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -282,19 +282,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -803,7 +802,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index 101247ff1..cefb521b3 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar Esquema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Establecer esquema seleccionado por &defecto.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,155,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,155,10 CONTROL "Selección &automática por extensión de archivo.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,155,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancelar",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,155,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancelar",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index 7f92c7b06..03f2739c8 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Annuler",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Sélection Schème" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Définir le schème sélectionné par &défaut.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,148,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,148,10 CONTROL "Sélection &automatique par extension fichier.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,148,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Annuler",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,148,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Annuler",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_hi_in/dialogs_hi_in.rc b/language/np3_hi_in/dialogs_hi_in.rc index 8637d5067..6369a5f7c 100644 --- a/language/np3_hi_in/dialogs_hi_in.rc +++ b/language/np3_hi_in/dialogs_hi_in.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index 694289eac..3eb915330 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Mégsem",IDCANCEL,137,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Színkiemelés választása" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "E színkiemelés beállítás &alapértelmezetté.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,135,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,135,10 CONTROL "Fájlnév &kit. alapján automatikusan.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Mégsem",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Mégsem",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_id_id/dialogs_id_id.rc b/language/np3_id_id/dialogs_id_id.rc index 03bcb95ca..62121b87e 100644 --- a/language/np3_id_id/dialogs_id_id.rc +++ b/language/np3_id_id/dialogs_id_id.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc index cb0ccc1bc..ba96553a2 100644 --- a/language/np3_it_it/dialogs_it_it.rc +++ b/language/np3_it_it/dialogs_it_it.rc @@ -285,19 +285,18 @@ BEGIN PUSHBUTTON "Annulla",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleziona Schema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Imposta Schema come &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Automatico in base a estensione.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Annulla",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Annulla",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -806,7 +805,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index cd2ac3528..d76a146f4 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -295,7 +295,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,127,10 DEFPUSHBUTTON "OK",IDOK,53,175,50,14,WS_DISABLED PUSHBUTTON "キャンセル",IDCANCEL,108,175,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,175,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc index 677481cfa..319e9775a 100644 --- a/language/np3_ko_kr/dialogs_ko_kr.rc +++ b/language/np3_ko_kr/dialogs_ko_kr.rc @@ -285,19 +285,18 @@ BEGIN PUSHBUTTON "취소",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "스키마 선택" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "선택한 스키마를 기본으로 설정(&D).",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,131,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,131,10 CONTROL "확장자로 자동 선택(&A).",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,131,10 - DEFPUSHBUTTON "확인",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "취소",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,131,10 + DEFPUSHBUTTON "확인",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "취소",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -806,7 +805,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index 1bd38b9df..c24607e8f 100644 --- a/language/np3_nl_nl/dialogs_nl_nl.rc +++ b/language/np3_nl_nl/dialogs_nl_nl.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Annuleren",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selectie Schema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Instellen geselecteerde schema als stand&aard.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,148,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,148,10 CONTROL "&Auto-selectie op bestandsextensie.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Annuleren",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Annuleren",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index d7befffc7..9212e6c36 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Anuluj",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wybierz schemat" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Ustaw schemat jako domyślny.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Autowybór w/g rozszerzenia pliku.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Anuluj",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Anuluj",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc index a34001abd..1312bd805 100644 --- a/language/np3_pt_br/dialogs_pt_br.rc +++ b/language/np3_pt_br/dialogs_pt_br.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecionar Esquema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_pt_pt/dialogs_pt_pt.rc b/language/np3_pt_pt/dialogs_pt_pt.rc index 300e74515..ed0635ea8 100644 --- a/language/np3_pt_pt/dialogs_pt_pt.rc +++ b/language/np3_pt_pt/dialogs_pt_pt.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancelar",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar esquema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Definir esquema seleccionado como pa&drão.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,152,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,152,10 CONTROL "&Auto-seleccionar por extensão do ficheiro.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,151,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancelar",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,151,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancelar",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index 49ac6a6b1..eaedc7214 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -285,19 +285,18 @@ BEGIN PUSHBUTTON "Отмена",IDCANCEL,156,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Выбрать схему" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "&Установить схемой по умолчанию",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,131,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,132,10 CONTROL "&Автовыбор по расширению файла",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,132,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Отмена",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,132,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Отмена",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -806,7 +805,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc index 12535d0a2..38de96867 100644 --- a/language/np3_sk_sk/dialogs_sk_sk.rc +++ b/language/np3_sk_sk/dialogs_sk_sk.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Zrušiť",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Výber schémy" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Nastaviť vybratú schému ako &predvolenú.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,144,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,144,10 CONTROL "&Automatický výber podľa prípony súboru.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,142,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Zrušiť",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,142,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Zrušiť",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_sv_se/dialogs_sv_se.rc b/language/np3_sv_se/dialogs_sv_se.rc index 70595d74e..e451e35e7 100644 --- a/language/np3_sv_se/dialogs_sv_se.rc +++ b/language/np3_sv_se/dialogs_sv_se.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Avbryt",IDCANCEL,137,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Välj schema" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Välj schema som förval.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "Välj automatiskt beroende på filändelse.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,130,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Avbryt",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,130,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Avbryt",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc index 5546c865d..c2959142a 100644 --- a/language/np3_tr_tr/dialogs_tr_tr.rc +++ b/language/np3_tr_tr/dialogs_tr_tr.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_vi_vn/dialogs_vi_vn.rc b/language/np3_vi_vn/dialogs_vi_vn.rc index e3057e4ea..7d423097f 100644 --- a/language/np3_vi_vn/dialogs_vi_vn.rc +++ b/language/np3_vi_vn/dialogs_vi_vn.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Scheme" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "Set selected scheme as &default.",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "&Auto-select by filename extension.",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "Cancel",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "OK",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "Cancel",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index d6f852af9..5e97d63d0 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "取消",IDCANCEL,150,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "选择语法高亮方案" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "将选定的方案设为默认(&D)",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,149,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,149,10 CONTROL "根据文件扩展名自动选择(&A)",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,149,10 - DEFPUSHBUTTON "确定",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "取消",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,149,10 + DEFPUSHBUTTON "确定",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "取消",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/language/np3_zh_tw/dialogs_zh_tw.rc b/language/np3_zh_tw/dialogs_zh_tw.rc index 76af590f1..0fe727ef4 100644 --- a/language/np3_zh_tw/dialogs_zh_tw.rc +++ b/language/np3_zh_tw/dialogs_zh_tw.rc @@ -283,19 +283,18 @@ BEGIN PUSHBUTTON "取消",IDCANCEL,127,24,50,14 END -IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 134 +IDD_MUI_STYLESELECT DIALOGEX 0, 0, 165, 194 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "選擇語法高亮方案" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,70 + CONTROL "",IDC_STYLELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,7,151,130 CONTROL "將選定的方案設為預設(&D)",IDC_DEFAULTSCHEME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,118,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,145,118,10 CONTROL "根據副檔名自動選擇(&A)",IDC_AUTOSELECT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 - DEFPUSHBUTTON "確定",IDOK,53,113,50,14,WS_DISABLED - PUSHBUTTON "取消",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,155,127,10 + DEFPUSHBUTTON "確定",IDOK,53,173,50,14,WS_DISABLED + PUSHBUTTON "取消",IDCANCEL,108,173,50,14 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -804,7 +803,7 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 158 TOPMARGIN, 7 - BOTTOMMARGIN, 127 + BOTTOMMARGIN, 187 END IDD_MUI_STYLECONFIG, DIALOG diff --git a/src/Dialogs.c b/src/Dialogs.c index 06e2ccea5..ee6ed8909 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -707,14 +707,10 @@ INT_PTR CALLBACK AboutDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam } break; - case WM_DESTROY: if (hVersionFont) { DeleteObject(hVersionFont); } break; - case WM_SIZE: - return !0; - case WM_DPICHANGED: { UpdateWindowLayoutForDPI(hwnd, (RECT*)lParam, NULL); diff --git a/src/Styles.c b/src/Styles.c index fac90849b..cd2e5cc4f 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -4700,10 +4700,9 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR { case WM_INITDIALOG: { + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); SET_NP3_DLG_ICON_SMALL(hwnd); - ResizeDlg_Init(hwnd, s_cxStyleSelectDlg, s_cyStyleSelectDlg, IDC_RESIZEGRIP); - hwndLV = GetDlgItem(hwnd,IDC_STYLELIST); SHFILEINFO shfi; @@ -4755,11 +4754,6 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR return !0; - case WM_DESTROY: - ResizeDlg_Destroy(hwnd, &s_cxStyleSelectDlg, &s_cyStyleSelectDlg); - return 0; - - case WM_DPICHANGED: UpdateWindowLayoutForDPI(hwnd, (RECT*)lParam, NULL); return !0; @@ -4767,23 +4761,12 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR case WM_SIZE: { - ResizeDlg_Size(hwnd, lParam, &cxClient, &cyClient); - HDWP hdwp = BeginDeferWindowPos(6); - hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, cxClient, cyClient, SWP_NOSIZE); - hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLELIST, 0, cyClient, SWP_NOMOVE); - hdwp = DeferCtlPos(hdwp, hwnd, IDC_DEFAULTSCHEME, cxClient, cyClient, SWP_NOSIZE); - hdwp = DeferCtlPos(hdwp, hwnd, IDC_AUTOSELECT, cxClient, cyClient, SWP_NOSIZE); - hdwp = DeferCtlPos(hdwp, hwnd, IDOK, cxClient, cyClient, SWP_NOSIZE); - hdwp = DeferCtlPos(hdwp, hwnd, IDCANCEL, cxClient, cyClient, SWP_NOSIZE); - EndDeferWindowPos(hdwp); - ListView_SetColumnWidth(GetDlgItem(hwnd, IDC_STYLELIST), 0, LVSCW_AUTOSIZE_USEHEADER); } return !0; case WM_GETMINMAXINFO: - ResizeDlg_GetMinMaxInfo(hwnd, lParam); return !0;