diff --git a/src/tests/kits/net/preflet/DialUpAddOn/Jamfile b/src/tests/kits/net/preflet/DialUpAddOn/Jamfile index 111b2562b7..f09486826a 100644 --- a/src/tests/kits/net/preflet/DialUpAddOn/Jamfile +++ b/src/tests/kits/net/preflet/DialUpAddOn/Jamfile @@ -1,4 +1,4 @@ -SubDir OBOS_TOP src tests kits net preflet DialUpAddOn ; +SubDir HAIKU_TOP src tests kits net preflet DialUpAddOn ; # set some additional defines { @@ -15,18 +15,18 @@ SubDir OBOS_TOP src tests kits net preflet DialUpAddOn ; UsePrivateHeaders net ; # For NetworkSetupAddOn.h, to be moved to private once... -UseHeaders [ FDirName $(OBOS_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libppp headers ] ; -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libppp headers ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ; # additonal headers for built-in add-ons: -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pppoe ] ; # PPPoE -UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp ipcp ] ; # IPCP +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp pppoe ] ; # PPPoE +UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp ipcp ] ; # IPCP AddResources DialUp : DialUpPreflet.rdef ; -Addon DialUp : network_setup : +Addon DialUp : AddOn.cpp DialUpView.cpp diff --git a/src/tests/kits/net/preflet/DummyAddOn/AddOn.proj b/src/tests/kits/net/preflet/DummyAddOn/AddOn.proj deleted file mode 100644 index 712dd14080..0000000000 Binary files a/src/tests/kits/net/preflet/DummyAddOn/AddOn.proj and /dev/null differ diff --git a/src/tests/kits/net/preflet/DummyAddOn/_APP_ b/src/tests/kits/net/preflet/DummyAddOn/_APP_ deleted file mode 120000 index ce9b514ed2..0000000000 --- a/src/tests/kits/net/preflet/DummyAddOn/_APP_ +++ /dev/null @@ -1 +0,0 @@ -../NetworkSetup \ No newline at end of file diff --git a/src/tests/kits/net/preflet/Jamfile b/src/tests/kits/net/preflet/Jamfile index 11579a8008..a1a5f60940 100644 --- a/src/tests/kits/net/preflet/Jamfile +++ b/src/tests/kits/net/preflet/Jamfile @@ -1,26 +1,15 @@ SubDir HAIKU_TOP src tests kits net preflet ; -SimpleTest Network_Setup : +SimpleTest NetworkSetup : NetworkSetup.cpp NetworkSetupWindow.cpp NetworkSetupProfile.cpp NetworkSetupAddOn.cpp - : be root + : be root $(TARGET_LIBSTDC++) ; -{ - # symlink the userland add-ons dir to the dir where the net_stack_tester lives - local dir = [ on Network\_Setup return $(LOCATE) ] ; - MakeLocate network_setup : $(HAIKU_ADDON_DIR) ; - MakeLocate add-ons : $(dir) ; - RelSymLink add-ons : network_setup : false ; - - # alias for the stack_tester the modules link against - LOCATE on Network_Setup = $(dir) ; - Depends Network_Setup : Network_Setup ; -} - - -# SubInclude HAIKU_TOP src tests kits net preflet StatusAddOn ; -# SubInclude HAIKU_TOP src tests kits net preflet ServicesAddOn ; +SubInclude HAIKU_TOP src tests kits net preflet StatusAddOn ; +SubInclude HAIKU_TOP src tests kits net preflet ServicesAddOn ; +SubInclude HAIKU_TOP src tests kits net preflet DummyAddOn ; +SubInclude HAIKU_TOP src tests kits net preflet MultipleAddOns ; # SubInclude HAIKU_TOP src tests kits net preflet DialUpAddOn ; diff --git a/src/tests/kits/net/preflet/MultipleAddOns/MultipleAddOn.proj b/src/tests/kits/net/preflet/MultipleAddOns/MultipleAddOn.proj deleted file mode 100644 index 48c697da74..0000000000 Binary files a/src/tests/kits/net/preflet/MultipleAddOns/MultipleAddOn.proj and /dev/null differ diff --git a/src/tests/kits/net/preflet/MultipleAddOns/_APP_ b/src/tests/kits/net/preflet/MultipleAddOns/_APP_ deleted file mode 120000 index ce9b514ed2..0000000000 --- a/src/tests/kits/net/preflet/MultipleAddOns/_APP_ +++ /dev/null @@ -1 +0,0 @@ -../NetworkSetup \ No newline at end of file diff --git a/src/tests/kits/net/preflet/NetworkSetup.proj b/src/tests/kits/net/preflet/NetworkSetup.proj deleted file mode 100644 index 43518494df..0000000000 Binary files a/src/tests/kits/net/preflet/NetworkSetup.proj and /dev/null differ diff --git a/src/tests/kits/net/preflet/ServicesAddOn/AddOn.proj b/src/tests/kits/net/preflet/ServicesAddOn/AddOn.proj deleted file mode 100644 index 70162cd9a1..0000000000 Binary files a/src/tests/kits/net/preflet/ServicesAddOn/AddOn.proj and /dev/null differ diff --git a/src/tests/kits/net/preflet/ServicesAddOn/Jamfile b/src/tests/kits/net/preflet/ServicesAddOn/Jamfile index 148f1060bd..593ea2d52a 100644 --- a/src/tests/kits/net/preflet/ServicesAddOn/Jamfile +++ b/src/tests/kits/net/preflet/ServicesAddOn/Jamfile @@ -2,9 +2,8 @@ SubDir HAIKU_TOP src tests kits net preflet ServicesAddOn ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; -Addon Services : network_setup : +Addon Services : ServicesAddOn.cpp + : be NetworkSetup $(TARGET_LIBSTDC++) # $(HAIKU_NETWORK_LIBS) ; -LinkSharedOSLibs Services : Network_Setup be ; - diff --git a/src/tests/kits/net/preflet/ServicesAddOn/_APP_ b/src/tests/kits/net/preflet/ServicesAddOn/_APP_ deleted file mode 120000 index ce9b514ed2..0000000000 --- a/src/tests/kits/net/preflet/ServicesAddOn/_APP_ +++ /dev/null @@ -1 +0,0 @@ -../NetworkSetup \ No newline at end of file diff --git a/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp b/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp index 097f371690..748353942b 100644 --- a/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp +++ b/src/tests/kits/net/preflet/StatusAddOn/InterfaceStatusItem.cpp @@ -115,7 +115,7 @@ InterfaceStatusItem::DrawItem(BView* owner, BRect /*bounds*/, bool complete) if (fSetting->GetAutoConfigure()) owner->DrawString("DHCP enabled", commentPt); else - owner->DrawString("DHCP Disabled, use static IP adress", commentPt); + owner->DrawString("DHCP disabled, use static IP adress", commentPt); } else diff --git a/src/tests/kits/net/preflet/StatusAddOn/Jamfile b/src/tests/kits/net/preflet/StatusAddOn/Jamfile index ec951988d6..682d2e5487 100644 --- a/src/tests/kits/net/preflet/StatusAddOn/Jamfile +++ b/src/tests/kits/net/preflet/StatusAddOn/Jamfile @@ -1,11 +1,18 @@ SubDir HAIKU_TOP src tests kits net preflet StatusAddOn ; UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ; +UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; -Addon Overview : network_setup : +UsePrivateHeaders shared ; + +Addon Overview : NetworkStatusAddOn.cpp + InterfaceStatusItem.cpp + Setting.cpp + NetworkWindow.cpp + EthernetSettingsView.cpp + + : be NetworkSetup $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSTDC++) ; -LinkSharedOSLibs Overview : be ; AddResources Overview : Resource.rsrc ; - diff --git a/src/tests/kits/net/preflet/StatusAddOn/NetworkStatusAddOn.cpp b/src/tests/kits/net/preflet/StatusAddOn/NetworkStatusAddOn.cpp index 7e32ea7563..02e05a70e6 100644 --- a/src/tests/kits/net/preflet/StatusAddOn/NetworkStatusAddOn.cpp +++ b/src/tests/kits/net/preflet/StatusAddOn/NetworkStatusAddOn.cpp @@ -159,6 +159,7 @@ NetworkStatusAddOn::MessageReceived(BMessage* msg) break; item->SetEnabled(!item->Enabled()); + fOnOff->SetLabel(item->Enabled() ? "Disable" : "Enable"); fListview->Invalidate(); break; diff --git a/src/tests/kits/net/preflet/StatusAddOn/StatusAddOn.proj b/src/tests/kits/net/preflet/StatusAddOn/StatusAddOn.proj deleted file mode 100644 index e8617dcc55..0000000000 Binary files a/src/tests/kits/net/preflet/StatusAddOn/StatusAddOn.proj and /dev/null differ diff --git a/src/tests/kits/net/preflet/StatusAddOn/macosx-networkstatus.jpg b/src/tests/kits/net/preflet/StatusAddOn/macosx-networkstatus.jpg deleted file mode 100644 index 346e25ebb6..0000000000 Binary files a/src/tests/kits/net/preflet/StatusAddOn/macosx-networkstatus.jpg and /dev/null differ diff --git a/src/tests/kits/net/preflet/add-ons/Dummy b/src/tests/kits/net/preflet/add-ons/Dummy deleted file mode 120000 index 0e215a49dc..0000000000 --- a/src/tests/kits/net/preflet/add-ons/Dummy +++ /dev/null @@ -1 +0,0 @@ -/HAIKU_DATA/work/haiku/src/tests/kits/net/preflet/DummyAddOn/Dummy \ No newline at end of file diff --git a/src/tests/kits/net/preflet/add-ons/Multiple b/src/tests/kits/net/preflet/add-ons/Multiple deleted file mode 120000 index d6fdae9343..0000000000 --- a/src/tests/kits/net/preflet/add-ons/Multiple +++ /dev/null @@ -1 +0,0 @@ -/HAIKU_DATA/work/haiku/src/tests/kits/net/preflet/MultipleAddOns/Multiple \ No newline at end of file diff --git a/src/tests/kits/net/preflet/add-ons/Overview b/src/tests/kits/net/preflet/add-ons/Overview deleted file mode 120000 index 85417f9cc0..0000000000 --- a/src/tests/kits/net/preflet/add-ons/Overview +++ /dev/null @@ -1 +0,0 @@ -../StatusAddOn/Overview \ No newline at end of file diff --git a/src/tests/kits/net/preflet/add-ons/Services b/src/tests/kits/net/preflet/add-ons/Services deleted file mode 120000 index bd1709d0bc..0000000000 --- a/src/tests/kits/net/preflet/add-ons/Services +++ /dev/null @@ -1 +0,0 @@ -../ServicesAddOn/Services \ No newline at end of file diff --git a/src/tests/kits/net/preflet/configure menu.gif b/src/tests/kits/net/preflet/configure menu.gif deleted file mode 100644 index 787e061eca..0000000000 Binary files a/src/tests/kits/net/preflet/configure menu.gif and /dev/null differ