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

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;