diff --git a/obs/OBSWindows.cpp b/obs/OBSWindows.cpp index 210924cfe..6b4e06cf2 100644 --- a/obs/OBSWindows.cpp +++ b/obs/OBSWindows.cpp @@ -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* clientSIzer; - clientSIzer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* windowSizer; + windowSizer = 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 ); - transitionContainer = new wxBoxSizer( wxVERTICAL ); + transitionSizer = new wxBoxSizer( wxVERTICAL ); m_button7 = new wxButton( mainPanel, wxID_ANY, _("MainWindow.Cut"), wxDefaultPosition, wxDefaultSize, 0 ); - transitionContainer->Add( m_button7, 0, wxALL, 5 ); + transitionSizer->Add( m_button7, 0, wxALL, 5 ); - topSizer->Add( transitionContainer, 0, wxALIGN_CENTER, 5 ); + topSizer->Add( transitionSizer, 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 ); - mainSizer->Add( topSizer, 1, wxEXPAND, 5 ); + centerSizer->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 ); + centerSizer->Add( bottomSizer, 0, wxEXPAND, 5 ); - 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 ); + clientSizer->Add( centerSizer, 1, wxEXPAND, 5 ); - m_listBox1 = new wxListBox( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, 0|wxNO_BORDER ); - bSizer38->Add( m_listBox1, 1, wxEXPAND, 0 ); + rightSizer = new wxBoxSizer( wxVERTICAL ); - 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 ); + clientSizer->Add( rightSizer, 0, wxEXPAND, 5 ); - 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 ); - - - bSizer20->Add( bSizer19, 0, wxEXPAND, 5 ); - - - bottomSizer->Add( bSizer20, 0, wxALIGN_CENTER, 5 ); - - - mainSizer->Add( bottomSizer, 0, wxEXPAND, 5 ); - - - mainPanel->SetSizer( mainSizer ); + mainPanel->SetSizer( clientSizer ); mainPanel->Layout(); - mainSizer->Fit( mainPanel ); - clientSIzer->Add( mainPanel, 1, wxEXPAND, 0 ); + clientSizer->Fit( mainPanel ); + windowSizer->Add( mainPanel, 1, wxEXPAND, 0 ); - this->SetSizer( clientSIzer ); + this->SetSizer( windowSizer ); this->Layout(); m_menubar1 = new wxMenuBar( 0 ); m_menu1 = new wxMenu(); diff --git a/obs/OBSWindows.fbp b/obs/OBSWindows.fbp index 8c86b73f4..4679c1e3e 100644 --- a/obs/OBSWindows.fbp +++ b/obs/OBSWindows.fbp @@ -44,7 +44,7 @@ OBSBasicBase - 923,677 + 1117,783 wxDEFAULT_FRAME_STYLE WindowSubclass; window-subclass.hpp .mainwindow @@ -88,7 +88,7 @@ - + 1 @@ -133,7 +133,7 @@ - + MainMenu.File fileMenu protected @@ -422,11 +422,11 @@ bSizer36 wxVERTICAL none - + 5 wxALIGN_CENTER 1 - + 625,-1 bottomCenterContainer wxHORIZONTAL @@ -2137,7 +2137,7 @@ - + 0 wxAUI_MGR_DEFAULT @@ -2199,16 +2199,16 @@ - + - clientSIzer + windowSizer wxVERTICAL none - + 0 wxEXPAND 1 - + 1 1 1 @@ -2282,19 +2282,30 @@ - + - mainSizer - wxVERTICAL + clientSizer + wxHORIZONTAL none + + 5 + wxEXPAND + 0 + + + leftSizer + wxVERTICAL + protected + + 5 wxEXPAND 1 - topSizer - wxHORIZONTAL + centerSizer + wxVERTICAL none 5 @@ -2302,197 +2313,208 @@ 1 - bSizer5 + topSizer wxHORIZONTAL none 5 - wxALIGN_CENTER + wxEXPAND 1 - bSizer8 - wxVERTICAL + bSizer5 + wxHORIZONTAL none 5 - wxALIGN_CENTER|wxEXPAND - 0 + wxALIGN_CENTER + 1 - bSizer33 + bSizer8 wxVERTICAL none - 0 - wxALIGN_CENTER + 5 + wxALIGN_CENTER|wxEXPAND 0 - bSizer191 + bSizer33 wxVERTICAL none - 3 - wxALL + 0 + wxALIGN_CENTER 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Preview - - 0 - - - 0 + - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_APPWORKSPACE - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel2 - 1 - - - protected - 1 - - Resizable - 1 - 480,270 - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + bSizer191 + wxVERTICAL + none + + 3 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Preview + + 0 + + + 0 + + 1 + m_staticText6 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_APPWORKSPACE + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panel2 + 1 + + + protected + 1 + + Resizable + 1 + 480,270 + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2501,103 +2523,310 @@ - - - - 5 - wxALIGN_CENTER - 0 - - - transitionContainer - wxVERTICAL - protected 5 - wxALL + wxALIGN_CENTER 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Cut - - 0 - - - 0 + - 1 - m_button7 - 1 - - + transitionSizer + wxVERTICAL protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Cut + + 0 + + + 0 + + 1 + m_button7 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + bSizer6 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER + 1 + + + bSizer13 + wxVERTICAL + none + + 5 + wxALIGN_CENTER|wxEXPAND + 0 + + + bSizer34 + wxVERTICAL + none + + 0 + wxALIGN_CENTER + 0 + + + bSizer201 + wxVERTICAL + none + + 3 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + MainWindow.Program + + 0 + + + 0 + + 1 + m_staticText7 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_APPWORKSPACE + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_panel3 + 1 + + + protected + 1 + + Resizable + 1 + 480,270 + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2605,1962 +2834,25 @@ 5 wxEXPAND - 1 + 0 - bSizer6 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER - 1 - - - bSizer13 - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxEXPAND - 0 - - - bSizer34 - wxVERTICAL - none - - 0 - wxALIGN_CENTER - 0 - - - bSizer201 - wxVERTICAL - none - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Program - - 0 - - - 0 - - 1 - m_staticText7 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_APPWORKSPACE - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_panel3 - 1 - - - protected - 1 - - Resizable - 1 - 480,270 - - 0 - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bottomSizer + wxVERTICAL + protected - + 5 wxEXPAND 0 - + - bottomSizer + rightSizer wxVERTICAL - none - - 5 - wxALIGN_CENTER - 0 - - 900,155 - bSizer20 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - - bSizer16 - wxVERTICAL - none - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Channels - - 0 - - - 0 - - 1 - m_staticText1 - 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_panel13 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer38 - wxVERTICAL - none - - 0 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_listBox1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 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 - m_toolBar1 - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool1 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\delete.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool2 - protected - - - - - - - - - - - - - - - protected - - - Load From Embedded File; images\up.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool4 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\down.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool5 - protected - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer17 - wxVERTICAL - none - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Scenes - - 0 - - - 0 - - 1 - m_staticText2 - 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_panel12 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer37 - wxVERTICAL - none - - 0 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_listBox2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - m_toolBar11 - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool11 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\delete.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool21 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\htmledit_icon22_properties.gif - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool24 - protected - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - bSizer18 - wxVERTICAL - none - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Sources - - 0 - - - 0 - - 1 - m_staticText3 - 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_panel14 - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer39 - wxVERTICAL - none - - 0 - wxALL|wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_checkList1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - m_toolBar12 - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool12 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\delete.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool22 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\htmledit_icon22_properties.gif - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool231 - protected - - - - - - - - - - - - - - - protected - - - Load From Embedded File; images\up.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool42 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\down.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool52 - protected - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - - bSizer19 - wxVERTICAL - none - - 3 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - MainWindow.Streams - - 0 - - - 0 - - 1 - m_staticText4 - 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 - -1,-1 - - 0 - -1,-1 - 1 - m_panel15 - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - 0 - - - - wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer40 - wxVERTICAL - none - - 0 - - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - -1,-1 - - 0 - 400,-1 - 1 - m_listCtrl1 - 1 - - - protected - 1 - - Resizable - 1 - - wxLC_REPORT|wxLC_SINGLE_SEL - ListCtrlFixed; window-subclass.hpp - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - m_toolBar13 - 1 - 1 - - - protected - 1 - - Resizable - 5 - 1 - - wxTB_HORIZONTAL - - 0 - - - - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - Load From Embedded File; images\list_add.png - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool13 - protected - - - - - - - - - - - - - - - Load From Embedded File; images\delete.ico - 0 - wxID_ANY - wxITEM_NORMAL - tool - m_tool23 - protected - - - - - - - - - - - - - - - - - - - - - - + protected diff --git a/obs/OBSWindows.h b/obs/OBSWindows.h index d0e658924..33756dc17 100644 --- a/obs/OBSWindows.h +++ b/obs/OBSWindows.h @@ -11,7 +11,6 @@ #include #include #include -class ListCtrlFixed; class WindowSubclass; #include "window-subclass.hpp" @@ -34,7 +33,6 @@ class WindowSubclass; #include #include #include -#include /////////////////////////////////////////////////////////////////////////// @@ -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* transitionContainer; + wxBoxSizer* transitionSizer; 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; diff --git a/obs/obs.cpp b/obs/obs.cpp index aa47dc8ca..66d1fad43 100644 --- a/obs/obs.cpp +++ b/obs/obs.cpp @@ -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(); - OBSBasicBase *mainWindow = new OBSBasicBase(NULL); + OBSBasic *mainWindow = new OBSBasic(); mainWindow->Show(); return true; } diff --git a/obs/obs.hpp b/obs/obs.hpp index dc0c33861..c1b372e5e 100644 --- a/obs/obs.hpp +++ b/obs/obs.hpp @@ -17,6 +17,7 @@ #pragma once +#include #include class OBSApp : public wxApp { diff --git a/obs/window-obs-basic.cpp b/obs/window-obs-basic.cpp index 0f77d0134..fb49ab23a 100644 --- a/obs/window-obs-basic.cpp +++ b/obs/window-obs-basic.cpp @@ -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 diff --git a/obs/window-obs-basic.hpp b/obs/window-obs-basic.hpp index 663af1f33..d6d10beeb 100644 --- a/obs/window-obs-basic.hpp +++ b/obs/window-obs-basic.hpp @@ -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