From 4c21779c3589f5cd592ea92a8327b3e035a0402c Mon Sep 17 00:00:00 2001 From: upstream svn Date: Fri, 7 Oct 2011 22:47:56 +0000 Subject: [PATCH] Added proper events and handling for enabling/disabling UPnP UI sub-items --- .svn-revision | 2 +- src/PrefsUnifiedDlg.cpp | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.svn-revision b/.svn-revision index 45ff58ec..6e844a98 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10631 +10632 diff --git a/src/PrefsUnifiedDlg.cpp b/src/PrefsUnifiedDlg.cpp index 33abcf9f..8c88c45f 100644 --- a/src/PrefsUnifiedDlg.cpp +++ b/src/PrefsUnifiedDlg.cpp @@ -91,6 +91,9 @@ BEGIN_EVENT_TABLE(PrefsUnifiedDlg,wxDialog) EVT_CHECKBOX(IDC_SHOWRATEONTITLE, PrefsUnifiedDlg::OnCheckBoxChange) EVT_CHECKBOX(IDC_NETWORKED2K, PrefsUnifiedDlg::OnCheckBoxChange) EVT_CHECKBOX(IDC_NETWORKKAD, PrefsUnifiedDlg::OnCheckBoxChange) + EVT_CHECKBOX(IDC_UPNP_ENABLED, PrefsUnifiedDlg::OnCheckBoxChange) + EVT_CHECKBOX(IDC_UPNP_WEBSERVER_ENABLED,PrefsUnifiedDlg::OnCheckBoxChange) + EVT_BUTTON(ID_PREFS_OK_TOP, PrefsUnifiedDlg::OnOk) EVT_BUTTON(ID_PREFS_CANCEL_TOP, PrefsUnifiedDlg::OnCancel) @@ -495,6 +498,11 @@ bool PrefsUnifiedDlg::TransferToWindow() thePrefs::SetUPnPWebServerEnabled(false); FindWindow(IDC_UPNP_EC_ENABLED)->Enable(false); thePrefs::SetUPnPECEnabled(false); +#else + FindWindow(IDC_UPNPTCPPORT)->Enable(thePrefs::GetUPnPEnabled()); + FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPEnabled()); + FindWindow(IDC_WEBUPNPTCPPORT)->Enable(thePrefs::GetUPnPWebServerEnabled()); + FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPWebServerEnabled()); #endif #ifdef __DEBUG__ @@ -785,6 +793,16 @@ void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event) FindWindow( IDC_UDPPORT )->Enable(value); break; + case IDC_UPNP_ENABLED: + FindWindow(IDC_UPNPTCPPORT)->Enable(value); + FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(value); + break; + + case IDC_UPNP_WEBSERVER_ENABLED: + FindWindow(IDC_WEBUPNPTCPPORT)->Enable(value); + FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(value); + break; + case IDC_NETWORKKAD: { wxCheckBox * udpPort = (wxCheckBox *) FindWindow(IDC_UDPENABLE); if (value) { -- 2.11.4.GIT