提交 02c32f9c 编写于 作者: J jp9000

update form data, made it so that that the warning messages display by default...

update form data, made it so that that the warning messages display by default because their position seems to go out of whack if they're hidden by default
上级 8dea4d60
......@@ -442,11 +442,9 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
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 );
generalText = new wxStaticText( generalPanel, wxID_ANY, _("Settings.RestartProgram"), wxDefaultPosition, wxDefaultSize, 0 );
generalText->Wrap( -1 );
bSizer32->Add( generalText, 1, wxALL|wxEXPAND, 5 );
generalPanel->SetSizer( bSizer32 );
......@@ -698,6 +696,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
this->Centre( wxBOTH );
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OBSBasicSettingsBase::OnClose ) );
settingsList->Connect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxListbookEventHandler( OBSBasicSettingsBase::PageChanged ), NULL, this );
settingsList->Connect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxListbookEventHandler( OBSBasicSettingsBase::PageChanging ), NULL, this );
}
......@@ -705,6 +704,7 @@ OBSBasicSettingsBase::OBSBasicSettingsBase( wxWindow* parent, wxWindowID id, con
OBSBasicSettingsBase::~OBSBasicSettingsBase()
{
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( OBSBasicSettingsBase::OnClose ) );
settingsList->Disconnect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxListbookEventHandler( OBSBasicSettingsBase::PageChanged ), NULL, this );
settingsList->Disconnect( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, wxListbookEventHandler( OBSBasicSettingsBase::PageChanging ), NULL, this );
......
......@@ -2727,7 +2727,7 @@
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose"></event>
<event name="OnClose">OnClose</event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnHibernate"></event>
......@@ -3175,7 +3175,7 @@
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">1</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Settings.RestartProgram</property>
<property name="max_size"></property>
......@@ -3185,11 +3185,11 @@
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">generalChangedText</property>
<property name="name">generalText</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
......
......@@ -196,7 +196,6 @@ class OBSBasicSettingsBase : public DialogSubclass
protected:
wxListbook* settingsList;
wxStaticText* m_staticText27;
wxStaticText* generalChangedText;
wxPanel* videoPanel;
wxStaticText* m_staticText6;
wxStaticText* m_staticText8;
......@@ -222,6 +221,7 @@ class OBSBasicSettingsBase : public DialogSubclass
wxButton* applyButton;
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void PageChanged( wxListbookEvent& event ) { event.Skip(); }
virtual void PageChanging( wxListbookEvent& event ) { event.Skip(); }
......@@ -229,6 +229,7 @@ class OBSBasicSettingsBase : public DialogSubclass
public:
wxPanel* generalPanel;
wxComboBox* languageList;
wxStaticText* generalText;
wxPanel* outputsPanel;
wxComboBox* videoAdapterList;
wxComboBox* baseResList;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册