diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc index 04232cdfa..21ebbb8f4 100644 --- a/language/np3_de_de/dialogs_de_de.rc +++ b/language/np3_de_de/dialogs_de_de.rc @@ -678,8 +678,8 @@ BEGIN CONTROL "&Diese Nachricht nicht nochmals anzeigen", IDC_INFOBOXCHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,66,122,10 DEFPUSHBUTTON "&Neu Laden", IDRETRY, 186, 82, 50, 14 - PUSHBUTTON "&Ignore", IDCANCEL, 130, 82, 50, 14 - PUSHBUTTON "&Monitor", IDCONTINUE, 242, 82, 50, 14 + PUSHBUTTON "&Ignorieren", IDCANCEL, 130, 82, 50, 14 + PUSHBUTTON "&Monitoring", IDCONTINUE, 242, 82, 50, 14 END IDD_MUI_SORT DIALOGEX 0, 0, 185, 188 diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc index 837dd77fc..e805a6c45 100644 --- a/language/np3_de_de/strings_de_de.rc +++ b/language/np3_de_de/strings_de_de.rc @@ -179,7 +179,7 @@ BEGIN IDS_MUI_ASK_CLEAR_UNDO "Diese Operation wird die Undo-History löschen. Weiter machen?" IDS_MUI_READONLY_SAVE """%s"" ist schreibgeschützt. Dokument unter einem anderen Dateipfad speichern?" IDS_MUI_FILECHANGENOTIFY - "Die geladene Datei wurde durch ein anderes Programm auf dem Datenträger verändert. Bitte wähle:\n\nIgnore - \t\tIgnoriere alle Änderungen\nNeu Laden - \tDatei neu laden\nMonitor - \t\tWechsle zum Logfile Monitoring" + "Die geladene Datei wurde durch ein anderes Programm auf dem Datenträger verändert. Bitte wähle:\n\nIgnorieren:\tIgnoriere weitere Änderungen\nNeu Laden:\tDatei neu laden\nMonitoring:\tWechsle zum Logfile Monitoring" IDS_MUI_FILECHANGENOTIFY2 "Die geladene Datei wurde auf dem Datenträger gelöscht. Nochmals speichern?" IDS_MUI_FILELOCK_ERROR "Es konnte keine exklusive Dateisperre auf ""%s"" gesetzt werden!" IDS_MUI_STICKYWINPOS "Eingefrorene Fensterpositionierung is eingeschaltet worden. Jede neue Notepad3 Instanz wird nun diese Fensterpositionierung initial verwenden" diff --git a/scintilla/call/ScintillaCall.cxx b/scintilla/call/ScintillaCall.cxx index 01c6ce430..048aa4beb 100644 --- a/scintilla/call/ScintillaCall.cxx +++ b/scintilla/call/ScintillaCall.cxx @@ -1275,6 +1275,14 @@ ChangeHistoryOption ScintillaCall::ChangeHistory() { return static_cast(Call(Message::GetChangeHistory)); } +void ScintillaCall::SetUndoSelectionHistory(Scintilla::UndoSelectionHistoryOption undoSelectionHistory) { + Call(Message::SetUndoSelectionHistory, static_cast(undoSelectionHistory)); +} + +UndoSelectionHistoryOption ScintillaCall::UndoSelectionHistory() { + return static_cast(Call(Message::GetUndoSelectionHistory)); +} + Line ScintillaCall::FirstVisibleLine() { return Call(Message::GetFirstVisibleLine); } diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html index 393a4b96f..886786484 100644 --- a/scintilla/doc/ScintillaDoc.html +++ b/scintilla/doc/ScintillaDoc.html @@ -1121,7 +1121,7 @@ struct Sci_TextRangeFull { If the text argument is NULL(0) then the length that should be allocated to store the entire current line is returned.

-

See also: See also: SCI_GETSELTEXT, SCI_GETLINE, SCI_GETTEXT, @@ -1938,6 +1938,8 @@ struct Sci_TextToFindFull { SCI_ENDUNDOACTION
SCI_GETUNDOSEQUENCE → int
SCI_ADDUNDOACTION(int token, int flags)
+ SCI_SETUNDOSELECTIONHISTORY(int undoSelectionHistory)
+ SCI_GETUNDOSELECTIONHISTORY → int

SCI_UNDO
@@ -2016,6 +2018,35 @@ struct Sci_TextToFindFull { look like typing or deletions that look like multiple uses of the Backspace or Delete keys.

+

SCI_SETUNDOSELECTIONHISTORY(int undoSelectionHistory)
+ SCI_GETUNDOSELECTIONHISTORY → int
+ The selection for each action can be saved and then restored when undo or redo is performed. + SCI_SETUNDOSELECTIONHISTORY controls this. + There is a memory cost for this feature with a minimum of 150 bytes for each of undo and redo for each recorded action. + Recording may be turned on at any time.

+ +

The undoSelectionHistory argument can be:

+ + + + + + + + + + + + + + + + + + + +
SC_UNDO_SELECTION_HISTORY_DISABLED0The default: undo selection history turned off.
SC_UNDO_SELECTION_HISTORY_ENABLED1Restore selection for each undo and redo.
+

Undo Save and Restore

This feature is unfinished and has limitations. @@ -5216,7 +5247,7 @@ struct Sci_TextToFindFull { SC_SUPPORTS_LINE_DRAWS_FINAL 0 Whether drawing a line draws its final position.
- Only false on Win32 GDI. + Only false on Win32 GDI. @@ -7523,7 +7554,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){

For many applications lexing documents larger than 4GB will be too sluggish so SC_DOCUMENTOPTION_STYLES_NONE and the null lexer "null" can be used. Another approach is to turn on idle styling with - SCI_SETIDLESTYLING. + SCI_SETIDLESTYLING.

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html index 68bd415d3..aac94ce44 100644 --- a/scintilla/doc/ScintillaDownload.html +++ b/scintilla/doc/ScintillaDownload.html @@ -26,9 +26,9 @@
@@ -42,7 +42,7 @@ containing very few restrictions.

- Release 5.5.3 + Release 5.5.4

Source Code @@ -50,8 +50,8 @@ The source code package contains all of the source code for Scintilla but no binary executable code and is available in
    -
  • zip format (1.8M) commonly used on Windows
    • -
  • tgz format (1.7M) commonly used on Linux and compatible operating systems
    • +
  • zip format (1.8M) commonly used on Windows
    • +
  • tgz format (1.7M) commonly used on Linux and compatible operating systems
Instructions for building on both Windows and Linux are included in the readme file.

diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html index b8fe778a7..7cb5ebcee 100644 --- a/scintilla/doc/ScintillaHistory.html +++ b/scintilla/doc/ScintillaHistory.html @@ -587,12 +587,29 @@

- + Windows   - + GTK/Linux  

Releases

+

+ Release 5.5.5 +

+
    +
  • + Released 18 December 2024. +
    • +
  • + Remember selection with undo and redo. Controlled with SCI_SETUNDOSELECTIONHISTORY. + Feature #1273, + Bug #1479, + Bug #1224. +
    • +
  • + Fix bug on Qt where double-click stopped working when Scintilla instance had been running for weeks. +
    • +

Release 5.5.4

  • - Released 19 October 2024. + Released 18 December 2024.
  • Update to Unicode 15.1. @@ -603,10 +620,18 @@ Feature #1533.
  • + Improve performance of DBCS text. + Feature #1535. +
    • +
  • Fix wrapping removed lines. Bug #2456.
  • + Fix moving line down to empty final line and moving empty final line up. + Bug #2457. +
    • +
  • On GTK, allow middle click to insert multiple times within a document. Geany Issue #2629.
    • diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html index fe0c4e549..1e66df7b2 100644 --- a/scintilla/doc/index.html +++ b/scintilla/doc/index.html @@ -9,7 +9,7 @@ - +