GNOME.org
 

genius r714 - in trunk: . src

Author: jirka
Date: Fri Feb 13 19:59:20 2009
New Revision: 714
URL: http://svn.gnome.org/viewvc/genius?rev=714&view=rev

Log:

Fri Feb 13 13:59:11 2009  Jiri (George) Lebl <jirka 5z com>

	* src/gnome-genius.c, src/graphing.c, src/gnome-genius.h src/genius.c:
	  some more delibgnome(ui)ification



Modified:
   trunk/ChangeLog
   trunk/src/genius.c
   trunk/src/gnome-genius.c
   trunk/src/gnome-genius.h
   trunk/src/graphing.c

Modified: trunk/src/genius.c
==============================================================================
--- trunk/src/genius.c	(original)
+++ trunk/src/genius.c	Fri Feb 13 19:59:20 2009
@@ -475,21 +475,6 @@
 		exit (1);
 	}
 
-#if 0
-	{
-		/* FIXME: use this for option parsing,
-		 * we really only need gnome-program for
-		 * gnome_config, perhaps we should switch to
-		 * ve-config anyway */
-		char *fakeargv[] = { argv[0], NULL };
-		gnome_program_init ("genius", VERSION, 
-				    LIBGNOME_MODULE /* module_info */,
-				    1, fakeargv,
-				    /* GNOME_PARAM_POPT_TABLE, options, */
-				    NULL);
-	}
-#endif
-
 	gel_read_plugin_list();
 
 	if (do_compile || do_gettext)

Modified: trunk/src/gnome-genius.c
==============================================================================
--- trunk/src/gnome-genius.c	(original)
+++ trunk/src/gnome-genius.c	Fri Feb 13 19:59:20 2009
@@ -1368,7 +1368,6 @@
 		argv[0] = xdgopen;
 		argv[1] = uri;
 		argv[2] = NULL;
-		g_print ("%s '%s'\n", xdgopen, uri);
 		g_spawn_async (NULL /* wd */,
 			       argv,
 			       NULL /* envp */,
@@ -1861,8 +1860,8 @@
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (setupdialog)->vbox),
 			    notebook, TRUE, TRUE, 0);
 	
-	mainbox = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox),GNOME_PAD);
+	mainbox = gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(mainbox), GENIUS_PAD);
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 				  mainbox,
 				  gtk_label_new(_("Output")));
@@ -1870,12 +1869,12 @@
 	
 	frame=gtk_frame_new(_("Number/Expression output options"));
 	gtk_box_pack_start(GTK_BOX(mainbox),frame,FALSE,FALSE,0);
-	box=gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(box),GNOME_PAD);
+	box=gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(box), GENIUS_PAD);
 	gtk_container_add(GTK_CONTAINER(frame),box);
 
 
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Maximum digits to output (0=unlimited)")),
@@ -1930,7 +1929,7 @@
 			  G_CALLBACK (optioncb),
 			  (gpointer)&tmpstate.mixed_fractions);
 
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Display 0.0 when floating point number is less than 10^-x "
@@ -1953,7 +1952,7 @@
 	g_signal_connect (G_OBJECT (adj), "value_changed",
 			  G_CALLBACK (intspincb), &tmpstate.chop);
 
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Only chop numbers when another number is greater than 10^-x")),
@@ -1992,10 +1991,10 @@
 
 	frame=gtk_frame_new(_("Error/Info output options"));
 	gtk_box_pack_start(GTK_BOX(mainbox),frame,FALSE,FALSE,0);
-	box=gtk_vbox_new(FALSE,GNOME_PAD);
+	box=gtk_vbox_new(FALSE, GENIUS_PAD);
 	gtk_container_add(GTK_CONTAINER(frame),box);
 
-	gtk_container_set_border_width(GTK_CONTAINER(box),GNOME_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(box), GENIUS_PAD);
 	
 
 	w=gtk_check_button_new_with_label(_("Display errors in a dialog"));
@@ -2014,7 +2013,7 @@
 			  G_CALLBACK (optioncb),
 			  (gpointer)&tmpsetup.info_box);
 	
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Maximum errors to display (0=unlimited)")),
@@ -2037,8 +2036,8 @@
 			  G_CALLBACK (intspincb),&tmpstate.max_errors);
 
 
-	mainbox = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox),GNOME_PAD);
+	mainbox = gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(mainbox), GENIUS_PAD);
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 				  mainbox,
 				  gtk_label_new(_("Precision")));
@@ -2046,8 +2045,8 @@
 	
 	frame=gtk_frame_new(_("Floating point precision"));
 	gtk_box_pack_start(GTK_BOX(mainbox),frame,FALSE,FALSE,0);
-	box=gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(box),GNOME_PAD);
+	box=gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(box), GENIUS_PAD);
 	gtk_container_add(GTK_CONTAINER(frame),box);
 	
 	gtk_box_pack_start(GTK_BOX(box), gtk_label_new(
@@ -2057,7 +2056,7 @@
 			   FALSE,FALSE,0);
 
 
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Floating point precision (bits)")),
@@ -2093,19 +2092,19 @@
 			      NULL);
 
 
-	mainbox = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox),GNOME_PAD);
+	mainbox = gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(mainbox), GENIUS_PAD);
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 				  mainbox,
 				  gtk_label_new(_("Terminal")));
 	
 	frame=gtk_frame_new(_("Terminal options"));
 	gtk_box_pack_start(GTK_BOX(mainbox),frame,FALSE,FALSE,0);
-	box=gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(box),GNOME_PAD);
+	box=gtk_vbox_new(FALSE, GENIUS_PAD);
+	gtk_container_set_border_width(GTK_CONTAINER(box), GENIUS_PAD);
 	gtk_container_add(GTK_CONTAINER(frame),box);
 	
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Scrollback lines")),
@@ -2128,7 +2127,7 @@
 			  G_CALLBACK (intspincb), &tmpsetup.scrollback);
 	
 	
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Font:")),
@@ -2159,8 +2158,8 @@
 			  (gpointer)&tmpsetup.blinking_cursor);
 
 
-	mainbox = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(mainbox),GNOME_PAD);
+	mainbox = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (mainbox), GENIUS_PAD);
 	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 				  mainbox,
 				  gtk_label_new(_("Memory")));
@@ -2168,8 +2167,8 @@
 	
 	frame=gtk_frame_new(_("Limits"));
 	gtk_box_pack_start(GTK_BOX(mainbox),frame,FALSE,FALSE,0);
-	box=gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width(GTK_CONTAINER(box),GNOME_PAD);
+	box=gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	gtk_container_add(GTK_CONTAINER(frame),box);
 	
 	gtk_box_pack_start(GTK_BOX(box), gtk_label_new(
@@ -2179,7 +2178,7 @@
 			   FALSE,FALSE,0);
 
 
-	b=gtk_hbox_new(FALSE,GNOME_PAD);
+	b=gtk_hbox_new(FALSE, GENIUS_PAD);
 	gtk_box_pack_start(GTK_BOX(box),b,FALSE,FALSE,0);
 	gtk_box_pack_start(GTK_BOX(b),
 		   gtk_label_new(_("Maximum number of nodes to allocate")),

Modified: trunk/src/gnome-genius.h
==============================================================================
--- trunk/src/gnome-genius.h	(original)
+++ trunk/src/gnome-genius.h	Fri Feb 13 19:59:20 2009
@@ -46,4 +46,9 @@
 gboolean genius_ask_question (GtkWidget *parent, const char *question);
 void genius_display_error (GtkWidget *parent, const char *err);
 
+/* same as GNOME */
+#define GENIUS_PAD          8
+#define GENIUS_PAD_SMALL    4
+#define GENIUS_PAD_BIG      12
+
 #endif /* GNOME_GENIUS_H_ */

Modified: trunk/src/graphing.c
==============================================================================
--- trunk/src/graphing.c	(original)
+++ trunk/src/graphing.c	Fri Feb 13 19:59:20 2009
@@ -20,10 +20,13 @@
  */
 #include "config.h"
 
-#include <gnome.h>
 #include <string.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 #include <math.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include <vicious.h>
 
@@ -437,7 +440,7 @@
 
 	/* X dir */
 
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
+	hbox = gtk_hbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (req)->vbox),
 			    hbox, TRUE, TRUE, 0);
 
@@ -462,7 +465,7 @@
 
 	/* Y dir */
 
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
+	hbox = gtk_hbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (req)->vbox),
 			    hbox, TRUE, TRUE, 0);
 
@@ -487,7 +490,7 @@
 
 	/* Z dir */
 
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
+	hbox = gtk_hbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (req)->vbox),
 			    hbox, TRUE, TRUE, 0);
 
@@ -612,7 +615,7 @@
 
 	gtk_dialog_set_has_separator (GTK_DIALOG (req), FALSE);
 
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
+	hbox = gtk_hbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (req)->vbox),
 			    hbox, TRUE, TRUE, 0);
 
@@ -1512,10 +1515,10 @@
 
 	gtk_dialog_set_has_separator (GTK_DIALOG (solver_dialog), FALSE);
 
-	box = gtk_vbox_new (FALSE, GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (solver_dialog)->vbox),
 			    box, TRUE, TRUE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 
 	w = gtk_label_new (_("Clicking on the graph window now will draw a "
 			     "solution according to the parameters set "
@@ -3447,7 +3450,7 @@
 	GtkWidget *b, *w;
 	GtkAdjustment *adj;
 
-	b = gtk_hbox_new (FALSE, GNOME_PAD);
+	b = gtk_hbox_new (FALSE, GENIUS_PAD);
 	w = gtk_label_new(title);
 	gtk_box_pack_start (GTK_BOX (b), w, FALSE, FALSE, 0);
 	adj = (GtkAdjustment *)gtk_adjustment_new (*val1,
@@ -3542,7 +3545,7 @@
 	GtkWidget *b, *w;
 	GtkAdjustment *adj;
 
-	b = gtk_hbox_new (FALSE, GNOME_PAD);
+	b = gtk_hbox_new (FALSE, GENIUS_PAD);
 	w = gtk_label_new(title);
 	gtk_box_pack_start (GTK_BOX (b), w, FALSE, FALSE, 0);
 	adj = (GtkAdjustment *)gtk_adjustment_new (*val,
@@ -3573,7 +3576,7 @@
 {
 	GtkWidget *b;
 
-	b = gtk_hbox_new (FALSE, GNOME_PAD);
+	b = gtk_hbox_new (FALSE, GENIUS_PAD);
 
 	gtk_box_pack_start (GTK_BOX (b),
 			    gtk_label_new (label), FALSE, FALSE, 0);
@@ -3606,8 +3609,8 @@
 	int i;
 
 
-	mainbox = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (mainbox), GNOME_PAD);
+	mainbox = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (mainbox), GENIUS_PAD);
 
 	function_notebook = gtk_notebook_new ();
 	gtk_box_pack_start (GTK_BOX (mainbox), function_notebook, FALSE, FALSE, 0);
@@ -3615,8 +3618,8 @@
 	/*
 	 * Line plot entries
 	 */
-	box = gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	w = gtk_label_new (_("Type in function names or expressions involving "
 			     "the x variable in the boxes below to graph "
 			     "them"));
@@ -3637,8 +3640,8 @@
 		b = gtk_viewport_new (NULL, NULL);
 		gtk_container_add (GTK_CONTAINER (w), b);
 
-		fb = gtk_vbox_new(FALSE,GNOME_PAD);
-		gtk_container_set_border_width (GTK_CONTAINER (fb), GNOME_PAD);
+		fb = gtk_vbox_new (FALSE, GENIUS_PAD);
+		gtk_container_set_border_width (GTK_CONTAINER (fb), GENIUS_PAD);
 
 		gtk_container_add (GTK_CONTAINER (b), fb);
 	}
@@ -3660,8 +3663,8 @@
 	 * Parametric plot entries
 	 */
 
-	box = gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	w = gtk_label_new (_("Type in function names or expressions involving "
 			     "the t variable in the boxes below to graph "
 			     "them.  Either fill in both boxes with x= and y= "
@@ -3717,8 +3720,8 @@
 	 * Slopefield
 	 */
 
-	box = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	w = gtk_label_new (_("Type in function name or expression involving "
 			     "the x and y variables (or the z variable which will be z=x+iy) "
 			     "that gives the slope "
@@ -3750,8 +3753,8 @@
 	 * Vectorfield
 	 */
 
-	box = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	w = gtk_label_new (_("Type in function names or expressions involving "
 			     "the x and y variables (or the z variable which will be z=x+iy) "
 			     "that give the dx/dt and dy/dt of the autonomous system to be plotted "
@@ -3809,8 +3812,8 @@
 
 	frame = gtk_frame_new (_("Plot Window"));
 	gtk_box_pack_start (GTK_BOX (mainbox), frame, FALSE, FALSE, 0);
-	box = gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	gtk_container_add (GTK_CONTAINER (frame), box);
 
 	/*
@@ -3844,13 +3847,13 @@
 	GtkWidget *mainbox, *frame;
 	GtkWidget *box, *b, *w;
 
-	mainbox = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (mainbox), GNOME_PAD);
+	mainbox = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (mainbox), GENIUS_PAD);
 	
 	frame = gtk_frame_new (_("Function / Expression"));
 	gtk_box_pack_start (GTK_BOX (mainbox), frame, FALSE, FALSE, 0);
-	box = gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	gtk_container_add (GTK_CONTAINER (frame), box);
 	w = gtk_label_new (_("Type a function name or an expression involving "
 			     "the x and y variables (or the z variable which will be z=x+iy) "
@@ -3862,7 +3865,7 @@
 
 	gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
 
-	b = gtk_hbox_new (FALSE, GNOME_PAD);
+	b = gtk_hbox_new (FALSE, GENIUS_PAD);
 	gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE, 0);
 
 	surface_entry = gtk_entry_new ();
@@ -3875,8 +3878,8 @@
 
 	frame = gtk_frame_new (_("Plot Window"));
 	gtk_box_pack_start (GTK_BOX (mainbox), frame, FALSE, FALSE, 0);
-	box = gtk_vbox_new(FALSE,GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (box), GNOME_PAD);
+	box = gtk_vbox_new (FALSE, GENIUS_PAD);
+	gtk_container_set_border_width (GTK_CONTAINER (box), GENIUS_PAD);
 	gtk_container_add (GTK_CONTAINER (frame), box);
 
 	/*
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]