Merge pull request #89 from Philip-Scott/1.3.1

1.3.1

Author: Philip-Scott

CMakeLists.txt

@@ -148,6 +148,7 @@ vala_precompile(VALA_C
   src/Services/Bookmark.vala
   src/Services/FileManager.vala
   src/Services/Notebook.vala
+  src/Services/Image.vala
   src/Services/Page.vala
   src/Services/Settings.vala
   src/Services/Trash.vala
@@ -158,6 +159,8 @@ vala_precompile(VALA_C
   src/Plugins/Break.vala
   src/Plugins/Color.vala
   src/Plugins/Youtube.vala
+  src/Plugins/Image.vala
+  src/Plugins/Highlight.vala
   src/config.vala
 PACKAGES
   ${VALA_DEPS}
@@ -177,14 +180,14 @@ add_dependencies(notes-up
 install(TARGETS notes-up RUNTIME
   DESTINATION bin)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/Notes.desktop
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.philip-scott.notes-up.desktop
   DESTINATION ${DATADIR}/applications/)
 
 #install assets
-file(GLOB assets "${CMAKE_CURRENT_SOURCE_DIR}/data/assets/*")
+file(GLOB assets "${CMAKE_CURRENT_SOURCE_DIR}/data/assets/**")
 install (FILES ${assets}
   DESTINATION ${DATADIR}/notes-up/)
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/notes.svg"
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.philip-scott.notes-up.svg"
   DESTINATION ${DATADIR}/pixmaps/)
 
 # App DATA

README.md

@@ -12,17 +12,14 @@ As a computer engineer, I've been writing my school notes using just a text edit
 
 ![screenshot](https://github.com/Philip-Scott/Notes-up/blob/master/Screenshot.png?raw=true)
 
-## Now in 1.3!
-
-- Notes-Up is now faster than ever! It now uses a database as its backend and saves the preview for quickly loading
-- You can now rename your bookmarks! Double-click on them to rename them
-- Plugins! There are currently 3 plugins installed by default, and with many more to come in the future.
-	- **Color**: You can now easily change the text color! Select it and click the new color button right from the toolbar or by typing ` <color rgb(164,0,0) [your text here]> `
-	- **Youtube**: By typing `<youtube [your video URL]>`, you can now embed youtube videos right into your notes!
-	- **Break**: Exporting to PDF is sometimes a pain... Now by typing `<break>` or clicking it’s new button on the editor you will be able to easily add page breaks on your exports!
-- Fixed: Sometimes the app would show a raw html document. It shouldn't do that anymore!
-- Fixed: Editing and adding a notebook used to restart the whole sidebar, it also doesn't do that anymore!
-- Fixed: Links are now passed to your web browser.
+## New in 1.3.1!
+
+- You can now keep your notebook list open while editing. Available right from the settings!
+- Plugins! One more plugin has been added to the family!
+	- **Highlight**: By using it just once in your document, you'll enable syntax highlighting! Just type  ` <highlight>` and your code blocks will be given some style! You just need to add the language you're using like ` ```vala `
+- Clicking on the image button on the toolbar without anything selected now embeds the image with your document! Now you don't have to worry about moving files! You can still link images by dragging and dropping them into the editor
+- Changed: the New Page shortcut has been changed from `Ctrl+N` to `Ctrl+Shift+N` to avoid accidentally creating new pages when you didn't want to
+- Preparations for AppCenter! 
 
 You can also view the full [changelog here](changelog.md)
 

changelog.md

@@ -1,4 +1,15 @@
-#Changelog: 
+# Changelog: 
+## 1.3
+- Notes-Up is now faster than ever! It now uses a database as its backend and saves the preview for quickly loading
+- You can now rename your bookmarks! Double-click on them to rename them
+- Plugins! There are currently 3 plugins installed by default, and with many more to come in the future.
+	- **Color**: You can now easily change the text color! Select it and click the new color button right from the toolbar or by typing ` <color rgb(164,0,0) [your text here]> `
+	- **Youtube**: By typing `<youtube [your video URL]>`, you can now embed youtube videos right into your notes!
+	- **Break**: Exporting to PDF is sometimes a pain... Now by typing `<break>` or clicking it’s new button on the editor you will be able to easily add page breaks on your exports!
+- Fixed: Sometimes the app would show a raw html document. It shouldn't do that anymore!
+- Fixed: Editing and adding a notebook used to restart the whole sidebar, it also doesn't do that anymore!
+- Fixed: Links are now passed to your web browser.
+
 ## 1.2.1
 
 - Your notes now autosave every minute if there was a change. No more excuses for lost work +Manuel del Valle ;) 

data/assets/highlight.LICENSE

@@ -0,0 +1,25 @@
+Copyright (c) 2006, Ivan Sagalaev
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of highlight.js nor the names of its contributors 
+      may be used to endorse or promote products derived from this software 
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

data/assets/highlight.pack.js

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2017 Felipe Escoto (https://github.com/Philip-Scott/Notes-up) -->
+<component type="desktop">
+  <id>com.github.philip-scott.notes-up.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>Notes-Up</name>
+  <summary>Your New Notebook</summary>
+   <description>
+     <p>Write beautiful notes fast and easy using Markdown</p>
+     <p>Features include:</p>
+     <ul>
+       <li>Multiple notebook support</li>
+       <li>Easy-to-use markdown editor</li>
+       <li>Exporting to PDF</li>
+       <li>Plugins: such as embedding Youtube videos</li>
+       <li>And much more!</li>
+     </ul>
+    </description>
+  <provides>
+    <binary>notes-up</binary>
+  </provides>
+  <releases>
+  </releases>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/Philip-Scott/Notes-up/master/Screenshot.png</image>
+    </screenshot>
+  </screenshots>
+  <developer_name>Felipe Escoto.</developer_name>
+  <url type="homepage">https://github.com/Philip-Scott</url>
+  <url type="bugtracker">https://github.com/Philip-Scott/Notes-up/issues</url>
+  <url type="help">https://github.com/Philip-Scott/Notes-up/issues</url>
+  <update_contact>[email protected]</update_contact>
+  <custom>
+    <value key="x-appcenter-color-primary">#D0F3FF</value>
+    <value key="x-appcenter-color-primary-text">#004B66</value>
+  </custom>
+</component>

data/assets/solarized-light.css

@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Notes
 Comment=Your markdown notebook
 Exec=/usr/bin/notes-up
-Icon=notes
+Icon=com.github.philip-scott.notes-up
 Terminal=false
 Type=Application
 StartupNotify=true

data/com.github.philip-scott.notes-up.appdata.xml

@@ -54,7 +54,7 @@ Csreparse(Cstring *iot, char *buf, int size, int flags)
 {
     MMIOT f;
     ___mkd_initmmiot(&f, 0);
-    ___mkd_reparse(buf, size, 0, &f, 0);
+    ___mkd_reparse(buf, size, flags, &f, 0);
     ___mkd_emblock(&f);
     SUFFIX(*iot, T(f.out), S(f.out));
     ___mkd_freemmiot(&f, 0);