Commit Graph

90 Commits

Author SHA1 Message Date
Rainer Kottenhoff
ada5b0c2b6 + fixing manifest embedding (Notepad3 & minipath) in VS2017 Solution / vcproj
- using Linker generated manifests (knows dependencies)
   - activate VS2017's postprocessing manifest-tool to merge manifest with
     Version.exe's .manifest.conf part (re-embedding assembled manifest)
     - by the way: Version.exe (Release/Win32) should only patch the items in
       <assemblyIdentity /> node of .manifest.conf and not re-create the complete manifest wiith dependencies
       (it works fine yet, but, if the Linker change dependencies, this will lead to merge conflicts)
   - switching DPI awarenes to 'false', cause only MFC Application can be made DPI aware
     (setting 'true' for non MFC Applications will end up in blurry effects on scaled desktops [MS doc])

- Tip: the embedded manifest resource can be checked by:
    i) load the .exe via file open dialog into VS2017
   ii) or using  Sysinternal's  > sigcheck.exe -a -m Notepad3.exe
2017-08-10 09:52:05 +02:00
Rainer Kottenhoff
2b1959e08f Merge branch 'Bugfixes_and_More' 2017-08-09 22:42:31 +02:00
Rainer Kottenhoff
d4ce0417ba - move settings for HighDPI Toolbar to [Window] section, to ge more portable configuration (same .ini-File on different screens) 2017-08-09 16:44:48 +02:00
Rainer Kottenhoff
1b71079b13 - fix: nullptr access while pressing "favorites" toolbar button on 'virgin' NP3
- reintroduce HighDPI toolbar:
  .ini-File settings:  section [Toolbar Images]
    + (new) HighDpiToolBar=
        val  -1  (or not set at all) => depending on screen resolution:
                 higher than Full-HD (1920x1080) -> select internal HighDPI-Toolbar
       val  0:  use internal low resolution Toolbar  (old behaviour)
       val  1:  use internal HighDPI-Toolbar
   -  (old)  BitmapDefault=<bitmap-file-path>  overrides HighDpiToolBar setting and uses <bitmap-file-path> (if valid)
2017-08-09 10:51:43 +02:00
Rainer Kottenhoff
da77f7d308 - fixing issues for batch buils all project configs (Release/Debug/Win32/x64)
- automatic linkage of dependant link-library projects (scintilla static lib) does not work
  (due to a VS bug or special Scintilla .vcxproj settings ?)
2017-08-08 16:03:52 +02:00
Rainer Kottenhoff
4500c2b855 add VS2017 .vcproj files: and adapt Compiler Tool Set accordingly 2017-08-08 13:00:03 +02:00
Rainer Kottenhoff
b944089efc - cleanup .vcxproj to support "All Config" ans "All Platform" selection
~ maybe it is time to change to Platform Toolset "Visual Studio 2017 - Windows XP (v141_xp)" ?

 - add existing recoding accelerator keys (Ctrl+Alt+F & Ctrl+Shift+A)
   to "Recode" menue  (func: reload file forcing this encoding type)

 - add version info for used Scintilla library
  ~ VERSION_SCIVERSION should be set by Version.exe (version patcher)
    and can be picked from provided scintilla\version.txt

 - some code-cleanup (cleancode-developer pathfinder rule)
   while trying to trace down notepad2-mod issue #121
   (i am able to reproduce, but didn't find the reason (yet))
2017-08-08 11:56:56 +02:00
Rainer Kottenhoff
b9b80cfaca Merge branch 'master' into Bugfixes_and_More 2017-08-08 02:29:38 +02:00
Rainer Kottenhoff
4226a6bf03 Merge remote-tracking branch 'notepad3_orig_rizone/master' 2017-08-08 02:27:34 +02:00
Derick Payne
92a23f0bf3 Merge pull request #43 from RaiKoHoff/Bugfixes_and_More
some fixes and features, that missed the latest notepad2-mod
2017-08-07 09:31:40 +02:00
Rainer Kottenhoff
d5e480f1eb - minor cleanups reported by CppCheck v.1.79
- fix exception - reported in notepad2-mod pull request (Crash fixing. #172), which has been rejected there,
  but I was able to reproduce it in VS2017 debug mode (initial defaults for exception handling).
  (https://github.com/XhmikosR/notepad2-mod/pull/172)

- incorporate changes from  notepad2-mod from v.4.2.25.995  to  v.4.2.25.998
  (one fix,  the other changes we have done before already)

- Change shortcuts for the following actions:
  (-) Toggle Transparent Mode:  moved from Ctrl+0  to  Ctrl+Numpad_*
  (x) Reset Zoom: Ctrl+/ change to Ctrl+0      ($v_5.0.26)
  Additional Accelerator Keys, as suggested by (https://github.com/XhmikosR/notepad2-mod/pull/197)
  (+) Toggle Line Comment : in addition to Ctrl+Q add Ctrl+/  with same functionality
  (+) Do Stream Comment : in addition to Ctrl+Shift+Q add Ctrl+Shift+/ with same functionality
  believing new shortcuts are more convenient and more widely used, aren't they?
2017-08-06 23:35:37 +02:00
Derick Payne
050c2436be Small updates 2017-08-06 19:10:50 +02:00
Rainer Kottenhoff
194c4ccf10 Merge branch 'Bugfixes_and_More' 2017-08-06 18:59:01 +02:00
Derick Payne
489db38dc4 Back to smaller toolbar buttons. 2017-08-06 18:38:45 +02:00
Derick Payne
9723493c42 Merge pull request #41 from RaiKoHoff/Bugfixes_and_More
Fixes regarding  encoding and code-page handling
2017-08-06 18:36:39 +02:00
Rainer Kottenhoff
74ec34dad3 integrate Scintillas DirectWrite technology:
- Settings:  SciDirectWriteTech, SciFontQuality
  + values according to Scintilla documentation
  + values = -1 (or not set) - don't call SCI API anyway - should be the same as DEFAULT technology settings (values = 0)
      SC_TECHNOLOGY_DEFAULT = 0,  SC_TECHNOLOGY_DIRECTWRITE = 1,  SC_TECHNOLOGY_DIRECTWRITERETAIN = 2,  SC_TECHNOLOGY_DIRECTWRITEDC = 3
      SC_EFF_QUALITY_DEFAULT = 0, SC_EFF_QUALITY_NON_ANTIALIASED = 1, SC_EFF_QUALITY_ANTIALIASED = 2, SC_EFF_QUALITY_LCD_OPTIMIZED = 3
2017-08-05 22:01:46 +02:00
Rainer Kottenhoff
da073686dc reverting, and fixing encoding / code-page issues:
- consistent encoding <> code-page handling (including Scintilla's code-page settings)
- Scintilla issue regarding notepad2-mod issie #173 (see https://github.com/XhmikosR/notepad2-mod/pull/193)
- allow arbitrary conversion between encodings (even it it does not make sense in any case)
  (instead of doing silently nothing but changing encoding info on status bar)
2017-08-05 20:20:22 +02:00
Rainer Kottenhoff
7647e03801 refactoring encoding and code-page handling:
- using Scintilla UTF8 code-page internally for most encodings,
  solves some encoding/code-page problems, the behaviour slightly changes:

  + if DefaultEncoding is not set (or set to DefaultEncoding = -1),
    initial encoding is set to current system's code-page, e.g. Windows-1252
    Scintilla's internal UTF8 code-page is used for edit box,
    that means copy/paste from clipboard may show characters which are
    not valid in this char-set of the selected code-page.
    Trying to save a file with this invalid UTF8 chars will result in conversion dialog:
    ("...  encoding from ANSI to non-ANSI (and vice versa) may replace unsupported text with default characters ...")

 + if DeaultEncoding = 0 (ANSI):
   a) if LoadASCIIasUTF8 = 0 (FALSE), Scintilla's internal ANSI code-page is used for edit box
      that means copy/paste from clipboard may convert chars to ANSI ()
   b) if LoadASCIIasUTF8 = 1 (TRUE), Scintilla's internal UTF8 code-page is used for edit box
    that means the universal UTF8 encoding is used

 + if DeaultEncoding = nnn (corresponding to some ANSI code-page encoding):
   same as if DefaultEncoding is set to corresponding code-page (see section "DefaultEncoding is not set")
2017-08-04 22:49:21 +02:00
Rainer Kottenhoff
bc7c7f98bd Issue #32: add VisualStudio's editor behaviour for Ctrl-C and Ctrl-X if nothing is selected (copy / cut current line) 2017-08-03 17:30:03 +02:00
Rainer Kottenhoff
67ff6f274e Refactoring/Fixes:
- standard encoding is ANSI, (resp. UTF8 - if no(-1) encoding default is given in .ini-file: DefaultEncoding=n)
- copy/paste non ANSI characters to ANSI encoded NP3 windo will recode them to ANSI (same as manually recode)
2017-08-03 15:34:28 +02:00
Rainer Kottenhoff
854f0a7cec reverting: don't use current system codepage for encoding default (this will lead to problems on changing encoding) 2017-08-03 12:36:39 +02:00
Derick Payne
1662ce3024 Merge pull request #38 from RaPeHoff/Bugfixes_and_More
minor fixes (initiated by some reportes issues)
2017-08-03 10:54:59 +02:00
Rainer Kottenhoff
c299225d6c to fix locale code page / encoding issue: using systems default CodePage for default encoding (and default code page), if default encodig is not persisted in .ini-file
to preserve old standard behaviour, DefaultEncoding "ANSI" may be set in .ini-File
2017-08-02 20:48:14 +02:00
Rainer Kottenhoff
8a94087563 - fixed: broken Ctrl-Q (toggle line comments)
- remember more settings/checksboxes for “Find text” dialog between sessions (.ini-file persistence of (open) dialog)
- DeelX RegexSearch:  remove EXTENDED mode - that disables white space ignore and '#' as line comment (expexted/convenient behaviour)
- fixing ".LOG-feature" of Notepad : ".LOG" recognition must be case sensitive
2017-08-02 15:48:40 +02:00
Derick Payne
55281e57be Removed some Junk 2017-06-13 23:01:34 +02:00
Derick Payne
8d59e54eaf Updated Changes.txt File 2017-06-13 22:55:29 +02:00
Derick Payne
5653da2984 Minor Updates 2017-06-13 22:40:30 +02:00
Derick Payne
7cadeaa7ed Merge pull request #29 from RaPeHoff/Scintilla_375
Update Scintilla Lib to v3.7.5
2017-05-30 16:27:50 +02:00
Rainer Kottenhoff
9f56e00787 - add VS2013 (vc120) std::unique_ptr handling (Scintilla's "UniqueString.h") 2017-05-30 13:41:55 +02:00
Rainer Kottenhoff
056303b6de - Update Scintilla Lib to v3.7.5
- Add CSS variable and media highlighting.
2017-05-30 10:24:10 +02:00
Derick Payne
cb6990cba6 Bigger toolbar buttons
- Bigger toolbar buttons (24px)
- Visual Studio 2017 solution file
2017-03-31 01:52:39 +02:00
Derick Payne
3cf3ea107b Merge pull request #26 from RaPeHoff/master
Minor changes
2017-03-30 23:21:55 +02:00
Rainer Kottenhoff
db8b9361c8 - set UTF-8 as character encoding, if no valid character encoding is chosen for default (.ini) - see notepad2-mod merge #69
- change "Notepad3.ini": don't use 2nd default syntax scheme by default (Notepad3 issue #21)
- Add Microsoft Visual C++ 2017 (vc141)
2017-03-30 14:02:35 +02:00
Derick Payne
c6e109c011 Merge pull request #25 from RaPeHoff/Scintilla_374
update to Scintilla library v.374
2017-03-29 19:10:14 +02:00
Rainer Kottenhoff
de1f3b55b9 update to Scintilla library v.374 2017-03-28 09:37:26 +02:00
Derick Payne
edddf9c521 Merge pull request #22 from RaPeHoff/Scintilla_373
Update to Scintilla v.3.7.3
2017-03-02 21:45:51 +02:00
Rainer Kottenhoff
60d356a17f update to Scintilla v.3.7.3 2017-02-21 11:31:09 +01:00
Derick Payne
a11f240947 Updated Changes.txt 2017-01-06 17:30:23 +02:00
Derick Payne
c8efc7a3b8 Merge pull request #16 from RaPeHoff/Scintilla_372
update Scintilla to version 3.7.2
2017-01-06 17:26:38 +02:00
Derick Payne
ac5d73375b MiniPath now working on Windows XP 2017-01-06 17:12:24 +02:00
Rainer Kottenhoff
334a68bbcb use changed scintilla/lexers/LexPython.cxx from current Notepad2-mod 2017-01-03 10:07:11 +01:00
Rainer Kottenhoff
51693dc7c7 update component Scintilla to version 372 2017-01-03 08:44:50 +01:00
Derick Payne
eca0846640 New release 2016-12-07 15:36:26 +02:00
Derick Payne
4f01887c72 Merge pull request #14 from RaPeHoff/Scintilla_371
+ update to Scintilla 371  (NP2 adaption due to deprecated data types)
2016-12-07 11:08:52 +02:00
Rainer Kottenhoff
1f5354b194 + update to Scintilla 371 (NP2 adaption due to deprecated data types) 2016-12-06 11:49:54 +01:00
Derick Payne
562182159d Merge pull request #10 from RaPeHoff/fix_64bit_37
clean-code solution (instead of "magic numbers")
2016-11-28 08:25:53 +02:00
Derick Payne
8a0723a133 Merge pull request #11 from RaPeHoff/crypto_update
+ crypto module: code cleanup
2016-11-28 08:25:38 +02:00
Derick Payne
db0db4b749 Merge pull request #12 from RaPeHoff/deelx_regex
+ Integration of DeelX RegExpr engine (http://www.regexlab.com/en/deelx/)
2016-11-28 08:25:16 +02:00
Rainer Kottenhoff
af672d7e49 extend RegExpr (DeelX) based "Wildcard Search" (?*) character escaping method 2016-11-27 16:55:42 +01:00
Rainer Kottenhoff
ad277d6008 clean up some more places calculating space for selection text sizes 2016-11-27 16:08:13 +01:00