[gnome-photos] Move the favorites button in the preview to the header bar

[Debarshi Ray <debarshir src gnome org>]

commit 587c32d59114be7c6af637faf6a62a82ec7e5be3
Author: Pranav Kant <pranav913 gmail com>
Date:   Sun Jul 27 14:24:16 2014 +0200

    Move the favorites button in the preview to the header bar
    
    https://bugzilla.gnome.org/show_bug.cgi?id=733216

 src/photos-main-toolbar.c        |   72 ++++++++++++++++++++++++++-
 src/photos-preview-nav-buttons.c |  101 --------------------------------------
 2 files changed, 70 insertions(+), 103 deletions(-)
---
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index 89d4af2..6c268bd 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -49,6 +49,7 @@ struct _PhotosMainToolbarPrivate
   GAction *search;
   GSimpleAction *gear_menu;
   GtkWidget *coll_back_button;
+  GtkWidget *favorite_button;
   GtkWidget *overlay;
   GtkWidget *remote_display_button;
   GtkWidget *searchbar;
@@ -72,6 +73,9 @@ enum
 G_DEFINE_TYPE_WITH_PRIVATE (PhotosMainToolbar, photos_main_toolbar, GTK_TYPE_BOX);
 
 
+static void photos_main_toolbar_favorite_button_update (PhotosMainToolbar *self, gboolean favorite);
+
+
 static void
 photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
 {
@@ -213,13 +217,19 @@ photos_main_toolbar_item_active_changed (PhotosBaseManager *manager, GObject *ob
   PhotosMainToolbar *self = PHOTOS_MAIN_TOOLBAR (user_data);
   PhotosMainToolbarPrivate *priv = self->priv;
   PhotosWindowMode window_mode;
+  gboolean favorite;
 
   if (object == NULL)
     return;
 
   window_mode = photos_mode_controller_get_window_mode (priv->mode_cntrlr);
-  if (window_mode == PHOTOS_WINDOW_MODE_PREVIEW)
-    photos_main_toolbar_set_toolbar_title (self);
+  if (window_mode != PHOTOS_WINDOW_MODE_PREVIEW)
+    return;
+
+  photos_main_toolbar_set_toolbar_title (self);
+
+  favorite = photos_base_item_is_favorite (PHOTOS_BASE_ITEM (object));
+  photos_main_toolbar_favorite_button_update (self, favorite);
 }
 
 
@@ -437,6 +447,49 @@ photos_main_toolbar_done_button_clicked (GtkButton *button, gpointer user_data)
 
 
 static void
+photos_main_toolbar_favorite_button_clicked (PhotosMainToolbar *self)
+{
+  PhotosBaseItem *item;
+  gboolean favorite;
+
+  item = PHOTOS_BASE_ITEM (photos_base_manager_get_active_object (self->priv->item_mngr));
+  favorite = photos_base_item_is_favorite (item);
+  photos_base_item_set_favorite (item, !favorite);
+
+  photos_main_toolbar_favorite_button_update (self, !favorite);
+}
+
+
+static void
+photos_main_toolbar_favorite_button_update (PhotosMainToolbar *self, gboolean favorite)
+{
+  PhotosMainToolbarPrivate *priv = self->priv;
+  GtkStyleContext *context;
+  gchar *favorite_label;
+
+  g_signal_handlers_block_by_func (priv->favorite_button, photos_main_toolbar_favorite_button_clicked, self);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->favorite_button), favorite);
+  g_signal_handlers_unblock_by_func (priv->favorite_button, photos_main_toolbar_favorite_button_clicked, 
self);
+
+  context = gtk_widget_get_style_context (priv->favorite_button);
+  if (favorite)
+    {
+      favorite_label = g_strdup (_("Remove from favorites"));
+      gtk_style_context_add_class (context, "photos-favorite");
+    }
+  else
+    {
+      favorite_label = g_strdup (_("Add to favorites"));
+      gtk_style_context_remove_class (context, "photos-favorite");
+    }
+
+  gtk_widget_reset_style (priv->favorite_button);
+  gtk_widget_set_tooltip_text (priv->favorite_button, favorite_label);
+  g_free (favorite_label);
+}
+
+
+static void
 photos_main_toolbar_populate_for_collections (PhotosMainToolbar *self)
 {
   PhotosMainToolbarPrivate *priv = self->priv;
@@ -520,6 +573,8 @@ photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self)
   GtkWidget *image;
   GtkWidget *menu_button;
   GApplication *app;
+  PhotosBaseItem *item;
+  gboolean favorite;
   gboolean remote_display_available;
   GAction *remote_display_action;
 
@@ -539,6 +594,19 @@ photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self)
 
   g_simple_action_set_enabled (priv->gear_menu, TRUE);
 
+  image = gtk_image_new_from_icon_name (PHOTOS_ICON_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
+  priv->favorite_button = gtk_toggle_button_new ();
+  gtk_button_set_image (GTK_BUTTON (priv->favorite_button), image);
+  gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), priv->favorite_button);
+  g_signal_connect_swapped (priv->favorite_button,
+                            "clicked",
+                            G_CALLBACK (photos_main_toolbar_favorite_button_clicked),
+                            self);
+
+  item = PHOTOS_BASE_ITEM (photos_base_manager_get_active_object (priv->item_mngr));
+  favorite = photos_base_item_is_favorite (item);
+  photos_main_toolbar_favorite_button_update (self, favorite);
+
   /* Disable the remote-display-current action if the dLeyna services are not
    * available */
   app = g_application_get_default ();
diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c
index f0410b4..1fc9307 100644
--- a/src/photos-preview-nav-buttons.c
+++ b/src/photos-preview-nav-buttons.c
@@ -40,12 +40,10 @@ struct _PhotosPreviewNavButtonsPrivate
 {
   GtkTreeModel *model;
   GtkTreePath *current_path;
-  GtkWidget *favorite_button;
   GtkWidget *next_widget;
   GtkWidget *overlay;
   GtkWidget *prev_widget;
   GtkWidget *preview_view;
-  GtkWidget *toolbar_widget;
   PhotosBaseManager *item_mngr;
   PhotosPreviewAction action;
   gboolean enable_next;
@@ -77,23 +75,6 @@ static guint signals[LAST_SIGNAL] = { 0 };
 G_DEFINE_TYPE_WITH_PRIVATE (PhotosPreviewNavButtons, photos_preview_nav_buttons, G_TYPE_OBJECT);
 
 
-static void photos_preview_nav_buttons_update_favorite (PhotosPreviewNavButtons *self, gboolean favorite);
-
-
-static void
-photos_preview_nav_buttons_active_changed (PhotosPreviewNavButtons *self, GObject *object)
-{
-  PhotosBaseItem *item = PHOTOS_BASE_ITEM (object);
-  gboolean favorite;
-
-  if (object == NULL)
-    return;
-
-  favorite = photos_base_item_is_favorite (item);
-  photos_preview_nav_buttons_update_favorite (self, favorite);
-}
-
-
 static void
 photos_preview_nav_buttons_fade_in_button (PhotosPreviewNavButtons *self, GtkWidget *widget)
 {
@@ -132,21 +113,6 @@ photos_preview_nav_buttons_fade_out_button (PhotosPreviewNavButtons *self, GtkWi
 }
 
 
-static void
-photos_preview_nav_buttons_favorite_clicked (PhotosPreviewNavButtons *self)
-{
-  PhotosPreviewNavButtonsPrivate *priv = self->priv;
-  PhotosBaseItem *item;
-  gboolean favorite;
-
-  item = PHOTOS_BASE_ITEM (photos_base_manager_get_active_object (priv->item_mngr));
-  favorite = photos_base_item_is_favorite (item);
-  photos_base_item_set_favorite (item, !favorite);
-
-  photos_preview_nav_buttons_update_favorite (self, !favorite);
-}
-
-
 static gboolean
 photos_preview_nav_buttons_auto_hide (PhotosPreviewNavButtons *self)
 {
@@ -154,7 +120,6 @@ photos_preview_nav_buttons_auto_hide (PhotosPreviewNavButtons *self)
 
   photos_preview_nav_buttons_fade_out_button (self, priv->prev_widget);
   photos_preview_nav_buttons_fade_out_button (self, priv->next_widget);
-  photos_preview_nav_buttons_fade_out_button (self, priv->toolbar_widget);
   priv->auto_hide_id = 0;
   return G_SOURCE_REMOVE;
 }
@@ -206,35 +171,6 @@ photos_preview_nav_buttons_leave_notify (PhotosPreviewNavButtons *self)
 
 
 static void
-photos_preview_nav_buttons_update_favorite (PhotosPreviewNavButtons *self, gboolean favorite)
-{
-  PhotosPreviewNavButtonsPrivate *priv = self->priv;
-  GtkStyleContext *context;
-  gchar *favorite_label;
-
-  g_signal_handlers_block_by_func (priv->favorite_button, photos_preview_nav_buttons_favorite_clicked, self);
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->favorite_button), favorite);
-  g_signal_handlers_unblock_by_func (priv->favorite_button, photos_preview_nav_buttons_favorite_clicked, 
self);
-
-  context = gtk_widget_get_style_context (priv->favorite_button);
-  if (favorite)
-    {
-      favorite_label = g_strdup (_("Remove from favorites"));
-      gtk_style_context_add_class (context, "photos-favorite");
-    }
-  else
-    {
-      favorite_label = g_strdup (_("Add to favorites"));
-      gtk_style_context_remove_class (context, "photos-favorite");
-    }
-
-  gtk_widget_reset_style (priv->favorite_button);
-  gtk_widget_set_tooltip_text (priv->favorite_button, favorite_label);
-  g_free (favorite_label);
-}
-
-
-static void
 photos_preview_nav_buttons_update_visibility (PhotosPreviewNavButtons *self)
 {
   PhotosPreviewNavButtonsPrivate *priv = self->priv;
@@ -250,12 +186,9 @@ photos_preview_nav_buttons_update_visibility (PhotosPreviewNavButtons *self)
     {
       enable_prev = FALSE;
       enable_next = FALSE;
-      photos_preview_nav_buttons_fade_out_button (self, priv->toolbar_widget);
       goto out;
     }
 
-  photos_preview_nav_buttons_fade_in_button (self, priv->toolbar_widget);
-
   tmp = iter;
   enable_prev = gtk_tree_model_iter_previous (priv->model, &tmp);
 
@@ -376,7 +309,6 @@ photos_preview_nav_buttons_constructed (GObject *object)
   GtkStyleContext *context;
   GtkWidget *button;
   GtkWidget *image;
-  GtkWidget *toolbar;
 
   G_OBJECT_CLASS (photos_preview_nav_buttons_parent_class)->constructed (object);
 
@@ -438,34 +370,6 @@ photos_preview_nav_buttons_constructed (GObject *object)
                             G_CALLBACK (photos_preview_nav_buttons_leave_notify),
                             self);
 
-  priv->toolbar_widget = gtk_revealer_new ();
-  gtk_widget_set_halign (priv->toolbar_widget, GTK_ALIGN_FILL);
-  gtk_widget_set_valign (priv->toolbar_widget, GTK_ALIGN_END);
-  gtk_revealer_set_transition_type (GTK_REVEALER (priv->toolbar_widget), 
GTK_REVEALER_TRANSITION_TYPE_CROSSFADE);
-  gtk_overlay_add_overlay (GTK_OVERLAY (priv->overlay), priv->toolbar_widget);
-
-  toolbar = gtk_action_bar_new ();
-  context = gtk_widget_get_style_context (toolbar);
-  gtk_style_context_add_class (context, "osd");
-  gtk_container_add (GTK_CONTAINER (priv->toolbar_widget), toolbar);
-  g_signal_connect_swapped (toolbar,
-                            "enter-notify-event",
-                            G_CALLBACK (photos_preview_nav_buttons_enter_notify),
-                            self);
-  g_signal_connect_swapped (toolbar,
-                            "leave-notify-event",
-                            G_CALLBACK (photos_preview_nav_buttons_leave_notify),
-                            self);
-
-  image = gtk_image_new_from_icon_name (PHOTOS_ICON_FAVORITE_SYMBOLIC, GTK_ICON_SIZE_BUTTON);
-  priv->favorite_button = gtk_toggle_button_new ();
-  gtk_button_set_image (GTK_BUTTON (priv->favorite_button), image);
-  gtk_action_bar_pack_end (GTK_ACTION_BAR (toolbar), priv->favorite_button);
-  g_signal_connect_swapped (priv->favorite_button,
-                            "clicked",
-                            G_CALLBACK (photos_preview_nav_buttons_favorite_clicked),
-                            self);
-
   g_signal_connect_swapped (priv->overlay,
                             "motion-notify-event",
                             G_CALLBACK (photos_preview_nav_buttons_motion_notify),
@@ -536,10 +440,6 @@ photos_preview_nav_buttons_init (PhotosPreviewNavButtons *self)
   priv = self->priv;
 
   priv->item_mngr = photos_item_manager_dup_singleton ();
-  g_signal_connect_swapped (priv->item_mngr,
-                            "active-changed",
-                            G_CALLBACK (photos_preview_nav_buttons_active_changed),
-                            self);
 
   priv->action = PHOTOS_PREVIEW_ACTION_NONE;
 
@@ -633,7 +533,6 @@ photos_preview_nav_buttons_hide (PhotosPreviewNavButtons *self)
   priv->visible = FALSE;
   photos_preview_nav_buttons_fade_out_button (self, priv->prev_widget);
   photos_preview_nav_buttons_fade_out_button (self, priv->next_widget);
-  photos_preview_nav_buttons_fade_out_button (self, priv->toolbar_widget);
 
   g_signal_emit (self, signals[ACTIVATED], 0, priv->action);
 }