TWebBrowserの参照カウントが正しくなるように修正

[gikonavigoeson/gikonavi.git] / Setting.pas

diff --git a/Setting.pas b/Setting.pas
index 0e8175f..7a98588 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -454,6 +454,14 @@ type
         FCheckDatFile: Boolean;
         //! \93¯ID\83\8c\83X\83A\83\93\83J\81[\95\\8e¦
         FLimitResCountMessage: Boolean;
+        //! \83\8c\83X\83|\83b\83v\83A\83b\83v\95\\8e¦\88Ê\92udeltaX
+        FRespopupDeltaX: Integer;
+        //! \83\8c\83X\83|\83b\83v\83A\83b\83v\95\\8e¦\88Ê\92udeltaY
+        FRespopupDeltaY: Integer;
+        //! \83\8c\83X\83|\83b\83v\83A\83b\83v\83^\83C\83}\81[
+        FRespopupWait: Integer;
+        //! \83\81\81[\83\8b\97\93\83\8c\83X\83|\83b\83v\83A\83b\83v
+        FRespopupMailTo: Boolean;
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
                function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -530,9 +538,10 @@ type
                procedure WriteLogFolder(AVal : String);
                function GetInputAssistFileName : String;
         function GetReplaceFileName: String;
+        function GetExtprevieFileName: String;
         {
         \brief  \83\8a\83\93\83N\97\9a\97ð\82Ì\95Û\8e\9d\83T\83C\83Y\82Ìsetter
-        \param  AVal    \90Ý\92è\82·\82é\83T\83C\83Y( >0) 
+        \param  AVal    \90Ý\92è\82·\82é\83T\83C\83Y( >0)
         }
         procedure SetMoveHistorySize(AVal : Integer);
                //\8eó\90M\83o\83b\83t\83@\83T\83C\83Y
@@ -814,6 +823,13 @@ type
         //! \83C\83\93\83f\83b\83N\83X\93Ç\82Ý\8d\9e\82Ý\8e\9edat\83t\83@\83C\83\8b\83`\83F\83b\83N
         property CheckDatFile: Boolean read FCheckDatFile write FCheckDatFile;
         property LimitResCountMessage: Boolean read FLimitResCountMessage write FLimitResCountMessage;
+        //! \83\8c\83X\83|\83b\83v\83A\83b\83v\95\\8e¦\88Ê\92udeltaX
+        property  RespopupDeltaX: Integer read FRespopupDeltaX write FRespopupDeltaX;
+        //! \83\8c\83X\83|\83b\83v\83A\83b\83v\95\\8e¦\88Ê\92udeltaY
+        property RespopupDeltaY: Integer read FRespopupDeltaY write FRespopupDeltaY;
+        //! \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;
 end;
 
 
@@ -845,6 +861,7 @@ const
        INPUTASSIST_FILE_NAME   = 'InputAssist.ini';
     FIXED_COOKIE =           'hana=mogera';
     REPLACE_FILE_NAME = 'replace.ini';
+    EXT_PREVIEW_FILE_NAME = 'extpreview.ini';
 
 implementation
 
@@ -978,15 +995,16 @@ end;
 //\83f\83X\83g\83\89\83N\83^
 destructor TSetting.Destroy();
 begin
+       FBoardColumnOrder.Free;
+       FCategoryColumnOrder.Free;
+       FBBSColumnOrder.Free;
+       FSelectTextList.Free;
+       FBoardURLs.Free;
+       FMailList.Free;
+       FNameList.Free;
+       FGestures.Free;
+    FSkinFiles.Free;
        inherited;
-       FBoardColumnOrder.Free;
-       FCategoryColumnOrder.Free;
-       FBBSColumnOrder.Free;
-       FSelectTextList.Free;
-       FBoardURLs.Free;
-       FMailList.Free;
-       FNameList.Free;
-       FGestures.Free;
 end;
 
 //\8f\89\8aú\89»\83t\83@\83C\83\8b\96¼\8eæ\93¾\81i\83p\83X\81{\83t\83@\83C\83\8b\96¼\81j
@@ -1153,6 +1171,11 @@ begin
         if (FPopupPosition = gppCenter) then begin
             FPopupPosition := gppTop;
         end;
+        FRespopupDeltaX := ini.ReadInteger('Browser', 'RespopupDelteX', 5);
+        FRespopupDeltaY := ini.ReadInteger('Browser', 'RespopupDelteY', 5);
+        FRespopupWait   := ini.ReadInteger('Browser', 'RespopupWait', 1000);
+        FRespopupMailTo := ini.ReadBool('Browser', 'RespopupMailTo', true);
+
                //\83A\83h\83\8c\83X\83o\81[
                FURLDisplay := ini.ReadBool('AddressBar', 'URLDisplay', False);
                FAddressBarTabStop := ini.ReadBool('AddressBar', 'TabStop', True);
@@ -1526,7 +1549,11 @@ begin
 
                //\83|\83b\83v\83A\83b\83v\88Ê\92u
                ini.WriteInteger('Browser', 'PopupPosition', Ord(FPopupPosition));
-
+        ini.WriteInteger('Browser', 'RespopupDelteX', FRespopupDeltaX);
+        ini.WriteInteger('Browser', 'RespopupDelteY', FRespopupDeltaY);
+        ini.WriteInteger('Browser', 'RespopupWait', FRespopupWait);
+        ini.WriteBool('Browser', 'RespopupMailTo', FRespopupMailTo);
+        
                //\83A\83h\83\8c\83X\83o\81[
                ini.WriteBool('AddressBar', 'URLDisplay', FURLDisplay);
                ini.WriteBool('AddressBar', 'TabStop', FAddressBarTabStop);
@@ -2142,6 +2169,10 @@ function TSetting.GetReplaceFileName: String;
 begin
     Result := GetConfigDir + REPLACE_FILE_NAME;
 end;
+function TSetting.GetExtprevieFileName: String;
+begin
+    Result := GetConfigDir + EXT_PREVIEW_FILE_NAME;
+end;
 procedure TSetting.SetMoveHistorySize(AVal : Integer);
 begin
     if (AVal > 0) then begin