Skip to content

O
Obs Studio

小白菜888 / Obs Studio

通知 4
Star 1
Fork 0
O
Obs Studio

体验新版 GitCode，发现更多精彩内容 >>

提交 22f7e6a8 编写于 作者: J jp9000
浏览文件
操作

UI: Move Renderer/Adapter to advanced 

These really are advanced options that users shouldn't need to change
normally, so moving them to advanced makes sense, and keeps them away
from users who don't know what they're doing.
上级 9e476134
隐藏空白更改
内联 并排
Showing with 63 addition and 63 deletion
obs/forms/OBSBasicSettings.ui
浏览文件 @ 22f7e6a8
......@@ -2320,53 +2320,19 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Basic.Settings.Video.Renderer</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="renderer">
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<widget class="QLabel" name="label_8">
<property name="minimumSize">
<size>
<width>170</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Basic.Settings.Video.Adapter</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="adapter">
<property name="enabled">
<bool>false</bool>
</property>
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Basic.Settings.Video.BaseResolution</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="0" column="1">
<widget class="QComboBox" name="baseResolution">
<property name="editable">
<bool>true</bool>
......@@ -2382,14 +2348,14 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Basic.Settings.Video.ScaledResolution</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="1" column="1">
<widget class="QComboBox" name="outputResolution">
<property name="editable">
<bool>true</bool>
......@@ -2399,21 +2365,21 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="downscaleFilter">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Basic.Settings.Video.DownscaleFilter</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="2" column="1">
<widget class="QComboBox" name="downscaleFilter">
<property name="enabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QComboBox" name="fpsType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
......@@ -2444,10 +2410,10 @@
</item>
</widget>
</item>
<item row="5" column="1">
<item row="3" column="1">
<widget class="QStackedWidget" name="fpsTypes">
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="page">
<layout class="QHBoxLayout" name="horizontalLayout_2">
......@@ -2600,7 +2566,7 @@
</widget>
</widget>
</item>
<item row="6" column="1">
<item row="4" column="1">
<widget class="QLabel" name="videoMsg">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
......@@ -2753,7 +2719,7 @@
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<item row="0" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_30">
<property name="minimumSize">
<size>
......@@ -2769,7 +2735,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="2" column="1">
<widget class="QComboBox" name="colorFormat">
<item>
<property name="text">
......@@ -2793,24 +2759,24 @@
</item>
</widget>
</item>
<item row="2" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>Basic.Settings.Advanced.Video.ColorRange</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="4" column="1">
<widget class="QComboBox" name="colorRange"/>
</item>
<item row="1" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_33">
<property name="text">
<string>Basic.Settings.Advanced.Video.ColorSpace</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="3" column="1">
<widget class="QComboBox" name="colorSpace">
<item>
<property name="text">
......@@ -2824,6 +2790,40 @@
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Basic.Settings.Video.Renderer</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="renderer">
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Basic.Settings.Video.Adapter</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="adapter">
<property name="enabled">
<bool>false</bool>
</property>
<property name="currentText">
<string notr="true"/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......
obs/window-basic-settings.cpp
浏览文件 @ 22f7e6a8
......@@ -331,8 +331,6 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->auxAudioDevice1, COMBO_CHANGED, AUDIO_CHANGED);
HookWidget(ui->auxAudioDevice2, COMBO_CHANGED, AUDIO_CHANGED);
HookWidget(ui->auxAudioDevice3, COMBO_CHANGED, AUDIO_CHANGED);
HookWidget(ui->renderer, COMBO_CHANGED, VIDEO_RESTART);
HookWidget(ui->adapter, COMBO_CHANGED, VIDEO_RESTART);
HookWidget(ui->baseResolution, CBEDIT_CHANGED, VIDEO_RES);
HookWidget(ui->outputResolution, CBEDIT_CHANGED, VIDEO_RES);
HookWidget(ui->downscaleFilter, COMBO_CHANGED, VIDEO_CHANGED);
......@@ -343,6 +341,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
HookWidget(ui->fpsNumerator, SCROLL_CHANGED, VIDEO_CHANGED);
HookWidget(ui->fpsDenominator, SCROLL_CHANGED, VIDEO_CHANGED);
HookWidget(ui->audioBufferingTime, SCROLL_CHANGED, ADV_RESTART);
HookWidget(ui->renderer, COMBO_CHANGED, ADV_RESTART);
HookWidget(ui->adapter, COMBO_CHANGED, ADV_RESTART);
HookWidget(ui->colorFormat, COMBO_CHANGED, ADV_CHANGED);
HookWidget(ui->colorSpace, COMBO_CHANGED, ADV_CHANGED);
HookWidget(ui->colorRange, COMBO_CHANGED, ADV_CHANGED);
......@@ -1013,7 +1013,6 @@ void OBSBasicSettings::LoadVideoSettings()
QTStr("Basic.Settings.Video.CurrentlyActive"));
}
LoadRendererList();
LoadResolutionLists();
LoadFPSData();
LoadDownscaleFilters();
......@@ -1642,6 +1641,8 @@ void OBSBasicSettings::LoadAdvancedSettings()
loading = true;
LoadRendererList();
ui->reconnectEnable->setChecked(reconnect);
ui->reconnectRetryDelay->setValue(retryDelay);
ui->reconnectMaxRetries->setValue(maxRetries);
......@@ -2021,10 +2022,6 @@ void OBSBasicSettings::SaveVideoSettings()
/* ------------------- */
if (WidgetChanged(ui->renderer))
config_set_string(App()->GlobalConfig(), "Video", "Renderer",
QT_TO_UTF8(ui->renderer->currentText()));
if (WidgetChanged(ui->baseResolution) &&
ConvertResText(QT_TO_UTF8(baseResolution), cx, cy)) {
config_set_uint(main->Config(), "Video", "BaseCX", cx);
......@@ -2056,6 +2053,9 @@ void OBSBasicSettings::SaveVideoSettings()
void OBSBasicSettings::SaveAdvancedSettings()
{
if (WidgetChanged(ui->renderer))
config_set_string(App()->GlobalConfig(), "Video", "Renderer",
QT_TO_UTF8(ui->renderer->currentText()));
SaveSpinBox(ui->audioBufferingTime, "Audio", "BufferingTime");
SaveCombo(ui->colorFormat, "Video", "ColorFormat");
SaveCombo(ui->colorSpace, "Video", "ColorSpace");
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或