Fix accidental networtde renames

remotes/gitea/gg-tdeadmin-kcron
Timothy Pearson 12 years ago
parent e79e4b9225
commit f5ca1166fd

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

@ -0,0 +1,4 @@
KDE_LANG = en
KDE_DOCS = knetworkconf

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY knetwortdeconf "<application>KNetworkConf</application>">
<!ENTITY kappname "&knetwortdeconf;">
<!ENTITY knetworkconf "<application>KNetworkConf</application>">
<!ENTITY kappname "&knetworkconf;">
<!ENTITY package "tdeadmin">
<!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
@ -65,7 +65,7 @@ document.</revremark>
<releaseinfo>1.0</releaseinfo>
<abstract>
<para>This manual explains how to install and use &knetwortdeconf;, a module for
<para>This manual explains how to install and use &knetworkconf;, a module for
&kcontrolcenter; that enables management of Network Interfaces, Routing and DNS
properties.</para>
</abstract>
@ -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
<menuchoice><guimenu>TDE Menu</guimenu><guimenuitem>&kcontrolcenter;</guimenuitem></menuchoice>.</para>
<para>The &knetwortdeconf; package was developed to enable users to manage TCP/IP
<para>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:</para>
<itemizedlist>
@ -117,7 +117,7 @@ interface from which to perform the following tasks:</para>
<para>Once installed a new module called <guimenuitem>Network
Settings</guimenuitem> is displayed in the &kcontrolcenter;.
To start the <application>Network Settings</application> (&knetwortdeconf;) module select <menuchoice>
To start the <application>Network Settings</application> (&knetworkconf;) module select <menuchoice>
<guimenuitem>&kcontrolcenter;</guimenuitem> <guimenuitem>Internet &amp; Network</guimenuitem>
<guimenuitem>Network Settings</guimenuitem> </menuchoice> in the &kmenu;.</para>
@ -126,13 +126,13 @@ To start the <application>Network Settings</application> (&knetwortdeconf;) modu
<imagedata fileref="11.png" format="PNG"/>
</imageobject>
<textobject>
<phrase>&knetwortdeconf; in user mode</phrase>
<phrase>&knetworkconf; in user mode</phrase>
</textobject>
</mediaobject>
<para>It is important to understand that &knetwortdeconf; cannot install
<para>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.</para>
<para>In most cases drivers for networking hardware and other devices are
@ -211,14 +211,14 @@ click the <guibutton>Administrator Mode</guibutton> button located bottom
left of the module. Enter your password when prompted.</para>
<screenshot>
<screeninfo>&knetwortdeconf; in administrator mode</screeninfo>
<screeninfo>&knetworkconf; in administrator mode</screeninfo>
<mediaobject>
<imageobject>
<imagedata fileref="01.png"
format="PNG"/>
</imageobject>
<textobject>
<phrase>&knetwortdeconf; in administrator mode</phrase>
<phrase>&knetworkconf; in administrator mode</phrase>
</textobject>
</mediaobject>
</screenshot>
@ -277,7 +277,7 @@ fileref="03.png"
format="PNG"/>
</imageobject>
<textobject>
<phrase>The &knetwortdeconf; interface</phrase>
<phrase>The &knetworkconf; interface</phrase>
</textobject>
</mediaobject>
@ -748,8 +748,8 @@ following command.</para>
<title>How to obtain knetwork-conf</title>
<para>knetwork-conf's home page is at <ulink
url="http://knetwortdeconf.sourceforge.net"
>http://knetwortdeconf.sourceforge.net</ulink> where you at least can download
url="http://knetworkconf.sourceforge.net"
>http://knetworkconf.sourceforge.net</ulink> where you at least can download
source packages. </para>
</sect1>
@ -778,7 +778,7 @@ packages. Install them from &konsole; using
installed; you also need the development packages which include libraries
and other stuff. </para>
<para>Recommended for advanced users only. Otherwise, compiling &knetwortdeconf;
<para>Recommended for advanced users only. Otherwise, compiling &knetworkconf;
is not difficult. The following commands should do it.</para>
<screen>
@ -801,7 +801,7 @@ let us know.</para>
<para>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. </para>
on your disk which can be changed by &knetworkconf; will be discussed. </para>
<sect1 id="networking-overview">
<title>IPv4 Networking</title>
@ -894,7 +894,7 @@ gateway-computer. </para>
<title>Configuration files</title>
<para>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. </para>
<sect2 id="resolv.conf">

@ -1,4 +0,0 @@
KDE_LANG = en
KDE_DOCS = knetwortdeconf

@ -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 \

@ -2,7 +2,7 @@ KNetworkConf 0.6.1 - Un m
para configurar las propiedades de red.
Juan Luis Baptiste M. <juan.baptiste@kdemail.net>
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.

@ -0,0 +1 @@
SUBDIRS = knetworkconf backends pixmaps

@ -1,7 +1,7 @@
KNetworkConf 0.6.1 - A KDE control Center Module to confiure Network settings.
Juan Luis Baptiste M. <juan.baptiste@kdemail.net>
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.

@ -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."

@ -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

@ -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 <geiseri@msoe.edu>
%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

@ -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

@ -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"

@ -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]=إعداد تعيينات الشبكة

@ -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 <kiconloader.h>
#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"

@ -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]=إعداد تعيينات ميفاق التحكم بلنقل/ميفاق الإنترنت

@ -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 <dcopclient.h>
#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 */

@ -1040,7 +1040,7 @@
</connection>
</connections>
<includes>
<include location="local" impldecl="in implementation">knetwortdeconfdlg.ui.h</include>
<include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include>
<include location="local" impldecl="in declaration">tqlistview.h</include>
</includes>
<Q_SLOTS>

@ -1,6 +1,6 @@
/* -*- c++ -*-
*
* knetwortdeconfiface.h
* knetworkconfiface.h
*
* Copyright (C) 2004 Juan Luis Baptiste <juan.baptiste@kdemail.net>
*
@ -20,8 +20,8 @@
*
*/
#ifndef knetwortdeconf_iface_h
#define knetwortdeconf_iface_h
#ifndef knetworkconf_iface_h
#define knetworkconf_iface_h
#include <dcopobject.h>

@ -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");

@ -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:

@ -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 <tdecmodule.h>
#include <tqlayout.h>
#include <version.h>
#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("<h1>").arg("</h1><p>").arg("</p>");
}
//#include "knetwortdeconfmodule.moc"
//#include "knetworkconfmodule.moc"
#include "knetwortdeconfmodule.moc"
#include "knetworkconfmodule.moc"

@ -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 <kaboutdata.h>
#include <tdecmodule.h>

@ -23,7 +23,7 @@
#include <tqptrlist.h>
#include "knetworkinfo.h"
#include "knetwortdeconfigparser.h"
#include "knetworkconfigparser.h"
class KProfilesListViewToolTip : public TQToolTip
{

@ -25,8 +25,8 @@
#include <kglobal.h>
#include <kgenericfactory.h>
//#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<KNetworkConfModule> 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);
}
}

@ -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
- kde-announce, knetworkconf-announce, kde-debian en ingles

@ -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

Before

Width:  |  Height:  |  Size: 802 B

After

Width:  |  Height:  |  Size: 802 B

Before

Width:  |  Height:  |  Size: 944 B

After

Width:  |  Height:  |  Size: 944 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 698 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 765 B

Before

Width:  |  Height:  |  Size: 853 B

After

Width:  |  Height:  |  Size: 853 B

Before

Width:  |  Height:  |  Size: 743 B

After

Width:  |  Height:  |  Size: 743 B

Before

Width:  |  Height:  |  Size: 682 B

After

Width:  |  Height:  |  Size: 682 B

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 443 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 793 B

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 749 B

Before

Width:  |  Height:  |  Size: 944 B

After

Width:  |  Height:  |  Size: 944 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -1 +0,0 @@
SUBDIRS = knetwortdeconf backends pixmaps

@ -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."

@ -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

@ -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"
Loading…
Cancel
Save