diff --git a/ChangeLog b/ChangeLog index de7967dd7d..82e7a6221f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,11 +4,6 @@ currency problems when importing QIF files (introduced by the widget cleanup.) -2006-08-09 Derek Atkins - - * move gnc-gtk-utils from core-utils to gnome-utils because - core-utils should not depend on gtk. - 2006-08-08 Christian Stimming * configure.in, src/gnome-utils/schemas/Makefile.am: Find absolute diff --git a/doc/tip_of_the_day.list.in b/doc/tip_of_the_day.list.in index 2a342a1fbc..aec46887a0 100644 --- a/doc/tip_of_the_day.list.in +++ b/doc/tip_of_the_day.list.in @@ -57,6 +57,9 @@ Accounts -> Open Subaccounts from the menu.") decrement the selected date. You can use '+' and '-' to increment and \ decrement check numbers as well.") + N_( "To switch between multiple tabs in the main window, press \ +Control+Alt+Page Up/Down.") + N_( "In the reconcile window, you can press the spacebar to mark \ transactions as reconciled. You can also press Tab and Shift-Tab to \ move between deposits and withdrawals.") diff --git a/src/business/business-reports/aging.scm b/src/business/business-reports/aging.scm index c637e16777..19d9dc1e16 100644 --- a/src/business/business-reports/aging.scm +++ b/src/business/business-reports/aging.scm @@ -643,9 +643,7 @@ totals to report currency") (gnc:html-document-add-object! document (gnc:make-html-text - (string-append - "No Valid Account Selected. " - "Click on the Options button and select the account to use.")))) + (_ "No valid account selected. Click on the Options button and select the account to use.")))) (gnc:free-query query) (gnc:report-finished) document)) diff --git a/src/business/business-reports/owner-report.scm b/src/business/business-reports/owner-report.scm index 4ba675fd08..967d6f9570 100644 --- a/src/business/business-reports/owner-report.scm +++ b/src/business/business-reports/owner-report.scm @@ -617,7 +617,7 @@ (gnc:make-html-text (sprintf #f (_ "No valid %s selected. Click on the Options button to select a company.") - type-str)))) + (_ type-str))))) ;; FIXME because of translations: Please change this string into full sentences instead of sprintf, because in non-english languages the "no valid" has different forms depending on the grammatical gender of the "%s". (gnc:free-query query) document)) diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 82ea897546..dd2eb75b48 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -6,11 +6,13 @@ libcore_utils_la_SOURCES = \ gnc-gdate-utils.c \ gnc-gkeyfile-utils.c \ gnc-glib-utils.c \ - gnc-gobject-utils.c + gnc-gobject-utils.c \ + gnc-gtk-utils.c libcore_utils_la_LIBADD = \ ${GLIB_LIBS} \ - ${GCONF_LIBS} + ${GCONF_LIBS} \ + ${GTK_LIBS} nodist_libgw_core_utils_la_SOURCES = \ gw-core-utils.c @@ -27,7 +29,8 @@ noinst_HEADERS = \ gnc-gdate-utils.h \ gnc-gkeyfile-utils.h \ gnc-glib-utils.h \ - gnc-gobject-utils.h + gnc-gobject-utils.h \ + gnc-gtk-utils.h EXTRA_DIST = ${gwmod_DATA} @@ -35,7 +38,8 @@ AM_CFLAGS = \ ${G_WRAP_COMPILE_ARGS} \ ${GUILE_INCS} \ ${GLIB_CFLAGS} \ - ${GCONF_CFLAGS} + ${GCONF_CFLAGS} \ + ${GTK_CFLAGS} gwmoddir = ${GNC_GWRAP_LIBDIR} gwmod_DATA = gw-core-utils-spec.scm diff --git a/src/core-utils/gnc-gobject-utils.c b/src/core-utils/gnc-gobject-utils.c index d674a33d5d..49e0d4f442 100644 --- a/src/core-utils/gnc-gobject-utils.c +++ b/src/core-utils/gnc-gobject-utils.c @@ -26,6 +26,10 @@ #include #include "gnc-gobject-utils.h" +#include // For gtk_main_quit(). Can't get this to work with + // a g_source attached to the main glib context. + + static void gnc_gobject_weak_cb (gpointer user_data, GObject *object); /************************************************************/ diff --git a/src/gnome-utils/gnc-gtk-utils.c b/src/core-utils/gnc-gtk-utils.c similarity index 100% rename from src/gnome-utils/gnc-gtk-utils.c rename to src/core-utils/gnc-gtk-utils.c diff --git a/src/gnome-utils/gnc-gtk-utils.h b/src/core-utils/gnc-gtk-utils.h similarity index 100% rename from src/gnome-utils/gnc-gtk-utils.h rename to src/core-utils/gnc-gtk-utils.h diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index 9c7ab015eb..be8d3d1bcb 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -66,7 +66,6 @@ libgncmod_gnome_utils_la_SOURCES = \ gnc-recurrence.c \ gnc-general-select.c \ gnc-gnome-utils.c \ - gnc-gtk-utils.c \ gnc-gui-query.c \ gnc-html-graph-gog.c \ gnc-html-history.c \ @@ -133,7 +132,6 @@ gncinclude_HEADERS = \ gnc-recurrence.h \ gnc-general-select.h \ gnc-gnome-utils.h \ - gnc-gtk-utils.h \ gnc-gui-query.h \ gnc-html-graph-gog.h \ gnc-html-history.h \ diff --git a/src/import-export/import-backend.c b/src/import-export/import-backend.c index ea15123e65..c4343dfb2a 100644 --- a/src/import-export/import-backend.c +++ b/src/import-export/import-backend.c @@ -592,7 +592,9 @@ static void split_find_match (GNCImportTransInfo * trans_info, /*DEBUG(" downloaded_split_amount=%f", downloaded_split_amount);*/ match_split_amount = gnc_numeric_to_double(xaccSplitGetAmount(split)); /*DEBUG(" match_split_amount=%f", match_split_amount);*/ - if(downloaded_split_amount == match_split_amount) + if(fabs(downloaded_split_amount - match_split_amount) < 1e-6) + /* bug#347791: Doubly type shouldn't be compared for exact + equality, so we're using fabs() instead. */ /*if (gnc_numeric_equal(xaccSplitGetAmount (gnc_import_TransInfo_get_fsplit (trans_info)), xaccSplitGetAmount(split))) diff --git a/src/report/report-system/html-utilities.scm b/src/report/report-system/html-utilities.scm index aeffc997d7..764bf1a507 100644 --- a/src/report/report-system/html-utilities.scm +++ b/src/report/report-system/html-utilities.scm @@ -794,9 +794,9 @@ (gnc:html-text-append! p (gnc:html-markup-h2 (string-append - report-title-string + (_ report-title-string) ":")) - (gnc:html-markup-h2 (_ "")) + (gnc:html-markup-h2 "") (gnc:html-markup-p (_ "This report requires you to specify certain report options."))) (if report-id @@ -818,7 +818,7 @@ (gnc:html-text-append! p (gnc:html-markup-h2 (string-append - report-title-string + (_ report-title-string) ":")) (gnc:html-markup-h2 (_ "No accounts selected")) (gnc:html-markup-p diff --git a/src/report/standard-reports/account-summary.scm b/src/report/standard-reports/account-summary.scm index 0d6afd960f..9c02a111f0 100644 --- a/src/report/standard-reports/account-summary.scm +++ b/src/report/standard-reports/account-summary.scm @@ -133,7 +133,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-report-title - "a" opthelp-report-title reportname)) + "a" opthelp-report-title (_ reportname))) (add-option (gnc:make-string-option gnc:pagename-general optname-party-name diff --git a/src/report/standard-reports/balance-sheet.scm b/src/report/standard-reports/balance-sheet.scm index 21b9a397e1..01859338f7 100644 --- a/src/report/standard-reports/balance-sheet.scm +++ b/src/report/standard-reports/balance-sheet.scm @@ -151,7 +151,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-report-title - "a" opthelp-report-title reportname)) + "a" opthelp-report-title (_ reportname))) (add-option (gnc:make-string-option gnc:pagename-general optname-party-name diff --git a/src/report/standard-reports/equity-statement.scm b/src/report/standard-reports/equity-statement.scm index 6deec36df4..b0c8f25db3 100644 --- a/src/report/standard-reports/equity-statement.scm +++ b/src/report/standard-reports/equity-statement.scm @@ -107,7 +107,7 @@ (add-option (gnc:make-string-option (N_ "General") optname-report-title - "a" opthelp-report-title reportname)) + "a" opthelp-report-title (_ reportname))) (add-option (gnc:make-string-option (N_ "General") optname-party-name diff --git a/src/report/standard-reports/general-journal.scm b/src/report/standard-reports/general-journal.scm index f97d3c32ce..17843e9175 100644 --- a/src/report/standard-reports/general-journal.scm +++ b/src/report/standard-reports/general-journal.scm @@ -83,15 +83,15 @@ (list "query" (gnc:query->scm query)) ;; think this wants an scm... (list "journal" #t) (list "double" #t) - (list "debit-string" (N_ "Debit")) - (list "credit-string" (N_ "Credit")) + (list "debit-string" (_ "Debit")) + (list "credit-string" (_ "Credit")) ) ) ;; we'll leave query malloc'd in case this is required by the C side... ;; set options in the general tab... (set-option! - gnc:pagename-general (N_ "Title") (N_ "General Journal")) + gnc:pagename-general (N_ "Title") (_ reportname)) ;; we can't (currently) set the Report name here ;; because it is automatically set to the template ;; name... :( diff --git a/src/report/standard-reports/income-statement.scm b/src/report/standard-reports/income-statement.scm index 26738da7a8..17f9833da1 100644 --- a/src/report/standard-reports/income-statement.scm +++ b/src/report/standard-reports/income-statement.scm @@ -134,7 +134,7 @@ (add-option (gnc:make-string-option gnc:pagename-general optname-report-title - "a" opthelp-report-title reportname)) + "a" opthelp-report-title (_ reportname))) (add-option (gnc:make-string-option gnc:pagename-general optname-party-name diff --git a/src/report/standard-reports/trial-balance.scm b/src/report/standard-reports/trial-balance.scm index 90e56a90ac..4558f4bed1 100644 --- a/src/report/standard-reports/trial-balance.scm +++ b/src/report/standard-reports/trial-balance.scm @@ -144,7 +144,7 @@ (add-option (gnc:make-string-option (N_ "General") optname-report-title - "a" opthelp-report-title reportname)) + "a" opthelp-report-title (_ reportname))) (add-option (gnc:make-string-option (N_ "General") optname-party-name diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am index ea8060e9bb..22cdc7ba43 100644 --- a/src/report/utility-reports/Makefile.am +++ b/src/report/utility-reports/Makefile.am @@ -21,8 +21,9 @@ gncscmmod_DATA = \ hello-world.scm \ utility-reports.scm \ view-column.scm \ - welcome-to-gnucash.scm \ - test-graphing.scm + welcome-to-gnucash.scm + +# test-graphing.scm -- not intended for general public?!? Surely not translated at all. if GNUCASH_SEPARATE_BUILDDIR #For separate build directory diff --git a/src/report/utility-reports/utility-reports.scm b/src/report/utility-reports/utility-reports.scm index b1619a08e5..2b8fa2f450 100644 --- a/src/report/utility-reports/utility-reports.scm +++ b/src/report/utility-reports/utility-reports.scm @@ -12,6 +12,6 @@ (use-modules (gnucash report view-column)) (use-modules (gnucash report welcome-to-gnucash)) -(use-modules (gnucash report test-graphing)) +;;(use-modules (gnucash report test-graphing)) (re-export gnc:make-welcome-report)