Merge branch 'develop'

robert7 · Apr 19, 2023 · f9cbad2 · f9cbad2
2 parents 94b1c62 + fa5206f
commit f9cbad2
Show file tree

Hide file tree

Showing 55 changed files with 1,495 additions and 1,161 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# NixNote v2.1
+# NixNote2
 ## Introduction
 
 Nixnote is Evernote desktop client for Linux (can be also build on macOS and Windows).
@@ -23,7 +23,7 @@ So far I know Nixnote works quite fine for many people... in case there would be
 ## Packages
 ### Debian, Ubuntu and derivatives official repositories
 In case you distribution is based on **Debian 10 (Buster) or Ubuntu 19.04 (Disco) or later distribution 
-versions**, you can install Nixnote 2.1 from official repositories using:
+versions**, you can install Nixnote2 from official repositories using:
 
 ``` bash
 sudo apt update
@@ -186,7 +186,7 @@ Unlike Unix-like systems, Windows is not shipped with a bash environment, so you
 #### Download development dependencies:
 
 ##### Download the third-party libraries:
-If you want to download binary third-party library files, you can get them from [winlib](https://github.com/boo-yee/winlib). Inside it, Hunspell and tidy are built with MinGW 32 5.3.0, and poppler is downloaded from sourceforge as binary. If you want to build by yourself, you can download them from the following links:
+If you want to download binary third-party library files compatible with Qt 5.5.0, you can get them from [winlib](https://github.com/boo-yee/winlib). Inside it, Hunspell and tidy are built with MinGW 32 4.9.2(shipped with Qt 5.5.0), and poppler is downloaded from sourceforge as binary. If you want to build by yourself, you can download them from the following links:
 
 [poppler](https://sourceforge.net/projects/poppler-qt5-mingw32/)
 
@@ -197,9 +197,9 @@ If you want to download binary third-party library files, you can get them from
 ##### Download Qt:
 [Qt](https://download.qt.io/)(with MinGW32)
 
-If your Qt version is 5.6 or higher, you need to download QtWebKit separately and copy the files under QtWebKit include folder to /your_path_to_qt/[version]/mingw[version]/include.
+Qt 5.5.0 is enough. But if you want to build with a newer version, you need to download QtWebKit separately and copy the files under QtWebKit include folder to /your_path_to_qt/[version]/mingw[version]/include.
 
-[QtWebKit](https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-tp5/qtwebkit-tp5-qt58-mingw530-x86.zip)
+[QtWebKit](https://github.com/qtwebkit/qtwebkit/releases)
 
 (Advice: You may want to add the path to qmake.exe and ming32-make.exe to the PATH environment, so that you do not have to type the full path when building the application and libraries later. You can do this by hand or running qtenv2.bat.)
 
@@ -217,7 +217,7 @@ Then you will get the hunspell dll file.
 Then, create folders as winlib/includes in this repository folder and copy the files under poppler, tidy and hunspell include folders to winlib/includes. The structure is:
 
 ```bash
-nixnote_repo
+nixnote2
 |
 `--winlib
    |

diff --git a/changelog.txt b/changelog.txt
@@ -1,21 +1,37 @@
+NixNote (2.1.9) stable; urgency=low
+  * Added a new dark theme.
+  * Optimised the sql statements of note creating and updating.
+  * Optimised the sql statements of batch operations, including movings, deletings, and restorings.
+  * Added an option to listen to the commands from command line.(When it is enabled, the shared memory size will be set to 128 bytes; when disabled, it will be set to 1 byte.)
+  * Decoupled the functions of CmdLineTool(except signalGui()) from shared memory.
+  * Made Nixnote export the stack attribute when exporting notes.
+  * Added an option to save the UI state changes when Nixnote exits.
+  * Save the note content when Nixnote receives specific signal interruptions(SIGINT, SIGHUP).
+  * Allocate the tageditor's tags dynamically.
+  * Added a default theme named with 'Default' when no theme is found in themes.ini.
+  * RAM usage optimizations.
+  * Fixed file downloading under Windows.
+  * Made the editor not render the note content when Key_Up or Key_Down keeps being pressed.
+ -- Robert Spiegel <[email protected]>  Sat, 15 Apr 2023 12:15:22 +0200
+
 NixNote (2.1.8) stable; urgency=low
   * Made the font size in the setting dialog consistent with the one in the editor button bar.
   * Made the Windows editon's results of find more recognizable.
-  * Limited the max length of the recently updated menu of the tray.
+  * Limited the max length of the recently updated menu and favourite menu of the tray.
   * Fixed memory leaks caused by Qt Webview.
   * Fixed: To-do Formatting is not in parity with Official Client - issue #131
   * Fixed: In-App Note links don't work when there is an apostrophe in the title - issue #168
   * Fixed: Nixnote2 exits when network gets disconnected - issue #189
   * Fixed: Import all notes, tag issue - issue #153
-  * Fixed: Local images cannot be pasted, web image's html element cannot be saved
+  * Fixed: Local images cannot be pasted, images in notes cannot be saved.
  -- Robert Spiegel <[email protected]>  Sat, 10 Sep 2022 10:00:00 +0200
 
 NixNote (2.1.7) stable; urgency=low
   * Fixed: Search by date attributes not working with PPA builds - issue #149
   * Fixed: Editor fonts and sorting notes - issue #156
-  * Fixed: Nixnote often crashes
+  * Fixed: Nixnote often crashes.
   * Fixed: Can't search / replace with as replacement. - issue #180
-  * Enabled the spell check code for Windows edition
+  * Enabled the spell check code for Windows edition.
   * Fixed Windows build (thanks to https://github.com/boo-yee)
  -- Robert Spiegel <[email protected]>  Tue, 12 Jul 2022 10:00:00 +0200
 
@@ -433,3 +449,4 @@ NixNote (2.0-beta-3) stable; urgency=low
 NixNote (2.0-beta-2) stable; urgency=low
   * Beta 2.  Lots of bug fixes and removal of Thrift.
 -- Randy Baumgarte <[email protected]> Sat, 26 Apr 2014 14:00:00 -0400
+
diff --git a/debian/changelog b/debian/changelog
@@ -1,21 +1,37 @@
+NixNote (2.1.9) stable; urgency=low
+  * Added a new dark theme.
+  * Optimised the sql statements of note creating and updating.
+  * Optimised the sql statements of batch operations, including movings, deletings, and restorings.
+  * Added an option to listen to the commands from command line.(When it is enabled, the shared memory size will be set to 128 bytes; when disabled, it will be set to 1 byte.)
+  * Decoupled the functions of CmdLineTool(except signalGui()) from shared memory.
+  * Made Nixnote export the stack attribute when exporting notes.
+  * Added an option to save the UI state changes when Nixnote exits.
+  * Save the note content when Nixnote receives specific signal interruptions(SIGINT, SIGHUP).
+  * Allocate the tageditor's tags dynamically.
+  * Added a default theme named with 'Default' when no theme is found in themes.ini.
+  * RAM usage optimizations.
+  * Fixed file downloading under Windows.
+  * Made the editor not render the note content when Key_Up or Key_Down keeps being pressed.
+ -- Robert Spiegel <[email protected]>  Sat, 15 Apr 2023 12:15:22 +0200
+
 NixNote (2.1.8) stable; urgency=low
   * Made the font size in the setting dialog consistent with the one in the editor button bar.
   * Made the Windows editon's results of find more recognizable.
-  * Limited the max length of the recently updated menu of the tray.
+  * Limited the max length of the recently updated menu and favourite menu of the tray.
   * Fixed memory leaks caused by Qt Webview.
   * Fixed: To-do Formatting is not in parity with Official Client - issue #131
   * Fixed: In-App Note links don't work when there is an apostrophe in the title - issue #168
   * Fixed: Nixnote2 exits when network gets disconnected - issue #189
   * Fixed: Import all notes, tag issue - issue #153
-  * Fixed: Local images cannot be pasted, web image's html element cannot be saved
+  * Fixed: Local images cannot be pasted, images in notes cannot be saved.
  -- Robert Spiegel <[email protected]>  Sat, 10 Sep 2022 10:00:00 +0200
 
 NixNote (2.1.7) stable; urgency=low
   * Fixed: Search by date attributes not working with PPA builds - issue #149
   * Fixed: Editor fonts and sorting notes - issue #156
-  * Fixed: Nixnote often crashes
+  * Fixed: Nixnote often crashes.
   * Fixed: Can't search / replace with as replacement. - issue #180
-  * Enabled the spell check code for Windows edition
+  * Enabled the spell check code for Windows edition.
   * Fixed Windows build (thanks to https://github.com/boo-yee)
  -- Robert Spiegel <[email protected]>  Tue, 12 Jul 2022 10:00:00 +0200
 

diff --git a/help/about.html b/help/about.html
@@ -6,7 +6,7 @@
         <p><b>__VERSION__</b></p>
         <p>
             (c) 2008-2018 <a href="https://github.com/baumgarr">Randy Baumgarte</a><br/>
-            (c) 2018-2022 <a href="https://github.com/robert7">Robert Spiegel</a>
+            (c) 2018-2023 <a href="https://github.com/robert7">Robert Spiegel</a>
             & <a href="https://raw.githubusercontent.com/robert7/nixnote2/master/debian/copyright">contributors</a>.<br/>
             License: <a href="https://www.gnu.org/licenses/gpl-3.0.en.html">GNU GPLv3</a>
         </p>

diff --git a/nixnote2.qrc b/nixnote2.qrc
@@ -35,7 +35,6 @@
         <file alias="todoIcon">resources/images/todo.png</file>
         <file alias="italicsIcon">resources/images/italic.png</file>
         <file alias="newNoteIcon">resources/images/newNote.png</file>
-        <file alias="trunkIcon">resources/images/trunk.png</file>
         <file alias="usageIcon">resources/images/usage.png</file>
         <file alias="blackDotIcon">resources/images/black_dot.png</file>
         <file alias="notebookSmallIcon">resources/images/notebookSmall.png</file>

diff --git a/resources/images/alarmclock.png b/resources/images/alarmclock.png
diff --git a/resources/images/checkbox.css b/resources/images/checkbox.css
diff --git a/resources/images/copy.png b/resources/images/copy.png
diff --git a/resources/images/delete.png b/resources/images/delete.png
diff --git a/resources/images/emailIcon.png b/resources/images/emailIcon.png
diff --git a/resources/images/fontColor.png b/resources/images/fontColor.png
diff --git a/resources/images/formatCode.png b/resources/images/formatCode.png
diff --git a/resources/images/password.png b/resources/images/password.png
diff --git a/resources/images/paste.png b/resources/images/paste.png
diff --git a/resources/images/printer.png b/resources/images/printer.png
diff --git a/resources/images/spellCheck.png b/resources/images/spellCheck.png
diff --git a/resources/images/splash_logo.png b/resources/images/splash_logo.png
diff --git a/resources/images/trayicon.png b/resources/images/trayicon.png
diff --git a/resources/images/windowIcon.ico b/resources/images/windowIcon.ico
diff --git a/resources/images/windowIcon.png b/resources/images/windowIcon.png