dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put the GimpContainerTreeView enums here instead of exposing them through 

* app/widgets/widgets-enums.h: Put the GimpContainerTreeView enums
here instead of exposing them through silly class instance
members.

* app/widgets/gimpcontainertreeview.c: 
* app/widgets/gimpcontainertreeview-dnd.c
* app/widgets/gimpdatafactoryview.c
* app/widgets/gimpitemtreeview.c
* app/widgets/gimplayertreeview.c
* app/widgets/gimpsettingseditor.c
* app/widgets/gimptemplateview.c
* app/widgets/gimptoolview.c: Clean up and use new enum names.

svn path=/trunk/; revision=27666
This commit is contained in:
Martin Nordholts 2008-11-15 20:01:55 +00:00
parent e78aa3033e
commit 137734aaed
10 changed files with 65 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2008-11-15 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/widgets-enums.h: Put the GimpContainerTreeView enums
here instead of exposing them through silly class instance
members.
* app/widgets/gimpcontainertreeview.c:
* app/widgets/gimpcontainertreeview-dnd.c
* app/widgets/gimpdatafactoryview.c
* app/widgets/gimpitemtreeview.c
* app/widgets/gimplayertreeview.c
* app/widgets/gimpsettingseditor.c
* app/widgets/gimptemplateview.c
* app/widgets/gimptoolview.c: Clean up and use new enum names.
2008-11-15 Martin Nordholts <martinn@svn.gnome.org> 2008-11-15 Martin Nordholts <martinn@svn.gnome.org>
* app/widgets/gimpcontainertreeview.[ch]: Don't expose class * app/widgets/gimpcontainertreeview.[ch]: Don't expose class

2
app/widgets/gimpcontainertreeview-dnd.c
View File

@ -106,7 +106,7 @@ gimp_container_tree_view_drop_status (GimpContainerTreeView *tree_view,
gtk_tree_model_get_iter (tree_view->model, &iter, path); gtk_tree_model_get_iter (tree_view->model, &iter, path);
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
dest_viewable = renderer->viewable; dest_viewable = renderer->viewable;

55
app/widgets/gimpcontainertreeview.c
View File

@ -44,15 +44,6 @@
#include "gimpwidgets-utils.h" #include "gimpwidgets-utils.h"
enum
{
COLUMN_RENDERER,
COLUMN_NAME,
COLUMN_NAME_ATTRIBUTES,
NUM_COLUMNS
};
static void gimp_container_tree_view_view_iface_init (GimpContainerViewInterface *iface); static void gimp_container_tree_view_view_iface_init (GimpContainerViewInterface *iface);
static GObject *gimp_container_tree_view_constructor (GType type, static GObject *gimp_container_tree_view_constructor (GType type,
@ -170,15 +161,11 @@ gimp_container_tree_view_init (GimpContainerTreeView *tree_view)
GIMP_TYPE_CONTAINER_TREE_VIEW, GIMP_TYPE_CONTAINER_TREE_VIEW,
GimpContainerTreeViewPriv); GimpContainerTreeViewPriv);
tree_view->n_model_columns = NUM_COLUMNS; tree_view->n_model_columns = GIMP_CONTAINER_TREE_VIEW_COLUMN_LAST;
tree_view->model_columns[COLUMN_RENDERER] = GIMP_TYPE_VIEW_RENDERER; tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER] = GIMP_TYPE_VIEW_RENDERER;
tree_view->model_columns[COLUMN_NAME] = G_TYPE_STRING; tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME] = G_TYPE_STRING;
tree_view->model_columns[COLUMN_NAME_ATTRIBUTES] = PANGO_TYPE_ATTR_LIST; tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES] = PANGO_TYPE_ATTR_LIST;
tree_view->model_column_renderer = COLUMN_RENDERER;
tree_view->model_column_name = COLUMN_NAME;
tree_view->model_column_name_attributes = COLUMN_NAME_ATTRIBUTES;
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win), gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
GTK_SHADOW_IN); GTK_SHADOW_IN);
@ -209,7 +196,7 @@ gimp_container_tree_view_constructor (GType type,
tree_view->view = g_object_new (GTK_TYPE_TREE_VIEW, tree_view->view = g_object_new (GTK_TYPE_TREE_VIEW,
"model", list, "model", list,
"search-column", COLUMN_NAME, "search-column", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
"enable-search", FALSE, "enable-search", FALSE,
"headers-visible", FALSE, "headers-visible", FALSE,
"has-tooltip", TRUE, "has-tooltip", TRUE,
@ -232,7 +219,7 @@ gimp_container_tree_view_constructor (GType type,
gtk_tree_view_column_set_attributes (tree_view->main_column, gtk_tree_view_column_set_attributes (tree_view->main_column,
tree_view->renderer_cell, tree_view->renderer_cell,
"renderer", COLUMN_RENDERER, "renderer", GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER,
NULL); NULL);
tree_view->priv->name_cell = gtk_cell_renderer_text_new (); tree_view->priv->name_cell = gtk_cell_renderer_text_new ();
@ -243,8 +230,8 @@ gimp_container_tree_view_constructor (GType type,
gtk_tree_view_column_set_attributes (tree_view->main_column, gtk_tree_view_column_set_attributes (tree_view->main_column,
tree_view->priv->name_cell, tree_view->priv->name_cell,
"text", COLUMN_NAME, "text", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
"attributes", COLUMN_NAME_ATTRIBUTES, "attributes", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
NULL); NULL);
g_signal_connect (tree_view->priv->name_cell, "editing-canceled", g_signal_connect (tree_view->priv->name_cell, "editing-canceled",
@ -457,8 +444,8 @@ gimp_container_tree_view_set (GimpContainerTreeView *tree_view,
name = gimp_viewable_get_description (viewable, NULL); name = gimp_viewable_get_description (viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
COLUMN_RENDERER, renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, renderer,
COLUMN_NAME, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
@ -545,7 +532,7 @@ gimp_container_tree_view_set_context (GimpContainerView *view,
GimpViewRenderer *renderer; GimpViewRenderer *renderer;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
gimp_view_renderer_set_context (renderer, context); gimp_view_renderer_set_context (renderer, context);
@ -626,7 +613,7 @@ gimp_container_tree_view_reorder_item (GimpContainerView *view,
GimpViewRenderer *renderer; GimpViewRenderer *renderer;
gtk_tree_model_get (tree_view->model, &selected_iter, gtk_tree_model_get (tree_view->model, &selected_iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
if (renderer->viewable != viewable) if (renderer->viewable != viewable)
@ -688,11 +675,11 @@ gimp_container_tree_view_rename_item (GimpContainerView *view,
gchar *old_name; gchar *old_name;
gtk_tree_model_get (tree_view->model, iter, gtk_tree_model_get (tree_view->model, iter,
COLUMN_NAME, &old_name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, &old_name,
-1); -1);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
COLUMN_NAME, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
if (name && old_name && strlen (name) < strlen (old_name)) if (name && old_name && strlen (name) < strlen (old_name))
@ -784,7 +771,7 @@ gimp_container_tree_view_set_view_size (GimpContainerView *view)
GimpViewRenderer *renderer; GimpViewRenderer *renderer;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
gimp_view_renderer_set_size (renderer, view_size, border_width); gimp_view_renderer_set_size (renderer, view_size, border_width);
@ -840,13 +827,13 @@ gimp_container_tree_view_name_canceled (GtkCellRendererText *cell,
gchar *name; gchar *name;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
name = gimp_viewable_get_description (renderer->viewable, NULL); name = gimp_viewable_get_description (renderer->viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
@ -865,7 +852,7 @@ gimp_container_tree_view_selection_changed (GtkTreeSelection *selection,
GimpViewRenderer *renderer; GimpViewRenderer *renderer;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (tree_view), gimp_container_view_item_selected (GIMP_CONTAINER_VIEW (tree_view),
@ -941,7 +928,7 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
gtk_tree_model_get_iter (tree_view->model, &iter, path); gtk_tree_model_get_iter (tree_view->model, &iter, path);
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
tree_view->priv->dnd_renderer = renderer; tree_view->priv->dnd_renderer = renderer;
@ -1042,7 +1029,7 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), gtk_list_store_set (GTK_LIST_STORE (tree_view->model),
&iter, &iter,
tree_view->model_column_name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
real_name, real_name,
-1); -1);
} }
@ -1129,7 +1116,7 @@ gimp_container_tree_view_tooltip (GtkWidget *widget,
return FALSE; return FALSE;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
COLUMN_RENDERER, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
if (renderer) if (renderer)

4
app/widgets/gimpdatafactoryview.c
View File

@ -250,7 +250,7 @@ gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
gchar *name; gchar *name;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
data = GIMP_DATA (renderer->viewable); data = GIMP_DATA (renderer->viewable);
@ -270,7 +270,7 @@ gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
name = gimp_viewable_get_description (renderer->viewable, NULL); name = gimp_viewable_get_description (renderer->viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
} }

8
app/widgets/gimpitemtreeview.c
View File

@ -845,7 +845,7 @@ gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
GError *error = NULL; GError *error = NULL;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
item = GIMP_ITEM (renderer->viewable); item = GIMP_ITEM (renderer->viewable);
@ -865,7 +865,7 @@ gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
gchar *name = gimp_viewable_get_description (renderer->viewable, NULL); gchar *name = gimp_viewable_get_description (renderer->viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
@ -1006,7 +1006,7 @@ gimp_item_tree_view_toggle_clicked (GtkCellRendererToggle *toggle,
context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view)); context = gimp_container_view_get_context (GIMP_CONTAINER_VIEW (view));
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
g_object_get (toggle, g_object_get (toggle,
"active", &active, "active", &active,
@ -1031,7 +1031,7 @@ gimp_item_tree_view_toggle_clicked (GtkCellRendererToggle *toggle,
&iter)) &iter))
{ {
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
if ((GimpItem *) renderer->viewable != item) if ((GimpItem *) renderer->viewable != item)

8
app/widgets/gimplayertreeview.c
View File

@ -866,7 +866,7 @@ gimp_layer_tree_view_floating_selection_changed (GimpImage *image,
if (iter) if (iter)
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
tree_view->model_column_name_attributes, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
layer_view->italic_attrs, layer_view->italic_attrs,
-1); -1);
} }
@ -884,7 +884,7 @@ gimp_layer_tree_view_floating_selection_changed (GimpImage *image,
if (iter) if (iter)
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
tree_view->model_column_name_attributes, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
gimp_drawable_has_alpha (drawable) ? gimp_drawable_has_alpha (drawable) ?
NULL : layer_view->bold_attrs, NULL : layer_view->bold_attrs,
-1); -1);
@ -1225,7 +1225,7 @@ gimp_layer_tree_view_update_borders (GimpLayerTreeView *layer_view,
GimpViewBorderType layer_type = GIMP_VIEW_BORDER_BLACK; GimpViewBorderType layer_type = GIMP_VIEW_BORDER_BLACK;
gtk_tree_model_get (tree_view->model, iter, gtk_tree_model_get (tree_view->model, iter,
tree_view->model_column_renderer, &layer_renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &layer_renderer,
layer_view->model_column_mask, &mask_renderer, layer_view->model_column_mask, &mask_renderer,
-1); -1);
@ -1373,7 +1373,7 @@ gimp_layer_tree_view_alpha_update (GimpLayerTreeView *view,
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view); GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
tree_view->model_column_name_attributes, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)) ? gimp_drawable_has_alpha (GIMP_DRAWABLE (layer)) ?
NULL : view->bold_attrs, NULL : view->bold_attrs,
-1); -1);

7
app/widgets/gimpsettingseditor.c
View File

@ -281,11 +281,10 @@ gimp_settings_editor_row_separator_func (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data) gpointer data)
{ {
GimpContainerTreeView *view = GIMP_CONTAINER_TREE_VIEW (data);
gchar *name = NULL; gchar *name = NULL;
gtk_tree_model_get (model, iter, gtk_tree_model_get (model, iter,
view->model_column_name, &name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, &name,
-1); -1);
g_free (name); g_free (name);
@ -375,7 +374,7 @@ gimp_settings_editor_name_edited (GtkCellRendererText *cell,
gchar *name; gchar *name;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
object = GIMP_OBJECT (renderer->viewable); object = GIMP_OBJECT (renderer->viewable);
@ -405,7 +404,7 @@ gimp_settings_editor_name_edited (GtkCellRendererText *cell,
name = gimp_viewable_get_description (renderer->viewable, NULL); name = gimp_viewable_get_description (renderer->viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
} }

4
app/widgets/gimptemplateview.c
View File

@ -196,7 +196,7 @@ gimp_template_view_tree_name_edited (GtkCellRendererText *cell,
const gchar *old_name; const gchar *old_name;
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
object = GIMP_OBJECT (renderer->viewable); object = GIMP_OBJECT (renderer->viewable);
@ -216,7 +216,7 @@ gimp_template_view_tree_name_edited (GtkCellRendererText *cell,
NULL); NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter, gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name, GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
-1); -1);
g_free (name); g_free (name);
} }

5
app/widgets/gimptoolview.c
View File

@ -245,12 +245,11 @@ gimp_tool_view_eye_data_func (GtkTreeViewColumn *tree_column,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data) gpointer data)
{ {
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
GimpViewRenderer *renderer; GimpViewRenderer *renderer;
gboolean visible; gboolean visible;
gtk_tree_model_get (tree_model, iter, gtk_tree_model_get (tree_model, iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
g_object_get (renderer->viewable, "visible", &visible, NULL); g_object_get (renderer->viewable, "visible", &visible, NULL);
@ -281,7 +280,7 @@ gimp_tool_view_eye_clicked (GtkCellRendererToggle *toggle,
NULL); NULL);
gtk_tree_model_get (tree_view->model, &iter, gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer, GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
-1); -1);
g_object_set (renderer->viewable, "visible", ! active, NULL); g_object_set (renderer->viewable, "visible", ! active, NULL);

8
app/widgets/widgets-enums.h
View File

@ -164,6 +164,14 @@ typedef enum /*< skip >*/
GIMP_VIEW_BORDER_GREEN GIMP_VIEW_BORDER_GREEN
} GimpViewBorderType; } GimpViewBorderType;
typedef enum /*< skip >*/
{
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER,
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
GIMP_CONTAINER_TREE_VIEW_COLUMN_LAST
} GimpContainerTreeViewColumn;
typedef enum /*< skip >*/ typedef enum /*< skip >*/
{ {
GIMP_DND_TYPE_NONE = 0, GIMP_DND_TYPE_NONE = 0,