Merge lp:~midori/midori/abstractBubbles into lp:midori

[Cris Dywan]

Add Notification class abstracting libnotify

[lp:~midori/midori/abstractBubbles]

6676. By Cris Dywan on 2014-04-24

Make Midori.Notification build with GTK+2

6677. By Cris Dywan on 2014-04-24

Dynamic sizing and placement based on monitor dimensions

6678. By Cris Dywan on 2014-04-24

Use boxes, labels and an icon for layout

6679. By Cris Dywan on 2014-04-24

Destroy the bubble after 60 seconds

6680. By Cris Dywan on 2014-05-14

Use real transfer strings for dummy notification

6681. By Cris Dywan on 2014-05-14

Leave space between bubble and screen edge

6682. By Cris Dywan on 2014-05-14

Wrapping, ellipsis and padding

6683. By Cris Dywan on 2014-05-14

Make the bubble semi-transparent

6684. By Paweł Forysiuk on 2014-07-18

Make label wrap on gtk3

6685. By Paweł Forysiuk on 2014-07-18

Don't expand child widgets by default on gtk3

6686. By Paweł Forysiuk on 2014-07-18

Fix drawing widgets with gtk3, remove some unneded cairo code

6687. By Paweł Forysiuk on 2014-07-18

Tweak the notifications size a bit

6688. By Paweł Forysiuk on 2014-07-18

Make positioning of the bubble a little less magical

6689. By Cris Dywan on 2014-08-25

Set window size rather than widget size

6690. By Cris Dywan on 2014-08-26

Drop #if hack and broken timeout

Unmerged revisions

6690. By Cris Dywan on 2014-08-26

Drop #if hack and broken timeout

6689. By Cris Dywan on 2014-08-25

Set window size rather than widget size

6688. By Paweł Forysiuk on 2014-07-18

Make positioning of the bubble a little less magical

6687. By Paweł Forysiuk on 2014-07-18

Tweak the notifications size a bit

6686. By Paweł Forysiuk on 2014-07-18

Fix drawing widgets with gtk3, remove some unneded cairo code

6685. By Paweł Forysiuk on 2014-07-18

Don't expand child widgets by default on gtk3

6684. By Paweł Forysiuk on 2014-07-18

Make label wrap on gtk3

6683. By Cris Dywan on 2014-05-14

Make the bubble semi-transparent

6682. By Cris Dywan on 2014-05-14

Wrapping, ellipsis and padding

6681. By Cris Dywan on 2014-05-14

Leave space between bubble and screen edge

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-11 01:36:48 +0000
+++ CMakeLists.txt	2014-08-26 21:42:13 +0000
@@ -149,6 +149,7 @@
     pkg_check_modules(NOTIFY REQUIRED libnotify)
     add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"")
     add_definitions("-DHAVE_LIBNOTIFY")
+    set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBNOTIFY)
     set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}")
     set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}")
     set(PKGS ${PKGS} libnotify)

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-04-14 06:53:01 +0000
+++ midori/midori-app.c	2014-08-26 21:42:13 +0000
@@ -34,13 +34,6 @@
     #include <locale.h>
 #endif
 
-#ifdef HAVE_LIBNOTIFY
-    #include <libnotify/notify.h>
-    #ifndef NOTIFY_CHECK_VERSION
-        #define NOTIFY_CHECK_VERSION(x,y,z) 0
-    #endif
-#endif
-
 #ifdef HAVE_SIGNAL_H
     #include <signal.h>
 #endif
@@ -690,10 +683,6 @@
     app->speeddial = NULL;
     app->extensions = katze_array_new (KATZE_TYPE_ARRAY);
     app->browsers = katze_array_new (MIDORI_TYPE_BROWSER);
-
-    #ifdef HAVE_LIBNOTIFY
-    notify_init (PACKAGE_NAME);
-    #endif
 }
 
 static void
@@ -711,11 +700,6 @@
     katze_object_assign (app->extensions, NULL);
     katze_object_assign (app->browsers, NULL);
 
-    #ifdef HAVE_LIBNOTIFY
-    if (notify_is_initted ())
-        notify_uninit ();
-    #endif
-
     G_OBJECT_CLASS (midori_app_parent_class)->finalize (object);
 }
 
@@ -1129,18 +1113,7 @@
     g_return_if_fail (MIDORI_IS_APP (app));
     g_return_if_fail (title);
 
-    #ifdef HAVE_LIBNOTIFY
-    if (notify_is_initted ())
-    {
-        #if NOTIFY_CHECK_VERSION (0, 7, 0)
-        NotifyNotification* note = notify_notification_new (title, message, "midori");
-        #else
-        NotifyNotification* note = notify_notification_new (title, message, "midori", NULL);
-        #endif
-        notify_notification_show (note, NULL);
-        g_object_unref (note);
-    }
-    #endif
+    midori_notification_show_one (title, message);
 }
 
 /**

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-07-30 17:47:30 +0000
+++ midori/midori-browser.c	2014-08-26 21:42:13 +0000
@@ -4850,6 +4850,18 @@
 }
 
 static void
+_action_notify (GtkAction*     action,
+                MidoriBrowser* browser)
+{
+    /* Dummy notification using real transfer strings for testing */
+    gchar* msg = g_strdup_printf (
+        _("'<b>%s</b>' and %d other files have been downloaded."),
+        "Kittens being eaten by a stuffed shark.mp4", 7);
+    g_signal_emit (browser, signals[SEND_NOTIFICATION], 0,
+        _("Transfer completed"), msg);
+}
+
+static void
 _action_help_link_activate (GtkAction*     action,
                             MidoriBrowser* browser)
 {
@@ -5352,6 +5364,8 @@
     { "About", GTK_STOCK_ABOUT,
         NULL, "",
         NULL, G_CALLBACK (_action_about_activate) },
+    { "Notify", NULL, NULL, NULL,
+        NULL, G_CALLBACK (_action_notify) },
     { "Dummy", NULL, N_("_Tools") },
 };
 static const guint entries_n = G_N_ELEMENTS (entries);

=== added file 'midori/midori-notification.vala'
--- midori/midori-notification.vala	1970-01-01 00:00:00 +0000
+++ midori/midori-notification.vala	2014-08-26 21:42:13 +0000
@@ -0,0 +1,125 @@
+/*
+ Copyright (C) 2014 Christian Dywan <[e-mail]>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ See the file COPYING for the full license text.
+*/
+
+namespace Midori {
+    public class Notification {
+        public string title { get; set; }
+        public string message { get; set; }
+
+#if HAVE_LIBNOTIFY
+        public Notification (string title, string message) {
+            if (!Notify.is_initted ())
+                warn_if_fail (Notify.init (PACKAGE_NAME));
+            this.title = title;
+            this.message = message;
+        }
+
+        public bool show () throws Error {
+            var bubble = (Notify.Notification)GLib.Object.new (
+                typeof (Notify.Notification),
+                "summary", title,
+                "body", message,
+                "icon-name", PACKAGE_NAME);
+            return bubble.show ();
+        }
+#else
+        public Notification (string title, string message) {
+            this.title = title;
+            this.message = message;
+        }
+
+        public bool show () throws Error {
+            var bubble = new Gtk.Window (Gtk.WindowType.POPUP);
+            bubble.decorated = false;
+            bubble.app_paintable = true;
+            bubble.skip_taskbar_hint = true;
+            bubble.title = title;
+
+            var screen = Gdk.Screen.get_default ();
+            Gdk.Rectangle monitor;
+            screen.get_monitor_geometry (0, out monitor);
+            int width = monitor.width / 4, height = monitor.height / 6;
+            bubble.resize (width, height);
+            int x, y, padding = 32;
+            x = monitor.width - (width + padding);
+            y = monitor.height - (height + padding);
+            bubble.move (x, y);
+
+#if HAVE_GTK3
+            bubble.set_visual (screen.get_rgba_visual());
+            bubble.draw.connect (window_exposed);
+#else
+            bubble.set_colormap (screen.get_rgba_colormap ());
+            bubble.expose_event.connect (window_exposed);
+#endif
+            var hbox = new Gtk.HBox (false, 8);
+            var icon = new Gtk.Image.from_icon_name (PACKAGE_NAME, Gtk.IconSize.DIALOG);
+            hbox.pack_start (icon, false, false, 4);
+            hbox.set_border_width (4);
+#if HAVE_GTK3
+            /* Don't set expand on gtk3, it would make child widgets inherit it */
+            var vbox = new Gtk.VBox (false, 8);
+#else
+            var vbox = new Gtk.VBox (true, 8);
+#endif
+            var header = new Gtk.Label ("<b>%s</b>".printf(title));
+            header.ellipsize = Pango.EllipsizeMode.END;
+            header.use_markup = true;
+            vbox.pack_start (header, false, false, 4);
+            var body = new Gtk.Label (message);
+            /* Wrapping means we can't ellipsize */
+            body.set_line_wrap (true);
+            body.set_size_request (width - width / 5, height / 2);
+#if HAVE_GTK3
+            /* gtk3 ignores size_request on labels, add some arbitrary max width */
+            body.set_max_width_chars (40);
+#endif
+            body.use_markup = true;
+            vbox.pack_start (body, false, false, 4);
+            vbox.set_border_width (4);
+            hbox.pack_start (vbox, false, false, 4);
+            bubble.add (hbox);
+            bubble.show_all ();
+            return true;
+        }
+
+#if HAVE_GTK3
+        bool window_exposed (Gtk.Widget bubble, Cairo.Context ctx) {
+#else
+        bool window_exposed (Gtk.Widget bubble, Gdk.EventExpose event) {
+            var ctx = Gdk.cairo_create (bubble.window);
+#endif
+            ctx.set_source_rgba (0.9, 0.9, 0.9, 0.7);
+            ctx.set_operator (Cairo.Operator.SOURCE);
+            ctx.paint ();
+            ctx.set_operator (Cairo.Operator.OVER);
+
+            var cont = bubble as Gtk.Bin;
+#if HAVE_GTK3
+            cont.propagate_draw (cont.get_child (), ctx);
+#else
+            cont.propagate_expose (cont.get_child (), event);
+#endif
+            return true;
+        }
+#endif
+
+        public static void show_one (string title, string message) {
+            var bubble = new Notification (title, message);
+            try {
+                bubble.show ();
+            } catch (Error error) {
+                warning (error.message);
+            }
+        }
+    }
+}
+

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-04-28 16:32:22 +0000
+++ po/POTFILES.in	2014-08-26 21:42:13 +0000
@@ -82,6 +82,7 @@
 midori/midori-bookmarks-db.c
 midori/midori-session.c
 extensions/nsplugin-manager.vala
+midori/midori-notification.vala
 midori/midori-frontend.c
 extensions/cookie-permissions/cookie-permission-manager-preferences-window.c
 extensions/cookie-permissions/cookie-permission-manager-preferences-window.h