diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | src/nautilus-navigation-window-menus.c | 12 | ||||
| -rw-r--r-- | src/nautilus-shell-ui.xml | 4 | ||||
| -rw-r--r-- | src/nautilus-window-menus.c | 12 | ||||
| -rw-r--r-- | user-guide/C/Makefile.am | 3 | ||||
| -rw-r--r-- | user-guide/C/html/.cvsignore | 2 | ||||
| -rw-r--r-- | user-guide/C/html/license.html | 153 |
7 files changed, 202 insertions, 2 deletions
@@ -1,4 +1,20 @@ -2000-11-05 Andy Hertzfeld <set EMAIL_ADDRESS environment variable> +2000-11-05 Andy Hertzfeld <andy@eazel.com> + + fixed bug 4475, add license to help menu + + * src/nautilus-shell-ui.xml: + added menu item for "Nautilus License" + * src/nautilus-window-menus.c: + (help_menu_nautilus_license_callback), + (nautilus_window_initialize_menus): + added a bonobo verb and a handler to invoke the license document + * user-guide/C/Makefile.am: + added license.html + * user-guide/C/html/.cvsignore: + * user-guide/C/html/license.html: + added license html file from Bud. + +2000-11-05 Andy Hertzfeld <andy@eazel.com> * components/music/nautilus-music-view.c: (play_status_display), (slider_moved_callback), (slider_release_callback): diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index e1849ecd7..c0770e8ee 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -650,6 +650,17 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component, } static void +help_menu_nautilus_license_callback (BonoboUIComponent *component, + gpointer user_data, + const char *verb) +{ + char *uri; + uri = g_strdup_printf ("file://%s/%s", DATADIR, "gnome/help/nautilus/C/license.html"); + nautilus_window_goto_uri (NAUTILUS_WINDOW (user_data), uri); + g_free (uri); +} + +static void help_menu_nautilus_feedback_callback (BonoboUIComponent *component, gpointer user_data, const char *verb) @@ -1239,6 +1250,7 @@ nautilus_window_initialize_menus (NautilusWindow *window) BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback), BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback), + BONOBO_UI_VERB ("Nautilus License", help_menu_nautilus_license_callback), BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback), BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback), diff --git a/src/nautilus-shell-ui.xml b/src/nautilus-shell-ui.xml index 6b7946277..bdd2722fb 100644 --- a/src/nautilus-shell-ui.xml +++ b/src/nautilus-shell-ui.xml @@ -242,6 +242,10 @@ _label="_Nautilus User Manual" _tip="Display on-line help for Nautilus" verb="Nautilus Manual"/> + <menuitem name="Nautilus License" + _label="_Nautilus License" + _tip="Display the license for Nautilus" + verb="Nautilus License"/> <menuitem name="Nautilus Feedback" _label="Nautilus _Feedback..." _tip="Show a page from which you can send feedback about Nautilus to its creators" diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index e1849ecd7..c0770e8ee 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -650,6 +650,17 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component, } static void +help_menu_nautilus_license_callback (BonoboUIComponent *component, + gpointer user_data, + const char *verb) +{ + char *uri; + uri = g_strdup_printf ("file://%s/%s", DATADIR, "gnome/help/nautilus/C/license.html"); + nautilus_window_goto_uri (NAUTILUS_WINDOW (user_data), uri); + g_free (uri); +} + +static void help_menu_nautilus_feedback_callback (BonoboUIComponent *component, gpointer user_data, const char *verb) @@ -1239,6 +1250,7 @@ nautilus_window_initialize_menus (NautilusWindow *window) BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback), BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback), + BONOBO_UI_VERB ("Nautilus License", help_menu_nautilus_license_callback), BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback), BONOBO_UI_VERB ("Switch to Beginner Level", user_level_menu_item_callback), diff --git a/user-guide/C/Makefile.am b/user-guide/C/Makefile.am index e5e9be9fe..b5c59d8d4 100644 --- a/user-guide/C/Makefile.am +++ b/user-guide/C/Makefile.am @@ -11,7 +11,8 @@ TARGET_DIR=$(SGML_DIR)/$(DOC_MODULE)/$(LANG)/ install-data-local: $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) installfiles=`echo $(srcdir)/sgml/*.sgml \ - $(srcdir)/img/*.png`; \ + $(srcdir)/img/*.png \ + $(srcdir)/html/*.html`; \ if test "$$installfiles" = '$(srcdir)/sgml/*.sgml'; \ then echo '-- Nothing to install' ; \ else \ diff --git a/user-guide/C/html/.cvsignore b/user-guide/C/html/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/user-guide/C/html/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/user-guide/C/html/license.html b/user-guide/C/html/license.html new file mode 100644 index 000000000..31fa3e49b --- /dev/null +++ b/user-guide/C/html/license.html @@ -0,0 +1,153 @@ +<HTML +><HEAD +><TITLE +>License</TITLE +><META +NAME="GENERATOR" +CONTENT="Modular DocBook HTML Stylesheet Version 1.52"> +</HEAD +><BODY +CLASS="SECT1" +BGCOLOR="#FFFFFF" +TEXT="#000000" +LINK="#0000FF" +VLINK="#840084" +ALINK="#0000FF" +><DIV +CLASS="NAVHEADER" +><TABLE +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><H1 +COLSPAN="3" +ALIGN="center" +>Nautilus</H1 +></TR +><TR +><TD +WIDTH="10%" +ALIGN="left" +VALIGN="bottom" +></TD +><TD +WIDTH="80%" +ALIGN="center" +VALIGN="bottom" +></TD +><TD +WIDTH="10%" +ALIGN="right" +VALIGN="bottom" +> </TD +></TR +></TABLE +><HR +ALIGN="LEFT" +WIDTH="100%"></DIV +><DIV +CLASS="SECT1" +><H1 +CLASS="SECT1" +>License</H1 +><P +> This program is free software; you can redistribute it and/or + modify it under the terms of the <I +CLASS="CITETITLE" +>GNU General Public + License</I +> as published by the Free Software Foundation; + either version 2 of the License, or (at your option) any later + version. + </P +><P +> This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + <I +CLASS="CITETITLE" +>GNU General Public License</I +> for more details. + </P +><P +> You may obtain a copy of the + <I +CLASS="CITETITLE" +>GNU General Public License</I +> from the Free + Software Foundation by visiting <A +HREF="http://www.fsf.org" +TARGET="_top" +>their Web site</A +> or by writing to + <P +CLASS="ADDRESS" +> Free Software Foundation, Inc.<br> + <SPAN +CLASS="STREET" +>59 Temple Place</SPAN +> - Suite 330<br> + <SPAN +CLASS="CITY" +>Boston</SPAN +>, <SPAN +CLASS="STATE" +>MA</SPAN +> <SPAN +CLASS="POSTCODE" +>02111-1307</SPAN +><br> + <SPAN +CLASS="COUNTRY" +>USA</SPAN +><br> + </P +> + </P +></DIV +><DIV +CLASS="NAVFOOTER" +><HR +ALIGN="LEFT" +WIDTH="100%"><TABLE +WIDTH="100%" +BORDER="0" +CELLPADDING="0" +CELLSPACING="0" +><TR +><TD +WIDTH="33%" +ALIGN="left" +VALIGN="top" +></TD +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +></TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +> </TD +></TR +><TR +><TD +WIDTH="34%" +ALIGN="center" +VALIGN="top" +> </TD +><TD +WIDTH="33%" +ALIGN="right" +VALIGN="top" +> </TD +></TR +></TABLE +></DIV +></BODY +></HTML +> + |