コミット: 05c61eaa43543729322f8a3149434d44d0e6d0c0 - gikonavi (git)

ギコナビ

コミットメタ情報

• リビジョン: 05c61eaa43543729322f8a3149434d44d0e6d0c0 (tree)
• 日時: 2009-06-07 12:11:06
• 作者: cvs2git <cvs2git>
• コミッター: cvs2git

ログメッセージ

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

変更サマリ

• modified: Editor.pas
• modified: Favorite.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Preview.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/default/Samba.default

差分

--- a/Editor.pas
+++ b/Editor.pas
@@ -281,8 +281,6 @@ type
         function FusianaMsgBox: Integer;
         //! sent.iniƒtƒ@ƒCƒ‹‚̐¶¬
         function CreateSentIniFile: TMemIniFile;
-        //! Œë”šƒ`ƒFƒbƒN
-        function isGobaku: Boolean;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
@@ -803,11 +801,6 @@ begin
                     CancelSend( Board, SysMenu );
                     Exit;
                 end;
-                // Œë”šƒ`ƒFƒbƒN
-                if (isGobaku) then begin
-                    CancelSend( Board, SysMenu );
-                    Exit;
-                end;
 			end;
 
 			GetSendData(Source);
@@ -2554,66 +2547,5 @@ begin
         GikoForm.DownloadList(GetBoard);
     end;
 end;
-//! Œë”šƒ`ƒFƒbƒN
-function TEditorForm.isGobaku: Boolean;
-const
-	MSG_GOBAKU : string =
-        '•\Ž¦‚µ‚Ä‚¢‚é%s‚Æ“Šeæ‚Ì%s‚ªˆÙ‚È‚è‚Ü‚·B'#13#10 +
-		'‚±‚̂܂܏‘‚«ž‚Ý‚Ü‚·‚©H';
-var
-    ThreadItem : TThreadItem;
-    msg : String;
-
-begin
-    Result := False;
-    // ƒIƒvƒVƒ‡ƒ“—LŒø‚©‚ƒŒƒX‘—M‚Å‚Ì‚Ý—LŒø
-    if (GikoSys.Setting.UseGobakuCheck) then begin
-        // ƒŒƒX‘—M
-        if (FThreadItem <> nil) then begin
-            ThreadItem := GikoForm.GetActiveContent(False);
-            if (ThreadItem <> nil) then begin
-                if (FThreadItem <> ThreadItem) then begin
-                    msg := Format(MSG_GOBAKU, ['ƒXƒŒƒbƒh', 'ƒXƒŒƒbƒh']);
-                    Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                end;
-            end else begin
-                if GikoForm.ActiveList is TBBS then begin
-                    if TBBS(GikoForm.ActiveList) <> FThreadItem.ParentBoard.ParentCategory.ParenTBBS then begin
-                        msg := Format(MSG_GOBAKU, ['BBS', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚éBBS']);
-                        Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                    end;
-                end else if GikoForm.ActiveList is TCategory then begin
-                    if TCategory(GikoForm.ActiveList).FindThreadFromURL(FThreadItem.URL) = nil then begin
-                        msg := Format(MSG_GOBAKU, ['ƒJƒeƒSƒŠ', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚éƒJƒeƒSƒŠ']);
-                        Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                    end;
-                end else if GikoForm.ActiveList is TBoard then begin
-                    if TBoard(GikoForm.ActiveList) <> FThreadItem.ParentBoard then begin
-                        msg := Format(MSG_GOBAKU, ['”Â', 'ƒXƒŒƒbƒh‚̏Š‘®‚·‚é”Â']);
-                        Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                    end;
-                end;
-            end;
-        end else begin
-            // ƒXƒŒ‚½‚Ä
-            if GikoForm.ActiveList is TBBS then begin
-                if TBBS(GikoForm.ActiveList) <> FBoard.ParentCategory.ParenTBBS then begin
-                    msg := Format(MSG_GOBAKU, ['BBS', '”‚̏Š‘®‚·‚éBBS']);
-                    Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                end;
-            end else if GikoForm.ActiveList is TCategory then begin
-                if TCategory(GikoForm.ActiveList).FindBoardFromURL(FBoard.URL) = nil then begin
-                    msg := Format(MSG_GOBAKU, ['ƒJƒeƒSƒŠ', '”‚̏Š‘®‚·‚éƒJƒeƒSƒŠ']);
-                    Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                end;
-            end else if GikoForm.ActiveList is TBoard then begin
-                if TBoard(GikoForm.ActiveList) <> FBoard then begin
-                    msg := Format(MSG_GOBAKU, ['”Â', '”Â']);
-                    Result := MsgBox(Handle, msg, 'î•ñ', MB_YESNO or MB_ICONQUESTION) = IDNO;
-                end;
-            end;
-        end;
-    end;
-end;
 
 end.

--- a/Favorite.pas
+++ b/Favorite.pas
@@ -70,7 +70,6 @@ var
 	FavoriteDM: TFavoriteDM;
 const
 	FAVORITE_LINK_NAME = 'ƒŠƒ“ƒN';
-	FAVORITE_FILE_NAME = 'Favorite.xml';
 
 implementation
 
@@ -78,7 +77,7 @@ uses	ExternalBoardManager, ExternalBoardPlugInMain,  MojuUtils;
 
 const
 	FAVORITE_ROOT_NAME = '‚¨‹C‚É“ü‚è';
-
+	FAVORITE_FILE_NAME = 'Favorite.xml';
 
 {$R *.dfm}
 
@@ -426,47 +425,31 @@ end;
 
 procedure TFavoriteDM.WriteFavorite;
 var
-	FileName, tmpFileName, bakFileName: string;
+	FileName, tmpFileName: string;
 	SaveList: TStringList;
-    Buffer: array[0..MAX_PATH] of Char;   // ƒoƒbƒtƒ@
-    FileRep : Boolean;
+
 begin
     FavoriteDM.Modified := true;
 	FileName := GikoSys.GetConfigDir + FAVORITE_FILE_NAME;
+	if FileExists(FileName) then begin
+		tmpFileName := GikoSys.GetConfigDir + '~' + FAVORITE_FILE_NAME;
+		if FileExists(tmpFileName) then
+			SysUtils.DeleteFile(tmpFileName); //SysUtils.‚ð‚‚¯‚È‚¢‚ÆWinAPI‚Æ‹æ•Ê‚Å‚«‚È‚¢‚Ì‚Å
+		RenameFile(FileName, tmpFileName);
+	end;
 	SaveList := TStringList.Create;
-    tmpFileName := '';
-    // ‘‚«ž‚Ý—pˆêŽžƒtƒ@ƒCƒ‹Žæ“¾
-    if GetTempFileName(PChar(GikoSys.GetConfigDir), PChar('fav'), 0, Buffer) <> 0 then begin
-        tmpFileName := Buffer;
-        try
-            try
-                SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
-                SaveList.Add('<favorite>');
-                AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
-                SaveList.Add('</favorite>');
-                // ˆêŽžƒtƒ@ƒCƒ‹‚Æ‚µ‚Ä•Û‘¶
-                SaveList.SaveToFile(tmpFileName);
-                FileRep := True;
-                // ‘O‚̃tƒ@ƒCƒ‹‚ðˆÚ“®‚·‚é
-                if FileExists(FileName) then begin
-                    bakFileName := GikoSys.GetConfigDir + '~' + FAVORITE_FILE_NAME;
-                    if FileExists(bakFileName) then begin
-                        FileRep := SysUtils.DeleteFile(bakFileName); //SysUtils.‚ð‚‚¯‚È‚¢‚ÆWinAPI‚Æ‹æ•Ê‚Å‚«‚È‚¢‚Ì‚Å
-                    end;
-                    if FileRep then begin
-                        FileRep := RenameFile(FileName, bakFileName);
-                    end;
-                end;
-                // ³‹K‚̃tƒ@ƒCƒ‹–¼‚ɃŠƒl[ƒ€‚·‚é
-                if FileRep then begin
-                    FileRep := RenameFile(tmpFileName, FileName);
-                end;
-            except
-            end;
-        finally
-            SaveList.Free;
-        end;
-    end;
+	try
+		SaveList.Add('<?xml version="1.0" encoding="Shift_JIS" standalone="yes"?>');
+		SaveList.Add('<favorite>');
+		try
+			AddSaveString(TreeView.Items.GetFirstNode.getFirstChild, SaveList);
+		except
+		end;
+		SaveList.Add('</favorite>');
+		SaveList.SaveToFile(FileName);
+	finally
+		SaveList.Free;
+	end;
 end;
 
 procedure TFavoriteDM.AddSaveString(Node: TTreeNode; SaveList: TStringList);

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -8406,18 +8406,6 @@ object GikoForm: TGikoForm
     object N83: TMenuItem
       Action = GikoDM.DereferenceResAction
     end
-    object N85: TMenuItem
-      Caption = '-'
-    end
-    object URL2: TMenuItem
-      Caption = #12371#12398#12524#12473#12398'URL'
-      object URLPATHINFO1: TMenuItem
-        Action = GikoDM.konoURLPATHAction
-      end
-      object URLQUERYSTRING1: TMenuItem
-        Action = GikoDM.konoURLQueryAction
-      end
-    end
   end
   object BrowserTabPopupMenu: TPopupMenu
     Images = HotToobarImageList

--- a/Giko.pas
+++ b/Giko.pas
@@ -24,7 +24,8 @@ uses
 const
 	NGWORDNAME_PANEL = 3;
 	THREADSIZE_PANEL = 2;
-    USER_POPUPCLEAR		= WM_USER + 2005;	///< wParam : TWebBrowser
+    USER_RESPOPUPCLEAR		= WM_USER + 2005;	///< wParam : TWebBrowser
+    	
 type
 
 	TToolBarSettingSenderType = (tssNone, tssMain, tssList, tssBrowser);
@@ -421,10 +422,6 @@ type
     N83: TMenuItem;
     UpdateGikonaviAction1: TMenuItem;
     N84: TMenuItem;
-    N85: TMenuItem;
-    URL2: TMenuItem;
-    URLPATHINFO1: TMenuItem;
-    URLQUERYSTRING1: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
         procedure SaveSettingAll();
@@ -614,7 +611,6 @@ type
         FResPopupBrowser: TResPopupBrowser;
         FUpdateExePath: string;    ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ƒpƒX
         FUpdateExeArgs: string;    ///ƒMƒRƒiƒrXVƒCƒ“ƒXƒg[ƒ‰ˆø”
-        FKokoPopupThreadItem: TThreadItem;
 		procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
 		procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
 		procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -717,7 +713,7 @@ type
 		BrowserNullTab: TBrowserRecord;
 		FControlThread: TThreadControl;
         FIconData : TNotifyIconData;
-		procedure MoveToURL(const inURL: string; KeyMask: Boolean = False);
+		procedure MoveToURL(const inURL: string);
 		function InsertBrowserTab(ThreadItem: TThreadItem; ActiveTab: Boolean = True) : TBrowserRecord;
 		procedure ReloadBBS;
 		function GetHttpState: Boolean;
@@ -764,9 +760,6 @@ type
 		property ListViewBackGroundColor: TColor read FListViewBackGroundColor write SetListViewBackGroundColor;
 		property UseOddResOddColor : Boolean read FUseOddResOddColor write FUseOddResOddColor;
 		property OddColor : TColor read FOddColor write FOddColor;
-        //! ƒŒƒXƒƒjƒ…[ƒAƒNƒeƒBƒuƒXƒŒƒbƒhƒAƒCƒeƒ€
-        property KokoPopupThreadItem : TThreadItem read FKokoPopupThreadItem;
-
 		function FindToolBarButton( bar : TToolBar; action : TAction ) : TToolButton;
 		procedure OnPlugInMenuItem( Sender : TObject );
 		procedure TabFileURLReplace(oldURLs: TStringList; newURLs: TStringList);
@@ -1351,13 +1344,8 @@ begin
 
     // ‰Šú‰»‚ÉŽ¸”s‚µ‚½ƒ‚ƒWƒ…[ƒ‹ƒ`ƒFƒbƒN
     if (FavoriteDM.AbEnd) then begin
-        GikoUtil.MsgBox(Self.Handle,
-            '‚¨‹C‚É“ü‚è‚̏‰Šú‰»‚ÉŽ¸”s‚µ‚Ü‚µ‚½BƒMƒRƒiƒr‚ðI—¹‚µ‚Ü‚·B'#13#10 +
-            'ƒMƒRƒiƒrƒtƒHƒ‹ƒ_‚ðŠJ‚«‚Ü‚·Aconfig/' + Favorite.FAVORITE_FILE_NAME +
-            ' ‚ð config/~' + Favorite.FAVORITE_FILE_NAME + '(‘O‰ñ‹N“®Žž‚Ì‚¨‹C‚É“ü‚è)‚Å'#13#10 +
-             '’u‚«Š·‚¦‚鎖‚Å’¼‚é‰Â”\«‚ª‚ ‚è‚Ü‚·B',
+        GikoUtil.MsgBox(Self.Handle, '‚¨‹C‚É“ü‚è‚̏‰Šú‰»‚ÉŽ¸”s‚µ‚Ü‚µ‚½BƒMƒRƒiƒr‚ðI—¹‚µ‚Ü‚·B',
             '‰Šú‰»ˆÙí');
-        GikoDM.GikoFolderOpenAction.Execute;
         Self.Close;
     end;
 
@@ -2380,10 +2368,9 @@ begin
 {$IFDEF DEBUG}
 	Writeln(URL);
 {$ENDIF}
-    FKokoPopupThreadItem := nil;
 	if Pos(kMenuName, URL) <> 0 then begin
 		sNo := Copy( URL, Pos( kMenuName, URL ) + Length( kMenuName ), Length( URL ) );
-
+		
 		if not GikoSys.IsNumeric(sNo) then Exit;
 
 		Cancel := True;
@@ -2401,7 +2388,6 @@ begin
                 TResPopupBrowser(Sender).ChildClear;
             end;
         end;
-        FKokoPopupThreadItem := GetActiveContent(true);
 		KokoPopupMenu.Tag := StrToInt(sNo);
 		KokoPopupMenu.Popup(p.x, p.y);
 	end else if Pos('mailto', LowerCase(URL)) <> 0 then begin
@@ -4706,7 +4692,7 @@ begin
 	end;
 end;
 
-procedure TGikoForm.MoveToURL(const inURL: string; KeyMask: Boolean = False);
+procedure TGikoForm.MoveToURL(const inURL: string);
 var
 	protocol, host, path, document, port, bookmark : string;
 	URL, protocol2, host2, path2, document2, port2, bookmark2 : string;
@@ -4723,18 +4709,17 @@ begin
 
 	GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark );
 	GikoSys.Parse2chURL( inURL, path, document, BBSID, BBSKey );
-    // ƒAƒNƒVƒ‡ƒ“‚©‚çŒÄ‚΂ê‚é‚Æshift/ctrl‚Í‚¨‚µ‚Á‚ς̏ꍇ‚ª‚Ù‚Æ‚ñ‚ǂȂ̂Ń}ƒXƒN‚·‚é
-    if not KeyMask then begin
-        shiftDown	:= GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
-        ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
-        if shiftDown then begin
-            GikoSys.OpenBrowser(inURL, gbtUserApp);
-            Exit;
-        end else if ctrlDown then begin
-            GikoSys.OpenBrowser(inURL, gbtIE);
-            Exit;
-        end;
-    end;
+
+
+	shiftDown	:= GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
+	ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
+	if shiftDown then begin
+		GikoSys.OpenBrowser(inURL, gbtUserApp);
+		Exit;
+	end else if ctrlDown then begin
+		GikoSys.OpenBrowser(inURL, gbtIE);
+		Exit;
+	end;
 
 	//===== ƒvƒ‰ƒOƒCƒ“
 	try
@@ -4933,16 +4918,12 @@ begin
 				senderBrowser := TWebBrowser( Message.WParam );
 				BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
 			end;
-        USER_POPUPCLEAR:
+        USER_RESPOPUPCLEAR:
             if (TObject(Message.WParam) is TResPopupBrowser) then begin
                 try
     				TResPopupBrowser( Message.WParam ).Clear;
                 except
                 end;
-			end else if (TObject(Message.WParam) is TPreviewBrowser) then begin
-                if FPreviewBrowser <> nil then begin
-            		ShowWindow(FPreviewBrowser.Handle, SW_HIDE);
-                end;
 			end;
 		end;
 
@@ -7353,7 +7334,7 @@ var
 begin
 	No := KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GikoForm.KokoPopupThreadItem;
+	ThreadItem := GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 
     id := GikoSys.GetResID(No, ThreadItem);
@@ -7412,7 +7393,7 @@ var
 begin
 	No := KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GikoForm.KokoPopupThreadItem;
+	ThreadItem := GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 	body := TStringList.Create;
 	try

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1386,21 +1386,6 @@ object GikoDM: TGikoDM
       Hint = #12462#12467#12490#12499#12398#26356#26032
       OnExecute = UpdateGikonaviActionExecute
     end
-    object konoURLPATHAction: TAction
-      Tag = -1
-      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
-      Caption = 'PATH_INFO'#24418#24335
-      Hint = #12371#12398#12524#12473#12398'URL'#12467#12500#12540#65288'PATH_INFO'#65289
-      OnExecute = konoURLPATHActionExecute
-    end
-    object konoURLQueryAction: TAction
-      Tag = -1
-      Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503
-      Caption = 'QUERY_STRING'#24418#24335
-      Hint = #12371#12398#12524#12473#12398'URL'#12467#12500#12540#65288'QUERY_STRING'#65289
-      OnExecute = konoURLQueryActionExecute
-      OnUpdate = konoURLQueryActionUpdate
-    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -42,7 +42,7 @@ const
 	//! 2‚¿‚á‚ñ‚Ë‚é‚ÌURL
 	URL_2ch: string = 'www.2ch.net/';
 	//! ƒMƒRƒiƒrWiki‚ÌURL
-	URL_Wiki: string = 'sourceforge.jp/projects/gikonavi/wiki/FAQ';
+	URL_Wiki: string = 'gikowiki.dyndns.info/index.php?FAQ';
 
 	SELECTCOMBOBOX_NAME: string = ''; // 'ƒXƒŒƒbƒhižŒŸõ';
 	SELECTCOMBOBOX_COLOR: TColor = clWindow;
@@ -243,8 +243,6 @@ type
     ShowTabListAction: TAction;
     DereferenceResAction: TAction;
     UpdateGikonaviAction: TAction;
-    konoURLPATHAction: TAction;
-    konoURLQueryAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -458,9 +456,6 @@ type
     procedure ShowTabListActionExecute(Sender: TObject);
     procedure DereferenceResActionExecute(Sender: TObject);
     procedure UpdateGikonaviActionExecute(Sender: TObject);
-    procedure konoURLPATHActionExecute(Sender: TObject);
-    procedure konoURLQueryActionExecute(Sender: TObject);
-    procedure konoURLQueryActionUpdate(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -476,7 +471,7 @@ type
 	procedure ClearSelectComboBox;
     procedure ClearMailAllEditor();
     procedure ClearNameTextAllEditor();
-    procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
+    procedure MoveURLWithHistory(URL : String);
     procedure BackToHistory(item: TMoveHistoryItem);
     function GetActiveThreadLinks : IHTMLElementCollection;
     procedure GetLinkURLs(links : IHTMLElementCollection;
@@ -2365,7 +2360,7 @@ begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0
         then Exit;
-	ThreadItem := GikoForm.KokoPopupThreadItem;
+	ThreadItem := GikoForm.GetActiveContent(True);
 	if not Assigned(ThreadItem) then
         Exit;
 	ThreadItem.Kokomade := No;
@@ -2402,7 +2397,7 @@ var
 begin
 	Number := GikoForm.KokoPopupMenu.Tag;
 	if Number = 0 then Exit;
-	Item := GikoForm.KokoPopupThreadItem;
+	Item := GikoForm.GetActiveContent(True);
 	if Item = nil then Exit;
 
 	Editor := TEditorForm.Create(GikoForm);
@@ -2431,7 +2426,7 @@ var
 begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
-	ThreadItem := GikoForm.KokoPopupThreadItem;
+	ThreadItem := GikoForm.GetActiveContent(True);
 	if ThreadItem = nil then Exit;
 
     AID := GikoSys.GetResID(No, ThreadItem);
@@ -4143,17 +4138,17 @@ begin
             end;
         end else begin
             //URL‚Ɉړ®
-            MoveURLWithHistory(item.ThreadItem.URL, True);
+            MoveURLWithHistory(item.ThreadItem.URL);
         end;
     end;
 end;
 //! —š—ðˆ—‚‚«URLˆÚ“®
-procedure TGikoDM.MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
+procedure TGikoDM.MoveURLWithHistory(URL : String);
 var
     idx : Integer;
 begin
     //URL‚Ɉړ®
-    GikoForm.MoveToURL(URL, KeyMask);
+    GikoForm.MoveToURL(URL);
     //ˆÈ‰ºA—š—ð‚̏ˆ—
     idx := GikoForm.AddressComboBox.Items.IndexOf(URL);
     if idx = -1 then begin
@@ -4518,7 +4513,7 @@ begin
 	No := GikoForm.KokoPopupMenu.Tag;
 	if No = 0 then Exit;
 
-    ThreadItem := GikoForm.KokoPopupThreadItem;
+    ThreadItem := GikoForm.GetActiveContent;
     // ƒAƒNƒeƒBƒuƒ^ƒu‚©‚ç‘S‚ẴŠƒ“ƒN‚ðŽæ“¾‚·‚é
     links := GetActiveThreadLinks;
     if (ThreadItem <> nil) and (links <> nil) then begin
@@ -4600,76 +4595,6 @@ begin
     end;
 
 end;
-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iPATH_INFO)
-procedure TGikoDM.konoURLPATHActionExecute(Sender: TObject);
-var
-    No : Integer;
-    ThreadItem : TThreadItem;
-    URL, Protocol, Host, Path, Document, Port, Bookmark : String;
-begin
-	No := GikoForm.KokoPopupMenu.Tag;
-	if No = 0 then Exit;
-
-    ThreadItem := GikoForm.KokoPopupThreadItem;
-    if (ThreadItem.ParentBoard.Is2ch) or not (Pos('?', ThreadItem.URL) > 0) then begin
-        GikoSys.ParseURI(ThreadItem.URL,Protocol, Host, Path, Document, Port, Bookmark);
-        URL := Protocol + '://' + Host + Path + IntToStr(No);
-    end else begin
-        if Pos('?', ThreadItem.URL) > 0 then begin
-            URL := Copy(ThreadItem.URL, 1, Pos('?', ThreadItem.URL)-1);
-            // ‚Ü‚¿BBS—pˆ’u
-            URL := MojuUtils.CustomStringReplace(URL, 'read.pl', 'read.cgi');
-            URL := URL + '/' + ThreadItem.ParentBoard.BBSID + '/' + ChangeFileExt(ThreadItem.FileName, '')  + '/' + IntToStr(No);
-        end;
-    end;
-    Clipboard.SetTextBuf( PChar(URL) );
-end;
-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iQuery_STRING)
-procedure TGikoDM.konoURLQueryActionExecute(Sender: TObject);
-var
-    No : Integer;
-    ThreadItem : TThreadItem;
-    URL, Protocol, Host, Path, Document, Port, Bookmark : String;
-begin
-	No := GikoForm.KokoPopupMenu.Tag;
-	if No = 0 then Exit;
-
-    ThreadItem := GikoForm.KokoPopupThreadItem;
-    // 2ch‚Æ‚µ‚½‚ç‚΂́AƒŒƒX”ԍ†‚ð‚¤‚Ü‚­ˆ—‚µ‚Ä‚­‚ê‚È‚¢‚Ì‚Å—˜—p•s‰Â
-    if ThreadItem.ParentBoard.Is2ch or not (Pos('?', ThreadItem.URL) > 0) then begin
-        GikoSys.ParseURI(ThreadItem.URL, Protocol, Host, Path, Document, Port, Bookmark);
-        URL := Protocol + '://' + Host + '/test/read.cgi?bbs=' + ThreadItem.ParentBoard.BBSID
-            + '&key=' + ChangeFileExt(ThreadItem.FileName, '') + '&st=' + IntToStr(No) + '&to=' + IntToStr(No);
-    end else begin
-        URL := ThreadItem.URL;
-        // ‚Ü‚¿BBS
-        if Pos('&LAST=', URL) > 0 then begin
-            URL := Copy(URL, 1, Pos('&LAST=', URL) - 1);
-            URL := URL + '&START=' + IntToStr(No) + '&END=' + IntToStr(No);
-        end;
-        // ‚»‚Ì‘¼ŠO•””Â
-        if Pos('&ls=', URL) > 0 then begin
-            URL := Copy(URL, 1, Pos('&ls=', URL) - 1);
-            URL := URL + '&st=' + IntToStr(No) + '&to=' + IntToStr(No);
-        end;
-
-    end;
-    Clipboard.SetTextBuf( PChar(URL) );
-end;
-//! ‚±‚̃ŒƒX‚ÌURLƒRƒs[iQuery_STRINGj‚Ì—˜—pƒ`ƒFƒbƒN
-procedure TGikoDM.konoURLQueryActionUpdate(Sender: TObject);
-const
-	LIVEDOOR_URL = 'http://jbbs.livedoor.jp/';
-begin
-    // 2ch‚Æ‚µ‚½‚ç‚΂͗˜—p‚Å‚«‚È‚¢‚悤‚É‚·‚éi‚¤‚Ü‚­ƒŒƒXŽw’è‚Å‚«‚È‚¢‚̂Łj
-    konoURLQueryAction.Enabled := false;
-    if (GikoForm.KokoPopupThreadItem <> nil) then begin
-        konoURLQueryAction.Enabled := not GikoForm.KokoPopupThreadItem.ParentBoard.Is2ch;
-        if konoURLQueryAction.Enabled then begin
-            konoURLQueryAction.Enabled := not (Pos(LIVEDOOR_URL, GikoForm.KokoPopupThreadItem.URL) = 1);
-        end;
-    end;
-end;
 
 end.
 

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -22,8 +22,8 @@ object KuroutOption: TKuroutOption
     Top = 0
     Width = 517
     Height = 393
-    ActivePage = TabSheet2
-    TabIndex = 3
+    ActivePage = KakikomiTabSheet
+    TabIndex = 2
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = #35443#32048#35373#23450#65297
@@ -548,11 +548,11 @@ object KuroutOption: TKuroutOption
         Left = 16
         Top = 16
         Width = 473
-        Height = 161
+        Height = 129
         Caption = #12475#12461#12517#12522#12486#12451
         TabOrder = 0
         object Label12: TLabel
-          Left = 23
+          Left = 25
           Top = 108
           Width = 374
           Height = 12
@@ -590,25 +590,17 @@ object KuroutOption: TKuroutOption
           Caption = #12475#12461#12517#12522#12486#12451#23550#31574#12477#12501#12488#12398#35492#21453#24540#23550#31574
           TabOrder = 1
         end
-        object UseGobakuCheckBox: TCheckBox
-          Left = 23
-          Top = 128
-          Width = 345
-          Height = 17
-          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
-          TabOrder = 2
-        end
       end
       object LogGroupBox: TGroupBox
         Left = 16
-        Top = 179
-        Width = 473
-        Height = 49
+        Top = 160
+        Width = 465
+        Height = 65
         Caption = #12525#12464
         TabOrder = 1
         object CheckDatFileCheckBox: TCheckBox
           Left = 22
-          Top = 18
+          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

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -96,7 +96,6 @@ type
     RespopupMailToCheckBox: TCheckBox;
     ResRangeLabeledEdit: TLabeledEdit;
     ResRangeCountUpDown: TUpDown;
-    UseGobakuCheckBox: TCheckBox;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -184,8 +183,6 @@ begin
     DeltaYUpDown.Position := GikoSys.Setting.RespopupDeltaY;
     RespopupWaitUpDown.Position := GikoSys.Setting.RespopupWait;
     RespopupMailToCheckBox.Checked := GikoSys.Setting.RespopupMailTo;
-    // Œë”šƒ`ƒFƒbƒN
-    UseGobakuCheckBox.Checked := GikoSys.Setting.UseGobakuCheck;
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -237,9 +234,6 @@ begin
     GikoSys.Setting.RespopupWait := StrToInt(RespopupWaitLabeledEdit.Text);
     GikoForm.ResPopupClearTimer.Interval := GikoSys.Setting.RespopupWait;
     GikoSys.Setting.RespopupMailTo := RespopupMailToCheckBox.Checked;
-    // Œë”šƒ`ƒFƒbƒN
-    GikoSys.Setting.UseGobakuCheck := UseGobakuCheckBox.Checked;
-
 end;
 
 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = CSSTabSheet
+    ActivePage = ThreadSheet
     MultiLine = True
-    TabIndex = 2
+    TabIndex = 4
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog
           Top = 43
           Width = 417
           Height = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 0
           Text = 'BoardURLComboBox'
         end

--- a/Preview.pas
+++ b/Preview.pas
@@ -3,23 +3,17 @@ unit Preview;
 interface
 uses
 	Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms,
-	ActiveX, OleCtrls, HTMLDocumentEvent,
+	ActiveX, 
 {$IF Defined(DELPRO) }
-	SHDocVw,
-	MSHTML
+	SHDocVw
 {$ELSE}
-	SHDocVw_TLB,
-	MSHTML_TLB
+	SHDocVw_TLB
 {$IFEND}
 ;
 type
 	TPreviewBrowser = class(TWebBrowser)
 	private
-        FEvent: THTMLDocumentEventSink;//ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
         function makeHTML(const URL, Host, Document : String): String;
-        procedure BrowserDocumentComplete(Sender: TObject;
-	            const pDisp: IDispatch; var URL: OleVariant);
-        function PreviewDbClick(Sender: TObject): WordBool;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
@@ -30,7 +24,7 @@ type
 	end;
 
 implementation
-uses MojuUtils, GikoSystem, Setting, Giko;
+uses MojuUtils, GikoSystem, Setting;
 
 const
 	//ƒvƒŒƒrƒ…[ƒtƒ@ƒCƒ‹–¼
@@ -43,15 +37,10 @@ const
 constructor TPreviewBrowser.Create(AOwner: TComponent);
 begin
 	inherited Create(AOwner);
-    FEvent := nil;
-    OnDocumentComplete := BrowserDocumentComplete;
 end;
 
 destructor TPreviewBrowser.Destroy;
 begin
-    if (FEvent <> nil) then begin
-        FreeAndNil(FEvent);
-    end;
 	inherited Destroy;
 end;
 
@@ -212,25 +201,4 @@ begin
 				+ '</body></html>';
     end;
 end;
-//! ƒhƒLƒ…ƒƒ“ƒgŠ®—¹ƒCƒxƒ“ƒg
-procedure TPreviewBrowser.BrowserDocumentComplete(Sender: TObject;
-    const pDisp: IDispatch; var URL: OleVariant);
-begin
-    if (URL <> 'about:blank') then begin
-        FEvent := THTMLDocumentEventSink.Create(Self, Self.OleObject.Document,
-            HTMLDocumentEvents2);
-        FEvent.OnDoubleClick := PreviewDbClick;
-    end else begin
-        if (FEvent <> nil) then begin
-            FreeAndNil(FEvent);
-        end;
-    end;
-end;
-function TPreviewBrowser.PreviewDbClick(Sender: TObject): WordBool;
-begin
-    // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
-    PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
-    Result := True;
-end;
-
 end.

--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -462,7 +462,7 @@ begin
     // ƒMƒRƒiƒr‚̃tƒH[ƒJƒX‚ð’D‚Á‚Ä‚é‚̂ŃtƒH[ƒ€‚É–³—‚â‚è•Ô‚·
     Blur;
     // Ž©•ª‚ÅŽ©•ª‚͏Á‚¹‚È‚¢‚̂ŁAƒƒbƒZ[ƒWŒo—R‚ŏÁ‚µ‚Ä‚à‚炤
-    PostMessage( GikoForm.Handle , USER_POPUPCLEAR, Integer( Self ), 0 );
+    PostMessage( GikoForm.Handle , USER_RESPOPUPCLEAR, Integer( Self ), 0 );
     Result := True;
 end;
 initialization

--- a/Setting.pas
+++ b/Setting.pas
@@ -464,8 +464,6 @@ type
         FRespopupWait: Integer;
         //! ƒ[ƒ‹—“ƒŒƒXƒ|ƒbƒvƒAƒbƒv
         FRespopupMailTo: Boolean;
-        //! Œë”šƒ`ƒFƒbƒN
-        FUseGobakuCheck: Boolean;
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -836,8 +834,6 @@ type
         //! ƒŒƒXƒ|ƒbƒvƒAƒbƒvƒ^ƒCƒ}[
         property RespopupWait: Integer read FRespopupWait write FRespopupWait;
         property RespopupMailTo: Boolean read FRespopupMailTo write FRespopupMailTo;
-        //! Œë”šƒ`ƒFƒbƒN
-        property UseGobakuCheck: Boolean read FUseGobakuCheck write FUseGobakuCheck; 
 end;
 
 
@@ -1275,7 +1271,6 @@ begin
 		// ƒGƒfƒBƒ^
 		FSpaceToNBSP	:= ini.ReadBool( 'Editor', 'SpaceToNBSP', False );
 		FAmpToCharRef	:= ini.ReadBool( 'Editor', 'AmpToCharRef', False );
-        FUseGobakuCheck := ini.ReadBool( 'Editor', 'UseGobakuCheck', True );
 
 		//TabŽ©“®•Û‘¶A“ǂݍž‚Ý
 		FTabAutoLoadSave    := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
@@ -1339,8 +1334,6 @@ begin
         FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
         FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
 
-
-
         // ƒMƒRƒiƒrXV‚Å—˜—p‚µ‚½ƒCƒ“ƒXƒg[ƒ‰‚̍폜
         s := ini.ReadString('Update', 'Remove0', '');
         if (FileExists(s)) then begin
@@ -1694,11 +1687,10 @@ begin
 		// ƒGƒfƒBƒ^
 		ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
 		ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
-        ini.WriteBool( 'Editor', 'UseGobakuCheck', FUseGobakuCheck );
 
                 //ƒ^ƒuŽ©“®•Û‘¶
 		ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
-        ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL);
+        ini.WriteString('Thread', 'LastCloseTabURL', FLastCloseTabURL); 
                 //Ú×Ý’è
 		ini.WriteInteger('OptionDialog', 'KuroutTabIndex', FKuroutSettingTabIndex);
 
@@ -1739,7 +1731,6 @@ begin
         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/readme.txt
+++ b/readme/readme.txt
@@ -91,7 +91,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) + IE8
+OS     FWindowsXP Professional Edition(SP3) + IE7
          WindowsXP Professional Edition(SP1) + IE6(SP1)
          Windows2000 Professional (SP4) + IE6(SP1)
 
@@ -123,25 +123,7 @@ LICENSE
 ------------------------------
 2009/XX/YY
   Version ÊÞÀ60
-  ƒXƒŒƒbƒhˆê——‚̓ǂݍž‚ݏˆ—‚̍œK‰»
-  ÅV100ƒŒƒX•\Ž¦‚Ì•\Ž¦”‚ðƒIƒvƒVƒ‡ƒ“‰»iÚ×Ý’è‚Rj
-  ƒjƒRƒjƒR“®‰æ‚ւ̃Šƒ“ƒN‚ŃTƒ€ƒlƒCƒ‹‚ðƒvƒŒƒrƒ…[•\Ž¦‚·‚é‚悤‚É‚µ‚½
-  ƒuƒ‰ƒEƒUƒ|ƒbƒvƒAƒbƒvƒƒjƒ…[‚ŁAƒŒƒXƒ|ƒbƒvƒAƒbƒv’†‚̃XƒŒƒbƒh‚ð‘Ώۂɂ·‚é•s‹ï‡‚̑Ήž
-  zlib‚ð1.2.3‚ɍXV
-  ƒTƒEƒ“ƒhƒCƒxƒ“ƒg‚̃tƒ@ƒCƒ‹Žw’è‚̃fƒtƒHƒ‹ƒg‚ð‘Š‘ÎŽQÆ‚ɕύX
-  ƒŠƒ“ƒNŽž“®ì‚ÅŽw’èƒAƒvƒŠƒP[ƒVƒ‡ƒ“‚ɃIƒvƒVƒ‡ƒ“‚ðŽw’è‚·‚é‚Æ“®ì‚µ‚È‚¢•s‹ï‡‚̏C³
-  ˆÚ“]”ÂŒŸõ‚ŁAƒT[ƒo‚ª–³”½‰ž‚¾‚Əˆ—‚ªŠ®—¹‚µ‚È‚¢•s‹ï‡C³
-  ƒMƒRƒiƒrWiki FAQ‚ւ̃Šƒ“ƒNæ‚ðSourceForge“à‚ÌWikiƒy[ƒW‚ɕύX
-  ‰æ‘œƒvƒŒƒrƒ…[‚ðƒ_ƒuƒ‹ƒNƒŠƒbƒN‚ŏÁ‚¹‚é‚悤‚ɏC³
-  u‚±‚±‚ɃŒƒXv‚Ń}ƒEƒXƒJ[ƒ\ƒ‹’¼‰º‚ɕʃXƒŒƒbƒh‚ւ̃Šƒ“ƒN‚ª‚ ‚é‚ƌ딚‚·‚é•s‹ï‡‚̏C³
-  ƒŒƒX‚̃ƒjƒ…[‚É"‚±‚̃ŒƒX‚ÌURLƒRƒs["‚ð’ljÁB
-  ƒŠƒ“ƒN—š—ð‚Ì–ß‚é^i‚ނŁAƒVƒ‡[ƒgƒJƒbƒgƒL[‚Éctrl/shift‚ð‘g‚ݍ‡‚킹‚é‚ƁAƒuƒ‰ƒEƒU‚ÅŠJ‚¢‚Ä‚µ‚Ü‚¤•s‹ï‡‚̏C³
-  I—¹Žž‚Ì‚¨‹C‚É“ü‚èƒtƒ@ƒCƒ‹iFavorite.xmlj‚Ì•Û‘¶ˆ—‚̏‡”ÔŒ©’¼‚µ
-
-2009/02/28
-  Version ÊÞÀ59 ƒŠƒŠ[ƒX2
-  ƒMƒRƒiƒrXV‚ŁAl’Œ”Å‚ð‘I‘ð‚µ‚Ä‚à³Ž®”ł̃Cƒ“ƒXƒg[ƒ‰‚ðDL‚·‚é•s‹ï‡‚̏C³
-  ‚Ü‚¿BBS‚ÌŽd—l•ÏX(2009/02/24)‘Ήž
+
 
 2009/02/01
   Version ÊÞÀ59

--- 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	= 21;
+	REVISION_VERSION	= 20;
 
 // =========================================================================
 // ŽG—pŠÖ”
@@ -268,7 +268,6 @@ var
 	foundPos	: Integer;
 const
 	BBS_HOST		= 'machi.to';
-	BBS_HOST2		= 'machibbs.com';    
 	THREAD_MARK	= '/bbs/read.pl';
     THREAD_MARK2= '/bbs/read.cgi';
 begin
@@ -293,23 +292,7 @@ begin
 				else
 					Result := atBBS;
 			end else begin
-                foundPos := AnsiPos( BBS_HOST2, uri.Host );
-                if (foundPos > 0) and (Length( uri.Host ) - foundPos + 1 = Length( BBS_HOST2 )) 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
-                        Result := atBoard
-                    else
-                        Result := atBBS;
-                end else begin
-
-                    Result := atNoAccept;
-                end;
+				Result := atNoAccept;
 			end;
 		finally
 			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 @@
 [Setting]
-academy6=40
-anchorage=40
-@liveplus=20
-atlanta=5
-changi=40
-dubai=40
-ex24=40
-@ogame2=20
-gimpo=40
-hideyoshi=40
-ipv6=40
-jfk=40
-live23=20
-live24=20
-love6=40
-mamono=40
-namidame=40
-pc11=40
-pc12=40
-qb5=40
-@sec2chd=20
-schiphol=40
-science6=40
-society6=40
-takeshima=40
-tsushima=40
+@endless=20
+@liveplus=10
+@news=156
 @newsplus=128
-yutori=40
-babiru=20
-qiufen=20
-set=20
-venus=20
-yomi=20
+@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