Commit Graph

6374 Commits

Author SHA1 Message Date
Rainer Kottenhoff
12942271f8 + fixing and cleanup build for Notepad3Portable 2017-08-14 01:11:38 +02:00
Rainer Kottenhoff
87fb54b316 Merge branch 'NP3_PortableAppsCom' 2017-08-13 16:45:06 +02:00
Rainer Kottenhoff
1ee3447b8e Merge branch 'Code_Quality' 2017-08-13 16:44:24 +02:00
Rainer Kottenhoff
17befb07d2 Merge branch 'Sandbox' 2017-08-13 16:43:25 +02:00
Derick Payne
b2c1510096 Small setup file update 2017-08-12 21:19:26 +02:00
Derick Payne
49b7372766 Updated build bat files 2017-08-12 20:13:24 +02:00
Derick Payne
4bcbb0592c Merge pull request #50 from RaiKoHoff/NP3_PortableAppsCom
Notepad3Portable:  PortableApps.com's build environment to create the App
2017-08-12 19:15:04 +02:00
Derick Payne
22099d5186 Merge pull request #49 from RaiKoHoff/Code_Quality
code quality enhancements only branch (no functional changes)
2017-08-12 19:14:35 +02:00
Derick Payne
33a09f77ac Merge pull request #47 from RaiKoHoff/Sandbox
fixing issue #35  and feature request #48
2017-08-12 19:14:20 +02:00
Rainer Kottenhoff
d7a1e5a912 Build environment, to create Notepad3Portable (according to PortableApps.com) (x86/x64)
+ need to (portable) install PortableApps.com's build tools (Launcher Creator, Installer Builder) on build server
+ fixing build_np3portableapp.cmd script - please read doc within this script
   - unfortunately the neccessary PortableApps.com build tools do not work the same in CmdLn-Version vs. GUI-Version ???
     so we have still manual interaction to build the Installer Package :-(( - try to figure out, whats going wrong in upcoming commits
+ build process is working, still some to todos left for releasing the Notepad3Portable Installer
2017-08-12 13:05:59 +02:00
Rainer Kottenhoff
d14ea57acb - remove .ini files, they are copied from distrib dir 2017-08-12 11:27:50 +02:00
Rainer Kottenhoff
7af3cd394a - initial version of PortableApps.com Launche and Installer build 2017-08-12 11:22:36 +02:00
Rainer Kottenhoff
223a977207 Merge branch 'Sandbox' into Code_Quality 2017-08-11 20:13:03 +02:00
Rainer Kottenhoff
93325e250d + add printing additional option /v(d)ialog to allow access to the Printer dialog (as on Menu: Print... ) 2017-08-11 20:10:52 +02:00
Rainer Kottenhoff
1ebeb4ceca + minor fixes for .vcxproj files regarding optimization and linker settings 2017-08-11 19:48:46 +02:00
Rainer Kottenhoff
935eed6d1e Merge branch 'Sandbox' into Code_Quality
# Conflicts:
#	src/Notepad3.c  (manually linebased merged)
2017-08-11 19:07:32 +02:00
Rainer Kottenhoff
fc10dbf655 + add command line option ( /v ) to print file immediately and quit (like Window's original notepad.exe /p option) 2017-08-11 18:33:38 +02:00
Rainer Kottenhoff
af4d1292f4 + raise Warning Level from 3 -> 4, and fix corresponding warnings
+ option: build-time: treat warning as error (build fails)
+ cleanups reported by CppCheck v.1.79  (except issue: 'variableScope')
+ remove _CRT_SECURE_NO_WARNINGS to see security warnings for deprecated functions;
+ remove macro-definition for BOOKMARK_EDITION (bookmarks are fixed component of NP3 now)
   (code has not been excaped by this MACRO consistently)
2017-08-11 14:18:39 +02:00
Rainer Kottenhoff
f96832ab7e Merge branch 'Sandbox' into Code_Quality 2017-08-11 09:05:34 +02:00
Rainer Kottenhoff
8600d566db fixing issue #35 (preserve FileExtension settings while switching Styles / 2nd Default Scheme)
+ enlarge some string buffers for dialogs
+ fixing np3encrypt vcxproj files
2017-08-11 03:35:21 +02:00
Rainer Kottenhoff
d8efdd07d4 Merge branch 'master' into Sandbox 2017-08-11 00:47:10 +02:00
Rainer Kottenhoff
b2cf67be9e Merge remote-tracking branch 'notepad3_orig_rizone/master' 2017-08-11 00:17:42 +02:00
Derick Payne
dc2968bb28 Prepaired NP3 Build 422 for Release 2017-08-10 22:41:46 +02:00
Derick Payne
b5646fda70 Fixed some version patching issues.
- Will create a seperate repository for the version patcher.
2017-08-10 21:45:13 +02:00
Derick Payne
b1e7c20f58 Added version patcher source code 2017-08-10 20:16:43 +02:00
Derick Payne
03e882a02d Merge pull request #46 from RaiKoHoff/NP3Encrypt
commandline tool for batch encryption - compatible with MP3' encryption feature
2017-08-10 20:07:46 +02:00
Derick Payne
c0379a137d Merge pull request #45 from RaiKoHoff/Bugfixes
revisit Manifest embedding
2017-08-10 20:05:56 +02:00
Rainer Kottenhoff
0b84a9ab1d + add commandline tool for batch encrypt / decrypt textfiles, comatible with NP3's encryption feature (Autor Dave Dyer: http://www.andromeda.com/people/ddyer/) 2017-08-10 18:00:27 +02:00
Rainer Kottenhoff
f0634adc68 - minipath DPI aware false 2017-08-10 13:54:40 +02:00
Rainer Kottenhoff
8bdad106c4 - cleanup manifest handling 2017-08-10 10:25:33 +02:00
Rainer Kottenhoff
aee59ebf60 * merge confict 2017-08-10 09:57:22 +02:00
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
Derick Payne
be9e397edd Updated Build Files to match build changes 2017-08-09 22:15:56 +02:00
Derick Payne
32eb85068d Creating new release 2017-08-09 22:09:31 +02:00
Derick Payne
989a134d6d Merge pull request #44 from RaiKoHoff/Bugfixes_and_More
Bugfixes and more
2017-08-09 17:11:42 +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