Commit: d5df7a08e8348887f31c6859657e1965da2e03e9 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revisão: d5df7a08e8348887f31c6859657e1965da2e03e9 (tree)
• Hora: 2008-09-14 10:47:48
• Autor: cvs2git <cvs2git>
• Commiter: cvs2git

Mensagem de Log

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

Mudança Sumário

• modified: BoardGroup.pas
• modified: Editor.dfm
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: Option.pas
• modified: ResPopupBrowser.pas
• modified: Setting.pas
• modified: gikoNavi.res
• modified: readme/readme.txt
• modified: res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
• modified: res/ExternalBoardPlugIn/MachiBBSPlugIn.res
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSAcquireBoard.pas
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res
• modified: res/default/Samba.default

Diff

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -334,12 +334,6 @@ type
         property	BoardPlugIn	: TBoardPlugIn	read FBoardPlugIn write FBoardPlugIn;
     end;
 
-    // “ÁŽê—p“r—pTBoard
-    TSpecialBoard = class(TBoard)
-    public
-        function Add(item: TThreadItem): integer; overload;
-        procedure Clear; overload;
-    end;
 
 	function	BBSsFindBoardFromBBSID( inBBSID : string ) : TBoard;
 	function	BBSsFindBoardFromURL( inURL : string ) : TBoard;
@@ -347,13 +341,9 @@ type
 	function	BBSsFindThreadFromURL(const inURL : string ) : TThreadItem;
 	function	ConvertDateTimeString( inDateTimeString : string) : TDateTime;
 
-    procedure    DestorySpecialBBS( inBBS : TBBS );
-
 var
 	BBSs 		: array of TBBS;
     BoardGroups : array of TBoardGroup;
-    SpecialBBS  : TBBS;
-    SpecialBoard: TSpecialBoard;
 
 implementation
 
@@ -539,28 +529,6 @@ begin
 	end;
 
 end;
-{!
-\brief “ÁŽê—p“rBBSíœ
-\param bbs íœ‚·‚é“ÁŽê—p“rBBS
-}
-procedure DestorySpecialBBS( inBBS : TBBS );
-var
-    sCategory : TCategory;
-    sBoard    : TSpecialBoard;
-begin
-    if inBBS <> nil then begin
-        sCategory := inBBS.Items[0];
-        if sCategory <> nil then begin
-            sBoard := TSpecialBoard(sCategory.Items[0]);
-            if sBoard <> nil then begin
-                sBoard.Modified := False;
-                sBoard.Clear;
-                FreeAndNil(sBoard);
-            end;
-        end;
-        FreeAndNil(inBBS);
-    end;
-end;
 
 (*************************************************************************
  *‹@”\–¼FTBBSƒRƒ“ƒXƒgƒ‰ƒNƒ^
@@ -1862,19 +1830,6 @@ begin
 
 end;
 
-function TSpecialBoard.Add(item: TThreadItem): integer;
-begin
-    Result := inherited AddObject(Item.URL, Item);
-end;
-
-procedure TSpecialBoard.Clear;
-var
-	i: integer;
-begin
-    for i := Count - 1 downto 0 do
-		DeleteList(i);
-    Capacity := 0;
-end;
 
 end.
 

--- a/Editor.dfm
+++ b/Editor.dfm
@@ -368,7 +368,6 @@ object EditorForm: TEditorForm
       Left = 324
       Top = 0
       Action = ContinueModeAction
-      Style = tbsCheck
     end
   end
   object MainMenu: TMainMenu

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8397,9 +8397,6 @@ object GikoForm: TGikoForm
     object ID1: TMenuItem
       Action = GikoDM.SameIDResAnchorAction
     end
-    object N83: TMenuItem
-      Action = GikoDM.DereferenceResAction
-    end
   end
   object BrowserTabPopupMenu: TPopupMenu
     Images = HotToobarImageList
@@ -8753,11 +8750,4 @@ object GikoForm: TGikoForm
     Left = 8
     Top = 440
   end
-  object TaskTrayPopupMenu: TPopupMenu
-    Left = 38
-    Top = 373
-    object Exit1: TMenuItem
-      Action = GikoDM.ExitAction
-    end
-  end
 end

--- a/Giko.pas
+++ b/Giko.pas
@@ -417,9 +417,6 @@ type
     IDNG1: TMenuItem;
     IDNG2: TMenuItem;
     ResPopupClearTimer: TTimer;
-    TaskTrayPopupMenu: TPopupMenu;
-    Exit1: TMenuItem;
-    N83: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure BrowserStatusTextChange(Sender: TObject;
@@ -692,9 +689,6 @@ type
         function isValidFile(FileName: String) : boolean;
         //! ListView‚ÌD&DŽó‚¯Žæ‚è
         procedure AcceptDropFiles(var Msg: TMsg);
-        //! ƒXƒŒƒbƒhˆê——XVˆ—
-        procedure UpdateListView();
-
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -821,8 +815,6 @@ type
         procedure TaskTrayIconMessage(var Msg : TMsg); message WM_USER + 2010;
         //! ƒ^ƒXƒNƒgƒŒƒC‚ɃAƒCƒRƒ““o˜^•ƒtƒH[ƒ€‰B‚µ
         procedure StoredTaskTray;
-        //! “¯IDƒŒƒXƒAƒ“ƒJ[•\Ž¦
-        procedure ShowSameIDAncher(const AID: String);
 	published
 		property EnabledCloseButton: Boolean read FEnabledCloseButton write SetEnabledCloseButton;
 	end;
@@ -1553,13 +1545,8 @@ var
 	i				: Integer;
 	wp			: TWindowPlacement;
 	tmpBool	: Boolean;
-    WindowPlacement: TWindowPlacement;
+    doc:IHTMLDocument2;
 begin
-    // ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ
-    if (FIconData.uID <> 0) then begin
-        Shell_NotifyIcon(NIM_DELETE, @FIconData);
-    end;
-
 	// ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[ŠJ•ú
 	try
         if GikoSys.Setting.GestureEnabled then begin
@@ -1577,9 +1564,6 @@ begin
 	except
 	end;
 	try
-        WindowPlacement.length := SizeOf(TWindowPlacement);
-        GetWindowPlacement(Self.Handle, @WindowPlacement);
-
 		//Å‘剻EƒEƒBƒ“ƒhƒEˆÊ’u•Û‘¶
 		wp.length := sizeof(wp);
 		GetWindowPlacement(Handle, @wp);
@@ -1587,8 +1571,8 @@ begin
 		GikoSys.Setting.WindowLeft := wp.rcNormalPosition.Left;
 		GikoSys.Setting.WindowHeight := wp.rcNormalPosition.Bottom - wp.rcNormalPosition.Top;
 		GikoSys.Setting.WindowWidth := wp.rcNormalPosition.Right - wp.rcNormalPosition.Left;
-		GikoSys.Setting.WindowMax := (WindowState = wsMaximized) or
-                                        (WindowPlacement.flags = WPF_RESTORETOMAXIMIZED);
+		GikoSys.Setting.WindowMax := WindowState = wsMaximized;
+
 		GikoSys.Setting.ListStyle := ListView.ViewStyle;
 		GikoSys.Setting.CabinetVisible := GikoDM.CabinetVisibleAction.Checked;
 		GikoSys.Setting.CabinetWidth := CabinetPanel.Width;
@@ -1743,7 +1727,6 @@ begin
 				BBSs[ i ].Free;
 			BBSs[ i ] := nil;
 		end;
-        DestorySpecialBBS(BoardGroup.SpecialBBS);
 	except
 	end;
 
@@ -2584,7 +2567,20 @@ begin
 				end;
 				TreeView.Refresh;
 				//ListView‚Å‚±‚̃XƒŒ‚ªŠÜ‚Ü‚ê‚锂ð•\Ž¦‚µ‚Ä‚¢‚é‚Æ‚«‚̍XVˆ—
-                UpdateListView();
+				if (ActiveList <> nil) and (ActiveList is TBoard) then begin
+					TBoard(ActiveList).LogThreadCount := TBoard(ActiveList).GetLogThreadCount;
+					TBoard(ActiveList).NewThreadCount := TBoard(ActiveList).GetNewThreadCount;
+					TBoard(ActiveList).UserThreadCount:= TBoard(ActiveList).GetUserThreadCount;
+                    //ListView‚̃AƒCƒeƒ€‚̌”‚àXV
+					case GikoForm.ViewType of
+						gvtAll: ListView.Items.Count := TBoard(ActiveList).Count;
+						gvtLog: ListView.Items.Count := TBoard(ActiveList).LogThreadCount;
+						gvtNew: ListView.Items.Count := TBoard(ActiveList).NewThreadCount;
+						gvtArch: ListView.Items.Count := TBoard(ActiveList).ArchiveThreadCount;
+						gvtLive: ListView.Items.Count := TBoard(ActiveList).LiveThreadCount;
+						gvtUser: ListView.Items.Count := TBoard(ActiveList).UserThreadCount;
+					end;
+				end;
 				RefreshListView(Item.ThreadItem);
 			end;
 
@@ -3076,9 +3072,6 @@ begin
 		BBSs[i].SelectText := SelectText;
 		BBSs[i].KubetsuChk := KubetsuChk;
 	end;
-    BoardGroup.SpecialBBS.SelectText := SelectText;
-    BoardGroup.SpecialBBS.KubetsuChk := KubetsuChk;
-    
 	ViewType := AViewType;
 	if ActiveList is TBoard then begin
 		Board := TBoard(ActiveList);
@@ -4960,13 +4953,9 @@ begin
 	if PreviewTimer.Enabled then
 		PreviewTimer.Enabled := False;
 
-    //WindowŠO‚Ɉړ®‚µ‚½‚Æ‚«‚͏Á‚¦‚é‚悤‚É‚·‚邽‚ß•œŠˆ
-    if (FResPopupBrowser <> nil) and (IsWindowVisible(FResPopupBrowser.Handle)) then begin
-        // ‰EƒNƒŠƒbƒN‚ÌŽž‚͏Á‚³‚È‚¢‚悤‚ÉðŒ’Ç‰Á
-        if (Message.MouseMsg <> WM_RBUTTONUP) then begin
-            FResPopupBrowser.Clear;
-        end;
-    end;
+	if (FResPopupBrowser <> nil) and (IsWindowVisible(FResPopupBrowser.Handle)) then begin
+        FResPopupBrowser.Clear;
+	end;
 
 	if (FPreviewBrowser <> nil)
 		and (IsWindowVisible(FPreviewBrowser.Handle)) then begin
@@ -5722,7 +5711,7 @@ procedure TGikoForm.SelectComboBoxKeyDown(Sender: TObject; var Key: Word;
 	Shift: TShiftState);
 var
   IMC: HIMC;
-  Len, idx: integer;
+  Len: integer;
   Str: string;
   tmp: string;
 begin
@@ -5748,20 +5737,6 @@ begin
 				SetSelectWord(Str);
 			end;
 		end;
-    end else if (Key = Windows.VK_DELETE) and (ssCtrl in Shift) then begin
-        // Ctrl + DEL ‚ō폜‚·‚é
-        Str := SelectComboBox.Text;
-        idx := GikoSys.Setting.SelectTextList.IndexOf( Str );
-        if idx <> -1 then begin
-            GikoSys.Setting.SelectTextList.Delete( idx );
-        end;
-        idx := SelectComboBox.Items.IndexOf( Str );
-		if idx <> -1 then begin
-            SelectComboBox.Items.Delete( idx );
-        end;
-        SelectComboBox.Text := '';
-        // iž‚Ý‚ð‰ðœ‚·‚邽‚߂ɕύXƒCƒxƒ“ƒg‚ðŒÄ‚яo‚·
-        SelectComboBox.OnChange(Sender);
 	end else if Length( SelectComboBox.Text ) = 0 then
 	begin
 		{* SelectComboBox.Text‚ª‹ó‚Å‚àA“ü—Í“r’†‚ÅEsc‚µ‚½‚Æ‚©
@@ -6778,12 +6753,18 @@ end;
 //! ƒXƒŒƒbƒhƒuƒ‰ƒEƒUƒNƒŠƒbƒNƒCƒxƒ“ƒg
 // *************************************************************************
 function TGikoForm.WebBrowserClick(Sender: TObject): WordBool;
+const
+    LIMIT = 20;
 var
 	e: IHTMLElement;
     doc : IHTMLDocument2;
     FOleInPlaceActiveObject: IOleInPlaceActiveObject;
 	p : TPoint;
 	AID: string;
+	stlist : TStringList;
+	i, count: Integer;
+	body : String;
+    limited : Integer;
 begin
 	result := true;
     if not Assigned(FActiveContent) then
@@ -6795,53 +6776,63 @@ begin
 		FOleInPlaceActiveObject := FActiveContent.Browser.ControlInterface as IOleInPlaceActiveObject;
 		FOleInPlaceActiveObject.OnFrameWindowActivate(True);
 		GetCursorPos(p);
-
+		
 		p.x := p.x - FActiveContent.Browser.ClientOrigin.x;
 		p.y := p.y - FActiveContent.Browser.ClientOrigin.y;
-
+		
 		doc := FActiveContent.Browser.ControlInterface.Document as IHTMLDocument2;
 		if not Assigned(doc) then
 			Exit;
 
 		e := doc.elementFromPoint(p.x, p.y);
-		if not Assigned(e) then
+		if not Assigned(e) then 
 			Exit;
-
+		
 		if (e.className = 'date') or (e.id = 'date') then begin
-			AID := GikoSys.ExtructResID(e.innerText);
-            ShowSameIDAncher(AID);
+			AID := e.innerText;
+			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)
+				end;
+			end else begin
+				stlist := TStringList.Create;
+				try
+					stList.DelimitedText := AID;
+					AID := '';
+					for i := 0 to stList.Count - 1 do begin
+						if Length(WideString(stList[i])) = 8 then begin
+							if GikoSys.NotDateorTimeString(stList[i]) then begin
+								AID := stList[i];
+								break;
+							end;
+						end;
+					end;
+				finally
+					stList.Free;
+				end;
+			end;
+			
+			count := GikoSys.GetSameIDResCount(AID, FActiveContent.Thread);
+			limited := LIMIT;
+			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',
+						MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin
+					limited := -1;
+				end
+			end;
+
+			body := GikoSys.GetSameIDResAnchor(AID, FActiveContent.Thread, limited);
+			FActiveContent.IDAnchorPopup(body);
 		end;
 	except
 	end;
 end;
-procedure TGikoForm.ShowSameIDAncher(const AID: String);
-const
-    LIMIT = 20;
-var
-	numbers : TStringList;
-    limited : Integer;
-begin
-    numbers := TStringList.Create;
-    try
 
-        GikoSys.GetSameIDRes(AID, FActiveContent.Thread, numbers);
-        limited := LIMIT;
-        if not (GikoSys.Setting.LimitResCountMessage) then begin
-            limited := -1;
-        end else if (numbers.Count > LIMIT) then begin
-            if (GikoUtil.MsgBox(Handle,
-                    IntToStr(LIMIT) + 'ŒÂˆÈã‚ ‚è‚Ü‚·‚ªA‚·‚ׂĕ\Ž¦‚µ‚Ü‚·‚©H',
-                    'IDƒ|ƒbƒvƒAƒbƒvŒx',
-                    MB_YESNO or MB_ICONQUESTION) = ID_YES) then begin
-                limited := -1;
-            end
-        end;
-        FActiveContent.IDAnchorPopup(
-            GikoSys.CreateResAnchor(numbers, FActiveContent.Thread, limited));
-    finally
-        numbers.Free;
-    end;
-end;
 //ƒXƒŒƒbƒhˆê——‚ðÅ‘剻‚µ‚ătƒH[ƒJƒX‚ð“–‚Ä‚é
 procedure TGikoForm.SelectTimerTimer(Sender: TObject);
 begin
@@ -7758,17 +7749,10 @@ begin
 end;
 
 procedure TGikoForm.TaskTrayIconMessage(var Msg: TMsg);
-var
-    p: TPoint;
 begin
     //  ¶ƒNƒŠƒbƒN‚È‚ç•œŒ³‚·‚é
     if  (Msg.wParam = WM_LBUTTONUP) then  begin
         UnStoredTaskTray;
-    end else if (Msg.wParam=WM_RBUTTONUP) then begin
-        // ‰EƒNƒŠƒbƒN‚È‚çI—¹‚·‚é
-        GetCursorPos ( p );
-        SetForegroundWindow ( Self.Handle );
-        TaskTrayPopupMenu.Popup ( p.X, p.Y );
     end;
 end;
 //! ƒ^ƒXƒNƒgƒŒƒC‚ɃAƒCƒRƒ““o˜^•ƒtƒH[ƒ€‰B‚µ
@@ -7841,6 +7825,7 @@ var
     Board: TBoard;
     LogFolder: String;
     datList: TStringList;
+    p: TPoint;
 begin
     // •\Ž¦‚µ‚Ä‚¢‚é‚̔‚̂Ƃ«ˆÈŠO‚Í‹‘”Û
     if GetActiveList is TBoard then begin
@@ -7877,12 +7862,10 @@ begin
                 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 begin
+              		if GikoForm.TreeView.Visible then
             			GikoForm.TreeView.Refresh;
-                    end;
-		            if GikoForm.ListView.Visible then begin
-        		    	UpdateListView();
-                    end;
+		            if GikoForm.ListView.Visible then
+        		    	GikoForm.ListView.Refresh;
                 end else begin
                     ShowMessage('ˆê‚‚àƒRƒs[‚³‚ê‚Ü‚¹‚ñ‚Å‚µ‚½B' );
                 end;
@@ -7895,25 +7878,7 @@ begin
         ShowMessage('”‚ð•\Ž¦‚µ‚Ä‚­‚¾‚³‚¢B');
     end;
 end;
-procedure TGikoForm.UpdateListView();
-begin
-    //ListView‚Å‚±‚̃XƒŒ‚ªŠÜ‚Ü‚ê‚锂ð•\Ž¦‚µ‚Ä‚¢‚é‚Æ‚«‚̍XVˆ—
-    if (ActiveList <> nil) and (ActiveList is TBoard) then begin
-        TBoard(ActiveList).LogThreadCount := TBoard(ActiveList).GetLogThreadCount;
-        TBoard(ActiveList).NewThreadCount := TBoard(ActiveList).GetNewThreadCount;
-        TBoard(ActiveList).UserThreadCount:= TBoard(ActiveList).GetUserThreadCount;
-        //ListView‚̃AƒCƒeƒ€‚̌”‚àXV
-        case GikoForm.ViewType of
-            gvtAll: ListView.Items.Count := TBoard(ActiveList).Count;
-            gvtLog: ListView.Items.Count := TBoard(ActiveList).LogThreadCount;
-            gvtNew: ListView.Items.Count := TBoard(ActiveList).NewThreadCount;
-            gvtArch: ListView.Items.Count := TBoard(ActiveList).ArchiveThreadCount;
-            gvtLive: ListView.Items.Count := TBoard(ActiveList).LiveThreadCount;
-            gvtUser: ListView.Items.Count := TBoard(ActiveList).UserThreadCount;
-        end;
-    end;
-    ListView.Refresh;
-end;
+
 //! ƒtƒ@ƒCƒ‹ƒ`ƒFƒbƒN
 function TGikoForm.isValidFile(FileName: String) : boolean;
 var
@@ -7930,7 +7895,7 @@ begin
     end else begin
         // ƒƒOƒtƒ@ƒCƒ‹‚ÌŠg’£Žq‚ð‚Í‚¸‚µ‚½‚à‚Ì‚ªƒXƒŒì¬“úŽž
         try
-            dt := GikoSys.GetCreateDateFromName(ExtractFileName(FileName));
+            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);

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1,8 +1,8 @@
 object GikoDM: TGikoDM
   OldCreateOrder = False
   OnCreate = DataModuleCreate
-  Left = 518
-  Top = 174
+  Left = 516
+  Top = 172
   Height = 336
   Width = 286
   object GikoFormActionList: TActionList
@@ -315,7 +315,7 @@ object GikoDM: TGikoDM
       ImageIndex = 9
       ShortCut = 16433
       OnExecute = AllItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object LogItemAction: TAction
       Category = #26495
@@ -326,7 +326,7 @@ object GikoDM: TGikoDM
       ImageIndex = 10
       ShortCut = 16434
       OnExecute = LogItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object NewItemAction: TAction
       Category = #26495
@@ -337,7 +337,7 @@ object GikoDM: TGikoDM
       ImageIndex = 11
       ShortCut = 16435
       OnExecute = NewItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object ArchiveItemAction: TAction
       Category = #26495
@@ -347,7 +347,7 @@ object GikoDM: TGikoDM
       Hint = 'DAT'#33853#12385#12473#12524#12483#12489#12398#12415#34920#31034#12377#12427
       ImageIndex = 55
       OnExecute = ArchiveItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object LiveItemAction: TAction
       Category = #26495
@@ -357,7 +357,7 @@ object GikoDM: TGikoDM
       Hint = #29983#23384#12375#12390#12356#12427#12473#12524#12483#12489#12398#12415#12434#34920#31034#12377#12427
       ImageIndex = 54
       OnExecute = LiveItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object ThreadRangeAction: TAction
       Category = #26495
@@ -367,7 +367,7 @@ object GikoDM: TGikoDM
       Hint = #12473#12524#12483#12489#12398#34920#31034#31684#22258#12434#35373#23450
       ImageIndex = 10
       OnExecute = ThreadRangeActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveCntentActionUpdate
     end
     object SelectItemAction: TAction
       Category = #26495
@@ -378,7 +378,7 @@ object GikoDM: TGikoDM
       ImageIndex = 12
       ShortCut = 16436
       OnExecute = SelectItemActionExecute
-      OnUpdate = DependActiveListTBoardWithSpeciapActionUpdate
+      OnUpdate = DependActiveListTBoardActionUpdate
     end
     object StopAction: TAction
       Category = #34920#31034
@@ -1356,27 +1356,6 @@ object GikoDM: TGikoDM
       Hint = 'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427
       OnExecute = AddIDtoNGWord1ActionExecute
     end
-    object ExtractSameIDAction: TAction
-      Category = #12473#12524#12483#12489
-      Caption = #12463#12522#12483#12503#12508#12540#12489#12398#25991#23383#21015#12434#21547#12416'ID'#12398#12524#12473#12450#12531#12459#12540#34920#31034
-      Hint = #12463#12522#12483#12503#12508#12540#12489#12398#25991#23383#21015#12434#21547#12416'ID'#12398#12524#12473#12450#12531#12459#12540#34920#31034
-      OnExecute = ExtractSameIDActionExecute
-      OnUpdate = DependActiveCntentLogActionUpdate
-    end
-    object ShowTabListAction: TAction
-      Category = #34920#31034
-      Caption = #12479#12502#19968#35239#34920#31034
-      Hint = #12479#12502#19968#35239#34920#31034
-      OnExecute = ShowTabListActionExecute
-    end
-    object DereferenceResAction: TAction
-      Tag = 1
-      Category = #12473#12524#12483#12489
-      Caption = #12371#12398#12524#12473#12434#21442#29031#12375#12390#12356#12427#12524#12473#12450#12531#12459#12540#34920#31034
-      Hint = #12371#12398#12524#12473#12434#21442#29031#12375#12390#12356#12427#12524#12473#12450#12531#12459#12540#34920#31034
-      OnExecute = DereferenceResActionExecute
-      OnUpdate = DependActiveCntentLogActionUpdate
-    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -239,9 +239,6 @@ type
     NewLinkToClipboardAction: TAction;
     AddIDtoNGWord0Action: TAction;
     AddIDtoNGWord1Action: TAction;
-    ExtractSameIDAction: TAction;
-    ShowTabListAction: TAction;
-    DereferenceResAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -451,9 +448,6 @@ type
     procedure NewLinkToClipboardActionExecute(Sender: TObject);
     procedure AddIDtoNGWord0ActionExecute(Sender: TObject);
     procedure AddIDtoNGWord1ActionExecute(Sender: TObject);
-    procedure ExtractSameIDActionExecute(Sender: TObject);
-    procedure ShowTabListActionExecute(Sender: TObject);
-    procedure DereferenceResActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -486,10 +480,8 @@ type
 	procedure DependActiveCntentActionUpdate(Sender: TObject);
 	//! TAction‚ÅGetActiveContent‚ªnilˆÈŠO‚©‚ƒƒO‚ðŽ‚Á‚Ä‚¢‚é‚Æ—LŒø‚É‚È‚é
 	procedure DependActiveCntentLogActionUpdate(Sender: TObject);
-	//! TAction‚ÅActiveList‚ªTBoard(”ñ“ÁŽê”Â)‚Å—LŒø‚É‚È‚é
-	procedure DependActiveListTBoardActionUpdate(Sender: TObject);
 	//! TAction‚ÅActiveList‚ªTBoard‚Å—LŒø‚É‚È‚é
-	procedure DependActiveListTBoardWithSpeciapActionUpdate(Sender: TObject);
+	procedure DependActiveListTBoardActionUpdate(Sender: TObject);
   end;
 
 var
@@ -530,17 +522,9 @@ begin
 									and (GikoForm.GetActiveContent.IsLogFile);
 end;
 // *************************************************************************
-//! TAction‚ÅActiveList‚ªTBoard(”ñ“ÁŽê”Â)‚Å—LŒø‚É‚È‚é
-// *************************************************************************
-procedure TGikoDM.DependActiveListTBoardActionUpdate(Sender: TObject);
-begin
-	TAction(Sender).Enabled := (GikoForm.GetActiveList is TBoard) and
-        (GikoForm.GetActiveList <> BoardGroup.SpecialBoard);
-end;
-// *************************************************************************
 //! TAction‚ÅActiveList‚ªTBoard‚Å—LŒø‚É‚È‚é
 // *************************************************************************
-procedure TGikoDM.DependActiveListTBoardWithSpeciapActionUpdate(Sender: TObject);
+procedure TGikoDM.DependActiveListTBoardActionUpdate(Sender: TObject);
 begin
 	TAction(Sender).Enabled := (GikoForm.GetActiveList is TBoard);
 end;
@@ -2354,6 +2338,7 @@ procedure TGikoDM.KokomadeActionExecute(Sender: TObject);
 var
 	No: Integer;
 	ThreadItem: TThreadItem;
+    doc : IHTMLDocument2;
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0
@@ -2419,18 +2404,28 @@ const
     LIMIT = 20;
 var
 	ThreadItem : TThreadItem;
-	No : Integer;
-	AID: string;
+	No, count: Integer;
+	body : string;
+	limited: Integer;
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
 	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
-
-    AID := GikoSys.GetResID(No, ThreadItem);
-    if not IsNoValidID(AID) then begin
-        GikoForm.ShowSameIDAncher(AID);
-    end;
+	count := GikoSys.GetSameIDResCount(No, GikoForm.ActiveContent.Thread);
+	limited := LIMIT;
+    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',
+				MB_YESNO or MB_ICONQUESTION) = ID_YES ) then begin
+            limited := -1;
+        end;
+	end;
+	body := GikoSys.GetSameIDResAnchor(No, ThreadItem, limited);
+	GikoForm.ActiveContent.IDAnchorPopup(body);
 end;
 // *************************************************************************
 //! ‚±‚̃ŒƒX‚ ‚ځ`‚ñ@i’ʏíj
@@ -2651,8 +2646,7 @@ end;
 // *************************************************************************
 procedure TGikoDM.UpFolderActionUpdate(Sender: TObject);
 begin
-	UpFolderAction.Enabled := not (GikoForm.GetActiveList is TBBS) and
-        (GikoForm.GetActiveList <> BoardGroup.SpecialBoard);
+	UpFolderAction.Enabled := not (GikoForm.GetActiveList is TBBS);
 end;
 // *************************************************************************
 //! •\Ž¦@•\Ž¦ƒŠƒXƒg‚̃‚[ƒh•ÏX
@@ -3015,10 +3009,9 @@ procedure TGikoDM.SelectListReloadActionUpdate(Sender: TObject);
 begin
 	if (GikoForm.GetActiveList is TCategory) and (GikoForm.ListView.SelCount > 0) then
 		TAction(Sender).Enabled := True
-	else if GikoForm.GetActiveList is TBoard then begin
-		TAction(Sender).Enabled :=
-            (GikoForm.GetActiveList <> BoardGroup.SpecialBoard);
-	end else
+	else if GikoForm.GetActiveList is TBoard then
+		TAction(Sender).Enabled := True
+	else
 		TAction(Sender).Enabled := False;
 end;
 // *************************************************************************
@@ -3216,10 +3209,8 @@ end;
 // *************************************************************************
 procedure TGikoDM.LogFolderOpenActionUpdate(Sender: TObject);
 begin
-	if (((GikoForm.GetActiveList is TBoard) and
-        (GikoForm.GetActiveList <> BoardGroup.SpecialBoard))
-        or (GikoForm.GetActiveList is TCategory))
-	    	and (GikoForm.ListView.SelCount > 0) then
+	if ((GikoForm.GetActiveList is TBoard) or (GikoForm.GetActiveList is TCategory))
+		and (GikoForm.ListView.SelCount > 0) then
 		TAction(Sender).Enabled := True
 	else
 		TAction(Sender).Enabled := False;
@@ -4401,7 +4392,7 @@ begin
                 // ƒŒƒX‚̔ԍ†‚ðXV
                 if (Pos('menu:', url) > 0) then begin
                     index := StrToInt64Def(
-                        Copy(url, 6, Length(url)), index + 1
+                        Copy(url, 5, Length(url)), index + 1
                     );
                 end else begin
                     // ŠJŽnƒŒƒX”ԍ†ˆÈ~‚©ƒ`ƒFƒbƒN
@@ -4469,99 +4460,6 @@ procedure TGikoDM.AddIDtoNGWord1ActionExecute(Sender: TObject);
 begin
     GikoForm.AddIDtoNGWord(false);
 end;
-//! ƒNƒŠƒbƒvƒ{[ƒh‚Ì•¶Žš—ñ‚ðID‚Æ‚µ‚Ä“¯ˆêIDƒŒƒXƒAƒ“ƒJ[•\Ž¦
-procedure TGikoDM.ExtractSameIDActionExecute(Sender: TObject);
-var
-    ID: String;
-begin
-    ID := Trim(Clipboard.AsText);
-    if (Length(ID) > 0) then begin
-        if not IsNoValidID(ID) then begin
-            GikoForm.ShowSameIDAncher(ID);
-        end;
-    end;
-end;
-//! ƒ^ƒu‚̃XƒŒƒbƒhˆê——‚ð•\Ž¦‚·‚é
-procedure TGikoDM.ShowTabListActionExecute(Sender: TObject);
-var
-    i : Integer;
-begin
-    GikoForm.ListView.Items.BeginUpdate;
-    GikoForm.ListView.Items.Clear;
-    BoardGroup.SpecialBoard.Clear;
-	for i := GikoForm.BrowserTab.Tabs.Count - 1 downto 0 do begin
-        BoardGroup.SpecialBoard.Add(
-    		TBrowserRecord(GikoForm.BrowserTab.Tabs.Objects[i]).Thread);
-	end;
-    GikoForm.ListView.Items.EndUpdate;
-    GikoForm.SetActiveList(BoardGroup.SpecialBoard);
-end;
-//! ‹tŽQÆ‚µ‚Ä‚¢‚郌ƒX‚ð’ljÁ‚·‚é
-procedure TGikoDM.DereferenceResActionExecute(Sender: TObject);
-var
-	i, currentNo, No : Integer;
-    links : IHTMLElementCollection;
-    threadItem : TThreadItem;
-    item : IHTMLElement;
-    url, url2 : string;
-    resNo : TStringList;
-    alreadyExist : Boolean;
-  	PathRec: TPathRec;
-begin
-	No := GikoForm.KokoPopupMenu.Tag;
-	if No = 0 then Exit;
-
-    ThreadItem := GikoForm.GetActiveContent;
-    // ƒAƒNƒeƒBƒuƒ^ƒu‚©‚ç‘S‚ẴŠƒ“ƒN‚ðŽæ“¾‚·‚é
-    links := GetActiveThreadLinks;
-    if (ThreadItem <> nil) and (links <> nil) then begin
-        resNo := TStringList.Create;
-        try
-            currentNo := 0;
-            alreadyExist := False;
-            // ƒŠƒ“ƒN‚ð‘S‚Ä‘–¸‚·‚é
-            for i := 0 to links.length - 1 do begin
-                item := links.item(i, 0) as IHTMLElement;
-                if (item <> nil) then begin
-                    url := item.getAttribute('href', 0);
-                    // ƒŒƒX‚̔ԍ†‚ðXV
-                    if (Pos('menu:', url) > 0) then begin
-                        currentNo := StrToInt64Def(
-                            Copy(url, 6, Length(url)), currentNo + 1
-                        );
-                        alreadyExist := False;
-                    end else if (currentNo <> -1) and (not alreadyExist) then begin
-                        // IE7‘Ήž
-                        if Pos('about:..', url) = 1 then begin
-                            url := 'about:blank..' + Copy( url, Length('about:..')+1, Length(url) )
-                        end;
-                        // Ž©•ª‚ւ̃Šƒ“ƒN‚©‚烌ƒXƒ|ƒbƒv—p‚̔ԍ†Žæ“¾
-                        if Pos('about:blank..', url) = 1 then begin
-                            // No ”Ԃւ̃Šƒ“ƒN‚ª‚ ‚ê‚ÎŽQÆ‚ ‚è
-                            url2 := THTMLCreate.GetRespopupURL(url, ThreadItem.URL);
-                			PathRec := Gikosys.Parse2chURL2(url2);
-                            if (not PathRec.FNoParam) then begin
-                                Gikosys.GetPopupResNumber(url2,PathRec.FSt,PathRec.FTo);
-			                end;
-                            // ‘ΏۃŒƒX‚à‚µ‚­‚Í‚»‚ê‚ðŠÜ‚Þ‚È‚çŽQÆ‚ ‚è‚Æ‚·‚é
-                            if (PathRec.FSt = No) or
-                                ((PathRec.FSt <= No) and (PathRec.FTo >= No))  then begin
-                                alreadyExist := True;
-                                resNo.Add(IntToStr(currentNo));
-                            end;
-                        end;
-                    end;
-                end;
-            end;
-            // –³§ŒÀ‚È‚Ì‚Å-1ŒÅ’è
-            GikoForm.ActiveContent.IDAnchorPopup(
-                GikoSys.CreateResAnchor(resNo, ThreadItem, -1));
-        finally
-            resNo.Clear;
-            resNo.Free;
-        end;
-    end;
-end;
 
 end.
 

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -213,11 +213,13 @@ type
 		procedure GetPopupResNumber(URL : string; var stRes, endRes : Int64);
 
 		property Bayesian : TGikoBayesian read FBayesian write FBayesian;
-        function CreateResAnchor(var Numbers: TStringList; ThreadItem: TThreadItem; limited: Integer):string;
+		function GetSameIDResAnchor(const AID : string; ThreadItem: TThreadItem; limited: Integer):string; overload;
+		function GetSameIDResAnchor(AIDNum : Integer; ThreadItem: TThreadItem; limited: Integer):string; overload;
 		procedure GetSameIDRes(const AID : string; ThreadItem: TThreadItem;var body: TStringList); overload;
 		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;
-        function ExtructResID(ADateStr: String): String;
 		//! ’PŒê‰ðÍ
 		procedure SpamCountWord( const text : string; wordCount : TWordCount );
 		//! ŠwKƒNƒŠƒA
@@ -226,6 +228,8 @@ type
 		procedure SpamLearn( wordCount : TWordCount; isSpam : Boolean );
 		//! ƒXƒpƒ€“x”
 		function SpamParse( const text : string; wordCount : TWordCount ) : Extended;
+		//ˆø”‚ªA“ú•t‚Å‚àŽž‚Å‚à‚È‚¢‚±‚Ƃ𒲂ׂé
+		function NotDateorTimeString(const AStr : string): boolean;
 
 		//! ˆø”‚É‘—‚ç‚ê‚Ä‚«‚½“ú•t/ID•”‚ÉBE‚Ì•¶Žš—ñ‚ª‚ ‚Á‚½‚çAƒvƒƒtƒ@ƒCƒ‹‚ւ̃Šƒ“ƒN‚ð’ljÁ
 		function AddBeProfileLink(AID : string; ANum: Integer): string;
@@ -2508,7 +2512,6 @@ procedure TGikoSys.ListBoardFile;
 var
 	boardFileList	: TStringList;
 	i, l			: Integer;
-    sCategory       : TCategory;
 begin
 	// BBS ‚ÌŠJ•ú
 	try
@@ -2551,20 +2554,6 @@ begin
 		BoardFileList.Free;
 	  end;
 	end;
-
-    // “ÁŽê—p“rBBS¶¬
-    // Šù‚É‘¶Ý‚·‚éê‡‚͍폜‚·‚é
-    DestorySpecialBBS(BoardGroup.SpecialBBS);
-    SpecialBBS := TBBS.Create('');
-    SpecialBBS.Title := '“ÁŽê—p“r(”ñ•\Ž¦)';
-    sCategory := TCategory.Create;
-    sCategory.No := 1;
-    sCategory.Title := '“ÁŽê—p“r(”ñ•\Ž¦)';
-    SpecialBBS.Add(sCategory);
-    BoardGroup.SpecialBoard := TSpecialBoard.Create(nil, 'http://localhost/gikonavi/special/index.html');
-    BoardGroup.SpecialBoard.Title := 'ƒ^ƒuˆê——';
-    BoardGroup.SpecialBoard.IsThreadDatRead := True;
-    sCategory.Add(BoardGroup.SpecialBoard);
 end;
 
 {!
@@ -2762,18 +2751,20 @@ function TGikoSys.GetSambaFileName : string;
 begin
 	Result := Setting.GetSambaFileName;
 end;
+
 {!
-\brief —ñ‹“‚³‚ꂽƒŒƒX”ԍ†‚ւ̃Aƒ“ƒJ[—pHTMLì¬
-\param Numbers    —ñ‹“‚³‚ꂽƒŒƒX”ԍ†
+\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒAƒ“ƒJ[‚É‚µ‚Ä—ñ‹“
+\param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
 \param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
 \return           —ñ‹“‚³‚ꂽƒŒƒXƒAƒ“ƒJ[
 }
-function TGikoSys.CreateResAnchor(
-    var Numbers: TStringList; ThreadItem: TThreadItem;
+function TGikoSys.GetSameIDResAnchor(
+    const AID : string; ThreadItem: TThreadItem;
     limited: Integer):string;
 var
 	i: integer;
+	body: TStringList;
     Res: TResRec;
     ResLink : TResLinkRec;
 begin
@@ -2781,22 +2772,29 @@ begin
     Res.FBody := '';
     Res.FType := glt2chNew;
 
-	Result := '';
-	if (Numbers <> nil) and (Numbers.Count > 0) then begin
-        if (limited > 0) and (Numbers.Count > limited) then begin
-            for i := Numbers.Count - limited to Numbers.Count - 1 do begin
-                Res.FBody := Res.FBody + '&gt;' + Numbers[i] + ' ';
-            end;
-        end else begin
-            for i := 0 to Numbers.Count - 1 do begin
-                Res.FBody := Res.FBody + '&gt;' + Numbers[i] + ' ';
-            end;
-        end;
+		Result := '';
+		if (not IsNoValidID(AID)) and
+			(ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
+				body := TStringList.Create;
+				try
+						GetSameIDRes(AID, ThreadItem, body);
+						if (limited > 0) and (body.Count > limited) then begin
+								for i := body.Count - limited to body.Count - 1 do begin
+										Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+								end;
+						end else begin
+								for i := 0 to body.Count - 1 do begin
+										Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+								end;
+						end;
+				finally
+						body.Free;
+				end;
         ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
         ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
         HTMLCreater.ConvRes(@Res, @ResLink, false);
         Result := Res.FBody;
-    end;
+		end;
 end;
 
 {!
@@ -2811,22 +2809,6 @@ var
 	ReadList: TStringList;
 	Res: TResRec;
 	boardPlugIn : TBoardPlugIn;
-
-    procedure CheckSameID(const AID:String; const Target: String; no: Integer);
-    var
-        pos: Integer;
-    begin
-        pos := AnsiPos('id:', LowerCase(Target));
-        if (pos > 0) then begin
-            if(AnsiPos(AID, Copy(Target, pos-1, Length(Target))) > 0) then begin
-                body.Add(IntToStr(no));
-            end;
-        end else begin
-            if(AnsiPos(AID, Target) > 0) then begin
-                body.Add(IntToStr(no));
-            end;
-        end;
-    end;
 begin
 	if (not IsNoValidID(AID)) and
     	(ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
@@ -2839,7 +2821,9 @@ begin
 			for i := 0 to threadItem.Count - 1 do begin
 				// ƒŒƒX
 				THTMLCreate.DivideStrLine(boardPlugIn.GetDat(DWORD( threadItem ), i + 1), @Res);
-                CheckSameID(AID, Res.FDateTime, i+1);
+				if(AnsiPos(AID, Res.FDateTime) > 0) then begin
+					body.Add(IntToStr(i+1));
+				end;
 			end;
 		end else begin
 			ReadList := TStringList.Create;
@@ -2847,7 +2831,9 @@ begin
 				ReadList.LoadFromFile(ThreadItem.GetThreadFileName);
 				for i := 0 to ReadList.Count - 1 do begin
 					THTMLCreate.DivideStrLine(ReadList[i], @Res);
-                    CheckSameID(AID, Res.FDateTime, i+1);
+					if AnsiPos(AID, Res.FDateTime) > 0 then begin
+						body.Add(IntToStr(i+1));
+					end;
 				end;
 			finally
 				ReadList.Free;
@@ -2860,6 +2846,50 @@ end;
 \brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ð—ñ‹“
 \param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
 \param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
+\param limited    —ñ‹“‚·‚鐔‚𐧌À‚·‚é‚È‚ç1ˆÈã
+\return
+}
+function TGikoSys.GetSameIDResAnchor(AIDNum : Integer;
+     ThreadItem: TThreadItem;
+     limited: Integer):string;
+var
+	i: integer;
+	body: TStringList;
+    Res: TResRec;
+    ResLink : TResLinkRec;
+begin
+    // bodyˆÈŠO‚ÍŽg—p‚µ‚È‚¢‚̂ŏ‰Šú‰»‚µ‚È‚¢
+    Res.FBody := '';
+    Res.FType := glt2chNew;
+
+	Result := '';
+	if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
+		body := TStringList.Create;
+		try
+			GetSameIDRes(AIDNum, ThreadItem, body);
+            if (limited > 0) and ( body.Count > limited) then begin
+                for i := body.Count - 20 to body.Count - 1 do begin
+                    Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+                end;
+            end else begin
+    			for i := 0 to body.Count - 1 do begin
+	    			Res.FBody := Res.FBody + '&gt;' + body[i] + ' ';
+		    	end;
+            end;
+		finally
+			body.Free;
+		end;
+        ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
+        ResLink.FKey := ChangeFileExt(ThreadItem.FileName, '');
+        HTMLCreater.ConvRes(@Res, @ResLink, false);
+        Result := Res.FBody;
+	end;
+end;
+
+{!
+\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ð—ñ‹“
+\param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
+\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
 \param body       OUT:—ñ‹“‚³‚ꂽƒŒƒX”ԍ†‚ª•Ô‚é
 }
 procedure TGikoSys.GetSameIDRes(AIDNum : Integer; ThreadItem: TThreadItem;var body: TStringList);
@@ -2881,6 +2911,8 @@ function TGikoSys.GetResID(AIDNum: Integer; ThreadItem: TThreadItem): String;
 var
 	Res: TResRec;
 	boardPlugIn : TBoardPlugIn;
+	stList: TStringList;
+	i : Integer;
 begin
     Result := '';
 	if (ThreadItem <> nil) and (ThreadItem.IsLogFile)
@@ -2894,40 +2926,96 @@ begin
 		end else begin
 			THTMLCreate.DivideStrLine( ReadThreadFile(ThreadItem.GetThreadFileName, AIDNum), @Res);
 		end;
-		Result := ExtructResID(Res.FDateTime);
+		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 := Result;
+                Result := '';
+				for i := 0 to stList.Count - 1 do
+					if Length(WideString(stList[i])) = 8 then begin
+						if NotDateorTimeString(stList[i]) then begin
+							Result := stList[i];
+							break;
+						end;
+					end;
+			finally
+				stList.Free;
+			end;
+		end;
 	end;
 end;
 {!
-\brief ƒŒƒX‚ÌŽž•”‚©‚çID‚𒊏o‚·‚é
-\param ADateStr Žž•”‚Ì•¶Žš—ñ
-\return     ID(ID‚Æ‚Ý‚È‚¹‚é•”•ª‚ª‚È‚¢‚Æ‚«‚͋󕶎š—ñ)
+\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
+\param AID        ŒÂl‚ð“Á’è‚·‚é“Še ID
+\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
+\return           “¯‚¶ ID ‚ðŽ‚ÂƒŒƒX‚̐”
 }
-function TGikoSys.ExtructResID(ADateStr: String): String;
+function TGikoSys.GetSameIDResCount(const AID : string; ThreadItem: TThreadItem):Integer;
 var
-    stlist : TStringList;
+	body: TStringList;
 begin
-    Result := '';
-    if AnsiPos('id', AnsiLowerCase(ADateStr)) > 0 then begin
-        Result := Copy(ADateStr, AnsiPos('id', AnsiLowerCase(ADateStr)), Length(ADateStr));
-        if AnsiPos(' ', Result) > 0 then begin
-            Result := Copy(Result, 1, AnsiPos(' ', Result) - 1);
-        end;
-        Result := ' ' + Result;
-    end else begin
-        stlist := TStringList.Create;
-        try
-            stList.Delimiter := ' ';
-            stList.DelimitedText := ADateStr;
-            // “ú•t Žž ID ‘¼@‚ƌŒè‚ōl‚¦‚é
-            if (stList.Count >= 3) then begin
-                if Length(stList[3 - 1]) >= 7 then begin
-                    Result := stList[3 - 1];
-                end;
-            end;
-        finally
-            stList.Free;
-        end;
-    end;
+    Result := 0;
+	if (not IsNoValidID(AID))
+     and (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
+		body := TStringList.Create;
+		try
+			GetSameIDRes(AID, ThreadItem, body);
+			Result := body.Count;
+		finally
+			body.Free;
+		end;
+	end;
+
+end;
+
+{!
+\brief “¯‚¶“Še ID ‚ðŽ‚ÂƒŒƒX‚ðƒJƒEƒ“ƒg
+\param AIDNum     ŒÂl‚ð“Á’è‚·‚é“Še ID
+\param ThreadItem —ñ‹“‚·‚éƒXƒŒƒbƒh
+\return           “¯‚¶ ID ‚ðŽ‚ÂƒŒƒX‚̐”
+}
+function TGikoSys.GetSameIDResCount(AIDNum : Integer; ThreadItem: TThreadItem):Integer;
+var
+	body: TStringList;
+begin
+	Result := 0;
+	if (ThreadItem <> nil) and (ThreadItem.IsLogFile) then begin
+		body := TStringList.Create;
+		try
+			GetSameIDRes(AIDNum, ThreadItem, body);
+            Result := body.Count;
+		finally
+			body.Free;
+		end;
+	end;
+end;
+
+{!
+\brief Žž‚ðŽ¦‚·•¶Žš—ñ‚Å‚Í–³‚¢‚©‚Ç‚¤‚©
+\param AStr ’²‚ׂ镶Žš—ñ
+\return     Žž‚Å‚Í–³‚¢‚È‚ç True
+\todo ”Û’èŒ`(Not)‚æ‚èm’èŒn(Is)
+}
+function TGikoSys.NotDateorTimeString(const AStr : string): boolean;
+begin
+	Result := false;
+	try
+		StrToDate(AStr);
+	except
+		try
+			StrToTime(AStr);
+			Result := false;
+		except
+			Result := true;
+		end;
+	end;
+
 end;
 
 {!
@@ -3397,10 +3485,8 @@ begin
 end;
 
 procedure TGikoSys.ShowRefCount(msg: String; unk: IUnknown);
-{$IFDEF DEBUG}
 var
     count : integer;
-{$ENDIF}
 begin
     if not Assigned(unk) then
         Exit;

--- a/Option.pas
+++ b/Option.pas
@@ -1325,19 +1325,13 @@ begin
 end;
 
 procedure TOptionDialog.SoundPlayButtonClick(Sender: TObject);
-var
-    s : String;
 begin
-    s := SoundFileEdit.Text;
-    if (AnsiPos('.\', s) = 1) then begin
-        s := GikoSys.Setting.GetAppDir + Copy(s, 2, Length(s));
-    end;
-	if not FileExists(s) then begin
+	if not FileExists(SoundFileEdit.Text) then begin
 		MsgBox(Handle, '‘¶Ý‚µ‚È‚¢ƒtƒ@ƒCƒ‹‚Å‚·', 'ƒGƒ‰[', MB_ICONSTOP or MB_OK);
 		SoundFileEdit.Text := '';
 		Exit;
 	end;
-	if not sndPlaySound(PChar(s), SND_ASYNC or SND_NOSTOP) then begin
+	if not sndPlaySound(PChar(SoundFileEdit.Text), SND_ASYNC or SND_NOSTOP) then begin
 		sndPlaySound(nil, SND_ASYNC);
 	end;
 end;

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -66,8 +66,6 @@ begin
     RawDocument := '';
     FEvent := nil;
     ShowWindow(Self.Handle, SW_HIDE);
-    GikoSys.ShowRefCount('ResPop Create', Self.ControlInterface);
-    GikoSys.ShowRefCount('ResPop.Document Create', Self.ControlInterface.Document);
 end;
 
 destructor TResPopupBrowser.Destroy;
@@ -86,10 +84,6 @@ begin
         FEvent := nil;
     end;
     FThread := nil;
-
-    GikoSys.ShowRefCount('ResPop Desctroy', Self.ControlInterface);
-    GikoSys.ShowRefCount('ResPop.Document Create', Self.ControlInterface.Document);
-
 	inherited Destroy;
 end;
 
@@ -142,7 +136,7 @@ begin
 end;
 procedure TResPopupBrowser.NavigateBlank(Forced: Boolean);
 begin
-    if (not Assigned(Self.ControlInterface.Document)) or (Forced) then begin
+    if (not Assigned(Self.Document)) or (Forced) then begin
         Self.Navigate('about:blank');
     end;
     while (Self.ReadyState <> READYSTATE_COMPLETE) and
@@ -198,7 +192,7 @@ begin
         ARect := CalcRect(Screen.MonitorFromPoint(p).WorkareaRect,
                         not OnlyTitle);
 
-        FEvent := THTMLDocumentEventSink.Create(Self, Self.OleObject.Document, HTMLDocumentEvents2);
+        FEvent := THTMLDocumentEventSink.Create(Self, Self.Document, HTMLDocumentEvents2);
         FEvent.OnClick := ResPopupBrowserClick;
         FEvent.OnDoubleClick := ResPopupBrowserDbClick;
         Self.Visible := True;
@@ -278,7 +272,7 @@ var
     DIV_X, DIV_Y: Integer;
 begin
 	GetCursorpos(p);
-    ele := ((Self.ControlInterface.Document as IHTMLDocument2).body as IHTMLElement2);
+    ele := ((Self.Document as IHTMLDocument2).body as IHTMLElement2);
     if Scroll then begin
         h := GetWindowHeight + 10;
         w := ele.scrollWidth + 25

--- a/Setting.pas
+++ b/Setting.pas
@@ -1218,16 +1218,8 @@ begin
 		if Exists then begin
 			for i := 0 to GetSoundCount - 1 do begin
 				SoundFileName[i] := ini.ReadString('Sound', SoundName[i], '');
-                // ‘Š‘ÎŽQÆ‘΍ô
-                s := SoundFileName[i];
-                if (AnsiPos('.\', SoundFileName[i]) = 1) then begin
-                    s := GetAppDir
-                            + Copy(SoundFileName[i], 2, Length(SoundFileName[i]));
-                end;
-                // ƒtƒ@ƒCƒ‹‚Ì‘¶Ýƒ`ƒFƒbƒN
-                if not FileExists(SoundFileName[i]) then begin
-                    SoundFileName[i] := '';
-                end;
+				if not FileExists(SoundFileName[i]) then
+					SoundFileName[i] := '';
 			end;
 		end else begin
 			s := GetAppDir + '\sound\';
@@ -1880,11 +1872,6 @@ begin
 	for i := 0 to GetSoundCount - 1 do begin
 		if SoundName[i] = Name then begin
 			Result := SoundFileName[i];
-            // ‘Š‘΃pƒX‘΍ô
-            if (AnsiPos('.\', Result) = 1) then begin
-                Result := GetAppDir
-                    + Copy(Result, 2, Length(Result));
-            end;
 			Exit;
 		end;
 	end;

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

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -79,7 +79,7 @@ http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkin
 ------------------------------
 ŠJ”­Â°ÙFDelphi6 Professional (UP2 + RTL UP2 + RTL UP3)
          Delphi6 Personal(UP2 + RTL UP2 + RTL UP3)
-OS     FWindowsXP Professional Edition(SP3) + IE7
+OS     FWindowsXP Professional Edition(SP2) + IE7
          WindowsXP Professional Edition(SP1) + IE6(SP1)
          Windows2000 Professional (SP4) + IE6(SP1)
 
@@ -108,16 +108,10 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2008/09/20
+2008/0X/XX
   Version ÊÞÀ58
   ƒvƒŒƒrƒ…[‚ÌURL‚©‚ç“o˜^‚µ‚Ä‚ ‚éŠO•”ƒAƒvƒŠ‚ð‹N“®‚·‚é‹@”\‚ð’ljÁ
   ƒŒƒX‘—MƒGƒfƒBƒ^‚ŁA˜A‘±‚µ‚Ä“Še‚Å‚«‚é‚悤‚É‚·‚é‹@”\‚ð’ljÁ
-  ŠJ‚¢‚Ä‚¢‚éƒ^ƒu‚̃XƒŒƒbƒh‚̈ꗗ‚ðƒXƒŒƒbƒhˆê——‚É•\Ž¦‚·‚é‹@”\‚ð’ljÁ
-  ‚Ü‚¿BBS‚ÌPATH_INFOŒ`Ž®‚ÌURL‚ɑΉž
-  ƒTƒEƒ“ƒhƒCƒxƒ“ƒg‚̃tƒ@ƒCƒ‹Žw’è‚𑊑΃pƒX‚ÅŽw’è‚Å‚«‚é‚悤‚ɏC³
-  •\Ž¦’†‚̃^ƒu‚̈ꗗ‚ðƒXƒŒƒbƒhˆê——‚É•\Ž¦‚·‚éƒAƒNƒVƒ‡ƒ“‚ð’ljÁ
-  ‚µ‚½‚ç‚ÎJBBS‚̔XV‹@”\C³
-  datƒtƒ@ƒCƒ‹‚ðƒXƒŒƒbƒhˆê——‚ÉD&D‚µ‚½‚Æ‚«‚ɁAƒtƒ@ƒCƒ‹–¼‚ª•s³‚Å‚·ƒGƒ‰[‚ɏí‚É‚È‚é•s‹ï‡‚̏C³
 
 2008/03/22
   Version ÊÞÀ57 ƒŠƒŠ[ƒX2

--- a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
@@ -83,7 +83,7 @@ const
 	MAJOR_VERSION			= 1;
 	MINOR_VERSION			= 0;
 	RELEASE_VERSION		= 'beta';
-	REVISION_VERSION	= 19;
+	REVISION_VERSION	= 18;
 
 // =========================================================================
 // ŽG—pŠÖ”
@@ -269,7 +269,6 @@ var
 const
 	BBS_HOST		= 'machi.to';
 	THREAD_MARK	= '/bbs/read.pl';
-    THREAD_MARK2= '/bbs/read.cgi';
 begin
 
 	try
@@ -281,10 +280,6 @@ begin
 			foundPos := AnsiPos( BBS_HOST, uri.Host );
 			if (foundPos > 0) and (Length( uri.Host ) - foundPos + 1 = Length( BBS_HOST )) then begin
 				foundPos := Pos( THREAD_MARK, inURL );
-                if (foundPos = 0) then begin
-                    // VURL‘Ήž
-                    foundPos := Pos( THREAD_MARK2, inURL );
-                end;
 				if foundPos > 0 then
 					Result := atThread
 				else if (uriList.Count > 1) and (uri.Path <> '/') then	// ÅŒã‚ª '/' ‚ŕ‚߂ç‚ê‚Ä‚é‚È‚ç 3
@@ -314,10 +309,9 @@ procedure OnExtractBoardURL(
 var
 	uri			: TIdURI;
 	uriList		: TStringList;
-	URL         : String;
+	URL			: String;
 const
 	THREAD_MARK	= '/bbs/read.pl';
-    THREAD_MARK2= '/bbs/read.cgi';
 begin
 	URL := string(inURL);
 	if AnsiPos(THREAD_MARK, URL) > 0 then begin
@@ -339,27 +333,6 @@ begin
 			uri.Free;
 			uriList.Free;
 		end;
-    end else if AnsiPos(THREAD_MARK2, URL) > 0 then begin
-		if Copy( inURL, Length( inURL ), 1 ) = '/' then
-			uri := TIdURI.Create( URL )
-		else
-			uri := TIdURI.Create( URL + '/' );
-
-        uriList := TStringList.Create;
-		try
-			// http://kanto.machi.to/bbs/read.cgi/kana/1215253035/l50
-			// http://kanto.machi.to/kana/
-            uriList.Delimiter := '/';
-            uriList.DelimitedText  := uri.Path;
-			URL := uri.Protocol + '://' + uri.Host + '/';
-            if (uriList.Count >= 4) then begin
-                URL := URL + uriList[3] + '/';
-            end;
-			outURL := CreateResultString(URL);
-		finally
-			uri.Free;
-            uriList.Free;
-		end;
 	end else begin
     	outURL := CreateResultString(URL);
 	end;
@@ -900,8 +873,6 @@ var
 	uri				: TIdURI;
 	uriList		: TStringList;
 	foundPos	: Integer;
-const
-    THREAD_MARK2= '/bbs/read.cgi';
 begin
 
 	foundPos := AnsiPos( '?', URL );
@@ -917,26 +888,7 @@ begin
 			uri.Free;
 			uriList.Free;
 		end;
-	end else begin
-        // VŒ`Ž® ?
-        foundPos := AnsiPos(THREAD_MARK2, URL);
-    	if (foundPos > 0) then begin
-            uri := TIdURI.Create( URL );
-            uriList := TStringList.Create;
-            try
-                uriList.Delimiter := '/';
-                uriList.DelimitedText  := uri.Path;
-                if (uriList.Count >= 5) then begin
-    			    Result :=
-	    			    uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' +
-		    		    'BBS=' + uriList[3] + '&KEY=' + uriList[4];
-                end;
-            finally
-    			uri.Free;
-	    		uriList.Free;
-            end;
-        end;
-    end;
+	end;
 
 end;
 

Binary files a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res and b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res differ

--- a/res/ExternalBoardPlugIn/ShitarabaJBBSAcquireBoard.pas
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSAcquireBoard.pas
@@ -201,9 +201,6 @@ var
 	key							: string;
 	htmlList					: TStringList;
 	i							: Integer;
-
-    resultArea                  : Boolean;
-    pos                         : Integer;
 const
     //http://rentalbbs.livedoor.com/jbbs/search/?word=%C2%E7%B3%D8&category=auto
 	BBS_HOST	 			= 'http://rentalbbs.livedoor.com/';
@@ -215,7 +212,7 @@ const
 label
 	NextBoard;
 begin
-    responseCode := 0;
+
 	category := CATEGORIES[ CategoryComboBox.ItemIndex ];
 	boardname := BoardNameEdit.Text;
 
@@ -240,30 +237,31 @@ begin
 				htmlList := TStringList.Create();
 				try
 					htmlList.Text	:= CustomStringReplace(downResult, '<br>', #13#10);
-                    resultArea := False;
-					for i := 0 to htmlList.Count - 1 do begin
+					for i := htmlList.Count - 1 downto 0 do begin
 						downResult := htmlList[i];
 						try
-                            //<div class="searchResults">
-                            //<h2><span class="ranking">[1]</span><a href="http://jbbs.livedoor.jp/auto/5497/">MIT-MCC BBS</a><span class="point"><span class="all">4750pt</span><span class="yesterday">(Yesterday40 pt)</span></span></h2>
-                            //<p>•‘ H‹Æ‘åŠw@ƒ‚[ƒ^ƒTƒCƒNƒ‹•”‚ÌBBS‚Å‚·BŠeŽ©ƒ`ƒFƒbƒN‚·‚é‚悤‚É‚µ‚Ü‚µ‚傤ô(&amp;gt;_&amp;lt;)b</p>
-                            //</div>
-                            if (not resultArea) and (AnsiPos('class="searchResults"', downResult) > 0) then begin
-                                resultArea := True;
-                            end else if (resultArea) then begin
-                                pos := AnsiPos('<a href="', downResult);
-                                if (pos > 0) then begin
-                                    resultArea := False;
-                                    downResult := Copy(downResult, pos + 9, Length(downResult));
-                                    key := Copy(downResult, 1, AnsiPos('"', downResult)-1);
-                                    downResult := Copy(downResult, AnsiPos('>', downResult) + 1, Length(downResult));
-
-                                    board	  := Copy(downResult, 1, AnsiPos('</a>', downResult) -1);
-
-                                    board	:=  CustomStringReplace(board, '=', '') + '=' + key;
-                                    LogEdit.SelText := board + #13#10;
-                                    FBoardList.Add( board );
-                                end;
+							//<a href="/auto/2348/">ƒgƒˆƒ^Ž©“®ŽÔŒfŽ¦”Â</a>
+                            //<small><strng><a href="http://jbbs.livedoor.jp/auto/4112/">–¾Ž¡‘åŠw@“ñ•”E’Z‘å</a></strong></small></td>
+                            if (AnsiPos('<small><strng><a href="', downResult) > 0)
+                                and (AnsiPos(category, downResult) > 0) then begin
+                                downResult := CustomStringReplace(downResult, '<small><strng>', '');
+								board	:= Copy(downResult, AnsiPos('<a href="', downResult) + 9,
+											Length(downResult));
+								key		:= Copy(board, AnsiPos('">', board) + 2,
+											Length(board));
+								key		:= Copy(key, 1, AnsiPos('</a>', key) -1);
+
+								board	:= Copy(board, 1, AnsiPos('">', board) - 1);
+								if (board = '../') then begin
+									board := CustomStringReplace(board, '../', BOARD_HOST);
+								end else if (AnsiPos('/', board) = 1) then begin
+									board := BOARD_HOST + Copy(board, 2, Length(board));
+								end;
+
+								board	:= key + '=' + board;
+
+								LogEdit.SelText := board + #13#10;
+								FBoardList.Add( board );
 							end;
 						except
 						end;

--- a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
@@ -2,7 +2,7 @@ library ShitarabaJBBSPlugIn;
 
 {
 	ShitarabaJBBSPlugIn
-	$Id: ShitarabaJBBSPlugIn.dpr,v 1.45 2008/08/03 02:45:48 h677 Exp $
+	$Id: ShitarabaJBBSPlugIn.dpr,v 1.44 2006/07/02 09:48:04 h677 Exp $
 }
 
 uses
@@ -83,7 +83,7 @@ const
 	MAJOR_VERSION			= 1;
 	MINOR_VERSION			= 1;
 	RELEASE_VERSION		= 'alpha';
-	REVISION_VERSION	= 17;
+	REVISION_VERSION	= 15;
 
 	SYNCRONIZE_MENU_CAPTION	= '‚µ‚½‚ç‚ÎJBBS”XV';
 

Binary files a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res and b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res differ

--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,31 +1,40 @@
 [Setting]
-@endless=20
 @liveplus=10
-@news=156
+@news=30
 @newsplus=128
-@operate=24
-@sec2chd=20
-academy6=45
-babiru=30
-bubble6=45
-changi=45
-ex24=45
-food8=45
-gimpo=45
-ipv6=45
-life9=45
-live23=15
-live24=15
-love6=45
-mamono=45
-namidame=45
-pc11=45
-qb5=45
-qiufen=30
-schiphol=45
-science6=45
-set=30
-society6=45
-venus=30
-yomi=30
-yutori=10
+@news4vip=10
+@news4viptasu=10
+academy6=20
+anime3=20
+bubble6=20
+etc7=20
+ex21=20
+food8=20
+game13=20
+game14=20
+hobby10=20
+human7=20
+life9=20
+live23=10
+live24=10
+live27=10
+love6=20
+mamono=10
+money6=20
+music8=20
+namidame=10
+news24=20
+pc11=20
+qb5=20
+qiufen=20
+babiru=20
+yomi=20
+venus=20
+set=20
+school7=20
+science6=20
+society6=20
+sports11=20
+tmp7=20
+tv11=20
+yutori=20
\ No newline at end of file