From ddbe057f3bb15b33f5d48cb7b82fd34d39fc0f79 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sun, 9 Nov 2003 01:04:44 +0000 Subject: updated 2003-11-09 Bastien Nocera * Makefile.am: * README: updated * configure.in: * data/totem.glade: * help/C/Makefile.am: * omf.make: * src/Makefile.am: remove deprecation flags to compile with GTK+ 2.3.x * src/totem.c: (on_help_activate), (totem_callback_connect): * xmldocs.make: put the help in the build system, add a menu item to get to the help --- ChangeLog | 14 +++++++++ Makefile.am | 2 +- README | 7 +++++ configure.in | 2 ++ data/totem.glade | 23 ++++++++++++++ help/C/Makefile.am | 10 ++++-- omf.make | 54 ++++++++++++++++++++++++++++++++ src/Makefile.am | 7 +---- src/totem.c | 16 ++++++++++ xmldocs.make | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 218 insertions(+), 9 deletions(-) create mode 100644 omf.make create mode 100644 xmldocs.make diff --git a/ChangeLog b/ChangeLog index c4c7431ed..4cc22ed74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-11-09 Bastien Nocera + + * Makefile.am: + * README: updated + * configure.in: + * data/totem.glade: + * help/C/Makefile.am: + * omf.make: + * src/Makefile.am: remove deprecation flags to compile with + GTK+ 2.3.x + * src/totem.c: (on_help_activate), (totem_callback_connect): + * xmldocs.make: put the help in the build system, add a menu + item to get to the help + 2003-11-07 Chee Bin HOH * help/Makefile.am: diff --git a/Makefile.am b/Makefile.am index 92f54e847..33af5598a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = po src data +SUBDIRS = po src data help install-data-local: @$(NORMAL_INSTALL) diff --git a/README b/README index bcd36e57a..e05de1564 100644 --- a/README +++ b/README @@ -13,8 +13,15 @@ News ==== 0.99.8: +* Online manual from Chee Bin HOH * Use the statusbar for buffering feedback * Use less memory when there's no video output +* Fix playback of Quicktime files with reference urls +* Fix Real playlists support with "stop" commands +* Support the XvMC video driver +* Support audio/x-ms-asf data type +* Added ability to launch totem in fullscreen mode +* Fix compilation with GTK+ 2.3.x 0.99.7: * Fix .pls playlist parsing and saving, as well as .m3u, .asx and .desktop diff --git a/configure.in b/configure.in index 298ab41bb..07f595e40 100644 --- a/configure.in +++ b/configure.in @@ -273,6 +273,8 @@ totem.spec src/Makefile data/Makefile po/Makefile.in +help/Makefile +help/C/Makefile ]) echo diff --git a/data/totem.glade b/data/totem.glade index 3e0a0538b..ebc56e42e 100644 --- a/data/totem.glade +++ b/data/totem.glade @@ -789,6 +789,29 @@ + + + True + Help contents + _Contents + True + + + + + + True + gtk-help + 1 + 0.5 + 0.5 + 0 + 0 + + + + + True diff --git a/help/C/Makefile.am b/help/C/Makefile.am index 40ff3a615..c13d31a57 100644 --- a/help/C/Makefile.am +++ b/help/C/Makefile.am @@ -1,7 +1,13 @@ +## arch-tag: Automake rules for English help files + figdir = figures docname = totem lang = C omffile = totem-C.omf -entities = legal.xml -include $(top_srcdir)/help/xmldocs.make +entities = totem.xml legal.xml + +include $(top_srcdir)/xmldocs.make + dist-hook: app-dist-hook + + diff --git a/omf.make b/omf.make new file mode 100644 index 000000000..195fb5244 --- /dev/null +++ b/omf.make @@ -0,0 +1,54 @@ +# +# arch-tag: Makefile rules for using Scrollkeeper to install OMF files +# No modifications of this Makefile should be necessary. +# +# This file contains the build instructions for installing OMF files. It is +# generally called from the makefiles for particular formats of documentation. +# +# Note that you must configure your package with --localstatedir=/var/lib +# so that the scrollkeeper-update command below will update the database +# in the standard scrollkeeper directory. +# +# If it is impossible to configure with --localstatedir=/var/lib, then +# modify the definition of scrollkeeper_localstate_dir so that +# it points to the correct location. Note that you must still use +# $(localstatedir) in this or when people build RPMs it will update +# the real database on their system instead of the one under RPM_BUILD_ROOT. +# +# Note: This make file is not incorporated into xmldocs.make because, in +# general, there will be other documents install besides XML documents +# and the makefiles for these formats should also include this file. +# +# About this file: +# This file was taken from scrollkeeper_example2, a package illustrating +# how to install documentation and OMF files for use with ScrollKeeper +# 0.3.x and 0.4.x. For more information, see: +# http://scrollkeeper.sourceforge.net/ +# Version: 0.1.2 (last updated: March 20, 2002) +# + +omf_dest_dir=$(datadir)/omf/@PACKAGE@ +scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper + +omf: omf_timestamp + +omf_timestamp: $(omffile) + -for file in $(omffile); do \ + scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \ + done + touch omf_timestamp + +install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir) + +uninstall-local-omf: + -for file in $(srcdir)/*.omf; do \ + basefile=`basename $$file`; \ + rm -f $(omf_dest_dir)/$$basefile; \ + done + -rmdir $(omf_dest_dir) + -scrollkeeper-update -o $(DESTDIR)$(omf_dest_dir) diff --git a/src/Makefile.am b/src/Makefile.am index 1ef5349de..3fd941c18 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -124,12 +124,7 @@ INCLUDES = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGCONF_PREFIX=\""/apps/totem"\" \ -DDATADIR=\""$(datadir)"\" \ - -DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\" \ - -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGNOME_DISABLE_DEPRECATED \ - -DGCONF_DISABLE_DEPRECATED=1 \ - -DLIBGLADE_DISABLE_DEPRECATED + -DLOGO_PATH=DATADIR\"\"G_DIR_SEPARATOR_S\"totem\"G_DIR_SEPARATOR_S\"totem_logo.png\" CLEANFILES = *.bak *.gladep core* *.orig *~ $(MARSHALFILES) $(desktop_DATA) EXTRA_DIST = bacon-video-widget-xine.c \ diff --git a/src/totem.c b/src/totem.c index 2413ee00d..49239383e 100644 --- a/src/totem.c +++ b/src/totem.c @@ -1794,6 +1794,18 @@ on_show_controls2_activate (GtkMenuItem *menuitem, Totem *totem) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE); } +static void +on_help_activate (GtkButton *button, Totem *totem) +{ + GError *err = NULL; + + if (gnome_help_display ("totem.xml", NULL, &err) == FALSE) + { + totem_action_error (_("Totem could not display the help contents."), err->message, totem); + g_error_free (err); + } +} + static void on_about1_activate (GtkButton *button, Totem *totem) { @@ -3051,6 +3063,10 @@ totem_callback_connect (Totem *totem) item = glade_xml_get_widget (totem->xml, "tmw_quit_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_quit1_activate), totem); + + item = glade_xml_get_widget (totem->xml, "tmw_contents_menu_item"); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (on_help_activate), totem); item = glade_xml_get_widget (totem->xml, "tmw_about_menu_item"); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (on_about1_activate), totem); diff --git a/xmldocs.make b/xmldocs.make new file mode 100644 index 000000000..1fcfef55d --- /dev/null +++ b/xmldocs.make @@ -0,0 +1,92 @@ +# +# arch-tag: Makefile rules for building GNOMEish Docbook documentation +# No modifications of this Makefile should be necessary. +# +# To use this template: +# 1) Define: figdir, docname, lang, omffile, and entities in +# your Makefile.am file for each document directory, +# although figdir, omffile, and entities may be empty +# 2) Make sure the Makefile in (1) also includes +# "include $(top_srcdir)/xmldocs.make" and +# "dist-hook: app-dist-hook". +# 3) Optionally define 'entities' to hold xml entities which +# you would also like installed +# 4) Figures must go under $(figdir)/ and be in PNG format +# 5) You should only have one document per directory +# 6) Note that the figure directory, $(figdir)/, should not have its +# own Makefile since this Makefile installs those figures. +# +# example Makefile.am: +# figdir = figures +# docname = scrollkeeper-manual +# lang = C +# omffile=scrollkeeper-manual-C.omf +# entities = fdl.xml +# include $(top_srcdir)/xmldocs.make +# dist-hook: app-dist-hook +# +# About this file: +# This file was taken from scrollkeeper_example2, a package illustrating +# how to install documentation and OMF files for use with ScrollKeeper +# 0.3.x and 0.4.x. For more information, see: +# http://scrollkeeper.sourceforge.net/ +# Version: 0.1.2 (last updated: March 20, 2002) +# + + +# ************* Begin of section some packagers may need to modify ************** +# This variable (docdir) specifies where the documents should be installed. +# This default value should work for most packages. +# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang) +docdir = $(datadir)/gnome/help/$(docname)/$(lang) + +# ************** You should not have to edit below this line ******************* +xml_files = $(entities) $(docname).xml + +EXTRA_DIST = $(xml_files) $(omffile) +CLEANFILES = omf_timestamp + +# If the following file is in a subdir (like help/) you need to add that to the path +include $(top_srcdir)/omf.make + +all: omf + +app-dist-hook: + if test "$(figdir)"; then \ + $(mkinstalldirs) $(distdir)/$(figdir); \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \ + done \ + fi + +install-data-local: omf + $(mkinstalldirs) $(DESTDIR)$(docdir) + for file in $(xml_files); do \ + cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ + done + if test "$(figdir)"; then \ + $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ + done \ + fi + +install-data-hook: install-data-hook-omf + +uninstall-local: uninstall-local-doc uninstall-local-omf + +uninstall-local-doc: + -if test "$(figdir)"; then \ + for file in $(srcdir)/$(figdir)/*.png; do \ + basefile=`echo $$file | sed -e 's,^.*/,,'`; \ + rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ + done; \ + rmdir $(DESTDIR)$(docdir)/$(figdir); \ + fi + -for file in $(xml_files); do \ + rm -f $(DESTDIR)$(docdir)/$$file; \ + done + -rmdir $(DESTDIR)$(docdir) + -- cgit v1.2.1