OSDN Git Service

Beログイン仕様変更に対応
[gikonavigoeson/gikonavi.git] / Setting.pas
index e2d0c63..cfbf9ec 100644 (file)
@@ -5,7 +5,7 @@ interface
 
 uses
        SysUtils, Classes, Graphics, Forms, {Math, IniFiles, UCryptAuto, UBase64,}
-       ComCtrls, GestureModel, IniFiles;
+       ComCtrls, GestureModel, IniFiles, SkinFiles;
 
 const
        MAIN_COOLBAND_COUNT = 4;                //\83\81\83C\83\93CoolBand\82Ì\90\94
@@ -20,9 +20,9 @@ type
        TGikoListOrientation = (gloHorizontal, gloVertical);    // \83\8a\83X\83g\90\82\92¼\81E\90\85\95½
        TGikoListState = (glsMax, glsNormal, glsMin);                                   // \83\8a\83X\83g\83T\83C\83Y\8fó\91Ô
                                                                                                                                                                                                                                // \83|\83b\83v\83A\83b\83v\95\\8e¦\88Ê\92u
-       TGikoPopupPosition = (gppRightTop, gppTop, gppLeftTop,
-                                                                                               gppRight, gppCenter, gppLeft,
-                                                                                               gppRightBottom, gppBottom, gppLeftBottom);
+       TGikoPopupPosition = (gppLeftTop = 0, gppTop, gppRightTop,
+                                                                                               gppLeft, gppCenter, gppRight,
+                                                                                               gppLeftBottom, gppBottom, gppRightBottom);
                                                                                                                                                                                                                                //\83v\83\8c\83r\83\85\81[\83T\83C\83Y
        TGikoPreviewSize = (gpsXLarge, gpsLarge, gpsMedium, gpsSmall, gpsXSmall);
        TGikoBrowserAutoMaximize        = (gbmNone, gbmClick, gbmDoubleClick);
@@ -232,8 +232,6 @@ type
                FListViewNo: Boolean;
                //CSS\95\\8e¦
                FUseCSS: Boolean;
-               //CSS\83t\83@\83C\83\8b\96¼
-               FCSSFileName: string;
                // \83X\83L\83\93\95\\8e¦(\88ê\8e\9e\93I\82È\82à\82Ì\82Å ini \82É\95Û\91\82Í\82³\82ê\82È\82¢)
                FUseSkin: Boolean;
                //\82©\82¿\82ã\81`\82µ\82á\97p\82ÌSkin\82ð\97\98\97p\82·\82é\82©
@@ -416,7 +414,7 @@ type
                                //Be2ch
                 //\94F\8fØ\97p\83\86\81[\83UID\81E\83p\83X\83\8f\81[\83h
                FBeUserID: String;
-               FBeCode: String;
+               FBePassword: String;
                FBeAutoLogin: Boolean;
                FBeLogin: Boolean;
                //\97\9a\97ð\82Ì\8dÅ\91å\95Û\91\8c\8f\90\94
@@ -442,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é
@@ -450,6 +450,26 @@ type
         FSentIniFileSize: Integer;
         //! \83\8a\83\93\83NURL\8eæ\93¾\82Ì\91Î\8fÛ\8ag\92£\8eq
         FExtList: String;
+        //! Skin\8aÖ\98A
+        FSkinFiles: TSkinFiles;
+        //! index\83t\83@\83C\83\8b\82ð\93Ç\82Ý\8e\9e\82Édat\82ð\8c\9f\8dõ\82·\82é
+        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;
+        //! \8cë\94\9a\83`\83F\83b\83N
+        FUseGobakuCheck: Boolean;
+
+        //! \96`\8c¯\82Ì\8f\91\97pCookie
+        FBoukenCookieList: TStringList;
+
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
                function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -475,6 +495,7 @@ type
 
                procedure SetUseCSS( value: Boolean );
                procedure SetCSSFileName( fileName: string );
+        function GetCSSFileName: string;
         //! \83v\83\8d\83L\83V\90Ý\92è\93Ç\82Ý\8d\9e\82Ý
         procedure ReadProxySettings(memIni: TMemIniFile);
         //! \8ae\8eí\83E\83B\83\93\83h\83E\90Ý\92è\93Ç\82Ý\8d\9e\82Ý
@@ -499,6 +520,7 @@ type
                procedure WriteNameMailSettingFile;
                procedure WriteFolderSettingFile();
                procedure WriteBoardURLSettingFile;
+               procedure WriteBoukenSettingFile;
                function GetSoundCount: Integer;
                function FindSoundFileName(Name: string): string;
 
@@ -511,12 +533,6 @@ type
                function GetSentFileName: string;
                function GetConfigDir: string;
                function GetSkinDir: string;
-               function GetSkinHeaderFileName: string;
-               function GetSkinFooterFileName: string;
-               function GetSkinResFileName: string;
-               function GetSkinNewResFileName: string;
-               function GetSkinBookmarkFileName: string;
-               function GetSkinNewmarkFileName: string;
                function GetStyleSheetDir: string;
                function GetOutBoxFileName: string;
                function GetNGWordsDir: string;
@@ -531,9 +547,13 @@ type
                procedure WriteLogFolder(AVal : String);
                function GetInputAssistFileName : String;
         function GetReplaceFileName: String;
+        function GetExtprevieFileName: String;
+        function GetBoukenCookie(AHostName: String): String;
+        procedure SetBoukenCookie(ACookieValue, AHostName: String);
+        procedure GetBouken(AHostName: String; var Domain:String; var Cookie: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
@@ -645,7 +665,7 @@ type
 
                property ListViewNo: Boolean read FListViewNo write FListViewNo;
                property UseCSS: Boolean read FUseCSS write SetUseCSS;
-               property CSSFileName: string read FCSSFileName write SetCSSFileName;
+               property CSSFileName: string read GetCSSFileName write SetCSSFileName;
                property UseKatjushaType : Boolean read FUseKatjushaType write FUseKatjushaType;
                property UseSkin: Boolean read FUseSkin;
 
@@ -780,7 +800,7 @@ type
                property UseUndecided: Boolean read FUseUndecided write FUseUndecided;
 
                property BeUserID: string read FBeUserID write FBeUserID;
-               property BeCode: string read FBeCode write FBeCode;
+               property BePassword: string read FBePassword write FBePassword;
                property BeAutoLogin: Boolean read FBeAutoLogin write FBeAutoLogin;
                property BeLogin: Boolean read FBeLogin write FBeLogin;
                property MaxRecordCount : Integer read FMaxRecordCount write FMaxRecordCount;
@@ -802,6 +822,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©
@@ -810,7 +832,22 @@ type
         property SentIniFileSize: Integer read FSentIniFileSize write FSentIniFileSize;
         //! \83\8a\83\93\83NURL\8eæ\93¾\82Ì\91Î\8fÛ\8ag\92£\8eq
         property ExtList: String read FExtList write FExtList;
-
+        //! Skin\83t\83@\83C\83\8b\8aÇ\97\9d
+        property SkinFiles: TSkinFiles read FSkinFiles;
+        //! \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;
+        //! \8cë\94\9a\83`\83F\83b\83N
+        property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck;
+        //! \96`\8c¯\82Ì\8f\91
+        property BoukenCookieList: TStringList read FBoukenCookieList write FBoukenCookieList; 
 end;
 
 
@@ -830,12 +867,6 @@ const
        CONFIG_DIR_NAME                                                         = 'config';
        CSS_DIR_NAME                                                                    = 'css';
        SKIN_DIR_NAME                                                                   = 'skin';
-       SKIN_HEADER_FILE_NAME                                   = 'Header.html';
-       SKIN_FOOTER_FILE_NAME                                   = 'Footer.html';
-       SKIN_NEWRES_FILE_NAME                                   = 'NewRes.html';
-       SKIN_RES_FILE_NAME                                              = 'Res.html';
-       SKIN_BOOKMARK_FILE_NAME                         = 'Bookmark.html';
-       SKIN_NEWMARK_FILE_NAME                          = 'Newmark.html';
        NGWORDs_DIR_NAME : String               = 'NGwords';
        BOARD_PLUGIN_DIR_NAME                                   = 'BoardPlugin';
        SAMBATIME_FILE_NAME : String    = 'Samba.ini';
@@ -846,8 +877,9 @@ const
        SPAMFILTER_FILE_NAME                                    = 'SpamFilter.ini';
                LANGUAGE_FILE_NAME    = 'language.ini';
        INPUTASSIST_FILE_NAME   = 'InputAssist.ini';
-    FIXED_COOKIE =           'hana=mogera';
+    FIXED_COOKIE =           '';
     REPLACE_FILE_NAME = 'replace.ini';
+    EXT_PREVIEW_FILE_NAME = 'extpreview.ini';
 
 implementation
 
@@ -969,10 +1001,12 @@ begin
        FCategoryColumnOrder := TGikoCategoryColumnList.Create;
        FBoardColumnOrder := TGikoBoardColumnList.Create;
        FGestures := TGestureModel.Create;
+    FSkinFiles := TSkinFiles.Create;
        FNameList.Duplicates := dupIgnore;
        FMailList.Duplicates := dupIgnore;
        FBoardURLs.Duplicates := dupIgnore;
        FSelectTextList.Duplicates := dupIgnore;
+    FBoukenCookieList := TStringList.Create;
        ReadSettingFile();
        ReadBoardURLsFile();
 end;
@@ -980,15 +1014,17 @@ end;
 //\83f\83X\83g\83\89\83N\83^
 destructor TSetting.Destroy();
 begin
+    FBoukenCookieList.Free;
+       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
@@ -1012,6 +1048,7 @@ var
        s: string;                                               
        CoolSet: TCoolSet;
     msg: String;
+    hostList: TStringList;
 begin
        Exists := FileExists(GetFileName);
        ini := TMemIniFile.Create(GetFileName);
@@ -1111,6 +1148,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¦
@@ -1155,6 +1193,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);
@@ -1195,13 +1238,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], '');
-                               if not FileExists(SoundFileName[i]) then
-                                       SoundFileName[i] := '';
+                // \91\8a\91Î\8eQ\8fÆ\91Î\8dô
+                // \83t\83@\83C\83\8b\82Ì\91\8dÝ\83`\83F\83b\83N
+                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';
@@ -1242,6 +1289,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);
@@ -1268,7 +1316,7 @@ begin
         //Be2ch
                //\94F\8fØ\97p\83\86\81[\83UID\81E\94F\8fØ\83R\81[\83h
                FBeUserID := ini.ReadString('Be', 'UserID', '');
-               FBeCode := Decrypt(ini.ReadString('Be', 'Code', ''));
+               FBePassword := Decrypt(ini.ReadString('Be', 'Password', ''));
                FBeAutoLogin := ini.ReadBool('Be', 'AutoLogin', False);
                //\97\9a\97ð\82Ì\8dÅ\91å\95Û\91\8c\8f\90\94
                FMaxRecordCount := Max(ini.ReadInteger('Recode', 'Max', 100), 1);
@@ -1301,6 +1349,27 @@ begin
 
         FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3);
         FExtList := ini.ReadString('Function', 'ExtList', '*.gif;*.jpg;*.jpeg;*.png;*.zip;*.rar');
+
+        FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
+        FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
+
+        // \96`\8c¯\82Ì\8f\91Cookie\93Ç\82Ý\8d\9e\82Ý
+        hostList := TStringList.Create;
+        ini.ReadSection('Bouken', hostList);
+        for i := 0 to hostList.Count - 1 do begin
+            FBoukenCookieList.Add( hostList[i] + '=' +
+                ini.ReadString('Bouken', hostList[i], '') );
+        end;
+        hostList.Free;
+
+        // \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;
@@ -1482,7 +1551,7 @@ begin
                //\82©\82µ\82ã\81`\82µ\82á\82Ì\83X\83L\83\93\82ð\8eg\82¤\82©
                ini.WriteBool('CSS', 'UseKatjushaType', FUseKatjushaType);
                //CSS\83t\83@\83C\83\8b\96¼
-               ini.WriteString('CSS', 'FileName', FCSSFileName);
+               ini.WriteString('CSS', 'FileName', FSkinFiles.FileName);
                //Mail\97\93\95\\8e¦
                ini.WriteBool('Thread', 'ShowMail', FShowMail);
                // \83\8c\83X\95\\8e¦\94Í\88Í
@@ -1490,6 +1559,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
@@ -1525,7 +1595,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);
@@ -1641,10 +1715,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);
 
@@ -1666,7 +1741,7 @@ begin
 
                //\94F\8fØ\97p\83\86\81[\83UID\81E\83p\83X\83\8f\81[\83h
                ini.WriteString('Be', 'UserID', FBeUserID);
-               ini.WriteString('Be', 'Code', Encrypt(FBeCode));
+               ini.WriteString('Be', 'Password', Encrypt(FBePassword));
                ini.WriteBool('Be', 'AutoLogin', FBeAutoLogin);
 
                //\97\9a\97ð\82Ì\8dÅ\91å\95Û\91\8c\8f\90\94
@@ -1683,6 +1758,28 @@ begin
         ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat);
         ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize);
         ini.WriteString('Function', 'ExtList', FExtList);
+        ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile);
+        ini.WriteBool('Thread', 'LimitResCountMessage', FLimitResCountMessage);
+
+
+               ini.UpdateFile;
+       finally
+               ini.Free;
+       end;
+end;
+//\90Ý\92è\83t\83@\83C\83\8b\95Û\91¶(\96`\8c¯\82Ì\8f\91)
+procedure TSetting.WriteBoukenSettingFile;
+var
+       i: Integer;
+       ini: TMemIniFile;
+begin
+       ini := TMemIniFile.Create(GetFileName());
+       try
+               ini.EraseSection('Bouken');
+        // \96`\8c¯\82Ì\8f\91Cookie\8f\91\82«\8d\9e\82Ý
+        for i := 0 to FBoukenCookieList.Count - 1 do begin
+            ini.WriteString('Bouken', FBoukenCookieList.Names[i], FBoukenCookieList.Values[FBoukenCookieList.Names[i]]);
+        end;
                ini.UpdateFile;
        finally
                ini.Free;
@@ -1841,7 +1938,8 @@ var
 begin
        for i := 0 to GetSoundCount - 1 do begin
                if SoundName[i] = Name then begin
-                       Result := SoundFileName[i];
+            SysUtils.SetCurrentDir(GetAppDir);
+                       Result := ExpandFileName(SoundFileName[i]);
                        Exit;
                end;
        end;
@@ -2051,48 +2149,6 @@ 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;
@@ -2115,21 +2171,20 @@ begin
        // \83R\83R\82Å\82Ì\94»\92è\82Å\82à\91å\95\8e\9a\8f¬\95\8e\9a\82Ì\88á\82¢\82Í\96³\8e\8b\82·\82é\81B
        FUseSkin :=
                UseCSS and
-               (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and
-               FileExists( GetSkinHeaderFileName );
+               (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and
+               FileExists( FSkinFiles.GetSkinHeaderFileName );
 
 end;
 
 procedure TSetting.SetCSSFileName( fileName: string );
 begin
-
-       FCSSFileName := fileName;
+    FSkinFiles.FileName := fileName;
        // Windows\93I\82É\83t\83@\83C\83\8b\83p\83X\82Ì\91å\95\8e\9a\8f¬\95\8e\9a\82Ì\88á\82¢\82Í\96³\8e\8b\82³\82ê\82é\82Ì\82Å\81A
        // \83R\83R\82Å\82Ì\94»\92è\82Å\82à\91å\95\8e\9a\8f¬\95\8e\9a\82Ì\88á\82¢\82Í\96³\8e\8b\82·\82é\81B
        FUseSkin :=
                UseCSS and
-               (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(CSSFileName) ) > 0) and
-               FileExists( GetSkinHeaderFileName );
+               (Pos( AnsiLowerCase(GetSkinDir), AnsiLowerCase(FSkinFiles.FileName) ) > 0) and
+               FileExists( FSkinFiles.GetSkinHeaderFileName );
 
 end;
 (*************************************************************************
@@ -2182,6 +2237,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
@@ -2415,5 +2474,49 @@ begin
                end;
     end;
 end;
+
+function TSetting.GetCSSFileName: string;
+begin
+    Result := FSkinFiles.FileName;
+end;
+function TSetting.GetBoukenCookie(AHostName: String): String;
+var
+    i : Integer;
+begin
+    for i := 0 to FBoukenCookieList.Count - 1 do begin
+        if ( AnsiPos(FBoukenCookieList.Names[i], AHostName) > 0 ) then begin
+            Result := FBoukenCookieList.Values[FBoukenCookieList.Names[i]];
+            Break;
+        end;
+    end;
+end;
+procedure TSetting.SetBoukenCookie(ACookieValue, AHostName: String);
+var
+    i : Integer;
+begin
+    for i := 0 to FBoukenCookieList.Count - 1 do begin
+        if ( FBoukenCookieList.Names[i] = AHostName ) then begin
+            FBoukenCookieList[i] := AHostName + '=' + ACookieValue;
+            Break;
+        end;
+    end;
+    if ( i = FBoukenCookieList.Count ) then begin
+        FBoukenCookieList.Add(AHostName + '=' + ACookieValue);
+    end;
+end;
+procedure TSetting.GetBouken(AHostName: String; var Domain:String; var Cookie:String);
+var
+    i : Integer;
+begin
+    Cookie := '';
+    for i := 0 to FBoukenCookieList.Count - 1 do begin
+        if ( AnsiPos(FBoukenCookieList.Names[i], AHostName) > 0 ) then begin
+            Domain := FBoukenCookieList.Names[i];
+            Cookie := FBoukenCookieList.Values[FBoukenCookieList.Names[i]];
+            Break;
+        end;
+    end;
+end;
+
 end.