Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ffes/nppsnippets
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.3.0
Choose a base ref
...
head repository: ffes/nppsnippets
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 19, 2013

  1. Copy the full SHA
    156c362 View commit details
  2. Upgraded to SQLite 3.8.0.2

    ffes committed Sep 19, 2013
    Copy the full SHA
    0b86d0d View commit details
  3. Copy the full SHA
    f6d83f6 View commit details

Commits on Jan 20, 2014

  1. Copy the full SHA
    bd849fd View commit details

Commits on Jan 21, 2014

  1. Added Code::Blocks project

    ffes committed Jan 21, 2014
    Copy the full SHA
    1f08f00 View commit details
  2. Copy the full SHA
    1588956 View commit details

Commits on Mar 12, 2014

  1. Minor changes to documentation

    ffes committed Mar 12, 2014
    Copy the full SHA
    e91fa07 View commit details
  2. Copy the full SHA
    7322e00 View commit details

Commits on Apr 29, 2014

  1. Copy the full SHA
    1722f26 View commit details
  2. Fixed various bugs

    ffes committed Apr 29, 2014
    Copy the full SHA
    6e29842 View commit details
  3. Updates to the documentation

    ffes committed Apr 29, 2014
    Copy the full SHA
    622c671 View commit details

Commits on May 29, 2014

  1. Copy the full SHA
    1ff5fc5 View commit details

Commits on Jun 11, 2014

  1. Copy the full SHA
    9c23ac3 View commit details
  2. Updated files to be compiled

    ffes committed Jun 11, 2014
    Copy the full SHA
    0128e96 View commit details

Commits on Jun 18, 2014

  1. Copy the full SHA
    9bac391 View commit details
  2. Copy the full SHA
    178bebe View commit details

Commits on Oct 1, 2014

  1. Changed type of database fields from 'long' to 'int'

    They are stored in the database the same way, sizeof() are equal
    but new gcc compiler couldn't find the right SqliteStatement::Bind()
    ffes committed Oct 1, 2014
    Copy the full SHA
    76e64e0 View commit details
  2. Fixed gcc warning

    ffes committed Oct 1, 2014
    Copy the full SHA
    84a6125 View commit details

Commits on Oct 23, 2014

  1. Rewrote constructor to fix stack corruption.

    Copied code from NppTags.
    ffes committed Oct 23, 2014
    Copy the full SHA
    9c5d42b View commit details
  2. Copy the full SHA
    1367763 View commit details
  3. Added VS2013 project files

    ffes committed Oct 23, 2014
    Copy the full SHA
    b1c7883 View commit details

Commits on Oct 24, 2014

  1. Upgrade to SQLite version 3.8.7

    ffes committed Oct 24, 2014
    Copy the full SHA
    3953450 View commit details

Commits on Jan 19, 2015

  1. Add option to hide toolbar icon

    ffes committed Jan 19, 2015
    Copy the full SHA
    d9692a3 View commit details

Commits on Mar 13, 2015

  1. Copy the full SHA
    571dc9a View commit details
  2. Copy the full SHA
    cb9315f View commit details
  3. Copy the full SHA
    75a2a52 View commit details
  4. Fixed bug 6 at Google Code

    When a snippet started with an empty line Validate()
    returned false because only the first line was checked.
    ffes committed Mar 13, 2015
    Copy the full SHA
    e8c5175 View commit details
  5. Updated the changelog

    ffes committed Mar 13, 2015
    Copy the full SHA
    e994819 View commit details

Commits on Apr 22, 2015

  1. Copy the full SHA
    2d0ed6f View commit details
  2. Copy the full SHA
    6bf51fd View commit details

Commits on May 15, 2015

  1. Fix bug when inserting new records.

    Identify column on name instead of on number
    ffes committed May 15, 2015
    Copy the full SHA
    c6bf6b0 View commit details
  2. Copy the full SHA
    ef022ad View commit details
  3. Copy the full SHA
    77778b1 View commit details
  4. Simple start of ExportTo()

    ffes committed May 15, 2015
    Copy the full SHA
    524cdba View commit details
  5. Copy the full SHA
    a7359dc View commit details

Commits on May 27, 2015

  1. Copy the full SHA
    6e5af3e View commit details
  2. Copy the full SHA
    80f9595 View commit details

Commits on Jul 13, 2015

  1. Copy the full SHA
    e1d843b View commit details

Commits on Jul 19, 2015

  1. Copy the full SHA
    b94fe3c View commit details
  2. Add clean target

    ffes committed Jul 19, 2015
    Copy the full SHA
    e3e0db2 View commit details

Commits on Jul 30, 2015

  1. 3
    Copy the full SHA
    c1b6b96 View commit details

Commits on Nov 27, 2015

  1. Copy the full SHA
    3315c40 View commit details

Commits on Nov 28, 2015

  1. Copy the full SHA
    b8d53b6 View commit details
  2. Copy the full SHA
    114174b View commit details
  3. Fixed type of LibraryID

    ffes committed Nov 28, 2015
    Copy the full SHA
    ec4ecf0 View commit details

Commits on Nov 30, 2015

  1. Merge branch 'export-lib'

    ffes committed Nov 30, 2015
    Copy the full SHA
    3b80964 View commit details
  2. Fix link warning in debug build

    ffes committed Nov 30, 2015
    Copy the full SHA
    b7a35fd View commit details
  3. Update Makefile

    The Makefile now produces a working .dll. The problem was that the
    .rc file was built with the wrong option.
    There is also a debug and a release build. The release build is
    the default.
    And the dependencies have been updated. No need for "Makefile.depend"
    anymore.
    ffes committed Nov 30, 2015
    Copy the full SHA
    e3e4b58 View commit details
  4. Remove unused build files

    ffes committed Nov 30, 2015
    Copy the full SHA
    fecfa12 View commit details
  5. Copy the full SHA
    dc1be93 View commit details
Showing with 224,061 additions and 121,035 deletions.
  1. +26 −0 .editorconfig
  2. +12 −0 .github/dependabot.yml
  3. +47 −0 .github/workflows/mingw-build.yml
  4. +48 −0 .github/workflows/msbuild.yml
  5. +10 −15 .gitignore
  6. +0 −286 Database.cpp
  7. +1 −84 DlgAbout.cpp
  8. +1 −7 DlgAbout.h
  9. +471 −165 DlgConsole.cpp
  10. +6 −5 DlgConsole.h
  11. +38 −92 DlgEditLanguages.cpp
  12. +1 −4 DlgEditLanguages.h
  13. +22 −15 DlgEditLibrary.cpp
  14. +1 −4 DlgEditLibrary.h
  15. +23 −19 DlgEditSnippet.cpp
  16. +1 −4 DlgEditSnippet.h
  17. +16 −172 DlgImportLibrary.cpp
  18. +1 −4 DlgImportLibrary.h
  19. +169 −0 DlgOptions.cpp
  20. +3 −29 Version.h → DlgOptions.h
  21. +264 −0 LICENSE.md
  22. 0 Language.cpp
  23. +1 −4 Language.h
  24. +66 −74 Library.cpp
  25. +9 −12 Library.h
  26. +69 −36 Makefile
  27. +30 −41 NPP/Docking.h
  28. +352 −119 NPP/Notepad_plus_msgs.h
  29. +1,311 −1,037 NPP/Parameters.h
  30. +28 −44 NPP/PluginInterface.h
  31. +29 −0 NPP/Sci_Position.h
  32. +483 −81 NPP/Scintilla.h
  33. +10 −24 NPP/dockingResource.h
  34. +333 −166 NPP/menuCmdID.h
  35. 0 { → NPP}/no_ms_shit.props
  36. +108 −0 NppOptions.cpp
  37. +45 −0 NppOptions.h
  38. +173 −90 NppSnippets.cpp
  39. +10 −17 NppSnippets.h
  40. +44 −0 NppSnippets.sln
  41. +315 −0 NppSnippets.vcxproj
  42. +22 −10 NppSnippets_vs2010.vcxproj.filters → NppSnippets.vcxproj.filters
  43. +35 −20 NppSnippets_res.rc
  44. +0 −20 NppSnippets_vs2005.sln
  45. +0 −330 NppSnippets_vs2005.vcproj
  46. +0 −20 NppSnippets_vs2010.sln
  47. +0 −146 NppSnippets_vs2010.vcxproj
  48. +20 −24 Options.cpp
  49. +21 −13 Options.h
  50. +6 −8 README.md
  51. BIN Res/MainToolbar_Snippets.bmp
  52. BIN Res/Snippets.ico
  53. +11 −3 Resource.h
  54. +50 −74 Snippets.cpp
  55. +19 −22 Snippets.h
  56. +259 −0 SnippetsDB.cpp
  57. +47 −40 Database.h → SnippetsDB.h
  58. +499 −0 SqliteDB.cpp
  59. +126 −0 SqliteDB.h
  60. +0 −102 Version.cpp
  61. +9 −9 WaitCursor.cpp
  62. +5 −8 WaitCursor.h
  63. +0 −311 __Docs/ReadMe.xml
  64. +0 −9 __Docs/config_html.xsl
  65. +0 −3 __Docs/docbook.css
  66. +0 −304 __Docs/gpl-2.0.xml
  67. +0 −120 __Docs/license.html
  68. +0 −133 __Docs/tabledef.xml
  69. +13 −0 docs/.editorconfig
  70. +9 −0 docs/Dockerfile
  71. +66 −0 docs/Makefile
  72. +302 −0 docs/changelog.rst
  73. +44 −0 docs/compile.rst
  74. +231 −0 docs/conf.py
  75. +12 −0 docs/contact.rst
  76. +136 −0 docs/database.rst
  77. +17 −0 docs/faq.rst
  78. +314 −0 docs/gpl-2.rst
  79. BIN docs/images/context-menu-library.png
  80. BIN docs/images/context-menu-snippet.png
  81. BIN docs/images/edit-snippet.png
  82. BIN docs/images/main.png
  83. +24 −0 docs/index.rst
  84. +18 −0 docs/installation.rst
  85. +7 −0 docs/introduction.rst
  86. +17 −0 docs/known-issues.rst
  87. +89 −0 docs/libraries.rst
  88. +6 −0 docs/license.rst
  89. +29 −0 docs/options.rst
  90. +2 −0 docs/requirements.txt
  91. +44 −0 docs/usage.rst
  92. +33 −0 docs/wishlist.rst
  93. +32 −3 {__SQL → misc}/Languages.sql
  94. +2 −2 {__SQL → misc}/NppSnippets.sql
  95. BIN __SampleDB/NppSnippets.sqlite → misc/Template.sqlite
  96. +0 −11 no_ms_shit.vsprops
  97. +210,437 −115,376 sqlite3.c
  98. +6,372 −1,264 sqlite3.h
  99. +41 −0 version_git.bat
  100. +58 −0 version_git.sh
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# EditorConfig for main source directory

root = true

[*]
end_of_line = crlf
indent_size = 4
indent_style = tab
trim_trailing_whitespace = true
insert_final_newline = true

[{*.{vcxproj,vcxproj.user,props}}]
indent_size = 2
indent_style = space
insert_final_newline = false

[*.yml]
indent_size = 2
indent_style = space
end_of_line = lf

[*.sh]
end_of_line = lf

[sqlite3.*]
end_of_line = lf
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
47 changes: 47 additions & 0 deletions .github/workflows/mingw-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Mingw Build

on: [ push, pull_request ]

jobs:

build_linux:
runs-on: ubuntu-latest
strategy:
max-parallel: 2
matrix:
build_platform: ["64", "32"]

steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install packages via apt
run: |
sudo apt-get -qq update
sudo apt-get -qq install -y mingw-w64 cppcheck
(for alt in i686-w64-mingw32-g++ i686-w64-mingw32-gcc x86_64-w64-mingw32-g++ x86_64-w64-mingw32-gcc; do sudo update-alternatives --set $alt /usr/bin/$alt-posix; done);
- name: build x86
if: matrix.build_platform == '32'
run: make ARCH=i686-w64-mingw32

- name: build x64
if: matrix.build_platform == '64'
run: make ARCH=x86_64-w64-mingw32

- name: Archive artifacts for x86
if: matrix.build_platform == '32'
uses: actions/upload-artifact@v4
with:
name: nppsnippets_dll_linux_x32
path: NppSnippets.dll

- name: Archive artifacts for x64
if: matrix.build_platform == '64'
uses: actions/upload-artifact@v4
with:
name: nppsnippets_dll_linux_x64
path: NppSnippets.dll

48 changes: 48 additions & 0 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: MSBuild

on: [ push, pull_request ]

jobs:

build_windows:
runs-on: windows-latest
strategy:
max-parallel: 3
matrix:
build_configuration: [ Release ]
build_platform: [ x64, Win32, ARM64 ]
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Show MSBuild version
run: msbuild -version

- name: Run MSBuild
run: msbuild NppSnippets.vcxproj /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}"

- name: Archive artifacts for x64
if: matrix.build_platform == 'x64'
uses: actions/upload-artifact@v4
with:
name: nppsnippets_dll_x64
path: ${{ matrix.build_platform }}/${{ matrix.build_configuration }}/NppSnippets.dll

- name: Archive artifacts for x32
if: matrix.build_platform == 'Win32'
uses: actions/upload-artifact@v4
with:
name: nppsnippets_dll_x32
path: ${{ matrix.build_platform }}/${{ matrix.build_configuration }}/NppSnippets.dll

- name: Archive artifacts for ARM64
if: matrix.build_platform == 'ARM64'
uses: actions/upload-artifact@v4
with:
name: nppsnippets_dll_arm64
path: ${{ matrix.build_platform }}/${{ matrix.build_configuration }}/NppSnippets.dll
25 changes: 10 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
__*
*.LNK
*.lnk
*.suo
*.ncb
*.user
*.opensdf
*.sdf
!__Docs
!__SQL
!__SampleDB
[Rr]elease/
[Dd]ebug/
ipch/
*.deps
.vs/
_build/
ARM64/
Win32/
x64/
*.d
*.o
*.user
NppSnippets.dll
version_git.h
Loading