Commit: 0f2143912fead3bf8f556a2a46d82f25ed813dbb - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: 0f2143912fead3bf8f556a2a46d82f25ed813dbb (tree)
• Time: 2009-06-07 12:11:09
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Editor.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• 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

Incremental Difference

--- 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/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/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
@@ -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