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

Merge branch 'maint'

Browse Source
This commit is contained in:
Geert Janssens
2020-01-17 18:35:30 +01:00
parent 6b7ef46d6a 073e47801d
commit 490b20d2da
64 changed files with 196 additions and 3523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@@ -2,22 +2,18 @@
cmake_minimum_required (VERSION 3.10)
project (gnucash)
project (gnucash
VERSION 3.900
)
enable_testing()
# Version number of gnucash
set (GNUCASH_MAJOR_VERSION 3)
set (GNUCASH_MINOR_VERSION 900)
set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
set (GNUCASH_LATEST_STABLE_SERIES 3.x)
set (PACKAGE gnucash)
set (PACKAGE_NAME GnuCash)
set (PACKAGE_VERSION 3.900)
set (PACKAGE_BUGREPORT "https://bugs.gnucash.org")
set (PACKAGE_TARNAME ${PACKAGE})
set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set (PACKAGE_STRING "${PACKAGE_NAME} ${PROJECT_VERSION}")
set (PACKAGE_URL "https://www.gnucash.org/")
# Change this in development versions when changing anything that
@@ -25,8 +21,6 @@ set (PACKAGE_URL "https://www.gnucash.org/")
set (GNUCASH_RESAVE_VERSION "19920")
set(GETTEXT_PACKAGE "gnucash")
# Clear cache variables that will be filled later during the cmake run
unset(dist_generated CACHE)
unset(dist_generated_depends CACHE)
@@ -642,8 +636,6 @@ install(FILES ${gnucash_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
# Create config.h
set (GETTEXT_PACKAGE "gnucash")
if (WIN32)
if (MINGW)
set (HAVE_SCANF_LLD 1)
@@ -795,7 +787,7 @@ dist_add_generated (${BUILDING_FROM_VCS} ChangeLog)
############################ BEGIN MAKE DIST #################
set(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
set(PACKAGE_PREFIX "${PROJECT_NAME}-${PROJECT_VERSION}")
set(DIST_FILE "${PACKAGE_PREFIX}.tar")
set(toplvl_DIST_local ${gnucash_DOCS}
@@ -928,10 +920,6 @@ endif()
# ############################################################
# Package creation rules
set(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
set(CPACK_PACKAGE_VERSION "${VERSION}")
if(UNIX)
set(CPACK_GENERATOR "TGZ")
endif(UNIX)

54
bindings/core-utils.i
View File

@@ -94,6 +94,60 @@ const char * gnc_locale_default_iso_currency_code (void);
gchar *gnc_locale_name (void);
#if defined(SWIGGUILE)
%init {
{
char tmp[100];
#define SET_ENUM(e) snprintf(tmp, 100, "(set! %s (%s))", (e), (e)); \
scm_c_eval_string(tmp);
/* Enum conversions go here */
SET_ENUM ("GNC-PREFS-GROUP-GENERAL");
SET_ENUM ("GNC-PREFS-GROUP-GENERAL-REGISTER");
SET_ENUM ("GNC-PREFS-GROUP-GENERAL-REPORT");
SET_ENUM ("GNC-PREFS-GROUP-WARNINGS");
SET_ENUM ("GNC-PREFS-GROUP-WARNINGS-TEMP");
SET_ENUM ("GNC-PREFS-GROUP-WARNINGS-PERM");
SET_ENUM ("GNC-PREFS-GROUP-ACCT-SUMMARY");
SET_ENUM ("GNC-PREF-VERSION");
SET_ENUM ("GNC-PREF-SAVE-GEOMETRY");
SET_ENUM ("GNC-PREF-LAST-PATH");
SET_ENUM ("GNC-PREF-USE-NEW");
SET_ENUM ("GNC-PREF-ACCOUNTING-LABELS");
SET_ENUM ("GNC-PREF-ACCOUNT-SEPARATOR");
SET_ENUM ("GNC-PREF-NEGATIVE-IN-RED");
SET_ENUM ("GNC-PREF-NUM-SOURCE");
SET_ENUM ("GNC-PREF-DATE-FORMAT");
SET_ENUM ("GNC-PREF-DATE-COMPL-THISYEAR");
SET_ENUM ("GNC-PREF-DATE-COMPL-SLIDING");
SET_ENUM ("GNC-PREF-DATE-BACKMONTHS");
SET_ENUM ("GNC-PREF-SHOW-LEAF-ACCT-NAMES");
SET_ENUM ("GNC-PREF-ENTER-MOVES-TO-END");
SET_ENUM ("GNC-PREF-DRAW-HOR-LINES");
SET_ENUM ("GNC-PREF-DRAW-VERT-LINES");
SET_ENUM ("GNC-PREF-ALT-COLOR-BY-TRANS");
SET_ENUM ("GNC-PREF-USE-THEME-COLORS");
SET_ENUM ("GNC-PREF-USE-GNUCASH-COLOR-THEME");
SET_ENUM ("GNC-PREF-TAB-TRANS-MEMORISED");
SET_ENUM ("GNC-PREF-FUTURE-AFTER-BLANK");
SET_ENUM ("GNC-PREF-START-CHOICE-ABS");
SET_ENUM ("GNC-PREF-START-CHOICE-REL");
SET_ENUM ("GNC-PREF-START-DATE");
SET_ENUM ("GNC-PREF-START-PERIOD");
SET_ENUM ("GNC-PREF-END-CHOICE-ABS");
SET_ENUM ("GNC-PREF-END-CHOICE-REL");
SET_ENUM ("GNC-PREF-END-DATE");
SET_ENUM ("GNC-PREF-END-PERIOD");
SET_ENUM ("GNC-PREF-CURRENCY-OTHER");
SET_ENUM ("GNC-PREF-CURRENCY-CHOICE-LOCALE");
SET_ENUM ("GNC-PREF-CURRENCY-CHOICE-OTHER");
#undef SET_ENUM
}
}
%rename ("gnc-utf8?") wrap_gnc_utf8_validate;
%inline %{
/* This helper function wraps gnc_utf8_validate() into a predicate. */

44
common/config.h.cmake.in
View File

@@ -24,8 +24,8 @@
/* Using GDK Quartz (not X11) */
#cmakedefine GDK_QUARTZ
/* Name of our gettext-domain */
#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
/* Name of our gettext-domain, needed for gi18n-lib.h */
#define GETTEXT_PACKAGE "@PROJECT_NAME@"
/* Cocoa/Nexstep/GnuStep framework */
#cmakedefine GNC_PLATFORM_COCOA 1
@@ -57,18 +57,6 @@
/* Most recent stable GnuCash series */
#define GNUCASH_LATEST_STABLE_SERIES "@GNUCASH_LATEST_STABLE_SERIES@"
/* GnuCash Major version number */
#define GNUCASH_MAJOR_VERSION @GNUCASH_MAJOR_VERSION@
/* GnuCash Micro version number */
#define GNUCASH_MICRO_VERSION @GNUCASH_MICRO_VERSION@
/* GnuCash Minor version number */
#define GNUCASH_MINOR_VERSION @GNUCASH_MINOR_VERSION@
/* GnuCash Nano version number */
#define GNUCASH_NANO_VERSION @GNUCASH_NANO_VERSION@
/* GnuCash earliest compatible databaseversion number */
#define GNUCASH_RESAVE_VERSION @GNUCASH_RESAVE_VERSION@
@@ -270,9 +258,6 @@
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#define LT_OBJDIR ".libs/"
/* Name of package */
#define PACKAGE "@PACKAGE@"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
@@ -282,14 +267,26 @@
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "@PACKAGE_STRING@"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "@PACKAGE_TARNAME@"
/* Define to the home page for this package. */
#define PACKAGE_URL "@PACKAGE_URL@"
/* Define to the version of this package. */
#define PACKAGE_VERSION "@PACKAGE_VERSION@"
/* Name of project */
#define PROJECT_NAME "@PROJECT_NAME@"
/* Version number of package */
#define PROJECT_VERSION "@PROJECT_VERSION@"
/* GnuCash Major version number */
#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
/* GnuCash Micro version number */
#define PROJECT_VERSION_MICRO @PROJECT_VERSION_PATCH@
/* GnuCash Minor version number */
#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
/* GnuCash Nano version number */
#define PROJECT_VERSION_NANO @PROJECT_VERSION_TWEAK@
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -333,9 +330,6 @@
#endif
/* Version number of package */
#define VERSION "@VERSION@"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD

3102
gnucash.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff

7
gnucash.xcodeproj/project.xcworkspace/contents.xcworkspacedata generated
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:gnucash.xcodeproj">
</FileRef>
</Workspace>

41
gnucash.xcodeproj/project.xcworkspace/xcshareddata/gnucash.xccheckout
View File

@@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectFavoriteDictionaryKey</key>
<false/>
<key>IDESourceControlProjectIdentifier</key>
<string>7C0F9071-5F34-4A6E-863E-3F0B0A6FA6F5</string>
<key>IDESourceControlProjectName</key>
<string>gnucash</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>891201B2FD1333E21F62FC8E4D7B084108B7C6B0</key>
<string>git://github.com/Gnucash/gnucash.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>gnucash.xcodeproj</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>891201B2FD1333E21F62FC8E4D7B084108B7C6B0</key>
<string>../..</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>git://github.com/Gnucash/gnucash.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>111</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>891201B2FD1333E21F62FC8E4D7B084108B7C6B0</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>891201B2FD1333E21F62FC8E4D7B084108B7C6B0</string>
<key>IDESourceControlWCCName</key>
<string>gnucash</string>
</dict>
</array>
</dict>
</plist>

97
gnucash.xcodeproj/xcshareddata/xcschemes/Gnucash.xcscheme
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0460"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6E0F8138098D492A00D0BB5C"
BuildableName = "Gnucash"
BlueprintName = "Gnucash"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6E0F8138098D492A00D0BB5C"
BuildableName = "Gnucash"
BlueprintName = "Gnucash"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "1"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<PathRunnable
runnableDebuggingMode = "0"
FilePath = "/tools/gnucash-git/install/darwin/bin/gnucash">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6E0F8138098D492A00D0BB5C"
BuildableName = "Gnucash"
BlueprintName = "Gnucash"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CommandLineArguments>
<CommandLineArgument
argument = "--nofile"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
<EnvironmentVariables>
<EnvironmentVariable
key = "PYTHONPATH"
value = "$SRCROOT/../install/darwin/lib/python2.7/site-packages"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

93
gnucash.xcodeproj/xcshareddata/xcschemes/Test Numeric.xcscheme
View File

@@ -1,93 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "NO"
buildForRunning = "YES"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6EB409A21E93773A009904A3"
BuildableName = "Test Numeric"
BlueprintName = "Test Numeric"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6EB409A21E93773A009904A3"
BuildableName = "Test Numeric"
BlueprintName = "Test Numeric"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<PathRunnable
runnableDebuggingMode = "0"
FilePath = "/tools/gnucash-git/build/darwin/src/libqof/qof/test/test-gnc-numeric">
</PathRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6EB409A21E93773A009904A3"
BuildableName = "Test Numeric"
BlueprintName = "Test Numeric"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "6EB409A21E93773A009904A3"
BuildableName = "Test Numeric"
BlueprintName = "Test Numeric"
ReferencedContainer = "container:gnucash.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

2
gnucash/gnome-utils/gnc-embedded-window.c
View File

@@ -342,7 +342,7 @@ gnc_embedded_window_new (const gchar *action_group_name,
/* Create menu and toolbar information */
priv->action_group = gtk_action_group_new (action_group_name);
gtk_action_group_set_translation_domain(priv->action_group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain(priv->action_group, PROJECT_NAME);
gtk_action_group_add_actions (priv->action_group, action_entries,
n_action_entries, user_data);
gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);

4
gnucash/gnome-utils/gnc-main-window.c
View File

@@ -3222,7 +3222,7 @@ gnc_main_window_merge_actions (GncMainWindow *window,
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
entry = g_new0 (MergedActionEntry, 1);
entry->action_group = gtk_action_group_new (group_name);
gtk_action_group_set_translation_domain (entry->action_group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain (entry->action_group, PROJECT_NAME);
gtk_action_group_add_actions (entry->action_group, actions, n_actions, data);
if (toggle_actions != NULL && n_toggle_actions > 0)
{
@@ -3672,7 +3672,7 @@ gnc_main_window_setup_window (GncMainWindow *window)
/* Create menu and toolbar information */
priv->action_group = gtk_action_group_new ("MainWindowActions");
gtk_action_group_set_translation_domain (priv->action_group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain (priv->action_group, PROJECT_NAME);
gtk_action_group_add_actions (priv->action_group, gnc_menu_actions,
gnc_menu_n_actions, window);
gtk_action_group_add_toggle_actions (priv->action_group,

2
gnucash/gnome-utils/gnc-plugin-menu-additions.c
View File

@@ -423,7 +423,7 @@ gnc_plugin_menu_additions_add_to_window (GncPlugin *plugin,
per_window.window = window;
per_window.ui_manager = window->ui_merge;
per_window.group = gtk_action_group_new ("MenuAdditions" );
gtk_action_group_set_translation_domain (per_window.group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain (per_window.group, PROJECT_NAME);
per_window.merge_id = gtk_ui_manager_new_merge_id(window->ui_merge);
gtk_ui_manager_insert_action_group(window->ui_merge, per_window.group, 0);

2
gnucash/gnome-utils/gnc-plugin-page.c
View File

@@ -997,7 +997,7 @@ gnc_plugin_page_create_action_group (GncPluginPage *page, const gchar *group_nam
priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page);
group = gtk_action_group_new(group_name);
gtk_action_group_set_translation_domain(group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain(group, PROJECT_NAME);
priv->action_group = group;
return group;
}

13
gnucash/gnome/assistant-hierarchy.c
View File

@@ -243,19 +243,22 @@ gnc_get_ea_locale_dir(const char *top_dir)
GStatBuf buf;
int i;
#ifdef PLATFORM_WIN32
#if PLATFORM(WINDOWS)
/* On win32, setlocale() doesn't say anything useful, so we check
* g_win32_getlocale(). Unfortunately it checks the value of $LANG first,
* and the user might have worked around the absence of sv in gettext's
* Microsoft Conversion Array by setting it to "Swedish_Sweden", so first
* check that.
*/
locale = g_getenv("LANG");
if (g_strcmp0(locale, "Swedish_Sweden") == 0)
const gchar *env_locale;
env_locale = g_getenv("LANG");
if (g_strcmp0(env_locale, "Swedish_Sweden") == 0)
locale = g_strdup("sv_SE");
else if (g_strcmp0(locale, "Swedish_Finland") == 0)
else if (g_strcmp0(env_locale, "Swedish_Finland") == 0)
locale =g_strdup("sv_FI");
else
else if (g_strcmp0(env_locale, "Swedish_Åland Islands") == 0)
locale =g_strdup("sv_AX");
else
{
locale = g_win32_getlocale();
if (!locale)

2
gnucash/gnome/gnucash.desktop.in.in
View File

@@ -14,6 +14,6 @@ Categories=Office;Finance;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=GnuCash
X-GNOME-Bugzilla-Component=General
X-GNOME-Bugzilla-Version=@VERSION@
X-GNOME-Bugzilla-Version=@PROJECT_VERSION@
X-GNOME-DocPath=gnucash/gnucash.xml
X-GNOME-FullName=GnuCash Finance Management

2
gnucash/gnome/window-reconcile.c
View File

@@ -1742,7 +1742,7 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
action_group = gtk_action_group_new ("ReconcileWindowActions");
recnData->action_group = action_group;
gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain(action_group, PROJECT_NAME);
gtk_action_group_add_actions (action_group, recnWindow_actions,
recnWindow_n_actions, recnData);
action =

2
gnucash/gnome/window-reconcile2.c
View File

@@ -1683,7 +1683,7 @@ recnWindow2WithBalance (GtkWidget *parent, Account *account,
action_group = gtk_action_group_new ("ReconcileWindowActions");
recnData->action_group = action_group;
gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
gtk_action_group_set_translation_domain (action_group, PROJECT_NAME);
gtk_action_group_add_actions (action_group, recnWindow2_actions,
recnWindow2_n_actions, recnData);
action =

8
gnucash/gnucash-bin.c
View File

@@ -440,7 +440,7 @@ gnc_parse_command_line(int *argc, char ***argv)
GError *error = NULL;
GOptionContext *context = g_option_context_new (_("- GnuCash, accounting for personal and small business finance"));
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
g_option_context_add_main_entries (context, options, PROJECT_NAME);
g_option_context_add_group (context, gtk_get_option_group(FALSE));
if (!g_option_context_parse (context, argc, argv, &error))
{
@@ -873,11 +873,11 @@ main(int argc, char ** argv)
setlocale (LC_ALL, "C");
}
#endif
bindtextdomain(GETTEXT_PACKAGE, localedir);
bindtextdomain(PROJECT_NAME, localedir);
bindtextdomain("iso_4217", localedir); // For win32 to find currency name translations
bind_textdomain_codeset("iso_4217", "UTF-8");
textdomain(GETTEXT_PACKAGE);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(PROJECT_NAME);
bind_textdomain_codeset(PROJECT_NAME, "UTF-8");
g_free(localedir);
gnc_parse_command_line(&argc, &argv);

8
gnucash/gnucash.rc.in
View File

@@ -3,8 +3,8 @@
APPLICATION_ICON ICON DISCARDABLE "../data/pixmaps/gnucash-icon.ico"
1 VERSIONINFO
FILEVERSION @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,0,0
PRODUCTVERSION @GNUCASH_MAJOR_VERSION@,@GNUCASH_MINOR_VERSION@,0,0
FILEVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
PRODUCTVERSION @PROJECT_VERSION_MAJOR@,@PROJECT_VERSION_MINOR@,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS VOS__WINDOWS32
@@ -17,12 +17,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "GnuCash Development Team"
VALUE "FileDescription", "GnuCash Program File"
VALUE "FileVersion", "@VERSION@"
VALUE "FileVersion", "@PROJECT_VERSION@"
VALUE "InternalName", "gnucash"
VALUE "LegalCopyright", "©2018 GnuCash Development Team, Licence: GPL v2.0 or later"
VALUE "OriginalFilename", "gnucash.exe"
VALUE "ProductName", "GnuCash Free Finance Manager"
VALUE "ProductVersion", "@VERSION@"
VALUE "ProductVersion", "@PROJECT_VERSION@"
END
END

2
gnucash/gschemas/org.gnucash.dialogs.business.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.business" path="/org/gnucash/dialogs/business/">
<child name="customer-search" schema="org.gnucash.dialogs.business.customer-search"/>
<child name="employee-search" schema="org.gnucash.dialogs.business.employee-search"/>

2
gnucash/gschemas/org.gnucash.dialogs.checkprinting.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.checkprinting" path="/org/gnucash/dialogs/print-checks/">
<key name="check-format-guid" type="s">
<default>''</default>

2
gnucash/gschemas/org.gnucash.dialogs.commodities.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.commodities" path="/org/gnucash/dialogs/commodities/">
<key name="include-iso" type="b">
<default>false</default>

2
gnucash/gschemas/org.gnucash.dialogs.export.csv.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.export.csv" path="/org/gnucash/dialogs/export/csv/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>

2
gnucash/gschemas/org.gnucash.dialogs.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs" path="/org/gnucash/dialogs/">
<child name="account" schema="org.gnucash.dialogs.account"/>
<child name="imap-editor" schema="org.gnucash.dialogs.imap-editor"/>

2
gnucash/gschemas/org.gnucash.dialogs.import.csv.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.csv" path="/org/gnucash/dialogs/import/csv/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>

2
gnucash/gschemas/org.gnucash.dialogs.import.generic.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.generic" path="/org/gnucash/dialogs/import/generic/">
<key name="enable-skip" type="b">
<default>true</default>

2
gnucash/gschemas/org.gnucash.dialogs.import.qif.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.qif" path="/org/gnucash/dialogs/import/qif/">
<key name="default-status-notcleared" type="b">
<default>true</default>

2
gnucash/gschemas/org.gnucash.dialogs.reconcile.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.reconcile" path="/org/gnucash/dialogs/reconcile/">
<key name="check-cleared" type="b">
<default>true</default>

2
gnucash/gschemas/org.gnucash.dialogs.sxs.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.sxs" path="/org/gnucash/dialogs/scheduled-trans/">
<child name="since-last-run" schema="org.gnucash.dialogs.sxs.since-last-run"/>
<child name="transaction-editor" schema="org.gnucash.dialogs.sxs.transaction-editor"/>

2
gnucash/gschemas/org.gnucash.dialogs.totd.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.totd" path="/org/gnucash/dialogs/tip-of-the-day/">
<key name="current-tip" type="i">
<default>0</default>

2
gnucash/gschemas/org.gnucash.general.finance-quote.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.general.finance-quote" path="/org/gnucash/general/finance-quote/">
<key name="alphavantage-api-key" type="s">
<default>''</default>

2
gnucash/gschemas/org.gnucash.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash" path="/org/gnucash/">
<child name="general" schema="org.gnucash.general"/>
<child name="dev" schema="org.gnucash.dev"/>

2
gnucash/gschemas/org.gnucash.history.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.history" path="/org/gnucash/history/">
<key name="maxfiles" type="i">
<default>4</default>

2
gnucash/gschemas/org.gnucash.warnings.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.warnings" path="/org/gnucash/warnings/">
<child name="permanent" schema="org.gnucash.warnings.permanent"/>
<child name="temporary" schema="org.gnucash.warnings.temporary"/>

2
gnucash/gschemas/org.gnucash.window.pages.account.tree.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.window.pages.account-tree.summary" path="/org/gnucash/window/pages/account-tree/summary/">
<key name="grand-total" type="b">
<default>true</default>

2
gnucash/gschemas/org.gnucash.window.pages.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.window.pages" path="/org/gnucash/window/pages/account-tree/">
<key name="account-code-visible" type="b">
<default>false</default>

2
gnucash/import-export/aqb/gnc-ab-utils.c
View File

@@ -169,7 +169,7 @@ gnc_AB_BANKING_new(void)
registration was requested and is managed by cstim). The function call was
introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PACKAGE_VERSION);
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PROJECT_VERSION);
#endif
#ifndef AQBANKING6

2
gnucash/import-export/aqb/gschemas/org.gnucash.dialogs.import.hbci.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.ab-initial" path="/org/gnucash/dialogs/ab-initial/">
<key name="last-geometry" type="(iiii)">
<default>(-1,-1,-1,-1)</default>

2
gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp
View File

@@ -2083,7 +2083,7 @@ CsvImpTransAssist::assist_summary_page_prepare ()
// FIXME Rather than passing a locale generator below we probably should set std::locale::global appropriately somewhere.
bl::generator gen;
gen.add_messages_path(gnc_path_get_localedir());
gen.add_messages_domain(GETTEXT_PACKAGE);
gen.add_messages_domain(PROJECT_NAME);
auto text = std::string("<span size=\"medium\"><b>");
try

2
gnucash/import-export/ofx/gschemas/org.gnucash.dialogs.import.ofx.gschema.xml.in
View File

@@ -1,4 +1,4 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
<schemalist gettext-domain="@PROJECT_NAME@">
<schema id="org.gnucash.dialogs.import.ofx" path="/org/gnucash/dialogs/import/ofx/">
<key name="last-path" type="s">
<default>''</default>

3
gnucash/report/report-utilities.scm
View File

@@ -140,8 +140,7 @@
(define (gnc:accounts-and-all-descendants accountslist)
(sort-and-delete-duplicates
(apply append accountslist (map gnc-account-get-descendants accountslist))
(lambda (a b) (< (xaccAccountOrder a b) 0))
equal?))
gnc:account-path-less-p equal?))
;;; Here's a statistics collector... Collects max, min, total, and makes
;;; it easy to get at the mean.

7
gnucash/report/reports/standard/new-aging.scm
View File

@@ -174,9 +174,6 @@ exist but have no suitable transactions."))
(define (gnc-owner-equal? a b)
(string=? (gncOwnerReturnGUID a) (gncOwnerReturnGUID b)))
(define (account<? a b)
(< (xaccAccountOrder a b) 0))
(define (split-has-owner? split owner)
(let* ((split-owner (split->owner split))
(retval (gnc-owner-equal? split-owner owner)))
@@ -263,9 +260,7 @@ exist but have no suitable transactions."))
(else
(setup-query query accounts report-date)
(let* ((splits (xaccQueryGetSplitsUniqueTrans query))
(accounts (sort-and-delete-duplicates (map xaccSplitGetAccount splits)
account<? equal?)))
(let* ((splits (xaccQueryGetSplitsUniqueTrans query)))
(qof-query-destroy query)
;; loop into each APAR account

75
gnucash/report/reports/standard/new-owner-report.scm
View File

@@ -54,7 +54,7 @@
(define tax-header (N_ "Tax"))
(define credit-header (N_ "Credits"))
(define debit-header (N_ "Debits"))
(define amount-header (N_ "Balance"))
(define balance-header (N_ "Balance"))
(define linked-txns-header (N_ "Links"))
;; Depending on the report type we want to set up some lists/cases
@@ -123,9 +123,9 @@
(vector-ref columns-used 5))
(define (tax-col columns-used)
(vector-ref columns-used 6))
(define (credit-col columns-used)
(vector-ref columns-used 7))
(define (debit-col columns-used)
(vector-ref columns-used 7))
(define (credit-col columns-used)
(vector-ref columns-used 8))
(define (bal-col columns-used)
(vector-ref columns-used 9))
@@ -177,13 +177,15 @@
(set-col (opt-val "Display Columns" desc-header) 4)
(set-col (opt-val "Display Columns" sale-header) 5)
(set-col (opt-val "Display Columns" tax-header) 6)
(set-col (opt-val "Display Columns" credit-header) 7)
(set-col (opt-val "Display Columns" debit-header) 8)
(set-col (opt-val "Display Columns" amount-header) 9)
(set-col (opt-val "Display Columns" debit-header) 7)
(set-col (opt-val "Display Columns" credit-header) 8)
(set-col (opt-val "Display Columns" balance-header) 9)
col-vector))
(define (make-heading-list column-vector link-option)
(let ((heading-list '()))
(define (make-heading-list column-vector link-option acct-type)
(let ((heading-list '())
(formal? (gnc-prefs-get-bool GNC-PREFS-GROUP-GENERAL
GNC-PREF-ACCOUNTING-LABELS)))
(if (date-col column-vector)
(addto! heading-list (_ date-header)))
(if (date-due-col column-vector)
@@ -198,12 +200,14 @@
(addto! heading-list (_ sale-header)))
(if (tax-col column-vector)
(addto! heading-list (_ tax-header)))
(if (credit-col column-vector)
(addto! heading-list (_ credit-header)))
(if (debit-col column-vector)
(addto! heading-list (_ debit-header)))
(addto! heading-list
(if formal? debit-header (gnc:get-debit-string acct-type))))
(if (credit-col column-vector)
(addto! heading-list
(if formal? credit-header (gnc:get-credit-string acct-type))))
(if (bal-col column-vector)
(addto! heading-list (_ amount-header)))
(addto! heading-list (_ balance-header)))
(case link-option
((simple)
(addto! heading-list (_ linked-txns-header)))
@@ -238,8 +242,6 @@
(eqv? (xaccTransGetTxnType txn) TXN-TYPE-PAYMENT))
(define (txn-is-link? txn)
(eqv? (xaccTransGetTxnType txn) TXN-TYPE-LINK))
(define (split<? a b)
(< (xaccSplitOrder a b) 0))
(define (split-is-payment? split)
(txn-is-payment? (xaccSplitGetParent split)))
@@ -402,8 +404,8 @@
(append
(addif (sale-col column-vector) (cell sale))
(addif (tax-col column-vector) (cell tax))
(addif (credit-col column-vector) (cell-anchor credit))
(addif (debit-col column-vector) (cell-anchor (and debit (- debit))))
(addif (debit-col column-vector) (cell-anchor debit))
(addif (credit-col column-vector) (cell-anchor (and credit (- credit))))
(addif (bal-col column-vector) (cell amt))))
(addif (< 0 mid-span) cell-nohoriz)
(link-data->cols (car link-rows))))
@@ -442,9 +444,9 @@
1 (1- period-span) #f))
(addif (sale-col used-columns) (make-cell sale))
(addif (tax-col used-columns) (make-cell tax))
(addif (debit-col used-columns) (make-cell debit))
(addif (credit-col used-columns) (make-cell credit))
(addif (debit-col used-columns) (make-cell (- debit)))
(addif (bal-col used-columns) (make-cell (+ credit debit)))
(addif (bal-col used-columns) (make-cell total))
(addif (< 0 rhs-cols) (gnc:make-html-table-cell/size
1 (+ mid-span rhs-cols) #f)))))
@@ -710,16 +712,15 @@
(let* ((split (car splits))
(txn (xaccSplitGetParent split))
(date (xaccTransGetDate txn))
(value (AP-negate (xaccTransGetAccountAmount txn acc)))
(orig-value (xaccTransGetAccountAmount txn acc))
(value (AP-negate orig-value))
(invoice (gncInvoiceGetInvoiceFromTxn txn)))
(cond
;; txn-date < start-date. skip display, accumulate amounts
((< date start-date)
(lp printed? odd-row? (cdr splits) (+ total value)
(if (negative? value) (+ debit value) debit)
(if (negative? value) credit (+ credit value))
tax sale))
debit credit tax sale))
;; if balance row hasn't been rendered, consider
;; adding here. skip if value=0.
@@ -738,7 +739,8 @@
((txn-is-invoice? txn) (list split))
((txn-is-payment? txn) (txn->assetliab-splits txn))))
currency (+ total value)
(and (>= value 0) value) (and (< value 0) value)
(and (< orig-value 0) orig-value)
(and (>= orig-value 0) orig-value)
(invoice->sale invoice) (invoice->tax invoice)
(txn->transfer-split txn)
link-option
@@ -756,8 +758,8 @@
(else '(()))))
(lp printed? (not odd-row?) (cdr splits) (+ total value)
(if (negative? value) (+ debit value) debit)
(if (negative? value) credit (+ credit value))
(if (< 0 orig-value) (+ debit orig-value) debit)
(if (< 0 orig-value) credit (- credit orig-value))
(+ tax (or (invoice->tax invoice) 0))
(+ sale (or (invoice->sale invoice) 0))))))))))
@@ -818,20 +820,20 @@
(N_ "Display Columns") tax-header
"hab" (N_ "Display the tax column?") #f))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") credit-header
"hac" (N_ "Display the period credits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") debit-header
"had" (N_ "Display a period debits column?") #t))
"hac" (N_ "Display the period debits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") amount-header
"hb" (N_ "Display the transaction amount?") #t))
(N_ "Display Columns") credit-header
"had" (N_ "Display a period credits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") balance-header
"hb" (N_ "Display a running balance?") #t))
(gnc:register-inv-option
(gnc:make-multichoice-option
@@ -953,7 +955,12 @@ invoices and amounts.")))))
(document (gnc:make-html-document))
(table (gnc:make-html-table))
(section-headings (make-section-heading-list used-columns owner-descr))
(headings (make-heading-list used-columns link-option))
(headings (make-heading-list
used-columns link-option
(if (eqv? (gncOwnerGetType (gncOwnerGetEndOwner owner))
GNC-OWNER-CUSTOMER)
ACCT-TYPE-RECEIVABLE
ACCT-TYPE-PAYABLE)))
(report-title (string-append (_ owner-descr) " " (_ "Report"))))
(cond

8
gnucash/report/reports/standard/test/test-balsheet-pnl.scm
View File

@@ -273,10 +273,10 @@
(set-option! balance-sheet-options "Display" "Parent account subtotals" 'f)
(let ((sxml (options->sxml balance-sheet-uuid balance-sheet-options "balsheet-recursive")))
(test-equal "recursive. root = $760+15000+104600"
'("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00")
'("#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00")
(sxml->table-row-col sxml 1 3 6))
(test-equal "recursive. assets = $760+15000+104600"
'("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00")
'("#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00")
(sxml->table-row-col sxml 1 4 5))
(test-equal "recursive. bank1 = $4,709.00"
(list "$4,709.00")
@@ -294,7 +294,7 @@
(list "$100.00")
(sxml->table-row-col sxml 1 9 3))
(test-equal "recursive. broker = $15000+2000.00"
'("$2,000.00" "$2,000.00" "30 FUNDS" "$15,000.00")
'("30 FUNDS" "$15,000.00" "$2,000.00" "$2,000.00")
(sxml->table-row-col sxml 1 10 4))
(test-equal "recursive. funds = $15,000.00"
(list "30 FUNDS" "$15,000.00" "$15,000.00")
@@ -326,7 +326,7 @@
(set-option! balance-sheet-options "Commodities" "Show Exchange Rates" #t)
(let ((sxml (options->sxml balance-sheet-uuid balance-sheet-options "balsheet-enable show-fcur show-rates")))
(test-equal "show-fcur enabled"
'("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00")
'("#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00")
(sxml->table-row-col sxml 1 3 6))
(test-equal "show-rates enabled"
'("#1.00" "$1.70" "1 FUNDS" "$500.00")

2
libgnucash/app-utils/gnc-gsettings.c
View File

@@ -666,7 +666,7 @@ void gnc_gsettings_version_upgrade (void)
/* Use versioning to ensure this routine will only sync once for each
* superseded setting */
int old_maj_min = gnc_gsettings_get_int (GNC_PREFS_GROUP_GENERAL, GNC_PREF_VERSION);
int cur_maj_min = GNUCASH_MAJOR_VERSION * 100 + GNUCASH_MINOR_VERSION;
int cur_maj_min = PROJECT_VERSION_MAJOR * 100 + PROJECT_VERSION_MINOR;
/* Convert settings to 3.0 compatibility level */
if (old_maj_min < 207)

2
libgnucash/backend/xml/sixtp-utils.cpp
View File

@@ -36,12 +36,10 @@ extern "C"
#include <time.h>
#include <errno.h>
#ifdef GNUCASH_MAJOR_VERSION
#ifndef HAVE_STRPTIME
#include "strptime.h"
#endif
#include <gnc-date.h>
#endif
}
#include "sixtp.h"

4
libgnucash/core-utils/gnc-filepath-utils.cpp
View File

@@ -591,7 +591,7 @@ static std::string migrate_gnc_datahome()
bl::generator gen;
gen.add_messages_path(gnc_path_get_datadir());
gen.add_messages_domain(PACKAGE);
gen.add_messages_domain(PROJECT_NAME);
std::stringstream migration_msg;
migration_msg.imbue(gnc_get_locale());
@@ -737,7 +737,7 @@ static std::string migrate_gnc_datahome()
#if defined G_OS_WIN32 ||defined MAC_INTEGRATION
constexpr auto path_package = PACKAGE_NAME;
#else
constexpr auto path_package = PACKAGE;
constexpr auto path_package = PROJECT_NAME;
#endif
// Initialize the user's config directory for gnucash

2
libgnucash/core-utils/gnc-prefs.c
View File

@@ -122,7 +122,7 @@ gnc_prefs_set_file_retention_days(gint days)
guint
gnc_prefs_get_long_version()
{
return GNUCASH_MAJOR_VERSION * 1000000 + GNUCASH_MINOR_VERSION;
return PROJECT_VERSION_MAJOR * 1000000 + PROJECT_VERSION_MINOR;
}
gulong gnc_prefs_register_cb (const char *group,

4
libgnucash/core-utils/gnc-version.c
View File

@@ -34,7 +34,7 @@
const char *gnc_version(void)
{
return VERSION;
return PROJECT_VERSION;
}
const char *gnc_build_id(void)
@@ -64,5 +64,5 @@ const char *gnc_vcs_rev_date(void)
const int gnc_gnucash_major_version(void)
{
return GNUCASH_MAJOR_VERSION;
return PROJECT_VERSION_MAJOR;
}

8
libgnucash/core-utils/test/test-userdata-dir-invalid-home.c
View File

@@ -42,19 +42,19 @@ usr_confpath_strings strs2[] =
{
{
0, "gnc_build_userdata_path",
PACKAGE
PROJECT_NAME
},
{
1, "gnc_build_book_path",
PACKAGE G_DIR_SEPARATOR_S "books"
PROJECT_NAME G_DIR_SEPARATOR_S "books"
},
{
2, "gnc_build_translog_path",
PACKAGE G_DIR_SEPARATOR_S "translog"
PROJECT_NAME G_DIR_SEPARATOR_S "translog"
},
{
3, "gnc_build_data_path",
PACKAGE G_DIR_SEPARATOR_S "data"
PROJECT_NAME G_DIR_SEPARATOR_S "data"
},
{ 0, NULL, NULL },
};

2
libgnucash/core-utils/test/test-userdata-dir.c
View File

@@ -62,7 +62,7 @@ usr_confpath_strings strs2[] =
#if defined G_OS_WIN32 ||defined MAC_INTEGRATION
const char *path_package = PACKAGE_NAME;
#else
const char *path_package = PACKAGE;
const char *path_package = PROJECT_NAME;
#endif

4
libgnucash/doc/design/CMakeLists.txt
View File

@@ -22,8 +22,8 @@ set(UPDATED_MONTH "${CURRENT_MONTH} ${CURRENT_YEAR}")
set(VERSION_TEXI_IN
"@set UPDATED ${UPDATED}
@set UPDATED-MONTH ${UPDATED_MONTH}
@set EDITION ${VERSION}
@set VERSION ${VERSION}
@set EDITION ${PROJECT_VERSION}
@set VERSION ${PROJECT_VERSION}
")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.texi ${VERSION_TEXI_IN})

12
libgnucash/engine/Account.cpp
View File

@@ -2284,18 +2284,6 @@ xaccAccountOrder (const Account *aa, const Account *ab)
da = priv_aa->accountCode;
db = priv_ab->accountCode;
/* If accountCodes are both base 36 integers do an integer sort */
la = strtoul (da, &endptr, 36);
if ((*da != '\0') && (*endptr == '\0'))
{
lb = strtoul (db, &endptr, 36);
if ((*db != '\0') && (*endptr == '\0'))
{
if (la < lb) return -1;
if (la > lb) return +1;
}
}
/* Otherwise do a string sort */
result = g_strcmp0 (da, db);
if (result)

2
libgnucash/engine/gncAddress.h
View File

@@ -55,9 +55,7 @@ up to you to pass a suitable entity.
#define GNC_ADDRESS_H_
#include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#define GNC_ADDRESS_MODULE_NAME "gncAddress"
#define GNC_ID_ADDRESS GNC_ADDRESS_MODULE_NAME

3
libgnucash/engine/gncBillTerm.h
View File

@@ -35,9 +35,8 @@ typedef struct _gncBillTerm GncBillTerm;
typedef struct _gncBillTermClass GncBillTermClass;
#include "qof.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#define GNC_ID_BILLTERM "gncBillTerm"
/* --- type macros --- */

2
libgnucash/engine/gncCustomer.c
View File

@@ -37,9 +37,7 @@
#include "gncAddressP.h"
#include "gncBillTermP.h"
#include "gncInvoice.h"
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#include "gncCustomer.h"
#include "gncCustomerP.h"

2
libgnucash/engine/gncEntry.h
View File

@@ -49,9 +49,7 @@ typedef enum
typedef GList AccountValueList;
#ifdef GNUCASH_MAJOR_VERSION
#include "gncBusiness.h"
#endif
#include "gncInvoice.h"
#include "gncOrder.h"
#include "gncTaxTable.h"

6
libgnucash/engine/gncJob.c
View File

@@ -576,11 +576,7 @@ gboolean gncJobRegister (void)
{ JOB_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, (QofSetterFunc)gncJobSetActive },
{ JOB_REFERENCE, QOF_TYPE_STRING, (QofAccessFunc)gncJobGetReference, (QofSetterFunc)gncJobSetReference },
{ JOB_RATE, QOF_TYPE_NUMERIC, (QofAccessFunc)gncJobGetRate, (QofSetterFunc)gncJobSetRate },
#ifdef GNUCASH_MAJOR_VERSION
{ JOB_OWNER, GNC_ID_OWNER, (QofAccessFunc)gncJobGetOwner, NULL },
#else
{ JOB_OWNER, QOF_TYPE_CHOICE, (QofAccessFunc)qofJobGetOwner, (QofSetterFunc)qofJobSetOwner },
#endif
{ QOF_PARAM_ACTIVE, QOF_TYPE_BOOLEAN, (QofAccessFunc)gncJobGetActive, NULL },
{ QOF_PARAM_BOOK, QOF_ID_BOOK, (QofAccessFunc)qof_instance_get_book, NULL },
{ QOF_PARAM_GUID, QOF_TYPE_GUID, (QofAccessFunc)qof_instance_get_guid, NULL },
@@ -597,10 +593,8 @@ gboolean gncJobRegister (void)
}
qof_class_register (_GNC_MOD_NAME, (QofSortFunc)gncJobCompare, params);
#ifdef GNUCASH_MAJOR_VERSION
qofJobGetOwner(NULL);
qofJobSetOwner(NULL, NULL);
#endif
return qof_object_register (&gncJobDesc);
}

2
libgnucash/engine/qof-backend.cpp
View File

@@ -109,7 +109,7 @@ QofBackend::register_backend(const char* directory, const char* module_name)
g_free (fullpath);
if (!backend)
{
PINFO ("%s: %s\n", PACKAGE, g_module_error ());
PINFO ("%s: %s\n", PROJECT_NAME, g_module_error ());
return false;
}
void (*module_init_func)(void);

4
po/CMakeLists.txt
View File

@@ -149,9 +149,9 @@ if(BUILDING_FROM_VCS)
-D TOP_SRC_DIR=${CMAKE_SOURCE_DIR}
-D PO_SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-D PO_BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}
-D PACKAGE=${PACKAGE}
-D PROJECT_NAME=${PROJECT_NAME}
-D PACKAGE_NAME=${PACKAGE_NAME}
-D PACKAGE_VERSION=${PACKAGE_VERSION}
-D PROJECT_VERSION=${PROJECT_VERSION}
-D XGETTEXT=${XGETTEXT}
-P ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-pot.cmake
DEPENDS ${gnucash_pot_depends}

2
po/Makevars
View File

@@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
DOMAIN = $(PROJECT_NAME)
# These two variables depend on the location of this directory.
subdir = po

6
po/glossary/txt-to-pot.sh
View File

@@ -23,17 +23,17 @@ then
exit 1;
fi
# Note: Line 3: PACKAGE and probably a few other variables are hardcoded
# Note: Line 3: PROJECT and probably a few other variables are hardcoded
cat <<!
# SOME DESCRIPTIVE TITLE. (Glossary)
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) YEAR THE PROJECT'S COPYRIGHT HOLDER
# This file is distributed under the same license as the GnuCash package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Project-Id-Version: PROJECT VERSION\n"
"POT-Creation-Date: `date +'%Y-%m-%d %H:%M%z'`\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

6
po/gnucash-pot.cmake
View File

@@ -1,8 +1,8 @@
execute_process(
COMMAND ${XGETTEXT} --add-comments=Translators
--directory=${TOP_SRC_DIR}
--default-domain=${PACKAGE}
--output=${PACKAGE}.pot
--default-domain=${PROJECT_NAME}
--output=${PROJECT_NAME}.pot
--files-from=${PO_SRC_DIR}/POTFILES.in
--from-code=UTF-8
--flag=g_strdup_printf:1:c-format
@@ -30,7 +30,7 @@ execute_process(
--keyword=translate:1,2,3t
--keyword=translate:1c,2,3,4t
--package-name=${PACKAGE_NAME}
--package-version=${PACKAGE_VERSION}
--package-version=${PROJECT_VERSION}
--msgid-bugs-address=https://bugs.gnucash.org/enter_bug.cgi?product=GnuCash&component=Translations
WORKING_DIRECTORY ${PO_BIN_DIR}
RESULT_VARIABLE GNUCASH_POT_RESULT

2
po/mni@bengali.po
View File

@@ -1,6 +1,6 @@
# GNUCash translations for Manipuri language using Bengali Script"
# Copyright (C) 2015.
# This file is distributed under the same license as the PACKAGE package.
# This file is distributed under the same license as the GnuCash package.
# Chandrakant Dhutadmal <cpdhutadmal@yahoo.com>, 2015.
#
msgid ""

2
po/ne.po
View File

@@ -1,5 +1,5 @@
# translation of gnucash2.ne.po to Nepali
# This file is distributed under the same license as the PACKAGE package.
# This file is distributed under the same license as the GnuCash package.
# Copyright (C) YEAR Gnumatic, Inc.
# Pawan Chitrakar <pchitrakar@gmail.com>, 2006.
# Jyotshna Shrestha <jyotshna@mpp.org.np>, 2006.