AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make it clear that 'filtered' means 'filtered_out'

Browse Source 
It bothers me that we call gtk_file_filter_filter(), then negate the result,
and the return *that* from node_should_be_filtered().  So, rename 'filtered'
throughout GtkFileSystemModel to 'filtered_out' to mean things that didn't
pass the filter.

Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero 2012-07-11 15:47:53 -05:00 committed by Matthias Clasen
parent 914749bebe
commit 435ee7741c
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkfilechooserdefault.c
View File

@ -6859,7 +6859,7 @@ file_system_model_set (GtkFileSystemModel *model,
GtkTreeIter iter; GtkTreeIter iter;
if (!_gtk_file_system_model_get_iter_for_file (model, &iter, file)) if (!_gtk_file_system_model_get_iter_for_file (model, &iter, file))
g_assert_not_reached (); g_assert_not_reached ();
sensitive = !_gtk_file_system_model_iter_is_filtered (model, &iter); sensitive = !_gtk_file_system_model_iter_is_filtered_out (model, &iter);
} }
g_value_set_boolean (value, sensitive); g_value_set_boolean (value, sensitive);

45
gtk/gtkfilesystemmodel.c
View File

@ -120,7 +120,7 @@ struct _FileModelNode
*/ */
guint visible :1; /* if the file is currently visible */ guint visible :1; /* if the file is currently visible */
guint filtered :1; /* if the file is currently filtered */ guint filtered_out :1;/* if the file is currently filtered out (i.e. it didn't pass the filters) */
guint frozen_add :1; /* true if the model was frozen and the entry has not been added yet */ guint frozen_add :1; /* true if the model was frozen and the entry has not been added yet */
GValue values[1]; /* actually n_columns values */ GValue values[1]; /* actually n_columns values */
@ -307,11 +307,11 @@ emit_row_deleted_for_row (GtkFileSystemModel *model, guint row)
} }
static void static void
node_set_filtered (GtkFileSystemModel *model, guint id, gboolean filtered) node_set_filtered_out (GtkFileSystemModel *model, guint id, gboolean filtered_out)
{ {
FileModelNode *node = get_node (model, id); FileModelNode *node = get_node (model, id);
node->filtered = filtered; node->filtered_out = filtered_out;
} }
static void static void
@ -343,7 +343,7 @@ node_set_visible (GtkFileSystemModel *model, guint id, gboolean visible)
} }
static gboolean static gboolean
node_should_be_filtered (GtkFileSystemModel *model, guint id) node_should_be_filtered_out (GtkFileSystemModel *model, guint id)
{ {
FileModelNode *node = get_node (model, id); FileModelNode *node = get_node (model, id);
GtkFileFilterInfo filter_info = { 0, }; GtkFileFilterInfo filter_info = { 0, };
@ -435,7 +435,7 @@ node_should_be_visible (GtkFileSystemModel *model, guint id)
return FALSE; return FALSE;
} }
result = !node_should_be_filtered (model, id); result = !node_should_be_filtered_out (model, id);
return result; return result;
} }
@ -1423,7 +1423,7 @@ gtk_file_system_model_refilter_all (GtkFileSystemModel *model)
/* start at index 1, don't change the editable */ /* start at index 1, don't change the editable */
for (i = 1; i < model->files->len; i++) for (i = 1; i < model->files->len; i++)
{ {
node_set_filtered (model, i, node_should_be_filtered (model, i)); node_set_filtered_out (model, i, node_should_be_filtered_out (model, i));
node_set_visible (model, i, node_should_be_visible (model, i)); node_set_visible (model, i, node_should_be_visible (model, i));
} }
@ -1552,7 +1552,7 @@ _gtk_file_system_model_get_cancellable (GtkFileSystemModel *model)
* Checks if the iterator is visible. A visible iterator references * Checks if the iterator is visible. A visible iterator references
* a row that is currently exposed using the #GtkTreeModel API. If * a row that is currently exposed using the #GtkTreeModel API. If
* the iterator is invisible, it references a file that is not shown * the iterator is invisible, it references a file that is not shown
* for some reason, such as being filtered by the current filter or * for some reason, such as being filtered out by the current filter or
* being a hidden file. * being a hidden file.
* *
* Returns: %TRUE if the iterator is visible * Returns: %TRUE if the iterator is visible
@ -1571,20 +1571,21 @@ _gtk_file_system_model_iter_is_visible (GtkFileSystemModel *model,
} }
/** /**
* _gtk_file_system_model_iter_is_filtered: * _gtk_file_system_model_iter_is_filtered_out:
* @model: the model * @model: the model
* @iter: a valid iterator * @iter: a valid iterator
* *
* Checks if the iterator is filtered. A filtered iterator references * Checks if the iterator is filtered out. This is only useful for rows
* a row that is currently exposed using the #GtkTreeModel API. If * that refer to folders, as those are always visible regardless
* the iterator is filtered, it references a file that filtered by * of what the current filter says. This function lets you see
* the current filter. * the results of the filter.
* *
* Returns: %TRUE if the iterator is filtered * Returns: %TRUE if the iterator passed the current filter; %FALSE if the
* filter would not have let the row pass.
**/ **/
gboolean gboolean
_gtk_file_system_model_iter_is_filtered (GtkFileSystemModel *model, _gtk_file_system_model_iter_is_filtered_out (GtkFileSystemModel *model,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
FileModelNode *node; FileModelNode *node;
@ -1592,7 +1593,7 @@ _gtk_file_system_model_iter_is_filtered (GtkFileSystemModel *model,
g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (iter != NULL, FALSE);
node = get_node (model, ITER_INDEX (iter)); node = get_node (model, ITER_INDEX (iter));
return node->filtered; return node->filtered_out;
} }
/** /**
@ -1793,8 +1794,8 @@ add_file (GtkFileSystemModel *model,
if (!model->frozen) if (!model->frozen)
{ {
node_set_filtered (model, model->files->len -1, node_set_filtered_out (model, model->files->len -1,
node_should_be_filtered (model, model->files->len - 1)); node_should_be_filtered_out (model, model->files->len - 1));
node_set_visible (model, model->files->len -1, node_set_visible (model, model->files->len -1,
node_should_be_visible (model, model->files->len - 1)); node_should_be_visible (model, model->files->len - 1));
} }
@ -1826,7 +1827,7 @@ remove_file (GtkFileSystemModel *model,
node = get_node (model, id); node = get_node (model, id);
node_set_visible (model, id, FALSE); node_set_visible (model, id, FALSE);
node_set_filtered (model, id, FALSE); node_set_filtered_out (model, id, FALSE);
g_hash_table_remove (model->file_lookup, file); g_hash_table_remove (model->file_lookup, file);
g_object_unref (node->file); g_object_unref (node->file);
@ -1938,7 +1939,7 @@ _gtk_file_system_model_add_editable (GtkFileSystemModel *model, GtkTreeIter *ite
g_return_if_fail (!get_node (model, 0)->visible); g_return_if_fail (!get_node (model, 0)->visible);
node_set_visible (model, 0, TRUE); node_set_visible (model, 0, TRUE);
node_set_filtered (model, 0, FALSE); node_set_filtered_out (model, 0, FALSE);
ITER_INIT_FROM_INDEX (model, iter, 0); ITER_INIT_FROM_INDEX (model, iter, 0);
} }
@ -1957,7 +1958,7 @@ _gtk_file_system_model_remove_editable (GtkFileSystemModel *model)
g_return_if_fail (get_node (model, 0)->visible); g_return_if_fail (get_node (model, 0)->visible);
node_set_visible (model, 0, FALSE); node_set_visible (model, 0, FALSE);
node_set_filtered (model, 0, FALSE); node_set_filtered_out (model, 0, FALSE);
} }
/** /**
@ -2015,7 +2016,7 @@ _gtk_file_system_model_thaw_updates (GtkFileSystemModel *model)
continue; continue;
node->frozen_add = FALSE; node->frozen_add = FALSE;
node_set_visible (model, i, node_should_be_visible (model, i)); node_set_visible (model, i, node_should_be_visible (model, i));
node_set_filtered (model, i, node_should_be_filtered (model, i)); node_set_filtered_out (model, i, node_should_be_filtered_out (model, i));
} }
} }
} }

4
gtk/gtkfilesystemmodel.h
View File

@ -53,8 +53,8 @@ GtkFileSystemModel *_gtk_file_system_model_new_for_directory(GFile *
GCancellable * _gtk_file_system_model_get_cancellable (GtkFileSystemModel *model); GCancellable * _gtk_file_system_model_get_cancellable (GtkFileSystemModel *model);
gboolean _gtk_file_system_model_iter_is_visible (GtkFileSystemModel *model, gboolean _gtk_file_system_model_iter_is_visible (GtkFileSystemModel *model,
GtkTreeIter *iter); GtkTreeIter *iter);
gboolean _gtk_file_system_model_iter_is_filtered (GtkFileSystemModel *model, gboolean _gtk_file_system_model_iter_is_filtered_out (GtkFileSystemModel *model,
GtkTreeIter *iter); GtkTreeIter *iter);
GFileInfo * _gtk_file_system_model_get_info (GtkFileSystemModel *model, GFileInfo * _gtk_file_system_model_get_info (GtkFileSystemModel *model,
GtkTreeIter *iter); GtkTreeIter *iter);
gboolean _gtk_file_system_model_get_iter_for_file(GtkFileSystemModel *model, gboolean _gtk_file_system_model_get_iter_for_file(GtkFileSystemModel *model,