Commit: 26058f9dc400818f20faa21f4e58f27472fe8787 - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revisión: 26058f9dc400818f20faa21f4e58f27472fe8787 (tree)
• Tiempo: 2009-10-12 22:15:15
• Autor: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Cambiar Resumen

• modified: Giko.pas
• modified: HTMLCreate.pas
• modified: PopupMenuSetting.pas
• modified: gikoNavi.res
• modified: readme/gikoSetup.iss
• modified: readme/gikoUSetup.iss
• modified: readme/readme.txt
• modified: res/default/Samba.default

Diferencia incremental

--- a/Giko.pas
+++ b/Giko.pas
@@ -3869,7 +3869,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := False;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := False;
 	end else if TObject(FClickNode.Data) is TBoard then begin
 		TreeSelectThreadPupupMenu.Visible := False;
 		TreeSelectBoardPupupMenu.Visible := True;
@@ -3880,7 +3879,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := True;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := True;
 	end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin
 		TreeSelectThreadPupupMenu.Visible := False;
 		TreeSelectBoardPupupMenu.Visible := True;
@@ -3891,7 +3889,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := True;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := False;
 	end else if (TObject(FClickNode.Data) is TThreadItem) then begin
 		TreeSelectThreadPupupMenu.Visible := True;
 		TreeSelectBoardPupupMenu.Visible := False;
@@ -3902,7 +3899,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := True;
 		TreeSelectLogDeleteSeparator.Visible := True;
 		TreeSelectLogDeletePopupMenu.Visible := True;
-        SearchBoardName.Visible := False;
 	end else if (TObject(FClickNode.Data) is TFavoriteThreadItem) then begin
 		TreeSelectThreadPupupMenu.Visible := True;
 		TreeSelectBoardPupupMenu.Visible := False;
@@ -3913,7 +3909,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := True;
 		TreeSelectLogDeleteSeparator.Visible := True;
 		TreeSelectLogDeletePopupMenu.Visible := True;
-        SearchBoardName.Visible := False;
 	end else if (TObject(FClickNode.Data) is TCategory) then begin
 		TreeSelectThreadPupupMenu.Visible := False;
 		TreeSelectBoardPupupMenu.Visible := False;
@@ -3924,7 +3919,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := False;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := True;
 	end else if FClickNode.IsFirstNode then begin
 		TreeSelectThreadPupupMenu.Visible := False;
 		TreeSelectBoardPupupMenu.Visible := False;
@@ -3935,7 +3929,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := False;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := True;
 	end else begin
 		TreeSelectThreadPupupMenu.Visible := False;
 		TreeSelectBoardPupupMenu.Visible := False;
@@ -3946,7 +3939,6 @@ begin
 		TreeSelectFavoriteAddPupupMenu.Visible := False;
 		TreeSelectLogDeleteSeparator.Visible := False;
 		TreeSelectLogDeletePopupMenu.Visible := False;
-        SearchBoardName.Visible := False;
 	end;
 end;
 

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -600,7 +600,6 @@ const
 	_END: string = '&END=';
 var
 	i, j, k: Integer;
-    hpos, qpos : Integer;
 	tmp: string;
 	res: string;
 begin
@@ -628,21 +627,10 @@ begin
 		end else begin
 			k := LastDelimiter('/', tmp);
 			Delete(tmp, 1, k);
-            hpos := AnsiPos('-', tmp);
-            qpos := AnsiPos('"', tmp);
-            if ( (hpos > 0) and (qpos > 0) ) then begin
-                if ( qpos < hpos ) then begin
-                    Delete(tmp, qpos, Length(tmp));
-                end else begin
-                    Delete(tmp, hpos, Length(tmp));
-                end;
-            end else begin
-                if ( qpos > 0 ) then begin
-                    Delete(tmp, qpos, Length(tmp));
-                end else if ( qpos > 0 ) then begin
-                    Delete(tmp, hpos, Length(tmp));
-                end;
-            end;
+			if AnsiPos('-', tmp) < AnsiPos('"', tmp) then
+				Delete(tmp, AnsiPos('-', tmp), Length(tmp))
+			else
+				Delete(tmp, AnsiPos('"', tmp), Length(tmp));
 
 			PRes.FBody := PRes.FBody + '<a href="#' + tmp + '">';
 		end;

--- a/PopupMenuSetting.pas
+++ b/PopupMenuSetting.pas
@@ -63,7 +63,7 @@ var
 implementation
 
 uses
-    PopupMenuUtil, IniFiles, GikoSystem, ToolBarUtil, GikoUtil;
+    PopupMenuUtil, IniFiles, GikoSystem, ToolBarUtil;
 {$R *.dfm}
 //! ƒRƒ“ƒXƒgƒ‰ƒNƒ^iˆø”’ljÁj
 constructor TPopupMenuSettingDialog.Create(AOwner: TComponent; ActionList: TActionList);
@@ -467,8 +467,6 @@ begin
 end;
 //! “K—pƒ{ƒ^ƒ“‰Ÿ‰ºˆ—
 procedure TPopupMenuSettingDialog.ApplyButtonClick(Sender: TObject);
-const
-    MSG = 'Ý’è‚ð•Û‘¶‚µ‚Ü‚µ‚½BÄ‹N“®Œã‚É—LŒø‚É‚È‚è‚Ü‚·B';
 var
     ini : TMemIniFile;
     sec, key, subkey : String;
@@ -498,9 +496,6 @@ begin
             node := node.GetNext;
         end;
         ini.UpdateFile;
-
-		MsgBox(Self.Handle, MSG, 'ƒMƒRƒiƒr', MB_OK or MB_ICONINFORMATION);
-
     finally
         ini.Free;
     end;

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

--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -9,12 +9,12 @@ DefaultDirName={pf}\gikonavi
 VersionInfoDescription=ƒMƒRƒiƒrƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€
 DefaultGroupName=ƒMƒRƒiƒr
 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
-SourceDir=G:\Release61
+SourceDir=G:\Release60
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.61.1.801
-OutputBaseFilename=gikoNavi_b61_setup
+VersionInfoVersion=1.60.2.794
+OutputBaseFilename=gikoNavi_b60_2_setup
 
 
 

--- a/readme/gikoUSetup.iss
+++ b/readme/gikoUSetup.iss
@@ -14,12 +14,12 @@ DefaultDirName={pf}\gikonavi
 VersionInfoDescription=ƒMƒRƒiƒrƒZƒbƒgƒAƒbƒvƒvƒƒOƒ‰ƒ€
 DefaultGroupName=ƒMƒRƒiƒr
 ; Ž©•ª‚̊‹«‚ɍ‡‚킹‚Ä‚­‚¾‚³‚¢
-SourceDir=G:\Release61
+SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; ƒMƒRƒiƒr‚̃o[ƒWƒ‡ƒ“‚É‚ ‚킹‚Ä‚­‚¾‚³‚¢
-VersionInfoVersion=1.61.1.801
-OutputBaseFilename=gikoNavi_b61_usetup
+VersionInfoVersion=1.61.0.798
+OutputBaseFilename=gikoNavi_b61_798_usetup
 CreateUninstallRegKey=no
 
 [Tasks]

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ61 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ60 Readme.txt
 
 
 ------------------------------
@@ -121,13 +121,8 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2009/10/18
+2009/XX/YY
   Version ÊÞÀ61
-  ‚µ‚½‚ç‚ÎJBBS‚ŃXƒŒƒbƒh‚ðŒš‚Ä‚é‚±‚Æ‚ª‚Å‚«‚È‚¢•s‹ï‡‚̏C³
-  ƒGƒfƒBƒ^‚̃vƒŒƒrƒ…[‚ŁA2‚¿‚á‚ñ‚Ë‚é‚Ì12Œ…ƒgƒŠƒbƒv‚ɑΉž
-  ƒƒCƒ“ƒƒjƒ…[‚́uƒc[ƒ‹v‚Ɂuƒ|ƒbƒvƒAƒbƒvƒƒjƒ…[Ý’èv‚ð’ljÁ
-  HTML‰»‚µ‚Ä•Û‘¶‚·‚éÛ‚ɁAƒŒƒXƒAƒ“ƒJ[‚̃^ƒO“à‚̃_ƒuƒ‹ƒNƒH[ƒg‚ª—]•ª‚É“ü‚é•s‹ï‡‚̏C³
-  ƒLƒƒƒrƒlƒbƒg‚ª—š—ð“™‚Å‚à"”–¼ŒŸõ"‚ªƒ|ƒbƒvƒAƒbƒvƒƒjƒ…[‚ª•\Ž¦‚³‚ê‚é•s‹ï‡‚̏C³
 
 2009/06/17
   Version ÊÞÀ60 ƒŠƒŠ[ƒX2

--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,10 +1,12 @@
 [Setting]
 academy6=40
 anchorage=40
-@bgame=60
+@liveplus=20
 atlanta=5
 changi=40
 dubai=40
+ex24=40
+@ogame2=20
 gimpo=40
 hideyoshi=40
 ipv6=40
@@ -15,17 +17,16 @@ love6=40
 mamono=40
 namidame=40
 pc11=40
+pc12=40
 qb5=40
 @sec2chd=20
 schiphol=40
 science6=40
 society6=40
+takeshima=40
 tsushima=40
 @newsplus=128
 yutori=40
-yutori7=40
-@liveplus=20
-@ogame2=20
 babiru=20
 qiufen=20
 set=20