GNOME.org
 

[gnome-photos/wip/rishi/collection: 29/40] Add a new mode for importing items from an attached device

commit 5a4db2a382da6b60aac0edfc253dda11d8b8863f
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Jan 23 13:17:16 2018 +0100

    Add a new mode for importing items from an attached device
    
    Based on code written by Petr Štětka.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=751212

 src/Makefile.am                        |   4 +
 src/photos-application.c               |  61 +++++++++++
 src/photos-embed.c                     | 141 +++++++++++++++++-------
 src/photos-empty-results-box.c         |   3 +
 src/photos-item-manager.c              | 123 +++++++++++++++++++--
 src/photos-item-manager.h              |   1 +
 src/photos-main-toolbar.c              | 101 ++++++++++++++++--
 src/photos-main-window.c               |  22 ++++
 src/photos-offset-import-controller.c  | 139 ++++++++++++++++++++++++
 src/photos-offset-import-controller.h  |  41 +++++++
 src/photos-preview-view.c              |   4 +
 src/photos-query.h                     |   5 +-
 src/photos-search-type-manager.c       |   4 +-
 src/photos-selection-toolbar.c         |  18 ++++
 src/photos-selection-toolbar.ui        |  13 +++
 src/photos-source-manager.c            |  44 +++++++-
 src/photos-tracker-import-controller.c | 189 +++++++++++++++++++++++++++++++++
 src/photos-tracker-import-controller.h |  41 +++++++
 src/photos-utils.c                     |   8 ++
 src/photos-view-container.c            |   4 +
 20 files changed, 902 insertions(+), 64 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7240390b..28cf46eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -150,6 +150,8 @@ gnome_photos_SOURCES = \
        photos-offset-controller.h \
        photos-offset-favorites-controller.c \
        photos-offset-favorites-controller.h \
+       photos-offset-import-controller.c \
+       photos-offset-import-controller.h \
        photos-offset-overview-controller.c \
        photos-offset-overview-controller.h \
        photos-offset-search-controller.c \
@@ -289,6 +291,8 @@ gnome_photos_SOURCES = \
        photos-tracker-controller.h \
        photos-tracker-favorites-controller.c \
        photos-tracker-favorites-controller.h \
+       photos-tracker-import-controller.c \
+       photos-tracker-import-controller.h \
        photos-tracker-overview-controller.c \
        photos-tracker-overview-controller.h \
        photos-tracker-search-controller.c \
diff --git a/src/photos-application.c b/src/photos-application.c
index 66af55f7..bb609b10 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -92,6 +92,8 @@ struct _PhotosApplication
   GSimpleAction *edit_revert_action;
   GSimpleAction *fs_action;
   GSimpleAction *gear_action;
+  GSimpleAction *import_action;
+  GSimpleAction *import_cancel_action;
   GSimpleAction *insta_action;
   GSimpleAction *load_next_action;
   GSimpleAction *load_previous_action;
@@ -342,6 +344,7 @@ photos_application_actions_update (PhotosApplication *self)
   if (mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
       || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
       || mode == PHOTOS_WINDOW_MODE_FAVORITES
+      || mode == PHOTOS_WINDOW_MODE_IMPORT
       || mode == PHOTOS_WINDOW_MODE_OVERVIEW
       || mode == PHOTOS_WINDOW_MODE_SEARCH)
     {
@@ -381,6 +384,7 @@ photos_application_actions_update (PhotosApplication *self)
   enable = ((mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
              || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
              || mode == PHOTOS_WINDOW_MODE_FAVORITES
+             || mode == PHOTOS_WINDOW_MODE_IMPORT
              || mode == PHOTOS_WINDOW_MODE_OVERVIEW
              || mode == PHOTOS_WINDOW_MODE_SEARCH)
             && n_items > 0);
@@ -388,6 +392,12 @@ photos_application_actions_update (PhotosApplication *self)
   g_simple_action_set_enabled (self->sel_none_action, enable);
   g_simple_action_set_enabled (self->selection_mode_action, enable);
 
+  enable = (mode == PHOTOS_WINDOW_MODE_IMPORT);
+  g_simple_action_set_enabled (self->import_cancel_action, enable);
+
+  enable = (mode == PHOTOS_WINDOW_MODE_IMPORT && selection != NULL);
+  g_simple_action_set_enabled (self->import_action, enable);
+
   enable = (mode == PHOTOS_WINDOW_MODE_PREVIEW);
   g_simple_action_set_enabled (self->load_next_action, enable);
   g_simple_action_set_enabled (self->load_previous_action, enable);
@@ -716,6 +726,7 @@ photos_application_activate_item (PhotosApplication *self, GObject *item)
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       can_activate = TRUE;
@@ -747,6 +758,7 @@ photos_application_activate_item (PhotosApplication *self, GObject *item)
       break;
 
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
+    case PHOTOS_WINDOW_MODE_IMPORT:
       photos_mode_controller_go_back (self->state->mode_cntrlr);
       break;
 
@@ -969,6 +981,35 @@ photos_application_get_state (PhotosSearchContext *context)
 }
 
 
+static void
+photos_application_import (PhotosApplication *self)
+{
+  GMount *mount;
+  PhotosSource *source;
+
+  source = PHOTOS_SOURCE (photos_base_manager_get_active_object (self->state->src_mngr));
+  g_return_if_fail (PHOTOS_IS_SOURCE (source));
+
+  mount = photos_source_get_mount (source);
+  g_return_if_fail (G_IS_MOUNT (mount));
+}
+
+
+static void
+photos_application_import_cancel (PhotosApplication *self)
+{
+  PhotosWindowMode mode;
+
+  photos_base_manager_set_active_object_by_id (self->state->src_mngr, PHOTOS_SOURCE_STOCK_ALL);
+
+  mode = photos_mode_controller_get_window_mode (self->state->mode_cntrlr);
+  g_return_if_fail (mode != PHOTOS_WINDOW_MODE_IMPORT);
+  g_return_if_fail (mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+                    || mode == PHOTOS_WINDOW_MODE_FAVORITES
+                    || mode == PHOTOS_WINDOW_MODE_OVERVIEW);
+}
+
+
 static void
 photos_application_items_changed (PhotosApplication *self)
 {
@@ -994,6 +1035,7 @@ photos_application_launch_search (PhotosApplication *self, const gchar* const *t
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       can_launch = TRUE;
@@ -1031,6 +1073,10 @@ photos_application_launch_search (PhotosApplication *self, const gchar* const *t
     case PHOTOS_WINDOW_MODE_SEARCH:
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      photos_mode_controller_go_back (self->state->mode_cntrlr);
+      break;
+
     case PHOTOS_WINDOW_MODE_EDIT:
     case PHOTOS_WINDOW_MODE_PREVIEW:
     default:
@@ -1722,6 +1768,7 @@ photos_application_window_mode_changed (PhotosApplication *self, PhotosWindowMod
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       item_mngr_chld = photos_item_manager_get_for_mode (PHOTOS_ITEM_MANAGER (self->state->item_mngr), 
old_mode);
@@ -1740,6 +1787,7 @@ photos_application_window_mode_changed (PhotosApplication *self, PhotosWindowMod
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       item_mngr_chld = photos_item_manager_get_for_mode (PHOTOS_ITEM_MANAGER (self->state->item_mngr), mode);
@@ -2118,6 +2166,17 @@ photos_application_startup (GApplication *application)
   self->gear_action = g_simple_action_new_stateful ("gear-menu", NULL, state);
   g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->gear_action));
 
+  self->import_action = g_simple_action_new ("import-current", NULL);
+  g_signal_connect_swapped (self->import_action, "activate", G_CALLBACK (photos_application_import), self);
+  g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->import_action));
+
+  self->import_cancel_action = g_simple_action_new ("import-cancel", NULL);
+  g_signal_connect_swapped (self->import_cancel_action,
+                            "activate",
+                            G_CALLBACK (photos_application_import_cancel),
+                            self);
+  g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->import_cancel_action));
+
   self->insta_action = g_simple_action_new ("insta-current", G_VARIANT_TYPE_INT16);
   g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (self->insta_action));
 
@@ -2351,6 +2410,8 @@ photos_application_dispose (GObject *object)
   g_clear_object (&self->edit_revert_action);
   g_clear_object (&self->fs_action);
   g_clear_object (&self->gear_action);
+  g_clear_object (&self->import_action);
+  g_clear_object (&self->import_cancel_action);
   g_clear_object (&self->insta_action);
   g_clear_object (&self->load_next_action);
   g_clear_object (&self->load_previous_action);
diff --git a/src/photos-embed.c b/src/photos-embed.c
index fe5d784d..56fe3939 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -39,6 +39,7 @@
 #include "photos-selection-toolbar.h"
 #include "photos-spinner-box.h"
 #include "photos-search-context.h"
+#include "photos-search-match.h"
 #include "photos-search-type.h"
 #include "photos-search-type-manager.h"
 #include "photos-source.h"
@@ -70,6 +71,7 @@ struct _PhotosEmbed
   GtkWidget *collection_view;
   GtkWidget *collections;
   GtkWidget *favorites;
+  GtkWidget *import;
   GtkWidget *no_results;
   GtkWidget *ntfctn_mngr;
   GtkWidget *overview;
@@ -155,6 +157,10 @@ photos_embed_get_view_container_from_mode (PhotosEmbed *self, PhotosWindowMode m
       view_container = self->favorites;
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      view_container = self->import;
+      break;
+
     case PHOTOS_WINDOW_MODE_OVERVIEW:
       view_container = self->overview;
       break;
@@ -410,6 +416,7 @@ photos_embed_prepare_for_collection_view (PhotosEmbed *self, PhotosWindowMode ol
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_EDIT:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     default:
       g_assert_not_reached ();
@@ -443,6 +450,17 @@ photos_embed_prepare_for_favorites (PhotosEmbed *self, PhotosWindowMode old_mode
 }
 
 
+static void
+photos_embed_prepare_for_import (PhotosEmbed *self, PhotosWindowMode old_mode)
+{
+  if (old_mode == PHOTOS_WINDOW_MODE_PREVIEW)
+    photos_embed_tracker_controllers_set_frozen (self, FALSE);
+
+  photos_spinner_box_stop (PHOTOS_SPINNER_BOX (self->spinner_box));
+  gtk_stack_set_visible_child_name (GTK_STACK (self->stack), "import");
+}
+
+
 static void
 photos_embed_prepare_for_overview (PhotosEmbed *self, PhotosWindowMode old_mode)
 {
@@ -480,53 +498,96 @@ photos_embed_query_status_changed (PhotosEmbed *self, gboolean querying)
 static void
 photos_embed_search_changed (PhotosEmbed *self)
 {
-  GObject *object;
-  const gchar *search_type_id;
-  const gchar *source_id;
-  const gchar *str;
-
-  /* Whenever a search constraint is specified, we switch to the
-   * search mode. Search is always global. If we are in
-   * collection-view, we go back to the previous top-level mode and
-   * then enter the search mode.
-   *
-   * When all constraints have been lifted we want to go back to the
-   * previous top-level mode which can be either collections,
-   * favorites or overview.
-   *
-   * The constraints are saved when entering collection-view or
-   * preview from the search mode. They are restored when going back.
-   * Saving and restoring doesn't cause any further mode changes.
-   */
-
-  self->search_changed = TRUE;
-
-  object = photos_base_manager_get_active_object (self->src_mngr);
-  source_id = photos_filterable_get_id (PHOTOS_FILTERABLE (object));
-
-  object = photos_base_manager_get_active_object (self->srch_typ_mngr);
-  search_type_id = photos_filterable_get_id (PHOTOS_FILTERABLE (object));
+  GMount *mount;
+  PhotosSource *source;
 
-  str = photos_search_controller_get_string (self->srch_cntrlr);
+  source = PHOTOS_SOURCE (photos_base_manager_get_active_object (self->src_mngr));
 
-  if (g_strcmp0 (search_type_id, PHOTOS_SEARCH_TYPE_STOCK_ALL) == 0
-      && g_strcmp0 (source_id, PHOTOS_SOURCE_STOCK_ALL) == 0
-      && (str == NULL || str [0] == '\0'))
-    {
-      photos_mode_controller_go_back (self->mode_cntrlr);
-    }
-  else
+  mount = photos_source_get_mount (source);
+  if (mount != NULL)
     {
+      GObject *object;
       PhotosWindowMode mode;
+      const gchar *search_match_id;
+      const gchar *search_type_id;
+
+      photos_embed_block_search_changed (self);
+
+      mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
+      if (mode == PHOTOS_WINDOW_MODE_PREVIEW)
+        photos_mode_controller_go_back (self->mode_cntrlr);
 
       mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
       if (mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW)
         photos_mode_controller_go_back (self->mode_cntrlr);
 
-      photos_mode_controller_set_window_mode (self->mode_cntrlr, PHOTOS_WINDOW_MODE_SEARCH);
+      mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
+      if (mode == PHOTOS_WINDOW_MODE_SEARCH)
+        photos_mode_controller_go_back (self->mode_cntrlr);
+
+      photos_base_manager_set_active_object (self->src_mngr, G_OBJECT (source));
+
+      object = photos_base_manager_get_active_object (self->srch_mtch_mngr);
+      search_match_id = photos_filterable_get_id (PHOTOS_FILTERABLE (object));
+      g_assert_cmpstr (search_match_id, ==, PHOTOS_SEARCH_MATCH_STOCK_ALL);
+
+      object = photos_base_manager_get_active_object (self->srch_typ_mngr);
+      search_type_id = photos_filterable_get_id (PHOTOS_FILTERABLE (object));
+      g_assert_cmpstr (search_type_id, ==, PHOTOS_SEARCH_TYPE_STOCK_ALL);
+
+      photos_mode_controller_set_window_mode (self->mode_cntrlr, PHOTOS_WINDOW_MODE_IMPORT);
+
+      photos_embed_unblock_search_changed (self);
     }
+  else
+    {
+      GObject *object;
+      const gchar *search_type_id;
+      const gchar *source_id;
+      const gchar *str;
+
+      /* Whenever a search constraint is specified, we switch to the
+       * search mode. Search is always global. If we are in
+       * collection-view, we go back to the previous top-level mode and
+       * then enter the search mode.
+       *
+       * When all constraints have been lifted we want to go back to the
+       * previous top-level mode which can be either collections,
+       * favorites or overview.
+       *
+       * The constraints are saved when entering collection-view or
+       * preview from the search mode. They are restored when going back.
+       * Saving and restoring doesn't cause any further mode changes.
+       */
+
+      self->search_changed = TRUE;
+
+      source_id = photos_filterable_get_id (PHOTOS_FILTERABLE (source));
+
+      object = photos_base_manager_get_active_object (self->srch_typ_mngr);
+      search_type_id = photos_filterable_get_id (PHOTOS_FILTERABLE (object));
 
-  self->search_changed = FALSE;
+      str = photos_search_controller_get_string (self->srch_cntrlr);
+
+      if (g_strcmp0 (search_type_id, PHOTOS_SEARCH_TYPE_STOCK_ALL) == 0
+          && g_strcmp0 (source_id, PHOTOS_SOURCE_STOCK_ALL) == 0
+          && (str == NULL || str [0] == '\0'))
+        {
+          photos_mode_controller_go_back (self->mode_cntrlr);
+        }
+      else
+        {
+          PhotosWindowMode mode;
+
+          mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
+          if (mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW)
+            photos_mode_controller_go_back (self->mode_cntrlr);
+
+          photos_mode_controller_set_window_mode (self->mode_cntrlr, PHOTOS_WINDOW_MODE_SEARCH);
+        }
+
+      self->search_changed = FALSE;
+    }
 }
 
 
@@ -621,6 +682,7 @@ photos_embed_window_mode_changed (PhotosModeController *mode_cntrlr,
 
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_EDIT:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_PREVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       break;
@@ -650,6 +712,10 @@ photos_embed_window_mode_changed (PhotosModeController *mode_cntrlr,
       photos_embed_prepare_for_favorites (self, old_mode);
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      photos_embed_prepare_for_import (self, old_mode);
+      break;
+
     case PHOTOS_WINDOW_MODE_OVERVIEW:
       photos_embed_prepare_for_overview (self, old_mode);
       break;
@@ -741,6 +807,9 @@ photos_embed_init (PhotosEmbed *self)
   name = photos_view_container_get_name (PHOTOS_VIEW_CONTAINER (self->favorites));
   gtk_stack_add_titled (GTK_STACK (self->stack), self->favorites, "favorites", name);
 
+  self->import = photos_view_container_new (PHOTOS_WINDOW_MODE_IMPORT, _("Import"));
+  gtk_stack_add_named (GTK_STACK (self->stack), self->import, "import");
+
   self->search = photos_view_container_new (PHOTOS_WINDOW_MODE_SEARCH, _("Search"));
   gtk_stack_add_named (GTK_STACK (self->stack), self->search, "search");
 
diff --git a/src/photos-empty-results-box.c b/src/photos-empty-results-box.c
index 9db63a1c..93123a14 100644
--- a/src/photos-empty-results-box.c
+++ b/src/photos-empty-results-box.c
@@ -111,6 +111,7 @@ photos_empty_results_box_add_image (PhotosEmptyResultsBox *self)
      * the relevant locations.
      */
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
       icon_name = "camera-photo-symbolic";
       break;
@@ -155,6 +156,7 @@ photos_empty_results_box_add_primary_label (PhotosEmptyResultsBox *self)
      * the relevant locations.
      */
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       text = _("No photos found");
@@ -194,6 +196,7 @@ photos_empty_results_box_add_secondary_label (PhotosEmptyResultsBox *self)
      */
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
       break;
 
     case PHOTOS_WINDOW_MODE_OVERVIEW:
diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
index 5deb007a..b3072221 100644
--- a/src/photos-item-manager.c
+++ b/src/photos-item-manager.c
@@ -31,6 +31,7 @@
 
 #include "egg-counter.h"
 #include "photos-debug.h"
+#include "photos-device-item.h"
 #include "photos-enums.h"
 #include "photos-filterable.h"
 #include "photos-item-manager.h"
@@ -357,7 +358,34 @@ photos_item_manager_check_wait_for_changes (PhotosItemManager *self, const gchar
 
 
 static void
-photos_item_manager_item_created_executed (GObject *source_object, GAsyncResult *res, gpointer user_data)
+photos_item_manager_item_created_executed_import (GObject *source_object, GAsyncResult *res, gpointer 
user_data)
+{
+  PhotosItemManager *self = PHOTOS_ITEM_MANAGER (user_data);
+  GError *error = NULL;
+  PhotosSingleItemJob *job = PHOTOS_SINGLE_ITEM_JOB (source_object);
+  TrackerSparqlCursor *cursor = NULL;
+
+  cursor = photos_single_item_job_finish (job, res, &error);
+  if (error != NULL)
+    {
+      g_warning ("Unable to query single item: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
+
+  if (cursor == NULL)
+    goto out;
+
+  photos_item_manager_add_item_for_mode (self, PHOTOS_TYPE_DEVICE_ITEM, PHOTOS_WINDOW_MODE_IMPORT, cursor);
+
+ out:
+  g_clear_object (&cursor);
+  g_object_unref (self);
+}
+
+
+static void
+photos_item_manager_item_created_executed_overview (GObject *source_object, GAsyncResult *res, gpointer 
user_data)
 {
   PhotosItemManager *self = PHOTOS_ITEM_MANAGER (user_data);
   GError *error = NULL;
@@ -399,7 +427,8 @@ photos_item_manager_item_created (PhotosItemManager *self, const gchar *urn)
   GApplication *app;
   PhotosItemManagerHiddenItem *old_hidden_item;
   PhotosSearchContextState *state;
-  PhotosSingleItemJob *job;
+  PhotosSingleItemJob *job_import;
+  PhotosSingleItemJob *job_overview;
 
   old_hidden_item = (PhotosItemManagerHiddenItem *) g_hash_table_lookup (self->hidden_items, urn);
   g_return_if_fail (old_hidden_item == NULL);
@@ -407,14 +436,24 @@ photos_item_manager_item_created (PhotosItemManager *self, const gchar *urn)
   app = g_application_get_default ();
   state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
 
-  job = photos_single_item_job_new (urn);
-  photos_single_item_job_run (job,
+  job_import = photos_single_item_job_new (urn);
+  photos_single_item_job_run (job_import,
+                              state,
+                              PHOTOS_QUERY_FLAGS_IMPORT,
+                              NULL,
+                              photos_item_manager_item_created_executed_import,
+                              g_object_ref (self));
+
+  job_overview = photos_single_item_job_new (urn);
+  photos_single_item_job_run (job_overview,
                               state,
                               PHOTOS_QUERY_FLAGS_NONE,
                               NULL,
-                              photos_item_manager_item_created_executed,
+                              photos_item_manager_item_created_executed_overview,
                               g_object_ref (self));
-  g_object_unref (job);
+
+  g_object_unref (job_import);
+  g_object_unref (job_overview);
 }
 
 
@@ -693,6 +732,7 @@ photos_item_manager_set_active_object (PhotosBaseManager *manager, GObject *obje
   g_return_val_if_fail (object != NULL, FALSE);
   g_return_val_if_fail (PHOTOS_IS_BASE_ITEM (object), FALSE);
   g_return_val_if_fail (self->mode != PHOTOS_WINDOW_MODE_EDIT, FALSE);
+  g_return_val_if_fail (self->mode != PHOTOS_WINDOW_MODE_IMPORT, FALSE);
 
   is_collection = photos_base_item_is_collection (PHOTOS_BASE_ITEM (object));
   if (is_collection)
@@ -1381,14 +1421,20 @@ photos_mode_controller_get_window_mode (PhotosModeController *self)
 void
 photos_mode_controller_go_back (PhotosModeController *self)
 {
+  GAction *selection_mode_action;
+  GApplication *app;
   PhotosWindowMode old_mode;
   PhotosWindowMode tmp;
   gboolean active_changed = FALSE;
   gboolean active_collection_changed = FALSE;
+  gboolean unset_selection_mode = FALSE;
 
   g_return_if_fail (PHOTOS_IS_MODE_CONTROLLER (self));
   g_return_if_fail (!g_queue_is_empty (self->history));
 
+  app = g_application_get_default ();
+  selection_mode_action = g_action_map_lookup_action (G_ACTION_MAP (app), "selection-mode");
+
   old_mode = (PhotosWindowMode) GPOINTER_TO_INT (g_queue_peek_head (self->history));
   g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_NONE);
 
@@ -1413,6 +1459,20 @@ photos_mode_controller_go_back (PhotosModeController *self)
       g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_PREVIEW);
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      {
+        g_autoptr (GVariant) state = NULL;
+
+        g_return_if_fail (old_mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+                          || old_mode == PHOTOS_WINDOW_MODE_FAVORITES
+                          || old_mode == PHOTOS_WINDOW_MODE_OVERVIEW);
+
+        state = g_action_get_state (selection_mode_action);
+        g_return_if_fail (state != NULL);
+        g_return_if_fail (g_variant_get_boolean (state));
+        break;
+      }
+
     case PHOTOS_WINDOW_MODE_PREVIEW:
       g_return_if_fail (PHOTOS_IS_BASE_ITEM (self->active_object));
       g_return_if_fail (self->active_object != (GObject *) self->active_collection);
@@ -1449,6 +1509,10 @@ photos_mode_controller_go_back (PhotosModeController *self)
     case PHOTOS_WINDOW_MODE_EDIT:
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      unset_selection_mode = TRUE;
+      break;
+
     case PHOTOS_WINDOW_MODE_PREVIEW:
       self->load_state = PHOTOS_LOAD_STATE_NONE;
       g_set_object (&self->active_object, G_OBJECT (self->active_collection));
@@ -1477,6 +1541,14 @@ photos_mode_controller_go_back (PhotosModeController *self)
       break;
     }
 
+  if (unset_selection_mode)
+    {
+      GVariant *state;
+
+      state = g_variant_new_boolean (FALSE);
+      g_action_change_state (selection_mode_action, state);
+    }
+
   if (active_changed)
     g_signal_emit_by_name (self, "active-changed", self->active_object);
 
@@ -1511,19 +1583,38 @@ photos_mode_controller_set_fullscreen (PhotosModeController *self, gboolean full
 void
 photos_mode_controller_set_window_mode (PhotosModeController *self, PhotosWindowMode mode)
 {
+  GAction *selection_mode_action;
+  GApplication *app;
   PhotosWindowMode old_mode;
+  gboolean active_changed = FALSE;
   gboolean active_collection_changed = FALSE;
+  gboolean set_selection_mode = FALSE;
 
   g_return_if_fail (PHOTOS_IS_MODE_CONTROLLER (self));
   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_NONE);
   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_COLLECTION_VIEW);
   g_return_if_fail (mode != PHOTOS_WINDOW_MODE_PREVIEW);
 
+  app = g_application_get_default ();
+  selection_mode_action = g_action_map_lookup_action (G_ACTION_MAP (app), "selection-mode");
+
   if (mode == PHOTOS_WINDOW_MODE_EDIT)
     {
       g_return_if_fail (self->load_state == PHOTOS_LOAD_STATE_FINISHED);
       g_return_if_fail (self->mode == PHOTOS_WINDOW_MODE_PREVIEW);
     }
+  else if (mode == PHOTOS_WINDOW_MODE_IMPORT)
+    {
+      g_autoptr (GVariant) state = NULL;
+
+      g_return_if_fail (self->mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+                        || self->mode == PHOTOS_WINDOW_MODE_FAVORITES
+                        || self->mode == PHOTOS_WINDOW_MODE_OVERVIEW);
+
+      state = g_action_get_state (selection_mode_action);
+      g_return_if_fail (state != NULL);
+      g_return_if_fail (!g_variant_get_boolean (state));
+    }
   else
     {
       g_return_if_fail (self->mode != PHOTOS_WINDOW_MODE_EDIT);
@@ -1547,11 +1638,25 @@ photos_mode_controller_set_window_mode (PhotosModeController *self, PhotosWindow
         }
 
       g_clear_object (&self->active_object);
-      g_signal_emit_by_name (self, "active-changed", self->active_object);
+      active_changed = TRUE;
+    }
 
-      if (active_collection_changed)
-        g_signal_emit (self, signals[ACTIVE_COLLECTION_CHANGED], 0, self->active_collection);
+  if (mode == PHOTOS_WINDOW_MODE_IMPORT)
+    set_selection_mode = TRUE;
+
+  if (set_selection_mode)
+    {
+      GVariant *state;
+
+      state = g_variant_new_boolean (TRUE);
+      g_action_change_state (selection_mode_action, state);
     }
 
+  if (active_changed)
+    g_signal_emit_by_name (self, "active-changed", self->active_object);
+
+  if (active_collection_changed)
+    g_signal_emit (self, signals[ACTIVE_COLLECTION_CHANGED], 0, self->active_collection);
+
   g_signal_emit (self, signals[WINDOW_MODE_CHANGED], 0, mode, old_mode);
 }
diff --git a/src/photos-item-manager.h b/src/photos-item-manager.h
index bd5b06e8..708e7504 100644
--- a/src/photos-item-manager.h
+++ b/src/photos-item-manager.h
@@ -60,6 +60,7 @@ typedef enum
   PHOTOS_WINDOW_MODE_COLLECTIONS,
   PHOTOS_WINDOW_MODE_EDIT,
   PHOTOS_WINDOW_MODE_FAVORITES,
+  PHOTOS_WINDOW_MODE_IMPORT,
   PHOTOS_WINDOW_MODE_OVERVIEW,
   PHOTOS_WINDOW_MODE_PREVIEW,
   PHOTOS_WINDOW_MODE_SEARCH
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index c4fd549c..a541be02 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -28,6 +28,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
+#include "photos-base-manager.h"
 #include "photos-dlna-renderers-manager.h"
 #include "photos-dropdown.h"
 #include "photos-item-manager.h"
@@ -52,6 +53,7 @@ struct _PhotosMainToolbar
   GtkWidget *selection_menu;
   GtkWidget *stack_switcher;
   PhotosBaseManager *item_mngr;
+  PhotosBaseManager *src_mngr;
   PhotosModeController *mode_cntrlr;
   PhotosRemoteDisplayManager *remote_mngr;
   PhotosSelectionController *sel_cntrlr;
@@ -65,7 +67,9 @@ static void photos_main_toolbar_favorite_button_update (PhotosMainToolbar *self,
 
 
 static gchar *
-photos_main_toolbar_create_selection_mode_label (PhotosMainToolbar *self, PhotosBaseItem *active_collection)
+photos_main_toolbar_create_selection_mode_label (PhotosMainToolbar *self,
+                                                 PhotosBaseItem *active_collection,
+                                                 PhotosSource *source)
 {
   GList *selection;
   g_autofree gchar *label = NULL;
@@ -80,9 +84,20 @@ photos_main_toolbar_create_selection_mode_label (PhotosMainToolbar *self, Photos
     label = g_strdup_printf (ngettext ("%d selected", "%d selected", length), length);
 
   if (active_collection != NULL)
-    ret_val = g_markup_printf_escaped ("<b>%s</b> (%s)", photos_base_item_get_name (active_collection), 
label);
+    {
+      ret_val = g_markup_printf_escaped ("<b>%s</b> (%s)", photos_base_item_get_name (active_collection), 
label);
+    }
+  else if (source != NULL)
+    {
+      const gchar *name;
+
+      name = photos_source_get_name (source);
+      ret_val = g_markup_printf_escaped ("<b>%s</b> (%s)", name, label);
+    }
   else
-    ret_val = g_steal_pointer (&label);
+    {
+      ret_val = g_steal_pointer (&label);
+    }
 
   return ret_val;
 }
@@ -92,6 +107,7 @@ static void
 photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
 {
   PhotosBaseItem *active_collection;
+  PhotosSource *source;
   PhotosWindowMode window_mode;
   gboolean selection_mode;
   g_autofree gchar *primary = NULL;
@@ -104,6 +120,7 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
       g_return_if_fail (window_mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
                         || window_mode == PHOTOS_WINDOW_MODE_COLLECTIONS
                         || window_mode == PHOTOS_WINDOW_MODE_FAVORITES
+                        || window_mode == PHOTOS_WINDOW_MODE_IMPORT
                         || window_mode == PHOTOS_WINDOW_MODE_OVERVIEW
                         || window_mode == PHOTOS_WINDOW_MODE_SEARCH);
     }
@@ -112,12 +129,24 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
     g_return_if_fail (!selection_mode);
 
   active_collection = photos_item_manager_get_active_collection (PHOTOS_ITEM_MANAGER (self->item_mngr));
+  source = PHOTOS_SOURCE (photos_base_manager_get_active_object (self->src_mngr));
+
+  if (window_mode == PHOTOS_WINDOW_MODE_IMPORT)
+    {
+      GMount *mount;
+
+      g_return_if_fail (active_collection == NULL);
+      g_return_if_fail (PHOTOS_IS_SOURCE (source));
+
+      mount = photos_source_get_mount (source);
+      g_return_if_fail (G_IS_MOUNT (mount));
+    }
 
   switch (window_mode)
     {
     case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
       if (selection_mode)
-        primary = photos_main_toolbar_create_selection_mode_label (self, active_collection);
+        primary = photos_main_toolbar_create_selection_mode_label (self, active_collection, NULL);
       else
         primary = g_strdup (photos_base_item_get_name (active_collection));
       break;
@@ -127,7 +156,7 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
       if (selection_mode)
-        primary = photos_main_toolbar_create_selection_mode_label (self, NULL);
+        primary = photos_main_toolbar_create_selection_mode_label (self, NULL, NULL);
       break;
 
     case PHOTOS_WINDOW_MODE_EDIT:
@@ -142,6 +171,10 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
         break;
       }
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      primary = photos_main_toolbar_create_selection_mode_label (self, NULL, source);
+      break;
+
     case PHOTOS_WINDOW_MODE_NONE:
     default:
       break;
@@ -450,6 +483,28 @@ photos_main_toolbar_populate_for_favorites (PhotosMainToolbar *self)
 }
 
 
+static void
+photos_main_toolbar_populate_for_import (PhotosMainToolbar *self)
+{
+  GtkStyleContext *context;
+  GtkWidget *cancel_button;
+
+  gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self->header_bar), self->selection_menu);
+  context = gtk_widget_get_style_context (self->header_bar);
+  gtk_style_context_add_class (context, "selection-mode");
+
+  cancel_button = gtk_button_new_with_label (_("Cancel"));
+  gtk_actionable_set_action_name (GTK_ACTIONABLE (cancel_button), "app.import-cancel");
+  gtk_header_bar_pack_end (GTK_HEADER_BAR (self->header_bar), cancel_button);
+
+  g_signal_connect_object (self->sel_cntrlr,
+                           "selection-changed",
+                           G_CALLBACK (photos_main_toolbar_set_toolbar_title),
+                           self,
+                           G_CONNECT_SWAPPED);
+}
+
+
 static void
 photos_main_toolbar_populate_for_overview (PhotosMainToolbar *self)
 {
@@ -582,6 +637,7 @@ photos_main_toolbar_dispose (GObject *object)
   g_clear_object (&self->remote_mngr);
   g_clear_object (&self->sel_cntrlr);
   g_clear_object (&self->selection_menu);
+  g_clear_object (&self->src_mngr);
   g_clear_object (&self->stack_switcher);
 
   G_OBJECT_CLASS (photos_main_toolbar_parent_class)->dispose (object);
@@ -652,6 +708,7 @@ photos_main_toolbar_init (PhotosMainToolbar *self)
   self->item_mngr = g_object_ref (state->item_mngr);
   self->mode_cntrlr = g_object_ref (state->mode_cntrlr);
   self->sel_cntrlr = photos_selection_controller_dup_singleton ();
+  self->src_mngr = g_object_ref (state->src_mngr);
 
   self->remote_mngr = photos_remote_display_manager_dup_singleton ();
   g_signal_connect_object (self->remote_mngr,
@@ -726,21 +783,44 @@ photos_main_toolbar_is_focus (PhotosMainToolbar *self)
 void
 photos_main_toolbar_reset_toolbar_mode (PhotosMainToolbar *self)
 {
+  PhotosWindowMode window_mode;
   gboolean selection_mode;
 
   photos_main_toolbar_clear_toolbar (self);
+  window_mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
   selection_mode = photos_utils_get_selection_mode ();
 
   if (selection_mode)
-    photos_main_toolbar_populate_for_selection_mode (self);
-  else
     {
-      PhotosWindowMode window_mode;
+      switch (window_mode)
+        {
+        case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
+        case PHOTOS_WINDOW_MODE_COLLECTIONS:
+        case PHOTOS_WINDOW_MODE_FAVORITES:
+        case PHOTOS_WINDOW_MODE_OVERVIEW:
+        case PHOTOS_WINDOW_MODE_SEARCH:
+          photos_main_toolbar_populate_for_selection_mode (self);
+          break;
 
-      window_mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
+        case PHOTOS_WINDOW_MODE_IMPORT:
+          photos_main_toolbar_populate_for_import (self);
+          break;
 
+        case PHOTOS_WINDOW_MODE_NONE:
+        case PHOTOS_WINDOW_MODE_EDIT:
+        case PHOTOS_WINDOW_MODE_PREVIEW:
+        default:
+          g_assert_not_reached ();
+          break;
+        }
+    }
+  else
+    {
       switch (window_mode)
         {
+        case PHOTOS_WINDOW_MODE_NONE:
+          break;
+
         case PHOTOS_WINDOW_MODE_COLLECTION_VIEW:
           photos_main_toolbar_populate_for_collection_view (self);
           break;
@@ -769,8 +849,9 @@ photos_main_toolbar_reset_toolbar_mode (PhotosMainToolbar *self)
           photos_main_toolbar_populate_for_search (self);
           break;
 
-        case PHOTOS_WINDOW_MODE_NONE:
+        case PHOTOS_WINDOW_MODE_IMPORT:
         default:
+          g_assert_not_reached ();
           break;
         }
     }
diff --git a/src/photos-main-window.c b/src/photos-main-window.c
index d14e90f3..d15c1eba 100644
--- a/src/photos-main-window.c
+++ b/src/photos-main-window.c
@@ -41,6 +41,7 @@ struct _PhotosMainWindow
 {
   GtkApplicationWindow parent_instance;
   GAction *edit_cancel;
+  GAction *import_cancel;
   GAction *load_next;
   GAction *load_previous;
   GtkWidget *embed;
@@ -166,6 +167,7 @@ photos_main_window_go_back (PhotosMainWindow *self)
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
     case PHOTOS_WINDOW_MODE_EDIT:
     case PHOTOS_WINDOW_MODE_FAVORITES:
+    case PHOTOS_WINDOW_MODE_IMPORT:
     case PHOTOS_WINDOW_MODE_OVERVIEW:
     case PHOTOS_WINDOW_MODE_SEARCH:
     default:
@@ -218,6 +220,21 @@ photos_main_window_handle_key_edit (PhotosMainWindow *self, GdkEventKey *event)
 }
 
 
+static gboolean
+photos_main_window_handle_key_import (PhotosMainWindow *self, GdkEventKey *event)
+{
+  gboolean handled = FALSE;
+
+  if (event->keyval == GDK_KEY_Escape)
+    {
+      g_action_activate (self->import_cancel, NULL);
+      handled = TRUE;
+    }
+
+  return handled;
+}
+
+
 static gboolean
 photos_main_window_handle_key_preview (PhotosMainWindow *self, GdkEventKey *event)
 {
@@ -285,6 +302,10 @@ photos_main_window_key_press_event (GtkWidget *widget, GdkEventKey *event)
       handled = photos_main_window_handle_key_edit (self, event);
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      handled = photos_main_window_handle_key_import (self, event);
+      break;
+
     case PHOTOS_WINDOW_MODE_PREVIEW:
       handled = photos_main_window_handle_key_preview (self, event);
       break;
@@ -350,6 +371,7 @@ photos_main_window_constructed (GObject *object)
   gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (self));
 
   self->edit_cancel = g_action_map_lookup_action (G_ACTION_MAP (app), "edit-cancel");
+  self->import_cancel = g_action_map_lookup_action (G_ACTION_MAP (app), "import-cancel");
   self->load_next = g_action_map_lookup_action (G_ACTION_MAP (app), "load-next");
   self->load_previous = g_action_map_lookup_action (G_ACTION_MAP (app), "load-previous");
 
diff --git a/src/photos-offset-import-controller.c b/src/photos-offset-import-controller.c
new file mode 100644
index 00000000..37d58c1c
--- /dev/null
+++ b/src/photos-offset-import-controller.c
@@ -0,0 +1,139 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2017 Red Hat, Inc.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Based on code from:
+ *   + Documents
+ */
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "photos-base-manager.h"
+#include "photos-filterable.h"
+#include "photos-offset-import-controller.h"
+#include "photos-query.h"
+#include "photos-query-builder.h"
+#include "photos-search-context.h"
+#include "photos-source.h"
+
+
+struct _PhotosOffsetImportController
+{
+  PhotosOffsetController parent_instance;
+  PhotosBaseManager *src_mngr;
+};
+
+
+G_DEFINE_TYPE (PhotosOffsetImportController, photos_offset_import_controller, PHOTOS_TYPE_OFFSET_CONTROLLER);
+
+
+static PhotosQuery *
+photos_offset_import_controller_get_query (PhotosOffsetController *offset_cntrlr)
+{
+  PhotosOffsetImportController *self = PHOTOS_OFFSET_IMPORT_CONTROLLER (offset_cntrlr);
+  GApplication *app;
+  GMount *mount;
+  g_autoptr (PhotosQuery) query = NULL;
+  PhotosQuery *ret_val = NULL;
+  PhotosSearchContextState *state;
+  PhotosSource *source;
+  const gchar *id;
+
+  source = PHOTOS_SOURCE (photos_base_manager_get_active_object (self->src_mngr));
+  g_return_val_if_fail (PHOTOS_IS_SOURCE (source), NULL);
+
+  id = photos_filterable_get_id (PHOTOS_FILTERABLE (source));
+  mount = photos_source_get_mount (source);
+  g_return_val_if_fail (g_strcmp0 (id, PHOTOS_SOURCE_STOCK_ALL) == 0 || G_IS_MOUNT (mount), NULL);
+
+  app = g_application_get_default ();
+  state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
+
+  if (mount != NULL)
+    query = photos_query_builder_count_query (state, PHOTOS_QUERY_FLAGS_IMPORT);
+  else
+    query = photos_query_new (state, "SELECT DISTINCT COUNT (?urn) WHERE { ?urn a rdfs:Resource FILTER 
(false) }");
+
+  ret_val = g_steal_pointer (&query);
+  return ret_val;
+}
+
+
+static GObject *
+photos_offset_import_controller_constructor (GType type,
+                                             guint n_construct_params,
+                                             GObjectConstructParam *construct_params)
+{
+  static GObject *self = NULL;
+
+  if (self == NULL)
+    {
+      self = G_OBJECT_CLASS (photos_offset_import_controller_parent_class)->constructor (type,
+                                                                                         n_construct_params,
+                                                                                         construct_params);
+      g_object_add_weak_pointer (self, (gpointer) &self);
+      return self;
+    }
+
+  return g_object_ref (self);
+}
+
+
+static void
+photos_offset_import_controller_dispose (GObject *object)
+{
+  PhotosOffsetImportController *self = PHOTOS_OFFSET_IMPORT_CONTROLLER (object);
+
+  g_clear_object (&self->src_mngr);
+
+  G_OBJECT_CLASS (photos_offset_import_controller_parent_class)->dispose (object);
+}
+
+
+static void
+photos_offset_import_controller_init (PhotosOffsetImportController *self)
+{
+  GApplication *app;
+  PhotosSearchContextState *state;
+
+  app = g_application_get_default ();
+  state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
+
+  self->src_mngr = g_object_ref (state->src_mngr);
+}
+
+
+static void
+photos_offset_import_controller_class_init (PhotosOffsetImportControllerClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  PhotosOffsetControllerClass *offset_controller_class = PHOTOS_OFFSET_CONTROLLER_CLASS (class);
+
+  object_class->constructor = photos_offset_import_controller_constructor;
+  object_class->dispose = photos_offset_import_controller_dispose;
+  offset_controller_class->get_query = photos_offset_import_controller_get_query;
+}
+
+
+PhotosOffsetController *
+photos_offset_import_controller_dup_singleton (void)
+{
+  return g_object_new (PHOTOS_TYPE_OFFSET_IMPORT_CONTROLLER, NULL);
+}
diff --git a/src/photos-offset-import-controller.h b/src/photos-offset-import-controller.h
new file mode 100644
index 00000000..c4623434
--- /dev/null
+++ b/src/photos-offset-import-controller.h
@@ -0,0 +1,41 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2017 Red Hat, Inc.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Based on code from:
+ *   + Documents
+ */
+
+#ifndef PHOTOS_OFFSET_IMPORT_CONTROLLER_H
+#define PHOTOS_OFFSET_IMPORT_CONTROLLER_H
+
+#include "photos-offset-controller.h"
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_OFFSET_IMPORT_CONTROLLER (photos_offset_import_controller_get_type ())
+G_DECLARE_FINAL_TYPE (PhotosOffsetImportController,
+                      photos_offset_import_controller,
+                      PHOTOS,
+                      OFFSET_IMPORT_CONTROLLER,
+                      PhotosOffsetController);
+
+PhotosOffsetController  *photos_offset_import_controller_dup_singleton     (void);
+
+G_END_DECLS
+
+#endif /* PHOTOS_OFFSET_IMPORT_CONTROLLER_H */
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 7e078dcd..9009330c 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -908,6 +908,9 @@ photos_preview_view_window_mode_changed (PhotosPreviewView *self, PhotosWindowMo
       photos_preview_nav_buttons_hide (self->nav_buttons);
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      break;
+
     case PHOTOS_WINDOW_MODE_PREVIEW:
       gtk_revealer_set_reveal_child (GTK_REVEALER (self->revealer), FALSE);
       photos_edit_palette_hide_details (PHOTOS_EDIT_PALETTE (self->palette));
@@ -1427,6 +1430,7 @@ photos_preview_view_set_mode (PhotosPreviewView *self, PhotosWindowMode old_mode
   g_return_if_fail (PHOTOS_IS_PREVIEW_VIEW (self));
   g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_NONE);
   g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_EDIT);
+  g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_IMPORT);
   g_return_if_fail (old_mode != PHOTOS_WINDOW_MODE_PREVIEW);
 
   photos_preview_nav_buttons_set_auto_hide (self->nav_buttons, TRUE);
diff --git a/src/photos-query.h b/src/photos-query.h
index 94707161..e59c03df 100644
--- a/src/photos-query.h
+++ b/src/photos-query.h
@@ -66,8 +66,9 @@ typedef enum
   PHOTOS_QUERY_FLAGS_UNFILTERED     = 1 << 0,
   PHOTOS_QUERY_FLAGS_COLLECTIONS    = 1 << 1,
   PHOTOS_QUERY_FLAGS_FAVORITES      = 1 << 2,
-  PHOTOS_QUERY_FLAGS_OVERVIEW       = 1 << 3,
-  PHOTOS_QUERY_FLAGS_SEARCH         = 1 << 4
+  PHOTOS_QUERY_FLAGS_IMPORT         = 1 << 3,
+  PHOTOS_QUERY_FLAGS_OVERVIEW       = 1 << 4,
+  PHOTOS_QUERY_FLAGS_SEARCH         = 1 << 5
 } PhotosQueryFlags;
 
 extern const gchar *PHOTOS_QUERY_COLLECTIONS_IDENTIFIER;
diff --git a/src/photos-search-type-manager.c b/src/photos-search-type-manager.c
index 25f856e9..4afd1b4a 100644
--- a/src/photos-search-type-manager.c
+++ b/src/photos-search-type-manager.c
@@ -58,7 +58,7 @@ photos_search_type_manager_get_filter (PhotosBaseManager *mngr, gint flags)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS);
   else if (flags & PHOTOS_QUERY_FLAGS_FAVORITES)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_FAVORITES);
-  else if (flags & PHOTOS_QUERY_FLAGS_OVERVIEW)
+  else if (flags & PHOTOS_QUERY_FLAGS_IMPORT || flags & PHOTOS_QUERY_FLAGS_OVERVIEW)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_PHOTOS);
   else if (flags & PHOTOS_QUERY_FLAGS_SEARCH)
     search_type = photos_base_manager_get_active_object (mngr);
@@ -79,7 +79,7 @@ photos_search_type_manager_get_where (PhotosBaseManager *mngr, gint flags)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS);
   else if (flags & PHOTOS_QUERY_FLAGS_FAVORITES)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_FAVORITES);
-  else if (flags & PHOTOS_QUERY_FLAGS_OVERVIEW)
+  else if (flags & PHOTOS_QUERY_FLAGS_IMPORT || flags & PHOTOS_QUERY_FLAGS_OVERVIEW)
     search_type = photos_base_manager_get_object_by_id (mngr, PHOTOS_SEARCH_TYPE_STOCK_PHOTOS);
   else if (flags & PHOTOS_QUERY_FLAGS_SEARCH)
     search_type = photos_base_manager_get_active_object (mngr);
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 7851c486..91156c48 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -46,6 +46,7 @@ struct _PhotosSelectionToolbar
   GtkWidget *toolbar_collection;
   GtkWidget *toolbar_export;
   GtkWidget *toolbar_favorite;
+  GtkWidget *toolbar_import;
   GtkWidget *toolbar_open;
   GtkWidget *toolbar_print;
   GtkWidget *toolbar_properties;
@@ -205,6 +206,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
   gboolean show_collection;
   gboolean show_export;
   gboolean show_favorite;
+  gboolean show_import;
   gboolean show_open;
   gboolean show_print;
   gboolean show_properties;
@@ -229,6 +231,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
       show_collection = TRUE;
       show_export = TRUE;
       show_favorite = TRUE;
+      show_import = FALSE;
       show_open = TRUE;
       show_print = TRUE;
       show_properties = TRUE;
@@ -237,6 +240,19 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
       show_trash = TRUE;
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      show_collection = FALSE;
+      show_export = FALSE;
+      show_favorite = FALSE;
+      show_import = TRUE;
+      show_open = FALSE;
+      show_print = FALSE;
+      show_properties = FALSE;
+      show_separator = FALSE;
+      show_share = FALSE;
+      show_trash = FALSE;
+      break;
+
     case PHOTOS_WINDOW_MODE_NONE:
     case PHOTOS_WINDOW_MODE_EDIT:
     case PHOTOS_WINDOW_MODE_PREVIEW:
@@ -307,6 +323,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
   gtk_widget_set_visible (self->toolbar_collection, show_collection);
   gtk_widget_set_visible (self->toolbar_export, show_export);
   gtk_widget_set_visible (self->toolbar_favorite, show_favorite);
+  gtk_widget_set_visible (self->toolbar_import, show_import);
   gtk_widget_set_visible (self->toolbar_open, show_open);
   gtk_widget_set_visible (self->toolbar_print, show_print);
   gtk_widget_set_visible (self->toolbar_properties, show_properties);
@@ -432,6 +449,7 @@ photos_selection_toolbar_class_init (PhotosSelectionToolbarClass *class)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Photos/selection-toolbar.ui");
   gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_export);
   gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_favorite);
+  gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_import);
   gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_open);
   gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_print);
   gtk_widget_class_bind_template_child (widget_class, PhotosSelectionToolbar, toolbar_properties);
diff --git a/src/photos-selection-toolbar.ui b/src/photos-selection-toolbar.ui
index bb7522a5..7e7aa466 100644
--- a/src/photos-selection-toolbar.ui
+++ b/src/photos-selection-toolbar.ui
@@ -106,6 +106,19 @@
           <property name="pack_type">end</property>
         </packing>
       </child>
+      <child>
+        <object class="GtkButton" id="toolbar_import">
+          <property name="label" translatable="yes">Add to Photos</property>
+          <property name="no-show-all">1</property>
+          <property name="action_name">app.import-current</property>
+          <style>
+            <class name="suggested-action"/>
+          </style>
+        </object>
+        <packing>
+          <property name="pack_type">end</property>
+        </packing>
+      </child>
       <child>
         <object class="GtkButton" id="toolbar_collection">
           <property name="label" translatable="yes">Add to Album</property>
diff --git a/src/photos-source-manager.c b/src/photos-source-manager.c
index 61bd08c8..1c1851d6 100644
--- a/src/photos-source-manager.c
+++ b/src/photos-source-manager.c
@@ -64,29 +64,63 @@ enum
 };
 
 
+static gboolean
+photos_source_manager_get_all_filter (GObject *source)
+{
+  GMount *mount;
+  gboolean ret_val;
+
+  g_return_val_if_fail (PHOTOS_IS_SOURCE (source), FALSE);
+
+  mount = photos_source_get_mount (PHOTOS_SOURCE (source));
+  ret_val = mount == NULL;
+  return ret_val;
+}
+
+
 static gchar *
 photos_source_manager_get_filter (PhotosBaseManager *mngr, gint flags)
 {
   GApplication *app;
   GObject *source;
+  const gchar *empty_filter = "(false)";
   const gchar *id;
   gchar *filter;
 
   app = g_application_get_default ();
   if (photos_application_get_empty_results (PHOTOS_APPLICATION (app)))
     {
-      filter = g_strdup ("(false)");
+      filter = g_strdup (empty_filter);
       goto out;
     }
 
-  if (flags & PHOTOS_QUERY_FLAGS_SEARCH)
-    source = photos_base_manager_get_active_object (mngr);
+  if (flags & PHOTOS_QUERY_FLAGS_IMPORT)
+    {
+      GMount *mount;
+
+      source = photos_base_manager_get_active_object (mngr);
+      mount = photos_source_get_mount (PHOTOS_SOURCE (source));
+      if (mount == NULL)
+        source = NULL;
+    }
+  else if (flags & PHOTOS_QUERY_FLAGS_SEARCH)
+    {
+      source = photos_base_manager_get_active_object (mngr);
+    }
   else
-    source = photos_base_manager_get_object_by_id (mngr, PHOTOS_SOURCE_STOCK_ALL);
+    {
+      source = photos_base_manager_get_object_by_id (mngr, PHOTOS_SOURCE_STOCK_ALL);
+    }
+
+  if (source == NULL)
+    {
+      filter = g_strdup (empty_filter);
+      goto out;
+    }
 
   id = photos_filterable_get_id (PHOTOS_FILTERABLE (source));
   if (g_strcmp0 (id, PHOTOS_SOURCE_STOCK_ALL) == 0)
-    filter = photos_base_manager_get_all_filter (mngr, NULL);
+    filter = photos_base_manager_get_all_filter (mngr, photos_source_manager_get_all_filter);
   else
     filter = photos_filterable_get_filter (PHOTOS_FILTERABLE (source));
 
diff --git a/src/photos-tracker-import-controller.c b/src/photos-tracker-import-controller.c
new file mode 100644
index 00000000..5e8f03c8
--- /dev/null
+++ b/src/photos-tracker-import-controller.c
@@ -0,0 +1,189 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2018 Red Hat, Inc.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Based on code from:
+ *   + Documents
+ */
+
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+#include "photos-base-manager.h"
+#include "photos-device-item.h"
+#include "photos-item-manager.h"
+#include "photos-offset-import-controller.h"
+#include "photos-query-builder.h"
+#include "photos-search-context.h"
+#include "photos-tracker-import-controller.h"
+#include "photos-utils.h"
+
+
+struct _PhotosTrackerImportController
+{
+  PhotosTrackerController parent_instance;
+  PhotosBaseManager *item_mngr;
+  PhotosBaseManager *src_mngr;
+  PhotosOffsetController *offset_cntrlr;
+};
+
+
+G_DEFINE_TYPE_WITH_CODE (PhotosTrackerImportController,
+                         photos_tracker_import_controller,
+                         PHOTOS_TYPE_TRACKER_CONTROLLER,
+                         photos_utils_ensure_extension_points ();
+                         g_io_extension_point_implement (PHOTOS_TRACKER_CONTROLLER_EXTENSION_POINT_NAME,
+                                                         g_define_type_id,
+                                                         "import",
+                                                         0));
+
+
+static void
+photos_tracker_import_controller_source_active_changed (PhotosTrackerImportController *self, GObject *source)
+{
+  GMount *mount;
+  gboolean frozen;
+
+  g_return_if_fail (PHOTOS_IS_TRACKER_IMPORT_CONTROLLER (self));
+  g_return_if_fail (PHOTOS_IS_SOURCE (source));
+  g_return_if_fail (PHOTOS_IS_ITEM_MANAGER (self->item_mngr));
+
+  mount = photos_source_get_mount (PHOTOS_SOURCE (source));
+  frozen = mount == NULL;
+  photos_tracker_controller_set_frozen (PHOTOS_TRACKER_CONTROLLER (self), frozen);
+
+  if (mount == NULL)
+    photos_item_manager_clear (PHOTOS_ITEM_MANAGER (self->item_mngr), PHOTOS_WINDOW_MODE_IMPORT);
+  else
+    photos_tracker_controller_refresh_for_object (PHOTOS_TRACKER_CONTROLLER (self));
+}
+
+
+static PhotosOffsetController *
+photos_tracker_import_controller_get_offset_controller (PhotosTrackerController *trk_cntrlr)
+{
+  PhotosTrackerImportController *self = PHOTOS_TRACKER_IMPORT_CONTROLLER (trk_cntrlr);
+  return g_object_ref (self->offset_cntrlr);
+}
+
+
+static PhotosQuery *
+photos_tracker_import_controller_get_query (PhotosTrackerController *trk_cntrlr)
+{
+  PhotosTrackerImportController *self = PHOTOS_TRACKER_IMPORT_CONTROLLER (trk_cntrlr);
+  GApplication *app;
+  PhotosSearchContextState *state;
+
+  app = g_application_get_default ();
+  state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
+
+  return photos_query_builder_global_query (state, PHOTOS_QUERY_FLAGS_IMPORT, self->offset_cntrlr);
+}
+
+
+static GObject *
+photos_tracker_import_controller_constructor (GType type,
+                                              guint n_construct_params,
+                                              GObjectConstructParam *construct_params)
+{
+  static GObject *self = NULL;
+
+  if (self == NULL)
+    {
+      self = G_OBJECT_CLASS (photos_tracker_import_controller_parent_class)->constructor (type,
+                                                                                          n_construct_params,
+                                                                                          construct_params);
+      g_object_add_weak_pointer (self, (gpointer) &self);
+      return self;
+    }
+
+  return g_object_ref (self);
+}
+
+
+static void
+photos_tracker_import_controller_dispose (GObject *object)
+{
+  PhotosTrackerImportController *self = PHOTOS_TRACKER_IMPORT_CONTROLLER (object);
+
+  g_clear_object (&self->src_mngr);
+  g_clear_object (&self->offset_cntrlr);
+
+  G_OBJECT_CLASS (photos_tracker_import_controller_parent_class)->dispose (object);
+}
+
+
+static void
+photos_tracker_import_controller_finalize (GObject *object)
+{
+  PhotosTrackerImportController *self = PHOTOS_TRACKER_IMPORT_CONTROLLER (object);
+
+  if (self->item_mngr != NULL)
+    g_object_remove_weak_pointer (G_OBJECT (self->item_mngr), (gpointer *) &self->item_mngr);
+
+  G_OBJECT_CLASS (photos_tracker_import_controller_parent_class)->finalize (object);
+}
+
+
+static void
+photos_tracker_import_controller_init (PhotosTrackerImportController *self)
+{
+  GApplication *app;
+  PhotosSearchContextState *state;
+
+  app = g_application_get_default ();
+  state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
+
+  self->item_mngr = state->item_mngr;
+  g_object_add_weak_pointer (G_OBJECT (self->item_mngr), (gpointer *) &self->item_mngr);
+
+  self->src_mngr = g_object_ref (state->src_mngr);
+  g_signal_connect_swapped (self->src_mngr,
+                            "active-changed",
+                            G_CALLBACK (photos_tracker_import_controller_source_active_changed),
+                            self);
+
+  self->offset_cntrlr = photos_offset_import_controller_dup_singleton ();
+}
+
+
+static void
+photos_tracker_import_controller_class_init (PhotosTrackerImportControllerClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  PhotosTrackerControllerClass *tracker_controller_class = PHOTOS_TRACKER_CONTROLLER_CLASS (class);
+
+  tracker_controller_class->base_item_type = PHOTOS_TYPE_DEVICE_ITEM;
+
+  object_class->constructor = photos_tracker_import_controller_constructor;
+  object_class->dispose = photos_tracker_import_controller_dispose;
+  object_class->finalize = photos_tracker_import_controller_finalize;
+  tracker_controller_class->get_offset_controller = photos_tracker_import_controller_get_offset_controller;
+  tracker_controller_class->get_query = photos_tracker_import_controller_get_query;
+}
+
+
+PhotosTrackerController *
+photos_tracker_import_controller_dup_singleton (void)
+{
+  return g_object_new (PHOTOS_TYPE_TRACKER_IMPORT_CONTROLLER,
+                       "delay-start", TRUE,
+                       "mode", PHOTOS_WINDOW_MODE_IMPORT,
+                       NULL);
+}
diff --git a/src/photos-tracker-import-controller.h b/src/photos-tracker-import-controller.h
new file mode 100644
index 00000000..3c9ada8a
--- /dev/null
+++ b/src/photos-tracker-import-controller.h
@@ -0,0 +1,41 @@
+/*
+ * Photos - access, organize and share your photos on GNOME
+ * Copyright © 2018 Red Hat, Inc.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Based on code from:
+ *   + Documents
+ */
+
+#ifndef PHOTOS_TRACKER_IMPORT_CONTROLLER_H
+#define PHOTOS_TRACKER_IMPORT_CONTROLLER_H
+
+#include "photos-tracker-controller.h"
+
+G_BEGIN_DECLS
+
+#define PHOTOS_TYPE_TRACKER_IMPORT_CONTROLLER (photos_tracker_import_controller_get_type ())
+G_DECLARE_FINAL_TYPE (PhotosTrackerImportController,
+                      photos_tracker_import_controller,
+                      PHOTOS,
+                      TRACKER_IMPORT_CONTROLLER,
+                      PhotosTrackerController);
+
+PhotosTrackerController  *photos_tracker_import_controller_dup_singleton     (void);
+
+G_END_DECLS
+
+#endif /* PHOTOS_TRACKER_IMPORT_CONTROLLER_H */
diff --git a/src/photos-utils.c b/src/photos-utils.c
index e31db31e..1eb4ade6 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -46,6 +46,7 @@
 #include "photos-offset-collection-view-controller.h"
 #include "photos-offset-collections-controller.h"
 #include "photos-offset-favorites-controller.h"
+#include "photos-offset-import-controller.h"
 #include "photos-offset-overview-controller.h"
 #include "photos-offset-search-controller.h"
 #include "photos-query.h"
@@ -63,6 +64,7 @@
 #include "photos-tracker-collection-view-controller.h"
 #include "photos-tracker-collections-controller.h"
 #include "photos-tracker-favorites-controller.h"
+#include "photos-tracker-import-controller.h"
 #include "photos-tracker-overview-controller.h"
 #include "photos-tracker-queue.h"
 #include "photos-tracker-search-controller.h"
@@ -723,6 +725,7 @@ photos_utils_ensure_builtins (void)
       g_type_ensure (PHOTOS_TYPE_TRACKER_COLLECTION_VIEW_CONTROLLER);
       g_type_ensure (PHOTOS_TYPE_TRACKER_COLLECTIONS_CONTROLLER);
       g_type_ensure (PHOTOS_TYPE_TRACKER_FAVORITES_CONTROLLER);
+      g_type_ensure (PHOTOS_TYPE_TRACKER_IMPORT_CONTROLLER);
       g_type_ensure (PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER);
       g_type_ensure (PHOTOS_TYPE_TRACKER_SEARCH_CONTROLLER);
 
@@ -1019,6 +1022,11 @@ photos_utils_get_controller (PhotosWindowMode mode,
       trk_cntrlr = photos_tracker_favorites_controller_dup_singleton ();
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      offset_cntrlr = photos_offset_import_controller_dup_singleton ();
+      trk_cntrlr = photos_tracker_import_controller_dup_singleton ();
+      break;
+
     case PHOTOS_WINDOW_MODE_OVERVIEW:
       offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
       trk_cntrlr = photos_tracker_overview_controller_dup_singleton ();
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 1679bf1e..da5bd854 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -120,6 +120,10 @@ photos_view_container_get_show_primary_text (PhotosViewContainer *self)
       ret_val = FALSE;
       break;
 
+    case PHOTOS_WINDOW_MODE_IMPORT:
+      ret_val = FALSE;
+      break;
+
     case PHOTOS_WINDOW_MODE_OVERVIEW:
       ret_val = FALSE;
       break;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]