From 1d9a705ed43189b05d1e11da35658c85ec077334 Mon Sep 17 00:00:00 2001
From: Stefano Ceccherini <stefano.ceccherini@gmail.com>
Date: Wed, 20 Feb 2008 10:37:11 +0000
Subject: [PATCH] Disable the apply button when settings have been...er..
 applied. Do some enabling/disabling of the revert button too. Initialize
 Settings::fAuto to a default value on construction.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24032 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../network/EthernetSettingsView.cpp          | 30 +++++++++++++++++++
 .../network/EthernetSettingsView.h            |  2 ++
 src/preferences/network/settings.cpp          |  2 ++
 3 files changed, 34 insertions(+)

diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp
index 880073e346..88f3e009fc 100644
--- a/src/preferences/network/EthernetSettingsView.cpp
+++ b/src/preferences/network/EthernetSettingsView.cpp
@@ -56,6 +56,16 @@
 #include "AutoDeleter.h"
 
 
+static void
+SetupTextControl(BTextControl *control)
+{
+	// TODO: Disallow characters, etc.
+	// Would be nice to have a real
+	// formatted input control
+	control->SetModificationMessage(new BMessage(kMsgChange));
+}
+
+
 bool
 EthernetSettingsView::_PrepareRequest(struct ifreq& request, const char* name)
 {
@@ -116,6 +126,11 @@ EthernetSettingsView::AttachedToWindow()
 {
 	fApplyButton->SetTarget(this);
 	fRevertButton->SetTarget(this);
+	fIPTextControl->SetTarget(this);
+	fNetMaskTextControl->SetTarget(this);
+	fGatewayTextControl->SetTarget(this);
+	fPrimaryDNSTextControl->SetTarget(this);
+	fSecondaryDNSTextControl->SetTarget(this);
 	fDeviceMenuField->Menu()->SetTargetForItems(this); 
 	fTypeMenuField->Menu()->SetTargetForItems(this); 
 	
@@ -175,11 +190,13 @@ EthernetSettingsView::EthernetSettingsView(BRect frame)
 	fIPTextControl = new BTextControl(frame, "ip", "IP Address:", "", NULL);
 	fIPTextControl->MoveTo(fTypeMenuField->Frame().LeftBottom() + spacing);
 	fIPTextControl->ResizeToPreferred();
+	SetupTextControl(fIPTextControl);
 	AddChild(fIPTextControl);
 
 	fNetMaskTextControl = new BTextControl(frame, "mask", "Netmask:", "", NULL);
 	fNetMaskTextControl->MoveTo(
 		fIPTextControl->Frame().LeftBottom() + spacing);
+	SetupTextControl(fNetMaskTextControl);
 	AddChild(fNetMaskTextControl);
 	fNetMaskTextControl->ResizeToPreferred();
 
@@ -187,6 +204,7 @@ EthernetSettingsView::EthernetSettingsView(BRect frame)
 		NULL);
 	fGatewayTextControl->MoveTo(
 		fNetMaskTextControl->Frame().LeftBottom() + spacing);
+	SetupTextControl(fGatewayTextControl);
 	AddChild(fGatewayTextControl);
 	fGatewayTextControl->ResizeToPreferred();
 	
@@ -194,6 +212,7 @@ EthernetSettingsView::EthernetSettingsView(BRect frame)
 		NULL);
 	fPrimaryDNSTextControl->MoveTo(
 		fGatewayTextControl->Frame().LeftBottom() + spacing);
+	SetupTextControl(fPrimaryDNSTextControl);
 	AddChild(fPrimaryDNSTextControl);
 	fPrimaryDNSTextControl->ResizeToPreferred();
 	
@@ -201,6 +220,7 @@ EthernetSettingsView::EthernetSettingsView(BRect frame)
 		NULL);
 	fSecondaryDNSTextControl->MoveTo(
 		fPrimaryDNSTextControl->Frame().LeftBottom() + spacing);
+	SetupTextControl(fSecondaryDNSTextControl);
 	AddChild(fSecondaryDNSTextControl);
 	fSecondaryDNSTextControl->ResizeToPreferred();
 
@@ -209,6 +229,7 @@ EthernetSettingsView::EthernetSettingsView(BRect frame)
 	fRevertButton->ResizeToPreferred();
 	fRevertButton->MoveTo(
 		fSecondaryDNSTextControl->Frame().LeftBottom() + spacing);
+	fRevertButton->SetEnabled(false);
 	AddChild(fRevertButton);
 
 	fApplyButton = new BButton(frame, "apply", "Apply", new BMessage(kMsgApply));
@@ -330,6 +351,9 @@ EthernetSettingsView::_ApplyControlsToConfiguration()
 		fPrimaryDNSTextControl->Text()));
 	fCurrentSettings->fNameservers.AddItem(new BString(
 		fSecondaryDNSTextControl->Text()));
+	
+	fApplyButton->SetEnabled(false);
+	fRevertButton->SetEnabled(true);	
 }
 
 
@@ -437,6 +461,8 @@ EthernetSettingsView::MessageReceived(BMessage* message)
 		case kMsgMode:
 			if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked())
 				_EnableTextControls(strcmp(item->Label(), "DHCP") != 0);
+			fApplyButton->SetEnabled(true);
+			fRevertButton->SetEnabled(true);
 			break;
 		case kMsgInfo: {
 		 	const char* name;
@@ -453,10 +479,14 @@ EthernetSettingsView::MessageReceived(BMessage* message)
 		}
 		case kMsgRevert:
 			_ShowConfiguration(fCurrentSettings);
+			fRevertButton->SetEnabled(false);
 			break;
 		case kMsgApply:
 			_SaveConfiguration();
 			break;
+		case kMsgChange:
+			fApplyButton->SetEnabled(true);
+			break;
 		default:
 			BView::MessageReceived(message);
 	}
diff --git a/src/preferences/network/EthernetSettingsView.h b/src/preferences/network/EthernetSettingsView.h
index 4d58483dec..89af8bad20 100644
--- a/src/preferences/network/EthernetSettingsView.h
+++ b/src/preferences/network/EthernetSettingsView.h
@@ -28,6 +28,8 @@ static const uint32 kMsgClose = 'clse';
 static const uint32 kMsgField = 'fild';
 static const uint32 kMsgInfo = 'info';
 static const uint32 kMsgMode = 'mode';
+static const uint32	kMsgChange = 'chng';
+
 
 class EthernetSettingsView : public BView {
 	public:
diff --git a/src/preferences/network/settings.cpp b/src/preferences/network/settings.cpp
index 64b24780ee..25e77d5527 100644
--- a/src/preferences/network/settings.cpp
+++ b/src/preferences/network/settings.cpp
@@ -31,6 +31,8 @@
 #include <unistd.h>
 
 Settings::Settings(const char *name)
+	:
+	fAuto(true)
 {
 	fSocket = socket(AF_INET, SOCK_DGRAM, 0);
 	fName = name;