Merge branch 'maint'

This commit is contained in:
Geert Janssens 2019-09-18 22:04:08 +02:00
commit 9214f2ed5b
135 changed files with 1167 additions and 1304 deletions

View File

@ -45,7 +45,6 @@ include (GncAddTest)
include (MakeDistFiles) include (MakeDistFiles)
include (GNUInstallDirs) include (GNUInstallDirs)
include (TestBigEndian) include (TestBigEndian)
include (CheckSymbolExists)
# ############################################################ # ############################################################
# These options are settable from the CMake command line. For example, to disable # These options are settable from the CMake command line. For example, to disable
@ -324,13 +323,6 @@ find_guile_dirs()
if (WITH_AQBANKING) if (WITH_AQBANKING)
pkg_check_modules (GWENHYWFAR REQUIRED IMPORTED_TARGET gwenhywfar>=4.9.99) pkg_check_modules (GWENHYWFAR REQUIRED IMPORTED_TARGET gwenhywfar>=4.9.99)
pkg_check_modules (AQBANKING REQUIRED IMPORTED_TARGET aqbanking>=5.3.4) pkg_check_modules (AQBANKING REQUIRED IMPORTED_TARGET aqbanking>=5.3.4)
set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}"
"${GWENHYWFAR_INCLUDE_DIRS}")
set(CMAKE_REQUIRED_LIBRARIES "-laqbanking")
check_symbol_exists("AB_Banking_RuntimeConfig_SetCharValue"
"aqbanking/banking.h" AQB_HAS_RUNTIME_CONFIG)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
if(WITH_GNUCASH) if(WITH_GNUCASH)
pkg_check_modules (GWEN_GTK3 gwengui-gtk3) pkg_check_modules (GWEN_GTK3 gwengui-gtk3)
if(GWEN_GTK3_FOUND AND GWEN_GTK3_VERSION VERSION_GREATER "4.20.0") if(GWEN_GTK3_FOUND AND GWEN_GTK3_VERSION VERSION_GREATER "4.20.0")
@ -557,7 +549,7 @@ endif()
set(BUILD_SHARED_LIBS ON) set(BUILD_SHARED_LIBS ON)
# Most libraries are installed to lib/gnucash, so set that as the default. # Most libraries are installed to lib/gnucash, so set that as the default.
# For the handful that are installed to lib, we override the properies below # For the handful that are installed to lib, we override the properties below
# (after the targets have been read in). # (after the targets have been read in).

View File

@ -129,9 +129,9 @@ or unit tests with Electric Fence.
It should probably be relatively straightforward to add this as all it It should probably be relatively straightforward to add this as all it
needs is to link with libefence.so (-lefence). needs is to link with libefence.so (-lefence).
Fedora 27 ships an ElectricFence package containing that libary and also Fedora 27 ships an ElectricFence package containing that library and also
an exectuable 'ef' to run an arbitrary program with Electric Fence an executable 'ef' to run an arbitrary program with Electric Fence
guarding enabled. I have given it a quick spin on gnucash but it immediatly guarding enabled. I have given it a quick spin on gnucash but it immediately
crashes. I haven't investigated whether this is because I should first have crashes. I haven't investigated whether this is because I should first have
linked gnucash with -lefence or because a real problem in GnuCash code. linked gnucash with -lefence or because a real problem in GnuCash code.

View File

@ -68,7 +68,7 @@ Libraries/Deps
libxml2 2.5.10 libxml2 2.5.10
gettext 0.19.6 gettext 0.19.6
libxslt, including xsltproc libxslt, including xsltproc
ICU International Compnents for ICU International Components for
Unicode Unicode
boost 1.50.0 locale and regex libs must be boost 1.50.0 locale and regex libs must be
built with ICU support. built with ICU support.

View File

@ -83,7 +83,7 @@ def gnc_numeric_to_python_Decimal(numeric):
copy = GncNumeric(numeric.num(), numeric.denom()) copy = GncNumeric(numeric.num(), numeric.denom())
result = copy.to_decimal(None) result = copy.to_decimal(None)
if not result: if not result:
raise Exception("gnc numeric value %s can't be converted to deciaml" % raise Exception("gnc numeric value %s can't be converted to decimal" %
copy.to_string() ) copy.to_string() )
digit_tuple = tuple( int(char) digit_tuple = tuple( int(char)
for char in str(copy.num()) for char in str(copy.num())

View File

@ -42,7 +42,7 @@ from datetime import date
# This script takes a gnucash url # This script takes a gnucash url
# and creates a new file/db at a second url that has the same # and creates a new file/db at a second url that has the same
# account tree and an equivilent opening balance on all the simple balance # account tree and an equivalent opening balance on all the simple balance
# sheet accounts (not for income and expense accounts) # sheet accounts (not for income and expense accounts)
# #
# This is done a per currency basis, one opening balance account for each # This is done a per currency basis, one opening balance account for each
@ -122,7 +122,7 @@ ACCOUNT_TYPES_TO_OPEN = ACCOUNT_TYPES_TO_OPEN.difference( set((
)) ) )) )
# this script isn't capable of properly setting up the transactions for # this script isn't capable of properly setting up the transactions for
# ACCT_TYPE_TRADING, you'll have to create opening balances for them mannually; # ACCT_TYPE_TRADING, you'll have to create opening balances for them manually;
# so, they are not included in the set of accounts used for opening balances # so, they are not included in the set of accounts used for opening balances
ACCOUNT_TYPES_TO_OPEN.remove(ACCT_TYPE_TRADING) ACCOUNT_TYPES_TO_OPEN.remove(ACCT_TYPE_TRADING)

View File

@ -1141,7 +1141,7 @@ def payBill(book, id, posted_account_guid, transfer_account_guid, payment_date,
xfer_acc = account_guid.AccountLookup(session.book) xfer_acc = account_guid.AccountLookup(session.book)
# We pay the negitive total as the bill as this seemed to cause issues # We pay the negative total as the bill as this seemed to cause issues
# with the split not being set correctly and not being marked as paid # with the split not being set correctly and not being marked as paid
bill.ApplyPayment(None, xfer_acc, bill.GetTotal().neg(), GncNumeric(0), bill.ApplyPayment(None, xfer_acc, bill.GetTotal().neg(), GncNumeric(0),
datetime.datetime.strptime(payment_date, '%Y-%m-%d'), memo, num) datetime.datetime.strptime(payment_date, '%Y-%m-%d'), memo, num)

View File

@ -27,7 +27,7 @@
# gnucash-env python simple_business_create.py \ # gnucash-env python simple_business_create.py \
# sqlite3:///home/blah/blah.gnucash # sqlite3:///home/blah/blah.gnucash
# #
# Specificically, this sets up a simple tree, creates a customer, job, # Specifically, this sets up a simple tree, creates a customer, job,
# employee and vendor, creates an unposted invoice for each, # employee and vendor, creates an unposted invoice for each,
# and posts the customer invoice with a few entries and a tax table. # and posts the customer invoice with a few entries and a tax table.
# #

View File

@ -48,7 +48,7 @@ class ClassFromFunctions(object):
add_method and add_methods_with_prefix. add_method and add_methods_with_prefix.
""" """
def __new__(cls, *args, **kargs): def __new__(cls, *args, **kargs):
# why reimpliment __new__? Because later on we're going to # why reimplement __new__? Because later on we're going to
# use new to avoid creating new instances when existing instances # use new to avoid creating new instances when existing instances
# already exist with the same __instance value, or equivalent __instance # already exist with the same __instance value, or equivalent __instance
# values, where this is desirable... # values, where this is desirable...

View File

@ -93,7 +93,7 @@
%include <qofbackend.h> %include <qofbackend.h>
// this function is defined in qofsession.h, but isnt found in the libraries, // this function is defined in qofsession.h, but isn't found in the libraries,
// ignored because SWIG attempts to link against (to create language bindings) // ignored because SWIG attempts to link against (to create language bindings)
%ignore qof_session_not_saved; %ignore qof_session_not_saved;
%include <qofsession.h> %include <qofsession.h>

View File

@ -58,7 +58,7 @@
// receiving this pointer is going to make a copy of the data. After the // receiving this pointer is going to make a copy of the data. After the
// function call, the memory for the time64 used to perform this conversion // function call, the memory for the time64 used to perform this conversion
// is going to be lost, so make damn sure that the recipient of this pointer // is going to be lost, so make damn sure that the recipient of this pointer
// is NOT going dereference it sometime after this function call takes place. // is NOT going to dereference it sometime after this function call takes place.
// //
// As far as I know, the xaccTransSetDate[Posted|Entered|Due]TS functions // As far as I know, the xaccTransSetDate[Posted|Entered|Due]TS functions
// from Transaction.h are the only functions with time64 * that we re // from Transaction.h are the only functions with time64 * that we re
@ -71,7 +71,7 @@
// //
// Mark Jenkins <mark@parit.ca> // Mark Jenkins <mark@parit.ca>
// //
// as far as I can see all occurences of pointers to time64 are now covered // as far as I can see all occurrences of pointers to time64 are now covered
// by the named typemaps below (2019-04) // by the named typemaps below (2019-04)
// //
// Christoph Holtermann <mail@c-holtermann.net> // Christoph Holtermann <mail@c-holtermann.net>

View File

@ -460,7 +460,7 @@ int era_cnt;
} }
/* Any character but `%' must be matched by the same character /* Any character but `%' must be matched by the same character
in the iput string. */ in the input string. */
if (*fmt != '%') if (*fmt != '%')
{ {
match_char (*fmt++, *rp++); match_char (*fmt++, *rp++);

View File

@ -363,9 +363,6 @@
#cmakedefine WEBKIT2_3 1 #cmakedefine WEBKIT2_3 1
#cmakedefine WEBKIT1 1 #cmakedefine WEBKIT1 1
/* Definition for AQBanking Runtime Config feature */
#cmakedefine AQB_HAS_RUNTIME_CONFIG 1
/* Definitions for all OS */ /* Definitions for all OS */
/* From cutecash */ /* From cutecash */
//#define HAVE_LIBQOF /**/ //#define HAVE_LIBQOF /**/

View File

@ -10,9 +10,9 @@ my @gnc_module_dirs=();
my @guile_load_dirs=(); my @guile_load_dirs=();
my @library_dirs=(); my @library_dirs=();
GetOptions ("exports!" => \$define_exports, # flag GetOptions ("exports!" => \$define_exports, # flag
"gnc-module-dir=s" => \@gnc_module_dirs, # arry of strings "gnc-module-dir=s" => \@gnc_module_dirs, # array of strings
"guile-load-dir=s" => \@guile_load_dirs, # arry of strings "guile-load-dir=s" => \@guile_load_dirs, # array of strings
"library-dir=s" => \@library_dirs, # arry of strings "library-dir=s" => \@library_dirs, # array of strings
"verbose" => \$verbose) # flag "verbose" => \$verbose) # flag
or die( or die(
"Usage: gnc-test-env.pl [ --exports | --noexports ]\n" . "Usage: gnc-test-env.pl [ --exports | --noexports ]\n" .

View File

@ -197,12 +197,12 @@ output of the ofxdump utility on your file.
(1) GnuCash simply hangs when importing an OFX file (1) GnuCash simply hangs when importing an OFX file
This is probably bug https://bugs.gnucash.org/show_bug.cgi?id=101738 This is probably bug https://bugs.gnucash.org/show_bug.cgi?id=101738
Unfortunately the main developpers are unable to reproduce. So far, this bug Unfortunately the main developers are unable to reproduce. So far, this bug
only occurs with OpenSP 1.5. It does not occur for anyone with OpenSP 1.3.x, only occurs with OpenSP 1.5. It does not occur for anyone with OpenSP 1.3.x,
which is shipped on most Linux distro as part of openjade, so you may want to which is shipped on most Linux distro as part of openjade, so you may want to
downgrade. (Please note that OpenSP 1.3.x has several other issues however) downgrade. (Please note that OpenSP 1.3.x has several other issues however)
This bug is beleived to be a threading issue, and may be a problem in GnuCash, This bug is believed to be a threading issue, and may be a problem in GnuCash,
LibOFX, OpenSP, or some versions of the Linux kernel. If you have any useful LibOFX, OpenSP, or some versions of the Linux kernel. If you have any useful
info,please add a comment to the bug above (even if only to say you encountered info,please add a comment to the bug above (even if only to say you encountered
the bug,and your version of the previously mentioned packages). the bug,and your version of the previously mentioned packages).

View File

@ -100,7 +100,7 @@ email address.
4) Building, Installing and running GnuCash 4) Building, Installing and running GnuCash
Before starting to work on your translations, it is suggested that you Before starting to work on your translations, it is suggested that you
buiild the gnucash source code. This way you can get your system set up build the gnucash source code. This way you can get your system set up
correctly with all the development packages you need. It is a good idea correctly with all the development packages you need. It is a good idea
to actually run gnucash with your new translations because it is quite to actually run gnucash with your new translations because it is quite
helpful to see the phrases in the context of the running program. helpful to see the phrases in the context of the running program.
@ -157,7 +157,7 @@ Now, open your language's glossary file and translate it completely.
============================================================================== ==============================================================================
6) Initial processing of the translation file 6) Initial processing of the translation file
Before you begin actualy translation work, you should update the gnucash.pot Before you begin actual translation work, you should update the gnucash.pot
file and use this to update your .po file. This process will insure that file and use this to update your .po file. This process will insure that
you have the latest translatable strings. you have the latest translatable strings.
@ -174,7 +174,7 @@ If your language file does exist, update it using the msgmerge program:
/usr/bin/msgmerge -o XXXX.po XXXX.po gnucash.pot /usr/bin/msgmerge -o XXXX.po XXXX.po gnucash.pot
The top of the .po file should be editted somewhat. The comments at the The top of the .po file should be edited somewhat. The comments at the
top of the file should be changed to be current: top of the file should be changed to be current:
# Messages in Deutsch f<>r GnuCash # Messages in Deutsch f<>r GnuCash
@ -191,7 +191,7 @@ Make sure that the header of your .po file contains this line:
Finally. You are ready to do some translating! Finally. You are ready to do some translating!
There are many transaltion editors, KBabel, for example, works well for There are many translation editors, KBabel, for example, works well for
GnuCash. Some Editors are noted here: GnuCash. Some Editors are noted here:
https://translationproject.org/html/software.html https://translationproject.org/html/software.html
@ -256,13 +256,13 @@ Notice that the comment "c-format" was not removed. That is correct, you
should leave that. should leave that.
When you see the comment "c-format", it means that the format codes in the When you see the comment "c-format", it means that the format codes in the
tranlatable string are referring to C formatting codes. So, '%s' means text, translatable string are referring to C formatting codes. So, '%s' means text,
'%d' means an integer, etc... '%d' means an integer, etc...
============================================================================== ==============================================================================
8) Testing and submitting your translations 8) Testing and submitting your translations
You must check that your new translations are programatically correct (ie: You must check that your new translations are programmatically correct (ie:
that there are no unclosed quotes, etc). To do this, use the msgfmt program that there are no unclosed quotes, etc). To do this, use the msgfmt program
/usr/bin/msgfmt -c --statistics XXXX.po /usr/bin/msgfmt -c --statistics XXXX.po

View File

@ -1,5 +1,5 @@
This directory contains sample data files in the 'iif' This directory contains sample data files in the 'iif'
Intuit Interchange Format files. Most of thise files Intuit Interchange Format files. Most of these files
have only one transaction in them, with only one or two have only one transaction in them, with only one or two
splits. splits.

View File

@ -502,7 +502,7 @@
<cmdty:id>USD</cmdty:id> <cmdty:id>USD</cmdty:id>
</act:commodity> </act:commodity>
<act:commodity-scu>100</act:commodity-scu> <act:commodity-scu>100</act:commodity-scu>
<act:description>Company 50% match of S&amp;S, to 7% of salery.</act:description> <act:description>Company 50% match of S&amp;S, to 7% of salary.</act:description>
<act:slots> <act:slots>
<slot> <slot>
<slot:key>tax-US</slot:key> <slot:key>tax-US</slot:key>
@ -1993,7 +1993,7 @@
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent> <act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>HomeMaintainance</act:name> <act:name>HomeMaintenance</act:name>
<act:id type="guid">2f46699ef618ac2e88c9a5201d4bff2d</act:id> <act:id type="guid">2f46699ef618ac2e88c9a5201d4bff2d</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2004,7 +2004,7 @@
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent> <act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>IRA Contribution, Non Deductable</act:name> <act:name>IRA Contribution, Non Deductible</act:name>
<act:id type="guid">911b7f106931fb26917aa2aa6662e70e</act:id> <act:id type="guid">911b7f106931fb26917aa2aa6662e70e</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2081,7 +2081,7 @@
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent> <act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Morgage</act:name> <act:name>Mortgage</act:name>
<act:id type="guid">8d172831a7cee627802966332dc04411</act:id> <act:id type="guid">8d172831a7cee627802966332dc04411</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2139,7 +2139,7 @@
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent> <act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Restarant</act:name> <act:name>Restaurant</act:name>
<act:id type="guid">ab78940fcbc8e25834c57c92a0dadd0e</act:id> <act:id type="guid">ab78940fcbc8e25834c57c92a0dadd0e</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2162,7 +2162,7 @@
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent> <act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Tax Deductable</act:name> <act:name>Tax Deductible</act:name>
<act:id type="guid">d7bfc2020fd8cb91e46a6cda6bdb6efd</act:id> <act:id type="guid">d7bfc2020fd8cb91e46a6cda6bdb6efd</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2392,7 +2392,7 @@
<act:parent type="guid">d7bfc2020fd8cb91e46a6cda6bdb6efd</act:parent> <act:parent type="guid">d7bfc2020fd8cb91e46a6cda6bdb6efd</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>Non Deductable</act:name> <act:name>Non Deductible</act:name>
<act:id type="guid">82119f5617cc4cbaf7f882a0883fd7df</act:id> <act:id type="guid">82119f5617cc4cbaf7f882a0883fd7df</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -2512,7 +2512,7 @@
<act:parent type="guid">babd20035ed6cd6415d878a31675210c</act:parent> <act:parent type="guid">babd20035ed6cd6415d878a31675210c</act:parent>
</gnc:account> </gnc:account>
<gnc:account version="2.0.0"> <gnc:account version="2.0.0">
<act:name>IRA mangement fee</act:name> <act:name>IRA management fee</act:name>
<act:id type="guid">380635c3d759d34529e0422ced08628c</act:id> <act:id type="guid">380635c3d759d34529e0422ced08628c</act:id>
<act:type>EXPENSE</act:type> <act:type>EXPENSE</act:type>
<act:commodity> <act:commodity>
@ -4008,7 +4008,7 @@ Witholding</act:name>
<trn:date-entered> <trn:date-entered>
<ts:date>2000-10-21 16:41:40 +0200</ts:date> <ts:date>2000-10-21 16:41:40 +0200</ts:date>
</trn:date-entered> </trn:date-entered>
<trn:description>IRA Contrib, non Deductable</trn:description> <trn:description>IRA Contrib, non Deductible</trn:description>
<trn:splits> <trn:splits>
<trn:split> <trn:split>
<split:id type="guid">d6d30e081d5da4f33d5248e8a6aae3c2</split:id> <split:id type="guid">d6d30e081d5da4f33d5248e8a6aae3c2</split:id>

View File

@ -1,5 +1,5 @@
/* This is an example GTK CSS file that can be used with Gnucash. /* This is an example GTK CSS file that can be used with Gnucash.
Simply copy this file to the loaction specified below according Simply copy this file to the location specified below according
to your platform and then restart gnucash. to your platform and then restart gnucash.
- Windows: CSIDL_APPDATA/GnuCash - Windows: CSIDL_APPDATA/GnuCash

View File

@ -248,7 +248,7 @@
<h2>A Web Browser for Financial Data</h2> <h2>A Web Browser for Financial Data</h2>
<p>More and more finacial data is moving onto the web. <p>More and more financial data is moving onto the web.
People shop on-line. They pay bills on-line. There are People shop on-line. They pay bills on-line. There are
even some promising e-wallet systems (such as even some promising e-wallet systems (such as
<a href="https://www.webfunds.org">WebFunds</a>). For GnuCash <a href="https://www.webfunds.org">WebFunds</a>). For GnuCash
@ -338,7 +338,7 @@
<dl> <dl>
<dt><b>E-Wallet</b></dt> <dt><b>E-Wallet</b></dt>
<dd>An e-wallet, just like a real wallet, stores cash. You <dd>An e-wallet, just like a real wallet, stores cash. You
can use that cash to pay freinds or businesses. Just can use that cash to pay friends or businesses. Just
like a real wallet, an e-wallet should not charge you like a real wallet, an e-wallet should not charge you
monthly fees. It should provide you with some measure monthly fees. It should provide you with some measure
of anonymity and privacy. An e-wallet should also do of anonymity and privacy. An e-wallet should also do
@ -428,7 +428,7 @@
<li>Basic Audit features. There's a problem with blindly <li>Basic Audit features. There's a problem with blindly
allowing on-line data (prices, transactions) to enter allowing on-line data (prices, transactions) to enter
GnuCash. It may not be clear where it came from, GnuCash. It may not be clear where it came from,
and even if the source is beleived to be 'reputable', and even if the source is believed to be 'reputable',
there still may be factual errors in the data. Thus, there still may be factual errors in the data. Thus,
there must be a way of audting newly-arrived (or even old) there must be a way of audting newly-arrived (or even old)
on-line data, and mark it as 'reconciled', i.e. on-line data, and mark it as 'reconciled', i.e.
@ -1215,7 +1215,7 @@
do you own jewelry? appraised value? etc.) do you own jewelry? appraised value? etc.)
In particular, show how appreciation In particular, show how appreciation
and depreciation should be treated. and depreciation should be treated.
See the section <a href="#arrangments">Arrangements</a> for See the section <a href="#arrangements">Arrangements</a> for
a discussion of the customization issues. a discussion of the customization issues.
</p> </p>
</li> </li>
@ -1272,7 +1272,7 @@
menu. It would be nice to be able to examine different menu. It would be nice to be able to examine different
account types (Asset, Liability, Income, Expense, account types (Asset, Liability, Income, Expense,
Payables, Receivables, Inventory) by selecting a tab Payables, Receivables, Inventory) by selecting a tab
folder. This is maybe a bs. request that shoudn't folder. This is maybe a bs. request that shouldn't
be implemented.</p> be implemented.</p>
</li> </li>
@ -1417,7 +1417,7 @@
<p><b>Print Register Window</b>. Output register window to <p><b>Print Register Window</b>. Output register window to
printer. printer.
<b>Status:</b> Done: there is a register report which <b>Status:</b> Done: there is a register report which
is printable, there is botton on register. Done in 1.6.0 is printable, there is a button on register. Done in 1.6.0
</p> </p>
</li> </li>
<li> <li>
@ -1536,7 +1536,7 @@
complex tasks, such as new user setup, account creation, complex tasks, such as new user setup, account creation,
QIF import, budget prep, obscure functional corners. QIF import, budget prep, obscure functional corners.
<p> <p>
Wizards are great, but lets not thow away the denser GUI's. Wizards are great, but lets not throw away the denser GUI's.
For 8-hour-a-day users, the wizards can be irritating. For 8-hour-a-day users, the wizards can be irritating.
A single, dense screen can be more efficient and nicer. A single, dense screen can be more efficient and nicer.
So when adding wizards, don't dump GUI's !! (instead, So when adding wizards, don't dump GUI's !! (instead,
@ -1583,7 +1583,7 @@
<p></p> <p></p>
<dt><a name="arrangements"><b>Arrangments</b></a></dt> <dt><a name="arrangements"><b>Arrangements</b></a></dt>
<dd> <dd>
An "application arrangement" is the defining look-n-feel of an application. An "application arrangement" is the defining look-n-feel of an application.
@ -1622,9 +1622,9 @@
their own preferred arrangement. It can also simplify the code base: their own preferred arrangement. It can also simplify the code base:
instead of having two products, a home-user application, and a small-business instead of having two products, a home-user application, and a small-business
application, each with a different code base and #defines and what not, instead, application, each with a different code base and #defines and what not, instead,
we have one code base, and different arrangments for each. we have one code base, and different arrangements for each.
However, most importantly, the arrangments should be easy to share between users. However, most importantly, the arrangements should be easy to share between users.
They should be such that users are encouraged to trade and use arrangments, They should be such that users are encouraged to trade and use arrangements,
and to create new ones that suit their needs. and to create new ones that suit their needs.
</p> </p>
<p> <p>
@ -1638,7 +1638,7 @@
Not started. Individually, all these cusomizable things exist Not started. Individually, all these cusomizable things exist
here and there in gnucash, but they cannot be shared between here and there in gnucash, but they cannot be shared between
users: a gnucash user cannot mail her favorite 'arrangement' users: a gnucash user cannot mail her favorite 'arrangement'
to her freind. to her friend.
</p> </p>
@ -1767,7 +1767,7 @@
dates, ISP contract expiration date :-). These may or may dates, ISP contract expiration date :-). These may or may
not be associated with transactions. Memo's should be not be associated with transactions. Memo's should be
possible. Pop-ups should happen when dates get close. possible. Pop-ups should happen when dates get close.
Technology: best bet is the Ximian Evolution Calander Technology: best bet is the Ximian Evolution Calendar
component.</p> component.</p>
<p><b>Design Notes:</b> Most alerts &amp; data storage <p><b>Design Notes:</b> Most alerts &amp; data storage
@ -2365,7 +2365,7 @@ next due date mm/dd/yy
&gt;&gt; - Export retrieved account data to CBB, Xfinans and QIF files &gt;&gt; - Export retrieved account data to CBB, Xfinans and QIF files
&gt;&gt; &gt;&gt;
&gt;&gt; With a simple click to an icon on my desktop, ZKA4BTX logs into &gt;&gt; With a simple click to an icon on my desktop, ZKA4BTX logs into
&gt;&gt; T-Online, gets all my account datas from several banks, and writes &gt;&gt; T-Online, gets all my account data from several banks, and writes
&gt;&gt; (adds) it to my CBB, Xfinans or GnuCash (QIF) files. &gt;&gt; (adds) it to my CBB, Xfinans or GnuCash (QIF) files.
&gt;&gt; &gt;&gt;
&gt;&gt; Another very important thing is that I can do all my transfers &gt;&gt; Another very important thing is that I can do all my transfers

View File

@ -175,7 +175,7 @@ gncs_validate (GNCSearchCoreType *fe)
if (fi->how == SEARCH_STRING_MATCHES_REGEX || if (fi->how == SEARCH_STRING_MATCHES_REGEX ||
fi->how == SEARCH_STRING_NOT_MATCHES_REGEX) fi->how == SEARCH_STRING_NOT_MATCHES_REGEX)
{ {
regex_t regexpat; /* regex patern */ regex_t regexpat; /* regex pattern */
gint regerr; gint regerr;
int flags = REG_EXTENDED; int flags = REG_EXTENDED;

View File

@ -174,7 +174,7 @@ void gxi_add_custom_enc_clicked_cb (GtkButton *button, GncXmlImportData *data);
void gxi_selected_enc_activated_cb (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, GncXmlImportData *data); void gxi_selected_enc_activated_cb (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, GncXmlImportData *data);
void gxi_remove_enc_clicked_cb (GtkButton *button, GncXmlImportData *data); void gxi_remove_enc_clicked_cb (GtkButton *button, GncXmlImportData *data);
/* Translators: Run the assistent in your language to see GTK's translation of the button labels. */ /* Translators: Run the assistant in your language to see GTK's translation of the button labels. */
static const gchar *encodings_doc_string = N_( static const gchar *encodings_doc_string = N_(
"\nThe file you are trying to load is from an older version of " "\nThe file you are trying to load is from an older version of "
"GnuCash. The file format in the older versions was missing the " "GnuCash. The file format in the older versions was missing the "

View File

@ -2134,7 +2134,7 @@ gnc_account_cascade_color_dialog (GtkWidget *window, Account *account)
GdkRGBA color; GdkRGBA color;
gint response; gint response;
// check if we actualy do have sub accounts // check if we actually do have sub accounts
g_return_if_fail (gnc_account_n_children (account) > 0); g_return_if_fail (gnc_account_n_children (account) > 0);
builder = gtk_builder_new(); builder = gtk_builder_new();

View File

@ -43,7 +43,7 @@
/** @name Non-Modal /** @name Non-Modal
@{ */ @{ */
/** Disply a window for editing the attributes of an existing account. /** Display a window for editing the attributes of an existing account.
* *
* @param parent The widget on which to parent the dialog. * @param parent The widget on which to parent the dialog.
* *
@ -53,7 +53,7 @@
void gnc_ui_edit_account_window (GtkWindow *parent, Account *account); void gnc_ui_edit_account_window (GtkWindow *parent, Account *account);
/** Disply a window for creating a new account. This function will /** Display a window for creating a new account. This function will
* also initially set the parent account of the new account to what * also initially set the parent account of the new account to what
* the caller specified. The user is free, however, to choose any * the caller specified. The user is free, however, to choose any
* parent account they wish. * parent account they wish.
@ -71,7 +71,7 @@ void gnc_ui_new_account_window (GtkWindow *parent,
QofBook *book, Account *parent_acct); QofBook *book, Account *parent_acct);
/** Disply a window for creating a new account. This function will /** Display a window for creating a new account. This function will
* restrict the available account type values to the list specified * restrict the available account type values to the list specified
* by the caller. * by the caller.
* *
@ -93,7 +93,7 @@ void gnc_ui_new_account_with_types (GtkWindow *parent, QofBook *book,
/** @name Modal /** @name Modal
@{ */ @{ */
/** Disply a modal window for creating a new account /** Display a modal window for creating a new account
* *
* @param parent The widget on which to parent the dialog. * @param parent The widget on which to parent the dialog.
* *
@ -103,7 +103,7 @@ void gnc_ui_new_account_with_types (GtkWindow *parent, QofBook *book,
Account * gnc_ui_new_accounts_from_name_window (GtkWindow *parent, Account * gnc_ui_new_accounts_from_name_window (GtkWindow *parent,
const char *name); const char *name);
/** Disply a modal window for creating a new account. This function /** Display a modal window for creating a new account. This function
* will restrict the available account type values to the list * will restrict the available account type values to the list
* specified by the caller. * specified by the caller.
* *
@ -151,7 +151,7 @@ Account * gnc_ui_new_accounts_from_name_with_defaults (GtkWindow *parent,
Account * parent_acct); Account * parent_acct);
/* /*
* register a callback that get's called when the account has changed * register a callback that gets called when the account has changed
* so significantly that you need to destroy yourself. In particular * so significantly that you need to destroy yourself. In particular
* this is used by the ledger display to destroy ledgers when the * this is used by the ledger display to destroy ledgers when the
* account type has changed. * account type has changed.

View File

@ -1209,7 +1209,7 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_widget_set_halign (GTK_WIDGET(frame), GTK_ALIGN_FILL); gtk_widget_set_halign (GTK_WIDGET(frame), GTK_ALIGN_FILL);
gtk_widget_set_hexpand (GTK_WIDGET(frame), TRUE); gtk_widget_set_hexpand (GTK_WIDGET(frame), TRUE);
/* Create the verticle button box */ /* Create the vertical button box */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE); gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_container_add (GTK_CONTAINER (frame), vbox);

View File

@ -149,7 +149,7 @@ gnc_restore_window_size(const char *group, GtkWindow *window, GtkWindow *parent)
if (wpos[1] - monitor_size.y + wsize[1] > monitor_size.y + monitor_size.height) if (wpos[1] - monitor_size.y + wsize[1] > monitor_size.y + monitor_size.height)
wpos[1] = monitor_size.y + monitor_size.height - wsize[1]; wpos[1] = monitor_size.y + monitor_size.height - wsize[1];
/* make sure the cordinates have not left the monitor */ /* make sure the coordinates have not left the monitor */
if (wpos[0] < monitor_size.x) if (wpos[0] < monitor_size.x)
wpos[0] = monitor_size.x; wpos[0] = monitor_size.x;
@ -292,7 +292,7 @@ gnc_window_adjust_for_screen(GtkWindow * window)
if (wpos[1] - monitor_size.y + height > monitor_size.y + monitor_size.height) if (wpos[1] - monitor_size.y + height > monitor_size.y + monitor_size.height)
wpos[1] = monitor_size.y + monitor_size.height - height; wpos[1] = monitor_size.y + monitor_size.height - height;
/* make sure the cordinates have not left the monitor */ /* make sure the coordinates have not left the monitor */
if (wpos[0] < monitor_size.x) if (wpos[0] < monitor_size.x)
wpos[0] = monitor_size.x; wpos[0] = monitor_size.x;

View File

@ -39,7 +39,7 @@
#include "dialog-options.h" #include "dialog-options.h"
/** Load a gtk resource configuration file to customize gtk /** Load a gtk resource configuration file to customize gtk
* appearance and behviour. * appearance and behaviour.
*/ */
void gnc_add_css_file (void); void gnc_add_css_file (void);

View File

@ -100,7 +100,7 @@ void gnc_keyring_set_password ( const gchar *access_method,
* @return a boolean indicating whether or not a valid password * @return a boolean indicating whether or not a valid password
* has been retrieved. The function will return FALSE * has been retrieved. The function will return FALSE
* when the user explicitly cancels the password dialog or * when the user explicitly cancels the password dialog or
* if it wasn't called properly. Otherwise it wil return * if it wasn't called properly. Otherwise it will return
* TRUE. * TRUE.
* *
* access_method, server, port, service and user will be the parameters * access_method, server, port, service and user will be the parameters

View File

@ -364,7 +364,7 @@ void gnc_main_window_restore_default_state(GncMainWindow *window);
* If any page returns a failure indication, then the function stops * If any page returns a failure indication, then the function stops
* walking pages and immediately returns a failure. * walking pages and immediately returns a failure.
* *
* @param window Whe window whose pages should be checked. * @param window When window whose pages should be checked.
* *
* @return FALSE if any page could not or would not comply, which * @return FALSE if any page could not or would not comply, which
* should cancel the pending operation. TRUE otherwise */ * should cancel the pending operation. TRUE otherwise */
@ -393,7 +393,7 @@ void gnc_main_window_all_action_set_sensitive (const gchar *action_name, gboolea
/** Find action in main window. /** Find action in main window.
* *
* @param window Whe window which should be checked for the action. * @param window When window which should be checked for the action.
* *
* @param name The name of the command to be retrieved. * @param name The name of the command to be retrieved.
* *

View File

@ -731,7 +731,7 @@ gnc_tree_model_owner_iter_n_children (GtkTreeModel *tree_model,
/* Owner lists don't have children, so always return 0, except for /* Owner lists don't have children, so always return 0, except for
* the special case this request comes for the special "root" iter * the special case this request comes for the special "root" iter
* (NULL). For that exception we return the size of the ower list. * (NULL). For that exception we return the size of the owner list.
*/ */
if (iter == NULL) if (iter == NULL)
return (gint) g_list_length (priv->owner_list); return (gint) g_list_length (priv->owner_list);

View File

@ -166,7 +166,7 @@ struct GncTreeModelSplitRegPrivate
*/ */
/*FIXME I thought this would work, it does not ????????? */ /*FIXME I thought this would work, it does not ????????? */
/* Do we need to test for a valid iter every where, is it enougth to test on make iter ? */ /* Do we need to test for a valid iter every where, is it enough to test on make iter ? */
#define VALID_ITER (model, iter) \ #define VALID_ITER (model, iter) \
(GNC_IS_TREE_MODEL_SPLIT_REG (model) && \ (GNC_IS_TREE_MODEL_SPLIT_REG (model) && \
((iter).user_data != NULL) && ((iter).user_data2 != NULL) && (model->stamp == (gint)(iter).stamp) && \ ((iter).user_data != NULL) && ((iter).user_data2 != NULL) && (model->stamp == (gint)(iter).stamp) && \
@ -687,7 +687,7 @@ gnc_tree_model_split_reg_move (GncTreeModelSplitReg *model, GncTreeModelSplitReg
priv = model->priv; priv = model->priv;
// if list is not long enougth, return // if list is not long enough, return
if (g_list_length (priv->full_tlist) < NUM_OF_TRANS*3) if (g_list_length (priv->full_tlist) < NUM_OF_TRANS*3)
return; return;
@ -958,7 +958,7 @@ gnc_tree_model_split_reg_set_data (GncTreeModelSplitReg *model, gpointer user_da
{ {
GncTreeModelSplitRegPrivate *priv; GncTreeModelSplitRegPrivate *priv;
/*FIXME This is used to get the parent window, mabe move to view */ /*FIXME This is used to get the parent window, maybe move to view */
priv = model->priv; priv = model->priv;
priv->user_data = user_data; priv->user_data = user_data;
@ -1374,7 +1374,7 @@ gnc_tree_model_split_reg_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter)
else if (tnode && snode) else if (tnode && snode)
{ {
/* Can not use snode position directly as slist length does not follow /* Can not use snode position directly as slist length does not follow
number of splits exactly, especailly if you delete a split */ number of splits exactly, especially if you delete a split */
spos = xaccTransGetSplitIndex (tnode->data, snode->data); spos = xaccTransGetSplitIndex (tnode->data, snode->data);
} }

View File

@ -96,7 +96,7 @@ GtkTreeView *gnc_tree_view_commodity_new (QofBook *book,
/** Configure (by name) the set of visible columns in an commodity tree /** Configure (by name) the set of visible columns in an commodity tree
* view. By default, only the commodity name column is show. The * view. By default, only the commodity name column is show. The
* avalible list of columns can be found in the file * available list of columns can be found in the file
* gnc-tree-view-commodity.c * gnc-tree-view-commodity.c
* *
* @param view A pointer to an commodity tree view. * @param view A pointer to an commodity tree view.
@ -136,7 +136,7 @@ typedef gboolean (*gnc_tree_view_commodity_cm_filter_func)(gnc_commodity*, gpoin
* thinks should possibly show. The filter may perform any actions * thinks should possibly show. The filter may perform any actions
* necessary on the commodity to decide whether it should be shown or * necessary on the commodity to decide whether it should be shown or
* not. (I.E. Check type, placeholder status, etc.) If the filter * not. (I.E. Check type, placeholder status, etc.) If the filter
* returns TRUE then the commodity wil be displayed. * returns TRUE then the commodity will be displayed.
* *
* @param view A pointer to an commodity tree view. * @param view A pointer to an commodity tree view.
* *

View File

@ -121,7 +121,7 @@ void gnc_tree_view_price_add_kvp_column (GncTreeViewPrice *view,
* thinks should possibly show. The filter may perform any actions * thinks should possibly show. The filter may perform any actions
* necessary on the price to decide whether it should be shown or * necessary on the price to decide whether it should be shown or
* not. (I.E. Check type, placeholder status, etc.) If the filter * not. (I.E. Check type, placeholder status, etc.) If the filter
* returns TRUE then the price wil be displayed. * returns TRUE then the price will be displayed.
* *
* @param price_view A pointer to an price tree view. * @param price_view A pointer to an price tree view.
* *

View File

@ -865,7 +865,7 @@ gnc_tree_view_split_reg_set_format (GncTreeViewSplitReg *view)
priv->expanded = FALSE; priv->expanded = FALSE;
LEAVE("#### Single line foramt ####"); LEAVE("#### Single line format ####");
} }
if (model->use_double_line) if (model->use_double_line)
@ -929,7 +929,7 @@ gnc_tree_view_split_reg_format_trans (GncTreeViewSplitReg *view, Transaction *tr
{ {
gtk_tree_view_collapse_row (GTK_TREE_VIEW (view), spath); gtk_tree_view_collapse_row (GTK_TREE_VIEW (view), spath);
priv->expanded = FALSE; priv->expanded = FALSE;
LEAVE("#### Single line transaction foramt ####"); LEAVE("#### Single line transaction format ####");
} }
if ((model->use_double_line) && (model->style != REG2_STYLE_JOURNAL)) if ((model->use_double_line) && (model->style != REG2_STYLE_JOURNAL))
@ -1498,7 +1498,7 @@ gtv_sr_cdf0 (GtkTreeViewColumn *col, GtkCellRenderer *cell, GtkTreeModel *s_mode
editable = (read_only == TRUE) ? FALSE : editable; editable = (read_only == TRUE) ? FALSE : editable;
/* This will remove the calander buttons if FALSE */ /* This will remove the calendar buttons if FALSE */
g_object_set (cell, "use_buttons", view->priv->show_calendar_buttons, NULL ); g_object_set (cell, "use_buttons", view->priv->show_calendar_buttons, NULL );
g_object_set (cell, "text", datebuff, "editable", editable, NULL); g_object_set (cell, "text", datebuff, "editable", editable, NULL);
break; break;
@ -4491,7 +4491,7 @@ gtv_sr_edited_normal_cb (GtkCellRendererText *cell, const gchar *path_string,
// Set the split parent trans // Set the split parent trans
xaccSplitSetParent (split, trans); xaccSplitSetParent (split, trans);
// If we are at trasaction level, column is value, split level is amount // If we are at transaction level, column is value, split level is amount
if (viewcol == COL_AMTVAL) if (viewcol == COL_AMTVAL)
{ {
gnc_tree_util_set_number_for_input (view, trans, split, input, COL_AMTVAL); gnc_tree_util_set_number_for_input (view, trans, split, input, COL_AMTVAL);

View File

@ -449,18 +449,18 @@ void
gnc_tree_view_keynav (GncTreeView *view, GtkTreeViewColumn **col, gnc_tree_view_keynav (GncTreeView *view, GtkTreeViewColumn **col,
GtkTreePath *path, GdkEventKey *event); GtkTreePath *path, GdkEventKey *event);
/* Returns TRUE if path is a vaid path for the treeview */ /* Returns TRUE if path is a valid path for the treeview */
gboolean gboolean
gnc_tree_view_path_is_valid (GncTreeView *view, GtkTreePath *path); gnc_tree_view_path_is_valid (GncTreeView *view, GtkTreePath *path);
/** Setup a callback for when the user starts editing so appropiate actions can be taken /** Setup a callback for when the user starts editing so appropriate actions can be taken
* like disable the actions delete menu option. * like disable the actions delete menu option.
*/ */
void void
gnc_tree_view_set_editing_started_cb (GncTreeView *view, gnc_tree_view_set_editing_started_cb (GncTreeView *view,
GFunc editing_started_cb, gpointer editing_cb_data); GFunc editing_started_cb, gpointer editing_cb_data);
/** Setup a callback for when the user finishes editing so appropiate actions can be taken /** Setup a callback for when the user finishes editing so appropriate actions can be taken
* like enable the actions delete menu option. * like enable the actions delete menu option.
*/ */
void void

View File

@ -1,5 +1,5 @@
/********************************************************************\ /********************************************************************\
* assistant-acct-period.c - accouting period assistant for GnuCash * * assistant-acct-period.c - accounting period assistant for GnuCash*
* Copyright (C) 2001 Gnumatic, Inc. * * Copyright (C) 2001 Gnumatic, Inc. *
* Copyright (C) 2001 Dave Peticolas <dave@krondo.com> * * Copyright (C) 2001 Dave Peticolas <dave@krondo.com> *
* Copyright (C) 2003 Linas Vepstas <linas@linas.org> * * Copyright (C) 2003 Linas Vepstas <linas@linas.org> *
@ -365,7 +365,7 @@ ap_assistant_book_prepare (GtkAssistant *assistant, gpointer user_data)
/* Display the book info */ /* Display the book info */
period_text = period_text =
/* Translators: Run the assistent in your language to see GTK's translation of the button labels. */ /* Translators: Run the assistant in your language to see GTK's translation of the button labels. */
_("You have asked for a book to be created. This book " _("You have asked for a book to be created. This book "
"will contain all transactions up to midnight %s " "will contain all transactions up to midnight %s "
"(for a total of %d transactions spread over %d accounts).\n\n " "(for a total of %d transactions spread over %d accounts).\n\n "

View File

@ -597,7 +597,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )
GList *allowableAccounts; GList *allowableAccounts;
} gas_data[] = } gas_data[] =
{ {
/* These ints are the GtkGrid boundries */ /* These ints are the GtkGrid boundaries */
{ &ldd->prmAccountGAS, ldd->prmTable, TRUE, 1, 0, 1, 1, liabilityAcct }, { &ldd->prmAccountGAS, ldd->prmTable, TRUE, 1, 0, 1, 1, liabilityAcct },
{ &ldd->repAssetsFromGAS, ldd->repTable, TRUE, 1, 2, 1, 1, paymentFromAccts }, { &ldd->repAssetsFromGAS, ldd->repTable, TRUE, 1, 2, 1, 1, paymentFromAccts },
{ &ldd->repPrincToGAS, ldd->repTable, TRUE, 1, 3, 1, 1, paymentToAccts }, { &ldd->repPrincToGAS, ldd->repTable, TRUE, 1, 3, 1, 1, paymentToAccts },
@ -656,7 +656,7 @@ gnc_loan_assistant_create( LoanAssistantData *ldd )
int left, top, width, height; int left, top, width, height;
} gde_data[] = } gde_data[] =
{ {
/* These ints are the GtkGrid boundries */ /* These ints are the GtkGrid boundaries */
{ &ldd->prmStartDateGDE, ldd->prmTable, 1, 4, 1, 1 }, { &ldd->prmStartDateGDE, ldd->prmTable, 1, 4, 1, 1 },
{ &ldd->revStartDate, ldd->revTable, 1, 0, 1, 1 }, { &ldd->revStartDate, ldd->revTable, 1, 0, 1, 1 },
{ &ldd->revEndDate, ldd->revTable, 1, 1, 1, 1 }, { &ldd->revEndDate, ldd->revTable, 1, 1, 1, 1 },

View File

@ -520,7 +520,7 @@ gnc_simple_combo_make (GtkComboBox *cbox, QofBook *book,
/* Use a list available billing terms to fill the model of /* Use a list available billing terms to fill the model of
* the combobox passed in. If none_ok is true, then add "none" as a * the combobox passed in. If none_ok is true, then add "none" as a
* choice (with data set to NULL).. If inital_choice is non-NULL, * choice (with data set to NULL).. If initial_choice is non-NULL,
* then that will be the default option setting when the menu is * then that will be the default option setting when the menu is
* created. * created.
*/ */

View File

@ -71,7 +71,7 @@ Account * gnc_account_select_combo_get_active (GtkWidget *combo);
/* Create a combo box of available billing terms based on /* Create a combo box of available billing terms based on
* the combo box If none_ok is true, then add "none" as a * the combo box If none_ok is true, then add "none" as a
* choice (with data set to NULL). If inital_choice is non-NULL, * choice (with data set to NULL). If initial_choice is non-NULL,
* then that will be the default option setting when the menu is * then that will be the default option setting when the menu is
* created. * created.
* *

View File

@ -2591,7 +2591,7 @@ gnc_invoice_window_new_invoice (GtkWindow *parent, InvoiceDialogType dialog_type
iw->type_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_choice_hbox")); iw->type_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_choice_hbox"));
iw->type_choice = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_invoice")); iw->type_choice = GTK_WIDGET (gtk_builder_get_object (builder, "dialog_type_invoice"));
/* The default GUI lables are for invoices, so change them if it isn't. */ /* The default GUI labels are for invoices, so change them if it isn't. */
owner_type = gncOwnerGetType (&iw->owner); owner_type = gncOwnerGetType (&iw->owner);
switch(owner_type) switch(owner_type)
{ {

View File

@ -962,7 +962,7 @@ gnc_sxed_save_sx( GncSxEditorDialog *sxed )
autocreateState = gtk_toggle_button_get_active( sxed->autocreateOpt ); autocreateState = gtk_toggle_button_get_active( sxed->autocreateOpt );
notifyState = gtk_toggle_button_get_active( sxed->notifyOpt ); notifyState = gtk_toggle_button_get_active( sxed->notifyOpt );
/* "Notify" only makes sense if AutoCreate is actived; /* "Notify" only makes sense if AutoCreate is activated;
* enforce that here. */ * enforce that here. */
xaccSchedXactionSetAutoCreate( sxed->sx, xaccSchedXactionSetAutoCreate( sxed->sx,
autocreateState, autocreateState,

View File

@ -933,7 +933,7 @@ gnc_sxed_save_sx (GncSxEditorDialog2 *sxed )
autocreateState = gtk_toggle_button_get_active (sxed->autocreateOpt); autocreateState = gtk_toggle_button_get_active (sxed->autocreateOpt);
notifyState = gtk_toggle_button_get_active (sxed->notifyOpt); notifyState = gtk_toggle_button_get_active (sxed->notifyOpt);
/* "Notify" only makes sense if AutoCreate is actived; /* "Notify" only makes sense if AutoCreate is activated;
* enforce that here. */ * enforce that here. */
xaccSchedXactionSetAutoCreate (sxed->sx, xaccSchedXactionSetAutoCreate (sxed->sx,
autocreateState, autocreateState,
@ -1773,7 +1773,7 @@ gnc_ui_sx_initialize2 (void) //FIXME need to remove the 2 when live
gnc_hook_add_dangler (HOOK_BOOK_OPENED, gnc_hook_add_dangler (HOOK_BOOK_OPENED,
(GFunc)gnc_sx_sxsincelast_book_opened, NULL); (GFunc)gnc_sx_sxsincelast_book_opened, NULL);
/* Add page to preferences page for Sheduled Transactions */ /* Add page to preferences page for Scheduled Transactions */
/* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */ /* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
gnc_preferences_add_page ("dialog-sx.glade", gnc_preferences_add_page ("dialog-sx.glade",
"create_days_adj,remind_days_adj,sx_prefs", "create_days_adj,remind_days_adj,sx_prefs",

View File

@ -934,7 +934,7 @@ gnc_tax_info_account_changed_cb (GtkTreeSelection *selection,
case 1: case 1:
/* Get the account. This view is set for multiple selection, so we /* Get the account. This view is set for multiple selection, so we
can only get a list of accounts. 1-25-19: The dialog does not work can only get a list of accounts. 1-25-19: The dialog does not work
for multipe accounts so it was changed to single selection */ for multiple accounts so it was changed to single selection */
view = GNC_TREE_VIEW_ACCOUNT(ti_dialog->account_treeview); view = GNC_TREE_VIEW_ACCOUNT(ti_dialog->account_treeview);
accounts = gnc_tree_view_account_get_selected_accounts (view); accounts = gnc_tree_view_account_get_selected_accounts (view);
if (accounts == NULL) if (accounts == NULL)

View File

@ -880,7 +880,7 @@ budget_accum_helper(Account* account, gpointer data)
/** \brief Function to calculate the accumulated budget amount in a given account at a specified period number. /** \brief Function to calculate the accumulated budget amount in a given account at a specified period number.
This function uses the \ref budget_accum_helper to calculate the accumulated budget amount in a given budget account for a specified period number. If the acocunt does not have children, then it simply returns the balance of the account. This function uses the \ref budget_accum_helper to calculate the accumulated budget amount in a given budget account for a specified period number. If the account does not have children, then it simply returns the balance of the account.
*/ */
static gnc_numeric static gnc_numeric
gbv_get_accumulated_budget_amount(GncBudget* budget, Account* account, guint period_num) gbv_get_accumulated_budget_amount(GncBudget* budget, Account* account, guint period_num)

View File

@ -1408,7 +1408,7 @@ gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPag
g_object_set_data(G_OBJECT(dialog), DELETE_DIALOG_FILTER, filter); g_object_set_data(G_OBJECT(dialog), DELETE_DIALOG_FILTER, filter);
g_object_set_data(G_OBJECT(dialog), DELETE_DIALOG_ACCOUNT, account); g_object_set_data(G_OBJECT(dialog), DELETE_DIALOG_ACCOUNT, account);
// Add the account selectors and enable sections as appropiate // Add the account selectors and enable sections as appropriate
// setup transactions selector // setup transactions selector
trans_mas = gppat_setup_account_selector (builder, dialog, "trans_mas_hbox", DELETE_DIALOG_TRANS_MAS); trans_mas = gppat_setup_account_selector (builder, dialog, "trans_mas_hbox", DELETE_DIALOG_TRANS_MAS);

View File

@ -1294,7 +1294,7 @@ gnc_plugin_page_register_create_widget (GncPluginPage *plugin_page)
gnc_ppr_update_status_query (page); gnc_ppr_update_status_query (page);
gnc_ppr_update_date_query (page); gnc_ppr_update_date_query (page);
/* Now do the refresh if this is a new page instaed of restore */ /* Now do the refresh if this is a new page instead of restore */
if (create_new_page) if (create_new_page)
{ {
priv->enable_refresh = TRUE; priv->enable_refresh = TRUE;
@ -2774,7 +2774,7 @@ get_filter_times(GncPluginPageRegister *page)
* function is responsible for setting the sensitivity of the widgets * function is responsible for setting the sensitivity of the widgets
* controlled by each radio button choice and updating the time * controlled by each radio button choice and updating the time
* limitation on the register query. This is handled by a helper * limitation on the register query. This is handled by a helper
* function as potentialy all widgets will need to be examined. * function as potentially all widgets will need to be examined.
* *
* @param button A pointer to the "select range" radio button. * @param button A pointer to the "select range" radio button.
* *
@ -2825,7 +2825,7 @@ gnc_plugin_page_register_filter_select_range_cb (GtkRadioButton *button,
/** This function is called when the "number of days" spin button is /** This function is called when the "number of days" spin button is
* changed which is then saved and updates the time limitation on * changed which is then saved and updates the time limitation on
* the register query. This is handled by a helper function as * the register query. This is handled by a helper function as
* potentialy all widgets will need to be examined. * potentially all widgets will need to be examined.
* *
* @param button A pointer to the "number of days" spin button. * @param button A pointer to the "number of days" spin button.
* *
@ -3837,7 +3837,7 @@ gnc_plugin_page_register_cmd_view_sort_by (GtkAction *action,
if (priv->sd.save_order == TRUE) if (priv->sd.save_order == TRUE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
// hide the save button if appropiate // hide the save button if appropriate
gtk_widget_set_visible (GTK_WIDGET(button), gtk_widget_set_visible (GTK_WIDGET(button),
gnc_plugin_page_register_show_fs_save (page)); gnc_plugin_page_register_show_fs_save (page));
@ -3922,7 +3922,7 @@ gnc_plugin_page_register_cmd_view_filter_by (GtkAction *action,
if (priv->fd.save_filter == TRUE) if (priv->fd.save_filter == TRUE)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
// hide the save button if appropiate // hide the save button if appropriate
gtk_widget_set_visible (GTK_WIDGET(button), gtk_widget_set_visible (GTK_WIDGET(button),
gnc_plugin_page_register_show_fs_save (page)); gnc_plugin_page_register_show_fs_save (page));
@ -4789,7 +4789,7 @@ gnc_plugin_page_register_close_cb (gpointer user_data)
/** This function is called when an account has been edited and an /** This function is called when an account has been edited and an
* "extreme" change has been made to it. (E.G. Changing from a * "extreme" change has been made to it. (E.G. Changing from a
* credit card account to an expense account. This rouine is * credit card account to an expense account. This routine is
* responsible for finding all open registers containing the account * responsible for finding all open registers containing the account
* and closing them. * and closing them.
* *

View File

@ -3929,7 +3929,7 @@ gnc_plugin_page_register2_close_cb (gpointer user_data)
/** This function is called when an account has been edited and an /** This function is called when an account has been edited and an
* "extreme" change has been made to it. (E.G. Changing from a * "extreme" change has been made to it. (E.G. Changing from a
* credit card account to an expense account. This rouine is * credit card account to an expense account. This routine is
* responsible for finding all open registers containing the account * responsible for finding all open registers containing the account
* and closing them. * and closing them.
* *

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright ${GNC_VCS_REV_YEAR} Multiple Authors, see included AUTHORS file. --> <!-- Copyright ${GNC_VCS_REV_YEAR} Multiple Authors, see included AUTHORS file. -->
<component> <component type="desktop-application">
<id>org.gnucash.GnuCash</id> <id>org.gnucash.GnuCash</id>
<name>GnuCash</name> <name>GnuCash</name>
<summary>Manage your finances, accounts, and investments</summary> <summary>Manage your finances, accounts, and investments</summary>

View File

@ -30,7 +30,7 @@
<object class="GtkLabel" id="start_label"> <object class="GtkLabel" id="start_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Run the assistent in your language to see GTK's translation of the button labels."> <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">
This assistant will help you import Accounts from a file. This assistant will help you import Accounts from a file.
The file must be in the same format as that exported as this is a fixed format import which can be seen by looking at a file created by using the "Export Account Tree to CSV" export menu option. The file must be in the same format as that exported as this is a fixed format import which can be seen by looking at a file created by using the "Export Account Tree to CSV" export menu option.

View File

@ -62,7 +62,7 @@ There is an option for specifying the start row, end row and an option to skip a
Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets.
This operation is not reversable, so make sure you have a working backup. This operation is not reversible, so make sure you have a working backup.
Click on "Next" to proceed or "Cancel" to Abort Import.</property> Click on "Next" to proceed or "Cancel" to Abort Import.</property>
<property name="wrap">True</property> <property name="wrap">True</property>

View File

@ -39,7 +39,7 @@
<object class="GtkLabel" id="start_page"> <object class="GtkLabel" id="start_page">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Run the assistent in your language to see GTK's translation of the button labels.">GnuCash can import financial data from QIF (Quicken Interchange Format) files written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs. <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">GnuCash can import financial data from QIF (Quicken Interchange Format) files written by Quicken/QuickBooks, MS Money, Moneydance, and many other programs.
The import process has several steps. Your GnuCash accounts will not be changed until you click "Apply" at the end of the process. The import process has several steps. Your GnuCash accounts will not be changed until you click "Apply" at the end of the process.
@ -63,7 +63,7 @@ Click "Next" to start loading your QIF data, or "Cancel" to abort the process. <
<object class="GtkLabel" id="label822"> <object class="GtkLabel" id="label822">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Run the assistent in your language to see GTK's translation of the button labels.">Please select a file to load. When you click "Next", the file will be loaded and analyzed. You may need to answer some questions about the account(s) in the file. <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">Please select a file to load. When you click "Next", the file will be loaded and analyzed. You may need to answer some questions about the account(s) in the file.
You will have the opportunity to load as many files as you wish, so don't worry if your data is in multiple files. You will have the opportunity to load as many files as you wish, so don't worry if your data is in multiple files.
</property> </property>
@ -451,7 +451,7 @@ Please enter a name for the account. If the file was exported from another accou
<object class="GtkLabel" id="label816"> <object class="GtkLabel" id="label816">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Run the assistent in your language to see GTK's translation of the button labels.">Click "Load another file" if you have more data to import at this time. Do this if you have saved your accounts to separate QIF files. <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">Click "Load another file" if you have more data to import at this time. Do this if you have saved your accounts to separate QIF files.
Click "Next" to finish loading files and move to the next step of the QIF import process. </property> Click "Next" to finish loading files and move to the next step of the QIF import process. </property>
<property name="wrap">True</property> <property name="wrap">True</property>
@ -1222,7 +1222,7 @@ If you don't see your exchange listed, or none of the available choices are appr
<object class="GtkLabel" id="label847694"> <object class="GtkLabel" id="label847694">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Run the assistent in your language to see GTK's translation of the button labels."> <property name="label" translatable="yes" comments="Run the assistant in your language to see GTK's translation of the button labels.">
If you are importing a QIF file from a bank or other financial institution, some of the transactions may already exist in your GnuCash accounts. To avoid duplication, GnuCash has tried to identify matches and needs your help to review them. If you are importing a QIF file from a bank or other financial institution, some of the transactions may already exist in your GnuCash accounts. To avoid duplication, GnuCash has tried to identify matches and needs your help to review them.
On the next page you will be shown a list of imported transactions. As you select each one, a list of possible matches will be shown below it. If you find a correct match, click on it. Your selection will be confirmed by a check mark in the "Match?" column. On the next page you will be shown a list of imported transactions. As you select each one, a list of possible matches will be shown below it. If you find a correct match, click on it. Your selection will be confirmed by a check mark in the "Match?" column.

View File

@ -107,7 +107,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="qif_default_transation_status"> <object class="GtkLabel" id="qif_default_transaction_status">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>

View File

@ -53,7 +53,7 @@ Press "Cancel" if you do not wish to setup any Online Banking connection now.
Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets.
This operation is not reversable, so make sure you have a working backup. This operation is not reversible, so make sure you have a working backup.
Click on "Next" to proceed or "Cancel" to Abort Import.</property> Click on "Next" to proceed or "Cancel" to Abort Import.</property>
<property name="wrap">True</property> <property name="wrap">True</property>

View File

@ -159,7 +159,8 @@ gnc_AB_BANKING_new(void)
api = AB_Banking_new("gnucash", NULL, 0); api = AB_Banking_new("gnucash", NULL, 0);
g_return_val_if_fail(api, NULL); g_return_val_if_fail(api, NULL);
#if AQB_HAS_RUNTIME_CONFIG #if AQBANKING_VERSION_INT >= 59925 \
|| (AQBANKING_VERSION_INT >= 50709 && AQBANKING_VERSION_INT < 59900)
/* These two values must be set because newest bank regulation requires /* These two values must be set because newest bank regulation requires
the bank servers to require it. The string itself results from our the bank servers to require it. The string itself results from our
registration with the German bank association at registration with the German bank association at
@ -379,10 +380,13 @@ gchar *
gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx) gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
{ {
#ifdef AQBANKING6 #ifdef AQBANKING6
const char* ab_purpose; # if AQBANKING_VERSION_INT < 59929
#else # error "You are using an old beta version of aqbanking > 5.99.0 but < 5.99.29, please upgrade to the latest 5.99.29 or newer."
const GWEN_STRINGLIST *ab_purpose;
# endif # endif
#else
const /* only const in aqbanking < 5.99 */
#endif
GWEN_STRINGLIST *ab_purpose;
const char *ab_transactionText = NULL; const char *ab_transactionText = NULL;
gchar *gnc_description = NULL; gchar *gnc_description = NULL;
@ -398,17 +402,25 @@ gnc_ab_get_purpose(const AB_TRANSACTION *ab_trans, gboolean is_ofx)
gnc_description = g_strdup(ab_transactionText); gnc_description = g_strdup(ab_transactionText);
} }
ab_purpose = AB_Transaction_GetPurpose(ab_trans); ab_purpose =
#ifdef AQBANKING6 #ifdef AQBANKING6
gnc_description = g_strdup(ab_purpose ? ab_purpose : ""); /* With aqbanking-5.99.29, the identical function as before is now available under this new name. */
AB_Transaction_GetPurposeAsStringList
#else #else
AB_Transaction_GetPurpose
#endif
(ab_trans);
if (ab_purpose) if (ab_purpose)
GWEN_StringList_ForEach(ab_purpose, join_ab_strings_cb, GWEN_StringList_ForEach(ab_purpose, join_ab_strings_cb,
&gnc_description); &gnc_description);
#ifdef AQBANKING6
/* With aqbanking>=5.99, the return value must now be free'd */
GWEN_StringList_free(ab_purpose);
#endif
if (!gnc_description) if (!gnc_description)
gnc_description = g_strdup(""); gnc_description = g_strdup("");
#endif
return gnc_description; return gnc_description;
} }
@ -1240,7 +1252,7 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
#ifdef AQBANKING6 #ifdef AQBANKING6
bankmsg = AB_Message_List_Next(bankmsg); bankmsg = AB_Message_List_Next(bankmsg);
#else #else
bankmsg = AB_ImExporterContext_GetNextMessage(context); // The interator is incremented within aqbanking bankmsg = AB_ImExporterContext_GetNextMessage(context); // The iterator is incremented within aqbanking
#endif #endif
} }
} }

View File

@ -881,7 +881,7 @@ hide_progress(GncGWENGui *gui, Progress *progress)
} }
else else
{ {
/* Last other progress to be hided */ /* Last other progress to be hidden */
gtk_grid_remove_row (GTK_GRID(gui->entries_grid), gtk_grid_remove_row (GTK_GRID(gui->entries_grid),
OTHER_ENTRIES_ROW_OFFSET); OTHER_ENTRIES_ROW_OFFSET);
gtk_widget_destroy(box); gtk_widget_destroy(box);

View File

@ -1,6 +1,6 @@
Things and thoughts AKA the TODO and README pages. Things and thoughts AKA the TODO and README pages.
BAD THINGS BAOUT THE IMPORTER BAD THINGS ABOUT THE IMPORTER
The importer should be limited to a single invoice per file, perhaps creating a new invoice number each time. The importer should be limited to a single invoice per file, perhaps creating a new invoice number each time.
Too many fields, and too inflexible field format. Too many fields, and too inflexible field format.

View File

@ -199,7 +199,7 @@ csv_export_file_chooser_selection_changed_cb (GtkFileChooser *chooser,
/******************************************************* /*******************************************************
* csv_export_sep_cb * csv_export_sep_cb
* *
* call back for type of separartor required * call back for type of separator required
*******************************************************/ *******************************************************/
void void
csv_export_sep_cb (GtkWidget *radio, gpointer user_data) csv_export_sep_cb (GtkWidget *radio, gpointer user_data)

View File

@ -89,7 +89,7 @@ gchar *csv_test_field_string (CsvExportInfo *info, const gchar *string_in)
g_strfreev (parts); g_strfreev (parts);
/* Check for separator string and \n and " in field, /* Check for separator string and \n and " in field,
if so quote field if not allready quoted */ if so quote field if not already quoted */
if (g_strrstr (string_parts, info->separator_str) != NULL) if (g_strrstr (string_parts, info->separator_str) != NULL)
need_quote = TRUE; need_quote = TRUE;
if (g_strrstr (string_parts, "\n") != NULL) if (g_strrstr (string_parts, "\n") != NULL)

View File

@ -273,7 +273,7 @@ static void csv_import_assistant_enable_account_forward (CsvImportInfo *info)
/******************************************************* /*******************************************************
* csv_import_sep_cb * csv_import_sep_cb
* *
* call back for type of separartor required * call back for type of separator required
*******************************************************/ *******************************************************/
void csv_import_sep_cb (GtkWidget *radio, gpointer user_data) void csv_import_sep_cb (GtkWidget *radio, gpointer user_data)
{ {

View File

@ -66,7 +66,7 @@ static QofLogModule log_module = GNC_MOD_ASSISTANT;
/* Note on memory management /* Note on memory management
* *
* The same notes as for assistant-csv-trans-import.cpp appy to * The same notes as for assistant-csv-trans-import.cpp apply to
* this assistant as well. Please read the note at the top of that * this assistant as well. Please read the note at the top of that
* file to understand important details about the use of several * file to understand important details about the use of several
* memory management models in one file. * memory management models in one file.

View File

@ -29,7 +29,7 @@
#define GNC_ASSISTANT_CSV_IMPORT_TRANS_H #define GNC_ASSISTANT_CSV_IMPORT_TRANS_H
/** The gnc_file_csv_trans_import() will let the user import thte /** The gnc_file_csv_trans_import() will let the user import the
* account tree or transactions to a delimited file. * account tree or transactions to a delimited file.
*/ */
void gnc_file_csv_trans_import (void); void gnc_file_csv_trans_import (void);

View File

@ -79,7 +79,7 @@ enum parse_line_cols {
}; };
/** Tuple to hold all internal state for one parsed line. The contents of each /** Tuple to hold all internal state for one parsed line. The contents of each
* colummn is described by the parse_line_cols enum. This enum should be used * column is described by the parse_line_cols enum. This enum should be used
* with std::get to access the columns. */ * with std::get to access the columns. */
using parse_line_t = std::tuple<StrVec, using parse_line_t = std::tuple<StrVec,
std::string, std::string,

View File

@ -89,7 +89,7 @@ int GncCsvTokenizer::tokenize()
// is by checking whether the character in front or after are either // is by checking whether the character in front or after are either
// a field separator or the beginning or end of of the string. // a field separator or the beginning or end of of the string.
if (!(((bs_pos == 0) || // quotes are at start of line if (!(((bs_pos == 0) || // quotes are at start of line
(m_sep_str.find (line[bs_pos-1]) != std::string::npos)) // quotes preceeded by field separator (m_sep_str.find (line[bs_pos-1]) != std::string::npos)) // quotes preceded by field separator
&& &&
((bs_pos + 2 >= line.length()) || // quotes are at end of line ((bs_pos + 2 >= line.length()) || // quotes are at end of line
(m_sep_str.find (line[bs_pos+2]) != std::string::npos)))) // quotes followed by field separator (m_sep_str.find (line[bs_pos+2]) != std::string::npos)))) // quotes followed by field separator

View File

@ -40,7 +40,7 @@ In split_to_match's parent account; for each split where date >= split_to_match.
if amount match if amount match
if transaction_online_id exists but doesn't match if transaction_online_id exists but doesn't match
add to matches using UNLIKELY (not IMPOSSIBLE, could be protocol change or prior error) add to matches using UNLIKELY (not IMPOSSIBLE, could be protocol change or prior error)
eles if memo match and date within 4 days else if memo match and date within 4 days
add to matches using PROBABLE add to matches using PROBABLE
else if date within 24 hours else if date within 24 hours
add to matches using LIKELY add to matches using LIKELY

View File

@ -100,7 +100,7 @@ static gpointer test_acct_online_id_match(Account *acct, gpointer param_online_i
/*********************************************************** /***********************************************************
* build_acct_tree * build_acct_tree
* *
* build the account tree with the custome column, online_id * build the account tree with the custom column, online_id
************************************************************/ ************************************************************/
static void static void
build_acct_tree(AccountPickerDialog *picker) build_acct_tree(AccountPickerDialog *picker)

View File

@ -127,7 +127,7 @@ gnc_commodity * gnc_import_select_commodity(const char * cusip,
it does not get overwritten - which is not consistent with the it does not get overwritten - which is not consistent with the
message - so Im adding it to do this. Looks like this is all message - so Im adding it to do this. Looks like this is all
that was needed to fix the cash value used as stock units problem that was needed to fix the cash value used as stock units problem
for pre-defined commodities which didnt have the cusip defined! */ for pre-defined commodities which didn't have the cusip defined! */
if (retval != NULL && if (retval != NULL &&
gnc_commodity_get_cusip(retval) != NULL && gnc_commodity_get_cusip(retval) != NULL &&
cusip != NULL && cusip != NULL &&

View File

@ -270,7 +270,7 @@ gnc_import_parse_numeric(const char* str, GncImportFormat fmt, gnc_numeric *val)
static int static int
fix_year(int y) fix_year(int y)
{ {
/* two-digit numbers less than "70" are interpretted to be post-2000. */ /* two-digit numbers less than "70" are interpreted to be post-2000. */
if (y < 70) if (y < 70)
return (y + 2000); return (y + 2000);

View File

@ -538,7 +538,7 @@ int ofx_proc_transaction_cb(struct OfxTransactionData data, void *user_data)
g_free(tmp); g_free(tmp);
} }
//PERR("WRITEME: GnuCash ofx_proc_transaction():Add PAYEE and ADRESS here once supported by libofx! Notes=%s\n", notes); //PERR("WRITEME: GnuCash ofx_proc_transaction():Add PAYEE and ADDRESS here once supported by libofx! Notes=%s\n", notes);
/* Ideally, gnucash should process the corrected transactions */ /* Ideally, gnucash should process the corrected transactions */
if (data.fi_id_corrected_valid) if (data.fi_id_corrected_valid)

View File

@ -282,7 +282,7 @@ void gnc_ui_qif_import_summary_page_prepare (GtkAssistant *assistant, gpointer u
* generalizes the code shared whenever any QIF -> GNC mapper is * generalizes the code shared whenever any QIF -> GNC mapper is
* updating it's LIST STORE. It asks the Scheme side to guess some account * updating it's LIST STORE. It asks the Scheme side to guess some account
* translations and then shows the account name and suggested * translations and then shows the account name and suggested
* translation in the Accounts page view (acount picker list). * translation in the Accounts page view (account picker list).
****************************************************************/ ****************************************************************/
static void static void
update_account_picker_page (QIFImportWindow * wind, SCM make_display, update_account_picker_page (QIFImportWindow * wind, SCM make_display,
@ -347,7 +347,7 @@ update_account_picker_page (QIFImportWindow * wind, SCM make_display,
gtk_tree_selection_select_path (selection, path); gtk_tree_selection_select_path (selection, path);
/* scroll the tree view so the selection is visable if there are rows */ /* scroll the tree view so the selection is visible if there are rows */
if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL(store), NULL) > 0) if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL(store), NULL) > 0)
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW(view), path, NULL, TRUE, 0.5, 0.0); gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW(view), path, NULL, TRUE, 0.5, 0.0);
gtk_tree_path_free (path); gtk_tree_path_free (path);
@ -2449,7 +2449,7 @@ gnc_ui_qif_import_account_rematch_cb (GtkButton *button, gpointer user_data)
/******************************************* /*******************************************
* Page 8 - Catagory Doc. Page Procedures * Page 8 - Category Doc. Page Procedures
*******************************************/ *******************************************/
/******************************************************************** /********************************************************************
@ -2485,7 +2485,7 @@ gnc_ui_qif_import_catagory_doc_prepare (GtkAssistant *assistant,
/****************************************** /******************************************
* Page 9 - Catagory Match Page Procedures * Page 9 - Category Match Page Procedures
******************************************/ ******************************************/
/**************************************************************** /****************************************************************
@ -3510,12 +3510,12 @@ void gnc_ui_qif_import_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
} }
else if (!g_strcmp0 (pagename, "category_doc_page")) else if (!g_strcmp0 (pagename, "category_doc_page"))
{ {
/* Current page is Catagory Doc. page */ /* Current page is Category Doc. page */
gnc_ui_qif_import_catagory_doc_prepare (assistant, user_data); gnc_ui_qif_import_catagory_doc_prepare (assistant, user_data);
} }
else if (!g_strcmp0 (pagename, "category_match_page")) else if (!g_strcmp0 (pagename, "category_match_page"))
{ {
/* Current page is Catagory Match page */ /* Current page is Category Match page */
gnc_ui_qif_import_catagory_match_prepare (assistant, user_data); gnc_ui_qif_import_catagory_match_prepare (assistant, user_data);
} }
else if (!g_strcmp0 (pagename, "memo_doc_page")) else if (!g_strcmp0 (pagename, "memo_doc_page"))

View File

@ -51,7 +51,7 @@ teardown (Fixture *fixture, gconstpointer pData)
test_clear_error_list(); test_clear_error_list();
} }
/* The exluded tests all rely on g_assert_true wich was only introduced /* The excluded tests all rely on g_assert_true which was only introduced
* in glib 2.38 */ * in glib 2.38 */
#ifdef HAVE_GLIB_2_38 #ifdef HAVE_GLIB_2_38
static void static void
@ -125,7 +125,7 @@ main (int argc, char *argv[])
qof_init(); qof_init();
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
/* The exluded tests all rely on g_assert_true wich was only introduced /* The excluded tests all rely on g_assert_true which was only introduced
* in glib 2.38 */ * in glib 2.38 */
#ifdef HAVE_GLIB_2_38 #ifdef HAVE_GLIB_2_38
GNC_TEST_ADD (suitename, "match_types", Fixture, NULL, setup, GNC_TEST_ADD (suitename, "match_types", Fixture, NULL, setup,

View File

@ -80,7 +80,7 @@ libgncmod_python_gnc_module_init(int refcount)
#endif #endif
Py_Initialize(); Py_Initialize();
PySys_SetArgv(0, &argv); PySys_SetArgv(0, &argv);
// I dont quite understand why these are loaded here // I don't quite understand why these are loaded here
// - these are python modules so should be able to just import them // - these are python modules so should be able to just import them
// in init.py // in init.py
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000

View File

@ -55,10 +55,10 @@ class Shell:
return self.globals return self.globals
def is_balanced (self, line): def is_balanced (self, line):
""" Checks line balance for brace, bracket, parenthese and string quote """ Checks line balance for brace, bracket, parentheses and string quote
This helper function checks for the balance of brace, bracket, This helper function checks for the balance of brace, bracket,
parenthese and string quote. Any unbalanced line means to wait until parentheses and string quote. Any unbalanced line means to wait until
some other lines are fed to the console. some other lines are fed to the console.
""" """

View File

@ -736,7 +736,7 @@ gnc_entry_ledger_compute_value (GncEntryLedger *ledger,
disc_type = gnc_entry_ledger_get_type (ledger, ENTRY_DISTYPE_CELL); disc_type = gnc_entry_ledger_get_type (ledger, ENTRY_DISTYPE_CELL);
disc_how = gnc_entry_ledger_get_type (ledger, ENTRY_DISHOW_CELL); disc_how = gnc_entry_ledger_get_type (ledger, ENTRY_DISHOW_CELL);
/* Bills and exp-vouchers dont have discounts */ /* Bills and exp-vouchers don't have discounts */
if (ledger->type == GNCENTRY_BILL_ENTRY || if (ledger->type == GNCENTRY_BILL_ENTRY ||
ledger->type == GNCENTRY_BILL_VIEWER || ledger->type == GNCENTRY_BILL_VIEWER ||
ledger->type == GNCENTRY_EXPVOUCHER_ENTRY || ledger->type == GNCENTRY_EXPVOUCHER_ENTRY ||

View File

@ -1769,7 +1769,7 @@ gnc_split_register_save (SplitRegister *reg, gboolean do_commit)
// transaction ever not be the current trans? // transaction ever not be the current trans?
if (xaccTransIsOpen (pending_trans)) if (xaccTransIsOpen (pending_trans))
{ {
g_warning("Impossible? commiting pending %p", pending_trans); g_warning("Impossible? committing pending %p", pending_trans);
xaccTransCommitEdit (pending_trans); xaccTransCommitEdit (pending_trans);
} }
else if (pending_trans) else if (pending_trans)
@ -1950,7 +1950,7 @@ gnc_split_register_get_account_by_name (SplitRegister *reg, BasicCell * bcell,
account = gnc_account_lookup_by_code(gnc_get_current_root_account(), name); account = gnc_account_lookup_by_code(gnc_get_current_root_account(), name);
/* if gnc_ui_new_accounts_from_name_window is used, there is a call to /* if gnc_ui_new_accounts_from_name_window is used, there is a call to
* refresh which subsequently calls this function again, thats the * refresh which subsequently calls this function again, that's the
* reason for static creating_account. */ * reason for static creating_account. */
if (!account && !creating_account) if (!account && !creating_account)

View File

@ -467,7 +467,7 @@ void gnc_split_register_void_current_trans (SplitRegister *reg,
* non-NULL. */ * non-NULL. */
void gnc_split_register_unvoid_current_trans (SplitRegister *reg); void gnc_split_register_unvoid_current_trans (SplitRegister *reg);
/** Deletes the non-transaction splits associated wih the current /** Deletes the non-transaction splits associated with the current
* cursor, if both are non-NULL. */ * cursor, if both are non-NULL. */
void gnc_split_register_empty_current_trans_except_split (SplitRegister *reg, Split *split); void gnc_split_register_empty_current_trans_except_split (SplitRegister *reg, Split *split);
void gnc_split_register_empty_current_trans (SplitRegister *reg); void gnc_split_register_empty_current_trans (SplitRegister *reg);

View File

@ -29,7 +29,7 @@
* *
* On output, the currently selected menu item is displayed. * On output, the currently selected menu item is displayed.
* On input, the user can select from a list in the pull-down menu, * On input, the user can select from a list in the pull-down menu,
* or use the keyboard to slect a menu entry by typing the first * or use the keyboard to select a menu entry by typing the first
* few menu characters. * few menu characters.
* *
* @author Created Jan 1998 Linas Vepstas * @author Created Jan 1998 Linas Vepstas

View File

@ -30,7 +30,7 @@
* keys. * keys.
* *
* On output, this cell will display a date as mm/dd/yy * On output, this cell will display a date as mm/dd/yy
* The actual date formate is compile-time configurable. * The actual date format is compile-time configurable.
* *
* hack alert -- make the display format run-time configurable, and * hack alert -- make the display format run-time configurable, and
* appropriately internationalized. * appropriately internationalized.

View File

@ -129,7 +129,7 @@ utf8_caseequal_len (const char *s1, const char *s2, guint len)
s2_bytes_len = s2_offset - s2; s2_bytes_len = s2_offset - s2;
/* Test whether the number of characters might be too small anyway /* Test whether the number of characters might be too small anyway
(dont need to examine more than bytes_len bytes to check that) */ (don't need to examine more than bytes_len bytes to check that) */
s1chars = g_utf8_strlen (s1, s1_bytes_len); s1chars = g_utf8_strlen (s1, s1_bytes_len);
s2chars = g_utf8_strlen (s2, s2_bytes_len); s2chars = g_utf8_strlen (s2, s2_bytes_len);
if ( (s1chars < len) || (s2chars < len) ) if ( (s1chars < len) || (s2chars < len) )

View File

@ -310,7 +310,7 @@ gnucash_cursor_get_type (void)
NULL, /* class_data */ NULL, /* class_data */
sizeof (GnucashCursor), sizeof (GnucashCursor),
0, /* n_preallocs */ 0, /* n_preallocs */
NULL /* instance intialization */ NULL /* instance initialization */
}; };
gnucash_cursor_type = gnucash_cursor_type =

View File

@ -891,7 +891,7 @@ gnc_item_edit_new (GnucashSheet *sheet)
item_edit->popup_toggle.tbutton); item_edit->popup_toggle.tbutton);
/* The button needs to be packed into a vertical box so that the height and position /* The button needs to be packed into a vertical box so that the height and position
* can be controlled in ealier than Gtk3.20 versions */ * can be controlled in earlier than Gtk3.20 versions */
gtk_box_pack_start (GTK_BOX(vb), item_edit->popup_toggle.ebox, gtk_box_pack_start (GTK_BOX(vb), item_edit->popup_toggle.ebox,
FALSE, FALSE, 0); FALSE, FALSE, 0);

View File

@ -300,7 +300,7 @@ gnucash_register_update_hadjustment (GtkAdjustment *adj,
gtk_widget_hide(reg->hscrollbar); gtk_widget_hide(reg->hscrollbar);
reg->hscrollbar_visible = FALSE; reg->hscrollbar_visible = FALSE;
// When sheet first loaded and the scrollbar is hidden, the space left // When sheet first loaded and the scrollbar is hidden, the space left
// is not always automaticly taken up by the sheet so queue a resize // is not always automatically taken up by the sheet so queue a resize
// when all is idle // when all is idle
g_idle_add ((GSourceFunc) gnucash_register_sheet_resize, reg); g_idle_add ((GSourceFunc) gnucash_register_sheet_resize, reg);
} }

View File

@ -245,7 +245,7 @@ static guint8 inc_intensity_byte(guint8 input, int numerator, int denominator)
} }
/** For a given RGB value, increase the color intensity for each of the three /** For a given RGB value, increase the color intensity for each of the three
colors indentically by 10 percent (i.e. make them "less black" and "more gray") colors identically by 10 percent (i.e. make them "less black" and "more gray")
and return this changed RGB value. */ and return this changed RGB value. */
static guint32 inc_intensity_10percent(guint32 argb) static guint32 inc_intensity_10percent(guint32 argb)
{ {
@ -269,7 +269,7 @@ static guint8 dec_intensity_byte(guint8 input, int numerator, int denominator)
} }
/** For a given RGB value, decrease the color intensity for each of the three /** For a given RGB value, decrease the color intensity for each of the three
colors indentically by 10 percent and return this changed RGB value. */ colors identically by 10 percent and return this changed RGB value. */
static guint32 dec_intensity_10percent(guint32 argb) static guint32 dec_intensity_10percent(guint32 argb)
{ {
// Multiply each single byte by 9/10 i.e. by 0.9 which decreases the // Multiply each single byte by 9/10 i.e. by 0.9 which decreases the

View File

@ -1709,7 +1709,7 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event)
new_virt_loc = cur_virt_loc; new_virt_loc = cur_virt_loc;
/* Don't process any keystrokes where a modifier key (Alt, /* Don't process any keystrokes where a modifier key (Alt,
* Meta, etc.) is being held down. This should't include * Meta, etc.) is being held down. This shouldn't include
* MOD2, aka NUM LOCK. */ * MOD2, aka NUM LOCK. */
if (event->state & modifiers & (GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK)) if (event->state & modifiers & (GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK))
pass_on = TRUE; pass_on = TRUE;

View File

@ -831,7 +831,7 @@
;; CAS: Previously, the exchange-fn was not optional -- we would crash ;; CAS: Previously, the exchange-fn was not optional -- we would crash
;; if it was invalid. I've changed this so that when exchange-fn is ;; if it was invalid. I've changed this so that when exchange-fn is
;; #f, #f is returned. Since #f is already returned when foreign is ;; #f, #f is returned. Since #f is already returned when foreign is
;; #f, and since any previous dependance on some behavior for the case ;; #f, and since any previous dependence on some behavior for the case
;; where exchange-fn was #f would've crashed, I think this change is ;; where exchange-fn was #f would've crashed, I think this change is
;; safe. ;; safe.
;; ;;

View File

@ -387,7 +387,7 @@ We have three different kinds of style control information available:
;; if you want to set default markup and data styles for ;; if you want to set default markup and data styles for
;; documents using this stylesheet, do it here. This ;; documents using this stylesheet, do it here. This
;; style element dosn't do anything, it's just there ;; style element doesn't do anything, it's just there
;; as an example: ;; as an example:
(gnc:html-document-set-style! ssdoc "p" 'tag "p") (gnc:html-document-set-style! ssdoc "p" 'tag "p")

View File

@ -126,7 +126,7 @@
;; the order in which they will be displayed. the function ;; the order in which they will be displayed. the function
;; must take two Account arguments and represent a total ;; must take two Account arguments and represent a total
;; ordering on Account-space. #t means to use the default ;; ordering on Account-space. #t means to use the default
;; sorting function. #f means to preform no sorting. the ;; sorting function. #f means to perform no sorting. the
;; default sorting function is gnc:account-code-less-p. ;; default sorting function is gnc:account-code-less-p.
;; ;;
;; start-date: time64 ;; start-date: time64
@ -134,17 +134,17 @@
;; the starting date of the reporting period over which to ;; the starting date of the reporting period over which to
;; report balances for this account. if start-date is #f, ;; report balances for this account. if start-date is #f,
;; will be no limit on how early a counted transaction may ;; will be no limit on how early a counted transaction may
;; ocurr. ;; occur.
;; ;;
;; end-date: time64 ;; end-date: time64
;; ;;
;; the ending date of the reporting period over which to ;; the ending date of the reporting period over which to
;; report balances for this account. if end-date is #f, there ;; report balances for this account. if end-date is #f, there
;; will be no limit on how late a counted transaction may ;; will be no limit on how late a counted transaction may
;; ocurr. note: i do not know if GnuCash, right now, supports ;; occur. note: i do not know if GnuCash, right now, supports
;; transactions in the future. so be prepared for the ;; transactions in the future. so be prepared for the
;; possibility that this may match transactions which haven't ;; possibility that this may match transactions which haven't
;; ocurred, yet. [CAS: I don't think end-date of #f works. ;; occurred, yet. [CAS: I don't think end-date of #f works.
;; It bombs.] ;; It bombs.]
;; ;;
;; report-commodity: commodity ;; report-commodity: commodity
@ -338,7 +338,7 @@
;; account-depth when depth-limit-behavior is 'flatten. ;; account-depth when depth-limit-behavior is 'flatten.
;; unlike in gnc:html-build-acct-table, the first level of ;; unlike in gnc:html-build-acct-table, the first level of
;; accounts is level 0. this means that display-depth is also ;; accounts is level 0. this means that display-depth is also
;; the number of empty cells which should preced the account ;; the number of empty cells which should precede the account
;; name in the gnc:html-table being generated. ;; name in the gnc:html-table being generated.
;; ;;
;; indented-depth: integer ;; indented-depth: integer
@ -1008,7 +1008,7 @@
;; balance and its respective report balance. note that this ;; balance and its respective report balance. note that this
;; shows report-commodity amounts twice: first as a commodity ;; shows report-commodity amounts twice: first as a commodity
;; and second in the report commodity. though this may arguably ;; and second in the report commodity. though this may arguably
;; be a bit redundant, i beleive that it makes the report more ;; be a bit redundant, i believe that it makes the report more
;; readable. ;; readable.
(let* ((table (gnc:make-html-table)) (let* ((table (gnc:make-html-table))
(spacer (gnc:make-html-table-cell)) (spacer (gnc:make-html-table-cell))

View File

@ -54,7 +54,7 @@ if (!document.createElement('canvas').getContext) {
var IE_VERSION = +navigator.userAgent.match(/MSIE ([\d.]+)?/)[1]; var IE_VERSION = +navigator.userAgent.match(/MSIE ([\d.]+)?/)[1];
/** /**
* This funtion is assigned to the <canvas> elements as element.getContext(). * This function is assigned to the <canvas> elements as element.getContext().
* @this {HTMLElement} * @this {HTMLElement}
* @return {CanvasRenderingContext2D_} * @return {CanvasRenderingContext2D_}
*/ */
@ -665,7 +665,7 @@ if (!document.createElement('canvas').getContext) {
bezierCurveTo(this, cp1, cp2, p); bezierCurveTo(this, cp1, cp2, p);
}; };
// Helper function that takes the already fixed cordinates. // Helper function that takes the already fixed coordinates.
function bezierCurveTo(self, cp1, cp2, p) { function bezierCurveTo(self, cp1, cp2, p) {
self.currentPath_.push({ self.currentPath_.push({
type: 'bezierCurveTo', type: 'bezierCurveTo',
@ -791,7 +791,7 @@ if (!document.createElement('canvas').getContext) {
contextPrototype.drawImage = function(image, var_args) { contextPrototype.drawImage = function(image, var_args) {
var dx, dy, dw, dh, sx, sy, sw, sh; var dx, dy, dw, dh, sx, sy, sw, sh;
// to find the original width we overide the width and height // to find the original width we override the width and height
var oldRuntimeWidth = image.runtimeStyle.width; var oldRuntimeWidth = image.runtimeStyle.width;
var oldRuntimeHeight = image.runtimeStyle.height; var oldRuntimeHeight = image.runtimeStyle.height;
image.runtimeStyle.width = 'auto'; image.runtimeStyle.width = 'auto';
@ -801,7 +801,7 @@ if (!document.createElement('canvas').getContext) {
var w = image.width; var w = image.width;
var h = image.height; var h = image.height;
// and remove overides // and remove overrides
image.runtimeStyle.width = oldRuntimeWidth; image.runtimeStyle.width = oldRuntimeWidth;
image.runtimeStyle.height = oldRuntimeHeight; image.runtimeStyle.height = oldRuntimeHeight;

View File

@ -1,7 +1,7 @@
Title: jqPlot Options Title: jqPlot Options
**This document is out of date. While the options described here should still be **This document is out of date. While the options described here should still be
relavent and valid, it has not been updated for many new options. Sorry for relevant and valid, it has not been updated for many new options. Sorry for
this inconvenience.** this inconvenience.**
This document describes the options available to jqPlot. These are set with the This document describes the options available to jqPlot. These are set with the
@ -37,7 +37,7 @@ options =
}, },
axesDefaults: { axesDefaults: {
show: false, // wether or not to renderer the axis. Determined automatically. show: false, // whether or not to renderer the axis. Determined automatically.
min: null, // minimum numerical value of the axis. Determined automatically. min: null, // minimum numerical value of the axis. Determined automatically.
max: null, // maximum numverical value of the axis. Determined automatically. max: null, // maximum numverical value of the axis. Determined automatically.
pad: 1.2, // a factor multiplied by the data range on the axis to give the pad: 1.2, // a factor multiplied by the data range on the axis to give the
@ -52,15 +52,15 @@ options =
mark: 'outside', // Where to put the tick mark on the axis mark: 'outside', // Where to put the tick mark on the axis
// 'outside', 'inside' or 'cross', // 'outside', 'inside' or 'cross',
showMark: true, showMark: true,
showGridline: true, // wether to draw a gridline (across the whole grid) at this tick, showGridline: true, // whether to draw a gridline (across the whole grid) at this tick,
markSize: 4, // length the tick will extend beyond the grid in pixels. For markSize: 4, // length the tick will extend beyond the grid in pixels. For
// 'cross', length will be added above and below the grid boundary, // 'cross', length will be added above and below the grid boundary,
show: true, // wether to show the tick (mark and label), show: true, // whether to show the tick (mark and label),
showLabel: true, // wether to show the text label at the tick, showLabel: true, // whether to show the text label at the tick,
formatString: '', // format string to use with the axis tick formatter formatString: '', // format string to use with the axis tick formatter
} }
showTicks: true, // wether or not to show the tick labels, showTicks: true, // whether or not to show the tick labels,
showTickMarks: true, // wether or not to show the tick marks showTickMarks: true, // whether or not to show the tick marks
}, },
axes: { axes: {
@ -79,7 +79,7 @@ options =
}, },
seriesDefaults: { seriesDefaults: {
show: true, // wether to render the series. show: true, // whether to render the series.
xaxis: 'xaxis', // either 'xaxis' or 'x2axis'. xaxis: 'xaxis', // either 'xaxis' or 'x2axis'.
yaxis: 'yaxis', // either 'yaxis' or 'y2axis'. yaxis: 'yaxis', // either 'yaxis' or 'y2axis'.
label: '', // label to use in the legend for this line. label: '', // label to use in the legend for this line.
@ -102,13 +102,13 @@ options =
markerRenderer: $.jqplot.MarkerRenderer, // renderer to use to draw the data markerRenderer: $.jqplot.MarkerRenderer, // renderer to use to draw the data
// point markers. // point markers.
markerOptions: { markerOptions: {
show: true, // wether to show data point markers. show: true, // whether to show data point markers.
style: 'filledCircle', // circle, diamond, square, filledCircle. style: 'filledCircle', // circle, diamond, square, filledCircle.
// filledDiamond or filledSquare. // filledDiamond or filledSquare.
lineWidth: 2, // width of the stroke drawing the marker. lineWidth: 2, // width of the stroke drawing the marker.
size: 9, // size (diameter, edge length, etc.) of the marker. size: 9, // size (diameter, edge length, etc.) of the marker.
color: '#666666' // color of marker, set to color of line by default. color: '#666666' // color of marker, set to color of line by default.
shadow: true, // wether to draw shadow on marker or not. shadow: true, // whether to draw shadow on marker or not.
shadowAngle: 45, // angle of the shadow. Clockwise from x axis. shadowAngle: 45, // angle of the shadow. Clockwise from x axis.
shadowOffset: 1, // offset from the line of the shadow, shadowOffset: 1, // offset from the line of the shadow,
shadowDepth: 3, // Number of strokes to make when drawing shadow. Each stroke shadowDepth: 3, // Number of strokes to make when drawing shadow. Each stroke
@ -130,7 +130,7 @@ options =
}, },
grid: { grid: {
drawGridLines: true, // wether to draw lines across the grid or not. drawGridLines: true, // whether to draw lines across the grid or not.
gridLineColor: '#cccccc' // **Color of the grid lines. gridLineColor: '#cccccc' // **Color of the grid lines.
background: '#fffdf6', // CSS color spec for background color of grid. background: '#fffdf6', // CSS color spec for background color of grid.
borderColor: '#999999', // CSS color spec for border around grid. borderColor: '#999999', // CSS color spec for border around grid.
@ -162,7 +162,7 @@ options =
barDirection: 'vertical', // vertical or horizontal. barDirection: 'vertical', // vertical or horizontal.
barWidth: null, // width of the bars. null to calculate automatically. barWidth: null, // width of the bars. null to calculate automatically.
shadowOffset: 2, // offset from the bar edge to stroke the shadow. shadowOffset: 2, // offset from the bar edge to stroke the shadow.
shadowDepth: 5, // nuber of strokes to make for the shadow. shadowDepth: 5, // number of strokes to make for the shadow.
shadowAlpha: 0.8, // transparency of the shadow. shadowAlpha: 0.8, // transparency of the shadow.
} }
}, },
@ -176,7 +176,7 @@ options =
// cursor to when over plot. // cursor to when over plot.
show: true, show: true,
showTooltip: true, // show a tooltip showing cursor position. showTooltip: true, // show a tooltip showing cursor position.
followMouse: false, // wether tooltip should follow the mouse or be stationary. followMouse: false, // whether tooltip should follow the mouse or be stationary.
tooltipLocation: 'se', // location of the tooltip either relative to the mouse tooltipLocation: 'se', // location of the tooltip either relative to the mouse
// (followMouse=true) or relative to the plot. One of // (followMouse=true) or relative to the plot. One of
// the compass directions, n, ne, e, se, etc. // the compass directions, n, ne, e, se, etc.
@ -186,7 +186,7 @@ options =
showTooltipUnitPosition: true, // show the coordinates in data units of the mouse showTooltipUnitPosition: true, // show the coordinates in data units of the mouse
// in the tooltip. // in the tooltip.
tooltipFormatString: '%.4P', // sprintf style format string for tooltip values. tooltipFormatString: '%.4P', // sprintf style format string for tooltip values.
useAxesFormatters: true, // wether to use the same formatter and formatStrings useAxesFormatters: true, // whether to use the same formatter and formatStrings
// as used by the axes, or to use the formatString // as used by the axes, or to use the formatString
// specified on the cursor with sprintf. // specified on the cursor with sprintf.
tooltipAxesGroups: [], // show only specified axes groups in tooltip. Would specify like: tooltipAxesGroups: [], // show only specified axes groups in tooltip. Would specify like:

View File

@ -39,7 +39,7 @@
.jqplot-xaxis-tick { .jqplot-xaxis-tick {
top: 0px; top: 0px;
/* initial position untill tick is drawn in proper place */ /* initial position until tick is drawn in proper place */
left: 15px; left: 15px;
/* padding-top: 10px;*/ /* padding-top: 10px;*/
vertical-align: top; vertical-align: top;
@ -47,7 +47,7 @@
.jqplot-x2axis-tick { .jqplot-x2axis-tick {
bottom: 0px; bottom: 0px;
/* initial position untill tick is drawn in proper place */ /* initial position until tick is drawn in proper place */
left: 15px; left: 15px;
/* padding-bottom: 10px;*/ /* padding-bottom: 10px;*/
vertical-align: bottom; vertical-align: bottom;
@ -55,7 +55,7 @@
.jqplot-yaxis-tick { .jqplot-yaxis-tick {
right: 0px; right: 0px;
/* initial position untill tick is drawn in proper place */ /* initial position until tick is drawn in proper place */
top: 15px; top: 15px;
/* padding-right: 10px;*/ /* padding-right: 10px;*/
text-align: right; text-align: right;
@ -72,7 +72,7 @@
.jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick {
left: 0px; left: 0px;
/* initial position untill tick is drawn in proper place */ /* initial position until tick is drawn in proper place */
top: 15px; top: 15px;
/* padding-left: 10px;*/ /* padding-left: 10px;*/
/* padding-right: 15px;*/ /* padding-right: 15px;*/

View File

@ -62,7 +62,7 @@
* > dataArray = [34,12,43,55,77]; * > dataArray = [34,12,43,55,77];
* > chart = $.jqplot('targetElemId', [dataArray, ...], {title:'My Plot', axes:{yaxis:{min:20, max:100}}}); * > chart = $.jqplot('targetElemId', [dataArray, ...], {title:'My Plot', axes:{yaxis:{min:20, max:100}}});
* *
* For more inforrmation, see <jqPlot Usage>. * For more information, see <jqPlot Usage>.
* *
* About: Usage * About: Usage
* *
@ -70,7 +70,7 @@
* *
* About: Available Options * About: Available Options
* *
* See <jqPlot Options> for a list of options available thorugh the options object (not complete yet!) * See <jqPlot Options> for a list of options available through the options object (not complete yet!)
* *
* About: Options Usage * About: Options Usage
* *
@ -289,7 +289,7 @@
return canvas; return canvas;
}; };
// this method has to be used after settings the dimesions // this method has to be used after settings the dimensions
// on the element returned by getCanvas() // on the element returned by getCanvas()
this.initCanvas = function(canvas) { this.initCanvas = function(canvas) {
if ($.jqplot.use_excanvas) { if ($.jqplot.use_excanvas) {
@ -315,7 +315,7 @@
var canvas = $.jqplot.CanvasManager.canvases[idx]; var canvas = $.jqplot.CanvasManager.canvases[idx];
canvas.getContext('2d').clearRect(0, 0, canvas.width, canvas.height); canvas.getContext('2d').clearRect(0, 0, canvas.width, canvas.height);
$(canvas).unbind().removeAttr('class').removeAttr('style'); $(canvas).unbind().removeAttr('class').removeAttr('style');
// Style attributes seemed to be still hanging around. wierd. Some ticks // Style attributes seemed to be still hanging around. weird. Some ticks
// still retained a left: 0px attribute after reusing a canvas. // still retained a left: 0px attribute after reusing a canvas.
$(canvas).css({left: '', top: '', position: ''}); $(canvas).css({left: '', top: '', position: ''});
// setting size to 0 may save memory of unused canvases? // setting size to 0 may save memory of unused canvases?
@ -328,7 +328,7 @@
}; };
// Convienence function that won't hang IE or FF without FireBug. // Convenience function that won't hang IE or FF without FireBug.
$.jqplot.log = function() { $.jqplot.log = function() {
if (window.console) { if (window.console) {
window.console.log.apply(window.console, arguments); window.console.log.apply(window.console, arguments);
@ -511,7 +511,7 @@
/** /**
* Class: Axis * Class: Axis
* An individual axis object. Cannot be instantiated directly, but created * An individual axis object. Cannot be instantiated directly, but created
* by the Plot oject. Axis properties can be set or overriden by the * by the Plot object. Axis properties can be set or overridden by the
* options passed in from the user. * options passed in from the user.
* *
*/ */
@ -534,7 +534,7 @@
this.name = name; this.name = name;
this._series = []; this._series = [];
// prop: show // prop: show
// Wether to display the axis on the graph. // Whether to display the axis on the graph.
this.show = false; this.show = false;
// prop: tickRenderer // prop: tickRenderer
// A class of a rendering engine for creating the ticks labels displayed on the plot, // A class of a rendering engine for creating the ticks labels displayed on the plot,
@ -598,15 +598,15 @@
// renderer specific options. See <$.jqplot.LinearAxisRenderer> for options. // renderer specific options. See <$.jqplot.LinearAxisRenderer> for options.
this.rendererOptions = {}; this.rendererOptions = {};
// prop: showTicks // prop: showTicks
// Wether to show the ticks (both marks and labels) or not. // Whether to show the ticks (both marks and labels) or not.
// Will not override showMark and showLabel options if specified on the ticks themselves. // Will not override showMark and showLabel options if specified on the ticks themselves.
this.showTicks = true; this.showTicks = true;
// prop: showTickMarks // prop: showTickMarks
// Wether to show the tick marks (line crossing grid) or not. // Whether to show the tick marks (line crossing grid) or not.
// Overridden by showTicks and showMark option of tick itself. // Overridden by showTicks and showMark option of tick itself.
this.showTickMarks = true; this.showTickMarks = true;
// prop: showMinorTicks // prop: showMinorTicks
// Wether or not to show minor ticks. This is renderer dependent. // Whether or not to show minor ticks. This is renderer dependent.
this.showMinorTicks = true; this.showMinorTicks = true;
// prop: drawMajorGridlines // prop: drawMajorGridlines
// True to draw gridlines for major axis ticks. // True to draw gridlines for major axis ticks.
@ -848,7 +848,7 @@
/** /**
* Class: Legend * Class: Legend
* Legend object. Cannot be instantiated directly, but created * Legend object. Cannot be instantiated directly, but created
* by the Plot oject. Legend properties can be set or overriden by the * by the Plot object. Legend properties can be set or overridden by the
* options passed in from the user. * options passed in from the user.
*/ */
function Legend(options) { function Legend(options) {
@ -856,7 +856,7 @@
// Group: Properties // Group: Properties
// prop: show // prop: show
// Wether to display the legend on the graph. // Whether to display the legend on the graph.
this.show = false; this.show = false;
// prop: location // prop: location
// Placement of the legend. one of the compass directions: nw, n, ne, e, se, s, sw, w // Placement of the legend. one of the compass directions: nw, n, ne, e, se, s, sw, w
@ -874,9 +874,9 @@
// prop: placement // prop: placement
// "insideGrid" places legend inside the grid area of the plot. // "insideGrid" places legend inside the grid area of the plot.
// "outsideGrid" places the legend outside the grid but inside the plot container, // "outsideGrid" places the legend outside the grid but inside the plot container,
// shrinking the grid to accomodate the legend. // shrinking the grid to accommodate the legend.
// "inside" synonym for "insideGrid", // "inside" synonym for "insideGrid",
// "outside" places the legend ouside the grid area, but does not shrink the grid which // "outside" places the legend outside the grid area, but does not shrink the grid which
// can cause the legend to overflow the plot container. // can cause the legend to overflow the plot container.
this.placement = "insideGrid"; this.placement = "insideGrid";
// prop: xoffset // prop: xoffset
@ -913,7 +913,7 @@
// renderer specific options passed to the renderer. // renderer specific options passed to the renderer.
this.rendererOptions = {}; this.rendererOptions = {};
// prop: predraw // prop: predraw
// Wether to draw the legend before the series or not. // Whether to draw the legend before the series or not.
// Used with series specific legend renderers for pie, donut, mekko charts, etc. // Used with series specific legend renderers for pie, donut, mekko charts, etc.
this.preDraw = false; this.preDraw = false;
// prop: marginTop // prop: marginTop
@ -1077,7 +1077,7 @@
/** /**
* Class: Title * Class: Title
* Plot Title object. Cannot be instantiated directly, but created * Plot Title object. Cannot be instantiated directly, but created
* by the Plot oject. Title properties can be set or overriden by the * by the Plot object. Title properties can be set or overridden by the
* options passed in from the user. * options passed in from the user.
* *
* Parameters: * Parameters:
@ -1091,7 +1091,7 @@
// text of the title; // text of the title;
this.text = text; this.text = text;
// prop: show // prop: show
// wether or not to show the title // whether or not to show the title
this.show = true; this.show = true;
// prop: fontFamily // prop: fontFamily
// css font-family spec for the text. // css font-family spec for the text.
@ -1140,7 +1140,7 @@
/** /**
* Class: Series * Class: Series
* An individual data series object. Cannot be instantiated directly, but created * An individual data series object. Cannot be instantiated directly, but created
* by the Plot oject. Series properties can be set or overriden by the * by the Plot object. Series properties can be set or overridden by the
* options passed in from the user. * options passed in from the user.
*/ */
function Series(options) { function Series(options) {
@ -1159,7 +1159,7 @@
// > } // > }
// prop: show // prop: show
// wether or not to draw the series. // whether or not to draw the series.
this.show = true; this.show = true;
// prop: xaxis // prop: xaxis
// which x axis to use with this series, either 'xaxis' or 'x2axis'. // which x axis to use with this series, either 'xaxis' or 'x2axis'.
@ -1221,7 +1221,7 @@
// Alpha channel transparency of shadow. 0 = transparent. // Alpha channel transparency of shadow. 0 = transparent.
this.shadowAlpha = '0.1'; this.shadowAlpha = '0.1';
// prop: breakOnNull // prop: breakOnNull
// Wether line segments should be broken at null value. // Whether line segments should be broken at null value.
// False will join point on either side of line. // False will join point on either side of line.
this.breakOnNull = false; this.breakOnNull = false;
// prop: markerRenderer // prop: markerRenderer
@ -1233,16 +1233,16 @@
// see <$.jqplot.MarkerRenderer>. // see <$.jqplot.MarkerRenderer>.
this.markerOptions = {}; this.markerOptions = {};
// prop: showLine // prop: showLine
// wether to actually draw the line or not. Series will still be renderered, even if no line is drawn. // whether to actually draw the line or not. Series will still be renderered, even if no line is drawn.
this.showLine = true; this.showLine = true;
// prop: showMarker // prop: showMarker
// wether or not to show the markers at the data points. // whether or not to show the markers at the data points.
this.showMarker = true; this.showMarker = true;
// prop: index // prop: index
// 0 based index of this series in the plot series array. // 0 based index of this series in the plot series array.
this.index; this.index;
// prop: fill // prop: fill
// true or false, wether to fill under lines or in bars. // true or false, whether to fill under lines or in bars.
// May not be implemented in all renderers. // May not be implemented in all renderers.
this.fill = false; this.fill = false;
// prop: fillColor // prop: fillColor
@ -1524,15 +1524,15 @@
* Object representing the grid on which the plot is drawn. The grid in this * Object representing the grid on which the plot is drawn. The grid in this
* context is the area bounded by the axes, the area which will contain the series. * context is the area bounded by the axes, the area which will contain the series.
* Note, the series are drawn on their own canvas. * Note, the series are drawn on their own canvas.
* The Grid object cannot be instantiated directly, but is created by the Plot oject. * The Grid object cannot be instantiated directly, but is created by the Plot object.
* Grid properties can be set or overriden by the options passed in from the user. * Grid properties can be set or overridden by the options passed in from the user.
*/ */
function Grid() { function Grid() {
$.jqplot.ElemContainer.call(this); $.jqplot.ElemContainer.call(this);
// Group: Properties // Group: Properties
// prop: drawGridlines // prop: drawGridlines
// wether to draw the gridlines on the plot. // whether to draw the gridlines on the plot.
this.drawGridlines = true; this.drawGridlines = true;
// prop: gridLineColor // prop: gridLineColor
// color of the grid lines. // color of the grid lines.
@ -1553,7 +1553,7 @@
// True to draw border around grid. // True to draw border around grid.
this.drawBorder = true; this.drawBorder = true;
// prop: shadow // prop: shadow
// wether to show a shadow behind the grid. // whether to show a shadow behind the grid.
this.shadow = true; this.shadow = true;
// prop: shadowAngle // prop: shadowAngle
// shadow angle in degrees // shadow angle in degrees
@ -1751,7 +1751,7 @@
// prop: data // prop: data
// user's data. Data should *NOT* be specified in the options object, // user's data. Data should *NOT* be specified in the options object,
// but be passed in as the second argument to the $.jqplot() function. // but be passed in as the second argument to the $.jqplot() function.
// The data property is described here soley for reference. // The data property is described here solely for reference.
// The data should be in the form of an array of 2D or 1D arrays like // The data should be in the form of an array of 2D or 1D arrays like
// > [ [[x1, y1], [x2, y2],...], [y1, y2, ...] ]. // > [ [[x1, y1], [x2, y2],...], [y1, y2, ...] ].
this.data = []; this.data = [];
@ -1785,7 +1785,7 @@
// prop: drawIfHidden // prop: drawIfHidden
// True to execute the draw method even if the plot target is hidden. // True to execute the draw method even if the plot target is hidden.
// Generally, this should be false. Most plot elements will not be sized/ // Generally, this should be false. Most plot elements will not be sized/
// positioned correclty if renderered into a hidden container. To render into // positioned correctly if renderered into a hidden container. To render into
// a hidden container, call the replot method when the container is shown. // a hidden container, call the replot method when the container is shown.
this.drawIfHidden = false; this.drawIfHidden = false;
this.eventCanvas = new $.jqplot.GenericCanvas(); this.eventCanvas = new $.jqplot.GenericCanvas();
@ -1839,7 +1839,7 @@
} }
} }
}; };
// container to hold all of the merged options. Convienence for plugins. // container to hold all of the merged options. Convenience for plugins.
this.options = {}; this.options = {};
this.previousSeriesStack = []; this.previousSeriesStack = [];
// Namespece to hold plugins. Generally non-renderer plugins add themselves to here. // Namespece to hold plugins. Generally non-renderer plugins add themselves to here.
@ -1848,7 +1848,7 @@
// Array of series object options. // Array of series object options.
// see <Series> for series specific options. // see <Series> for series specific options.
this.series = []; this.series = [];
// array of series indicies. Keep track of order // array of series indices. Keep track of order
// which series canvases are displayed, lowest // which series canvases are displayed, lowest
// to highest, back to front. // to highest, back to front.
this.seriesStack = []; this.seriesStack = [];
@ -1884,7 +1884,7 @@
// and this will create a new title object with the specified text. // and this will create a new title object with the specified text.
this.title = new Title(); this.title = new Title();
// Count how many times the draw method has been called while the plot is visible. // Count how many times the draw method has been called while the plot is visible.
// Mostly used to test if plot has never been dran (=0), has been successfully drawn // Mostly used to test if plot has never been drawn (=0), has been successfully drawn
// into a visible container once (=1) or draw more than once into a visible container. // into a visible container once (=1) or draw more than once into a visible container.
// Can use this in tests to see if plot has been visibly drawn at least one time. // Can use this in tests to see if plot has been visibly drawn at least one time.
// After plot has been visibly drawn once, it generally doesn't need redrawn if its // After plot has been visibly drawn once, it generally doesn't need redrawn if its
@ -1895,7 +1895,7 @@
this._sumy = 0; this._sumy = 0;
this._sumx = 0; this._sumx = 0;
// array to hold the cumulative stacked series data. // array to hold the cumulative stacked series data.
// used to ajust the individual series data, which won't have access to other // used to adjust the individual series data, which won't have access to other
// series data. // series data.
this._stackData = []; this._stackData = [];
// array that holds the data to be plotted. This will be the series data // array that holds the data to be plotted. This will be the series data
@ -2514,7 +2514,7 @@
// only need to sum up the stack axis column of data // only need to sum up the stack axis column of data
// and only sum if it is of same sign. // and only sum if it is of same sign.
// if previous series isn't same sign, keep looking // if previous series isn't same sign, keep looking
// at earlier series untill we find one of same sign. // at earlier series until we find one of same sign.
if (temp * prevval >= 0) { if (temp * prevval >= 0) {
this._plotData[index][k][sidx] += prevval; this._plotData[index][k][sidx] += prevval;
this._stackData[index][k][sidx] += prevval; this._stackData[index][k][sidx] += prevval;
@ -2727,7 +2727,7 @@
for (var j=0; j<this.preParseSeriesOptionsHooks.hooks.length; j++) { for (var j=0; j<this.preParseSeriesOptionsHooks.hooks.length; j++) {
this.preParseSeriesOptionsHooks.hooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]); this.preParseSeriesOptionsHooks.hooks[j].call(temp, this.options.seriesDefaults, this.options.series[i]);
} }
// Now go back and apply the options to the series. Really should just do this during initializaiton, but don't want to // Now go back and apply the options to the series. Really should just do this during initialization, but don't want to
// mess up preParseSeriesOptionsHooks at this point. // mess up preParseSeriesOptionsHooks at this point.
$.extend(true, temp, sopts); $.extend(true, temp, sopts);
var dir = 'vertical'; var dir = 'vertical';
@ -2889,7 +2889,7 @@
if (clear) { if (clear) {
this.canvasManager.freeAllCanvases(); this.canvasManager.freeAllCanvases();
this.eventCanvas._elem.unbind(); this.eventCanvas._elem.unbind();
// Dont think I bind any events to the target, this shouldn't be necessary. // Don't think I bind any events to the target, this shouldn't be necessary.
// It will remove user's events. // It will remove user's events.
// this.target.unbind(); // this.target.unbind();
this.target.empty(); this.target.empty();
@ -4090,7 +4090,7 @@
// name of the axis associated with this tick // name of the axis associated with this tick
this.axis; this.axis;
// prop: show // prop: show
// wether or not to show the tick (mark and label). // whether or not to show the tick (mark and label).
this.show = true; this.show = true;
// prop: label // prop: label
// The text or html for the label. // The text or html for the label.
@ -4159,29 +4159,29 @@
// name of the axis associated with this tick // name of the axis associated with this tick
this.axis; this.axis;
// prop: showMark // prop: showMark
// wether or not to show the mark on the axis. // whether or not to show the mark on the axis.
this.showMark = true; this.showMark = true;
// prop: showGridline // prop: showGridline
// wether or not to draw the gridline on the grid at this tick. // whether or not to draw the gridline on the grid at this tick.
this.showGridline = true; this.showGridline = true;
// prop: isMinorTick // prop: isMinorTick
// if this is a minor tick. // if this is a minor tick.
this.isMinorTick = false; this.isMinorTick = false;
// prop: size // prop: size
// Length of the tick beyond the grid in pixels. // Length of the tick beyond the grid in pixels.
// DEPRECATED: This has been superceeded by markSize // DEPRECATED: This has been superseded by markSize
this.size = 4; this.size = 4;
// prop: markSize // prop: markSize
// Length of the tick marks in pixels. For 'cross' style, length // Length of the tick marks in pixels. For 'cross' style, length
// will be stoked above and below axis, so total length will be twice this. // will be stoked above and below axis, so total length will be twice this.
this.markSize = 6; this.markSize = 6;
// prop: show // prop: show
// wether or not to show the tick (mark and label). // whether or not to show the tick (mark and label).
// Setting this to false requires more testing. It is recommended // Setting this to false requires more testing. It is recommended
// to set showLabel and showMark to false instead. // to set showLabel and showMark to false instead.
this.show = true; this.show = true;
// prop: showLabel // prop: showLabel
// wether or not to show the label. // whether or not to show the label.
this.showLabel = true; this.showLabel = true;
this.label = null; this.label = null;
this.value = null; this.value = null;
@ -4967,12 +4967,12 @@
this.renderer.options = options; this.renderer.options = options;
// if we are given some band data, and bands aren't explicity set to false in options, turn them on. // if we are given some band data, and bands aren't explicitly set to false in options, turn them on.
if (this.renderer.bandData.length > 1 && (!options.bands || options.bands.show == null)) { if (this.renderer.bandData.length > 1 && (!options.bands || options.bands.show == null)) {
this.renderer.bands.show = true; this.renderer.bands.show = true;
} }
// if we are given an interval, and bands aren't explicity set to false in options, turn them on. // if we are given an interval, and bands aren't explicitly set to false in options, turn them on.
else if (options.bands && options.bands.show == null && options.bands.interval != null) { else if (options.bands && options.bands.show == null && options.bands.interval != null) {
this.renderer.bands.show = true; this.renderer.bands.show = true;
} }
@ -6822,7 +6822,7 @@
} }
this._offsets = offsets; this._offsets = offsets;
// pixellength will be + for x axes and - for y axes becasue pixels always measured from top left. // pixellength will be + for x axes and - for y axes because pixels always measured from top left.
var pixellength = offmax - offmin; var pixellength = offmax - offmin;
var unitlength = max - min; var unitlength = max - min;
@ -7099,7 +7099,7 @@
} }
}; };
// Given a fixed minimum and maximum and a target number ot ticks // Given a fixed minimum and maximum and a target number of ticks
// figure out the best interval and // figure out the best interval and
// return min, max, number ticks, format string and tick interval // return min, max, number ticks, format string and tick interval
function bestConstrainedInterval(min, max, nttarget) { function bestConstrainedInterval(min, max, nttarget) {
@ -7129,7 +7129,7 @@
bestPrec = sd.digitsRight; bestPrec = sd.digitsRight;
} }
else if (temp === badness) { else if (temp === badness) {
// let nicer ticks trump number ot ticks // let nicer ticks trump number of ticks
if (sd.digitsRight < bestPrec) { if (sd.digitsRight < bestPrec) {
bestNT = currentNT; bestNT = currentNT;
bestPrec = sd.digitsRight; bestPrec = sd.digitsRight;
@ -7151,7 +7151,7 @@
} }
// This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n // This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n
// it is based soley on the range and number of ticks. So if user specifies // it is based solely on the range and number of ticks. So if user specifies
// number of ticks, use this. // number of ticks, use this.
function bestInterval(range, numberTicks) { function bestInterval(range, numberTicks) {
numberTicks = numberTicks || 7; numberTicks = numberTicks || 7;
@ -7202,7 +7202,7 @@
} }
// This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n // This will return an interval of form 2 * 10^n, 5 * 10^n or 10 * 10^n
// it is based soley on the range of data, number of ticks must be computed later. // it is based solely on the range of data, number of ticks must be computed later.
function bestLinearInterval(range, scalefact) { function bestLinearInterval(range, scalefact) {
scalefact = scalefact || 1; scalefact = scalefact || 1;
var expv = Math.floor(Math.log(range)/Math.LN10); var expv = Math.floor(Math.log(range)/Math.LN10);
@ -7313,7 +7313,7 @@
// Figure out the axis min, max and number of ticks // Figure out the axis min, max and number of ticks
// the min and max will be some multiple of the tick interval, // the min and max will be some multiple of the tick interval,
// 1*10^n, 2*10^n or 5*10^n. This gaurantees that, if the // 1*10^n, 2*10^n or 5*10^n. This guarantees that, if the
// axis min is negative, 0 will be a tick. // axis min is negative, 0 will be a tick.
if (!keepMin && !keepMax) { if (!keepMin && !keepMax) {
r[0] = Math.floor(axis_min / ss) * ss; // min r[0] = Math.floor(axis_min / ss) * ss; // min
@ -7359,7 +7359,7 @@
// Figure out the axis min, max and number of ticks // Figure out the axis min, max and number of ticks
// the min and max will be some multiple of the tick interval, // the min and max will be some multiple of the tick interval,
// 1*10^n, 2*10^n or 5*10^n. This gaurantees that, if the // 1*10^n, 2*10^n or 5*10^n. This guarantees that, if the
// axis min is negative, 0 will be a tick. // axis min is negative, 0 will be a tick.
tempr[0] = Math.floor(axis_min / ss) * ss; // min tempr[0] = Math.floor(axis_min / ss) * ss; // min
tempr[1] = Math.ceil(axis_max / ss) * ss; // max tempr[1] = Math.ceil(axis_max / ss) * ss; // max
@ -7399,7 +7399,7 @@
// Group: Properties // Group: Properties
// prop: show // prop: show
// wether or not to show the marker. // whether or not to show the marker.
this.show = true; this.show = true;
// prop: style // prop: style
// One of diamond, circle, square, x, plus, dash, filledDiamond, filledCircle, filledSquare // One of diamond, circle, square, x, plus, dash, filledDiamond, filledCircle, filledSquare
@ -7414,7 +7414,7 @@
// color of marker. Will be set to color of series by default on init. // color of marker. Will be set to color of series by default on init.
this.color = '#666666'; this.color = '#666666';
// prop: shadow // prop: shadow
// wether or not to draw a shadow on the line // whether or not to draw a shadow on the line
this.shadow = true; this.shadow = true;
// prop: shadowAngle // prop: shadowAngle
// Shadow angle in degrees // Shadow angle in degrees
@ -7625,7 +7625,7 @@
this.depth = 3; this.depth = 3;
this.strokeStyle = 'rgba(0,0,0,0.1)'; this.strokeStyle = 'rgba(0,0,0,0.1)';
// prop: isarc // prop: isarc
// wether the shadow is an arc or not. // whether the shadow is an arc or not.
this.isarc = false; this.isarc = false;
$.extend(true, this, options); $.extend(true, this, options);
@ -7727,7 +7727,7 @@
// whether to fill the shape. // whether to fill the shape.
this.fill = false; this.fill = false;
// prop: isarc // prop: isarc
// wether the shadow is an arc or not. // whether the shadow is an arc or not.
this.isarc = false; this.isarc = false;
// prop: fillRect // prop: fillRect
// true to draw shape as a filled rectangle. // true to draw shape as a filled rectangle.
@ -8129,7 +8129,7 @@
/** /**
* Class: $.jqplot.ThemeEngine * Class: $.jqplot.ThemeEngine
* Theme Engine provides a programatic way to change some of the more * Theme Engine provides a programmatic way to change some of the more
* common jqplot styling options such as fonts, colors and grid options. * common jqplot styling options such as fonts, colors and grid options.
* A theme engine instance is created with each plot. The theme engine * A theme engine instance is created with each plot. The theme engine
* manages a collection of themes which can be modified, added to, or * manages a collection of themes which can be modified, added to, or
@ -9283,7 +9283,7 @@
return str; return str;
}; };
// Not gauranteed to work, even on canvas supporting browsers due to // Not guaranteed to work, even on canvas supporting browsers due to
// limitations with location.href and browser support. // limitations with location.href and browser support.
$.fn.jqplotSaveImage = function() { $.fn.jqplotSaveImage = function() {
var imgData = $(this).jqplotToImageStr({}); var imgData = $(this).jqplotToImageStr({});
@ -9293,7 +9293,7 @@
}; };
// Not gauranteed to work, even on canvas supporting browsers due to // Not guaranteed to work, even on canvas supporting browsers due to
// limitations with window.open and arbitrary data. // limitations with window.open and arbitrary data.
$.fn.jqplotViewImage = function() { $.fn.jqplotViewImage = function() {
var imgStr = $(this).jqplotToImageElemStr({}); var imgStr = $(this).jqplotToImageElemStr({});
@ -9527,9 +9527,9 @@
}; };
/** /**
* Get the Day of week 1 (Monday) thru 7 (Sunday) * Get the Day of week 1 (Monday) through 7 (Sunday)
* *
* @returns {Integer} Day of week 1 (Monday) thru 7 (Sunday) * @returns {Integer} Day of week 1 (Monday) through 7 (Sunday)
*/ */
jsDate.prototype.getDayOfWeek = function() { jsDate.prototype.getDayOfWeek = function() {
var dow = this.proxy.getDay(); var dow = this.proxy.getDay();
@ -10069,7 +10069,7 @@
add: function(d, number) { add: function(d, number) {
// add any years needed (increments of 12) // add any years needed (increments of 12)
multipliers.year.add(d, Math[number > 0 ? 'floor' : 'ceil'](number / 12)); multipliers.year.add(d, Math[number > 0 ? 'floor' : 'ceil'](number / 12));
// ensure that we properly wrap betwen December and January // ensure that we properly wrap between December and January
// 11 % 12 = 11 // 11 % 12 = 11
// 12 % 12 = 0 // 12 % 12 = 0
var prevMonth = d.getMonth() + (number % 12); var prevMonth = d.getMonth() + (number % 12);
@ -10419,7 +10419,7 @@
* === Time === * === Time ===
* %H 00 through 23 Two digit representation of the hour in 24-hour format * %H 00 through 23 Two digit representation of the hour in 24-hour format
* %I 01 through 12 Two digit representation of the hour in 12-hour format * %I 01 through 12 Two digit representation of the hour in 12-hour format
* %l 1 through 12 Hour in 12-hour format, with a space preceeding single digits * %l 1 through 12 Hour in 12-hour format, with a space preceding single digits
* %M 00 through 59 Two digit representation of the minute * %M 00 through 59 Two digit representation of the minute
* %p AM/PM UPPER-CASE 'AM' or 'PM' based on the given time * %p AM/PM UPPER-CASE 'AM' or 'PM' based on the given time
* %P am/pm lower-case 'am' or 'pm' based on the given time * %P am/pm lower-case 'am' or 'pm' based on the given time
@ -10638,7 +10638,7 @@
* @returns {Integer} Number of days in the month. * @returns {Integer} Number of days in the month.
*/ */
// //
// handy utility method Borrowed right from Ken Snyder's Date Instance Mehtods. // handy utility method Borrowed right from Ken Snyder's Date Instance Methods.
// //
jsDate.daysInMonth = function(year, month) { jsDate.daysInMonth = function(year, month) {
if (month == 2) { if (month == 2) {
@ -11293,7 +11293,7 @@
} }
} }
// if the element is hiddden and mode is hide, // if the element is hidden and mode is hide,
// or element is visible and mode is show // or element is visible and mode is show
if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) { if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
done(); done();

View File

@ -4186,7 +4186,7 @@ setDocument = Sizzle.setDocument = function( node ) {
// Regex strategy adopted from Diego Perini // Regex strategy adopted from Diego Perini
assert(function( div ) { assert(function( div ) {
// Select is set to empty string on purpose // Select is set to empty string on purpose
// This is to test IE's treatment of not explictly // This is to test IE's treatment of not explicitly
// setting a boolean content attribute, // setting a boolean content attribute,
// since its presence should be enough // since its presence should be enough
// http://bugs.jquery.com/ticket/12359 // http://bugs.jquery.com/ticket/12359
@ -6836,7 +6836,7 @@ jQuery.extend({
value += "px"; value += "px";
} }
// Fixes #8908, it can be done more correctly by specifing setters in cssHooks, // Fixes #8908, it can be done more correctly by specifying setters in cssHooks,
// but it would mean to define eight (for every problematic property) identical functions // but it would mean to define eight (for every problematic property) identical functions
if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) { if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
style[ name ] = "inherit"; style[ name ] = "inherit";

View File

@ -127,7 +127,7 @@ and
> optionsObj = {title:"My Plot"} > optionsObj = {title:"My Plot"}
Where things need more explaination is with renderers, plugins and Where things need more explanation is with renderers, plugins and
their options. Briefly, what's renderer, what's a plugin. their options. Briefly, what's renderer, what's a plugin.
A renderer is an object that is used to draw something and gets A renderer is an object that is used to draw something and gets
@ -138,7 +138,7 @@ cursor, provide event driven functionality, etc. I consider renderers
plugins, but plugins don't have to be renderers. plugins, but plugins don't have to be renderers.
So, how do you use renderers, plugins, and specify their options? So, how do you use renderers, plugins, and specify their options?
Some common renderes are for bar charts and category axes. If you Some common renderers are for bar charts and category axes. If you
want to render your series as a bar chart with each set of bars want to render your series as a bar chart with each set of bars
showing up in a category on the x axis, you do: showing up in a category on the x axis, you do:

View File

@ -32,7 +32,7 @@
// Class: $.jqplot.BezierCurveRenderer.js // Class: $.jqplot.BezierCurveRenderer.js
// Renderer which draws lines as stacked bezier curves. // Renderer which draws lines as stacked bezier curves.
// Data for the line will not be specified as an array of // Data for the line will not be specified as an array of
// [x, y] data point values, but as a an array of [start piont, bezier curve] // [x, y] data point values, but as a an array of [start point, bezier curve]
// So, the line is specified as: [[xstart, ystart], [cp1x, cp1y, cp2x, cp2y, xend, yend]]. // So, the line is specified as: [[xstart, ystart], [cp1x, cp1y, cp2x, cp2y, xend, yend]].
$.jqplot.BezierCurveRenderer = function(){ $.jqplot.BezierCurveRenderer = function(){
$.jqplot.LineRenderer.call(this); $.jqplot.LineRenderer.call(this);

View File

@ -59,7 +59,7 @@
this.barWidth = null; this.barWidth = null;
// prop: shadowOffset // prop: shadowOffset
// offset of the shadow from the slice and offset of // offset of the shadow from the slice and offset of
// each succesive stroke of the shadow from the last. // each successive stroke of the shadow from the last.
this.shadowOffset = 2; this.shadowOffset = 2;
// prop: shadowDepth // prop: shadowDepth
// number of strokes to apply to the shadow, // number of strokes to apply to the shadow,
@ -97,7 +97,7 @@
// NOT IMPLEMENTED YET. True if this is a horizontal bar plot and // NOT IMPLEMENTED YET. True if this is a horizontal bar plot and
// x and y values are "transposed". Tranposed, or "swapped", data is // x and y values are "transposed". Tranposed, or "swapped", data is
// required prior to rev. 894 builds of jqPlot with horizontal bars. // required prior to rev. 894 builds of jqPlot with horizontal bars.
// Allows backward compatability of bar renderer horizontal bars with // Allows backward compatibility of bar renderer horizontal bars with
// old style data sets. // old style data sets.
this.transposedData = true; this.transposedData = true;
this.renderer.animation = { this.renderer.animation = {
@ -115,7 +115,7 @@
////// //////
// This is probably wrong here. // This is probably wrong here.
// After going back and forth on wether renderer should be the thing // After going back and forth on whether renderer should be the thing
// or extend the thing, it seems that it is best if it is a property // or extend the thing, it seems that it is best if it is a property
// on the thing. This should be something that is commonized // on the thing. This should be something that is commonized
// among series renderers in the future. // among series renderers in the future.
@ -148,7 +148,7 @@
this._stackAxis = 'x'; this._stackAxis = 'x';
this.fillAxis = 'x'; this.fillAxis = 'x';
} }
// index of the currenty highlighted point, if any // index of the currently highlighted point, if any
this._highlightedPoint = null; this._highlightedPoint = null;
// total number of values for all bar series, total number of bar series, and position of this series // total number of values for all bar series, total number of bar series, and position of this series
this._plotSeriesInfo = null; this._plotSeriesInfo = null;
@ -233,7 +233,7 @@
} }
// is the series rendered as a bar? // is the series rendered as a bar?
if (series.renderer.constructor == $.jqplot.BarRenderer) { if (series.renderer.constructor == $.jqplot.BarRenderer) {
// gridData may not be computed yet, use data length insted // gridData may not be computed yet, use data length instead
nvals += series.data.length; nvals += series.data.length;
nseries += 1; nseries += 1;
} }

View File

@ -36,7 +36,7 @@
* *
* > [[x1, y1, "label 1", {css}], [x2, y2, "label 2", {css}], ...] * > [[x1, y1, "label 1", {css}], [x2, y2, "label 2", {css}], ...]
* *
* The label and css object are optional. If the label is ommitted, the * The label and css object are optional. If the label is omitted, the
* box will collapse unless a css height and/or width is specified. * box will collapse unless a css height and/or width is specified.
* *
* The css object is an object specifying css properties * The css object is an object specifying css properties

View File

@ -139,7 +139,7 @@
// largest points below smaller points. // largest points below smaller points.
this.radii = []; this.radii = [];
this.maxRadius = 0; this.maxRadius = 0;
// index of the currenty highlighted point, if any // index of the currently highlighted point, if any
this._highlightedPoint = null; this._highlightedPoint = null;
// array of jQuery labels. // array of jQuery labels.
this.labels = []; this.labels = [];
@ -162,7 +162,7 @@
this.autoscaleMultiplier = this.autoscaleMultiplier * Math.pow(this.data.length, this.autoscalePointsFactor); this.autoscaleMultiplier = this.autoscaleMultiplier * Math.pow(this.data.length, this.autoscalePointsFactor);
// index of the currenty highlighted point, if any // index of the currently highlighted point, if any
this._highlightedPoint = null; this._highlightedPoint = null;
// adjust the series colors for options colors passed in with data or for alpha. // adjust the series colors for options colors passed in with data or for alpha.
@ -327,7 +327,7 @@
// color = (this.varyBubbleColors) ? this.colorGenerator.get(idx) : this.color; // color = (this.varyBubbleColors) ? this.colorGenerator.get(idx) : this.color;
color = this.colorGenerator.get(idx); color = this.colorGenerator.get(idx);
// If we're drawing a shadow, expand the canvas dimensions to accomodate. // If we're drawing a shadow, expand the canvas dimensions to accommodate.
var canvasRadius = gd[2]; var canvasRadius = gd[2];
var offset, depth; var offset, depth;
if (this.shadow) { if (this.shadow) {
@ -422,7 +422,7 @@
$.jqplot.BubbleCanvas.prototype = new $.jqplot.ElemContainer(); $.jqplot.BubbleCanvas.prototype = new $.jqplot.ElemContainer();
$.jqplot.BubbleCanvas.prototype.constructor = $.jqplot.BubbleCanvas; $.jqplot.BubbleCanvas.prototype.constructor = $.jqplot.BubbleCanvas;
// initialize with the x,y pont of bubble center and the bubble radius. // initialize with the x,y point of bubble center and the bubble radius.
$.jqplot.BubbleCanvas.prototype.createElement = function(x, y, r) { $.jqplot.BubbleCanvas.prototype.createElement = function(x, y, r) {
var klass = 'jqplot-bubble-point'; var klass = 'jqplot-bubble-point';

View File

@ -34,7 +34,7 @@
* Renderer to draw axis labels with a canvas element to support advanced * Renderer to draw axis labels with a canvas element to support advanced
* featrues such as rotated text. This renderer uses a separate rendering engine * featrues such as rotated text. This renderer uses a separate rendering engine
* to draw the text on the canvas. Two modes of rendering the text are available. * to draw the text on the canvas. Two modes of rendering the text are available.
* If the browser has native font support for canvas fonts (currently Mozila 3.5 * If the browser has native font support for canvas fonts (currently Mozilla 3.5
* and Safari 4), you can enable text rendering with the canvas fillText method. * and Safari 4), you can enable text rendering with the canvas fillText method.
* You do so by setting the "enableFontSupport" option to true. * You do so by setting the "enableFontSupport" option to true.
* *
@ -52,10 +52,10 @@
// name of the axis associated with this tick // name of the axis associated with this tick
this.axis; this.axis;
// prop: show // prop: show
// wether or not to show the tick (mark and label). // whether or not to show the tick (mark and label).
this.show = true; this.show = true;
// prop: showLabel // prop: showLabel
// wether or not to show the label. // whether or not to show the label.
this.showLabel = true; this.showLabel = true;
// prop: label // prop: label
// label for the axis. // label for the axis.
@ -88,7 +88,7 @@
// around a label. The labels text renderer has a default setting of 1.4, which // around a label. The labels text renderer has a default setting of 1.4, which
// should be suitable for most fonts. Leave as null to use default. If tops of // should be suitable for most fonts. Leave as null to use default. If tops of
// letters appear clipped, increase this. If bounding box seems too big, decrease. // letters appear clipped, increase this. If bounding box seems too big, decrease.
// This is an issue only with the native font renderering capabilities of Mozilla // This is an issue only with the native font rendering capabilities of Mozilla
// 3.5 and Safari 4 since they do not provide a method to determine the font height. // 3.5 and Safari 4 since they do not provide a method to determine the font height.
this.pt2px = null; this.pt2px = null;
@ -174,8 +174,8 @@
this._elem = null; this._elem = null;
} }
// create a canvas here, but can't draw on it untill it is appended // create a canvas here, but can't draw on it until it is appended
// to dom for IE compatability. // to dom for IE compatibility.
var elem = plot.canvasManager.getCanvas(); var elem = plot.canvasManager.getCanvas();
this._textRenderer.setText(this.label, ctx); this._textRenderer.setText(this.label, ctx);

View File

@ -34,7 +34,7 @@
* Renderer to draw axis ticks with a canvas element to support advanced * Renderer to draw axis ticks with a canvas element to support advanced
* featrues such as rotated text. This renderer uses a separate rendering engine * featrues such as rotated text. This renderer uses a separate rendering engine
* to draw the text on the canvas. Two modes of rendering the text are available. * to draw the text on the canvas. Two modes of rendering the text are available.
* If the browser has native font support for canvas fonts (currently Mozila 3.5 * If the browser has native font support for canvas fonts (currently Mozilla 3.5
* and Safari 4), you can enable text rendering with the canvas fillText method. * and Safari 4), you can enable text rendering with the canvas fillText method.
* You do so by setting the "enableFontSupport" option to true. * You do so by setting the "enableFontSupport" option to true.
* *
@ -49,10 +49,10 @@
// tick mark on the axis. One of 'inside', 'outside', 'cross', '' or null. // tick mark on the axis. One of 'inside', 'outside', 'cross', '' or null.
this.mark = 'outside'; this.mark = 'outside';
// prop: showMark // prop: showMark
// wether or not to show the mark on the axis. // whether or not to show the mark on the axis.
this.showMark = true; this.showMark = true;
// prop: showGridline // prop: showGridline
// wether or not to draw the gridline on the grid at this tick. // whether or not to draw the gridline on the grid at this tick.
this.showGridline = true; this.showGridline = true;
// prop: isMinorTick // prop: isMinorTick
// if this is a minor tick. // if this is a minor tick.
@ -65,10 +65,10 @@
// will be stoked above and below axis, so total length will be twice this. // will be stoked above and below axis, so total length will be twice this.
this.markSize = 4; this.markSize = 4;
// prop: show // prop: show
// wether or not to show the tick (mark and label). // whether or not to show the tick (mark and label).
this.show = true; this.show = true;
// prop: showLabel // prop: showLabel
// wether or not to show the label. // whether or not to show the label.
this.showLabel = true; this.showLabel = true;
// prop: labelPosition // prop: labelPosition
// 'auto', 'start', 'middle' or 'end'. // 'auto', 'start', 'middle' or 'end'.
@ -115,7 +115,7 @@
// around a label. The labels text renderer has a default setting of 1.4, which // around a label. The labels text renderer has a default setting of 1.4, which
// should be suitable for most fonts. Leave as null to use default. If tops of // should be suitable for most fonts. Leave as null to use default. If tops of
// letters appear clipped, increase this. If bounding box seems too big, decrease. // letters appear clipped, increase this. If bounding box seems too big, decrease.
// This is an issue only with the native font renderering capabilities of Mozilla // This is an issue only with the native font rendering capabilities of Mozilla
// 3.5 and Safari 4 since they do not provide a method to determine the font height. // 3.5 and Safari 4 since they do not provide a method to determine the font height.
this.pt2px = null; this.pt2px = null;
@ -210,15 +210,15 @@
this._elem = null; this._elem = null;
} }
// create a canvas here, but can't draw on it untill it is appended // create a canvas here, but can't draw on it until it is appended
// to dom for IE compatability. // to dom for IE compatibility.
var elem = plot.canvasManager.getCanvas(); var elem = plot.canvasManager.getCanvas();
this._textRenderer.setText(this.label, ctx); this._textRenderer.setText(this.label, ctx);
var w = this.getWidth(ctx); var w = this.getWidth(ctx);
var h = this.getHeight(ctx); var h = this.getHeight(ctx);
// canvases seem to need to have width and heigh attributes directly set. // canvases seem to need to have width and height attributes directly set.
elem.width = w; elem.width = w;
elem.height = h; elem.height = h;
elem.style.width = w; elem.style.width = w;

View File

@ -107,7 +107,7 @@
// color of the line // color of the line
color: '#666666', color: '#666666',
// prop: shadow // prop: shadow
// wether or not to draw a shadow on the line // whether or not to draw a shadow on the line
shadow: true, shadow: true,
// prop: shadowAngle // prop: shadowAngle
// Shadow angle in degrees // Shadow angle in degrees

View File

@ -170,7 +170,7 @@
}; };
// w - height in pt // w - height in pt
// set heigh in px // set height in px
$.jqplot.CanvasTextRenderer.prototype.setHeight = function(w) { $.jqplot.CanvasTextRenderer.prototype.setHeight = function(w) {
if (!w) { if (!w) {
//height = this.fontSize /0.75; //height = this.fontSize /0.75;

View File

@ -217,7 +217,7 @@
// keep a reference to these tick labels to use for redrawing plot (see bug #57) // keep a reference to these tick labels to use for redrawing plot (see bug #57)
this.ticks = labels; this.ticks = labels;
// now bin the data values to the right lables. // now bin the data values to the right labels.
for (var i=0; i<this._series.length; i++) { for (var i=0; i<this._series.length; i++) {
var s = this._series[i]; var s = this._series[i];
for (var j=0; j<s.data.length; j++) { for (var j=0; j<s.data.length; j++) {
@ -438,7 +438,7 @@
} }
this._offsets = offsets; this._offsets = offsets;
// pixellength will be + for x axes and - for y axes becasue pixels always measured from top left. // pixellength will be + for x axes and - for y axes because pixels always measured from top left.
var pixellength = offmax - offmin; var pixellength = offmax - offmin;
var unitlength = max - min; var unitlength = max - min;

Some files were not shown because too many files have changed in this diff Show More