Move the new network preflet at the right place.

haiku · Oct 30, 2014 · a0c8a64 · a0c8a64
1 parent 446094b
commit a0c8a64
Show file tree

Hide file tree

Showing 69 changed files with 13 additions and 1,282 deletions.
diff --git a/...ts/kits/net/preflet/DialUpAddOn/AddOn.cpp → ...preferences/network/DialUpAddOn/AddOn.cpp b/...ts/kits/net/preflet/DialUpAddOn/AddOn.cpp → ...preferences/network/DialUpAddOn/AddOn.cpp
diff --git a/...et/DialUpAddOn/ConnectionOptionsAddon.cpp → ...rk/DialUpAddOn/ConnectionOptionsAddon.cpp b/...et/DialUpAddOn/ConnectionOptionsAddon.cpp → ...rk/DialUpAddOn/ConnectionOptionsAddon.cpp
diff --git a/...flet/DialUpAddOn/ConnectionOptionsAddon.h → ...work/DialUpAddOn/ConnectionOptionsAddon.h b/...flet/DialUpAddOn/ConnectionOptionsAddon.h → ...work/DialUpAddOn/ConnectionOptionsAddon.h
diff --git a/...sts/kits/net/preflet/DialUpAddOn/DEVNOTES → src/preferences/network/DialUpAddOn/DEVNOTES b/...sts/kits/net/preflet/DialUpAddOn/DEVNOTES → src/preferences/network/DialUpAddOn/DEVNOTES
diff --git a/.../net/preflet/DialUpAddOn/DialUpAddOn.proj → ...nces/network/DialUpAddOn/DialUpAddOn.proj b/.../net/preflet/DialUpAddOn/DialUpAddOn.proj → ...nces/network/DialUpAddOn/DialUpAddOn.proj
diff --git a/...its/net/preflet/DialUpAddOn/DialUpAddon.h → ...erences/network/DialUpAddOn/DialUpAddon.h b/...its/net/preflet/DialUpAddOn/DialUpAddon.h → ...erences/network/DialUpAddOn/DialUpAddon.h
diff --git a/...preflet/DialUpAddOn/DialUpApplication.cpp → ...network/DialUpAddOn/DialUpApplication.cpp b/...preflet/DialUpAddOn/DialUpApplication.cpp → ...network/DialUpAddOn/DialUpApplication.cpp
diff --git a/...et/preflet/DialUpAddOn/DialUpPreflet.rdef → ...es/network/DialUpAddOn/DialUpPreflet.rdef b/...et/preflet/DialUpAddOn/DialUpPreflet.rdef → ...es/network/DialUpAddOn/DialUpPreflet.rdef
diff --git a/...ts/net/preflet/DialUpAddOn/DialUpView.cpp → ...rences/network/DialUpAddOn/DialUpView.cpp b/...ts/net/preflet/DialUpAddOn/DialUpView.cpp → ...rences/network/DialUpAddOn/DialUpView.cpp
diff --git a/...kits/net/preflet/DialUpAddOn/DialUpView.h → ...ferences/network/DialUpAddOn/DialUpView.h b/...kits/net/preflet/DialUpAddOn/DialUpView.h → ...ferences/network/DialUpAddOn/DialUpView.h
diff --git a/.../net/preflet/DialUpAddOn/GeneralAddon.cpp → ...nces/network/DialUpAddOn/GeneralAddon.cpp b/.../net/preflet/DialUpAddOn/GeneralAddon.cpp → ...nces/network/DialUpAddOn/GeneralAddon.cpp
diff --git a/...ts/net/preflet/DialUpAddOn/GeneralAddon.h → ...rences/network/DialUpAddOn/GeneralAddon.h b/...ts/net/preflet/DialUpAddOn/GeneralAddon.h → ...rences/network/DialUpAddOn/GeneralAddon.h
diff --git a/...its/net/preflet/DialUpAddOn/IPCPAddon.cpp → ...erences/network/DialUpAddOn/IPCPAddon.cpp b/...its/net/preflet/DialUpAddOn/IPCPAddon.cpp → ...erences/network/DialUpAddOn/IPCPAddon.cpp
diff --git a/.../kits/net/preflet/DialUpAddOn/IPCPAddon.h → ...eferences/network/DialUpAddOn/IPCPAddon.h b/.../kits/net/preflet/DialUpAddOn/IPCPAddon.h → ...eferences/network/DialUpAddOn/IPCPAddon.h
diff --git a/...et/preflet/DialUpAddOn/InterfaceUtils.cpp → ...es/network/DialUpAddOn/InterfaceUtils.cpp b/...et/preflet/DialUpAddOn/InterfaceUtils.cpp → ...es/network/DialUpAddOn/InterfaceUtils.cpp
diff --git a/.../net/preflet/DialUpAddOn/InterfaceUtils.h → ...nces/network/DialUpAddOn/InterfaceUtils.h b/.../net/preflet/DialUpAddOn/InterfaceUtils.h → ...nces/network/DialUpAddOn/InterfaceUtils.h
diff --git a/...ests/kits/net/preflet/DialUpAddOn/Jamfile → src/preferences/network/DialUpAddOn/Jamfile b/...ests/kits/net/preflet/DialUpAddOn/Jamfile → src/preferences/network/DialUpAddOn/Jamfile
diff --git a/...ialUpAddOn/MessageDriverSettingsUtils.cpp → ...ialUpAddOn/MessageDriverSettingsUtils.cpp b/...ialUpAddOn/MessageDriverSettingsUtils.cpp → ...ialUpAddOn/MessageDriverSettingsUtils.cpp
diff --git a/.../DialUpAddOn/MessageDriverSettingsUtils.h → .../DialUpAddOn/MessageDriverSettingsUtils.h b/.../DialUpAddOn/MessageDriverSettingsUtils.h → .../DialUpAddOn/MessageDriverSettingsUtils.h
diff --git a/...ts/net/preflet/DialUpAddOn/PPPoEAddon.cpp → ...rences/network/DialUpAddOn/PPPoEAddon.cpp b/...ts/net/preflet/DialUpAddOn/PPPoEAddon.cpp → ...rences/network/DialUpAddOn/PPPoEAddon.cpp
diff --git a/...kits/net/preflet/DialUpAddOn/PPPoEAddon.h → ...ferences/network/DialUpAddOn/PPPoEAddon.h b/...kits/net/preflet/DialUpAddOn/PPPoEAddon.h → ...ferences/network/DialUpAddOn/PPPoEAddon.h
diff --git a/src/tests/kits/net/preflet/DialUpAddOn/TODO → src/preferences/network/DialUpAddOn/TODO b/src/tests/kits/net/preflet/DialUpAddOn/TODO → src/preferences/network/DialUpAddOn/TODO
diff --git a/...preflet/DialUpAddOn/TextRequestDialog.cpp → ...network/DialUpAddOn/TextRequestDialog.cpp b/...preflet/DialUpAddOn/TextRequestDialog.cpp → ...network/DialUpAddOn/TextRequestDialog.cpp
diff --git a/...t/preflet/DialUpAddOn/TextRequestDialog.h → ...s/network/DialUpAddOn/TextRequestDialog.h b/...t/preflet/DialUpAddOn/TextRequestDialog.h → ...s/network/DialUpAddOn/TextRequestDialog.h
diff --git a/...et/preflet/DialUpAddOn/posix/net/if_arp.h → ...es/network/DialUpAddOn/posix/net/if_arp.h b/...et/preflet/DialUpAddOn/posix/net/if_arp.h → ...es/network/DialUpAddOn/posix/net/if_arp.h
diff --git a/...flet/DialUpAddOn/posix/netinet/if_ether.h → ...work/DialUpAddOn/posix/netinet/if_ether.h b/...flet/DialUpAddOn/posix/netinet/if_ether.h → ...work/DialUpAddOn/posix/netinet/if_ether.h
diff --git a/...its/net/preflet/DummyAddOn/DummyAddOn.cpp → ...erences/network/DummyAddOn/DummyAddOn.cpp b/...its/net/preflet/DummyAddOn/DummyAddOn.cpp → ...erences/network/DummyAddOn/DummyAddOn.cpp
diff --git a/...tests/kits/net/preflet/DummyAddOn/Jamfile → src/preferences/network/DummyAddOn/Jamfile b/...tests/kits/net/preflet/DummyAddOn/Jamfile → src/preferences/network/DummyAddOn/Jamfile
diff --git a/src/preferences/network/EthernetSettingsView.cpp b/src/preferences/network/EthernetSettingsView.cpp
diff --git a/src/preferences/network/EthernetSettingsView.h b/src/preferences/network/EthernetSettingsView.h
diff --git a/.../InterfacesAddOn/InterfaceAddressView.cpp → .../InterfacesAddOn/InterfaceAddressView.cpp b/.../InterfacesAddOn/InterfaceAddressView.cpp → .../InterfacesAddOn/InterfaceAddressView.cpp
diff --git a/...et/InterfacesAddOn/InterfaceAddressView.h → ...rk/InterfacesAddOn/InterfaceAddressView.h b/...et/InterfacesAddOn/InterfaceAddressView.h → ...rk/InterfacesAddOn/InterfaceAddressView.h
diff --git a/...InterfacesAddOn/InterfaceHardwareView.cpp → ...InterfacesAddOn/InterfaceHardwareView.cpp b/...InterfacesAddOn/InterfaceHardwareView.cpp → ...InterfacesAddOn/InterfaceHardwareView.cpp
diff --git a/...t/InterfacesAddOn/InterfaceHardwareView.h → ...k/InterfacesAddOn/InterfaceHardwareView.h b/...t/InterfacesAddOn/InterfaceHardwareView.h → ...k/InterfacesAddOn/InterfaceHardwareView.h
diff --git a/...preflet/InterfacesAddOn/InterfaceView.cpp → ...network/InterfacesAddOn/InterfaceView.cpp b/...preflet/InterfacesAddOn/InterfaceView.cpp → ...network/InterfacesAddOn/InterfaceView.cpp
diff --git a/...t/preflet/InterfacesAddOn/InterfaceView.h → ...s/network/InterfacesAddOn/InterfaceView.h b/...t/preflet/InterfacesAddOn/InterfaceView.h → ...s/network/InterfacesAddOn/InterfaceView.h
diff --git a/...eflet/InterfacesAddOn/InterfacesAddOn.cpp → ...twork/InterfacesAddOn/InterfacesAddOn.cpp b/...eflet/InterfacesAddOn/InterfacesAddOn.cpp → ...twork/InterfacesAddOn/InterfacesAddOn.cpp
diff --git a/...preflet/InterfacesAddOn/InterfacesAddOn.h → ...network/InterfacesAddOn/InterfacesAddOn.h b/...preflet/InterfacesAddOn/InterfacesAddOn.h → ...network/InterfacesAddOn/InterfacesAddOn.h
diff --git a/...flet/InterfacesAddOn/InterfacesIcons.rdef → ...work/InterfacesAddOn/InterfacesIcons.rdef b/...flet/InterfacesAddOn/InterfacesIcons.rdef → ...work/InterfacesAddOn/InterfacesIcons.rdef
diff --git a/...et/InterfacesAddOn/InterfacesListView.cpp → ...rk/InterfacesAddOn/InterfacesListView.cpp b/...et/InterfacesAddOn/InterfacesListView.cpp → ...rk/InterfacesAddOn/InterfacesListView.cpp
diff --git a/...flet/InterfacesAddOn/InterfacesListView.h → ...work/InterfacesAddOn/InterfacesListView.h b/...flet/InterfacesAddOn/InterfacesListView.h → ...work/InterfacesAddOn/InterfacesListView.h
diff --git a/.../kits/net/preflet/InterfacesAddOn/Jamfile → ...eferences/network/InterfacesAddOn/Jamfile b/.../kits/net/preflet/InterfacesAddOn/Jamfile → ...eferences/network/InterfacesAddOn/Jamfile
diff --git a/...eflet/InterfacesAddOn/NetworkSettings.cpp → ...twork/InterfacesAddOn/NetworkSettings.cpp b/...eflet/InterfacesAddOn/NetworkSettings.cpp → ...twork/InterfacesAddOn/NetworkSettings.cpp
diff --git a/...preflet/InterfacesAddOn/NetworkSettings.h → ...network/InterfacesAddOn/NetworkSettings.h b/...preflet/InterfacesAddOn/NetworkSettings.h → ...network/InterfacesAddOn/NetworkSettings.h
diff --git a/...t/preflet/InterfacesAddOn/StatusAddOn.cpp → ...s/network/InterfacesAddOn/StatusAddOn.cpp b/...t/preflet/InterfacesAddOn/StatusAddOn.cpp → ...s/network/InterfacesAddOn/StatusAddOn.cpp
diff --git a/src/preferences/network/Jamfile b/src/preferences/network/Jamfile
@@ -1,26 +1,22 @@
-SubDir HAIKU_TOP src preferences network ;
+SubDir HAIKU_TOP src tests kits net preflet ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ;
 
-UsePrivateHeaders net shared ;
-
-Preference Network :
-	NetworkApp.cpp
-	NetworkWindow.cpp
-	EthernetSettingsView.cpp
-	Settings.cpp
+Preference NetworkSetup :
+	NetworkSetup.cpp
+	NetworkSetupWindow.cpp
+	NetworkSetupProfile.cpp
+	NetworkSetupAddOn.cpp
 
 	# from NetworkStatus
 	RadioView.cpp
 	WirelessNetworkMenuItem.cpp
 
-	: be $(HAIKU_NETWORK_LIBS) [ TargetLibstdc++ ] [ TargetLibsupc++ ]
-		localestub libbnetapi.so
-	: Network.rdef
+	: be root [ TargetLibstdc++ ] localestub
+	: NetworkSetup.rdef
 ;
 
-DoCatalogs Network :
-	x-vnd.Haiku-Network
-	:
-	EthernetSettingsView.cpp
-	NetworkWindow.cpp
-;
+SubInclude HAIKU_TOP src tests kits net preflet InterfacesAddOn ;
+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/...s/kits/net/preflet/MultipleAddOns/Jamfile → ...references/network/MultipleAddOns/Jamfile b/...s/kits/net/preflet/MultipleAddOns/Jamfile → ...references/network/MultipleAddOns/Jamfile
diff --git a/.../preflet/MultipleAddOns/MultipleAddOn.cpp → .../network/MultipleAddOns/MultipleAddOn.cpp b/.../preflet/MultipleAddOns/MultipleAddOn.cpp → .../network/MultipleAddOns/MultipleAddOn.cpp
diff --git a/src/preferences/network/Network.rdef b/src/preferences/network/Network.rdef
diff --git a/src/preferences/network/NetworkApp.cpp b/src/preferences/network/NetworkApp.cpp
diff --git a/src/preferences/network/NetworkApp.h b/src/preferences/network/NetworkApp.h
diff --git a/src/tests/kits/net/preflet/NetworkSetup.cpp → src/preferences/network/NetworkSetup.cpp b/src/tests/kits/net/preflet/NetworkSetup.cpp → src/preferences/network/NetworkSetup.cpp
diff --git a/src/tests/kits/net/preflet/NetworkSetup.rdef → src/preferences/network/NetworkSetup.rdef b/src/tests/kits/net/preflet/NetworkSetup.rdef → src/preferences/network/NetworkSetup.rdef
diff --git a/...ts/kits/net/preflet/NetworkSetupAddOn.cpp → ...preferences/network/NetworkSetupAddOn.cpp b/...ts/kits/net/preflet/NetworkSetupAddOn.cpp → ...preferences/network/NetworkSetupAddOn.cpp
diff --git a/...ests/kits/net/preflet/NetworkSetupAddOn.h → src/preferences/network/NetworkSetupAddOn.h b/...ests/kits/net/preflet/NetworkSetupAddOn.h → src/preferences/network/NetworkSetupAddOn.h
diff --git a/.../kits/net/preflet/NetworkSetupProfile.cpp → ...eferences/network/NetworkSetupProfile.cpp b/.../kits/net/preflet/NetworkSetupProfile.cpp → ...eferences/network/NetworkSetupProfile.cpp
diff --git a/...ts/kits/net/preflet/NetworkSetupProfile.h → ...preferences/network/NetworkSetupProfile.h b/...ts/kits/net/preflet/NetworkSetupProfile.h → ...preferences/network/NetworkSetupProfile.h
diff --git a/...s/kits/net/preflet/NetworkSetupWindow.cpp → ...references/network/NetworkSetupWindow.cpp b/...s/kits/net/preflet/NetworkSetupWindow.cpp → ...references/network/NetworkSetupWindow.cpp
diff --git a/...sts/kits/net/preflet/NetworkSetupWindow.h → src/preferences/network/NetworkSetupWindow.h b/...sts/kits/net/preflet/NetworkSetupWindow.h → src/preferences/network/NetworkSetupWindow.h
diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp
diff --git a/src/preferences/network/NetworkWindow.h b/src/preferences/network/NetworkWindow.h
diff --git a/...preflet/ServicesAddOn/DNSSettingsView.cpp → ...network/ServicesAddOn/DNSSettingsView.cpp b/...preflet/ServicesAddOn/DNSSettingsView.cpp → ...network/ServicesAddOn/DNSSettingsView.cpp
diff --git a/...t/preflet/ServicesAddOn/DNSSettingsView.h → ...s/network/ServicesAddOn/DNSSettingsView.h b/...t/preflet/ServicesAddOn/DNSSettingsView.h → ...s/network/ServicesAddOn/DNSSettingsView.h
diff --git a/...ts/kits/net/preflet/ServicesAddOn/Jamfile → ...preferences/network/ServicesAddOn/Jamfile b/...ts/kits/net/preflet/ServicesAddOn/Jamfile → ...preferences/network/ServicesAddOn/Jamfile
diff --git a/...t/preflet/ServicesAddOn/ServicesAddOn.cpp → ...s/network/ServicesAddOn/ServicesAddOn.cpp b/...t/preflet/ServicesAddOn/ServicesAddOn.cpp → ...s/network/ServicesAddOn/ServicesAddOn.cpp
diff --git a/...net/preflet/ServicesAddOn/ServicesAddOn.h → ...ces/network/ServicesAddOn/ServicesAddOn.h b/...net/preflet/ServicesAddOn/ServicesAddOn.h → ...ces/network/ServicesAddOn/ServicesAddOn.h