summaryrefslogtreecommitdiffstats
path: root/Smoke/gtk_glyphs.c
diff options
context:
space:
mode:
Diffstat (limited to 'Smoke/gtk_glyphs.c')
-rw-r--r--Smoke/gtk_glyphs.c42
1 files changed, 9 insertions, 33 deletions
diff --git a/Smoke/gtk_glyphs.c b/Smoke/gtk_glyphs.c
index ca392eb..8db7eb3 100644
--- a/Smoke/gtk_glyphs.c
+++ b/Smoke/gtk_glyphs.c
@@ -80,7 +80,6 @@ GtkWidget *create_glyphs_page(void)
GtkAdjustment *adjustment;
GtkWidget *scale;
GSList *dataset_group;
- int j = 0 ;
page = gtk_vbox_new(FALSE, 0);
@@ -160,33 +159,6 @@ GtkWidget *create_glyphs_page(void)
gtk_widget_show(frame);
-
- //frame = gtk_frame_new("Glyphs");
-
- // box = gtk_vbox_new(FALSE, 0);
-
- // label = gtk_label_new("Parameterize the glyphs");
-
- // gtk_box_pack_start(GTK_BOX(box), label, FALSE, TRUE, 0);
- // gtk_widget_show(label);
-
- // combo = gtk_combo_box_new_text();
-
- // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Hedgehogs");
- // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Triangles");
- // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "3D Cones");
- // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Arrow images");
- // gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Quake");
-
- // gtk_combo_box_set_active(GTK_COMBO_BOX(combo), glyphs_get_sort());
- // g_signal_connect(combo, "changed", G_CALLBACK(select_sort), (gpointer)NULL);
-
- // gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0);
- // gtk_widget_show(combo);
-
- //gtk_widget_show(frame);
-
-
frame = gtk_frame_new("Glyphs");
box = gtk_vbox_new(FALSE, 0);
@@ -250,11 +222,15 @@ GtkWidget *create_glyphs_page(void)
combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Black & White");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Rainbow");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Bands");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Wilrik");
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo), "Oliver");
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLACKWHITE);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_RAINBOW);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BANDS);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLUE_GREEN_RED);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_WILRIK);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_OLIVER);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_RED);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_GREEN);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), PALETTE_NAME_BLUE);
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), glyphs_get_colormap());
g_signal_connect(combo, "changed", G_CALLBACK(select_colormap), (gpointer)NULL);