IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2161 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas
2000-04-05 21:59:56 +00:00
parent 60a90316d0
commit 20743f221f
7 changed files with 216 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,5 +1,13 @@
2000-04-05 Dave Peticolas <peticola@cs.ucdavis.edu>
* configure.in: removed check for eperl
* src/reports: removed pathconfig.h.in and Sheet.? (eperl stuff)
* src/gnome/window-help.c: took out gncReport call (eperl)
* lib/Makefile.in: took out make dist hack
* src/register/table-allgui.c: more error checking
* src/SplitLedger.c: more cleanup. Fix a bug in refreshing a register

403
configure vendored
View File

File diff suppressed because it is too large Load Diff

27
configure.in
View File

@@ -140,8 +140,9 @@ fi
AC_SUBST(QT_TARGET)
AC_SUBST(QT_STATIC_TARGET)
### --------------------------------------------------------------------------
### Programs
### Check for perl
# Check for perl, force version 5
# AC_CHECK_PROGS(PERL,perl5 perl) # Sets @PERL@
@@ -179,29 +180,6 @@ if test ! -d ${PERLINCL}/CORE; then
fi
AC_SUBST(PERLINCL)
# Check for eperl (rgmerk)
# Permits compilation without eperl, but if it can't find eperl you
# must either use the --with-eperl option or, at a last resort,
# it'll use /usr/bin/eperl.
AC_PATH_PROG(EPERL,eperl,no)
AC_ARG_WITH(eperl,
[ --with-eperl=FILE which eperl executable to use ],
EPERL="${with_eperl}")
if test x"$EPERL" = xno; then
AC_MSG_WARN([Can't find eperl. Try using the --with-eperl flag.])
EPERL="/usr/bin/eperl"
fi
# for some reason the code needs both the full path and the basename.
# these get dumped into src/guile/pathconfig.h
GNC_EXPANDED_EPERL_PATH=$(gnc_recursively_expand_var "${EPERL}")
EPERL_NAME=`basename $EPERL`
AC_SUBST(GNC_EXPANDED_EPERL_PATH)
AC_SUBST(EPERL_NAME)
### -------------------------------------------------------------------
@@ -598,7 +576,6 @@ AC_OUTPUT(Makefile
src/register/Makefile
src/register/gnome/Makefile
src/reports/Makefile
src/reports/pathconfig.h
src/swig/Makefile
src/swig/perl5/Makefile
po/Makefile.in

29
lib/Makefile.in
View File

@@ -1,4 +1,4 @@
# Makefile -- makefile for xacc/lib
# Makefile -- makefile for gnucash/lib
# Copyright (C) 1997 Robin Clark
# Copyright (C) 1998 Rob Browning <rlb@cs.utexas.edu>
#
@@ -13,13 +13,11 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
# Author: Robin Clark
# Internet: rclark@rush.aero.org
# Address: 609 8th Street
# Huntington Beach, CA 92648-4632
# along with this program; if not, contact:
#
# Free Software Foundation Voice: +1-617-542-5942
# 59 Temple Place - Suite 330 Fax: +1-617-542-2652
# Boston, MA 02111-1307, USA gnu@gnu.org
include @top_srcdir@/Makefile.init
@@ -34,7 +32,7 @@ include @top_srcdir@/Makefile.init
######################################################################
# See Makefile.common for information about these variables.
CLEAN_SUBDIRS := XmHTML-1.1.0 ComboBox-1.33 Xbae-4.6.2-linas g-wrap
CLEAN_SUBDIRS := ComboBox-1.33 Xbae-4.6.2-linas g-wrap
######################################################################
all:
@@ -65,19 +63,6 @@ TRASH += g-wrap-install
.PHONY: g-wrap-install
# this make dist is a quick hack to avoid build problems that
# # naive builders are suffering from. Doing a 'make dist' makes
# build problems go away.
dist:
touch g-wrap/aclocal.m4
touch g-wrap/configure.in
touch g-wrap/Makefile.in
touch g-wrap/doc/Makefile.in
touch g-wrap/configure
touch g-wrap/conf-h.in
touch g-wrap/stamp-h.in
chmod +x g-wrap/missing
motif motif.static: g-wrap-install
@cd ComboBox-1.33; $(MAKE) default

36
src/SplitLedger.c
View File

@@ -1,3 +1,23 @@
/********************************************************************\
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* 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 *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
* *
\********************************************************************/
/*
* FILE:
* SplitLedger.c
@@ -73,22 +93,6 @@
* HISTORY:
* Copyright (c) 1998-2000 Linas Vepstas */
/********************************************************************\
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* 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 *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
\********************************************************************/
#define _GNU_SOURCE
#include <stdio.h>

17
src/gnome/window-help.c
View File

@@ -3,6 +3,7 @@
* Copyright (C) 1997 Robin D. Clark *
* Copyright (C) 1998 Linas Vepstas *
* Copyright (C) 1999 Jeremy Collins ( gtk-xmhtml port ) *
* Copyright (C) 2000 Dave Peticolas *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@@ -15,13 +16,12 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, write to the Free Software *
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. *
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
* *
* Author: Rob Clark *
* Internet: rclark@cs.hmc.edu *
* Address: 609 8th Street *
* Huntington Beach, CA 92648-4632 *
\********************************************************************/
#include <top-level.h>
@@ -30,7 +30,6 @@
#include "window-help.h"
#include "window-html.h"
#include "Sheet.h"
#include "File.h"
#include "messages.h"
#include "util.h"
@@ -173,10 +172,6 @@ helpJumpCB(HTMLUserData user_data, char **set_text, char **set_label)
help_data->htmlfile[label - help_data->htmlfile] = 0x0;
}
/* see if the anchor is an "active gnucash page" */
if (strstr(help_data->htmlfile, ".phtml"))
text = gncReport(help_data->htmlfile);
/* if text to display wasn't specified, use the truncated name to read */
if (text == NULL)
text = gncReadFile(help_data->htmlfile);

16
src/scm/report/balance-and-pnl.scm
View File

@@ -70,7 +70,7 @@
gnc:*pnl-report-options*)
(define (render-level-2-account level-2-account l2-value)
(let ((account-name (string-append "&nbsp;&nbsp;"
(let ((account-name (string-append "&nbsp;&nbsp;&nbsp;&nbsp"
(gnc:account-get-full-name
level-2-account)))
(type-name (gnc:account-get-type-string
@@ -80,14 +80,11 @@
account-name type-name (gnc:amount->formatted-string l2-value #f))
(list "left" "center" "right"))))
(define (render-level-1-account account l1-value l2-value)
(define (render-level-1-account account l1-value)
(let ((name (gnc:account-get-full-name account))
(type (gnc:account-get-type-string (gnc:account-get-type account))))
(html-table-row-align
(list name type
(if l2-value
(gnc:amount->formatted-string l2-value #f)
"&nbsp;")
(list name type "&nbsp;"
(gnc:amount->formatted-string l1-value #f)
"&nbsp;" "&nbsp;")
(list "left" "center" "right" "right" "right" "right"))))
@@ -147,10 +144,7 @@
(l0-collector 'add (l1-collector 'total #f))
(let ((level-1-output
(render-level-1-account account
(l1-collector 'total #f)
(if (> num-children 0)
(l2-collector 'total #f)
#f))))
(l1-collector 'total #f))))
(l1-collector 'reset #f)
(l2-collector 'reset #f)
(if (null? childrens-output)
@@ -220,7 +214,7 @@
report-description
"<p>"
"<table cellpadding=2>"
"<table cellpadding=1>"
"<caption><b>" report-name "</b></caption>"
"<tr>"
"<th>" (string-db 'lookup 'account-name) "</th>"