直接Exeのファイルパスを参照している部分をGikoSystem経由に変更

パス取得関連の整理

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index 5273080..9686239 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -2283,7 +2283,7 @@ var
 begin
     URLs := TStringList.Create();
        try
-               fileName := ExtractFilePath(Application.ExeName) + TABFILE;
+               fileName := GikoSys.GetAppDir + TABFILE;
                if FileExists(fileName) then begin
                    try
                                URLs.LoadFromFile(fileName);

diff --git a/Option.pas b/Option.pas
index d1b89fa..c544d0d 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -1283,7 +1283,7 @@ end;
 function TOptionDialog.CheckFolder: Boolean;
 begin
        if Trim(LogFolderEdit.Text) = '' then
-               LogFolderEdit.Text := ExtractFilePath(Application.ExeName) + 'Log';
+               LogFolderEdit.Text := GikoSys.GetAppDir + 'Log';
 
        if DirectoryExists(LogFolderEdit.Text) then begin
                Result := True;

diff --git a/Setting.pas b/Setting.pas
index 4915e27..e2d0c63 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -994,13 +994,13 @@ end;
 //\8f\89\8aú\89»\83t\83@\83C\83\8b\96¼\8eæ\93¾\81i\83p\83X\81{\83t\83@\83C\83\8b\96¼\81j
 function TSetting.GetFileName(): string;
 begin
-       Result := ExtractFilePath(Application.ExeName) + INI_FILE_NAME;
+       Result := GetAppDir + INI_FILE_NAME;
 end;
 
 //\94Â\8dX\90V\97pURL\90Ý\92è\83t\83@\83C\83\8b\96¼\81i\83p\83X\81{\83t\83@\83C\83\8b\96¼\81j
 function TSetting.GetBoardURLFileName(): string;
 begin
-       Result := ExtractFilePath(Application.ExeName) + BOARD_URL_INI_FILE_NAME;
+       Result := GetAppDir + BOARD_URL_INI_FILE_NAME;
 end;
 
 //\90Ý\92è\83t\83@\83C\83\8b\93Ç\8d\9e
@@ -1128,7 +1128,7 @@ begin
                //ResAnchorjamp
                ResAnchorJamp := ini.ReadBool('Function', 'ResAnchoJamp', True);
                //\83\8d\83O\83t\83H\83\8b\83_
-               LogFolder := ini.ReadString('Folder', 'LogFolder', ExtractFilePath(Application.ExeName) + 'Log');
+               LogFolder := ini.ReadString('Folder', 'LogFolder', GetAppDir + 'Log');
                NewLogFolder := '';
 
                //\94ÂURL
@@ -1201,7 +1201,7 @@ begin
                                        SoundFileName[i] := '';
                        end;
                end else begin
-                       s := ExtractFileDir(Application.ExeName) + '\sound\';
+                       s := GetAppDir + '\sound\';
                        SoundFileName[0] := s + '\8eæ\93¾\90¬\8c÷.wav';
                        SoundFileName[1] := s + '\8eæ\93¾\90¬\8c÷(\8d·\95ª).wav';
                        SoundFileName[2] := s + '\96¢\8dX\90V.wav';
@@ -1727,7 +1727,7 @@ var
 begin
        ini := TMemIniFile.Create(GetFileName());
        try
-               if ExtractFilePath(Application.ExeName) + 'Log' = NewLogFolder then
+               if GetAppDir + 'Log' = NewLogFolder then
                        ini.DeleteKey('Folder', 'LogFolder')
                else
                        ini.WriteString('Folder', 'LogFolder', NewLogFolder);
@@ -1969,7 +1969,7 @@ end;
  *************************************************************************)
 function TSetting.GetBoardFileName: string;
 begin
-       Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_FILE_NAME;
+       Result := GetConfigDir + BOARD_FILE_NAME;
 end;
 
 (*************************************************************************
@@ -1977,15 +1977,15 @@ end;
  *************************************************************************)
 function TSetting.GetCustomBoardFileName: string;
 begin
-       Result := GetAppDir + CONFIG_DIR_NAME + '\' + CUSTOMBOARD_FILE_NAME;
+       Result := GetConfigDir + CUSTOMBOARD_FILE_NAME;
 end;
 
 (*************************************************************************
- *\83{\81[\83h\83f\83B\83\8c\83N\83g\83\8a\8eæ\93¾
+ *\83{\81[\83h\83f\83B\83\8c\83N\83g\83\8a\8eæ\93¾(\\82Å\8fI\82í\82é)
  *************************************************************************)
 function TSetting.GetBoardDir: string;
 begin
-       Result := GetAppDir + CONFIG_DIR_NAME + '\' + BOARD_DIR_NAME + '\';
+       Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_DIR_NAME);
 end;
 
 (*************************************************************************
@@ -1998,7 +1998,7 @@ end;
 
 
 (*************************************************************************
- *\8eÀ\8ds\83t\83@\83C\83\8b\83t\83H\83\8b\83_\8eæ\93¾
+ *\8eÀ\8ds\83t\83@\83C\83\8b\83t\83H\83\8b\83_\8eæ\93¾(\8dÅ\8cã\82É\\82ª\82 \82é)
  *************************************************************************)
 function TSetting.GetAppDir: string;
 begin
@@ -2030,58 +2030,78 @@ begin
 end;
 
 (*************************************************************************
- *Config\83t\83H\83\8b\83_\8eæ\93¾
+ *Config\83t\83H\83\8b\83_\8eæ\93¾(\\82Å\8fI\82í\82é)
  *************************************************************************)
 function TSetting.GetConfigDir: string;
 begin
        Result := IncludeTrailingPathDelimiter(GetAppDir + CONFIG_DIR_NAME);
 end;
-
+(*************************************************************************
+ *CSS\83t\83H\83\8b\83_\8eæ\93¾(\\82Å\8fI\82í\82é)
+ *************************************************************************)
 function TSetting.GetStyleSheetDir: string;
 begin
        Result := IncludeTrailingPathDelimiter(GetConfigDir + CSS_DIR_NAME);
 end;
-
+(*************************************************************************
+ *skin\83t\83H\83\8b\83_\8eæ\93¾(\\82Å\8fI\82í\82é)
+ *************************************************************************)
 function TSetting.GetSkinDir: string;
 begin
        Result := IncludeTrailingPathDelimiter(GetConfigDir + SKIN_DIR_NAME);
 end;
-
+(*************************************************************************
+ *skin\83w\83b\83_\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinHeaderFileName: string;
 begin
        Result := CSSFileName + SKIN_HEADER_FILE_NAME;
 end;
-
+(*************************************************************************
+ *skin\83t\83b\83^\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinFooterFileName: string;
 begin
        Result := CSSFileName + SKIN_FOOTER_FILE_NAME;
 end;
-
+(*************************************************************************
+ *skin\90V\83\8c\83X\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinNewResFileName: string;
 begin
        Result := CSSFileName + SKIN_NEWRES_FILE_NAME;
 end;
-
+(*************************************************************************
+ *skin\83\8c\83X\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinResFileName: string;
 begin
        Result := CSSFileName + SKIN_RES_FILE_NAME;
 end;
-
+(*************************************************************************
+ *skin\83u\83b\83N\83}\81[\83N\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinBookmarkFileName: string;
 begin
        Result := CSSFileName + SKIN_BOOKMARK_FILE_NAME;
 end;
-
+(*************************************************************************
+ *skin\90V\92\85\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSkinNewmarkFileName: string;
 begin
        Result := CSSFileName + SKIN_NEWMARK_FILE_NAME;
 end;
-
+(*************************************************************************
+ *NG\83\8f\81[\83h\83f\83B\83\8c\83N\83g\83\8a\8eæ\93¾(\\82Å\8fI\82í\82é)
+ *************************************************************************)
 function TSetting.GetNGWordsDir: string;
 begin
        Result := IncludeTrailingPathDelimiter(GetConfigDir + NGWORDs_DIR_NAME);
 end;
-
+(*************************************************************************
+ *Board\83v\83\89\83O\83C\83\93\83f\83B\83\8c\83N\83g\83\8a\8eæ\93¾(\\82Å\8fI\82í\82é)
+ *************************************************************************)
 function TSetting.GetBoardPlugInDir: string;
 begin
        Result := IncludeTrailingPathDelimiter(GetConfigDir + BOARD_PLUGIN_DIR_NAME);
@@ -2112,7 +2132,9 @@ begin
                FileExists( GetSkinHeaderFileName );
 
 end;
-
+(*************************************************************************
+ *samba\90Ý\92è\83t\83@\83C\83\8b\96¼\8eæ\93¾
+ *************************************************************************)
 function TSetting.GetSambaFileName: string;
 begin
        Result := GetAppDir + SAMBATIME_FILE_NAME;