[gnome-photos/wip/rishi/collection: 17/33] application: Add an import action
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/collection: 17/33] application: Add an import action
- Date: Sun, 21 Jan 2018 23:48:51 +0000 (UTC)
commit f3e8a769dc7683dfc7babe6830b8681c449c2135
Author: Petr Štětka <stetka peta gmail com>
Date: Mon Sep 4 00:21:53 2017 +0200
application: Add an import action
https://bugzilla.gnome.org/show_bug.cgi?id=751212
src/photos-application.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 5f1fb47e..8761ff7c 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;
@@ -377,6 +379,9 @@ 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_PREVIEW);
g_simple_action_set_enabled (self->load_next_action, enable);
g_simple_action_set_enabled (self->load_previous_action, enable);
@@ -958,6 +963,39 @@ photos_application_get_state (PhotosSearchContext *context)
}
+static void
+photos_application_import (PhotosApplication *self, GVariant *parameter)
+{
+ GMount *mount;
+ PhotosSource *source;
+ const gchar *id;
+
+ id = g_variant_get_string (parameter, NULL);
+ g_return_if_fail (id != NULL && id[0] != '\0');
+
+ source = PHOTOS_SOURCE (photos_base_manager_get_object_by_id (self->state->src_mngr, id));
+ 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)
{
@@ -2086,6 +2124,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", G_VARIANT_TYPE_STRING);
+ 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));
@@ -2307,6 +2356,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]