Hello community, here is the log from the commit of package notejot for openSUSE:Factory checked in at 2018-09-17 14:26:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notejot (Old) and /work/SRC/openSUSE:Factory/.notejot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notejot" Mon Sep 17 14:26:33 2018 rev:6 rq:635879 version:1.4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/notejot/notejot.changes 2018-08-03 12:37:39.139600804 +0200 +++ /work/SRC/openSUSE:Factory/.notejot.new/notejot.changes 2018-09-17 14:26:40.343770588 +0200 @@ -1,0 +2,7 @@ +Sat Sep 8 16:52:51 UTC 2018 - Alexei Podvalsky <[email protected]> + +- Update to 1.4.5: + * fix an oops + * new UI, same ol' app. + +------------------------------------------------------------------- Old: ---- notejot-1.4.2.tar.gz New: ---- notejot-1.4.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notejot.spec ++++++ --- /var/tmp/diff_new_pack.gRuOyU/_old 2018-09-17 14:26:42.543768689 +0200 +++ /var/tmp/diff_new_pack.gRuOyU/_new 2018-09-17 14:26:42.547768686 +0200 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: notejot -Version: 1.4.2 +Version: 1.4.5 Release: 0 Summary: A Sticky Note App License: GPL-3.0-only @@ -69,8 +69,12 @@ done popd +# Switch to the default system font +find %{buildroot} -type f -name "*.ttf" -delete -print + %files -f dir.lst -%doc AUTHORS LICENSE README.md +%license LICENSE +%doc AUTHORS README.md %{_bindir}/com.github.lainsce.notejot %{_datadir}/applications/com.github.lainsce.notejot.desktop %{_datadir}/glib-2.0/schemas/com.github.lainsce.notejot.gschema.xml ++++++ notejot-1.4.2.tar.gz -> notejot-1.4.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/README.md new/notejot-1.4.5/README.md --- old/notejot-1.4.2/README.md 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/README.md 2018-09-08 03:49:29.000000000 +0200 @@ -9,6 +9,10 @@  +## License + +Fonts under the `/data/font` directory are under [License: SIL OFL 1.1](http://scripts.sil.org/OFL), also copied there in full. + ## Donations Would you like to support the development of this app to new heights? Then: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/data/com.github.lainsce.notejot.appdata.xml new/notejot-1.4.5/data/com.github.lainsce.notejot.appdata.xml --- old/notejot-1.4.2/data/com.github.lainsce.notejot.appdata.xml 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/data/com.github.lainsce.notejot.appdata.xml 2018-09-08 03:49:29.000000000 +0200 @@ -52,6 +52,26 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> + <release version="1.4.2" date="2018-09-14"> + <description> + <p>Release: New Note Tech</p> + <ul> + <li>New font, as requested by users.</li> + <li>Some small UI fixes.</li> + </ul> + </description> + </release> + <release version="1.4.1" date="2018-09-07"> + <description> + <p>Release: New Note Tech</p> + <ul> + <li>New User Interface.</li> + <li>New font.</li> + <li>Same ol' notes app.</li> + </ul> + <p><b>Note:</b> You should first backup your notes' file before updating, you could lose data due to the new UI's backend.</p> + </description> + </release> <release version="1.4.0" date="2018-07-04"> <description> <p>Release: Hello Juno!</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/data/com.github.lainsce.notejot.desktop new/notejot-1.4.5/data/com.github.lainsce.notejot.desktop --- old/notejot-1.4.2/data/com.github.lainsce.notejot.desktop 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/data/com.github.lainsce.notejot.desktop 2018-09-08 03:49:29.000000000 +0200 @@ -4,6 +4,7 @@ Comment[lt]=Greitai užsirašykite savo idėjas Comment[pt_BR]=Anote suas ideias Comment[pl]=Notuj swoje pomysły +Comment[cs]=Zapiš si své nápady Exec=com.github.lainsce.notejot Icon=com.github.lainsce.notejot Keywords=Text;Plain;Plaintext;Notepad; @@ -16,3 +17,4 @@ [Desktop Action NewNote] Exec=com.github.lainsce.notejot --new-note Name=New note... +Name[cs]=Nová poznámka... Binary files old/notejot-1.4.2/data/font/Lavi.ttf and new/notejot-1.4.5/data/font/Lavi.ttf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/notejot-1.4.2/data/font/SIL Open Font License.txt" "new/notejot-1.4.5/data/font/SIL Open Font License.txt" --- "old/notejot-1.4.2/data/font/SIL Open Font License.txt" 1970-01-01 01:00:00.000000000 +0100 +++ "new/notejot-1.4.5/data/font/SIL Open Font License.txt" 2018-09-08 03:49:29.000000000 +0200 @@ -0,0 +1,90 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANT-ABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/data/meson.build new/notejot-1.4.5/data/meson.build --- old/notejot-1.4.2/data/meson.build 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/data/meson.build 2018-09-08 03:49:29.000000000 +0200 @@ -28,3 +28,8 @@ meson.project_name() + '.appdata.xml', install_dir: join_paths(get_option('datadir'), 'metainfo') ) + +install_data( + join_paths('font', 'Lavi.ttf'), + install_dir: join_paths(get_option('datadir'), 'fonts', 'truetype', 'quilt') +) Binary files old/notejot-1.4.2/data/shot.png and new/notejot-1.4.5/data/shot.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/debian/changelog new/notejot-1.4.5/debian/changelog --- old/notejot-1.4.2/debian/changelog 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/debian/changelog 2018-09-08 03:49:29.000000000 +0200 @@ -1,3 +1,15 @@ +com.github.lainsce.notejot (1.4.2) xenial; urgency=low + + * New stuff, does anyone read this? + + -- Lains <[email protected]> Fri, 07 Sep 2018 13:04:00 -0300 + +com.github.lainsce.notejot (1.4.1) xenial; urgency=low + + * New UI and stuff. + + -- Lains <[email protected]> Fri, 07 Sep 2018 13:04:00 -0300 + com.github.lainsce.notejot (1.4.0) xenial; urgency=low * Fixed deleted notes taking others with them. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/meson.build new/notejot-1.4.5/meson.build --- old/notejot-1.4.2/meson.build 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/meson.build 2018-09-08 03:49:29.000000000 +0200 @@ -1,6 +1,6 @@ # Name our project project('com.github.lainsce.notejot', ['vala', 'c'], - version: '1.4.0' + version: '1.4.2' ) # Import main lib files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/po/LINGUAS new/notejot-1.4.5/po/LINGUAS --- old/notejot-1.4.2/po/LINGUAS 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/po/LINGUAS 2018-09-08 03:49:29.000000000 +0200 @@ -7,3 +7,4 @@ fr ca ja +cs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/po/cs.po new/notejot-1.4.5/po/cs.po --- old/notejot-1.4.2/po/cs.po 1970-01-01 01:00:00.000000000 +0100 +++ new/notejot-1.4.5/po/cs.po 2018-09-08 03:49:29.000000000 +0200 @@ -0,0 +1,65 @@ +# +# Jan Marek <[email protected]>, 2018. +# +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-07-21 18:20+0200\n" +"Last-Translator: Jan Marek <[email protected]>\n" +"Language-Team: čeština <>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Gtranslator 2.91.7\n" + +#: src/MainWindow.vala:299 +msgid "New note" +msgstr "Nová poznámka" + +#: src/MainWindow.vala:303 +msgid "Delete note" +msgstr "Smazat poznámku" + +#: src/MainWindow.vala:310 +msgid "White" +msgstr "Bílá" + +#: src/MainWindow.vala:320 +msgid "Red" +msgstr "Červená" + +#: src/MainWindow.vala:330 +msgid "Orange" +msgstr "Oranžová" + +#: src/MainWindow.vala:340 +msgid "Yellow" +msgstr "Žlutá" + +#: src/MainWindow.vala:350 +msgid "Green" +msgstr "Zelená" + +#: src/MainWindow.vala:360 +msgid "Blue" +msgstr "Modrá" + +#: src/MainWindow.vala:370 +msgid "Indigo" +msgstr "Indigová" + +#: src/MainWindow.vala:380 +msgid "Violet" +msgstr "Fialová" + +#: src/MainWindow.vala:390 +msgid "Slate" +msgstr "Břidlicová" + +#: src/MainWindow.vala:423 +msgid "Settings" +msgstr "Nastavení" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/src/EditableLabel.vala new/notejot-1.4.5/src/EditableLabel.vala --- old/notejot-1.4.2/src/EditableLabel.vala 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/src/EditableLabel.vala 2018-09-08 03:49:29.000000000 +0200 @@ -64,11 +64,13 @@ string style = null; var css_provider = new Gtk.CssProvider(); - if (Gtk.get_minor_version() < 20) { - style = ".notejot-label { font-weight: 700; color: @textColorPrimary; } .notejot-label:backdrop { color: mix (@textColorPrimary, @colorPrimary, 0.3); }"; - } else { - style = ".notejot-label { font-weight: 700; color: @textColorPrimary; } .notejot-label:backdrop { color: mix (@textColorPrimary, @colorPrimary, 0.3); }"; + style = """ + .notejot-label { + font-weight: 700; } + .notejot-label:backdrop { + color: mix (@textColorPrimary, @colorPrimary, 0.3); + }"""; try { css_provider.load_from_data(style, -1); @@ -103,6 +105,7 @@ grid = new Gtk.Grid (); grid.valign = Gtk.Align.CENTER; grid.column_spacing = 6; + grid.hexpand = false; grid.add (dummy_spacer); grid.add (title); grid.add (button_revealer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/src/MainWindow.vala new/notejot-1.4.5/src/MainWindow.vala --- old/notejot-1.4.2/src/MainWindow.vala 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/src/MainWindow.vala 2018-09-08 03:49:29.000000000 +0200 @@ -19,12 +19,14 @@ namespace Notejot { public class MainWindow : Gtk.Window { - private Gtk.ModelButton delete_item; + private Gtk.Button delete_item; private Gtk.SourceView view = new Gtk.SourceView (); private Gtk.HeaderBar header; + private Gtk.ActionBar actionbar; private int uid; private static int uid_counter = 0; public string color = "#fff394"; + public string selected_color_text = "#333333"; public string content = ""; public string title_name = "Notejot"; public Notejot.EditableLabel label; @@ -56,6 +58,7 @@ init_from_storage(storage); } else { this.color = "#fff394"; + this.selected_color_text = "#ad5f00"; this.content = ""; this.set_position(Gtk.WindowPosition.CENTER); this.title_name = "Notejot"; @@ -63,26 +66,33 @@ } this.get_style_context().add_class("rounded"); + this.get_style_context().add_class("default-decoration"); + this.get_style_context().add_class("notejot-window"); this.uid = uid_counter++; update_theme(); header = new Gtk.HeaderBar(); header.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT); + header.get_style_context().add_class("notejot-title"); header.has_subtitle = false; - create_app_menu (); header.set_show_close_button (true); label = new Notejot.EditableLabel (this.title_name); header.set_custom_title(label); this.set_titlebar(header); + actionbar = new Gtk.ActionBar (); + actionbar.get_style_context().add_class("notejot-bar"); + create_actionbar (); + create_app_menu (); + var scrolled = new Gtk.ScrolledWindow (null, null); - this.add (scrolled); view.bottom_margin = 10; view.buffer.text = this.content; - view.expand = false; + view.get_style_context().add_class("notejot-view"); + view.expand = true; view.left_margin = 10; view.margin = 2; view.right_margin = 10; @@ -91,6 +101,14 @@ scrolled.add (view); this.show_all(); + var grid = new Gtk.Grid (); + grid.orientation = Gtk.Orientation.VERTICAL; + grid.expand = true; + grid.add (scrolled); + grid.add (actionbar); + grid.show_all (); + this.add (grid); + focus_out_event.connect (() => { update_storage (); return false; @@ -121,126 +139,73 @@ string style = null; string selected_color = this.color; - if (Gtk.get_minor_version() < 20) { - style = (N_(""" - @define-color textColorPrimary #1a1a1a; + style = (N_(""" + @define-color textColorPrimary #323232; .mainwindow-%d { background-color: %s; - box-shadow: #1a1a1a; } - GtkTextView.view { + .notejot-view:selected { color: @textColorPrimary; - font-size: 11px; } - GtkTextView.view:selected { + .notejot-view:selected { color: #FFFFFF; background-color: #64baff; - font-size: 11px } - GtkEntry.flat { + entry.flat { background: transparent; } - .window-%d GtkTextView, - .window-%d GtkHeaderBar { - background-color: %s; - border-bottom-color: %s; - box-shadow: none; - } - - .color-button { - border-radius: 50%; - box-shadow: - inset 0 1px 0 0 alpha (@inset_dark_color, 0.7), - inset 0 0 0 1px alpha (@inset_dark_color, 0.3), - 0 1px 0 0 alpha (@bg_highlight_color, 0.3); - } - - .color-button:focus { - border-color: @colorAccent; - } - - .color-slate { - background-color: #a5b3bc; - } - - .color-white { - background-color: #fafafa; + .window-%d .notejot-title image, + .window-%d .notejot-label { + color: %s; + font-family: 'Lavi', fantasy; } - .color-red { - background-color: #ff9c92; - } - - .color-orange { - background-color: #ffc27d; - } - - .color-yellow { - background-color: #fff394; - } - - .color-green { - background-color: #d1ff82; - } - - .color-blue { - background-color: #8cd5ff; - } - - .color-indigo { - background-color: #aca9fd; - } - - .color-violet { - background-color: #e29ffc; - } - """)).printf(uid, selected_color, uid, uid, selected_color, selected_color); - } else { - style = (N_(""" - @define-color textColorPrimary #1a1a1a; - - .mainwindow-%d { + .window-%d .notejot-bar { + color: %s; background-color: %s; - box-shadow: #1a1a1a; - } - - textview.view:selected { - color: @textColorPrimary; - font-size: 14px; - } - - textview.view:selected { - color: #FFFFFF; - background-color: #64baff; - font-size: 14px + border-top-color: %s; + box-shadow: none; + background-image: none; + padding: 3px; } - entry.flat { - background: transparent; + .window-%d .notejot-bar image { + color: %s; + padding: 3px; + background-image: none; } - .window-%d textview.view text, - .window-%d headerbar { + .window-%d .notejot-view, + .window-%d .notejot-view text, + .window-%d .notejot-title { background-color: %s; + background-image: none; border-bottom-color: %s; + font-family: 'Lavi', fantasy; + font-weight: 300; + font-size: 1.33em; + color: #000; box-shadow: none; } .color-button { border-radius: 50%; + background-image: none; + border: 2px solid alpha(@BLACK_300, 0.3); box-shadow: inset 0 1px 0 0 alpha (@inset_dark_color, 0.7), inset 0 0 0 1px alpha (@inset_dark_color, 0.3), 0 1px 0 0 alpha (@bg_highlight_color, 0.3); } - .color-button:focus { - border-color: @colorAccent; + .color-button:hover, + .color_button:focus { + border: 2px solid @BLACK_300; } .color-slate { @@ -252,7 +217,7 @@ } .color-red { - background-color: #ff9c92; + background-color: #ff8c82; } .color-orange { @@ -275,11 +240,10 @@ background-color: #aca9fd; } - .color-violet { - background-color: #e29ffc; + .color-cocoa { + background-color: #a3907c; } - """)).printf(uid, selected_color, uid, uid, selected_color, selected_color); - } + """)).printf(uid, selected_color, uid, uid, selected_color_text, uid, selected_color_text, selected_color, selected_color, uid, selected_color_text, uid, uid, uid, selected_color, selected_color); try { css_provider.load_from_data(style, -1); @@ -294,16 +258,24 @@ ); } - private void create_app_menu() { - var new_item = new Gtk.ModelButton (); - new_item.text = (_("New note")); + private void create_actionbar () { + var new_item = new Gtk.Button (); + new_item.tooltip_text = (_("New note")); + new_item.set_image (new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR)); new_item.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_NEW; - delete_item = new Gtk.ModelButton (); - delete_item.text = (_("Delete note")); + delete_item = new Gtk.Button (); + delete_item.tooltip_text = (_("Delete note")); + delete_item.set_image (new Gtk.Image.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.SMALL_TOOLBAR)); delete_item.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_DELETE; + actionbar.pack_start (new_item); + actionbar.pack_start (delete_item); + } + + private void create_app_menu () { var color_button_white = new Gtk.Button (); + color_button_white.has_focus = false; color_button_white.halign = Gtk.Align.CENTER; color_button_white.height_request = 24; color_button_white.width_request = 24; @@ -314,6 +286,7 @@ color_button_white_context.add_class ("color-white"); var color_button_red = new Gtk.Button (); + color_button_red.has_focus = false; color_button_red.halign = Gtk.Align.CENTER; color_button_red.height_request = 24; color_button_red.width_request = 24; @@ -324,6 +297,7 @@ color_button_red_context.add_class ("color-red"); var color_button_orange = new Gtk.Button (); + color_button_orange.has_focus = false; color_button_orange.halign = Gtk.Align.CENTER; color_button_orange.height_request = 24; color_button_orange.width_request = 24; @@ -334,6 +308,7 @@ color_button_orange_context.add_class ("color-orange"); var color_button_yellow = new Gtk.Button (); + color_button_yellow.has_focus = false; color_button_yellow.halign = Gtk.Align.CENTER; color_button_yellow.height_request = 24; color_button_yellow.width_request = 24; @@ -344,6 +319,7 @@ color_button_yellow_context.add_class ("color-yellow"); var color_button_green = new Gtk.Button (); + color_button_green.has_focus = false; color_button_green.halign = Gtk.Align.CENTER; color_button_green.height_request = 24; color_button_green.width_request = 24; @@ -354,6 +330,7 @@ color_button_green_context.add_class ("color-green"); var color_button_blue = new Gtk.Button (); + color_button_blue.has_focus = false; color_button_blue.halign = Gtk.Align.CENTER; color_button_blue.height_request = 24; color_button_blue.width_request = 24; @@ -364,6 +341,7 @@ color_button_blue_context.add_class ("color-blue"); var color_button_indigo = new Gtk.Button (); + color_button_indigo.has_focus = false; color_button_indigo.halign = Gtk.Align.CENTER; color_button_indigo.height_request = 24; color_button_indigo.width_request = 24; @@ -373,17 +351,19 @@ color_button_indigo_context.add_class ("color-button"); color_button_indigo_context.add_class ("color-indigo"); - var color_button_violet = new Gtk.Button (); - color_button_violet.halign = Gtk.Align.CENTER; - color_button_violet.height_request = 24; - color_button_violet.width_request = 24; - color_button_violet.tooltip_text = _("Violet"); - - var color_button_violet_context = color_button_violet.get_style_context (); - color_button_violet_context.add_class ("color-button"); - color_button_violet_context.add_class ("color-violet"); + var color_button_cocoa = new Gtk.Button (); + color_button_cocoa.has_focus = false; + color_button_cocoa.halign = Gtk.Align.CENTER; + color_button_cocoa.height_request = 24; + color_button_cocoa.width_request = 24; + color_button_cocoa.tooltip_text = _("Cocoa"); + + var color_button_cocoa_context = color_button_cocoa.get_style_context (); + color_button_cocoa_context.add_class ("color-button"); + color_button_cocoa_context.add_class ("color-cocoa"); var color_button_slate = new Gtk.Button (); + color_button_slate.has_focus = false; color_button_slate.halign = Gtk.Align.CENTER; color_button_slate.height_request = 24; color_button_slate.width_request = 24; @@ -394,8 +374,6 @@ color_button_slate_context.add_class ("color-slate"); var color_button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6); - color_button_box.margin_start = 6; - color_button_box.margin_end = 6; color_button_box.pack_start (color_button_white, false, true, 0); color_button_box.pack_start (color_button_red, false, true, 0); color_button_box.pack_start (color_button_orange, false, true, 0); @@ -403,17 +381,18 @@ color_button_box.pack_start (color_button_green, false, true, 0); color_button_box.pack_start (color_button_blue, false, true, 0); color_button_box.pack_start (color_button_indigo, false, true, 0); - color_button_box.pack_start (color_button_violet, false, true, 0); + color_button_box.pack_start (color_button_cocoa, false, true, 0); color_button_box.pack_start (color_button_slate, false, true, 0); + var color_button_label = new Granite.HeaderLabel (_("Note Color")); + var setting_grid = new Gtk.Grid (); - setting_grid.margin = 6; + setting_grid.margin = 12; setting_grid.column_spacing = 6; - setting_grid.row_spacing = 12; + setting_grid.row_spacing = 6; setting_grid.orientation = Gtk.Orientation.VERTICAL; - setting_grid.attach (new_item, 0, 0, 1, 1); + setting_grid.attach (color_button_label, 0, 0, 1, 1); setting_grid.attach (color_button_box, 0, 1, 1, 1); - setting_grid.attach (delete_item, 0, 2, 1, 1); setting_grid.show_all (); var popover = new Gtk.Popover (null); @@ -427,63 +406,73 @@ color_button_white.clicked.connect (() => { this.color = "#F5F5F5"; + this.selected_color_text = "#666666"; update_theme(); ((Application)this.application).update_storage(); }); color_button_red.clicked.connect (() => { - this.color = "#ff9c92"; + this.color = "#ff8c82"; + this.selected_color_text = "#7a0000"; update_theme(); ((Application)this.application).update_storage(); }); color_button_orange.clicked.connect (() => { this.color = "#ffc27d"; + this.selected_color_text = "#a62100"; update_theme(); ((Application)this.application).update_storage(); }); color_button_yellow.clicked.connect (() => { this.color = "#fff394"; + this.selected_color_text = "#ad5f00"; update_theme(); ((Application)this.application).update_storage(); }); color_button_green.clicked.connect (() => { this.color = "#d1ff82"; + this.selected_color_text = "#206b00"; update_theme(); ((Application)this.application).update_storage(); }); color_button_blue.clicked.connect (() => { this.color = "#8cd5ff"; + this.selected_color_text = "#002e99"; update_theme(); ((Application)this.application).update_storage(); }); color_button_indigo.clicked.connect (() => { this.color = "#aca9fd"; + this.selected_color_text = "#452981"; update_theme(); ((Application)this.application).update_storage(); }); - color_button_violet.clicked.connect (() => { - this.color = "#e29ffc"; + color_button_cocoa.clicked.connect (() => { + this.color = "#a3907c"; + this.selected_color_text = "#3d211b"; update_theme(); ((Application)this.application).update_storage(); }); color_button_slate.clicked.connect (() => { this.color = "#a5b3bc"; + this.selected_color_text = "#0e141f"; update_theme(); ((Application)this.application).update_storage(); }); - header.pack_end(app_button); + actionbar.pack_end (app_button); } private void init_from_storage(Storage storage) { this.color = storage.color; + this.selected_color_text = storage.selected_color_text; this.content = storage.content; this.move((int)storage.x, (int)storage.y); this.title_name = storage.title; @@ -502,6 +491,7 @@ public Storage get_storage_note() { int x, y; string color = this.color; + string selected_color_text = this.selected_color_text; Gtk.TextIter start,end; view.buffer.get_bounds (out start, out end); this.content = view.buffer.get_text (start, end, true); @@ -510,7 +500,7 @@ this.get_position (out x, out y); - return new Storage.from_storage(x, y, color, content, title_name); + return new Storage.from_storage(x, y, color, selected_color_text, content, title_name); } public override bool delete_event (Gdk.EventAny event) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/src/Services/NoteManager.vala new/notejot-1.4.5/src/Services/NoteManager.vala --- old/notejot-1.4.2/src/Services/NoteManager.vala 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/src/Services/NoteManager.vala 2018-09-08 03:49:29.000000000 +0200 @@ -62,6 +62,8 @@ builder.add_int_value (note.y); 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 ("content"); builder.add_string_value (note.content); builder.set_member_name ("title"); @@ -100,11 +102,12 @@ foreach (var item in array.get_elements()) { var node = item.get_object(); string color = node.get_string_member("color"); + string selected_color_text = node.get_string_member("selected_color_text"); int64 x = node.get_int_member("x"); int64 y = node.get_int_member("y"); string content = node.get_string_member("content"); string title = node.get_string_member("title"); - Storage stored_note = new Storage.from_storage(x, y, color, content, title); + Storage stored_note = new Storage.from_storage(x, y, color, selected_color_text, content, title); stored_notes.add(stored_note); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notejot-1.4.2/src/Services/Storage.vala new/notejot-1.4.5/src/Services/Storage.vala --- old/notejot-1.4.2/src/Services/Storage.vala 2018-07-05 00:01:36.000000000 +0200 +++ new/notejot-1.4.5/src/Services/Storage.vala 2018-09-08 03:49:29.000000000 +0200 @@ -21,6 +21,7 @@ namespace Notejot { public class Storage : Object { public string color; + public string selected_color_text; public int64 x; public int64 y; public string content; @@ -28,8 +29,9 @@ public Storage() {} - public Storage.from_storage(int64 x, int64 y, string color, string message, string title) { + public Storage.from_storage(int64 x, int64 y, string color, string selected_color_text, string message, string title) { this.color = color; + this.selected_color_text = selected_color_text; this.content = message; this.x = x; this.y = y;
