Commit 94f44bfe authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

load the ui file from a version specific location.

2001-06-26  Jody Goldberg <jgoldberg@home.com>

	* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
	  file from a version specific location.

	* src/Makefile.am : No need for GNOME_DATADIR anymore.

	* gnumeric.spec.in : Move the bonobo ui file into a version specific
	  location.

2001-06-26  Jody Goldberg <jgoldberg@home.com>

	* fn-lookup.c (lookup_functions_init) : fix the args for hyperlink.
	(help_hyperlink) : fix the arg descriptions.
parent a3fa2747
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
file from a version specific location.
* src/Makefile.am : No need for GNOME_DATADIR anymore.
* gnumeric.spec.in : Move the bonobo ui file into a version specific
location.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
......
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
file from a version specific location.
* src/Makefile.am : No need for GNOME_DATADIR anymore.
* gnumeric.spec.in : Move the bonobo ui file into a version specific
location.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
......
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
file from a version specific location.
* src/Makefile.am : No need for GNOME_DATADIR anymore.
* gnumeric.spec.in : Move the bonobo ui file into a version specific
location.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
......
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
file from a version specific location.
* src/Makefile.am : No need for GNOME_DATADIR anymore.
* gnumeric.spec.in : Move the bonobo ui file into a version specific
location.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
......
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* src/workbook-control-gui.c (workbook_control_gui_init) : load the ui
file from a version specific location.
* src/Makefile.am : No need for GNOME_DATADIR anymore.
* gnumeric.spec.in : Move the bonobo ui file into a version specific
location.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* src/xml-io.c (xml_not_used_old_array_spec) : fix a few warnings.
......
......@@ -97,11 +97,12 @@ fi
%config %{prefix}/share/gnome/apps/Applications/gnumeric.desktop
%{prefix}/share/gnome/help/gnumeric/C/images/*
%{prefix}/share/gnome/help/gnumeric/C/*.*
%{prefix}/share/gnome/ui/GNOME_Gnumeric.xml
%{prefix}/share/gnumeric/%{version}/autoformat-templates/*/*
%{prefix}/share/gnumeric/%{version}/glade/*.glade
%{prefix}/share/gnumeric/%{version}/python/*
%{prefix}/share/gnumeric/%{version}/templates/*.gnumeric
%{prefix}/share/gnumeric/%{version}/idl/*.idl
%{prefix}/share/gnumeric/%{version}/gnome/ui/GNOME_Gnumeric.xml
#%{prefix}/share/locale/*/LC_MESSAGES/*.mo
%{prefix}/share/mc/templates/gnumeric.desktop
%{prefix}/share/mime-info/gnumeric.keys
......@@ -110,9 +111,10 @@ fi
%{prefix}/share/pixmaps/gnumeric/*
%{prefix}/share/pixmaps/*.png
%{prefix}/lib/gnumericConf.sh
%{prefix}/share/gnumeric/%{version}/idl/*.idl
# Don't even think about it. -MW
# Gnumeric is not ready for a devel package yet. Please wait until we split
# out libgnumeric.
#%files devel
#%defattr (-, bin, bin)
#%{prefix}/lib/gnumericConf.sh
......@@ -121,6 +123,9 @@ fi
##%{prefix}/lib/gnumeric/%{version}/plugins/*/*.la
%changelog
* Tue Jun 26 2001 Jody Goldberg <jgoldberg@home.com>
- load the bonobo ui file from a version specific location
* Sat May 19 2001 Jody Goldberg <jgoldberg@home.com>
- update the gal req
......
......@@ -1054,7 +1054,7 @@ gnumeric_rows (FunctionEvalInfo *ei, Value **args)
static char *help_hyperlink = {
N_("@FUNCTION=HYPERLINK\n"
"@SYNTAX=HYPERLINK(reference)\n"
"@SYNTAX=HYPERLINK(link_location, optional_label)\n"
"@DESCRIPTION="
"The HYPERLINK function currently returns its 2nd argument, "
......@@ -1141,7 +1141,7 @@ lookup_functions_init (void)
"?Af|b","val,range,col_idx,approx",
&help_hlookup, gnumeric_hlookup);
function_add_args (cat, "hyperlink",
"s|?","link_location, contents",
"s|s","link_location, optional_label",
&help_hyperlink, gnumeric_hyperlink);
function_add_args (cat, "indirect", "s|b","ref_string,format",
&help_indirect, gnumeric_indirect);
......
......@@ -12,7 +12,6 @@ INCLUDES = \
-DGNUMERIC_DATADIR=\""$(gnumeric_datadir)"\" \
-DGNUMERIC_LIBDIR=\""$(gnumeric_libdir)"\" \
-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-DGNOME_DATADIR=\""$(datadir)"\" \
-I$(includedir) \
-I$(top_srcdir) \
-I$(srcdir) \
......@@ -300,5 +299,6 @@ dist-hook:
EXTRA_DIST = portability.h.in GNOME_Gnumeric.xml
uidir=$(datadir)/gnome/ui
# Bonobo requires things to be in a subdir of this form
uidir=$(gnumeric_datadir)/gnome/ui
ui_DATA = GNOME_Gnumeric.xml
2001-06-26 Jody Goldberg <jgoldberg@home.com>
* fn-lookup.c (lookup_functions_init) : fix the args for hyperlink.
(help_hyperlink) : fix the arg descriptions.
2001-06-25 Jody Goldberg <jgoldberg@home.com>
* fn-information.c (translate_table) : partial patch. Should this be
......
......@@ -1054,7 +1054,7 @@ gnumeric_rows (FunctionEvalInfo *ei, Value **args)
static char *help_hyperlink = {
N_("@FUNCTION=HYPERLINK\n"
"@SYNTAX=HYPERLINK(reference)\n"
"@SYNTAX=HYPERLINK(link_location, optional_label)\n"
"@DESCRIPTION="
"The HYPERLINK function currently returns its 2nd argument, "
......@@ -1141,7 +1141,7 @@ lookup_functions_init (void)
"?Af|b","val,range,col_idx,approx",
&help_hlookup, gnumeric_hlookup);
function_add_args (cat, "hyperlink",
"s|?","link_location, contents",
"s|s","link_location, optional_label",
&help_hyperlink, gnumeric_hyperlink);
function_add_args (cat, "indirect", "s|b","ref_string,format",
&help_indirect, gnumeric_indirect);
......
......@@ -3551,8 +3551,11 @@ workbook_control_gui_init (WorkbookControlGUI *wbcg,
bonobo_ui_component_add_verb_list_with_data (wbcg->uic, verbs, wbcg);
/* TODO : switch to gnumeric_sys_data_dir */
bonobo_ui_util_set_ui (wbcg->uic, GNOME_DATADIR, "GNOME_Gnumeric.xml", "gnumeric");
{
char const *dir = gnumeric_sys_data_dir (NULL);
bonobo_ui_util_set_ui (wbcg->uic, dir,
"GNOME_Gnumeric.xml", "gnumeric");
}
TOGGLE_REGISTER (display_formulas, SheetDisplayFormulas);
TOGGLE_REGISTER (hide_zero, SheetHideZeros);
......
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