From 5471625dd73db7a3d201aeecc163018bac9fa6ca Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 22 Dec 2013 01:28:40 -0700 Subject: [PATCH] update form to add volume section to main window --- obs/forms/OBSWindows.cpp | 20 +++++ obs/forms/OBSWindows.fbp | 180 +++++++++++++++++++++++++++++++++++++++ obs/forms/OBSWindows.h | 2 + 3 files changed, 202 insertions(+) diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index ad2465b7c..402bae8c2 100644 --- a/obs/forms/OBSWindows.cpp +++ b/obs/forms/OBSWindows.cpp @@ -167,6 +167,26 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit bottomCenterContainer->Add( sourcesContainer, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer42; + bSizer42 = new wxBoxSizer( wxVERTICAL ); + + sourcesLabel1 = new wxStaticText( mainPanel, wxID_ANY, _("MainWindow.Volume"), wxDefaultPosition, wxDefaultSize, 0 ); + sourcesLabel1->Wrap( -1 ); + bSizer42->Add( sourcesLabel1, 0, wxALL, 2 ); + + m_panel16 = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); + wxBoxSizer* bSizer43; + bSizer43 = new wxBoxSizer( wxVERTICAL ); + + + m_panel16->SetSizer( bSizer43 ); + m_panel16->Layout(); + bSizer43->Fit( m_panel16 ); + bSizer42->Add( m_panel16, 1, wxEXPAND | wxALL, 2 ); + + + bottomCenterContainer->Add( bSizer42, 1, wxEXPAND, 5 ); + wxBoxSizer* rightButtonsContainer; rightButtonsContainer = new wxBoxSizer( wxVERTICAL ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index e26c7e6e6..f9f0434d1 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -1354,6 +1354,186 @@ + + 5 + wxEXPAND + 1 + + + bSizer42 + wxVERTICAL + none + + 2 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Volume + + 0 + + + 0 + + 1 + sourcesLabel1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + wxEXPAND | wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panel16 + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxSIMPLE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer43 + wxVERTICAL + none + + + + + 5 wxEXPAND diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index 95b032dba..665d424d6 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -120,6 +120,8 @@ class OBSBasicBase : public WindowSubclass wxPanel* sourcesPanel; wxCheckListBox* sources; wxToolBar* sourcesToolbar; + wxStaticText* sourcesLabel1; + wxPanel* m_panel16; wxStaticText* m_staticText6; wxButton* toggleStreamButton; wxButton* ToggleRecordButton;