diff --git a/Versions/build.txt b/Versions/build.txt index 889f56ca7..505c5cc23 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -1682 +1684 diff --git a/language/common_res.h b/language/common_res.h index cb2a39977..81f9e646c 100644 --- a/language/common_res.h +++ b/language/common_res.h @@ -242,7 +242,7 @@ #define IDC_OPENWITHDIR 18025 #define IDC_GETOPENWITHDIR 18026 #define IDC_OPENWITHDESCR 18027 -#define IDC_RESIZEGRIP3 18028 +#define IDC_RESIZEGRIP 18028 #define IDC_ENCODINGLIST 18029 #define IDC_USEASREADINGFALLBACK 18030 #define IDC_NOANSICPDETECTION 18031 @@ -264,75 +264,75 @@ #define IDC_PRESERVECARET 18046 #define IDC_SAVEMRU 18047 #define IDC_REMOVE 18048 -#define IDC_RESIZEGRIP 18049 -#define IDC_REMEMBERSEARCHPATTERN 18050 -#define IDC_STYLELIST 18051 -#define IDC_DEFAULTSCHEME 18052 -#define IDC_AUTOSELECT 18053 -#define IDC_STYLELABEL_ROOT 18054 -#define IDC_STYLEEDIT_ROOT 18055 -#define IDC_STYLELABEL 18056 -#define IDC_STYLEFORE 18057 -#define IDC_STYLEBACK 18058 -#define IDC_STYLEFONT 18059 -#define IDC_PREVIEW 18060 -#define IDC_STYLEDEFAULT 18061 -#define IDC_PREVSTYLE 18062 -#define IDC_NEXTSTYLE 18063 -#define IDC_IMPORT 18064 -#define IDC_EXPORT 18065 -#define IDC_TITLE 18066 -#define IDC_STYLEEDIT 18067 -#define IDC_PRINTER 18068 -#define IDC_FAVORITESDIR 18069 -#define IDC_GETFAVORITESDIR 18070 -#define IDC_FAVORITESDESCR 18071 -#define IDC_PWD_EDIT1 18072 -#define IDC_PWD_EDIT2 18073 -#define IDC_PWD_EDIT3 18074 -#define IDC_PWD_CHECK1 18075 -#define IDC_PWD_CHECK2 18076 -#define IDC_PWD_CHECK3 18077 -#define IDC_PWD_CHECK4 18078 -#define IDC_PWD_STATMPW 18079 -#define IDC_COLUMNWRAP 18080 -#define IDC_INFOBOXTEXT 18081 -#define IDC_INFOBOXCHECK 18082 -#define IDC_INFOBOXICON 18083 -#define IDC_RESIZEGRIP4 18084 -#define IDC_VERSION 18085 -#define IDC_SCI_VERSION 18086 -#define IDC_COMPILER 18087 -#define IDC_COPYRIGHT 18088 -#define IDC_WEBPAGE2 18089 -#define IDC_WEBPAGE 18090 -#define IDR_RIZBITMAP 18091 -#define IDC_RIZONEBMP 18092 -#define IDC_COPYVERSTRG 18093 -#define IDC_RICHEDITABOUT 18094 -#define IDC_TRANSL_AUTH 18095 -#define IDC_TRANSPARENT 18096 -#define IDC_TAB_WIDTH 18097 -#define IDC_INDENT_DEPTH 18098 -#define IDC_TAB_AS_SPC 18099 -#define IDC_TAB_INDENTS 18100 -#define IDC_BACKTAB_INDENTS 18101 -#define IDC_WARN_INCONSISTENT_INDENTS 18102 -#define IDC_AUTO_DETECT_INDENTS 18103 -#define IDC_CMDLINEHELP 18104 -#define IDC_STYLEEDIT_HELP 18105 -#define IDC_RELIABLE_DETECTION_RES 18106 -#define IDC_LINE_TEXT 18107 -#define IDC_COLUMN_TEXT 18108 -#define IDC_INDENT_WIDTH_TAB 18109 -#define IDC_INDENT_WIDTH_SPC 18110 -#define IDC_INDENT_SUM_TAB 18111 -#define IDC_INDENT_SUM_SPC 18112 -#define IDC_INDENT_SUM_MIX 18113 -#define IDC_INDENT_BY_TABS 18114 -#define IDC_INDENT_BY_SPCS 18115 -#define IDC_INDENT_TAB_MODX 18116 -#define IDC_INDENT_SPC_MODX 18117 +#define IDC_REMEMBERSEARCHPATTERN 18049 +#define IDC_STYLELIST 18050 +#define IDC_DEFAULTSCHEME 18051 +#define IDC_AUTOSELECT 18052 +#define IDC_STYLELABEL_ROOT 18053 +#define IDC_STYLEEDIT_ROOT 18054 +#define IDC_STYLELABEL 18055 +#define IDC_STYLEFORE 18056 +#define IDC_STYLEBACK 18057 +#define IDC_STYLEFONT 18058 +#define IDC_PREVIEW 18059 +#define IDC_STYLEDEFAULT 18060 +#define IDC_PREVSTYLE 18061 +#define IDC_NEXTSTYLE 18062 +#define IDC_IMPORT 18063 +#define IDC_EXPORT 18064 +#define IDC_TITLE 18065 +#define IDC_STYLEEDIT 18066 +#define IDC_PRINTER 18067 +#define IDC_FAVORITESDIR 18068 +#define IDC_GETFAVORITESDIR 18069 +#define IDC_FAVORITESDESCR 18070 +#define IDC_PWD_EDIT1 18071 +#define IDC_PWD_EDIT2 18072 +#define IDC_PWD_EDIT3 18073 +#define IDC_PWD_CHECK1 18074 +#define IDC_PWD_CHECK2 18075 +#define IDC_PWD_CHECK3 18076 +#define IDC_PWD_CHECK4 18077 +#define IDC_PWD_STATMPW 18078 +#define IDC_COLUMNWRAP 18079 +#define IDC_INFOBOXTEXT 18080 +#define IDC_INFOBOXCHECK 18081 +#define IDC_INFOBOXICON 18082 +#define IDC_VERSION 18083 +#define IDC_SCI_VERSION 18084 +#define IDC_COMPILER 18085 +#define IDC_COPYRIGHT 18086 +#define IDC_WEBPAGE2 18087 +#define IDC_WEBPAGE 18088 +#define IDR_RIZBITMAP 18089 +#define IDC_RIZONEBMP 18090 +#define IDC_COPYVERSTRG 18091 +#define IDC_RICHEDITABOUT 18092 +#define IDC_TRANSL_AUTH 18093 +#define IDC_TRANSPARENT 18094 +#define IDC_TAB_WIDTH 18095 +#define IDC_INDENT_DEPTH 18096 +#define IDC_TAB_AS_SPC 18097 +#define IDC_TAB_INDENTS 18098 +#define IDC_BACKTAB_INDENTS 18099 +#define IDC_WARN_INCONSISTENT_INDENTS 18100 +#define IDC_AUTO_DETECT_INDENTS 18101 +#define IDC_CMDLINEHELP 18102 +#define IDC_STYLEEDIT_HELP 18103 +#define IDC_RELIABLE_DETECTION_RES 18104 +#define IDC_LINE_TEXT 18105 +#define IDC_COLUMN_TEXT 18106 +#define IDC_INDENT_WIDTH_TAB 18107 +#define IDC_INDENT_WIDTH_SPC 18108 +#define IDC_INDENT_SUM_TAB 18109 +#define IDC_INDENT_SUM_SPC 18110 +#define IDC_INDENT_SUM_MIX 18111 +#define IDC_INDENT_BY_TABS 18112 +#define IDC_INDENT_BY_SPCS 18113 +#define IDC_INDENT_TAB_MODX 18114 +#define IDC_INDENT_SPC_MODX 18115 +#define IDC_ADDFAV_FILES 18116 +#define IDC_INFO_GROUPBOX 18117 #define CMD_ESCAPE 20000 #define CMD_SHIFTESC 20001 diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc index e53df4fb8..697efe671 100644 --- a/language/np3_af_za/dialogs_af_za.rc +++ b/language/np3_af_za/dialogs_af_za.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,208,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,269,9,WS_EX_STATICEDGE PUSHBUTTON "&Fokus Aansig",IDC_TOGGLE_VISIBILITY,221,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,269,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 283, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,208,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,269,9,WS_EX_STATICEDGE PUSHBUTTON "&Fokus Aansig",IDC_TOGGLE_VISIBILITY,221,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,272,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Klik hier om die gids te spesifiseer met skakels na jou gunsteling programme.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,95,127,10 DEFPUSHBUTTON "OK",IDOK,53,113,50,14,WS_DISABLED PUSHBUTTON "Kanselleer",IDCANCEL,108,113,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "&Uitvoer...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Pas skemas aan",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Klik hier om die gids te spesifiseer met skakels na jou gunsteling lers.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Kanselleer",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Voeg by Gunstelinge" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Voer die naam vir die nuwe gunstelingitem in:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Voer die naam vir die nuwe gunstelingitem in:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Kanselleer",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Kanselleer",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Kanselleer",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc index 5cd2d2711..8b5c13f72 100644 --- a/language/np3_be_by/dialogs_be_by.rc +++ b/language/np3_be_by/dialogs_be_by.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,199,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,299,9,WS_EX_STATICEDGE PUSHBUTTON "&",IDC_TOGGLE_VISIBILITY,246,65,60,14 + SCROLLBAR IDC_RESIZEGRIP,302,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 313, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,199,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,299,9,WS_EX_STATICEDGE PUSHBUTTON "&",IDC_TOGGLE_VISIBILITY,246,94,60,14 + SCROLLBAR IDC_RESIZEGRIP,302,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 235, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT " \n ",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 211, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "&...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "",IDCANCEL,410,233,50,14 - GROUPBOX "",IDC_STATIC,180,7,280,127 + GROUPBOX "",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT " ",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 192, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT " \n ",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT " :",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT " :",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index e5965c19c..742efa158 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -79,7 +79,7 @@ BEGIN EDITTEXT IDC_CMDLINEHELP,15,7,278,176,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL END -IDD_MUI_FIND DIALOGEX 0, 0, 273, 130 +IDD_MUI_FIND DIALOGEX 0, 0, 273, 142 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Suche Text" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Fokussieren",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,7,116,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Fokussieren",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,7,156,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Spezifiziere das Verzeichnis mit den Links zu den bevorzugten Applikationen.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -261,7 +263,7 @@ BEGIN PUSHBUTTON "Verwerfen",IDC_REMOVE,212,107,50,14,WS_DISABLED DEFPUSHBUTTON "OK",IDOK,154,139,50,14,WS_DISABLED PUSHBUTTON "Abbrechen",IDCANCEL,212,139,50,14 - SCROLLBAR IDC_RESIZEGRIP,7,143,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,146,10,10 END IDD_MUI_CHANGENOTIFY DIALOGEX 0, 0, 184, 65 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xportieren...",IDC_EXPORT,246,233,60,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,410,233,50,14 - GROUPBOX "Information",IDC_STATIC,180,7,280,127 + GROUPBOX "Information",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Syntax Schemata anpassen",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 184, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Festlegen des Verzeichnisses mit den Verweisen (Links) zu den Favoriten.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Zu Favoriten hinzufgen" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Gib dem neuen Favoriten (Link) einen Namen:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Gib dem neuen Favoriten (Link) einen Namen:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Abbrechen",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,171,87 DEFPUSHBUTTON "OK",IDOK,73,114,50,14,WS_DISABLED PUSHBUTTON "Abbrechen",IDCANCEL,128,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 185, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,171,87 DEFPUSHBUTTON "OK",IDOK,73,114,50,14,WS_DISABLED PUSHBUTTON "Abbrechen",IDCANCEL,128,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc index 50f05c89c..69c43dba9 100644 --- a/language/np3_en_gb/dialogs_en_gb.rc +++ b/language/np3_en_gb/dialogs_en_gb.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite applications.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Customise Schemes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite files.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Add to Favourites" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Enter the name for the new favourites item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Enter the name for the new favourites item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc index 88dbc1575..3a46cd750 100644 --- a/language/np3_en_us/dialogs_en_us.rc +++ b/language/np3_en_us/dialogs_en_us.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favorite applications.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Customize Schemes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favorite files.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Add to Favorites" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Enter the name for the new favorites item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Enter the name for the new favorites item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc index fad052fec..8223936d8 100644 --- a/language/np3_es_es/dialogs_es_es.rc +++ b/language/np3_es_es/dialogs_es_es.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Vista enfocada",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Vista enfocada",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Cliquear aqu para especificar la carpeta con enlaces a sus aplicaciones favoritas.",IDC_OPENWITHDESCR,26,83,162,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancelar",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xportar...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancelar",IDCANCEL,410,233,50,14 - GROUPBOX "Informacin",IDC_STATIC,180,7,280,127 + GROUPBOX "Informacin",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Personalizar esquemas",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Cliquear aqu para especificar la carpeta con enlaces a sus archivos favoritos.",IDC_FAVORITESDESCR,26,83,142,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancelar",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Aadir a Favoritos" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Teclee el nombre del nuevo elemento favorito:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Teclee el nombre del nuevo elemento favorito:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancelar",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancelar",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancelar",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc index c37a5ce56..090aca774 100644 --- a/language/np3_fr_fr/dialogs_fr_fr.rc +++ b/language/np3_fr_fr/dialogs_fr_fr.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Vue focalise",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "&Vue focalise",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Cliquer ici pour spcifier le dossier avec des liens vers vos applications prfres.",IDC_OPENWITHDESCR,26,83,165,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annuler",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xporter...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Annuler",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Personnaliser les Schmes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Cliquer ici pour spcifier le dossier avec des liens vers vos fichiers favoris.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annuler",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Ajouter Favoris" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Entrer le nom du nouvel lment favori:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Entrer le nom du nouvel lment favori:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Annuler",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annuler",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annuler",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc index 8d2d8946c..5be5c3401 100644 --- a/language/np3_hu_hu/dialogs_hu_hu.rc +++ b/language/np3_hu_hu/dialogs_hu_hu.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite applications.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Customise Schemes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite files.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Add to Favourites" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Enter the name for the new favourites item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Enter the name for the new favourites item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc index 50c01e87c..b2815f314 100644 --- a/language/np3_it_it/dialogs_it_it.rc +++ b/language/np3_it_it/dialogs_it_it.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,201,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,277,9,WS_EX_STATICEDGE PUSHBUTTON "&Visualiz. focalizzata",IDC_TOGGLE_VISIBILITY,221,65,63,14 + SCROLLBAR IDC_RESIZEGRIP,279,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 290, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,201,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,277,9,WS_EX_STATICEDGE PUSHBUTTON "&Visualiz. focalizzata",IDC_TOGGLE_VISIBILITY,221,94,63,14 + SCROLLBAR IDC_RESIZEGRIP,279,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Clicca qui per specificare la cartella con i collegamenti alle tue applicazioni preferite.",IDC_OPENWITHDESCR,26,83,165,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annulla",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 207, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Annulla",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Personalizza Schemi",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Clicca qui per specificare la cartella con i collegamenti ai tuoi file preferiti.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annulla",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Aggiungi ai Preferiti" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Inserisci il nome per il nuovo Preferito:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Inserisci il nome per il nuovo Preferito:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Annulla",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annulla",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annulla",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc index 21223ced6..fd44c6f4f 100644 --- a/language/np3_ja_jp/dialogs_ja_jp.rc +++ b/language/np3_ja_jp/dialogs_ja_jp.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "][h(&V)",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "][h(&V)",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "vOtH_w肷ɂ́A\nNbN܂B",IDC_OPENWITHDESCR,26,160,132,18 DEFPUSHBUTTON "OK",IDOK,52,180,50,14 PUSHBUTTON "LZ",IDCANCEL,108,180,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,180,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,180,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,127,10 DEFPUSHBUTTON "OK",IDOK,53,175,50,14,WS_DISABLED PUSHBUTTON "LZ",IDCANCEL,108,175,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,175,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,175,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "GNX|[g(&E)...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "LZ",IDCANCEL,410,233,50,14 - GROUPBOX "",IDC_STATIC,180,7,280,127 + GROUPBOX "",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "FƃtHg̎w@",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "NbNāACɓ\ntH_w肵ĂB",IDC_FAVORITESDESCR,26,154,132,18 DEFPUSHBUTTON "OK",IDOK,52,179,50,14 PUSHBUTTON "LZ",IDCANCEL,108,179,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,183,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,183,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Cɓɒlj" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Cɓɒlj鍀ږ:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Cɓɒlj鍀ږ:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "LZ",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,152 DEFPUSHBUTTON "OK",IDOK,53,179,50,14,WS_DISABLED PUSHBUTTON "LZ",IDCANCEL,108,179,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,183,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,183,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 200 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,152 DEFPUSHBUTTON "OK",IDOK,53,179,50,14,WS_DISABLED PUSHBUTTON "LZ",IDCANCEL,108,179,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,183,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,183,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc index 2387fc7b4..57ea6b393 100644 --- a/language/np3_ko_kr/dialogs_ko_kr.rc +++ b/language/np3_ko_kr/dialogs_ko_kr.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,196,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,264,9,WS_EX_STATICEDGE PUSHBUTTON "(&V)",IDC_TOGGLE_VISIBILITY,216,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,267,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 278, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,196,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,264,9,WS_EX_STATICEDGE PUSHBUTTON "(&V)",IDC_TOGGLE_VISIBILITY,216,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,267,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "⸦ ŬϿ ȣϴ α׷ ũ 丮 ϼ.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "Ȯ",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "(&X)...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "Ȯ",IDOK,355,233,50,14 PUSHBUTTON "",IDCANCEL,410,233,50,14 - GROUPBOX "",IDC_STATIC,180,7,280,127 + GROUPBOX "",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Ű ",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "⸦ ŬϿ ã ũ 丮 ϼ.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "Ȯ",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION " ã⿡ ߰" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT " ã ׸ ̸ ԷϽʽÿ.",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT " ã ׸ ̸ ԷϽʽÿ.",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "Ȯ",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "Ȯ",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "Ȯ",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc index d4ed4a4da..602c4801b 100644 --- a/language/np3_nl_nl/dialogs_nl_nl.rc +++ b/language/np3_nl_nl/dialogs_nl_nl.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Gefocust &zicht",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Gefocust &zicht",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Klik hier om de map met koppelingen naar uw favoriete applicaties te specificeren.",IDC_OPENWITHDESCR,26,83,150,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annuleren",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xportatie...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Annuleren",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Aanpassen Schema's",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Klik hier om de map met koppelingen naar uw favoriete bestanden op te geven.",IDC_FAVORITESDESCR,26,83,150,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Annuleren",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Toevoegen aan favorieten" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Voer de naam in voor het nieuwe favorieten item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Voer de naam in voor het nieuwe favorieten item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Annuleren",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annuleren",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Annuleren",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc index d8bc7e37e..4cd210bd6 100644 --- a/language/np3_pl_pl/dialogs_pl_pl.rc +++ b/language/np3_pl_pl/dialogs_pl_pl.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite applications.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Customise Schemes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite files.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Add to Favourites" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Enter the name for the new favourites item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Enter the name for the new favourites item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc index 9086ffa2c..08979f1e8 100644 --- a/language/np3_pt_br/dialogs_pt_br.rc +++ b/language/np3_pt_br/dialogs_pt_br.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "Focused &View",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite applications.",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "E&xport...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "Cancel",IDCANCEL,410,233,50,14 - GROUPBOX "Info",IDC_STATIC,180,7,280,127 + GROUPBOX "Info",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Customise Schemes",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "Click here to specify the directory with links to your favourite files.",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "Cancel",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Add to Favourites" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Enter the name for the new favourites item:",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "Enter the name for the new favourites item:",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "Cancel",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc index cd947e8e2..60c3015cd 100644 --- a/language/np3_ru_ru/dialogs_ru_ru.rc +++ b/language/np3_ru_ru/dialogs_ru_ru.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,199,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,299,9,WS_EX_STATICEDGE PUSHBUTTON "&",IDC_TOGGLE_VISIBILITY,246,65,60,14 + SCROLLBAR IDC_RESIZEGRIP,302,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 313, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,199,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,299,9,WS_EX_STATICEDGE PUSHBUTTON "&",IDC_TOGGLE_VISIBILITY,246,94,60,14 + SCROLLBAR IDC_RESIZEGRIP,302,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 235, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT " ",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 211, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "&...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "OK",IDOK,355,233,50,14 PUSHBUTTON "",IDCANCEL,410,233,50,14 - GROUPBOX "",IDC_STATIC,180,7,280,127 + GROUPBOX "",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT " ",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 192, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT " ",IDC_FAVORITESDESCR,26,83,132,18 DEFPUSHBUTTON "OK",IDOK,52,108,50,14 PUSHBUTTON "",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION " " FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT " :",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT " :",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "OK",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc index ec725e9ca..9f4fa4b0f 100644 --- a/language/np3_zh_cn/dialogs_zh_cn.rc +++ b/language/np3_zh_cn/dialogs_zh_cn.rc @@ -108,6 +108,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,85,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,130,259,9,WS_EX_STATICEDGE PUSHBUTTON "ʾƥ(&V)",IDC_TOGGLE_VISIBILITY,211,65,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,131,10,10 END IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168 @@ -145,6 +146,7 @@ BEGIN CONTROL "(?)",IDC_WILDCARDHELP,"SysLink",0x0,191,114,14,10 CONTROL "",IDS_FR_STATUS_TEXT,"Static",SS_LEFTNOWORDWRAP,7,156,259,9,WS_EX_STATICEDGE PUSHBUTTON "ʾƥ(&V)",IDC_TOGGLE_VISIBILITY,211,94,55,14 + SCROLLBAR IDC_RESIZEGRIP,262,157,10,10 END IDD_MUI_RUN DIALOGEX 0, 0, 229, 96 @@ -170,7 +172,7 @@ BEGIN LTEXT "ղӦóļС",IDC_OPENWITHDESCR,26,83,132,18 DEFPUSHBUTTON "ȷ",IDOK,52,108,50,14 PUSHBUTTON "ȡ",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_DEFENCODING DIALOGEX 0, 0, 197, 172 @@ -289,7 +291,7 @@ BEGIN "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_RESIZEGRIP3,7,117,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,117,10,10 END IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254 @@ -313,10 +315,11 @@ BEGIN PUSHBUTTON "(&X)...",IDC_EXPORT,237,233,50,14 DEFPUSHBUTTON "ȷ",IDOK,355,233,50,14 PUSHBUTTON "ȡ",IDCANCEL,410,233,50,14 - GROUPBOX "ʾϢ",IDC_STATIC,180,7,280,127 + GROUPBOX "ʾϢ",IDC_INFO_GROUPBOX,180,7,280,127 ICON IDI_MUI_STYLES,IDC_STATIC,189,19,20,20 LTEXT "Զ﷨",IDC_TITLE,220,25,200,12 EDITTEXT IDC_STYLEEDIT_HELP,197,50,252,74,ES_MULTILINE | ES_READONLY | NOT WS_BORDER + SCROLLBAR IDC_RESIZEGRIP,7,233,10,10 END IDD_MUI_TABSETTINGS DIALOGEX 0, 0, 174, 114 @@ -446,7 +449,7 @@ BEGIN LTEXT "ղļļС",IDC_FAVORITESDESCR,26,83,154,18 DEFPUSHBUTTON "ȷ",IDOK,52,108,50,14 PUSHBUTTON "ȡ",IDCANCEL,108,108,50,14 - SCROLLBAR IDC_RESIZEGRIP3,7,112,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,112,10,10 END IDD_MUI_ADDTOFAV DIALOGEX 0, 0, 172, 66 @@ -454,10 +457,11 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "ӵղؼ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "ʾղؼе(&N)",IDC_STATIC,7,7,158,8 - EDITTEXT 100,7,22,158,14,ES_AUTOHSCROLL + LTEXT "ʾղؼе(&N)",IDC_FAVORITESDESCR,7,7,158,8 + EDITTEXT IDC_ADDFAV_FILES,7,22,158,14,ES_AUTOHSCROLL DEFPUSHBUTTON "ȷ",IDOK,59,45,50,14,WS_DISABLED PUSHBUTTON "ȡ",IDCANCEL,115,45,50,14 + SCROLLBAR IDC_RESIZEGRIP,7,45,10,10 END IDD_MUI_PASSWORDS DIALOGEX 0, 0, 311, 122 @@ -617,7 +621,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "ȷ",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "ȡ",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ENCODING DIALOGEX 0, 0, 165, 135 @@ -629,7 +633,7 @@ BEGIN CONTROL "",IDC_ENCODINGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,7,19,151,87 DEFPUSHBUTTON "ȷ",IDOK,53,114,50,14,WS_DISABLED PUSHBUTTON "ȡ",IDCANCEL,108,114,50,14 - SCROLLBAR IDC_RESIZEGRIP4,7,118,10,10 + SCROLLBAR IDC_RESIZEGRIP,7,118,10,10 END IDD_MUI_ALIGN DIALOGEX 0, 0, 184, 74 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 5a8cef577..838fc3f68 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 develop diff --git a/src/Dialogs.c b/src/Dialogs.c index eb2474276..c0fe2c861 100644 --- a/src/Dialogs.c +++ b/src/Dialogs.c @@ -1036,7 +1036,7 @@ static INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM { SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } - ResizeDlg_Init(hwnd,Settings.OpenWithDlgSizeX,Settings.OpenWithDlgSizeY,IDC_RESIZEGRIP3); + ResizeDlg_Init(hwnd,Settings.OpenWithDlgSizeX,Settings.OpenWithDlgSizeY,IDC_RESIZEGRIP); LVCOLUMN lvc = { LVCF_FMT | LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; @@ -1077,7 +1077,7 @@ static INT_PTR CALLBACK OpenWithDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARAM ResizeDlg_Size(hwnd,lParam,&dx,&dy); hdwp = BeginDeferWindowPos(6); - hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP3,dx,dy,SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDOK,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDCANCEL,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDC_OPENWITHDIR,dx,dy,SWP_NOMOVE); @@ -1234,7 +1234,8 @@ static INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARA { SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } - ResizeDlg_Init(hwnd,Settings.FavoritesDlgSizeX,Settings.FavoritesDlgSizeY,IDC_RESIZEGRIP3); + + ResizeDlg_Init(hwnd,Settings.FavoritesDlgSizeX,Settings.FavoritesDlgSizeY,IDC_RESIZEGRIP); LVCOLUMN lvc = { LVCF_FMT | LVCF_TEXT, LVCFMT_LEFT, 0, L"", -1, 0, 0, 0 }; @@ -1275,7 +1276,7 @@ static INT_PTR CALLBACK FavoritesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPARA ResizeDlg_Size(hwnd,lParam,&dx,&dy); hdwp = BeginDeferWindowPos(6); - hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP3,dx,dy,SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDOK,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDCANCEL,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDC_FAVORITESDIR,dx,dy,SWP_NOMOVE); @@ -1397,7 +1398,7 @@ bool FavoritesDlg(HWND hwnd,LPWSTR lpstrFile) // // AddToFavDlgProc() // -// Controls: 100 Edit +// Controls: IDC_ADDFAV_FILES Edit // static INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) { @@ -1406,11 +1407,13 @@ static INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPA case WM_INITDIALOG: { SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); - LPCWSTR const pszName = (LPCWSTR)lParam; - if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } - SendDlgItemMessage(hwnd, 100, EM_LIMITTEXT, MAX_PATH - 1, 0); - SetDlgItemText(hwnd, 100, pszName); + + ResizeDlg_InitX(hwnd, Settings.AddToFavDlgSizeX, IDC_RESIZEGRIP); + + LPCWSTR const pszName = (LPCWSTR)lParam; + SendDlgItemMessage(hwnd, IDC_ADDFAV_FILES, EM_LIMITTEXT, MAX_PATH - 1, 0); + SetDlgItemText(hwnd, IDC_ADDFAV_FILES, pszName); CenterDlgInParent(hwnd); } @@ -1422,16 +1425,43 @@ static INT_PTR CALLBACK AddToFavDlgProc(HWND hwnd, UINT umsg, WPARAM wParam, LPA break; + case WM_DESTROY: + ResizeDlg_Destroy(hwnd, &Settings.AddToFavDlgSizeX, NULL); + return FALSE; + + + case WM_SIZE: { + int dx; + + ResizeDlg_Size(hwnd, lParam, &dx, NULL); + HDWP hdwp = BeginDeferWindowPos(5); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDOK, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDCANCEL, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_FAVORITESDESCR, dx, 0, SWP_NOMOVE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_ADDFAV_FILES, dx, 0, SWP_NOMOVE); + EndDeferWindowPos(hdwp); + InvalidateRect(GetDlgItem(hwnd, IDC_FAVORITESDESCR), NULL, TRUE); + } + return TRUE; + + + case WM_GETMINMAXINFO: + ResizeDlg_GetMinMaxInfo(hwnd, lParam); + return TRUE; + + case WM_COMMAND: - switch (LOWORD(wParam)) { - case 100: - DialogEnableWindow(hwnd, IDOK, GetWindowTextLength(GetDlgItem(hwnd, 100))); + switch (LOWORD(wParam)) + { + case IDC_ADDFAV_FILES: + DialogEnableWindow(hwnd, IDOK, GetWindowTextLength(GetDlgItem(hwnd, IDC_ADDFAV_FILES))); break; case IDOK: { LPWSTR pszName = (LPWSTR)GetWindowLongPtr(hwnd, DWLP_USER); - GetDlgItemText(hwnd, 100, pszName, MAX_PATH - 1); + GetDlgItemText(hwnd, IDC_ADDFAV_FILES, pszName, MAX_PATH - 1); EndDialog(hwnd, IDOK); } break; @@ -2614,7 +2644,7 @@ static INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam, if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } - ResizeDlg_Init(hwnd,pdd->cxDlg,pdd->cyDlg,IDC_RESIZEGRIP4); + ResizeDlg_Init(hwnd,pdd->cxDlg,pdd->cyDlg,IDC_RESIZEGRIP); hwndLV = GetDlgItem(hwnd,IDC_ENCODINGLIST); @@ -2658,7 +2688,7 @@ static INT_PTR CALLBACK SelectEncodingDlgProc(HWND hwnd,UINT umsg,WPARAM wParam, ResizeDlg_Size(hwnd,lParam,&dx,&dy); HDWP hdwp = BeginDeferWindowPos(4); - hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP4,dx,dy,SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp,hwnd,IDC_RESIZEGRIP,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDOK,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDCANCEL,dx,dy,SWP_NOSIZE); hdwp = DeferCtlPos(hdwp,hwnd,IDC_ENCODINGLIST,dx,dy,SWP_NOMOVE); @@ -3633,103 +3663,159 @@ void SetDlgPos(HWND hDlg, int xDlg, int yDlg) //============================================================================= // -// Resize Dialog Helpers() +// Resize Dialog Helpers() // -#define _RESISIZEDLG_PROP_NAME L"ResizeDlg" - -typedef struct _resizedlg { +#define RESIZEDLG_PROP_KEY L"ResizeDlg" +typedef struct _resizeDlg { + int direction; int cxClient; int cyClient; - int cxFrame; - int cyFrame; int mmiPtMinX; int mmiPtMinY; -} RESIZEDLG, *PRESIZEDLG; + int mmiPtMaxX; // only Y direction + int mmiPtMaxY; // only X direction + int attrs[MAX_RESIZEDLG_ATTR_COUNT]; +} RESIZEDLG, * PRESIZEDLG; -void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip) +typedef const RESIZEDLG* LPCRESIZEDLG; + +void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection) { + RESIZEDLG* pm = (RESIZEDLG*)AllocMem(sizeof(RESIZEDLG), HEAP_ZERO_MEMORY); + pm->direction = iDirection; + RECT rc; GetClientRect(hwnd, &rc); + pm->cxClient = rc.right - rc.left; + pm->cyClient = rc.bottom - rc.top; - PRESIZEDLG pResizeDlg = AllocMem(sizeof(RESIZEDLG), HEAP_ZERO_MEMORY); - if (pResizeDlg) { - pResizeDlg->cxClient = rc.right - rc.left; - pResizeDlg->cyClient = rc.bottom - rc.top; + AdjustWindowRectEx(&rc, GetWindowLong(hwnd, GWL_STYLE) | WS_THICKFRAME, FALSE, 0); + pm->mmiPtMinX = rc.right - rc.left; + pm->mmiPtMinY = rc.bottom - rc.top; + // only one direction + switch (iDirection) { + case ResizeDlgDirection_OnlyX: + pm->mmiPtMaxY = pm->mmiPtMinY; + break; - pResizeDlg->cxFrame = cxFrame; - pResizeDlg->cyFrame = cyFrame; - - AdjustWindowRectEx(&rc, GetWindowLong(hwnd, GWL_STYLE) | WS_THICKFRAME, false, 0); - pResizeDlg->mmiPtMinX = rc.right - rc.left; - pResizeDlg->mmiPtMinY = rc.bottom - rc.top; - - if (pResizeDlg->cxFrame < (rc.right - rc.left)) - pResizeDlg->cxFrame = rc.right - rc.left; - if (pResizeDlg->cyFrame < (rc.bottom - rc.top)) - pResizeDlg->cyFrame = rc.bottom - rc.top; - - SetProp(hwnd, _RESISIZEDLG_PROP_NAME, (HANDLE)pResizeDlg); - - SetWindowPos(hwnd, NULL, rc.left, rc.top, pResizeDlg->cxFrame, pResizeDlg->cyFrame, SWP_NOZORDER); - - 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); - - WCHAR wch[64] = { L'\0' }; - GetMenuString(GetSystemMenu(GetParent(hwnd), false), SC_SIZE, wch, COUNTOF(wch), MF_BYCOMMAND); - InsertMenu(GetSystemMenu(hwnd, false), SC_CLOSE, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SC_SIZE, wch); - InsertMenu(GetSystemMenu(hwnd, false), SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); - - SetWindowLongPtr(GetDlgItem(hwnd, nIdGrip), GWL_STYLE, - GetWindowLongPtr(GetDlgItem(hwnd, nIdGrip), GWL_STYLE) | SBS_SIZEGRIP | WS_CLIPSIBLINGS); - - int const cGrip = GetSystemMetricsEx(SM_CXHTHUMB); - SetWindowPos(GetDlgItem(hwnd, nIdGrip), NULL, pResizeDlg->cxClient - cGrip, pResizeDlg->cyClient - cGrip, cGrip, cGrip, SWP_NOZORDER); + case ResizeDlgDirection_OnlyY: + pm->mmiPtMaxX = pm->mmiPtMinX; + break; } + + cxFrame = max_i(cxFrame, pm->mmiPtMinX); + cyFrame = max_i(cyFrame, pm->mmiPtMinY); + + SetProp(hwnd, RESIZEDLG_PROP_KEY, (HANDLE)pm); + + SetWindowPos(hwnd, NULL, rc.left, rc.top, cxFrame, cyFrame, SWP_NOZORDER); + + 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); + + WCHAR wch[64]; + GetMenuString(GetSystemMenu(GetParent(hwnd), FALSE), SC_SIZE, wch, COUNTOF(wch), MF_BYCOMMAND); + InsertMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND | MF_STRING | MF_ENABLED, SC_SIZE, wch); + InsertMenu(GetSystemMenu(hwnd, FALSE), SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR, 0, NULL); + + HWND hwndCtl = GetDlgItem(hwnd, nIdGrip); + SetWindowLongPtr(hwndCtl, GWL_STYLE, GetWindowLongPtr(hwndCtl, GWL_STYLE) | SBS_SIZEGRIP | WS_CLIPSIBLINGS); + /// TODO: per-window DPI + const int cGrip = GetSystemMetricsEx(SM_CXHTHUMB); + SetWindowPos(hwndCtl, NULL, pm->cxClient - cGrip, pm->cyClient - cGrip, cGrip, cGrip, SWP_NOZORDER); } -void ResizeDlg_Destroy(HWND hwnd, int *cxFrame, int *cyFrame) -{ - PRESIZEDLG pResizeDlg = GetProp(hwnd, _RESISIZEDLG_PROP_NAME); +void ResizeDlg_Destroy(HWND hwnd, int* cxFrame, int* cyFrame) { + PRESIZEDLG pm = (PRESIZEDLG)GetProp(hwnd, RESIZEDLG_PROP_KEY); RECT rc; GetWindowRect(hwnd, &rc); - *cxFrame = rc.right - rc.left; - *cyFrame = rc.bottom - rc.top; + if (cxFrame) { + *cxFrame = rc.right - rc.left; + } + if (cyFrame) { + *cyFrame = rc.bottom - rc.top; + } - RemoveProp(hwnd, _RESISIZEDLG_PROP_NAME); - FreeMem(pResizeDlg); + RemoveProp(hwnd, RESIZEDLG_PROP_KEY); + FreeMem(pm); } -void ResizeDlg_Size(HWND hwnd, LPARAM lParam, int *cx, int *cy) -{ - PRESIZEDLG pResizeDlg = GetProp(hwnd, _RESISIZEDLG_PROP_NAME); - - *cx = LOWORD(lParam) - pResizeDlg->cxClient; - *cy = HIWORD(lParam) - pResizeDlg->cyClient; - pResizeDlg->cxClient = LOWORD(lParam); - pResizeDlg->cyClient = HIWORD(lParam); +void ResizeDlg_Size(HWND hwnd, LPARAM lParam, int* cx, int* cy) { + PRESIZEDLG pm = (PRESIZEDLG)GetProp(hwnd, RESIZEDLG_PROP_KEY); + const int cxClient = LOWORD(lParam); + const int cyClient = HIWORD(lParam); + if (cx) { + *cx = cxClient - pm->cxClient; + } + if (cy) { + *cy = cyClient - pm->cyClient; + } + pm->cxClient = cxClient; + pm->cyClient = cyClient; } -void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam) -{ - PRESIZEDLG pResizeDlg = GetProp(hwnd, _RESISIZEDLG_PROP_NAME); +void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam) { + LPCRESIZEDLG pm = (LPCRESIZEDLG)GetProp(hwnd, RESIZEDLG_PROP_KEY); LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam; - lpmmi->ptMinTrackSize.x = pResizeDlg->mmiPtMinX; - lpmmi->ptMinTrackSize.y = pResizeDlg->mmiPtMinY; + lpmmi->ptMinTrackSize.x = pm->mmiPtMinX; + lpmmi->ptMinTrackSize.y = pm->mmiPtMinY; + + // only one direction + switch (pm->direction) { + case ResizeDlgDirection_OnlyX: + lpmmi->ptMaxTrackSize.y = pm->mmiPtMaxY; + break; + + case ResizeDlgDirection_OnlyY: + lpmmi->ptMaxTrackSize.x = pm->mmiPtMaxX; + break; + } } -HDWP DeferCtlPos(HDWP hdwp, HWND hwndDlg, int nCtlId, int dx, int dy, UINT uFlags) -{ - RECT rc; - HWND const hwndCtl = GetDlgItem(hwndDlg, nCtlId); - GetWindowRect(hwndCtl, &rc); - MapWindowPoints(NULL, hwndDlg, (LPPOINT)&rc, 2); - if (uFlags & SWP_NOSIZE) { - return(DeferWindowPos(hdwp, hwndCtl, NULL, rc.left + dx, rc.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE)); +void ResizeDlg_SetAttr(HWND hwnd, int index, int value) { + if (index < MAX_RESIZEDLG_ATTR_COUNT) { + PRESIZEDLG pm = (PRESIZEDLG)GetProp(hwnd, RESIZEDLG_PROP_KEY); + pm->attrs[index] = value; } - return(DeferWindowPos(hdwp, hwndCtl, NULL, 0, 0, rc.right - rc.left + dx, rc.bottom - rc.top + dy, SWP_NOZORDER | SWP_NOMOVE)); +} + +int ResizeDlg_GetAttr(HWND hwnd, int index) { + if (index < MAX_RESIZEDLG_ATTR_COUNT) { + const LPCRESIZEDLG pm = (LPCRESIZEDLG)GetProp(hwnd, RESIZEDLG_PROP_KEY); + return pm->attrs[index]; + } + + return 0; +} + +static inline int GetDlgCtlHeight(HWND hwndDlg, int nCtlId) { + RECT rc; + GetWindowRect(GetDlgItem(hwndDlg, nCtlId), &rc); + const int height = rc.bottom - rc.top; + return height; +} + +void ResizeDlgCtl(HWND hwndDlg, int nCtlId, int dx, int dy) { + HWND hwndCtl = GetDlgItem(hwndDlg, nCtlId); + RECT rc; + GetWindowRect(hwndCtl, &rc); + MapWindowPoints(NULL, hwndDlg, (LPPOINT)& rc, 2); + SetWindowPos(hwndCtl, NULL, 0, 0, rc.right - rc.left + dx, rc.bottom - rc.top + dy, SWP_NOZORDER | SWP_NOMOVE); + InvalidateRect(hwndCtl, NULL, TRUE); +} + + +HDWP DeferCtlPos(HDWP hdwp, HWND hwndDlg, int nCtlId, int dx, int dy, UINT uFlags) { + HWND hwndCtl = GetDlgItem(hwndDlg, nCtlId); + RECT rc; + GetWindowRect(hwndCtl, &rc); + MapWindowPoints(NULL, hwndDlg, (LPPOINT)& rc, 2); + if (uFlags & SWP_NOSIZE) { + return DeferWindowPos(hdwp, hwndCtl, NULL, rc.left + dx, rc.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + } + return DeferWindowPos(hdwp, hwndCtl, NULL, 0, 0, rc.right - rc.left + dx, rc.bottom - rc.top + dy, SWP_NOZORDER | SWP_NOMOVE); } diff --git a/src/Dialogs.h b/src/Dialogs.h index 93c45d55d..1360d55d1 100644 --- a/src/Dialogs.h +++ b/src/Dialogs.h @@ -59,11 +59,37 @@ void CenterDlgInParent(HWND hDlg); void GetDlgPos(HWND hDlg, LPINT xDlg, LPINT yDlg); void SetDlgPos(HWND hDlg, int xDlg, int yDlg); //void SnapToDefaultButton(HWND); -void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip); + +#define ResizeDlgDirection_Both 0 +#define ResizeDlgDirection_OnlyX 1 +#define ResizeDlgDirection_OnlyY 2 +void ResizeDlg_InitEx(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection); +inline void ResizeDlg_Init(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip) { + ResizeDlg_InitEx(hwnd, cxFrame, cyFrame, nIdGrip, ResizeDlgDirection_Both); +} +inline void ResizeDlg_InitX(HWND hwnd, int cxFrame, int nIdGrip) { + ResizeDlg_InitEx(hwnd, cxFrame, 0, nIdGrip, ResizeDlgDirection_OnlyX); +} +inline void ResizeDlg_InitY(HWND hwnd, int cyFrame, int nIdGrip) { + ResizeDlg_InitEx(hwnd, 0, cyFrame, nIdGrip, ResizeDlgDirection_OnlyY); +} void ResizeDlg_Destroy(HWND hwnd, int* cxFrame, int* cyFrame); void ResizeDlg_Size(HWND hwnd, LPARAM lParam, int* cx, int* cy); void ResizeDlg_GetMinMaxInfo(HWND hwnd, LPARAM lParam); + +#define MAX_RESIZEDLG_ATTR_COUNT 2 +void ResizeDlg_SetAttr(HWND hwnd, int index, int value); +int ResizeDlg_GetAttr(HWND hwnd, int index); + +void ResizeDlg_InitY2Ex(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int iDirection, int nCtlId1, int nCtlId2); +inline void ResizeDlg_InitY2(HWND hwnd, int cxFrame, int cyFrame, int nIdGrip, int nCtlId1, int nCtlId2) { + ResizeDlg_InitY2Ex(hwnd, cxFrame, cyFrame, nIdGrip, ResizeDlgDirection_Both, nCtlId1, nCtlId2); +} +int ResizeDlg_CalcDeltaY2(HWND hwnd, int dy, int cy, int nCtlId1, int nCtlId2); +void ResizeDlgCtl(HWND hwndDlg, int nCtlId, int dx, int dy); HDWP DeferCtlPos(HDWP hdwp, HWND hwndDlg, int nCtlId, int dx, int dy, UINT uFlags); + + void MakeBitmapButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, WORD uBmpId); void MakeColorPickButton(HWND hwnd, int nCtlId, HINSTANCE hInstance, COLORREF crColor); void DeleteBitmapButton(HWND hwnd, int nCtlId); diff --git a/src/Edit.c b/src/Edit.c index 2c5f4113f..7e684c9cf 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -5061,8 +5061,8 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara { // the global static Find/Replace data structure SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR)lParam); - if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } + ResizeDlg_InitX(hwnd, Settings.FindReplaceDlgSizeX, IDC_RESIZEGRIP); //sg_pefrData = (LPEDITFINDREPLACE)lParam; sg_pefrData = (LPEDITFINDREPLACE)GetWindowLongPtr(hwnd, DWLP_USER); @@ -5292,11 +5292,42 @@ static INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wPara DeleteObject(hBrushRed); DeleteObject(hBrushGreen); DeleteObject(hBrushBlue); + ResizeDlg_Destroy(hwnd, &Settings.FindReplaceDlgSizeX, NULL); } return false; - case WM_ACTIVATE: + case WM_SIZE: { + int dx; + bool const isReplace = (GetDlgItem(hwnd, IDC_REPLACETEXT) != NULL); + ResizeDlg_Size(hwnd, lParam, &dx, NULL); + HDWP hdwp = BeginDeferWindowPos(isReplace ? 15 : 12); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDOK, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDCANCEL, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_FINDTEXT, dx, 0, SWP_NOMOVE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_FINDPREV, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_TOGGLE_VISIBILITY, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDS_FR_STATUS_TEXT, dx, 0, SWP_NOMOVE); + if (isReplace) { + hdwp = DeferCtlPos(hdwp, hwnd, IDC_REPLACETEXT, dx, 0, SWP_NOMOVE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_SWAPSTRG, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_REPLACE, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_REPLACEINSEL, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_REPLACEALL, dx, 0, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_REPLACEINSEL, dx, 0, SWP_NOSIZE); + } + EndDeferWindowPos(hdwp); + } + return true; + + + case WM_GETMINMAXINFO: + ResizeDlg_GetMinMaxInfo(hwnd, lParam); + return true; + + + case WM_ACTIVATE: { switch (LOWORD(wParam)) { diff --git a/src/Notepad3.c b/src/Notepad3.c index c227dc566..30a6ad2bf 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -3600,18 +3600,14 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case IDM_EDIT_UNDO: if (SciCall_CanUndo()) { - _IGNORE_NOTIFY_CHANGE_; SciCall_Undo(); - _OBSERVE_NOTIFY_CHANGE_; UpdateToolbar(); } break; case IDM_EDIT_REDO: if (SciCall_CanRedo()) { - _IGNORE_NOTIFY_CHANGE_; SciCall_Redo(); - _OBSERVE_NOTIFY_CHANGE_; UpdateToolbar(); } break; @@ -3651,8 +3647,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case IDM_EDIT_COPYALL: { - if (s_flagPasteBoard) + if (s_flagPasteBoard) { s_bLastCopyFromMe = true; + } SciCall_CopyRange(0, Sci_GetDocEndPosition()); UpdateToolbar(); } @@ -3661,21 +3658,21 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case IDM_EDIT_COPYADD: { - if (s_flagPasteBoard) + if (s_flagPasteBoard) { s_bLastCopyFromMe = true; - EditCopyAppend(Globals.hwndEdit,true); + } + EditCopyAppend(Globals.hwndEdit, true); UpdateToolbar(); } break; case IDM_EDIT_PASTE: { - if (s_flagPasteBoard) + if (s_flagPasteBoard) { s_bLastCopyFromMe = true; + } _BEGIN_UNDO_ACTION_; - _IGNORE_NOTIFY_CHANGE_; SciCall_Paste(); - _OBSERVE_NOTIFY_CHANGE_; _END_UNDO_ACTION_; UpdateToolbar(); UpdateStatusbar(false); @@ -3684,12 +3681,11 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) case IDM_EDIT_SWAP: { - if (s_flagPasteBoard) + if (s_flagPasteBoard) { s_bLastCopyFromMe = true; + } _BEGIN_UNDO_ACTION_; - _IGNORE_NOTIFY_CHANGE_; EditSwapClipboard(Globals.hwndEdit, Settings.SkipUnicodeDetection); - _OBSERVE_NOTIFY_CHANGE_; _END_UNDO_ACTION_; UpdateToolbar(); UpdateStatusbar(false); @@ -7231,18 +7227,24 @@ void LoadSettings() GET_BOOL_VALUE_FROM_INISECTION(ShowToolbar, true); GET_BOOL_VALUE_FROM_INISECTION(ShowStatusbar, true); - GET_INT_VALUE_FROM_INISECTION(EncodingDlgSizeX, 256, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(EncodingDlgSizeY, 262, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeX, 256, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeY, 262, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeX, 412, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeY, 376, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeX, 384, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeY, 384, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeX, 334, INT_MIN, INT_MAX); - GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeY, 334, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(EncodingDlgSizeX, 340, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(EncodingDlgSizeY, 292, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeX, 340, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(RecodeDlgSizeY, 292, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeX, 487, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(FileMRUDlgSizeY, 339, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeX, 305, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(OpenWithDlgSizeY, 281, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeX, 305, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(FavoritesDlgSizeY, 281, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(AddToFavDlgSizeX, 317, INT_MIN, INT_MAX); + + GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgSizeX, 494, INT_MIN, INT_MAX); GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgPosX, CW_USEDEFAULT, INT_MIN, INT_MAX); GET_INT_VALUE_FROM_INISECTION(FindReplaceDlgPosY, CW_USEDEFAULT, INT_MIN, INT_MAX); + + GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgSizeX, 833, INT_MIN, INT_MAX); + GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgSizeY, 515, INT_MIN, INT_MAX); GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosX, CW_USEDEFAULT, INT_MIN, INT_MAX); GET_INT_VALUE_FROM_INISECTION(CustomSchemesDlgPosY, CW_USEDEFAULT, INT_MIN, INT_MAX); @@ -7603,8 +7605,14 @@ void SaveSettings(bool bSaveSettingsNow) SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, OpenWithDlgSizeY); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FavoritesDlgSizeX); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FavoritesDlgSizeY); + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, AddToFavDlgSizeX); + + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgSizeX); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgPosX); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, FindReplaceDlgPosY); + + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgSizeX); + SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgSizeY); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgPosX); SAVE_VALUE_IF_NOT_EQ_DEFAULT(Int, CustomSchemesDlgPosY); diff --git a/src/Styles.c b/src/Styles.c index 8bc9d6a80..6b04a5ada 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -3425,6 +3425,9 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam case WM_INITDIALOG: { if (Globals.hDlgIcon) { SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon); } + + ResizeDlg_Init(hwnd, Settings.CustomSchemesDlgSizeX, Settings.CustomSchemesDlgSizeY, IDC_RESIZEGRIP); + GetLngString(IDS_MUI_STYLEEDIT_HELP, tchTmpBuffer, COUNTOF(tchTmpBuffer)); SetDlgItemText(hwnd, IDC_STYLEEDIT_HELP, tchTmpBuffer); @@ -3500,10 +3503,12 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam SendDlgItemMessage(hwnd,IDC_TITLE,WM_SETFONT,(WPARAM)hFontTitle,true); if (Settings.CustomSchemesDlgPosX == CW_USEDEFAULT || Settings.CustomSchemesDlgPosY == CW_USEDEFAULT) + { CenterDlgInParent(hwnd); - else + } + else { SetDlgPos(hwnd, Settings.CustomSchemesDlgPosX, Settings.CustomSchemesDlgPosY); - + } HMENU hmenu = GetSystemMenu(hwnd, false); GetLngString(IDS_MUI_PREVIEW, tchTmpBuffer, COUNTOF(tchTmpBuffer)); InsertMenu(hmenu, 0, MF_BYPOSITION | MF_STRING | MF_ENABLED, IDS_MUI_PREVIEW, tchTmpBuffer); @@ -3532,6 +3537,8 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam DeleteBitmapButton(hwnd, IDC_STYLEBACK); DeleteBitmapButton(hwnd, IDC_PREVSTYLE); DeleteBitmapButton(hwnd, IDC_NEXTSTYLE); + ResizeDlg_Destroy(hwnd, &Settings.CustomSchemesDlgSizeX, &Settings.CustomSchemesDlgSizeY); + // free old backup int cnt = 0; for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); ++iLexer) { @@ -3569,6 +3576,38 @@ INT_PTR CALLBACK Style_CustomizeSchemesDlgProc(HWND hwnd,UINT umsg,WPARAM wParam else return false; + case WM_SIZE: + { + int dx; + int dy; + ResizeDlg_Size(hwnd, lParam, &dx, &dy); + HDWP hdwp = BeginDeferWindowPos(18); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_RESIZEGRIP, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDOK, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDCANCEL, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLELIST, 0, dy, SWP_NOMOVE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_INFO_GROUPBOX, dx, 0, SWP_NOMOVE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLELABEL_ROOT, 0, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEEDIT_ROOT, 0, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLELABEL, 0, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEEDIT, 0, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEFORE, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEBACK, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEFONT, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_PREVIEW, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_STYLEDEFAULT, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_PREVSTYLE, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_NEXTSTYLE, dx, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_IMPORT, 0, dy, SWP_NOSIZE); + hdwp = DeferCtlPos(hdwp, hwnd, IDC_EXPORT, 0, dy, SWP_NOSIZE); + EndDeferWindowPos(hdwp); + } + return TRUE; + + case WM_GETMINMAXINFO: + ResizeDlg_GetMinMaxInfo(hwnd, lParam); + return TRUE; + case WM_NOTIFY: @@ -4092,11 +4131,11 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR 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); - SetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP3),GWL_STYLE, - GetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP3),GWL_STYLE)|SBS_SIZEGRIP|WS_CLIPSIBLINGS); + SetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP),GWL_STYLE, + GetWindowLongPtr(GetDlgItem(hwnd,IDC_RESIZEGRIP),GWL_STYLE)|SBS_SIZEGRIP|WS_CLIPSIBLINGS); int cGrip = GetSystemMetricsEx(SM_CXHTHUMB); - SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP3),NULL,cxClient-cGrip, + SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP),NULL,cxClient-cGrip, cyClient-cGrip,cGrip,cGrip,SWP_NOZORDER); hwndLV = GetDlgItem(hwnd,IDC_STYLELIST); @@ -4172,10 +4211,10 @@ INT_PTR CALLBACK Style_SelectLexerDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPAR cxClient = LOWORD(lParam); cyClient = HIWORD(lParam); - GetWindowRect(GetDlgItem(hwnd,IDC_RESIZEGRIP3),&rc); + GetWindowRect(GetDlgItem(hwnd,IDC_RESIZEGRIP),&rc); MapWindowPoints(NULL,hwnd,(LPPOINT)&rc,2); - SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP3),NULL,rc.left+dxClient,rc.top+dyClient,0,0,SWP_NOZORDER|SWP_NOSIZE); - InvalidateRect(GetDlgItem(hwnd,IDC_RESIZEGRIP3),NULL,true); + SetWindowPos(GetDlgItem(hwnd,IDC_RESIZEGRIP),NULL,rc.left+dxClient,rc.top+dyClient,0,0,SWP_NOZORDER|SWP_NOSIZE); + InvalidateRect(GetDlgItem(hwnd,IDC_RESIZEGRIP),NULL,true); GetWindowRect(GetDlgItem(hwnd,IDOK),&rc); MapWindowPoints(NULL,hwnd,(LPPOINT)&rc,2); diff --git a/src/TypeDefs.h b/src/TypeDefs.h index dcb6d3ef8..517f0d1bd 100644 --- a/src/TypeDefs.h +++ b/src/TypeDefs.h @@ -405,8 +405,12 @@ typedef struct _settings_t int OpenWithDlgSizeY; int FavoritesDlgSizeX; int FavoritesDlgSizeY; + int AddToFavDlgSizeX; + int FindReplaceDlgSizeX; int FindReplaceDlgPosX; int FindReplaceDlgPosY; + int CustomSchemesDlgSizeX; + int CustomSchemesDlgSizeY; int CustomSchemesDlgPosX; int CustomSchemesDlgPosY; bool MuteMessageBeep; diff --git a/src/VersionEx.h b/src/VersionEx.h index ac94ae381..fbd912cf5 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 429 -#define VERSION_BUILD 1682 +#define VERSION_REV 430 +#define VERSION_BUILD 1684 #define SCINTILLA_VER 415 #define ONIGMO_REGEX_VER 6.2.0 #define VERSION_PATCH develop