Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
66f846ca
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,发现更多精彩内容 >>
提交
66f846ca
编写于
11月 22, 2013
作者:
J
jp9000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
updated UI files
上级
af8329c6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
471 addition
and
2344 deletion
+471
-2344
obs/OBSWindows.cpp
obs/OBSWindows.cpp
+24
-173
obs/OBSWindows.fbp
obs/OBSWindows.fbp
+438
-2146
obs/OBSWindows.h
obs/OBSWindows.h
+5
-20
obs/obs.cpp
obs/obs.cpp
+2
-1
obs/obs.hpp
obs/obs.hpp
+1
-0
obs/window-obs-basic.cpp
obs/window-obs-basic.cpp
+1
-2
obs/window-obs-basic.hpp
obs/window-obs-basic.hpp
+0
-2
未找到文件。
obs/OBSWindows.cpp
浏览文件 @
66f846ca
...
...
@@ -5,8 +5,6 @@
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "window-subclass.hpp"
#include "OBSWindows.h"
#include "res/delete.ico.h"
...
...
@@ -276,12 +274,20 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t
{
this
->
SetSizeHints
(
wxSize
(
900
,
400
),
wxDefaultSize
);
wxBoxSizer
*
clientSI
zer
;
clientSI
zer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
windowSi
zer
;
windowSi
zer
=
new
wxBoxSizer
(
wxVERTICAL
);
mainPanel
=
new
wxPanel
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
wxBoxSizer
*
mainSizer
;
mainSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
clientSizer
;
clientSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
leftSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
clientSizer
->
Add
(
leftSizer
,
0
,
wxEXPAND
,
5
);
wxBoxSizer
*
centerSizer
;
centerSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
topSizer
;
topSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
...
...
@@ -319,13 +325,13 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t
topSizer
->
Add
(
bSizer5
,
1
,
wxEXPAND
,
5
);
transition
Contain
er
=
new
wxBoxSizer
(
wxVERTICAL
);
transition
Siz
er
=
new
wxBoxSizer
(
wxVERTICAL
);
m_button7
=
new
wxButton
(
mainPanel
,
wxID_ANY
,
_
(
"MainWindow.Cut"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
transition
Contain
er
->
Add
(
m_button7
,
0
,
wxALL
,
5
);
transition
Siz
er
->
Add
(
m_button7
,
0
,
wxALL
,
5
);
topSizer
->
Add
(
transition
Contain
er
,
0
,
wxALIGN_CENTER
,
5
);
topSizer
->
Add
(
transition
Siz
er
,
0
,
wxALIGN_CENTER
,
5
);
wxBoxSizer
*
bSizer6
;
bSizer6
=
new
wxBoxSizer
(
wxHORIZONTAL
);
...
...
@@ -361,184 +367,29 @@ OBSStudioBase::OBSStudioBase( wxWindow* parent, wxWindowID id, const wxString& t
topSizer
->
Add
(
bSizer6
,
1
,
wxEXPAND
,
5
);
main
Sizer
->
Add
(
topSizer
,
1
,
wxEXPAND
,
5
);
center
Sizer
->
Add
(
topSizer
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bottomSizer
;
bottomSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
bSizer20
;
bSizer20
=
new
wxBoxSizer
(
wxHORIZONTAL
);
bSizer20
->
SetMinSize
(
wxSize
(
900
,
155
)
);
wxBoxSizer
*
bSizer16
;
bSizer16
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticText1
=
new
wxStaticText
(
mainPanel
,
wxID_ANY
,
_
(
"MainWindow.Channels"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText1
->
Wrap
(
-
1
);
bSizer16
->
Add
(
m_staticText1
,
0
,
wxALL
,
3
);
m_panel13
=
new
wxPanel
(
mainPanel
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxSIMPLE_BORDER
);
wxBoxSizer
*
bSizer38
;
bSizer38
=
new
wxBoxSizer
(
wxVERTICAL
);
m_listBox1
=
new
wxListBox
(
m_panel13
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
0
|
wxNO_BORDER
);
bSizer38
->
Add
(
m_listBox1
,
1
,
wxEXPAND
,
0
);
m_toolBar1
=
new
wxToolBar
(
m_panel13
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTB_HORIZONTAL
|
wxNO_BORDER
);
m_toolBar1
->
SetBackgroundColour
(
wxSystemSettings
::
GetColour
(
wxSYS_COLOUR_BTNFACE
)
);
m_toolBar1
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
list_add_png_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar1
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
delete_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar1
->
AddSeparator
();
m_toolBar1
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
up_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar1
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
down_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar1
->
Realize
();
bSizer38
->
Add
(
m_toolBar1
,
0
,
wxEXPAND
,
0
);
m_panel13
->
SetSizer
(
bSizer38
);
m_panel13
->
Layout
();
bSizer38
->
Fit
(
m_panel13
);
bSizer16
->
Add
(
m_panel13
,
1
,
wxEXPAND
|
wxALL
,
2
);
bSizer20
->
Add
(
bSizer16
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bSizer17
;
bSizer17
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticText2
=
new
wxStaticText
(
mainPanel
,
wxID_ANY
,
_
(
"MainWindow.Scenes"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText2
->
Wrap
(
-
1
);
bSizer17
->
Add
(
m_staticText2
,
0
,
wxALL
,
3
);
m_panel12
=
new
wxPanel
(
mainPanel
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxSIMPLE_BORDER
);
wxBoxSizer
*
bSizer37
;
bSizer37
=
new
wxBoxSizer
(
wxVERTICAL
);
m_listBox2
=
new
wxListBox
(
m_panel12
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
0
|
wxNO_BORDER
);
bSizer37
->
Add
(
m_listBox2
,
1
,
wxALL
|
wxEXPAND
,
0
);
m_toolBar11
=
new
wxToolBar
(
m_panel12
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTB_HORIZONTAL
|
wxNO_BORDER
);
m_toolBar11
->
SetBackgroundColour
(
wxSystemSettings
::
GetColour
(
wxSYS_COLOUR_BTNFACE
)
);
m_toolBar11
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
list_add_png_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar11
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
delete_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar11
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
htmledit_icon22_properties_gif_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar11
->
Realize
();
bSizer37
->
Add
(
m_toolBar11
,
0
,
wxEXPAND
,
5
);
m_panel12
->
SetSizer
(
bSizer37
);
m_panel12
->
Layout
();
bSizer37
->
Fit
(
m_panel12
);
bSizer17
->
Add
(
m_panel12
,
1
,
wxEXPAND
|
wxALL
,
2
);
bSizer20
->
Add
(
bSizer17
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bSizer18
;
bSizer18
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticText3
=
new
wxStaticText
(
mainPanel
,
wxID_ANY
,
_
(
"MainWindow.Sources"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText3
->
Wrap
(
-
1
);
bSizer18
->
Add
(
m_staticText3
,
0
,
wxALL
,
3
);
m_panel14
=
new
wxPanel
(
mainPanel
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxSIMPLE_BORDER
);
wxBoxSizer
*
bSizer39
;
bSizer39
=
new
wxBoxSizer
(
wxVERTICAL
);
wxArrayString
m_checkList1Choices
;
m_checkList1
=
new
wxCheckListBox
(
m_panel14
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
m_checkList1Choices
,
0
|
wxNO_BORDER
);
bSizer39
->
Add
(
m_checkList1
,
1
,
wxALL
|
wxEXPAND
,
0
);
m_toolBar12
=
new
wxToolBar
(
m_panel14
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTB_HORIZONTAL
|
wxNO_BORDER
);
m_toolBar12
->
SetBackgroundColour
(
wxSystemSettings
::
GetColour
(
wxSYS_COLOUR_BTNFACE
)
);
m_toolBar12
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
list_add_png_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar12
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
delete_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar12
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
htmledit_icon22_properties_gif_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar12
->
AddSeparator
();
m_toolBar12
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
up_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar12
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
down_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar12
->
Realize
();
bSizer39
->
Add
(
m_toolBar12
,
0
,
wxEXPAND
,
5
);
m_panel14
->
SetSizer
(
bSizer39
);
m_panel14
->
Layout
();
bSizer39
->
Fit
(
m_panel14
);
bSizer18
->
Add
(
m_panel14
,
1
,
wxEXPAND
|
wxALL
,
2
);
bSizer20
->
Add
(
bSizer18
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bSizer19
;
bSizer19
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticText4
=
new
wxStaticText
(
mainPanel
,
wxID_ANY
,
_
(
"MainWindow.Streams"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticText4
->
Wrap
(
-
1
);
bSizer19
->
Add
(
m_staticText4
,
0
,
wxALL
,
3
);
m_panel15
=
new
wxPanel
(
mainPanel
,
wxID_ANY
,
wxDefaultPosition
,
wxSize
(
-
1
,
-
1
),
wxSIMPLE_BORDER
);
wxBoxSizer
*
bSizer40
;
bSizer40
=
new
wxBoxSizer
(
wxVERTICAL
);
m_listCtrl1
=
new
ListCtrlFixed
(
m_panel15
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLC_REPORT
|
wxLC_SINGLE_SEL
|
wxNO_BORDER
);
m_listCtrl1
->
SetMinSize
(
wxSize
(
400
,
-
1
)
);
bSizer40
->
Add
(
m_listCtrl1
,
1
,
0
,
0
);
m_toolBar13
=
new
wxToolBar
(
m_panel15
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTB_HORIZONTAL
|
wxNO_BORDER
);
m_toolBar13
->
SetBackgroundColour
(
wxSystemSettings
::
GetColour
(
wxSYS_COLOUR_BTNFACE
)
);
m_toolBar13
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
list_add_png_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar13
->
AddTool
(
wxID_ANY
,
_
(
"tool"
),
delete_ico_to_wx_bitmap
(),
wxNullBitmap
,
wxITEM_NORMAL
,
wxEmptyString
,
wxEmptyString
,
NULL
);
m_toolBar13
->
Realize
();
bSizer40
->
Add
(
m_toolBar13
,
0
,
wxEXPAND
,
5
);
m_panel15
->
SetSizer
(
bSizer40
);
m_panel15
->
Layout
();
bSizer40
->
Fit
(
m_panel15
);
bSizer19
->
Add
(
m_panel15
,
1
,
wxEXPAND
|
wxALL
,
2
);
centerSizer
->
Add
(
bottomSizer
,
0
,
wxEXPAND
,
5
);
bSizer20
->
Add
(
bSizer19
,
0
,
wxEXPAND
,
5
);
clientSizer
->
Add
(
centerSizer
,
1
,
wxEXPAND
,
5
);
bottomSizer
->
Add
(
bSizer20
,
0
,
wxALIGN_CENTER
,
5
);
rightSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
mainSizer
->
Add
(
bottom
Sizer
,
0
,
wxEXPAND
,
5
);
clientSizer
->
Add
(
right
Sizer
,
0
,
wxEXPAND
,
5
);
mainPanel
->
SetSizer
(
main
Sizer
);
mainPanel
->
SetSizer
(
client
Sizer
);
mainPanel
->
Layout
();
main
Sizer
->
Fit
(
mainPanel
);
clientSI
zer
->
Add
(
mainPanel
,
1
,
wxEXPAND
,
0
);
client
Sizer
->
Fit
(
mainPanel
);
windowSi
zer
->
Add
(
mainPanel
,
1
,
wxEXPAND
,
0
);
this
->
SetSizer
(
clientSI
zer
);
this
->
SetSizer
(
windowSi
zer
);
this
->
Layout
();
m_menubar1
=
new
wxMenuBar
(
0
);
m_menu1
=
new
wxMenu
();
...
...
obs/OBSWindows.fbp
浏览文件 @
66f846ca
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
obs/OBSWindows.h
浏览文件 @
66f846ca
...
...
@@ -11,7 +11,6 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class
ListCtrlFixed
;
class
WindowSubclass
;
#include "window-subclass.hpp"
...
...
@@ -34,7 +33,6 @@ class WindowSubclass;
#include <wx/checkbox.h>
#include <wx/statusbr.h>
#include <wx/frame.h>
#include <wx/listctrl.h>
///////////////////////////////////////////////////////////////////////////
...
...
@@ -115,7 +113,7 @@ class OBSBasicBase : public WindowSubclass
public:
OBSBasicBase
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
".mainwindow"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
923
,
677
),
long
style
=
wxDEFAULT_FRAME_STYLE
|
wxTAB_TRAVERSAL
);
OBSBasicBase
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
".mainwindow"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
1117
,
783
),
long
style
=
wxDEFAULT_FRAME_STYLE
|
wxTAB_TRAVERSAL
);
~
OBSBasicBase
();
...
...
@@ -130,28 +128,15 @@ class OBSStudioBase : public WindowSubclass
protected:
wxPanel
*
mainPanel
;
wxBoxSizer
*
leftSizer
;
wxStaticText
*
m_staticText6
;
wxPanel
*
m_panel2
;
wxBoxSizer
*
transition
Contain
er
;
wxBoxSizer
*
transition
Siz
er
;
wxButton
*
m_button7
;
wxStaticText
*
m_staticText7
;
wxPanel
*
m_panel3
;
wxStaticText
*
m_staticText1
;
wxPanel
*
m_panel13
;
wxListBox
*
m_listBox1
;
wxToolBar
*
m_toolBar1
;
wxStaticText
*
m_staticText2
;
wxPanel
*
m_panel12
;
wxListBox
*
m_listBox2
;
wxToolBar
*
m_toolBar11
;
wxStaticText
*
m_staticText3
;
wxPanel
*
m_panel14
;
wxCheckListBox
*
m_checkList1
;
wxToolBar
*
m_toolBar12
;
wxStaticText
*
m_staticText4
;
wxPanel
*
m_panel15
;
ListCtrlFixed
*
m_listCtrl1
;
wxToolBar
*
m_toolBar13
;
wxBoxSizer
*
bottomSizer
;
wxBoxSizer
*
rightSizer
;
wxMenuBar
*
m_menubar1
;
wxMenu
*
m_menu1
;
wxStatusBar
*
m_statusBar1
;
...
...
obs/obs.cpp
浏览文件 @
66f846ca
...
...
@@ -17,6 +17,7 @@
#include "obs.hpp"
#include "window-obs-basic.hpp"
#include "obs-wrappers.hpp"
IMPLEMENT_APP
(
OBSApp
)
...
...
@@ -27,7 +28,7 @@ bool OBSApp::OnInit()
wxInitAllImageHandlers
();
OBSBasic
Base
*
mainWindow
=
new
OBSBasicBase
(
NULL
);
OBSBasic
*
mainWindow
=
new
OBSBasic
(
);
mainWindow
->
Show
();
return
true
;
}
obs/obs.hpp
浏览文件 @
66f846ca
...
...
@@ -17,6 +17,7 @@
#pragma once
#include <obs.h>
#include <wx/app.h>
class
OBSApp
:
public
wxApp
{
...
...
obs/window-obs-basic.cpp
浏览文件 @
66f846ca
...
...
@@ -16,7 +16,7 @@
******************************************************************************/
#include "window-obs-basic.hpp"
/*
void
OBSBasic
::
file_newOnMenuSelection
(
wxCommandEvent
&
event
)
{
}
...
...
@@ -80,4 +80,3 @@ void OBSBasic::sourceUpOnToolClicked(wxCommandEvent& event)
void
OBSBasic
::
sourceDownOnToolClicked
(
wxCommandEvent
&
event
)
{
}
*/
\ No newline at end of file
obs/window-obs-basic.hpp
浏览文件 @
66f846ca
...
...
@@ -19,7 +19,6 @@
#include "OBSWindows.h"
/*
class
OBSBasic
:
public
OBSBasicBase
{
protected:
virtual
void
file_newOnMenuSelection
(
wxCommandEvent
&
event
);
...
...
@@ -42,4 +41,3 @@ protected:
public:
inline
OBSBasic
()
:
OBSBasicBase
(
NULL
)
{}
};
*/
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录