diff --git a/doc/knetwortdeconf/01.png b/doc/knetworkconf/01.png
similarity index 100%
rename from doc/knetwortdeconf/01.png
rename to doc/knetworkconf/01.png
diff --git a/doc/knetwortdeconf/02.png b/doc/knetworkconf/02.png
similarity index 100%
rename from doc/knetwortdeconf/02.png
rename to doc/knetworkconf/02.png
diff --git a/doc/knetwortdeconf/03.png b/doc/knetworkconf/03.png
similarity index 100%
rename from doc/knetwortdeconf/03.png
rename to doc/knetworkconf/03.png
diff --git a/doc/knetwortdeconf/04.png b/doc/knetworkconf/04.png
similarity index 100%
rename from doc/knetwortdeconf/04.png
rename to doc/knetworkconf/04.png
diff --git a/doc/knetwortdeconf/05.png b/doc/knetworkconf/05.png
similarity index 100%
rename from doc/knetwortdeconf/05.png
rename to doc/knetworkconf/05.png
diff --git a/doc/knetwortdeconf/06.png b/doc/knetworkconf/06.png
similarity index 100%
rename from doc/knetwortdeconf/06.png
rename to doc/knetworkconf/06.png
diff --git a/doc/knetwortdeconf/07.png b/doc/knetworkconf/07.png
similarity index 100%
rename from doc/knetwortdeconf/07.png
rename to doc/knetworkconf/07.png
diff --git a/doc/knetwortdeconf/08.png b/doc/knetworkconf/08.png
similarity index 100%
rename from doc/knetwortdeconf/08.png
rename to doc/knetworkconf/08.png
diff --git a/doc/knetwortdeconf/09.png b/doc/knetworkconf/09.png
similarity index 100%
rename from doc/knetwortdeconf/09.png
rename to doc/knetworkconf/09.png
diff --git a/doc/knetwortdeconf/11.png b/doc/knetworkconf/11.png
similarity index 100%
rename from doc/knetwortdeconf/11.png
rename to doc/knetworkconf/11.png
diff --git a/doc/knetworkconf/Makefile.am b/doc/knetworkconf/Makefile.am
new file mode 100644
index 0000000..01c1911
--- /dev/null
+++ b/doc/knetworkconf/Makefile.am
@@ -0,0 +1,4 @@
+KDE_LANG = en
+KDE_DOCS = knetworkconf
+
+
diff --git a/doc/knetwortdeconf/about1.png b/doc/knetworkconf/about1.png
similarity index 100%
rename from doc/knetwortdeconf/about1.png
rename to doc/knetworkconf/about1.png
diff --git a/doc/knetwortdeconf/index.docbook b/doc/knetworkconf/index.docbook
similarity index 96%
rename from doc/knetwortdeconf/index.docbook
rename to doc/knetworkconf/index.docbook
index 0858115..2483880 100644
--- a/doc/knetwortdeconf/index.docbook
+++ b/doc/knetworkconf/index.docbook
@@ -1,7 +1,7 @@
KNetworkConf">
-
+ KNetworkConf">
+
@@ -65,7 +65,7 @@ document.
1.0
-This manual explains how to install and use &knetwortdeconf;, a module for
+This manual explains how to install and use &knetworkconf;, a module for
&kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
properties.
@@ -86,9 +86,9 @@ integrated interface from which to manage a wide variety of system and
desktop settings and preferences. &kcontrolcenter; can be started by selecting
TDE Menu&kcontrolcenter;.
-The &knetwortdeconf; package was developed to enable users to manage TCP/IP
+The &knetworkconf; package was developed to enable users to manage TCP/IP
networking settings in the same way they manage other system settings from
-&kcontrolcenter;. Tasks enabled by &knetwortdeconf; provide users with a simple
+&kcontrolcenter;. Tasks enabled by &knetworkconf; provide users with a simple
interface from which to perform the following tasks:
@@ -117,7 +117,7 @@ interface from which to perform the following tasks:
Once installed a new module called Network
Settings is displayed in the &kcontrolcenter;.
-To start the Network Settings (&knetwortdeconf;) module select
+To start the Network Settings (&knetworkconf;) module select
&kcontrolcenter; Internet & Network
Network Settings in the &kmenu;.
@@ -126,13 +126,13 @@ To start the Network Settings (&knetwortdeconf;) modu
-&knetwortdeconf; in user mode
+&knetworkconf; in user mode
-It is important to understand that &knetwortdeconf; cannot install
+It is important to understand that &knetworkconf; cannot install
networking hardware. As such physical devices and their drivers must be
-properly installed and configured in order for &knetwortdeconf; to display the
+properly installed and configured in order for &knetworkconf; to display the
device and enable management of networking properties.
In most cases drivers for networking hardware and other devices are
@@ -211,14 +211,14 @@ click the Administrator Mode button located bottom
left of the module. Enter your password when prompted.
-&knetwortdeconf; in administrator mode
+&knetworkconf; in administrator mode
-&knetwortdeconf; in administrator mode
+&knetworkconf; in administrator mode
@@ -277,7 +277,7 @@ fileref="03.png"
format="PNG"/>
-The &knetwortdeconf; interface
+The &knetworkconf; interface
@@ -748,8 +748,8 @@ following command.
How to obtain knetwork-conf
knetwork-conf's home page is at http://knetwortdeconf.sourceforge.net where you at least can download
+url="http://knetworkconf.sourceforge.net"
+>http://knetworkconf.sourceforge.net where you at least can download
source packages.
@@ -778,7 +778,7 @@ packages. Install them from &konsole; using
installed; you also need the development packages which include libraries
and other stuff.
-Recommended for advanced users only. Otherwise, compiling &knetwortdeconf;
+Recommended for advanced users only. Otherwise, compiling &knetworkconf;
is not difficult. The following commands should do it.
@@ -801,7 +801,7 @@ let us know.
In the first section of this chapter, you'll find some valuable
information about networking basics. In the second, all configuration files
-on your disk which can be changed by &knetwortdeconf; will be discussed.
+on your disk which can be changed by &knetworkconf; will be discussed.
IPv4 Networking
@@ -894,7 +894,7 @@ gateway-computer.
Configuration files
In this section you'll find the configuration files which are touched
-by &knetwortdeconf; and where they reside in the file system of the different
+by &knetworkconf; and where they reside in the file system of the different
distributions.
diff --git a/doc/knetwortdeconf/Makefile.am b/doc/knetwortdeconf/Makefile.am
deleted file mode 100644
index 19c4bed..0000000
--- a/doc/knetwortdeconf/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = knetwortdeconf
-
-
diff --git a/knetwortdeconf/AUTHORS b/knetworkconf/AUTHORS
similarity index 100%
rename from knetwortdeconf/AUTHORS
rename to knetworkconf/AUTHORS
diff --git a/knetwortdeconf/COPYING b/knetworkconf/COPYING
similarity index 100%
rename from knetwortdeconf/COPYING
rename to knetworkconf/COPYING
diff --git a/knetwortdeconf/ChangeLog b/knetworkconf/ChangeLog
similarity index 100%
rename from knetwortdeconf/ChangeLog
rename to knetworkconf/ChangeLog
diff --git a/knetwortdeconf/Doxyfile b/knetworkconf/Doxyfile
similarity index 98%
rename from knetwortdeconf/Doxyfile
rename to knetworkconf/Doxyfile
index bd68031..c227a40 100644
--- a/knetwortdeconf/Doxyfile
+++ b/knetworkconf/Doxyfile
@@ -3,7 +3,7 @@
#---------------------------------------------------------------------------
# General configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = knetwortdeconf
+PROJECT_NAME = knetworkconf
PROJECT_NUMBER =
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
@@ -57,7 +57,7 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = /home/juancho/cvs_proyectos/knetwortdeconf_0.4.9
+INPUT = /home/juancho/cvs_proyectos/knetworkconf_0.4.9
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
diff --git a/knetwortdeconf/INSTALL b/knetworkconf/INSTALL
similarity index 100%
rename from knetwortdeconf/INSTALL
rename to knetworkconf/INSTALL
diff --git a/knetwortdeconf/LEAME b/knetworkconf/LEAME
similarity index 95%
rename from knetwortdeconf/LEAME
rename to knetworkconf/LEAME
index 89cf46a..8925c6c 100644
--- a/knetwortdeconf/LEAME
+++ b/knetworkconf/LEAME
@@ -2,7 +2,7 @@ KNetworkConf 0.6.1 - Un m
para configurar las propiedades de red.
Juan Luis Baptiste M.
Colombia 2003 - 2005
-http://www.merlinux.org/knetwortdeconf/
+http://www.merlinux.org/knetworkconf/
------------------------------------------------------------
@@ -79,5 +79,5 @@ y correr el comando update-menus despu
4. Contacto
Para reportar errores, o si tiene comentarios o sugerencias acerca
de KNetworkConf, por favor escriba a las listas de correo del proyecto:
-knetwortdeconf-devel@lists.sourceforge.net o knetwortdeconf-users@lists.sourceforge.net.
+knetworkconf-devel@lists.sourceforge.net o knetworkconf-users@lists.sourceforge.net.
diff --git a/knetworkconf/Makefile.am b/knetworkconf/Makefile.am
new file mode 100644
index 0000000..cb7b17e
--- /dev/null
+++ b/knetworkconf/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = knetworkconf backends pixmaps
\ No newline at end of file
diff --git a/knetwortdeconf/README b/knetworkconf/README
similarity index 92%
rename from knetwortdeconf/README
rename to knetworkconf/README
index edf3377..db16fe9 100644
--- a/knetwortdeconf/README
+++ b/knetworkconf/README
@@ -1,7 +1,7 @@
KNetworkConf 0.6.1 - A KDE control Center Module to confiure Network settings.
Juan Luis Baptiste M.
Colombia, 2003 - 2005
-http://www.merlinux.org/knetwortdeconf/
+http://www.merlinux.org/knetworkconf/
------------------------------------------------------------
@@ -69,6 +69,6 @@ install the files in the correct path and run update-menus after make install.
4. Contact
To report bugs or if you have any comments or sugestions about KNetworkConf,
-please write to the mailing lists knetwortdeconf-devel@lists.sourceforge.net or
-knetwortdeconf-users@lists.sourceforge.net.
+please write to the mailing lists knetworkconf-devel@lists.sourceforge.net or
+knetworkconf-users@lists.sourceforge.net.
diff --git a/knetwortdeconf/TODO b/knetworkconf/TODO
similarity index 100%
rename from knetwortdeconf/TODO
rename to knetworkconf/TODO
diff --git a/knetwortdeconf/backends/AUTHORS b/knetworkconf/backends/AUTHORS
similarity index 100%
rename from knetwortdeconf/backends/AUTHORS
rename to knetworkconf/backends/AUTHORS
diff --git a/knetwortdeconf/backends/Makefile.am b/knetworkconf/backends/Makefile.am
similarity index 100%
rename from knetwortdeconf/backends/Makefile.am
rename to knetworkconf/backends/Makefile.am
diff --git a/knetwortdeconf/backends/NEWS b/knetworkconf/backends/NEWS
similarity index 100%
rename from knetwortdeconf/backends/NEWS
rename to knetworkconf/backends/NEWS
diff --git a/knetwortdeconf/backends/README b/knetworkconf/backends/README
similarity index 100%
rename from knetwortdeconf/backends/README
rename to knetworkconf/backends/README
diff --git a/knetwortdeconf/backends/README.NEW_PLATFORMS b/knetworkconf/backends/README.NEW_PLATFORMS
similarity index 100%
rename from knetwortdeconf/backends/README.NEW_PLATFORMS
rename to knetworkconf/backends/README.NEW_PLATFORMS
diff --git a/knetworkconf/backends/configure.in.in b/knetworkconf/backends/configure.in.in
new file mode 100644
index 0000000..44cfc14
--- /dev/null
+++ b/knetworkconf/backends/configure.in.in
@@ -0,0 +1,15 @@
+dnl ==============================================================
+dnl Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
+dnl ==============================================================
+KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
+scriptsdir="$KDE_DATADIR/knetworkconf/backends"
+
+AC_SUBST(scriptsdir)
+
+dnl ==============================================================
+dnl END: Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
+dnl ==============================================================
+
+dnl Keep the comment on the line below, it works that way.
+dnl AC_OUTPUT(knetworkconf/backends/system-tools-backends.pc knetworkconf/backends/network-conf knetworkconf/backends/debug.pl knetworkconf/backends/file.pl knetworkconf/backends/general.pl knetworkconf/backends/network.pl knetworkconf/backends/parse.pl knetworkconf/backends/platform.pl knetworkconf/backends/process.pl knetworkconf/backends/replace.pl knetworkconf/backends/report.pl knetworkconf/backends/service-list.pl knetworkconf/backends/service.pl knetworkconf/backends/util.pl knetworkconf/backends/xml.pl)
+echo "Backend configured."
diff --git a/knetwortdeconf/backends/debug.pl.in b/knetworkconf/backends/debug.pl.in
similarity index 100%
rename from knetwortdeconf/backends/debug.pl.in
rename to knetworkconf/backends/debug.pl.in
diff --git a/knetwortdeconf/backends/file.pl.in b/knetworkconf/backends/file.pl.in
similarity index 100%
rename from knetwortdeconf/backends/file.pl.in
rename to knetworkconf/backends/file.pl.in
diff --git a/knetwortdeconf/backends/general.pl.in b/knetworkconf/backends/general.pl.in
similarity index 100%
rename from knetwortdeconf/backends/general.pl.in
rename to knetworkconf/backends/general.pl.in
diff --git a/knetwortdeconf/backends/guess_system.sh b/knetworkconf/backends/guess_system.sh
similarity index 100%
rename from knetwortdeconf/backends/guess_system.sh
rename to knetworkconf/backends/guess_system.sh
diff --git a/knetwortdeconf/backends/mkinstalldirs b/knetworkconf/backends/mkinstalldirs
similarity index 100%
rename from knetwortdeconf/backends/mkinstalldirs
rename to knetworkconf/backends/mkinstalldirs
diff --git a/knetwortdeconf/backends/network-conf.in b/knetworkconf/backends/network-conf.in
similarity index 100%
rename from knetwortdeconf/backends/network-conf.in
rename to knetworkconf/backends/network-conf.in
diff --git a/knetwortdeconf/backends/network.pl.in b/knetworkconf/backends/network.pl.in
similarity index 100%
rename from knetwortdeconf/backends/network.pl.in
rename to knetworkconf/backends/network.pl.in
diff --git a/knetwortdeconf/backends/parse.pl.in b/knetworkconf/backends/parse.pl.in
similarity index 100%
rename from knetwortdeconf/backends/parse.pl.in
rename to knetworkconf/backends/parse.pl.in
diff --git a/knetwortdeconf/backends/platform.pl.in b/knetworkconf/backends/platform.pl.in
similarity index 100%
rename from knetwortdeconf/backends/platform.pl.in
rename to knetworkconf/backends/platform.pl.in
diff --git a/knetwortdeconf/backends/process.pl.in b/knetworkconf/backends/process.pl.in
similarity index 100%
rename from knetwortdeconf/backends/process.pl.in
rename to knetworkconf/backends/process.pl.in
diff --git a/knetwortdeconf/backends/replace.pl.in b/knetworkconf/backends/replace.pl.in
similarity index 100%
rename from knetwortdeconf/backends/replace.pl.in
rename to knetworkconf/backends/replace.pl.in
diff --git a/knetwortdeconf/backends/report.pl.in b/knetworkconf/backends/report.pl.in
similarity index 100%
rename from knetwortdeconf/backends/report.pl.in
rename to knetworkconf/backends/report.pl.in
diff --git a/knetwortdeconf/backends/service-list.pl.in b/knetworkconf/backends/service-list.pl.in
similarity index 100%
rename from knetwortdeconf/backends/service-list.pl.in
rename to knetworkconf/backends/service-list.pl.in
diff --git a/knetwortdeconf/backends/service.pl.in b/knetworkconf/backends/service.pl.in
similarity index 100%
rename from knetwortdeconf/backends/service.pl.in
rename to knetworkconf/backends/service.pl.in
diff --git a/knetwortdeconf/backends/system-tools-backends.pc.in b/knetworkconf/backends/system-tools-backends.pc.in
similarity index 100%
rename from knetwortdeconf/backends/system-tools-backends.pc.in
rename to knetworkconf/backends/system-tools-backends.pc.in
diff --git a/knetwortdeconf/backends/type1inst b/knetworkconf/backends/type1inst
similarity index 100%
rename from knetwortdeconf/backends/type1inst
rename to knetworkconf/backends/type1inst
diff --git a/knetwortdeconf/backends/util.pl.in b/knetworkconf/backends/util.pl.in
similarity index 100%
rename from knetwortdeconf/backends/util.pl.in
rename to knetworkconf/backends/util.pl.in
diff --git a/knetwortdeconf/backends/xml.pl.in b/knetworkconf/backends/xml.pl.in
similarity index 100%
rename from knetwortdeconf/backends/xml.pl.in
rename to knetworkconf/backends/xml.pl.in
diff --git a/knetwortdeconf/config.h.in b/knetworkconf/config.h.in
similarity index 100%
rename from knetwortdeconf/config.h.in
rename to knetworkconf/config.h.in
diff --git a/knetwortdeconf/knetwortdeconf-mdk.spec b/knetworkconf/knetworkconf-mdk.spec
similarity index 81%
rename from knetwortdeconf/knetwortdeconf-mdk.spec
rename to knetworkconf/knetworkconf-mdk.spec
index 8322e55..d2bb210 100644
--- a/knetwortdeconf/knetwortdeconf-mdk.spec
+++ b/knetworkconf/knetworkconf-mdk.spec
@@ -1,4 +1,4 @@
-%define name knetwortdeconf
+%define name knetworkconf
%define version 0.6.1
%define release 1mdk
#%define _unpackaged_files_terminate_build 0
@@ -8,12 +8,12 @@ Name: %{name}
Version: %{version}
Release: %{release}
License: GPL
-Url: http://www.merlinux.org/knetwortdeconf/
+Url: http://www.merlinux.org/knetworkconf/
Group: Networking/Other
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-buildroot
Requires: %_bindir/tdesu
-Patch1: knetwortdeconf-0.6-fix-menu.patch.bz2
+Patch1: knetworkconf-0.6-fix-menu.patch.bz2
%description
KNetworkConf is a TDE Control Center module to configure the Network
@@ -64,7 +64,7 @@ install -m 644 %{name}/lo32-app-%{name}.png %buildroot/%{_iconsdir}/%{name}.png
install -m 644 %{name}/network_card.png %buildroot/%{_prefix}/share/pixmaps/network_card.png
mkdir -p %{buildroot}/%{_menudir}
-kdedesktop2mdkmenu.pl %{name} System/Configuration/KDE/Network $RPM_BUILD_ROOT%{_datadir}/applications/tde/kcm_knetwortdeconfmodule.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
+kdedesktop2mdkmenu.pl %{name} System/Configuration/KDE/Network $RPM_BUILD_ROOT%{_datadir}/applications/tde/kcm_knetworkconfmodule.desktop $RPM_BUILD_ROOT%{_menudir}/%{name}
%post
@@ -81,16 +81,16 @@ rm -rf $RPM_BUILD_ROOT/*
%files -f %name.lang
#Quick Hack: for some reason the %find_lang command doesn't find
-#the translations files, it outputs a knetwortdeconf.lang file full
+#the translations files, it outputs a knetworkconf.lang file full
#of empty lines instead of the following ones:
-%lang(de) /usr/share/locale/de/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(es) /usr/share/locale/es/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(eu) /usr/share/locale/eu/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(fr) /usr/share/locale/fr/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(hu) /usr/share/locale/hu/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(no) /usr/share/locale/no/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(pl) /usr/share/locale/pl/LC_MESSAGES/knetwortdeconfmodule.mo
-%lang(pt_BR) /usr/share/locale/pt_BR/LC_MESSAGES/knetwortdeconfmodule.mo
+%lang(de) /usr/share/locale/de/LC_MESSAGES/knetworkconfmodule.mo
+%lang(es) /usr/share/locale/es/LC_MESSAGES/knetworkconfmodule.mo
+%lang(eu) /usr/share/locale/eu/LC_MESSAGES/knetworkconfmodule.mo
+%lang(fr) /usr/share/locale/fr/LC_MESSAGES/knetworkconfmodule.mo
+%lang(hu) /usr/share/locale/hu/LC_MESSAGES/knetworkconfmodule.mo
+%lang(no) /usr/share/locale/no/LC_MESSAGES/knetworkconfmodule.mo
+%lang(pl) /usr/share/locale/pl/LC_MESSAGES/knetworkconfmodule.mo
+%lang(pt_BR) /usr/share/locale/pt_BR/LC_MESSAGES/knetworkconfmodule.mo
%defattr(-,root,root,0755)
%doc README COPYING AUTHORS LEAME
diff --git a/knetwortdeconf/knetwortdeconf.lsm b/knetworkconf/knetworkconf.lsm
similarity index 100%
rename from knetwortdeconf/knetwortdeconf.lsm
rename to knetworkconf/knetworkconf.lsm
diff --git a/knetwortdeconf/knetwortdeconf.spec b/knetworkconf/knetworkconf.spec
similarity index 91%
rename from knetwortdeconf/knetwortdeconf.spec
rename to knetworkconf/knetworkconf.spec
index 89a3414..e47e964 100644
--- a/knetwortdeconf/knetwortdeconf.spec
+++ b/knetworkconf/knetworkconf.spec
@@ -1,7 +1,7 @@
# This spec file was generated using Kpp
# If you find any problems with this spec file please report
# the error to ian geiser
-%define name knetwortdeconf
+%define name knetworkconf
%define version 0.5
%define release 1mdk
@@ -10,7 +10,7 @@ Name: %{name}
Version: %{version}
Release: %{release}
License: GPL
-Url: http://www.merlinux.org/knetwortdeconf/
+Url: http://www.merlinux.org/knetworkconf/
Group: Networking/Other
Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-buildroot
@@ -74,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT/*
%defattr(-,root,root,0755)
%doc README COPYING AUTHORS LEAME
%{_libdir}/menu/*
-%{_bindir}/knetwortdeconf
+%{_bindir}/knetworkconf
%{_iconsdir}/*.png
%{_miconsdir}/%{name}.png
%_datadir/pixmaps/network_card.png
@@ -83,11 +83,11 @@ rm -rf $RPM_BUILD_ROOT/*
#%_datadir/applnk/Internet/*
%_datadir/icons/locolor/16x16/apps/*
%_datadir/icons/locolor/32x32/apps/*
-%_docdir/HTML/en/knetwortdeconf
-%_docdir/HTML/de/knetwortdeconf
-%_docdir/HTML/es/knetwortdeconf
-%_datadir/apps/knetwortdeconf/backends/*
-%_datadir/apps/knetwortdeconf/pixmaps/*
+%_docdir/HTML/en/knetworkconf
+%_docdir/HTML/de/knetworkconf
+%_docdir/HTML/es/knetworkconf
+%_datadir/apps/knetworkconf/backends/*
+%_datadir/apps/knetworkconf/pixmaps/*
%{_libdir}/pkgconfig/system-tools-backends.pc
diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am
new file mode 100644
index 0000000..a0aea3b
--- /dev/null
+++ b/knetworkconf/knetworkconf/Makefile.am
@@ -0,0 +1,41 @@
+# set the include path for X, qt and KDE
+#INCLUDES= $(all_includes)
+AM_CPPFLAGS = $(all_includes)
+
+# We use deprecated routines in QButton, undefine QT_NO_COMPAT.
+KDE_CXXFLAGS = -UQT_NO_COMPAT
+
+METASOURCES = AUTO
+#bin_PROGRAMS = knetworkconf
+
+kde_module_LTLIBRARIES = kcm_knetworkconfmodule.la
+
+kcm_knetworkconfmodule_la_LIBADD = $(LIB_TDEUI)
+
+# the library search path.
+kcm_knetworkconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+
+## INCLUDES were found outside tdevelop specific part
+
+kcm_knetworkconfmodule_la_SOURCES = tdeselectdistrodlg.ui kknownhostinfo.cpp \
+ kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetworkconfmodule.cpp \
+ kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
+ knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetworkconfigparser.cpp \
+ knetworkinterface.cpp knetworkconfdlg.ui knetworkconf.cpp main.cpp kadddevicedlgextension.ui \
+ knetworkconfiface.skel kwirelessinterface.cpp kadddevicewifiext.ui kadddevicecontainer.cpp \
+ kprofileslistviewtooltip.cpp
+
+
+EXTRA_DIST = main.cpp knetworkconf.cpp knetworkconf.h knetworkconf.desktop cr16-app-knetworkconf.png cr22-app-knetworkconf.png cr32-app-knetworkconf.png knetworkconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetworkconfigparser.cpp knetworkconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetworkconfmodule.cpp knetworkconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h tdeselectdistrodlg.ui kcm_knetworkconfmodule version.h
+
+xdg_apps_DATA = kcm_knetworkconfmodule.desktop
+
+KDE_ICON = AUTO
+
+messages: rc.cpp
+ LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+ if test -n "$$LIST"; then \
+ $(XGETTEXT) $$LIST -o $(podir)/knetworkconf.pot; \
+ fi
+
+noinst_HEADERS = kprofileslistviewtooltip.h
diff --git a/knetwortdeconf/knetwortdeconf/hi16-app-knetwortdeconf.png b/knetworkconf/knetworkconf/hi16-app-knetworkconf.png
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/hi16-app-knetwortdeconf.png
rename to knetworkconf/knetworkconf/hi16-app-knetworkconf.png
diff --git a/knetwortdeconf/knetwortdeconf/hi22-app-knetwortdeconf.png b/knetworkconf/knetworkconf/hi22-app-knetworkconf.png
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/hi22-app-knetwortdeconf.png
rename to knetworkconf/knetworkconf/hi22-app-knetworkconf.png
diff --git a/knetwortdeconf/knetwortdeconf/hi32-app-knetwortdeconf.png b/knetworkconf/knetworkconf/hi32-app-knetworkconf.png
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/hi32-app-knetwortdeconf.png
rename to knetworkconf/knetworkconf/hi32-app-knetworkconf.png
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicecontainer.cpp
rename to knetworkconf/knetworkconf/kadddevicecontainer.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicecontainer.h
rename to knetworkconf/knetworkconf/kadddevicecontainer.h
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicedlg.ui b/knetworkconf/knetworkconf/kadddevicedlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicedlg.ui
rename to knetworkconf/knetworkconf/kadddevicedlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicedlg.ui.h b/knetworkconf/knetworkconf/kadddevicedlg.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicedlg.ui.h
rename to knetworkconf/knetworkconf/kadddevicedlg.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui
rename to knetworkconf/knetworkconf/kadddevicedlgextension.ui
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui.h b/knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicedlgextension.ui.h
rename to knetworkconf/knetworkconf/kadddevicedlgextension.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/kadddevicewifiext.ui b/knetworkconf/knetworkconf/kadddevicewifiext.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddevicewifiext.ui
rename to knetworkconf/knetworkconf/kadddevicewifiext.ui
diff --git a/knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui
rename to knetworkconf/knetworkconf/kadddnsserverdlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kadddnsserverdlg.ui.h
rename to knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui
rename to knetworkconf/knetworkconf/kaddknownhostdlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kaddknownhostdlg.ui.h
rename to knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/kaddressvalidator.cpp b/knetworkconf/knetworkconf/kaddressvalidator.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kaddressvalidator.cpp
rename to knetworkconf/knetworkconf/kaddressvalidator.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kaddressvalidator.h b/knetworkconf/knetworkconf/kaddressvalidator.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kaddressvalidator.h
rename to knetworkconf/knetworkconf/kaddressvalidator.h
diff --git a/knetworkconf/knetworkconf/kcm_knetworkconfmodule b/knetworkconf/knetworkconf/kcm_knetworkconfmodule
new file mode 100644
index 0000000..2598a8b
--- /dev/null
+++ b/knetworkconf/knetworkconf/kcm_knetworkconfmodule
@@ -0,0 +1 @@
+?package(local.kcm_knetworkconfmodule.desktop):needs="x11" kde_filename="kcm_knetworkconfmodule" section="System/Configuration/KDE/Network" command="tdecmshell kcm_knetworkconfmodule" icon="locolor/32x32/apps/knetworkconf.png" longtitle="Configure your Network settings" title="Network Settings" kde_opt="Encoding=UTF-8\\nX-TDE-RootOnly=true\\nX-TDE-ModuleType=Library\\nX-TDE-Library=knetworkconfmodule\\nX-TDE-FactoryName=knetworkconfmodule\\nX-TDE-ParentApp=kcontrol\\nType=Application\\nDocPath=knetworkconf/index.docbook\\nComment[es]=Configurar las propiedades de Red\\nComment[de]=Netzwerkschnittstellen konfigurieren\\nTerminal=0\\nName[es]=Propiedades de Red\\nName[de]=Netzwerkschnittstellen konfigurieren\\nGenericName=Configure TCP/IP settings\\nGenericName[es]=Configurar las propiedades de red\\nKeywords=Network,DNS,routes,interfaces\\n"
diff --git a/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop b/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
similarity index 97%
rename from knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop
rename to knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
index d51ca0f..de21dff 100644
--- a/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule.desktop
+++ b/knetworkconf/knetworkconf/kcm_knetworkconfmodule.desktop
@@ -2,12 +2,12 @@
X-TDE-RootOnly=true
Categories=Qt;TDE;Settings;X-TDE-settings-network;
X-TDE-ModuleType=Library
-X-TDE-Library=knetwortdeconfmodule
-X-TDE-FactoryName=knetwortdeconfmodule
+X-TDE-Library=knetworkconfmodule
+X-TDE-FactoryName=knetworkconfmodule
Type=Application
-Exec=tdecmshell kcm_knetwortdeconfmodule
-Icon=knetwortdeconf
-DocPath=knetwortdeconf/index.html
+Exec=tdecmshell kcm_knetworkconfmodule
+Icon=knetworkconf
+DocPath=knetworkconf/index.html
Comment=Configure Network Settings
Comment[ar]=إعداد تعيينات الشبكة
diff --git a/knetwortdeconf/knetwortdeconf/kdetectdistrodlg.ui b/knetworkconf/knetworkconf/kdetectdistrodlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kdetectdistrodlg.ui
rename to knetworkconf/knetworkconf/kdetectdistrodlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kdnsinfo.cpp b/knetworkconf/knetworkconf/kdnsinfo.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kdnsinfo.cpp
rename to knetworkconf/knetworkconf/kdnsinfo.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kdnsinfo.h b/knetworkconf/knetworkconf/kdnsinfo.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kdnsinfo.h
rename to knetworkconf/knetworkconf/kdnsinfo.h
diff --git a/knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui
rename to knetworkconf/knetworkconf/kinterfaceupdowndlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui.h b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kinterfaceupdowndlg.ui.h
rename to knetworkconf/knetworkconf/kinterfaceupdowndlg.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/kknownhostinfo.cpp b/knetworkconf/knetworkconf/kknownhostinfo.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kknownhostinfo.cpp
rename to knetworkconf/knetworkconf/kknownhostinfo.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kknownhostinfo.h b/knetworkconf/knetworkconf/kknownhostinfo.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kknownhostinfo.h
rename to knetworkconf/knetworkconf/kknownhostinfo.h
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp
similarity index 99%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp
rename to knetworkconf/knetworkconf/knetworkconf.cpp
index 4e1bd9b..72430ac 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconf.cpp
+++ b/knetworkconf/knetworkconf/knetworkconf.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconf.cpp - description
+ knetworkconf.cpp - description
-------------------
begin : Sun Jan 12 8:54:19 UTC 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -17,7 +17,7 @@
#include
-#include "knetwortdeconf.h"
+#include "knetworkconf.h"
KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name)
{
@@ -44,7 +44,7 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe
// Register with DCOP - No longer needed as now we are a kcontrol module?
if ( !kapp->dcopClient()->isRegistered() ) {
- kapp->dcopClient()->registerAs( "knetwortdeconf" );
+ kapp->dcopClient()->registerAs( "knetworkconf" );
kapp->dcopClient()->setDefaultObject( objId() );
}
@@ -499,8 +499,8 @@ void KNetworkConf::helpSlot(){
void KNetworkConf::aboutSlot(){
KAboutApplication *about = new KAboutApplication(kapp->aboutData(),0);
- // about->setLogo(locate("icon","knetwortdeconf.png"));
- //tqDebug("locate icon= %s",locate("icon","knetwortdeconf.png").latin1());
+ // about->setLogo(locate("icon","knetworkconf.png"));
+ //tqDebug("locate icon= %s",locate("icon","knetworkconf.png").latin1());
about->show();
}
@@ -1183,4 +1183,4 @@ void KNetworkConf::updateProfileSlot()
}
}
-#include "knetwortdeconf.moc"
+#include "knetworkconf.moc"
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop b/knetworkconf/knetworkconf/knetworkconf.desktop
similarity index 97%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop
rename to knetworkconf/knetworkconf/knetworkconf.desktop
index 7b24479..b7471c1 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconf.desktop
+++ b/knetworkconf/knetworkconf/knetworkconf.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
-Exec=tdesu knetwortdeconf -caption "%c" %i %m
-Icon=knetwortdeconf
-DocPath=knetwortdeconf/index.html
+Exec=tdesu knetworkconf -caption "%c" %i %m
+Icon=knetworkconf
+DocPath=knetworkconf/index.html
Comment=Configure TCP/IP settings
Comment[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
Comment[be]=Наставіць TCP/IP
@@ -67,7 +67,7 @@ Name[bn]=কে-নেটওয়ার্ক-কন্ফ
Name[ne]=केडीई सञ्जाल कन्फिगरेसन
Name[pa]=ਕੇ-ਨੈੱਟਵਰਕ-ਸੰਰਚਨਾ
Name[pt_BR]=KNetworkConf
-Name[sv]=Knetwortdeconf
+Name[sv]=Knetworkconf
Name[th]=ปรับแต่งเครือข่าย - K
GenericName=Configure TCP/IP Settings
GenericName[ar]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h b/knetworkconf/knetworkconf/knetworkconf.h
similarity index 97%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconf.h
rename to knetworkconf/knetworkconf/knetworkconf.h
index 9ce0c29..25ba8e1 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconf.h - description
+ knetworkconf.h - description
-------------------
begin : Sun Jan 12 00:54:19 UTC 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -56,20 +56,20 @@
#include
-#include "knetwortdeconfdlg.h"
+#include "knetworkconfdlg.h"
#include "kadddnsserverdlg.h"
#include "kadddevicecontainer.h"
#include "kadddevicedlg.h"
#include "kadddevicewifiext.h"
#include "knetworkinfo.h"
#include "kroutinginfo.h"
-#include "knetwortdeconfigparser.h"
+#include "knetworkconfigparser.h"
#include "kdnsinfo.h"
#include "kaddknownhostdlg.h"
#include "kknownhostinfo.h"
#include "knetworkinterface.h"
#include "kadddevicedlgextension.h"
-#include "knetwortdeconfiface.h"
+#include "knetworkconfiface.h"
#include "kprofileslistviewtooltip.h"
/** KNetworkConf is the base class of the project */
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui
similarity index 99%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
rename to knetworkconf/knetworkconf/knetworkconfdlg.ui
index a608eb0..2885a7e 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui
+++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui
@@ -1040,7 +1040,7 @@
- knetwortdeconfdlg.ui.h
+ knetworkconfdlg.ui.h
tqlistview.h
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui.h b/knetworkconf/knetworkconf/knetworkconfdlg.ui.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfdlg.ui.h
rename to knetworkconf/knetworkconf/knetworkconfdlg.ui.h
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h b/knetworkconf/knetworkconf/knetworkconfiface.h
similarity index 91%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h
rename to knetworkconf/knetworkconf/knetworkconfiface.h
index e1dc2c9..36dfb14 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfiface.h
+++ b/knetworkconf/knetworkconf/knetworkconfiface.h
@@ -1,6 +1,6 @@
/* -*- c++ -*-
*
- * knetwortdeconfiface.h
+ * knetworkconfiface.h
*
* Copyright (C) 2004 Juan Luis Baptiste
*
@@ -20,8 +20,8 @@
*
*/
-#ifndef knetwortdeconf_iface_h
-#define knetwortdeconf_iface_h
+#ifndef knetworkconf_iface_h
+#define knetworkconf_iface_h
#include
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
similarity index 95%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp
rename to knetworkconf/knetworkconf/knetworkconfigparser.cpp
index 27d236a..73bab37 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconfigparser.cpp - description
+ knetworkconfigparser.cpp - description
-------------------
begin : Mon Jan 13 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#include "knetwortdeconfigparser.h"
-#include "knetwortdeconfigparser.moc"
+#include "knetworkconfigparser.h"
+#include "knetworkconfigparser.moc"
KNetworkConfigParser::KNetworkConfigParser(){
networkInfo = new KNetworkInfo();
@@ -69,7 +69,7 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){
}
}
/** runs gst to find out the state of network devices.It runs the command:
-$knetwortdeconf_home/backends/networtdeconf [--platform platform] -d list_ifaces. */
+$knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces. */
void KNetworkConfigParser::listIfaces(const TQString &platform){
procDetect = new TQProcess(this);
procDetect->addArgument( locate("data",BACKEND_PATH) );
@@ -367,7 +367,7 @@ void KNetworkConfigParser::addNetworkInterfacesToXMLDoc(TQDomDocument *doc, TQDo
//Save in the configuration file the description of the interfaces as
//the backend no longer handles this
- KSimpleConfig cfg("knetwortdeconfrc");
+ KSimpleConfig cfg("knetworkconfrc");
cfg.setGroup("Interfaces");
//Add the network interfaces list
@@ -751,7 +751,7 @@ KNetworkInterface * KNetworkConfigParser::getInterfaceInfo(TQDomElement interfac
tempDevice->setType(type);
TQString description;
- KSimpleConfig cfg("knetwortdeconfrc");
+ KSimpleConfig cfg("knetworkconfrc");
cfg.setGroup("Interfaces");
description = cfg.readEntry(tempDevice->getDeviceName());
if (!description.isEmpty())
@@ -818,7 +818,7 @@ void KNetworkConfigParser::readNetworkInfo()
xmlOuput = xmlOuput.section('\n',1);
tqDebug("--get XML:\n%s",xmlOuput.latin1());
- //If the platform where knetwortdeconf is running isn't supported, show the
+ //If the platform where knetworkconf is running isn't supported, show the
//user a dialog with all the supported platforms to choose.
if (xmlErr.contains("platform_unsup::"))
{
@@ -1083,92 +1083,92 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){
name = name.section(":",1,1);
if (key.contains("debian"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/debian.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/debian.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("mandriva"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/mandriva.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/mandriva.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("conectiva"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/conectiva.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/conectiva.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("pld"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/pld.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/pld.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("redhat"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/redhat.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/redhat.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("suse"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/suse.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/suse.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("turbolinux"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/turbolinux.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/turbolinux.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("fedora"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/fedora.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/fedora.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("openna"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/openna.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/openna.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("slackware"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/slackware.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/slackware.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("freebsd"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/freebsd.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/freebsd.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("gentoo"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/gentoo.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/gentoo.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("blackpanther"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/blackpanther.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/blackpanther.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("rpath"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/rpath.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/rpath.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("vine"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/vine.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/vine.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("ubuntu"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/kubuntu.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/kubuntu.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("yoper"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/yoper.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/yoper.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
else if (key.contains("ark"))
{
- TQPixmap distroImg(locate("data","knetwortdeconf/pixmaps/ark.png"));
+ TQPixmap distroImg(locate("data","knetworkconf/pixmaps/ark.png"));
dialog->klbDistroList->insertItem(distroImg, name);
}
}
@@ -1199,7 +1199,7 @@ void KNetworkConfigParser::showSupportedPlatformsDialogSlot(){
void KNetworkConfigParser::saveAskAgain(const TQString &platform, bool askAgain)
{
- KSimpleConfig cfg("knetwortdeconfrc");
+ KSimpleConfig cfg("knetworkconfrc");
cfg.setGroup("General");
cfg.writeEntry("detectedPlatform",platform);
cfg.writeEntry("askAgainPlatform",askAgain);
@@ -1208,7 +1208,7 @@ void KNetworkConfigParser::saveAskAgain(const TQString &platform, bool askAgain)
bool KNetworkConfigParser::readAskAgain(TQString &platform)
{
- KSimpleConfig cfg("knetwortdeconfrc");
+ KSimpleConfig cfg("knetworkconfrc");
cfg.setGroup("General");
platform = cfg.readEntry("detectedPlatform");
return cfg.readBoolEntry("askAgainPlatform");
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h
similarity index 97%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
rename to knetworkconf/knetworkconf/knetworkconfigparser.h
index a50a741..8e95737 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfigparser.h
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.h
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconfigparser.h - description
+ knetworkconfigparser.h - description
-------------------
begin : Mon Jan 13 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -18,7 +18,7 @@
#ifndef KNETWORKCONFIGPARSER_H
#define KNETWORKCONFIGPARSER_H
-#define BACKEND_PATH "knetwortdeconf/backends/network-conf"
+#define BACKEND_PATH "knetworkconf/backends/network-conf"
#define ETHERNET_IFACE_TYPE "ethernet"
#define WIRELESS_IFACE_TYPE "wireless"
#define LOOPBACK_IFACE_TYPE "loopback"
@@ -83,7 +83,7 @@ class KNetworkConfigParser : public TQObject {
public slots:
/** runs gst to find out the state of network devices.It runs the command:
- $knetwortdeconf_home/backends/networtdeconf [--platform platform] -d list_ifaces */
+ $knetworkconf_home/backends/networkconf [--platform platform] -d list_ifaces */
void listIfaces(const TQString &platform);
private slots:
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
similarity index 89%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp
rename to knetworkconf/knetworkconf/knetworkconfmodule.cpp
index 0982379..93a930c 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconfmodule.cpp - description
+ knetworkconfmodule.cpp - description
-------------------
begin : Tue Apr 1 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -19,7 +19,7 @@
#include
#include
#include
-#include "knetwortdeconfmodule.h"
+#include "knetworkconfmodule.h"
@@ -81,9 +81,9 @@ TQString KNetworkConfModule::rootOnlyMsg() const
TDEAboutData* KNetworkConfModule::aboutData() const
{
- /*TDEAboutData* data = new TDEAboutData( "knetwortdeconf", I18N_NOOP("KNetworkConf"),
+ /*TDEAboutData* data = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, TDEAboutData::License_GPL,
- "(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetwortdeconf/", "jbaptiste@merlinux.org");
+ "(c) 2003, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "jbaptiste@merlinux.org");
data->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
"jbaptiste@merlinux.org");
data->addCredit("David Sansome",I18N_NOOP("Various bugfixes and features"),
@@ -91,9 +91,9 @@ TDEAboutData* KNetworkConfModule::aboutData() const
return data; // Memory leak, oh well...*/
-TDEAboutData *aboutData = new TDEAboutData( "knetwortdeconf", I18N_NOOP("KNetworkConf"),
+TDEAboutData *aboutData = new TDEAboutData( "knetworkconf", I18N_NOOP("KNetworkConf"),
VERSION, description, TDEAboutData::License_GPL,
- "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetwortdeconf/", "juan.baptiste@kdemail.net");
+ "(c) 2003 - 2005, Juan Luis Baptiste", 0, "http://www.merlinux.org/knetworkconf/", "juan.baptiste@kdemail.net");
aboutData->addAuthor("Juan Luis Baptiste",I18N_NOOP("Lead Developer"),
"juan.baptiste@kdemail.net");
aboutData->addCredit("Carlos Garnacho and the Gnome System Tools Team",I18N_NOOP("Provided the Network backend which KNetworkConf relies on."),
@@ -113,6 +113,6 @@ TQString KNetworkConfModule::quickHelp() const
return i18n("%1Network configuration%2This module allows you to configure your TCP/IP settings.%3").arg("").arg("
").arg("
");
}
-//#include "knetwortdeconfmodule.moc"
+//#include "knetworkconfmodule.moc"
-#include "knetwortdeconfmodule.moc"
+#include "knetworkconfmodule.moc"
diff --git a/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h
similarity index 94%
rename from knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h
rename to knetworkconf/knetworkconf/knetworkconfmodule.h
index e4321b9..0e56706 100644
--- a/knetwortdeconf/knetwortdeconf/knetwortdeconfmodule.h
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.h
@@ -1,5 +1,5 @@
/***************************************************************************
- knetwortdeconfmodule.h - description
+ knetworkconfmodule.h - description
-------------------
begin : Tue Apr 1 2003
copyright : (C) 2003 by Juan Luis Baptiste
@@ -18,7 +18,7 @@
#ifndef KNETWORKCONFMODULE_H
#define KNETWORKCONFMODULE_H
-#include "knetwortdeconf.h"
+#include "knetworkconf.h"
#include
#include
diff --git a/knetwortdeconf/knetwortdeconf/knetworkinfo.cpp b/knetworkconf/knetworkconf/knetworkinfo.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/knetworkinfo.cpp
rename to knetworkconf/knetworkconf/knetworkinfo.cpp
diff --git a/knetwortdeconf/knetwortdeconf/knetworkinfo.h b/knetworkconf/knetworkconf/knetworkinfo.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/knetworkinfo.h
rename to knetworkconf/knetworkconf/knetworkinfo.h
diff --git a/knetwortdeconf/knetwortdeconf/knetworkinterface.cpp b/knetworkconf/knetworkconf/knetworkinterface.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/knetworkinterface.cpp
rename to knetworkconf/knetworkconf/knetworkinterface.cpp
diff --git a/knetwortdeconf/knetwortdeconf/knetworkinterface.h b/knetworkconf/knetworkconf/knetworkinterface.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/knetworkinterface.h
rename to knetworkconf/knetworkconf/knetworkinterface.h
diff --git a/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.cpp b/knetworkconf/knetworkconf/kprofileslistviewtooltip.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.cpp
rename to knetworkconf/knetworkconf/kprofileslistviewtooltip.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
similarity index 99%
rename from knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h
rename to knetworkconf/knetworkconf/kprofileslistviewtooltip.h
index deec161..dc30c12 100644
--- a/knetwortdeconf/knetwortdeconf/kprofileslistviewtooltip.h
+++ b/knetworkconf/knetworkconf/kprofileslistviewtooltip.h
@@ -23,7 +23,7 @@
#include
#include "knetworkinfo.h"
-#include "knetwortdeconfigparser.h"
+#include "knetworkconfigparser.h"
class KProfilesListViewToolTip : public TQToolTip
{
diff --git a/knetwortdeconf/knetwortdeconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kreloadnetworkdlg.ui
rename to knetworkconf/knetworkconf/kreloadnetworkdlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/kroutinginfo.cpp b/knetworkconf/knetworkconf/kroutinginfo.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kroutinginfo.cpp
rename to knetworkconf/knetworkconf/kroutinginfo.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kroutinginfo.h b/knetworkconf/knetworkconf/kroutinginfo.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kroutinginfo.h
rename to knetworkconf/knetworkconf/kroutinginfo.h
diff --git a/knetwortdeconf/knetwortdeconf/kwirelessinterface.cpp b/knetworkconf/knetworkconf/kwirelessinterface.cpp
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kwirelessinterface.cpp
rename to knetworkconf/knetworkconf/kwirelessinterface.cpp
diff --git a/knetwortdeconf/knetwortdeconf/kwirelessinterface.h b/knetworkconf/knetworkconf/kwirelessinterface.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/kwirelessinterface.h
rename to knetworkconf/knetworkconf/kwirelessinterface.h
diff --git a/knetwortdeconf/knetwortdeconf/main.cpp b/knetworkconf/knetworkconf/main.cpp
similarity index 83%
rename from knetwortdeconf/knetwortdeconf/main.cpp
rename to knetworkconf/knetworkconf/main.cpp
index d7cded7..710d977 100644
--- a/knetwortdeconf/knetwortdeconf/main.cpp
+++ b/knetworkconf/knetworkconf/main.cpp
@@ -25,8 +25,8 @@
#include
#include
-//#include "knetwortdeconf.h"
-#include "knetwortdeconfmodule.h"
+//#include "knetworkconf.h"
+#include "knetworkconfmodule.h"
#include "version.h"
@@ -36,13 +36,13 @@ static KCmdLineOptions options[] =
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
/*typedef KGenericFactory KDEDFactory;
-K_EXPORT_COMPONENT_FACTORY( knetwortdeconfmodule, KDEDFactory( "kcm_knetwortdeconfmodule" ) ); */
+K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmodule" ) ); */
extern "C"
{
- KDE_EXPORT TDECModule *create_knetwortdeconfmodule(TQWidget *parent, const char *name)
+ KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name)
{
- TDEGlobal::locale()->insertCatalogue("knetwortdeconf");
+ TDEGlobal::locale()->insertCatalogue("knetworkconf");
return new KNetworkConfModule(parent, name);
}
}
diff --git a/knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/tdeselectdistrodlg.ui
rename to knetworkconf/knetworkconf/tdeselectdistrodlg.ui
diff --git a/knetwortdeconf/knetwortdeconf/version.h b/knetworkconf/knetworkconf/version.h
similarity index 100%
rename from knetwortdeconf/knetwortdeconf/version.h
rename to knetworkconf/knetworkconf/version.h
diff --git a/knetwortdeconf/pasosRelease.txt b/knetworkconf/pasosRelease.txt
similarity index 88%
rename from knetwortdeconf/pasosRelease.txt
rename to knetworkconf/pasosRelease.txt
index 2fce150..9abaa5a 100644
--- a/knetwortdeconf/pasosRelease.txt
+++ b/knetworkconf/pasosRelease.txt
@@ -11,4 +11,4 @@ PASOS PARA HACER RELEASE DE KNETWORKCONF:
9. Hacer anuncio en kde-apps.org y freshmeat.net
10. Hacer anuncios en listas de correo:
- Merlinux, Colibri y Linux Anuncio en espaniol
-- kde-announce, knetwortdeconf-announce, kde-debian en ingles
\ No newline at end of file
+- kde-announce, knetworkconf-announce, kde-debian en ingles
\ No newline at end of file
diff --git a/knetwortdeconf/pixmaps/Makefile.am b/knetworkconf/pixmaps/Makefile.am
similarity index 88%
rename from knetwortdeconf/pixmaps/Makefile.am
rename to knetworkconf/pixmaps/Makefile.am
index 0e0e1d8..250a3a7 100644
--- a/knetwortdeconf/pixmaps/Makefile.am
+++ b/knetworkconf/pixmaps/Makefile.am
@@ -1,4 +1,4 @@
-iconsdir = $(kde_datadir)/knetwortdeconf/pixmaps/
+iconsdir = $(kde_datadir)/knetworkconf/pixmaps/
icons_DATA = ark.png debian.png mandriva.png blackpanther.png pld.png \
redhat.png suse.png turbolinux.png conectiva.png fedora.png openna.png \
slackware.png freebsd.png gentoo.png vine.png kubuntu.png yoper.png rpath.png
diff --git a/knetwortdeconf/pixmaps/ark.png b/knetworkconf/pixmaps/ark.png
similarity index 100%
rename from knetwortdeconf/pixmaps/ark.png
rename to knetworkconf/pixmaps/ark.png
diff --git a/knetwortdeconf/pixmaps/blackpanther.png b/knetworkconf/pixmaps/blackpanther.png
similarity index 100%
rename from knetwortdeconf/pixmaps/blackpanther.png
rename to knetworkconf/pixmaps/blackpanther.png
diff --git a/knetwortdeconf/pixmaps/conectiva.png b/knetworkconf/pixmaps/conectiva.png
similarity index 100%
rename from knetwortdeconf/pixmaps/conectiva.png
rename to knetworkconf/pixmaps/conectiva.png
diff --git a/knetwortdeconf/pixmaps/debian.png b/knetworkconf/pixmaps/debian.png
similarity index 100%
rename from knetwortdeconf/pixmaps/debian.png
rename to knetworkconf/pixmaps/debian.png
diff --git a/knetwortdeconf/pixmaps/fedora.png b/knetworkconf/pixmaps/fedora.png
similarity index 100%
rename from knetwortdeconf/pixmaps/fedora.png
rename to knetworkconf/pixmaps/fedora.png
diff --git a/knetwortdeconf/pixmaps/freebsd.png b/knetworkconf/pixmaps/freebsd.png
similarity index 100%
rename from knetwortdeconf/pixmaps/freebsd.png
rename to knetworkconf/pixmaps/freebsd.png
diff --git a/knetwortdeconf/pixmaps/gentoo.png b/knetworkconf/pixmaps/gentoo.png
similarity index 100%
rename from knetwortdeconf/pixmaps/gentoo.png
rename to knetworkconf/pixmaps/gentoo.png
diff --git a/knetwortdeconf/pixmaps/hi22-action-network_connected_lan_knc.png b/knetworkconf/pixmaps/hi22-action-network_connected_lan_knc.png
similarity index 100%
rename from knetwortdeconf/pixmaps/hi22-action-network_connected_lan_knc.png
rename to knetworkconf/pixmaps/hi22-action-network_connected_lan_knc.png
diff --git a/knetwortdeconf/pixmaps/hi22-action-network_disconnected_lan.png b/knetworkconf/pixmaps/hi22-action-network_disconnected_lan.png
similarity index 100%
rename from knetwortdeconf/pixmaps/hi22-action-network_disconnected_lan.png
rename to knetworkconf/pixmaps/hi22-action-network_disconnected_lan.png
diff --git a/knetwortdeconf/pixmaps/hi22-action-network_disconnected_wlan.png b/knetworkconf/pixmaps/hi22-action-network_disconnected_wlan.png
similarity index 100%
rename from knetwortdeconf/pixmaps/hi22-action-network_disconnected_wlan.png
rename to knetworkconf/pixmaps/hi22-action-network_disconnected_wlan.png
diff --git a/knetwortdeconf/pixmaps/hi22-action-network_traffic_wlan.png b/knetworkconf/pixmaps/hi22-action-network_traffic_wlan.png
similarity index 100%
rename from knetwortdeconf/pixmaps/hi22-action-network_traffic_wlan.png
rename to knetworkconf/pixmaps/hi22-action-network_traffic_wlan.png
diff --git a/knetwortdeconf/pixmaps/kubuntu.png b/knetworkconf/pixmaps/kubuntu.png
similarity index 100%
rename from knetwortdeconf/pixmaps/kubuntu.png
rename to knetworkconf/pixmaps/kubuntu.png
diff --git a/knetwortdeconf/pixmaps/mandriva.png b/knetworkconf/pixmaps/mandriva.png
similarity index 100%
rename from knetwortdeconf/pixmaps/mandriva.png
rename to knetworkconf/pixmaps/mandriva.png
diff --git a/knetwortdeconf/pixmaps/openna.png b/knetworkconf/pixmaps/openna.png
similarity index 100%
rename from knetwortdeconf/pixmaps/openna.png
rename to knetworkconf/pixmaps/openna.png
diff --git a/knetwortdeconf/pixmaps/pld.png b/knetworkconf/pixmaps/pld.png
similarity index 100%
rename from knetwortdeconf/pixmaps/pld.png
rename to knetworkconf/pixmaps/pld.png
diff --git a/knetwortdeconf/pixmaps/redhat.png b/knetworkconf/pixmaps/redhat.png
similarity index 100%
rename from knetwortdeconf/pixmaps/redhat.png
rename to knetworkconf/pixmaps/redhat.png
diff --git a/knetwortdeconf/pixmaps/rpath.png b/knetworkconf/pixmaps/rpath.png
similarity index 100%
rename from knetwortdeconf/pixmaps/rpath.png
rename to knetworkconf/pixmaps/rpath.png
diff --git a/knetwortdeconf/pixmaps/slackware.png b/knetworkconf/pixmaps/slackware.png
similarity index 100%
rename from knetwortdeconf/pixmaps/slackware.png
rename to knetworkconf/pixmaps/slackware.png
diff --git a/knetwortdeconf/pixmaps/suse.png b/knetworkconf/pixmaps/suse.png
similarity index 100%
rename from knetwortdeconf/pixmaps/suse.png
rename to knetworkconf/pixmaps/suse.png
diff --git a/knetwortdeconf/pixmaps/turbolinux.png b/knetworkconf/pixmaps/turbolinux.png
similarity index 100%
rename from knetwortdeconf/pixmaps/turbolinux.png
rename to knetworkconf/pixmaps/turbolinux.png
diff --git a/knetwortdeconf/pixmaps/vine.png b/knetworkconf/pixmaps/vine.png
similarity index 100%
rename from knetwortdeconf/pixmaps/vine.png
rename to knetworkconf/pixmaps/vine.png
diff --git a/knetwortdeconf/pixmaps/yoper.png b/knetworkconf/pixmaps/yoper.png
similarity index 100%
rename from knetwortdeconf/pixmaps/yoper.png
rename to knetworkconf/pixmaps/yoper.png
diff --git a/knetwortdeconf/update_backends.sh b/knetworkconf/update_backends.sh
similarity index 100%
rename from knetwortdeconf/update_backends.sh
rename to knetworkconf/update_backends.sh
diff --git a/knetwortdeconf/Makefile.am b/knetwortdeconf/Makefile.am
deleted file mode 100644
index 93aadb2..0000000
--- a/knetwortdeconf/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = knetwortdeconf backends pixmaps
\ No newline at end of file
diff --git a/knetwortdeconf/backends/configure.in.in b/knetwortdeconf/backends/configure.in.in
deleted file mode 100644
index 1d867c1..0000000
--- a/knetwortdeconf/backends/configure.in.in
+++ /dev/null
@@ -1,15 +0,0 @@
-dnl ==============================================================
-dnl Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
-dnl ==============================================================
-KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
-scriptsdir="$KDE_DATADIR/knetwortdeconf/backends"
-
-AC_SUBST(scriptsdir)
-
-dnl ==============================================================
-dnl END: Set SCRIPTS_DIR, FILES_DIR & LOCALE_DIR
-dnl ==============================================================
-
-dnl Keep the comment on the line below, it works that way.
-dnl AC_OUTPUT(knetwortdeconf/backends/system-tools-backends.pc knetwortdeconf/backends/network-conf knetwortdeconf/backends/debug.pl knetwortdeconf/backends/file.pl knetwortdeconf/backends/general.pl knetwortdeconf/backends/network.pl knetwortdeconf/backends/parse.pl knetwortdeconf/backends/platform.pl knetwortdeconf/backends/process.pl knetwortdeconf/backends/replace.pl knetwortdeconf/backends/report.pl knetwortdeconf/backends/service-list.pl knetwortdeconf/backends/service.pl knetwortdeconf/backends/util.pl knetwortdeconf/backends/xml.pl)
-echo "Backend configured."
diff --git a/knetwortdeconf/knetwortdeconf/Makefile.am b/knetwortdeconf/knetwortdeconf/Makefile.am
deleted file mode 100644
index 6df330e..0000000
--- a/knetwortdeconf/knetwortdeconf/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# set the include path for X, qt and KDE
-#INCLUDES= $(all_includes)
-AM_CPPFLAGS = $(all_includes)
-
-# We use deprecated routines in QButton, undefine QT_NO_COMPAT.
-KDE_CXXFLAGS = -UQT_NO_COMPAT
-
-METASOURCES = AUTO
-#bin_PROGRAMS = knetwortdeconf
-
-kde_module_LTLIBRARIES = kcm_knetwortdeconfmodule.la
-
-kcm_knetwortdeconfmodule_la_LIBADD = $(LIB_TDEUI)
-
-# the library search path.
-kcm_knetwortdeconfmodule_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-
-## INCLUDES were found outside tdevelop specific part
-
-kcm_knetwortdeconfmodule_la_SOURCES = tdeselectdistrodlg.ui kknownhostinfo.cpp \
- kinterfaceupdowndlg.ui kaddknownhostdlg.ui kdetectdistrodlg.ui knetwortdeconfmodule.cpp \
- kroutinginfo.cpp kreloadnetworkdlg.ui kaddressvalidator.cpp kdnsinfo.cpp \
- knetworkinfo.cpp kadddevicedlg.ui kadddnsserverdlg.ui knetwortdeconfigparser.cpp \
- knetworkinterface.cpp knetwortdeconfdlg.ui knetwortdeconf.cpp main.cpp kadddevicedlgextension.ui \
- knetwortdeconfiface.skel kwirelessinterface.cpp kadddevicewifiext.ui kadddevicecontainer.cpp \
- kprofileslistviewtooltip.cpp
-
-
-EXTRA_DIST = main.cpp knetwortdeconf.cpp knetwortdeconf.h knetwortdeconf.desktop cr16-app-knetwortdeconf.png cr22-app-knetwortdeconf.png cr32-app-knetwortdeconf.png knetwortdeconfdlg.ui knetworkinterface.cpp knetworkinterface.h knetwortdeconfigparser.cpp knetwortdeconfigparser.h kadddnsserverdlg.ui kadddevicedlg.ui knetworkinfo.cpp knetworkinfo.h kdnsinfo.cpp kdnsinfo.h kaddressvalidator.cpp kaddressvalidator.h kreloadnetworkdlg.ui network_card.png kroutinginfo.cpp kroutinginfo.h knetwortdeconfmodule.cpp knetwortdeconfmodule.h kdetectdistrodlg.ui kaddknownhostdlg.ui kinterfaceupdowndlg.ui kadddnsserverdlg.ui.h kadddevicedlg.ui.h kaddknownhostdlg.ui.h kknownhostinfo.cpp kknownhostinfo.h tdeselectdistrodlg.ui kcm_knetwortdeconfmodule version.h
-
-xdg_apps_DATA = kcm_knetwortdeconfmodule.desktop
-
-KDE_ICON = AUTO
-
-messages: rc.cpp
- LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
- if test -n "$$LIST"; then \
- $(XGETTEXT) $$LIST -o $(podir)/knetwortdeconf.pot; \
- fi
-
-noinst_HEADERS = kprofileslistviewtooltip.h
diff --git a/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule b/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule
deleted file mode 100644
index dd4137d..0000000
--- a/knetwortdeconf/knetwortdeconf/kcm_knetwortdeconfmodule
+++ /dev/null
@@ -1 +0,0 @@
-?package(local.kcm_knetwortdeconfmodule.desktop):needs="x11" kde_filename="kcm_knetwortdeconfmodule" section="System/Configuration/KDE/Network" command="tdecmshell kcm_knetwortdeconfmodule" icon="locolor/32x32/apps/knetwortdeconf.png" longtitle="Configure your Network settings" title="Network Settings" kde_opt="Encoding=UTF-8\\nX-TDE-RootOnly=true\\nX-TDE-ModuleType=Library\\nX-TDE-Library=knetwortdeconfmodule\\nX-TDE-FactoryName=knetwortdeconfmodule\\nX-TDE-ParentApp=kcontrol\\nType=Application\\nDocPath=knetwortdeconf/index.docbook\\nComment[es]=Configurar las propiedades de Red\\nComment[de]=Netzwerkschnittstellen konfigurieren\\nTerminal=0\\nName[es]=Propiedades de Red\\nName[de]=Netzwerkschnittstellen konfigurieren\\nGenericName=Configure TCP/IP settings\\nGenericName[es]=Configurar las propiedades de red\\nKeywords=Network,DNS,routes,interfaces\\n"