Skip to content

GitLab

gnumeric
gnumeric
Commit f0c07807 authored by Arturo Espinosa's avatar Arturo Espinosa
Browse files
Options

Warning fixes; Keep up with Bonobo changes; Render the views in all of the 



Warning fixes;  Keep up with Bonobo changes;  Render the views in all
of the graphic wizard view bits.

Miguel
parent c453ee7d
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 49 deletions
src/corba-args.c
View file @ f0c07807
......@@ -12,6 +12,9 @@
#include "gnumeric.h"
#include "main.h"
#include "main.h"
#ifdef ENABLE_BONOBO
# include <bonobo/gnome-bonobo.h>
#endif
void
gnumeric_arg_parse (int argc, char *argv [])
......
src/libgnumeric.c
View file @ f0c07807
......@@ -30,7 +30,7 @@ int gnumeric_debugging = 0;
static char *dump_file_name = NULL;
static char **startup_files = NULL;
static char startup_glade_file = NULL;
static char *startup_glade_file = NULL;
poptContext ctx;
......
src/main.c
View file @ f0c07807
......@@ -30,7 +30,7 @@ int gnumeric_debugging = 0;
static char *dump_file_name = NULL;
static char **startup_files = NULL;
static char startup_glade_file = NULL;
static char *startup_glade_file = NULL;
poptContext ctx;
......
src/sheet-control-gui.c
View file @ f0c07807
......@@ -689,7 +689,7 @@ sheet_view_comment_relocate (SheetView *sheet_view, int col, int row, GnomeCanva
#ifdef ENABLE_BONOBO
void
sheet_view_insert_object (SheetView *sheet_view, GnomeObject *object)
sheet_view_insert_object (SheetView *sheet_view, GnomeObjectClient *object)
{
GtkWidget *view;
......
src/sheet-object-container.c
View file @ f0c07807
......@@ -73,7 +73,7 @@ void
sheet_object_container_land (SheetObject *so)
{
SheetObjectContainer *soc;
GnomeObject *component;
GnomeObjectClient *component;
GList *l;
g_return_if_fail (so != NULL);
......
src/sheet-object-container.h
View file @ f0c07807
......@@ -27,7 +27,7 @@ typedef struct {
/*
* Points to the object server that implements this view
*/
GnomeObject *object_server;
GnomeObjectClient *object_server;
char *repoid;
} SheetObjectContainer;
......
src/sheet-view.c
View file @ f0c07807
......@@ -689,7 +689,7 @@ sheet_view_comment_relocate (SheetView *sheet_view, int col, int row, GnomeCanva
#ifdef ENABLE_BONOBO
void
sheet_view_insert_object (SheetView *sheet_view, GnomeObject *object)
sheet_view_insert_object (SheetView *sheet_view, GnomeObjectClient *object)
{
GtkWidget *view;
......
wizards/graphics/ChangeLog
View file @ f0c07807
1999-04-28 Miguel de Icaza <miguel@nuclecu.unam.mx>
* graphic-context.c (GUPPI_ID): Use a GUPPI component. Now that
GUPPI actually works.
1999-04-26 Miguel de Icaza <miguel@nuclecu.unam.mx>
* graphic-context.[ch]: New files that keep track of the
......
wizards/graphics/graphic-context.c
View file @ f0c07807
......@@ -13,7 +13,7 @@
#include <bonobo/gnome-bonobo.h>
#include "graphic-context.h"
#define GUPPI_ID "Test_server_component"
#define GUPPI_ID "Guppi_component"
static GnomeObject *
launch_guppi (void)
......
wizards/graphics/graphics.glade
View file @ f0c07807
......@@ -7,7 +7,6 @@
<source_directory></source_directory>
<pixmaps_directory>pixmaps</pixmaps_directory>
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>
<use_widget_names>False</use_widget_names>
<main_source_file>gladesrc.c</main_source_file>
......@@ -462,6 +461,31 @@
</widget>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>plot-view-1</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
<widget>
......@@ -770,6 +794,31 @@
</widget>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>plot-view-2</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
<widget>
......@@ -830,31 +879,6 @@
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel10</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Plot title:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel11</name>
......@@ -1074,10 +1098,47 @@
<text_max_length>0</text_max_length>
<text></text>
</widget>
<widget>
<class>GtkAccelLabel</class>
<name>accellabel10</name>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>True</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<label>Plot title:</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
</widget>
<widget>
<class>Placeholder</class>
<class>GtkHBox</class>
<name>plot-view-3</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
......@@ -1250,7 +1311,19 @@
</widget>
<widget>
<class>Placeholder</class>
<class>GtkHBox</class>
<name>plot-view-4</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
......@@ -1414,7 +1487,19 @@
</widget>
<widget>
<class>Placeholder</class>
<class>GtkHBox</class>
<name>plot-view-5</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
......@@ -1548,7 +1633,19 @@
</widget>
<widget>
<class>Placeholder</class>
<class>GtkHBox</class>
<name>plot-view-6</name>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>Placeholder</class>
</widget>
</widget>
</widget>
......
wizards/graphics/main.c
View file @ f0c07807
......@@ -27,16 +27,17 @@ customize (GladeXML *gui, GraphicContext *gc)
fill_graphic_types (gui, gc);
/* Stick the views all over the place */
gtk_table_attach (
GTK_TABLE (glade_xml_get_widget (gui, "data-ranges-table")),
gnome_component_new_view (gc->guppi),
0, 1, 0, 1, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (glade_xml_get_widget (gui, "data-series-table")),
gnome_component_new_view (gc->guppi),
0, 1, 0, 1, 0, 0, 0, 0);
for (i = 0; i < 6; i++){
GtkWidget *view, *container;
char *name;
name = g_strdup_printf ("plot-view-%d", i+1);
container = glade_xml_get_widget (gui, name);
g_free (name);
view = gnome_component_new_view (gc->guppi);
gtk_container_add (GTK_CONTAINER (container), view);
}
}
static void
......@@ -62,11 +63,9 @@ set_page (GraphicContext *gc, int page)
case 1:
name = _("Step 2 of 3: Select data ranges");
break;
case 2:
name = _("Step 3 of 3: Customize graphic");
break;
default:
name = "not_reached";
g_assert_not_reached ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment