gimp r27674 - in trunk: . app/dialogs app/display app/tools app/widgets
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27674 - in trunk: . app/dialogs app/display app/tools app/widgets
- Date: Sun, 16 Nov 2008 20:17:44 +0000 (UTC)
Author: mitch
Date: Sun Nov 16 20:17:43 2008
New Revision: 27674
URL: http://svn.gnome.org/viewvc/gimp?rev=27674&view=rev
Log:
2008-11-16 Michael Natterer <mitch gimp org>
* app/dialogs/module-dialog.c
* app/display/gimpscalecombobox.c
* app/tools/gimpgegltool.c
* app/tools/gimprectangleoptions.c
* app/widgets/gimpactionview.[ch]
* app/widgets/gimpcomponenteditor.c
* app/widgets/gimpcontainerentry.[ch]
* app/widgets/gimpcontrollereditor.c
* app/widgets/gimpcontrollerlist.c
* app/widgets/gimpfileprocview.c: s/NUM_COLUMNS/N_COLUMNS/
Modified:
trunk/ChangeLog
trunk/app/dialogs/module-dialog.c
trunk/app/display/gimpscalecombobox.c
trunk/app/tools/gimpgegltool.c
trunk/app/tools/gimprectangleoptions.c
trunk/app/widgets/gimpactionview.c
trunk/app/widgets/gimpactionview.h
trunk/app/widgets/gimpcomponenteditor.c
trunk/app/widgets/gimpcontainerentry.c
trunk/app/widgets/gimpcontainerentry.h
trunk/app/widgets/gimpcontrollereditor.c
trunk/app/widgets/gimpcontrollerlist.c
trunk/app/widgets/gimpfileprocview.c
Modified: trunk/app/dialogs/module-dialog.c
==============================================================================
--- trunk/app/dialogs/module-dialog.c (original)
+++ trunk/app/dialogs/module-dialog.c Sun Nov 16 20:17:43 2008
@@ -47,7 +47,7 @@
COLUMN_NAME,
COLUMN_ENABLED,
COLUMN_MODULE,
- NUM_COLUMNS
+ N_COLUMNS
};
enum
@@ -57,7 +57,7 @@
INFO_DATE,
INFO_COPYRIGHT,
INFO_LOCATION,
- NUM_INFOS
+ N_INFOS
};
typedef struct
@@ -69,7 +69,7 @@
GtkWidget *hint;
GtkWidget *table;
- GtkWidget *label[NUM_INFOS];
+ GtkWidget *label[N_INFOS];
GtkWidget *error_box;
GtkWidget *error_label;
} ModuleDialog;
@@ -164,7 +164,7 @@
gtk_widget_set_size_request (listbox, 124, 100);
gtk_widget_show (listbox);
- dialog->list = gtk_list_store_new (NUM_COLUMNS,
+ dialog->list = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
G_TYPE_BOOLEAN,
GIMP_TYPE_MODULE);
@@ -196,7 +196,7 @@
gtk_container_add (GTK_CONTAINER (listbox), view);
gtk_widget_show (view);
- dialog->table = gtk_table_new (2, NUM_INFOS, FALSE);
+ dialog->table = gtk_table_new (2, N_INFOS, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (dialog->table), 6);
gtk_box_pack_start (GTK_BOX (vbox), dialog->table, FALSE, FALSE, 0);
gtk_widget_show (dialog->table);
@@ -413,7 +413,7 @@
{
GtkTreeModel *model = GTK_TREE_MODEL (dialog->list);
GtkTreeIter iter;
- const gchar *text[NUM_INFOS] = { NULL, };
+ const gchar *text[N_INFOS] = { NULL, };
gchar *location = NULL;
gboolean iter_valid;
gint i;
@@ -443,7 +443,7 @@
if (! module)
{
- for (i = 0; i < NUM_INFOS; i++)
+ for (i = 0; i < N_INFOS; i++)
gtk_label_set_text (GTK_LABEL (dialog->label[i]), NULL);
gtk_label_set_text (GTK_LABEL (dialog->error_label), NULL);
@@ -469,7 +469,7 @@
location : _("No longer available"));
}
- for (i = 0; i < NUM_INFOS; i++)
+ for (i = 0; i < N_INFOS; i++)
gtk_label_set_text (GTK_LABEL (dialog->label[i]),
text[i] ? text[i] : "--");
Modified: trunk/app/display/gimpscalecombobox.c
==============================================================================
--- trunk/app/display/gimpscalecombobox.c (original)
+++ trunk/app/display/gimpscalecombobox.c Sun Nov 16 20:17:43 2008
@@ -40,10 +40,10 @@
enum
{
- SCALE,
- LABEL,
- PERSISTENT,
- NUM_COLUMNS
+ COLUMN_SCALE,
+ COLUMN_LABEL,
+ COLUMN_PERSISTENT,
+ N_COLUMNS
};
enum
@@ -123,7 +123,7 @@
combo_box->scale = 1.0;
combo_box->last_path = NULL;
- store = gtk_list_store_new (NUM_COLUMNS,
+ store = gtk_list_store_new (N_COLUMNS,
G_TYPE_DOUBLE, /* SCALE */
G_TYPE_STRING, /* LABEL */
G_TYPE_BOOLEAN); /* PERSISTENT */
@@ -131,7 +131,8 @@
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
g_object_unref (store);
- gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), LABEL);
+ gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box),
+ COLUMN_LABEL);
entry = gtk_bin_get_child (GTK_BIN (combo_box));
@@ -151,7 +152,7 @@
gtk_cell_layout_clear (layout);
gtk_cell_layout_pack_start (layout, cell, TRUE);
gtk_cell_layout_set_attributes (layout, cell,
- "text", LABEL,
+ "text", COLUMN_LABEL,
NULL);
for (i = 8; i > 0; i /= 2)
@@ -245,7 +246,7 @@
gdouble scale;
gtk_tree_model_get (model, &iter,
- SCALE, &scale,
+ COLUMN_SCALE, &scale,
-1);
if (scale > 0.0)
{
@@ -378,9 +379,9 @@
"%.3g\342\200\211%%", 100.0 * scale);
gtk_list_store_set (store, iter,
- SCALE, scale,
- LABEL, label,
- PERSISTENT, persistent,
+ COLUMN_SCALE, scale,
+ COLUMN_LABEL, label,
+ COLUMN_PERSISTENT, persistent,
-1);
}
@@ -479,7 +480,7 @@
gdouble this;
gtk_tree_model_get (model, &iter,
- SCALE, &this,
+ COLUMN_SCALE, &this,
-1);
if (fabs (this - scale) < 0.0001)
@@ -497,7 +498,7 @@
gdouble this;
gtk_tree_model_get (model, &sibling,
- SCALE, &this,
+ COLUMN_SCALE, &this,
-1);
if (this < scale)
@@ -511,7 +512,7 @@
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter);
gtk_tree_model_get (model, &iter,
- PERSISTENT, &persistent,
+ COLUMN_PERSISTENT, &persistent,
-1);
if (! persistent)
{
Modified: trunk/app/tools/gimpgegltool.c
==============================================================================
--- trunk/app/tools/gimpgegltool.c (original)
+++ trunk/app/tools/gimpgegltool.c Sun Nov 16 20:17:43 2008
@@ -51,7 +51,7 @@
COLUMN_NAME,
COLUMN_LABEL,
COLUMN_STOCK_ID,
- NUM_COLUMNS
+ N_COLUMNS
};
@@ -336,7 +336,7 @@
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
- store = gtk_list_store_new (NUM_COLUMNS,
+ store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
opclasses = gimp_get_geglopclasses ();
@@ -354,7 +354,7 @@
{
const gchar *stock_id;
const gchar *label;
-
+
if (g_str_has_prefix (opclass->name, "gegl:"))
{
label = opclass->name + strlen ("gegl:");
Modified: trunk/app/tools/gimprectangleoptions.c
==============================================================================
--- trunk/app/tools/gimprectangleoptions.c (original)
+++ trunk/app/tools/gimprectangleoptions.c Sun Nov 16 20:17:43 2008
@@ -43,7 +43,7 @@
COLUMN_LEFT_NUMBER,
COLUMN_RIGHT_NUMBER,
COLUMN_TEXT,
- NUM_COLUMNS
+ N_COLUMNS
};
@@ -335,12 +335,12 @@
{
private = g_slice_new0 (GimpRectangleOptionsPrivate);
- private->aspect_history = gtk_list_store_new (NUM_COLUMNS,
+ private->aspect_history = gtk_list_store_new (N_COLUMNS,
G_TYPE_DOUBLE,
G_TYPE_DOUBLE,
G_TYPE_STRING);
- private->size_history = gtk_list_store_new (NUM_COLUMNS,
+ private->size_history = gtk_list_store_new (N_COLUMNS,
G_TYPE_DOUBLE,
G_TYPE_DOUBLE,
G_TYPE_STRING);
Modified: trunk/app/widgets/gimpactionview.c
==============================================================================
--- trunk/app/widgets/gimpactionview.c (original)
+++ trunk/app/widgets/gimpactionview.c Sun Nov 16 20:17:43 2008
@@ -205,7 +205,7 @@
g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
- store = gtk_tree_store_new (GIMP_ACTION_VIEW_NUM_COLUMNS,
+ store = gtk_tree_store_new (GIMP_ACTION_VIEW_N_COLUMNS,
G_TYPE_BOOLEAN, /* COLUMN_VISIBLE */
GTK_TYPE_ACTION, /* COLUMN_ACTION */
G_TYPE_STRING, /* COLUMN_STOCK_ID */
Modified: trunk/app/widgets/gimpactionview.h
==============================================================================
--- trunk/app/widgets/gimpactionview.h (original)
+++ trunk/app/widgets/gimpactionview.h Sun Nov 16 20:17:43 2008
@@ -34,7 +34,7 @@
GIMP_ACTION_VIEW_COLUMN_ACCEL_KEY,
GIMP_ACTION_VIEW_COLUMN_ACCEL_MASK,
GIMP_ACTION_VIEW_COLUMN_ACCEL_CLOSURE,
- GIMP_ACTION_VIEW_NUM_COLUMNS
+ GIMP_ACTION_VIEW_N_COLUMNS
};
Modified: trunk/app/widgets/gimpcomponenteditor.c
==============================================================================
--- trunk/app/widgets/gimpcomponenteditor.c (original)
+++ trunk/app/widgets/gimpcomponenteditor.c Sun Nov 16 20:17:43 2008
@@ -49,7 +49,7 @@
COLUMN_VISIBLE,
COLUMN_RENDERER,
COLUMN_NAME,
- NUM_COLUMNS
+ N_COLUMNS
};
@@ -122,7 +122,7 @@
gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
- list = gtk_list_store_new (NUM_COLUMNS,
+ list = gtk_list_store_new (N_COLUMNS,
G_TYPE_INT,
G_TYPE_BOOLEAN,
GIMP_TYPE_VIEW_RENDERER,
Modified: trunk/app/widgets/gimpcontainerentry.c
==============================================================================
--- trunk/app/widgets/gimpcontainerentry.c (original)
+++ trunk/app/widgets/gimpcontainerentry.c Sun Nov 16 20:17:43 2008
@@ -128,7 +128,7 @@
"popup-set-width", FALSE,
NULL);
- store = gtk_list_store_new (GIMP_CONTAINER_ENTRY_NUM_COLUMNS,
+ store = gtk_list_store_new (GIMP_CONTAINER_ENTRY_N_COLUMNS,
GIMP_TYPE_VIEW_RENDERER,
G_TYPE_STRING);
Modified: trunk/app/widgets/gimpcontainerentry.h
==============================================================================
--- trunk/app/widgets/gimpcontainerentry.h (original)
+++ trunk/app/widgets/gimpcontainerentry.h Sun Nov 16 20:17:43 2008
@@ -27,7 +27,7 @@
{
GIMP_CONTAINER_ENTRY_COLUMN_RENDERER,
GIMP_CONTAINER_ENTRY_COLUMN_NAME,
- GIMP_CONTAINER_ENTRY_NUM_COLUMNS
+ GIMP_CONTAINER_ENTRY_N_COLUMNS
};
Modified: trunk/app/widgets/gimpcontrollereditor.c
==============================================================================
--- trunk/app/widgets/gimpcontrollereditor.c (original)
+++ trunk/app/widgets/gimpcontrollereditor.c Sun Nov 16 20:17:43 2008
@@ -59,7 +59,7 @@
COLUMN_BLURB,
COLUMN_STOCK_ID,
COLUMN_ACTION,
- NUM_COLUMNS
+ N_COLUMNS
};
@@ -272,7 +272,7 @@
g_free (property_specs);
- store = gtk_list_store_new (NUM_COLUMNS,
+ store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING,
Modified: trunk/app/widgets/gimpcontrollerlist.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerlist.c (original)
+++ trunk/app/widgets/gimpcontrollerlist.c Sun Nov 16 20:17:43 2008
@@ -65,7 +65,7 @@
COLUMN_ICON,
COLUMN_NAME,
COLUMN_TYPE,
- NUM_COLUMNS
+ N_COLUMNS
};
@@ -169,7 +169,7 @@
gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0);
gtk_widget_show (sw);
- list->src = gtk_list_store_new (NUM_COLUMNS,
+ list->src = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_GTYPE);
Modified: trunk/app/widgets/gimpfileprocview.c
==============================================================================
--- trunk/app/widgets/gimpfileprocview.c (original)
+++ trunk/app/widgets/gimpfileprocview.c Sun Nov 16 20:17:43 2008
@@ -43,7 +43,7 @@
COLUMN_LABEL,
COLUMN_EXTENSIONS,
COLUMN_HELP_ID,
- NUM_COLUMNS
+ N_COLUMNS
};
enum
@@ -120,7 +120,7 @@
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
- store = gtk_list_store_new (NUM_COLUMNS,
+ store = gtk_list_store_new (N_COLUMNS,
GIMP_TYPE_PLUG_IN_PROCEDURE, /* COLUMN_PROC */
G_TYPE_STRING, /* COLUMN_LABEL */
G_TYPE_STRING, /* COLUMN_EXTENSIONS */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
