Additional branding updates

19 files changed, 259 insertions, 155 deletions

diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt
index 28fa0f8..ac862e2 100644
--- a/tdenetworkmanager/src/CMakeLists.txt
+++ b/tdenetworkmanager/src/CMakeLists.txt
@@ -46,7 +46,7 @@ install( FILES tdenetworkmanager_plugin.desktop tdenetworkmanager_vpnplugin.desk
 
 ##### tdenetman (tdeinit) #################
 
-tde_add_tdeinit_executable( tdenetman AUTOMOC
+tde_add_tdeinit_executable( tdenetworkmanager AUTOMOC
   SOURCES
     connection_editor.ui
     vpnauthentication.ui main.cpp tdenetman.cpp tdenetman-tray.cpp
diff --git a/tdenetworkmanager/src/configwidgets/CMakeLists.txt b/tdenetworkmanager/src/configwidgets/CMakeLists.txt
new file mode 100644
index 0000000..6233f98
--- /dev/null
+++ b/tdenetworkmanager/src/configwidgets/CMakeLists.txt
@@ -0,0 +1,63 @@
+#################################################
+#
+#  (C) 2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing (DOT) net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${DBUS_TQT_INCLUDE_DIRS}
+  ${NM_UTIL_INCLUDE_DIRS}
+)
+
+
+##### tdenetwork-connection-configwidgets ########
+
+set( target tdenetwork-connection-configwidgets )
+
+set( ${target}_SRCS
+    connection_setting_info.ui
+    connection_setting_wireless_security_wep.ui
+    connection_setting_gsm.ui
+    connection_setting_cdma.ui
+    connection_setting_ipv4.ui
+    connection_setting_ppp.ui
+    connection_setting_serial.ui
+    connection_setting_wireless_security_wpacipher.ui
+    connection_setting_wireless_security_eap.ui
+    connection_setting_wireless_security_wpapsk.ui
+    connection_setting_wireless_security_phase2.ui
+    connection_setting_wireless_security_wpaversion.ui
+    connection_setting_wireless_security.ui
+    connection_setting_wireless.ui
+    connection_setting_wireless_security_wepencryption.ui
+    connection_settings.ui
+    connection_setting_wireless_security_auth.ui
+#    connection_setting_vpn.ui
+    tdenetman-connection_setting_cdma_widget.cpp
+    tdenetman-connection_setting_gsm_widget.cpp
+    tdenetman-connection_setting_info_widget.cpp
+    tdenetman-connection_setting_ipv4_widget.cpp
+    tdenetman-connection_setting_ppp_widget.cpp
+    tdenetman-connection_setting_serial_widget.cpp
+    tdenetman-connection_setting_wireless_security_widget.cpp
+    tdenetman-connection_setting_wireless_widget.cpp
+#    tdenetman-connection_setting_vpn_widget.cpp
+    tdenetman-connection_setting_widget_interface.cpp
+    tdenetman-connection_settings_dialog.cpp
+)
+
+tde_add_library( ${target} STATIC_PIC AUTOMOC
+  SOURCES ${${target}_SRCS}
+)
diff --git a/tdenetworkmanager/src/eventsrc b/tdenetworkmanager/src/eventsrc
index 47723af..df039f5 100644
--- a/tdenetworkmanager/src/eventsrc
+++ b/tdenetworkmanager/src/eventsrc
@@ -1,6 +1,6 @@
 [!Global!]
 IconName=network
-Comment=KNetworkManager
+Comment=TDENetworkManager
 Comment[bn]=কে-নেটওয়ার্ক-ম্যানেজার
 Comment[da]=Netværkshåndtering
 Comment[sv]=Nätverkshantering
@@ -10,23 +10,23 @@ Comment=VPN Banner Notification Received
 default_presentation=0
 
 [knm-nm-sleeping]
-Name=KNetworkManager Offline
-Name[bg]=KNetworkManager - изключен от Интернет
+Name=TDENetworkManager Offline
+Name[bg]=TDENetworkManager - изключен от Интернет
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার অফলাইন
-Name[br]=Ezlinenn eo KNetworkManager
-Name[ca]=El KNetworkManager està desconnectat
-Name[cs]=KNetworkManager offline
+Name[br]=Ezlinenn eo TDENetworkManager
+Name[ca]=El TDENetworkManager està desconnectat
+Name[cs]=TDENetworkManager offline
 Name[da]=Netværkshåndtering offline
-Name[el]=Ο KNetworkManager χωρίς σύνδεση
-Name[es]=KNetworkManager desconectado
-Name[et]=KNetworkManager võrguta režiimis
-Name[it]=KNetworkManager Non in linea
-Name[ja]=KNetworkManager オフライン
-Name[pt]=KNetworkManager Desligado
-Name[sr]=KNetworkManager ван везе
-Name[sr@Latn]=KNetworkManager van veze
+Name[el]=Ο TDENetworkManager χωρίς σύνδεση
+Name[es]=TDENetworkManager desconectado
+Name[et]=TDENetworkManager võrguta režiimis
+Name[it]=TDENetworkManager Non in linea
+Name[ja]=TDENetworkManager オフライン
+Name[pt]=TDENetworkManager Desligado
+Name[sr]=TDENetworkManager ван везе
+Name[sr@Latn]=TDENetworkManager van veze
 Name[sv]=Nätverkshantering nerkopplad
-Name[tr]=KNetworkManager Çevrimdışı
+Name[tr]=TDENetworkManager Çevrimdışı
 Comment=Switched to offline mode
 Comment[bg]=Преминаване в режим "Изключен от Интернет"
 Comment[bn]=অফলাইন মোড চালু করা হয়েছে
@@ -48,25 +48,25 @@ Comment[tr]=Çevrimdışı kipe geçildi
 default_presentation=0
 
 [knm-nm-connected]
-Name=KNetworkManager Connected
-Name[bg]=KNetworkManager - свързан
+Name=TDENetworkManager Connected
+Name[bg]=TDENetworkManager - свързан
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযুক্ত
-Name[br]=Kevreet eo KNetworkManager
-Name[ca]=El KNetworkManager està connectat
-Name[cs]=KNetworkManager připojen
+Name[br]=Kevreet eo TDENetworkManager
+Name[ca]=El TDENetworkManager està connectat
+Name[cs]=TDENetworkManager připojen
 Name[da]=Netværkshåndtering forbundet
-Name[de]=KNetworkManager Verbunden
-Name[el]=Ο KNetworkManager συνδέθηκε
-Name[es]=KNetworkManager conectado
-Name[et]=KNetworkManager ühendatud
-Name[it]=KNetworkManager Connesso
-Name[ja]=KNetworkManager 接続しました
-Name[nl]=KNetworkManager Verbonden
-Name[pt]=KNetworkManager Ligado
-Name[sr]=KNetworkManager је повезан
-Name[sr@Latn]=KNetworkManager je povezan
+Name[de]=TDENetworkManager Verbunden
+Name[el]=Ο TDENetworkManager συνδέθηκε
+Name[es]=TDENetworkManager conectado
+Name[et]=TDENetworkManager ühendatud
+Name[it]=TDENetworkManager Connesso
+Name[ja]=TDENetworkManager 接続しました
+Name[nl]=TDENetworkManager Verbonden
+Name[pt]=TDENetworkManager Ligado
+Name[sr]=TDENetworkManager је повезан
+Name[sr@Latn]=TDENetworkManager je povezan
 Name[sv]=Nätverkshantering ansluten
-Name[tr]=KNetworkManager Bağlandı
+Name[tr]=TDENetworkManager Bağlandı
 Comment=NetworkManager is now connected
 Comment[bg]=NetworkManager е свързан
 Comment[bn]=এখন নেটওয়ার্ক-ম্যানেজার সংযুক্ত
@@ -88,30 +88,30 @@ Comment[tr]=NetworkManager şimdi bağlı
 default_presentation=0
 
 [knm-nm-connecting]
-Name=KNetworkManager Connecting
-Name[bg]=KNetworkManager се свързва
+Name=TDENetworkManager Connecting
+Name[bg]=TDENetworkManager се свързва
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযোগ স্থাপন করছে
-Name[ca]=El KNetworkManager s'està connectant
+Name[ca]=El TDENetworkManager s'està connectant
 Name[da]=Netværkshåndtering forbinder
-Name[de]=KNetworkManager Verbinden
-Name[el]=Ο KNetworkManager συνδέεται
-Name[es]=KNetworkManager conectando
-Name[et]=KNetworkManager ühendub
-Name[it]=KNetworkManager Connessione in corso
-Name[ja]=KNetworkManager 接続中
-Name[nl]=KNetworkManager Verbinden
-Name[pt]=KNetworkManager a Ligar
-Name[sr]=KNetworkManager се повезује
-Name[sr@Latn]=KNetworkManager se povezuje
+Name[de]=TDENetworkManager Verbinden
+Name[el]=Ο TDENetworkManager συνδέεται
+Name[es]=TDENetworkManager conectando
+Name[et]=TDENetworkManager ühendub
+Name[it]=TDENetworkManager Connessione in corso
+Name[ja]=TDENetworkManager 接続中
+Name[nl]=TDENetworkManager Verbinden
+Name[pt]=TDENetworkManager a Ligar
+Name[sr]=TDENetworkManager се повезује
+Name[sr@Latn]=TDENetworkManager se povezuje
 Name[sv]=Nätverkshantering kopplar upp
-Name[tr]=KNetworkManager Bağlanıyor
+Name[tr]=TDENetworkManager Bağlanıyor
 Comment=NetworkManager is connecting
 Comment[bg]=NetworkManager се свързва
 Comment[bn]=নেটওয়ার্ক-ম্যানেজার সংযোগ স্থাপন করছে
 Comment[ca]=El NetworkManager s'està connectant
 Comment[da]=Networkmanager forbinder
 Comment[de]=NetworkManager stellt eine Verbindung her
-Comment[el]=Ο KNetworkManager συνδέεται
+Comment[el]=Ο TDENetworkManager συνδέεται
 Comment[es]=NetworkManager se está conectando
 Comment[et]=Võrguhaldur ühendub
 Comment[it]=NetworkManager si sta connettendo
@@ -125,24 +125,24 @@ Comment[tr]=NetworkManager bağlanıyor
 default_presentation=0
 
 [knm-nm-disconnected]
-Name=KNetworkManager Disconnected
-Name[bg]=KNetworkManager - изключен от Интернет
+Name=TDENetworkManager Disconnected
+Name[bg]=TDENetworkManager - изключен от Интернет
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার সংযোগ বিহীন
-Name[br]=Digevreet eo KNetworkManager
-Name[ca]=El KNetworkManager està desconnectat
+Name[br]=Digevreet eo TDENetworkManager
+Name[ca]=El TDENetworkManager està desconnectat
 Name[da]=Netværkshåndtering afbrudt
-Name[de]=KNetworkManager Getrennt
-Name[el]=Ο KNetworkManager αποσυνδέθηκε
-Name[es]=KNetworkManager desconectado
-Name[et]=KNetworkManager lahutatud
-Name[it]=KNetworkManager Disconnesso
-Name[ja]=KNetworkManager 切断しました
-Name[nl]=KNetworkManager Niet verbonden
-Name[pt]=KNetworkManager Desligado
-Name[sr]=KNetworkManager је развезан
-Name[sr@Latn]=KNetworkManager je razvezan
+Name[de]=TDENetworkManager Getrennt
+Name[el]=Ο TDENetworkManager αποσυνδέθηκε
+Name[es]=TDENetworkManager desconectado
+Name[et]=TDENetworkManager lahutatud
+Name[it]=TDENetworkManager Disconnesso
+Name[ja]=TDENetworkManager 切断しました
+Name[nl]=TDENetworkManager Niet verbonden
+Name[pt]=TDENetworkManager Desligado
+Name[sr]=TDENetworkManager је развезан
+Name[sr@Latn]=TDENetworkManager je razvezan
 Name[sv]=Nätverkshantering nerkopplad
-Name[tr]=KNetworkManager Bağlı Değil
+Name[tr]=TDENetworkManager Bağlı Değil
 Comment=NetworkManager is now disconnected
 Comment[bg]=NetworkManager е изключен от Интернет
 Comment[bn]=এখন নেটওয়ার্ক-ম্যানেজার সংযোগ বিহীন
@@ -163,23 +163,23 @@ Comment[tr]=NetworkManager artık bağlı değil
 default_presentation=0
 
 [knm-nm-device-added]
-Name=KNetworkManager Device Added
-Name[bg]=KNetworkManager - добавено е устройство
+Name=TDENetworkManager Device Added
+Name[bg]=TDENetworkManager - добавено е устройство
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ডিভাইস যোগ করা হয়েছে
-Name[ca]=S'ha afegit un dispositiu del KNetworkManager
+Name[ca]=S'ha afegit un dispositiu del TDENetworkManager
 Name[da]=Netværkshåndtering enhed tilføjet
-Name[de]=KNetworkManager Gerät hinzugefügt
-Name[el]=Προστέθηκε συσκευή στον KNetworkManager
-Name[es]=Añadido dispositivo a KNetworkManager
-Name[et]=KNetworkManager lisas seadme
-Name[it]=KNetworkManager Dispositivo aggiunto
-Name[ja]=KNetworkManager デバイスが追加されました
-Name[nl]=KNetworkManager Apparaat toegevoegd
-Name[pt]=KNetworkManager com Dispositivo Adicionado
-Name[sr]=KNetworkManager уређај додат
-Name[sr@Latn]=KNetworkManager uređaj dodat
+Name[de]=TDENetworkManager Gerät hinzugefügt
+Name[el]=Προστέθηκε συσκευή στον TDENetworkManager
+Name[es]=Añadido dispositivo a TDENetworkManager
+Name[et]=TDENetworkManager lisas seadme
+Name[it]=TDENetworkManager Dispositivo aggiunto
+Name[ja]=TDENetworkManager デバイスが追加されました
+Name[nl]=TDENetworkManager Apparaat toegevoegd
+Name[pt]=TDENetworkManager com Dispositivo Adicionado
+Name[sr]=TDENetworkManager уређај додат
+Name[sr@Latn]=TDENetworkManager uređaj dodat
 Name[sv]=Nätverkshantering enhet tillagd
-Name[tr]=KNetworkManager Aygıt Eklendi
+Name[tr]=TDENetworkManager Aygıt Eklendi
 Comment=New network device found
 Comment[bg]=Открито е ново мрежово устройство
 Comment[bn]=নতুন নেটওয়ার্ক ডিভাইস খুঁজে পেয়েছে
@@ -201,23 +201,23 @@ Comment[tr]=Yeni ağ aygıtı bulundu
 default_presentation=0
 
 [knm-nm-device-removed]
-Name=KNetworkManager Device Removed
-Name[bg]=KNetworkManager - устройството е премахнато
+Name=TDENetworkManager Device Removed
+Name[bg]=TDENetworkManager - устройството е премахнато
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ডিভাইস অপসারিত করা হয়েছে
-Name[ca]=S'ha eliminat un dispositiu del KNetworkManager
+Name[ca]=S'ha eliminat un dispositiu del TDENetworkManager
 Name[da]=Netværkshåndtering enhed fjernet
-Name[de]=KNetworkManager Gerät entfernt
-Name[el]=Αφαιρέθηκε συσκευή από τον KNetworkManager
-Name[es]=Eliminado dispositivo de KNetworkManager
-Name[et]=KNetworkManager eemaldas seadme
-Name[it]=KNetworkManager Dispositivo rimosso
-Name[ja]=KNetworkManager デバイスが削除されました
-Name[nl]=KNetworkManager Apparaat verwijderd
-Name[pt]=KNetworkManager com Dispositivo Removido
-Name[sr]=KNetworkManager уређај уклоњен
-Name[sr@Latn]=KNetworkManager uređaj uklonjen
+Name[de]=TDENetworkManager Gerät entfernt
+Name[el]=Αφαιρέθηκε συσκευή από τον TDENetworkManager
+Name[es]=Eliminado dispositivo de TDENetworkManager
+Name[et]=TDENetworkManager eemaldas seadme
+Name[it]=TDENetworkManager Dispositivo rimosso
+Name[ja]=TDENetworkManager デバイスが削除されました
+Name[nl]=TDENetworkManager Apparaat verwijderd
+Name[pt]=TDENetworkManager com Dispositivo Removido
+Name[sr]=TDENetworkManager уређај уклоњен
+Name[sr@Latn]=TDENetworkManager uređaj uklonjen
 Name[sv]=Nätverkshantering enhet borttagen
-Name[tr]=KNetworkManager Aygıt Kaldırıldı
+Name[tr]=TDENetworkManager Aygıt Kaldırıldı
 Comment=Network device removed
 Comment[bg]=Мрежовото устройство е премахнато
 Comment[bn]=নেটওয়ার্ক ডিভাইস অপসারিত করা হয়েছে
@@ -239,23 +239,23 @@ Comment[tr]=Ağ aygıtı kaldırıldı
 default_presentation=0
 
 [knm-nm-network-found]
-Name=KNetworkManager New Wireless Network Found
-Name[bg]=KNetworkManager - намерена е нова безжична мрежа
+Name=TDENetworkManager New Wireless Network Found
+Name[bg]=TDENetworkManager - намерена е нова безжична мрежа
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার নতুন ওয়্যারলেস নেটওয়ার্ক খুঁজে পেয়েছে
-Name[ca]=S'ha trobat una nova xarxa sense fils del KNetworkManager
+Name[ca]=S'ha trobat una nova xarxa sense fils del TDENetworkManager
 Name[da]=Netværkshåndtering fandt nyt trådløst netværk
-Name[de]=KNetworkManager Neues drahtloses Netzwerk gefunden
-Name[el]=Βρέθηκε νέο ασύρματο δίκτυο στον KNetworkManager
-Name[es]=Encontrada nueva red inalámbrica en KNetworkManager
-Name[et]=KNetworkManager leidis uue traadita võrgu
-Name[it]=KNetworkManager Trovata nuova rete senza fili
-Name[ja]=KNetworkManager ワイヤレスネットワークを検出
-Name[nl]=KNetworkManager  Nieuw draadloos netwerk gevonden
-Name[pt]=KNetworkManager com Nova Rede Sem-Fios Encontrada
-Name[sr]=KNetworkManager нова бежична мрежа је нађена
-Name[sr@Latn]=KNetworkManager nova bežična mreža je nađena
+Name[de]=TDENetworkManager Neues drahtloses Netzwerk gefunden
+Name[el]=Βρέθηκε νέο ασύρματο δίκτυο στον TDENetworkManager
+Name[es]=Encontrada nueva red inalámbrica en TDENetworkManager
+Name[et]=TDENetworkManager leidis uue traadita võrgu
+Name[it]=TDENetworkManager Trovata nuova rete senza fili
+Name[ja]=TDENetworkManager ワイヤレスネットワークを検出
+Name[nl]=TDENetworkManager  Nieuw draadloos netwerk gevonden
+Name[pt]=TDENetworkManager com Nova Rede Sem-Fios Encontrada
+Name[sr]=TDENetworkManager нова бежична мрежа је нађена
+Name[sr@Latn]=TDENetworkManager nova bežična mreža je nađena
 Name[sv]=Nätverkshantering ny trådlös enhet hittades
-Name[tr]=KNetworkManager Yeni Kablosuz Ağ Bulundu
+Name[tr]=TDENetworkManager Yeni Kablosuz Ağ Bulundu
 Comment=New wireless network found
 Comment[bg]=Намерена е нова безжична мрежа
 Comment[bn]=নতুন ওয়্যারলেস নেটওয়ার্ক খুঁজে পেয়েছে
@@ -276,23 +276,23 @@ Comment[tr]=Yeni kablosuz ağ bulundu
 default_presentation=0
 
 [knm-nm-network-gone]
-Name=KNetworkManager Wireless Network Disappeared
-Name[bg]=KNetworkManager - безжичната мрежа се изгуби
+Name=TDENetworkManager Wireless Network Disappeared
+Name[bg]=TDENetworkManager - безжичната мрежа се изгуби
 Name[bn]=কে-নেটওয়ার্ক-ম্যানেজার ওয়্যারলেস নেটওয়ার্ক অন্তর্ধান করেছে
-Name[ca]=Ha desaparegut la xarxa sense fils del KNetworkManager
+Name[ca]=Ha desaparegut la xarxa sense fils del TDENetworkManager
 Name[da]=Netværkshåndtering trådløst netværk forsvandt
-Name[de]=KNetworkManager Drahtloses Netzwerk nicht mehr vorhanden
-Name[el]=Ένα ασύρματο δίκτυο αφαιρέθηκε από τον KNetworkManager
-Name[es]=Desaparecida red inalámbrica en KNetworkManager
-Name[et]=KNetworkManager kaotas traadita võrgu
-Name[it]=KNetworkManager È scomparsa la rete senza fili
-Name[ja]=KNetworkManager ワイヤレスネットワークが消失
-Name[nl]=KNetworkManager Draadloos netwerk verdwenen
-Name[pt]=KNetworkManager Rede Sem-Fios Desaparecida
-Name[sr]=KNetworkManager бежична мрежа је нестала
-Name[sr@Latn]=KNetworkManager bežična mreža je nestala
+Name[de]=TDENetworkManager Drahtloses Netzwerk nicht mehr vorhanden
+Name[el]=Ένα ασύρματο δίκτυο αφαιρέθηκε από τον TDENetworkManager
+Name[es]=Desaparecida red inalámbrica en TDENetworkManager
+Name[et]=TDENetworkManager kaotas traadita võrgu
+Name[it]=TDENetworkManager È scomparsa la rete senza fili
+Name[ja]=TDENetworkManager ワイヤレスネットワークが消失
+Name[nl]=TDENetworkManager Draadloos netwerk verdwenen
+Name[pt]=TDENetworkManager Rede Sem-Fios Desaparecida
+Name[sr]=TDENetworkManager бежична мрежа је нестала
+Name[sr@Latn]=TDENetworkManager bežična mreža je nestala
 Name[sv]=Nätverkshantering trådlöst nätverk försvann
-Name[tr]=KNetworkManager Kablosuz Ağ Yok Oldu
+Name[tr]=TDENetworkManager Kablosuz Ağ Yok Oldu
 Comment=Wireless network disappeared
 Comment[bg]=Безжичната мрежа се изгуби
 Comment[bn]=ওয়্যারলেস নেটওয়ার্ক অন্তর্ধান করেছে
diff --git a/tdenetworkmanager/src/main.cpp b/tdenetworkmanager/src/main.cpp
index 7d1a6f1..08cd81e 100644
--- a/tdenetworkmanager/src/main.cpp
+++ b/tdenetworkmanager/src/main.cpp
@@ -56,8 +56,8 @@ kdemain (int argc, char* argv[])
 
 	KCmdLineArgs::init (argc, argv, &aboutData);
 
-	if (KNetworkManager::start ()) {
-		KNetworkManager app;
+	if (TDENetworkManager::start ()) {
+		TDENetworkManager app;
 		app.disableSessionManagement ();
 		return app.exec ();
 	}
diff --git a/tdenetworkmanager/src/settings/CMakeLists.txt b/tdenetworkmanager/src/settings/CMakeLists.txt
new file mode 100644
index 0000000..cdaec6e
--- /dev/null
+++ b/tdenetworkmanager/src/settings/CMakeLists.txt
@@ -0,0 +1,41 @@
+#################################################
+#
+#  (C) 2012 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing (DOT) net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings
+  ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${DBUS_TQT_INCLUDE_DIRS}
+  ${NM_UTIL_INCLUDE_DIRS}
+)
+
+
+##### tdenetwork-connection-settings ############
+
+set( target tdenetwork-connection-settings )
+
+set( ${target}_SRCS
+    knetworkmanager-connection_setting.cpp
+    knetworkmanager-connection_setting_info.cpp knetworkmanager-connection_setting_ipv4.cpp
+    knetworkmanager-connection_setting_wired.cpp knetworkmanager-connection_setting_wireless.cpp
+    knetworkmanager-connection_setting_wireless_security.cpp
+    knetworkmanager-connection_setting_8021x.cpp knetworkmanager-connection_setting_vpn.cpp
+    knetworkmanager-connection_setting_serial.cpp knetworkmanager-connection_setting_cdma.cpp
+    knetworkmanager-connection_setting_gsm.cpp knetworkmanager-connection_setting_ppp.cpp
+)
+
+tde_add_library( ${target} STATIC_PIC AUTOMOC
+  SOURCES ${${target}_SRCS}
+)
diff --git a/tdenetworkmanager/src/tdenetman-device_tray.cpp b/tdenetworkmanager/src/tdenetman-device_tray.cpp
index 14a218e..a58b3fc 100644
--- a/tdenetworkmanager/src/tdenetman-device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-device_tray.cpp
@@ -220,7 +220,7 @@ void DeviceTray::contextMenuAboutToShow (KPopupMenu* menu)
 	menu->clear();
 
 	// insert title
-	menu->insertTitle (SmallIcon ("tdenetman",  TQIconSet::Automatic), "KNetworkManager", -1, -1);
+	menu->insertTitle (SmallIcon ("tdenetworkmanager",  TQIconSet::Automatic), "TDENetworkManager", -1, -1);
 
 	// let the specific device_tray add its items
 	addMenuItems(menu);
@@ -286,7 +286,7 @@ void DeviceTray::updateTrayIcon(TDENetworkConnectionStatus::TDENetworkConnection
 		setPixmap(d->pixmapForConnState(state));
 	}
 	else {
-		setPixmap(loadSizedIcon("KNetworkManager", width()));
+		setPixmap(loadSizedIcon("TDENetworkManager", width()));
 	}
 
 	m_currentIconState = state;
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
index c197da9..a5dfce9 100644
--- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
@@ -35,14 +35,14 @@ PluginManager* PluginManager::getInstance()
 {
 	if (_instance)
 		return _instance;
-	return new PluginManager(TQT_TQOBJECT(KNetworkManager::getInstance()), "pluginmanager");
+	return new PluginManager(TQT_TQOBJECT(TDENetworkManager::getInstance()), "pluginmanager");
 }
 
 PluginManager::PluginManager(TQObject* parent, const char* name)
 	: TQObject(parent, name)
 {
 	// get list of available plugins
-	this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KNetworkManager/Plugin" )));
+	this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "TDENetworkManager/Plugin" )));
 
 	// a bit debug output
 	for(TQValueList<KPluginInfo*>::ConstIterator it = _plugins.begin(); it != _plugins.end(); ++it)
@@ -125,7 +125,7 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID)
 	// try to load Plugin
 	int error = 0;
 	KPluginInfo* info = infoForPluginID(pluginID);
-	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ),
+	Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "TDENetworkManager/Plugin" ),
 	                 TQString::fromLatin1( "[X-TDE-PluginInfo-Name]=='%1'" ).arg( pluginID ), this, 0, TQStringList(), &error );
 
 	// plugin loaded?
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index 36d2743..fae3a15 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -676,7 +676,7 @@ void Tray::slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobal
 		KNotifyClient::event( winId(), "knm-nm-connected", i18n("NetworkManager is now connected") );
 	}
 	else if (nm_state & TDENetworkGlobalManagerFlags::Sleeping) {
-		KNotifyClient::event( winId(), "knm-nm-sleeping", i18n("KNetworkManager Offline") );
+		KNotifyClient::event( winId(), "knm-nm-sleeping", i18n("TDENetworkManager Offline") );
 	}
 	else if (nm_state & TDENetworkGlobalManagerFlags::Unknown) {
 		//
diff --git a/tdenetworkmanager/src/tdenetman-vpn_plugin.h b/tdenetworkmanager/src/tdenetman-vpn_plugin.h
index 00d3c8e..56a03d6 100644
--- a/tdenetworkmanager/src/tdenetman-vpn_plugin.h
+++ b/tdenetworkmanager/src/tdenetman-vpn_plugin.h
@@ -32,7 +32,7 @@
 // KNM includes
 #include "tdenetman.h"
 
-class KNetworkManager;
+class TDENetworkManager;
 
 class VPNDBUSPluginPrivate;
 
diff --git a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
index f1af73b..5602518 100644
--- a/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
+++ b/tdenetworkmanager/src/tdenetman-vpnauthenticationdialog.h
@@ -35,7 +35,7 @@
 #include "tdenetman-vpnplugin.h"
 #include "tdenetman-vpnmanager.h"
 
-class KNetworkManager;
+class TDENetworkManager;
 class ManageConnectionsDialog;
 class VPNService;
 
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
index 530be61..d3472c3 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
@@ -59,7 +59,7 @@ VPNManager::getVPNServices ()
 kdDebug() << "VPN Service " << kconfig->readEntry ("name", TQString()).ascii() << endl;
 
 			// create new VPNService Object
-			VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
+			VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(TDENetworkManager::getInstance()));
 			if (!vpnservice->getVPNPlugin())
 				delete vpnservice;
 			else
@@ -92,7 +92,7 @@ VPNManager::getVPNService(TQString service_type)
 			if (kconfig->readEntry ("service", TQString()) == service_type)
 			{
 				// create new VPNService Object
-				VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(KNetworkManager::getInstance()));
+				VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", TQString()), kconfig->readEntry ("service", TQString()), TQT_TQOBJECT(TDENetworkManager::getInstance()));
 				if (!vpnservice->getVPNPlugin())
 					delete vpnservice;
 				else
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.h b/tdenetworkmanager/src/tdenetman-vpnmanager.h
index 89e8032..d6e6002 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.h
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.h
@@ -35,7 +35,7 @@
 #include "tdenetman.h"
 #include "tdenetman-vpnplugin.h"
 
-class KNetworkManager;
+class TDENetworkManager;
 class VPNService;
 
 typedef TQValueList<VPNService*> VPNServiceList;
diff --git a/tdenetworkmanager/src/tdenetman-vpnplugin.h b/tdenetworkmanager/src/tdenetman-vpnplugin.h
index c89fc5e..d98db7e 100644
--- a/tdenetworkmanager/src/tdenetman-vpnplugin.h
+++ b/tdenetworkmanager/src/tdenetman-vpnplugin.h
@@ -31,7 +31,7 @@
 #include <tqdbusvariant.h>
 #include "tdenetman-plugin.h"
 
-#define KNETWORKMANAGER_VPNPLUGIN "KNetworkManager/VPNPlugin"
+#define KNETWORKMANAGER_VPNPLUGIN "TDENetworkManager/VPNPlugin"
 
 class VPNConfigWidget : public TQWidget
 {
diff --git a/tdenetworkmanager/src/tdenetman-vpnservice.cpp b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
index a43826d..b2643cf 100644
--- a/tdenetworkmanager/src/tdenetman-vpnservice.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.cpp
@@ -56,7 +56,7 @@ VPNService::VPNService(const TQString& serviceName, const TQString& service, TQO
 	PluginManager* plugMan = PluginManager::getInstance();
 	if (plugMan)
 	{
-		TQStringList list = plugMan->getPluginList("KNetworkManager/VPNPlugin", "X-NetworkManager-Services", serviceName);
+		TQStringList list = plugMan->getPluginList("TDENetworkManager/VPNPlugin", "X-NetworkManager-Services", serviceName);
 		if (list.size() > 0)
 		{
 			// get the first VPN Plugin	handling our VPNService
diff --git a/tdenetworkmanager/src/tdenetman-vpnservice.h b/tdenetworkmanager/src/tdenetman-vpnservice.h
index 03dda01..d95fafa 100644
--- a/tdenetworkmanager/src/tdenetman-vpnservice.h
+++ b/tdenetworkmanager/src/tdenetman-vpnservice.h
@@ -35,7 +35,7 @@
 #include "tdenetman.h"
 #include "tdenetman-vpnplugin.h"
 
-class KNetworkManager;
+class TDENetworkManager;
 class VPNService;
 class KConfigGroup;
 
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
index b8be188..a9ca359 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
@@ -376,12 +376,12 @@ void WirelessDeviceTray::apPropertyChanged(TDEMACAddress BSSID, TDENetworkAPEven
 
 void WirelessDeviceTray::slotAccessPointAdded(TDENetworkWiFiAPInfo* ap)
 {
-	KNotifyClient::event( tray()->winId(), "knm-nm-network-found", i18n("KNetworkManager New Wireless Network Found") );
+	KNotifyClient::event( tray()->winId(), "knm-nm-network-found", i18n("TDENetworkManager New Wireless Network Found") );
 }
 
 void WirelessDeviceTray::slotAccessPointRemoved(const TQString&)
 {
-	KNotifyClient::event( tray()->winId(), "knm-nm-network-gone", i18n("KNetworkManager Wireless Network Disappeared") );
+	KNotifyClient::event( tray()->winId(), "knm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") );
 }
 
 WirelessDeviceTray::WirelessDeviceTray (TDENetworkDevice* dev, KSystemTray * parent, const char * name)
diff --git a/tdenetworkmanager/src/tdenetman-wireless_network.h b/tdenetworkmanager/src/tdenetman-wireless_network.h
index bf0ab03..8ace658 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_network.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_network.h
@@ -32,7 +32,7 @@
 #include <tdehardwaredevices.h>
 #include <tdenetworkconnections.h>
 
-class KNetworkManager;
+class TDENetworkManager;
 class WirelessNetworkPrivate;
 
 /*
diff --git a/tdenetworkmanager/src/tdenetman.cpp b/tdenetworkmanager/src/tdenetman.cpp
index d8125f2..9ef8f9f 100644
--- a/tdenetworkmanager/src/tdenetman.cpp
+++ b/tdenetworkmanager/src/tdenetman.cpp
@@ -44,36 +44,36 @@
 
 extern TDENetworkConnectionStatus::TDENetworkConnectionStatus nm_device_state_global;
 
-class KNetworkManagerPrivate
+class TDENetworkManagerPrivate
 {
 	public:
-		KNetworkManagerPrivate() {}
-		~KNetworkManagerPrivate() {}
-	static KNetworkManager* _ctx;
+		TDENetworkManagerPrivate() {}
+		~TDENetworkManagerPrivate() {}
+	static TDENetworkManager* _ctx;
 };
 
-KNetworkManager* KNetworkManagerPrivate::_ctx = NULL;
+TDENetworkManager* TDENetworkManagerPrivate::_ctx = NULL;
 
-KNetworkManager* KNetworkManager::getInstance()
+TDENetworkManager* TDENetworkManager::getInstance()
 {
-	return KNetworkManagerPrivate::_ctx;
+	return TDENetworkManagerPrivate::_ctx;
 }
 
 void
-KNetworkManager::slotShutDown()
+TDENetworkManager::slotShutDown()
 {
 	//
 }
 
-void KNetworkManager::timerEvent( TQTimerEvent *e )
+void TDENetworkManager::timerEvent( TQTimerEvent *e )
 {
 	Tray* tray = Tray::getInstance();
 	tray->slotUpdateDeviceState(nm_device_state_global);
 }
 
-KNetworkManager::KNetworkManager () : KUniqueApplication ()
+TDENetworkManager::TDENetworkManager () : KUniqueApplication ()
 {
-	d = new KNetworkManagerPrivate();
+	d = new TDENetworkManagerPrivate();
 	d->_ctx = this;
 
 	// we need to get informed when shutting down
@@ -85,7 +85,7 @@ KNetworkManager::KNetworkManager () : KUniqueApplication ()
 	setMainWidget(tray);
 }
 
-KNetworkManager::~KNetworkManager()
+TDENetworkManager::~TDENetworkManager()
 {
 	delete d;
 }
diff --git a/tdenetworkmanager/src/tdenetman.h b/tdenetworkmanager/src/tdenetman.h
index 6ab2ca1..8fd1a05 100644
--- a/tdenetworkmanager/src/tdenetman.h
+++ b/tdenetworkmanager/src/tdenetman.h
@@ -31,24 +31,24 @@
 // KNM includes
 #include "config.h"
 
-class KNetworkManagerPrivate;
+class TDENetworkManagerPrivate;
 class Device;
 
-class KNetworkManager : public KUniqueApplication
+class TDENetworkManager : public KUniqueApplication
 {
 	Q_OBJECT
   
 
 	public:
-	  KNetworkManager ();
-	  ~KNetworkManager ();
+	  TDENetworkManager ();
+	  ~TDENetworkManager ();
 
-	  static KNetworkManager* getInstance (void);
+	  static TDENetworkManager* getInstance (void);
 
 	public slots:
 		void slotShutDown();
 	private:
-		KNetworkManagerPrivate* d;
+		TDENetworkManagerPrivate* d;
 
 	protected:
 		void timerEvent( TQTimerEvent *e );