Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
454d800c
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,发现更多精彩内容 >>
提交
454d800c
编写于
12月 12, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated settings form again with new callbacks
上级
5edc9cf9
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
214 addition
and
8 deletion
+214
-8
obs/forms/OBSWindows.cpp
obs/forms/OBSWindows.cpp
+22
-4
obs/forms/OBSWindows.fbp
obs/forms/OBSWindows.fbp
+190
-4
obs/forms/OBSWindows.h
obs/forms/OBSWindows.h
+2
-0
未找到文件。
obs/forms/OBSWindows.cpp
浏览文件 @
454d800c
...
@@ -437,13 +437,22 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
...
@@ -437,13 +437,22 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer13
->
Add
(
languageList
,
0
,
wxALL
,
2
);
fgSizer13
->
Add
(
languageList
,
0
,
wxALL
,
2
);
bSizer32
->
Add
(
fgSizer13
,
1
,
wxEXPAND
,
5
);
bSizer32
->
Add
(
fgSizer13
,
0
,
wxEXPAND
,
5
);
bSizer32
->
Add
(
0
,
20
,
0
,
wxEXPAND
,
5
);
generalChangedText
=
new
wxStaticText
(
generalPanel
,
wxID_ANY
,
_
(
"Settings.RestartProgram"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
generalChangedText
->
Wrap
(
-
1
);
generalChangedText
->
Hide
();
bSizer32
->
Add
(
generalChangedText
,
1
,
wxALL
|
wxEXPAND
,
5
);
generalPanel
->
SetSizer
(
bSizer32
);
generalPanel
->
SetSizer
(
bSizer32
);
generalPanel
->
Layout
();
generalPanel
->
Layout
();
bSizer32
->
Fit
(
generalPanel
);
bSizer32
->
Fit
(
generalPanel
);
settingsList
->
AddPage
(
generalPanel
,
_
(
"Settings.General"
),
fals
e
);
settingsList
->
AddPage
(
generalPanel
,
_
(
"Settings.General"
),
tru
e
);
outputsPanel
=
new
wxPanel
(
settingsList
,
ID_SETTINGS_OUTPUTS
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
outputsPanel
=
new
wxPanel
(
settingsList
,
ID_SETTINGS_OUTPUTS
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
wxBoxSizer
*
bSizer33
;
wxBoxSizer
*
bSizer33
;
bSizer33
=
new
wxBoxSizer
(
wxVERTICAL
);
bSizer33
=
new
wxBoxSizer
(
wxVERTICAL
);
...
@@ -587,10 +596,19 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
...
@@ -587,10 +596,19 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
bSizer34
->
Add
(
fgSizer1
,
0
,
wxEXPAND
,
5
);
bSizer34
->
Add
(
fgSizer1
,
0
,
wxEXPAND
,
5
);
bSizer34
->
Add
(
0
,
20
,
0
,
wxEXPAND
,
5
);
videoChangedText
=
new
wxStaticText
(
videoPanel
,
wxID_ANY
,
_
(
"Settings.RestartStream"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
videoChangedText
->
Wrap
(
-
1
);
videoChangedText
->
Hide
();
bSizer34
->
Add
(
videoChangedText
,
1
,
wxALL
|
wxEXPAND
,
5
);
videoPanel
->
SetSizer
(
bSizer34
);
videoPanel
->
SetSizer
(
bSizer34
);
videoPanel
->
Layout
();
videoPanel
->
Layout
();
bSizer34
->
Fit
(
videoPanel
);
bSizer34
->
Fit
(
videoPanel
);
settingsList
->
AddPage
(
videoPanel
,
_
(
"Settings.Video"
),
tru
e
);
settingsList
->
AddPage
(
videoPanel
,
_
(
"Settings.Video"
),
fals
e
);
audioPanel
=
new
wxPanel
(
settingsList
,
ID_SETTINGS_AUDIO
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
audioPanel
=
new
wxPanel
(
settingsList
,
ID_SETTINGS_AUDIO
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
wxBoxSizer
*
bSizer36
;
wxBoxSizer
*
bSizer36
;
bSizer36
=
new
wxBoxSizer
(
wxVERTICAL
);
bSizer36
=
new
wxBoxSizer
(
wxVERTICAL
);
...
@@ -639,7 +657,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
...
@@ -639,7 +657,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
fgSizer11
->
Add
(
auxAudioDeviceList4
,
0
,
wxALL
,
2
);
fgSizer11
->
Add
(
auxAudioDeviceList4
,
0
,
wxALL
,
2
);
bSizer36
->
Add
(
fgSizer11
,
1
,
wxEXPAND
,
5
);
bSizer36
->
Add
(
fgSizer11
,
0
,
wxEXPAND
,
5
);
audioPanel
->
SetSizer
(
bSizer36
);
audioPanel
->
SetSizer
(
bSizer36
);
...
...
obs/forms/OBSWindows.fbp
浏览文件 @
454d800c
...
@@ -2853,7 +2853,7 @@
...
@@ -2853,7 +2853,7 @@
<object class="listbookpage" expanded="0">
<object class="listbookpage" expanded="0">
<property name="bitmap"></property>
<property name="bitmap"></property>
<property name="label">Settings.General</property>
<property name="label">Settings.General</property>
<property name="select">
0
</property>
<property name="select">
1
</property>
<object class="wxPanel" expanded="0">
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="LeftDockable">1</property>
...
@@ -2946,7 +2946,7 @@
...
@@ -2946,7 +2946,7 @@
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">
1
</property>
<property name="proportion">
0
</property>
<object class="wxFlexGridSizer" expanded="0">
<object class="wxFlexGridSizer" expanded="0">
<property name="cols">2</property>
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="flexible_direction">wxBOTH</property>
...
@@ -3135,6 +3135,99 @@
...
@@ -3135,6 +3135,99 @@
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="0">
<property name="height">20</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">1</property>
<property name="id">wxID_ANY</property>
<property name="label">Settings.RestartProgram</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">generalChangedText</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
...
@@ -3227,7 +3320,7 @@
...
@@ -3227,7 +3320,7 @@
<object class="listbookpage" expanded="0">
<object class="listbookpage" expanded="0">
<property name="bitmap"></property>
<property name="bitmap"></property>
<property name="label">Settings.Video</property>
<property name="label">Settings.Video</property>
<property name="select">
1
</property>
<property name="select">
0
</property>
<object class="wxPanel" expanded="0">
<object class="wxPanel" expanded="0">
<property name="BottomDockable">1</property>
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="LeftDockable">1</property>
...
@@ -5338,6 +5431,99 @@
...
@@ -5338,6 +5431,99 @@
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="0">
<property name="height">20</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">1</property>
<property name="id">wxID_ANY</property>
<property name="label">Settings.RestartStream</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">videoChangedText</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
...
@@ -5437,7 +5623,7 @@
...
@@ -5437,7 +5623,7 @@
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">
1
</property>
<property name="proportion">
0
</property>
<object class="wxFlexGridSizer" expanded="0">
<object class="wxFlexGridSizer" expanded="0">
<property name="cols">2</property>
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="flexible_direction">wxBOTH</property>
...
...
obs/forms/OBSWindows.h
浏览文件 @
454d800c
...
@@ -196,6 +196,7 @@ class OBSBasicSettingsBase : public DialogSubclass
...
@@ -196,6 +196,7 @@ class OBSBasicSettingsBase : public DialogSubclass
protected:
protected:
wxListbook
*
settingsList
;
wxListbook
*
settingsList
;
wxStaticText
*
m_staticText27
;
wxStaticText
*
m_staticText27
;
wxStaticText
*
generalChangedText
;
wxPanel
*
videoPanel
;
wxPanel
*
videoPanel
;
wxStaticText
*
m_staticText6
;
wxStaticText
*
m_staticText6
;
wxStaticText
*
m_staticText8
;
wxStaticText
*
m_staticText8
;
...
@@ -209,6 +210,7 @@ class OBSBasicSettingsBase : public DialogSubclass
...
@@ -209,6 +210,7 @@ class OBSBasicSettingsBase : public DialogSubclass
wxStaticText
*
m_staticText20
;
wxStaticText
*
m_staticText20
;
wxStaticText
*
m_staticText21
;
wxStaticText
*
m_staticText21
;
wxPanel
*
m_panel16
;
wxPanel
*
m_panel16
;
wxStaticText
*
videoChangedText
;
wxPanel
*
audioPanel
;
wxPanel
*
audioPanel
;
wxStaticText
*
m_staticText23
;
wxStaticText
*
m_staticText23
;
wxStaticText
*
m_staticText24
;
wxStaticText
*
m_staticText24
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录