Commit: 82842463c45da54e60bf47153d4a40673fce23be - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revisão: 82842463c45da54e60bf47153d4a40673fce23be (tree)
• Hora: 2007-08-19 18:29:33
• Autor: cvs2git <cvs2git>
• Commiter: cvs2git

Mensagem de Log

This commit was manufactured by cvs2svn to create tag 'v1_57_0_725'.

Mudança Sumário

• modified: AbonUnit.pas
• modified: BoardGroup.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: InputAssist.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Preview.pas
• modified: Setting.pas
• modified: gikoNavi.res
• modified: readme/gikoSetup.iss
• modified: readme/readme.txt
• modified: res/default/Samba.default

Diff

--- a/AbonUnit.pas
+++ b/AbonUnit.pas
@@ -115,6 +115,7 @@ type
 	//--
 	function TreatSyria(AString: string): string;
     //--
+    function AddToken(AString: string; Invisible: Boolean): Boolean;
   end;
 var
 	Abon1 :TAbon;
@@ -905,6 +906,32 @@ begin
 	Result := Result + AString;
 end;
 
+// NGƒ[ƒhƒtƒ@ƒCƒ‹‚ɒljÁ ’ljÁ‚³‚ꂽê‡ATrue‚ª‚©‚¦‚é
+function TAbon.AddToken(AString: string; Invisible: Boolean): Boolean;
+var
+	bufStringList : TStringList;
+    ngword: String;
+begin
+    Result := False;
+    if FileExists(GetNGwordpath) then begin
+        bufStringList := TStringList.Create;
+        try
+            bufStringList.LoadFromFile(GetNGwordpath);
+            if (Invisible) then begin
+                ngword := #9 + AString;
+            end else begin
+                ngword := AString;
+            end;
+            if (bufStringList.IndexOf(ngword) = -1) then begin
+                bufStringList.Add(ngword);
+                bufStringList.SaveToFile(GetNGwordpath);
+                Result := True;
+            end;
+        finally
+            bufStringList.Free;
+        end;
+    end;
+end;
 
 
 end.

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -1777,9 +1777,6 @@ begin
 end;
 
 function TThreadItem.GetCreateDate: TDateTime;
-var
-	unixtime: Int64;
-    tmp: string;
 begin
 	// ƒtƒ@ƒCƒ‹–¼‚©‚çƒXƒŒì¬“úŽž‚ð‹‚ß‚é
 	try
@@ -1787,18 +1784,7 @@ begin
             Result := ZERO_DATE
         else begin
             // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
-			tmp := ChangeFileExt(FFileName, '');
-			if AnsiPos('_', tmp) <> 0 then
-				if AnsiPos('_', tmp) > 9 then
-					tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1)
-				else
-					Delete(tmp, AnsiPos('_', tmp), 1);
-
-			if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then
-				Insert('1', tmp, 1);
-
-			unixtime := StrToInt64Def(tmp, ZERO_DATE);
-			Result := UnixToDateTime(unixtime) + OffsetFromUTC;
+            Result := GikoSys.GetCreateDateFromName(FFileName);
 			if GikoSys.Setting.FutureThread then begin
         		if CompareDateTime(Result, Now) = 1 then
             		Result := ZERO_DATE;

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8419,6 +8419,17 @@ object GikoForm: TGikoForm
       object N71: TMenuItem
         Action = GikoDM.IndividualAbonID0Action
       end
+      object N82: TMenuItem
+        Caption = '-'
+      end
+      object IDNG1: TMenuItem
+        Action = GikoDM.AddIDtoNGWord1Action
+        Caption = 'NG'#12527#12540#12489#12395#36861#21152
+      end
+      object IDNG2: TMenuItem
+        Action = GikoDM.AddIDtoNGWord0Action
+        Caption = 'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')'
+      end
     end
     object N52: TMenuItem
       Caption = #20491#21029#12354#12412#65374#12435#35299#38500

--- a/Giko.pas
+++ b/Giko.pas
@@ -419,6 +419,9 @@ type
     N80: TMenuItem;
     SameBoardThreadItem: TMenuItem;
     N81: TMenuItem;
+    N82: TMenuItem;
+    IDNG1: TMenuItem;
+    IDNG2: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure BrowserStatusTextChange(Sender: TObject;
@@ -686,6 +689,10 @@ type
         procedure SameBoardThreadSubItemOnClick(Sender: TObject);
         //! ƒ|ƒbƒvƒAƒbƒvƒuƒ‰ƒEƒUì¬
         procedure CreateResPopupBrowser;
+        //! D&D‚ðŽó‚¯Žæ‚é
+        procedure WMDropFiles(var Msg: TWMDropFiles); Message WM_DropFiles;
+        //! ƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
+        function isValidFile(FileName: String) : boolean;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -756,6 +763,8 @@ type
 		procedure IndividualAbonID(Atype : Integer);
 		//‚±‚̃ŒƒX‚ ‚ځ`‚ñ
 		procedure IndividualAbon(Atag, Atype : Integer);
+        //“¯ˆêID‚ðNGƒ[ƒh‚É“o˜^
+        procedure AddIDtoNGWord(invisible : boolean);
 		//ƒuƒ‰ƒEƒU‚̍ĕ`‰æ true:‘S‚Ẵ^ƒu false:ƒAƒNƒeƒBƒu‚ȃ^ƒu‚Ì‚Ý
 		procedure RepaintAllTabsBrowser();
 		//ƒŠƒ“ƒNƒo[Ý’è
@@ -1312,6 +1321,8 @@ begin
 
     //’uŠ·Ý’èƒtƒ@ƒCƒ‹‚̓ǂݍž‚Ý
     ReplaceDM.LoadFromFile(GikoSys.GetReplaceFileName);
+    // D&D‚ðŽó‚¯Žæ‚é
+    DragAcceptFiles(Self.Handle, True);
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1467,6 +1478,13 @@ begin
 			GikoDM.TabsOpenAction.Execute;
             GikoDM.TabsOpenAction.Tag := 0;
             if (GikoSys.Setting.LastCloseTabURL <> '') then begin
+                PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
+                if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
+            		while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and
+    			    	(FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
+            			Application.ProcessMessages;
+                    end;
+		        end;
                 item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL );
                 if (item <> nil) and (item.IsLogFile) then begin
                     OpenThreadItem(item, item.URL);
@@ -2740,7 +2758,8 @@ var
 begin
 	Thread := inThread;
 	idx := BrowserTab.TabIndex;
-	if (FActiveContent <> nil) and
+	if  (not FStartUp) and
+        (FActiveContent <> nil) and
 		(FActiveContent.Thread <> Thread.Thread) and
 		(FActiveContent.Browser <> nil) and
 		(Assigned(FActiveContent.Browser.Document)) then begin
@@ -2777,6 +2796,12 @@ begin
 	ThreadTitle := Thread.Thread.Title;
 	ThreadPTitle := Thread.Thread.ParentBoard.Title;
 	//ThreadScrollTop := Thread.Thread.ScrollTop;
+    if Thread.Thread.IsLogFile then  begin
+        if not FileExists(Thread.Thread.GetThreadFileName) then begin
+            Thread.Thread.DeleteLogFile;
+        end;
+    end;
+
 	ThreadIsLog := Thread.Thread.IsLogFile;
 	ThreadItem := Thread.Thread;
 	ThreadNewArraical :=  Thread.Thread.NewArrival;
@@ -6611,7 +6636,7 @@ begin
 
 end;
 // *************************************************************************
-//! ‚¨‹C‚É“ü‚èƒcƒŠ[‚̃}ƒEƒXƒAƒbƒvƒCƒxƒ“ƒg
+//! ƒXƒŒƒbƒhƒuƒ‰ƒEƒUƒNƒŠƒbƒNƒCƒxƒ“ƒg
 // *************************************************************************
 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
 const
@@ -6662,7 +6687,9 @@ begin
 					end;
                     count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
                     limited := LIMIT;
-                    if count > LIMIT then begin
+                    if not (GikoSys.Setting.LimitResCountMessage) then begin
+                        limited := -1;
+                    end else if (count > LIMIT) then begin
                         if (GikoUtil.MsgBox(Handle,
                                 IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
                                 'IDƒ|ƒbƒvƒAƒbƒvŒx',
@@ -6955,10 +6982,11 @@ end;
 
 procedure TGikoForm.BrowserPanelResize(Sender: TObject);
 begin
-	if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
-		MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
-	end;
-
+    if (FIsMinimize <> mtMinimizing) then begin
+    	if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
+	    	MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false);
+    	end;
+    end;
 end;
 procedure TGikoForm.CoolBarResized(Sender: TObject; CoolBar: TCoolBar);
 var
@@ -7091,6 +7119,60 @@ begin
 	if ThreadItem <> nil then
 		InsertBrowserTab( ThreadItem, True );
 end;
+//“¯ˆêID‚ðNGƒ[ƒh‚É“o˜^
+procedure TGikoForm.AddIDtoNGWord(invisible : boolean);
+var
+	ThreadItem : TThreadItem;
+	No : Integer;
+{$IFDEF SPAM_FILTER_ENABLED}
+	body : TStringList;
+	ReadList		: TStringList;
+	wordCount		: TWordCount;
+{$ENDIF}
+    id: String;
+begin
+	No := KokoPopupMenu.Tag;
+	if No = 0 then Exit;
+	ThreadItem := GetActiveContent(True);
+	if ThreadItem = nil then Exit;
+
+    id := GikoSys.GetResID(No, ThreadItem);
+    if (id <> '') and (not IsNoValidID(id)) then begin
+        if (GikoSys.FAbon.AddToken(id, invisible)) then begin
+            GikoSys.FAbon.ReLoadFromNGwordFile;
+            FActiveContent.Repaint := True;
+        end;
+    end else begin
+        ShowMessage('ID‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B');
+    end;
+{$IFDEF SPAM_FILTER_ENABLED}
+    body := TStringList.Create;
+    try
+        GikoSys.GetSameIDRes(id, ThreadItem, body);
+        ReadList		:= TStringList.Create;
+        wordCount		:= TWordCount.Create;
+        try
+            // ƒXƒpƒ€‚ɐݒè
+            ReadList.LoadFromFile( ThreadItem.GetThreadFileName );
+            for i := 0 to body.Count - 1 do begin
+                GikoSys.SpamCountWord( ReadList[ i ], wordCount );
+                GikoSys.SpamForget( wordCount, False );	// ƒnƒ€‚ð‰ðœ
+                GikoSys.SpamLearn( wordCount, True );		// ƒXƒpƒ€‚ɐݒè
+            end;
+        finally
+            wordCount.Free;
+            ReadList.Free;
+        end;
+    finally
+        body.Free;
+    end;
+{$ENDIF}
+    if (FActiveContent.Repaint) then begin
+        ThreadItem.ScrollTop := OleVariant(IHTMLDocument2(FActiveContent.Browser.Document)).Body.ScrollTop;
+        if ThreadItem <> nil then
+            InsertBrowserTab( ThreadItem, True );
+    end;
+end;
 
 //“¯ˆêID‚Ì‚ ‚ځ`‚ñ
 procedure TGikoForm.IndividualAbonID(Atype : Integer);
@@ -7582,6 +7664,93 @@ begin
         FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel);
     end;
 end;
+//! ŠO‚©‚ç‚ÌD&Dˆ—
+procedure TGikoForm.WMDropFiles(var Msg: TWMDropFiles);
+var
+    FileName: Array[0..MAX_PATH] of Char;
+    Cnt, K: Integer;
+    Board: TBoard;
+    LogFolder: String;
+    datList: TStringList;
+begin
+    // •\Ž¦‚µ‚Ä‚¢‚é‚̔‚̂Ƃ«ˆÈŠO‚Í‹‘”Û
+    if GetActiveList is TBoard then begin
+        Board := TBoard(GetActiveList);
+        if MsgBox(Handle, Board.Title
+            + ' ”‚ɓü‚ê‚Ä‚¢‚¢‚Å‚·‚©H', 'ƒMƒRƒiƒr', MB_YESNO or MB_ICONQUESTION) = IDYES	then begin
+            // ”‚̎ž‚́AƒƒOƒtƒHƒ‹ƒ_‚ɃRƒs[‚µ‚Ä‚Í‚®‚ꃍƒO‘Ήž‚Æ“¯‚¶ˆ—H
+            datList := TStringList.Create;
+            try
+                Cnt := DragQueryFile(Msg.Drop, $FFFFFFFF, FileName, SizeOf(FileName));
+                for K := 0 to Cnt - 1 do begin
+                    DragQueryFile(Msg.Drop, K, FileName, SizeOf(FileName));
+                    {FileName‚Édrop‚³‚ꂽƒtƒ@ƒCƒ‹–¼‚ª“ü‚Á‚Ä‚¢‚é‚̂ŁA‚±‚±‚ʼn½‚ç‚©‚̏ˆ—‚ð‚·‚éB‚½‚Æ‚¦‚ÎŽŸ‚̍s}
+                    // ƒtƒ@ƒCƒ‹‚̃`ƒFƒbƒN
+                    if (isValidFile(FileName)) then begin
+                        LogFolder := ExtractFilePath(Board.FilePath);
+                        if (FileExists( LogFolder + ExtractFileName(FileName))) then begin
+                            GikoUtil.MsgBox(Handle, LogFolder + '‚É' + ExtractFileName(FileName) + '‚ªŠù‚É‘¶Ý‚µ‚Ü‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+                        end else begin
+                            if (not DirectoryExists(LogFolder)) then begin
+                                if (not GikoSys.ForceDirectoriesEx(LogFolder) ) then begin
+                                    GikoUtil.MsgBox(Handle, LogFolder + '‚̐¶¬‚ÉŽ¸”s‚µ‚Ü‚µ‚½B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+                                end;
+                            end;
+                            if (not Windows.CopyFile(FileName,  PChar(LogFolder + ExtractFileName(FileName)), true)) then begin
+                                GikoUtil.MsgBox(Handle, FileName + '‚̃Rƒs[‚ÉŽ¸”s‚µ‚Ü‚µ‚½B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+                            end else begin
+                                datList.Add(ExtractFileName(FileName));
+                            end;
+                        end;
+                    end;
+                end;
+                DragFinish(Msg.Drop);
+                if (datList.Count > 0) then begin
+                    GikoSys.AddOutofIndexDat(Board, datList, False);
+                    ShowMessage(IntToStr(datList.Count) + 'ŒÂ‚Ìdatƒtƒ@ƒCƒ‹‚ªƒRƒs[‚³‚ê‚Ü‚µ‚½B' );
+              		if GikoForm.TreeView.Visible then
+            			GikoForm.TreeView.Refresh;
+		            if GikoForm.ListView.Visible then
+        		    	GikoForm.ListView.Refresh;
+                end else begin
+                    ShowMessage('ˆê‚‚àƒRƒs[‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B' );
+                end;
+            finally
+                datList.Free;
+            end;
+
+        end;
+    end else begin
+        ShowMessage('”‚ð•\Ž¦‚µ‚Ä‚­‚¾‚³‚¢B');
+    end;
+end;
+//! ƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
+function TGikoForm.isValidFile(FileName: String) : boolean;
+var
+    dt: TDateTime;
+begin
+    Result := True;
+    // ‘¶Ý‚·‚é‚©AŠg’£ŽqdatAƒtƒ@ƒCƒ‹–¼
+    if ( not FileExists(FileName) ) then begin
+        Result := False;
+        GikoUtil.MsgBox(Handle, FileName + '‚Í‘¶Ý‚µ‚Ü‚¹‚ñB', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+    end else if (ExtractFileExt(ExtractFileName(FileName)) <> '.dat' ) then begin
+        Result := False;
+        GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚ÌŠg’£Žq‚ª".dat"‚Å‚ ‚è‚Ü‚¹‚ñB', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+    end else begin
+        // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
+        try
+            dt := GikoSys.GetCreateDateFromName(FileName);
+            if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin
+                Result := False;
+                GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚̃tƒ@ƒCƒ‹–¼‚ª•s³‚Å‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+            end;
+        except
+            Result := False;
+            GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + '‚̃tƒ@ƒCƒ‹–¼‚ª•s³‚Å‚·B', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
+        end;
+    end;
+end;
 
 initialization
 				OleInitialize(nil);

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1344,6 +1344,18 @@ object GikoDM: TGikoDM
       OnExecute = NewLinkToClipboardActionExecute
       OnUpdate = DependActiveCntentActionUpdate
     end
+    object AddIDtoNGWord0Action: TAction
+      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
+      Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')'
+      Hint = #12524#12473#12398'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427#65288#36879#26126#65289
+      OnExecute = AddIDtoNGWord0ActionExecute
+    end
+    object AddIDtoNGWord1Action: TAction
+      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
+      Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152
+      Hint = 'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427
+      OnExecute = AddIDtoNGWord1ActionExecute
+    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -237,6 +237,8 @@ type
     ScrollPageUpAction: TAction;
     AllLinkToClipboardAction: TAction;
     NewLinkToClipboardAction: TAction;
+    AddIDtoNGWord0Action: TAction;
+    AddIDtoNGWord1Action: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -444,6 +446,8 @@ type
     procedure ScrollPageUpActionExecute(Sender: TObject);
     procedure AllLinkToClipboardActionExecute(Sender: TObject);
     procedure NewLinkToClipboardActionExecute(Sender: TObject);
+    procedure AddIDtoNGWord0ActionExecute(Sender: TObject);
+    procedure AddIDtoNGWord1ActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -2261,9 +2265,11 @@ begin
                     if item <> nil then
                         GikoForm.InsertBrowserTab( item, false );
                 end;
-                //Å‰‚Ì‚P–‡‚ÉÝ’è ƒAƒhƒŒƒX‚̐ݒè‚Ì‚½‚߂̃Jƒ‰ŒÄ‚Ñ
-                if GikoForm.BrowserTab.Tabs.Count > 0 then begin
-                    GikoForm.BrowserTab.OnChange(nil);
+                //Å‰‚Ì‚P–‡‚ɐݒè
+                if (GikoSys.Setting.URLDisplay) and
+                    (GikoForm.BrowserTab.Tabs.Count > 0) then begin
+					GikoForm.AddressComboBox.Text :=
+                        TBrowserRecord(GikoForm.BrowserTab.Tabs.Objects[0]).Thread.URL;
                 end;
             end;
         finally
@@ -2408,7 +2414,9 @@ begin
 	if ThreadItem = nil then Exit;
 	count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
 	limited := LIMIT;
-	if count > LIMIT then begin
+    if not (GikoSys.Setting.LimitResCountMessage) then begin
+        limited := -1;
+    end else if count > LIMIT then begin
 		if ( GikoUtil.MsgBox(GikoForm.Handle,
 				IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
 				'IDƒ|ƒbƒvƒAƒbƒvŒx',
@@ -4434,6 +4442,16 @@ begin
 end;
 
 
+//! ‚±‚̃ŒƒX‚ÌID‚ðNGƒ[ƒh‚ɒljÁ‚·‚éi“§–¾)
+procedure TGikoDM.AddIDtoNGWord0ActionExecute(Sender: TObject);
+begin
+    GikoForm.AddIDtoNGWord(true);
+end;
+//! ‚±‚̃ŒƒX‚ÌID‚ðNGƒ[ƒh‚ɒljÁ‚·‚é
+procedure TGikoDM.AddIDtoNGWord1ActionExecute(Sender: TObject);
+begin
+    GikoForm.AddIDtoNGWord(false);
+end;
 
 end.
 

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -116,8 +116,6 @@ type
 		function ChooseString(const Text, Separator: string; Index: integer): string;
         //! ˆêŽžƒtƒ@ƒCƒ‹‚©‚ç‚Ì•œ‹Œ
         procedure RestoreThreadData(Board: TBoard);
-        //! ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
-        procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList);
 	public
 		{ Public éŒ¾ }
 		FAbon : TAbon;
@@ -129,13 +127,10 @@ type
 		property ResRange : Longint read FResRange write FResRange;
 		//! ƒo[ƒWƒ‡ƒ“î•ñ
 		property Version : String read FVersion;
-//		function MsgBox(Msg: string; Title: string; Flags: Longint): integer; overload;
-//		function MsgBox(Handle: THandle; Msg: string; Title: string; Flags: Longint): integer; overload;
 		function IsNumeric(s: string): boolean;
 		function IsFloat(s: string): boolean;
 		function DirectoryExistsEx(const Name: string): Boolean;
 		function ForceDirectoriesEx(Dir: string): Boolean;
-//		function GetVersion: string;
 
 		function GetBoardFileName: string;
 		function GetCustomBoardFileName: string;
@@ -224,7 +219,7 @@ type
 		procedure GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList); overload;
 		function GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer; overload;
 		function GetSameIDResCount(AIDNum : Integer; ThreadItem: TThreadItem):Integer; overload;
-
+        function GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
 		//! ’PŒê‰ðÍ
 		procedure SpamCountWord( const text : string; wordCount : TWordCount );
 		//! ŠwKƒNƒŠƒA
@@ -257,6 +252,10 @@ type
         function GetOEIndentChar : string;
         //! ’uŠ·Ý’èƒtƒ@ƒCƒ‹Žæ“¾
         function GetReplaceFileName: String;
+        //! ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
+        procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: boolean = True);
+        //! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
+        function GetCreateDateFromName(FileName: String): TDateTime;
 	end;
 
 var
@@ -266,7 +265,7 @@ const
 	ZERO_DATE: Integer	= 25569;
 	BETA_VERSION_NAME_E = 'beta';
 	BETA_VERSION_NAME_J = 'ÊÞÀ';
-	BETA_VERSION				= 56;
+	BETA_VERSION				= 57;
 	BETA_VERSION_BUILD	= '';				//!< debug”Å‚È‚Ç
 	APP_NAME						= 'gikoNavi';
 	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -572,11 +571,18 @@ var
 	usePlugIn : Boolean;
 	islog : Boolean;
     urlHead: String;
+    datFileCheck: Boolean;
 	{*
 	FavoThreadItem : TFavoriteThreadItem;
 	Node: TTreeNode;
 	*}
+{$IFDEF DEBUG}
+    st, rt: Cardinal;
+{$ENDIF}
 begin
+{$IFDEF DEBUG}
+	st := GetTickCount;
+{$ENDIF}
 	if Board.IsThreadDatRead then
 		Exit;
 	Board.Clear;
@@ -592,12 +598,16 @@ begin
 
 	FileName := Board.GetFolderIndexFileName;
 
-	FileList := TStringList.Create;
-	FileList.Sorted := True;
-	FileList.BeginUpdate;
-	//IsLogFile—pDATƒtƒ@ƒCƒ‹ƒŠƒXƒg
-	GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
-	FileList.EndUpdate;
+    //
+    datFileCheck := (Setting.CheckDatFile) or (not FileExists(FileName));
+    if (datFileCheck) then begin
+        FileList := TStringList.Create;
+        FileList.Sorted := True;
+        FileList.BeginUpdate;
+        //IsLogFile—pDATƒtƒ@ƒCƒ‹ƒŠƒXƒg
+        GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False);
+        FileList.EndUpdate;
+    end;
 
 	// d•¡‚ð–h‚®
 	Board.BeginUpdate;
@@ -609,7 +619,11 @@ begin
 			//‚Qs–Ú‚©‚çi‚Ps–ڂ̓o[ƒWƒ‡ƒ“j
 			for i := sl.Count - 1 downto 1 do begin
 				Rec := ParseIndexLine(sl[i]);
-				islog := FileList.Find( Rec.FFileName, Index );
+                if (datFileCheck) then begin
+    				islog := FileList.Find( Rec.FFileName, Index );
+                end else begin
+                    islog := (Rec.FSize <> 0) and (Rec.FCount <> 0);
+                end;
 				if usePlugIn then
 					ThreadItem := TThreadItem.Create(
 							Board.BoardPlugIn,
@@ -636,7 +650,7 @@ begin
 				end;
 
 				ThreadItem.BeginUpdate;
-				if islog then
+				if (datFileCheck) and (islog) then
 					FileList.Delete( Index );
 
 				ThreadItem.No := Rec.FNo;
@@ -671,50 +685,75 @@ begin
 		if UnRead <> Board.UnRead then
 			Board.UnRead := UnRead;
 
-		//ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
-        AddOutofIndexDat(Board, FileList);
+        if (datFileCheck) then begin
+		    //ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
+            AddOutofIndexDat(Board, FileList);
+        end;
 		Board.EndUpdate;
 
         //‘O‰ñˆÙíI—¹Žžƒ`ƒFƒbƒN
         RestoreThreadData( Board );
 	finally
 		sl.Free;
-		FileList.Free;
+        if (datFileCheck) then begin
+    		FileList.Free;
+        end;
 		Board.Sorted := False;
 	end;
 	Board.IsThreadDatRead := True;
+{$IFDEF DEBUG}
+	rt := GetTickCount - st;
+	Writeln('Read Done.' + IntToStr(rt) + ' ms');
+{$ENDIF}
 end;
 {!
 \brief ƒCƒ“ƒfƒbƒNƒX‚É‚È‚¢dati‚Í‚®‚êdatj‚̒ljÁ
 \param Board ’ljÁ‚·‚é”Â
 \param DatList  datƒtƒ@ƒCƒ‹–¼
 }
-procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList);
+procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: Boolean = True);
 var
     i : Integer;
     Boardpath,FileName : String;
     ResRec: TResRec;
     ThreadItem: TThreadItem;
+    create: Boolean;
 begin
+    create := False;
     Boardpath := ExtractFilePath(Board.GetFolderIndexFileName);
     //ƒCƒ“ƒfƒbƒNƒX‚É–³‚©‚Á‚½ƒƒO‚ð’ljÁi•…‚êƒCƒ“ƒfƒbƒNƒX‘Ήžj
     for i := 0 to DatList.Count - 1 do begin
         FileName := Boardpath + DatList[i];
-
-        //ResRec := DivideStrLine(ReadThreadFile(FileName, 1));
-        if Board.IsBoardPlugInAvailable then begin
-            ThreadItem := TThreadItem.Create(
-                Board.BoardPlugIn,
-                Board,
-                Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) );
-            THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
-        end else begin
-            ThreadItem := TThreadItem.Create(
-                nil,
-                Board,
-                Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) );
-            THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
+        ThreadItem := nil;
+        if (not AllCreate) then begin
+            create := False;
+            ThreadItem := Board.FindThreadFromFileName(DatList[i]);
+            if (ThreadItem = nil) then begin
+                create := True;
+            end else begin
+                if Board.IsBoardPlugInAvailable then begin
+                    THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
+                end else begin
+                    THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
+                end;
+            end;
         end;
+        if (ThreadItem = nil) then begin
+            if Board.IsBoardPlugInAvailable then begin
+                ThreadItem := TThreadItem.Create(
+                    Board.BoardPlugIn,
+                    Board,
+                    Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) );
+                THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec);
+            end else begin
+                ThreadItem := TThreadItem.Create(
+                    nil,
+                    Board,
+                    Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) );
+                THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec);
+            end;
+        end;
+        
 
         ThreadItem.BeginUpdate;
         ThreadItem.FileName := DatList[i];
@@ -736,7 +775,9 @@ begin
         ThreadItem.ScrollTop := 0;
         ThreadItem.AgeSage := gasNone;
         ThreadItem.EndUpdate;
-        Board.Add(ThreadItem);
+        if (AllCreate) or (create) then begin
+            Board.Add(ThreadItem);
+        end;
     end;
 end;
 {!
@@ -2849,12 +2890,27 @@ end;
 }
 procedure TGikoSys.GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList);
 var
+	AID : String;
+begin
+    AID := GetResID(AIDNum, ThreadItem);
+    if not IsNoValidID(AID) then begin
+	    GetSameIDRes(AID, ThreadItem, body);
+	end;
+end;
+{!
+\brief “Še ID Žæ“¾
+\param AIDNum     “Še ƒŒƒX”ԍ†
+\param ThreadItem “ŠeƒXƒŒƒbƒh
+\param body       OUT:“ŠeID
+}
+function TGikoSys.GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
+var
 	Res: TResRec;
 	boardPlugIn : TBoardPlugIn;
-	AID : String;
 	stList: TStringList;
 	i : Integer;
 begin
+    Result := '';
 	if (ThreadItem <> nil) and (ThreadItem.IsLogFile)
 		and (AIDNum > 0) and (AIDNum <= ThreadItem.Count) then begin
 		//if ThreadItem.IsBoardPlugInAvailable then begin
@@ -2866,21 +2922,21 @@ begin
 		end else begin
 			THTMLCreate.DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum), @Res);
 		end;
-		AID := Res.FDateTime;
-		if AnsiPos('id', AnsiLowerCase(AID)) > 0 then begin
-			AID := Copy(AID, AnsiPos('id', AnsiLowerCase(AID)) - 1, 11);
-            if AnsiPos(' be:', AnsiLowerCase(AID)) > 0 then begin
-            	AID := Copy(AID, 1, AnsiPos(' BE:', AnsiLowerCase(AID)) - 1)
+		Result := Res.FDateTime;
+		if AnsiPos('id', AnsiLowerCase(Result)) > 0 then begin
+			Result := Copy(Result, AnsiPos('id', AnsiLowerCase(Result)) - 1, 11);
+            if AnsiPos(' be:', AnsiLowerCase(Result)) > 0 then begin
+            	Result := Copy(Result, 1, AnsiPos(' BE:', AnsiLowerCase(Result)) - 1)
             end;
 		end else begin
 			stlist := TStringList.Create;
 			try
-				stList.DelimitedText := AID;
-                AID := '';
+				stList.DelimitedText := Result;
+                Result := '';
 				for i := 0 to stList.Count - 1 do
 					if Length(WideString(stList[i])) = 8 then begin
 						if NotDateorTimeString(stList[i]) then begin
-							AID := stList[i];
+							Result := stList[i];
 							break;
 						end;
 					end;
@@ -2888,11 +2944,8 @@ begin
 				stList.Free;
 			end;
 		end;
-        if not IsNoValidID(AID) then
-			GetSameIDRes(AID, ThreadItem, body);
 	end;
 end;
-
 {!
 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
 \param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
@@ -3309,7 +3362,8 @@ begin
 					ThreadItem.NewReceive := ini.ReadInteger(SECTION, 'NewReceive', 0);
 
 					ThreadItem.Size := ini.ReadInteger(SECTION, 'Size', 0);
-					if(ThreadItem.Size = 0) and (FileExists(ThreadItem.GetThreadFileName)) then begin
+                    ThreadItem.IsLogFile := FileExists(ThreadItem.GetThreadFileName);
+					if(ThreadItem.Size = 0) and (ThreadItem.IsLogFile) then begin
 						try
 							ThreadItem.Size := GetFileSize(ThreadItem.GetThreadFileName) - ThreadItem.Count;
 						except
@@ -3399,6 +3453,26 @@ function TGikoSys.GetReplaceFileName: String;
 begin
     Result := Setting.GetReplaceFileName;
 end;
+//! ƒtƒ@ƒCƒ‹–¼‚©‚ç‚̃XƒŒƒbƒhì¬“ú‚̎擾
+function TGikoSys.GetCreateDateFromName(FileName: String): TDateTime;
+var
+    tmp : String;
+    unixtime: Int64;  
+begin
+    // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
+    tmp := ChangeFileExt(FileName, '');
+    if AnsiPos('_', tmp) <> 0 then
+        if AnsiPos('_', tmp) > 9 then
+            tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1)
+        else
+            Delete(tmp, AnsiPos('_', tmp), 1);
+
+    if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then
+        Insert('1', tmp, 1);
+
+    unixtime := StrToInt64Def(tmp, ZERO_DATE);
+    Result := UnixToDateTime(unixtime) + OffsetFromUTC;
+end;
 
 initialization
 	GikoSys := TGikoSys.Create;

--- a/InputAssist.pas
+++ b/InputAssist.pas
@@ -189,12 +189,19 @@ var
 begin
 	if GikoListView1.Selected <> nil then begin
     	if (ValidateKey(KeyNameEdit.Text, CategoryNameComboBox.Text)) then begin
-            if (not InputAssistDM.IsDupulicate(
+            resWord := TResistWord(GikoListView1.Selected.Data);
+            // •ÏX‘O‚̃L[^ƒJƒeƒSƒŠ‚Æ“¯ˆê‚à‚µ‚­‚́A‘¼‚Əd•¡–³‚µ
+            if ((resWord.GetKey = KeyNameEdit.Text)
+                and (resWord.GetCategory = CategoryNameComboBox.Text)) or
+                (not InputAssistDM.IsDupulicate(
     			KeyNameEdit.Text, CategoryNameComboBox.Text) ) then begin
-	    		resWord := TResistWord(GikoListView1.Selected.Data);
-		    	resWord.SetKey(KeyNameEdit.Text);
-			    resWord.SetCategory(CategoryNameComboBox.Text);
-	    		resWord.SetText(TextMemo.Text);
+                resWord.SetCategory(CategoryNameComboBox.Text);
+                resWord.SetText(TextMemo.Text);
+                // ƒL[‚ª•Ï‚í‚é‚Æ‚«‚́AChangeKey‚ðŒÄ‚Ô
+                if (resWord.GetKey <> KeyNameEdit.Text) then begin
+       		    	resWord.SetKey(KeyNameEdit.Text);
+                    InputAssistDM.ChangeKey(resWord);
+                end;
 		    	// ˆê——‚̍XV
 			    GikoListView1.Selected.Caption := resWord.GetKey;
     			GikoListView1.Selected.SubItems[0] := resWord.GetCategory;

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -21,8 +21,8 @@ object KuroutOption: TKuroutOption
     Top = 0
     Width = 517
     Height = 393
-    ActivePage = KakikomiTabSheet
-    TabIndex = 2
+    ActivePage = TabSheet2
+    TabIndex = 3
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = #35443#32048#35373#23450#65297
@@ -562,6 +562,22 @@ object KuroutOption: TKuroutOption
           TabOrder = 1
         end
       end
+      object LogGroupBox: TGroupBox
+        Left = 16
+        Top = 160
+        Width = 465
+        Height = 65
+        Caption = #12525#12464
+        TabOrder = 1
+        object CheckDatFileCheckBox: TCheckBox
+          Left = 22
+          Top = 14
+          Width = 369
+          Height = 17
+          Caption = #12473#12524#12483#12489#19968#35239#65288'Folder.idx'#65289#35501#12415#36796#12415#26178#12395'dat'#12501#12449#12452#12523#12434#12481#12455#12483#12463#12377#12427#12290
+          TabOrder = 0
+        end
+      end
     end
   end
   object OkBotton: TButton

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -81,6 +81,8 @@ type
     Label14: TLabel;
     ExtListLabeledEdit: TLabeledEdit;
     Label15: TLabel;
+    LogGroupBox: TGroupBox;
+    CheckDatFileCheckBox: TCheckBox;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -156,6 +158,8 @@ begin
     ReplaceDatCheckBox.Checked := GikoSys.Setting.ReplaceDat;
     SentIniFileSizeUpDown.Position := GikoSys.Setting.SentIniFileSize;
     ExtListLabeledEdit.Text := GikoSys.Setting.ExtList;
+    // Folder.idx“ǂݍž‚ÝŽždatƒ`ƒFƒbƒN
+    CheckDatFileCheckBox.Checked := GikoSys.Setting.CheckDatFile;
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -198,6 +202,8 @@ begin
     GikoSys.Setting.ReplaceDat := ReplaceDatCheckBox.Checked;
     GikoSys.Setting.SentIniFileSize := SentIniFileSizeUpDown.Position;
     GikoSys.Setting.ExtList := ExtListLabeledEdit.Text;
+    // Folder.idx“ǂݍž‚ÝŽždatƒ`ƒFƒbƒN
+    GikoSys.Setting.CheckDatFile := CheckDatFileCheckBox.Checked;
 end;
 
 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);

--- a/Option.dfm
+++ b/Option.dfm
@@ -1,6 +1,6 @@
 object OptionDialog: TOptionDialog
-  Left = 417
-  Top = 435
+  Left = 300
+  Top = 166
   BorderStyle = bsDialog
   Caption = #12458#12503#12471#12519#12531
   ClientHeight = 428
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet1
+    ActivePage = ThreadSheet
     MultiLine = True
-    TabIndex = 5
+    TabIndex = 4
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -870,7 +870,7 @@ object OptionDialog: TOptionDialog
         Left = 12
         Top = 92
         Width = 477
-        Height = 121
+        Height = 157
         Caption = #12522#12531#12463#12463#12522#12483#12463#26178#21205#20316
         TabOrder = 1
         object AppFolderLabel: TLabel
@@ -915,13 +915,21 @@ object OptionDialog: TOptionDialog
           TabOrder = 3
           OnClick = URLAppCheckBoxClick
         end
+        object ResAnchorCheckBox: TCheckBox
+          Left = 12
+          Top = 125
+          Width = 333
+          Height = 17
+          Caption = #12524#12473#12450#12531#12459#12540#12398#22580#21512#12289#12381#12398#12524#12473#12414#12391#12472#12515#12531#12503#12377#12427
+          TabOrder = 4
+        end
       end
       object GroupBox6: TGroupBox
         Left = 12
-        Top = 220
+        Top = 260
         Width = 477
-        Height = 49
-        Caption = #12525#12464#21066#38500
+        Height = 77
+        Caption = #30906#35469#12513#12483#12475#12540#12472
         TabOrder = 2
         object LogDeleteMessageCheckBox: TCheckBox
           Left = 12
@@ -932,21 +940,14 @@ object OptionDialog: TOptionDialog
           TabOrder = 0
           OnClick = URLAppCheckBoxClick
         end
-      end
-      object ResAnchorGroupBox: TGroupBox
-        Left = 12
-        Top = 279
-        Width = 477
-        Height = 49
-        Caption = #12524#12473#12450#12531#12459#12540#12463#12522#12483#12463#26178#21205#20316
-        TabOrder = 3
-        object ResAnchorCheckBox: TCheckBox
+        object IgnoreLimitResCountCheckBox: TCheckBox
           Left = 12
-          Top = 21
-          Width = 165
+          Top = 46
+          Width = 389
           Height = 17
-          Caption = #12381#12398#12524#12473#12414#12391#12472#12515#12531#12503#12377#12427
-          TabOrder = 0
+          Caption = #21516'ID'#12524#12473#12450#12531#12459#12540#34920#31034#12391#21046#38480#25968#36234#12360#12398#30906#35469#12513#12483#12475#12540#12472#12434#34920#31034#12377#12427'(&R)'
+          TabOrder = 1
+          OnClick = URLAppCheckBoxClick
         end
       end
     end

--- a/Option.pas
+++ b/Option.pas
@@ -116,8 +116,6 @@ type
                 OpenMailerCheckBox: TCheckBox;
                 GroupBox6: TGroupBox;
                 LogDeleteMessageCheckBox: TCheckBox;
-                ResAnchorGroupBox: TGroupBox;
-                ResAnchorCheckBox: TCheckBox;
                 TabSheet1: TTabSheet;
 	        TabAddRadioGroup: TRadioGroup;
                 GroupBox8: TGroupBox;
@@ -219,6 +217,8 @@ type
     gppLeftBottomRB: TRadioButton;
     gppBottomRB: TRadioButton;
     gppRighBottomRB: TRadioButton;
+    ResAnchorCheckBox: TCheckBox;
+    IgnoreLimitResCountCheckBox: TCheckBox;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure ApplyButtonClick(Sender: TObject);
@@ -766,6 +766,8 @@ begin
 
 	//ƒƒOíœŽžƒƒbƒZ[ƒW
 	LogDeleteMessageCheckBox.Checked := GikoSys.Setting.DeleteMsg;
+    //“¯IDƒŒƒXƒAƒ“ƒJ[•\Ž¦‚̐§ŒÀ”‰z‚¦ƒƒbƒZ[ƒW
+    IgnoreLimitResCountCheckBox.Checked := GikoSys.Setting.LimitResCountMessage;
 
 	//I—¹ŽžŠm”Fƒ_ƒCƒAƒƒO
 	ShowDialogForEndCheckBox.Checked := GikoSys.Setting.ShowDialogForEnd;
@@ -1031,6 +1033,8 @@ begin
 
 	GikoSys.Setting.OpenMailer := OpenMailerCheckBox.Checked;
 	GikoSys.Setting.DeleteMsg := LogDeleteMessageCheckBox.Checked;
+    GikoSys.Setting.LimitResCountMessage := IgnoreLimitResCountCheckBox.Checked;
+
 	//I—¹ŽžŠm”Fƒ_ƒCƒAƒƒO
 	GikoSys.Setting.ShowDialogForEnd := ShowDialogForEndCheckBox.Checked;
 	//AllTabClose

--- a/Preview.pas
+++ b/Preview.pas
@@ -148,14 +148,14 @@ begin
 	end;
 
 	Result := Rect(0, 0, WindowWidth, WindowHeight);
-
+    // bata55ˆÈ‘O‚͍¶‰E‚ªŠÔˆá‚Á‚Ä‚½
     // o‚µˆÊ’u‚É‚æ‚é•â³
 	case GikoSys.Setting.PopupPosition of
-		gppRightTop: 		OffsetRect(Result,
+		gppLeftTop: 		OffsetRect(Result,
             Point.x - WindowWidth - 15, Point.y - WindowHeight -	15);
-		gppRight: 			OffsetRect(Result,
+		gppLeft: 			OffsetRect(Result,
             Point.x - WindowWidth - 15, Point.y - (WindowHeight div 2));
-		gppRightBottom: OffsetRect(Result,
+		gppLeftBottom: OffsetRect(Result,
             Point.x - WindowWidth - 15, Point.y + 15);
 		gppTop:				OffsetRect(Result,
             Point.x - (WindowWidth div 2), Point.y - WindowHeight - 15);
@@ -163,11 +163,11 @@ begin
             Point.x - (WindowWidth div 2), Point.y - (WindowHeight div 2));
 		gppBottom:			OffsetRect(Result,
             Point.x - (WindowWidth div 2), Point.y + 15);
-		gppLeftTop:			OffsetRect(Result,
+		gppRightTop:			OffsetRect(Result,
             Point.x + 15, Point.y - WindowHeight -	15);
-		gppLeft:			OffsetRect(Result,
+		gppRight:			OffsetRect(Result,
             Point.x + 15, Point.y - (WindowHeight div 2));
-		gppLeftBottom: 	OffsetRect(Result, Point.x + 15, Point.y + 15);		//ƒMƒRƒiƒrƒXƒŒ ƒp[ƒg‚P‚Ì453Ž‚ÉŠ´ŽÓ
+		gppRightBottom: 	OffsetRect(Result, Point.x + 15, Point.y + 15);		//ƒMƒRƒiƒrƒXƒŒ ƒp[ƒg‚P‚Ì453Ž‚ÉŠ´ŽÓ
 	end;
 
 end;

--- a/Setting.pas
+++ b/Setting.pas
@@ -20,9 +20,9 @@ type
 	TGikoListOrientation = (gloHorizontal, gloVertical);	// ƒŠƒXƒg‚’¼E…•½
 	TGikoListState = (glsMax, glsNormal, glsMin);					// ƒŠƒXƒgƒTƒCƒYó‘Ô
 																												// ƒ|ƒbƒvƒAƒbƒv•\Ž¦ˆÊ’u
-	TGikoPopupPosition = (gppRightTop, gppTop, gppLeftTop,
-												gppRight, gppCenter, gppLeft,
-												gppRightBottom, gppBottom, gppLeftBottom);
+	TGikoPopupPosition = (gppLeftTop = 0, gppTop, gppRightTop,
+												gppLeft, gppCenter, gppRight,
+												gppLeftBottom, gppBottom, gppRightBottom);
 																												//ƒvƒŒƒrƒ…[ƒTƒCƒY
 	TGikoPreviewSize = (gpsXLarge, gpsLarge, gpsMedium, gpsSmall, gpsXSmall);
 	TGikoBrowserAutoMaximize	= (gbmNone, gbmClick, gbmDoubleClick);
@@ -450,6 +450,10 @@ type
         FExtList: String;
         //! SkinŠÖ˜A
         FSkinFiles: TSkinFiles;
+        //! indexƒtƒ@ƒCƒ‹‚ð“Ç‚ÝŽž‚Édat‚ðŒŸõ‚·‚é
+        FCheckDatFile: Boolean;
+        //! “¯IDƒŒƒXƒAƒ“ƒJ[•\Ž¦
+        FLimitResCountMessage: Boolean;
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -807,7 +811,9 @@ type
         property ExtList: String read FExtList write FExtList;
         //! Skinƒtƒ@ƒCƒ‹ŠÇ—
         property SkinFiles: TSkinFiles read FSkinFiles;
-
+        //! ƒCƒ“ƒfƒbƒNƒX“ǂݍž‚ÝŽždatƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
+        property CheckDatFile: Boolean read FCheckDatFile write FCheckDatFile;
+        property LimitResCountMessage: Boolean read FLimitResCountMessage write FLimitResCountMessage;
 end;
 
 
@@ -1293,6 +1299,9 @@ 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);
 		ini.UpdateFile;
 	finally
 		ini.Free;
@@ -1675,6 +1684,8 @@ 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;

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -10,11 +10,11 @@ VersionInfoDescription=
 DefaultGroupName=ƒMƒRƒiƒr
 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
 SourceDir=G:\Release
-OutputDir=G:\Output
+OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.56.0.714
-OutputBaseFilename=gikoNavi_1.56.0.714_2_setup
+VersionInfoVersion=1.56.1.716
+OutputBaseFilename=gikoNavi_b56_setup
 
 
 [Tasks]
@@ -90,7 +90,7 @@ begin
         begin
           DelTree(path, True, True, True);
         end;
-        
+
         path := ExpandConstant('{app}') + '\config';
         if MsgBox(path + 'ƒtƒHƒ‹ƒ_ˆÈ‰º‚ðŠ®‘S‚ɏÁ‹Ž‚µ‚Ä‚æ‚낵‚¢‚Å‚µ‚傤‚©H', mbConfirmation, MB_YESNO) = IDYES then
         begin

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ56 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ57 Readme.txt
 
 
 ------------------------------
@@ -108,6 +108,16 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
+2007/XX/XX
+  Version ÊÞÀ57
+  
+2007/08/18
+  Version ÊÞÀ56 ƒŠƒŠ[ƒX2
+  “ü—̓AƒVƒXƒg‚̐ݒè‚ŁA‘}“ü•¶Žš—ñ‚ð‚¾‚¯‚ð•ÏX‚Å‚«‚È‚¢•s‹ï‡‚̏C³
+  ˆê•”ŠÂ‹«‚ŁAƒMƒRƒiƒr‚ðÅ¬‰»‚µ‚Ä•œŒ³‚·‚é‚ƃXƒŒƒbƒh‚ªƒXƒNƒ[ƒ‹‚·‚é•s‹ï‡‚̏C³
+  ÊÞÀ55ˆÈ‘O‚©‚çƒAƒbƒvƒf[ƒg‚·‚é‚ƃŒƒXƒ|ƒbƒvƒAƒbƒvˆÊ’u‚̐ݒè‚̍¶‰E‚ª‹t“]‚·‚é•s‹ï‡‚̏C³
+  
+
 2007/08/05
   Version ÊÞÀ56
 @ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì‘½’i‘Ήž

--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,44 +1,36 @@
 [Setting]
-@ascii2d=30
-@chiri=30
-@gline=30
 @newsplus=120
-@operate=30
-@tv=30
-aa6=30
+@skate=60
 academy6=30
-anime2=45
-book4=30
-bubble5=30
+anime2=60
+bubble6=30
 etc6=30
 ex20=30
 ex21=30
-ex22=30
-food7=30
+ex23=20
+food8=30
 game11=30
 game12=30
 hobby9=30
-human6=30
+human7=30
 life8=30
 live23=10
 live24=10
 live25=10
-love5=30
-money5=30
+love6=30
+money6=30
 music8=30
 news21=30
 news22=30
-off4=30
-pc9=30
+news23=128
 pc11=30
 qb5=30
-school6=30
+school7=30
 science6=30
-sports10=60
+sports11=60
 tmp6=45
-travel3=30
 tv11=60
-wwwww=20
+wwwww=15
 
 idol=30
 pie=30