[gnome-photos/wip/rishi/edit-mode: 2/25] Add a new mode for Edit
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/edit-mode: 2/25] Add a new mode for Edit
- Date: Sun, 28 Jun 2015 08:16:08 +0000 (UTC)
commit 230cd22186140351122ae3b55fe0ad2bc5f4c523
Author: Debarshi Ray <debarshir gnome org>
Date: Thu Mar 26 10:28:28 2015 +0100
Add a new mode for Edit
src/photos-embed.c | 4 ++++
src/photos-empty-results-box.c | 2 ++
src/photos-main-window.c | 2 ++
src/photos-mode-controller.h | 3 ++-
src/photos-preview-view.c | 1 +
src/photos-view-container.c | 1 +
src/photos-view-model.c | 1 +
7 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/src/photos-embed.c b/src/photos-embed.c
index ee205bb..b93a5d8 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -164,6 +164,7 @@ photos_embed_get_view_container_from_mode (PhotosEmbed *self, PhotosWindowMode m
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_PREVIEW:
default:
g_assert_not_reached ();
@@ -522,6 +523,9 @@ photos_embed_window_mode_changed (PhotosModeController *mode_cntrlr,
switch (mode)
{
+ case PHOTOS_WINDOW_MODE_EDIT:
+ break;
+
case PHOTOS_WINDOW_MODE_COLLECTIONS:
photos_embed_prepare_for_collections (self);
goto set_toolbar_model;
diff --git a/src/photos-empty-results-box.c b/src/photos-empty-results-box.c
index cae35e5..8f8dcd5 100644
--- a/src/photos-empty-results-box.c
+++ b/src/photos-empty-results-box.c
@@ -193,6 +193,7 @@ photos_empty_results_box_constructed (GObject *object)
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_PREVIEW:
default:
g_assert_not_reached ();
@@ -237,6 +238,7 @@ photos_empty_results_box_constructed (GObject *object)
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_PREVIEW:
default:
g_assert_not_reached ();
diff --git a/src/photos-main-window.c b/src/photos-main-window.c
index 838f96d..9b21242 100644
--- a/src/photos-main-window.c
+++ b/src/photos-main-window.c
@@ -175,6 +175,7 @@ photos_main_window_go_back (PhotosMainWindow *self)
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_OVERVIEW:
default:
handled = FALSE;
@@ -289,6 +290,7 @@ photos_main_window_key_press_event (GtkWidget *widget, GdkEventKey *event)
switch (mode)
{
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
handled = GDK_EVENT_PROPAGATE;
break;
diff --git a/src/photos-mode-controller.h b/src/photos-mode-controller.h
index dfd1e1d..0ef51e6 100644
--- a/src/photos-mode-controller.h
+++ b/src/photos-mode-controller.h
@@ -1,6 +1,6 @@
/*
* Photos - access, organize and share your photos on GNOME
- * Copyright © 2012, 2013, 2014 Red Hat, Inc.
+ * Copyright © 2012, 2013, 2014, 2015 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
@@ -55,6 +55,7 @@ typedef enum
{
PHOTOS_WINDOW_MODE_NONE,
PHOTOS_WINDOW_MODE_COLLECTIONS,
+ PHOTOS_WINDOW_MODE_EDIT,
PHOTOS_WINDOW_MODE_FAVORITES,
PHOTOS_WINDOW_MODE_OVERVIEW,
PHOTOS_WINDOW_MODE_PREVIEW,
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 97210ab..f309331 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -168,6 +168,7 @@ photos_preview_view_window_mode_changed (PhotosPreviewView *self, PhotosWindowMo
switch (mode)
{
case PHOTOS_WINDOW_MODE_COLLECTIONS:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_FAVORITES:
case PHOTOS_WINDOW_MODE_OVERVIEW:
case PHOTOS_WINDOW_MODE_SEARCH:
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 982f2bb..b2e549f 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -324,6 +324,7 @@ photos_view_container_constructed (GObject *object)
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_PREVIEW:
default:
g_assert_not_reached ();
diff --git a/src/photos-view-model.c b/src/photos-view-model.c
index 2de9f91..76065b1 100644
--- a/src/photos-view-model.c
+++ b/src/photos-view-model.c
@@ -365,6 +365,7 @@ photos_view_model_constructed (GObject *object)
break;
case PHOTOS_WINDOW_MODE_NONE:
+ case PHOTOS_WINDOW_MODE_EDIT:
case PHOTOS_WINDOW_MODE_PREVIEW:
default:
g_assert_not_reached ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]