mirror of https://github.com/GNOME/gimp.git
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:
parent
e78aa3033e
commit
137734aaed
15
ChangeLog
15
ChangeLog
|
@ -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>
|
||||
|
||||
* app/widgets/gimpcontainertreeview.[ch]: Don't expose class
|
||||
|
|
|
@ -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 (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
dest_viewable = renderer->viewable;
|
||||
|
|
|
@ -44,15 +44,6 @@
|
|||
#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 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,
|
||||
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[COLUMN_NAME] = G_TYPE_STRING;
|
||||
tree_view->model_columns[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;
|
||||
tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER] = GIMP_TYPE_VIEW_RENDERER;
|
||||
tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME] = G_TYPE_STRING;
|
||||
tree_view->model_columns[GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES] = PANGO_TYPE_ATTR_LIST;
|
||||
|
||||
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (box->scrolled_win),
|
||||
GTK_SHADOW_IN);
|
||||
|
@ -209,7 +196,7 @@ gimp_container_tree_view_constructor (GType type,
|
|||
|
||||
tree_view->view = g_object_new (GTK_TYPE_TREE_VIEW,
|
||||
"model", list,
|
||||
"search-column", COLUMN_NAME,
|
||||
"search-column", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
|
||||
"enable-search", FALSE,
|
||||
"headers-visible", FALSE,
|
||||
"has-tooltip", TRUE,
|
||||
|
@ -232,7 +219,7 @@ gimp_container_tree_view_constructor (GType type,
|
|||
|
||||
gtk_tree_view_column_set_attributes (tree_view->main_column,
|
||||
tree_view->renderer_cell,
|
||||
"renderer", COLUMN_RENDERER,
|
||||
"renderer", GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER,
|
||||
NULL);
|
||||
|
||||
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,
|
||||
tree_view->priv->name_cell,
|
||||
"text", COLUMN_NAME,
|
||||
"attributes", COLUMN_NAME_ATTRIBUTES,
|
||||
"text", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
|
||||
"attributes", GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME_ATTRIBUTES,
|
||||
NULL);
|
||||
|
||||
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);
|
||||
|
||||
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
|
||||
COLUMN_RENDERER, renderer,
|
||||
COLUMN_NAME, name,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
|
||||
-1);
|
||||
|
||||
g_free (name);
|
||||
|
@ -545,7 +532,7 @@ gimp_container_tree_view_set_context (GimpContainerView *view,
|
|||
GimpViewRenderer *renderer;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
gimp_view_renderer_set_context (renderer, context);
|
||||
|
@ -626,7 +613,7 @@ gimp_container_tree_view_reorder_item (GimpContainerView *view,
|
|||
GimpViewRenderer *renderer;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &selected_iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
if (renderer->viewable != viewable)
|
||||
|
@ -688,11 +675,11 @@ gimp_container_tree_view_rename_item (GimpContainerView *view,
|
|||
gchar *old_name;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, iter,
|
||||
COLUMN_NAME, &old_name,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, &old_name,
|
||||
-1);
|
||||
|
||||
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), iter,
|
||||
COLUMN_NAME, name,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, name,
|
||||
-1);
|
||||
|
||||
if (name && old_name && strlen (name) < strlen (old_name))
|
||||
|
@ -784,7 +771,7 @@ gimp_container_tree_view_set_view_size (GimpContainerView *view)
|
|||
GimpViewRenderer *renderer;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
gimp_view_renderer_set_size (renderer, view_size, border_width);
|
||||
|
@ -840,13 +827,13 @@ gimp_container_tree_view_name_canceled (GtkCellRendererText *cell,
|
|||
gchar *name;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
name = gimp_viewable_get_description (renderer->viewable, NULL);
|
||||
|
||||
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);
|
||||
|
||||
g_free (name);
|
||||
|
@ -865,7 +852,7 @@ gimp_container_tree_view_selection_changed (GtkTreeSelection *selection,
|
|||
GimpViewRenderer *renderer;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
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 (tree_view->model, &iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
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),
|
||||
&iter,
|
||||
tree_view->model_column_name,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME,
|
||||
real_name,
|
||||
-1);
|
||||
}
|
||||
|
@ -1129,7 +1116,7 @@ gimp_container_tree_view_tooltip (GtkWidget *widget,
|
|||
return FALSE;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
COLUMN_RENDERER, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
if (renderer)
|
||||
|
|
|
@ -250,7 +250,7 @@ gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
|
|||
gchar *name;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
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);
|
||||
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);
|
||||
g_free (name);
|
||||
}
|
||||
|
|
|
@ -845,7 +845,7 @@ gimp_item_tree_view_name_edited (GtkCellRendererText *cell,
|
|||
GError *error = NULL;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
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);
|
||||
|
||||
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);
|
||||
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));
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
g_object_get (toggle,
|
||||
"active", &active,
|
||||
|
@ -1031,7 +1031,7 @@ gimp_item_tree_view_toggle_clicked (GtkCellRendererToggle *toggle,
|
|||
&iter))
|
||||
{
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
if ((GimpItem *) renderer->viewable != item)
|
||||
|
|
|
@ -866,7 +866,7 @@ gimp_layer_tree_view_floating_selection_changed (GimpImage *image,
|
|||
|
||||
if (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,
|
||||
-1);
|
||||
}
|
||||
|
@ -884,7 +884,7 @@ gimp_layer_tree_view_floating_selection_changed (GimpImage *image,
|
|||
|
||||
if (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) ?
|
||||
NULL : layer_view->bold_attrs,
|
||||
-1);
|
||||
|
@ -1225,7 +1225,7 @@ gimp_layer_tree_view_update_borders (GimpLayerTreeView *layer_view,
|
|||
GimpViewBorderType layer_type = GIMP_VIEW_BORDER_BLACK;
|
||||
|
||||
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,
|
||||
-1);
|
||||
|
||||
|
@ -1373,7 +1373,7 @@ gimp_layer_tree_view_alpha_update (GimpLayerTreeView *view,
|
|||
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
|
||||
|
||||
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)) ?
|
||||
NULL : view->bold_attrs,
|
||||
-1);
|
||||
|
|
|
@ -281,11 +281,10 @@ gimp_settings_editor_row_separator_func (GtkTreeModel *model,
|
|||
GtkTreeIter *iter,
|
||||
gpointer data)
|
||||
{
|
||||
GimpContainerTreeView *view = GIMP_CONTAINER_TREE_VIEW (data);
|
||||
gchar *name = NULL;
|
||||
gchar *name = NULL;
|
||||
|
||||
gtk_tree_model_get (model, iter,
|
||||
view->model_column_name, &name,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_NAME, &name,
|
||||
-1);
|
||||
g_free (name);
|
||||
|
||||
|
@ -375,7 +374,7 @@ gimp_settings_editor_name_edited (GtkCellRendererText *cell,
|
|||
gchar *name;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
object = GIMP_OBJECT (renderer->viewable);
|
||||
|
@ -405,7 +404,7 @@ gimp_settings_editor_name_edited (GtkCellRendererText *cell,
|
|||
|
||||
name = gimp_viewable_get_description (renderer->viewable, NULL);
|
||||
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);
|
||||
g_free (name);
|
||||
}
|
||||
|
|
|
@ -196,7 +196,7 @@ gimp_template_view_tree_name_edited (GtkCellRendererText *cell,
|
|||
const gchar *old_name;
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
object = GIMP_OBJECT (renderer->viewable);
|
||||
|
@ -216,7 +216,7 @@ gimp_template_view_tree_name_edited (GtkCellRendererText *cell,
|
|||
NULL);
|
||||
|
||||
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);
|
||||
g_free (name);
|
||||
}
|
||||
|
|
|
@ -245,12 +245,11 @@ gimp_tool_view_eye_data_func (GtkTreeViewColumn *tree_column,
|
|||
GtkTreeIter *iter,
|
||||
gpointer data)
|
||||
{
|
||||
GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (data);
|
||||
GimpViewRenderer *renderer;
|
||||
gboolean visible;
|
||||
GimpViewRenderer *renderer;
|
||||
gboolean visible;
|
||||
|
||||
gtk_tree_model_get (tree_model, iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
g_object_get (renderer->viewable, "visible", &visible, NULL);
|
||||
|
@ -281,7 +280,7 @@ gimp_tool_view_eye_clicked (GtkCellRendererToggle *toggle,
|
|||
NULL);
|
||||
|
||||
gtk_tree_model_get (tree_view->model, &iter,
|
||||
tree_view->model_column_renderer, &renderer,
|
||||
GIMP_CONTAINER_TREE_VIEW_COLUMN_RENDERER, &renderer,
|
||||
-1);
|
||||
|
||||
g_object_set (renderer->viewable, "visible", ! active, NULL);
|
||||
|
|
|
@ -164,6 +164,14 @@ typedef enum /*< skip >*/
|
|||
GIMP_VIEW_BORDER_GREEN
|
||||
} 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 >*/
|
||||
{
|
||||
GIMP_DND_TYPE_NONE = 0,
|
||||
|
|
Loading…
Reference in New Issue