Hello community, here is the log from the commit of package quilter for openSUSE:Factory checked in at 2019-06-12 13:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quilter (Old) and /work/SRC/openSUSE:Factory/.quilter.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quilter" Wed Jun 12 13:19:03 2019 rev:15 rq:709233 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/quilter/quilter.changes 2019-06-05 11:46:46.358986633 +0200 +++ /work/SRC/openSUSE:Factory/.quilter.new.4811/quilter.changes 2019-06-12 13:19:04.620557745 +0200 @@ -1,0 +2,9 @@ +Mon Jun 3 12:06:11 UTC 2019 - Alexei Podvalsky <[email protected]> + +- Update to 1.9.0: + * fix flatpak + * 1.8.7 - Fix local image syntax with instead of + * 1.8.6 - Even more tiny fixes on the Sidebar + * Update com.github.lainsce.quilter.appdata.xml.in + +------------------------------------------------------------------- Old: ---- quilter-1.8.5.tar.gz New: ---- quilter-1.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quilter.spec ++++++ --- /var/tmp/diff_new_pack.pt5F5t/_old 2019-06-12 13:19:05.036557554 +0200 +++ /var/tmp/diff_new_pack.pt5F5t/_new 2019-06-12 13:19:05.040557553 +0200 @@ -17,7 +17,7 @@ Name: quilter -Version: 1.8.5 +Version: 1.9.0 Release: 0 Summary: Writing application License: GPL-3.0-only ++++++ quilter-1.8.5.tar.gz -> quilter-1.9.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/data/com.github.lainsce.quilter.appdata.xml.in new/quilter-1.9.0/data/com.github.lainsce.quilter.appdata.xml.in --- old/quilter-1.8.5/data/com.github.lainsce.quilter.appdata.xml.in 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/data/com.github.lainsce.quilter.appdata.xml.in 2019-05-31 02:35:56.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>com.github.lainsce.quilter.desktop</id> + <id>com.github.lainsce.quilter</id> <metadata_license>CC0</metadata_license> <project_license>GPL-3.0+</project_license> <name>Quilter</name> @@ -55,7 +55,31 @@ <content_attribute id="money-gambling">none</content_attribute> </content_rating> <releases> - <release version="1.8.5" date="2019-05-31"> + <release version="1.9.0" date="2019-05-30"> + <description> + <p>Release: I Said Fixes!</p> + <ul> + <li>Fixed: Backend technical confusion with files.</li> + </ul> + </description> + </release> + <release version="1.8.7" date="2019-05-30"> + <description> + <p>Release: Did Anyone Say Minor Fixes?</p> + <ul> + <li>Fixed: Local image syntax wrongly picked up with links or two : in succession.</li> + </ul> + </description> + </release> + <release version="1.8.6" date="2019-05-30"> + <description> + <p>Release: Even MORE Minor Fixes</p> + <ul> + <li>Other tiny fixes with the sidebar.</li> + </ul> + </description> + </release> + <release version="1.8.5" date="2019-05-30"> <description> <p>Release: Minor Fixes</p> <ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/data/com.github.lainsce.quilter.gschema.xml new/quilter-1.9.0/data/com.github.lainsce.quilter.gschema.xml --- old/quilter-1.8.5/data/com.github.lainsce.quilter.gschema.xml 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/data/com.github.lainsce.quilter.gschema.xml 2019-05-31 02:35:56.000000000 +0200 @@ -61,7 +61,7 @@ <description>The c.w.f. in Quilter</description> </key> <key name="last-files" type="as"> - <default>['']</default> + <default>[]</default> <summary>Last opened files</summary> <description>The last opened files in Quilter</description> </key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/flatpak/com.github.lainsce.quilter.json new/quilter-1.9.0/flatpak/com.github.lainsce.quilter.json --- old/quilter-1.8.5/flatpak/com.github.lainsce.quilter.json 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/flatpak/com.github.lainsce.quilter.json 2019-05-31 02:35:56.000000000 +0200 @@ -82,8 +82,8 @@ "sources" : [ { "type" : "archive", - "url" : "https://github.com/lainsce/quilter/archive/1.8.3.zip";, - "sha256" : "bd4c8b5f319d98b10c06dd2fb6dc7bebd4aaf964c55543bb48da14034e4d6f4a" + "url" : "https://github.com/lainsce/quilter/archive/1.8.7.zip";, + "sha256" : "f4d563df26a21463006cd6e005173352cca7b0d43046ad154a67e4b7e195bb5d" } ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/meson.build new/quilter-1.9.0/meson.build --- old/quilter-1.8.5/meson.build 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/meson.build 2019-05-31 02:35:56.000000000 +0200 @@ -1,6 +1,6 @@ # Name our project project('com.github.lainsce.quilter', ['vala', 'c'], - version: '1.8.5' + version: '1.9.0' ) # Import main lib files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/MainWindow.vala new/quilter-1.9.0/src/MainWindow.vala --- old/quilter-1.8.5/src/MainWindow.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/MainWindow.vala 2019-05-31 02:35:56.000000000 +0200 @@ -95,13 +95,13 @@ sidebar.get_file_contents_as_items (); sidebar.view.expand_all (); if (settings.current_file == "" || toolbar.get_subtitle () == (_("No Documents Open"))) { - Widgets.EditView.buffer.text = ""; + edit_view_content.buffer.text = ""; } settings.changed.connect (on_settings_changed); on_settings_changed (); - Widgets.EditView.buffer.changed.connect (() => { + edit_view_content.buffer.changed.connect (() => { render_func (); update_count (); @@ -113,7 +113,7 @@ Services.FileManager.get_cache_path (); sidebar.add_file (Services.FileManager.get_cache_path ()); settings.current_file = Services.FileManager.get_cache_path (); - Widgets.EditView.buffer.text = ""; + edit_view_content.buffer.text = ""; sidebar.view.expand_all (); sidebar.get_file_contents_as_items (); sidebar.view.expand_all (); @@ -155,12 +155,12 @@ } if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) { if (match_keycode (Gdk.Key.z, keycode)) { - Widgets.EditView.buffer.undo (); + edit_view_content.buffer.undo (); } } if ((e.state & Gdk.ModifierType.CONTROL_MASK + Gdk.ModifierType.SHIFT_MASK) != 0) { if (match_keycode (Gdk.Key.z, keycode)) { - Widgets.EditView.buffer.redo (); + edit_view_content.buffer.redo (); } } if (match_keycode (Gdk.Key.F11, keycode)) { @@ -268,7 +268,7 @@ edit_view.add (edit_view_content); preview_view = new Gtk.ScrolledWindow (null, null); - preview_view_content = new Widgets.Preview (); + preview_view_content = new Widgets.Preview (this, edit_view_content.buffer); preview_view.add (preview_view_content); stack = new Gtk.Stack (); @@ -298,7 +298,7 @@ actions.add_action_entries (action_entries, this); insert_action_group ("win", actions); - statusbar = new Widgets.StatusBar (); + statusbar = new Widgets.StatusBar (edit_view_content.buffer); sidebar = new Widgets.SideBar (this); sidebar.row_selected.connect (on_sidebar_row_selected); sidebar.save_as.connect (() => on_save_as ()); @@ -341,7 +341,7 @@ } this.window_position = Gtk.WindowPosition.CENTER; - this.show_all (); + //this.show_all (); } #if VALA_0_42 @@ -423,9 +423,9 @@ } private void render_func () { - if (Widgets.EditView.buffer.get_modified () == true) { + if (edit_view_content.buffer.get_modified () == true) { preview_view_content.update_html_view (); - Widgets.EditView.buffer.set_modified (false); + edit_view_content.buffer.set_modified (false); } } @@ -488,7 +488,7 @@ Services.FileManager.get_cache_path (); sidebar.add_file (Services.FileManager.get_cache_path ()); settings.current_file = Services.FileManager.get_cache_path (); - Widgets.EditView.buffer.text = ""; + edit_view_content.buffer.text = ""; sidebar.store.clear (); sidebar.get_file_contents_as_items (); sidebar.view.expand_all (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Plugins/Image.vala new/quilter-1.9.0/src/Plugins/Image.vala --- old/quilter-1.8.5/src/Plugins/Image.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Plugins/Image.vala 2019-05-31 02:35:56.000000000 +0200 @@ -20,7 +20,7 @@ */ public class Quilter.Image : Plugins.Plugin { - private PatternSpec spec = new PatternSpec ("*:*:*"); + private PatternSpec spec = new PatternSpec ("*|*|*"); construct {} @@ -59,4 +59,4 @@ return build; } -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Services/FileManager.vala new/quilter-1.9.0/src/Services/FileManager.vala --- old/quilter-1.8.5/src/Services/FileManager.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Services/FileManager.vala 2019-05-31 02:35:56.000000000 +0200 @@ -69,8 +69,8 @@ } try { GLib.FileUtils.get_contents (file_path, out text); - Widgets.EditView.buffer.text = text; - Widgets.EditView.buffer.set_modified (false); + win.edit_view_content.buffer.text = text; + win.edit_view_content.buffer.set_modified (false); file = null; } catch (Error e) { warning ("Error: %s", e.message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/Cheatsheet.vala new/quilter-1.9.0/src/Widgets/Cheatsheet.vala --- old/quilter-1.8.5/src/Widgets/Cheatsheet.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/Cheatsheet.vala 2019-05-31 02:35:56.000000000 +0200 @@ -118,7 +118,7 @@ var special_header = new Granite.HeaderLabel (_("Special")); var codeblocks_label = new Label (_("```This is a code block```")); var hr_label = new Label (_("This creates a horizontal rule → ---")); - var sp_image_label = new Label (_("This embeds a local image → : Folder/Image.png :")); + var sp_image_label = new Label (_("This embeds a local image → | Folder/Image.png |")); var sp_file_label = new Label (_("This embeds a local Markdown file → % Folder/File.md %")); links_grid.attach (link_header, 0, 0, 5, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/SideBar.vala new/quilter-1.9.0/src/Widgets/SideBar.vala --- old/quilter-1.8.5/src/Widgets/SideBar.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/SideBar.vala 2019-05-31 02:35:56.000000000 +0200 @@ -58,6 +58,7 @@ } public SideBar (MainWindow win) { + var settings = AppSettings.get_default (); this.win = win; no_files = new Gtk.Label (_("No files…")); @@ -81,8 +82,10 @@ stack.add_titled (sidebar_outline (), "outline", _("Outline")); stack.child_set_property (outline_grid, "icon-name", "format-justify-left-symbolic"); - get_file_contents_as_items (); - view.expand_all (); + if (settings.current_file != "") { + get_file_contents_as_items (); + view.expand_all (); + } var grid = new Gtk.Grid (); var g_context = grid.get_style_context (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/SideBarBox.vala new/quilter-1.9.0/src/Widgets/SideBarBox.vala --- old/quilter-1.8.5/src/Widgets/SideBarBox.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/SideBarBox.vala 2019-05-31 02:35:56.000000000 +0200 @@ -111,8 +111,8 @@ save_as (); delete_row (); dialog.close (); - Widgets.EditView.buffer.text = ""; - Widgets.EditView.buffer.set_modified (false); + win.edit_view_content.buffer.text = ""; + win.edit_view_content.buffer.set_modified (false); Services.FileManager.file = null; win.toolbar.set_subtitle (_("No Documents Open")); Widgets.SideBar.get_instance ().store.clear (); @@ -120,8 +120,8 @@ case Gtk.ResponseType.NO: delete_row (); dialog.close (); - Widgets.EditView.buffer.text = ""; - Widgets.EditView.buffer.set_modified (false); + win.edit_view_content.buffer.text = ""; + win.edit_view_content.buffer.set_modified (false); Services.FileManager.file = null; win.toolbar.set_subtitle (_("No Documents Open")); Widgets.SideBar.get_instance ().store.clear (); @@ -135,11 +135,11 @@ assert_not_reached (); } }); - if (Widgets.EditView.buffer.get_modified () == true) { + if (win.edit_view_content.buffer.get_modified () == true) { dialog.run (); - } else if (Widgets.EditView.buffer.get_modified () == false) { + } else if (win.edit_view_content.buffer.get_modified () == false) { delete_row (); - Widgets.EditView.buffer.text = ""; + win.edit_view_content.buffer.text = ""; Services.FileManager.file = null; win.toolbar.set_subtitle (_("No Documents Open")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/SourceView.vala new/quilter-1.9.0/src/Widgets/SourceView.vala --- old/quilter-1.8.5/src/Widgets/SourceView.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/SourceView.vala 2019-05-31 02:35:56.000000000 +0200 @@ -20,7 +20,6 @@ public class EditView : Gtk.SourceView { public MainWindow window; private static EditView? instance = null; - public static new Gtk.SourceBuffer buffer; public bool should_scroll {get; set; default = false;} public File file; public GtkSpell.Checker spell; @@ -36,6 +35,7 @@ public Gtk.TextTag error_tag; public Gtk.SourceSearchContext search_context = null; public Gtk.SourceStyle srcstyle = null; + public new Gtk.SourceBuffer buffer; public static EditView get_instance () { if (instance == null) { @@ -255,7 +255,9 @@ buffer_context.add_class ("big-text"); } - set_scheme (get_default_scheme ()); + var style_manager = Gtk.SourceStyleSchemeManager.get_default (); + var style = style_manager.get_scheme (get_default_scheme ()); + buffer.set_style_scheme (style); } public void dynamic_margins () { @@ -292,12 +294,6 @@ } } - public void set_scheme (string id) { - var style_manager = Gtk.SourceStyleSchemeManager.get_default (); - var style = style_manager.get_scheme (id); - buffer.set_style_scheme (style); - } - private string get_default_scheme () { var settings = AppSettings.get_default (); if (settings.dark_mode) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/StatusBar.vala new/quilter-1.9.0/src/Widgets/StatusBar.vala --- old/quilter-1.8.5/src/Widgets/StatusBar.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/StatusBar.vala 2019-05-31 02:35:56.000000000 +0200 @@ -26,11 +26,13 @@ public MainWindow window; public Gtk.ActionBar actionbar; public Gtk.MenuButton track_type_menu; + public Gtk.SourceBuffer buf; /* Average normal reading speed is 275 WPM */ int WPM = 275; - public StatusBar () { + public StatusBar (Gtk.SourceBuffer buf) { + this.buf = buf; var settings = AppSettings.get_default (); actionbar = new Gtk.ActionBar (); @@ -154,12 +156,11 @@ public WordCount get_count() { try { var reg = new Regex("[\\s\\W]+", RegexCompileFlags.OPTIMIZE); - var buffer = Widgets.EditView.buffer; - string text = buffer.text; + string text = buf.text; string result = reg.replace (text, text.length, 0, " "); - var lines = buffer.get_line_count (); + var lines = buf.get_line_count (); var chars = result.length; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quilter-1.8.5/src/Widgets/WebView.vala new/quilter-1.9.0/src/Widgets/WebView.vala --- old/quilter-1.8.5/src/Widgets/WebView.vala 2019-05-28 16:12:04.000000000 +0200 +++ new/quilter-1.9.0/src/Widgets/WebView.vala 2019-05-31 02:35:56.000000000 +0200 @@ -19,16 +19,26 @@ */ using WebKit; -namespace Quilter { - public class Widgets.Preview : WebKit.WebView { +namespace Quilter.Widgets { + public class Preview : WebKit.WebView { private static Preview? instance = null; public string html; + public Gtk.SourceBuffer buf; - public Preview () { + public static Preview get_instance () { + if (instance == null) { + instance = new Widgets.Preview (Application.win, Application.win.edit_view_content.buffer); + } + + return instance; + } + + public Preview (MainWindow window, Gtk.SourceBuffer buf) { Object(user_content_manager: new UserContentManager()); visible = true; vexpand = true; hexpand = true; + this.buf = buf; var settingsweb = get_settings(); settingsweb.enable_plugins = false; settingsweb.enable_page_cache = false; @@ -41,14 +51,6 @@ connect_signals (); } - public static Preview get_instance () { - if (instance == null) { - instance = new Widgets.Preview (); - } - - return instance; - } - protected override bool context_menu ( ContextMenu context_menu, Gdk.Event event, @@ -208,10 +210,9 @@ } private string process () { - string text = Widgets.EditView.buffer.text; string processed_mk; - process_frontmatter (text, out processed_mk); - var mkd = new Markdown.Document.gfm_format (processed_mk.data, + process_frontmatter (buf.text, out processed_mk); + var mkd = new Markdown.Document.gfm_format (processed_mk.data, 0x00004000 + 0x00200000 + 0x00400000 +
