diff options
| author | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-03 09:33:57 (GMT) |
|---|---|---|
| committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-03 09:33:57 (GMT) |
| commit | 948ca528baf6dda4345cf7b2bee003869338fc10 (patch) | |
| tree | 562de34f965ac50a907cdd270b89507d6a055f10 | |
| parent | 277b39b014ce93b6f79d3cf031865eef72ede7a2 (diff) | |
| download | 2iv35-948ca528baf6dda4345cf7b2bee003869338fc10.zip 2iv35-948ca528baf6dda4345cf7b2bee003869338fc10.tar.gz 2iv35-948ca528baf6dda4345cf7b2bee003869338fc10.tar.bz2 | |
testing
| -rw-r--r-- | Smoke/gtk.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/Smoke/gtk.c b/Smoke/gtk.c index 91c9ea6..bbe3b72 100644 --- a/Smoke/gtk.c +++ b/Smoke/gtk.c @@ -727,6 +727,11 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) * Draw the options notebook */ +#if 1 + settings_notebook = create_main_page(); + gtk_box_pack_start(GTK_BOX(hbox), settings_notebook, FALSE, FALSE, 0); + gtk_widget_show(settings_notebook); +#else settings_notebook = gtk_notebook_new(); gtk_notebook_set_tab_pos(GTK_NOTEBOOK(settings_notebook), GTK_POS_BOTTOM); @@ -742,7 +747,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_main_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Colormap"); gtk_widget_show(notebook_page_label); @@ -750,7 +755,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_colormap_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Glyphs"); gtk_widget_show(notebook_page_label); @@ -758,7 +763,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_glyphs_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Divergence"); gtk_widget_show(notebook_page_label); @@ -766,7 +771,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_divergence_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Isolines"); gtk_widget_show(notebook_page_label); @@ -774,7 +779,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_isolines_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Height Plots"); gtk_widget_show(notebook_page_label); @@ -782,7 +787,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_heightplots_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Stream Tubes"); gtk_widget_show(notebook_page_label); @@ -790,7 +795,7 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_streamlines_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); notebook_page_label = gtk_label_new("Flow Vis"); gtk_widget_show(notebook_page_label); @@ -798,7 +803,8 @@ create_window (GdkGLConfig *glconfig, fftw_real *field) notebook_page = create_flowvis_page(); gtk_widget_show(notebook_page); - //gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); + gtk_notebook_append_page(GTK_NOTEBOOK(settings_notebook), notebook_page, notebook_page_label); +#endif return window; } |