GNOME.org
 

[gnome-photos] Add notification when an item is edited

commit 0e9b118c793b99c20008d82f814e1a19bf7bcfd7
Author: Rafael Fonseca <r4f4rfs gmail com>
Date:   Fri Mar 4 15:46:30 2016 +0100

    Add notification when an item is edited
    
    The notification lets you undo the editing operations.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763096

 po/POTFILES.in                 |    1 +
 src/Makefile.am                |    2 +
 src/photos-done-notification.c |  282 ++++++++++++++++++++++++++++++++++++++++
 src/photos-done-notification.h |   48 +++++++
 src/photos-preview-view.c      |    3 +
 5 files changed, 336 insertions(+), 0 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 053ffcb..f0cbd9e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ src/photos-application.c
 src/photos-base-item.c
 src/photos-delete-notification.c
 [type: gettext/glade]src/photos-dlna-renderers-dialog.ui
+src/photos-done-notification.c
 src/photos-embed.c
 src/photos-empty-results-box.c
 [type: gettext/glade]src/photos-export-dialog.ui
diff --git a/src/Makefile.am b/src/Makefile.am
index f780b24..0cb21e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,6 +60,8 @@ gnome_photos_SOURCES = \
        photos-dlna-renderers-dialog.h \
        photos-dlna-renderers-manager.c \
        photos-dlna-renderers-manager.h \
+       photos-done-notification.c \
+       photos-done-notification.h \
        photos-dropdown.c \
        photos-dropdown.h \
        photos-export-dialog.c \
diff --git a/src/photos-done-notification.c b/src/photos-done-notification.c
new file mode 100644
index 0000000..1dc7de9
--- /dev/null
+++ b/src/photos-done-notification.c
@@ -0,0 +1,282 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Rafael Fonseca
+ *
+ * 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 <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "photos-base-item.h"
+#include "photos-done-notification.h"
+#include "photos-icons.h"
+#include "photos-notification-manager.h"
+#include "photos-search-context.h"
+
+struct _PhotosDoneNotification
+{
+  GtkGrid parent_instance;
+  PhotosBaseItem *item;
+  GtkWidget *ntfctn_mngr;
+  guint timeout_id;
+};
+
+
+struct _PhotosDoneNotificationClass
+{
+  GtkGridClass parent_class;
+};
+
+
+enum
+{
+  PROP_0,
+  PROP_ITEM
+};
+
+
+G_DEFINE_TYPE (PhotosDoneNotification, photos_done_notification, GTK_TYPE_GRID);
+
+
+enum
+{
+  DONE_TIMEOUT = 10 /* s */
+};
+
+
+static void
+photos_done_notification_remove_timeout (PhotosDoneNotification *self)
+{
+  if (self->timeout_id != 0)
+    {
+      g_source_remove (self->timeout_id);
+      self->timeout_id = 0;
+    }
+}
+
+
+static void
+photos_done_notification_destroy (PhotosDoneNotification *self)
+{
+  photos_done_notification_remove_timeout (self);
+  gtk_widget_destroy (GTK_WIDGET (self));
+}
+
+
+static gboolean
+photos_done_notification_timeout (gpointer user_data)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (user_data);
+
+  self->timeout_id = 0;
+  photos_done_notification_destroy (self);
+  return G_SOURCE_REMOVE;
+}
+
+
+static void
+photos_done_notification_pipeline_save_finish (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (user_data);
+  GApplication *app;
+  GError *error = NULL;
+  PhotosBaseItem *item = PHOTOS_BASE_ITEM (source_object);
+
+  if (!photos_base_item_pipeline_save_finish (item, res, &error))
+    {
+      g_warning ("Unable to save pipeline: %s", error->message);
+      g_error_free (error);
+    }
+
+  app = g_application_get_default ();
+  g_application_release (app);
+  g_object_unref (self);
+}
+
+
+static void
+photos_done_notification_edit_undo_process (GObject *source_object, GAsyncResult *res, gpointer user_data)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (user_data);
+  GApplication *app;
+  GAction *action;
+  GError *error = NULL;
+  PhotosBaseItem *item = PHOTOS_BASE_ITEM (source_object);
+
+  app = g_application_get_default ();
+
+  if (!photos_base_item_process_finish (item, res, &error))
+    {
+      g_warning ("Unable to process item: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
+
+  g_application_hold (app);
+  photos_base_item_pipeline_save_async (item,
+                                        NULL,
+                                        photos_done_notification_pipeline_save_finish,
+                                        g_object_ref (self));
+
+ out:
+  action = g_action_map_lookup_action (G_ACTION_MAP (app), "draw-current");
+  g_action_activate (action, NULL);
+  g_application_release (app);
+  g_object_unref (self);
+}
+
+
+static void
+photos_done_notification_undo_clicked (PhotosDoneNotification *self)
+{
+  GApplication *app;
+
+  photos_base_item_operations_revert (self->item);
+
+  app = g_application_get_default ();
+  g_application_hold (app);
+
+  photos_base_item_process_async (self->item,
+                                  NULL,
+                                  photos_done_notification_edit_undo_process,
+                                  g_object_ref (self));
+
+  photos_done_notification_destroy (self);
+}
+
+
+static void
+photos_done_notification_constructed (GObject *object)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (object);
+  GtkWidget *close;
+  GtkWidget *image;
+  GtkWidget *label;
+  GtkWidget *undo;
+  const gchar *name;
+  gchar *msg;
+
+  G_OBJECT_CLASS (photos_done_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);
+
+  name = photos_base_item_get_name_with_fallback (PHOTOS_BASE_ITEM (self->item));
+  msg = g_strdup_printf (_("“%s” edited"), name);
+
+  label = gtk_label_new (msg);
+  gtk_widget_set_halign (label, GTK_ALIGN_START);
+  gtk_container_add (GTK_CONTAINER (self), label);
+  g_free (msg);
+
+  undo = gtk_button_new_with_label (_("Undo"));
+  gtk_widget_set_valign (undo, GTK_ALIGN_CENTER);
+  gtk_container_add (GTK_CONTAINER (self), undo);
+  g_signal_connect_swapped (undo, "clicked", G_CALLBACK (photos_done_notification_undo_clicked), 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_done_notification_destroy), 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,
+                                                 DONE_TIMEOUT,
+                                                 photos_done_notification_timeout,
+                                                 g_object_ref (self),
+                                                 g_object_unref);
+}
+
+
+static void
+photos_done_notification_dispose (GObject *object)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (object);
+
+  g_clear_object (&self->item);
+  g_clear_object (&self->ntfctn_mngr);
+
+  G_OBJECT_CLASS (photos_done_notification_parent_class)->dispose (object);
+}
+
+
+static void
+photos_done_notification_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec 
*pspec)
+{
+  PhotosDoneNotification *self = PHOTOS_DONE_NOTIFICATION (object);
+
+  switch (prop_id)
+    {
+      case PROP_ITEM:
+        {
+          PhotosBaseItem *item = (PhotosBaseItem *) g_value_get_pointer (value);
+          self->item = g_object_ref (item);
+          break;
+        }
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        break;
+    }
+}
+
+
+static void
+photos_done_notification_init (PhotosDoneNotification *self)
+{
+  self->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_dup_singleton ());
+}
+
+
+static void
+photos_done_notification_class_init (PhotosDoneNotificationClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->constructed = photos_done_notification_constructed;
+  object_class->dispose = photos_done_notification_dispose;
+  object_class->set_property = photos_done_notification_set_property;
+
+  g_object_class_install_property (object_class,
+                                   PROP_ITEM,
+                                   g_param_spec_pointer ("item",
+                                                         "PhotosBaseItem",
+                                                         "the edited PhotosBaseItem",
+                                                         G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+}
+
+
+void
+photos_done_notification_new (PhotosBaseItem *item)
+{
+  g_return_if_fail (PHOTOS_IS_BASE_ITEM (item));
+  g_object_new (PHOTOS_TYPE_DONE_NOTIFICATION, "item", item, NULL);
+}
diff --git a/src/photos-done-notification.h b/src/photos-done-notification.h
new file mode 100644
index 0000000..5429f1c
--- /dev/null
+++ b/src/photos-done-notification.h
@@ -0,0 +1,48 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2016 Rafael Fonseca
+ *
+ * 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_DONE_NOTIFICATION_H
+#define PHOTOS_DONE_NOTIFICATION_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_DONE_NOTIFICATION (photos_done_notification_get_type ())
+
+#define PHOTOS_DONE_NOTIFICATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+   PHOTOS_TYPE_DONE_NOTIFICATION, PhotosDoneNotification))
+
+#define PHOTOS_IS_DONE_NOTIFICATION(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+   PHOTOS_TYPE_DONE_NOTIFICATION))
+
+typedef struct _PhotosDoneNotification      PhotosDoneNotification;
+typedef struct _PhotosDoneNotificationClass PhotosDoneNotificationClass;
+
+GType             photos_done_notification_get_type (void) G_GNUC_CONST;
+
+void              photos_done_notification_new      (PhotosBaseItem *item);
+
+G_END_DECLS
+
+#endif /* PHOTOS_DONE_NOTIFICATION_H */
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 1f832a7..1afc1a7 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -30,6 +30,7 @@
 #include <glib/gi18n.h>
 
 #include "photos-base-item.h"
+#include "photos-done-notification.h"
 #include "photos-image-view.h"
 #include "photos-item-manager.h"
 #include "photos-edit-palette.h"
@@ -501,6 +502,8 @@ photos_preview_view_edit_done_pipeline_save (GObject *source_object, GAsyncResul
 
   photos_mode_controller_go_back (self->mode_cntrlr);
 
+  photos_done_notification_new (item);
+
  out:
   app = g_application_get_default ();
   g_application_release (G_APPLICATION (app));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]