Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
a8d9c5b2
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,发现更多精彩内容 >>
提交
a8d9c5b2
编写于
12月 06, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated UI files
上级
ff47b3a2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
19 deletion
+28
-19
obs/OBSWindows.cpp
obs/OBSWindows.cpp
+13
-8
obs/OBSWindows.fbp
obs/OBSWindows.fbp
+11
-11
obs/OBSWindows.h
obs/OBSWindows.h
+4
-0
未找到文件。
obs/OBSWindows.cpp
浏览文件 @
a8d9c5b2
...
...
@@ -50,28 +50,27 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
wxBoxSizer
*
panelContainer
;
panelContainer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
topContainer
;
topContainer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
wxBoxSizer
*
previewContainer
;
previewContainer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
wxBoxSizer
*
previewVertical
;
previewVertical
=
new
wxBoxSizer
(
wxHORIZONTAL
);
wxBoxSizer
*
bSizer35
;
bSizer35
=
new
wxBoxSizer
(
wxVERTICAL
);
previewPanel
=
new
wxPanel
(
mainPanel
,
ID_PROGRAM
,
wxDefaultPosition
,
wxSize
(
480
,
270
),
wxTAB_TRAVERSAL
);
previewPanel
=
new
wxPanel
(
mainPanel
,
ID_PROGRAM
,
wxDefaultPosition
,
wxSize
(
-
1
,
-
1
),
wxTAB_TRAVERSAL
);
previewPanel
->
SetBackgroundColour
(
wxSystemSettings
::
GetColour
(
wxSYS_COLOUR_APPWORKSPACE
)
);
bSizer35
->
Add
(
previewPanel
,
0
,
wxALIGN_CENTER
|
wxALL
,
5
);
preview
Container
->
Add
(
bSizer35
,
1
,
wxEXPAND
,
5
);
preview
Vertical
->
Add
(
bSizer35
,
1
,
wxEXPAND
,
5
);
topContainer
->
Add
(
previewContainer
,
1
,
wxALIGN_CENTER
,
5
);
previewContainer
->
Add
(
previewVertical
,
1
,
wxALIGN_CENTER
,
5
);
panelContainer
->
Add
(
top
Container
,
1
,
wxEXPAND
,
5
);
panelContainer
->
Add
(
preview
Container
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bottomContainer
;
bottomContainer
=
new
wxBoxSizer
(
wxVERTICAL
);
...
...
@@ -231,10 +230,13 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit
// Connect Events
this
->
Connect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
OBSBasicBase
::
OnClose
)
);
this
->
Connect
(
wxEVT_ICONIZE
,
wxIconizeEventHandler
(
OBSBasicBase
::
OnMinimize
)
);
this
->
Connect
(
wxEVT_SIZE
,
wxSizeEventHandler
(
OBSBasicBase
::
OnSize
)
);
this
->
Connect
(
file_new
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_newOnMenuSelection
)
);
this
->
Connect
(
file_open
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_openOnMenuSelection
)
);
this
->
Connect
(
file_save
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_saveOnMenuSelection
)
);
this
->
Connect
(
file_exit
->
GetId
(),
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_exitOnMenuSelection
)
);
previewPanel
->
Connect
(
wxEVT_SIZE
,
wxSizeEventHandler
(
OBSBasicBase
::
whatever
),
NULL
,
this
);
scenes
->
Connect
(
wxEVT_RIGHT_DOWN
,
wxMouseEventHandler
(
OBSBasicBase
::
scenesOnRightDown
),
NULL
,
this
);
this
->
Connect
(
ID_SCENE_ADD
,
wxEVT_COMMAND_TOOL_CLICKED
,
wxCommandEventHandler
(
OBSBasicBase
::
sceneAddOnToolClicked
)
);
this
->
Connect
(
ID_SCENE_DELETE
,
wxEVT_COMMAND_TOOL_CLICKED
,
wxCommandEventHandler
(
OBSBasicBase
::
sceneRemoveOnToolClicked
)
);
...
...
@@ -253,10 +255,13 @@ OBSBasicBase::~OBSBasicBase()
{
// Disconnect Events
this
->
Disconnect
(
wxEVT_CLOSE_WINDOW
,
wxCloseEventHandler
(
OBSBasicBase
::
OnClose
)
);
this
->
Disconnect
(
wxEVT_ICONIZE
,
wxIconizeEventHandler
(
OBSBasicBase
::
OnMinimize
)
);
this
->
Disconnect
(
wxEVT_SIZE
,
wxSizeEventHandler
(
OBSBasicBase
::
OnSize
)
);
this
->
Disconnect
(
ID_FILE_NEW
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_newOnMenuSelection
)
);
this
->
Disconnect
(
IF_FILE_OPEN
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_openOnMenuSelection
)
);
this
->
Disconnect
(
IF_FILE_SAVE
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_saveOnMenuSelection
)
);
this
->
Disconnect
(
ID_FILE_EXIT
,
wxEVT_COMMAND_MENU_SELECTED
,
wxCommandEventHandler
(
OBSBasicBase
::
file_exitOnMenuSelection
)
);
previewPanel
->
Disconnect
(
wxEVT_SIZE
,
wxSizeEventHandler
(
OBSBasicBase
::
whatever
),
NULL
,
this
);
scenes
->
Disconnect
(
wxEVT_RIGHT_DOWN
,
wxMouseEventHandler
(
OBSBasicBase
::
scenesOnRightDown
),
NULL
,
this
);
this
->
Disconnect
(
ID_SCENE_ADD
,
wxEVT_COMMAND_TOOL_CLICKED
,
wxCommandEventHandler
(
OBSBasicBase
::
sceneAddOnToolClicked
)
);
this
->
Disconnect
(
ID_SCENE_DELETE
,
wxEVT_COMMAND_TOOL_CLICKED
,
wxCommandEventHandler
(
OBSBasicBase
::
sceneRemoveOnToolClicked
)
);
...
...
obs/OBSWindows.fbp
浏览文件 @
a8d9c5b2
...
...
@@ -66,7 +66,7 @@
<event
name=
"OnEnterWindow"
></event>
<event
name=
"OnEraseBackground"
></event>
<event
name=
"OnHibernate"
></event>
<event
name=
"OnIconize"
></event>
<event
name=
"OnIconize"
>
OnMinimize
</event>
<event
name=
"OnIdle"
></event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
...
...
@@ -86,7 +86,7 @@
<event
name=
"OnRightDown"
></event>
<event
name=
"OnRightUp"
></event>
<event
name=
"OnSetFocus"
></event>
<event
name=
"OnSize"
></event>
<event
name=
"OnSize"
>
OnSize
</event>
<event
name=
"OnUpdateUI"
></event>
<object
class=
"wxMenuBar"
expanded=
"0"
>
<property
name=
"bg"
></property>
...
...
@@ -291,22 +291,22 @@
<property
name=
"name"
>
panelContainer
</property>
<property
name=
"orient"
>
wxVERTICAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxEXPAND
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
top
Container
</property>
<property
name=
"name"
>
preview
Container
</property>
<property
name=
"orient"
>
wxHORIZONTAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"
0
"
>
<property
name=
"permission"
>
protected
</property>
<object
class=
"sizeritem"
expanded=
"
1
"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER
</property>
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxBoxSizer"
expanded=
"
0
"
>
<object
class=
"wxBoxSizer"
expanded=
"
1
"
>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
preview
Container
</property>
<property
name=
"name"
>
preview
Vertical
</property>
<property
name=
"orient"
>
wxHORIZONTAL
</property>
<property
name=
"permission"
>
none
</property>
<object
class=
"sizeritem"
expanded=
"0"
>
...
...
@@ -366,7 +366,7 @@
<property
name=
"pos"
></property>
<property
name=
"resize"
>
Resizable
</property>
<property
name=
"show"
>
1
</property>
<property
name=
"size"
>
480,270
</property>
<property
name=
"size"
>
-1,-1
</property>
<property
name=
"subclass"
></property>
<property
name=
"toolbar_pane"
>
0
</property>
<property
name=
"tooltip"
></property>
...
...
@@ -394,7 +394,7 @@
<event
name=
"OnRightDown"
></event>
<event
name=
"OnRightUp"
></event>
<event
name=
"OnSetFocus"
></event>
<event
name=
"OnSize"
></event>
<event
name=
"OnSize"
>
whatever
</event>
<event
name=
"OnUpdateUI"
></event>
</object>
</object>
...
...
obs/OBSWindows.h
浏览文件 @
a8d9c5b2
...
...
@@ -74,6 +74,7 @@ class OBSBasicBase : public WindowSubclass
wxMenuBar
*
mainMenu
;
wxMenu
*
fileMenu
;
wxPanel
*
mainPanel
;
wxBoxSizer
*
previewContainer
;
wxPanel
*
previewPanel
;
wxStaticText
*
scenesLabel
;
wxPanel
*
scenesPanel
;
...
...
@@ -95,10 +96,13 @@ class OBSBasicBase : public WindowSubclass
// Virtual event handlers, overide them in your derived class
virtual
void
OnClose
(
wxCloseEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnMinimize
(
wxIconizeEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnSize
(
wxSizeEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_newOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_openOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_saveOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
file_exitOnMenuSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
whatever
(
wxSizeEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
scenesOnRightDown
(
wxMouseEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
sceneAddOnToolClicked
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
sceneRemoveOnToolClicked
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录