Hello community, here is the log from the commit of package notejot for openSUSE:Factory checked in at 2019-02-27 15:07:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notejot (Old) and /work/SRC/openSUSE:Factory/.notejot.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notejot" Wed Feb 27 15:07:05 2019 rev:10 rq:679479 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/notejot/notejot.changes 2018-12-04 20:56:41.892694916 +0100 +++ /work/SRC/openSUSE:Factory/.notejot.new.28833/notejot.changes 2019-02-27 15:07:11.650427916 +0100 @@ -1,0 +2,18 @@ +Mon Jan 28 20:16:22 UTC 2019 - Alexei Podvalsky <[email protected]> + +- Update to 1.5.4: + * New stuff. Please read the enclosed appdata book. + +------------------------------------------------------------------- +Sun Dec 16 17:42:00 UTC 2018 - Alexei Podvalsky <[email protected]> + +- Update to 1.5.3: + * Merge pull request #106 from 4ugustin/store-pinned-state + * Stick pinned notes on launch + * Store pinned state in Storage + * Merge pull request #105 from 4ugustin/patch-bug-102 + * Fix initial state of pin button #102 + * Update com.github.lainsce.notejot.appdata.xml.in + * Merge pull request #101 from ryonakano/fix-id-in-appdata + +------------------------------------------------------------------- Old: ---- notejot-1.5.2.tar.gz New: ---- notejot-1.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notejot.spec ++++++ --- /var/tmp/diff_new_pack.gJPIJZ/_old 2019-02-27 15:07:13.238427433 +0100 +++ /var/tmp/diff_new_pack.gJPIJZ/_new 2019-02-27 15:07:13.242427431 +0100 @@ -17,7 +17,7 @@ Name: notejot -Version: 1.5.2 +Version: 1.5.4 Release: 0 Summary: A Sticky Note App License: GPL-3.0-only ++++++ notejot-1.5.2.tar.gz -> notejot-1.5.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/data/com.github.lainsce.notejot.appdata.xml.in new/notejot-1.5.4/data/com.github.lainsce.notejot.appdata.xml.in --- old/notejot-1.5.2/data/com.github.lainsce.notejot.appdata.xml.in 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/data/com.github.lainsce.notejot.appdata.xml.in 2019-01-27 17:13:30.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>com.github.lainsce.notejot.desktop</id> + <id>com.github.lainsce.notejot</id> <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-3.0+</project_license> <name>Notejot</name> @@ -52,7 +52,23 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> - <release version="1.4.3" date="2018-11-23"> + <release version="1.5.4" date="2019-01-28"> + <description> + <p>Release: Resized Notes? No problem!</p> + <ul> + <li>Notes' resized sizes are now saved.</li> + </ul> + </description> + </release> + <release version="1.5.3" date="2018-12-15"> + <description> + <p>Release: Undo/Redo Your Notes</p> + <ul> + <li>Now you can undo/redo stuff inside your notes!</li> + </ul> + </description> + </release> + <release version="1.5.2" date="2018-11-23"> <description> <p>Release: Desktop Notes</p> <ul> @@ -314,5 +330,6 @@ <custom> <value key="x-appcenter-color-primary">#fff3ae</value> <value key="x-appcenter-color-primary-text">#555864</value> + <value key="x-appcenter-suggested-price">3</value> </custom> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/debian/changelog new/notejot-1.5.4/debian/changelog --- old/notejot-1.5.2/debian/changelog 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/debian/changelog 2019-01-27 17:13:30.000000000 +0100 @@ -1,3 +1,15 @@ +com.github.lainsce.notejot (1.5.4) xenial; urgency=low + + * New stuff. Please read the enclosed appdata book. + + -- Lains <[email protected]> Tue, 28 Jan 2019 12:00:00 -0300 + +com.github.lainsce.notejot (1.5.3) xenial; urgency=low + + * New stuff. Please read the enclosed appdata book. + + -- Lains <[email protected]> Fri, 15 Dec 2018 13:04:00 -0300 + com.github.lainsce.notejot (1.4.4) xenial; urgency=low * New stuff. Please read the enclosed appdata book. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/meson.build new/notejot-1.5.4/meson.build --- old/notejot-1.5.2/meson.build 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/meson.build 2019-01-27 17:13:30.000000000 +0100 @@ -1,6 +1,6 @@ # Name our project project('com.github.lainsce.notejot', ['vala', 'c'], - version: '1.4.4' + version: '1.5.4' ) # Import main lib files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/LINGUAS new/notejot-1.5.4/po/LINGUAS --- old/notejot-1.5.2/po/LINGUAS 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/LINGUAS 2019-01-27 17:13:30.000000000 +0100 @@ -8,3 +8,4 @@ ca ja cs +ru \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/com.github.lainsce.notejot.pot new/notejot-1.5.4/po/com.github.lainsce.notejot.pot --- old/notejot-1.5.2/po/com.github.lainsce.notejot.pot 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/com.github.lainsce.notejot.pot 2019-01-27 17:13:30.000000000 +0100 @@ -3,59 +3,66 @@ msgstr "" "Project-Id-Version: com.github.lainsce.notejot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-23 01:00-0200\n" +"POT-Creation-Date: 2019-01-17 20:58+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-Basepath: ../src\n" +"X-Poedit-SearchPath-0: .\n" -#: src/MainWindow.vala:299 +#: src/MainWindow.vala:308 msgid "New note" msgstr "" -#: src/MainWindow.vala:303 +#: src/MainWindow.vala:313 msgid "Delete note" msgstr "" -#: src/MainWindow.vala:310 +#: src/MainWindow.vala:327 msgid "White" msgstr "" -#: src/MainWindow.vala:320 +#: src/MainWindow.vala:338 msgid "Red" msgstr "" -#: src/MainWindow.vala:330 +#: src/MainWindow.vala:349 msgid "Orange" msgstr "" -#: src/MainWindow.vala:340 +#: src/MainWindow.vala:360 msgid "Yellow" msgstr "" -#: src/MainWindow.vala:350 +#: src/MainWindow.vala:371 msgid "Green" msgstr "" -#: src/MainWindow.vala:360 +#: src/MainWindow.vala:382 msgid "Blue" msgstr "" -#: src/MainWindow.vala:370 +#: src/MainWindow.vala:393 msgid "Indigo" msgstr "" -#: src/MainWindow.vala:380 -msgid "Violet" +#: src/MainWindow.vala:404 +msgid "Cocoa" msgstr "" -#: src/MainWindow.vala:390 +#: src/MainWindow.vala:415 msgid "Slate" msgstr "" -#: src/MainWindow.vala:423 +#: src/MainWindow.vala:432 +msgid "Note Color" +msgstr "" + +#: src/MainWindow.vala:448 msgid "Settings" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/extra/LINGUAS new/notejot-1.5.4/po/extra/LINGUAS --- old/notejot-1.5.2/po/extra/LINGUAS 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/extra/LINGUAS 2019-01-27 17:13:30.000000000 +0100 @@ -8,3 +8,4 @@ ca ja cs +ru \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/extra/extra.pot new/notejot-1.5.4/po/extra/extra.pot --- old/notejot-1.5.2/po/extra/extra.pot 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/extra/extra.pot 2019-01-27 17:13:30.000000000 +0100 @@ -8,22 +8,25 @@ msgstr "" "Project-Id-Version: extra\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-01 21:12+0900\n" +"POT-Creation-Date: 2019-01-17 21:29+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-Basepath: ../../data\n" +"X-Poedit-SearchPath-0: .\n" #: data/com.github.lainsce.notejot.appdata.xml.in:6 -#: data/com.github.lainsce.notejot.desktop.in:3 +#: data/com.github.lainsce.notejot.desktop.in:2 msgid "Notejot" msgstr "" #: data/com.github.lainsce.notejot.appdata.xml.in:7 -#: data/com.github.lainsce.notejot.desktop.in:4 +#: data/com.github.lainsce.notejot.desktop.in:3 msgid "Jot your ideas" msgstr "" @@ -41,14 +44,14 @@ msgid "Lains" msgstr "" -#: data/com.github.lainsce.notejot.desktop.in:10 +#: data/com.github.lainsce.notejot.desktop.in:4 msgid "com.github.lainsce.notejot" msgstr "" -#: data/com.github.lainsce.notejot.desktop.in:11 +#: data/com.github.lainsce.notejot.desktop.in:6 msgid "Text;Plain;Plaintext;Notepad;" msgstr "" -#: data/com.github.lainsce.notejot.desktop.in:20 +#: data/com.github.lainsce.notejot.desktop.in:15 msgid "New note…" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/extra/fr.po new/notejot-1.5.4/po/extra/fr.po --- old/notejot-1.5.2/po/extra/fr.po 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/extra/fr.po 2019-01-27 17:13:30.000000000 +0100 @@ -1,54 +1,55 @@ # French translations for extra package. -# Copyright (C) 2018 THE extra'S COPYRIGHT HOLDER +# Copyright (C) 2019 THE extra'S COPYRIGHT HOLDER # This file is distributed under the same license as the extra package. -# Automatically generated, 2018. +# NathanBnm, 2019. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: extra\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-01 21:12+0900\n" -"PO-Revision-Date: 2018-11-01 21:12+0900\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: fr\n" +"POT-Creation-Date: 2019-01-17 21:29+0400\n" +"PO-Revision-Date: 2019-01-26 19:41+0100\n" +"Last-Translator: NathanBnm\n" +"Language-Team: Français\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: data/com.github.lainsce.notejot.appdata.xml.in:6 -#: data/com.github.lainsce.notejot.desktop.in:3 +#: data/com.github.lainsce.notejot.desktop.in:2 msgid "Notejot" -msgstr "" +msgstr "Notejot" #: data/com.github.lainsce.notejot.appdata.xml.in:7 -#: data/com.github.lainsce.notejot.desktop.in:4 +#: data/com.github.lainsce.notejot.desktop.in:3 msgid "Jot your ideas" -msgstr "" +msgstr "Notez vos idées" #: data/com.github.lainsce.notejot.appdata.xml.in:9 msgid "" "A stupidly-simple sticky notes application for any type of short term notes " "or ideas." msgstr "" +"Une application de notes post-it stupidement simple pour tout type de notes " +"ou d'idées à court terme." #: data/com.github.lainsce.notejot.appdata.xml.in:11 msgid "Quit anytime with the shortcut Ctrl + Q" -msgstr "" +msgstr "Quittez à tout moment avec le raccourci Ctrl + Q" #: data/com.github.lainsce.notejot.appdata.xml.in:17 msgid "Lains" -msgstr "" +msgstr "Lains" -#: data/com.github.lainsce.notejot.desktop.in:10 +#: data/com.github.lainsce.notejot.desktop.in:4 msgid "com.github.lainsce.notejot" -msgstr "" +msgstr "com.github.lainsce.notejot" -#: data/com.github.lainsce.notejot.desktop.in:11 +#: data/com.github.lainsce.notejot.desktop.in:6 msgid "Text;Plain;Plaintext;Notepad;" -msgstr "" +msgstr "Texte;Simple;Texte Simple;Note;" -#: data/com.github.lainsce.notejot.desktop.in:20 +#: data/com.github.lainsce.notejot.desktop.in:15 msgid "New note…" -msgstr "" +msgstr "Nouvelle note…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/extra/ru.po new/notejot-1.5.4/po/extra/ru.po --- old/notejot-1.5.2/po/extra/ru.po 1970-01-01 01:00:00.000000000 +0100 +++ new/notejot-1.5.4/po/extra/ru.po 2019-01-27 17:13:30.000000000 +0100 @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the extra package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: extra\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-01-17 21:29+0400\n" +"PO-Revision-Date: 2019-01-17 21:44+0400\n" +"Last-Translator: Andrey Kultyapov <[email protected]>\n" +"Language-Team: \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: data/com.github.lainsce.notejot.appdata.xml.in:6 +#: data/com.github.lainsce.notejot.desktop.in:2 +msgid "Notejot" +msgstr "Notejot" + +#: data/com.github.lainsce.notejot.appdata.xml.in:7 +#: data/com.github.lainsce.notejot.desktop.in:3 +msgid "Jot your ideas" +msgstr "Запишите ваши идеи" + +#: data/com.github.lainsce.notejot.appdata.xml.in:9 +msgid "" +"A stupidly-simple sticky notes application for any type of short term notes " +"or ideas." +msgstr "" +"Невероятно простое приложение для любого типа быстрых заметок или идей." + +#: data/com.github.lainsce.notejot.appdata.xml.in:11 +msgid "Quit anytime with the shortcut Ctrl + Q" +msgstr "Выход в любой момент с помощью сочетания клавиш Ctrl + Q" + +#: data/com.github.lainsce.notejot.appdata.xml.in:17 +msgid "Lains" +msgstr "Lains" + +#: data/com.github.lainsce.notejot.desktop.in:4 +msgid "com.github.lainsce.notejot" +msgstr "com.github.lainsce.notejot" + +#: data/com.github.lainsce.notejot.desktop.in:6 +msgid "Text;Plain;Plaintext;Notepad;" +msgstr "Text;Plain;Plaintext;Notepad;" + +#: data/com.github.lainsce.notejot.desktop.in:15 +msgid "New note…" +msgstr "Новый стикер…" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/fr.po new/notejot-1.5.4/po/fr.po --- old/notejot-1.5.2/po/fr.po 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/po/fr.po 2019-01-27 17:13:30.000000000 +0100 @@ -1,62 +1,68 @@ +# French translations for com.github.lainsce.notejot package. +# Copyright (C) 2019 THE com.github.lainsce.notejot'S COPYRIGHT HOLDER +# This file is distributed under the same license as the com.github.lainsce.notejot package. +# NathanBnm, 2019. +# msgid "" msgstr "" "Project-Id-Version: com.github.lainsce.notejot\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-01-23 01:00-0200\n" -"PO-Revision-Date: 2018-01-13 15:43+0300\n" -"Last-Translator: Alain M. <[email protected]>\n" +"PO-Revision-Date: 2019-01-26 19:36+0100\n" +"Last-Translator: NathanBnm\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.7.1\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/MainWindow.vala:299 +#: src/MainWindow.vala:308 msgid "New note" msgstr "Nouvelle note" -#: src/MainWindow.vala:303 +#: src/MainWindow.vala:313 msgid "Delete note" msgstr "Effacer la note" -#: src/MainWindow.vala:310 +#: src/MainWindow.vala:327 msgid "White" msgstr "Blanc" -#: src/MainWindow.vala:320 +#: src/MainWindow.vala:338 msgid "Red" msgstr "Rouge" -#: src/MainWindow.vala:330 +#: src/MainWindow.vala:349 msgid "Orange" msgstr "Orange" -#: src/MainWindow.vala:340 +#: src/MainWindow.vala:360 msgid "Yellow" msgstr "Jaune" -#: src/MainWindow.vala:350 +#: src/MainWindow.vala:371 msgid "Green" msgstr "Vert" -#: src/MainWindow.vala:360 +#: src/MainWindow.vala:382 msgid "Blue" msgstr "Bleu" -#: src/MainWindow.vala:370 +#: src/MainWindow.vala:393 msgid "Indigo" msgstr "Indigo" -#: src/MainWindow.vala:380 -msgid "Violet" -msgstr "Violet" +#: src/MainWindow.vala:404 +msgid "Cocoa" +msgstr "Cacao" -#: src/MainWindow.vala:390 +#: src/MainWindow.vala:415 msgid "Slate" -msgstr "Gris" +msgstr "Ardoise" + +#: src/MainWindow.vala:432 +msgid "Note Color" +msgstr "Couleur de note" #: src/MainWindow.vala:423 msgid "Settings" -msgstr "Préférences" +msgstr "Paramètres" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/po/ru.po new/notejot-1.5.4/po/ru.po --- old/notejot-1.5.2/po/ru.po 1970-01-01 01:00:00.000000000 +0100 +++ new/notejot-1.5.4/po/ru.po 2019-01-27 17:13:30.000000000 +0100 @@ -0,0 +1,71 @@ +msgid "" +msgstr "" +"Project-Id-Version: com.github.lainsce.notejot\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-01-17 20:58+0400\n" +"PO-Revision-Date: 2019-01-17 21:49+0400\n" +"Last-Translator: Andrey Kultyapov <[email protected]>\n" +"Language-Team: \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: src/MainWindow.vala:308 +msgid "New note" +msgstr "Новый стикер" + +#: src/MainWindow.vala:313 +msgid "Delete note" +msgstr "Удалить стикер" + +#: src/MainWindow.vala:327 +msgid "White" +msgstr "Белый" + +#: src/MainWindow.vala:338 +msgid "Red" +msgstr "Красный" + +#: src/MainWindow.vala:349 +msgid "Orange" +msgstr "Оранжевый" + +#: src/MainWindow.vala:360 +msgid "Yellow" +msgstr "Жёлтый" + +#: src/MainWindow.vala:371 +msgid "Green" +msgstr "Зелёный" + +#: src/MainWindow.vala:382 +msgid "Blue" +msgstr "Синий" + +#: src/MainWindow.vala:393 +msgid "Indigo" +msgstr "Индиго" + +#: src/MainWindow.vala:404 +msgid "Cocoa" +msgstr "Какао" + +#: src/MainWindow.vala:415 +msgid "Slate" +msgstr "Синевато-серый" + +#: src/MainWindow.vala:432 +msgid "Note Color" +msgstr "Цвет стикера" + +#: src/MainWindow.vala:448 +msgid "Settings" +msgstr "Параметры" + +#~ msgid "Violet" +#~ msgstr "Фиолетовый" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/src/MainWindow.vala new/notejot-1.5.4/src/MainWindow.vala --- old/notejot-1.5.2/src/MainWindow.vala 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/src/MainWindow.vala 2019-01-27 17:13:30.000000000 +0100 @@ -20,29 +20,34 @@ namespace Notejot { public class MainWindow : Gtk.Window { private Gtk.Button delete_item; - private Gtk.TextView view = new Gtk.TextView (); + private new Gtk.SourceBuffer buffer; + private Gtk.SourceView view; private Gtk.HeaderBar header; private Gtk.ActionBar actionbar; - private bool pinned; private int uid; private static int uid_counter = 0; public string color = "#fff394"; public string selected_color_text = "#ad5f00"; + public bool pinned = false; public string content = ""; public string title_name = "Notejot"; public Notejot.EditableLabel label; public SimpleActionGroup actions { get; construct; } - public const string ACTION_PREFIX = "win."; - public const string ACTION_NEW = "action_new"; - public const string ACTION_DELETE = "action_delete"; + public const string ACTION_PREFIX = "win."; + public const string ACTION_NEW = "action_new"; + public const string ACTION_DELETE = "action_delete"; + public const string ACTION_UNDO = "action_undo"; + public const string ACTION_REDO = "action_redo"; public static Gee.MultiMap<string, string> action_accelerators = new Gee.HashMultiMap<string, string> (); private const GLib.ActionEntry[] action_entries = { - { ACTION_NEW, action_new }, - { ACTION_DELETE, action_delete } + { ACTION_NEW, action_new }, + { ACTION_DELETE, action_delete }, + { ACTION_UNDO, action_new }, + { ACTION_REDO, action_delete } }; public MainWindow (Gtk.Application app, Storage? storage) { @@ -57,6 +62,7 @@ } else { this.color = "#fff394"; this.selected_color_text = "#ad5f00"; + this.pinned = false; this.content = ""; this.set_position(Gtk.WindowPosition.CENTER); this.title_name = "Notejot"; @@ -82,9 +88,11 @@ applet_button.set_image (new Gtk.Image.from_icon_name ("view-pin-symbolic", Gtk.IconSize.SMALL_TOOLBAR)); if (pinned) { - applet_button.set_active (false); - } else { applet_button.set_active (true); + set_keep_below (pinned); + stick (); + } else { + applet_button.set_active (false); } applet_button.toggled.connect (() => { @@ -112,6 +120,9 @@ var scrolled = new Gtk.ScrolledWindow (null, null); scrolled.set_size_request (330,270); + buffer = new Gtk.SourceBuffer (null); + buffer.set_highlight_matching_brackets (false); + view = new Gtk.SourceView.with_buffer (buffer); view.bottom_margin = 10; view.buffer.text = this.content; view.get_style_context().add_class("notejot-view"); @@ -144,6 +155,21 @@ view.buffer.changed.connect (() => { update_storage (); }); + + key_press_event.connect ((e) => { + uint keycode = e.hardware_keycode; + if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) { + if (match_keycode (Gdk.Key.z, keycode)) { + action_undo (); + } + } + if ((e.state & Gdk.ModifierType.CONTROL_MASK + Gdk.ModifierType.SHIFT_MASK) != 0) { + if (match_keycode (Gdk.Key.z, keycode)) { + action_redo (); + } + } + return false; + }); } public new void set_title (string title) { @@ -492,8 +518,12 @@ private void init_from_storage(Storage storage) { this.color = storage.color; this.selected_color_text = storage.selected_color_text; + this.pinned = storage.pinned; this.content = storage.content; this.move((int)storage.x, (int)storage.y); + if ((int)storage.w != 0 && (int)storage.h != 0) { + this.resize ((int)storage.w, (int)storage.h); + } this.title_name = storage.title; set_title (this.title_name); } @@ -507,10 +537,19 @@ this.close (); } + private void action_undo () { + buffer.undo (); + } + + private void action_redo () { + buffer.redo (); + } + public Storage get_storage_note() { - int x, y; + int x, y, w, h; string color = this.color; string selected_color_text = this.selected_color_text; + bool pinned = this.pinned; Gtk.TextIter start,end; view.buffer.get_bounds (out start, out end); this.content = view.buffer.get_text (start, end, true); @@ -518,8 +557,26 @@ set_title (this.title_name); this.get_position (out x, out y); + this.get_size (out w, out h); + + return new Storage.from_storage(x, y, w, h, color, selected_color_text, pinned, content, title_name); + } + +#if VALA_0_42 + protected bool match_keycode (uint keyval, uint code) { +#else + protected bool match_keycode (int keyval, uint code) { +#endif + Gdk.KeymapKey [] keys; + Gdk.Keymap keymap = Gdk.Keymap.get_for_display (Gdk.Display.get_default ()); + if (keymap.get_entries_for_keyval (keyval, out keys)) { + foreach (var key in keys) { + if (code == key.keycode) + return true; + } + } - return new Storage.from_storage(x, y, color, selected_color_text, content, title_name); + return false; } public override bool delete_event (Gdk.EventAny event) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/src/Services/NoteManager.vala new/notejot-1.5.4/src/Services/NoteManager.vala --- old/notejot-1.5.2/src/Services/NoteManager.vala 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/src/Services/NoteManager.vala 2019-01-27 17:13:30.000000000 +0100 @@ -60,10 +60,16 @@ builder.add_int_value (note.x); builder.set_member_name ("y"); builder.add_int_value (note.y); + builder.set_member_name ("w"); + builder.add_int_value (note.w); + builder.set_member_name ("h"); + builder.add_int_value (note.h); builder.set_member_name ("color"); builder.add_string_value (note.color); builder.set_member_name ("selected_color_text"); builder.add_string_value (note.selected_color_text); + builder.set_member_name ("pinned"); + builder.add_boolean_value (note.pinned); builder.set_member_name ("content"); builder.add_string_value (note.content); builder.set_member_name ("title"); @@ -103,11 +109,14 @@ var node = item.get_object(); string color = node.get_string_member("color"); string selected_color_text = node.get_string_member("selected_color_text"); + bool pinned = node.get_boolean_member("pinned"); int64 x = node.get_int_member("x"); int64 y = node.get_int_member("y"); + int64 w = node.get_int_member("w"); + int64 h = node.get_int_member("h"); string content = node.get_string_member("content"); string title = node.get_string_member("title"); - Storage stored_note = new Storage.from_storage(x, y, color, selected_color_text, content, title); + Storage stored_note = new Storage.from_storage(x, y, w, h, color, selected_color_text, pinned, content, title); stored_notes.add(stored_note); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.5.2/src/Services/Storage.vala new/notejot-1.5.4/src/Services/Storage.vala --- old/notejot-1.5.2/src/Services/Storage.vala 2018-11-22 14:51:08.000000000 +0100 +++ new/notejot-1.5.4/src/Services/Storage.vala 2019-01-27 17:13:30.000000000 +0100 @@ -22,19 +22,25 @@ public class Storage : Object { public string color; public string selected_color_text; + public bool pinned; public int64 x; public int64 y; + public int64 w; + public int64 h; public string content; public string title; public Storage() {} - public Storage.from_storage(int64 x, int64 y, string color, string selected_color_text, string message, string title) { + public Storage.from_storage(int64 x, int64 y, int64 w, int64 h, string color, string selected_color_text, bool pinned, string message, string title) { this.color = color; this.selected_color_text = selected_color_text; + this.pinned = pinned; this.content = message; this.x = x; this.y = y; + this.w = w; + this.h = h; this.title = title; } }
