Browse Source

UI: Rename 'Custom x264 Settings'

Rename 'Custom x264 Settings' to 'Custom Encoder Settings', because it
may be useful to use this for encoders other than x264
jp9000 11 years ago
parent
commit
8ffd7ec16c
3 changed files with 7 additions and 7 deletions
  1. 1 1
      obs/data/locale/en-US.ini
  2. 3 3
      obs/forms/OBSBasicSettings.ui
  3. 3 3
      obs/window-basic-settings.cpp

+ 1 - 1
obs/data/locale/en-US.ini

@@ -227,7 +227,7 @@ Basic.Settings.Output.RetryDelay="Retry Delay (seconds)"
 Basic.Settings.Output.MaxRetries="Maximum Retries"
 Basic.Settings.Output.MaxRetries="Maximum Retries"
 Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
 Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
 Basic.Settings.Output.X264Preset="x264 Preset"
 Basic.Settings.Output.X264Preset="x264 Preset"
-Basic.Settings.Output.CustomX264Settings="Custom x264 Settings"
+Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
 Basic.Settings.Output.UseCBR="Use Constant Bitrate"
 Basic.Settings.Output.UseCBR="Use Constant Bitrate"
 
 
 # basic mode 'video' settings
 # basic mode 'video' settings

+ 3 - 3
obs/forms/OBSBasicSettings.ui

@@ -525,12 +525,12 @@
                     </widget>
                     </widget>
                    </item>
                    </item>
                    <item row="9" column="1">
                    <item row="9" column="1">
-                    <widget class="QLineEdit" name="simpleOutCustomX264"/>
+                    <widget class="QLineEdit" name="simpleOutCustom"/>
                    </item>
                    </item>
                    <item row="9" column="0">
                    <item row="9" column="0">
                     <widget class="QLabel" name="label_23">
                     <widget class="QLabel" name="label_23">
                      <property name="text">
                      <property name="text">
-                      <string>Basic.Settings.Output.CustomX264Settings</string>
+                      <string>Basic.Settings.Output.CustomEncoderSettings</string>
                      </property>
                      </property>
                     </widget>
                     </widget>
                    </item>
                    </item>
@@ -1222,7 +1222,7 @@
   <connection>
   <connection>
    <sender>simpleOutAdvanced</sender>
    <sender>simpleOutAdvanced</sender>
    <signal>toggled(bool)</signal>
    <signal>toggled(bool)</signal>
-   <receiver>simpleOutCustomX264</receiver>
+   <receiver>simpleOutCustom</receiver>
    <slot>setVisible(bool)</slot>
    <slot>setVisible(bool)</slot>
    <hints>
    <hints>
     <hint type="sourcelabel">
     <hint type="sourcelabel">

+ 3 - 3
obs/window-basic-settings.cpp

@@ -148,7 +148,7 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	HookWidget(ui->simpleOutAdvanced,    CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutAdvanced,    CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutUseCBR,      CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutUseCBR,      CHECK_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutPreset,      COMBO_CHANGED,  OUTPUTS_CHANGED);
 	HookWidget(ui->simpleOutPreset,      COMBO_CHANGED,  OUTPUTS_CHANGED);
-	HookWidget(ui->simpleOutCustomX264,  EDIT_CHANGED,   OUTPUTS_CHANGED);
+	HookWidget(ui->simpleOutCustom,      EDIT_CHANGED,   OUTPUTS_CHANGED);
 	HookWidget(ui->channelSetup,         COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->channelSetup,         COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->sampleRate,           COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->sampleRate,           COMBO_CHANGED,  AUDIO_RESTART);
 	HookWidget(ui->desktopAudioDevice1,  COMBO_CHANGED,  AUDIO_CHANGED);
 	HookWidget(ui->desktopAudioDevice1,  COMBO_CHANGED,  AUDIO_CHANGED);
@@ -478,7 +478,7 @@ void OBSBasicSettings::LoadSimpleOutputSettings()
 	ui->simpleOutAdvanced->setChecked(advanced);
 	ui->simpleOutAdvanced->setChecked(advanced);
 	ui->simpleOutUseCBR->setChecked(useCBR);
 	ui->simpleOutUseCBR->setChecked(useCBR);
 	ui->simpleOutPreset->setCurrentText(preset);
 	ui->simpleOutPreset->setCurrentText(preset);
-	ui->simpleOutCustomX264->setText(custom);
+	ui->simpleOutCustom->setText(custom);
 }
 }
 
 
 void OBSBasicSettings::LoadOutputSettings()
 void OBSBasicSettings::LoadOutputSettings()
@@ -655,7 +655,7 @@ void OBSBasicSettings::SaveOutputSettings()
 	SaveCheckBox(ui->simpleOutAdvanced, "SimpleOutput", "UseAdvanced");
 	SaveCheckBox(ui->simpleOutAdvanced, "SimpleOutput", "UseAdvanced");
 	SaveCheckBox(ui->simpleOutUseCBR, "SimpleOutput", "UseCBR");
 	SaveCheckBox(ui->simpleOutUseCBR, "SimpleOutput", "UseCBR");
 	SaveCombo(ui->simpleOutPreset, "SimpleOutput", "Preset");
 	SaveCombo(ui->simpleOutPreset, "SimpleOutput", "Preset");
-	SaveEdit(ui->simpleOutCustomX264, "SimpleOutput", "x264Settings");
+	SaveEdit(ui->simpleOutCustom, "SimpleOutput", "x264Settings");
 }
 }
 
 
 void OBSBasicSettings::SaveAudioSettings()
 void OBSBasicSettings::SaveAudioSettings()