diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index 04c45e113..040520c89 100644 --- a/obs/forms/OBSWindows.cpp +++ b/obs/forms/OBSWindows.cpp @@ -53,18 +53,12 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit previewContainer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* previewVertical; - previewVertical = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bSizer35; - bSizer35 = new wxBoxSizer( wxVERTICAL ); + previewVertical = new wxBoxSizer( wxVERTICAL ); 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 ); - - - previewVertical->Add( bSizer35, 1, wxEXPAND, 5 ); + previewVertical->Add( previewPanel, 0, wxALIGN_CENTER|wxALL, 5 ); previewContainer->Add( previewVertical, 1, wxALIGN_CENTER, 5 ); @@ -76,25 +70,33 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit bottomContainer = new wxBoxSizer( wxVERTICAL ); bottomContainer->SetMinSize( wxSize( -1,155 ) ); - wxBoxSizer* bSizer36; - bSizer36 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bottomCenterContainer; - bottomCenterContainer = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* scenesContainer; - scenesContainer = new wxBoxSizer( wxVERTICAL ); + wxFlexGridSizer* fgSizer5; + fgSizer5 = new wxFlexGridSizer( 0, 4, 0, 0 ); + fgSizer5->AddGrowableRow( 1 ); + fgSizer5->SetFlexibleDirection( wxVERTICAL ); + fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); scenesLabel = new wxStaticText( mainPanel, wxID_ANY, _("MainWindow.Scenes"), wxDefaultPosition, wxDefaultSize, 0 ); scenesLabel->Wrap( -1 ); - scenesContainer->Add( scenesLabel, 0, wxALL|wxEXPAND, 2 ); + fgSizer5->Add( scenesLabel, 0, wxALL|wxEXPAND, 2 ); + + sourcesLabel = new wxStaticText( mainPanel, wxID_ANY, _("MainWindow.Sources"), wxDefaultPosition, wxDefaultSize, 0 ); + sourcesLabel->Wrap( -1 ); + fgSizer5->Add( sourcesLabel, 0, wxALL|wxEXPAND, 2 ); + + sourcesLabel1 = new wxStaticText( mainPanel, wxID_ANY, _("MainWindow.Volume"), wxDefaultPosition, wxDefaultSize, 0 ); + sourcesLabel1->Wrap( -1 ); + fgSizer5->Add( sourcesLabel1, 0, wxALL|wxEXPAND, 2 ); + + + fgSizer5->Add( 0, 0, 1, wxEXPAND, 5 ); scenesPanel = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); wxBoxSizer* bSizer16; bSizer16 = new wxBoxSizer( wxVERTICAL ); scenes = new wxListBox( scenesPanel, ID_SCENES, wxDefaultPosition, wxDefaultSize, 0, NULL, 0|wxNO_BORDER ); - bSizer16->Add( scenes, 1, wxALL|wxEXPAND, 0 ); + bSizer16->Add( scenes, 1, wxEXPAND, 0 ); scenesToolbar = new wxToolBar( scenesPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL ); scenesToolbar->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); @@ -119,17 +121,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit scenesPanel->SetSizer( bSizer16 ); scenesPanel->Layout(); bSizer16->Fit( scenesPanel ); - scenesContainer->Add( scenesPanel, 1, wxEXPAND | wxALL, 2 ); - - - bottomCenterContainer->Add( scenesContainer, 1, wxEXPAND, 5 ); - - wxBoxSizer* sourcesContainer; - sourcesContainer = new wxBoxSizer( wxVERTICAL ); - - sourcesLabel = new wxStaticText( mainPanel, wxID_ANY, _("MainWindow.Sources"), wxDefaultPosition, wxDefaultSize, 0 ); - sourcesLabel->Wrap( -1 ); - sourcesContainer->Add( sourcesLabel, 0, wxALL|wxEXPAND, 2 ); + fgSizer5->Add( scenesPanel, 1, wxEXPAND | wxALL, 2 ); sourcesPanel = new wxPanel( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER ); wxBoxSizer* bSizer17; @@ -137,7 +129,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit wxArrayString sourcesChoices; sources = new wxCheckListBox( sourcesPanel, ID_SOURCES, wxDefaultPosition, wxDefaultSize, sourcesChoices, 0|wxNO_BORDER ); - bSizer17->Add( sources, 1, wxALL, 0 ); + bSizer17->Add( sources, 1, wxEXPAND, 0 ); sourcesToolbar = new wxToolBar( sourcesPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL ); sourcesToolbar->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); @@ -162,17 +154,7 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit sourcesPanel->SetSizer( bSizer17 ); sourcesPanel->Layout(); bSizer17->Fit( sourcesPanel ); - sourcesContainer->Add( sourcesPanel, 1, wxEXPAND | wxALL, 2 ); - - - 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 ); + fgSizer5->Add( sourcesPanel, 1, wxEXPAND | wxALL, 2 ); m_scrolledWindow1 = new wxScrolledWindow( mainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL ); m_scrolledWindow1->SetScrollRate( 5, 5 ); @@ -183,18 +165,11 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit m_scrolledWindow1->SetSizer( bSizer44 ); m_scrolledWindow1->Layout(); bSizer44->Fit( m_scrolledWindow1 ); - bSizer42->Add( m_scrolledWindow1, 1, wxEXPAND | wxALL, 2 ); - - - bottomCenterContainer->Add( bSizer42, 1, wxEXPAND, 5 ); + fgSizer5->Add( m_scrolledWindow1, 1, wxEXPAND|wxALL, 2 ); wxBoxSizer* rightButtonsContainer; rightButtonsContainer = new wxBoxSizer( wxVERTICAL ); - m_staticText6 = new wxStaticText( mainPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - rightButtonsContainer->Add( m_staticText6, 0, wxALL, 2 ); - toggleStreamButton = new wxButton( mainPanel, ID_STARTSTREAM, _("MainWindow.StartStream"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); rightButtonsContainer->Add( toggleStreamButton, 0, wxALL|wxEXPAND, 2 ); @@ -208,13 +183,10 @@ OBSBasicBase::OBSBasicBase( wxWindow* parent, wxWindowID id, const wxString& tit rightButtonsContainer->Add( exitButton, 0, wxALL|wxEXPAND, 2 ); - bottomCenterContainer->Add( rightButtonsContainer, 1, wxEXPAND, 5 ); + fgSizer5->Add( rightButtonsContainer, 1, wxEXPAND, 5 ); - bSizer36->Add( bottomCenterContainer, 1, wxALIGN_CENTER, 5 ); - - - bottomContainer->Add( bSizer36, 1, wxALIGN_CENTER|wxEXPAND, 5 ); + bottomContainer->Add( fgSizer5, 1, wxALIGN_CENTER_HORIZONTAL, 5 ); panelContainer->Add( bottomContainer, 0, wxEXPAND, 5 ); @@ -722,12 +694,6 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con audioPanel->Layout(); bSizer36->Fit( audioPanel ); settingsList->AddPage( audioPanel, _("Settings.Audio"), false ); - /*#ifndef __WXGTK__ // Small icon style not supported in GTK - wxListView* settingsListListView = settingsList->GetListView(); - long settingsListFlags = settingsListListView->GetWindowStyleFlag(); - settingsListFlags = ( settingsListFlags & ~wxLC_ICON ) | wxLC_SMALL_ICON; - settingsListListView->SetWindowStyleFlag( settingsListFlags ); - #endif*/ bSizer31->Add( settingsList, 1, wxEXPAND | wxALL, 5 ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index 3637849e3..7c4d0f9e8 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -307,22 +307,1213 @@ previewVertical - wxHORIZONTAL + wxVERTICAL none + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_APPWORKSPACE + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_PROGRAM + + 0 + + + 0 + + 1 + previewPanel + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + OnResizePreview + + + + + + + + + 5 + wxEXPAND + 0 + + -1,155 + bottomContainer + wxVERTICAL + none + + 5 + wxALIGN_CENTER_HORIZONTAL + 1 + + 4 + wxVERTICAL + + 1 + 0 + + fgSizer5 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Scenes + + 0 + + + 0 + + 1 + scenesLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Sources + + 0 + + + 0 + + 1 + sourcesLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + wxALL|wxEXPAND + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 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 + scenesPanel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxSIMPLE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer16 + wxVERTICAL + none + + 0 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_SCENES + + 0 + + + 0 + + 1 + scenes + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxNO_BORDER + + + + + + + + + + + scenesClicked + + + + + + + + + + scenesRDown + + + + + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_BTNFACE + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + scenesToolbar + 1 + 1 + + + protected + 1 + + Resizable + 5 + 1 + + wxTB_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Load From Embedded File; images\list_add.png + 0 + ID_SCENE_ADD + wxITEM_NORMAL + tool + sceneAdd + protected + + + + + + + + + sceneAddClicked + + + + + + Load From Embedded File; images\delete.ico + 0 + ID_SCENE_DELETE + wxITEM_NORMAL + tool + sceneRemove + protected + + + + + + + + + sceneRemoveClicked + + + + + + Load From Embedded File; images\properties.ico + 0 + ID_SCENE_PROPERTIES + wxITEM_NORMAL + tool + sceneProperties + protected + + + + + + + + + scenePropertiesClicked + + + + + + protected + + + Load From Embedded File; images\up.ico + 0 + ID_SCENE_MOVEUP + wxITEM_NORMAL + tool + sceneUp + protected + + + + + + + + + sceneUpClicked + + + + + + Load From Embedded File; images\down.ico + 0 + ID_SCENE_MOVEDOWN + wxITEM_NORMAL + tool + sceneDown + protected + + + + + + + + + sceneDownClicked + + + + + + + + + + + 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 + sourcesPanel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxSIMPLE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer17 + wxVERTICAL + none + + 0 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_SOURCES + + 0 + + + 0 + + 1 + sources + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + wxNO_BORDER + + sourcesClicked + + sourcesToggled + + + + + + + + + + + + + + + + + + sourcesRDown + + + + + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_BTNFACE + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + sourcesToolbar + 1 + 1 + + + protected + 1 + + Resizable + 5 + 1 + + wxTB_HORIZONTAL + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Load From Embedded File; images\list_add.png + 0 + ID_SOURCE_ADD + wxITEM_NORMAL + tool + sourceAdd + protected + + + + + + + + + sourceAddClicked + + + + + + Load From Embedded File; images\delete.ico + 0 + ID_SOURCE_DELETE + wxITEM_NORMAL + tool + sourceRemove + protected + + + + + + + + + sourceRemoveClicked + + + + + + Load From Embedded File; images\properties.ico + 0 + ID_SOURCE_PROPERTIES + wxITEM_NORMAL + tool + sourceProperties + protected + + + + + + + + + sourcePropertiesClicked + + + + + + protected + + + Load From Embedded File; images\up.ico + 0 + ID_SOURCE_MOVEUP + wxITEM_NORMAL + tool + sourceUp + protected + + + + + + + + + sourceUpClicked + + + + + + Load From Embedded File; images\down.ico + 0 + ID_SOURCE_MOVEDOWN + wxITEM_NORMAL + tool + sourceDown + protected + + + + + + + + + sourceDownClicked + + + + + + + + + + + 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_scrolledWindow1 + 1 + + + protected + 1 + + Resizable + 5 + 5 + 1 + + + 0 + + + + wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer44 + wxVERTICAL + none + + + 5 wxEXPAND 1 - bSizer35 + rightButtonsContainer wxVERTICAL none - 5 - wxALIGN_CENTER|wxALL + 2 + wxALL|wxEXPAND 0 - + 1 1 1 @@ -332,13 +1523,14 @@ - wxSYS_COLOUR_APPWORKSPACE + 1 0 1 1 + 0 0 Dock 0 @@ -349,7 +1541,8 @@ 0 0 - ID_PROGRAM + ID_STARTSTREAM + MainWindow.StartStream 0 @@ -357,7 +1550,7 @@ 0 1 - previewPanel + toggleStreamButton 1 @@ -367,12 +1560,18 @@ Resizable 1 -1,-1 + 0 + + wxFILTER_NONE + wxDefaultValidator + - wxTAB_TRAVERSAL + + toggleStreamClicked @@ -394,1592 +1593,272 @@ - OnResizePreview + - - - - - - - - 5 - wxEXPAND - 0 - - -1,155 - bottomContainer - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxEXPAND - 1 - - - bSizer36 - wxVERTICAL - none - - 5 - wxALIGN_CENTER - 1 - - -1,-1 - bottomCenterContainer - wxHORIZONTAL - none - 5 - wxEXPAND - 1 - + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_RECORD + MainWindow.StartRecording + + 0 + + + 0 - scenesContainer - wxVERTICAL - none - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Scenes - - 0 - - - 0 - - 1 - scenesLabel - 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 - scenesPanel - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer16 - wxVERTICAL - none - - 0 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_SCENES - - 0 - - - 0 - - 1 - scenes - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - - - - - - - - - - scenesClicked - - - - - - - - - - scenesRDown - - - - - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_BTNFACE - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - scenesToolbar - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - ID_SCENE_ADD - wxITEM_NORMAL - tool - sceneAdd - protected - - - - - - - - - sceneAddClicked - - - - - - Load From Embedded File; images\delete.ico - 0 - ID_SCENE_DELETE - wxITEM_NORMAL - tool - sceneRemove - protected - - - - - - - - - sceneRemoveClicked - - - - - - Load From Embedded File; images\properties.ico - 0 - ID_SCENE_PROPERTIES - wxITEM_NORMAL - tool - sceneProperties - protected - - - - - - - - - scenePropertiesClicked - - - - - - protected - - - Load From Embedded File; images\up.ico - 0 - ID_SCENE_MOVEUP - wxITEM_NORMAL - tool - sceneUp - protected - - - - - - - - - sceneUpClicked - - - - - - Load From Embedded File; images\down.ico - 0 - ID_SCENE_MOVEDOWN - wxITEM_NORMAL - tool - sceneDown - protected - - - - - - - - - sceneDownClicked - - - - - - - - - + 1 + ToggleRecordButton + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + toggleRecordClicked + + + + + + + + + + + + + + + + + + + + + + + - 5 - wxEXPAND - 1 - + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_SETTINGS + MainWindow.Settings + + 0 + + + 0 - sourcesContainer - wxVERTICAL - none - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Sources - - 0 - - - 0 - - 1 - sourcesLabel - 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 - sourcesPanel - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer17 - wxVERTICAL - none - - 0 - wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_SOURCES - - 0 - - - 0 - - 1 - sources - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - sourcesClicked - - sourcesToggled - - - - - - - - - - - - - - - - - - sourcesRDown - - - - - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_BTNFACE - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - sourcesToolbar - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - ID_SOURCE_ADD - wxITEM_NORMAL - tool - sourceAdd - protected - - - - - - - - - sourceAddClicked - - - - - - Load From Embedded File; images\delete.ico - 0 - ID_SOURCE_DELETE - wxITEM_NORMAL - tool - sourceRemove - protected - - - - - - - - - sourceRemoveClicked - - - - - - Load From Embedded File; images\properties.ico - 0 - ID_SOURCE_PROPERTIES - wxITEM_NORMAL - tool - sourceProperties - protected - - - - - - - - - sourcePropertiesClicked - - - - - - protected - - - Load From Embedded File; images\up.ico - 0 - ID_SOURCE_MOVEUP - wxITEM_NORMAL - tool - sourceUp - protected - - - - - - - - - sourceUpClicked - - - - - - Load From Embedded File; images\down.ico - 0 - ID_SOURCE_MOVEDOWN - wxITEM_NORMAL - tool - sourceDown - protected - - - - - - - - - sourceDownClicked - - - - - - - - - + 1 + settingsButton + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + settingsClicked + + + + + + + + + + + + + + + + + + + + + + + - 5 - wxEXPAND - 1 - + 2 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_EXIT + MainWindow.Exit + + 0 + + + 0 - 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_scrolledWindow1 - 1 - - - protected - 1 - - Resizable - 5 - 5 - 1 - - - 0 - - - - wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer44 - wxVERTICAL - none - - - - - - - 5 - wxEXPAND - 1 - - - rightButtonsContainer - wxVERTICAL - none - - 2 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_STARTSTREAM - MainWindow.StartStream - - 0 - - - 0 - - 1 - toggleStreamButton - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - toggleStreamClicked - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_RECORD - MainWindow.StartRecording - - 0 - - - 0 - - 1 - ToggleRecordButton - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - toggleRecordClicked - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_SETTINGS - MainWindow.Settings - - 0 - - - 0 - - 1 - settingsButton - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - settingsClicked - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_EXIT - MainWindow.Exit - - 0 - - - 0 - - 1 - exitButton - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - exitClicked - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + exitButton + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + exitClicked + + + + + + + + + + + + + + + + + + + + + + + diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index 96e417c0a..2596e410b 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -115,16 +115,15 @@ class OBSBasicBase : public WindowSubclass wxBoxSizer* previewContainer; wxPanel* previewPanel; wxStaticText* scenesLabel; + wxStaticText* sourcesLabel; + wxStaticText* sourcesLabel1; wxPanel* scenesPanel; wxListBox* scenes; wxToolBar* scenesToolbar; - wxStaticText* sourcesLabel; wxPanel* sourcesPanel; wxCheckListBox* sources; wxToolBar* sourcesToolbar; - wxStaticText* sourcesLabel1; wxScrolledWindow* m_scrolledWindow1; - wxStaticText* m_staticText6; wxButton* toggleStreamButton; wxButton* ToggleRecordButton; wxButton* settingsButton;