Merge pull request #4985 from hpwamr/Mui_Beta

MUI - Commit before release build "Notepad3 6.23.903.1 rc"
rizonesoft · Sep 3, 2023 · a3eb9f1 · a3eb9f1
2 parents 5f0caed + 6478b17
commit a3eb9f1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 36 deletions.
diff --git a/Build/Changes.txt b/Build/Changes.txt
@@ -34,21 +34,21 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 6.23.830.(build_#) (2023-08-30)
+Current BETA/RC Version 6.23.903.(build_#) (2023-09-03)
 ========================================================
 
 --------------------------------------------------------
 NEW:
 --------------------------------------------------------
 [.###.#]- .
+[.903.1]- Python stream comment hack.
 [.830.1]- "DrawAnimatedWindow": Option to disable animated max./min. window.
 [.827.1]- Add Dark-Mode Contrast control for Schemes configuration.
 [.707.1]- Add new Toolbar button "New Empty Window".
 [.702.1]- Add new "grepWinNP3" icon for Launch and Search menu's.
 [.702.1]- Add new Toolbar button "Reset Zoom".
 [.619.1]- Indentation guide coloring on matching brace highlight.
 [.513.1]- Option on F/R dialog: incremental search ON/OFF.
-[.512.1]- Add an "Additional Notepad3Portable.cmd Launcher".
 [.504.1]- Option: do not save blank new files.
 [.430.1]- Option to show/hide titlebar.
 [.424.1]- Localization in INNO Setup of "Open with Notepad3" (SUP).
@@ -114,7 +114,7 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
-[.718.1]- Show hidden menu bar on Alt or F10 key.
+[.903.1]- Python Line Comment : respect indents.
 [.718.1]- TinyExpr Output formatter.
 [.711.1]- RegEx search with begin/end line meta chars.
 [.710.1]- Recoding for UTF-16.

diff --git a/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini b/np3portableapp/Notepad3Portable/App/AppInfo/installer_template.ini
@@ -31,10 +31,6 @@ RemoveOtherDirectory=true
 ;OptionalSectionInstalledWhenSilent=true
 ;OptionalDirectory1=
 ;OptionalFile1=
-OptionalComponents=true
-OptionalSectionTitle=Additional Notepad3Portable.cmd Launcher
-OptionalSectionDescription=Extracts additional launcher for Notepad3
-OptionalFile1=Notepad3Portable.cmd
 
 [CopyLocalFiles]
 ;CopyLocalFiles=true

diff --git a/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd b/np3portableapp/Notepad3Portable/Other/Source/Notepad3Portable.cmd
diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd
@@ -177,11 +177,6 @@ del /f /q "%NP3_PORTAPP_INFO%_tmp.ini"
 
 :: ---------------------------------------------------------------------------------------------------
 
-:: - Copy "Additional Notepad3Portable.cmd Launcher" to "Notepad3Portable PAF [ROOT]" -
-if exist "%NP3_PORTAPP_DIR%\Other\Source\Notepad3Portable.cmd" (
-copy /B "%NP3_PORTAPP_DIR%\Other\Source\Notepad3Portable.cmd" "%NP3_PORTAPP_DIR%\Notepad3Portable.cmd" /Y /V 
-)
-
 :: --- build Launcher and Installer Package ---
 
 :: - build Launcher -