v0.4.8 release

dail8859 · Feb 28, 2022 · 818c784 · 818c784
2 parents d98494e + 298614e
commit 818c784
Show file tree

Hide file tree

Showing 105 changed files with 1,877 additions and 970 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,34 @@ name: Build Notepad Next
 on: [push, pull_request]
 
 jobs:
-  build:
+  build-linux:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: "5.15.2"
+
+      - name: Compile
+        run: |
+          rm -rf build-linux
+          mkdir build-linux 
+          cd build-linux
+          qmake ../src/NotepadNext.pro
+          make
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: NotepadNext-Linux
+          path: ${{ github.workspace }}/build-linux/NotepadNext/NotepadNext
+
+  build-windows:
     strategy:
       matrix:
         config:
@@ -54,5 +81,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: NotepadNext-Qt${{ matrix.config.qt_version }}
+          name: NotepadNext-Windows-Qt${{ matrix.config.qt_version }}
           path: ${{ github.workspace }}/build/package/
diff --git a/installer/installer.nsi b/installer/installer.nsi
@@ -38,9 +38,14 @@ SetCompressor /SOLID lzma
 !include "NsisMultiUser.nsh"
 !include "NsisMultiUserLang.nsh"
 !include "MUI2.nsh"
+!include "Memento.nsh"
 !include "FileFunc.nsh"
 !include "utils.nsh"
 
+# Configure Memento
+!define MEMENTO_REGISTRY_ROOT SHCTX
+!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\NotepadNext
+
 
 # Install pages
 !define MUI_PAGE_CUSTOMFUNCTION_PRE PageWelcomeLicensePre
@@ -94,6 +99,11 @@ Function .onInit
 	${endif}
 
 	!insertmacro MULTIUSER_INIT
+	${MementoSectionRestore}
+FunctionEnd
+
+Function .onInstSuccess
+	${MementoSectionSave}
 FunctionEnd
 
 Function un.onInit
@@ -127,31 +137,92 @@ Section "Notepad Next"
 	WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\NotepadNext" "EstimatedSize" "$0"
 SectionEnd
 
-Section /o "Desktop Shortcut"
+# -----------------------------------------------
+
+${MementoUnselectedSection} "Desktop Shortcut" SEC_DESKTOP_SHORTCUT
 	CreateShortCut "$DESKTOP\Notepad Next.lnk" "$INSTDIR\NotepadNext.exe"
+${MementoSectionEnd}
+
+Section "-Remove Desktop Shortcut" SEC_REMOVE_DESKTOP_SHORTCUT
+	Delete "$DESKTOP\Notepad Next.lnk"
 SectionEnd
 
-Section /o "Start Menu Shortcut"
+# -----------------------------------------------
+
+${MementoUnselectedSection} "Start Menu Shortcut" SEC_START_MENU_SHORTCUT
 	CreateShortCut "$SMPROGRAMS\Notepad Next.lnk" "$INSTDIR\NotepadNext.exe"
+${MementoSectionEnd}
+
+Section "-Start Menu Shortcut" SEC_REMOVE_START_MENU_SHORTCUT
+	Delete "$SMPROGRAMS\Notepad Next.lnk"
 SectionEnd
 
-Section /o "Context Menu"
+# -----------------------------------------------
+
+${MementoUnselectedSection} "Context Menu" SEC_CONTEXT_MENU
 	SetRegView 64
 
 	WriteRegStr SHCTX "Software\Classes\*\shell\NotepadNext" "" "Edit with Notepad Next"
 	WriteRegStr SHCTX "Software\Classes\*\shell\NotepadNext" "icon" "$INSTDIR\NotepadNext.exe"
 	WriteRegStr SHCTX "Software\Classes\*\shell\NotepadNext\command" "" "$\"$INSTDIR\NotepadNext.exe$\" $\"%1$\""
+${MementoSectionEnd}
+
+Section "-Context Menu" SEC_REMOVE_CONTEXT_MENU
+	SetRegView 64
+
+	DeleteRegKey SHCTX "Software\Classes\*\shell\NotepadNext"
 SectionEnd
 
-Section /o "Auto Updater"
+# -----------------------------------------------
+
+${MementoUnselectedSection} "Auto Updater" SEC_AUTO_UPDATER
 	SetRegView 64
 	SetOutPath $INSTDIR
 
 	File ..\build\package\libcrypto-1_1-x64.dll ..\build\package\libssl-1_1-x64.dll
 
 	WriteRegDWORD SHCTX "Software\NotepadNext\NotepadNext\" "AutoUpdate" 1
+${MementoSectionEnd}
+
+Section "-Auto Updater" SEC_REMOVE_AUTO_UPDATER
+	SetRegView 64
+
+	# Disable the auto update, if there was an existing install the DLLs may hang around but that's fine for now
+	WriteRegDWORD SHCTX "Software\NotepadNext\NotepadNext\" "AutoUpdate" 0
 SectionEnd
 
+# -----------------------------------------------
+
+
+${MementoSectionDone}
+
+
+Function .onSelChange
+${If} ${SectionIsSelected} ${SEC_DESKTOP_SHORTCUT}
+	!insertmacro UnselectSection ${SEC_REMOVE_DESKTOP_SHORTCUT}
+${Else}
+	!insertmacro SelectSection ${SEC_REMOVE_DESKTOP_SHORTCUT}
+${EndIf}
+
+${If} ${SectionIsSelected} ${SEC_START_MENU_SHORTCUT}
+	!insertmacro UnselectSection ${SEC_REMOVE_START_MENU_SHORTCUT}
+${Else}
+	!insertmacro SelectSection ${SEC_REMOVE_START_MENU_SHORTCUT}
+${EndIf}
+
+${If} ${SectionIsSelected} ${SEC_CONTEXT_MENU}
+	!insertmacro UnselectSection ${SEC_REMOVE_CONTEXT_MENU}
+${Else}
+	!insertmacro SelectSection ${SEC_REMOVE_CONTEXT_MENU}
+${EndIf}
+
+${If} ${SectionIsSelected} ${SEC_AUTO_UPDATER}
+	!insertmacro UnselectSection ${SEC_REMOVE_AUTO_UPDATER}
+${Else}
+	!insertmacro SelectSection ${SEC_REMOVE_AUTO_UPDATER}
+${EndIf}
+FunctionEnd
+
 
 Section "Uninstall"
 	SetRegView 64

diff --git a/src/NotepadNext/NotepadNextApplication.cpp b/src/NotepadNext/NotepadNextApplication.cpp
@@ -228,6 +228,9 @@ void NotepadNextApplication::setEditorLanguage(ScintillaNext *editor, const QStr
                     if style.fontStyle & 4 == 4 then
                         editor.StyleUnderline[style.id] = true
                     end
+                    if style.fontStyle & 8 == 8 then
+                        editor.StyleEOLFilled[style.id] = true
+                    end
                 end
             end
         end

diff --git a/src/NotepadNext/dialogs/FindReplaceDialog.cpp b/src/NotepadNext/dialogs/FindReplaceDialog.cpp
@@ -101,15 +101,13 @@ FindReplaceDialog::FindReplaceDialog(QWidget *parent) :
 
     loadSettings();
 
+    connect(qApp, &QApplication::aboutToQuit, this, &FindReplaceDialog::saveSettings);
+
     changeTab(tabBar->currentIndex());
 }
 
 FindReplaceDialog::~FindReplaceDialog()
 {
-    qInfo(Q_FUNC_INFO);
-
-    saveSettings();
-
     delete ui;
 }
 
@@ -425,7 +423,7 @@ void FindReplaceDialog::loadSettings()
     ui->checkBoxBackwardsDirection->setChecked(settings.value("Backwards").toBool());
     ui->checkBoxMatchWholeWord->setChecked(settings.value("WholeWord").toBool());
     ui->checkBoxMatchCase->setChecked(settings.value("MatchCase").toBool());
-    ui->checkBoxWrapAround->setChecked(settings.value("WrapAround").toBool());
+    ui->checkBoxWrapAround->setChecked(settings.value("WrapAround", true).toBool());
 
     if (settings.contains("SearchMode")) {
         const QString searchMode = settings.value("SearchMode").toString();

diff --git a/src/NotepadNext/languages/ini.lua b/src/NotepadNext/languages/ini.lua
@@ -1,6 +1,6 @@
 local L = {}
 
-L.lexer = "ini"
+L.lexer = "props"
 
 L.extensions = {
 	"ini",
@@ -27,7 +27,7 @@ L.styles = {
 		id = 2,
 		fgColor = rgb(0x8000FF),
 		bgColor = rgb(0xF2F4FF),
-		fontStyle = 1,
+		fontStyle = 9,
 	},
 	["ASSIGNMENT"] = {
 		id = 3,

diff --git a/src/Version.pri b/src/Version.pri
@@ -15,5 +15,5 @@
 # along with Notepad Next.  If not, see <https://www.gnu.org/licenses/>.
 
 
-!defined(APP_VERSION, var):APP_VERSION = "0.4.7"
+!defined(APP_VERSION, var):APP_VERSION = "0.4.8"
 APP_COPYRIGHT = "Copyright 2019-2022 Justin Dailey"
diff --git a/src/ads b/src/ads
diff --git a/src/lexilla/.gitattributes b/src/lexilla/.gitattributes
@@ -14,6 +14,7 @@
 **.css text
 **.html text
 **.bat text
+**.bsh text
 **.mak text
 **.def text
 **.manifest text

diff --git a/src/lexilla/doc/Lexilla.html b/src/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20211207" />
+    <meta name="Date.Modified" content="20220209" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.1.4<br />
-           Site last modified December 7 2021</font>
+          <font color="#FFCC99" size="3">Release version 5.1.5<br />
+           Site last modified February 9 2022</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,13 +77,10 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.1.5 improves Bash, Batch, F#, HTML, Inno Setup, and Python.</li>
       <li>Version 5.1.4 adds lexers for AsciiDoc and GDScript.</li>
       <li>Version 5.1.3 improves Rust.</li>
       <li>Version 5.1.2 improves CSS, F#, Inno Setup, Markdown, and PHP.</li>
-      <li>Version 5.1.1 improves C++, Julia, Markdown, Matlab, and PHP.</li>
-      <li>Version 5.1.0 is a stable release: the interfaces between Scintilla and Lexilla and between
-      platform-independent code and platform layers should remain compatible through 5.x releases.
-      Improvements were made for ASP, Erlang, F#, Raku, Ruby, Tcl, and YAML.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

diff --git a/src/lexilla/doc/LexillaDownload.html b/src/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla514.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla515.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla514.tgz">
+	<a href="https://www.scintilla.org/lexilla515.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.4.6
+       Release 5.1.5
     </h3>
     <h4>
        Source Code
     </h4>
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla514.zip">zip format</a> (1.1M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla514.tgz">tgz format</a> (0.8M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla515.zip">zip format</a> (1.1M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla515.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>

diff --git a/src/lexilla/doc/LexillaHistory.html b/src/lexilla/doc/LexillaHistory.html
@@ -574,9 +574,54 @@ <h2>Contributors</h2>
 	<td>Michael Heath</td>
 	<td>Antonio Cebrián</td>
 	<td>David Yu Yang</td>
+	<td>Arkadiusz Michalski</td>
+      </tr><tr>
+	<td>Red_M</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla515.zip">Release 5.1.5</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 February 2022.
+	</li>
+	<li>
+	Bash: Treat \r\n line ends the same as \n. This makes testing easier.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/57">Issue #57</a>.
+	</li>
+	<li>
+	Batch: Recognise "::" comments when second command on line.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2304/">Bug #2304</a>.
+	</li>
+	<li>
+	F#: Recognise format specifiers in interpolated strings and %B for binary.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/46">Issue #46</a>.
+	</li>
+	<li>
+	F#: More accurate line-based folding.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/56">Issue #56</a>.
+	</li>
+	<li>
+	HTML: Fix folding inside script blocks.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/47">Issue #47</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/53">Issue #53</a>.
+	</li>
+	<li>
+	Inno Setup: Fix multiline comments in code.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/44">Issue #44</a>.
+	</li>
+	<li>
+	Python: Add attribute style with properties lexer.python.identifier.attributes and
+	lexer.python.decorator.attributes.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/49">Pull request #49</a>.
+	</li>
+	<li>
+	Allow choice of object file directory with makefile by setting DIR_O.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/50">Issue #50</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla514.zip">Release 5.1.4</a>
     </h3>
@@ -595,7 +640,7 @@ <h3>
 	</li>
 	<li>
 	Fix strings ending in escaped '\' in F#.
-	<a href="https://github.com/ScintillaOrg/lexilla/issues/38">Issue #38</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/38">Issue #38</a>.
 	</li>
 	<li>
 	Better handling of bad terminators and folding for X12.

diff --git a/src/lexilla/include/LexicalStyles.iface b/src/lexilla/include/LexicalStyles.iface
@@ -171,6 +171,7 @@ val SCE_P_FSTRING=16
 val SCE_P_FCHARACTER=17
 val SCE_P_FTRIPLE=18
 val SCE_P_FTRIPLEDOUBLE=19
+val SCE_P_ATTRIBUTE=20
 # Lexical states for SCLEX_CPP
 # Lexical states for SCLEX_BULLANT
 # Lexical states for SCLEX_COBOL

diff --git a/src/lexilla/include/SciLexer.h b/src/lexilla/include/SciLexer.h
@@ -169,6 +169,7 @@
 #define SCE_P_FCHARACTER 17
 #define SCE_P_FTRIPLE 18
 #define SCE_P_FTRIPLEDOUBLE 19
+#define SCE_P_ATTRIBUTE 20
 #define SCE_C_DEFAULT 0
 #define SCE_C_COMMENT 1
 #define SCE_C_COMMENTLINE 2
+14 −4		README.md
+ −		doc/showcase_notepad_next.png
+10 −0		src/DockManager.cpp
+9 −0		src/DockManager.h
+4 −1		src/DockWidget.cpp