GNOME.org
 

[gnome-photos] Add notifications when photos are exported

commit a9914556d6b8eb0434898b62bdab63a562399ee2
Author: Umang Jain <mailumangjain gmail com>
Date:   Sun Feb 21 12:22:47 2016 +0530

    Add notifications when photos are exported
    
    https://bugzilla.gnome.org/show_bug.cgi?id=762371

 configure.ac                     |    2 +-
 po/POTFILES.in                   |    1 +
 src/Makefile.am                  |    2 +
 src/photos-application.c         |   10 +
 src/photos-export-notification.c |  452 ++++++++++++++++++++++++++++++++++++++
 src/photos-export-notification.h |   51 +++++
 6 files changed, 517 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 83385c0..b68bfd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ PKG_CHECK_MODULES(GEGL, [gegl-0.3 >= $GEGL_MIN_VERSION])
 PKG_CHECK_MODULES(GEXIV2, [gexiv2])
 PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0])
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= $GLIB_MIN_VERSION])
-PKG_CHECK_MODULES(GIO, [gio-2.0])
+PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
 
 PKG_CHECK_MODULES(GNOME_DESKTOP, [gnome-desktop-3.0])
 AC_DEFINE([GNOME_DESKTOP_USE_UNSTABLE_API], [], [We are aware that GNOME_DESKTOP's API can change])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4aea560..053ffcb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,6 +11,7 @@ src/photos-embed.c
 src/photos-empty-results-box.c
 [type: gettext/glade]src/photos-export-dialog.ui
 src/photos-export-dialog.c
+src/photos-export-notification.c
 src/photos-facebook-item.c
 src/photos-fetch-metas-job.c
 src/photos-flickr-item.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 9fbb3ff..f780b24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,6 +64,8 @@ gnome_photos_SOURCES = \
        photos-dropdown.h \
        photos-export-dialog.c \
        photos-export-dialog.h \
+       photos-export-notification.c \
+       photos-export-notification.h \
        photos-edit-palette.c \
        photos-edit-palette.h \
        photos-edit-palette-row.c \
diff --git a/src/photos-application.c b/src/photos-application.c
index a3eaa99..9a1361b 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -40,6 +40,7 @@
 #include "photos-camera-cache.h"
 #include "photos-dlna-renderers-dialog.h"
 #include "photos-export-dialog.h"
+#include "photos-export-notification.h"
 #include "photos-filterable.h"
 #include "photos-gom-miner.h"
 #include "photos-item-manager.h"
@@ -993,19 +994,25 @@ photos_application_save_save (GObject *source_object, GAsyncResult *res, gpointe
   PhotosBaseItem *item = PHOTOS_BASE_ITEM (source_object);
   GError *error = NULL;
   GFile *file = NULL;
+  GList *items = NULL;
 
   file = photos_base_item_save_finish (item, res, &error);
   if (error != NULL)
     {
       g_warning ("Unable to save: %s", error->message);
+      photos_export_notification_new_with_error (error);
       g_error_free (error);
       goto out;
     }
 
+  items = g_list_prepend (items, g_object_ref (item));
+  photos_export_notification_new (items, file);
+
  out:
   photos_selection_controller_set_selection_mode (self->priv->sel_cntrlr, FALSE);
   g_application_release (G_APPLICATION (self));
   g_clear_object (&file);
+  g_list_free_full (items, g_object_unref);
 }
 
 
@@ -1036,6 +1043,7 @@ photos_application_save_response (GtkDialog *dialog, gint response_id, gpointer
   if (!photos_utils_make_directory_with_parents (export, NULL, &error))
     {
       g_warning ("Unable to create %s: %s", export_path, error->message);
+      photos_export_notification_new_with_error (error);
       g_error_free (error);
       goto out;
     }
@@ -1047,6 +1055,7 @@ photos_application_save_response (GtkDialog *dialog, gint response_id, gpointer
   if (error != NULL)
     {
       g_warning ("Unable to get a child for %s: %s", export_dir_name, error->message);
+      photos_export_notification_new_with_error (error);
       g_error_free (error);
       goto out;
     }
@@ -1058,6 +1067,7 @@ photos_application_save_response (GtkDialog *dialog, gint response_id, gpointer
   if (!photos_utils_make_directory_with_parents (export, NULL, &error))
     {
       g_warning ("Unable to create %s: %s", export_path, error->message);
+      photos_export_notification_new_with_error (error);
       g_error_free (error);
       goto out;
     }
diff --git a/src/photos-export-notification.c b/src/photos-export-notification.c
new file mode 100644
index 0000000..8b8f712
--- /dev/null
+++ b/src/photos-export-notification.c
@@ -0,0 +1,452 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Umang Jain
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+
+#include "config.h"
+
+#include <gio/gdesktopappinfo.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "photos-base-item.h"
+#include "photos-base-manager.h"
+#include "photos-export-notification.h"
+#include "photos-icons.h"
+#include "photos-notification-manager.h"
+
+
+struct _PhotosExportNotification
+{
+  GtkGrid parent_instance;
+  GtkWidget *ntfctn_mngr;
+  GError *error;
+  GFile *file;
+  GList *items;
+  guint timeout_id;
+};
+
+struct _PhotosExportNotificationClass
+{
+  GtkGridClass parent_class;
+};
+
+enum
+{
+  PROP_0,
+  PROP_ERROR,
+  PROP_FILE,
+  PROP_ITEMS
+};
+
+
+G_DEFINE_TYPE (PhotosExportNotification, photos_export_notification, GTK_TYPE_GRID);
+
+
+enum
+{
+    EXPORT_TIMEOUT = 10 /* s */
+};
+
+static void
+photos_export_notification_remove_timeout (PhotosExportNotification *self)
+{
+  if (self->timeout_id != 0)
+    {
+      g_source_remove (self->timeout_id);
+      self->timeout_id = 0;
+    }
+}
+
+
+static void
+photos_export_notification_destroy (PhotosExportNotification *self)
+{
+  photos_export_notification_remove_timeout (self);
+  gtk_widget_destroy (GTK_WIDGET (self));
+}
+
+
+static void
+photos_export_notification_analyze (PhotosExportNotification *self)
+{
+  GDesktopAppInfo *analyzer;
+  GError *error = NULL;
+
+  analyzer = g_desktop_app_info_new ("org.gnome.baobab.desktop");
+
+  if (!g_app_info_launch (G_APP_INFO (analyzer), NULL, NULL, &error))
+    {
+      g_warning ("Unable to launch disk usage analyzer: %s", error->message);
+      g_error_free (error);
+    }
+
+  photos_export_notification_destroy (self);
+  g_object_unref (analyzer);
+}
+
+
+static void
+photos_export_notification_close (PhotosExportNotification *self)
+{
+  photos_export_notification_destroy (self);
+}
+
+
+static void
+photos_export_notification_empty_trash_bus_get (GObject *source_object, GAsyncResult *result, gpointer 
user_data)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (user_data);
+  GDBusConnection *connection = NULL;
+  GError *error = NULL;
+
+  connection = g_bus_get_finish (result, &error);
+  if (error != NULL)
+    {
+      g_warning ("Unable to connect to session bus: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
+
+  g_dbus_connection_call (connection,
+                          "org.gnome.SettingsDaemon",
+                          "/org/gnome/SettingsDaemon/Housekeeping",
+                          "org.gnome.SettingsDaemon.Housekeeping",
+                          "EmptyTrash",
+                          NULL,
+                          NULL,
+                          G_DBUS_CALL_FLAGS_NONE,
+                          -1,
+                          NULL,
+                          NULL,
+                          NULL);
+
+ out:
+  g_clear_object (&connection);
+  g_object_unref (self);
+}
+
+
+static void
+photos_export_notification_empty_trash (PhotosExportNotification *self)
+{
+  g_bus_get (G_BUS_TYPE_SESSION, NULL, photos_export_notification_empty_trash_bus_get, g_object_ref (self));
+  photos_export_notification_destroy (self);
+}
+
+
+static void
+photos_export_notification_export_folder (PhotosExportNotification *self)
+{
+  GError *error;
+  GFile *directory;
+  gchar *uri;
+
+  g_return_if_fail (self->file != NULL);
+  g_return_if_fail (self->items != NULL);
+
+  if (self->items->next == NULL) /* length == 1 */
+    directory = g_file_get_parent (self->file);
+  else
+    directory = g_object_ref (self->file);
+
+  uri = g_file_get_uri (directory);
+
+  error = NULL;
+  if (!g_app_info_launch_default_for_uri (uri, NULL, &error))
+    {
+      g_warning ("Failed to open uri: %s", error->message);
+      g_error_free (error);
+    }
+
+  photos_export_notification_destroy (self);
+  g_object_unref (directory);
+  g_free (uri);
+}
+
+
+static void
+photos_export_notification_open (PhotosExportNotification *self)
+{
+  GError *error;
+  gchar *uri;
+
+  g_return_if_fail (self->file != NULL);
+  g_return_if_fail (self->items != NULL);
+  g_return_if_fail (self->items->next == NULL);
+
+  uri = g_file_get_uri (self->file);
+
+  error = NULL;
+  if (!g_app_info_launch_default_for_uri (uri, NULL, &error))
+    {
+      g_warning ("Failed to open uri: %s", error->message);
+      g_error_free (error);
+    }
+
+  photos_export_notification_destroy (self);
+  g_free (uri);
+}
+
+
+static gboolean
+photos_export_notification_timeout (gpointer user_data)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (user_data);
+
+  self->timeout_id = 0;
+  photos_export_notification_destroy (self);
+  return G_SOURCE_REMOVE;
+}
+
+
+static void
+photos_export_notification_constructed (GObject *object)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (object);
+  GtkWidget *close;
+  GtkWidget *image;
+  GtkWidget *label;
+  gchar *msg;
+  guint length;
+
+  G_OBJECT_CLASS (photos_export_notification_parent_class)->constructed (object);
+
+  gtk_grid_set_column_spacing (GTK_GRID (self), 12);
+  gtk_widget_set_margin_end (GTK_WIDGET (self), 12);
+  gtk_widget_set_margin_start (GTK_WIDGET (self), 12);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL);
+
+  length = g_list_length (self->items);
+
+  if (length == 0)
+    {
+      g_assert_nonnull (self->error);
+
+      if (g_error_matches (self->error, G_IO_ERROR, G_IO_ERROR_NO_SPACE))
+        msg = g_strdup (_("Failed to export: not enough space"));
+      else
+        msg = g_strdup (_("Failed to export"));
+    }
+  else if (length == 1)
+    {
+      const gchar *name;
+
+      name = photos_base_item_get_name_with_fallback (PHOTOS_BASE_ITEM (self->items->data));
+      msg = g_strdup_printf (_("“%s” exported"), name);
+    }
+  else
+    {
+      msg = g_strdup_printf (ngettext ("%d item exported", "%d items exported", length), length);
+    }
+
+  label = gtk_label_new (msg);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_container_add (GTK_CONTAINER (self), label);
+  g_free (msg);
+
+  if (length == 0)
+    {
+      g_assert_nonnull (self->error);
+
+      if (g_error_matches (self->error, G_IO_ERROR, G_IO_ERROR_NO_SPACE))
+        {
+          GtkWidget *analyze;
+          GtkWidget *empty_trash;
+
+          analyze = gtk_button_new_with_label (_("Analyze"));
+          gtk_widget_set_valign (analyze, GTK_ALIGN_CENTER);
+          gtk_container_add (GTK_CONTAINER (self), analyze);
+          g_signal_connect_swapped (analyze, "clicked", G_CALLBACK (photos_export_notification_analyze), 
self);
+
+          empty_trash = gtk_button_new_with_label (_("Empty Trash"));
+          gtk_widget_set_valign (empty_trash, GTK_ALIGN_CENTER);
+          gtk_container_add (GTK_CONTAINER (self), empty_trash);
+          g_signal_connect_swapped (empty_trash,
+                                    "clicked",
+                                    G_CALLBACK (photos_export_notification_empty_trash),
+                                    self);
+        }
+    }
+  else
+    {
+      GtkWidget *export_folder;
+
+      if (length == 1)
+        {
+          GtkWidget *open;
+
+          open = gtk_button_new_with_label (_("Open"));
+          gtk_widget_set_valign (open, GTK_ALIGN_CENTER);
+          gtk_widget_set_halign (open, GTK_ALIGN_CENTER);
+          gtk_container_add (GTK_CONTAINER (self), open);
+          g_signal_connect_swapped (open, "clicked", G_CALLBACK (photos_export_notification_open), self);
+        }
+
+      export_folder = gtk_button_new_with_label (_("Export Folder"));
+      gtk_widget_set_valign (export_folder, GTK_ALIGN_CENTER);
+      gtk_container_add (GTK_CONTAINER (self), export_folder);
+      g_signal_connect_swapped (export_folder,
+                                "clicked",
+                                G_CALLBACK (photos_export_notification_export_folder),
+                                self);
+    }
+
+  image = gtk_image_new_from_icon_name (PHOTOS_ICON_WINDOW_CLOSE_SYMBOLIC, GTK_ICON_SIZE_INVALID);
+  gtk_widget_set_margin_bottom (image, 2);
+  gtk_widget_set_margin_top (image, 2);
+  gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
+
+  close = gtk_button_new ();
+  gtk_widget_set_valign (close, GTK_ALIGN_CENTER);
+  gtk_button_set_focus_on_click (GTK_BUTTON (close), FALSE);
+  gtk_button_set_relief (GTK_BUTTON (close), GTK_RELIEF_NONE);
+  gtk_button_set_image (GTK_BUTTON (close), image);
+  gtk_container_add (GTK_CONTAINER (self), close);
+  g_signal_connect_swapped (close, "clicked", G_CALLBACK (photos_export_notification_close), self);
+
+  photos_notification_manager_add_notification (PHOTOS_NOTIFICATION_MANAGER (self->ntfctn_mngr),
+                                                GTK_WIDGET (self));
+
+  self->timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+                                                 EXPORT_TIMEOUT,
+                                                 photos_export_notification_timeout,
+                                                 g_object_ref (self),
+                                                 g_object_unref);
+}
+
+
+static void
+photos_export_notification_dispose (GObject *object)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (object);
+
+  if (self->items != NULL)
+    {
+      g_list_free_full (self->items, g_object_unref);
+      self->items = NULL;
+    }
+
+  g_clear_object (&self->file);
+  g_clear_object (&self->ntfctn_mngr);
+
+  G_OBJECT_CLASS (photos_export_notification_parent_class)->dispose (object);
+}
+
+
+static void
+photos_export_notification_finalize (GObject *object)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (object);
+
+  g_clear_error (&self->error);
+
+  G_OBJECT_CLASS (photos_export_notification_parent_class)->finalize (object);
+}
+
+
+static void
+photos_export_notification_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec 
*pspec)
+{
+  PhotosExportNotification *self = PHOTOS_EXPORT_NOTIFICATION (object);
+
+  switch (prop_id)
+    {
+    case PROP_ERROR:
+      self->error = g_value_dup_boxed (value);
+      break;
+
+    case PROP_FILE:
+      self->file = g_value_dup_object (value);
+      break;
+
+    case PROP_ITEMS:
+      {
+        GList *items;
+
+        items = (GList *) g_value_get_pointer (value);
+        self->items = g_list_copy_deep (items, (GCopyFunc) g_object_ref, NULL);
+        break;
+      }
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+static void
+photos_export_notification_init (PhotosExportNotification *self)
+{
+  self->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_dup_singleton ());
+}
+
+
+static void
+photos_export_notification_class_init (PhotosExportNotificationClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->constructed = photos_export_notification_constructed;
+  object_class->dispose = photos_export_notification_dispose;
+  object_class->finalize = photos_export_notification_finalize;
+  object_class->set_property = photos_export_notification_set_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_ERROR,
+                                   g_param_spec_boxed ("error",
+                                                       "Error",
+                                                       "Error thrown during export",
+                                                       G_TYPE_ERROR,
+                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_FILE,
+                                   g_param_spec_object ("file",
+                                                        "File",
+                                                        "A GFile representing the exported file or 
directory",
+                                                        G_TYPE_FILE,
+                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_ITEMS,
+                                   g_param_spec_pointer ("items",
+                                                         "List of PhotosBaseItems",
+                                                         "List of items that were exported",
+                                                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+}
+
+
+void
+photos_export_notification_new (GList *items, GFile *file)
+{
+  g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (items != NULL);
+
+  g_object_new (PHOTOS_TYPE_EXPORT_NOTIFICATION, "file", file, "items", items, NULL);
+}
+
+
+void
+photos_export_notification_new_with_error (GError *error)
+{
+  g_return_if_fail (error != NULL);
+  g_object_new (PHOTOS_TYPE_EXPORT_NOTIFICATION, "error", error, NULL);
+}
diff --git a/src/photos-export-notification.h b/src/photos-export-notification.h
new file mode 100644
index 0000000..f277055
--- /dev/null
+++ b/src/photos-export-notification.h
@@ -0,0 +1,51 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Umang Jain
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+
+#ifndef PHOTOS_EXPORT_NOTIFICATION_H
+#define PHOTOS_EXPORT_NOTIFICATION_H
+
+#include <gio/gio.h>
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_EXPORT_NOTIFICATION (photos_export_notification_get_type ())
+
+#define PHOTOS_EXPORT_NOTIFICATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   PHOTOS_TYPE_EXPORT_NOTIFICATION, PhotosExportNotification))
+
+#define PHOTOS_IS_EXPORT_NOTIFICATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   PHOTOS_TYPE_EXPORT_NOTIFICATION))
+
+typedef struct _PhotosExportNotification      PhotosExportNotification;
+typedef struct _PhotosExportNotificationClass PhotosExportNotificationClass;
+
+GType               photos_export_notification_get_type        (void) G_GNUC_CONST;
+
+void                photos_export_notification_new             (GList *items, GFile *file);
+
+void                photos_export_notification_new_with_error  (GError *error);
+
+G_END_DECLS
+
+#endif /* PHOTOS_EXPORT_NOTIFICATION_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]