• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revision526e920a15c548255c3daa725f4ab3e9022ede67 (tree)
Time2008-09-14 10:47:56
Authorcvs2git <cvs2git>
Commitercvs2git

Log Message

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

Change Summary

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -692,9 +692,6 @@ type
692692 function isValidFile(FileName: String) : boolean;
693693 //! ListViewのD&D受け取り
694694 procedure AcceptDropFiles(var Msg: TMsg);
695- //! スレッド一覧更新処理
696- procedure UpdateListView();
697-
698695 protected
699696 procedure CreateParams(var Params: TCreateParams); override;
700697 procedure WndProc(var Message: TMessage); override;
@@ -2584,7 +2581,20 @@ begin
25842581 end;
25852582 TreeView.Refresh;
25862583 //ListViewでこのスレが含まれる板を表示しているときの更新処理
2587- UpdateListView();
2584+ if (ActiveList <> nil) and (ActiveList is TBoard) then begin
2585+ TBoard(ActiveList).LogThreadCount := TBoard(ActiveList).GetLogThreadCount;
2586+ TBoard(ActiveList).NewThreadCount := TBoard(ActiveList).GetNewThreadCount;
2587+ TBoard(ActiveList).UserThreadCount:= TBoard(ActiveList).GetUserThreadCount;
2588+ //ListViewのアイテムの個数も更新
2589+ case GikoForm.ViewType of
2590+ gvtAll: ListView.Items.Count := TBoard(ActiveList).Count;
2591+ gvtLog: ListView.Items.Count := TBoard(ActiveList).LogThreadCount;
2592+ gvtNew: ListView.Items.Count := TBoard(ActiveList).NewThreadCount;
2593+ gvtArch: ListView.Items.Count := TBoard(ActiveList).ArchiveThreadCount;
2594+ gvtLive: ListView.Items.Count := TBoard(ActiveList).LiveThreadCount;
2595+ gvtUser: ListView.Items.Count := TBoard(ActiveList).UserThreadCount;
2596+ end;
2597+ end;
25882598 RefreshListView(Item.ThreadItem);
25892599 end;
25902600
@@ -6784,6 +6794,8 @@ var
67846794 FOleInPlaceActiveObject: IOleInPlaceActiveObject;
67856795 p : TPoint;
67866796 AID: string;
6797+ stlist : TStringList;
6798+ i : Integer;
67876799 begin
67886800 result := true;
67896801 if not Assigned(FActiveContent) then
@@ -7841,6 +7853,7 @@ var
78417853 Board: TBoard;
78427854 LogFolder: String;
78437855 datList: TStringList;
7856+ p: TPoint;
78447857 begin
78457858 // 表示しているの板のとき以外は拒否
78467859 if GetActiveList is TBoard then begin
@@ -7877,12 +7890,10 @@ begin
78777890 if (datList.Count > 0) then begin
78787891 GikoSys.AddOutofIndexDat(Board, datList, False);
78797892 ShowMessage(IntToStr(datList.Count) + '個のdatファイルがコピーされました。' );
7880- if GikoForm.TreeView.Visible then begin
7893+ if GikoForm.TreeView.Visible then
78817894 GikoForm.TreeView.Refresh;
7882- end;
7883- if GikoForm.ListView.Visible then begin
7884- UpdateListView();
7885- end;
7895+ if GikoForm.ListView.Visible then
7896+ GikoForm.ListView.Refresh;
78867897 end else begin
78877898 ShowMessage('一つもコピーされませんでした。' );
78887899 end;
@@ -7895,25 +7906,7 @@ begin
78957906 ShowMessage('板を表示してください。');
78967907 end;
78977908 end;
7898-procedure TGikoForm.UpdateListView();
7899-begin
7900- //ListViewでこのスレが含まれる板を表示しているときの更新処理
7901- if (ActiveList <> nil) and (ActiveList is TBoard) then begin
7902- TBoard(ActiveList).LogThreadCount := TBoard(ActiveList).GetLogThreadCount;
7903- TBoard(ActiveList).NewThreadCount := TBoard(ActiveList).GetNewThreadCount;
7904- TBoard(ActiveList).UserThreadCount:= TBoard(ActiveList).GetUserThreadCount;
7905- //ListViewのアイテムの個数も更新
7906- case GikoForm.ViewType of
7907- gvtAll: ListView.Items.Count := TBoard(ActiveList).Count;
7908- gvtLog: ListView.Items.Count := TBoard(ActiveList).LogThreadCount;
7909- gvtNew: ListView.Items.Count := TBoard(ActiveList).NewThreadCount;
7910- gvtArch: ListView.Items.Count := TBoard(ActiveList).ArchiveThreadCount;
7911- gvtLive: ListView.Items.Count := TBoard(ActiveList).LiveThreadCount;
7912- gvtUser: ListView.Items.Count := TBoard(ActiveList).UserThreadCount;
7913- end;
7914- end;
7915- ListView.Refresh;
7916-end;
7909+
79177910 //! ファイルチェック
79187911 function TGikoForm.isValidFile(FileName: String) : boolean;
79197912 var
@@ -7930,7 +7923,7 @@ begin
79307923 end else begin
79317924 // ログファイルの拡張子をはずしたものがスレ作成日時
79327925 try
7933- dt := GikoSys.GetCreateDateFromName(ExtractFileName(FileName));
7926+ dt := GikoSys.GetCreateDateFromName(FileName);
79347927 if ((UnixToDateTime(ZERO_DATE) + OffsetFromUTC) = dt) then begin
79357928 Result := False;
79367929 GikoUtil.MsgBox(Handle, ExtractFileName(FileName) + 'のファイル名が不正です。', 'エラー', MB_ICONSTOP or MB_OK);
--- a/ResPopupBrowser.pas
+++ b/ResPopupBrowser.pas
@@ -66,8 +66,6 @@ begin
6666 RawDocument := '';
6767 FEvent := nil;
6868 ShowWindow(Self.Handle, SW_HIDE);
69- GikoSys.ShowRefCount('ResPop Create', Self.ControlInterface);
70- GikoSys.ShowRefCount('ResPop.Document Create', Self.ControlInterface.Document);
7169 end;
7270
7371 destructor TResPopupBrowser.Destroy;
@@ -86,10 +84,6 @@ begin
8684 FEvent := nil;
8785 end;
8886 FThread := nil;
89-
90- GikoSys.ShowRefCount('ResPop Desctroy', Self.ControlInterface);
91- GikoSys.ShowRefCount('ResPop.Document Create', Self.ControlInterface.Document);
92-
9387 inherited Destroy;
9488 end;
9589
@@ -142,7 +136,7 @@ begin
142136 end;
143137 procedure TResPopupBrowser.NavigateBlank(Forced: Boolean);
144138 begin
145- if (not Assigned(Self.ControlInterface.Document)) or (Forced) then begin
139+ if (not Assigned(Self.Document)) or (Forced) then begin
146140 Self.Navigate('about:blank');
147141 end;
148142 while (Self.ReadyState <> READYSTATE_COMPLETE) and
@@ -198,7 +192,7 @@ begin
198192 ARect := CalcRect(Screen.MonitorFromPoint(p).WorkareaRect,
199193 not OnlyTitle);
200194
201- FEvent := THTMLDocumentEventSink.Create(Self, Self.OleObject.Document, HTMLDocumentEvents2);
195+ FEvent := THTMLDocumentEventSink.Create(Self, Self.Document, HTMLDocumentEvents2);
202196 FEvent.OnClick := ResPopupBrowserClick;
203197 FEvent.OnDoubleClick := ResPopupBrowserDbClick;
204198 Self.Visible := True;
@@ -278,7 +272,7 @@ var
278272 DIV_X, DIV_Y: Integer;
279273 begin
280274 GetCursorpos(p);
281- ele := ((Self.ControlInterface.Document as IHTMLDocument2).body as IHTMLElement2);
275+ ele := ((Self.Document as IHTMLDocument2).body as IHTMLElement2);
282276 if Scroll then begin
283277 h := GetWindowHeight + 10;
284278 w := ele.scrollWidth + 25
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -79,7 +79,7 @@ http://www.microsoft.com/windows95/downloads/contents/WUAdminTools/S_WUNetworkin
7979 ------------------------------
8080 開発ツール:Delphi6 Professional (UP2 + RTL UP2 + RTL UP3)
8181 Delphi6 Personal(UP2 + RTL UP2 + RTL UP3)
82-OS :WindowsXP Professional Edition(SP3) + IE7
82+OS :WindowsXP Professional Edition(SP2) + IE7
8383 WindowsXP Professional Edition(SP1) + IE6(SP1)
8484 Windows2000 Professional (SP4) + IE6(SP1)
8585
@@ -108,17 +108,13 @@ LICENSE
108108 ------------------------------
109109 履歴
110110 ------------------------------
111-2008/09/20
111+2008/0X/XX
112112 Version バタ58
113113 プレビューのURLから登録してある外部アプリを起動する機能を追加
114114 レス送信エディタで、連続して投稿できるようにする機能を追加
115115 開いているタブのスレッドの一覧をスレッド一覧に表示する機能を追加
116116 まちBBSのPATH_INFO形式のURLに対応
117- サウンドイベントのファイル指定を相対パスで指定できるように修正
118- 表示中のタブの一覧をスレッド一覧に表示するアクションを追加
119- したらばJBBSの板更新機能修正
120- datファイルをスレッド一覧にD&Dしたときに、ファイル名が不正ですエラーに常になる不具合の修正
121-
117+
122118 2008/03/22
123119 Version バタ57 リリース2
124120 名前欄の数字のレスポップアップができない不具合の修正
--- a/res/ExternalBoardPlugIn/ShitarabaJBBSAcquireBoard.pas
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSAcquireBoard.pas
@@ -201,9 +201,6 @@ var
201201 key : string;
202202 htmlList : TStringList;
203203 i : Integer;
204-
205- resultArea : Boolean;
206- pos : Integer;
207204 const
208205 //http://rentalbbs.livedoor.com/jbbs/search/?word=%C2%E7%B3%D8&category=auto
209206 BBS_HOST = 'http://rentalbbs.livedoor.com/';
@@ -215,7 +212,7 @@ const
215212 label
216213 NextBoard;
217214 begin
218- responseCode := 0;
215+
219216 category := CATEGORIES[ CategoryComboBox.ItemIndex ];
220217 boardname := BoardNameEdit.Text;
221218
@@ -240,30 +237,31 @@ begin
240237 htmlList := TStringList.Create();
241238 try
242239 htmlList.Text := CustomStringReplace(downResult, '<br>', #13#10);
243- resultArea := False;
244- for i := 0 to htmlList.Count - 1 do begin
240+ for i := htmlList.Count - 1 downto 0 do begin
245241 downResult := htmlList[i];
246242 try
247- //<div class="searchResults">
248- //<h2><span class="ranking">[1]</span><a href="http://jbbs.livedoor.jp/auto/5497/">MIT-MCC BBS</a><span class="point"><span class="all">4750pt</span><span class="yesterday">(Yesterday40 pt)</span></span></h2>
249- //<p>武蔵工業大学 モータサイクル部のBBSです。各自チェックするようにしましょう♪(&amp;gt;_&amp;lt;)b</p>
250- //</div>
251- if (not resultArea) and (AnsiPos('class="searchResults"', downResult) > 0) then begin
252- resultArea := True;
253- end else if (resultArea) then begin
254- pos := AnsiPos('<a href="', downResult);
255- if (pos > 0) then begin
256- resultArea := False;
257- downResult := Copy(downResult, pos + 9, Length(downResult));
258- key := Copy(downResult, 1, AnsiPos('"', downResult)-1);
259- downResult := Copy(downResult, AnsiPos('>', downResult) + 1, Length(downResult));
260-
261- board := Copy(downResult, 1, AnsiPos('</a>', downResult) -1);
262-
263- board := CustomStringReplace(board, '=', '=') + '=' + key;
264- LogEdit.SelText := board + #13#10;
265- FBoardList.Add( board );
266- end;
243+ //<a href="/auto/2348/">トヨタ自動車掲示板</a>
244+ //<small><strng><a href="http://jbbs.livedoor.jp/auto/4112/">明治大学 二部・短大</a></strong></small></td>
245+ if (AnsiPos('<small><strng><a href="', downResult) > 0)
246+ and (AnsiPos(category, downResult) > 0) then begin
247+ downResult := CustomStringReplace(downResult, '<small><strng>', '');
248+ board := Copy(downResult, AnsiPos('<a href="', downResult) + 9,
249+ Length(downResult));
250+ key := Copy(board, AnsiPos('">', board) + 2,
251+ Length(board));
252+ key := Copy(key, 1, AnsiPos('</a>', key) -1);
253+
254+ board := Copy(board, 1, AnsiPos('">', board) - 1);
255+ if (board = '../') then begin
256+ board := CustomStringReplace(board, '../', BOARD_HOST);
257+ end else if (AnsiPos('/', board) = 1) then begin
258+ board := BOARD_HOST + Copy(board, 2, Length(board));
259+ end;
260+
261+ board := key + '=' + board;
262+
263+ LogEdit.SelText := board + #13#10;
264+ FBoardList.Add( board );
267265 end;
268266 except
269267 end;
--- a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
@@ -2,7 +2,7 @@ library ShitarabaJBBSPlugIn;
22
33 {
44 ShitarabaJBBSPlugIn
5- $Id: ShitarabaJBBSPlugIn.dpr,v 1.45 2008/08/03 02:45:48 h677 Exp $
5+ $Id: ShitarabaJBBSPlugIn.dpr,v 1.44 2006/07/02 09:48:04 h677 Exp $
66 }
77
88 uses
@@ -83,7 +83,7 @@ const
8383 MAJOR_VERSION = 1;
8484 MINOR_VERSION = 1;
8585 RELEASE_VERSION = 'alpha';
86- REVISION_VERSION = 17;
86+ REVISION_VERSION = 15;
8787
8888 SYNCRONIZE_MENU_CAPTION = 'したらばJBBS板更新';
8989
Binary files a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res and b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.res differ
--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -1,31 +1,40 @@
11 [Setting]
2-@endless=20
32 @liveplus=10
4-@news=156
3+@news=30
54 @newsplus=128
6-@operate=24
7-@sec2chd=20
8-academy6=45
9-babiru=30
10-bubble6=45
11-changi=45
12-ex24=45
13-food8=45
14-gimpo=45
15-ipv6=45
16-life9=45
17-live23=15
18-live24=15
19-love6=45
20-mamono=45
21-namidame=45
22-pc11=45
23-qb5=45
24-qiufen=30
25-schiphol=45
26-science6=45
27-set=30
28-society6=45
29-venus=30
30-yomi=30
31-yutori=10
5+@news4vip=10
6+@news4viptasu=10
7+academy6=20
8+anime3=20
9+bubble6=20
10+etc7=20
11+ex21=20
12+food8=20
13+game13=20
14+game14=20
15+hobby10=20
16+human7=20
17+life9=20
18+live23=10
19+live24=10
20+live27=10
21+love6=20
22+mamono=10
23+money6=20
24+music8=20
25+namidame=10
26+news24=20
27+pc11=20
28+qb5=20
29+qiufen=20
30+babiru=20
31+yomi=20
32+venus=20
33+set=20
34+school7=20
35+science6=20
36+society6=20
37+sports11=20
38+tmp7=20
39+tv11=20
40+yutori=20
\ No newline at end of file
Show on old repository browser