ギコナビ
Revision | a9d37583ee813f997731c40710111324bcad82aa (tree) |
---|---|
Time | 2009-04-05 23:54:59 |
Author | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_60_0_788'.
@@ -279,7 +279,7 @@ type | ||
279 | 279 | public |
280 | 280 | constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard; inURL : string ); overload; |
281 | 281 | constructor Create(const inPlugIn : TBoardPlugIn; const inBoard : TBoard; |
282 | - inURL : string; inExist: Boolean; const inFilename: string ); overload; | |
282 | + const inURL : string; inExist: Boolean; const inFilename: string ); overload; | |
283 | 283 | |
284 | 284 | destructor Destroy; override; |
285 | 285 |
@@ -1574,7 +1574,7 @@ end; | ||
1574 | 1574 | constructor TThreadItem.Create( |
1575 | 1575 | const inPlugIn : TBoardPlugIn; |
1576 | 1576 | const inBoard : TBoard; |
1577 | - inURL : string; | |
1577 | + const inURL : string; | |
1578 | 1578 | inExist: Boolean; |
1579 | 1579 | const inFilename: string |
1580 | 1580 | ); |
@@ -1589,7 +1589,7 @@ begin | ||
1589 | 1589 | // dat ÌÛ¶pXðÝè |
1590 | 1590 | FileName := inFilename; |
1591 | 1591 | IsLogFile := inExist; |
1592 | - URL := GikoSys.Get2chBrowsableThreadURL( inURL ); | |
1592 | + URL := inURL; | |
1593 | 1593 | end else begin |
1594 | 1594 | // vOCÉ TThreadItem ªì¬³ê½±Æð`¦é |
1595 | 1595 | inPlugIn.CreateThreadItem( DWORD( Self ) ); |
@@ -1025,7 +1025,11 @@ begin | ||
1025 | 1025 | case FResRangeMenuSelect of |
1026 | 1026 | Ord( grrKoko ): GikoDM.OnlyKokoResAction.Checked := True; |
1027 | 1027 | Ord( grrNew ): GikoDM.OnlyNewResAction.Checked := True; |
1028 | - 100: GikoDM.OnlyAHundredResAction.Checked := True; | |
1028 | + 10..65535: | |
1029 | + begin | |
1030 | + GikoDM.OnlyAHundredResAction.Checked := True; | |
1031 | + GikoSys.ResRange := GikoSys.Setting.ResRangeExCount; | |
1032 | + end; | |
1029 | 1033 | end; |
1030 | 1034 | end; |
1031 | 1035 |
@@ -1468,8 +1472,8 @@ var | ||
1468 | 1472 | item : TThreadItem; |
1469 | 1473 | begin |
1470 | 1474 | if FStartUp then begin |
1475 | + FStartUp := false; | |
1471 | 1476 | ShowWindow(Application.Handle, SW_HIDE); |
1472 | - | |
1473 | 1477 | //FormCreateÅâéÆÂÝ誽f³êÈ¢êª éÌÅFormShowÅâé±Æɵ½ |
1474 | 1478 | //c[o[\¦ |
1475 | 1479 | GikoDM.StdToolBarVisibleAction.Checked := GikoSys.Setting.StdToolBarVisible; |
@@ -1494,6 +1498,9 @@ begin | ||
1494 | 1498 | // ResetBandInfo( ListCoolBar, ListToolBar ); |
1495 | 1499 | FIsIgnoreResize := rtNone; |
1496 | 1500 | |
1501 | + //ActionListÌGroupIndexð³Éß· | |
1502 | + SetGroupIndex(GikoDM.GikoFormActionList); | |
1503 | + | |
1497 | 1504 | //FormCrete©çÚ®B |
1498 | 1505 | if GikoSys.Setting.TabAutoLoadSave then begin |
1499 | 1506 | GikoDM.TabsOpenAction.Tag := 1; |
@@ -1501,26 +1508,20 @@ begin | ||
1501 | 1508 | GikoDM.TabsOpenAction.Tag := 0; |
1502 | 1509 | if (GikoSys.Setting.LastCloseTabURL <> '') then begin |
1503 | 1510 | if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin |
1504 | - PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 ); | |
1505 | - end; | |
1506 | - if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin | |
1507 | 1511 | while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and |
1508 | 1512 | (FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin |
1509 | - Application.ProcessMessages; | |
1513 | + // bZ[Wðó¯æçÈ¢æ¤ÉX[vÉÏX | |
1514 | + Sleep(1); | |
1510 | 1515 | end; |
1511 | 1516 | end; |
1512 | 1517 | item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL ); |
1518 | + GikoSys.Setting.LastCloseTabURL := ''; | |
1513 | 1519 | if (item <> nil) and (item.IsLogFile) then begin |
1514 | 1520 | OpenThreadItem(item, item.URL); |
1515 | 1521 | end; |
1516 | - GikoSys.Setting.LastCloseTabURL := ''; | |
1522 | + //ShowWindow(Self.Handle, SW_SHOW); | |
1517 | 1523 | end; |
1518 | 1524 | end; |
1519 | - | |
1520 | - //ActionListÌGroupIndexð³Éß· | |
1521 | - SetGroupIndex(GikoDM.GikoFormActionList); | |
1522 | - | |
1523 | - FStartUp := false; | |
1524 | 1525 | end; |
1525 | 1526 | end; |
1526 | 1527 |
@@ -2079,7 +2080,8 @@ begin | ||
2079 | 2080 | s := ''; |
2080 | 2081 | Ext := AnsiLowerCase(ExtractFileExt(Text2)); |
2081 | 2082 | if (Pos('http://', Text2) = 1) and (GikoSys.Setting.PreviewVisible) and |
2082 | - ((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) then begin | |
2083 | + ((Ext = '.jpg') or (Ext = '.jpeg') or (Ext = '.gif') or (Ext = '.png')) or | |
2084 | + (Pos('http://www.nicovideo.jp/watch/', Text2) = 1) then begin | |
2083 | 2085 | if FPreviewBrowser = nil then begin |
2084 | 2086 | FPreviewBrowser := TPreviewBrowser.Create(Self); |
2085 | 2087 | ShowWindow(FPreviewBrowser.Handle, SW_HIDE); |
@@ -2376,6 +2378,16 @@ begin | ||
2376 | 2378 | KokoPopupMenu.PopupComponent := nil; |
2377 | 2379 | if (Sender is TComponent) then |
2378 | 2380 | KokoPopupMenu.PopupComponent := TComponent(Sender); |
2381 | + // ëÎô NbNµ½uEUÆÙÈéÆ«ÉÁ·ðÇÁ | |
2382 | + if not (Sender is TResPopupBrowser) then begin | |
2383 | + if (FResPopupBrowser <> nil) and (FResPopupBrowser.CurrentBrowser.Visible = True) then begin | |
2384 | + FResPopupBrowser.Clear; | |
2385 | + end; | |
2386 | + end else begin | |
2387 | + if (Sender <> FResPopupBrowser.CurrentBrowser) then begin | |
2388 | + TResPopupBrowser(Sender).ChildClear; | |
2389 | + end; | |
2390 | + end; | |
2379 | 2391 | KokoPopupMenu.Tag := StrToInt(sNo); |
2380 | 2392 | KokoPopupMenu.Popup(p.x, p.y); |
2381 | 2393 | end else if Pos('mailto', LowerCase(URL)) <> 0 then begin |
@@ -5,7 +5,7 @@ unit GikoBayesian; | ||
5 | 5 | \brief xCWAtB^ |
6 | 6 | |
7 | 7 | |
8 | -$Id: GikoBayesian.pas,v 1.21 2006/06/26 14:57:15 h677 Exp $ | |
8 | +$Id: GikoBayesian.pas,v 1.22 2009/01/31 15:47:15 h677 Exp $ | |
9 | 9 | } |
10 | 10 | |
11 | 11 | //! ½¼¼ð«ÉÜßÈ¢ |
@@ -310,12 +310,12 @@ begin | ||
310 | 310 | |
311 | 311 | for i := 1 to sl.Count - 1 do begin |
312 | 312 | s := sl[ i ]; |
313 | - name := RemoveToken( s, #1 ); | |
313 | + name := GikoBayesian.RemoveToken( s, #1 ); | |
314 | 314 | info := TWordInfo.Create; |
315 | - info.NormalWord := StrToIntDef( '$' + RemoveToken( s, #1 ), 0 ); | |
316 | - info.ImportantWord := StrToIntDef( '$' + RemoveToken( s, #1 ), 0 ); | |
317 | - info.NormalText := StrToIntDef( '$' + RemoveToken( s, #1 ), 0 ); | |
318 | - info.ImportantText := StrToIntDef( '$' + RemoveToken( s, #1 ), 0 ); | |
315 | + info.NormalWord := StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 ); | |
316 | + info.ImportantWord := StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 ); | |
317 | + info.NormalText := StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 ); | |
318 | + info.ImportantText := StrToIntDef( '$' + GikoBayesian.RemoveToken( s, #1 ), 0 ); | |
319 | 319 | |
320 | 320 | AddObject( name, info ); |
321 | 321 | end; |
@@ -1237,6 +1237,7 @@ object GikoDM: TGikoDM | ||
1237 | 1237 | OnExecute = OpenFindDialogActionExecute |
1238 | 1238 | end |
1239 | 1239 | object FavoriteTreeViewItemNameCopyAction: TAction |
1240 | + Tag = -1 | |
1240 | 1241 | Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503 |
1241 | 1242 | Caption = #34920#31034#21517#12434#12467#12500#12540'(&S)' |
1242 | 1243 | Hint = #34920#31034#12375#12390#12356#12427#21517#21069#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427 |
@@ -1345,12 +1346,14 @@ object GikoDM: TGikoDM | ||
1345 | 1346 | OnUpdate = DependActiveCntentActionUpdate |
1346 | 1347 | end |
1347 | 1348 | object AddIDtoNGWord0Action: TAction |
1349 | + Tag = -1 | |
1348 | 1350 | Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503 |
1349 | 1351 | Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152'('#36879#26126')' |
1350 | 1352 | Hint = #12524#12473#12398'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427#65288#36879#26126#65289 |
1351 | 1353 | OnExecute = AddIDtoNGWord0ActionExecute |
1352 | 1354 | end |
1353 | 1355 | object AddIDtoNGWord1Action: TAction |
1356 | + Tag = -1 | |
1354 | 1357 | Category = #12502#12521#12454#12470#12509#12483#12503#12450#12483#12503 |
1355 | 1358 | Caption = 'ID'#12434'NG'#12527#12540#12489#12395#36861#21152 |
1356 | 1359 | Hint = 'ID'#12434'NG'#12527#12540#12489#12501#12449#12452#12523#12395#36861#21152#12377#12427 |
@@ -926,8 +926,8 @@ begin | ||
926 | 926 | |
927 | 927 | GikoForm.ResRangeMenuSelect := 100; |
928 | 928 | OnlyAHundredResAction.Checked := True; |
929 | - //@\¦ÍÍðÝè·é | |
930 | - SetResRange(100); | |
929 | + //@\¦ÍÍðÝè·éBÝèl©çÆÁÄéB | |
930 | + SetResRange(GikoSys.Setting.ResRangeExCount); | |
931 | 931 | end; |
932 | 932 | // ************************************************************************* |
933 | 933 | //! ¢ÇXÌÝ\¦ |
@@ -4582,8 +4582,10 @@ begin | ||
4582 | 4582 | try |
4583 | 4583 | form.ShowModal; |
4584 | 4584 | shutdown := form.Allowshutdown; |
4585 | - GikoForm.UpdateExePath := form.ExecPath; | |
4586 | - GikoForm.UpdateExeArgs := form.ExecArgs; | |
4585 | + if shutdown then begin | |
4586 | + GikoForm.UpdateExePath := form.ExecPath; | |
4587 | + GikoForm.UpdateExeArgs := form.ExecArgs; | |
4588 | + end; | |
4587 | 4589 | finally |
4588 | 4590 | form.Release; |
4589 | 4591 | end; |
@@ -181,7 +181,7 @@ type | ||
181 | 181 | |
182 | 182 | procedure MenuFont(Font: TFont); |
183 | 183 | |
184 | - function RemoveToken(var s:string; const delimiter:string):string; | |
184 | +// function RemoveToken(var s:string; const delimiter:string):string; | |
185 | 185 | function GetTokenIndex(s: string; delimiter: string; index: Integer): string; |
186 | 186 | |
187 | 187 | function GetShortName(const LongName: string; ALength: integer): string; |
@@ -264,7 +264,7 @@ const | ||
264 | 264 | ZERO_DATE: Integer = 25569; |
265 | 265 | BETA_VERSION_NAME_E = 'beta'; |
266 | 266 | BETA_VERSION_NAME_J = 'ÊÞÀ'; |
267 | - BETA_VERSION = 59; | |
267 | + BETA_VERSION = 60; | |
268 | 268 | BETA_VERSION_BUILD = ''; //!< debugÅÈÇ |
269 | 269 | APP_NAME = 'gikoNavi'; |
270 | 270 | BE_PHP_URL = 'http://be.2ch.net/test/p.php?i='; |
@@ -645,7 +645,7 @@ begin | ||
645 | 645 | end; |
646 | 646 | end; |
647 | 647 | |
648 | - ThreadItem.BeginUpdate; | |
648 | + //ThreadItem.BeginUpdate; | |
649 | 649 | if (datFileCheck) and (islog) then |
650 | 650 | FileList.Delete( Index ); |
651 | 651 |
@@ -670,7 +670,7 @@ begin | ||
670 | 670 | Node := FavoriteDM.TreeView.Items.AddChildObject( FavoriteDM.TreeView.Items.Item[0], ThreadItem.Title, FavoThreadItem); |
671 | 671 | *} |
672 | 672 | |
673 | - ThreadItem.EndUpdate; | |
673 | + //ThreadItem.EndUpdate; | |
674 | 674 | Board.Add(ThreadItem); |
675 | 675 | |
676 | 676 | if (ThreadItem.UnRead) and (ThreadItem.IsLogFile) then |
@@ -699,7 +699,7 @@ begin | ||
699 | 699 | Board.IsThreadDatRead := True; |
700 | 700 | {$IFDEF DEBUG} |
701 | 701 | rt := GetTickCount - st; |
702 | - Writeln('Read Done.' + IntToStr(rt) + ' ms'); | |
702 | + Writeln('Read Done.' + Board.Title + ':' + IntToStr(rt) + ' ms'); | |
703 | 703 | {$ENDIF} |
704 | 704 | end; |
705 | 705 | {! |
@@ -943,7 +943,7 @@ begin | ||
943 | 943 | Result.FLastModified := IntToDateTime(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), ZERO_DATE)); |
944 | 944 | Result.FKokomade := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), -1); |
945 | 945 | Result.FNewReceive := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0); |
946 | - RemoveToken(Line, #1);//9: ; //¢gp | |
946 | + MojuUtils.RemoveToken(Line, #1);//9: ; //¢gp | |
947 | 947 | Result.FUnRead := IntToBool(StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0)); |
948 | 948 | Result.FScrollTop := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0); |
949 | 949 | Result.FAllResCount := StrToIntDef('$' + MojuUtils.RemoveToken(Line, #1), 0); |
@@ -1098,8 +1098,8 @@ begin | ||
1098 | 1098 | Delim := ',' |
1099 | 1099 | else |
1100 | 1100 | Delim := '<>'; |
1101 | - Result.FFileName := RemoveToken(Line, Delim); | |
1102 | - Result.FTitle := Trim(RemoveToken(Line, Delim)); | |
1101 | + Result.FFileName := MojuUtils.RemoveToken(Line, Delim); | |
1102 | + Result.FTitle := Trim(MojuUtils.RemoveToken(Line, Delim)); | |
1103 | 1103 | |
1104 | 1104 | ws := Result.FTitle; |
1105 | 1105 | if Copy(ws, Length(ws), 1) = ')' then begin |
@@ -1363,7 +1363,7 @@ end; | ||
1363 | 1363 | |
1364 | 1364 | DZ©ÌTCg©çÌpN |
1365 | 1365 | } |
1366 | -function TGikoSys.RemoveToken(var s: string;const delimiter: string): string; | |
1366 | +{function TGikoSys.RemoveToken(var s: string;const delimiter: string): string; | |
1367 | 1367 | var |
1368 | 1368 | p: Integer; |
1369 | 1369 | begin |
@@ -1374,7 +1374,7 @@ begin | ||
1374 | 1374 | Result := Copy(s, 1, p - 1); |
1375 | 1375 | Delete(s, 1, Length(Result) + Length(delimiter)); |
1376 | 1376 | end; |
1377 | - | |
1377 | +} | |
1378 | 1378 | |
1379 | 1379 | {! |
1380 | 1380 | \brief n ÂÚÌg[NðØèoµ |
@@ -1390,7 +1390,7 @@ var | ||
1390 | 1390 | begin |
1391 | 1391 | Result := ''; |
1392 | 1392 | for i := 0 to index do |
1393 | - Result := RemoveToken(s, delimiter); | |
1393 | + Result := MojuUtils.RemoveToken(s, delimiter); | |
1394 | 1394 | end; |
1395 | 1395 | |
1396 | 1396 |
@@ -1632,7 +1632,7 @@ begin | ||
1632 | 1632 | SI.cbReserved2 := 0; |
1633 | 1633 | SI.lpReserved2 := nil; |
1634 | 1634 | SI.dwysize := 0; |
1635 | - Windows.CreateProcess(nil, | |
1635 | + if Windows.CreateProcess(nil, | |
1636 | 1636 | PChar(Path), |
1637 | 1637 | nil, |
1638 | 1638 | nil, |
@@ -1641,7 +1641,11 @@ begin | ||
1641 | 1641 | nil, |
1642 | 1642 | nil, |
1643 | 1643 | SI, |
1644 | - PI); | |
1644 | + PI) then | |
1645 | + begin | |
1646 | + CloseHandle(PI.hProcess); | |
1647 | + end; | |
1648 | + | |
1645 | 1649 | end; |
1646 | 1650 | |
1647 | 1651 | {! |
@@ -1650,14 +1654,45 @@ end; | ||
1650 | 1654 | \param BrowserType uEUÌ^Cv(IE ©Ç¤©) |
1651 | 1655 | } |
1652 | 1656 | procedure TGikoSys.OpenBrowser(URL: string; BrowserType: TGikoBrowserType); |
1657 | +var | |
1658 | + i, j : Integer; | |
1659 | + path, arg : String; | |
1660 | + params : TStringList; | |
1653 | 1661 | begin |
1654 | 1662 | case BrowserType of |
1655 | 1663 | gbtIE: |
1656 | 1664 | HlinkNavigateString(nil, PWideChar(WideString(URL))); |
1657 | 1665 | gbtUserApp, gbtAuto: |
1658 | - if (Setting.URLApp) and (FileExists(Setting.URLAppFile)) then | |
1659 | - GikoSys.CreateProcess(Setting.URLAppFile, URL) | |
1660 | - else | |
1666 | + if (Setting.URLApp) then begin | |
1667 | + if (FileExists(Setting.URLAppFile)) then begin | |
1668 | + GikoSys.CreateProcess(Setting.URLAppFile, URL) | |
1669 | + end else begin | |
1670 | + // N®p[^t«Îô | |
1671 | + path := ''; | |
1672 | + params := TStringList.Create; | |
1673 | + try | |
1674 | + params.Delimiter := ' '; | |
1675 | + params.DelimitedText := Setting.URLAppFile; | |
1676 | + for i := 0 to params.Count - 1 do begin | |
1677 | + path := TrimLeft(path + ' ' + params[i]); | |
1678 | + if (FileExists(path)) then begin | |
1679 | + arg := ''; | |
1680 | + for j := i + 1 to params.Count - 1 do begin | |
1681 | + arg := arg + ' ' + params[j]; | |
1682 | + end; | |
1683 | + break; | |
1684 | + end; | |
1685 | + end; | |
1686 | + if i < params.Count then begin | |
1687 | + GikoSys.CreateProcess(path, arg + ' ' + URL); | |
1688 | + end else begin | |
1689 | + HlinkNavigateString(nil, PWideChar(WideString(URL))); | |
1690 | + end; | |
1691 | + finally | |
1692 | + params.Free; | |
1693 | + end; | |
1694 | + end; | |
1695 | + end else | |
1661 | 1696 | HlinkNavigateString(nil, PWideChar(WideString(URL))); |
1662 | 1697 | end; |
1663 | 1698 | end; |
@@ -1459,10 +1459,10 @@ begin | ||
1459 | 1459 | Line := CustomStringReplace(Line, 'M', ','); |
1460 | 1460 | end; |
1461 | 1461 | //TrimµÄÍ¢¯È¢Cª·é@byà¶ã |
1462 | - PRes.FName := RemoveToken(Line, delimiter); | |
1463 | - PRes.FMailTo := RemoveToken(Line, delimiter); | |
1464 | - PRes.FDateTime := RemoveToken(Line, delimiter); | |
1465 | - PRes.FBody := RemoveToken(Line, delimiter); | |
1462 | + PRes.FName := MojuUtils.RemoveToken(Line, delimiter); | |
1463 | + PRes.FMailTo := MojuUtils.RemoveToken(Line, delimiter); | |
1464 | + PRes.FDateTime := MojuUtils.RemoveToken(Line, delimiter); | |
1465 | + PRes.FBody := MojuUtils.RemoveToken(Line, delimiter); | |
1466 | 1466 | //Q¿áñËéÆ©¾ÆA{¶ÌæªÉP¼póªüÁÄ¢éÌÅí·é |
1467 | 1467 | //¼Ìf¦ÂÅAX©ÌÌó©àµêÈ¢¯Ç»êÍúßé |
1468 | 1468 | PRes.FBody := TrimLeft(PRes.FBody); |
@@ -1470,7 +1470,7 @@ begin | ||
1470 | 1470 | if PRes.FBody = '' then |
1471 | 1471 | PRes.FBody := ' '; |
1472 | 1472 | |
1473 | - PRes.FTitle := RemoveToken(Line, delimiter); | |
1473 | + PRes.FTitle := MojuUtils.RemoveToken(Line, delimiter); | |
1474 | 1474 | end; |
1475 | 1475 | |
1476 | 1476 | {! |
@@ -475,6 +475,34 @@ object KuroutOption: TKuroutOption | ||
475 | 475 | TabOrder = 1 |
476 | 476 | Wrap = False |
477 | 477 | end |
478 | + object ResRangeLabeledEdit: TLabeledEdit | |
479 | + Left = 317 | |
480 | + Top = 18 | |
481 | + Width = 121 | |
482 | + Height = 20 | |
483 | + EditLabel.Width = 113 | |
484 | + EditLabel.Height = 12 | |
485 | + EditLabel.Caption = #34920#31034#12524#12473#25968'(100-9999)' | |
486 | + ImeMode = imDisable | |
487 | + LabelPosition = lpLeft | |
488 | + LabelSpacing = 3 | |
489 | + TabOrder = 2 | |
490 | + Text = '100' | |
491 | + OnExit = ResRangeLabeledEditExit | |
492 | + end | |
493 | + object ResRangeCountUpDown: TUpDown | |
494 | + Left = 438 | |
495 | + Top = 18 | |
496 | + Width = 17 | |
497 | + Height = 20 | |
498 | + Associate = ResRangeLabeledEdit | |
499 | + Min = 100 | |
500 | + Max = 9999 | |
501 | + Position = 100 | |
502 | + TabOrder = 3 | |
503 | + Thousands = False | |
504 | + Wrap = False | |
505 | + end | |
478 | 506 | end |
479 | 507 | object ThreadGroupBox: TGroupBox |
480 | 508 | Left = 16 |
@@ -94,6 +94,8 @@ type | ||
94 | 94 | RespopupWaitUpDown: TUpDown; |
95 | 95 | Label19: TLabel; |
96 | 96 | RespopupMailToCheckBox: TCheckBox; |
97 | + ResRangeLabeledEdit: TLabeledEdit; | |
98 | + ResRangeCountUpDown: TUpDown; | |
97 | 99 | procedure OkBottonClick(Sender: TObject); |
98 | 100 | procedure FormCreate(Sender: TObject); |
99 | 101 | procedure CDeleteButtonClick(Sender: TObject); |
@@ -110,6 +112,7 @@ type | ||
110 | 112 | procedure DeltaXLabeledEditExit(Sender: TObject); |
111 | 113 | procedure DeltaYLabeledEditExit(Sender: TObject); |
112 | 114 | procedure RespopupWaitLabeledEditExit(Sender: TObject); |
115 | + procedure ResRangeLabeledEditExit(Sender: TObject); | |
113 | 116 | private |
114 | 117 | { Private é¾ } |
115 | 118 | procedure SetValue; |
@@ -166,6 +169,8 @@ begin | ||
166 | 169 | MoveHistoryMaxEdit.Text := IntToStr( GikoSys.Setting.MoveHistorySize ); |
167 | 170 | //@æª\¦X |
168 | 171 | AHandredUpDown.Position := GikoSys.Setting.HeadResCount; |
172 | + // \¦X | |
173 | + ResRangeCountUpDown.Position := GikoSys.Setting.ResRangeExCount; | |
169 | 174 | // ÖAL[[hÇÁtO |
170 | 175 | AddKeywordCheckBox.Checked := GikoSys.Setting.AddKeywordLink; |
171 | 176 | // ë½Îô |
@@ -212,7 +217,8 @@ begin | ||
212 | 217 | //@æª\¦X |
213 | 218 | GikoSys.Setting.HeadResCount := |
214 | 219 | StrToIntDef( AHandredLabeledEdit.Text , 1); |
215 | - | |
220 | + GikoSys.Setting.ResRangeExCount := | |
221 | + StrToIntDef( ResRangeLabeledEdit.Text , 100 ); | |
216 | 222 | GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex; |
217 | 223 | // ÖAL[[hÇÁtO |
218 | 224 | GikoSys.Setting.AddKeywordLink := AddKeywordCheckBox.Checked; |
@@ -515,4 +521,14 @@ begin | ||
515 | 521 | RespopupWaitLabeledEdit.Text := IntToStr(RespopupWaitUpDown.Max); |
516 | 522 | end; |
517 | 523 | |
524 | +procedure TKuroutOption.ResRangeLabeledEditExit(Sender: TObject); | |
525 | +begin | |
526 | + if not GikoSys.IsNumeric(ResRangeLabeledEdit.Text) then | |
527 | + ResRangeLabeledEdit.Text := '100'; | |
528 | + if StrToInt(ResRangeLabeledEdit.Text) < 100 then | |
529 | + ResRangeLabeledEdit.Text := '100'; | |
530 | + if StrToInt(ResRangeLabeledEdit.Text) > 9999 then | |
531 | + ResRangeLabeledEdit.Text := '9999'; | |
532 | +end; | |
533 | + | |
518 | 534 | end. |
@@ -253,7 +253,7 @@ object OptionDialog: TOptionDialog | ||
253 | 253 | Top = 43 |
254 | 254 | Width = 417 |
255 | 255 | Height = 20 |
256 | - ItemHeight = 12 | |
256 | + ItemHeight = 0 | |
257 | 257 | TabOrder = 0 |
258 | 258 | Text = 'BoardURLComboBox' |
259 | 259 | end |
@@ -723,7 +723,7 @@ begin | ||
723 | 723 | Ord( grrAll ): ResRangeHoldComboBox.ItemIndex := 0; |
724 | 724 | Ord( grrKoko ): ResRangeHoldComboBox.ItemIndex := 2; |
725 | 725 | Ord( grrNew ): ResRangeHoldComboBox.ItemIndex := 3; |
726 | - 100: ResRangeHoldComboBox.ItemIndex := 1; | |
726 | + 10..65535: ResRangeHoldComboBox.ItemIndex := 1; | |
727 | 727 | end; |
728 | 728 | ResRangeHoldComboBox.Enabled := GikoSys.Setting.ResRangeHold; |
729 | 729 | //^uÇÁÊu |
@@ -1013,7 +1013,7 @@ begin | ||
1013 | 1013 | GikoSys.Setting.ResRangeHold := ResRangeHoldCheckBox.Checked; |
1014 | 1014 | case ResRangeHoldComboBox.ItemIndex of |
1015 | 1015 | 0: GikoSys.Setting.ResRange := Ord( grrAll ); |
1016 | - 1: GikoSys.Setting.ResRange := 100; | |
1016 | + 1: GikoSys.Setting.ResRange := GikoSys.Setting.ResRangeExCount; | |
1017 | 1017 | 2: GikoSys.Setting.ResRange := Ord( grrKoko ); |
1018 | 1018 | 3: GikoSys.Setting.ResRange := Ord( grrNew ); |
1019 | 1019 | end; |
@@ -1321,6 +1321,14 @@ begin | ||
1321 | 1321 | sndPlaySound(nil, SND_ASYNC); |
1322 | 1322 | if OpenDialog.Execute then begin |
1323 | 1323 | SoundFileEdit.Text := OpenDialog.FileName; |
1324 | + // AvzºÌt@CÌêÎpXÉÏ··éB | |
1325 | + if (AnsiPos(GikoSys.Setting.GetAppDir,SoundFileEdit.Text) = 1) then begin | |
1326 | + // .\ ªÂ©È¢ÌÅA.\ðÇÁ | |
1327 | + SoundFileEdit.Text := '.\' + ExtractRelativePath( | |
1328 | + GikoSys.Setting.GetAppDir, | |
1329 | + SoundFileEdit.Text); | |
1330 | + | |
1331 | + end; | |
1324 | 1332 | end; |
1325 | 1333 | end; |
1326 | 1334 |
@@ -1328,10 +1336,8 @@ procedure TOptionDialog.SoundPlayButtonClick(Sender: TObject); | ||
1328 | 1336 | var |
1329 | 1337 | s : String; |
1330 | 1338 | begin |
1331 | - s := SoundFileEdit.Text; | |
1332 | - if (AnsiPos('.\', s) = 1) then begin | |
1333 | - s := GikoSys.Setting.GetAppDir + Copy(s, 2, Length(s)); | |
1334 | - end; | |
1339 | + SetCurrentDir(GikoSys.Setting.GetAppDir); | |
1340 | + s := ExpandFileName(SoundFileEdit.Text); | |
1335 | 1341 | if not FileExists(s) then begin |
1336 | 1342 | MsgBox(Handle, '¶ÝµÈ¢t@CÅ·', 'G[', MB_ICONSTOP or MB_OK); |
1337 | 1343 | SoundFileEdit.Text := ''; |
@@ -1357,7 +1363,8 @@ begin | ||
1357 | 1363 | Item := SoundListView.Selected; |
1358 | 1364 | if Item = nil then Exit; |
1359 | 1365 | |
1360 | - if FileExists(SoundFileEdit.Text) then | |
1366 | + SetCurrentDir(GikoSys.Setting.GetAppDir); | |
1367 | + if FileExists(ExpandFileName(SoundFileEdit.Text)) then | |
1361 | 1368 | Item.SubItems[0] := SoundFileEdit.Text; |
1362 | 1369 | if Trim(SoundFileEdit.Text) = '' then |
1363 | 1370 | Item.SubItems[0] := ''; |
@@ -13,6 +13,7 @@ uses | ||
13 | 13 | type |
14 | 14 | TPreviewBrowser = class(TWebBrowser) |
15 | 15 | private |
16 | + function makeHTML(const URL, Host, Document : String): String; | |
16 | 17 | protected |
17 | 18 | procedure CreateParams(var Params: TCreateParams); override; |
18 | 19 | public |
@@ -31,6 +32,7 @@ const | ||
31 | 32 | // }EXJ[\©ç̸çµÊu |
32 | 33 | DIV_X = 15; |
33 | 34 | DIV_Y = 15; |
35 | + NICO = 'www.nicovideo.jp'; | |
34 | 36 | |
35 | 37 | constructor TPreviewBrowser.Create(AOwner: TComponent); |
36 | 38 | begin |
@@ -52,7 +54,6 @@ end; | ||
52 | 54 | } |
53 | 55 | procedure TPreviewBrowser.PreviewImage(URL : String); |
54 | 56 | var |
55 | - html : string; | |
56 | 57 | HtmlFileName : string; |
57 | 58 | sl : TStringList; |
58 | 59 | Protocol, Host, Path, Document, Port, Bookmark : string; |
@@ -62,41 +63,21 @@ var | ||
62 | 63 | PostData: OleVariant; |
63 | 64 | Headers: OleVariant; |
64 | 65 | begin |
65 | - html := '<html><head>'#13#10 | |
66 | - + '<SCRIPT>'#13#10 | |
67 | - + 'function init() {'#13#10 | |
68 | - + ' if ((document.body.clientHeight >= Image1.height) && (document.body.clientWidth >= Image1.width)) {'#13#10 | |
69 | - + ' } else {'#13#10 | |
70 | - + ' var dh, ih;'#13#10 | |
71 | - + ' dh = document.body.clientWidth / document.body.clientHeight;'#13#10 | |
72 | - + ' ih = Image1.width / Image1.height;'#13#10 | |
73 | - + ' if (document.body.clientWidth < document.body.clientHeight) {'#13#10 | |
74 | - + ' if (ih > dh)'#13#10 | |
75 | - + ' Image1.width = document.body.clientWidth;'#13#10 | |
76 | - + ' else'#13#10 | |
77 | - + ' Image1.height = document.body.clientHeight;'#13#10 | |
78 | - + ' } else {'#13#10 | |
79 | - + ' if (ih < dh)'#13#10 | |
80 | - + ' Image1.height = document.body.clientHeight;'#13#10 | |
81 | - + ' else'#13#10 | |
82 | - + ' Image1.width = document.body.clientWidth;'#13#10 | |
83 | - + ' }'#13#10 | |
84 | - + ' }'#13#10 | |
85 | - + ' Message.style.display = "none";'#13#10 | |
86 | - + '}'#13#10 | |
87 | - + '</SCRIPT>'#13#10 | |
88 | - + '</head>'#13#10 | |
89 | - + '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10 | |
90 | - + '<div align="center" id="Message">vr [ì¬</div>'#13#10 | |
91 | - + '<div align="center"><img name="Image1" border="0" src="%ImageURL%"></div>'#13#10 | |
92 | - + '</body></html>'; | |
93 | - | |
66 | + GikoSys.ParseURI(URL, Protocol, Host, Path, Document, Port, Bookmark); | |
67 | + Referer := Protocol + '://' + Host; | |
68 | + if Port <> '' then | |
69 | + Referer := Referer + ':' + Port; | |
70 | + Referer := Referer + Path; | |
71 | + Headers := 'Referer: ' + Referer; | |
72 | + Flags := 0; | |
73 | + TargetFrameName := ''; | |
74 | + PostData := ''; | |
75 | + | |
94 | 76 | HtmlFileName := GikoSys.GetAppDir + HTML_FILE_NAME; |
95 | 77 | sl := TStringList.Create; |
96 | 78 | try |
97 | 79 | try |
98 | - sl.Text := MojuUtils. | |
99 | - CustomStringReplace(html, '%ImageURL%', URL, False); | |
80 | + sl.Text := makeHTML(URL, Host, Document); | |
100 | 81 | sl.SaveToFile(HtmlFileName); |
101 | 82 | finally |
102 | 83 | sl.Free; |
@@ -104,15 +85,6 @@ begin | ||
104 | 85 | except |
105 | 86 | end; |
106 | 87 | |
107 | - GikoSys.ParseURI(URL, Protocol, Host, Path, Document, Port, Bookmark); | |
108 | - Referer := Protocol + '://' + Host; | |
109 | - if Port <> '' then | |
110 | - Referer := Referer + ':' + Port; | |
111 | - Referer := Referer + Path; | |
112 | - Headers := 'Referer: ' + Referer; | |
113 | - Flags := 0; | |
114 | - TargetFrameName := ''; | |
115 | - PostData := ''; | |
116 | 88 | |
117 | 89 | Navigate(HtmlFileName,Flags, TargetFrameName, PostData, Headers); |
118 | 90 |
@@ -173,4 +145,60 @@ begin | ||
173 | 145 | end; |
174 | 146 | |
175 | 147 | end; |
148 | + | |
149 | +{ | |
150 | +\breif vr [pÌHTMLð쬷é | |
151 | +\param URL vr [·éC[Wt@C | |
152 | +} | |
153 | +function TPreviewBrowser.makeHTML(const URL, Host, Document : String): String; | |
154 | +var | |
155 | + point :TPoint; | |
156 | + rect :TRect; | |
157 | +begin | |
158 | + if (Pos('http://www.nicovideo.jp/watch/', URL) <> 1) then begin | |
159 | + Result := '<html><head>'#13#10 | |
160 | + + '<SCRIPT>'#13#10 | |
161 | + + 'function init() {'#13#10 | |
162 | + + ' if ((document.body.clientHeight >= Image1.height) && (document.body.clientWidth >= Image1.width)) {'#13#10 | |
163 | + + ' } else {'#13#10 | |
164 | + + ' var dh, ih;'#13#10 | |
165 | + + ' dh = document.body.clientWidth / document.body.clientHeight;'#13#10 | |
166 | + + ' ih = Image1.width / Image1.height;'#13#10 | |
167 | + + ' if (document.body.clientWidth < document.body.clientHeight) {'#13#10 | |
168 | + + ' if (ih > dh)'#13#10 | |
169 | + + ' Image1.width = document.body.clientWidth;'#13#10 | |
170 | + + ' else'#13#10 | |
171 | + + ' Image1.height = document.body.clientHeight;'#13#10 | |
172 | + + ' } else {'#13#10 | |
173 | + + ' if (ih < dh)'#13#10 | |
174 | + + ' Image1.height = document.body.clientHeight;'#13#10 | |
175 | + + ' else'#13#10 | |
176 | + + ' Image1.width = document.body.clientWidth;'#13#10 | |
177 | + + ' }'#13#10 | |
178 | + + ' }'#13#10 | |
179 | + + ' Message.style.display = "none";'#13#10 | |
180 | + + '}'#13#10 | |
181 | + + '</SCRIPT>'#13#10 | |
182 | + + '</head>'#13#10 | |
183 | + + '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10 | |
184 | + + '<div align="center" id="Message">vr [ì¬</div>'#13#10 | |
185 | + + '<div align="center"><img name="Image1" border="0" src="' + URL + '"></div>'#13#10 | |
186 | + + '</body></html>'; | |
187 | + end else begin | |
188 | + // <div><iframe width="340" height="185" src="http://www.nicovideo.jp/thumb/sm2494604" scrolling="no" style="border:solid 1px #CCC;" frameborder="0"></iframe></div><div class=link_nicovideo_title><a href="" title="" target="_blank"></a></div> | |
189 | + rect := GetWindowRect(point); | |
190 | + | |
191 | + Result := '<html><head>'#13#10 | |
192 | + + '<SCRIPT>'#13#10 | |
193 | + + 'function init() {'#13#10 | |
194 | + + ' Message.style.display = "none";'#13#10 | |
195 | + + '}'#13#10 | |
196 | + + '</SCRIPT>'#13#10 | |
197 | + + '</head>'#13#10 | |
198 | + + '<body topmargin="0" leftmargin="0" style="border-width: 1px; overflow:hidden; border-style: solid;" onLoad="init()">'#13#10 | |
199 | + + '<div align="center" id="Message">vr [ì¬</div>'#13#10 | |
200 | + + '<div><iframe width="' + IntToStr(rect.Right - rect.Left) +'" height="' + IntToStr(rect.Bottom - rect.Top) + '" src="http://' + Host + '/thumb/' + Document + '" scrolling="no" style="border:solid 1px #CCC;" frameborder="0"></iframe></div>' | |
201 | + + '</body></html>'; | |
202 | + end; | |
203 | +end; | |
176 | 204 | end. |
@@ -440,6 +440,8 @@ type | ||
440 | 440 | FLoopBrowserTabs : Boolean; |
441 | 441 | //! 100X\¦Ìæª\¦X |
442 | 442 | FHeadResCount : Integer; |
443 | + //! 100X\¦ig£pj | |
444 | + FResRangeExCount: Integer; | |
443 | 445 | //! ÖAL[[hÇÁtO |
444 | 446 | FAddKeywordLink: Boolean; |
445 | 447 | //! datu·ðLøÉ·é |
@@ -810,6 +812,8 @@ type | ||
810 | 812 | property LoopBrowserTabs : Boolean read FLoopBrowserTabs write FLoopBrowserTabs; |
811 | 813 | //! 100X\¦Ìæª\¦X |
812 | 814 | property HeadResCount : Integer read FHeadResCount write FHeadResCount; |
815 | + //! 100X\¦ig£pj | |
816 | + property ResRangeExCount: Integer read FResRangeExCount write FResRangeExCount; | |
813 | 817 | //! ÖAL[[hÇÁtO |
814 | 818 | property AddKeywordLink: Boolean read FAddKeywordLink write FAddKeywordLink; |
815 | 819 | //! datÌu·ðLøÉ·é© |
@@ -1127,6 +1131,7 @@ begin | ||
1127 | 1131 | FResRange := ini.ReadInteger( 'Thread', 'ResRange', Ord( grrAll ) ); |
1128 | 1132 | FResRangeHold := ini.ReadBool( 'Thread', 'ResRangeHold', False ); |
1129 | 1133 | FHeadResCount := ini.ReadInteger('Thread', 'HeadResCount', 1); |
1134 | + FResRangeExCount:= ini.ReadInteger('Thread','ResRangeExCount', 100); | |
1130 | 1135 | // Xbhê\¦ÍÍ |
1131 | 1136 | FThreadRange := TGikoThreadRange( ini.ReadInteger('ThreadList', 'ThreadRange', Ord( gtrAll )) ); |
1132 | 1137 | //ñANeBuX|bvAbv\¦ |
@@ -1219,18 +1224,13 @@ begin | ||
1219 | 1224 | for i := 0 to GetSoundCount - 1 do begin |
1220 | 1225 | SoundFileName[i] := ini.ReadString('Sound', SoundName[i], ''); |
1221 | 1226 | // ÎQÆÎô |
1222 | - s := SoundFileName[i]; | |
1223 | - if (AnsiPos('.\', SoundFileName[i]) = 1) then begin | |
1224 | - s := GetAppDir | |
1225 | - + Copy(SoundFileName[i], 2, Length(SoundFileName[i])); | |
1226 | - end; | |
1227 | 1227 | // t@C̶Ý`FbN |
1228 | - if not FileExists(SoundFileName[i]) then begin | |
1228 | + if not FileExists(ExpandFileName(SoundFileName[i])) then begin | |
1229 | 1229 | SoundFileName[i] := ''; |
1230 | 1230 | end; |
1231 | 1231 | end; |
1232 | 1232 | end else begin |
1233 | - s := GetAppDir + '\sound\'; | |
1233 | + s := 'Sound\'; | |
1234 | 1234 | SoundFileName[0] := s + '澬÷.wav'; |
1235 | 1235 | SoundFileName[1] := s + '澬÷(·ª).wav'; |
1236 | 1236 | SoundFileName[2] := s + '¢XV.wav'; |
@@ -1531,6 +1531,7 @@ begin | ||
1531 | 1531 | ini.WriteInteger('Thread', 'ResRange', FResRange); |
1532 | 1532 | ini.WriteBool('Thread', 'ResRangeHold', FResRangeHold); |
1533 | 1533 | ini.WriteInteger('Thread', 'HeadResCount', FHeadResCount); |
1534 | + ini.WriteInteger('Thread','ResRangeExCount', FResRangeExCount); | |
1534 | 1535 | // Xbhê\¦ÍÍ |
1535 | 1536 | ini.WriteInteger('ThreadList', 'ThreadRange', Ord( FThreadRange )); |
1536 | 1537 | //OímF |
@@ -1888,12 +1889,8 @@ var | ||
1888 | 1889 | begin |
1889 | 1890 | for i := 0 to GetSoundCount - 1 do begin |
1890 | 1891 | if SoundName[i] = Name then begin |
1891 | - Result := SoundFileName[i]; | |
1892 | - // ÎpXÎô | |
1893 | - if (AnsiPos('.\', Result) = 1) then begin | |
1894 | - Result := GetAppDir | |
1895 | - + Copy(Result, 2, Length(Result)); | |
1896 | - end; | |
1892 | + SysUtils.SetCurrentDir(GetAppDir); | |
1893 | + Result := ExpandFileName(SoundFileName[i]); | |
1897 | 1894 | Exit; |
1898 | 1895 | end; |
1899 | 1896 | end; |
@@ -80,7 +80,7 @@ const | ||
80 | 80 | CHECK_URL = 'http://gikonavi.sourceforge.jp/updater/latest.txt'; |
81 | 81 | {$ENDIF} |
82 | 82 | var |
83 | - value : string; | |
83 | + value, url : string; | |
84 | 84 | ResStream: TMemoryStream; |
85 | 85 | downResult, current, newest: TStringList; |
86 | 86 | newgiko: Boolean; |
@@ -129,8 +129,10 @@ begin | ||
129 | 129 | newgiko := false; |
130 | 130 | // night buildÍArhÔ¾¯Å»è·é |
131 | 131 | if (nightbuild) then begin |
132 | + url := downResult.Values[ 'n_url' ]; | |
132 | 133 | newgiko := StrToInt(current[3]) < StrToInt(newest[3]); |
133 | 134 | end else begin |
135 | + url := downResult.Values[ 'url' ]; | |
134 | 136 | newgiko := ( StrToInt(current[1]) < StrToInt(newest[1]) ) or |
135 | 137 | ( (StrToInt(current[1]) = StrToInt(newest[1]))) and |
136 | 138 | ((StrToInt(current[2]) < StrToInt(newest[2])) ); |
@@ -138,9 +140,8 @@ begin | ||
138 | 140 | if (newgiko) then begin |
139 | 141 | if GikoUtil.MsgBox(Handle, 'Vµ¢MRirª èÜ·B_E[hµÜ·©H', 'XVmF', |
140 | 142 | MB_YESNO or MB_ICONWARNING or MB_DEFBUTTON2) = ID_YES then begin |
141 | - | |
142 | - ResultMemo.Lines.Add('Vµ¢MRirª èÜ·B_E[hðJnµÜ·B' + downResult.Values[ 'url' ]); | |
143 | - DonwloadUpdate(Trim(downResult.Values[ 'url' ])); | |
143 | + ResultMemo.Lines.Add('Vµ¢MRirª èÜ·B_E[hðJnµÜ·B' + url); | |
144 | + DonwloadUpdate(Trim(url)); | |
144 | 145 | Result := True; |
145 | 146 | end; |
146 | 147 | end else begin |
@@ -52,7 +52,7 @@ uses | ||
52 | 52 | ExternalBoardPlugInMain in 'ExternalBoardPlugInMain.pas', |
53 | 53 | ExternalFilePath in 'ExternalFilePath.pas', |
54 | 54 | MojuUtils in 'MojuUtils.pas', |
55 | - crc in 'gzip_delphi2\crc.pas', | |
55 | + {crc in 'gzip_delphi2\crc.pas', //zlibXVɺ¢í} | |
56 | 56 | gzip in 'gzip_delphi2\gzip.pas', |
57 | 57 | zlib in 'gzip_delphi2\zlib.pas', |
58 | 58 | bmRegExp in 'bmRegExp\bmregexp.pas', |
@@ -13,8 +13,8 @@ SourceDir=G:\Release | ||
13 | 13 | OutputDir=G:\InnoSetup\Output |
14 | 14 | SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico" |
15 | 15 | ; MRirÌo[WÉ í¹Ä¾³¢ |
16 | -VersionInfoVersion=1.58.1.764 | |
17 | -OutputBaseFilename=gikoNavi_b58_setup | |
16 | +VersionInfoVersion=1.59.1.778 | |
17 | +OutputBaseFilename=gikoNavi_b59_setup | |
18 | 18 | |
19 | 19 | |
20 | 20 | [Tasks] |
@@ -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.60.0.779 | |
22 | +OutputBaseFilename=gikoNavi_b60_779_usetup | |
23 | 23 | CreateUninstallRegKey=no |
24 | 24 | |
25 | 25 | [Tasks] |
@@ -1,4 +1,4 @@ | ||
1 | -¡MRir Version1.00 ÊÞÀ59 Readme.txt | |
1 | +¡MRir Version1.00 ÊÞÀ60 Readme.txt | |
2 | 2 | |
3 | 3 | |
4 | 4 | ------------------------------ |
@@ -19,6 +19,14 @@ | ||
19 | 19 | ------------------------------ |
20 | 20 | Oo[W©çAbvO[h·éû@ |
21 | 21 | ------------------------------ |
22 | +¡ÊÞÀ59È~¡ | |
23 | +MRirXV@\ðpµÄ¾³¢B | |
24 | +uwv¨MRirXVvÅAÀs{^ðºµÄ¾³¢B | |
25 | +AbvO[hpÌCXg[ð_E[hãAÄN®ðßçêéÌÅÄN®·é©A | |
26 | +fXNgbvÉ쬳êé"MRirXV"V[gJbgðÀs·éÆAbvO[h³êÜ·B | |
27 | +ÚµÍAhttp://gikonavi.sourceforge.jp/tips/tips001007.html ð©Ä¾³¢B | |
28 | + | |
29 | +¡ÊÞÀ58ÈO¡ | |
22 | 30 | CXg[Ư¶Å·BACXg[µÈ¢Å¾³¢B |
23 | 31 | »ÌÜÜã«CXg[·êÎAÈOÌÝèâOÍø«±«gpÅ«Ü·B |
24 | 32 | ÚµÍA http://gikonavi.sourceforge.jp/tips/tips001002.html ð©Ä¾³¢B |
@@ -50,7 +58,9 @@ | ||
50 | 58 | ------------------------------ |
51 | 59 | oOâv]ÍAMRirXbhÅó¯t¯Ä¨èÜ·B |
52 | 60 | MRirTCgFhttp://gikonavi.sourceforge.jp/ |
53 | -MRirXFhttp://pc7.2ch.net/test/read.cgi/software/1151728347/l50 | |
61 | +MRirXFhttp://find.2ch.net/?BBS=2ch&TYPE=TITLE&STR=%A5%AE%A5%B3%A5%CA%A5%D3&COUNT=10 | |
62 | +MRirJXFhttp://flounder.s27.xrea.com/bbs/test/read.cgi?bbs=giko&key=213536508&ls=50 | |
63 | + | |
54 | 64 | |
55 | 65 | ------------------------------ |
56 | 66 | ]ÚÉ墀 |
@@ -62,12 +72,14 @@ Web | ||
62 | 72 | ------------------------------ |
63 | 73 | ®ì« |
64 | 74 | ------------------------------ |
65 | -OS: Windows98Èã (98, 98SE, ME, 2000, XP, 2003j | |
75 | +OS: Windows98Èã (98, 98SE, ME, 2000, XP, 2003, Vista(*1)j | |
76 | +*1 "Program Files"tH_ÈOÉCXg[µÄ¾³¢B | |
66 | 77 | CPU: ¬¯êά¢ÙǬ®æ¤ÈCª·é |
67 | 78 | ÒÓØ: 64MBÈãi½¯êν¢ÙÇ¢¢æ¤ÈCª·éj |
68 | 79 | ¿ÉÀ: 800x600ÈãÌðxAʲ¶×°ÈãA|CeBOfoCXK{ |
69 | 80 | InternetExplorer5.01ÈãK{ |
70 | 81 | |
82 | + | |
71 | 83 | Windows95ÍT|[gOÅ·ªAIE5ÈãÆWinSock2Abvf[gðs¦Î®ìµÜ·B |
72 | 84 | WinSock2Abvf[gÍȺÌê©ç_E[hÅ«Ü·B |
73 | 85 | CXg[Í©ÈÓCŨ袵ܷB |
@@ -94,6 +106,7 @@ Windows Me IE6 | ||
94 | 106 | Windows 2000 Professional Edition(SP3) IE5 |
95 | 107 | Windows 2000 Professional Edition(SP3) IE6 |
96 | 108 | Windows Server 2003 Enterprise Edition IE6 |
109 | +Windows Vista IE7 | |
97 | 110 | |
98 | 111 | ------------------------------ |
99 | 112 | ì AüÏ&Äzz(Ⱥuñzzv)É墀 |
@@ -108,8 +121,19 @@ LICENSE | ||
108 | 121 | ------------------------------ |
109 | 122 | ð |
110 | 123 | ------------------------------ |
111 | -2008/XX/XX | |
124 | +2009/XX/YY | |
125 | + Version ÊÞÀ60 | |
126 | + | |
127 | + | |
128 | +2009/02/01 | |
112 | 129 | Version ÊÞÀ59 |
130 | + X{¶ÉA^OÈOÌ^OªÜÜêéÆAX|bvAbvÅA{¶ª¯ésïÌC³ | |
131 | + MRirXV@\ÇÁ | |
132 | + CtH[ÅpµÄ¢éACRÌæð·µÖ¦êéæ¤ÉC³ | |
133 | + Û¶µ½^uÌOª¶ÝµÈ¢êɱ¯éâèÌC³ | |
134 | + RoundBoard.2chARoundItem.2chÌàeªPsàÈ¢êNbV ·éoOÌC³ | |
135 | + OñeÆIPAhXizXg¼jªÏíÁÄ¢éÆ«ÉACookieîñªóÉÈésïÌC³ | |
136 | + µ½çÎJBBSÌßOÅAeú+IDÌOÉ"eúF"̶ñªÈ¢êÉÎ | |
113 | 137 | |
114 | 138 | 2008/09/16 |
115 | 139 | Version ÊÞÀ58 |
@@ -83,7 +83,7 @@ const | ||
83 | 83 | MAJOR_VERSION = 1; |
84 | 84 | MINOR_VERSION = 0; |
85 | 85 | RELEASE_VERSION = 'beta'; |
86 | - REVISION_VERSION = 19; | |
86 | + REVISION_VERSION = 20; | |
87 | 87 | |
88 | 88 | // ========================================================================= |
89 | 89 | // GpÖ |
@@ -472,7 +472,6 @@ var | ||
472 | 472 | foundPos := AnsiPos( '<table', downResult.Text ) - 1; |
473 | 473 | if foundPos > 0 then |
474 | 474 | downResult.Text := Copy( downResult.Text, 1, foundPos ); |
475 | - | |
476 | 475 | // Ü¿BBSÍ dat ¼ÇݪoÈ¢µAcgi ÈOÉ·ªÇÝÝÌû@ª éí¯Åà³¢ÌÅ |
477 | 476 | // fÌÜÜð³ÉÛƤÆ͹¸É 2ch Ì dat `®ÉÏ·µ½àÌðÛ¶µÄµÜ¤ |
478 | 477 | To2chDat( downResult, Count + 1 ); |
@@ -519,13 +518,13 @@ begin | ||
519 | 518 | if Count = 0 then |
520 | 519 | // 1` |
521 | 520 | datURL := |
522 | - uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' + | |
521 | + uri.Protocol + '://' + uri.Host + '/bbs/read.cgi?' + | |
523 | 522 | 'BBS=' + uriList.Values[ 'BBS' ] + '&KEY=' + uriList.Values[ 'KEY' ] + |
524 | 523 | '&START=' + IntToStr( 1 ) |
525 | 524 | else |
526 | 525 | // V ÌÝ |
527 | 526 | datURL := |
528 | - uri.Protocol + '://' + uri.Host + '/bbs/read.pl?' + | |
527 | + uri.Protocol + '://' + uri.Host + '/bbs/read.cgi?' + | |
529 | 528 | 'BBS=' + uriList.Values[ 'BBS' ] + '&KEY=' + uriList.Values[ 'KEY' ] + |
530 | 529 | '&START=' + IntToStr( Count + 1 ) + '&NOFIRST=TRUE'; |
531 | 530 | // _E[h |
@@ -767,7 +766,7 @@ procedure TMachiBBSThreadItem.To2chDat( | ||
767 | 766 | ); |
768 | 767 | var |
769 | 768 | i, bound : Integer; |
770 | - foundPos : Integer; | |
769 | + foundPos,foundPos2 : Integer; | |
771 | 770 | strTmp : string; |
772 | 771 | res : TStringList; |
773 | 772 | no : Integer; |
@@ -804,6 +803,7 @@ begin | ||
804 | 803 | // Ú[ñ`FbNÅâ誶µÄàæÖiß½¢ÌÅ |
805 | 804 | end; |
806 | 805 | |
806 | + | |
807 | 807 | // gbvÌãÌ '<b> </b>' ðóÉ |
808 | 808 | if AnsiPos('</b>', ioHTML.Text) <> 0 then begin |
809 | 809 | ioHTML.Text := CustomStringReplace( ioHTML.Text, '<b> </b></font>', '</b></font>', true ); |
@@ -828,6 +828,7 @@ begin | ||
828 | 828 | try |
829 | 829 | bound := ioHTML.Count - 1; |
830 | 830 | for i := 0 to bound do begin |
831 | + // XNvgªÜÜêÄ¢½çí·éiLÎôj | |
831 | 832 | res.Text := CustomStringReplace( ioHTML[ i ], '<>', #10 ); |
832 | 833 | //StringReplace( ioHTML[ i ], '<>', #10, [rfReplaceAll] ); |
833 | 834 | if res.Count >= 3 then begin // 3 ¢Í è¦È¢Æv¤¯ÇÀSÌ½ß |
@@ -855,7 +856,15 @@ begin | ||
855 | 856 | end; |
856 | 857 | end; |
857 | 858 | ioHTML[ i ] := CustomStringReplace( res.Text, #13#10, '<>'); |
858 | - //StringReplace( res.Text, #13#10, '<>', [rfReplaceAll] ); | |
859 | + // LXNvgÎô | |
860 | + foundPos := Pos( '<script', ioHTML[ i ] ); | |
861 | + if foundPos > 0 then begin | |
862 | + foundPos2 := Pos( '</script>', ioHTML[ i ] ); | |
863 | + if (foundPos2 > foundPos) then begin | |
864 | + ioHTML[ i ] := Copy(ioHTML[ i ], 1, foundPos-1) + | |
865 | + Copy(ioHTML[ i ], foundPos2 + 9, Length(ioHTML[ i ])); | |
866 | + end; | |
867 | + end; | |
859 | 868 | end; |
860 | 869 | finally |
861 | 870 | res.Free; |