| 修订版 | e359ba949930d66c4fcbc03d7e0142c562c5249a (tree) |
|---|---|
| 时间 | 2005-06-25 22:03:12 |
| 作者 | cvs2git <cvs2git> |
| Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'merged-remodeling'.
BoardGroup.pas (diff) Giko.pas (diff) RoundData.pas (diff)
gikoNavi.res (diff)| @@ -1960,19 +1960,10 @@ var | ||
| 1960 | 1960 | i : Integer; |
| 1961 | 1961 | begin |
| 1962 | 1962 | for i := Self.Count - 1 downto 0 do begin |
| 1963 | - try | |
| 1964 | - TBoard(Self.Objects[i]).Free; | |
| 1965 | - except | |
| 1966 | - end; | |
| 1963 | + TBoard(Self.Objects[i]).Free; | |
| 1967 | 1964 | end; |
| 1968 | 1965 | inherited Clear; |
| 1969 | - Self.Capacity := 0; | |
| 1970 | - try | |
| 1971 | - if FBoardPlugIn <> nil then | |
| 1972 | - FBoardPlugIn.Free; | |
| 1973 | - except | |
| 1974 | - end; | |
| 1975 | - | |
| 1966 | + Self.Capacity := 0; | |
| 1976 | 1967 | end; |
| 1977 | 1968 | |
| 1978 | 1969 |
| @@ -1840,6 +1840,8 @@ begin | ||
| 1840 | 1840 | if FStartUp then begin |
| 1841 | 1841 | ShowWindow(Application.Handle, SW_HIDE); |
| 1842 | 1842 | |
| 1843 | + | |
| 1844 | + | |
| 1843 | 1845 | //FormCreateでやると可視設定が反映されない場合があるのでFormShowでやることにした |
| 1844 | 1846 | //ツールバー表示 |
| 1845 | 1847 | StdToolBarVisibleAction.Checked := GikoSys.Setting.StdToolBarVisible; |
| @@ -2126,7 +2128,7 @@ begin | ||
| 2126 | 2128 | except |
| 2127 | 2129 | end; |
| 2128 | 2130 | |
| 2129 | - { | |
| 2131 | + | |
| 2130 | 2132 | try |
| 2131 | 2133 | for i := Length( BoardPlugIns ) - 1 downto 0 do begin |
| 2132 | 2134 | if BoardPlugIns[ i ] <> nil then |
| @@ -2135,7 +2137,7 @@ begin | ||
| 2135 | 2137 | end; |
| 2136 | 2138 | except |
| 2137 | 2139 | end; |
| 2138 | - } | |
| 2140 | + | |
| 2139 | 2141 | try |
| 2140 | 2142 | if FEvent <> nil then |
| 2141 | 2143 | FEvent.Free; |
| @@ -2221,26 +2223,6 @@ begin | ||
| 2221 | 2223 | //TreeViewクリア（BBS2ch.Freeの後にクリアするとXPスタイル時にエラー出る） |
| 2222 | 2224 | TreeView.Items.Clear; |
| 2223 | 2225 | |
| 2224 | - //巡回リスト保存 | |
| 2225 | - try | |
| 2226 | - RoundList.SaveRoundFile; | |
| 2227 | - except | |
| 2228 | - end; | |
| 2229 | - //巡回リストを破棄 | |
| 2230 | - try | |
| 2231 | - RoundList.Clear; | |
| 2232 | - except | |
| 2233 | - end; | |
| 2234 | - | |
| 2235 | - //履歴の保存と破棄 | |
| 2236 | - SaveHistory; | |
| 2237 | - ClearHistory; | |
| 2238 | - | |
| 2239 | - //お気に入りの保存と破棄 | |
| 2240 | - FavoriteDM.WriteFavorite; | |
| 2241 | - FavoriteDM.Clear; | |
| 2242 | - | |
| 2243 | - | |
| 2244 | 2226 | //BBS破棄 |
| 2245 | 2227 | try |
| 2246 | 2228 | for i := Length( BBSs ) - 1 downto 0 do begin |
| @@ -2254,32 +2236,44 @@ begin | ||
| 2254 | 2236 | ActiveList := nil; |
| 2255 | 2237 | |
| 2256 | 2238 | FTreeType := gttNone; |
| 2257 | - //GikoSys.FBoardURLList.Clear; | |
| 2258 | - for i := Length(BoardGroups) - 1 downto 0 do begin | |
| 2259 | - BoardGroups[i].Clear; | |
| 2260 | - end; | |
| 2239 | + //GikoSys.FBoardURLList.Clear; | |
| 2240 | + for i := Length(BoardGroups) - 1 downto 0 do begin | |
| 2241 | + BoardGroups[i].Clear; | |
| 2242 | + end; | |
| 2261 | 2243 | GikoSys.ListBoardFile; //ボードファイル読込 |
| 2262 | 2244 | |
| 2263 | - // すべてのBBSを読み込んでおく | |
| 2264 | - for i := Length(BBSs) - 1 downto 0 do begin | |
| 2265 | - if not BBSs[i].IsBoardFileRead then | |
| 2266 | - GikoSys.ReadBoardFile(BBSs[i]); | |
| 2267 | - end; | |
| 2268 | - | |
| 2269 | 2245 | // BBS メニューの更新 |
| 2270 | 2246 | SetBBSMenu; |
| 2271 | 2247 | |
| 2272 | 2248 | ShowBBSTree( BBSs[ 0 ] ); |
| 2273 | 2249 | |
| 2274 | 2250 | // 履歴読み込み |
| 2251 | + SaveHistory; | |
| 2252 | + ClearHistory; | |
| 2275 | 2253 | LoadHistory; |
| 2276 | 2254 | |
| 2277 | 2255 | //お気に入り読み込み |
| 2256 | + FavoriteDM.WriteFavorite; | |
| 2257 | + FavoriteDM.Clear; | |
| 2278 | 2258 | FavoriteDM.ReadFavorite; |
| 2279 | 2259 | |
| 2280 | 2260 | SetLinkBar; |
| 2281 | 2261 | |
| 2282 | - //巡回の読み込み | |
| 2262 | + // すべてのBBSを読み込んでおく | |
| 2263 | + for i := Length(BBSs) - 1 downto 0 do begin | |
| 2264 | + if not BBSs[i].IsBoardFileRead then | |
| 2265 | + GikoSys.ReadBoardFile(BBSs[i]); | |
| 2266 | + end; | |
| 2267 | + | |
| 2268 | + //巡回リスト保存&破棄 | |
| 2269 | + try | |
| 2270 | + RoundList.SaveRoundFile; | |
| 2271 | + except | |
| 2272 | + end; | |
| 2273 | + try | |
| 2274 | + RoundList.Clear; | |
| 2275 | + except | |
| 2276 | + end; | |
| 2283 | 2277 | RoundList.LoadRoundBoardFile; |
| 2284 | 2278 | RoundList.LoadRoundThreadFile; |
| 2285 | 2279 |
| @@ -12034,9 +12028,7 @@ var | ||
| 12034 | 12028 | msg : String; |
| 12035 | 12029 | ReadList : TStringList; |
| 12036 | 12030 | wordCount : TWordCount; |
| 12037 | -{$IFDEF SPAM_FILTER_ENABLED} | |
| 12038 | - i : Integer; | |
| 12039 | -{$ENDIF} | |
| 12031 | + {i : Integer;} | |
| 12040 | 12032 | begin |
| 12041 | 12033 | IndividualForm := TIndividualAbonForm.Create(Self); |
| 12042 | 12034 | try |
| @@ -532,19 +532,16 @@ begin | ||
| 532 | 532 | sl.Add(ROUND_INDEX_VERSION); |
| 533 | 533 | for i := 0 to FBoardList.Count - 1 do begin |
| 534 | 534 | Item := TRoundItem(FBoardList[i]); |
| 535 | - try | |
| 536 | - if Item.TmpURL <> '' then begin | |
| 537 | - s := Item.TmpURL + #1 | |
| 538 | - + Item.BoardTitle + #1 | |
| 539 | - + Item.RoundName; | |
| 540 | - end else begin | |
| 541 | - s := Item.URL + #1 | |
| 542 | - + Item.BoardTitle + #1 | |
| 543 | - + Item.RoundName; | |
| 544 | - end; | |
| 545 | - sl.Add(s); | |
| 546 | - except | |
| 535 | + if Item.TmpURL <> '' then begin | |
| 536 | + s := Item.TmpURL + #1 | |
| 537 | + + Item.BoardTitle + #1 | |
| 538 | + + Item.RoundName; | |
| 539 | + end else begin | |
| 540 | + s := Item.URL + #1 | |
| 541 | + + Item.BoardTitle + #1 | |
| 542 | + + Item.RoundName; | |
| 547 | 543 | end; |
| 544 | + sl.Add(s); | |
| 548 | 545 | end; |
| 549 | 546 | sl.SaveToFile(FileName); |
| 550 | 547 | sl.Clear; |
| @@ -552,23 +549,20 @@ begin | ||
| 552 | 549 | sl.Add(ROUND_INDEX_VERSION); |
| 553 | 550 | for i := 0 to FItemList.Count - 1 do begin |
| 554 | 551 | Item := TRoundItem(FItemList[i]); |
| 555 | - try | |
| 556 | - if Item.TmpURL <> '' then begin | |
| 557 | - s := Item.TmpURL + #1 | |
| 558 | - + Item.BoardTitle + #1 | |
| 559 | - + Item.FileName + #1 | |
| 560 | - + Item.ThreadTitle + #1 | |
| 561 | - + Item.RoundName; | |
| 562 | - end else begin | |
| 563 | - s := Item.URL + #1 | |
| 564 | - + Item.BoardTitle + #1 | |
| 565 | - + Item.FileName + #1 | |
| 566 | - + Item.ThreadTitle + #1 | |
| 567 | - + Item.RoundName; | |
| 568 | - end; | |
| 569 | - sl.Add(s); | |
| 570 | - except | |
| 552 | + if Item.TmpURL <> '' then begin | |
| 553 | + s := Item.TmpURL + #1 | |
| 554 | + + Item.BoardTitle + #1 | |
| 555 | + + Item.FileName + #1 | |
| 556 | + + Item.ThreadTitle + #1 | |
| 557 | + + Item.RoundName; | |
| 558 | + end else begin | |
| 559 | + s := Item.URL + #1 | |
| 560 | + + Item.BoardTitle + #1 | |
| 561 | + + Item.FileName + #1 | |
| 562 | + + Item.ThreadTitle + #1 | |
| 563 | + + Item.RoundName; | |
| 571 | 564 | end; |
| 565 | + sl.Add(s); | |
| 572 | 566 | end; |
| 573 | 567 | sl.SaveToFile(FileName); |
| 574 | 568 | finally |
Fork