From ed32d4e9f30a3f45b5d341459adbbd67df081a19 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sat, 19 Jun 2010 15:42:32 +0000 Subject: [PATCH] Improve name consistency. Use "GnuCash" (or more precisely PACKAGE_NAME), wherever the name is visible to the user, and "gnucash" (or more precisely PACKAGE) everywhere else. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19279 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/gnucash.iss.in | 12 ++++++------ packaging/win32/install-impl.sh | 2 +- src/bin/Makefile.am | 4 +--- src/bin/gnucash-bin.c | 8 ++++---- src/gnome-utils/gnc-gnome-utils.c | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index 618fba6adb..e2c24a7e25 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -41,25 +41,25 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}" [Icons] -Name: "{group}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon +Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon Name: "{group}\{cm:IconName_README}"; Filename: "{app}\doc\gnucash\{cm:IconFilename_README}"; Comment: "{cm:IconComment_README}"; Tasks: menuicon Name: "{group}\{cm:IconName_FAQ}"; Filename: "http://wiki.gnucash.org/wiki/FAQ"; Tasks: menuicon Name: "{group}\{cm:IconName_Bugzilla}"; Filename: "http://bugzilla.gnome.org/enter_bug.cgi?product=GnuCash"; Tasks: menuicon Name: "{group}\{cm:IconName_InstallFQ}"; Filename: "{app}\bin\install-fq-mods.cmd"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_InstallFQ}"; Tasks: menuicon Name: "{group}\{cm:IconName_Uninstall}"; Filename: "{uninstallexe}"; Comment: "{cm:IconComment_Uninstall}"; Tasks: menuicon -Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\GnuCash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon +Name: "{commondesktop}\GnuCash"; Filename: "{app}\bin\gnucash.exe"; WorkingDir: "{app}\bin"; Comment: "{cm:IconComment_GnuCash}"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon [Run] -Filename: "{app}\bin\GnuCash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent +Filename: "{app}\bin\gnucash.exe"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; OnlyBelowVersion: 0,6; Flags: postinstall skipifsilent Filename: "{app}\bin\guile.cmd"; Parameters: "-c ""(use-modules (ice-9 slib)) (require 'printf)"""; Flags: runhidden ;; The Windows firewall exceptions, see http://www.vincenzo.net/isxkb/index.php?title=Adding_a_rule_to_the_Windows_firewall -Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\GnuCash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2; +Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gnucash.exe"" ""GnuCash Free Finance Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2; Filename: "{sys}\netsh.exe"; Parameters: "firewall add allowedprogram ""{app}\bin\gconfd-2.exe"" ""GConf Settings Manager"" ENABLE ALL"; StatusMsg: "{cm:StatusMsgFirewall}"; Flags: runhidden; MinVersion: 0,5.01.2600sp2; [UninstallRun] Filename: "{app}\bin\gconftool-2.exe"; Parameters: "--shutdown"; Flags: runhidden -Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\GnuCash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2 +Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gnucash.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2 Filename: "{sys}\netsh.exe"; Parameters: "firewall delete allowedprogram program=""{app}\bin\gconfd-2.exe"""; Flags: runhidden; MinVersion: 0,5.01.2600sp2 ; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -113,7 +113,7 @@ Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: ""; ValueData: "Gn Root: HKCR; Subkey: ".gnucash"; ValueType: string; ValueName: "Content Type"; ValueData: "application/x-gnucash"; Flags: uninsdeletevalue Root: HKCR; Subkey: "GnuCash.Financial.Data"; ValueType: string; ValueName: ""; ValueData: "GnuCash Financial Data"; Flags: uninsdeletevalue Root: HKCR; Subkey: "GnuCash.Financial.Data\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\share\gnucash\pixmaps\gnucash-icon.ico,0" -Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\GnuCash.exe"" ""%1""" +Root: HKCR; Subkey: "GnuCash.Financial.Data\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\bin\gnucash.exe"" ""%1""" Root: HKLM; Subkey: "Software\GnuCash"; ValueType: none; Flags: uninsdeletekeyifempty Root: HKLM; Subkey: "Software\GnuCash\Paths"; ValueType: none; Flags: uninsdeletekeyifempty diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index e5305240c6..1ef7a72715 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -1434,7 +1434,7 @@ set PATH=$PGSQL_DIR\\lib;%PATH% set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib -start GnuCash %* +start gnucash %* EOF qpopd fi diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 6833110ba3..97bfcc7f92 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -26,9 +26,7 @@ SUFFIXES = .rc .res # Some settings are platform dependent. Let's define them per platform. if PLATFORM_WIN32 # Windows specific settings go here: -BIN_NAME = GnuCash -GnuCash_SOURCES = ${gnucash_SOURCES} -GnuCash_LDADD = ${gnucash_LDADD} +BIN_NAME = gnucash GNUCASH_RESOURCE_FILE = gnucash.rc dist_noinst_DATA = gnucash.rc diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c index ca20e2d93f..d875d1bb56 100644 --- a/src/bin/gnucash-bin.c +++ b/src/bin/gnucash-bin.c @@ -252,7 +252,7 @@ environment_override() #ifdef MAC_INTEGRATION static void -set_mac_locale() +set_mac_locale() { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSUserDefaults *defs = [NSUserDefaults standardUserDefaults]; @@ -278,7 +278,7 @@ set_mac_locale() NSString *money_locale = nil; while (this_locale = (NSString*)[locale_iter nextObject]) if ([[[[NSLocale alloc] initWithLocaleIdentifier: this_locale] - objectForKey: NSLocaleCurrencyCode] + objectForKey: NSLocaleCurrencyCode] isEqualToString: currency]) { money_locale = this_locale; break; @@ -304,7 +304,7 @@ set_mac_locale() * traditional Chinese (zh-Hant), which are normally assigned the * locales zh_CN and zh_TW, respectively. Those are handled * specially.*/ - if ([languages count] > 0 && + if ([languages count] > 0 && !([[languages objectAtIndex: 0] isEqualToString: @"en"] || [[languages objectAtIndex: 0] isEqualToString: @"\"en-US\""])) { NSEnumerator *lang_iter = [languages objectEnumerator]; @@ -853,7 +853,7 @@ main(int argc, char ** argv) /* This option needs to run without a display, so we can't initialize any GUI libraries. */ gnome_program_init( - "gnucash", VERSION, LIBGNOME_MODULE, + PACKAGE, VERSION, LIBGNOME_MODULE, argc, argv, GNOME_PARAM_APP_PREFIX, prefix, GNOME_PARAM_APP_SYSCONFDIR, pkgsysconfdir, diff --git a/src/gnome-utils/gnc-gnome-utils.c b/src/gnome-utils/gnc-gnome-utils.c index c8fc655068..83c44b98e1 100644 --- a/src/gnome-utils/gnc-gnome-utils.c +++ b/src/gnome-utils/gnc-gnome-utils.c @@ -593,7 +593,7 @@ gnc_gui_init(void) return main_window; } - g_set_application_name("GnuCash"); + g_set_application_name(PACKAGE_NAME); if (gnc_gconf_get_bool(GCONF_GENERAL, "show_splash_screen", NULL)) gnc_gui_init_splash();