Menu
▾
▴
gexperts-cvs
|
From: Erik B. <eb...@us...> - 2007-04-09 06:01:12
|
Update of /cvsroot/gexperts/gexperts/unstable/Src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4647/Src Modified Files: GX_CondDefine.inc GX_ConfigurationInfo.pas GX_Configure.pas GX_VerDepConst.pas Log Message: Default to store data files in Application Data\GExperts for better Vista support Minor .chm help file directory support tweak Delphi 2007 IFDEF tweaks Index: GX_Configure.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_Configure.pas,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- GX_Configure.pas 23 Mar 2007 08:59:00 -0000 1.47 +++ GX_Configure.pas 9 Apr 2007 06:01:09 -0000 1.48 @@ -358,7 +358,7 @@ var CurrentIdeFolder: string; begin - dlgHelpFile.InitialDir := ConfigInfo.ConfigPath; + dlgHelpFile.InitialDir := ExtractFilePath(edHelpFile.Text); CurrentIdeFolder := GetCurrentDir; try Index: GX_ConfigurationInfo.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_ConfigurationInfo.pas,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- GX_ConfigurationInfo.pas 1 Apr 2007 03:21:11 -0000 1.45 +++ GX_ConfigurationInfo.pas 9 Apr 2007 06:01:09 -0000 1.46 @@ -128,7 +128,7 @@ {$IFOPT D+} GX_DbugIntf, {$ENDIF} SysUtils, GX_IdeEnhance, GX_EditorEnhancements, GX_MessageBox, - GX_GenericUtils, GX_GenericClasses, GX_IdeUtils, GX_OtaUtils; + GX_GenericUtils, GX_GenericClasses, GX_IdeUtils, GX_OtaUtils, GX_VerDepConst; type TConfigInfo = class(TSingletonInterfacedObject, IConfigInfo) @@ -394,7 +394,7 @@ else // Windows begin FGExpertsPath := AddSlash(ExtractFilePath(ThisDllName)); - FConfigPath := ExtractFilePath(ThisDllName); + FConfigPath := AddSlash(GetUserApplicationDataFolder) + AddSlash('GExperts') + IDEEnglishName; end; EditorEnhancements.Enabled := False; @@ -408,6 +408,7 @@ destructor TConfigInfo.Destroy; begin {$IFOPT D+} SendDebug('TConfigInfo.Destroy'); {$ENDIF D+} + SaveSettings; FreeEditorEnhancements; FreeIdeEnhancements; @@ -426,7 +427,7 @@ try FVclPath := AddSlash(Settings.ReadString(ConfigurationKey, 'VCLPath', FVclPath)); FConfigPath := AddSlash(Settings.ReadString(ConfigurationKey, 'ConfigPath', FConfigPath)); - FHelpFileLocation := Settings.ReadString(ConfigurationKey, 'HelpFile', FConfigPath + 'GExperts.chm'); + FHelpFileLocation := Settings.ReadString(ConfigurationKey, 'HelpFile', FGExpertsPath + 'GExperts.chm'); if SameText(ExtractFileExt(FHelpFileLocation), '.hlp') then FHelpFileLocation := ChangeFileExt(FHelpFileLocation, '.chm'); FAlphabetizeMenu := Settings.ReadBool(ConfigurationKey, 'AlphabetizeMenu', False); @@ -445,7 +446,8 @@ var Settings: TGExpertsSettings; begin - Assert(not IsStandAlone); + if IsStandAlone then + Exit; // Do not localize any of the following strings. Settings := TGExpertsSettings.Create; Index: GX_CondDefine.inc =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_CondDefine.inc,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- GX_CondDefine.inc 17 Mar 2007 07:55:39 -0000 1.45 +++ GX_CondDefine.inc 9 Apr 2007 06:01:09 -0000 1.46 @@ -18,7 +18,7 @@ {$IFNDEF GX_AutomatedBuild} // Turn things on we want compiled into GExperts - {.$DEFINE SYNEDIT} + {$DEFINE SYNEDIT} {.$DEFINE GX_DEBUGLOG} {$ENDIF GX_AutomatedBuild} Index: GX_VerDepConst.pas =================================================================== RCS file: /cvsroot/gexperts/gexperts/unstable/Src/GX_VerDepConst.pas,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- GX_VerDepConst.pas 17 Mar 2007 07:55:39 -0000 1.32 +++ GX_VerDepConst.pas 9 Apr 2007 06:01:09 -0000 1.33 @@ -195,7 +195,7 @@ {$ENDIF VER170} {$IFDEF VER180} - {$IFDEF VER185} + {$IFNDEF VER185} MajorVersionNumberChar = '10'; // BDS 2006 {$ELSE} MajorVersionNumberChar = '11'; // Delphi 2007 @@ -213,6 +213,75 @@ {$ENDIF MajorVersionNumber} {$UNDEF MajorVersionNumber} + +// ***************************************************** +// +// The "English" name of the IDE: "Delphi 2007", etc. +// +// ***************************************************** + {$UNDEF IDEEnglishNameDefined} + {$IFDEF VER140} + {$IFDEF LINUX} + {$IFDEF GX_KYLIX1} + IDEEnglishName = 'Kylix 1'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF GX_KYLIX1} + {$IFDEF GX_KYLIX2} + IDEEnglishName = 'Kylix 2'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF GX_KYLIX2} + {$IFDEF GX_KYLIX3} + IDEEnglishName = 'Kylix 3'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF GX_KYLIX3} + {$ENDIF LINUX} + {$IFDEF MSWINDOWS} + {$IFDEF BCB} + IDEEnglishName = 'C++Builder 6'; + {$DEFINE IDEEnglishNameDefined} + {$ELSE} + IDEEnglishName = 'Delphi 6'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF} + {$ENDIF MSWINDOWS} + {$ENDIF VER140} + + {$IFDEF VER150} + IDEEnglishName = 'Delphi 7'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF VER150} + + {$IFDEF VER160} + IDEEnglishName = 'Delphi 8'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF VER160} + + {$IFDEF VER170} + IDEEnglishName = 'Delphi 2005'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF VER170} + + {$IFDEF VER180} + {$IFNDEF VER185} + IDEEnglishName = 'BDS 2006'; + {$DEFINE IDEEnglishNameDefined} + {$ELSE} + IDEEnglishName = 'Delphi 2007'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF} + {$ENDIF VER180} + + {$IFDEF VER190} + IDEEnglishName = 'RAD Studio 2007'; + {$DEFINE IDEEnglishNameDefined} + {$ENDIF VER190} + + {$IFNDEF IDEEnglishNameDefined} + IDEEnglishName has not been defined + {$ENDIF IDEEnglishNameDefined} + {$UNDEF IDEEnglishNameDefined} + + // ***************************************************** // // Base registry key for each IDE version, in case @@ -265,10 +334,10 @@ {$ENDIF VER170} {$IFDEF VER180} - {$IFDEF VER185} - CompilerDefinedProductRegistryKey = 'BDS\5.0'; // Delphi 2007 - {$ELSE} + {$IFNDEF VER185} CompilerDefinedProductRegistryKey = 'BDS\4.0'; // BDS 2006 + {$ELSE} + CompilerDefinedProductRegistryKey = 'BDS\5.0'; // Delphi 2007 {$ENDIF} {$DEFINE IdeBaseKey} {$ENDIF VER180} @@ -321,10 +390,10 @@ {$ENDIF VER170} {$IFDEF VER180} - {$IFDEF VER185} - ClassBrowserStorageFolder = 'Classes.Delphi2007'; - {$ELSE} + {$IFNDEF VER185} ClassBrowserStorageFolder = 'Classes.BDS2006'; + {$ELSE} + ClassBrowserStorageFolder = 'Classes.Delphi2007'; {$ENDIF} {$DEFINE ClassBrowserStorageDefined} {$ENDIF VER180} |
Thanks for helping keep SourceForge clean.
X