OSDN > Developer >

sado > Chamber > gikonavi > Commit

sado

gikonavi
Fork

Fork origin: gikonavigoeson / gikonavi

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	1b469200270c9b16b8f3ce3456ba946e81b88a2c (tree)
Time	2009-01-25 18:38:16
Author	cvs2git <cvs2git>
Commiter	cvs2git

Log Message

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

Change Summary

modified: Editor.pas (diff)
modified: Giko.dfm (diff)
modified: Giko.pas (diff)
modified: GikoDataModule.pas (diff)
modified: NewBoardURL.pas (diff)
modified: RoundData.pas (diff)
modified: Setting.pas (diff)
modified: UpdateCheck.dfm (diff)
modified: UpdateCheck.pas (diff)
modified: gikoNavi.res (diff)
modified: readme/gikoSetup.iss (diff)
modified: readme/gikoUSetup.iss (diff)
modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr (diff)
modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res (diff)

Incremental Difference

--- a/Editor.pas

+++ b/Editor.pas

		@@ -1882,61 +1882,31 @@ const
1882	1882	VAL_PON = 'PON=';
1883	1883	EXPIRES_MARK = 'expires=';
1884	1884	var
1885		- i, pos: Integer;
	1885	+// i: Integer;
1886	1886	tmp : string;
1887	1887	val : string;
1888		- curCookies : TStringList;
1889		- tmpCookieName : string;
1890	1888	begin
1891		- // 2008.12.14 ³ðNAµÄÍ¢¯È¢ by à¶ã
1892		- curCookies := TStringList.Create;
1893		- curCookies.Delimiter := ';';
1894		- curCookies.DelimitedText := ABoard.Cookie;
1895	1889	ABoard.Cookie := '';
1896		- try
1897		- while (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
1898		- tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
1899		- Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
1900		- //CookieðØèo·
1901		- val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
1902		- if( AnsiPos(VAL_SPID, val) > 0 ) then begin
1903		- ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
1904		- end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
1905		- ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
1906		- end else begin
1907		- // ù¶ÌCookieÌêÍl¾¯t¯Ö¦é
1908		- pos := AnsiPos('=', val);
1909		- if pos > 0 then begin
1910		- tmpCookieName := Copy(val, 0, pos - 1);
1911		- for i := 0 to curCookies.Count - 1 do begin
1912		- if (curCookies.IndexOfName(tmpCookieName) >= 0) then begin
1913		- curCookies.Values[tmpCookieName] := Copy(val, pos + 1, Length(val));
1914		- tmpCookieName := '';
1915		- break;
1916		- end;
1917		- end;
1918		- if (tmpCookieName <> '') then begin
1919		- curCookies.Add(val);
1920		- end;
1921		- end;
1922		- //tmpCookie := tmpCookie + val + '; ';
1923		- end;
1924		- //expiresðØèo·
1925		- val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
1926		- if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
1927		- Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
1928		- ABoard.Expires := GMTToLocalDateTime(val);
1929		- end;
1930		- end;
1931		- for i := 0 to curCookies.Count - 1 do begin
1932		- if (curCookies.Strings[i] <> '') then begin
1933		- ABoard.Cookie := ABoard.Cookie + curCookies.Strings[i] + '; ';
1934		- end;
1935		- end;
1936		-
1937		- finally
1938		- curCookies.Free;
1939		- end;
	1890	+ while (AnsiPos(COOKIE_MARK, Rawtext) > 0 ) do begin
	1891	+ //i := 0;
	1892	+ tmp := Copy(Rawtext, AnsiPos(COOKIE_MARK, Rawtext) + Length(COOKIE_MARK), Length(Rawtext));
	1893	+ Delete(Rawtext, 1, AnsiPos('Set-Cookie', Rawtext)+ Length(COOKIE_MARK));
	1894	+ //CookieðØèo·
	1895	+ val := Trim(GikoSys.GetTokenIndex(tmp, ';', 0));
	1896	+ if( AnsiPos(VAL_SPID, val) > 0 ) then begin
	1897	+ ABoard.SPID := Copy(val, AnsiPos(VAL_SPID, val) + Length(VAL_SPID), Length(val));
	1898	+ end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
	1899	+ ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
	1900	+ end else begin
	1901	+ ABoard.Cookie := ABoard.Cookie + val + '; ';
	1902	+ end;
	1903	+ //expiresðØèo·
	1904	+ val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));
	1905	+ if( AnsiPos(EXPIRES_MARK, val) > 0) then begin
	1906	+ Delete(val, 1, AnsiPos(EXPIRES_MARK, val) + Length(EXPIRES_MARK) - 1);
	1907	+ ABoard.Expires := GMTToLocalDateTime(val);
	1908	+ end;
	1909	+ end;
1940	1910	end;
1941	1911	//! hiddenf[^æ¾
1942	1912	procedure TEditorForm.GetHiddenParameter(Rawtext: String; ABoard: TBoard);

--- a/Giko.dfm

+++ b/Giko.dfm

		@@ -7609,6 +7609,12 @@ object GikoForm: TGikoForm
7609	7609	object N84: TMenuItem
7610	7610	Caption = '-'
7611	7611	end
	7612	+ object UpdateGikonaviAction1: TMenuItem
	7613	+ Action = GikoDM.UpdateGikonaviAction
	7614	+ end
	7615	+ object N7: TMenuItem
	7616	+ Caption = '-'
	7617	+ end
7612	7618	object DeleteMenu: TMenuItem
7613	7619	Action = GikoDM.LogDeleteAction
7614	7620	end

		@@ -8157,12 +8163,6 @@ object GikoForm: TGikoForm
8157	8163	object N38: TMenuItem
8158	8164	Caption = '-'
8159	8165	end
8160		- object UpdateGikonaviAction1: TMenuItem
8161		- Action = GikoDM.UpdateGikonaviAction
8162		- end
8163		- object N7: TMenuItem
8164		- Caption = '-'
8165		- end
8166	8166	object AboutMenu: TMenuItem
8167	8167	Action = GikoDM.AboutAction
8168	8168	end

--- a/Giko.pas

+++ b/Giko.pas

		@@ -424,7 +424,6 @@ type
424	424	N84: TMenuItem;
425	425	procedure FormCreate(Sender: TObject);
426	426	procedure FormDestroy(Sender: TObject);
427		- procedure SaveSettingAll();
428	427	procedure BrowserStatusTextChange(Sender: TObject;
429	428	const Text: WideString);
430	429	procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);

		@@ -609,8 +608,6 @@ type
609	608	FPreviewBrowserRect: TRect; ///< vr[Ì\¦ÊuðL¯·é
610	609	FActionListGroupIndexes: array of Integer; ///<GikoDMãÌANVXgÌeANVÉÝè³ê½GroupIndexðÛ¶·ézñ
611	610	FResPopupBrowser: TResPopupBrowser;
612		- FUpdateExePath: string; ///MRirXVCXg[pX
613		- FUpdateExeArgs: string; ///MRirXVCXg[ø
614	611	procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
615	612	procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
616	613	procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);

		@@ -738,9 +735,6 @@ type
738	735	property ScreenCursor : TCursor read GetScreenCursor write SetScreenCursor;
739	736	property ActiveBBS : TBBS read FActiveBBS write FActiveBBS;
740	737	property WorkCount: Integer read FWorkCount write FWorkCount;
741		- property UpdateExePath: string read FUpdateExePath write FUpdateExePath;
742		- property UpdateExeArgs: string read FUpdateExeArgs write FUpdateExeArgs;
743		-
744	738	procedure SetContent(inThread: TBrowserRecord);
745	739	function GetActiveContent(popup :Boolean = false): TThreadItem;
746	740	function GetActiveList: TObject;

		@@ -934,8 +928,6 @@ begin
934	928	FResPopupBrowser := nil;
935	929	CreateBrowsers(BROWSER_COUNT);
936	930	FIconData.uID := 0;
937		- FUpdateExePath := '';
938		- FUpdateExeArgs := '';
939	931
940	932	//j[tHg
941	933	SetMenuFont;

		@@ -1500,9 +1492,7 @@ begin
1500	1492	GikoDM.TabsOpenAction.Execute;
1501	1493	GikoDM.TabsOpenAction.Tag := 0;
1502	1494	if (GikoSys.Setting.LastCloseTabURL <> '') then begin
1503		- if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
1504		- PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
1505		- end;
	1495	+ PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 );
1506	1496	if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
1507	1497	while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and
1508	1498	(FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin

		@@ -1560,25 +1550,38 @@ begin
1560	1550
1561	1551	Application.UnhookMainWindow(Hook);
1562	1552	//AvP[VI¹ÌOÉ_E[hXbhÉ³íI¹ð£·
1563		- FControlThread.DownloadAbort;
1564	1553	FControlThread.Terminate;
1565		-
1566		- //OnDestory¾ÆÄN®ð©¯½Æ«ÈÇÉÛ¶³êÈ¢ÌÅOnCloseQueryÅÝèÛ¶
1567		- SaveSettingAll();
1568		-
1569	1554	Application.Terminate;
1570	1555	end;
1571	1556
1572		-procedure TGikoForm.SaveSettingAll();
	1557	+procedure TGikoForm.FormDestroy(Sender: TObject);
1573	1558	var
	1559	+ i : Integer;
1574	1560	wp : TWindowPlacement;
	1561	+ tmpBool : Boolean;
1575	1562	WindowPlacement: TWindowPlacement;
1576	1563	begin
	1564	+ // ^XNgCÌACRí
	1565	+ if (FIconData.uID <> 0) then begin
	1566	+ Shell_NotifyIcon(NIM_DELETE, @FIconData);
	1567	+ end;
	1568	+
	1569	+ // }EXWFX`[Jú
	1570	+ try
	1571	+ if GikoSys.Setting.GestureEnabled then begin
	1572	+ MouseGesture.OnGestureStart := nil;
	1573	+ MouseGesture.OnGestureMove := nil;
	1574	+ MouseGesture.OnGestureEnd := nil;
	1575	+ end;
	1576	+ MouseGesture.Clear;
	1577	+ MouseGesture.UnHook;
	1578	+ MouseGesture.Free;
	1579	+ except
	1580	+ end;
1577	1581	try
1578	1582	ActiveListColumnSave;
1579	1583	except
1580	1584	end;
1581		-
1582	1585	try
1583	1586	WindowPlacement.length := SizeOf(TWindowPlacement);
1584	1587	GetWindowPlacement(Self.Handle, @WindowPlacement);

		@@ -1611,11 +1614,20 @@ begin
1611	1614	GikoSys.Setting.ResRange := FResRangeMenuSelect;
1612	1615	except
1613	1616	end;
1614		- //¡ÌwinodwÌX^CÅCoolBarÌÊuAEBhEÌÊuðÛ¶
1615		- SaveCoolBarSettings;
1616		- GikoSys.Setting.WriteWindowSettingFile;
1617		- // ¼OÆ[ÌÛ¶ÈÌÅGfB^ªÂ¶½ãÈç¢ÂÅà¢¢
1618		- GikoSys.Setting.WriteNameMailSettingFile;
	1617	+ if WindowState <> wsNormal then
	1618	+ WindowState := wsNormal;
	1619	+ SaveCoolBarSettings;
	1620	+ try
	1621	+ GikoSys.Setting.WriteWindowSettingFile;
	1622	+ GikoSys.Setting.WriteNameMailSettingFile;
	1623	+ except
	1624	+ end;
	1625	+ // A^CÉÛ¶³êéÌÅAÜ½AEBhETCYª CoolBar æè
	1626	+ // ¬³ÈÁÄ¢éÆ«ÉÛ¶·éÆlªã«³êÄµÜ¤ÌÅ±±ÅÍÛ¶µÈ¢
	1627	+
	1628	+ // ªFormDestroyÉÚ®µ½ÌÅA±±ÅÛ¶µÈ¢Æ¢¯È¢Æv¤Bià¶ã@2004/04/09j
	1629	+ // CoolBar Û¶
	1630	+ //if (GikoForm.WindowState <> wsMinimized) and (GikoForm.WindowState <> wsMaximized) then
1619	1631
1620	1632	//üÍAVXg@\ÌÝèÌÛ¶
1621	1633	InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);

		@@ -1627,71 +1639,10 @@ begin
1627	1639	if not (FavoriteDM.AbEnd) then begin
1628	1640	FavoriteDM.WriteFavorite;
1629	1641	end;
1630		- except
1631		- end;
1632		-
1633		- //AhXðÛ¶
1634		- try
1635		- //AddressHistoryDMÍ©®¶¬tH[ÈÌÅAðúÍ©®IÉ³êéB
1636		- AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount);
1637		- except
1638		- end;
1639		-
1640		- //qXgXgÛ¶
1641		- try
1642		- FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml');
1643		- except
1644		- end;
1645		-
1646		- //ñXgÛ¶
1647		- try
1648		- RoundList.SaveRoundFile;
1649		- except
1650		- end;
1651		-
1652		- // ^XNgCÌACRí
1653		- if (FIconData.uID <> 0) then begin
1654		- Shell_NotifyIcon(NIM_DELETE, @FIconData);
1655		- end;
1656		-
1657		-end;
1658		-
1659		-procedure TGikoForm.FormDestroy(Sender: TObject);
1660		-var
1661		- i : Integer;
1662		- tmpBool : Boolean;
1663		-begin
1664		- //êIÉÊíX^CÉßµÄCoolBarÌÊuAEBhEÌÊuðÛ¶
1665		- //¦ÓFOnDestroyÅg¤±Æµ©l¶³êÄ¢È¢
1666		- // ¼ÅâéÆÄ`æª¶·é
1667		- if WindowState <> wsNormal then begin
1668		- WindowState := wsNormal;
1669		- try
1670		- SaveCoolBarSettings;
1671		- GikoSys.Setting.WriteWindowSettingFile;
1672		- except
1673		- end;
1674		- end;
1675		-
1676		- // }EXWFX`[Jú
1677		- try
1678		- if GikoSys.Setting.GestureEnabled then begin
1679		- MouseGesture.OnGestureStart := nil;
1680		- MouseGesture.OnGestureMove := nil;
1681		- MouseGesture.OnGestureEnd := nil;
1682		- end;
1683		- MouseGesture.Clear;
1684		- MouseGesture.UnHook;
1685		- MouseGesture.Free;
1686		- except
1687		- end;
1688		-
1689		- //¨CÉüèjü
1690		- try
1691	1642	FavoriteDM.Clear;
1692	1643	except
1693	1644	end;
1694		-
	1645	+ //LockWindowUpdate(Self.Handle);
1695	1646	try
1696	1647	//^uN[Y
1697	1648	tmpBool := GikoSys.Setting.ShowDialogForAllTabClose;

		@@ -1700,7 +1651,6 @@ begin
1700	1651	GikoSys.Setting.ShowDialogForAllTabClose := tmpBool;
1701	1652	except
1702	1653	end;
1703		-
1704	1654	try
1705	1655	for i := FBrowsers.Count - 1 downto 0 do begin
1706	1656	GikoSys.ShowRefCount('browser' + IntToStr(i), TWebBrowser(FBrowsers[i]).ControlInterface);

		@@ -1715,7 +1665,6 @@ begin
1715	1665	finally
1716	1666	FBrowsers.Free;
1717	1667	end;
1718		-
1719	1668	try
1720	1669	if BrowserNullTab <> nil then begin
1721	1670	BrowserNullTab.Browser := nil; {*BrowserNullTabÌBrowserÍÝvÉ\èt¯Äéz

		@@ -1734,6 +1683,18 @@ begin
1734	1683	except
1735	1684	end;
1736	1685
	1686	+ //AhXðÛ¶
	1687	+ try
	1688	+ //AddressHistoryDMÍ©®¶¬tH[ÈÌÅAðúÍ©®IÉ³êéB
	1689	+ AddressHistoryDM.WriteHistory(AddressComboBox.Items, GikoSys.Setting.MaxRecordCount);
	1690	+ except
	1691	+ end;
	1692	+
	1693	+ //qXgXgÛ¶
	1694	+ try
	1695	+ FHistoryList.SaveToFile(GikoSys.GetConfigDir + 'History.xml');
	1696	+ except
	1697	+ end;
1737	1698	try
1738	1699	try
1739	1700	FHistoryList.Clear;

		@@ -1743,7 +1704,11 @@ begin
1743	1704	FHistoryList.Free;
1744	1705	end;
1745	1706
1746		-
	1707	+ //ñXgÛ¶&jü
	1708	+ try
	1709	+ RoundList.SaveRoundFile;
	1710	+ except
	1711	+ end;
1747	1712	try
1748	1713	try
1749	1714	RoundList.Clear;

		@@ -1755,7 +1720,7 @@ begin
1755	1720
1756	1721	try
1757	1722	try
1758		- //FControlThread.DownloadAbort;
	1723	+ FControlThread.DownloadAbort;
1759	1724	FControlThread.Terminate;
1760	1725	FControlThread.WaitFor;
1761	1726	except

		@@ -1807,12 +1772,7 @@ begin
1807	1772	end;
1808	1773	except
1809	1774	end;
1810		-
1811		- // Updateª¢êÎÀs·é
1812		- if FileExists(FUpdateExePath) then begin
1813		- // Abvf[gÀs
1814		- GikoSys.CreateProcess(FUpdateExePath, FUpdateExeArgs);
1815		- end;
	1775	+ //LockWindowUpdate(0);
1816	1776	end;
1817	1777
1818	1778	// eÉ éLrlbgE BBS j[ðZbg^XV

--- a/GikoDataModule.pas

+++ b/GikoDataModule.pas

		@@ -4569,29 +4569,18 @@ procedure TGikoDM.UpdateGikonaviActionExecute(Sender: TObject);
4569	4569	var
4570	4570	form : TUpdateCheckForm;
4571	4571	Msg: string;
4572		- shutdown: boolean;
4573	4572	begin
4574	4573	if (EditorFormExists) then begin
4575	4574	Msg := 'XGfB^ðSÄÂ¶Ä¾³¢';
4576	4575	MsgBox(GikoForm.Handle, Msg, MSG_ERROR, MB_OK or MB_ICONSTOP);
4577	4576	Exit;
4578	4577	end;
4579		- GikoForm.UpdateExePath := '';
4580		- GikoForm.UpdateExeArgs := '';
4581	4578	form := TUpdateCheckForm.Create(Self);
4582	4579	try
4583	4580	form.ShowModal;
4584		- shutdown := form.Allowshutdown;
4585		- GikoForm.UpdateExePath := form.ExecPath;
4586		- GikoForm.UpdateExeArgs := form.ExecArgs;
4587	4581	finally
4588	4582	form.Release;
4589	4583	end;
4590		- if shutdown then begin
4591		- // MRirI¹
4592		- GikoForm.Close;
4593		- end;
4594		-
4595	4584	end;
4596	4585
4597	4586	end.

--- a/NewBoardURL.pas

+++ b/NewBoardURL.pas

		@@ -115,14 +115,9 @@ begin
115	115	newURL := IdHTTP.Response.Location;
116	116	end;
117	117	if (newURL <> '') then begin
118		- // _CNg·êÎK¸Ú]ÆÍÀçÈ¢
119		- // erÔgÂÈÇÌÎôÅãÌ'/'ÜÅðURLÆ·é
120		- if (Length(newURL) <> LastDelimiter('/', newURL)) then begin
121		- newURL := Copy(newURL, 1, LastDelimiter('/', newURL));
122		- end;
123	118	oldURL := URLs[i];
124		- if (oldURL <> newURL) then begin
125		- ResultMemo.Lines.Add('URL:' + oldURL + ' -> ' + newURL);
	119	+ ResultMemo.Lines.Add('URL:' + oldURL + ' -> ' + newURL);
	120	+ if (newURL <> '') then begin
126	121	oldURLs.Add( oldURL );
127	122	newURLs.Add( newURL );
128	123	end;

--- a/RoundData.pas

+++ b/RoundData.pas

		@@ -381,12 +381,6 @@ begin
381	381	end;
382	382	end;
383	383	//Item := TRoundItem.Create;
384		-
385		- if sl.Count = 0 then begin
386		- //G[¿·éÈÇµÄt@CÌàeªó¾ÆG[ÉÈéÎô
387		- sl.Add(ROUND_INDEX_VERSION);
388		- end;
389		-
390	384	delCount := 0;
391	385	//PsÚÍo[W
392	386	if sl[0] = ROUND_INDEX_VERSION then begin

		@@ -448,11 +442,6 @@ begin
448	442	end;
449	443	end;
450	444	//Item := TRoundItem.Create;
451		- if sl.Count = 0 then begin
452		- //G[¿·éÈÇµÄt@CÌàeªó¾ÆG[ÉÈéÎô
453		- sl.Add(ROUND_INDEX_VERSION);
454		- end;
455		-
456	445	delCount := 0;
457	446	//PsÚÍo[W
458	447	if sl[0] = ROUND_INDEX_VERSION then begin

--- a/Setting.pas

+++ b/Setting.pas

		@@ -1333,15 +1333,6 @@ begin
1333	1333
1334	1334	FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True);
1335	1335	FLimitResCountMessage := ini.ReadBool('Thread', 'LimitResCountMessage', True);
1336		-
1337		- // MRirXVÅpµ½CXg[Ìí
1338		- s := ini.ReadString('Update', 'Remove0', '');
1339		- if (FileExists(s)) then begin
1340		- SysUtils.DeleteFile(s);
1341		- // íÉ¸sµÄà³·é
1342		- ini.DeleteKey('Update', 'Remove0');
1343		- end;
1344		-
1345	1336	ini.UpdateFile;
1346	1337	finally
1347	1338	ini.Free;

--- a/UpdateCheck.dfm

+++ b/UpdateCheck.dfm

		@@ -31,15 +31,6 @@ object UpdateCheckForm: TUpdateCheckForm
31	31	TabOrder = 0
32	32	OnClick = UpdateButtonClick
33	33	end
34		- object NightBuildCheckButton: TButton
35		- Left = 368
36		- Top = 8
37		- Width = 107
38		- Height = 25
39		- Caption = #20154#26609#29256#26356#26032
40		- TabOrder = 1
41		- OnClick = NightBuildCheckButtonClick
42		- end
43	34	end
44	35	object Panel2: TPanel
45	36	Left = 0

		@@ -72,11 +63,11 @@ object UpdateCheckForm: TUpdateCheckForm
72	63	Request.BasicAuthentication = False
73	64	Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)'
74	65	HTTPOptions = [hoForceEncodeParams]
75		- Left = 304
	66	+ Left = 400
76	67	Top = 8
77	68	end
78	69	object IdAntiFreeze: TIdAntiFreeze
79		- Left = 336
	70	+ Left = 440
80	71	Top = 8
81	72	end
82	73	end

--- a/UpdateCheck.pas

+++ b/UpdateCheck.pas

		@@ -15,25 +15,16 @@ type
15	15	UpdateButton: TButton;
16	16	IdHTTP: TIdHTTP;
17	17	IdAntiFreeze: TIdAntiFreeze;
18		- NightBuildCheckButton: TButton;
19	18	procedure UpdateButtonClick(Sender: TObject);
20	19	procedure FormCreate(Sender: TObject);
21		- procedure NightBuildCheckButtonClick(Sender: TObject);
22	20	private
23	21	{ Private é¾ }
24		- FExecPath : string;
25		- FExecArgs : string;
26		- FAllowshutdown : Boolean;
27	22	function GetDesktopDir:string;
28	23	function GetDownloadFilePath(FileName: String): String;
29	24	function CreateShortCut(FileName, Argment, SavePath :string):boolean;
30	25	procedure DonwloadUpdate(url: String);
31		- function CheckUpdate(nightbuild :Boolean): Boolean;
32	26	public
33	27	{ Public é¾ }
34		- property ExecPath :String read FExecPath;
35		- property ExecArgs :String read FExecArgs;
36		- property Allowshutdown :Boolean read FAllowshutdown;
37	28	end;
38	29
39	30	var

		@@ -42,53 +33,18 @@ var
42	33	implementation
43	34	uses
44	35	GikoSystem, NewBoard, Giko, IniFiles, MojuUtils, GikoDataModule,
45		- ActiveX, ComObj, ShlObj, GikoUtil;
46		-
	36	+ ActiveX, ComObj, ShlObj;
	37	+
47	38	{$R *.dfm}
48		-//! ³KÅ
49		-procedure TUpdateCheckForm.UpdateButtonClick(Sender: TObject);
50		-begin
51		- if CheckUpdate(false) then begin
52		- if GikoUtil.MsgBox(Handle, 'XVª é½ßMRirðÄN®µÜ·©H', 'I¹mF',
53		- MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
54		- FAllowshutdown := True;
55		- close;
56		- end;
57		- end;
58		-end;
59		-//! lÅ
60		-procedure TUpdateCheckForm.NightBuildCheckButtonClick(Sender: TObject);
61		-begin
62		- if GikoUtil.MsgBox(Handle, '³®[XÅÅÍ èÜ¹ñªæëµ¢Å·©H', 'XVmF',
63		- MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
64		- if CheckUpdate(true) then begin
65		- if GikoUtil.MsgBox(Handle, 'XVª é½ßMRirðÄN®µÜ·©H', 'I¹mF',
66		- MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
67		- FAllowshutdown := True;
68		- close;
69		- end;
70		- end;
71		- end;
72		-end;
73	39
74		-//! Abvf[gÎÛmF
75		-function TUpdateCheckForm.CheckUpdate(nightbuild :Boolean): Boolean;
	40	+procedure TUpdateCheckForm.UpdateButtonClick(Sender: TObject);
76	41	const
77		-{$IFDEF DEBUG}
78		- CHECK_URL = 'http://gikonavi.sourceforge.jp/updater/debug.txt';
79		-{$ELSE}
80	42	CHECK_URL = 'http://gikonavi.sourceforge.jp/updater/latest.txt';
81		-{$ENDIF}
82	43	var
83	44	value : string;
84	45	ResStream: TMemoryStream;
85	46	downResult, current, newest: TStringList;
86		- newgiko: Boolean;
87	47	begin
88		- Result := false;
89		- FExecPath := '';
90		- FExecArgs := '';
91		- FAllowshutdown := False;
92	48	ResultMemo.Lines.Clear;
93	49	Screen.Cursor := crHourGlass;
94	50	UpdateButton.Enabled := False;

		@@ -114,35 +70,17 @@ begin
114	70	value := GikoSys.GzipDecompress(ResStream,
115	71	IdHTTP.Response.ContentEncoding);
116	72	downResult.Text := value;
117		- if (nightbuild) then begin
118		- ResultMemo.Lines.Add('ÅVÌnight buildÍA' + downResult.Values[ 'n_version' ]);
119		- newest.Text := MojuUtils.CustomStringReplace(downResult.Values[ 'n_version' ],
120		- '.', #10, false);
121		- end else begin
122		- ResultMemo.Lines.Add('ÅVÌMRirÍA' + downResult.Values[ 'version' ]);
123		- newest.Text := MojuUtils.CustomStringReplace(downResult.Values[ 'version' ],
	73	+ newest.Text := MojuUtils.CustomStringReplace(downResult.Values[ 'version' ],
124	74	'.', #10, false);
125		- end;
126	75	current.Text := MojuUtils.CustomStringReplace(GikoSys.Version,
127	76	'.', #10, false);
128	77	if newest.Count >= 2 then begin
129		- newgiko := false;
130		- // night buildÍArhÔ¾¯Å»è·é
131		- if (nightbuild) then begin
132		- newgiko := StrToInt(current[3]) < StrToInt(newest[3]);
133		- end else begin
134		- newgiko := ( StrToInt(current[1]) < StrToInt(newest[1]) ) or
135		- ( (StrToInt(current[1]) = StrToInt(newest[1]))) and
136		- ((StrToInt(current[2]) < StrToInt(newest[2])) );
137		- end;
138		- if (newgiko) then begin
139		- if GikoUtil.MsgBox(Handle, 'Vµ¢MRirª èÜ·B_E[hµÜ·©H', 'XVmF',
140		- MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin
	78	+ if ( StrToInt(current[1]) < StrToInt(newest[1]) ) or
	79	+ ( (StrToInt(current[1]) = StrToInt(newest[1]))) and
	80	+ ((StrToInt(current[2]) < StrToInt(newest[2])) ) then begin
	81	+ ResultMemo.Lines.Add('Vµ¢MRirª èÜ·B_E[hðJnµÜ·B' + downResult.Values[ 'url' ]);
141	82
142		- ResultMemo.Lines.Add('Vµ¢MRirª èÜ·B_E[hðJnµÜ·B' + downResult.Values[ 'url' ]);
143		- DonwloadUpdate(Trim(downResult.Values[ 'url' ]));
144		- Result := True;
145		- end;
	83	+ DonwloadUpdate(Trim(downResult.Values[ 'url' ]));
146	84	end else begin
147	85	ResultMemo.Lines.Add('¡ÌMRirªÅVÅ·B');
148	86	end;

		@@ -186,12 +124,12 @@ begin
186	124	IdHTTP.Get(url, fileStrem);
187	125	ResultMemo.Lines.Add(
188	126	IdHttp.ResponseText + '(' + IntToStr(IdHttp.ResponseCode) + ')');
189		- FExecPath := filename;
190		- FExecArgs := '/SP- /silent /noicons "/dir=' + GikoSys.GetAppDir + '"';
191	127	if CreateShortCut(
192		- execPath, execArgs, GetDesktopDir) then begin
	128	+ filename,
	129	+ '/SP- /silent /noicons "/dir=' + GikoSys.GetAppDir + '"'
	130	+ , GetDesktopDir) then begin
193	131	ResultMemo.Lines.Add('fXNgbvÉ"MRirXV"V[gJbgðì¬µÜµ½B');
194		- // ResultMemo.Lines.Add('MRirðI¹µÄA"MRirXV"V[gJbgð_uNbNµÄ¾³¢B');
	132	+ ResultMemo.Lines.Add('MRirðI¹µÄA"MRirXV"V[gJbgð_uNbNµÄ¾³¢B');
195	133	end else begin
196	134	ResultMemo.Lines.Add('fXNgbvÉV[gJbgðì¬Å«Ü¹ñÅµ½B');
197	135	end;

		@@ -263,9 +201,6 @@ end;
263	201	procedure TUpdateCheckForm.FormCreate(Sender: TObject);
264	202	begin
265	203	ResultMemo.Lines.Clear;
266		- FExecPath := '';
267		- FExecArgs := '';
268		- FAllowshutdown := False;
269	204	end;
270	205
271	206	end.

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

--- a/readme/gikoSetup.iss

+++ b/readme/gikoSetup.iss

		@@ -56,9 +56,6 @@ Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
56	56
57	57	[Code]
58	58	procedure CurStepChanged(CurStep: TSetupStep);
59		-var
60		- path :String;
61		- srcpath: String;
62	59	begin
63	60	case CurStep of
64	61	ssInstall:

		@@ -78,15 +75,6 @@ begin
78	75	end;
79	76	end;
80	77	end;
81		- ssPostInstall:
82		- begin
83		- path := ExpandConstant('{app}') + '\gikoNavi.ini';
84		- srcpath := ExpandConstant('{srcexe}');
85		- if (FileExists(path)) then
86		- begin
87		- SetIniString('Update', 'Remove0', srcpath, path);
88		- end;
89		- end;
90	78	end;
91	79
92	80	end;

--- a/readme/gikoUSetup.iss

+++ b/readme/gikoUSetup.iss

		@@ -7,7 +7,7 @@
7	7	AppName=MRir
8	8	AppVerName=MRir
9	9	AppId=gikoNavi
10		-AppMutex=gikoNaviInstance
	10	+AppMutex=http://gikonavi.sourceforge.jp/gikonavi/mutex
11	11	AppPublisherURL=http://gikonavi.sourceforge.jp/
12	12	AppendDefaultDirName = no
13	13	DefaultDirName={pf}\gikonavi

		@@ -18,8 +18,8 @@ SourceDir=G:\Release
18	18	OutputDir=G:\InnoSetup\Output
19	19	SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
20	20	; MRirÌo[WÉ í¹Ä¾³¢
21		-VersionInfoVersion=1.59.0.778
22		-OutputBaseFilename=gikoNavi_b59_778_usetup
	21	+VersionInfoVersion=1.59.0.769
	22	+OutputBaseFilename=gikoNavi_b59_769_usetup
23	23	CreateUninstallRegKey=no
24	24
25	25	[Tasks]

		@@ -63,49 +63,8 @@ Type: files; Name: "{app}\gikoNavi.ini"
63	63	Name: japanese; MessagesFile: compiler:Languages\Japanese.isl
64	64
65	65	[Code]
66		-function InitializeSetup(): Boolean;
67		-var
68		- timeout : Integer;
69		-begin
70		- Result := true;
71		- // ^CAEgÔ1ª
72		- timeout := 60 * 1000;
73		- // MRirÌN®~[ebNXð`FbN
74		- while CheckForMutexes('gikoNaviInstance') do begin
75		- // N®ÈÌÅX[v
76		- // Ü¸ÍA^CAEg`FbN
77		- if (timeout < 0) then begin
78		- // ^CAEg
79		- Result := False;
80		- break;
81		- end;
82		- timeout := timeout - 500;
83		- // X[v
84		- Sleep(500);
85		- end;
86		- // ^CAEgÍAè®ÅMRirVbg_Eðv
87		- if not Result Then begin
88		- if MsgBox('MRirªN®µÄ¢é©B®SÉI¹µÄ¢Ü¹ñBMRirÌI¹ðmFµÄ¾³¢B'
89		- + #10#13 + 'XVð±s·éÉÍ,uÍ¢v{^ðµÄ¾³¢B',
90		- mbConfirmation, MB_YESNO) = IDYES then begin
91		- Result := not CheckForMutexes('gikoNaviInstance');
92		- if not Result Then begin
93		- MsgBox('MRirªN®µÄ¢Ü·BMRirXVðLZµÜ·B'
94		- + #10#13 + 'MRirXVÍAfXNgbvÌuMRirXVvV[gJbg©çÄN®Å«Ü·B'
95		- , mbError, MB_OK);
96		- end;
97		- end else begin
98		- MsgBox('MRirXVðLZµÜ·B'
99		- + #10#13 + 'MRirXVÍAfXNgbvÌuMRirXVvV[gJbg©çÄN®Å«Ü·B'
100		- , mbError, MB_OK);
101		- end;
102		- end;
103		-end;
104	66
105	67	procedure CurStepChanged(CurStep: TSetupStep);
106		-var
107		- path :String;
108		- srcpath: String;
109	68	begin
110	69	case CurStep of
111	70	ssInstall:

		@@ -125,15 +84,6 @@ begin
125	84	end;
126	85	end;
127	86	end;
128		- ssPostInstall:
129		- begin
130		- path := ExpandConstant('{app}') + '\gikoNavi.ini';
131		- srcpath := ExpandConstant('{srcexe}');
132		- if (FileExists(path)) then
133		- begin
134		- SetIniString('Update', 'Remove0', srcpath, path);
135		- end;
136		- end;
137	87	end;
138	88
139	89	end;

--- a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr

+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr

		@@ -2,7 +2,7 @@ library ShitarabaJBBSPlugIn;
2	2
3	3	{
4	4	ShitarabaJBBSPlugIn
5		- $Id: ShitarabaJBBSPlugIn.dpr,v 1.46 2008/12/20 04:02:40 h677 Exp $
	5	+ $Id: ShitarabaJBBSPlugIn.dpr,v 1.45 2008/08/03 02:45:48 h677 Exp $
6	6	}
7	7
8	8	uses

		@@ -83,7 +83,7 @@ const
83	83	MAJOR_VERSION = 1;
84	84	MINOR_VERSION = 1;
85	85	RELEASE_VERSION = 'alpha';
86		- REVISION_VERSION = 18;
	86	+ REVISION_VERSION = 17;
87	87
88	88	SYNCRONIZE_MENU_CAPTION = 'µ½çÎJBBSÂXV';
89	89

		@@ -880,10 +880,11 @@ begin
880	880	tmpLine := AnsiLowerCase(tmpHTML[i]);
881	881	tS := AnsiPos('<a href="mailto:', tmpLine);
882	882	if tS > 0 then begin //A
883		- tE := AnsiPos('">', tmpLine);
884		- tmpDatToken[2] := Copy(tmpHTML[i], tS + 16, tE - (tS + 16));
885		- tmpHTML[i] := Copy(tmpHTML[i], tE + 5, Length(tmpHTML[i]));
886		- tmpHTML[i] := CustomStringReplace(tmpHTML[i], '</a>', '', true); end else begin //³µ
	883	+ tE := AnsiPos('">', tmpLine);
	884	+ tmpDatToken[2] := Copy(tmpHTML[i], tS + 16, tE - (tS + 16));
	885	+ tmpHTML[i] := Copy(tmpHTML[i], tE + 5, Length(tmpHTML[i]));
	886	+ tmpHTML[i] := CustomStringReplace(tmpHTML[i], '</a>', '', true);
	887	+ end else begin //³µ
887	888	tmpDatToken[2] := '';
888	889	end;
889	890	//====================//

		@@ -896,16 +897,7 @@ begin
896	897	tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '</b>', '', true);
897	898	tmpHTML[i] := Copy(tmpHTML[i], tE + 8, Length(tmpHTML[i]));
898	899	end else begin
899		- // eúÌÈ¢p^[ð~¤
900		- tE := AnsiPos('F', tmpLine);
901		- if tE > 0 then begin
902		- tmpDatToken[1] := Trim(Copy(tmpHTML[i], 1, tE - 1 ));
903		- tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '<b>', '', true);
904		- tmpDatToken[1] := CustomStringReplace(tmpDatToken[1], '</b>', '', true);
905		- tmpHTML[i] := Copy(tmpHTML[i], tE + 2, Length(tmpHTML[i]));
906		- end else begin
907		- tmpDatToken[1] := '';
908		- end;
	900	+ tmpDatToken[1] := '';
909	901	end;
910	902	//====================//
911	903	//==útÌæ¾==//

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

gikonavi Fork