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 Packages Projects Releases Wiki Activity

Merge pull request #2136 from RaiKoHoff/NewFeatures

Browse Source 
grepWin integration enhancement
This commit is contained in:
Rainer Kottenhoff 2020-03-19 15:41:08 +01:00 committed by GitHub
commit 12e033ae97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 1640 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Build/Bin/upx.exe
View File

Binary file not shown.

1096
Build/Bin/upx.html
View File

File diff suppressed because it is too large Load Diff

34
Build/Changes.txt
View File

@ -31,34 +31,32 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
Current RC3 Version 5.20.315.(build_#) (2020-03-15)
// Version 5.20.3xx.x (xx March 2020)
Version 5.20.3xx.x (xx March 2020)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
- remove scaling of Toolbar image for DPI (avoid blurry images)
- "Open with Notepad3" Right-Click in Explorer Context Menu.
- Fix DPI scaling of Toolbar bitmaps (avoid slicing by rounding errors).
- "Open with Notepad3" Right-Click in Explorer Context Menu (install/setup version).
- In About Resources: Data Sharing Service from https://workupload.com/.
- Automatic scrolling when dragging text near window edge.
Patch by McLoo from https://sourceforge.net/p/scintilla/feature-requests/497/.
- Multiple selection on end-of-lines from rectangular selection.
- Infos of sreen/display for "Copy Version Info" button.
- Automatic scrolling when dragging selected text near window edge (SCI).
- break rectangular selection into multiple selection on end-of-lines (move caret).
- Infos of sreen/display/dpi for "Copy Version Info" button.
- Preserve stream selection in file history (w/ text position remembering).
- Language dependent status bar abreviations.
- Copy directory to clipboard and Open path in explorer.
- Toggle menu bar option.
- Add Lexicographical Line Sort Order.
- CSV Prism Color Lexer.
- Preserve File Modification Date/Time: Option stays until new Session is loaded.
- Preserve File Modification Date/Time: Option stays until new session is started.
- Save with Original File Date/Time - Ctrl+Alt+F6.
-----------------------------------------------------
CHANGES:
-----------------------------------------------------
- Update "KeyboardShortcuts.txt".
- Split undo typing sequence by line-breaks default -> true
- Split undo typing sequence by line-breaks default -> true.
- Add file history to to recent docs (taskbar) jumplist.
- NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances.
- Reset build-of-the-day number in AppVeyor on new day.
@ -77,7 +75,7 @@ CHANGES:
- Don't Auto-Close blank untitled document, only empty untitled document.
- Encoding detection fallback: if "Load ASCII as UTF-8" is checked use UTF-8 (if valid) else current ANSI code-page.
- Use Ctrl+Shift+L for toggle "Menu: Reuse Window" option.
- Inversion of Accelerator key Ctrl+Alt+L with Ctrl+Shift+L
- Inversion of Accelerator key Ctrl+Alt+L with Ctrl+Shift+L.
- Change wording "Administrator" to "Elevated".
- Hidden "ExitOnESCSkipLevel" feature (Exit on ESC can ignore a selection).
- ESC Key clears active selection (not exiting Notepad3 if configured) (Config: ExitOnESCSkipLevel=2).
@ -91,7 +89,7 @@ CHANGES:
- Option [Settings2] NoCopyLineOnEmptySelection and NoCutLineOnEmptySelection.
- Appearance of INFOBOX4 (MB_YESNOCANCEL).
- Thin rectangular (multi) selection after toggeling line-comment block for multi insertion.
- Full Work Area Mode (F11) -> Full Screen Mode (Maximize window if "full work area" is requested)
- Full Work Area Mode (F11) -> Full Screen Mode (Maximize window if "full work area" is requested).
- Ctrl+Alt+Enter AutoCompletion behaviour.
- Menu and behavior for copy/paste and copy/paste line.
- Allow each modification step to split undo typing sequence (set timeout 0 < to < 20ms).
@ -103,9 +101,9 @@ CHANGES:
ENHANCEMENT:
-----------------------------------------------------
- Load files larger than 2GB (64-bit) - Limit to 4GB (Scintilla problems).
- Method to set document for big files.
- ScintillaWin: IMEJPCancelAction (SCI)
- Win file API locking mechanism to avoid multi process file write race conditions.
- Parameter to set document limit for big files (switch off highlighting).
- ScintillaWin: IMEJPCancelAction (SCI).
- File locking mechanism (.ini-file) to avoid multi process file write race conditions.
- Menu entries for move line and folding control.
- Multi-line Search Find/Replace.
- Apply Start Case to AutoHotkey Lexer.
@ -121,7 +119,7 @@ FIXES:
- Configurable default ANSI code-page (locale) detection bonus.
- No AutoCompletion on empty words (busy loop bug).
- DPI Scaling Toolbar and DPI scaling selection mode.
- Common controls will use preffered/available MUI language
- Common controls will use preffered/available MUI language.
- Sticky window position handling.
- Initial, default and current window position handling.
- Debug assertion (isspace() called on non ASCII char).
@ -131,7 +129,7 @@ FIXES:
- Drag&drop rectangular selection shuffles chars.
- Paint() hangs due to unnecessary LockWindowsUpdate().
- Drag&drop selection should use configured slop settings.
- Internal file-history submitted to taskbar JumpList
- Internal file-history submitted to taskbar JumpList.
- Load files larger than 2GB (64-bit) - Limit to 4GB (Scintilla problems).
- Automatic scrolling when dragging text near window edge: make caret visible after drop.
- No styling for big/large files (loading speedup and UI responsiveness).
@ -161,7 +159,7 @@ FIXES:
- Elevated relaunch after encoding change.
- Sub dialog centering in multi monitor environment.
- Modern style message box icons.
- System MessageBox() for "not saved" warning on modified files
- System MessageBox() for "not saved" warning on modified files.
- Oniguruma RegEx engine: respect EOL mode on encoding type.
- Wrong encoding detection settings for explicit config .ini-File load.
- Disable HyperLink calltip on ESC, as long as caret is in hyperlink text range.

12
Build/Docs/KeyboardShortcuts.txt
View File

@ -8,7 +8,7 @@
================================================================================
*** Keyboard Shortcuts *** date: 2020/03/15
*** Keyboard Shortcuts *** date: 2020/03/18
---------------------------------------------------------
@ -21,13 +21,13 @@
Ctrl+S Save file.
F6 Save file as...
Ctrl+F6 Save file Copy...
Ctrl+Alt+F6 Save with Original file &Date/Time.
Ctrl+Alt+F6 Save with Original file "Date/Time".
Ctrl+P Print file...
Ctrl+M Run MiniPath file Browser plugin...
Ctrl+Alt+H Open Recent file (History)...
Alt+F4 Exit Notepad3.
Esc Cancel current state (AutoCompletion or Selection)
Minimize or Exit Notepad3 (otionally, if no state).
Minimize or Exit Notepad3 (optionally, if no state).
Shift+Esc Save file and Exit Notepad3.
Launch
@ -98,7 +98,7 @@
Ctrl+Shift+D Delete Line.
Ctrl+Shift+Backspace Delete Line Left.
Ctrl+Shift+Del Delete Line Right.
Ctrl+Shift+W Column wrap...
Ctrl+Shift+W Column Wrap...
Ctrl+I Split Lines.
Ctrl+J Join Lines.
Ctrl+Alt+J Fuse Lines.
@ -385,8 +385,8 @@
/b Open new paste board to collect clipboard entries.
/n Always open a new window (/ns single file instance).
/r Reuse window (/rs single file instance).
/p Set window position and size (/p0, /ps, /pf,l,t,r,b,m).
or /p <left>,<top>,<width>,<height>,<max> [all integers]
/p Set window position and size (/p0, /ps, /pf,l,t,r,b,m)
or /p <left>,<top>,<width>,<height>,<max> [all integers].
/t Set window title.
/i Start as tray icon.
/o Keep window on top.

22
Build/License.txt
View File

@ -9,6 +9,7 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=================================================
License for Scintilla and SciTE
=================================================
@ -20,16 +21,27 @@ Permission to use, copy, modify, and distribute this software and its documentat
NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGESWHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
=================================================
License for Onigmo (Oniguruma-mod) RegEx Engine
License for Oniguruma RegEx Engine
=================================================
Copyright (c) 2002-2009 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
Copyright (c) 2011-2014 K.Takata <kentkt AT csc DOT jp>
Copyright (c) 2002-2020 K.Kosako <kkosako0@gmail.com>
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
==========================================================================
License for grepWin (Regular expression search and replace for Windows)
==========================================================================
License: GPL v.3.0 (see grepWin_GPL_v3.0_LICENSE.txt)
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
grepWin is developed by Stefan Küng (https://tools.stefankueng.com/grepWin.html).
Distributed grepWin binaries (currently v1.9.2) and corresponding source code (according to GPL v3.0)
can be retrived at folowing location https://github.com/stefankueng/grepWin/releases/tag/1.9.2.

1
Build/Notepad3.ini
View File

@ -13,6 +13,7 @@ SettingsVersion=4
;DefaultWindowPosition=
;DenyVirtualSpaceAccess=0
;filebrowser.exe=minipath.exe
;grepWin.exe=grepWin.exe
;FileCheckInverval=2000
;FileDlgFilters=
;FileLoadWarningMB=64

629
Build/grepWin/GPL_v3.0_LICENSE.txt Normal file
View File

@ -0,0 +1,629 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
########################################################################################################
grepWin is developed by Stefan Küng (https://tools.stefankueng.com/grepWin.html).
Distributed grepWin binaries (currently v1.9.2) and corresponding source code (according to GPL v3.0)
can be retrived at folowing location https://github.com/stefankueng/grepWin/releases/tag/1.9.2.
########################################################################################################

BIN
Build/grepWin/grepWin-1.9.2_portable.exe Normal file
View File

Binary file not shown.

BIN
Build/grepWin/grepWin-x64-1.9.2_portable.exe Normal file
View File

Binary file not shown.

1
Build/notepad3_setup.iss
View File

@ -196,6 +196,7 @@ Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion
Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion

1
Build/notepad3_x86_setup.iss
View File

@ -152,6 +152,7 @@ Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion
Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion

2
Versions/day.txt
View File

@ -1 +1 @@
316
319

43
language/common_res.h
View File

@ -437,27 +437,28 @@
#define IDM_FILE_OPEN 40001
#define IDM_FILE_REVERT 40002
#define IDM_FILE_BROWSE 40003
#define IDM_FILE_SAVE 40004
#define IDM_FILE_SAVEAS 40005
#define IDM_FILE_SAVECOPY 40006
#define IDM_FILE_READONLY 40007
#define IDM_FILE_LAUNCH 40008
#define IDM_FILE_LAUNCH_ELEVATED 40009
#define IDM_FILE_EXPLORE_DIR 40010
#define IDM_FILE_OPENWITH 40011
#define IDM_FILE_RUN 40012
#define IDM_FILE_NEWWINDOW 40013
#define IDM_FILE_NEWWINDOW2 40014
#define IDM_FILE_PAGESETUP 40015
#define IDM_FILE_PRINT 40016
#define IDM_FILE_PROPERTIES 40017
#define IDM_FILE_CREATELINK 40018
#define IDM_FILE_OPENFAV 40019
#define IDM_FILE_ADDTOFAV 40020
#define IDM_FILE_MANAGEFAV 40021
#define IDM_FILE_RECENT 40022
#define IDM_FILE_EXIT 40023
#define IDM_FILE_PRESERVE_FILEMODTIME 40024
#define IDM_GREP_WIN_SEARCH 40004
#define IDM_FILE_SAVE 40005
#define IDM_FILE_SAVEAS 40006
#define IDM_FILE_SAVECOPY 40007
#define IDM_FILE_READONLY 40008
#define IDM_FILE_LAUNCH 40009
#define IDM_FILE_LAUNCH_ELEVATED 40010
#define IDM_FILE_EXPLORE_DIR 40011
#define IDM_FILE_OPENWITH 40012
#define IDM_FILE_RUN 40013
#define IDM_FILE_NEWWINDOW 40014
#define IDM_FILE_NEWWINDOW2 40015
#define IDM_FILE_PAGESETUP 40016
#define IDM_FILE_PRINT 40017
#define IDM_FILE_PROPERTIES 40018
#define IDM_FILE_CREATELINK 40019
#define IDM_FILE_OPENFAV 40020
#define IDM_FILE_ADDTOFAV 40021
#define IDM_FILE_MANAGEFAV 40022
#define IDM_FILE_RECENT 40023
#define IDM_FILE_EXIT 40024
#define IDM_FILE_PRESERVE_FILEMODTIME 40025
#define IDM_ENCODING_ANSI 40100
#define IDM_ENCODING_UNICODE 40101

6
language/np3_af_za/menu_af_za.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Begin"
BEGIN
MENUITEM "Maak File &Explorer Oop", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nuwe Venster\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "Lê&er Venster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Sjabloon &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Sjabloon &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Maak File &Explorer Oop", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Enkodering"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Hercodeer na &Standaard\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Hercodeer na &Standaard", CMD_RECODEDEFAULT
MENUITEM "Hercodeer na &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Hercodeer na &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Hercodeer na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_af_za/strings_af_za.rc
View File

@ -277,7 +277,8 @@ Opsies:\r\n\
/b\tMaak 'n nuwe plakbord oop om klipbordinskrywings te versamel.\r\n\
/n\tMaak altyd 'n nuwe venster oop (/ns enkele lêer instansie).\r\n\
/r\tHergebruik venster (/rs enkele lêer instansie).\r\n\
/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tStel venster titel.\r\n\
/i\tBegin as tray ikoon.\r\n\
/o\tHou venster bo-op.\r\n\

8
language/np3_be_by/menu_be_by.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Запусціць"
BEGIN
MENUITEM "Адкрыць Права&днік", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "Копі&ю акна\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Пустое акно\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Вэб-шаблон &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Вэб-шаблон &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Адкрыць Права&днік", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "Кадо&ўка"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 з BO&M", IDM_ENCODING_UTF8SIGN
MENUITEM "Я&шчэ...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Пераадкрыць у прадвызначанай ка&доўцы\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Пераадкрыць у прадвызначанай ка&доўцы", CMD_RECODEDEFAULT
MENUITEM "Пераадкрыць у A&NSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Пераадкрыць у &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Пераадкрыць у &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
@ -363,7 +365,7 @@ BEGIN
MENUITEM "Пракручваць за мяжу апошняга радка", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Паказваць &падказку для гіперспасылак", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "P&anels"
POPUP "П&аліцы"
BEGIN
MENUITEM "Паказаць паліцу &меню", IDM_VIEW_MENUBAR
MENUITEM "Паказаць &паліцу прыладаў", IDM_VIEW_TOOLBAR

3
language/np3_be_by/strings_be_by.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e]
/b\tАдкрыць новае акно для збірання змяненняў буфера абмену.\r\n\
/n\tЗаўсёды адкрываць новае акно (/ns адзін экзэмпляр файла).\r\n\
/r\tВыкарыстаць былое акно (/rs адзін экзэмпляр файла).\r\n\
/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tці /p <left>,<top>,<width>,<height>,<max> [цэлыя лікі].\r\n\
/t\tЗадаць назву акна.\r\n\
/i\tЗапусціць значком на паліцы задач.\r\n\
/o\tЗверху іншых вокнаў.\r\n\

6
language/np3_de_de/menu_de_de.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Starte"
BEGIN
MENUITEM "Öffne Datei-&Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "Suche in &Dateien\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Neues Fenster\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Leeres Fenster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Aufruf &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Aufruf &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Öffne Datei-&Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Codierung"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 mit &Signatur", IDM_ENCODING_UTF8SIGN
MENUITEM "&Mehr Codierungen...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recodiere als &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recodiere als &Default", CMD_RECODEDEFAULT
MENUITEM "Recodiere als &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recodiere als &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recodiere als &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_de_de/strings_de_de.rc
View File

@ -277,7 +277,8 @@ Optionen:\r\n\
/b\tÖffne ein neues 'Paste Board' um die Einträge\r\n\tder Zwischenablage zu sammeln.\r\n\
/n\tÖffne immer ein neues Fenster (/ns single file instance).\r\n\
/r\tBenutze geöffnetes Fenster erneut (/rs single file instance).\r\n\
/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\toder /p <links>,<oben>,<breite>,<höhe>,<max> [ganzzahlig].\r\n\
/t\tSetze Fenster-Titel.\r\n\
/i\tStarte als 'Tray-Icon'.\r\n\
/o\tHalte Fenster immer auf oberster Ebene.\r\n\

6
language/np3_en_gb/menu_en_gb.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Launch"
BEGIN
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encoding"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&More...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recode to &Default", CMD_RECODEDEFAULT
MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_en_gb/strings_en_gb.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

6
language/np3_en_us/menu_en_us.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Launch"
BEGIN
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encoding"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&More...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recode to &Default", CMD_RECODEDEFAULT
MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_en_us/strings_en_us.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

6
language/np3_es_es/menu_es_es.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "Lan&zar"
BEGIN
MENUITEM "Abrir &Explorador de archivos", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nueva ventana\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "V&entana vacía\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Plantilla Web &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Plantilla Web &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Abrir &Explorador de archivos", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "C&odificación"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 con &signatura", IDM_ENCODING_UTF8SIGN
MENUITEM "&Más...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recodificar a &Defecto\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recodificar a &Defecto", CMD_RECODEDEFAULT
MENUITEM "Recodificar a &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recodificar a &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recodificar a &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_es_es/strings_es_es.rc
View File

@ -277,7 +277,8 @@ Opciones:\r\n\
/b\tAbre una nueva tabla de pegar para recoger las entradas\r\n\tdel portapapeles.\r\n\
/n\tSiempre abre una nueva ventana (/ns instancia de archivo único).\r\n\
/r\tReutilizar la ventana (/rs instancia de archivo único).\r\n\
/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m).\r\n\
/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\
\to /p <izquierda>,<arriba>,<ancho>,<altura>,<max> [todos enteros].\r\n\
/t\tEstablecer el título de la ventana.\r\n\
/i\tComenzar como un icono de la barra de tareas.\r\n\
/o\tVentana siempre visible.\r\n\

6
language/np3_fr_fr/menu_fr_fr.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Lancer"
BEGIN
MENUITEM "Ouvrir &Explorateur de fichiers", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nouvelle fenêtre\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Fenêtre vide\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web modèle &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web modèle &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Ouvrir &Explorateur de fichiers", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encodage"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 avec &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&Plus...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Réencoder vers &Défaut\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Réencoder vers &Défaut", CMD_RECODEDEFAULT
MENUITEM "Réencoder vers &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Réencoder vers &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Réencoder vers &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOuvrir un nouveau tableau de collage pour collecter les entrées\r\n\tdu presse-papiers.\r\n\
/n\tToujours ouvrir une nouvelle fenêtre (/ns instance\r\n\tde fichier unique).\r\n\
/r\tRéutiliser la fenêtre (/rs instance de fichier unique).\r\n\
/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tou /p <gauche>,<haut>,<largeur>,<hauteur>,<max> [tous entiers].\r\n\
/t\tDéfinir un titre de fenêtre.\r\n\
/i\tDémarrer en tant que icône de barre de tâches.\r\n\
/o\tFenêtre toujours visible.\r\n\

6
language/np3_hu_hu/menu_hu_hu.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "In&dítás"
BEGIN
MENUITEM "Fájl&böngésző megnyitása", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Új ablak\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Üres ablak\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web sablon &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM "Web sablon &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM SEPARATOR
MENUITEM "Fájl&böngésző megnyitása", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Kódolás"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&Továbbiak...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Újrakódolás az ala&pért.-re\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Újrakódolás az ala&pért.-re", CMD_RECODEDEFAULT
MENUITEM "Újrakódolás A&NSI-ra\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Újrakódolás &OEM-re\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Újrakódolás &GB18030-ra\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -277,7 +277,8 @@ Opciók:\r\n\
/b\tÚj dokumentum megnyitása, ahova a vágólap tartalma gyűlik.\r\n\
/n\tMindig nyisson új ablakot (/ns egyetlen fájl példány).\r\n\
/r\tAblak újrahasznosítása (/rs egyetlen fájl példány).\r\n\
/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <bal>,<teteje>,<szélesség>,<magasság>,<max> [mindegyik egész szám].\r\n\
/t\tCímsor szövegének beállítása.\r\n\
/i\tIndítás óra melé kicsinyítve.\r\n\
/o\tAblak mindig felül.\r\n\

6
language/np3_it_it/menu_it_it.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Esegui"
BEGIN
MENUITEM "Apri &Esplora File", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nuova finestra\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Finestra vuota\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Template Web &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Template Web &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Apri &Esplora File", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encoding"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&Altri...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Ricodifica con Encoding di &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Ricodifica con Encoding di &Default", CMD_RECODEDEFAULT
MENUITEM "Ricodifica come &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Ricodifica come &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Ricodifica come &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_it_it/strings_it_it.rc
View File

@ -277,7 +277,8 @@ Opzioni:\r\n\
/b\tApri una nuova Paste Board per collezionare il testo copiato negli Appunti.\r\n\
/n\tApri sempre una nuova finestra (/ns istanza singola).\r\n\
/r\tRiutilizza finestra (/rs istanza singola).\r\n\
/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tImposta titolo della finestra.\r\n\
/i\tAvvia come icona nella Tray.\r\n\
/o\tMantieni finestra in primo piano.\r\n\

14
language/np3_ja_jp/menu_ja_jp.rc
View File

@ -77,19 +77,21 @@ BEGIN
END
POPUP "起動(&L)"
BEGIN
MENUITEM "エクスプローラーを開く(&E)", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "同じファイルを開く(&N)\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "新規ウィンドウ(&E)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
MENUITEM "同じファイルを開く(&N)\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "新規ウィンドウ(&E)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
MENUITEM SEPARATOR
MENUITEM "管理者権限で再起動(&R)", IDM_FILE_LAUNCH_ELEVATED
MENUITEM "管理者権限で再起動(&R)", IDM_FILE_LAUNCH_ELEVATED
MENUITEM SEPARATOR
MENUITEM "開いている文書を実行(&D)\tCtrl+L", IDM_FILE_LAUNCH
MENUITEM "開いている文書を実行(&D)\tCtrl+L", IDM_FILE_LAUNCH
MENUITEM "別のプログラムで開く(&O)...\tAlt+L", IDM_FILE_OPENWITH
MENUITEM "ファイル名を指定して実行(&C)...\tCtrl+R", IDM_FILE_RUN
MENUITEM SEPARATOR
MENUITEM "ウェブ1で開く(&1)\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "ウェブ2で開く(&2)\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "エクスプローラーを開く(&E)", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "文字コード(&E)"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 BOM (&S)", IDM_ENCODING_UTF8SIGN
MENUITEM "その他の文字コードを指定(&M)...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "デフォルトで読み直し(&D)\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "デフォルトで読み直し(&D)", CMD_RECODEDEFAULT
MENUITEM "ANSI で読み直し(&A)\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "OEM で読み直し(&O)\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "GB18030 で読み直し(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030

1
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -278,6 +278,7 @@ Notepad3 \t[/?] [...[文字コード]] [...[改行コード]] [/e] [/g] [/m] [/l
/n\t新しいウィンドウで開く (/ns ファイルは単一のインスタンス)\r\n\
/r\tひとつウインドウを再利用 (/rs 同じく単一のインスタンス\r\n\
/p\tウィンドウの位置とサイズを指定 [/p x,y,sizex,y[,max]] (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers]\r\n\
/t\tタイトルバーの文字列を指定 [/t text]\r\n\
/i\tシステムトレイ内に起動\r\n\
/o\t常に手前に表示\r\n\

6
language/np3_ko_kr/menu_ko_kr.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "실행(&L)"
BEGIN
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "새 창에 열기(&N)\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "빈 창 열기(&E)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "웹 템플릿 1(&1)\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "웹 템플릿 2(&2)\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "인코딩(&E)"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "서명 있는 UTF-8(&S)", IDM_ENCODING_UTF8SIGN
MENUITEM "기타(&M)...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "기본값으로 표시(&F)\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "기본값으로 표시(&F)", CMD_RECODEDEFAULT
MENUITEM "ANSI로 표시(&N)\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "OEM으로 표시(&O)\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "GB18030으로 표시(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[인코딩]] [...[줄 끝 모드]] [/e] [/g] [/m] [/l]\r\n\
/b\t클립보드 항목 수집용 붙여넣기판으로 열기.\r\n\
/n\t항상 새 창 열기 (/ns 단일 파일 인스턴스).\r\n\
/r\t윈도우 다시 사용 (/rs 단일 파일 인스턴스).\r\n\
/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\t윈도우 타이틀 지정.\r\n\
/i\t트레이 아이콘으로 실행.\r\n\
/o\t최상위 창으로.\r\n\

6
language/np3_nl_nl/menu_nl_nl.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Lancering"
BEGIN
MENUITEM "Open bestand &Verkenner", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nieuw venster\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Leeg venster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web sjabloon &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web sjabloon &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open bestand &Verkenner", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encodering"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 met &signatuur", IDM_ENCODING_UTF8SIGN
MENUITEM "&Meer...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Hercoderen naar &Standaard\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Hercoderen naar &Standaard", CMD_RECODEDEFAULT
MENUITEM "Hercoderen naar &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Hercoderen naar &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Hercoderen naar &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -277,7 +277,8 @@ Opties:\r\n\
/b\tOpen nieuw plakbord om de klemborditems te verzamelen.\r\n\
/n\tOpen altijd een nieuw venster (/ns één bestand instantie).\r\n\
/r\tHergebruik venster (/rs één bestand instantie).\r\n\
/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tof /p <links>,<top>,<breedte>,<hoogte>,<max> [alle gehele getallen].\r\n\
/t\tStel de titel van het venster in.\r\n\
/i\tStart als systeemvak icoon.\r\n\
/o\tHoud het venster bovenop.\r\n\

6
language/np3_pl_pl/menu_pl_pl.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Uruchom"
BEGIN
MENUITEM "Otwórz Eksplorator pliku", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nowe okno\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Puste okno\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Szablon Web &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Szablon Web &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Otwórz Eksplorator pliku", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Kodowanie"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 z &sygnaturą", IDM_ENCODING_UTF8SIGN
MENUITEM "&Więcej...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Przekoduj na domyślny\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Przekoduj na domyślny", CMD_RECODEDEFAULT
MENUITEM "Przekoduj na &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Przekoduj na &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Przekoduj na &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

6
language/np3_pt_br/menu_pt_br.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Executar"
BEGIN
MENUITEM "Abri &Gerenciador de Arquivos", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&Nova Janela\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "Janela &Vazia\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Modelo Web &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Modelo Web &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Abri &Gerenciador de Arquivos", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Codificação"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 com &Assinatura", IDM_ENCODING_UTF8SIGN
MENUITEM "&Mais...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recodificar para o &Padrão\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recodificar para o &Padrão", CMD_RECODEDEFAULT
MENUITEM "Recodificar para &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recodificar para &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recodificar para &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_pt_br/strings_pt_br.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

8
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Запустить"
BEGIN
MENUITEM "Открыть Прово&дник", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "Копи&ю окна\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Пустое окно\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Веб-шаблон &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Веб-шаблон &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Открыть Прово&дник", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "Ко&дировка"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 с BO&M", IDM_ENCODING_UTF8SIGN
MENUITEM "Е&щё...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Переоткрыть в ко&дировке по умолчанию\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Переоткрыть в ко&дировке по умолчанию", CMD_RECODEDEFAULT
MENUITEM "Переоткрыть в A&NSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Переоткрыть в &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Переоткрыть в &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
@ -363,7 +365,7 @@ BEGIN
MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Показывать &подсказку для гиперссылок", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "P&anels"
POPUP "Панел&и"
BEGIN
MENUITEM "Показать панель &меню", IDM_VIEW_MENUBAR
MENUITEM "Показать &панель инструментов", IDM_VIEW_TOOLBAR

3
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кодировка]] [...[Окончания строк]] [
/b\tОткрыть новое окно для сбора изменений буфера обмена.\r\n\
/n\tВсегда открывать новое окно (/ns один экземпляр файла).\r\n\
/r\tПереиспользовать окно (/rs один экземпляр файла).\r\n\
/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tили /p <left>,<top>,<width>,<height>,<max> [целые числа].\r\n\
/t\tЗадать заголовок окна.\r\n\
/i\tЗапустить иконкой в области уведомлений.\r\n\
/o\tПоверх других окон.\r\n\

6
language/np3_sk_sk/menu_sk_sk.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Launch"
BEGIN
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encoding"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&More...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recode to &Default", CMD_RECODEDEFAULT
MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_sk_sk/strings_sk_sk.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

12
language/np3_sv_se/menu_sv_se.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "Kör"
BEGIN
MENUITEM "Öppna filutforskaren", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "Nytt fönster\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "Tomt fönster\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Webbmall &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Webbmall &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Öppna filutforskaren", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "Teckenkodning"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 med &signatur", IDM_ENCODING_UTF8SIGN
MENUITEM "Mer...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Omkoda till standardkodning\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Omkoda till standardkodning", CMD_RECODEDEFAULT
MENUITEM "Omkoda till &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Omkoda till &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Omkoda till &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030
@ -363,7 +365,7 @@ BEGIN
MENUITEM "Rulla förbi slutet av filen", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Visa verktygstips för hyperlänk", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "P&anels"
POPUP "Fält"
BEGIN
MENUITEM "Visa menyfält", IDM_VIEW_MENUBAR
MENUITEM "Visa verktygsfält", IDM_VIEW_TOOLBAR
@ -372,7 +374,7 @@ BEGIN
MENUITEM "Ladda tema för verktygsfält...", IDM_VIEW_LOADTHEMETB
MENUITEM "Anpassa verktygsfält...", IDM_VIEW_CUSTOMIZETB
MENUITEM "Växla verktygsfält", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
MENUITEM "Skala verktygsfält enligt DPI", IDM_VIEW_DPISCALETB
END
POPUP "Förstoring"
BEGIN
@ -509,7 +511,7 @@ BEGIN
MENUITEM "Ladda tema för verktygsfält...", IDM_VIEW_LOADTHEMETB
MENUITEM "Anpassa verktygsfält...", IDM_VIEW_CUSTOMIZETB
MENUITEM "Växla verktygsfält", IDM_VIEW_TOGGLETB
MENUITEM "&DPI Scale Toolbar", IDM_VIEW_DPISCALETB
MENUITEM "Skala verktygsfält enligt DPI", IDM_VIEW_DPISCALETB
END
POPUP "+"
BEGIN

3
language/np3_sv_se/strings_sv_se.rc
View File

@ -277,7 +277,8 @@ Tillval:\r\n\
/b\tÖppna urklippsbordet för att samla alla urklipp.\r\n\
/n\tÖppna alltid nytt fönster (/ns enkel filinstans).\r\n\
/r\tÅteranvänd fönster (/rs enkel filinstans).\r\n\
/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\teller /p <vänster>,<topp>,<bredd>,<höjd>,<max> [alla heltal].\r\n\
/t\tAnge fönstertitel.\r\n\
/i\tStarta som ikon i verktygsfältet.\r\n\
/o\tVisa alltid fönstret överst.\r\n\

6
language/np3_tr_tr/menu_tr_tr.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "&Launch"
BEGIN
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "&New Window\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "&Empty Window\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Web Template &1\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "Web Template &2\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "Open File &Explorer", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "&Encoding"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 with &Signature", IDM_ENCODING_UTF8SIGN
MENUITEM "&More...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "Recode to &Default\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "Recode to &Default", CMD_RECODEDEFAULT
MENUITEM "Recode to &ANSI\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "Recode to &OEM\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "Recode to &GB18030\tCtrl+Shift+F10", CMD_RECODEGB18030

3
language/np3_tr_tr/strings_tr_tr.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

8
language/np3_zh_cn/menu_zh_cn.rc
View File

@ -77,7 +77,7 @@ BEGIN
END
POPUP "启动(&L)"
BEGIN
MENUITEM "打开资源管理器(&E)", IDM_FILE_EXPLORE_DIR
MENUITEM "&Search in Files\tCtrl+Alt+F", IDM_GREP_WIN_SEARCH
MENUITEM SEPARATOR
MENUITEM "新窗口(&N)\tAlt+N", IDM_FILE_NEWWINDOW
MENUITEM "空窗口(&E)\tAlt+Shift+N", IDM_FILE_NEWWINDOW2
@ -90,6 +90,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "用超链接模板 1 打开(&1)(&1)\tCtrl+Shift+1", CMD_WEBACTION1
MENUITEM "用超链接模板 2 打开(&2)(&2)\tCtrl+Shift+2", CMD_WEBACTION2
MENUITEM SEPARATOR
MENUITEM "打开资源管理器(&E)", IDM_FILE_EXPLORE_DIR
END
MENUITEM SEPARATOR
POPUP "编码(&E)"
@ -101,7 +103,7 @@ BEGIN
MENUITEM "UTF-8 带签名(&S)", IDM_ENCODING_UTF8SIGN
MENUITEM "更多编码(&M)...\tF9", IDM_ENCODING_SELECT
MENUITEM SEPARATOR
MENUITEM "重新编码为默认(&E)\tCtrl+Alt+F", CMD_RECODEDEFAULT
MENUITEM "重新编码为默认(&E)", CMD_RECODEDEFAULT
MENUITEM "重新编码为 ANSI(&A)\tCtrl+Shift+A", CMD_RECODEANSI
MENUITEM "重新编码为 OEM(&O)\tCtrl+Shift+O", CMD_RECODEOEM
MENUITEM "重新编码为 GB18030(&G)\tCtrl+Shift+F10", CMD_RECODEGB18030
@ -175,7 +177,7 @@ BEGIN
MENUITEM "复制选区或当前行(&C)\tCtrl+C", IDM_EDIT_COPY
MENUITEM "复制选区所在整行或当前行(&Y)\tCtrl+Shift+C", IDM_EDIT_COPYLINE
MENUITEM SEPARATOR
MENUITEM "复写上一行/选区(&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
MENUITEM "复写当前行/选区(&D)\tCtrl+D", IDM_EDIT_DUPLINEORSELECTION
MENUITEM "与上一行调换(&T)\tAlt+D", IDM_EDIT_LINETRANSPOSE
MENUITEM "删除行(&E)\tCtrl+Shift+D", IDM_EDIT_DELETELINE
MENUITEM SEPARATOR

5
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[编码]] [...[换行符模式]] [/e] [/g] [/m] [/l]\r\n\
/b\t打开剪贴板收集窗口（自动粘贴加入到剪贴板中的内容）。\r\n\
/n\t总是打开新窗口（/ns 对于每个文件只允许打开一个实例）。\r\n\
/r\t重用已存在的窗口（/rs 对于每个文件只允许打开一个实例）。\r\n\
/p\t设置窗口位置和大小（/p0, /ps, /pf,l,t,r,b,m）。\r\n\
/p\t设置窗口位置和大小（/p0, /ps, /pf,左,上,宽,高,最大化）\r\n\
\t或 /p <左>,<上>,<宽>,<高>,<最大化> ［均为整数］。\r\n\
/t\t设置窗口标题。\r\n\
/i\t以托盘图标状态启动。\r\n\
/o\t窗口置顶。\r\n\
@ -285,7 +286,7 @@ Notepad3 \t[/?] [...[编码]] [...[换行符模式]] [/e] [/g] [/m] [/l]\r\n\
/u\t以管理员权限启动。\r\n\
/v\t打印文件并退出。\r\n\
/vd\t打印文件（打开打印机对话框）。\r\n\
/y\tSearch environment PATH in case of relative filename.\r\n\
/y\t在环境变量 PATH 中查找相对路径。\r\n\
/z\t忽略下一个参数（当通过注册表替换系统记事本时这可能有用）。\r\n\r\n\
示例：\r\n\
Notepad3 /utf8sig /crlf d:\\temp\\Test.txt\r\n\

2
np3portableapp/_buildname.txt
View File

@ -1 +1 @@
"RC3"
"NF"

11
np3portableapp/build_np3portableapp.cmd
View File

@ -44,7 +44,7 @@ set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\Portabl
set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe
call :RESOLVEPATH NP3_DISTRIB_DIR %SCRIPT_DIR%..\Build
call :RESOLVEPATH NP3_DOC_DIR %SCRIPT_DIR%..\Build\doc
call :RESOLVEPATH NP3_DOC_DIR %SCRIPT_DIR%..\Build\Docs
::call :RESOLVEPATH NP3_THEMES_DIR %SCRIPT_DIR%..\themes
call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\themes
::call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v141
@ -52,6 +52,8 @@ call :RESOLVEPATH NP3_BUILD_SCHEMES_DIR %SCRIPT_DIR%..\Build\themes
call :RESOLVEPATH NP3_WIN32_DIR %SCRIPT_DIR%..\Bin\Release_x86_v142
call :RESOLVEPATH NP3_X64_DIR %SCRIPT_DIR%..\Bin\Release_x64_v142
call :RESOLVEPATH NP3_GREPWIN_DIR %SCRIPT_DIR%..\Build\grepWin
call :RESOLVEPATH NP3_PORTAPP_DIR %SCRIPT_DIR%Notepad3Portable
call :RESOLVEPATH NP3_PORTAPP_INFO %NP3_PORTAPP_DIR%\App\AppInfo\appinfo
call :RESOLVEPATH NP3_PORTAPP_INSTALL %NP3_PORTAPP_DIR%\App\AppInfo\installer
@ -59,6 +61,7 @@ call :RESOLVEPATH NP3_PORTAPP_INSTALL %NP3_PORTAPP_DIR%\App\AppInfo\installer
call :RESOLVEPATH NP3_BUILD_VER %SCRIPT_DIR%..\Versions\build.txt
call :RESOLVEPATH NP3_BUILD_NAME %SCRIPT_DIR%_buildname.txt
:: --------------------------------------------------------------------------------------------------------------------
set YY=00
@ -94,6 +97,7 @@ copy "%NP3_DISTRIB_DIR%\License.txt" "%NP3_PORTAPP_DIR%\Other\Help\License.txt"
copy "%NP3_DISTRIB_DIR%\Readme.txt" "%NP3_PORTAPP_DIR%\Other\Help\Readme.txt" /Y /V
copy "%NP3_DOC_DIR%\Notepad3.txt" "%NP3_PORTAPP_DIR%\Other\Help\Notepad3.txt" /Y /V
copy "%NP3_DOC_DIR%\KeyboardShortcuts.txt" "%NP3_PORTAPP_DIR%\Other\Help\KeyboardShortcuts.txt" /Y /V
copy "%NP3_DOC_DIR%\Oniguruma_RE.txt" "%NP3_PORTAPP_DIR%\Other\Help\Oniguruma_RE.txt" /Y /V
copy "%NP3_DOC_DIR%\crypto\encryption-doc.txt" "%NP3_PORTAPP_DIR%\Other\Help\encryption-doc.txt" /Y /V
@ -147,6 +151,11 @@ copy /B "%NP3_X64_DIR%\minipath.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y
::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\client.wyc" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
::copy /B "%NP3_DISTRIB_DIR%\Update\wyUpdate\64\wyUpdate.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\" /Y /V
copy "%NP3_GREPWIN_DIR%\GPL_v3.0_LICENSE.txt" "%NP3_PORTAPP_DIR%\Other\Help\grepWin_GPL_v3.0_LICENSE.txt" /Y /V
copy /B "%NP3_GREPWIN_DIR%\grepWin-1.9.2_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x86\grepWin.exe" /Y /V
copy /B "%NP3_GREPWIN_DIR%\grepWin-x64-1.9.2_portable.exe" /B "%NP3_PORTAPP_DIR%\App\Notepad3\x64\grepWin.exe" /Y /V
:: --------------------------------------------------------------------------------------------------------------------
call :REPLACE "xxxVERSIONxxx" "%NP3_PORTAPP_INFO%_template.ini" "%VERSION%" "%NP3_PORTAPP_INFO%_tmp.ini"

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

@ -3,8 +3,8 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.316.1"
version="5.20.319.1"
type="win32"
/>
<description>Notepad3 RC3</description>
<description>Notepad3 NF</description>
</assembly>

15
src/Config/Config.cpp
View File

@ -59,9 +59,9 @@ extern "C" THEMEFILES Theme_Files[];
// ============================================================================
static bool const s_bIsUTF8 = true;
static bool const s_bWriteSIG = true; // BOM
static bool const s_bWriteSIG = true; // IniFileSetXXX()
static bool const s_bUseMultiKey = false;
static bool const s_bUseMultiLine = true; // find/repl with line breaks
static bool const s_bUseMultiLine = true; // find/replace with line breaks
static bool const s_bSetSpaces = false;
// ----------------------------------------------------------------------------
@ -86,7 +86,7 @@ constexpr bool SI_Success(const SI_Error rc) noexcept {
// ----------------------------------------------------------------------------
// No mechanism for EXCLUSIVE WRITE / SHARD READ:
// cause we need completely synchronized exclusive access for READ _and_ WRITE
// of complete file to preserve integrety of any transaction
// of complete file to preserve integrity of any transaction
// ----------------------------------------------------------------------------
HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
@ -170,11 +170,11 @@ extern "C" void ReleaseIniFile()
}
extern "C" bool SaveIniFile()
extern "C" bool SaveIniFile(bool bAddSignature)
{
s_INI.SetSpaces(s_bSetSpaces);
s_INI.SetMultiLine(s_bUseMultiLine);
SI_Error const rc = s_INI.SaveFile(s_INI_Hndl, s_bWriteSIG);
SI_Error const rc = s_INI.SaveFile(s_INI_Hndl, bAddSignature);
ReleaseIniFile();
return SI_Success(rc);
}
@ -1059,6 +1059,9 @@ void LoadSettings()
Defaults2.FileBrowserPath[0] = L'\0';
IniSectionGetString(IniSecSettings2, L"filebrowser.exe", Defaults2.FileBrowserPath, Settings2.FileBrowserPath, COUNTOF(Settings2.FileBrowserPath));
Defaults2.GrepWinPath[0] = L'\0';
IniSectionGetString(IniSecSettings2, L"grepWin.exe", Defaults2.GrepWinPath, Settings2.GrepWinPath, COUNTOF(Settings2.GrepWinPath));
StringCchCopyW(Defaults2.AppUserModelID, COUNTOF(Defaults2.AppUserModelID), _W("Rizonesoft." SAPPNAME));
if (StrIsEmpty(Settings2.AppUserModelID)) { // set via CmdLine ?
IniSectionGetString(IniSecSettings2, L"ShellAppUserModelID", Defaults2.AppUserModelID, Settings2.AppUserModelID, COUNTOF(Settings2.AppUserModelID));
@ -1895,7 +1898,7 @@ bool CloseSettingsFile(bool bSaveChanges)
{
if (!IsIniFileLoaded() || StrIsEmpty(Globals.IniFile)) { return false; }
bool const ok = bSaveChanges ? SaveIniFile() : true;
bool const ok = bSaveChanges ? SaveIniFile(true) : true;
if (ok) {
Globals.bIniFileFromScratch = false;

2
src/Config/Config.h
View File

@ -40,7 +40,7 @@ bool CloseSettingsFile(bool bSaveChanges);
bool LoadIniFile(LPCWSTR lpIniFilePath, bool bNeedReadWriteAccess);
bool IsIniFileLoaded();
void ReleaseIniFile();
bool SaveIniFile();
bool SaveIniFile(bool bAddSignature);
size_t IniSectionGetString(LPCWSTR lpSectionName, LPCWSTR lpKeyName, LPCWSTR lpDefault,

138
src/Dialogs.c
View File

@ -3386,21 +3386,20 @@ void DialogNewWindow(HWND hwnd, bool bSaveOnRunTools, LPCWSTR lpcwFilePath)
//
void DialogFileBrowse(HWND hwnd)
{
WCHAR tchParam[MAX_PATH] = L"";
WCHAR tchExeFile[MAX_PATH] = L"";
WCHAR tchTemp[MAX_PATH];
WCHAR tchTemp[MAX_PATH] = { L'\0' };
WCHAR tchParam[MAX_PATH] = { L'\0' };
WCHAR tchExeFile[MAX_PATH] = { L'\0' };
StringCchCopyW(tchTemp, COUNTOF(tchTemp), Settings2.FileBrowserPath);
if (StrIsNotEmpty(Settings2.FileBrowserPath))
{
ExtractFirstArgument(tchTemp, tchExeFile, tchParam, COUNTOF(tchTemp));
if (StrIsNotEmpty(Settings2.FileBrowserPath)) {
ExtractFirstArgument(Settings2.FileBrowserPath, tchExeFile, tchParam, COUNTOF(tchExeFile));
ExpandEnvironmentStringsEx(tchExeFile, COUNTOF(tchExeFile));
}
if (StrIsEmpty(tchExeFile)) {
StringCchCopy(tchExeFile, COUNTOF(tchExeFile), Constants.FileBrowserMiniPath);
}
if (PathIsRelative(tchExeFile)) {
GetModuleFileName(NULL, tchTemp, COUNTOF(tchTemp));
NormalizePathEx(tchTemp, COUNTOF(tchTemp), true, false);
PathCchRemoveFileSpec(tchTemp, COUNTOF(tchTemp));
PathAppend(tchTemp, tchExeFile);
if (PathFileExists(tchTemp)) {
@ -3434,12 +3433,133 @@ void DialogFileBrowse(HWND hwnd)
}
typedef struct _grepwin_ini
{
const WCHAR* const key;
const int val;
}
grepWin_t;
static grepWin_t grepWinIniSettings[13] =
{
{ L"onlyone", 1 },
{ L"AllSize", 1 },
{ L"Size", 2000 },
{ L"CaseSensitive", 0 },
{ L"CreateBackup", 1 },
{ L"DateLimit", 0 },
{ L"IncludeBinary", 0 },
{ L"IncludeHidden", 1 },
{ L"IncludeSubfolders", 1 },
{ L"IncludeSystem", 1 },
{ L"UseFileMatchRegex", 0 },
{ L"UseRegex", 1 },
{ L"UTF8", 1 }
};
//=============================================================================
//
// DialogGrepWin()
//
//
void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
{
WCHAR tchTemp[MAX_PATH] = { L'\0' };
WCHAR tchModulePath[MAX_PATH] = { L'\0' };
WCHAR tchExeFile[MAX_PATH] = { L'\0' };
WCHAR tchOptions[MAX_PATH] = { L'\0' };
WCHAR tchParams[MAX_PATH * 2] = { L'\0' };
WCHAR tchGrepWinDir[MAX_PATH] = { L'\0' };
WCHAR tchIniFilePath[MAX_PATH] = { L'\0' };
const WCHAR* const tchParamFmt = L"/portable /content %s /searchpath:\"%s\" /searchfor:\"%s\"";
GetModuleFileName(NULL, tchModulePath, COUNTOF(tchModulePath));
NormalizePathEx(tchModulePath, COUNTOF(tchModulePath), true, false);
// grepWin executable
if (StrIsNotEmpty(Settings2.GrepWinPath)) {
ExtractFirstArgument(Settings2.GrepWinPath, tchExeFile, tchOptions, COUNTOF(tchExeFile));
ExpandEnvironmentStringsEx(tchExeFile, COUNTOF(tchExeFile));
}
if (StrIsEmpty(tchExeFile)) {
StringCchCopy(tchExeFile, COUNTOF(tchExeFile), Constants.FileSearchGrepWin);
}
if (PathIsRelative(tchExeFile)) {
StringCchCopy(tchTemp, COUNTOF(tchTemp), tchModulePath);
PathCchRemoveFileSpec(tchTemp, COUNTOF(tchTemp));
PathAppend(tchTemp, tchExeFile);
if (PathFileExists(tchTemp)) {
StringCchCopy(tchExeFile, COUNTOF(tchExeFile), tchTemp);
}
}
// working (grepwin.ini) directory
if (PathFileExists(tchExeFile)) {
StringCchCopy(tchGrepWinDir, COUNTOF(tchGrepWinDir), tchExeFile);
PathCchRemoveFileSpec(tchGrepWinDir, COUNTOF(tchGrepWinDir));
// relative Notepad3 path (for grepWin's EditorCmd)
PathRelativePathTo(tchModulePath, tchGrepWinDir, FILE_ATTRIBUTE_DIRECTORY, tchModulePath, FILE_ATTRIBUTE_NORMAL);
// grepWin INI-File
StringCchCopy(tchIniFilePath, COUNTOF(tchIniFilePath), tchGrepWinDir);
PathAppend(tchIniFilePath, L"grepwin.ini");
if (LoadIniFile(tchIniFilePath, true)) {
// preserve [global] user settings from last call
const WCHAR* const section = L"global";
for (int i = 0; i < COUNTOF(grepWinIniSettings); ++i) {
int const iVal = IniSectionGetInt(section, grepWinIniSettings[i].key, grepWinIniSettings[i].val);
IniSectionSetInt(section, grepWinIniSettings[i].key, iVal);
}
//~StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% /m %s - %%path%%", tchModulePath, searchPattern);
StringCchPrintf(tchTemp, COUNTOF(tchTemp), L"%s /g %%line%% - %%path%%", tchModulePath);
IniSectionSetString(L"global", L"editorcmd", tchTemp);
// [settings]
int const iEscClose = IniSectionSetInt(L"settings", L"escclose", (Settings.EscFunction == 2) ? 1 : 0);
IniSectionSetInt(L"settings", L"escclose", iEscClose);
int const iBackupFolder = IniSectionSetInt(L"settings", L"backupinfolder", 1);
IniSectionSetInt(L"settings", L"backupinfolder", iBackupFolder);
SaveIniFile(false);
}
}
// search directory
StringCchCopy(tchTemp, COUNTOF(tchTemp), Globals.CurrentFile);
if (StrIsNotEmpty(tchTemp)) {
PathCchRemoveFileSpec(tchTemp, COUNTOF(tchTemp));
}
// grepWin arguments
StringCchPrintf(tchParams, COUNTOF(tchParams), tchParamFmt, tchOptions, tchTemp, searchPattern);
//if (StrIsNotEmpty(searchPattern)) {
// SetClipboardTextW(hwnd, searchPattern, StringCchLen(searchPattern, 0));
//}
SHELLEXECUTEINFO sei;
ZeroMemory(&sei, sizeof(SHELLEXECUTEINFO));
sei.cbSize = sizeof(SHELLEXECUTEINFO);
sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_NOZONECHECKS;
sei.hwnd = hwnd;
sei.lpVerb = NULL;
sei.lpFile = tchExeFile;
sei.lpParameters = tchParams;
sei.lpDirectory = tchGrepWinDir;
sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei);
if ((INT_PTR)sei.hInstApp < 32) {
InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_BROWSE);
}
}
//=============================================================================
//
// DialogAdminExe()
//
//
void DialogAdminExe(HWND hwnd, bool bExecInstaller)
{
WCHAR tchExe[MAX_PATH];

1
src/Dialogs.h
View File

@ -48,6 +48,7 @@ WINDOWPLACEMENT WindowPlacementFromInfo(HWND hwnd, const WININFO* pWinInfo, SCRE
void DialogNewWindow(HWND hwnd, bool bSaveOnRunTools, LPCWSTR lpcwFilePath);
void DialogFileBrowse(HWND hwnd);
void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern);
void DialogAdminExe(HWND hwnd,bool);
int MessageBoxLng(HWND hwnd, UINT uType, UINT uIdMsg, ...);

89
src/Edit.c
View File

@ -489,6 +489,30 @@ bool EditIsRecodingNeeded(WCHAR* pszText, int cchLen)
}
//=============================================================================
//
// EditGetSelectedText()
//
size_t EditGetSelectedText(LPWSTR pwchBuffer, size_t wchLength)
{
char* pszText = NULL;
size_t const selSize = SciCall_GetSelText(NULL);
if (selSize > 0) {
pszText = AllocMem(selSize, HEAP_ZERO_MEMORY);
if (pszText) {
SciCall_GetSelText(pszText);
size_t const length = (size_t)MultiByteToWideCharEx(Encoding_SciCP, 0, pszText, -1, pwchBuffer, wchLength);
FreeMem(pszText);
return length;
}
return 0;
}
return 0;
}
//=============================================================================
//
// EditGetClipboardText()
@ -1542,7 +1566,7 @@ bool EditSaveFile(
void EditInvertCase(HWND hwnd)
{
UNUSED(hwnd);
const DocPos iCurPos = SciCall_GetCurrentPos();
const DocPos iCurPos = SciCall_GetCurrentPos();
const DocPos iAnchorPos = SciCall_GetAnchor();
if (iCurPos != iAnchorPos)
@ -1556,16 +1580,13 @@ void EditInvertCase(HWND hwnd)
const DocPos iSelEnd = SciCall_GetSelectionEnd();
const DocPos iSelSize = SciCall_GetSelText(NULL);
LPSTR pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
LPWSTR pszTextW = AllocMem(iSelSize * sizeof(WCHAR), HEAP_ZERO_MEMORY);
if (pszText && pszTextW) {
SciCall_GetSelText(pszText);
if (pszTextW) {
ptrdiff_t const cchTextW = MultiByteToWideCharEx(Encoding_SciCP, 0, pszText, (iSelSize - 1), pszTextW, iSelSize);
size_t const cchTextW = EditGetSelectedText(pszTextW, iSelSize);
bool bChanged = false;
for (int i = 0; i < cchTextW; i++) {
for (size_t i = 0; i < cchTextW; i++) {
if (IsCharUpperW(pszTextW[i])) {
pszTextW[i] = LOWORD(CharLowerW((LPWSTR)(LONG_PTR)MAKELONG(pszTextW[i], 0)));
bChanged = true;
@ -1577,17 +1598,18 @@ void EditInvertCase(HWND hwnd)
}
if (bChanged) {
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, iSelSize, NULL, NULL);
_BEGIN_UNDO_ACTION_;
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, SizeOfMem(pszText), NULL, NULL);
SciCall_Clear();
SciCall_AddText((iSelEnd - iSelStart), pszText);
SciCall_SetSel(iAnchorPos, iCurPos);
_END_UNDO_ACTION_;
FreeMem(pszText);
}
}
FreeMem(pszText);
FreeMem(pszTextW);
}
}
}
@ -1611,17 +1633,14 @@ void EditTitleCase(HWND hwnd)
const DocPos iSelEnd = SciCall_GetSelectionEnd();
const DocPos iSelSize = SciCall_GetSelText(NULL);
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
LPWSTR pszTextW = AllocMem((iSelSize * sizeof(WCHAR)), HEAP_ZERO_MEMORY);
if (pszText == NULL || pszTextW == NULL) {
FreeMem(pszText);
if (pszTextW == NULL) {
FreeMem(pszTextW);
return;
}
SciCall_GetSelText(pszText);
ptrdiff_t const cchTextW = MultiByteToWideCharEx(Encoding_SciCP, 0, pszText, (iSelSize - 1), pszTextW, iSelSize);
size_t const cchTextW = EditGetSelectedText(pszTextW, iSelSize);
bool bChanged = false;
LPWSTR pszMappedW = AllocMem(SizeOfMem(pszTextW), HEAP_ZERO_MEMORY);
@ -1637,14 +1656,15 @@ void EditTitleCase(HWND hwnd)
}
if (bChanged) {
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, SizeOfMem(pszText), NULL, NULL);
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, iSelSize, NULL, NULL);
_BEGIN_UNDO_ACTION_;
SciCall_Clear();
SciCall_AddText((iSelEnd - iSelStart), pszText);
SciCall_SetSel(iAnchorPos, iCurPos);
_END_UNDO_ACTION_;
FreeMem(pszText);
}
FreeMem(pszText);
FreeMem(pszTextW);
}
}
@ -1669,21 +1689,18 @@ void EditSentenceCase(HWND hwnd)
const DocPos iSelEnd = SciCall_GetSelectionEnd();
const DocPos iSelSize = SciCall_GetSelText(NULL);
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
LPWSTR pszTextW = AllocMem((iSelSize * sizeof(WCHAR)), HEAP_ZERO_MEMORY);
if (pszText == NULL || pszTextW == NULL) {
FreeMem(pszText);
if (pszTextW == NULL) {
FreeMem(pszTextW);
return;
}
SciCall_GetSelText(pszText);
ptrdiff_t const cchTextW = MultiByteToWideCharEx(Encoding_SciCP, 0, pszText, (iSelSize - 1), pszTextW, iSelSize);
size_t const cchTextW = EditGetSelectedText(pszTextW, iSelSize);
bool bChanged = false;
bool bNewSentence = true;
for (int i = 0; i < cchTextW; i++) {
for (size_t i = 0; i < cchTextW; i++) {
if (StrChr(L".;!?\r\n", pszTextW[i])) {
bNewSentence = true;
}
@ -1707,15 +1724,15 @@ void EditSentenceCase(HWND hwnd)
}
if (bChanged) {
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, iSelSize, NULL, NULL);
_BEGIN_UNDO_ACTION_;
WideCharToMultiByteEx(Encoding_SciCP, 0, pszTextW, cchTextW, pszText, SizeOfMem(pszText), NULL, NULL);
SciCall_Clear();
SciCall_AddText((iSelEnd - iSelStart), pszText);
SciCall_SetSel(iAnchorPos, iCurPos);
_END_UNDO_ACTION_;
FreeMem(pszText);
}
FreeMem(pszText);
FreeMem(pszTextW);
}
}
@ -4817,8 +4834,7 @@ void EditEnsureSelectionVisible()
SciCall_EnsureVisible(iAnchorLine);
if (iAnchorLine != iCurrentLine) { SciCall_EnsureVisible(iCurrentLine); }
//SciCall_ScrollCaret();
Sci_ScrollToLine(iCurrentLine);
Sci_ScrollToLine(iCurrentLine, true);
}
@ -4845,7 +4861,7 @@ void EditJumpTo(HWND hwnd, DocLn iNewLine, DocPos iNewCol)
const DocPos iNewPos = SciCall_FindColumn(iNewLine, iNewCol);
SciCall_GotoPos(iNewPos);
Sci_ScrollToLine(iNewLine);
Sci_ScrollToLine(iNewLine, true);
// remember x-pos for moving caret vertically
SciCall_ChooseCaretX();
@ -6620,15 +6636,8 @@ void EditSelectionMultiSelectAll()
{
DocPos const iSelSize = SciCall_GetSelText(NULL);
if ((iSelSize > 1))
if (iSelSize > 1)
{
char* pszText = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
if (NULL == pszText) {
FreeMem(pszText);
return;
}
SciCall_GetSelText(pszText);
int const searchFlags = IsMarkOccurrencesEnabled() ? GetMarkAllOccSearchFlags() :
EditAddSearchFlags(0, false, false, true, false, false);
@ -6662,8 +6671,6 @@ void EditSelectionMultiSelectAll()
SciCall_ChooseCaretX();
SciCall_SetTargetRange(saveTargetBeg, saveTargetEnd); //restore
FreeMem(pszText);
}
}
@ -6976,11 +6983,11 @@ void EditToggleView(HWND hwnd)
EditHideNotMarkedLineRange(hwnd, FocusedView.HideNonMatchedLines);
if (FocusedView.HideNonMatchedLines) {
Sci_ScrollToLine(0);
Sci_ScrollToLine(0, false);
SciCall_SetReadOnly(true);
}
else {
Sci_ScrollToLine(Sci_GetCurrentLineNumber());
Sci_ScrollToLine(Sci_GetCurrentLineNumber(), true);
SciCall_SetReadOnly(false);
}

1
src/Edit.h
View File

@ -28,6 +28,7 @@ void EditSetNewText(HWND hwnd,const char* lpstrText, DocPosU lenText,bool);
bool EditConvertText(HWND hwnd, cpi_enc_t encSource, cpi_enc_t encDest,bool);
bool EditSetNewEncoding(HWND hwnd, cpi_enc_t iNewEncoding,bool);
bool EditIsRecodingNeeded(WCHAR* pszText,int cchLen);
size_t EditGetSelectedText(LPWSTR pwchBuffer, size_t wchLength);
char* EditGetClipboardText(HWND hwnd,bool,int* pLineCount,int* pLenLastLn);
void EditGetClipboardW(LPWSTR pwchBuffer, size_t wchLength);
bool EditSetClipboardText(HWND hwnd, const char* pszText, size_t cchText);

164
src/Notepad3.c
View File

@ -56,6 +56,7 @@
CONSTANTS_T const Constants = {
2 // StdDefaultLexerID
, L"minipath.exe" // FileBrowserMiniPath
, L"grepWin.exe" // FileSearchGrepWin
, L"ThemeFileName" // StylingThemeName
, L"Settings" // Inifile Section "Settings"
@ -778,6 +779,11 @@ static void _CleanUpResources(const HWND hwnd, bool bIsInitialized)
OleUninitialize();
if (s_lpMatchArg) {
LocalFree(s_lpMatchArg); // StrDup()
s_lpMatchArg = NULL;
}
if (s_lpOrigFileArg) {
FreeMem(s_lpOrigFileArg);
s_lpOrigFileArg = NULL;
@ -1364,8 +1370,6 @@ HWND InitInstance(HINSTANCE hInstance,LPCWSTR pszCmdLine,int nCmdShow)
EditEnsureSelectionVisible();
}
}
LocalFree(s_lpMatchArg); // StrDup()
s_lpMatchArg = NULL;
}
// Check for Paste Board option -- after loading files
@ -2806,6 +2810,30 @@ LRESULT MsgCopyData(HWND hwnd, WPARAM wParam, LPARAM lParam)
EditJumpTo(Globals.hwndEdit, params->iInitialLine, params->iInitialColumn);
}
if (params->flagMatchText) {
s_flagMatchText = params->flagMatchText;
if (s_lpMatchArg) { LocalFree(s_lpMatchArg); } // StrDup()
s_lpMatchArg = StrDup(StrEnd(&params->wchData, 0) + 1);
WideCharToMultiByteEx(Encoding_SciCP, 0, s_lpMatchArg, -1, Settings.EFR_Data.szFind, COUNTOF(Settings.EFR_Data.szFind), NULL, NULL);
if (s_flagMatchText & 4)
Settings.EFR_Data.fuFlags |= (SCFIND_REGEXP | SCFIND_POSIX);
else if (s_flagMatchText & 8)
Settings.EFR_Data.bTransformBS = true;
if (s_flagMatchText & 2) {
if (!s_flagJumpTo) { SciCall_DocumentEnd(); }
EditFindPrev(Globals.hwndEdit, &Settings.EFR_Data, false, false);
EditEnsureSelectionVisible();
}
else {
if (!s_flagJumpTo) { SciCall_DocumentStart(); }
EditFindNext(Globals.hwndEdit, &Settings.EFR_Data, false, false);
EditEnsureSelectionVisible();
}
}
s_flagLexerSpecified = false;
s_flagQuietCreate = false;
@ -2912,7 +2940,7 @@ LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
if (FileWatching.MonitoringLog)
{
SciCall_SetReadOnly(FileWatching.MonitoringLog);
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
else {
SciCall_GotoPos(iCurPos);
@ -3587,6 +3615,15 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
break;
case IDM_GREP_WIN_SEARCH:
{
WCHAR wchBuffer[SMALL_BUFFER] = { L'\0' };
EditGetSelectedText(wchBuffer, COUNTOF(wchBuffer));
DialogGrepWin(hwnd, wchBuffer);
}
break;
case IDM_FILE_NEWWINDOW:
case IDM_FILE_NEWWINDOW2:
SaveAllSettings(false);
@ -5233,7 +5270,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = 250UL;
UndoRedoRecordingStop();
SciCall_SetEndAtLastLine(false);
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
else {
s_flagChangeNotify = FileWatching.flagChangeNotify;
@ -5243,7 +5280,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
UndoRedoRecordingStart();
SciCall_SetEndAtLastLine(!Settings.ScrollPastEOF);
Sci_ScrollToLine(Sci_GetCurrentLineNumber());
Sci_ScrollToLine(Sci_GetCurrentLineNumber(), true);
}
InstallFileWatching(Globals.CurrentFile); // force
@ -5891,53 +5928,45 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (StringCchLenW(tchMaxPathBuffer,0) > 0) {
DocPos const cchSelection = SciCall_GetSelText(NULL);
WCHAR wszSelection[HUGE_BUFFER] = { L'\0' };
size_t const cchSelection = EditGetSelectedText(wszSelection, HUGE_BUFFER);
char mszSelection[HUGE_BUFFER] = { '\0' };
if ((1 < cchSelection) && (cchSelection < (DocPos)COUNTOF(mszSelection)))
if (1 < cchSelection)
{
SciCall_GetSelText(mszSelection);
// Check lpszSelection and truncate bad WCHARs
char* lpsz = StrChrA(mszSelection,13);
if (lpsz) *lpsz = '\0';
WCHAR* lpsz = StrChr(wszSelection, L'\r');
if (lpsz) *lpsz = L'\0';
lpsz = StrChrA(mszSelection,10);
if (lpsz) *lpsz = '\0';
lpsz = StrChr(wszSelection, L'\n');
if (lpsz) *lpsz = L'\0';
lpsz = StrChrA(mszSelection,9);
if (lpsz) *lpsz = '\0';
lpsz = StrChr(wszSelection, L'\t');
if (lpsz) *lpsz = L'\0';
if (StringCchLenA(mszSelection,COUNTOF(mszSelection))) {
int cmdsz = (512 + COUNTOF(tchMaxPathBuffer) + MAX_PATH + 32);
LPWSTR lpszCommand = AllocMem(sizeof(WCHAR) * cmdsz, HEAP_ZERO_MEMORY);
StringCchPrintf(lpszCommand, cmdsz, tchMaxPathBuffer, wszSelection);
ExpandEnvironmentStringsEx(lpszCommand, cmdsz);
WCHAR wszSelection[HUGE_BUFFER] = { L'\0' };
MultiByteToWideCharEx(Encoding_SciCP,0,mszSelection,-1,wszSelection, HUGE_BUFFER);
int cmdsz = (512 + COUNTOF(tchMaxPathBuffer) + MAX_PATH + 32);
LPWSTR lpszCommand = AllocMem(sizeof(WCHAR)*cmdsz, HEAP_ZERO_MEMORY);
StringCchPrintf(lpszCommand,cmdsz,tchMaxPathBuffer,wszSelection);
ExpandEnvironmentStringsEx(lpszCommand, cmdsz);
WCHAR wchDirectory[MAX_PATH] = { L'\0' };
if (StrIsNotEmpty(Globals.CurrentFile)) {
StringCchCopy(wchDirectory,COUNTOF(wchDirectory),Globals.CurrentFile);
PathCchRemoveFileSpec(wchDirectory, COUNTOF(wchDirectory));
}
SHELLEXECUTEINFO sei;
ZeroMemory(&sei,sizeof(SHELLEXECUTEINFO));
sei.cbSize = sizeof(SHELLEXECUTEINFO);
sei.fMask = SEE_MASK_NOZONECHECKS;
sei.hwnd = NULL;
sei.lpVerb = NULL;
sei.lpFile = lpszCommand;
sei.lpParameters = NULL;
sei.lpDirectory = wchDirectory;
sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei);
FreeMem(lpszCommand);
WCHAR wchDirectory[MAX_PATH] = { L'\0' };
if (StrIsNotEmpty(Globals.CurrentFile)) {
StringCchCopy(wchDirectory, COUNTOF(wchDirectory), Globals.CurrentFile);
PathCchRemoveFileSpec(wchDirectory, COUNTOF(wchDirectory));
}
SHELLEXECUTEINFO sei;
ZeroMemory(&sei, sizeof(SHELLEXECUTEINFO));
sei.cbSize = sizeof(SHELLEXECUTEINFO);
sei.fMask = SEE_MASK_NOZONECHECKS;
sei.hwnd = NULL;
sei.lpVerb = NULL;
sei.lpFile = lpszCommand;
sei.lpParameters = NULL;
sei.lpDirectory = wchDirectory;
sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei);
FreeMem(lpszCommand);
}
}
}
@ -8263,6 +8292,8 @@ const static WCHAR* FR_Status[] = { L"[>--<]", L"[>>--]", L"[>>-+]", L"[+->]>",
static void _UpdateStatusbarDelayed(bool bForceRedraw)
{
static char chSelectionBuffer[XHUGE_BUFFER];
if (!Settings.ShowStatusbar) { return; }
static sectionTxt_t tchStatusBar[STATUS_SECTOR_COUNT];
@ -8471,16 +8502,12 @@ static void _UpdateStatusbarDelayed(bool bForceRedraw)
if (bIsSelCharCountable)
{
DocPos const iSelSize = SciCall_GetSelText(NULL);
if (iSelSize < 2048) // should be fast !
if (iSelSize < COUNTOF(chSelectionBuffer)) // should be fast !
{
char* selectionBuffer = AllocMem(iSelSize, HEAP_ZERO_MEMORY);
if (selectionBuffer) {
SciCall_GetSelText(selectionBuffer);
//StrDelChrA(chExpression, " \r\n\t\v");
StrDelChrA(selectionBuffer, "\r\n");
s_dExpression = te_interp(selectionBuffer, &s_iExprError);
FreeMem(selectionBuffer);
}
SciCall_GetSelText(chSelectionBuffer);
//StrDelChrA(chExpression, " \r\n\t\v");
StrDelChrA(chSelectionBuffer, "\r\n");
s_dExpression = te_interp(chSelectionBuffer, &s_iExprError);
}
else {
s_iExprError = -1;
@ -9645,7 +9672,7 @@ bool FileRevert(LPCWSTR szFileName, bool bIgnoreCmdLnEnc)
if (FileWatching.FileWatchingMode == FWM_AUTORELOAD) {
if (docView.bIsTail || FileWatching.MonitoringLog) {
bPreserveView = false;
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
}
@ -10201,6 +10228,9 @@ bool ActivatePrevInst()
if (s_lpSchemeArg) {
cb += ((StringCchLen(s_lpSchemeArg, 0) + 1) * sizeof(WCHAR));
}
if (s_lpMatchArg) {
cb += ((StringCchLen(s_lpMatchArg, 0) + 1) * sizeof(WCHAR));
}
LPnp3params params = AllocMem(cb, HEAP_ZERO_MEMORY);
params->flagFileSpecified = false;
params->flagChangeNotify = FWM_DONT_CARE;
@ -10210,8 +10240,9 @@ bool ActivatePrevInst()
StringCchCopy(StrEnd(&params->wchData,0)+1,(StringCchLen(s_lpSchemeArg,0)+1),s_lpSchemeArg);
params->iInitialLexer = -1;
}
else
else {
params->iInitialLexer = s_iInitialLexer;
}
params->flagJumpTo = s_flagJumpTo ? 1 : 0;
params->iInitialLine = s_iInitialLine;
params->iInitialColumn = s_iInitialColumn;
@ -10220,12 +10251,17 @@ bool ActivatePrevInst()
params->flagSetEOLMode = s_flagSetEOLMode;
params->flagTitleExcerpt = 0;
params->flagMatchText = s_flagMatchText;
if (s_lpMatchArg) {
StringCchCopy(StrEnd(&params->wchData, 0) + 1, (StringCchLen(s_lpMatchArg, 0) + 1), s_lpMatchArg);
}
cds.dwData = DATA_NOTEPAD3_PARAMS;
cds.cbData = (DWORD)SizeOfMem(params);
cds.lpData = params;
SendMessage(hwnd,WM_COPYDATA,(WPARAM)NULL,(LPARAM)&cds);
FreeMem(params);
FreeMem(params); params = NULL;
return true;
}
@ -10269,13 +10305,17 @@ bool ActivatePrevInst()
size_t cb = sizeof(np3params);
cb += (StringCchLenW(s_lpFileArg,0) + 1) * sizeof(WCHAR);
if (s_lpSchemeArg)
cb += (StringCchLenW(s_lpSchemeArg,0) + 1) * sizeof(WCHAR);
if (s_lpSchemeArg) {
cb += (StringCchLenW(s_lpSchemeArg, 0) + 1) * sizeof(WCHAR);
}
size_t cchTitleExcerpt = StringCchLenW(s_wchTitleExcerpt,COUNTOF(s_wchTitleExcerpt));
if (cchTitleExcerpt) {
cb += (cchTitleExcerpt + 1) * sizeof(WCHAR);
}
if (s_lpMatchArg) {
cb += ((StringCchLen(s_lpMatchArg, 0) + 1) * sizeof(WCHAR));
}
LPnp3params params = AllocMem(cb, HEAP_ZERO_MEMORY);
params->flagFileSpecified = true;
StringCchCopy(&params->wchData, StringCchLenW(s_lpFileArg,0)+1,s_lpFileArg);
@ -10303,6 +10343,12 @@ bool ActivatePrevInst()
else {
params->flagTitleExcerpt = 0;
}
params->flagMatchText = s_flagMatchText;
if (s_lpMatchArg) {
StringCchCopy(StrEnd(&params->wchData, 0) + 1, (StringCchLen(s_lpMatchArg, 0) + 1), s_lpMatchArg);
}
cds.dwData = DATA_NOTEPAD3_PARAMS;
cds.cbData = (DWORD)SizeOfMem(params);
cds.lpData = params;

1
src/Notepad3.h
View File

@ -40,6 +40,7 @@ typedef struct np3params {
cpi_enc_t flagSetEncoding;
int flagSetEOLMode;
int flagTitleExcerpt;
int flagMatchText;
WCHAR wchData;
}
np3params, *LPnp3params;

2
src/Notepad3.rc
View File

@ -189,7 +189,7 @@ BEGIN
"E", IDM_EDIT_URLENCODE, VIRTKEY, SHIFT, CONTROL, NOINVERT
//~"E", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(Edit)
"F", IDM_EDIT_FIND, VIRTKEY, CONTROL, NOINVERT
"F", CMD_RECODEDEFAULT, VIRTKEY, CONTROL, ALT, NOINVERT
"F", IDM_GREP_WIN_SEARCH, VIRTKEY, CONTROL, ALT, NOINVERT
//"F", IDM_VIEW_FOLDING, (issue #1609) VIRTKEY, SHIFT, CONTROL, ALT, NOINVERT
"F", IDM_VIEW_TOGGLEFOLDS, VIRTKEY, SHIFT, CONTROL, NOINVERT
//~"F", MMMMMMMMMMMMMMMMMM, VIRTKEY, ALT, NOINVERT /// Menu(File)

2
src/SciCall.h
View File

@ -599,7 +599,7 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
}
// respect VSlop settings
#define Sci_ScrollToLine(L) SciCall_ScrollRange(SciCall_GetLineEndPosition(L), SciCall_PositionFromLine(L));
#define Sci_ScrollToLine(L,C) { SciCall_ScrollRange(SciCall_PositionFromLine(L), SciCall_GetLineEndPosition(L)); if (C) { SciCall_ScrollCaret(); } }
#define Sci_ReplaceTarget(M,L,T) (((M) == SCI_REPLACETARGET) ? SciCall_ReplaceTarget((L),(T)) : SciCall_ReplaceTargetRe((L),(T)))

2
src/Styles.c
View File

@ -827,7 +827,7 @@ bool Style_ExportToFile(const WCHAR* szFile, bool bForceAll)
else {
LoadIniFile(szFilePathNorm, true); // reset
Style_ToIniSection(bForceAll);
ok = SaveIniFile();
ok = SaveIniFile(true);
}
return ok;
}

2
src/TypeDefs.h
View File

@ -278,6 +278,7 @@ typedef struct _constants_t
{
int const StdDefaultLexerID; // Pure Text Files
const WCHAR* const FileBrowserMiniPath;
const WCHAR* const FileSearchGrepWin;
const WCHAR* const StylingThemeName;
const WCHAR* const Settings_Section;
@ -548,6 +549,7 @@ typedef struct _settings2_t
WCHAR FileDlgFilters[XHUGE_BUFFER];
WCHAR FileBrowserPath[MAX_PATH];
WCHAR GrepWinPath[MAX_PATH];
WCHAR AppUserModelID[128];
WCHAR AutoCompleteFillUpChars[64];
WCHAR LineCommentPostfixStrg[64];

4
src/VersionEx.h
View File

@ -8,12 +8,12 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 316
#define VERSION_REV 319
#define VERSION_BUILD 1
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4
#define UCHARDET_VER 2018.09.27
#define TINYEXPR_VER 2018.05.11
#define UTHASH_VER 2.1.0
#define VERSION_PATCH RC3
#define VERSION_PATCH NF
#define VERSION_COMMIT_ID t7820-rk