Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
f50fbfd1
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f50fbfd1
编写于
12月 14, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add more accessible variables for form items
上级
aead95f5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
10 deletion
+26
-10
obs/forms/OBSWindows.cpp
obs/forms/OBSWindows.cpp
+16
-0
obs/forms/OBSWindows.fbp
obs/forms/OBSWindows.fbp
+9
-9
obs/forms/OBSWindows.h
obs/forms/OBSWindows.h
+1
-1
未找到文件。
obs/forms/OBSWindows.cpp
浏览文件 @
f50fbfd1
...
...
@@ -479,6 +479,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer1
->
Add
(
m_staticText6
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
videoAdapterList
=
new
wxComboBox
(
videoPanel
,
ID_ADAPTER
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
videoAdapterList
->
Enable
(
false
);
fgSizer1
->
Add
(
videoAdapterList
,
0
,
wxALL
,
2
);
m_staticText8
=
new
wxStaticText
(
videoPanel
,
wxID_ANY
,
_
(
"Settings.Video.BaseRes"
),
wxDefaultPosition
,
wxDefaultSize
,
wxALIGN_LEFT
);
...
...
@@ -500,12 +502,16 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer1
->
Add
(
m_staticText11
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
filterList
=
new
wxComboBox
(
videoPanel
,
ID_DOWNSCALE_FILTER
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
filterList
->
Enable
(
false
);
fgSizer1
->
Add
(
filterList
,
0
,
wxALL
,
2
);
fgSizer1
->
Add
(
0
,
0
,
1
,
wxEXPAND
,
5
);
disableAeroCheckbox
=
new
wxCheckBox
(
videoPanel
,
ID_DISABLEAERO
,
_
(
"Settings.DisableAeroWindows"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
disableAeroCheckbox
->
Enable
(
false
);
fgSizer1
->
Add
(
disableAeroCheckbox
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
2
);
...
...
@@ -624,6 +630,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
m_staticText23
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
desktopAudioDeviceList
=
new
wxComboBox
(
audioPanel
,
ID_DESKTOP_AUDIO_DEVICE
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
desktopAudioDeviceList
->
Enable
(
false
);
fgSizer11
->
Add
(
desktopAudioDeviceList
,
0
,
wxALL
,
2
);
m_staticText24
=
new
wxStaticText
(
audioPanel
,
wxID_ANY
,
_
(
"Settings.Audio.AuxAudioDevice1"
),
wxDefaultPosition
,
wxDefaultSize
,
wxALIGN_RIGHT
);
...
...
@@ -631,6 +639,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
m_staticText24
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
auxAudioDeviceList1
=
new
wxComboBox
(
audioPanel
,
ID_AUX_AUDIO_DEVICE1
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
auxAudioDeviceList1
->
Enable
(
false
);
fgSizer11
->
Add
(
auxAudioDeviceList1
,
0
,
wxALL
,
2
);
m_staticText241
=
new
wxStaticText
(
audioPanel
,
wxID_ANY
,
_
(
"Settings.Audio.AuxAudioDevice2"
),
wxDefaultPosition
,
wxDefaultSize
,
wxALIGN_RIGHT
);
...
...
@@ -638,6 +648,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
m_staticText241
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
auxAudioDeviceList2
=
new
wxComboBox
(
audioPanel
,
ID_AUX_AUDIO_DEVICE2
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
auxAudioDeviceList2
->
Enable
(
false
);
fgSizer11
->
Add
(
auxAudioDeviceList2
,
0
,
wxALL
,
2
);
m_staticText242
=
new
wxStaticText
(
audioPanel
,
wxID_ANY
,
_
(
"Settings.Audio.AuxAudioDevice3"
),
wxDefaultPosition
,
wxDefaultSize
,
wxALIGN_RIGHT
);
...
...
@@ -645,6 +657,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
m_staticText242
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
auxAudioDeviceList3
=
new
wxComboBox
(
audioPanel
,
ID_AUX_AUDIO_DEVICE3
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
auxAudioDeviceList3
->
Enable
(
false
);
fgSizer11
->
Add
(
auxAudioDeviceList3
,
0
,
wxALL
,
2
);
m_staticText243
=
new
wxStaticText
(
audioPanel
,
wxID_ANY
,
_
(
"Settings.Audio.AuxAudioDevice4"
),
wxDefaultPosition
,
wxDefaultSize
,
wxALIGN_RIGHT
);
...
...
@@ -652,6 +666,8 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
m_staticText243
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALIGN_RIGHT
|
wxALL
,
2
);
auxAudioDeviceList4
=
new
wxComboBox
(
audioPanel
,
ID_AUX_AUDIO_DEVICE4
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
wxCB_READONLY
);
auxAudioDeviceList4
->
Enable
(
false
);
fgSizer11
->
Add
(
auxAudioDeviceList4
,
0
,
wxALL
,
2
);
...
...
obs/forms/OBSWindows.fbp
浏览文件 @
f50fbfd1
...
...
@@ -2812,7 +2812,7 @@
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">p
rotected
</property>
<property name="permission">p
ublic
</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
...
...
@@ -3535,7 +3535,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -4057,7 +4057,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -4158,7 +4158,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -5745,7 +5745,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -5919,7 +5919,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -6093,7 +6093,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -6267,7 +6267,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
@@ -6441,7 +6441,7 @@
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">
1
</property>
<property name="enabled">
0
</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
...
...
obs/forms/OBSWindows.h
浏览文件 @
f50fbfd1
...
...
@@ -194,7 +194,6 @@ class OBSBasicSettingsBase : public DialogSubclass
private:
protected:
wxListbook
*
settingsList
;
wxStaticText
*
m_staticText27
;
wxPanel
*
videoPanel
;
wxStaticText
*
m_staticText6
;
...
...
@@ -227,6 +226,7 @@ class OBSBasicSettingsBase : public DialogSubclass
public:
wxListbook
*
settingsList
;
wxPanel
*
generalPanel
;
wxComboBox
*
languageList
;
wxStaticText
*
generalText
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录