GNOME.org
 

[evolution-patches] menu patch for quick reference (bug 127545)

I just noticed that Dan didn't actually attach the patch, only the
tarball. Here's the actual code for review.

-David
-- 
David Trowbridge <jupiter babylonia flatirons org>

? doc/quickref.pdf
? doc/quickref.tex
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1264
diff -u -p -r1.1264 ChangeLog
--- ChangeLog	24 Nov 2003 10:38:10 -0000	1.1264
+++ ChangeLog	26 Nov 2003 06:50:18 -0000
@@ -1,3 +1,9 @@
+2003-11-25  David Trowbridge <trowbrds cs colorado edu>
+
+	* configure.in: Add facilities for recursing into doc
+
+	* Makefile.am: Add doc as a SUBDIR
+
 2003-11-24  Rodrigo Moya <rodrigo ximian com>
 
 	* tools/killev.c (main): kill Evo 2.0's alarm daemon, not 1.4's.
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/Makefile.am,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile.am
--- Makefile.am	17 Nov 2003 16:31:13 -0000	1.93
+++ Makefile.am	26 Nov 2003 06:50:18 -0000
@@ -32,6 +32,7 @@ endif
 
 SUBDIRS = 			\
         data                    \
+	doc			\
         e-util                  \
 	a11y			\
         widgets                 \
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.628
diff -u -p -r1.628 configure.in
--- configure.in	18 Nov 2003 20:04:59 -0000	1.628
+++ configure.in	26 Nov 2003 06:50:18 -0000
@@ -1131,6 +1131,9 @@ AC_SUBST(serverdir)
 evolutionuidir="$privdatadir/ui"
 AC_SUBST(evolutionuidir)
 
+evolutiondocdir="$privdatadir/doc"
+AC_SUBST(evolutiondocdir)
+
 imagesdir="$privdatadir/images"
 AC_SUBST(imagesdir)
 
@@ -1306,6 +1309,7 @@ default_user/local/Outbox/Makefile
 default_user/local/Sent/Makefile
 default_user/local/Tasks/Makefile
 default_user/local/Trash/Makefile
+doc/Makefile
 e-util/Makefile
 filter/Makefile
 help/Makefile
Index: doc/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/doc/ChangeLog,v
retrieving revision 1.106
diff -u -p -r1.106 ChangeLog
--- doc/ChangeLog	9 Jun 2003 17:31:04 -0000	1.106
+++ doc/ChangeLog	26 Nov 2003 06:50:19 -0000
@@ -0,0 +1,4 @@
+2003-11-25 David Trowbridge <trowbrds cs colorado edu>
+
+	* Makefile.am: Add in installation for quickref.pdf, and remove older
+	entries due to having readded doc into SUBDIRS from the root
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/doc/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- doc/Makefile.am	12 Jun 2003 21:13:52 -0000	1.6
+++ doc/Makefile.am	26 Nov 2003 06:50:19 -0000
@@ -1,3 +1,8 @@
-SUBDIRS = devel
+HELP_FILES =					\
+	quickref.pdf
 
-EXTRA_DIST = ChangeLog.pre-1-4
+evolutiondoc_DATA = $(HELP_FILES)
+
+EXTRA_DIST = 					\
+	$(HELP_FILES)				\
+	quickref.tex
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1344
diff -u -p -r1.1344 ChangeLog
--- shell/ChangeLog	23 Nov 2003 16:54:59 -0000	1.1344
+++ shell/ChangeLog	26 Nov 2003 06:50:19 -0000
@@ -1,3 +1,9 @@
+2003-11-25  David Trowbridge <trowbrds cs colorado edu>
+
+	* Makefile.am: add definition for EVOLUTION_DOCDIR
+
+	* e-shell-window-commands.c: add handling for new "Quick Reference" menu
+
 2003-11-23  JP Rosevear  <jpr ximian com>
 
 	* Makefile.am: remove gtk deprecated flag
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.178
diff -u -p -r1.178 Makefile.am
--- shell/Makefile.am	23 Nov 2003 16:55:05 -0000	1.178
+++ shell/Makefile.am	26 Nov 2003 06:50:20 -0000
@@ -12,6 +12,7 @@ INCLUDES =							\
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
 	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DEVOLUTION_DOCDIR=\""$(evolutiondocdir)"\"		\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"		\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
Index: shell/e-shell-window-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-window-commands.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-shell-window-commands.c
--- shell/e-shell-window-commands.c	18 Nov 2003 01:05:55 -0000	1.5
+++ shell/e-shell-window-commands.c	26 Nov 2003 06:50:20 -0000
@@ -180,6 +180,15 @@ command_help_faq (BonoboUIComponent *uih
 	gnome_url_show ("http://www.ximian.com/apps/evolution-faq.html";, NULL);	/* FIXME use the error */
 }
 
+static void
+command_quick_reference (BonoboUIComponent *uih,
+			 EShellWindow *window,
+			 const char *path)
+{
+	const char *quickref = "file://" EVOLUTION_DOCDIR "/quickref.pdf";
+	/* The error here can be ignored fairly safely, since the file is installed alongside evolution */
+	gnome_url_show (quickref, NULL);
+}
 
 static void
 command_work_offline (BonoboUIComponent *uih,
@@ -270,6 +279,7 @@ static BonoboUIVerb tools_verbs[] = {
 
 static BonoboUIVerb help_verbs [] = {
 	BONOBO_UI_VERB ("HelpFAQ", (BonoboUIVerbFn) command_help_faq),
+	BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference),
 	BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug),
 	BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about_box),
 
Index: ui/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
retrieving revision 1.359
diff -u -p -r1.359 ChangeLog
--- ui/ChangeLog	18 Nov 2003 17:02:01 -0000	1.359
+++ ui/ChangeLog	26 Nov 2003 06:50:20 -0000
@@ -1,3 +1,7 @@
+2003-11-25  David Trowbridge <trowbrds cs colorado edu>
+
+	* evolution.xml: added "Quick Reference" menu item
+
 2003-11-18  Rodrigo Moya <rodrigo ximian com>
 
 	* evolution-calendar.xml: removed the 'New...' items, since they are
Index: ui/evolution.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution.xml,v
retrieving revision 1.85
diff -u -p -r1.85 evolution.xml
--- ui/evolution.xml	17 Nov 2003 20:04:11 -0000	1.85
+++ ui/evolution.xml	26 Nov 2003 06:50:20 -0000
@@ -90,16 +90,21 @@
       <placeholder name="BuiltMenuItems"/>
 
       <separator f="" name="eshell1"/>
+      
+      <menuitem name="QuickReference" verb=""
+        _label="_Quick Reference"/>
+
+      <separator f="" name="eshell2"/>
 
       <menuitem name="HelpFAQ" verb=""
 	_label="Ximian Evolution _FAQ"/>
 
-      <separator f="" name="eshell2"/>
+      <separator f="" name="eshell3"/>
 
       <menuitem name="HelpSubmitBug" verb=""
 	_label="Submit _Bug Report"/>
 
-      <separator f="" name="eshell3"/>
+      <separator f="" name="eshell4"/>
 
       <menuitem name="HelpAbout" verb=""
 	_label="_About Ximian Evolution..."/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]