обработка счетчиков и сохранение галочек озвучки и приветствия

forms/uGeneral.fmx

@@ -18,7 +18,7 @@ object TTW_Bot: TTTW_Bot
     Size.Width = 1003.000000000000000000
     Size.Height = 744.000000000000000000
     Size.PlatformDefault = False
-    TabIndex = 3
+    TabIndex = 2
     TabOrder = 0
     TabPosition = PlatformDefault
     Sizes = (
@@ -189,7 +189,7 @@ object TTW_Bot: TTTW_Bot
         item
         end>
       TextSettings.Trimming = None
-      IsSelected = False
+      IsSelected = True
       ImageIndex = 13
       Size.Width = 78.000000000000000000
       Size.Height = 26.000000000000000000
@@ -254,7 +254,7 @@ object TTW_Bot: TTTW_Bot
               inherited btnAIPic: TButton
                 Images = ImageList1
                 ImageIndex = 5
-                TabOrder = 46
+                TabOrder = 47
               end
             end
             inherited btnAddCommand: TButton
@@ -269,15 +269,6 @@ object TTW_Bot: TTTW_Bot
               Images = ImageList1
               ImageIndex = 12
             end
-            object cbHelloTTS: TCheckBox
-              Position.X = 240.000000000000000000
-              Position.Y = 35.000000000000000000
-              Size.Width = 152.000000000000000000
-              Size.Height = 19.000000000000000000
-              Size.PlatformDefault = False
-              TabOrder = 48
-              Text = #1055#1088#1080#1074#1077#1090#1089#1090#1074#1086#1074#1072#1090#1100' '#1085#1086#1074#1099#1093
-            end
           end
         end
         inherited GroupBox9: TGroupBox
@@ -293,6 +284,7 @@ object TTW_Bot: TTTW_Bot
             inherited btnRandomAdd: TButton
               Images = ImageList1
               ImageIndex = 0
+              TabOrder = 30
             end
             inherited btnRandomDel: TButton
               Images = ImageList1
@@ -432,7 +424,7 @@ object TTW_Bot: TTTW_Bot
         item
         end>
       TextSettings.Trimming = None
-      IsSelected = True
+      IsSelected = False
       ImageIndex = 20
       Size.Width = 79.000000000000000000
       Size.Height = 26.000000000000000000
@@ -551,8 +543,11 @@ object TTW_Bot: TTTW_Bot
           inherited Label34: TLabel
             TabOrder = 2
           end
+          inherited edtCustomRevardPrompt: TEdit
+            TabOrder = 7
+          end
           inherited nbCustomRevardCost: TNumberBox
-            TabOrder = 5
+            TabOrder = 6
           end
           inherited Label35: TLabel
             TabOrder = 3
@@ -560,6 +555,9 @@ object TTW_Bot: TTTW_Bot
           inherited Label2: TLabel
             TabOrder = 9
           end
+          inherited btnAddCustomRewards: TButton
+            TabOrder = 13
+          end
           inherited btnDelCustomRewards: TButton
             TabOrder = 16
           end
@@ -611,7 +609,7 @@ object TTW_Bot: TTTW_Bot
           OnClick = frOBS1btnDeleteeChatClick
         end
         inherited Label1: TLabel
-          TabOrder = 12
+          TabOrder = 14
         end
         inherited btnCreateOBSNotify: TButton
           Images = ImageList1
@@ -622,7 +620,7 @@ object TTW_Bot: TTTW_Bot
           Images = ImageList1
           ImageIndex = 5
           Position.X = 264.000000000000000000
-          TabOrder = 11
+          TabOrder = 13
         end
         object btnCreateChat: TButton
           Images = ImageList1
@@ -848,11 +846,13 @@ object TTW_Bot: TTTW_Bot
           inherited btnCounterAdd: TButton
             Images = ImageList1
             ImageIndex = 0
+            OnClick = frAutoActions1btnCounterAddClick
           end
           inherited btnCounterDelete: TButton
             Images = ImageList1
             ImageIndex = 4
             TabOrder = 37
+            OnClick = frAutoActions1btnCounterDeleteClick
           end
           inherited btnCounterP: TButton
             Images = ImageList1
@@ -874,6 +874,7 @@ object TTW_Bot: TTTW_Bot
             Images = ImageList1
             ImageIndex = 3
             TabOrder = 44
+            OnClick = frAutoActions1btnCounterEditClick
           end
           inherited sgCounter: TStringGrid
             TabOrder = 45

forms/uGeneral.pas

@@ -74,7 +74,6 @@ type
     frPlayerWeb1: TfrPlayerWeb;
     frEvents1: TfrEvents;
     GroupBox2: TGroupBox;
-    cbHelloTTS: TCheckBox;
     GroupBox3: TGroupBox;
     frRevards1: TfrRevards;
     procedure cbThemeChange(Sender: TObject);
@@ -89,6 +88,9 @@ type
 
     procedure frTTS1btnSendClick(Sender: TObject);
     procedure btnConnectingClick(Sender: TObject);
+    procedure frAutoActions1btnCounterAddClick(Sender: TObject);
+    procedure frAutoActions1btnCounterEditClick(Sender: TObject);
+    procedure frAutoActions1btnCounterDeleteClick(Sender: TObject);
   private
     { Private declarations }
     procedure toSpeech(aText: string);
@@ -723,7 +725,7 @@ begin
   UpdateWordCounters(processedText);
   CheckBannedWords(processedText, aRecord.DisplayName, aRecord.UserId);
 
-  if (frCommands1.cbTextToSpeach.IsChecked) and (processedText[1] = '!') and
+  if (frCommands1.frContruct1.cbTextToSpeach.IsChecked) and (processedText[1] = '!') and
     (processedText[2] = '!') and (processedText[3] = '!') then
   begin
     s := StringReplace(processedText, '!!!', '', [rfReplaceAll]);
@@ -732,7 +734,7 @@ begin
     exit;
   end;
 
-  if (TTW_Bot.cbHelloTTS.IsChecked) and (aRecord.FirstMsg = 1) then
+  if (frCommands1.frContruct1.cbHelloTTS.IsChecked) and (aRecord.FirstMsg = 1) then
     toSpeech('приветствую, ' + IfThen(aRecord.DisplayName <> '',
       aRecord.DisplayName, aRecord.Username));
 
@@ -803,6 +805,33 @@ begin
   end;
 end;
 
+procedure TTTW_Bot.frAutoActions1btnCounterAddClick(Sender: TObject);
+var i:integer;
+begin
+  frAutoActions1.btnCounterAddClick(Sender);
+  frCommands1.frContruct1.cbCounterName.Items.Clear;
+  for i:=0 to high(frAutoActions1.listCounters) do
+  frCommands1.frContruct1.cbCounterName.Items.Add(frAutoActions1.listCounters[i].counterName);
+end;
+
+procedure TTTW_Bot.frAutoActions1btnCounterDeleteClick(Sender: TObject);
+var i:integer;
+begin
+  frAutoActions1.btnCounterDeleteClick(Sender);
+    frCommands1.frContruct1.cbCounterName.Items.Clear;
+  for i:=0 to high(frAutoActions1.listCounters) do
+  frCommands1.frContruct1.cbCounterName.Items.Add(frAutoActions1.listCounters[i].counterName);
+end;
+
+procedure TTTW_Bot.frAutoActions1btnCounterEditClick(Sender: TObject);
+var i:integer;
+begin
+  frAutoActions1.btnCounterEditClick(Sender);
+    frCommands1.frContruct1.cbCounterName.Items.Clear;
+  for i:=0 to high(frAutoActions1.listCounters) do
+  frCommands1.frContruct1.cbCounterName.Items.Add(frAutoActions1.listCounters[i].counterName);
+end;
+
 procedure TTTW_Bot.frCommands1btnRandAddClick(Sender: TObject);
 begin
   frCommands1.btnRandAddClick(Sender);
@@ -1065,10 +1094,15 @@ procedure TTTW_Bot.ReadDB;
 
 // Загрузка гридов автоматических действий
   procedure LoadAutoActionsGrids;
+var i:integer;
   begin
     db.LoadRecordArray<TListTimer>('listTimer', frAutoActions1.listTimer);
     db.LoadRecordArray<TBanWord>('listBanWords', frAutoActions1.listBanWords);
     db.LoadRecordArray<TCounter>('listCounters', frAutoActions1.listCounters);
+     for I := 0 to High(frAutoActions1.listCounters) do
+      frCommands1.frContruct1.cbCounterName.items.Add(frAutoActions1.listCounters[i].counterName);
+    frCommands1.frContruct1.cbTextToSpeach.IsChecked:=db.ReadSetting('cbTextToSpeach', 'False') = 'True';
+    frCommands1.frContruct1.cbHelloTTS.IsChecked:= db.ReadSetting('cbHelloTTS', 'False') = 'True';
     frAutoActions1.initTimers;
     frAutoActions1.UpdateGridFromArray;
   end;

frames/fCommands.fmx

@@ -49,32 +49,8 @@ object frCommands: TfrCommands
         Viewport.Height = 161.000000000000000000
       end
       inherited GroupBox7: TGroupBox
-        inherited btnAddUserName: TButton
-          TabOrder = 37
-        end
-        inherited btnGetDateFollow: TButton
-          TabOrder = 38
-        end
-        inherited btnGetAgeAccaunt: TButton
-          TabOrder = 39
-        end
-        inherited btnCounterAddtoText: TButton
-          TabOrder = 40
-        end
-        inherited cbCounterName: TComboBox
-          TabOrder = 41
-        end
-        inherited btnGPT: TButton
-          TabOrder = 42
-        end
-        inherited btnRandomUserName: TButton
-          TabOrder = 43
-        end
-        inherited btnGetChannelStat: TButton
-          TabOrder = 44
-        end
         inherited btnAIPic: TButton
-          TabOrder = 45
+          TabOrder = 46
         end
       end
       inherited btnAddCommand: TButton
@@ -86,11 +62,8 @@ object frCommands: TfrCommands
       inherited btnRmCommand: TButton
         OnClick = frContruct1btnRmCommandClick
       end
-      object cbTextToSpeach: TCheckBox
+      inherited cbHelloTTS: TCheckBox
-        Position.X = 272.000000000000000000
+        OnClick = nil
-        Position.Y = 8.000000000000000000
-        TabOrder = 47
-        Text = #1054#1079#1074#1091#1095#1082#1072' '#1087#1086#1089#1083#1077' !!!'
       end
     end
   end
@@ -121,16 +94,16 @@ object frCommands: TfrCommands
         Viewport.Height = 116.000000000000000000
       end
       inherited btnRandomAdd: TButton
-        TabOrder = 33
+        TabOrder = 31
       end
       inherited btnRandomDel: TButton
-        TabOrder = 34
+        TabOrder = 32
       end
       inherited btnRmGroup: TButton
-        TabOrder = 36
+        TabOrder = 34
       end
       inherited Label4: TLabel
-        TabOrder = 38
+        TabOrder = 36
       end
     end
   end

frames/fCommands.pas

@@ -4,7 +4,7 @@ interface
 
 uses
   System.SysUtils, System.Types, System.UITypes, System.Classes,
-  System.Variants,
+  System.Variants, StrUtils,
   FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls,
   System.Rtti, FMX.Grid.Style, FMX.Memo.Types, FMX.Grid, FMX.Layouts, uRecords,
   FMX.ListBox, FMX.Memo, FMX.Edit, FMX.Controls.Presentation, FMX.ScrollBox,
@@ -36,7 +36,6 @@ type
     frsgNeiro: TfrSimpleGrid;
     frContruct1: TfrContruct;
     frGroupsRequest1: TfrGroupsRequest;
-    cbTextToSpeach: TCheckBox;
     procedure btnRandAddClick(Sender: TObject);
     procedure btnRandDelClick(Sender: TObject);
     procedure frsgSoundsbtnSoundDelClick(Sender: TObject);

frames/fContruct.fmx

@@ -86,6 +86,7 @@ object frContruct: TfrContruct
       TabOrder = 41
       Text = #1057#1095#1077#1090#1095#1080#1082
       TextSettings.Trimming = None
+      OnClick = btnCounterAddtoTextClick
     end
     object cbCounterName: TComboBox
       Position.X = 111.000000000000000000
@@ -155,13 +156,24 @@ object frContruct: TfrContruct
     Text = #1059#1076#1072#1083#1080#1090#1100
     TextSettings.Trimming = None
   end
-  object cbTextToSpeech: TCheckBox
+  object cbTextToSpeach: TCheckBox
-    Position.X = 167.000000000000000000
+    Position.X = 240.000000000000000000
-    Size.Width = 217.000000000000000000
+    Position.Y = 8.000000000000000000
+    Size.Width = 152.000000000000000000
     Size.Height = 19.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 46
-    Text = #1054#1079#1074#1091#1095#1080#1074#1072#1090#1100' '#1089#1086#1086#1073#1097#1077#1085#1080#1103' '#1087#1086#1089#1083#1077' "!!!"'
+    Text = #1054#1079#1074#1091#1095#1080#1090#1100' '#1087#1086#1089#1083#1077'  !!!'
-    Visible = False
+    OnExit = cbTextToSpeachExit
+  end
+  object cbHelloTTS: TCheckBox
+    Position.X = 240.000000000000000000
+    Position.Y = 35.000000000000000000
+    Size.Width = 151.000000000000000000
+    Size.Height = 19.000000000000000000
+    Size.PlatformDefault = False
+    TabOrder = 47
+    Text = #1055#1088#1080#1074#1077#1090#1089#1090#1074#1086#1074#1072#1090#1100' '#1085#1086#1074#1099#1093
+    OnExit = cbHelloTTSExit
   end
 end

frames/fContruct.pas

@@ -6,7 +6,7 @@ uses
   System.SysUtils, System.Types, System.UITypes, System.Classes, System.Variants, 
   FMX.Types, FMX.Graphics, FMX.Controls, FMX.Forms, FMX.Dialogs, FMX.StdCtrls,
   FMX.Memo.Types, FMX.ListBox, FMX.ScrollBox, FMX.Memo, FMX.Edit,
-  FMX.Controls.Presentation;
+  FMX.Controls.Presentation, StrUtils;
 
 type
   TfrContruct = class(TFrame)
@@ -27,7 +27,8 @@ type
     btnAddCommand: TButton;
     btnEditCommand: TButton;
     btnRmCommand: TButton;
-    cbTextToSpeech: TCheckBox;
+    cbTextToSpeach: TCheckBox;
+    cbHelloTTS: TCheckBox;
     procedure btnAddUserNameClick(Sender: TObject);
     procedure btnGetDateFollowClick(Sender: TObject);
     procedure btnGetAgeAccauntClick(Sender: TObject);
@@ -35,6 +36,9 @@ type
     procedure btnGPTClick(Sender: TObject);
     procedure btnAIPicClick(Sender: TObject);
     procedure btnRandomUserNameClick(Sender: TObject);
+    procedure btnCounterAddtoTextClick(Sender: TObject);
+    procedure cbTextToSpeachExit(Sender: TObject);
+    procedure cbHelloTTSExit(Sender: TObject);
   private
     { Private declarations }
   public
@@ -45,6 +49,8 @@ implementation
 
 {$R *.fmx}
 
+uses ugeneral;
+
 procedure TfrContruct.btnAddUserNameClick(Sender: TObject);
 begin
 mResponse.Lines.text := mResponse.Lines.text + '[USERNAME]';
@@ -55,6 +61,13 @@ begin
 mResponse.Lines.text := mResponse.Lines.text + ' [Kandinsky]';
 end;
 
+procedure TfrContruct.btnCounterAddtoTextClick(Sender: TObject);
+begin
+if cbCounterName.Text = '' then
+  exit;
+mResponse.Lines.text := mResponse.Lines.text + '``'+cbCounterName.Text+'``';
+end;
+
 procedure TfrContruct.btnGetAgeAccauntClick(Sender: TObject);
 begin
   mResponse.Lines.text := mResponse.Lines.text + ' [AGE]';
@@ -80,4 +93,14 @@ begin
 mResponse.Lines.text := mResponse.Lines.text + ' [RANDOMUSER]';
 end;
 
+procedure TfrContruct.cbHelloTTSExit(Sender: TObject);
+begin
+db.WriteSetting('cbHelloTTS', ifthen(cbHelloTTS.IsChecked,'True','False'));
+end;
+
+procedure TfrContruct.cbTextToSpeachExit(Sender: TObject);
+begin
+db.WriteSetting('cbTextToSpeach', ifthen(cbTextToSpeach.IsChecked,'True','False'));
+end;
+
 end.