Mercurial > hg > octave-max

changeset 15405:f52a62a6db3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate copy and paste copyright info in GUI about info box * libgui/src/main-window.cc (main_window::show_about_octave): Use OCTAVE_STARTUP_MESSAGE instead of duplicating the text. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include -I$(top_builddir)/libinterp in the list.
author John W. Eaton <jwe@octave.org>
date Tue, 18 Sep 2012 01:32:30 -0400
parents 7b69cd89868c
children 0b4626dc4d38
files libgui/src/main-window.cc libgui/src/module.mk
diffstat 2 files changed, 4 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc
+++ b/libgui/src/main-window.cc
@@ -43,9 +43,11 @@
 #include "settings-dialog.h"
 
 #include "debug.h"
+#include "defaults.h"
 #include "load-save.h"
 #include "toplev.h"
 #include "variables.h"
+#include "version.h"
 
 #include "cmd-hist.h"
 #include "oct-env.h"
@@ -376,22 +378,7 @@
 void
 main_window::show_about_octave ()
 {
-  QString message =
-    "GNU Octave\n"
-    "Copyright (C) 2009 John W. Eaton and others.\n"
-    "This is free software; see the source code for copying conditions."
-    "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or"
-    "FITNESS FOR A PARTICULAR PURPOSE.  For details, type `warranty'.\n"
-    "\n"
-    "Additional information about Octave is available at http://www.octave.org.\n"
-    "\n"
-    "Please contribute if you find this software useful."
-    "For more information, visit http://www.octave.org/help-wanted.html\n"
-    "\n"
-    "Report bugs to <bug@octave.org> (but first, please read"
-    "http://www.octave.org/bugs.html to learn how to write a helpful report).\n"
-    "\n"
-    "For information about changes from previous versions, type `news'.\n";
+  QString message = OCTAVE_STARTUP_MESSAGE;
 
   QMessageBox::about (this, tr ("About Octave"), message);
 }
--- a/libgui/src/module.mk
+++ b/libgui/src/module.mk
@@ -141,7 +141,7 @@
   -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \
   -I$(top_srcdir)/liboctave/system \
   -I$(top_srcdir)/liboctave/util \
-  -I$(top_srcdir)/libinterp \
+  -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \
   -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \
   -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \
   -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \