ギコナビ
リビジョン | 5e7ef90839d42b21920ae419b19eaa880bb5621c (tree) |
---|---|
日時 | 2007-08-02 00:02:43 |
作者 | cvs2git <cvs2git> |
コミッター | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_57_0_719'.
@@ -1787,18 +1787,7 @@ begin | ||
1787 | 1787 | Result := ZERO_DATE |
1788 | 1788 | else begin |
1789 | 1789 | // Ot@CÌg£qð͸µ½à̪Xì¬ú |
1790 | - tmp := ChangeFileExt(FFileName, ''); | |
1791 | - if AnsiPos('_', tmp) <> 0 then | |
1792 | - if AnsiPos('_', tmp) > 9 then | |
1793 | - tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1) | |
1794 | - else | |
1795 | - Delete(tmp, AnsiPos('_', tmp), 1); | |
1796 | - | |
1797 | - if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then | |
1798 | - Insert('1', tmp, 1); | |
1799 | - | |
1800 | - unixtime := StrToInt64Def(tmp, ZERO_DATE); | |
1801 | - Result := UnixToDateTime(unixtime) + OffsetFromUTC; | |
1790 | + Result := GikoSys.GetCreateDateFromName(FFileName); | |
1802 | 1791 | if GikoSys.Setting.FutureThread then begin |
1803 | 1792 | if CompareDateTime(Result, Now) = 1 then |
1804 | 1793 | Result := ZERO_DATE; |
@@ -686,6 +686,10 @@ type | ||
686 | 686 | procedure SameBoardThreadSubItemOnClick(Sender: TObject); |
687 | 687 | //! |bvAbvuEUì¬ |
688 | 688 | procedure CreateResPopupBrowser; |
689 | + //! D&Dðó¯æé | |
690 | + procedure WMDropFiles(var Msg: TWMDropFiles); Message WM_DropFiles; | |
691 | + //! t@C`FbN | |
692 | + function isValidFile(FileName: String) : boolean; | |
689 | 693 | protected |
690 | 694 | procedure CreateParams(var Params: TCreateParams); override; |
691 | 695 | procedure WndProc(var Message: TMessage); override; |
@@ -1312,6 +1316,8 @@ begin | ||
1312 | 1316 | |
1313 | 1317 | //u·Ýèt@CÌÇÝÝ |
1314 | 1318 | ReplaceDM.LoadFromFile(GikoSys.GetReplaceFileName); |
1319 | + // D&Dðó¯æé | |
1320 | + DragAcceptFiles(Self.Handle, True); | |
1315 | 1321 | end; |
1316 | 1322 | |
1317 | 1323 | // CoolBar ÌÝèðÏÉÛ¶ |
@@ -1467,6 +1473,13 @@ begin | ||
1467 | 1473 | GikoDM.TabsOpenAction.Execute; |
1468 | 1474 | GikoDM.TabsOpenAction.Tag := 0; |
1469 | 1475 | if (GikoSys.Setting.LastCloseTabURL <> '') then begin |
1476 | + PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( FActiveContent.Browser ), 0 ); | |
1477 | + if ( FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin | |
1478 | + while (FActiveContent.Browser.ReadyState <> READYSTATE_COMPLETE) and | |
1479 | + (FActiveContent.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin | |
1480 | + Application.ProcessMessages; | |
1481 | + end; | |
1482 | + end; | |
1470 | 1483 | item := BBSsFindThreadFromURL( GikoSys.Setting.LastCloseTabURL ); |
1471 | 1484 | if (item <> nil) and (item.IsLogFile) then begin |
1472 | 1485 | OpenThreadItem(item, item.URL); |
@@ -2740,7 +2753,8 @@ var | ||
2740 | 2753 | begin |
2741 | 2754 | Thread := inThread; |
2742 | 2755 | idx := BrowserTab.TabIndex; |
2743 | - if (FActiveContent <> nil) and | |
2756 | + if (not FStartUp) and | |
2757 | + (FActiveContent <> nil) and | |
2744 | 2758 | (FActiveContent.Thread <> Thread.Thread) and |
2745 | 2759 | (FActiveContent.Browser <> nil) and |
2746 | 2760 | (Assigned(FActiveContent.Browser.Document)) then begin |
@@ -2777,6 +2791,12 @@ begin | ||
2777 | 2791 | ThreadTitle := Thread.Thread.Title; |
2778 | 2792 | ThreadPTitle := Thread.Thread.ParentBoard.Title; |
2779 | 2793 | //ThreadScrollTop := Thread.Thread.ScrollTop; |
2794 | + if Thread.Thread.IsLogFile then begin | |
2795 | + if not FileExists(Thread.Thread.GetThreadFileName) then begin | |
2796 | + Thread.Thread.DeleteLogFile; | |
2797 | + end; | |
2798 | + end; | |
2799 | + | |
2780 | 2800 | ThreadIsLog := Thread.Thread.IsLogFile; |
2781 | 2801 | ThreadItem := Thread.Thread; |
2782 | 2802 | ThreadNewArraical := Thread.Thread.NewArrival; |
@@ -6955,10 +6975,11 @@ end; | ||
6955 | 6975 | |
6956 | 6976 | procedure TGikoForm.BrowserPanelResize(Sender: TObject); |
6957 | 6977 | begin |
6958 | - if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin | |
6959 | - MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false); | |
6960 | - end; | |
6961 | - | |
6978 | + if (FIsMinimize <> mtMinimizing) then begin | |
6979 | + if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin | |
6980 | + MoveWindow(FActiveContent.Browser.Handle, 0, 0, BrowserPanel.ClientWidth, BrowserPanel.ClientHeight, false); | |
6981 | + end; | |
6982 | + end; | |
6962 | 6983 | end; |
6963 | 6984 | procedure TGikoForm.CoolBarResized(Sender: TObject; CoolBar: TCoolBar); |
6964 | 6985 | var |
@@ -7582,6 +7603,93 @@ begin | ||
7582 | 7603 | FResPopupBrowser := TResPopupBrowser.Create(BrowserPanel); |
7583 | 7604 | end; |
7584 | 7605 | end; |
7606 | +//! O©çÌD&D | |
7607 | +procedure TGikoForm.WMDropFiles(var Msg: TWMDropFiles); | |
7608 | +var | |
7609 | + FileName: Array[0..MAX_PATH] of Char; | |
7610 | + Cnt, K: Integer; | |
7611 | + Board: TBoard; | |
7612 | + LogFolder: String; | |
7613 | + datList: TStringList; | |
7614 | +begin | |
7615 | + // \¦µÄ¢éÌÂÌÆ«ÈOÍÛ | |
7616 | + if GetActiveList is TBoard then begin | |
7617 | + Board := TBoard(GetActiveList); | |
7618 | + if MsgBox(Handle, Board.Title | |
7619 | + + ' ÂÉüêÄ¢¢Å·©H', 'MRir', MB_YESNO or MB_ICONQUESTION) = IDYES then begin | |
7620 | + // ÂÌÍAOtH_ÉRs[µÄÍ®êOÎƯ¶H | |
7621 | + datList := TStringList.Create; | |
7622 | + try | |
7623 | + Cnt := DragQueryFile(Msg.Drop, $FFFFFFFF, FileName, SizeOf(FileName)); | |
7624 | + for K := 0 to Cnt - 1 do begin | |
7625 | + DragQueryFile(Msg.Drop, K, FileName, SizeOf(FileName)); | |
7626 | + {FileNameÉdrop³ê½t@C¼ªüÁÄ¢éÌÅA±±Å½ç©Ìð·éB½Æ¦ÎÌs} | |
7627 | + // t@CÌ`FbN | |
7628 | + if (isValidFile(FileName)) then begin | |
7629 | + LogFolder := ExtractFilePath(Board.FilePath); | |
7630 | + if (FileExists( LogFolder + ExtractFileName(FileName))) then begin | |
7631 | + GikoUtil.MsgBox(Handle, LogFolder + 'É' + ExtractFileName(FileName) + 'ªùɶݵܷB', 'G[', MB_ICONSTOP or MB_OK); | |
7632 | + end else begin | |
7633 | + if (not DirectoryExists(LogFolder)) then begin | |
7634 | + if (not GikoSys.ForceDirectoriesEx(LogFolder) ) then begin | |
7635 | + GikoUtil.MsgBox(Handle, LogFolder + '̶¬É¸sµÜµ½B', 'G[', MB_ICONSTOP or MB_OK); | |
7636 | + end; | |
7637 | + end; | |
7638 | + if (not Windows.CopyFile(FileName, PChar(LogFolder + ExtractFileName(FileName)), true)) then begin | |
7639 | + GikoUtil.MsgBox(Handle, FileName + 'ÌRs[ɸsµÜµ½B', 'G[', MB_ICONSTOP or MB_OK); | |
7640 | + end else begin | |
7641 | + datList.Add(ExtractFileName(FileName)); | |
7642 | + end; | |
7643 | + end; | |
7644 | + end; | |
7645 | + end; | |
7646 | + DragFinish(Msg.Drop); | |
7647 | + if (datList.Count > 0) then begin | |
7648 | + GikoSys.AddOutofIndexDat(Board, datList, False); | |
7649 | + ShowMessage(IntToStr(datList.Count) + 'ÂÌdatt@CªRs[³êܵ½B' ); | |
7650 | + if GikoForm.TreeView.Visible then | |
7651 | + GikoForm.TreeView.Refresh; | |
7652 | + if GikoForm.ListView.Visible then | |
7653 | + GikoForm.ListView.Refresh; | |
7654 | + end else begin | |
7655 | + ShowMessage('êÂàRs[³êܹñŵ½B' ); | |
7656 | + end; | |
7657 | + finally | |
7658 | + datList.Free; | |
7659 | + end; | |
7660 | + | |
7661 | + end; | |
7662 | + end else begin | |
7663 | + ShowMessage('Âð\¦µÄ¾³¢B'); | |
7664 | + end; | |
7665 | +end; | |
7666 | +//! t@C`FbN | |
7667 | +function TGikoForm.isValidFile(FileName: String) : boolean; | |
7668 | +var | |
7669 | + dt: TDateTime; | |
7670 | +begin | |
7671 | + Result := True; | |
7672 | + // ¶Ý·é©Ag£qdatAt@C¼ | |
7673 | + if ( not FileExists(FileName) ) then begin | |
7674 | + Result := False; | |
7675 | + GikoUtil.MsgBox(Handle, FileName + 'ͶݵܹñB', 'G[', MB_ICONSTOP or MB_OK); | |
7676 | + end else if (ExtractFileExt(ExtractFileName(FileName)) <> '.dat' ) then begin | |
7677 | + Result := False; | |
7678 | + GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'Ìg£qª".dat"Å èܹñB', 'G[', MB_ICONSTOP or MB_OK); | |
7679 | + end else begin | |
7680 | + // Ot@CÌg£qð͸µ½à̪Xì¬ú | |
7681 | + try | |
7682 | + dt := GikoSys.GetCreateDateFromName(FileName); | |
7683 | + if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin | |
7684 | + Result := False; | |
7685 | + GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'Ìt@C¼ªs³Å·B', 'G[', MB_ICONSTOP or MB_OK); | |
7686 | + end; | |
7687 | + except | |
7688 | + Result := False; | |
7689 | + GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'Ìt@C¼ªs³Å·B', 'G[', MB_ICONSTOP or MB_OK); | |
7690 | + end; | |
7691 | + end; | |
7692 | +end; | |
7585 | 7693 | |
7586 | 7694 | initialization |
7587 | 7695 | OleInitialize(nil); |
@@ -2261,9 +2261,11 @@ begin | ||
2261 | 2261 | if item <> nil then |
2262 | 2262 | GikoForm.InsertBrowserTab( item, false ); |
2263 | 2263 | end; |
2264 | - //ÅÌPÉÝè AhXÌÝè̽ßÌJÄÑ | |
2265 | - if GikoForm.BrowserTab.Tabs.Count > 0 then begin | |
2266 | - GikoForm.BrowserTab.OnChange(nil); | |
2264 | + //ÅÌPÉÝè | |
2265 | + if (GikoSys.Setting.URLDisplay) and | |
2266 | + (GikoForm.BrowserTab.Tabs.Count > 0) then begin | |
2267 | + GikoForm.AddressComboBox.Text := | |
2268 | + TBrowserRecord(GikoForm.BrowserTab.Tabs.Objects[0]).Thread.URL; | |
2267 | 2269 | end; |
2268 | 2270 | end; |
2269 | 2271 | finally |
@@ -116,8 +116,6 @@ type | ||
116 | 116 | function ChooseString(const Text, Separator: string; Index: integer): string; |
117 | 117 | //! êt@C©çÌ |
118 | 118 | procedure RestoreThreadData(Board: TBoard); |
119 | - //! CfbNXÉÈ¢datiÍ®êdatjÌÇÁ | |
120 | - procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList); | |
121 | 119 | public |
122 | 120 | { Public é¾ } |
123 | 121 | FAbon : TAbon; |
@@ -129,13 +127,10 @@ type | ||
129 | 127 | property ResRange : Longint read FResRange write FResRange; |
130 | 128 | //! o[Wîñ |
131 | 129 | property Version : String read FVersion; |
132 | -// function MsgBox(Msg: string; Title: string; Flags: Longint): integer; overload; | |
133 | -// function MsgBox(Handle: THandle; Msg: string; Title: string; Flags: Longint): integer; overload; | |
134 | 130 | function IsNumeric(s: string): boolean; |
135 | 131 | function IsFloat(s: string): boolean; |
136 | 132 | function DirectoryExistsEx(const Name: string): Boolean; |
137 | 133 | function ForceDirectoriesEx(Dir: string): Boolean; |
138 | -// function GetVersion: string; | |
139 | 134 | |
140 | 135 | function GetBoardFileName: string; |
141 | 136 | function GetCustomBoardFileName: string; |
@@ -257,6 +252,10 @@ type | ||
257 | 252 | function GetOEIndentChar : string; |
258 | 253 | //! u·Ýèt@Cæ¾ |
259 | 254 | function GetReplaceFileName: String; |
255 | + //! CfbNXÉÈ¢datiÍ®êdatjÌÇÁ | |
256 | + procedure AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: boolean = True); | |
257 | + //! t@C¼©çÌXbhì¬úÌæ¾ | |
258 | + function GetCreateDateFromName(FileName: String): TDateTime; | |
260 | 259 | end; |
261 | 260 | |
262 | 261 | var |
@@ -266,7 +265,7 @@ const | ||
266 | 265 | ZERO_DATE: Integer = 25569; |
267 | 266 | BETA_VERSION_NAME_E = 'beta'; |
268 | 267 | BETA_VERSION_NAME_J = 'ÊÞÀ'; |
269 | - BETA_VERSION = 56; | |
268 | + BETA_VERSION = 57; | |
270 | 269 | BETA_VERSION_BUILD = ''; //!< debugÅÈÇ |
271 | 270 | APP_NAME = 'gikoNavi'; |
272 | 271 | BE_PHP_URL = 'http://be.2ch.net/test/p.php?i='; |
@@ -572,11 +571,18 @@ var | ||
572 | 571 | usePlugIn : Boolean; |
573 | 572 | islog : Boolean; |
574 | 573 | urlHead: String; |
574 | + datFileCheck: Boolean; | |
575 | 575 | {* |
576 | 576 | FavoThreadItem : TFavoriteThreadItem; |
577 | 577 | Node: TTreeNode; |
578 | 578 | *} |
579 | +{$IFDEF DEBUG} | |
580 | + st, rt: Cardinal; | |
581 | +{$ENDIF} | |
579 | 582 | begin |
583 | +{$IFDEF DEBUG} | |
584 | + st := GetTickCount; | |
585 | +{$ENDIF} | |
580 | 586 | if Board.IsThreadDatRead then |
581 | 587 | Exit; |
582 | 588 | Board.Clear; |
@@ -592,12 +598,16 @@ begin | ||
592 | 598 | |
593 | 599 | FileName := Board.GetFolderIndexFileName; |
594 | 600 | |
595 | - FileList := TStringList.Create; | |
596 | - FileList.Sorted := True; | |
597 | - FileList.BeginUpdate; | |
598 | - //IsLogFilepDATt@CXg | |
599 | - GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False); | |
600 | - FileList.EndUpdate; | |
601 | + // | |
602 | + datFileCheck := (Setting.CheckDatFile) or (not FileExists(FileName)); | |
603 | + if (datFileCheck) then begin | |
604 | + FileList := TStringList.Create; | |
605 | + FileList.Sorted := True; | |
606 | + FileList.BeginUpdate; | |
607 | + //IsLogFilepDATt@CXg | |
608 | + GetFileList(ExtractFileDir(Board.GetFolderIndexFileName), '*.dat', FileList, False); | |
609 | + FileList.EndUpdate; | |
610 | + end; | |
601 | 611 | |
602 | 612 | // d¡ðh® |
603 | 613 | Board.BeginUpdate; |
@@ -609,7 +619,11 @@ begin | ||
609 | 619 | //QsÚ©çiPsÚÍo[Wj |
610 | 620 | for i := sl.Count - 1 downto 1 do begin |
611 | 621 | Rec := ParseIndexLine(sl[i]); |
612 | - islog := FileList.Find( Rec.FFileName, Index ); | |
622 | + if (datFileCheck) then begin | |
623 | + islog := FileList.Find( Rec.FFileName, Index ); | |
624 | + end else begin | |
625 | + islog := (Rec.FSize <> 0) and (Rec.FCount <> 0); | |
626 | + end; | |
613 | 627 | if usePlugIn then |
614 | 628 | ThreadItem := TThreadItem.Create( |
615 | 629 | Board.BoardPlugIn, |
@@ -636,7 +650,7 @@ begin | ||
636 | 650 | end; |
637 | 651 | |
638 | 652 | ThreadItem.BeginUpdate; |
639 | - if islog then | |
653 | + if (datFileCheck) and (islog) then | |
640 | 654 | FileList.Delete( Index ); |
641 | 655 | |
642 | 656 | ThreadItem.No := Rec.FNo; |
@@ -671,50 +685,75 @@ begin | ||
671 | 685 | if UnRead <> Board.UnRead then |
672 | 686 | Board.UnRead := UnRead; |
673 | 687 | |
674 | - //CfbNXɳ©Á½OðÇÁi êCfbNXÎj | |
675 | - AddOutofIndexDat(Board, FileList); | |
688 | + if (datFileCheck) then begin | |
689 | + //CfbNXɳ©Á½OðÇÁi êCfbNXÎj | |
690 | + AddOutofIndexDat(Board, FileList); | |
691 | + end; | |
676 | 692 | Board.EndUpdate; |
677 | 693 | |
678 | 694 | //OñÙíI¹`FbN |
679 | 695 | RestoreThreadData( Board ); |
680 | 696 | finally |
681 | 697 | sl.Free; |
682 | - FileList.Free; | |
698 | + if (datFileCheck) then begin | |
699 | + FileList.Free; | |
700 | + end; | |
683 | 701 | Board.Sorted := False; |
684 | 702 | end; |
685 | 703 | Board.IsThreadDatRead := True; |
704 | +{$IFDEF DEBUG} | |
705 | + rt := GetTickCount - st; | |
706 | + Writeln('Read Done.' + IntToStr(rt) + ' ms'); | |
707 | +{$ENDIF} | |
686 | 708 | end; |
687 | 709 | {! |
688 | 710 | \brief CfbNXÉÈ¢datiÍ®êdatjÌÇÁ |
689 | 711 | \param Board ÇÁ·é |
690 | 712 | \param DatList datt@C¼ |
691 | 713 | } |
692 | -procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList); | |
714 | +procedure TGikoSys.AddOutofIndexDat(Board: TBoard; DatList: TStringList; AllCreate: Boolean = True); | |
693 | 715 | var |
694 | 716 | i : Integer; |
695 | 717 | Boardpath,FileName : String; |
696 | 718 | ResRec: TResRec; |
697 | 719 | ThreadItem: TThreadItem; |
720 | + create: Boolean; | |
698 | 721 | begin |
722 | + create := False; | |
699 | 723 | Boardpath := ExtractFilePath(Board.GetFolderIndexFileName); |
700 | 724 | //CfbNXɳ©Á½OðÇÁi êCfbNXÎj |
701 | 725 | for i := 0 to DatList.Count - 1 do begin |
702 | 726 | FileName := Boardpath + DatList[i]; |
703 | - | |
704 | - //ResRec := DivideStrLine(ReadThreadFile(FileName, 1)); | |
705 | - if Board.IsBoardPlugInAvailable then begin | |
706 | - ThreadItem := TThreadItem.Create( | |
707 | - Board.BoardPlugIn, | |
708 | - Board, | |
709 | - Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) ); | |
710 | - THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec); | |
711 | - end else begin | |
712 | - ThreadItem := TThreadItem.Create( | |
713 | - nil, | |
714 | - Board, | |
715 | - Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) ); | |
716 | - THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec); | |
727 | + ThreadItem := nil; | |
728 | + if (not AllCreate) then begin | |
729 | + create := False; | |
730 | + ThreadItem := Board.FindThreadFromFileName(DatList[i]); | |
731 | + if (ThreadItem = nil) then begin | |
732 | + create := True; | |
733 | + end else begin | |
734 | + if Board.IsBoardPlugInAvailable then begin | |
735 | + THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec); | |
736 | + end else begin | |
737 | + THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec); | |
738 | + end; | |
739 | + end; | |
740 | + end; | |
741 | + if (ThreadItem = nil) then begin | |
742 | + if Board.IsBoardPlugInAvailable then begin | |
743 | + ThreadItem := TThreadItem.Create( | |
744 | + Board.BoardPlugIn, | |
745 | + Board, | |
746 | + Board.BoardPlugIn.FileName2ThreadURL( DWORD( Board ), DatList[i] ) ); | |
747 | + THTMLCreate.DivideStrLine(Board.BoardPlugIn.GetDat( DWORD( ThreadItem ), 1 ), @ResRec); | |
748 | + end else begin | |
749 | + ThreadItem := TThreadItem.Create( | |
750 | + nil, | |
751 | + Board, | |
752 | + Get2chBoard2ThreadURL( Board, ChangeFileExt( DatList[i], '' ) ) ); | |
753 | + THTMLCreate.DivideStrLine(ReadThreadFile(FileName, 1), @ResRec); | |
754 | + end; | |
717 | 755 | end; |
756 | + | |
718 | 757 | |
719 | 758 | ThreadItem.BeginUpdate; |
720 | 759 | ThreadItem.FileName := DatList[i]; |
@@ -736,7 +775,9 @@ begin | ||
736 | 775 | ThreadItem.ScrollTop := 0; |
737 | 776 | ThreadItem.AgeSage := gasNone; |
738 | 777 | ThreadItem.EndUpdate; |
739 | - Board.Add(ThreadItem); | |
778 | + if (AllCreate) or (create) then begin | |
779 | + Board.Add(ThreadItem); | |
780 | + end; | |
740 | 781 | end; |
741 | 782 | end; |
742 | 783 | {! |
@@ -3309,7 +3350,8 @@ begin | ||
3309 | 3350 | ThreadItem.NewReceive := ini.ReadInteger(SECTION, 'NewReceive', 0); |
3310 | 3351 | |
3311 | 3352 | ThreadItem.Size := ini.ReadInteger(SECTION, 'Size', 0); |
3312 | - if(ThreadItem.Size = 0) and (FileExists(ThreadItem.GetThreadFileName)) then begin | |
3353 | + ThreadItem.IsLogFile := FileExists(ThreadItem.GetThreadFileName); | |
3354 | + if(ThreadItem.Size = 0) and (ThreadItem.IsLogFile) then begin | |
3313 | 3355 | try |
3314 | 3356 | ThreadItem.Size := GetFileSize(ThreadItem.GetThreadFileName) - ThreadItem.Count; |
3315 | 3357 | except |
@@ -3399,6 +3441,26 @@ function TGikoSys.GetReplaceFileName: String; | ||
3399 | 3441 | begin |
3400 | 3442 | Result := Setting.GetReplaceFileName; |
3401 | 3443 | end; |
3444 | +//! t@C¼©çÌXbhì¬úÌæ¾ | |
3445 | +function TGikoSys.GetCreateDateFromName(FileName: String): TDateTime; | |
3446 | +var | |
3447 | + tmp : String; | |
3448 | + unixtime: Int64; | |
3449 | +begin | |
3450 | + // Ot@CÌg£qð͸µ½à̪Xì¬ú | |
3451 | + tmp := ChangeFileExt(FileName, ''); | |
3452 | + if AnsiPos('_', tmp) <> 0 then | |
3453 | + if AnsiPos('_', tmp) > 9 then | |
3454 | + tmp := Copy(tmp, 1, AnsiPos('_', tmp)-1) | |
3455 | + else | |
3456 | + Delete(tmp, AnsiPos('_', tmp), 1); | |
3457 | + | |
3458 | + if ( Length(tmp) = 9) and ( tmp[1] = '0' ) then | |
3459 | + Insert('1', tmp, 1); | |
3460 | + | |
3461 | + unixtime := StrToInt64Def(tmp, ZERO_DATE); | |
3462 | + Result := UnixToDateTime(unixtime) + OffsetFromUTC; | |
3463 | +end; | |
3402 | 3464 | |
3403 | 3465 | initialization |
3404 | 3466 | GikoSys := TGikoSys.Create; |
@@ -21,8 +21,8 @@ object KuroutOption: TKuroutOption | ||
21 | 21 | Top = 0 |
22 | 22 | Width = 517 |
23 | 23 | Height = 393 |
24 | - ActivePage = KakikomiTabSheet | |
25 | - TabIndex = 2 | |
24 | + ActivePage = TabSheet2 | |
25 | + TabIndex = 3 | |
26 | 26 | TabOrder = 0 |
27 | 27 | object TabSheet1: TTabSheet |
28 | 28 | Caption = #35443#32048#35373#23450#65297 |
@@ -562,6 +562,22 @@ object KuroutOption: TKuroutOption | ||
562 | 562 | TabOrder = 1 |
563 | 563 | end |
564 | 564 | end |
565 | + object LogGroupBox: TGroupBox | |
566 | + Left = 16 | |
567 | + Top = 160 | |
568 | + Width = 465 | |
569 | + Height = 65 | |
570 | + Caption = #12525#12464 | |
571 | + TabOrder = 1 | |
572 | + object CheckDatFileCheckBox: TCheckBox | |
573 | + Left = 22 | |
574 | + Top = 14 | |
575 | + Width = 369 | |
576 | + Height = 17 | |
577 | + 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 | |
578 | + TabOrder = 0 | |
579 | + end | |
580 | + end | |
565 | 581 | end |
566 | 582 | end |
567 | 583 | object OkBotton: TButton |
@@ -81,6 +81,8 @@ type | ||
81 | 81 | Label14: TLabel; |
82 | 82 | ExtListLabeledEdit: TLabeledEdit; |
83 | 83 | Label15: TLabel; |
84 | + LogGroupBox: TGroupBox; | |
85 | + CheckDatFileCheckBox: TCheckBox; | |
84 | 86 | procedure OkBottonClick(Sender: TObject); |
85 | 87 | procedure FormCreate(Sender: TObject); |
86 | 88 | procedure CDeleteButtonClick(Sender: TObject); |
@@ -156,6 +158,8 @@ begin | ||
156 | 158 | ReplaceDatCheckBox.Checked := GikoSys.Setting.ReplaceDat; |
157 | 159 | SentIniFileSizeUpDown.Position := GikoSys.Setting.SentIniFileSize; |
158 | 160 | ExtListLabeledEdit.Text := GikoSys.Setting.ExtList; |
161 | + // Folder.idxÇÝÝdat`FbN | |
162 | + CheckDatFileCheckBox.Checked := GikoSys.Setting.CheckDatFile; | |
159 | 163 | end; |
160 | 164 | |
161 | 165 | procedure TKuroutOption.SaveSetting; |
@@ -198,6 +202,8 @@ begin | ||
198 | 202 | GikoSys.Setting.ReplaceDat := ReplaceDatCheckBox.Checked; |
199 | 203 | GikoSys.Setting.SentIniFileSize := SentIniFileSizeUpDown.Position; |
200 | 204 | GikoSys.Setting.ExtList := ExtListLabeledEdit.Text; |
205 | + // Folder.idxÇÝÝdat`FbN | |
206 | + GikoSys.Setting.CheckDatFile := CheckDatFileCheckBox.Checked; | |
201 | 207 | end; |
202 | 208 | |
203 | 209 | procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject); |
@@ -450,6 +450,8 @@ type | ||
450 | 450 | FExtList: String; |
451 | 451 | //! SkinÖA |
452 | 452 | FSkinFiles: TSkinFiles; |
453 | + //! indext@CðÇÝÉdatðõ·é | |
454 | + FCheckDatFile: Boolean; | |
453 | 455 | function GetMainCoolSet(Index: Integer): TCoolSet; |
454 | 456 | function GetBoardCoolSet(Index: Integer): TCoolSet; |
455 | 457 | function GetBrowserCoolSet(Index: Integer): TCoolSet; |
@@ -807,7 +809,8 @@ type | ||
807 | 809 | property ExtList: String read FExtList write FExtList; |
808 | 810 | //! Skint@CÇ |
809 | 811 | property SkinFiles: TSkinFiles read FSkinFiles; |
810 | - | |
812 | + //! CfbNXÇÝÝdatt@C`FbN | |
813 | + property CheckDatFile: Boolean read FCheckDatFile write FCheckDatFile; | |
811 | 814 | end; |
812 | 815 | |
813 | 816 |
@@ -1293,6 +1296,9 @@ begin | ||
1293 | 1296 | |
1294 | 1297 | FSentIniFileSize := ini.ReadInteger('Function', 'SentIniFileSize', 3); |
1295 | 1298 | FExtList := ini.ReadString('Function', 'ExtList', '*.gif;*.jpg;*.jpeg;*.png;*.zip;*.rar'); |
1299 | + | |
1300 | + FCheckDatFile := ini.ReadBool('ThreadList', 'CheckDatFile', True); | |
1301 | + | |
1296 | 1302 | ini.UpdateFile; |
1297 | 1303 | finally |
1298 | 1304 | ini.Free; |
@@ -1675,6 +1681,7 @@ begin | ||
1675 | 1681 | ini.WriteBool('Thread', 'ReplaceDat', FReplaceDat); |
1676 | 1682 | ini.WriteInteger('Function', 'SentIniFileSize', FSentIniFileSize); |
1677 | 1683 | ini.WriteString('Function', 'ExtList', FExtList); |
1684 | + ini.WriteBool('ThreadList', 'CheckDatFile', FCheckDatFile); | |
1678 | 1685 | ini.UpdateFile; |
1679 | 1686 | finally |
1680 | 1687 | ini.Free; |
@@ -10,11 +10,11 @@ VersionInfoDescription= | ||
10 | 10 | DefaultGroupName=MRir |
11 | 11 | ; ©ªÌ«Éí¹Ä¾³¢ |
12 | 12 | SourceDir=G:\Release |
13 | -OutputDir=G:\Output | |
13 | +OutputDir=G:\InnoSetup\Output | |
14 | 14 | SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico" |
15 | 15 | ; MRirÌo[WÉ í¹Ä¾³¢ |
16 | -VersionInfoVersion=1.56.0.714 | |
17 | -OutputBaseFilename=gikoNavi_1.56.0.714_2_setup | |
16 | +VersionInfoVersion=1.56.1.716 | |
17 | +OutputBaseFilename=gikoNavi_b56_setup | |
18 | 18 | |
19 | 19 | |
20 | 20 | [Tasks] |
@@ -90,7 +90,7 @@ begin | ||
90 | 90 | begin |
91 | 91 | DelTree(path, True, True, True); |
92 | 92 | end; |
93 | - | |
93 | + | |
94 | 94 | path := ExpandConstant('{app}') + '\config'; |
95 | 95 | if MsgBox(path + 'tH_Ⱥð®SÉÁµÄæ뵢ŵ天H', mbConfirmation, MB_YESNO) = IDYES then |
96 | 96 | begin |
@@ -1,4 +1,4 @@ | ||
1 | -¡MRir Version1.00 ÊÞÀ56 Readme.txt | |
1 | +¡MRir Version1.00 ÊÞÀ57 Readme.txt | |
2 | 2 | |
3 | 3 | |
4 | 4 | ------------------------------ |
@@ -108,6 +108,9 @@ LICENSE | ||
108 | 108 | ------------------------------ |
109 | 109 | ð |
110 | 110 | ------------------------------ |
111 | +2007/XX/XX | |
112 | + Version ÊÞÀ57 | |
113 | + | |
111 | 114 | 2007/08/05 |
112 | 115 | Version ÊÞÀ56 |
113 | 116 | @X|bvAbv̽iΠ|
@@ -1,44 +1,36 @@ | ||
1 | 1 | [Setting] |
2 | -@ascii2d=30 | |
3 | -@chiri=30 | |
4 | -@gline=30 | |
5 | 2 | @newsplus=120 |
6 | -@operate=30 | |
7 | -@tv=30 | |
8 | -aa6=30 | |
3 | +@skate=60 | |
9 | 4 | academy6=30 |
10 | -anime2=45 | |
11 | -book4=30 | |
12 | -bubble5=30 | |
5 | +anime2=60 | |
6 | +bubble6=30 | |
13 | 7 | etc6=30 |
14 | 8 | ex20=30 |
15 | 9 | ex21=30 |
16 | -ex22=30 | |
17 | -food7=30 | |
10 | +ex23=20 | |
11 | +food8=30 | |
18 | 12 | game11=30 |
19 | 13 | game12=30 |
20 | 14 | hobby9=30 |
21 | -human6=30 | |
15 | +human7=30 | |
22 | 16 | life8=30 |
23 | 17 | live23=10 |
24 | 18 | live24=10 |
25 | 19 | live25=10 |
26 | -love5=30 | |
27 | -money5=30 | |
20 | +love6=30 | |
21 | +money6=30 | |
28 | 22 | music8=30 |
29 | 23 | news21=30 |
30 | 24 | news22=30 |
31 | -off4=30 | |
32 | -pc9=30 | |
25 | +news23=128 | |
33 | 26 | pc11=30 |
34 | 27 | qb5=30 |
35 | -school6=30 | |
28 | +school7=30 | |
36 | 29 | science6=30 |
37 | -sports10=60 | |
30 | +sports11=60 | |
38 | 31 | tmp6=45 |
39 | -travel3=30 | |
40 | 32 | tv11=60 |
41 | -wwwww=20 | |
33 | +wwwww=15 | |
42 | 34 | |
43 | 35 | idol=30 |
44 | 36 | pie=30 |