676 Commits

Author SHA1 Message Date
Joshua Noel
bc0b68b2ba Fixed extra space between UNTITLED_STR and document number when creating a new document through the function FileManager::newEmptyDocument() 2015-05-30 13:40:41 -04:00
Don HO
17e8ca3c15 Merge pull request #120 from andreas-jonsson/tempfix_corruption
[BUG_FIXED] Prevent big file corruption on some long period operations.
2015-05-30 18:00:16 +02:00
milipili
0ce219566a ScitillaComponent: Buffer: fixed an uninitialized variable in ctor
The non-default constructor of the class Buffer calls the inner method
`checkFileState()`, using the private variable `_currentStatus` to determine
whether some checks on the file attached to the buffer are required or not.
However this variable is properly initialized _after_.
2015-05-30 02:26:55 +02:00
Christian Grasser
e1d8e055c8 Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648 2015-05-28 19:37:24 +02:00
Christian Grasser
c8254f89d1 renamed missed CallWindowProcW Unicode version also to CallWindowProc 2015-05-28 19:33:39 +02:00
Don Ho
9d50da76b1 [CODE_ENHANCEMENT] Code enhancement. 2015-05-28 18:11:35 +02:00
Don Ho
7f6dd17f03 [CODE_ENHANCEMENT] Code enhancement. 2015-05-28 01:22:28 +02:00
Christian Grasser
c3697d2055 Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLongPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr 2015-05-27 22:59:46 +02:00
Christian Grasser
311c7d578e Further x86, x64 compatibility fix by reinterpret_cast<LONG_PTR> instead of reinterpret_cast<LONG> for SetWindowLongPtr 2015-05-27 22:47:40 +02:00
Christian Grasser
4d694ea704 Add patch from http://sourceforge.net/p/notepad-plus/patches/648/ by Xileer Torias with comment:
Updated the GetWindowLongPtr and SetWindowLongPtrW nIndex reference as per https://msdn.microsoft.com/en-us/library/windows/desktop/ms633585%28v=vs.85%29.aspx and https://msdn.microsoft.com/en-us/library/windows/desktop/ms644898(v=vs.85).aspx

This alters the function to be compatible with both x86, and x64 as to simplify future x64 builds.
2015-05-27 22:06:53 +02:00
Don HO
ad5788d266 Merge pull request #114 from pnedev/findinfiles_1
Enhance FindInFiles - part 1
2015-05-27 02:42:48 +02:00
Andreas Jönsson
2a7ef2ecf0 Guard long-running operations with a mutex
The session snapshot feature runs in its own thread and access to
Scintilla etc is not thread-safe. As a *temporary* and *non-exhaustive*
fix we guard some long-running operations (undo, redo, replace, sort)
with a mutex to prevent data corruption.
2015-05-26 15:58:46 +02:00
Don HO
56ceaf5546 Merge pull request #117 from NN---/VS2015
[ADD] Add VS2015 project file and make notepad++ project compatible with VS2015.
2015-05-26 09:12:03 +02:00
Don HO
805ab2b9ff Merge pull request #86 from andreas-jonsson/decimal_sort
[NEW_FEATURE] Refine sort lines feature: Add Sort Lines Lexicographically/Integer/Decimal (comma) /Decimal (dot) with Ascending and Descending commands.
2015-05-25 22:59:26 +02:00
Pavel Nedev
d6b321d2d5 Properly position on screen FindInFiles progress window
Use Search Dialog position as bias for the progress window position to avoid bad appearence on multiple monitors setups.
2015-05-25 11:04:31 +03:00
Pavel Nedev
df7ddabff0 Make FindInFiles progress window behave like modal 2015-05-25 11:03:21 +03:00
Pavel Nedev
4409277180 Display find progress status on cancel operation also 2015-05-25 11:01:50 +03:00
Pavel Nedev
43ac186d2b Auto-fit filename in FindInFiles progress window
This way the filename doesn't spread on multiple lines.
2015-05-25 11:01:16 +03:00
Pavel Nedev
ccee6ea29d Refresh N++ window on Finder creation
This makes Notepad++ window look clean when starting Find/Replace InFiles operation for the first time.
2015-05-25 11:00:47 +03:00
Don HO
e70eb054b0 Merge pull request #46 from andreas-jonsson/repeat
[ENHANCEMENT] Add "repeat" option to column editor.
2015-05-24 18:40:04 +02:00
NN
2ef5e5eca3 Support compilation in VS2015.
Changes:
_CRT_NON_CONFORMING_WCSTOK - to have old wcstok behaviour
dbghelp.h doesn't disable warnings, do it manually.
Better casting from pointer to integral.
Disable warnings in tinyXml headers.
Disable warnings 4456;4457;4459 to not touch the source.
More details about the warnings: http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
2015-05-19 14:01:27 +03:00
Andreas Jönsson
d0bafb7fba Add more options for sorting.
User can now choose between lexicographic, integer and decimal sorting.
For decimal sorting there are two further options: decimal point ('.')
or decimal comma (',').

When doing integer/decimal sort, the parsing is not as strict as
before. E.g during integer sorting the program will interpret "123abc"
as 123.

Performance of integer sorting has been improved by 30%.

The implementation of sorting is delegated to classes which implement
the new "ISorter" interface. Unfortunately due to template issues most
of the code had to go in the header file.
2015-05-17 19:18:43 +02:00
Andreas Jönsson
98cafadc3f Remove const. 2015-05-15 11:49:42 +02:00
Andreas Jönsson
014c06c89c Remove const. 2015-05-15 11:46:39 +02:00
Andreas Jönsson
f4132c1634 Add "repeat" option to column editor.
This allows the inserted text to be repeated x times. As an example,
if we have selected 6 columns and let initial number = 10,
increase by = 5 and repeat = 2, then the column editor will insert the
following:

10
10
15
15
20
20
2015-05-10 13:06:25 +02:00
Andreas Jönsson
ee225f5cad Handle empty lines properly in numeric sort. 2015-05-10 11:00:58 +02:00
Andreas Jönsson
60505765cc Remove ScintillaEditView::getLine, no longer used. 2015-05-10 10:29:21 +02:00
Andreas Jönsson
6f004d86a4 Rename sortAllLines -> sortEntireDocument. 2015-05-09 13:21:35 +02:00
Andreas Jönsson
e258bcb3a7 Speed up numeric sorting by 10x.
Convert strings to int, sort, then convert back to strings.
2015-05-09 13:20:37 +02:00
Andreas Jönsson
0eca4db949 Improve numeric sorting. No need to read lines from Scintilla, we already
have them in a vector.
2015-05-09 11:25:07 +02:00
Andreas Jönsson
eee7c4f16e Sort numerically (not lexicographically) if all lines are integers. 2015-05-09 11:02:58 +02:00
Andreas Jönsson
6e84be21f4 Fix newline bug when not sorting all lines. 2015-05-09 10:22:50 +02:00
Andreas Jönsson
351b9b6bff Rename quickSortLines -> sortLines. 2015-05-09 10:05:45 +02:00
Andreas Jönsson
01c1667b09 Use TCHAR instead of _TCHAR. 2015-05-09 08:34:56 +02:00
Andreas Jönsson
4f7752e4a3 Add more const. 2015-05-09 00:17:18 +02:00
Andreas Jönsson
1f4a1fb2e7 Optimize sort.
Remove custom, recursive implementation of quicksort which becomes too
slow to use after a couple of hundred lines.
2015-05-08 23:27:21 +02:00
Don HO
2fe9845dbe Merge pull request #7 from andreas-jonsson/find_ampersands
Fix ampersands in find dialog status bar.
2015-05-02 11:49:36 +02:00
Andreas Jönsson
930464fb8c Cleanup after comments in pull review. 2015-04-25 08:59:38 +02:00
Andreas Jönsson
43879e64ef Fix plurals in find-replace dialog. 2015-04-24 19:32:08 +02:00
Andreas Jönsson
5bacca3601 Fix ampersands in find dialog status bar. 2015-04-24 19:18:54 +02:00
Don Ho
8ec487d668 [RELEASE] Notepad++ 6.7.5 Release.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1351 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-03-10 20:53:52 +00:00
Don Ho
473769cd58 [BUG_FIXED] (Author: Pekka Pöyry) Filename rendered incorrectly on tab bar while it contains '&' character.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1349 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-28 13:17:37 +00:00
Don Ho
8d3583ccfd [MODIF] Code clean up: make code adapt the coding convention.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1348 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-24 18:27:55 +00:00
Don Ho
aa7461f062 [ENHANCEMENT) (Author: Pavel Nedev) Enhance displaying of searching files on the progress bar while finding files.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1347 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-23 17:42:38 +00:00
Don Ho
f224c673bf [NEW] (Author: Pavel Nedev) Add notification for plugins : NPPN_BEFORESHUTDOWN NPPN_CANCELSHUTDOWN NPPN_FILEBEFORERENAME NPPN_FILERENAMECANCEL NPPN_FILERENAMED NPPN_FILEBEFOREDELETE NPPN_FILEDELETEFAILED NPPN_FILEDELETED
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1346 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-21 18:20:50 +00:00
Don Ho
d9299e644f [ENHANCEMENT] (Author: Pavel Nedev) Show progress window during FindInFiles and ReplaceInFiles.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1345 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-19 01:01:12 +00:00
Don Ho
6420dfb67e [NEW] (Author: Korikulum) Adds a message showing the total number of matches in the current document to the Incremental Search bar.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1343 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-14 17:21:09 +00:00
Don Ho
c922089e28 [NEW] (Author: Mike Cowperthwaite) Python lexer: enable EXTRAWORDS.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1338 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-09 08:45:30 +00:00
Don Ho
9a54f90312 [EN[ENHANCEMENT] Enhance Incremental search: make highlighting follow typing.
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1336 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-06 18:18:04 +00:00
Don Ho
3d2f570aba [ENHANCEMENT] (Author: Mike Cowperthwaite) Enhance Incremental search. (part 2/2)
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1335 f5eea248-9336-0410-98b8-ebc06183d4e3
2015-02-06 03:46:15 +00:00