From: q9_ Date: Sat, 10 Jul 2004 15:45:32 +0000 (+0000) Subject: スレ一覧で取得数のかわりに未取得数を表示できるようにした X-Git-Tag: v1_64_1_820~1074 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6260aaeb63f0e07eab27b3cd8db664afd22c9664;p=gikonavigoeson%2Fgikonavi.git スレ一覧で取得数のかわりに未取得数を表示できるようにした --- diff --git a/Giko.pas b/Giko.pas index 64d2f50..bc3dc45 100644 --- a/Giko.pas +++ b/Giko.pas @@ -2248,6 +2248,7 @@ function TGikoForm.SetThreadListItem(Board: TBoard): Integer; const COLUMN: array[0..7] of string = ('ƒXƒŒƒbƒh–¼', 'ƒJƒEƒ“ƒg', 'Žæ“¾', 'V’…', '–¢“Ç', '„‰ñ—\–ñ', 'Žæ“¾“úŽž', 'ƒXƒŒì¬“úŽž'); + COLUMN_NONACQUIREDCOUNT: string = '–¢Žæ“¾'; COLUMN_ALIGNMENT: array[0..7] of TAlignment = (taLeftJustify, taRightJustify, taRightJustify, taRightJustify, taRightJustify, taLeftJustify, @@ -2273,6 +2274,10 @@ begin ListColumn.Alignment := COLUMN_ALIGNMENT[i]; end; end; + if GikoSys.Setting.NonAcquiredCount then + begin + ListView.Columns[2].Caption := COLUMN_NONACQUIREDCOUNT; + end; ListView.Items.Count := 0; ListView.Items.Clear; @@ -2446,7 +2451,10 @@ begin if ThreadItem.IsLogFile then begin Item.ImageIndex := ITEM_ICON_THREADLOG1; Item.SubItems[0] := IntToStr(ThreadItem.AllResCount); - Item.SubItems[1] := IntToStr(ThreadItem.Count); + if GikoSys.Setting.NonAcquiredCount then + Item.SubItems[1] := IntToStr(ThreadItem.AllResCount - ThreadItem.Count) + else + Item.SubItems[1] := IntToStr(ThreadItem.Count); if ThreadItem.NewResCount = 0 then Item.SubItems[2] := '' else @@ -2796,6 +2804,7 @@ begin wkBoard := TBoard( FActiveList ); Sort.SortOrder := FSortOrder; Sort.SortIndex := Column.Index; + Sort.SortNonAcquiredCountFlag := GikoSys.Setting.NonAcquiredCount; wkBoard.CustomSort(ThreadItemSortProc); ListView.Refresh; end; diff --git a/Option.dfm b/Option.dfm index 3bbee06..b24ec89 100644 --- a/Option.dfm +++ b/Option.dfm @@ -697,21 +697,29 @@ object OptionDialog: TOptionDialog Left = 12 Top = 8 Width = 477 - Height = 49 + Height = 78 Caption = #34920#31034#35373#23450 TabOrder = 0 object ThreadListIconCheckBox: TCheckBox Left = 12 - Top = 20 + Top = 24 Width = 217 Height = 17 Caption = #12473#12524#12483#12489#26356#26032#12450#12452#12467#12531#12434#34920#31034#12377#12427'(&I)' TabOrder = 0 end + object NonAcquiredCountCheckBox: TCheckBox + Left = 12 + Top = 48 + Width = 217 + Height = 17 + Caption = #21462#24471#25968#12398#20195#12431#12426#12395#26410#21462#24471#25968#12434#34920#31034#12377#12427 + TabOrder = 1 + end end object GroupBox16: TGroupBox Left = 12 - Top = 64 + Top = 90 Width = 477 Height = 81 Caption = #12473#12524#20316#25104#26085#26178#34920#31034#35373#23450 @@ -735,7 +743,7 @@ object OptionDialog: TOptionDialog end object GroupBox5: TGroupBox Left = 12 - Top = 152 + Top = 175 Width = 477 Height = 89 Caption = #12502#12521#12454#12470#12398#26368#22823#21270 @@ -763,7 +771,7 @@ object OptionDialog: TOptionDialog end object GroupBox17: TGroupBox Left = 12 - Top = 256 + Top = 268 Width = 477 Height = 65 Caption = #12502#12521#12454#12470#12479#12502#38750#34920#31034#26178#35373#23450 diff --git a/Option.pas b/Option.pas index 33a33b2..c95f620 100644 --- a/Option.pas +++ b/Option.pas @@ -115,6 +115,7 @@ type TabSheet3: TTabSheet; GroupBox9: TGroupBox; ThreadListIconCheckBox: TCheckBox; + NonAcquiredCountCheckBox: TCheckBox; GroupBox6: TGroupBox; LogDeleteMessageCheckBox: TCheckBox; GroupBox10: TGroupBox; @@ -772,6 +773,7 @@ begin //ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“ ThreadListIconCheckBox.Checked := GikoSys.Setting.ListIconVisible; + NonAcquiredCountCheckBox.Checked := GikoSys.Setting.NonAcquiredCount; CreationTimeLogsCheckBox.Checked := GikoSys.Setting.CreationTimeLogs; FutureThreadCheckBox.Checked := GikoSys.Setting.FutureThread; SelectIntervalEdit.Text := IntToStr(GikoSys.Setting.SelectInterval); @@ -986,6 +988,7 @@ begin //ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“ GikoSys.Setting.ListIconVisible := ThreadListIconCheckBox.Checked; + GikoSys.Setting.NonAcquiredCount := NonAcquiredCountCheckBox.Checked; GikoSys.Setting.CreationTimeLogs := CreationTimeLogsCheckBox.Checked; GikoSys.Setting.FutureThread := FutureThreadCheckBox.Checked; if StrToIntDef(SelectIntervalEdit.Text, 110) > 55 then diff --git a/Setting.pas b/Setting.pas index e842dd5..3739a5d 100644 --- a/Setting.pas +++ b/Setting.pas @@ -260,11 +260,13 @@ type //ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“•\Ž¦ FListIconVisible: Boolean; + //Žæ“¾”‚Å‚Í‚È‚­–¢Žæ“¾‚ð•\Ž¦‚·‚é + FNonAcquiredCount: Boolean; //ƒXƒŒƒbƒhˆê——‚ÅLog‚Ì‚ ‚éƒXƒŒƒbƒh‚̂݃XƒŒì¬“ú‚ð•\Ž¦‚·‚é‚© FCreationTimeLogs: Boolean; //ƒXƒŒƒbƒhˆê——‚̃XƒŒ¶¬“ú‚Å–¢—ˆ‚̃XƒŒ‚̐¶¬“ú‚ð•\Ž¦‚µ‚È‚¢ - FFutureThread: Boolean; + FFutureThread: Boolean; //‘‚«ž‚ÝŽžƒ}ƒVƒ“ŽžŠÔŽg—pÝ’è FUseMachineTime: Boolean; @@ -537,6 +539,7 @@ type property BrowserAutoMaximize: TGikoBrowserAutoMaximize read FBrowserAutoMaximize write FBrowserAutoMaximize; property ListIconVisible: Boolean read FListIconVisible write FListIconVisible; + property NonAcquiredCount: Boolean read FNonAcquiredCount write FNonAcquiredCount; property CreationTimeLogs: Boolean read FCreationTimeLogs write FCreationTimeLogs; property FutureThread: Boolean read FFutureThread write FFutureThread; @@ -911,7 +914,8 @@ begin //ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“ FListIconVisible := ini.ReadBool('ThreadList', 'StateIconVisible', True); - FCreationTimeLogs := ini.ReadBool('ThreadList', 'CreationTimeLogs', True); + FNonAcquiredCount := ini.ReadBool('ThreadList', 'NonAcquiredCount', False); + FCreationTimeLogs := ini.ReadBool('ThreadList', 'CreationTimeLogs', True); FFutureThread := ini.ReadBool('ThreadList', 'FutureThread', True); FSelectInterval := ini.ReadInteger('ThreadList', 'SelectInterval', 110); @@ -1189,9 +1193,10 @@ begin //ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“ ini.WriteBool('ThreadList', 'StateIconVisible', FListIconVisible); + ini.WriteBool('ThreadList', 'NonAcquiredCount', FNonAcquiredCount); ini.WriteBool('ThreadList', 'CreationTimeLogs',FCreationTimeLogs); ini.WriteBool('ThreadList', 'FutureThread', FFutureThread); - ini.WriteInteger('ThreadList', 'SelectInterval', FSelectInterval); + ini.WriteInteger('ThreadList', 'SelectInterval', FSelectInterval); //‘‚«ž‚ÝŽžƒ}ƒVƒ“ŽžŽg—pÝ’è ini.WriteBool('PostTime', 'UseMachineTime', FUseMachineTime); diff --git a/Sort.pas b/Sort.pas index 1b56834..2b44b56 100644 --- a/Sort.pas +++ b/Sort.pas @@ -16,6 +16,7 @@ var SortOrder: Boolean; SortIndex: Integer; SortNoFlag: Boolean; + SortNonAcquiredCountFlag: Boolean; implementation @@ -73,14 +74,27 @@ begin Result := AnsiCompareText(ThreadItem1.Title, ThreadItem2.Title) end; 1: Result := CompareInt(ThreadItem1.AllResCount, ThreadItem2.AllResCount); - 2: Result := CompareInt(ThreadItem1.Count, ThreadItem2.Count); + 2: + begin + if SortNonAcquiredCountFlag then + if ThreadItem1.IsLogFile and ThreadItem2.IsLogFile then + Result := CompareInt(ThreadItem1.AllResCount - ThreadItem1.Count, ThreadItem2.AllResCount - ThreadItem2.Count) + else if ThreadItem1.IsLogFile then + Result := 1 + else if ThreadItem2.IsLogFile then + Result := -1 + else + Result := 0 + else + Result := CompareInt(ThreadItem1.Count, ThreadItem2.Count); + end; 3: Result := CompareInt(ThreadItem1.NewResCount, ThreadItem2.NewResCount); 4: Result := 0; 5: Result := AnsiCompareText(ThreadItem1.RoundName, ThreadItem2.RoundName); 6: Result := CompareDateTime(ThreadItem1.RoundDate, ThreadItem2.RoundDate); - 7: Result := CompareDateTime(ThreadItem1.CreateDate, ThreadItem2.CreateDate); - else - Result := 0; + 7: Result := CompareDateTime(ThreadItem1.CreateDate, ThreadItem2.CreateDate); + else + Result := 0; end; { if SortIndex = 0 then diff --git a/readme/readme.txt b/readme/readme.txt index 015dc85..43ab13c 100644 --- a/readme/readme.txt +++ b/readme/readme.txt @@ -103,6 +103,7 @@ Windows Server 2003 Enterprise Edition IE6 ƒŒƒXƒGƒfƒBƒ^‚ŁAˆø—p•„•t‚«“\‚è•t‚¯‚ª‚Å‚«‚é‚悤‚É‚È‚Á‚½ ‚µ‚½‚ç‚ÎJBBS‚̉ߋŽƒƒO‚ðŽæ“¾‚Å‚«‚é‚悤‚É‚µ‚½iˆê•”•s‹ï‡‚ ‚èj ƒŒƒX‘—MŽž‚Ì–¼‘O—“‚ªhfusianasanh‚©hŽRèÂh‚¾‚ÆŒxƒƒbƒZ[ƒW‚ª‚Å‚é‚悤‚É‚È‚Á‚½B + ƒXƒŒˆê——‚Ŏ擾”‚Ì‚©‚í‚è‚É–¢Žæ“¾”‚ð•\Ž¦‚Å‚«‚é‚悤‚É‚µ‚½ 2004/04/19 Version ÊÞÀ47 ƒXƒŒì¬“úŽžƒJƒ‰ƒ€•‚̏‰Šú’l‚ðÝ’è