Commit 6d388511 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

remove gnome-print include

2003-07-02  Jody Goldberg <jody@gnome.org>

	* widget-font-selector.c : remove gnome-print include

	* widget-pixmap-combo.h : Cleanup the includes

	* gtk-combo-box.c (gtk_combo_box_init) : Use GObject properties in
	  place of deprecated gtk_window_set_policy.
	(gtk_combo_popup_tear_off) : ditto.
	(gtk_combo_box_popup_display) : Use gtk_window_move in place of
	  deprecated gtk_window_set_uposition.
	(gtk_combo_box_get_pos) : Make multi head safe.

2003-07-02  Jody Goldberg <jody@gnome.org>

	* dialog-tabulate.c (dialog_tabulate) : Use GObject properties in
	  place of deprecated gtk_window_set_policy.

2003-07-02  Jody Goldberg <jody@gnome.org>

	* src/sheet-control-gui.c (scg_comment_display) : Use gtk_window_move
	  in place of the deprecated gtk_widget_set_uposition.
parent d1661b08
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/sheet-control-gui.c (scg_comment_display) : Use gtk_window_move
in place of the deprecated gtk_widget_set_uposition.
2003-07-02 Morten Welinder <terra@gnome.org>
* src/datetime.c (yearfrac): Swap args if incorrectly ordered.
......@@ -5,6 +10,11 @@
(Leap days are February 24ths, if you must know.) Get the less
than one year special case right.
2003-07-02 Jody Goldberg <jody@gnome.org>
* po/Makefile.in.in : As suggested by tino, try to do a release
without the .gmo files.
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/print.c (print_sheet_objects) : translate to the upper left
......
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/sheet-control-gui.c (scg_comment_display) : Use gtk_window_move
in place of the deprecated gtk_widget_set_uposition.
2003-07-02 Morten Welinder <terra@gnome.org>
* src/datetime.c (yearfrac): Swap args if incorrectly ordered.
......@@ -5,6 +10,11 @@
(Leap days are February 24ths, if you must know.) Get the less
than one year special case right.
2003-07-02 Jody Goldberg <jody@gnome.org>
* po/Makefile.in.in : As suggested by tino, try to do a release
without the .gmo files.
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/print.c (print_sheet_objects) : translate to the upper left
......
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/sheet-control-gui.c (scg_comment_display) : Use gtk_window_move
in place of the deprecated gtk_widget_set_uposition.
2003-07-02 Morten Welinder <terra@gnome.org>
* src/datetime.c (yearfrac): Swap args if incorrectly ordered.
......@@ -5,6 +10,11 @@
(Leap days are February 24ths, if you must know.) Get the less
than one year special case right.
2003-07-02 Jody Goldberg <jody@gnome.org>
* po/Makefile.in.in : As suggested by tino, try to do a release
without the .gmo files.
2003-07-02 Jody Goldberg <jody@gnome.org>
* src/print.c (print_sheet_objects) : translate to the upper left
......
......@@ -21,6 +21,10 @@
_tip="Save the current workbook with a different name"
pixtype="stock" pixname="gtk-save-as"
accel="*Shift**Control*s"/>
<cmd name="FileSend"
_label="Sen_d To..."
_tip="Send the current file via email"
pixtype="stock" pixname="New Mail"/>
<cmd name="FilePageSetup"
_label="Page Set_up..."
......@@ -173,6 +177,7 @@
<separator/>
<menuitem name="FileSend" verb=""/>
<menuitem name="FileSummary" verb=""/>
<menuitem name="FilePreferences" verb=""/>
<placeholder name="FileHistory" delimit="top"/>
......
......@@ -42,7 +42,7 @@ libfoocanvas_a_SOURCES = \
foo-canvas-marshal.h: foo-canvas-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=foo_canvas_marshal > $@
foo-canvas-marshal.c: foo-canvas-marshal.list $(GLIB_GENMARSHAL)
foo-canvas-marshal.c: foo-canvas-marshal.list $(GLIB_GENMARSHAL) foo-canvas-marshal.h
$(GLIB_GENMARSHAL) $< --body --prefix=foo_canvas_marshal > $@.tmp
echo '/* This file has been automatically generated. Do not edit. */' >$@
echo '#include "'$*.h'"' >>$@
......
......@@ -68,7 +68,7 @@ struct _GtkComboBoxPrivate {
GtkWidget *toplevel; /* Popup's toplevel when not torn off */
GtkWidget *tearoff_window; /* Popup's toplevel when torn off */
guint torn_off;
gboolean torn_off;
GtkWidget *tearable; /* The tearoff "button" */
GtkWidget *popup; /* Popup */
......@@ -280,6 +280,7 @@ gtk_combo_box_popup_hide (GtkComboBox *combo_box)
gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
{
GtkWidget *wcombo = GTK_WIDGET (combo_box);
GdkScreen *screen = gtk_widget_get_screen (wcombo);
int ph, pw;
gdk_window_get_origin (wcombo->window, x, y);
......@@ -289,11 +290,11 @@ gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
ph = combo_box->priv->popup->allocation.height;
pw = combo_box->priv->popup->allocation.width;
if ((*y + ph) > gdk_screen_height ())
*y = gdk_screen_height () - ph;
if ((*y + ph) > gdk_screen_get_height (screen))
*y = gdk_screen_get_height (screen) - ph;
if ((*x + pw) > gdk_screen_width ())
*x = gdk_screen_width () - pw;
if ((*x + pw) > gdk_screen_get_width (screen))
*x = gdk_screen_get_width (screen) - pw;
}
/* protected */ void
......@@ -336,7 +337,7 @@ gtk_combo_box_popup_display (GtkComboBox *combo_box)
gtk_combo_box_get_pos (combo_box, &x, &y);
gtk_widget_set_uposition (combo_box->priv->toplevel, x, y);
gtk_window_move (GTK_WINDOW (combo_box->priv->toplevel), x, y);
gtk_widget_realize (combo_box->priv->popup);
gtk_widget_show (combo_box->priv->popup);
gtk_widget_realize (combo_box->priv->toplevel);
......@@ -444,8 +445,10 @@ gtk_combo_box_init (GtkComboBox *combo_box)
combo_box->priv->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_ref (combo_box->priv->toplevel);
gtk_object_sink (GTK_OBJECT (combo_box->priv->toplevel));
gtk_window_set_policy (GTK_WINDOW (combo_box->priv->toplevel),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (combo_box->priv->toplevel),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
combo_box->priv->popup = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (combo_box->priv->toplevel),
......@@ -542,8 +545,10 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
"gtk-combo-title");
if (title)
gdk_window_set_title (tearoff->window, title);
gtk_window_set_policy (GTK_WINDOW (tearoff),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (tearoff),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
gtk_window_set_transient_for
(GTK_WINDOW (tearoff),
GTK_WINDOW (gtk_widget_get_toplevel
......@@ -566,7 +571,7 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
if (set_position) {
gtk_combo_box_get_pos (combo, &x, &y);
gtk_widget_set_uposition (combo->priv->tearoff_window, x, y);
gtk_window_move (GTK_WINDOW (combo->priv->tearoff_window), x, y);
}
gtk_widget_show (GTK_WIDGET (combo->priv->popup));
gtk_widget_show (combo->priv->tearoff_window);
......
......@@ -25,7 +25,7 @@
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <gnumeric-i18n.h>
#include "gtk-combo-box.h"
#include "widget-pixmap-combo.h"
#include <gnm-marshalers.h>
......
......@@ -26,9 +26,6 @@
#ifndef GNUMERIC_WIDGET_PIXMAP_COMBO_H
#define GNUMERIC_WIDGET_PIXMAP_COMBO_H
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <libgnomeui/gnome-pixmap.h>
#include <widgets/gtk-combo-box.h>
G_BEGIN_DECLS
......
2003-07-02 Jody Goldberg <jody@gnome.org>
* dialog-tabulate.c (dialog_tabulate) : Use GObject properties in
place of deprecated gtk_window_set_policy.
2003-07-02 Andreas J. Guelzow <aguelzow@taliesin.ca>
* format-selector.glade: remove some translatable nonsense text
......
......@@ -47,6 +47,7 @@
#include <libfoocanvas/foo-canvas-text.h>
#include <libfoocanvas/foo-canvas-rect-ellipse.h>
#include <glade/glade.h>
#include <stdio.h>
/* FIXME: do not hardcode pixel counts. */
#define PREVIEW_X 170
......
......@@ -44,6 +44,7 @@
#include <glade/glade.h>
#include <widgets/widget-color-combo.h>
#include <string.h>
#include <stdio.h>
typedef struct {
WorkbookControlGUI *wbcg;
......
......@@ -347,7 +347,7 @@ stf_dialog (WorkbookControlGUI *wbcg,
pagedata.wbcg = wbcg;
pagedata.source = source;
pagedata.raw_data = data;
pagedata.raw_data_len = data_len < 0 ? strlen (data) : data_len;
pagedata.raw_data_len = data_len < 0 ? (int)strlen (data) : data_len;
pagedata.utf8_data = NULL;
pagedata.cur = NULL;
......
......@@ -530,7 +530,10 @@ dialog_tabulate (WorkbookControlGUI *wbcg, Sheet *sheet)
dd->dialog = dialog;
dd->sheet = sheet;
gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (dialog),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
dd->source_table = GTK_TABLE (glade_xml_get_widget (gui, "source_table"));
for (i = 1; i < dd->source_table->nrows; i++) {
......
......@@ -494,7 +494,7 @@ gnm_gconf_set_printer_header (gchar const *left, gchar const *middle,
gconf_client_set_list (application_get_gconf_client (),
PRINTSETUP_GCONF_HEADER,
GCONF_VALUE_STRING, list, NULL);
g_slist_free_custom (prefs.printer_header, g_free);
g_slist_free_custom ((GSList *)prefs.printer_header, g_free);
prefs.printer_header = list;
}
......@@ -509,7 +509,7 @@ gnm_gconf_set_printer_footer (gchar const *left, gchar const *middle,
gconf_client_set_list (application_get_gconf_client (),
PRINTSETUP_GCONF_FOOTER,
GCONF_VALUE_STRING, list, NULL);
g_slist_free_custom (prefs.printer_footer, g_free);
g_slist_free_custom ((GSList *)prefs.printer_footer, g_free);
prefs.printer_footer = list;
}
......
......@@ -35,6 +35,7 @@
#include <libxml/globals.h>
#include <locale.h>
#include <string.h>
#include <unistd.h>
typedef struct {
WorkbookControlGUI *wbcg;
......
......@@ -36,6 +36,8 @@
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-help.h>
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
gboolean
gnumeric_dialog_question_yes_no (WorkbookControlGUI *wbcg,
......@@ -998,7 +1000,7 @@ color_combo_get_style_color (GtkWidget *color_combo)
GtkWidget *
gnumeric_toolbar_new (WorkbookControlGUI *wbcg,
GnomeUIInfo *info,
gpointer info, /* GnomeUIInfo *info */
char const *name,
gint band_num,
gint band_position,
......
......@@ -8,10 +8,6 @@
#include <gtk/gtk.h>
#include <glade/glade-xml.h>
#if 1 /* go away when we switch to eggmenu */
#include <libgnomeui/libgnomeui.h>
#endif
gboolean gnumeric_dialog_question_yes_no (WorkbookControlGUI *wbcg,
const gchar *message,
gboolean default_answer);
......@@ -98,7 +94,7 @@ void gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
StyleColor *color_combo_get_style_color (GtkWidget *color_combo);
GtkWidget *gnumeric_toolbar_new (WorkbookControlGUI *wbcg, GnomeUIInfo *info,
GtkWidget *gnumeric_toolbar_new (WorkbookControlGUI *wbcg, gpointer info,
char const *name, gint band_num, gint band_position, gint offset);
GtkWidget *gnumeric_toolbar_get_widget (GtkToolbar *toolbar, int pos);
......
......@@ -24,6 +24,7 @@
#include <gtk/gtkprogressbar.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkwindow.h>
#include <stdlib.h>
extern int gnumeric_no_splash;
......
......@@ -1930,7 +1930,7 @@ scg_comment_display (SheetControlGUI *scg, CellComment *cc)
scg->comment.item = gtk_window_new (GTK_WINDOW_POPUP);
gdk_window_get_pointer (NULL, &x, &y, NULL);
gtk_widget_set_uposition (scg->comment.item, x+10, y+10);
gtk_window_move (GTK_WINDOW (scg->comment.item), x+10, y+10);
label = gtk_text_view_new ();
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(label), GTK_WRAP_NONE);
......
2003-07-02 Jody Goldberg <jody@gnome.org>
* widget-font-selector.c : remove gnome-print include
* widget-pixmap-combo.h : Cleanup the includes
* gtk-combo-box.c (gtk_combo_box_init) : Use GObject properties in
place of deprecated gtk_window_set_policy.
(gtk_combo_popup_tear_off) : ditto.
(gtk_combo_box_popup_display) : Use gtk_window_move in place of
deprecated gtk_window_set_uposition.
(gtk_combo_box_get_pos) : Make multi head safe.
2003-07-02 Jon K Hellan <hellan@acm.org>
* gtk-combo-stack.c (gtk_combo_stack_push_item): Focus pushed item
......
......@@ -68,7 +68,7 @@ struct _GtkComboBoxPrivate {
GtkWidget *toplevel; /* Popup's toplevel when not torn off */
GtkWidget *tearoff_window; /* Popup's toplevel when torn off */
guint torn_off;
gboolean torn_off;
GtkWidget *tearable; /* The tearoff "button" */
GtkWidget *popup; /* Popup */
......@@ -280,6 +280,7 @@ gtk_combo_box_popup_hide (GtkComboBox *combo_box)
gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
{
GtkWidget *wcombo = GTK_WIDGET (combo_box);
GdkScreen *screen = gtk_widget_get_screen (wcombo);
int ph, pw;
gdk_window_get_origin (wcombo->window, x, y);
......@@ -289,11 +290,11 @@ gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
ph = combo_box->priv->popup->allocation.height;
pw = combo_box->priv->popup->allocation.width;
if ((*y + ph) > gdk_screen_height ())
*y = gdk_screen_height () - ph;
if ((*y + ph) > gdk_screen_get_height (screen))
*y = gdk_screen_get_height (screen) - ph;
if ((*x + pw) > gdk_screen_width ())
*x = gdk_screen_width () - pw;
if ((*x + pw) > gdk_screen_get_width (screen))
*x = gdk_screen_get_width (screen) - pw;
}
/* protected */ void
......@@ -336,7 +337,7 @@ gtk_combo_box_popup_display (GtkComboBox *combo_box)
gtk_combo_box_get_pos (combo_box, &x, &y);
gtk_widget_set_uposition (combo_box->priv->toplevel, x, y);
gtk_window_move (GTK_WINDOW (combo_box->priv->toplevel), x, y);
gtk_widget_realize (combo_box->priv->popup);
gtk_widget_show (combo_box->priv->popup);
gtk_widget_realize (combo_box->priv->toplevel);
......@@ -444,8 +445,10 @@ gtk_combo_box_init (GtkComboBox *combo_box)
combo_box->priv->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_ref (combo_box->priv->toplevel);
gtk_object_sink (GTK_OBJECT (combo_box->priv->toplevel));
gtk_window_set_policy (GTK_WINDOW (combo_box->priv->toplevel),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (combo_box->priv->toplevel),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
combo_box->priv->popup = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (combo_box->priv->toplevel),
......@@ -542,8 +545,10 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
"gtk-combo-title");
if (title)
gdk_window_set_title (tearoff->window, title);
gtk_window_set_policy (GTK_WINDOW (tearoff),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (tearoff),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
gtk_window_set_transient_for
(GTK_WINDOW (tearoff),
GTK_WINDOW (gtk_widget_get_toplevel
......@@ -566,7 +571,7 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
if (set_position) {
gtk_combo_box_get_pos (combo, &x, &y);
gtk_widget_set_uposition (combo->priv->tearoff_window, x, y);
gtk_window_move (GTK_WINDOW (combo->priv->tearoff_window), x, y);
}
gtk_widget_show (GTK_WIDGET (combo->priv->popup));
gtk_widget_show (combo->priv->tearoff_window);
......
......@@ -68,7 +68,7 @@ struct _GtkComboBoxPrivate {
GtkWidget *toplevel; /* Popup's toplevel when not torn off */
GtkWidget *tearoff_window; /* Popup's toplevel when torn off */
guint torn_off;
gboolean torn_off;
GtkWidget *tearable; /* The tearoff "button" */
GtkWidget *popup; /* Popup */
......@@ -280,6 +280,7 @@ gtk_combo_box_popup_hide (GtkComboBox *combo_box)
gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
{
GtkWidget *wcombo = GTK_WIDGET (combo_box);
GdkScreen *screen = gtk_widget_get_screen (wcombo);
int ph, pw;
gdk_window_get_origin (wcombo->window, x, y);
......@@ -289,11 +290,11 @@ gtk_combo_box_get_pos (GtkComboBox *combo_box, int *x, int *y)
ph = combo_box->priv->popup->allocation.height;
pw = combo_box->priv->popup->allocation.width;
if ((*y + ph) > gdk_screen_height ())
*y = gdk_screen_height () - ph;
if ((*y + ph) > gdk_screen_get_height (screen))
*y = gdk_screen_get_height (screen) - ph;
if ((*x + pw) > gdk_screen_width ())
*x = gdk_screen_width () - pw;
if ((*x + pw) > gdk_screen_get_width (screen))
*x = gdk_screen_get_width (screen) - pw;
}
/* protected */ void
......@@ -336,7 +337,7 @@ gtk_combo_box_popup_display (GtkComboBox *combo_box)
gtk_combo_box_get_pos (combo_box, &x, &y);
gtk_widget_set_uposition (combo_box->priv->toplevel, x, y);
gtk_window_move (GTK_WINDOW (combo_box->priv->toplevel), x, y);
gtk_widget_realize (combo_box->priv->popup);
gtk_widget_show (combo_box->priv->popup);
gtk_widget_realize (combo_box->priv->toplevel);
......@@ -444,8 +445,10 @@ gtk_combo_box_init (GtkComboBox *combo_box)
combo_box->priv->toplevel = gtk_window_new (GTK_WINDOW_POPUP);
gtk_widget_ref (combo_box->priv->toplevel);
gtk_object_sink (GTK_OBJECT (combo_box->priv->toplevel));
gtk_window_set_policy (GTK_WINDOW (combo_box->priv->toplevel),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (combo_box->priv->toplevel),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
combo_box->priv->popup = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (combo_box->priv->toplevel),
......@@ -542,8 +545,10 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
"gtk-combo-title");
if (title)
gdk_window_set_title (tearoff->window, title);
gtk_window_set_policy (GTK_WINDOW (tearoff),
FALSE, TRUE, FALSE);
g_object_set (G_OBJECT (tearoff),
"allow_shrink", FALSE,
"allow_grow", TRUE,
NULL);
gtk_window_set_transient_for
(GTK_WINDOW (tearoff),
GTK_WINDOW (gtk_widget_get_toplevel
......@@ -566,7 +571,7 @@ gtk_combo_popup_tear_off (GtkComboBox *combo, gboolean set_position)
if (set_position) {
gtk_combo_box_get_pos (combo, &x, &y);
gtk_widget_set_uposition (combo->priv->tearoff_window, x, y);
gtk_window_move (GTK_WINDOW (combo->priv->tearoff_window), x, y);
}
gtk_widget_show (GTK_WIDGET (combo->priv->popup));
gtk_widget_show (combo->priv->tearoff_window);
......
......@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <libgnomeprint/gnome-font.h>
#include <gtk/gtkhbox.h>
#include <glade/glade.h>
......
......@@ -25,7 +25,7 @@
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <gnumeric-i18n.h>
#include "gtk-combo-box.h"
#include "widget-pixmap-combo.h"
#include <gnm-marshalers.h>
......
......@@ -26,9 +26,6 @@
#ifndef GNUMERIC_WIDGET_PIXMAP_COMBO_H
#define GNUMERIC_WIDGET_PIXMAP_COMBO_H
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <libgnomeui/gnome-pixmap.h>
#include <widgets/gtk-combo-box.h>
G_BEGIN_DECLS
......
......@@ -81,19 +81,19 @@
#ifdef WITH_BONOBO
#include <bonobo/bonobo-ui-component.h>
#include "sheet-object-container.h"
#ifdef ENABLE_EVOLUTION
#include <idl/Evolution-Composer.h>
#include <bonobo/bonobo-stream-memory.h>
#endif
#endif
#include <gsf/gsf-impl-utils.h>
#include <widgets/widget-color-combo.h>
#include <widgets/gtk-combo-stack.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
#include <errno.h>
#define WBCG_CLASS(o) WORKBOOK_CONTROL_GUI_CLASS (G_OBJECT_GET_CLASS (o))
#define WBCG_VIRTUAL_FULL(func, handle, arglist, call) \
......@@ -1888,6 +1888,12 @@ cb_file_save_as (GtkWidget *widget, WorkbookControlGUI *wbcg)
gui_file_save_as (wbcg, wb_control_view (WORKBOOK_CONTROL (wbcg)));
wbcg_focus_cur_scg (wbcg); /* force focus back to sheet */
}
static void
cb_file_sendto (GtkWidget *widget, WorkbookControlGUI *wbcg)
{
wb_view_sendto (wb_control_view (WORKBOOK_CONTROL (wbcg)),
COMMAND_CONTEXT (wbcg));
}
static void
cb_file_page_setup (GtkWidget *widget, WorkbookControlGUI *wbcg)
......@@ -3292,6 +3298,9 @@ static GnomeUIInfo workbook_menu_file [] = {
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_ITEM_STOCK (N_("Sen_d To..."),
N_("Send the current file via email"),
cb_file_sendto, "Gnumeric_Link_EMail"),
GNOMEUIINFO_ITEM_STOCK (N_("Proper_ties..."),
N_("Edit descriptive information"),
cb_file_summary, GTK_STOCK_PROPERTIES),
......@@ -3990,9 +3999,7 @@ static BonoboUIVerb verbs [] = {
BONOBO_UI_UNSAFE_VERB ("FileOpen", cb_file_open),
BONOBO_UI_UNSAFE_VERB ("FileSave", cb_file_save),
BONOBO_UI_UNSAFE_VERB ("FileSaveAs", cb_file_save_as),
#ifdef ENABLE_EVOLUTION
BONOBO_UI_UNSAFE_VERB ("FileSend", cb_file_send),
#endif
BONOBO_UI_UNSAFE_VERB ("FilePageSetup", cb_file_page_setup),
BONOBO_UI_UNSAFE_VERB ("FilePrint", cb_file_print),
BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", cb_file_print_preview),
......@@ -5067,11 +5074,6 @@ cb_wbcg_drag_data_received (GtkWidget *widget, GdkDragContext *context,
g_free (target_type);
}
/*
* NOTE: Keep the two strings below in sync - send_menu_item_i18n array must
* always contain values of _label and _tip properties from XML inside
* send_menu_item.
*/
#ifdef ENABLE_EVOLUTION
static gchar send_menu_item[] =
"<placeholder name=\"FileOperations\">"
......@@ -5216,10 +5218,6 @@ workbook_control_gui_init (WorkbookControlGUI *wbcg,
bonobo_ui_util_set_ui (wbcg->uic, dir,
"GNOME_Gnumeric.xml", "gnumeric", NULL);
}
#ifdef ENABLE_EVOLUTION
bonobo_ui_component_set_translate (wbcg->uic, "/menu/File",
send_menu_item, NULL);
#endif
TOGGLE_REGISTER (display_formulas, SheetDisplayFormulas);
TOGGLE_REGISTER (hide_zero, SheetHideZeros);
......
......@@ -39,6 +39,8 @@
#include <widgets/gtk-combo-box.h>
#include <widgets/widget-color-combo.h>
#include <widgets/widget-pixmap-combo.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <string.h>
......
......@@ -34,6 +34,8 @@
#include "sheet-object-graph.h"
#include "gui-util.h"
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-stock-icons.h>
#ifdef WITH_BONOBO
#include <bonobo.h>
#endif
......
......@@ -683,6 +683,11 @@ wb_view_save (WorkbookView *wbv, CommandContext *context)
return !has_error;
}
gboolean
wb_view_sendto (WorkbookView *wbv, CommandContext *context)
{
}
WorkbookView *
wb_view_new_from_input (GsfInput *input,
GnmFileOpener const *optional_fmt,
......
......@@ -78,9 +78,10 @@ void wb_view_auto_expr (WorkbookView *wbv,
char const *func_name);
/* I/O routines */
gboolean wb_view_save_as (WorkbookView *wbv, GnmFileSaver *fs,
char const *file_name, CommandContext *context);
gboolean wb_view_save (WorkbookView *wbv, CommandContext *context);
gboolean wb_view_save_as (WorkbookView *wbv, GnmFileSaver *fs,
char const *file_name, CommandContext *context);
gboolean wb_view_save (WorkbookView *wbv, CommandContext *context);
gboolean wb_view_sendto (WorkbookView *wbv, CommandContext *context);
WorkbookView *wb_view_new_from_input (GsfInput *input,
GnmFileOpener const *optional_format,
......
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