Merge remote-tracking branch 'origin/UI_2.0' into UI_2.0

main.py

@@ -252,10 +252,16 @@ def callbackSetMicHost(value):
     view.updateSelected_MicDevice(config.CHOICE_MIC_DEVICE)
     view.updateList_MicDevice(model.getListInputDevice())
 
+    model.stopCheckMicEnergy()
+    view.replaceConfigWindowMicThresholdCheckButtonToPassive()
+
 def callbackSetMicDevice(value):
     print("callbackSetMicDevice", value)
     config.CHOICE_MIC_DEVICE = value
 
+    model.stopCheckMicEnergy()
+    view.replaceConfigWindowMicThresholdCheckButtonToPassive()
+
 def callbackSetMicEnergyThreshold(value):
     print("callbackSetMicEnergyThreshold", int(value))
     config.INPUT_MIC_ENERGY_THRESHOLD = int(value)
@@ -306,14 +312,17 @@ def callbackSetMicWordFilter(value):
         config.INPUT_MIC_WORD_FILTER = word_filter.split(",")
     else:
         config.INPUT_MIC_WORD_FILTER = []
-    # model.resetKeywordProcessor()
-    # model.addKeywords()
+    model.resetKeywordProcessor()
+    model.addKeywords()
 
 # Transcription Tab (Speaker)
 def callbackSetSpeakerDevice(value):
     print("callbackSetSpeakerDevice", value)
     config.CHOICE_SPEAKER_DEVICE = value
 
+    model.stopCheckSpeakerEnergy()
+    view.replaceConfigWindowSpeakerThresholdCheckButtonToPassive()
+
 def callbackSetSpeakerEnergyThreshold(value):
     print("callbackSetSpeakerEnergyThreshold", int(value))
     config.INPUT_SPEAKER_ENERGY_THRESHOLD = int(value)

model.py

@@ -55,7 +55,7 @@ class Model:
         self.logger = None
         self.mic_energy_recorder = None
         self.mic_energy_plot_progressbar = None
-        self.speaker_energy_get_progressbar = None
+        self.speaker_energy_recorder = None
         self.speaker_energy_plot_progressbar = None
         self.translator = Translator()
         self.keyword_processor = KeywordProcessor()