callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced the GtkList with a GtkTreeView/Model, replaced all deprecated

Browse Source 
2003-02-25  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/spheredesigner.c: replaced the GtkList with a
	GtkTreeView/Model, replaced all deprecated GTK+ calls.

	* plug-ins/common/uniteditor.c: cosmetics.
This commit is contained in:
Sven Neumann
2003-02-25 14:48:24 +00:00
committed by Sven Neumann
parent 4da735e6b3
commit a7aae31211
3 changed files with 167 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-02-25 Sven Neumann <sven@gimp.org>
* plug-ins/common/spheredesigner.c: replaced the GtkList with a
GtkTreeView/Model, replaced all deprecated GTK+ calls.
* plug-ins/common/uniteditor.c: cosmetics.
2003-02-25 Michael Natterer <mitch@gimp.org> 2003-02-25 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcontainerview.c (gimp_container_view_remove): * app/widgets/gimpcontainerview.c (gimp_container_view_remove):

248
plug-ins/common/spheredesigner.c
View File

@ -33,11 +33,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef __GNUC__
#warning GTK_DISABLE_DEPRECATED
#endif
#undef GTK_DISABLE_DEPRECATED
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libgimp/gimp.h> #include <libgimp/gimp.h>
@ -113,6 +108,14 @@ enum
FOG FOG
}; };
enum
{
TYPE,
TEXTURE,
NUM_COLUMNS
};
/* World-flags */ /* World-flags */
#define SMARTAMBIENT 0x00000001 #define SMARTAMBIENT 0x00000001
@ -310,7 +313,7 @@ static gdouble turbulence (gdouble *point, gdouble lofreq, gdouble hifreq);
#define COLORBUTTONWIDTH 30 #define COLORBUTTONWIDTH 30
#define COLORBUTTONHEIGHT 20 #define COLORBUTTONHEIGHT 20
static GtkWidget *texturelist = NULL; static GtkTreeView *texturelist = NULL;
static GtkObject *scalexscale, *scaleyscale, *scalezscale; static GtkObject *scalexscale, *scaleyscale, *scalezscale;
static GtkObject *rotxscale, *rotyscale, *rotzscale; static GtkObject *rotxscale, *rotyscale, *rotzscale;
@ -1785,42 +1788,46 @@ mklabel (texture * t)
return tmps; return tmps;
} }
static GtkWidget *
currentitem (GtkWidget *list)
{
GList *h;
GtkWidget *tmpw;
h = GTK_LIST (list)->selection;
if (!h)
return NULL;
tmpw = h->data;
return tmpw;
}
static texture * static texture *
currenttexture (void) currenttexture (void)
{ {
GtkWidget *tmpw; GtkTreeSelection *sel;
texture *t; GtkTreeIter iter;
texture *t = NULL;
sel = gtk_tree_view_get_selection (texturelist);
if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{
gtk_tree_model_get (gtk_tree_view_get_model (texturelist), &iter,
TEXTURE, &t,
-1);
}
tmpw = currentitem (texturelist);
if (!tmpw)
return NULL;
t = g_object_get_data (G_OBJECT (tmpw), "texture");
return t; return t;
} }
static void static void
relabel (void) relabel (void)
{ {
GtkWidget *tmpw = currentitem (texturelist); GtkTreeModel *model;
texture *t = currenttexture (); GtkTreeSelection *sel;
GtkTreeIter iter;
texture *t = NULL;
if (!tmpw || !t) sel = gtk_tree_view_get_selection (texturelist);
return;
tmpw = GTK_BIN (tmpw)->child; if (gtk_tree_selection_get_selected (sel, NULL, &iter))
gtk_label_set_text (GTK_LABEL (tmpw), mklabel (t)); {
model = gtk_tree_view_get_model (texturelist);
gtk_tree_model_get (model, &iter,
TEXTURE, &t,
-1);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
TYPE, mklabel (t),
-1);
}
} }
static gboolean noupdate = FALSE; static gboolean noupdate = FALSE;
@ -1875,8 +1882,8 @@ setvals (texture * t)
static void static void
selectitem (GtkWidget *widget, selectitem (GtkTreeSelection *treeselection,
gpointer data) gpointer data)
{ {
setvals (currenttexture ()); setvals (currenttexture ());
} }
@ -1884,20 +1891,24 @@ selectitem (GtkWidget *widget,
static void static void
addtexture (void) addtexture (void)
{ {
GtkWidget *item; GtkListStore *list_store;
gint n = s.com.numtexture; GtkTreeIter iter;
gint n = s.com.numtexture;
if (n == MAXTEXTUREPEROBJ - 1) if (n == MAXTEXTUREPEROBJ - 1)
return; return;
setdefaults (&s.com.texture[n]); setdefaults (&s.com.texture[n]);
item = gtk_list_item_new_with_label (mklabel (&s.com.texture[n])); list_store = GTK_LIST_STORE (gtk_tree_view_get_model (texturelist));
g_object_set_data (G_OBJECT (item), "texture", &s.com.texture[n]);
gtk_container_add (GTK_CONTAINER (texturelist), item);
gtk_widget_show (item);
gtk_list_select_child (GTK_LIST (texturelist), item); gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
TYPE, mklabel (&s.com.texture[n]),
TEXTURE, &s.com.texture[n],
-1);
gtk_tree_selection_select_iter (gtk_tree_view_get_selection (texturelist),
&iter);
s.com.numtexture++; s.com.numtexture++;
restartrender (); restartrender ();
@ -1906,9 +1917,10 @@ addtexture (void)
static void static void
duptexture (void) duptexture (void)
{ {
GtkWidget *item; GtkListStore *list_store;
texture *t = currenttexture (); GtkTreeIter iter;
gint n = s.com.numtexture; texture *t = currenttexture ();
gint n = s.com.numtexture;
if (n == MAXTEXTUREPEROBJ - 1) if (n == MAXTEXTUREPEROBJ - 1)
return; return;
@ -1917,12 +1929,15 @@ duptexture (void)
s.com.texture[n] = *t; s.com.texture[n] = *t;
item = gtk_list_item_new_with_label (mklabel (&s.com.texture[n])); list_store = GTK_LIST_STORE (gtk_tree_view_get_model (texturelist));
g_object_set_data (G_OBJECT (item), "texture", &s.com.texture[n]);
gtk_container_add (GTK_CONTAINER (texturelist), item);
gtk_widget_show (item);
gtk_list_select_child (GTK_LIST (texturelist), item); gtk_list_store_append (list_store, &iter);
gtk_list_store_set (list_store, &iter,
TYPE, mklabel (&s.com.texture[n]),
TEXTURE, &s.com.texture[n],
-1);
gtk_tree_selection_select_iter (gtk_tree_view_get_selection (texturelist),
&iter);
s.com.numtexture++; s.com.numtexture++;
restartrender (); restartrender ();
@ -1931,27 +1946,33 @@ duptexture (void)
static void static void
rebuildlist (void) rebuildlist (void)
{ {
GtkWidget *item; GtkListStore *list_store;
gint n; GtkTreeIter iter;
gint n;
for (n = 0; n < s.com.numtexture; n++) for (n = 0; n < s.com.numtexture; n++)
{ {
if (s.com.numtexture && (s.com.texture[n].majtype < 0)) if (s.com.numtexture && (s.com.texture[n].majtype < 0))
{ {
int i; gint i;
for (i = n; i < s.com.numtexture - 1; i++) for (i = n; i < s.com.numtexture - 1; i++)
s.com.texture[i] = s.com.texture[i + 1]; s.com.texture[i] = s.com.texture[i + 1];
s.com.numtexture--; s.com.numtexture--;
n--; n--;
} }
} }
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (texturelist));
for (n = 0; n < s.com.numtexture; n++) for (n = 0; n < s.com.numtexture; n++)
{ {
item = gtk_list_item_new_with_label (mklabel (&s.com.texture[n])); gtk_list_store_append (list_store, &iter);
g_object_set_data (G_OBJECT (item), "texture", &s.com.texture[n]); gtk_list_store_set (list_store, &iter,
gtk_container_add (GTK_CONTAINER (texturelist), item); TYPE, mklabel (&s.com.texture[n]),
gtk_widget_show (item); TEXTURE, &s.com.texture[n],
-1);
} }
restartrender (); restartrender ();
} }
@ -1973,25 +1994,30 @@ sphere_reset (void)
vset (&s.com.texture[2].color1, 0, 0.4, 0.4); vset (&s.com.texture[2].color1, 0, 0.4, 0.4);
vset (&s.com.texture[2].translate, 15, 15, -15); vset (&s.com.texture[2].translate, 15, 15, -15);
gtk_list_clear_items (GTK_LIST (texturelist), 0, -1); gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (texturelist)));
rebuildlist ();
restartrender (); restartrender ();
} }
static void static void
deltexture (void) deltexture (void)
{ {
texture *t; GtkTreeSelection *sel;
GtkWidget *tmpw; GtkTreeModel *model;
GtkTreeIter iter;
texture *t = NULL;
tmpw = currentitem (texturelist); sel = gtk_tree_view_get_selection (texturelist);
if (!tmpw)
return; if (gtk_tree_selection_get_selected (sel, NULL, &iter))
t = currenttexture (); {
if (!t) model = gtk_tree_view_get_model (texturelist);
return;
t->majtype = -1; gtk_tree_model_get (model, &iter,
gtk_widget_destroy (tmpw); TEXTURE, &t,
-1);
t->majtype = -1;
gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
}
} }
static void static void
@ -2078,7 +2104,7 @@ loadpreset_ok (GtkWidget *widget,
const gchar *fn = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs)); const gchar *fn = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
gtk_widget_hide (GTK_WIDGET (fs)); gtk_widget_hide (GTK_WIDGET (fs));
gtk_list_clear_items (GTK_LIST (texturelist), 0, -1); gtk_list_store_clear (GTK_LIST_STORE (gtk_tree_view_get_model (texturelist)));
loadit (fn); loadit (fn);
rebuildlist (); rebuildlist ();
restartrender (); restartrender ();
@ -2360,7 +2386,7 @@ mktexturemenu (GtkWidget *texturemenu_menu)
{ {
item = gtk_menu_item_new_with_label (gettext (t->s)); item = gtk_menu_item_new_with_label (gettext (t->s));
gtk_widget_show (item); gtk_widget_show (item);
gtk_menu_append (GTK_MENU (texturemenu_menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (texturemenu_menu), item);
g_signal_connect (item, "activate", g_signal_connect (item, "activate",
G_CALLBACK (selecttexture), GINT_TO_POINTER (t->n)); G_CALLBACK (selecttexture), GINT_TO_POINTER (t->n));
t++; t++;
@ -2453,20 +2479,23 @@ sphere_cancel (GtkWidget *widget,
GtkWidget * GtkWidget *
makewindow (void) makewindow (void)
{ {
GtkWidget *window; GtkListStore *list_store;
GtkWidget *table; GtkTreeViewColumn *col;
GtkWidget *frame; GtkWidget *window;
GtkWidget *viewport; GtkWidget *table;
GtkWidget *hbox; GtkWidget *frame;
GtkWidget *button; GtkWidget *scrolled;
GtkWidget *label; GtkWidget *hbox;
GtkWidget *item; GtkWidget *button;
GtkWidget *_scalescale; GtkWidget *label;
GtkWidget *_rotscale; GtkWidget *list;
GtkWidget *_turbulencescale; GtkWidget *item;
GtkWidget *_amountscale; GtkWidget *_scalescale;
GtkWidget *_expscale; GtkWidget *_rotscale;
GimpRGB rgb; GtkWidget *_turbulencescale;
GtkWidget *_amountscale;
GtkWidget *_expscale;
GimpRGB rgb;
window = gimp_dialog_new (_("Sphere Designer"), "spheredesigner", window = gimp_dialog_new (_("Sphere Designer"), "spheredesigner",
gimp_standard_help_func, gimp_standard_help_func,
@ -2513,26 +2542,39 @@ makewindow (void)
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (restartrender), NULL); G_CALLBACK (restartrender), NULL);
scrolled = gtk_scrolled_window_new (NULL, NULL);
frame = gtk_frame_new (_("Textures")); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
gtk_table_attach (GTK_TABLE (table), frame, 1, 2, 0, 2, GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_table_attach (GTK_TABLE (table), scrolled, 1, 2, 0, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (frame); gtk_widget_show (scrolled);
viewport = gtk_viewport_new (NULL, NULL); list_store = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
gtk_widget_set_size_request (viewport, 150, -1); list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list_store));
gtk_container_add (GTK_CONTAINER (frame), viewport); g_object_unref (list_store);
gtk_widget_show (viewport);
texturelist = gtk_list_new (); texturelist = GTK_TREE_VIEW (list);
gtk_container_add (GTK_CONTAINER (viewport), texturelist);
g_signal_connect (texturelist, "selection_changed", g_signal_connect (gtk_tree_view_get_selection (texturelist), "changed",
G_CALLBACK (selectitem), texturelist); G_CALLBACK (selectitem),
gtk_widget_show (texturelist); NULL);
gtk_widget_set_size_request (list, -1, 150);
gtk_container_add (GTK_CONTAINER (scrolled), list);
gtk_widget_show (list);
col = gtk_tree_view_column_new_with_attributes (_("Textures"),
gtk_cell_renderer_text_new (),
"text", TYPE,
NULL);
gtk_tree_view_append_column (texturelist, col);
hbox = gtk_hbox_new (TRUE, 0); hbox = gtk_hbox_new (TRUE, 0);
gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 3, gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
button = gtk_button_new_from_stock (GTK_STOCK_NEW); button = gtk_button_new_from_stock (GTK_STOCK_NEW);
@ -2555,7 +2597,7 @@ makewindow (void)
hbox = gtk_hbox_new (TRUE, 0); hbox = gtk_hbox_new (TRUE, 0);
gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 2, 3, gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);
button = gtk_button_new_from_stock (GTK_STOCK_OPEN); button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
@ -2828,21 +2870,21 @@ makewindow (void)
item = gtk_menu_item_new_with_label (_("Texture")); item = gtk_menu_item_new_with_label (_("Texture"));
gtk_widget_show (item); gtk_widget_show (item);
g_signal_connect (item, "activate", G_CALLBACK (selecttype), NULL); g_signal_connect (item, "activate", G_CALLBACK (selecttype), NULL);
gtk_menu_append (GTK_MENU (typemenu_menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (typemenu_menu), item);
item = gtk_menu_item_new_with_label (_("Bump")); item = gtk_menu_item_new_with_label (_("Bump"));
gtk_widget_show (item); gtk_widget_show (item);
g_signal_connect (item, "activate", g_signal_connect (item, "activate",
G_CALLBACK (selecttype), G_CALLBACK (selecttype),
GINT_TO_POINTER (1)); GINT_TO_POINTER (1));
gtk_menu_append (GTK_MENU (typemenu_menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (typemenu_menu), item);
item = gtk_menu_item_new_with_label (_("Light")); item = gtk_menu_item_new_with_label (_("Light"));
gtk_widget_show (item); gtk_widget_show (item);
g_signal_connect (item, "activate", g_signal_connect (item, "activate",
G_CALLBACK (selecttype), G_CALLBACK (selecttype),
GINT_TO_POINTER (2)); GINT_TO_POINTER (2));
gtk_menu_append (GTK_MENU (typemenu_menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (typemenu_menu), item);
gtk_option_menu_set_menu (GTK_OPTION_MENU (typemenu), typemenu_menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (typemenu), typemenu_menu);
@ -3106,8 +3148,8 @@ sphere_main (GimpDrawable *drawable)
if (!s.com.numtexture) if (!s.com.numtexture)
sphere_reset (); sphere_reset ();
else
rebuildlist (); rebuildlist ();
gtk_main (); gtk_main ();

32
plug-ins/common/uniteditor.c
View File

@ -403,28 +403,27 @@ static void
new_callback (GtkWidget *widget, new_callback (GtkWidget *widget,
GtkTreeView *tv) GtkTreeView *tv)
{ {
GtkListStore *list_store; GimpUnit unit;
GtkTreeSelection *sel;
GimpUnit unit;
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
sel = gtk_tree_view_get_selection (tv);
unit = new_unit (gtk_widget_get_toplevel (widget), GIMP_UNIT_PIXEL); unit = new_unit (gtk_widget_get_toplevel (widget), GIMP_UNIT_PIXEL);
if (unit != GIMP_UNIT_PIXEL) if (unit != GIMP_UNIT_PIXEL)
{ {
GtkTreeIter iter; GtkTreeModel *model;
GtkTreeIter iter;
list_init (tv); list_init (tv);
if (gtk_tree_model_get_iter_root (GTK_TREE_MODEL (list_store), &iter) && model = gtk_tree_view_get_model (tv);
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list_store), &iter,
if (gtk_tree_model_get_iter_root (model, &iter) &&
gtk_tree_model_iter_nth_child (model, &iter,
NULL, unit - GIMP_UNIT_INCH)) NULL, unit - GIMP_UNIT_INCH))
{ {
GtkAdjustment *adj; GtkAdjustment *adj;
gtk_tree_selection_select_iter (sel, &iter); gtk_tree_selection_select_iter (gtk_tree_view_get_selection (tv),
&iter);
adj = gtk_tree_view_get_vadjustment (tv); adj = gtk_tree_view_get_vadjustment (tv);
gtk_adjustment_set_value (adj, adj->upper); gtk_adjustment_set_value (adj, adj->upper);
@ -436,18 +435,18 @@ static void
duplicate_callback (GtkWidget *widget, duplicate_callback (GtkWidget *widget,
GtkTreeView *tv) GtkTreeView *tv)
{ {
GtkListStore *list_store; GtkTreeModel *model;
GtkTreeSelection *sel; GtkTreeSelection *sel;
GtkTreeIter iter; GtkTreeIter iter;
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (tv)); model = gtk_tree_view_get_model (tv);
sel = gtk_tree_view_get_selection (tv); sel = gtk_tree_view_get_selection (tv);
if (gtk_tree_selection_get_selected (sel, NULL, &iter)) if (gtk_tree_selection_get_selected (sel, NULL, &iter))
{ {
GimpUnit unit; GimpUnit unit;
gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, gtk_tree_model_get (model, &iter,
UNIT, &unit, UNIT, &unit,
-1); -1);
@ -459,9 +458,8 @@ duplicate_callback (GtkWidget *widget,
list_init (tv); list_init (tv);
if (gtk_tree_model_get_iter_root (GTK_TREE_MODEL (list_store), if (gtk_tree_model_get_iter_root (model, &iter) &&
&iter) && gtk_tree_model_iter_nth_child (model, &iter,
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list_store), &iter,
NULL, unit - GIMP_UNIT_INCH)) NULL, unit - GIMP_UNIT_INCH))
{ {
GtkAdjustment *adj; GtkAdjustment *adj;