Commit 164f0ac9 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

The initial pass at GtkAction custom combos are mucho broken move this out



2004-01-06  Jody Goldberg <jody@gnome.org>

	The initial pass at GtkAction custom combos are mucho broken
	* src/sheet.c (sheet_toggle_hide_zeros) : move this out of the macro
	  in wbcg.
	(sheet_toggle_show_formula) : ditto.

	* src/sheet-object-graph.c (cb_save_as) : add jpg, and translate the
	  error message now that string freeze is done.

	* src/gui-util.c : restore DISABLE_DEPRECATED
	(gnumeric_toolbar_insert_with_eventbox) : delete.
	(gnumeric_toolbar_append_with_eventbox) : delete.
	(gtk_button_stock_alignment_set) : delete.
	(gnumeric_toolbar_new) : delete.
	(gnumeric_inject_widget_into_bonoboui) : move the wbc-bonobo.c
	(gnumeric_toolbar_get_widget) : delete.
	(gnm_widget_disable_focus) : move here from workbook-format-toolbar.c

	* workbook-format-toolbar.{c,h} : move contents into
	* wbcg-actions.c : this new file
	* wbc-gtk.c : or this new file
	* wbc-bonobo.c : or this new file (WHICH DOES NOT COMPILE OR WORK)
	  Should probably merge into workbook-control-component or something
	  like that

	* src/gnm-marshalers.list (VOID) : Use the stock marshallers in glib
	  directly rather than adding our own wrappers.
	* src/application.c : here

	* src/GNOME_Gnumeric.xml : rename FileExit -> FileQuit to be consistent
	* src/GNOME_Gnumeric-gtk.xml : new file for GtkAction
	  NOTE NOTE NOTE
	  You must be running in gnumeric/src
	  I Repeat
	  YOU MUST BE RUNNING IN gnumeric/src
	  for anything to work right now.  I don't quite know how I want to
	  handle the file yet (the bonobo approach was irritating) we'll see.

	* configure.in :
	- Add goffice/gui-utils
	- Get rid of --with-bonobo
	- Add --with-gnome
	- Add --enable-bonobo-component
	* plugins/Makefile.am : Adapt to that.
	* src/Makefile.am : ditto, and add the new files.

2004-01-05  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=130424
	* src/commands.c (cmd_set_text_redo) : remove manual kludge.
	* src/dependent.h (cell_eval) : move from here
	* src/cell.h (cell_eval) : to here.  Add a new flag CELL_HAS_NEW_EXPR
	* src/cell.c (cell_set_expr_internal) : set the flag here.
	* src/rendered-value.c (rendered_value_new) : test it here.

	http://bugzilla.gnome.org/show_bug.cgi?id=130582
	* src/sheet-control-gui.c (scg_cursor_move) : don't scroll the other
	  panes unless we absolutely have to.  Apparently we only fuxed normal
	  cursor movement for http://bugzilla.gnome.org/show_bug.cgi?id=77303
	  This fixes rangesel too.

2003-12-29  Jody Goldberg <jody@gnome.org>

	* * : Move everything to glib/gi18n.h in place of gnumeric-i18n.h
	* gnumeric-i18n.h : delete

	* configure.in : Looks like we're really requiring gtk/glib 2.3.1 at a
	  minimum.  In reality it's probably closer to CVS at this point.  I'm
	  kinda looking forward to the gtk freeze.

2004-01-05  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=130577
	* ms-excel-write.c (excel_write_SELECTION) : generalize a bit.
	(excel_write_selections) : new wrapper to handle selectins for each pane

	http://bugzilla.gnome.org/show_bug.cgi?id=130579
	* ms-excel-read.c (excel_read_SELECTION) : we only care about
	  selections in the primary pane.

2003-12-24  Jody Goldberg <jody@gnome.org>

	* ms-excel-write.c (excel_write_WRITEACCESS) : don't free memory we do
	  no own.
	(excel_write_COUNTRY) : init both fields.
	(write_sheet_head) : pre biff8 it was part of the sheet record.  Its
	  hard to tell if this should be part of every sheet or just the first.
	  I've seen both.
	(write_workbook) : biff8 puts the COUNTRY record in the workbook area.
parent efd6428a
......@@ -317,8 +317,8 @@ workbook_control_corba_new (WorkbookView *optional_view,
{
WorkbookControl *wbc =
g_object_new (workbook_control_corba_get_type (), NULL);
workbook_control_set_view (wbc, optional_view, optional_wb);
workbook_control_init_state (wbc);
wb_control_set_view (wbc, optional_view, optional_wb);
wb_control_init_state (wbc);
return wbc;
}
......
2004-01-05 Jody Goldberg <jody@gnome.org>
http://bugzilla.gnome.org/show_bug.cgi?id=130577
* ms-excel-write.c (excel_write_SELECTION) : generalize a bit.
(excel_write_selections) : new wrapper to handle selectins for each pane
http://bugzilla.gnome.org/show_bug.cgi?id=130579
* ms-excel-read.c (excel_read_SELECTION) : we only care about
selections in the primary pane.
2003-12-24 Jody Goldberg <jody@gnome.org>
* ms-excel-write.c (excel_write_WRITEACCESS) : don't free memory we do
......
......@@ -3458,24 +3458,23 @@ excel_read_IMDATA (BiffQuery *q)
static void
excel_read_SELECTION (BiffQuery *q, ExcelReadSheet *esheet)
{
/* FIXME : pane_number will be relevant for split panes.
* because frozen panes are bound together this does not matter.
*/
/* int const pane_number = GSF_LE_GET_GUINT8 (q->data); */
GnmCellPos edit_pos, tmp;
/* the range containing the edit_pos */
int const pane_number = GSF_LE_GET_GUINT8 (q->data);
int i, j = GSF_LE_GET_GUINT16 (q->data + 5);
int num_refs = GSF_LE_GET_GUINT16 (q->data + 7);
guint8 *refs;
SheetView *sv = sheet_get_view (esheet->sheet, esheet->container.ewb->wbv);
GnmRange r;
/* pane 3 is the standard pane. I will need to look into the numbering
* for split panes */
if (pane_number != 3)
return;
edit_pos.row = GSF_LE_GET_GUINT16 (q->data + 1);
edit_pos.col = GSF_LE_GET_GUINT16 (q->data + 3);
d (5, fprintf (stderr,"Start selection\n"););
d (5, fprintf (stderr,"Cursor: %s in Ref #%d\n", cellpos_as_string (&edit_pos),
d (-1, fprintf (stderr,"Start selection in pane #%d\n", pane_number););
d (-1, fprintf (stderr,"Cursor: %s in Ref #%d\n", cellpos_as_string (&edit_pos),
j););
sv_selection_reset (sv);
......@@ -3486,7 +3485,7 @@ excel_read_SELECTION (BiffQuery *q, ExcelReadSheet *esheet)
r.start.col = GSF_LE_GET_GUINT8 (refs + 4);
r.end.col = GSF_LE_GET_GUINT8 (refs + 5);
d (5, fprintf (stderr,"Ref %d = %s\n", i-1, range_name (&r)););
d (-1, fprintf (stderr,"Ref %d = %s\n", i-1, range_name (&r)););
tmp = (i == num_refs) ? edit_pos : r.start;
sv_selection_add_range (sv,
......@@ -3495,7 +3494,7 @@ excel_read_SELECTION (BiffQuery *q, ExcelReadSheet *esheet)
r.end.col, r.end.row);
}
d (5, fprintf (stderr,"Done selection\n"););
d (-1, fprintf (stderr,"Done selection\n"););
}
static void
......
......@@ -3418,23 +3418,22 @@ excel_write_SCL (ExcelWriteSheet *esheet)
}
static void
excel_write_SELECTION (BiffPut *bp, ExcelWriteSheet *esheet)
excel_write_SELECTION (BiffPut *bp, GList *selections,
GnmCellPos const *pos, int pane)
{
SheetView const *sv = sheet_get_view (esheet->gnum_sheet,
esheet->ewb->gnum_wb_view);
int n = g_list_length (sv->selections);
int n = g_list_length (selections);
GList *ptr;
guint8 *data;
data = ms_biff_put_len_next (bp, BIFF_SELECTION, 9 + 6*n);
GSF_LE_SET_GUINT8 (data + 0, 3); /* no split == pane 3 ? */
GSF_LE_SET_GUINT16 (data + 1, sv->edit_pos.row);
GSF_LE_SET_GUINT16 (data + 3, sv->edit_pos.col);
GSF_LE_SET_GUINT8 (data + 0, pane); /* no split == pane 3 ? */
GSF_LE_SET_GUINT16 (data + 1, pos->row);
GSF_LE_SET_GUINT16 (data + 3, pos->col);
GSF_LE_SET_GUINT16 (data + 5, 0); /* our edit_pos is in 1st range */
GSF_LE_SET_GUINT16 (data + 7, n);
data += 9;
for (ptr = sv->selections ; ptr != NULL ; ptr = ptr->next, data += 6) {
for (ptr = selections ; ptr != NULL ; ptr = ptr->next, data += 6) {
GnmRange const *r = ptr->data;
GSF_LE_SET_GUINT16 (data + 0, r->start.row);
GSF_LE_SET_GUINT16 (data + 2, r->end.row);
......@@ -3443,7 +3442,43 @@ excel_write_SELECTION (BiffPut *bp, ExcelWriteSheet *esheet)
}
ms_biff_put_commit (bp);
}
static void
excel_write_selections (BiffPut *bp, ExcelWriteSheet *esheet)
{
GnmRange r;
GnmCellPos pos;
GList *tmp;
SheetView const *sv = sheet_get_view (esheet->gnum_sheet,
esheet->ewb->gnum_wb_view);
excel_write_SELECTION (bp, sv->selections, &sv->edit_pos, 3);
if (sv->unfrozen_top_left.col >= 0) {
pos = sv->edit_pos;
if (pos.col < sv->unfrozen_top_left.col)
pos.col = sv->unfrozen_top_left.col;
tmp = g_list_prepend (NULL,
range_init_cellpos (&r, &pos, &pos));
excel_write_SELECTION (bp, tmp, &pos, 1);
g_list_free (tmp);
}
if (sv->unfrozen_top_left.row >= 0) {
pos = sv->edit_pos;
if (pos.row < sv->unfrozen_top_left.row)
pos.row = sv->unfrozen_top_left.row;
tmp = g_list_prepend (NULL,
range_init_cellpos (&r, &pos, &pos));
excel_write_SELECTION (bp, tmp, &pos, 2);
g_list_free (tmp);
}
if (sv_is_frozen (sv)) {
pos = sv->edit_pos; /* apparently no bounds check needed */
tmp = g_list_prepend (NULL,
range_init_cellpos (&r, &pos, &pos));
excel_write_SELECTION (bp, tmp, &pos, 0);
g_list_free (tmp);
}
}
/* See: S59DDB.HTM */
static unsigned
excel_write_ROWINFO (BiffPut *bp, ExcelWriteSheet *esheet, guint32 row, guint32 last_col)
......@@ -3711,7 +3746,7 @@ excel_write_sheet (ExcelWriteState *ewb, ExcelWriteSheet *esheet)
excel_write_PANE (ewb->bp, esheet);
excel_write_SCL (esheet);
excel_write_SELECTION (ewb->bp, esheet);
excel_write_selections (ewb->bp, esheet);
/* These are actually specific to >= biff8
* but it can't hurt to have them here
......
......@@ -38,6 +38,7 @@
#include <sheet-object-graphic.h>
#include <gsf/gsf-utils.h>
#include <stdio.h>
#define GR_END 0x00
#define GR_MACRO 0x04
......
<?xml version="1.0"?>
<ui>
<menubar>
<menu name="_File" action="MenuFile">
<menuitem name="FileNew" action="FileNew"/>
<menuitem name="FileOpen" action="FileOpen"/>
<separator name="file-sep1"/>
<menuitem name="FileSave" action="FileSave"/>
<menuitem name="FileSaveAs" action="FileSaveAs"/>
<separator name="file-sep2"/>
<menuitem name="FilePageSetup" action="FilePageSetup"/>
<menuitem name="FilePrintPreview" action="FilePrintPreview"/>
<menuitem name="FilePrint" action="FilePrint"/>
<separator name="file-sep3"/>
<menuitem name="FileSend" action="FileSend"/>
<menuitem name="FileSummary" action="FileSummary"/>
<menuitem name="FilePreferences" action="FilePreferences"/>
<placeholder name="FileHistory" />
<separator name="file-sep4"/>
<menuitem name="FileClose" action="FileClose"/>
<menuitem name="FileQuit" action="FileQuit"/>
</menu>
<menu name="Edit" action="MenuEdit">
<menuitem name="Undo" action="Undo"/>
<menuitem name="Redo" action="Redo"/>
<separator name="edit-sep1"/>
<menuitem name="EditCut" action="EditCut"/>
<menuitem name="EditCopy" action="EditCopy"/>
<menuitem name="EditPaste" action="EditPaste"/>
<menuitem name="EditPasteSpecial" action="EditPasteSpecial"/>
<separator name="edit-sep2"/>
<menu name="Clear" action="MenuEditClear">
<menuitem name="EditClearAll" action="EditClearAll"/>
<menuitem name="EditClearFormats" action="EditClearFormats"/>
<menuitem name="EditClearComments" action="EditClearComments"/>
<menuitem name="EditClearContent" action="EditClearContent"/>
</menu>
<menuitem name="EditDelete" action="EditDelete"/>
<menuitem name="InsertComment" action="InsertComment"/>
<separator name="edit-sep3"/>
<menu name="EditSheet" action="MenuEditSheet">
<menuitem name="SheetReorder" action="SheetReorder"/>
<separator/>
<menuitem name="InsertSheet" action="InsertSheet"/>
<menuitem name="InsertSheetAtEnd" action="InsertSheetAtEnd"/>
<menuitem name="EditDuplicateSheet" action="EditDuplicateSheet"/>
<menuitem name="SheetRemove" action="SheetRemove"/>
<menuitem name="SheetChangeName" action="SheetChangeName"/>
</menu>
<menu name="Select" action="MenuEditSelect">
<menuitem name="EditSelectAll" action="EditSelectAll"/>
<menuitem name="EditSelectColumn" action="EditSelectColumn"/>
<menuitem name="EditSelectRow" action="EditSelectRow"/>
<menuitem name="EditSelectArray" action="EditSelectArray"/>
<menuitem name="EditSelectDepends" action="EditSelectDepends"/>
<menuitem name="EditSelectInputs" action="EditSelectInputs"/>
</menu>
<menu name="Fill" action="MenuEditFill">
<menuitem name="EditFillAutofill" action="EditFillAutofill"/>
<menuitem name="ToolsMerge" action="ToolsMerge"/>
<menuitem name="ToolsTabulate" action="ToolsTabulate"/>
<menuitem name="EditFillSeries" action="EditFillSeries"/>
<menuitem name="RandomGenerator" action="RandomGenerator"/>
</menu>
<menuitem name="EditSearch" action="EditSearch"/>
<menuitem name="EditSearchReplace" action="EditSearchReplace"/>
<menuitem name="EditGoto" action="EditGoto"/>
<menuitem name="EditRecalc" action="EditRecalc"/>
<placeholder name="ops"/>
</menu>
<menu name="View" action="MenuView">
<menuitem name="ViewNew" action="ViewNew"/>
<menuitem name="ViewZoom" action="ViewZoom"/>
<menuitem name="ViewFreezeThawPanes" action="ViewFreezeThawPanes"/>
</menu>
<menu name="Insert" action="MenuInsert">
<menuitem name="InsertCells" action="InsertCells"/>
<menuitem name="InsertColumns" action="InsertColumns"/>
<menuitem name="InsertRows" action="InsertRows"/>
<menuitem name="InsertSheet" action="InsertSheet"/>
<separator/>
<menuitem name="InsertChart" action="ChartGuru"/>
<!-- These don't work yet for Gnome 2
<menuitem name="InsertComponent" action="InsertComponent" />
<menuitem name="InsertShapedComponent" action="InsertShapedComponent" />
<separator/>
-->
<menuitem name="InsertImage" action="InsertImage"/>
<menuitem name="InsertFormula" action="InsertFormula"/>
<menu name="Names" action="MenuInsertNames">
<menuitem name="Define" action="EditNames"/>
</menu>
<menuitem name="InsertHyperlink" action="InsertHyperlink"/>
<menu name="Special" action="MenuInsertSpecial">
<menuitem name="Date" action="InsertCurrentDate"/>
<menuitem name="Time" action="InsertCurrentTime"/>
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menuitem name="FormatCells" action="FormatCells"/>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem name="Size" action="ColumnSize"/>
<menuitem name="AutoFit" action="ColumnAutoSize"/>
<menuitem name="Hide" action="ColumnHide"/>
<menuitem name="Unhide" action="ColumnUnhide"/>
<menuitem name="Default" action="ColumnDefaultSize"/>
</menu>
<menu name="FormatRow" action="MenuFormatRow">
<menuitem name="Size" action="RowSize"/>
<menuitem name="AutoFit" action="RowAutoSize"/>
<menuitem name="Hide" action="RowHide"/>
<menuitem name="Unhide" action="RowUnhide"/>
<menuitem name="Default" action="RowDefaultSize"/>
</menu>
<menu name="FormatSheets" action="MenuFormatSheets">
<menuitem name="SheetReorder" action="SheetReorder"/>
<menuitem name="SheetChangeName" action="SheetChangeName"/>
<separator/>
<menuitem name="SheetDisplayFormulas" action="SheetDisplayFormulas"/>
<menuitem name="SheetHideZeros" action="SheetHideZeros"/>
<menuitem name="SheetHideGridlines" action="SheetHideGridlines"/>
<menuitem name="SheetHideColHeader" action="SheetHideColHeader"/>
<menuitem name="SheetHideRowHeader" action="SheetHideRowHeader"/>
</menu>
<menuitem name="FormatWorkbook" action="FormatWorkbook"/>
<menuitem name="FormatGnumeric" action="FilePreferences"/>
<menuitem name="FormatAuto" action="FormatAuto"/>
</menu>
<menu name="Tools" action="MenuTools">
<menuitem name="ToolsPlugins" action="ToolsPlugins"/>
<separator name="tools-sep1"/>
<menuitem name="ToolsAutoCorrect" action="ToolsAutoCorrect"/>
<menuitem name="ToolsAutoSave" action="ToolsAutoSave"/>
<separator name="tools-sep2"/>
<menuitem name="ToolsGoalSeek" action="ToolsGoalSeek"/>
<menuitem name="ToolsSolver" action="ToolsSolver"/>
<menu name="Scenarios" action="MenuToolsScenario">
<menuitem name="ToolsScenarios" action="ToolsScenarios"/>
<menuitem name="ToolsScenarioAdd" action="ToolsScenarioAdd"/>
</menu>
<menuitem name="ToolsSimulation" action="ToolsSimulation"/>
<separator/>
<menu name="ToolStatisticalAnalysis" action="MenuToolStatisticalAnalysis">
<menu name="ANOVA" action="MenuANOVA">
<menuitem name="ToolsANOVAoneFactor" action="ToolsANOVAoneFactor"/>
<menuitem name="ToolsANOVAtwoFactor" action="ToolsANOVAtwoFactor"/>
</menu>
<menuitem name="ToolsCorrelation" action="ToolsCorrelation"/>
<menuitem name="ToolsCovariance" action="ToolsCovariance"/>
<menuitem name="ToolsDescStatistics" action="ToolsDescStatistics"/>
<menu name="ToolForecast" action="MenuToolForecast">
<menuitem name="ToolsExpSmoothing" action="ToolsExpSmoothing"/>
<menuitem name="ToolsAverage" action="ToolsAverage"/>
</menu>
<menuitem name="ToolsFourier" action="ToolsFourier"/>
<menuitem name="ToolsHistogram" action="ToolsHistogram"/>
<menuitem name="ToolsRanking" action="ToolsRanking"/>
<menuitem name="ToolsRegression" action="ToolsRegression"/>
<menuitem name="ToolsSampling" action="ToolsSampling"/>
<menu name="ToolTTest" action="MenuToolTTest">
<menuitem name="ToolTTestPaired" action="ToolTTestPaired"/>
<menuitem name="ToolTTestEqualVar" action="ToolTTestEqualVar"/>
<menuitem name="ToolTTestUnequalVar" action="ToolTTestUnequalVar"/>
<menuitem name="ToolZTest" action="ToolZTest"/>
</menu>
<menuitem name="ToolsFTest" action="ToolsFTest"/>
</menu>
</menu>
<menu name="Data" action="MenuData">
<menuitem name="DataSort" action="DataSort"/>
<menu name="Filter" action="MenuFilter">
<menuitem name="DataAutoFilter" action="DataAutoFilter"/>
<menuitem name="DataFilterShowAll" action="DataFilterShowAll"/>
<menuitem name="DataFilterAdvancedfilter" action="DataFilterAdvancedfilter"/>
</menu>
<menuitem name="DataValidate" action="DataValidate"/>
<separator/>
<menuitem name="DataTextToColumns" action="DataTextToColumns"/>
<menuitem name="DataConsolidate" action="DataConsolidate"/>
<menu name="Outline" action="MenuOutline">
<menuitem name="DataOutlineHideDetail" action="DataOutlineHideDetail"/>
<menuitem name="DataOutlineShowDetail" action="DataOutlineShowDetail"/>
<menuitem name="DataOutlineGroup" action="DataOutlineGroup"/>
<menuitem name="DataOutlineUngroup" action="DataOutlineUngroup"/>
<separator/>
<menuitem name="SheetDisplayOutlines" action="SheetDisplayOutlines"/>
<menuitem name="SheetOutlineBelow" action="SheetOutlineBelow"/>
<menuitem name="SheetOutlineRight" action="SheetOutlineRight"/>
</menu>
<!--
<menuitem name="PivotTable" action="PivotTable" />
-->
<menu name="ExternalData" action="MenuExternalData">
<menuitem name="DataImportText" action="DataImportText"/>
</menu>
</menu>
<menu name="Help" action="MenuHelp">
<placeholder name="BuiltMenuItems"/>
<menuitem name="HelpAbout" action="HelpAbout"/>
</menu>
</menubar>
<toolbar name="StandardToolbar" action="StandardToolbar">
<toolitem name="New" action="FileNew"/>
<toolitem name="Open" action="FileOpen"/>
<toolitem name="Save" action="FileSave"/>
<separator name="std-sep1"/>
<toolitem name="Print" action="FilePrint"/>
<toolitem name="PrintPreview" action="FilePrintPreview"/>
<separator name="std-sep2"/>
<toolitem name="Cut" action="EditCut"/>
<toolitem name="Copy" action="EditCopy"/>
<toolitem name="Paste" action="EditPaste"/>
<separator name="std-sep3"/>
<toolitem name="Undo" action="Undo"/>
<toolitem name="Redo" action="Redo"/>
<separator name="std-sep4"/>
<toolitem name="InsertHyperlink" action="InsertHyperlink"/>
<toolitem name="Sum" action="AutoSum"/>
<toolitem name="InsertFormula" action="InsertFormula"/>
<toolitem name="SortAscending" action="SortAscending"/>
<toolitem name="SortDescending" action="SortDescending"/>
<separator name="std-sep5"/>
<toolitem name="ChartGuru" action="ChartGuru" />
<toolitem name="Zoom" action="Zoom"/>
</toolbar>
<toolbar name="FormatToolbar" action="FormatToolbar">
<toolitem name="FontName" action="FontName"/>
<toolitem name="FontSize" action="FontSize"/>
<toolitem name="FontBold" action="FontBold"/>
<toolitem name="FontItalic" action="FontItalic"/>
<toolitem name="FontUnderline" action="FontUnderline"/>
<separator name="fmt-sep1"/>
<toolitem name="Left" action="AlignLeft"/>
<toolitem name="Center" action="AlignCenter"/>
<toolitem name="gtk-justify-right" action="AlignRight"/>
<toolitem name="CenterAcrossSelection" action="CenterAcrossSelection"/>
<toolitem name="Merge" action="FormatMergeCells"/>
<toolitem name="Unmerge" action="FormatUnmergeCells"/>
<separator name="fmt-sep2"/>
<toolitem name="Money" action="FormatAsMoney"/>
<toolitem name="Percent" action="FormatAsPercent"/>
<toolitem name="Thousands" action="FormatWithThousands"/>
<toolitem name="IncreasePrecision" action="FormatIncreasePrecision"/>
<toolitem name="DecreasePrecision" action="FormatDecreasePrecision"/>
<separator name="fmt-sep3"/>
<toolitem name="DecreaseIndent" action="FormatDecreaseIndent"/>
<toolitem name="IncreaseIndent" action="FormatIncreaseIndent"/>
<separator name="fmt-sep4"/>
<toolitem name="BorderSelector" action="BorderSelector"/>
<toolitem name="ColorBack" action="ColorBack"/>
<toolitem name="ColorFore" action="ColorFore"/>
</toolbar>
<toolbar name="ObjectToolbar" action="ObjectToolbar">
<toolitem name="Label" action="CreateLabel"/>
<toolitem name="Frame" action="CreateFrame"/>
<!-- Not useful until we have scripts
<toolitem name="Button" action="CreateButton"/> -->
<!-- think about how to handle groups
<toolitem name="RadioButton" action="CreateRadioButton"/> -->
<toolitem name="Checkbox" action="CreateCheckbox"/>
<toolitem name="Scrollbar" action="CreateScrollbar"/>
<toolitem name="SpinButton" action="CreateSpinButton"/>
<toolitem name="Slider" action="CreateSlider"/>
<toolitem name="List" action="CreateList"/>
<toolitem name="Combo" action="CreateCombo"/>
<toolitem name="Line" action="CreateLine"/>
<toolitem name="Arrow" action="CreateArrow"/>
<toolitem name="Rectangle" action="CreateRectangle"/>
<toolitem name="Ellipse" action="CreateEllipse"/>
</toolbar>
</ui>
......@@ -55,7 +55,7 @@
_tip="Close the current file"
pixtype="stock" pixname="gtk-close"
accel="*Control*w"/>
<cmd name="FileExit"
<cmd name="FileQuit"
_label="_Quit"
_tip="Quit the application"
pixtype="stock" pixname="gtk-quit"
......@@ -184,7 +184,7 @@
<separator/>
<menuitem name="FileClose" verb=""/>
<menuitem name="FileQuit" verb=""/>
<menuitem name="FileExit" verb=""/>
</submenu>
<submenu name="Edit" _label="_Edit">
......
......@@ -4,7 +4,7 @@
SUBDIRS = pixmaps dialogs widgets tools cut-n-paste-code
if WITH_BONOBO
if ENABLE_BONOBO_COMPONENT
libexec_PROGRAMS = gnumeric-component
endif
bin_PROGRAMS = gnumeric ssconvert
......@@ -103,8 +103,6 @@ GNUMERIC_BASE = \
gnumeric-gconf-priv.h \
gnumeric-pane.c \
gnumeric-pane.h \
gnumeric-i18n.c \
gnumeric-i18n.h \
gnumeric.h \
graph.c \
graph.h \
......@@ -258,10 +256,6 @@ GNUMERIC_BASE = \
workbook-cmd-format.h \
workbook-edit.c \
workbook-edit.h \
workbook-format-toolbar.c \
workbook-format-toolbar.h \
workbook-object-toolbar.c \
workbook-object-toolbar.h \
workbook-view.c \
workbook-view.h \
workbook-control.c \
......@@ -270,9 +264,8 @@ GNUMERIC_BASE = \
workbook-control-gui.c \
workbook-control-gui.h \
workbook-control-gui-priv.h \
workbook-control-standalone.c \
workbook-control-standalone.h \
workbook-control-standalone-priv.h \
wbc-gtk.c \
wbcg-actions.c \
xml-io.c \
xml-io.h \
xml-io-version.h \
......@@ -288,29 +281,13 @@ GNUMERIC_BONOBO = \
sheet-object-container.h \
sheet-object-item.c \
sheet-object-item.h \
wbc-bonobo.c \
workbook-control-component.c \
workbook-control-component.h \
workbook-control-component-priv.h
if WITH_BONOBO
GNUMERIC_SOURCE = $(GNUMERIC_BASE) $(GNUMERIC_BONOBO)
else
GNUMERIC_SOURCE = $(GNUMERIC_BASE)
endif
if WITH_BONOBO
gnumeric_SOURCES = \
$(GNUMERIC_SOURCE) \
io-context-gtk.c \
io-context-gtk.h \
main-application.c \
normal-args.c
gnumeric_LDADD = \
$(gnumeric_app_libs) \
$(GNUMERIC_LIBS) \
$(INTLLIBS)
else
gnumeric_SOURCES = \
$(GNUMERIC_SOURCE) \
io-context-gtk.c \
......@@ -322,7 +299,6 @@ gnumeric_LDADD = \
$(gnumeric_app_libs) \
$(GNUMERIC_LIBS) \
$(INTLLIBS)
endif
gnumeric_LDFLAGS = -export-dynamic
......@@ -337,7 +313,7 @@ gnumeric_app_libs = \
cut-n-paste-code/pcre/libpcre.a \
cut-n-paste-code/foocanvas/libfoocanvas/libfoocanvas.a
if WITH_BONOBO
if ENABLE_BONOBO_COMPONENT
gnumeric_component_SOURCES = \
$(GNUMERIC_SOURCE) \
main-component.c
......
......@@ -21,7 +21,6 @@
#include "auto-correct.h"
#include "gutils.h"
#include "pixmaps/gnumeric-stock-pixbufs.h"
#include "gnm-marshalers.h"
#include <gnumeric-gconf.h>
#include <gsf/gsf-impl-utils.h>
......@@ -763,7 +762,7 @@ gnm_app_class_init (GObjectClass *gobject_klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GnmAppClass, workbook_added),
(GSignalAccumulator) NULL, NULL,
gnm__VOID__OBJECT,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1, WORKBOOK_TYPE);
signals [WORKBOOK_REMOVED] = g_signal_new ("workbook_removed",
......@@ -771,7 +770,7 @@ gnm_app_class_init (GObjectClass *gobject_klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GnmAppClass, workbook_removed),
(GSignalAccumulator) NULL, NULL,
gnm__VOID__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE,
1, G_TYPE_POINTER);
signals [CLIPBOARD_MODIFIED] = g_signal_new ("clipboard_modified",
......@@ -779,7 +778,7 @@ gnm_app_class_init (GObjectClass *gobject_klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GnmAppClass, clipboard_modified),
(GSignalAccumulator) NULL, NULL,
gnm__VOID__VOID,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
}
......
......@@ -83,8 +83,8 @@ gnm_persist_stream_load (PortableServer_Servant servant,
}
g_object_ref (G_OBJECT (wbc));
workbook_unref (old_wb);
workbook_control_set_view (wbc, wb_view, NULL);
workbook_control_init_state (wbc);
wb_control_set_view (wbc, wb_view, NULL);
wb_control_init_state (wbc);
}
static void
......
......@@ -6,7 +6,7 @@
* Miguel de Icaza (miguel@gnu.org)
*/
#include <gnumeric-config.h>
#include <gnumeric-i18n.h>
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "clipboard.h"
......
......@@ -20,7 +20,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <gnumeric-i18n.h>
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "cmd-edit.h"
......
......@@ -8,7 +8,7 @@
* (C) 2002 Jon K Hellan
*/
#include <gnumeric-config.h>
#include <gnumeric-i18n.h>
#include <glib/gi18n.h>
#include <stdio.h>
#include "gnumeric.h"
#include "command-context-stderr.h"
......
......@@ -7,7 +7,7 @@
* (C) 1999-2001 Jody Goldberg
*/
#include <gnumeric-config.h>
#include <gnumeric-i18n.h>
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "command-context-priv.h"
#include "ranges.h"
......
......@@ -23,7 +23,7 @@
* USA
*/
#include <gnumeric-config.h>
#include <gnumeric-i18n.h>
#include <glib/gi18n.h>
#include "gnumeric.h"
#include "commands.h"
......@@ -544,7 +544,7 @@ command_setup_combos (WorkbookControl *wbc)
g_return_if_fail (wb);
wb_control_undo_redo_clear (wbc, TRUE);
wb_control_undo_redo_truncate (wbc, 0, TRUE);
tmp = g_slist_reverse (wb->undo_commands);
for (ptr = tmp ; ptr != NULL ; ptr = ptr->next) {
undo_label = get_menu_label (ptr);
......@@ -552,7 +552,7 @@ command_setup_combos (WorkbookControl *wbc)
}
g_slist_reverse (tmp);
wb_control_undo_redo_clear (wbc, FALSE);
wb_control_undo_redo_truncate (wbc, 0, FALSE);
tmp = g_slist_reverse (wb->redo_commands);
for (ptr = tmp ; ptr != NULL ; ptr = ptr->next) {
redo_label = get_menu_label (ptr);
......@@ -693,14 +693,11 @@ command_register_undo (WorkbookControl *wbc, GObject *obj)
wb->undo_commands = g_slist_prepend (wb->undo_commands, cmd);
undo_trunc = truncate_undo_info (wb);
WORKBOOK_FOREACH_CONTROL (wb, view, control,
{
wb_control_undo_redo_push (control,
cmd->cmd_descriptor, TRUE);
WORKBOOK_FOREACH_CONTROL (wb, view, control, {
wb_control_undo_redo_push (control, cmd->cmd_descriptor, TRUE);