diff options
author | Oliver Schinagl <oliver@schinagl.nl> | 2007-12-14 13:06:50 (GMT) |
---|---|---|
committer | Oliver Schinagl <oliver@schinagl.nl> | 2007-12-14 13:06:50 (GMT) |
commit | 6c1d686104ee1ecc3cfdad13ee2177041928e58f (patch) | |
tree | 1865e38fcb2c76df1bb3f462f3c8195023819589 /Smoke/gtk.c | |
parent | ab8aa770afa4fd72e4078f5c8703f91817b2d6c5 (diff) | |
download | 2iv35-6c1d686104ee1ecc3cfdad13ee2177041928e58f.zip 2iv35-6c1d686104ee1ecc3cfdad13ee2177041928e58f.tar.gz 2iv35-6c1d686104ee1ecc3cfdad13ee2177041928e58f.tar.bz2 |
fixed notebooks, fixed combo box etc.
Diffstat (limited to 'Smoke/gtk.c')
-rw-r--r-- | Smoke/gtk.c | 52 |
1 files changed, 6 insertions, 46 deletions
diff --git a/Smoke/gtk.c b/Smoke/gtk.c index 8b8e8c5..a44ed8f 100644 --- a/Smoke/gtk.c +++ b/Smoke/gtk.c @@ -619,6 +619,7 @@ GtkWidget *create_main_page(void) g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(toggle_smoke_usage), NULL); gtk_box_pack_start (GTK_BOX(box), button, TRUE, TRUE, 0); gtk_widget_show(button); + button = gtk_check_button_new_with_label("Draw Glyphs"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); g_signal_connect (G_OBJECT(button), "clicked", G_CALLBACK(toggle_glyph_usage), NULL); @@ -628,9 +629,6 @@ GtkWidget *create_main_page(void) gtk_box_pack_start (GTK_BOX(page), box, FALSE, TRUE, 0); gtk_widget_show(box); -// frame = gtk_frame_new("XXX"); -// gtk_box_pack_start (GTK_BOX(page), frame, TRUE, TRUE, 0); -// gtk_widget_show(frame); frame = gtk_frame_new("Dataset"); @@ -857,40 +855,9 @@ GtkWidget *create_stream_tubes_page(void) { int i, max; GtkWidget *page; - GtkWidget *frame; - GtkWidget *box; - GtkWidget *button; - GtkWidget *combo; - GList *glist; - - glist = NULL; page = gtk_vbox_new(FALSE, 0); - frame = gtk_frame_new("Seed points"); - - box = gtk_hbox_new(FALSE, 0); - - combo = gtk_combo_new(); - - max = get_cur_seedpoint(); - for (i = 0; i < max; i++) - { - glist = g_list_append(glist, strcat("Seedpoint ", (char *)i)); - } - - gtk_combo_set_popdown_strings (GTK_COMBO (combo), glist); - - gtk_box_pack_start(GTK_BOX(box), combo, FALSE, TRUE, 0); - gtk_widget_show(combo); - - gtk_container_add(GTK_CONTAINER(frame), box); - gtk_widget_show(box); - - gtk_box_pack_start(GTK_BOX(page), frame, FALSE, TRUE, 0); - - gtk_widget_show(frame); - return page; } @@ -926,8 +893,8 @@ create_window (GdkGLConfig *glconfig) * hBox. */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (window), hbox); + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_add(GTK_CONTAINER (window), hbox); gtk_widget_show (hbox); /* @@ -1015,16 +982,15 @@ create_window (GdkGLConfig *glconfig) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(settings_notebook), GTK_POS_BOTTOM); gtk_notebook_set_scrollable(GTK_NOTEBOOK(settings_notebook), TRUE); - + gtk_notebook_popup_enable(GTK_NOTEBOOK(settings_notebook)); gtk_box_pack_start(GTK_BOX(hbox), settings_notebook, FALSE, FALSE, 0); - gtk_widget_show(settings_notebook); + notebook_page_label = gtk_label_new("Main"); gtk_widget_show(notebook_page_label); notebook_page = create_main_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1033,7 +999,6 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_colormap_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1042,7 +1007,6 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_glyph_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1051,7 +1015,6 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_divergence_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1060,7 +1023,6 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_isolines_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1069,7 +1031,6 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_height_plots_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); @@ -1078,10 +1039,9 @@ create_window (GdkGLConfig *glconfig) gtk_widget_show(notebook_page_label); notebook_page = create_stream_tubes_page(); - gtk_container_add(GTK_CONTAINER(window), notebook_page); gtk_widget_show(notebook_page); - gtk_notebook_append_page(settings_notebook, notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); return window; } |