diff --git a/obs/forms/OBSWindows.cpp b/obs/forms/OBSWindows.cpp index aa62ba636..24d4a1b9a 100644 --- a/obs/forms/OBSWindows.cpp +++ b/obs/forms/OBSWindows.cpp @@ -437,13 +437,22 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con fgSizer13->Add( languageList, 0, wxALL, 2 ); - bSizer32->Add( fgSizer13, 1, wxEXPAND, 5 ); + bSizer32->Add( fgSizer13, 0, wxEXPAND, 5 ); + + + bSizer32->Add( 0, 20, 0, wxEXPAND, 5 ); + + generalChangedText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 ); + generalChangedText->Wrap( -1 ); + generalChangedText->Hide(); + + bSizer32->Add( generalChangedText, 1, wxALL|wxEXPAND, 5 ); generalPanel->SetSizer( bSizer32 ); generalPanel->Layout(); bSizer32->Fit( generalPanel ); - settingsList->AddPage( generalPanel, _("Settings.General"), false ); + settingsList->AddPage( generalPanel, _("Settings.General"), true ); outputsPanel = new wxPanel( settingsList, ID_SETTINGS_OUTPUTS, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer33; bSizer33 = new wxBoxSizer( wxVERTICAL ); @@ -587,10 +596,19 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con bSizer34->Add( fgSizer1, 0, wxEXPAND, 5 ); + bSizer34->Add( 0, 20, 0, wxEXPAND, 5 ); + + videoChangedText = new wxStaticText( videoPanel, wxID_ANY, _("Settings.RestartStream"), wxDefaultPosition, wxDefaultSize, 0 ); + videoChangedText->Wrap( -1 ); + videoChangedText->Hide(); + + bSizer34->Add( videoChangedText, 1, wxALL|wxEXPAND, 5 ); + + videoPanel->SetSizer( bSizer34 ); videoPanel->Layout(); bSizer34->Fit( videoPanel ); - settingsList->AddPage( videoPanel, _("Settings.Video"), true ); + settingsList->AddPage( videoPanel, _("Settings.Video"), false ); audioPanel = new wxPanel( settingsList, ID_SETTINGS_AUDIO, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer36; bSizer36 = new wxBoxSizer( wxVERTICAL ); @@ -639,7 +657,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con fgSizer11->Add( auxAudioDeviceList4, 0, wxALL, 2 ); - bSizer36->Add( fgSizer11, 1, wxEXPAND, 5 ); + bSizer36->Add( fgSizer11, 0, wxEXPAND, 5 ); audioPanel->SetSizer( bSizer36 ); diff --git a/obs/forms/OBSWindows.fbp b/obs/forms/OBSWindows.fbp index 9cb8b5749..bd3122d5c 100644 --- a/obs/forms/OBSWindows.fbp +++ b/obs/forms/OBSWindows.fbp @@ -2853,7 +2853,7 @@ Settings.General - 0 + 1 1 1 @@ -2946,7 +2946,7 @@ 5 wxEXPAND - 1 + 0 2 wxBOTH @@ -3135,6 +3135,99 @@ + + 5 + wxEXPAND + 0 + + 20 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 1 + wxID_ANY + Settings.RestartProgram + + 0 + + + 0 + + 1 + generalChangedText + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3227,7 +3320,7 @@ Settings.Video - 1 + 0 1 1 @@ -5338,6 +5431,99 @@ + + 5 + wxEXPAND + 0 + + 20 + protected + 0 + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 1 + wxID_ANY + Settings.RestartStream + + 0 + + + 0 + + 1 + videoChangedText + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5437,7 +5623,7 @@ 5 wxEXPAND - 1 + 0 2 wxBOTH diff --git a/obs/forms/OBSWindows.h b/obs/forms/OBSWindows.h index a96d8b748..55b80058f 100644 --- a/obs/forms/OBSWindows.h +++ b/obs/forms/OBSWindows.h @@ -196,6 +196,7 @@ class OBSBasicSettingsBase : public DialogSubclass protected: wxListbook* settingsList; wxStaticText* m_staticText27; + wxStaticText* generalChangedText; wxPanel* videoPanel; wxStaticText* m_staticText6; wxStaticText* m_staticText8; @@ -209,6 +210,7 @@ class OBSBasicSettingsBase : public DialogSubclass wxStaticText* m_staticText20; wxStaticText* m_staticText21; wxPanel* m_panel16; + wxStaticText* videoChangedText; wxPanel* audioPanel; wxStaticText* m_staticText23; wxStaticText* m_staticText24;