CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1816 from RaiKoHoff/DevNewFeatures

Browse Source 
Preserve file modification time settings on elevated relaunch
This commit is contained in:
Rainer Kottenhoff 2019-11-27 09:37:44 +01:00 committed by GitHub
commit 5535771b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2687
2688

3
language/np3_be_by/strings_be_by.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Вызначаныя сімвалы ў гэтым тэксце не падтрымліваюцца выбранай кадоўкай і будуць заменены сімваламі-заменнікамі падчас захавання. Лепей выбраць іншую кадоўку файла. Усё роўна працягнуць?"
IDS_MUI_ERR_DROP "За адзін раз можна перацягнуць толькі адзін файл!"
//IDS_MUI_ERR_ACCESSDENIED "Файл «%s» нельга захаваць з прычыны абароны ад змянення.\n\nХочаце запусціць Notepad3 ад імя Адміністратара?"
IDS_MUI_ERR_ACCESSDENIED
"Файл «%s» нельга захаваць з прычыны абароны ад змянення.\n\nХочаце запусціць Notepad3 ад імя Адміністратара?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Не знойдены інструмент адміністратара\nНаведаць сайт https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Вы ўпэўнены, што хочаце адкрыць гэты вялікі файл?"

2
language/np3_de_de/strings_de_de.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Bestimmte Zeichen im aktuellen Text werden von der gewählten Codierung nicht unterstützt und werden evtl. durch Standardplatzhalter ersetzt wenn die Datei gespeichert wird. Es wird empfolen eine andere Codierung zu wählen. Weiter machen?"
IDS_MUI_ERR_DROP "Es kann immer nur eine Datei gleichzeitig verworfen werden!"
IDS_MUI_ERR_ACCESSDENIED
"Die Datei ""%s"" kann nicht gespeichert werden und ist evtl. geschützt.\n\nMöchtest Du Notepad3 als Administrator starten?"
"Die Datei ""%s"" kann nicht gespeichert werden und ist evtl. geschützt.\n\nMöchtest Du %s mit erhöhten Rechten starten?"
IDS_MUI_ERR_ADMINEXE "Kein Verwaltungswerkzeug gefunden.\nBitte auf der Website https://rizonesoft.com prüfen."
IDS_MUI_WARN_LOAD_BIG_FILE
"Bist Du sicher, dass Du diese sehr große Datei öffnen möchtest?"

2
language/np3_en_gb/strings_en_gb.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch Notepad3 as Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?"

2
language/np3_en_us/strings_en_us.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch Notepad3 as Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?"

3
language/np3_es_es/strings_es_es.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Ciertos caracteres en el texto actual no son compatibles con la codificación seleccionada, y pueden ser reemplazados por marcadores de posición predeterminados al guardar. Se recomienda elegir otra codificación de archivo. ¿Continuar?"
IDS_MUI_ERR_DROP "¡Sólo se puede eliminar un archivo al mismo tiempo!"
//IDS_MUI_ERR_ACCESSDENIED "El archivo ""%s"" no se puede guardar y puede estar protegido.\n\n¿Quiere lanzar Notepad3 como administrador?"
IDS_MUI_ERR_ACCESSDENIED
"El archivo ""%s"" no se puede guardar y puede estar protegido.\n\n¿Quiere lanzar Notepad3 como administrador?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "No se ha encontrado administración ejecutable .\n¿Consultar website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"¿¿Seguro que quiere abrir este archivo tan grande??"

3
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Certains caractères dans le texte courant ne sont pas supportés par le codage sélectionné et peuvent être remplacés par des espaces réservés par défaut lors de la sauvegarde. Il est recommandé de choisir un autre encodage de fichier. Continuer?"
IDS_MUI_ERR_DROP "Un seul fichier peut être déposé en même temps!"
//IDS_MUI_ERR_ACCESSDENIED "Le fichier ""% s "" ne peut pas être sauvegardé et est peut-être protégé.\n\nVoulez-vous lancer Notepad3 en tant qu'administrateur?"
IDS_MUI_ERR_ACCESSDENIED
"Le fichier ""% s "" ne peut pas être sauvegardé et est peut-être protégé.\n\nVoulez-vous lancer Notepad3 en tant qu'administrateur?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Aucun fichier exécutable d'administration trouvé.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Etes-vous sûr de vouloir ouvrir ce gros fichier?"

3
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Egyes karakterek a jelenlegi szövegben nem támogatottak a kiválasztott kódolásban, ezért le kéne cserélni őket az alapértelmezett helykitöltővel mentéskor.Ajánlott egy másik kódolást választani. Folytatja?"
IDS_MUI_ERR_DROP "Csak egy fájlt lehet egyszerre ide ejteni!"
//IDS_MUI_ERR_ACCESSDENIED "A következő fájlt: ""%s"" nem lehet menteni, lehet, hogy védett.\n\nSzeretné adminisztrátornként elindítani a Notepad3-at?"
IDS_MUI_ERR_ACCESSDENIED
"A következő fájlt: ""%s"" nem lehet menteni, lehet, hogy védett.\n\nSzeretné adminisztrátornként elindítani a Notepad3-at?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Adminisztrátor végrehajtható nem található.\nFelkeressük e weboldalt: https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Biztosan meg szeretné nyitni ezt a nagy fájlt?"

3
language/np3_it_it/strings_it_it.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Alcuni caratteri nel testo corrente non sono supportati dall'encoding selezionato, e potrebbero essere rimpiazzati da segnaposto di default al salvataggio. E' opportuno selezionare un encoding differente. Continuare?"
IDS_MUI_ERR_DROP "Solo un file può essere rilasciato con una unica operazione!"
//IDS_MUI_ERR_ACCESSDENIED "Il file ""%s"" non può essere salvato e potrebbe essere protetto.\n\nVuoi avviare Notepad3 come Administrator?"
IDS_MUI_ERR_ACCESSDENIED
"Il file ""%s"" non può essere salvato e potrebbe essere protetto.\n\nVuoi avviare Notepad3 come Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Nessun eseguibile di administration trovato.\nControllare https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Sei sicuro di voler aprire questo file grande?"

3
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "現在の文書に含まれる一部の文字が、選択した文字コードに対応していません。保存した場合、所定の文字に置換される可能性があります。他の文字コードを推奨します。\n変換を続行しますか？"
IDS_MUI_ERR_DROP "一度にひとつのファイルしかドロップできません。"
//IDS_MUI_ERR_ACCESSDENIED """%s"" を保存できませんでした。保護されている可能性があります。\n\n管理者権限でNotepad3を起動しますか？"
IDS_MUI_ERR_ACCESSDENIED
"""%s"" を保存できませんでした。保護されている可能性があります。\n\n管理者権限でNotepad3を起動しますか？"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "管理ツールが見つかりません。\nNotepad3の公式サイトを開きますか？ https://rizonesoft.com"
IDS_MUI_WARN_LOAD_BIG_FILE
"大容量のファイルです。このファイルを開きますか？"

3
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "현재 텍스트의 특정 문자를 현재 인코딩에서 지원하지 않기 때문에 저장시에는 기본 문자로 대체될 것입니다. 다른 인코딩을 선택하는게 좋습니다. 계속 할까요?"
IDS_MUI_ERR_DROP "한 번에 하나의 파일만 끌어서 놓을 수 있습니다.!"
//IDS_MUI_ERR_ACCESSDENIED """%s"" 파일을 저장할 수 없으며 보호되어 있을 수 있습니다. \n\n관리자 권한으로 Notepad3을 시작 하시겠습니까?"
IDS_MUI_ERR_ACCESSDENIED
"""%s"" 파일을 저장할 수 없으며 보호되어 있을 수 있습니다. \n\n관리자 권한으로 Notepad3을 시작 하시겠습니까?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "사용 가능한 관리 도구를 찾을 수 없습니다. https://rizonesoft.com 에서 확인 하시겠습니까?"
IDS_MUI_WARN_LOAD_BIG_FILE
"이 대용량 파일을 열겠습니까?"

3
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Bepaalde tekens in de huidige tekst worden niet ondersteund door de geselecteerde codering, en kunnen worden vervangen door standaardplaatshouders bij het opslaan. Het wordt aanbevolen om een andere bestandscodering te kiezen. Doorgaan?"
IDS_MUI_ERR_DROP "Er kan slechts één bestand tegelijkertijd worden gedeponeerd!"
//IDS_MUI_ERR_ACCESSDENIED "Het bestand ""%s"" kan niet worden opgeslagen en kan worden beveiligd.\n\nWilt u Notepad3 als Administrator starten?"
IDS_MUI_ERR_ACCESSDENIED
"Het bestand ""%s"" kan niet worden opgeslagen en kan worden beveiligd.\n\nWilt u Notepad3 als Administrator starten?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Geen administratief uitvoerbaar bestand gevonden.\nControleer website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Weet je zeker dat je dit grote bestand wilt openen?"

3
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Niektóre znaki w tym tekście nie są obsługiwane przez wybrane kodowanie, i mogą zostanie zamienione na standardowe znaki po zapisaniu. Zaleca się wybrać inne kodowanie pliku. Kontynuować?"
IDS_MUI_ERR_DROP "Tylko jeden plik może być upuszczony w tym samym czasie!"
//IDS_MUI_ERR_ACCESSDENIED "Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nCzy uruchomić Notepad3 jako Administrator?"
IDS_MUI_ERR_ACCESSDENIED
"Plik ""%s"" nie może zostać zapisany i może być zabezpieczony.\n\nCzy uruchomić Notepad3 jako Administrator?"
"The file '%s' cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Nie znaleziono narzędzia administracyjnego.\nSprawdź stronę https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Czy na pewno chcesz otworzyć ten duży plik?"

2
language/np3_pt_br/strings_pt_br.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch Notepad3 as Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?"

3
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "Определенные символы в текущем тексте не поддерживаются выбранной кодировкой и будут заменены заполнителями при сохранении. Рекомендуется выбрать другую кодировку файла. Все равно продолжить?"
IDS_MUI_ERR_DROP "За один раз можно перетащить только один файл!"
//IDS_MUI_ERR_ACCESSDENIED "Файл «%s» не может быть сохранен и может быть защищен.\n\nХотите запустить Notepad3 от имени Администратора?"
IDS_MUI_ERR_ACCESSDENIED
"Файл «%s» не может быть сохранен и может быть защищен.\n\nХотите запустить Notepad3 от имени Администратора?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "Не найден инструмент администратора\nПосетить сайт https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Вы уверены, что хотите открыть этот очень большой файл?"

2
language/np3_sk_sk/strings_sk_sk.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch Notepad3 as Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?"

2
language/np3_tr_tr/strings_tr_tr.rc
View File

@ -143,7 +143,7 @@ BEGIN
IDS_MUI_ERR_UNICODE2 "Certain characters in the current text are not supported by the selected encoding, and may be replaced by default placeholders when saving. It's recommended to choose another file encoding. Continue?"
IDS_MUI_ERR_DROP "Only one file can be dropped at the same time!"
IDS_MUI_ERR_ACCESSDENIED
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch Notepad3 as Administrator?"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application??"
IDS_MUI_ERR_ADMINEXE "No administration executable found.\nCheck website https://rizonesoft.com ?"
IDS_MUI_WARN_LOAD_BIG_FILE
"Are you sure you want to open this large file?"

3
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -142,8 +142,9 @@ STRINGTABLE
BEGIN
IDS_MUI_ERR_UNICODE2 "在当前文档中的某些字符不能使用选定的编码表示。在保存文件时，它们可能被替换为其它字符。因此，建议选择其它编码。\n\n是否继续？"
IDS_MUI_ERR_DROP "一次只能拖放一个文件。"
//IDS_MUI_ERR_ACCESSDENIED "文件""%s""不能被保存，它可能是受保护的。\n\n是否以管理员权限运行 Notepad3？"
IDS_MUI_ERR_ACCESSDENIED
"文件""%s""不能被保存，它可能是受保护的。\n\n是否以管理员权限运行 Notepad3？"
"The file ""%s"" cannot be saved and may be protected.\n\nDo you want to launch %s as 'Elevated' application?"
IDS_MUI_ERR_ADMINEXE "无管理工具可用。\n\n访问 https://rizonesoft.com/ 看看？"
IDS_MUI_WARN_LOAD_BIG_FILE
"是否确实要打开一个如此庞大的文件？"

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.1126.2687"
version="5.19.1127.2688"
type="win32"
/>
<description>Notepad3 BETA</description>

21
src/Notepad3.c
View File

@ -7827,11 +7827,16 @@ void ParseCommandLine()
break;
case L'R':
Globals.flagReuseWindow = 2;
if (*CharUpper(lp1 + 1) == L'S')
Globals.flagSingleFileInstance = 2;
else
Globals.flagSingleFileInstance = 1;
if (*CharUpper(lp1 + 1) == L'P') {
Flags.bPreserveFileModTime = true;
}
else {
Globals.flagReuseWindow = 2;
if (*CharUpper(lp1 + 1) == L'S')
Globals.flagSingleFileInstance = 2;
else
Globals.flagSingleFileInstance = 1;
}
break;
case L'F':
@ -9932,6 +9937,9 @@ bool DoElevatedRelaunch(EditFileIOStatus* pFioStatus, bool bAutoSaveOnRelaunch)
if (bAutoSaveOnRelaunch) {
StringCchCat(wchFlags, COUNTOF(wchFlags), L"/QS ");
}
if (Flags.bPreserveFileModTime) {
StringCchCat(wchFlags, COUNTOF(wchFlags), L"/RP ");
}
DocPos const iCurPos = SciCall_GetCurrentPos();
int const iCurLn = (int)SciCall_LineFromPosition(iCurPos) + 1;
@ -10158,7 +10166,8 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP
{
if (!s_bIsProcessElevated && (Globals.dwLastError == ERROR_ACCESS_DENIED))
{
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONSHIELD, NULL, IDS_MUI_ERR_ACCESSDENIED, PathFindFileName(Globals.CurrentFile));
INT_PTR const answer = InfoBoxLng(MB_YESNO | MB_ICONSHIELD, NULL, IDS_MUI_ERR_ACCESSDENIED,
PathFindFileName(Globals.CurrentFile), _W(SAPPNAME));
if ((IDOK == answer) || (IDYES == answer)) {
if (DoElevatedRelaunch(&fioStatus, true))
{

4
src/VersionEx.h
View File

@ -8,8 +8,8 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 1126
#define VERSION_BUILD 2687
#define VERSION_REV 1127
#define VERSION_BUILD 2688
#define SCINTILLA_VER 421
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27