Browse Source

New logging level added by c7a55143cb requires renaming LogProtocolCombo to get it correctly translated

Source commit: 0166602c90a70b55fb61fb9d7f88192d6861282e
Martin Prikryl 7 years ago
parent
commit
e7631249d1
3 changed files with 7 additions and 7 deletions
  1. 5 5
      source/forms/Preferences.cpp
  2. 1 1
      source/forms/Preferences.dfm
  3. 1 1
      source/forms/Preferences.h

+ 5 - 5
source/forms/Preferences.cpp

@@ -613,7 +613,7 @@ void __fastcall TPreferencesDialog::LoadConfiguration()
 
     // logging
     EnableLoggingCheck->Checked = Configuration->Logging;
-    LogProtocolCombo->ItemIndex = Configuration->LogProtocol + BelowNormalLogLevels;
+    LogProtocolCombo2->ItemIndex = Configuration->LogProtocol + BelowNormalLogLevels;
     LogFileNameEdit3->Text =
       !Configuration->LogFileName.IsEmpty() ? Configuration->LogFileName : Configuration->DefaultLogFileName;
     if (Configuration->LogFileAppend)
@@ -927,7 +927,7 @@ void __fastcall TPreferencesDialog::SaveConfiguration()
 
     // logging
     Configuration->Logging = EnableLoggingCheck->Checked && !LogFileNameEdit3->Text.IsEmpty();
-    Configuration->LogProtocol = LogProtocolCombo->ItemIndex - BelowNormalLogLevels;
+    Configuration->LogProtocol = LogProtocolCombo2->ItemIndex - BelowNormalLogLevels;
     Configuration->LogFileName = LogFileNameEdit3->Text;
     Configuration->LogFileAppend = LogFileAppendButton->Checked;
     __int64 LogMaxSize;
@@ -1376,8 +1376,8 @@ void __fastcall TPreferencesDialog::UpdateControls()
       (static_cast<TLocaleInfo *>(LanguagesView->ItemFocused->Data)->Locale != GUIConfiguration->AppliedLocale);
 
     // logging
-    EnableControl(LogProtocolCombo, EnableLoggingCheck->Checked);
-    EnableControl(LogFileNameEdit3, LogProtocolCombo->Enabled);
+    EnableControl(LogProtocolCombo2, EnableLoggingCheck->Checked);
+    EnableControl(LogFileNameEdit3, LogProtocolCombo2->Enabled);
     EnableControl(LogFileNameHintText, LogFileNameEdit3->Enabled);
     EnableControl(LogFileAppendButton, LogFileNameEdit3->Enabled);
     EnableControl(LogFileOverwriteButton, LogFileNameEdit3->Enabled);
@@ -1387,7 +1387,7 @@ void __fastcall TPreferencesDialog::UpdateControls()
     EnableControl(LogMaxSizeCountEdit, LogMaxSizeCountCheck->Enabled && LogMaxSizeCountCheck->Checked);
     EnableControl(LogMaxSizeCountFilesLabel, LogMaxSizeCountEdit->Enabled);
 
-    EnableControl(LogSensitiveCheck, LogProtocolCombo->Enabled);
+    EnableControl(LogSensitiveCheck, LogProtocolCombo2->Enabled);
 
     EnableControl(ActionsLogFileNameEdit, EnableActionsLoggingCheck->Checked);
     EnableControl(ActionsLogFileNameHintText, ActionsLogFileNameEdit->Enabled);

+ 1 - 1
source/forms/Preferences.dfm

@@ -346,7 +346,7 @@ object PreferencesDialog: TPreferencesDialog
               OnClick = ControlChange
             end
           end
-          object LogProtocolCombo: TComboBox
+          object LogProtocolCombo2: TComboBox
             Left = 256
             Top = 21
             Width = 119

+ 1 - 1
source/forms/Preferences.h

@@ -258,7 +258,7 @@ __published:
   TPanel *LogFilePanel;
   TRadioButton *LogFileAppendButton;
   TRadioButton *LogFileOverwriteButton;
-  TComboBox *LogProtocolCombo;
+  TComboBox *LogProtocolCombo2;
   TStaticText *LogFileNameHintText;
   TCheckBox *EnableLoggingCheck;
   TGroupBox *ActionsLoggingGroup;