bata62へ更新

[gikonavigoeson/gikonavi.git] / Setting.pas

diff --git a/Setting.pas b/Setting.pas
index 0a7ea21..fb4f262 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -440,6 +440,8 @@ type
         FLoopBrowserTabs : Boolean;
         //! 100\83\8c\83X\95\\8e¦\82Ì\90æ\93ª\95\\8e¦\83\8c\83X\90\94
         FHeadResCount : Integer;
+        //! 100\83\8c\83X\95\\8e¦\90\94\81i\8ag\92£\97p\81j
+        FResRangeExCount: Integer;
         //! \8aÖ\98A\83L\81[\83\8f\81[\83h\92Ç\89Á\83t\83\89\83O
         FAddKeywordLink: Boolean;
         //! dat\92u\8a·\82ð\97L\8cø\82É\82·\82é
@@ -462,6 +464,8 @@ type
         FRespopupWait: Integer;
         //! \83\81\81[\83\8b\97\93\83\8c\83X\83|\83b\83v\83A\83b\83v
         FRespopupMailTo: Boolean;
+        //! \8cë\94\9a\83`\83F\83b\83N
+        FUseGobakuCheck: Boolean;
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
                function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -810,6 +814,8 @@ type
         property LoopBrowserTabs : Boolean read FLoopBrowserTabs write FLoopBrowserTabs;
         //! 100\83\8c\83X\95\\8e¦\82Ì\90æ\93ª\95\\8e¦\83\8c\83X\90\94
         property HeadResCount : Integer read FHeadResCount write FHeadResCount;
+        //! 100\83\8c\83X\95\\8e¦\90\94\81i\8ag\92£\97p\81j
+        property ResRangeExCount: Integer read FResRangeExCount write FResRangeExCount;
         //! \8aÖ\98A\83L\81[\83\8f\81[\83h\92Ç\89Á\83t\83\89\83O
         property AddKeywordLink: Boolean read FAddKeywordLink write FAddKeywordLink;
         //! dat\82Ì\92u\8a·\82ð\97L\8cø\82É\82·\82é\82©
@@ -830,6 +836,8 @@ type
         //! \83\8c\83X\83|\83b\83v\83A\83b\83v\83^\83C\83}\81[
         property RespopupWait: Integer read FRespopupWait write FRespopupWait;
         property RespopupMailTo: Boolean read FRespopupMailTo write FRespopupMailTo;
+        //! \8cë\94\9a\83`\83F\83b\83N
+        property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck; 
 end;
 
 
@@ -1127,6 +1135,7 @@ begin
                        FResRange := ini.ReadInteger( 'Thread', 'ResRange', Ord( grrAll ) );
                FResRangeHold := ini.ReadBool( 'Thread', 'ResRangeHold', False );
         FHeadResCount := ini.ReadInteger('Thread', 'HeadResCount', 1);
+        FResRangeExCount:= ini.ReadInteger('Thread','ResRangeExCount', 100);
                // \83X\83\8c\83b\83h\88ê\97\97\95\\8e¦\94Í\88Í
                FThreadRange := TGikoThreadRange( ini.ReadInteger('ThreadList', 'ThreadRange', Ord( gtrAll )) );
                //\94ñ\83A\83N\83e\83B\83u\8e\9e\83\8c\83X\83|\83b\83v\83A\83b\83v\95\\8e¦
@@ -1216,21 +1225,17 @@ begin
 
                //\83T\83E\83\93\83h
                if Exists then begin
+            SetCurrentDir(ExtractFilePath(Application.ExeName));
                        for i := 0 to GetSoundCount - 1 do begin
                                SoundFileName[i] := ini.ReadString('Sound', SoundName[i], '');
                 // \91\8a\91Î\8eQ\8fÆ\91Î\8dô
-                s := SoundFileName[i];
-                if (AnsiPos('.\', SoundFileName[i]) = 1) then begin
-                    s := GetAppDir
-                            + Copy(SoundFileName[i], 2, Length(SoundFileName[i]));
-                end;
                 // \83t\83@\83C\83\8b\82Ì\91¶\8dÝ\83`\83F\83b\83N
-                if not FileExists(SoundFileName[i]) then begin
+                if not FileExists(ExpandFileName(SoundFileName[i])) then begin
                     SoundFileName[i] := '';
                 end;
                        end;
                end else begin
-                       s := GetAppDir + '\sound\';
+                       s := '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';
@@ -1271,6 +1276,7 @@ begin
                // \83G\83f\83B\83^
                FSpaceToNBSP    := ini.ReadBool( 'Editor', 'SpaceToNBSP', False );
                FAmpToCharRef   := ini.ReadBool( 'Editor', 'AmpToCharRef', False );
+        FUseGobakuCheck := ini.ReadBool( 'Editor', 'UseGobakuCheck', True );
 
                //Tab\8e©\93®\95Û\91¶\81A\93Ç\82Ý\8d\9e\82Ý
                FTabAutoLoadSave    := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
@@ -1333,6 +1339,17 @@ begin
 
         FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
         FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
+
+
+
+        // \83M\83R\83i\83r\8dX\90V\82Å\97\98\97p\82µ\82½\83C\83\93\83X\83g\81[\83\89\82Ì\8dí\8f\9c
+        s := ini.ReadString('Update', 'Remove0', '');
+        if (FileExists(s)) then begin
+            SysUtils.DeleteFile(s);
+            // \8dí\8f\9c\82É\8e¸\94s\82µ\82Ä\82à\96³\8e\8b\82·\82é
+            ini.DeleteKey('Update', 'Remove0');
+        end;
+
                ini.UpdateFile;
        finally
                ini.Free;
@@ -1522,6 +1539,7 @@ begin
                ini.WriteInteger('Thread', 'ResRange', FResRange);
                ini.WriteBool('Thread', 'ResRangeHold', FResRangeHold);
         ini.WriteInteger('Thread', 'HeadResCount', FHeadResCount);
+        ini.WriteInteger('Thread','ResRangeExCount', FResRangeExCount);
                // \83X\83\8c\83b\83h\88ê\97\97\95\\8e¦\94Í\88Í
                ini.WriteInteger('ThreadList', 'ThreadRange', Ord( FThreadRange ));
                //\83\8d\83O\8dí\8f\9c\8am\94F
@@ -1677,10 +1695,11 @@ begin
                // \83G\83f\83B\83^
                ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
                ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
+        ini.WriteBool( 'Editor', 'UseGobakuCheck', FUseGobakuCheck );
 
                 //\83^\83u\8e©\93®\95Û\91¶
                ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
-        ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL); 
+        ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL);
                 //\8fÚ\8d×\90Ý\92è
                ini.WriteInteger('OptionDialog', 'KuroutTabIndex', FKuroutSettingTabIndex);
 
@@ -1721,6 +1740,7 @@ begin
         ini.WriteString('Function', 'ExtList', FExtList);
         ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile);
         ini.WriteBool('Thread', 'LimitResCountMessage', FLimitResCountMessage);
+
                ini.UpdateFile;
        finally
                ini.Free;
@@ -1879,12 +1899,8 @@ var
 begin
        for i := 0 to GetSoundCount - 1 do begin
                if SoundName[i] = Name then begin
-                       Result := SoundFileName[i];
-            // \91\8a\91Î\83p\83X\91Î\8dô
-            if (AnsiPos('.\', Result) = 1) then begin
-                Result := GetAppDir
-                    + Copy(Result, 2, Length(Result));
-            end;
+            SysUtils.SetCurrentDir(GetAppDir);
+                       Result := ExpandFileName(SoundFileName[i]);
                        Exit;
                end;
        end;