OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

ギコナビ


Commit MetaInfo

Revisión05c61eaa43543729322f8a3149434d44d0e6d0c0 (tree)
Tiempo2009-06-07 12:11:06
Autorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Cambiar Resumen

Diferencia incremental

--- a/Editor.pas
+++ b/Editor.pas
@@ -281,8 +281,6 @@ type
281281 function FusianaMsgBox: Integer;
282282 //! sent.iniƒtƒ@ƒCƒ‹‚̐¶¬
283283 function CreateSentIniFile: TMemIniFile;
284- //! Œë”šƒ`ƒFƒbƒN
285- function isGobaku: Boolean;
286284 protected
287285 procedure CreateParams(var Params: TCreateParams); override;
288286 public
@@ -803,11 +801,6 @@ begin
803801 CancelSend( Board, SysMenu );
804802 Exit;
805803 end;
806- // Œë”šƒ`ƒFƒbƒN
807- if (isGobaku) then begin
808- CancelSend( Board, SysMenu );
809- Exit;
810- end;
811804 end;
812805
813806 GetSendData(Source);
@@ -2554,66 +2547,5 @@ begin
25542547 GikoForm.DownloadList(GetBoard);
25552548 end;
25562549 end;
2557-//! Œë”šƒ`ƒFƒbƒN
2558-function TEditorForm.isGobaku: Boolean;
2559-const
2560- MSG_GOBAKU : string =
2561- '•\Ž¦‚µ‚Ä‚¢‚é%s‚Æ“Šeæ‚Ì%s‚ªˆÙ‚È‚è‚Ü‚·B'#13#10 +
2562- '‚±‚̂܂܏‘‚«ž‚Ý‚Ü‚·‚©H';
2563-var
2564- ThreadItem : TThreadItem;
2565- msg : String;
2566-
2567-begin
2568- Result := False;
2569- // ƒIƒvƒVƒ‡ƒ“—LŒø‚©‚ƒŒƒX‘—M‚Å‚Ì‚Ý—LŒø
2570- if (GikoSys.Setting.UseGobakuCheck) then begin
2571- // ƒŒƒX‘—M
2572- if (FThreadItem <> nil) then begin
2573- ThreadItem := GikoForm.GetActiveContent(False);
2574- if (ThreadItem <> nil) then begin
2575- if (FThreadItem <> ThreadItem) then begin
2576- msg := Format(MSG_GOBAKU, ['ƒXƒŒƒbƒh', 'ƒXƒŒƒbƒh']);
2577- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2578- end;
2579- end else begin
2580- if GikoForm.ActiveList is TBBS then begin
2581- if TBBS(GikoForm.ActiveList) <> FThreadItem.ParentBoard.ParentCategory.ParenTBBS then begin
2582- msg := Format(MSG_GOBAKU, ['BBS', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚éBBS']);
2583- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2584- end;
2585- end else if GikoForm.ActiveList is TCategory then begin
2586- if TCategory(GikoForm.ActiveList).FindThreadFromURL(FThreadItem.URL) = nil then begin
2587- msg := Format(MSG_GOBAKU, ['ƒJƒeƒSƒŠ', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚éƒJƒeƒSƒŠ']);
2588- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2589- end;
2590- end else if GikoForm.ActiveList is TBoard then begin
2591- if TBoard(GikoForm.ActiveList) <> FThreadItem.ParentBoard then begin
2592- msg := Format(MSG_GOBAKU, ['”Â', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚é”Â']);
2593- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2594- end;
2595- end;
2596- end;
2597- end else begin
2598- // ƒXƒŒ‚½‚Ä
2599- if GikoForm.ActiveList is TBBS then begin
2600- if TBBS(GikoForm.ActiveList) <> FBoard.ParentCategory.ParenTBBS then begin
2601- msg := Format(MSG_GOBAKU, ['BBS', '”‚̏Š‘®‚·‚éBBS']);
2602- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2603- end;
2604- end else if GikoForm.ActiveList is TCategory then begin
2605- if TCategory(GikoForm.ActiveList).FindBoardFromURL(FBoard.URL) = nil then begin
2606- msg := Format(MSG_GOBAKU, ['ƒJƒeƒSƒŠ', '”‚̏Š‘®‚·‚éƒJƒeƒSƒŠ']);
2607- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2608- end;
2609- end else if GikoForm.ActiveList is TBoard then begin
2610- if TBoard(GikoForm.ActiveList) <> FBoard then begin
2611- msg := Format(MSG_GOBAKU, ['”Â', '”Â']);
2612- Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
2613- end;
2614- end;
2615- end;
2616- end;
2617-end;
26182550
26192551 end.
--- a/Favorite.pas
+++ b/Favorite.pas
@@ -70,7 +70,6 @@ var
7070 FavoriteDM: TFavoriteDM;
7171 const
7272 FAVORITE_LINK_NAME = 'ƒŠƒ“ƒN';
73- FAVORITE_FILE_NAME = 'Favorite.xml';
7473
7574 implementation
7675
@@ -78,7 +77,7 @@ uses ExternalBoardManager, ExternalBoardPlugInMain, MojuUtils;
7877
7978 const
8079 FAVORITE_ROOT_NAME = '‚¨‹C‚É“ü‚è';
81-
80+ FAVORITE_FILE_NAME = 'Favorite.xml';
8281
8382 {$R *.dfm}
8483
@@ -426,47 +425,31 @@ end;
426425
427426 procedure TFavoriteDM.WriteFavorite;
428427 var
429- FileName, tmpFileName, bakFileName: string;
428+ FileName, tmpFileName: string;
430429 SaveList: TStringList;
431- Buffer: array[0..MAX_PATH] of Char; // ƒoƒbƒtƒ@
432- FileRep : Boolean;
430+
433431 begin
434432 FavoriteDM.Modified := true;
435433 FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
434+ if FileExists(FileName) then begin
435+ tmpFileName := GikoSys.GetConfigDir + '~' + FAVORITE_FILE_NAME;
436+ if FileExists(tmpFileName) then
437+ SysUtils.DeleteFile(tmpFileName); //SysUtils.‚ð‚‚¯‚È‚¢‚ÆWinAPI‚Æ‹æ•Ê‚Å‚«‚È‚¢‚Ì‚Å
438+ RenameFile(FileName, tmpFileName);
439+ end;
436440 SaveList := TStringList.Create;
437- tmpFileName := '';
438- // ‘‚«ž‚Ý—pˆêŽžƒtƒ@ƒCƒ‹Žæ“¾
439- if GetTempFileName(PChar(GikoSys.GetConfigDir), PChar('fav'), 0, Buffer) <> 0 then begin
440- tmpFileName := Buffer;
441- try
442- try
443- SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
444- SaveList.Add('<favorite>');
445- AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
446- SaveList.Add('</favorite>');
447- // ˆêŽžƒtƒ@ƒCƒ‹‚Æ‚µ‚Ä•Û‘¶
448- SaveList.SaveToFile(tmpFileName);
449- FileRep := True;
450- // ‘O‚̃tƒ@ƒCƒ‹‚ðˆÚ“®‚·‚é
451- if FileExists(FileName) then begin
452- bakFileName := GikoSys.GetConfigDir + '~' + FAVORITE_FILE_NAME;
453- if FileExists(bakFileName) then begin
454- FileRep := SysUtils.DeleteFile(bakFileName); //SysUtils.‚ð‚‚¯‚È‚¢‚ÆWinAPI‚Æ‹æ•Ê‚Å‚«‚È‚¢‚Ì‚Å
455- end;
456- if FileRep then begin
457- FileRep := RenameFile(FileName, bakFileName);
458- end;
459- end;
460- // ³‹K‚̃tƒ@ƒCƒ‹–¼‚ɃŠƒl[ƒ€‚·‚é
461- if FileRep then begin
462- FileRep := RenameFile(tmpFileName, FileName);
463- end;
464- except
465- end;
466- finally
467- SaveList.Free;
468- end;
469- end;
441+ try
442+ SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
443+ SaveList.Add('<favorite>');
444+ try
445+ AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
446+ except
447+ end;
448+ SaveList.Add('</favorite>');
449+ SaveList.SaveToFile(FileName);
450+ finally
451+ SaveList.Free;
452+ end;
470453 end;
471454
472455 procedure TFavoriteDM.AddSaveString(Node: TTreeNode; SaveList: TStringList);
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8406,18 +8406,6 @@ object GikoForm: TGikoForm
84068406 object N83: TMenuItem
84078407 Action = GikoDM.DereferenceResAction
84088408 end
8409- object N85: TMenuItem
8410- Caption = '-'
8411- end
8412- object URL2: TMenuItem
8413- Caption = #12371#12398#12524#12473#12398'URL'
8414- object URLPATHINFO1: TMenuItem
8415- Action = GikoDM.konoURLPATHAction
8416- end
8417- object URLQUERYSTRING1: TMenuItem
8418- Action = GikoDM.konoURLQueryAction
8419- end
8420- end
84218409 end
84228410 object BrowserTabPopupMenu: TPopupMenu
84238411 Images = HotToobarImageList
--- a/Giko.pas
+++ b/Giko.pas
@@ -24,7 +24,8 @@ uses
2424 const
2525 NGWORDNAME_PANEL = 3;
2626 THREADSIZE_PANEL = 2;
27- USER_POPUPCLEAR = WM_USER + 2005; ///< wParam : TWebBrowser
27+ USER_RESPOPUPCLEAR = WM_USER + 2005; ///< wParam : TWebBrowser
28+
2829 type
2930
3031 TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
@@ -421,10 +422,6 @@ type
421422 N83: TMenuItem;
422423 UpdateGikonaviAction1: TMenuItem;
423424 N84: TMenuItem;
424- N85: TMenuItem;
425- URL2: TMenuItem;
426- URLPATHINFO1: TMenuItem;
427- URLQUERYSTRING1: TMenuItem;
428425 procedure FormCreate(Sender: TObject);
429426 procedure FormDestroy(Sender: TObject);
430427 procedure SaveSettingAll();
@@ -614,7 +611,6 @@ type
614611 FResPopupBrowser: TResPopupBrowser;
615612 FUpdateExePath: string; ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ƒpƒX
616613 FUpdateExeArgs: string; ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ˆø”
617- FKokoPopupThreadItem: TThreadItem;
618614 procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
619615 procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
620616 procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -717,7 +713,7 @@ type
717713 BrowserNullTab: TBrowserRecord;
718714 FControlThread: TThreadControl;
719715 FIconData : TNotifyIconData;
720- procedure MoveToURL(const inURL: string; KeyMask: Boolean = False);
716+ procedure MoveToURL(const inURL: string);
721717 function InsertBrowserTab(ThreadItem: TThreadItem; ActiveTab: Boolean = True) : TBrowserRecord;
722718 procedure ReloadBBS;
723719 function GetHttpState: Boolean;
@@ -764,9 +760,6 @@ type
764760 property ListViewBackGroundColor: TColor read FListViewBackGroundColor write SetListViewBackGroundColor;
765761 property UseOddResOddColor : Boolean read FUseOddResOddColor write FUseOddResOddColor;
766762 property OddColor : TColor read FOddColor write FOddColor;
767- //! ƒŒƒXƒƒjƒ…[ƒAƒNƒeƒBƒuƒXƒŒƒbƒhƒAƒCƒeƒ€
768- property KokoPopupThreadItem : TThreadItem read FKokoPopupThreadItem;
769-
770763 function FindToolBarButton( bar : TToolBar; action : TAction ) : TToolButton;
771764 procedure OnPlugInMenuItem( Sender : TObject );
772765 procedure TabFileURLReplace(oldURLs: TStringList; newURLs: TStringList);
@@ -1351,13 +1344,8 @@ begin
13511344
13521345 // ‰Šú‰»‚ÉŽ¸”s‚µ‚½ƒ‚ƒWƒ…[ƒ‹ƒ`ƒFƒbƒN
13531346 if (FavoriteDM.AbEnd) then begin
1354- GikoUtil.MsgBox(Self.Handle,
1355- '‚¨‹C‚É“ü‚è‚̏‰Šú‰»‚ÉŽ¸”s‚µ‚Ü‚µ‚½BƒMƒRƒiƒr‚ðI—¹‚µ‚Ü‚·B'#13#10 +
1356- 'ƒMƒRƒiƒrƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·Aconfig/' + Favorite.FAVORITE_FILE_NAME +
1357- ' ‚ð config/~' + Favorite.FAVORITE_FILE_NAME + '(‘O‰ñ‹N“®Žž‚Ì‚¨‹C‚É“ü‚è)‚Å'#13#10 +
1358- '’u‚«Š·‚¦‚鎖‚Å’¼‚é‰Â”\«‚ª‚ ‚è‚Ü‚·B',
1347+ GikoUtil.MsgBox(Self.Handle, '‚¨‹C‚É“ü‚è‚̏‰Šú‰»‚ÉŽ¸”s‚µ‚Ü‚µ‚½BƒMƒRƒiƒr‚ðI—¹‚µ‚Ü‚·B',
13591348 '‰Šú‰»ˆÙí');
1360- GikoDM.GikoFolderOpenAction.Execute;
13611349 Self.Close;
13621350 end;
13631351
@@ -2380,10 +2368,9 @@ begin
23802368 {$IFDEF DEBUG}
23812369 Writeln(URL);
23822370 {$ENDIF}
2383- FKokoPopupThreadItem := nil;
23842371 if Pos(kMenuName, URL) <> 0 then begin
23852372 sNo := Copy( URL, Pos( kMenuName, URL ) + Length( kMenuName ), Length( URL ) );
2386-
2373+
23872374 if not GikoSys.IsNumeric(sNo) then Exit;
23882375
23892376 Cancel := True;
@@ -2401,7 +2388,6 @@ begin
24012388 TResPopupBrowser(Sender).ChildClear;
24022389 end;
24032390 end;
2404- FKokoPopupThreadItem := GetActiveContent(true);
24052391 KokoPopupMenu.Tag := StrToInt(sNo);
24062392 KokoPopupMenu.Popup(p.x, p.y);
24072393 end else if Pos('mailto', LowerCase(URL)) <> 0 then begin
@@ -4706,7 +4692,7 @@ begin
47064692 end;
47074693 end;
47084694
4709-procedure TGikoForm.MoveToURL(const inURL: string; KeyMask: Boolean = False);
4695+procedure TGikoForm.MoveToURL(const inURL: string);
47104696 var
47114697 protocol, host, path, document, port, bookmark : string;
47124698 URL, protocol2, host2, path2, document2, port2, bookmark2 : string;
@@ -4723,18 +4709,17 @@ begin
47234709
47244710 GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark );
47254711 GikoSys.Parse2chURL( inURL, path, document, BBSID, BBSKey );
4726- // ƒAƒNƒVƒ‡ƒ“‚©‚çŒÄ‚΂ê‚é‚Æshift/ctrl‚Í‚¨‚µ‚Á‚ς̏ꍇ‚ª‚Ù‚Æ‚ñ‚ǂȂ̂Ń}ƒXƒN‚·‚é
4727- if not KeyMask then begin
4728- shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
4729- ctrlDown := GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
4730- if shiftDown then begin
4731- GikoSys.OpenBrowser(inURL, gbtUserApp);
4732- Exit;
4733- end else if ctrlDown then begin
4734- GikoSys.OpenBrowser(inURL, gbtIE);
4735- Exit;
4736- end;
4737- end;
4712+
4713+
4714+ shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
4715+ ctrlDown := GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
4716+ if shiftDown then begin
4717+ GikoSys.OpenBrowser(inURL, gbtUserApp);
4718+ Exit;
4719+ end else if ctrlDown then begin
4720+ GikoSys.OpenBrowser(inURL, gbtIE);
4721+ Exit;
4722+ end;
47384723
47394724 //===== ƒvƒ‰ƒOƒCƒ“
47404725 try
@@ -4933,16 +4918,12 @@ begin
49334918 senderBrowser := TWebBrowser( Message.WParam );
49344919 BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
49354920 end;
4936- USER_POPUPCLEAR:
4921+ USER_RESPOPUPCLEAR:
49374922 if (TObject(Message.WParam) is TResPopupBrowser) then begin
49384923 try
49394924 TResPopupBrowser( Message.WParam ).Clear;
49404925 except
49414926 end;
4942- end else if (TObject(Message.WParam) is TPreviewBrowser) then begin
4943- if FPreviewBrowser <> nil then begin
4944- ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
4945- end;
49464927 end;
49474928 end;
49484929
@@ -7353,7 +7334,7 @@ var
73537334 begin
73547335 No := KokoPopupMenu.Tag;
73557336 if No = 0 then Exit;
7356- ThreadItem := GikoForm.KokoPopupThreadItem;
7337+ ThreadItem := GetActiveContent(True);
73577338 if ThreadItem = nil then Exit;
73587339
73597340 id := GikoSys.GetResID(No, ThreadItem);
@@ -7412,7 +7393,7 @@ var
74127393 begin
74137394 No := KokoPopupMenu.Tag;
74147395 if No = 0 then Exit;
7415- ThreadItem := GikoForm.KokoPopupThreadItem;
7396+ ThreadItem := GetActiveContent(True);
74167397 if ThreadItem = nil then Exit;
74177398 body := TStringList.Create;
74187399 try
--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1386,21 +1386,6 @@ object GikoDM: TGikoDM
13861386 Hint = #12462#12467#12490#12499#12398#26356#26032
13871387 OnExecute = UpdateGikonaviActionExecute
13881388 end
1389- object konoURLPATHAction: TAction
1390- Tag = -1
1391- Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
1392- Caption = 'PATH_INFO'#24418#24335
1393- Hint = #12371#12398#12524#12473#12398'URL'#12467#12500#12540#65288'PATH_INFO'#65289
1394- OnExecute = konoURLPATHActionExecute
1395- end
1396- object konoURLQueryAction: TAction
1397- Tag = -1
1398- Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
1399- Caption = 'QUERY_STRING'#24418#24335
1400- Hint = #12371#12398#12524#12473#12398'URL'#12467#12500#12540#65288'QUERY_STRING'#65289
1401- OnExecute = konoURLQueryActionExecute
1402- OnUpdate = konoURLQueryActionUpdate
1403- end
14041389 end
14051390 object ToobarImageList: TImageList
14061391 Left = 44
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -42,7 +42,7 @@ const
4242 //! 2‚¿‚á‚ñ‚Ë‚é‚ÌURL
4343 URL_2ch: string = 'www.2ch.net/';
4444 //! ƒMƒRƒiƒrWiki‚ÌURL
45- URL_Wiki: string = 'sourceforge.jp/projects/gikonavi/wiki/FAQ';
45+ URL_Wiki: string = 'gikowiki.dyndns.info/index.php?FAQ';
4646
4747 SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ';
4848 SELECTCOMBOBOX_COLOR: TColor = clWindow;
@@ -243,8 +243,6 @@ type
243243 ShowTabListAction: TAction;
244244 DereferenceResAction: TAction;
245245 UpdateGikonaviAction: TAction;
246- konoURLPATHAction: TAction;
247- konoURLQueryAction: TAction;
248246 procedure EditNGActionExecute(Sender: TObject);
249247 procedure ReloadActionExecute(Sender: TObject);
250248 procedure GoFowardActionExecute(Sender: TObject);
@@ -458,9 +456,6 @@ type
458456 procedure ShowTabListActionExecute(Sender: TObject);
459457 procedure DereferenceResActionExecute(Sender: TObject);
460458 procedure UpdateGikonaviActionExecute(Sender: TObject);
461- procedure konoURLPATHActionExecute(Sender: TObject);
462- procedure konoURLQueryActionExecute(Sender: TObject);
463- procedure konoURLQueryActionUpdate(Sender: TObject);
464459 private
465460 { Private éŒ¾ }
466461 procedure ClearResFilter;
@@ -476,7 +471,7 @@ type
476471 procedure ClearSelectComboBox;
477472 procedure ClearMailAllEditor();
478473 procedure ClearNameTextAllEditor();
479- procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
474+ procedure MoveURLWithHistory(URL : String);
480475 procedure BackToHistory(item: TMoveHistoryItem);
481476 function GetActiveThreadLinks : IHTMLElementCollection;
482477 procedure GetLinkURLs(links : IHTMLElementCollection;
@@ -2365,7 +2360,7 @@ begin
23652360 No := GikoForm.KokoPopupMenu.Tag;
23662361 if No = 0
23672362 then Exit;
2368- ThreadItem := GikoForm.KokoPopupThreadItem;
2363+ ThreadItem := GikoForm.GetActiveContent(True);
23692364 if not Assigned(ThreadItem) then
23702365 Exit;
23712366 ThreadItem.Kokomade := No;
@@ -2402,7 +2397,7 @@ var
24022397 begin
24032398 Number := GikoForm.KokoPopupMenu.Tag;
24042399 if Number = 0 then Exit;
2405- Item := GikoForm.KokoPopupThreadItem;
2400+ Item := GikoForm.GetActiveContent(True);
24062401 if Item = nil then Exit;
24072402
24082403 Editor := TEditorForm.Create(GikoForm);
@@ -2431,7 +2426,7 @@ var
24312426 begin
24322427 No := GikoForm.KokoPopupMenu.Tag;
24332428 if No = 0 then Exit;
2434- ThreadItem := GikoForm.KokoPopupThreadItem;
2429+ ThreadItem := GikoForm.GetActiveContent(True);
24352430 if ThreadItem = nil then Exit;
24362431
24372432 AID := GikoSys.GetResID(No, ThreadItem);
@@ -4143,17 +4138,17 @@ begin
41434138 end;
41444139 end else begin
41454140 //URL‚Ɉړ®
4146- MoveURLWithHistory(item.ThreadItem.URL, True);
4141+ MoveURLWithHistory(item.ThreadItem.URL);
41474142 end;
41484143 end;
41494144 end;
41504145 //! —š—ðˆ—‚‚«URLˆÚ“®
4151-procedure TGikoDM.MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
4146+procedure TGikoDM.MoveURLWithHistory(URL : String);
41524147 var
41534148 idx : Integer;
41544149 begin
41554150 //URL‚Ɉړ®
4156- GikoForm.MoveToURL(URL, KeyMask);
4151+ GikoForm.MoveToURL(URL);
41574152 //ˆÈ‰ºA—š—ð‚̏ˆ—
41584153 idx := GikoForm.AddressComboBox.Items.IndexOf(URL);
41594154 if idx = -1 then begin
@@ -4518,7 +4513,7 @@ begin
45184513 No := GikoForm.KokoPopupMenu.Tag;
45194514 if No = 0 then Exit;
45204515
4521- ThreadItem := GikoForm.KokoPopupThreadItem;
4516+ ThreadItem := GikoForm.GetActiveContent;
45224517 // ƒAƒNƒeƒBƒuƒ^ƒu‚©‚ç‘S‚ẴŠƒ“ƒN‚ðŽæ“¾‚·‚é
45234518 links := GetActiveThreadLinks;
45244519 if (ThreadItem <> nil) and (links <> nil) then begin
@@ -4600,76 +4595,6 @@ begin
46004595 end;
46014596
46024597 end;
4603-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iPATH_INFO)
4604-procedure TGikoDM.konoURLPATHActionExecute(Sender: TObject);
4605-var
4606- No : Integer;
4607- ThreadItem : TThreadItem;
4608- URL, Protocol, Host, Path, Document, Port, Bookmark : String;
4609-begin
4610- No := GikoForm.KokoPopupMenu.Tag;
4611- if No = 0 then Exit;
4612-
4613- ThreadItem := GikoForm.KokoPopupThreadItem;
4614- if (ThreadItem.ParentBoard.Is2ch) or not (Pos('?', ThreadItem.URL) > 0) then begin
4615- GikoSys.ParseURI(ThreadItem.URL,Protocol, Host, Path, Document, Port, Bookmark);
4616- URL := Protocol + '://' + Host + Path + IntToStr(No);
4617- end else begin
4618- if Pos('?', ThreadItem.URL) > 0 then begin
4619- URL := Copy(ThreadItem.URL, 1, Pos('?', ThreadItem.URL)-1);
4620- // ‚Ü‚¿BBS—pˆ’u
4621- URL := MojuUtils.CustomStringReplace(URL, 'read.pl', 'read.cgi');
4622- URL := URL + '/' + ThreadItem.ParentBoard.BBSID + '/' + ChangeFileExt(ThreadItem.FileName, '') + '/' + IntToStr(No);
4623- end;
4624- end;
4625- Clipboard.SetTextBuf( PChar(URL) );
4626-end;
4627-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iQuery_STRING)
4628-procedure TGikoDM.konoURLQueryActionExecute(Sender: TObject);
4629-var
4630- No : Integer;
4631- ThreadItem : TThreadItem;
4632- URL, Protocol, Host, Path, Document, Port, Bookmark : String;
4633-begin
4634- No := GikoForm.KokoPopupMenu.Tag;
4635- if No = 0 then Exit;
4636-
4637- ThreadItem := GikoForm.KokoPopupThreadItem;
4638- // 2ch‚Æ‚µ‚½‚ç‚΂́AƒŒƒX”ԍ†‚ð‚¤‚Ü‚­ˆ—‚µ‚Ä‚­‚ê‚È‚¢‚Ì‚Å—˜—p•s‰Â
4639- if ThreadItem.ParentBoard.Is2ch or not (Pos('?', ThreadItem.URL) > 0) then begin
4640- GikoSys.ParseURI(ThreadItem.URL, Protocol, Host, Path, Document, Port, Bookmark);
4641- URL := Protocol + '://' + Host + '/test/read.cgi?bbs=' + ThreadItem.ParentBoard.BBSID
4642- + '&key=' + ChangeFileExt(ThreadItem.FileName, '') + '&st=' + IntToStr(No) + '&to=' + IntToStr(No);
4643- end else begin
4644- URL := ThreadItem.URL;
4645- // ‚Ü‚¿BBS
4646- if Pos('&LAST=', URL) > 0 then begin
4647- URL := Copy(URL, 1, Pos('&LAST=', URL) - 1);
4648- URL := URL + '&START=' + IntToStr(No) + '&END=' + IntToStr(No);
4649- end;
4650- // ‚»‚Ì‘¼ŠO•””Â
4651- if Pos('&ls=', URL) > 0 then begin
4652- URL := Copy(URL, 1, Pos('&ls=', URL) - 1);
4653- URL := URL + '&st=' + IntToStr(No) + '&to=' + IntToStr(No);
4654- end;
4655-
4656- end;
4657- Clipboard.SetTextBuf( PChar(URL) );
4658-end;
4659-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iQuery_STRINGj‚Ì—˜—pƒ`ƒFƒbƒN
4660-procedure TGikoDM.konoURLQueryActionUpdate(Sender: TObject);
4661-const
4662- LIVEDOOR_URL = 'http://jbbs.livedoor.jp/';
4663-begin
4664- // 2ch‚Æ‚µ‚½‚ç‚΂͗˜—p‚Å‚«‚È‚¢‚悤‚É‚·‚éi‚¤‚Ü‚­ƒŒƒXŽw’è‚Å‚«‚È‚¢‚̂Łj
4665- konoURLQueryAction.Enabled := false;
4666- if (GikoForm.KokoPopupThreadItem <> nil) then begin
4667- konoURLQueryAction.Enabled := not GikoForm.KokoPopupThreadItem.ParentBoard.Is2ch;
4668- if konoURLQueryAction.Enabled then begin
4669- konoURLQueryAction.Enabled := not (Pos(LIVEDOOR_URL, GikoForm.KokoPopupThreadItem.URL) = 1);
4670- end;
4671- end;
4672-end;
46734598
46744599 end.
46754600
--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -22,8 +22,8 @@ object KuroutOption: TKuroutOption
2222 Top = 0
2323 Width = 517
2424 Height = 393
25- ActivePage = TabSheet2
26- TabIndex = 3
25+ ActivePage = KakikomiTabSheet
26+ TabIndex = 2
2727 TabOrder = 0
2828 object TabSheet1: TTabSheet
2929 Caption = #35443#32048#35373#23450#65297
@@ -548,11 +548,11 @@ object KuroutOption: TKuroutOption
548548 Left = 16
549549 Top = 16
550550 Width = 473
551- Height = 161
551+ Height = 129
552552 Caption = #12475#12461#12517#12522#12486#12451
553553 TabOrder = 0
554554 object Label12: TLabel
555- Left = 23
555+ Left = 25
556556 Top = 108
557557 Width = 374
558558 Height = 12
@@ -590,25 +590,17 @@ object KuroutOption: TKuroutOption
590590 Caption = #12475#12461#12517#12522#12486#12451#23550#31574#12477#12501#12488#12398#35492#21453#24540#23550#31574
591591 TabOrder = 1
592592 end
593- object UseGobakuCheckBox: TCheckBox
594- Left = 23
595- Top = 128
596- Width = 345
597- Height = 17
598- Caption = #34920#31034#26495'/'#12473#12524#12483#12489#12392#30064#12394#12427#26495'/'#12473#12524#12483#12489#12395#25237#31295#12377#12427#38555#12395#35686#21578#12377#12427#12290
599- TabOrder = 2
600- end
601593 end
602594 object LogGroupBox: TGroupBox
603595 Left = 16
604- Top = 179
605- Width = 473
606- Height = 49
596+ Top = 160
597+ Width = 465
598+ Height = 65
607599 Caption = #12525#12464
608600 TabOrder = 1
609601 object CheckDatFileCheckBox: TCheckBox
610602 Left = 22
611- Top = 18
603+ Top = 14
612604 Width = 369
613605 Height = 17
614606 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
--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -96,7 +96,6 @@ type
9696 RespopupMailToCheckBox: TCheckBox;
9797 ResRangeLabeledEdit: TLabeledEdit;
9898 ResRangeCountUpDown: TUpDown;
99- UseGobakuCheckBox: TCheckBox;
10099 procedure OkBottonClick(Sender: TObject);
101100 procedure FormCreate(Sender: TObject);
102101 procedure CDeleteButtonClick(Sender: TObject);
@@ -184,8 +183,6 @@ begin
184183 DeltaYUpDown.Position := GikoSys.Setting.RespopupDeltaY;
185184 RespopupWaitUpDown.Position := GikoSys.Setting.RespopupWait;
186185 RespopupMailToCheckBox.Checked := GikoSys.Setting.RespopupMailTo;
187- // Œë”šƒ`ƒFƒbƒN
188- UseGobakuCheckBox.Checked := GikoSys.Setting.UseGobakuCheck;
189186 end;
190187
191188 procedure TKuroutOption.SaveSetting;
@@ -237,9 +234,6 @@ begin
237234 GikoSys.Setting.RespopupWait := StrToInt(RespopupWaitLabeledEdit.Text);
238235 GikoForm.ResPopupClearTimer.Interval := GikoSys.Setting.RespopupWait;
239236 GikoSys.Setting.RespopupMailTo := RespopupMailToCheckBox.Checked;
240- // Œë”šƒ`ƒFƒbƒN
241- GikoSys.Setting.UseGobakuCheck := UseGobakuCheckBox.Checked;
242-
243237 end;
244238
245239 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);
--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
6161 Top = 4
6262 Width = 509
6363 Height = 389
64- ActivePage = CSSTabSheet
64+ ActivePage = ThreadSheet
6565 MultiLine = True
66- TabIndex = 2
66+ TabIndex = 4
6767 TabOrder = 3
6868 OnChange = OptionTabChange
6969 object ConnectSheet: TTabSheet
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
253253 Top = 43
254254 Width = 417
255255 Height = 20
256- ItemHeight = 12
256+ ItemHeight = 0
257257 TabOrder = 0
258258 Text = 'BoardURLComboBox'
259259 end
--- a/Preview.pas
+++ b/Preview.pas
@@ -3,23 +3,17 @@ unit Preview;
33 interface
44 uses
55 Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
6- ActiveX, OleCtrls, HTMLDocumentEvent,
6+ ActiveX,
77 {$IF Defined(DELPRO) }
8- SHDocVw,
9- MSHTML
8+ SHDocVw
109 {$ELSE}
11- SHDocVw_TLB,
12- MSHTML_TLB
10+ SHDocVw_TLB
1311 {$IFEND}
1412 ;
1513 type
1614 TPreviewBrowser = class(TWebBrowser)
1715 private
18- FEvent: THTMLDocumentEventSink;//ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
1916 function makeHTML(const URL, Host, Document : String): String;
20- procedure BrowserDocumentComplete(Sender: TObject;
21- const pDisp: IDispatch; var URL: OleVariant);
22- function PreviewDbClick(Sender: TObject): WordBool;
2317 protected
2418 procedure CreateParams(var Params: TCreateParams); override;
2519 public
@@ -30,7 +24,7 @@ type
3024 end;
3125
3226 implementation
33-uses MojuUtils, GikoSystem, Setting, Giko;
27+uses MojuUtils, GikoSystem, Setting;
3428
3529 const
3630 //ƒvƒŒƒrƒ…[ƒtƒ@ƒCƒ‹–¼
@@ -43,15 +37,10 @@ const
4337 constructor TPreviewBrowser.Create(AOwner: TComponent);
4438 begin
4539 inherited Create(AOwner);
46- FEvent := nil;
47- OnDocumentComplete := BrowserDocumentComplete;
4840 end;
4941
5042 destructor TPreviewBrowser.Destroy;
5143 begin
52- if (FEvent <> nil) then begin
53- FreeAndNil(FEvent);
54- end;
5544 inherited Destroy;
5645 end;
5746
@@ -212,25 +201,4 @@ begin
212201 + '</body></html>';
213202 end;
214203 end;
215-//! ƒhƒLƒ…ƒƒ“ƒgŠ®—¹ƒCƒxƒ“ƒg
216-procedure TPreviewBrowser.BrowserDocumentComplete(Sender: TObject;
217- const pDisp: IDispatch; var URL: OleVariant);
218-begin
219- if (URL <> 'about:blank') then begin
220- FEvent := THTMLDocumentEventSink.Create(Self, Self.OleObject.Document,
221- HTMLDocumentEvents2);
222- FEvent.OnDoubleClick := PreviewDbClick;
223- end else begin
224- if (FEvent <> nil) then begin
225- FreeAndNil(FEvent);
226- end;
227- end;
228-end;
229-function TPreviewBrowser.PreviewDbClick(Sender: TObject): WordBool;
230-begin
231- // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
232- PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
233- Result := True;
234-end;
235-
236204 end.
--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -462,7 +462,7 @@ begin
462462 // ƒMƒRƒiƒr‚̃tƒH[ƒJƒX‚ð’D‚Á‚Ä‚é‚̂ŃtƒH[ƒ€‚É–³—‚â‚è•Ô‚·
463463 Blur;
464464 // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
465- PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
465+ PostMessage( GikoForm.Handle , USER_RESPOPUPCLEAR, Integer( Self ), 0 );
466466 Result := True;
467467 end;
468468 initialization
--- a/Setting.pas
+++ b/Setting.pas
@@ -464,8 +464,6 @@ type
464464 FRespopupWait: Integer;
465465 //! ƒ[ƒ‹—“ƒŒƒXƒ|ƒbƒvƒAƒbƒv
466466 FRespopupMailTo: Boolean;
467- //! Œë”šƒ`ƒFƒbƒN
468- FUseGobakuCheck: Boolean;
469467 function GetMainCoolSet(Index: Integer): TCoolSet;
470468 function GetBoardCoolSet(Index: Integer): TCoolSet;
471469 function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -836,8 +834,6 @@ type
836834 //! ƒŒƒXƒ|ƒbƒvƒAƒbƒvƒ^ƒCƒ}[
837835 property RespopupWait: Integer read FRespopupWait write FRespopupWait;
838836 property RespopupMailTo: Boolean read FRespopupMailTo write FRespopupMailTo;
839- //! Œë”šƒ`ƒFƒbƒN
840- property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck;
841837 end;
842838
843839
@@ -1275,7 +1271,6 @@ begin
12751271 // ƒGƒfƒBƒ^
12761272 FSpaceToNBSP := ini.ReadBool( 'Editor', 'SpaceToNBSP', False );
12771273 FAmpToCharRef := ini.ReadBool( 'Editor', 'AmpToCharRef', False );
1278- FUseGobakuCheck := ini.ReadBool( 'Editor', 'UseGobakuCheck', True );
12791274
12801275 //TabŽ©“®•Û‘¶A“ǂݍž‚Ý
12811276 FTabAutoLoadSave := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
@@ -1339,8 +1334,6 @@ begin
13391334 FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
13401335 FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
13411336
1342-
1343-
13441337 // ƒMƒRƒiƒrXV‚Å—˜—p‚µ‚½ƒCƒ“ƒXƒg[ƒ‰‚̍폜
13451338 s := ini.ReadString('Update', 'Remove0', '');
13461339 if (FileExists(s)) then begin
@@ -1694,11 +1687,10 @@ begin
16941687 // ƒGƒfƒBƒ^
16951688 ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
16961689 ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
1697- ini.WriteBool( 'Editor', 'UseGobakuCheck', FUseGobakuCheck );
16981690
16991691 //ƒ^ƒuŽ©“®•Û‘¶
17001692 ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
1701- ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL);
1693+ ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL);
17021694 //Ú×Ý’è
17031695 ini.WriteInteger('OptionDialog', 'KuroutTabIndex', FKuroutSettingTabIndex);
17041696
@@ -1739,7 +1731,6 @@ begin
17391731 ini.WriteString('Function', 'ExtList', FExtList);
17401732 ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile);
17411733 ini.WriteBool('Thread', 'LimitResCountMessage', FLimitResCountMessage);
1742-
17431734 ini.UpdateFile;
17441735 finally
17451736 ini.Free;
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -91,7 +91,7 @@ http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkin
9191 ------------------------------
9292 ŠJ”­Â°ÙFDelphi6 Professional (UP2 + RTL UP2 + RTL UP3)
9393 Delphi6 Personal(UP2 + RTL UP2 + RTL UP3)
94-OS FWindowsXP Professional Edition(SP3) + IE8
94+OS FWindowsXP Professional Edition(SP3) + IE7
9595 WindowsXP Professional Edition(SP1) + IE6(SP1)
9696 Windows2000 Professional (SP4) + IE6(SP1)
9797
@@ -123,25 +123,7 @@ LICENSE
123123 ------------------------------
124124 2009/XX/YY
125125 Version ÊÞÀ60
126- ƒXƒŒƒbƒhˆê——‚̓ǂݍž‚ݏˆ—‚̍œK‰»
127- ÅV100ƒŒƒX•\Ž¦‚Ì•\Ž¦”‚ðƒIƒvƒVƒ‡ƒ“‰»iÚ×Ý’è‚Rj
128- ƒjƒRƒjƒR“®‰æ‚ւ̃Šƒ“ƒN‚ŃTƒ€ƒlƒCƒ‹‚ðƒvƒŒƒrƒ…[•\Ž¦‚·‚é‚悤‚É‚µ‚½
129- ƒuƒ‰ƒEƒUƒ|ƒbƒvƒAƒbƒvƒƒjƒ…[‚ŁAƒŒƒXƒ|ƒbƒvƒAƒbƒv’†‚̃XƒŒƒbƒh‚ð‘Ώۂɂ·‚é•s‹ï‡‚̑Ήž
130- zlib‚ð1.2.3‚ɍXV
131- ƒTƒEƒ“ƒhƒCƒxƒ“ƒg‚̃tƒ@ƒCƒ‹Žw’è‚̃fƒtƒHƒ‹ƒg‚ð‘Š‘ÎŽQÆ‚ɕύX
132- ƒŠƒ“ƒNŽž“®ì‚ÅŽw’èƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ɃIƒvƒVƒ‡ƒ“‚ðŽw’è‚·‚é‚Æ“®ì‚µ‚È‚¢•s‹ï‡‚̏C³
133- ˆÚ“]”ÂŒŸõ‚ŁAƒT[ƒo‚ª–³”½‰ž‚¾‚Əˆ—‚ªŠ®—¹‚µ‚È‚¢•s‹ï‡C³
134- ƒMƒRƒiƒrWiki FAQ‚ւ̃Šƒ“ƒNæ‚ðSourceForge“à‚ÌWikiƒy[ƒW‚ɕύX
135- ‰æ‘œƒvƒŒƒrƒ…[‚ðƒ_ƒuƒ‹ƒNƒŠƒbƒN‚ŏÁ‚¹‚é‚悤‚ɏC³
136- u‚±‚±‚ɃŒƒXv‚Ń}ƒEƒXƒJ[ƒ\ƒ‹’¼‰º‚ɕʃXƒŒƒbƒh‚ւ̃Šƒ“ƒN‚ª‚ ‚é‚ƌ딚‚·‚é•s‹ï‡‚̏C³
137- ƒŒƒX‚̃ƒjƒ…[‚É"‚±‚̃ŒƒX‚ÌURLƒRƒs["‚ð’ljÁB
138- ƒŠƒ“ƒN—š—ð‚Ì–ß‚é^i‚ނŁAƒVƒ‡[ƒgƒJƒbƒgƒL[‚Éctrl/shift‚ð‘g‚ݍ‡‚킹‚é‚ƁAƒuƒ‰ƒEƒU‚ÅŠJ‚¢‚Ä‚µ‚Ü‚¤•s‹ï‡‚̏C³
139- I—¹Žž‚Ì‚¨‹C‚É“ü‚èƒtƒ@ƒCƒ‹iFavorite.xmlj‚Ì•Û‘¶ˆ—‚̏‡”ÔŒ©’¼‚µ
140-
141-2009/02/28
142- Version ÊÞÀ59 ƒŠƒŠ[ƒX2
143- ƒMƒRƒiƒrXV‚ŁAl’Œ”Å‚ð‘I‘ð‚µ‚Ä‚à³Ž®”ł̃Cƒ“ƒXƒg[ƒ‰‚ðDL‚·‚é•s‹ï‡‚̏C³
144- ‚Ü‚¿BBS‚ÌŽd—l•ÏX(2009/02/24)‘Ήž
126+
145127
146128 2009/02/01
147129 Version ÊÞÀ59
--- a/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/MachiBBSPlugIn.dpr
@@ -83,7 +83,7 @@ const
8383 MAJOR_VERSION = 1;
8484 MINOR_VERSION = 0;
8585 RELEASE_VERSION = 'beta';
86- REVISION_VERSION = 21;
86+ REVISION_VERSION = 20;
8787
8888 // =========================================================================
8989 // ŽG—pŠÖ”
@@ -268,7 +268,6 @@ var
268268 foundPos : Integer;
269269 const
270270 BBS_HOST = 'machi.to';
271- BBS_HOST2 = 'machibbs.com';
272271 THREAD_MARK = '/bbs/read.pl';
273272 THREAD_MARK2= '/bbs/read.cgi';
274273 begin
@@ -293,23 +292,7 @@ begin
293292 else
294293 Result := atBBS;
295294 end else begin
296- foundPos := AnsiPos( BBS_HOST2, uri.Host );
297- if (foundPos > 0) and (Length( uri.Host ) - foundPos + 1 = Length( BBS_HOST2 )) then begin
298- foundPos := Pos( THREAD_MARK, inURL );
299- if (foundPos = 0) then begin
300- // VURL‘Ήž
301- foundPos := Pos( THREAD_MARK2, inURL );
302- end;
303- if foundPos > 0 then
304- Result := atThread
305- else if (uriList.Count > 1) and (uri.Path <> '/') then // ÅŒã‚ª '/' ‚ŕ‚߂ç‚ê‚Ä‚é‚È‚ç 3
306- Result := atBoard
307- else
308- Result := atBBS;
309- end else begin
310-
311- Result := atNoAccept;
312- end;
295+ Result := atNoAccept;
313296 end;
314297 finally
315298 uri.Free;
Binary files a/res/ExternalBoardPlugIn/MachiBBSPlugIn.res and b/res/ExternalBoardPlugIn/MachiBBSPlugIn.res differ
--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,34 +1,31 @@
11 [Setting]
2-academy6=40
3-anchorage=40
4-@liveplus=20
5-atlanta=5
6-changi=40
7-dubai=40
8-ex24=40
9-@ogame2=20
10-gimpo=40
11-hideyoshi=40
12-ipv6=40
13-jfk=40
14-live23=20
15-live24=20
16-love6=40
17-mamono=40
18-namidame=40
19-pc11=40
20-pc12=40
21-qb5=40
22-@sec2chd=20
23-schiphol=40
24-science6=40
25-society6=40
26-takeshima=40
27-tsushima=40
2+@endless=20
3+@liveplus=10
4+@news=156
285 @newsplus=128
29-yutori=40
30-babiru=20
31-qiufen=20
32-set=20
33-venus=20
34-yomi=20
6+@operate=24
7+@sec2chd=20
8+academy6=45
9+babiru=30
10+bubble6=45
11+changi=45
12+ex24=45
13+food8=45
14+gimpo=45
15+ipv6=45
16+life9=45
17+live23=15
18+live24=15
19+love6=45
20+mamono=45
21+namidame=45
22+pc11=45
23+qb5=45
24+qiufen=30
25+schiphol=45
26+science6=45
27+set=30
28+society6=45
29+venus=30
30+yomi=30
31+yutori=10