Merge branch 'master' of https://code.as/writeas/writeas-gtk

data/write-as-gtk.appdata.xml

@@ -27,8 +27,20 @@
     <binary>write-as-gtk</binary>
   </provides>
 
-  <!-- TODO Add the screenshots to this metadata,
-        but for that we need them publicly accessible online. -->
-  <!-- Once that's done, it's a simple matter of following
-        https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Application.html -->
+  <screenshots>
+    <screenshot type="default">
+      <caption>The Write.as editor.</caption>
+      <image type="source">https://write.as/img/screens/gtk/serif.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>The Write.as editor in dark mode.</caption>
+      <image type="source">https://write.as/img/screens/gtk/serif-dark.png</image>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://write.as/img/screens/gtk/sans.png</image>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://write.as/img/screens/gtk/monospace.png</image>
+    </screenshot>
+  </screenshots>
 </components>

debian/control

@@ -13,5 +13,5 @@ Standards-Version: 3.9.3
 Package: write-as-gtk
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommend: fonts-open-sans, fonts-hack
+Recommends: fonts-open-sans, fonts-hack
 Description: A distraction free and private writing tool, with builtin publishing.

src/window.vala

@@ -66,7 +66,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
             title = _("Publishing post…");
             canvas.sensitive = false;
             publish.begin((obj, res) => {
-                canvas.buffer.text = publish.end(res);
+                canvas.buffer.text += "\n\n" + publish.end(res);
                 canvas.sensitive = true;
             });
         });
@@ -98,7 +98,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
         build_fontoption(fonts.popup, _("Serif"), "serif", font);
         build_fontoption(fonts.popup, _("Sans-serif"), "sans",
                 "'Open Sans', 'Segoe UI', Tahoma, Arial, sans-serif");
-        build_fontoption(fonts.popup, _("Monospace"), "mono", "Hack, consolas," +
+        build_fontoption(fonts.popup, _("Monospace"), "wrap", "Hack, consolas," +
                 "Menlo-Regular, Menlo, Monaco, 'ubuntu mono', monospace");
         fonts.popup.show_all();
     }