設定項目に\eを自動付加しない、編集スクリプトのバイト数で予測をスキップする機能を追加。

diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas
index 45a06dc..c37ed05 100755 (executable)
--- a/bottleclient/BottleDef.pas
+++ b/bottleclient/BottleDef.pas
@@ -110,6 +110,9 @@ type
     FGhostChList: TStringList;
     FNotShowLog: boolean;
     FNotCheckClear: boolean;
+    FNotYenETrans: boolean;
+    FNotScriptTime: boolean;
+    FNotScriptTimeLen: integer;
 
     procedure SetDblClkInsert(const Value: boolean);
     procedure SetDefaultScript(const Value: String);
@@ -190,6 +193,9 @@ type
     procedure SetGhostChList(const Value: TStringList);
     procedure SetNotShowLog(const Value: boolean);
     procedure SetNotCheckClear(const Value: boolean);
+    procedure SetNotYenETrans(const Value: boolean);
+    procedure SetNotScriptTime(const Value: boolean);
+    procedure SetNotScriptTimeLen(const Value: integer);
   protected
     function InScreen(ARect: TRect): boolean;
   public
@@ -302,6 +308,9 @@ type
     property GhostChList: TStringList read FGhostChList write SetGhostChList;
     property NotShowLog: boolean read FNotShowLog write SetNotShowLog;
     property NotCheckClear: boolean read FNotCheckClear write SetNotCheckClear;
+    property NotYenETrans: boolean read FNotYenETrans write SetNotYenETrans;
+    property NotScriptTime: boolean read FNotScriptTime write SetNotScriptTime;
+    property NotScriptTimeLen: Integer read FNotScriptTimeLen write SetNotScriptTimeLen;
 
     //\83R\83\93\83X\83g\83\89\83N\83^\81E\83f\83X\83g\83\89\83N\83^\81E\95Û\91¶
     constructor Create;
@@ -746,6 +755,9 @@ begin
     GhostChList.CommaText := FIni2.ReadString('System', 'GhostChList', '');
     NotShowLog := FIni2.ReadBool('System', 'NotShowLog', false);
     NotCheckClear := FIni2.ReadBool('System', 'NotCheckClear', false);
+    NotYenETrans := FIni2.ReadBool('System', 'NotYenETrans', false);
+    NotScriptTime := FIni2.ReadBool('System', 'NotScriptTime', true);
+    NotScriptTimeLen := FIni2.ReadInteger('System', 'NotScriptTimeLen', 20000);
 
   except
     on E: Exception do
@@ -1109,6 +1121,9 @@ begin
   FIni2.WriteString('System', 'GhostChList', GhostChList.CommaText);
   FIni2.WriteBool('System', 'NotShowLog', NotShowLog);
   FIni2.WriteBool('System', 'NotCheckClear', NotCheckClear);
+  FIni2.WriteBool('System', 'NotYenETrans', NotYenETrans);
+  FIni2.WriteBool('System', 'NotScriptTime', NotScriptTime);
+  FIni2.WriteInteger('System', 'NotScriptTimeLen', NotScriptTimeLen);
 end;
 
 function TBottlePrefs.GetDefaultScript: String;
@@ -1362,6 +1377,21 @@ begin
   FNotCheckClear := Value;
 end;
 
+procedure TBottlePrefs.SetNotYenETrans(const Value: boolean);
+begin
+  FNotYenETrans := Value;
+end;
+
+procedure TBottlePrefs.SetNotScriptTime(const Value: boolean);
+begin
+  FNotScriptTime := Value;
+end;
+
+procedure TBottlePrefs.SetNotScriptTimeLen(const Value: Integer);
+begin
+  FNotScriptTimeLen := Value;
+end;
+
 initialization
 
 Classes.RegisterClass(TSsPlayTimeParams);

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index f923327..e08a80b 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -330,7 +330,7 @@ type
     //
     FWM_TaskBarCreated: WORD; // \83^\83X\83N\83o\81[\93o\98^\97p\83E\83B\83\93\83h\83E\83\81\83b\83Z\81[\83WID
     //
-    procedure SetStatusText(const Value: String);
+//    procedure SetStatusText(const Value: String);
     procedure SetSleeping(const Value: boolean);
     procedure YenETrans;
 //    procedure SetConnecting(const Value: boolean);
@@ -340,7 +340,7 @@ type
     procedure mnPresetReplaceClick(Sender: TObject);
 //    property Added: boolean read FAdded write SetAdded;
     property Sleeping: boolean read FSleeping write SetSleeping;
-    property StatusText: String read FStatusText write SetStatusText;
+//    property StatusText: String read FStatusText write SetStatusText;
     function GetScriptText: String;
     procedure ChangeTaskIcon;
     procedure ShowHintLabel(const Mes: String; Col: TColor = clBlue);
@@ -393,6 +393,8 @@ type
     procedure SetFileModified(const Value: boolean);
     //\83u\83\89\83E\83U\94»\92f\82ÆURL\88ø\93n\82µ
     procedure OpenBrowser(const Url: string);
+//    procedure CopyDataMessage(var WMCopyData: TWMCopyData); message WM_COPYDATA;
+
   protected
     procedure WndProc(var Message: TMessage); override;
     procedure WMQueryEndSession(var msg: TWMQueryEndSession);
@@ -1074,13 +1076,17 @@ var
   Script: String;
   Text: String;
 begin
-  //\83X\83e\81[\83^\83X\95Ï\8dX\82¾\82¯
-  //\93à\97e\82ª\83h\83\89\83b\83O\82³\82ê\82½\82Æ\82«\82à\8cÄ\82Ñ\8fo\82³\82ê\82é
-  Script := StringReplace(GetScriptText, #13#10, '', [rfReplaceAll]);
-  if Length(Script) < 30000 then
-    Text := Format('%d\83o\83C\83g/%d\95b', [Length(Script), SsPlayTime.PlayTime(Script) div 1000])
+  // \83X\83e\81[\83^\83X\95Ï\8dX\82¾\82¯
+  // \93à\97e\82ª\83h\83\89\83b\83O\82³\82ê\82½\82Æ\82«\82à\8cÄ\82Ñ\8fo\82³\82ê\82é
+  Script := GetScriptText;
+  // \94»\92è\82·\82é\95ª\8fd\82¢\82©\82à\81H
+  if Pref.NotScriptTime AND (Length(Script) > Pref.NotScriptTimeLen) then
+    Text := Format('%d\83o\83C\83g/?', [Length(Script)])
   else
-    Text := Format('%d\83o\83C\83g/?', [Length(Script)]);
+  begin
+    Script := StringReplace(Script, #13#10, '', [rfReplaceAll]);
+    Text := Format('%d\83o\83C\83g/%d\95b', [Length(Script), SsPlayTime.PlayTime(Script) div 1000])
+  end;
   StatusBar.Panels[PanelBytes].Text := Text;
 //  FScriptModified := true;
   EditorPreview;
@@ -1200,11 +1206,13 @@ begin
   end;
 end;
 
+{
 procedure TfrmSender.SetStatusText(const Value: String);
 begin
   FStatusText := Value;
   StatusBar.Panels[PanelStatus].Text := Value;
 end;
+}
 
 procedure TfrmSender.ApplicationEventsHint(Sender: TObject);
 var id: integer;
@@ -1982,6 +1990,7 @@ procedure TfrmSender.YenETrans;
 var St, Le, i: integer;
     Orig, Text: String;
 begin
+  if Pref.NotYenETrans then exit; // \e\83`\83F\83b\83N\82µ\82È\82¢
   St := memScript.SelStart;
   Le := memScript.SelLength;
   Orig := GetScriptText;
@@ -3702,4 +3711,32 @@ begin
     end;
 end;
 
+{
+procedure TfrmSender.CopyDataMessage(var WMCopyData: TWMCopyData);
+var
+  Param: string;
+  HeadValue: THeadValue;
+begin
+  // \83e\83X\83g\97p
+  if WMCopyData.CopyDataStruct.dwData = 1 then
+  begin
+    Param := PChar(WMCopyData.CopyDataStruct.lpData);
+    HeadValue := THeadValue.Create(Param);
+    try
+      if HeadValue['Script'] <> '' then
+        DispatchBottle(HeadValue, Now(), 0, 0)
+      else if HeadValue['Type'] = 'Vote' then
+        frmLog.VoteLog(HeadValue['MID'], StrToIntDef(HeadValue['Num'], 0))
+      else if HeadValue['Type'] = 'Agree' then
+        frmLog.AgreeLog(HeadValue['MID'], StrToIntDef(HeadValue['Num'], 0))
+      else if (HeadValue['Num'] <> '') AND (HeadValue['Channel'] = '') AND
+        (HeadValue['Entry'] = '') then
+        StatusBar.Panels[PanelMembers].Text := HeadValue['Num'] + '\90l';
+    finally
+      HeadValue.Free;
+    end;
+  end;
+end;
+}
+
 end.

diff --git a/bottleclient/SettingForm.dfm b/bottleclient/SettingForm.dfm
index bc15ea1..b274164 100755 (executable)
--- a/bottleclient/SettingForm.dfm
+++ b/bottleclient/SettingForm.dfm
@@ -898,8 +898,8 @@ object frmSetting: TfrmSetting
       ImageIndex = 10
       TabVisible = False
       object Label3: TLabel
-        Left = 248
-        Top = 200
+        Left = 312
+        Top = 256
         Width = 110
         Height = 12
         BiDiMode = bdLeftToRight
@@ -907,12 +907,11 @@ object frmSetting: TfrmSetting
         ParentBiDiMode = False
       end
       object Label2: TLabel
-        Left = 0
+        Left = 312
         Top = 232
-        Width = 96
+        Width = 110
         Height = 12
-        Hint = #12420#12373#12368#12428#12463#12521#12452#12450#12531#12488#12398#21839#38988#28857
-        Caption = #8251#20170#29694#22312#12398#21839#38988#28857
+        Caption = '('#25913#34892#21547#12416#32207#12496#12452#12488#25968')'
       end
       object cbxSendAction: TCheckBox
         Left = 8
@@ -961,17 +960,17 @@ object frmSetting: TfrmSetting
       end
       object cbxScriptBackUp: TCheckBox
         Left = 8
-        Top = 192
-        Width = 193
+        Top = 248
+        Width = 241
         Height = 25
         Hint = #32232#38598#20013#12398#12473#12463#12522#12503#12488#12398#23450#26399#20445#23384
         Caption = #33258#21205#12496#12483#12463#12450#12483#12503#12434#26377#21177#12395#12377#12427'(&B)'
         TabOrder = 5
       end
       object spnScriptBackUpTime: TSpinEdit
-        Left = 200
-        Top = 192
-        Width = 41
+        Left = 248
+        Top = 248
+        Width = 57
         Height = 21
         Hint = #12496#12483#12463#12450#12483#12503#12377#12427#38291#38548#12434#25351#23450
         MaxValue = 60
@@ -981,8 +980,8 @@ object frmSetting: TfrmSetting
       end
       object cbxEConstBar: TCheckBox
         Left = 8
-        Top = 247
-        Width = 241
+        Top = 199
+        Width = 249
         Height = 17
         Hint = #22793#25968#12434#27598#22238#21021#26399#21270#12377#12427
         Caption = #23450#22411#21477#12496#12540#12434#20986#12377
@@ -1002,9 +1001,39 @@ object frmSetting: TfrmSetting
         Top = 152
         Width = 249
         Height = 17
-        Caption = #12456#12487#12451#12479#12463#12522#12450#26178#12395#20445#23384#30906#35469#12375#12394#12356
+        Hint = #12456#12487#12451#12479#12364#12463#12522#12450#12373#12428#12427#12392#12365#12395#20445#23384#30906#35469#12375#12394#12356
+        Caption = #12456#12487#12451#12479#12463#12522#12450#26178#12395#20445#23384#30906#35469#12375#12394#12356'(&C)'
         TabOrder = 9
       end
+      object cbxNotYenETrans: TCheckBox
+        Left = 8
+        Top = 176
+        Width = 249
+        Height = 17
+        Hint = #32232#38598#20013#12398#12473#12463#12522#12503#12488#12395'\e'#12434#33258#21205#30340#12395#20184#21152#12375#12394#12356
+        Caption = #33258#21205#30340#12395'\e'#12434#20184#21152#12375#12394#12356'(&E)'
+        TabOrder = 10
+      end
+      object cbxNotScriptTime: TCheckBox
+        Left = 8
+        Top = 224
+        Width = 241
+        Height = 25
+        Hint = #25351#23450#12496#12452#12488#12434#36234#12360#12383#12425#31777#26131#34920#31034#12395#12377#12427
+        Caption = #25351#23450#12496#12452#12488#25968#12434#36234#12360#12383#12425#26178#38291#20104#28204#12375#12394#12356'(&T)'
+        TabOrder = 11
+      end
+      object spnNotScriptTimeLen: TSpinEdit
+        Left = 248
+        Top = 224
+        Width = 57
+        Height = 21
+        Hint = #12496#12452#12488#25968#12434#25351#23450
+        MaxValue = 50000
+        MinValue = 1
+        TabOrder = 12
+        Value = 20000
+      end
     end
     object tstYclientSet2: TTabSheet
       Caption = #12481#12515#12531#12493#12523': '#12481#12515#12531#12493#12523#12468#12540#12473#12488#12398#35373#23450

diff --git a/bottleclient/SettingForm.pas b/bottleclient/SettingForm.pas
index adae996..4b4ba44 100755 (executable)
--- a/bottleclient/SettingForm.pas
+++ b/bottleclient/SettingForm.pas
@@ -112,7 +112,6 @@ type
     cbxLogAction: TCheckBox;
     cbxLogOneAction: TCheckBox;
     cbxEConstBar: TCheckBox;
-    Label2: TLabel;
     cbxNotSSTP: TCheckBox;
     cbxErrScript: TCheckBox;
     cbxScriptBackUp: TCheckBox;
@@ -126,6 +125,10 @@ type
     cbxNotShowLog: TCheckBox;
     btnGhostChEdit: TButton;
     cbxNotCheckClear: TCheckBox;
+    cbxNotYenETrans: TCheckBox;
+    cbxNotScriptTime: TCheckBox;
+    spnNotScriptTimeLen: TSpinEdit;
+    Label2: TLabel;
 
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
     procedure edtProxyPortKeyPress(Sender: TObject; var Key: Char);
@@ -294,6 +297,9 @@ begin
   cbxEConstBar.Checked := Pref.EConstBar;
   cbxNotShowLog.Checked := Pref.NotShowLog;
   cbxNotCheckClear.Checked := Pref.NotCheckClear;
+  cbxNotYenETrans.Checked := Pref.NotYenETrans;
+  cbxNotScriptTime.Checked := Pref.NotScriptTime;
+  spnNotScriptTimeLen.Value := Pref.NotScriptTimeLen;
   //\83S\81[\83X\83g\83`\83\83\83\93\83l\83\8b\83\8a\83X\83g\93Ç\82Ý\8fo\82µ
   i := 0;
   while i < Pref.GhostChList.Count-1 do
@@ -405,6 +411,9 @@ begin
   Pref.GhostCh := cbxGhostCh.Checked;
   Pref.NotShowLog := cbxNotShowLog.Checked;
   Pref.NotCheckClear := cbxNotCheckClear.Checked;
+  Pref.NotYenETrans := cbxNotYenETrans.Checked;
+  Pref.NotScriptTime := cbxNotScriptTime.Checked;
+  Pref.NotScriptTimeLen := spnNotScriptTimeLen.Value;
 
 end;