[gnome-photos] application: Don't disable the search UI when there are no results
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] application: Don't disable the search UI when there are no results
- Date: Wed, 24 Jan 2018 10:47:30 +0000 (UTC)
commit 10de98491a5facb5c6ecd20f2be6a7696bd0fa9a
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Jan 23 11:26:29 2018 +0100
application: Don't disable the search UI when there are no results
If the user is already in SEARCH, and there are no results, then it is
likely that she would want to tweak the parameters and continue
searching. Disabling the search UI makes it difficult to do that.
src/photos-application.c | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 7f419c06..38b9de0d 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -331,6 +331,7 @@ photos_application_actions_update (PhotosApplication *self)
gboolean can_trash;
gboolean enable;
gboolean selection_mode;
+ guint n_items = 0;
item = photos_application_get_selection_or_active_item (self);
load_state = photos_item_manager_get_load_state (self->state->item_mngr);
@@ -338,6 +339,18 @@ photos_application_actions_update (PhotosApplication *self)
selection = photos_selection_controller_get_selection (self->sel_cntrlr);
selection_mode = photos_utils_get_selection_mode ();
+ if (mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
+ || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+ || mode == PHOTOS_WINDOW_MODE_FAVORITES
+ || mode == PHOTOS_WINDOW_MODE_OVERVIEW
+ || mode == PHOTOS_WINDOW_MODE_SEARCH)
+ {
+ PhotosBaseManager *item_mngr_chld;
+
+ item_mngr_chld = photos_item_manager_get_for_mode (PHOTOS_ITEM_MANAGER (self->state->item_mngr), mode);
+ n_items = g_list_model_get_n_items (G_LIST_MODEL (item_mngr_chld));
+ }
+
g_simple_action_set_enabled (self->zoom_best_fit_action, FALSE);
g_simple_action_set_enabled (self->zoom_end_action, FALSE);
g_simple_action_set_enabled (self->zoom_out_action, FALSE);
@@ -354,25 +367,23 @@ photos_application_actions_update (PhotosApplication *self)
g_simple_action_set_enabled (self->shadows_highlights_action, enable);
g_simple_action_set_enabled (self->sharpen_action, enable);
- enable = FALSE;
- if (mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
- || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
- || mode == PHOTOS_WINDOW_MODE_FAVORITES
- || mode == PHOTOS_WINDOW_MODE_OVERVIEW
- || mode == PHOTOS_WINDOW_MODE_SEARCH)
- {
- PhotosBaseManager *item_mngr_chld;
- guint n_items;
-
- item_mngr_chld = photos_item_manager_get_for_mode (PHOTOS_ITEM_MANAGER (self->state->item_mngr), mode);
- n_items = g_list_model_get_n_items (G_LIST_MODEL (item_mngr_chld));
- enable = n_items > 0;
- }
-
+ enable = (((mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
+ || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+ || mode == PHOTOS_WINDOW_MODE_FAVORITES
+ || mode == PHOTOS_WINDOW_MODE_OVERVIEW)
+ && n_items > 0)
+ || mode == PHOTOS_WINDOW_MODE_SEARCH);
g_simple_action_set_enabled (self->search_action, enable);
g_simple_action_set_enabled (self->search_match_action, enable);
g_simple_action_set_enabled (self->search_source_action, enable);
g_simple_action_set_enabled (self->search_type_action, enable);
+
+ enable = ((mode == PHOTOS_WINDOW_MODE_COLLECTION_VIEW
+ || mode == PHOTOS_WINDOW_MODE_COLLECTIONS
+ || mode == PHOTOS_WINDOW_MODE_FAVORITES
+ || mode == PHOTOS_WINDOW_MODE_OVERVIEW
+ || mode == PHOTOS_WINDOW_MODE_SEARCH)
+ && n_items > 0);
g_simple_action_set_enabled (self->sel_all_action, enable);
g_simple_action_set_enabled (self->sel_none_action, enable);
g_simple_action_set_enabled (self->selection_mode_action, enable);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]