Bottle search implemented

diff --git a/bottleclient/LogForm.dfm b/bottleclient/LogForm.dfm
index 9c64181..3374d33 100755 (executable)
--- a/bottleclient/LogForm.dfm
+++ b/bottleclient/LogForm.dfm
@@ -69,9 +69,17 @@ object frmLog: TfrmLog
       Top = 0
       Action = frmSender.actDownloadLog
     end
-    object ToolButton2: TToolButton
+    object tbtnFindBottle: TToolButton
       Left = 122
       Top = 0
+      Hint = #12508#12488#12523#12434#26908#32034#12377#12427
+      Caption = #26908#32034'(&F)'
+      ImageIndex = 37
+      OnClick = tbtnFindBottleClick
+    end
+    object ToolButton2: TToolButton
+      Left = 145
+      Top = 0
       Width = 8
       Caption = 'ToolButton2'
       Enabled = False
@@ -79,12 +87,12 @@ object frmLog: TfrmLog
       Style = tbsSeparator
     end
     object tbtnVoteMessage: TToolButton
-      Left = 130
+      Left = 153
       Top = 0
       Action = frmSender.actVoteMessage
     end
     object tbtnAgreeMessage: TToolButton
-      Left = 153
+      Left = 176
       Top = 0
       Action = frmSender.actAgreeMessage
     end

diff --git a/bottleclient/LogForm.pas b/bottleclient/LogForm.pas
index 77a5424..f9cfa2e 100755 (executable)
--- a/bottleclient/LogForm.pas
+++ b/bottleclient/LogForm.pas
@@ -48,6 +48,7 @@ type
     tbtnDownloadLog: TToolButton;
     PopupMenuTab: TPopupMenu;
     mnCloseTab: TMenuItem;
+    tbtnFindBottle: TToolButton;
     procedure tbtnClearClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure lvwLogChange(Sender: TObject; Item: TListItem;
@@ -78,6 +79,7 @@ type
     procedure tabBottleLogContextPopup(Sender: TObject; MousePos: TPoint;
       var Handled: Boolean);
     procedure mnCloseTabClick(Sender: TObject);
+    procedure tbtnFindBottleClick(Sender: TObject);
   private
     { Private \90é\8c¾ }
     FLastScript: String; //\83X\83N\83\8a\83v\83g\8dÄ\95`\89æ\97}\90§\97p
@@ -130,7 +132,7 @@ const
 
 implementation
 
-uses MainForm;
+uses MainForm, StrUtils;
 
 {$R *.DFM}
 
@@ -546,6 +548,7 @@ procedure TfrmLog.lvwLogData(Sender: TObject; Item: TListItem);
 var i: integer;
     Log: TLogItem;
 begin
+  if Item = nil then Exit;
   i := Item.Index;
   Log := SelectedBottleLog.Bottles[i];
   with Item do begin
@@ -933,4 +936,41 @@ begin
   lvwLogChange(Self, nil, ctState);
 end;
 
+procedure TfrmLog.tbtnFindBottleClick(Sender: TObject);
+var Query: String;
+    ResultLog: TBottleLogList;
+    Item1, Item2: TLogItem;
+    i, matched: integer;
+begin
+  if SelectedBottleLog.Count = 0 then begin
+    ShowMessage('\8c\9f\8dõ\91Î\8fÛ\82ª\8bó\82Å\82·\81B');
+    Exit;
+  end;
+  Query := '';
+  matched := 0;
+  ResultLog := TBottleLogList.Create('\8c\9f\8dõ\8c\8b\89Ê');
+  if InputQuery('\83X\83N\83\8a\83v\83g\96{\95¶\82ð\8c\9f\8dõ', '\8c\9f\8dõ\95¶\8e\9a\97ñ', Query) then begin
+    if Query = '' then Exit;
+    for i := 0 to SelectedBottleLog.Count-1 do begin
+      Item1 := SelectedBottleLog.Items[i] as TLogItem;
+      if AnsiContainsText(Item1.Script, Query) and (Item1.LogType = ltBottle) then begin
+        matched := matched + 1;
+        Item2 := TLogItem.Create(ltBottle, Item1.MID, Item1.Channel,
+          Item1.Script, Item1.Ghost, Item1.LogTime);
+        Item2.State := lsOpened;
+        Item2.Votes := Item1.Votes;
+        Item2.Agrees := Item1.Agrees;
+        ResultLog.Add(Item2);
+      end;
+    end;
+  end;
+  if matched = 0 then
+    ResultLog.AddSystemLog('\8c©\82Â\82©\82è\82Ü\82¹\82ñ\82Å\82µ\82½');
+  BottleLogList.Add(ResultLog);
+  tabBottleLog.TabIndex := BottleLogList.Count-1;
+  UpdateTab;
+  UpdateWindow;
+  lvwLogChange(Self, nil, ctState);
+end;
+
 end.

diff --git a/bottleclient/MainForm.dfm b/bottleclient/MainForm.dfm
index 7241216..fef987c 100755 (executable)
--- a/bottleclient/MainForm.dfm
+++ b/bottleclient/MainForm.dfm
@@ -699,7 +699,7 @@ object frmSender: TfrmSender
     Left = 8
     Top = 72
     Bitmap = {
-      494C010125002700040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010126002700040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000A0000000010020000000000000A0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -719,17 +719,17 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FF000000FF0000000000
       0000B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2FF00B1E2
-      FF00B1E2FF00B1E2FF00B1E2FF00000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      FF00B1E2FF00B1E2FF00B1E2FF00000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FF000000FF0000000000
       0000B1E2FF000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -743,24 +743,24 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FF6B8F00FF6B8F000000
       00000000000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000F0FBFF00F0FBFF00FFFF0000FFFF0000FFFF
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000F0FBFF00F0FBFF00F0FBFF00FFFF0000FFFF
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00000000000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -776,7 +776,7 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF0000FFFF0000F0FBFF00F0FBFF00F0FBFF00FFFF
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      0000FFFFFF000000000000000000000000000000000000000000FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -800,8 +800,8 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000FFFF000000969600009696000096960000969600FFFF
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000FFFFFF000000000000000000000000000000000000000000FFFF
+      FF00000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1983,11 +1983,11 @@ object frmSender: TfrmSender
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000424D3E000000000000003E000000
       2800000040000000A00000000100010000000000000500000000000000000000
-      000000000000000000000000FFFFFF00F01F0000000000000001000000000000
-      0000000000000000000100000000000000000000000000000001000000000000
-      0807000000000000F807000000000000F807000000000000F807000000000000
-      F807000000000000F807000000000000F807000000000000FC0F000000000000
-      FE1F000000000000FE1F000000000000E0FFFFFFFFFFFFFF807FFFFFFFFFFFFF
+      000000000000000000000000FFFFFF00F01FFFFF00000000000183E000000000
+      000083E000000000000183E00000000000008080000000000001800000000000
+      0807810000000000F807810000000000F807C00100000000F807E08300000000
+      F807E08300000000F807F1C700000000F807F1C700000000FC0FF1C700000000
+      FE1FFFFF00000000FE1FFFFF00000000E0FFFFFFFFFFFFFF807FFFFFFFFFFFFF
       807F0000FFFFFFFFC1FF0000FF7FFEFFF1FF0000FE7FFE7FF0E70000FC7FFE3F
       C0E30000F807E01FC0630000F007E00FE0630000E007E007F0010000F007E00F
       F8010000F807E01FFC010000FC7FFE3FFE010000FE7FFE7FFF000001FF7FFEFF
@@ -2023,8 +2023,7 @@ object frmSender: TfrmSender
       F00BFFFFFC018000F00BFB7FFC010000F00BF93FFC010000F00BF81F00010000
       F00B800F00010001F00B800700010003B00B8003000100038003800700030003
       C027800F00070003802FF81F000F0FC3C01FF93F00FF0003C0FFFB7F01FF8007
-      93FFFFFF03FFF87FB33FFFFFFFFFFFFF00000000000000000000000000000000
-      000000000000}
+      93FFFFFF03FFF87FB33FFFFFFFFFFFFF}
   end
   object mnPopupConst: TPopupMenu
     Images = imgIcon