OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 09:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated UI files

Browse source
This commit is contained in:
jp9000 2013-12-06 06:38:50 -07:00
parent ff47b3a2dc
commit a8d9c5b25c
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
obs/OBSWindows.cpp
View file

@ -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 );
previewContainer->Add( bSizer35, 1, wxEXPAND, 5 );
previewVertical->Add( bSizer35, 1, wxEXPAND, 5 );
topContainer->Add( previewContainer, 1, wxALIGN_CENTER, 5 );
previewContainer->Add( previewVertical, 1, wxALIGN_CENTER, 5 );
panelContainer->Add( topContainer, 1, wxEXPAND, 5 );
panelContainer->Add( previewContainer, 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 ) );

22
obs/OBSWindows.fbp
View file

@ -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">topContainer</property>
<property name="name">previewContainer</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">previewContainer</property>
<property name="name">previewVertical</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>

4
obs/OBSWindows.h
View file

@ -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(); }