[gnome-photos/wip/rishi/collection: 6/45] selection-toolbar: Rename variables
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/collection: 6/45] selection-toolbar: Rename variables
- Date: Sat, 10 Feb 2018 00:24:44 +0000 (UTC)
commit 58acc1d3e99309b887c5eb2f3cc1a1e048e3b8ed
Author: Debarshi Ray <debarshir gnome org>
Date: Tue Jan 23 12:44:37 2018 +0100
selection-toolbar: Rename variables
These variables were being used to set the sensitivity of the widgets,
not their visibility. Thus, enable_* is a better name than show_*.
This distinction will be valuable when we explicitly set the visibility
of the buttons in the subsequent commit.
https://gitlab.gnome.org/GNOME/gnome-photos/issues/29
src/photos-selection-toolbar.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index 11f1595a..d9140e48 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -192,8 +192,8 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
GList *selection;
GtkWidget *image;
gboolean has_selection;
- gboolean show_collection;
- gboolean show_favorite;
+ gboolean enable_collection;
+ gboolean enable_favorite;
gchar *favorite_label;
gchar *open_label;
guint fav_count = 0;
@@ -204,8 +204,8 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
selection = photos_selection_controller_get_selection (self->sel_cntrlr);
has_selection = selection != NULL;
- show_collection = has_selection;
- show_favorite = has_selection;
+ enable_collection = has_selection;
+ enable_favorite = has_selection;
for (l = selection; l != NULL; l = g_list_next (l))
{
@@ -215,8 +215,8 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
item = PHOTOS_BASE_ITEM (photos_base_manager_get_object_by_id (self->item_mngr, urn));
- show_collection = show_collection && !photos_base_item_is_collection (item);
- show_favorite = show_favorite && !photos_base_item_is_collection (item);
+ enable_collection = enable_collection && !photos_base_item_is_collection (item);
+ enable_favorite = enable_favorite && !photos_base_item_is_collection (item);
if (photos_base_item_is_favorite (item))
fav_count++;
@@ -229,7 +229,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
sel_length++;
}
- show_favorite = show_favorite && ((fav_count == 0) || (fav_count == sel_length));
+ enable_favorite = enable_favorite && ((fav_count == 0) || (fav_count == sel_length));
if (apps != NULL && apps->next == NULL) /* length == 1 */
/* Translators: this is the Open action in a context menu */
@@ -242,7 +242,7 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
g_free (open_label);
g_list_free_full (apps, g_free);
- if (show_favorite && fav_count == sel_length)
+ if (enable_favorite && fav_count == sel_length)
{
favorite_label = g_strdup (_("Remove from favorites"));
image = gtk_image_new_from_icon_name ("starred-symbolic", GTK_ICON_SIZE_BUTTON);
@@ -257,8 +257,8 @@ photos_selection_toolbar_set_item_visibility (PhotosSelectionToolbar *self)
gtk_widget_set_tooltip_text (self->toolbar_favorite, favorite_label);
g_free (favorite_label);
- gtk_widget_set_sensitive (self->toolbar_collection, show_collection);
- gtk_widget_set_sensitive (self->toolbar_favorite, show_favorite);
+ gtk_widget_set_sensitive (self->toolbar_collection, enable_collection);
+ gtk_widget_set_sensitive (self->toolbar_favorite, enable_favorite);
self->inside_refresh = FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]