i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Network Preflet: Renamed CustomTextControl to RestrictedTextControl.

Browse Source 
Removed commented code.
This commit is contained in:
Stefano Ceccherini
2014-09-09 23:05:16 +02:00
parent 4613cf2600
commit 177ff99dd3
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/EthernetSettingsView.cpp
+13 -16
View File
@@ -90,9 +90,6 @@ GetDNSListFromString(BString string, BObjectList<BString>& list)
for (size_t startPos = 0; for (size_t startPos = 0;
(startPos = strcspn(string.String(), "1234567890")) (startPos = strcspn(string.String(), "1234567890"))
!= (size_t)string.Length();) { != (size_t)string.Length();) {
/*size_t startPos = strcspn(string.String(), "1234567890");
if (startPos == (size_t)string.Length())
break;*/
string.Remove(0, startPos); string.Remove(0, startPos);
size_t endPos = strcspn(string.String(), ",; "); size_t endPos = strcspn(string.String(), ",; ");
BString *dns = new BString(); BString *dns = new BString();
@@ -110,12 +107,12 @@ GetDNSListFromString(BString string, BObjectList<BString>& list)
// A TextControl which doesn't accept any charachter on creation // A TextControl which doesn't accept any charachter on creation
class CustomTextControl : public BTextControl { class RestrictedTextControl : public BTextControl {
public: public:
CustomTextControl(const char* label, RestrictedTextControl(const char* label,
const char* initialText, const char* initialText,
BMessage* message); BMessage* message);
virtual ~CustomTextControl(); virtual ~RestrictedTextControl();
void AllowChars(const char* chars); void AllowChars(const char* chars);
}; };
@@ -174,10 +171,10 @@ EthernetSettingsView::EthernetSettingsView()
layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 3); layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 3);
layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 3); layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 3);
fIPTextControl = new CustomTextControl( fIPTextControl = new RestrictedTextControl(
B_TRANSLATE("IP address:"), "", NULL); B_TRANSLATE("IP address:"), "", NULL);
SetupTextControl(fIPTextControl); SetupTextControl(fIPTextControl);
((CustomTextControl*)fIPTextControl)->AllowChars("0123456789."); ((RestrictedTextControl*)fIPTextControl)->AllowChars("0123456789.");
BLayoutItem* layoutItem = fIPTextControl->CreateTextViewLayoutItem(); BLayoutItem* layoutItem = fIPTextControl->CreateTextViewLayoutItem();
layoutItem->SetExplicitMinSize(BSize( layoutItem->SetExplicitMinSize(BSize(
@@ -187,26 +184,26 @@ EthernetSettingsView::EthernetSettingsView()
layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 4); layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 4);
layout->AddItem(layoutItem, 1, 4); layout->AddItem(layoutItem, 1, 4);
fNetMaskTextControl = new CustomTextControl( fNetMaskTextControl = new RestrictedTextControl(
B_TRANSLATE("Netmask:"), "", NULL); B_TRANSLATE("Netmask:"), "", NULL);
SetupTextControl(fNetMaskTextControl); SetupTextControl(fNetMaskTextControl);
layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 5); layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 5);
layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 5); layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 5);
((CustomTextControl*)fNetMaskTextControl)->AllowChars("0123456789."); ((RestrictedTextControl*)fNetMaskTextControl)->AllowChars("0123456789.");
fGatewayTextControl = new CustomTextControl( fGatewayTextControl = new RestrictedTextControl(
B_TRANSLATE("Gateway:"), "", NULL); B_TRANSLATE("Gateway:"), "", NULL);
SetupTextControl(fGatewayTextControl); SetupTextControl(fGatewayTextControl);
layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 6); layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 6);
layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 6); layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 6);
((CustomTextControl*)fGatewayTextControl)->AllowChars("0123456789."); ((RestrictedTextControl*)fGatewayTextControl)->AllowChars("0123456789.");
fDNSTextControl = new BTextControl( fDNSTextControl = new BTextControl(
B_TRANSLATE("DNS:"), "", NULL); B_TRANSLATE("DNS:"), "", NULL);
SetupTextControl(fDNSTextControl); SetupTextControl(fDNSTextControl);
layout->AddItem(fDNSTextControl->CreateLabelLayoutItem(), 0, 7); layout->AddItem(fDNSTextControl->CreateLabelLayoutItem(), 0, 7);
layout->AddItem(fDNSTextControl->CreateTextViewLayoutItem(), 1, 7); layout->AddItem(fDNSTextControl->CreateTextViewLayoutItem(), 1, 7);
((CustomTextControl*)fDNSTextControl)->AllowChars("0123456789.;, "); ((RestrictedTextControl*)fDNSTextControl)->AllowChars("0123456789.;, ");
fDomainTextControl = new BTextControl(B_TRANSLATE("Domain:"), "", NULL); fDomainTextControl = new BTextControl(B_TRANSLATE("Domain:"), "", NULL);
SetupTextControl(fDomainTextControl); SetupTextControl(fDomainTextControl);
@@ -770,7 +767,7 @@ EthernetSettingsView::_ValidateControl(BTextControl* control)
// IPV4AddressTextControl // IPV4AddressTextControl
CustomTextControl::CustomTextControl(const char* label, RestrictedTextControl::RestrictedTextControl(const char* label,
const char* initialText, BMessage* message) const char* initialText, BMessage* message)
: :
BTextControl(label, initialText, message) BTextControl(label, initialText, message)
@@ -783,13 +780,13 @@ CustomTextControl::CustomTextControl(const char* label,
/* virtual */ /* virtual */
CustomTextControl::~CustomTextControl() RestrictedTextControl::~RestrictedTextControl()
{ {
} }
void void
CustomTextControl::AllowChars(const char* chars) RestrictedTextControl::AllowChars(const char* chars)
{ {
int numChars = strlen(chars); int numChars = strlen(chars);
for (int i = 0; i < numChars; i++) for (int i = 0; i < numChars; i++)