[Kmyirc-cvs] kmyirc-ng/src ircdefault.ui,NONE,1.1 kmiircdefault.cpp,NONE,1.1 kmiircdefault.h,NONE,1.1 Makefile.am,1.10,1.11 Makefile.in,1.14,1.15 avatardlg.ui,1.4,1.5 kmiavatardlg.cpp,1.5,1.6 kmigeneralcfg.cpp,1.1,1.2 kmigeneralcfg.h,1.2,1.3 kmiircservercfg.cpp,1.10,1.11 kmyirc.cpp,1.4,1.5 main.cpp,1.3,1.4 pref.cpp,1.5,1.6 pref.h,1.4,1.5

[<she...@us...>]

Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8137/src

Modified Files:
	Makefile.am Makefile.in avatardlg.ui kmiavatardlg.cpp 
	kmigeneralcfg.cpp kmigeneralcfg.h kmiircservercfg.cpp 
	kmyirc.cpp main.cpp pref.cpp pref.h 
Added Files:
	ircdefault.ui kmiircdefault.cpp kmiircdefault.h 
Log Message:
see comment before


--- NEW FILE: ircdefault.ui ---
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>ircDefault</class>
<widget class="QWidget">
    <property name="name">
        <cstring>ircDefault</cstring>
    </property>
    <property name="geometry">
        <rect>
            <x>0</x>
            <y>0</y>
            <width>220</width>
            <height>180</height>
        </rect>
    </property>
    <property name="caption">
        <string></string>
    </property>
    <grid>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <widget class="QLabel" row="0" column="0">
            <property name="name">
                <cstring>textLabel1</cstring>
            </property>
            <property name="text">
                <string>Default &amp;Nickname:</string>
            </property>
            <property name="buddy" stdset="0">
                <cstring>leDefNickname</cstring>
            </property>
        </widget>
        <widget class="KLineEdit" row="1" column="0">
            <property name="name">
                <cstring>leDefNickname</cstring>
            </property>
        </widget>
        <widget class="KLineEdit" row="5" column="0">
            <property name="name">
                <cstring>leDefUsername</cstring>
            </property>
        </widget>
        <widget class="QLabel" row="4" column="0">
            <property name="name">
                <cstring>textLabel2</cstring>
            </property>
            <property name="text">
                <string>Default &amp;Username:</string>
            </property>
            <property name="buddy" stdset="0">
                <cstring>leDefUsername</cstring>
            </property>
        </widget>
        <widget class="KLineEdit" row="3" column="0">
            <property name="name">
                <cstring>leDefAltNickname</cstring>
            </property>
        </widget>
        <widget class="QLabel" row="2" column="0">
            <property name="name">
                <cstring>textLabel3</cstring>
            </property>
            <property name="text">
                <string>Default a&amp;lternative nickname:</string>
            </property>
            <property name="buddy" stdset="0">
                <cstring>leDefAltNickname</cstring>
            </property>
        </widget>
    </grid>
</widget>
<tabstops>
    <tabstop>leDefNickname</tabstop>
    <tabstop>leDefAltNickname</tabstop>
    <tabstop>leDefUsername</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
    <includehint>klineedit.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>klineedit.h</includehint>
</includehints>
</UI>

--- NEW FILE: kmiircdefault.cpp ---


#include "kmiircdefault.h"
#include "klineedit.h"
KMIIrcDefault::KMIIrcDefault(QWidget* parent, const char* name)
: ircDefault(parent,name)
{
}

KMIIrcDefault::~KMIIrcDefault()
{
}

/*!
    \fn KMIIrcDefault::defaultAltNickname()
 */
QString KMIIrcDefault::defaultAltNickname()
{
	return leDefAltNickname->text();
}

/*!
    \fn KMIIrcDefault::defaultNickname()
 */
QString KMIIrcDefault::defaultNickname()
{
	return leDefNickname->text();
}

/*!
    \fn KMIIrcDefault::defaultUsername()
 */
QString KMIIrcDefault::defaultUsername()
{
	return leDefUsername->text();
}

/*!
    \fn KMIIrcDefault::setDefaultAltNickname(const QString &)
 */
void KMIIrcDefault::setDefaultAltNickname(const QString &text)
{
	leDefAltNickname->setText(text);
}

/*!
    \fn KMIIrcDefault::setDefaultNickname(const QString &)
 */
void KMIIrcDefault::setDefaultNickname(const QString &text)
{
	leDefNickname->setText(text);
}

/*!
    \fn KMIIrcDefault::setDefaultUsername(const QString &)
 */
void KMIIrcDefault::setDefaultUsername(const QString &text)
{
	leDefUsername->setText(text);
}







/*$SPECIALIZATION$*/

#include "kmiircdefault.moc"


--- NEW FILE: kmiircdefault.h ---

#ifndef KMIIRCDEFAULT_H
#define KMIIRCDEFAULT_H

#include "ircdefault.h"

class KMIIrcDefault : public ircDefault
{
  Q_OBJECT

public:
  KMIIrcDefault(QWidget* parent = 0, const char* name = 0 );
  ~KMIIrcDefault();
  /*$PUBLIC_FUNCTIONS$*/

public slots:
  /*$PUBLIC_SLOTS$*/

protected:
  /*$PROTECTED_FUNCTIONS$*/

protected slots:
  /*$PROTECTED_SLOTS$*/


    public: QString defaultAltNickname();
    public: QString defaultNickname();
    public: QString defaultUsername();
    public: void setDefaultAltNickname(const QString &);
    public: void setDefaultNickname(const QString &);
    public: void setDefaultUsername(const QString &);
};

#endif


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	18 May 2003 13:31:14 -0000	1.10
+++ Makefile.am	2 Jun 2003 08:44:03 -0000	1.11
@@ -14,7 +14,7 @@
 kmyirc_LDADD   = $(LIB_KFILE) $(LIB_KDEPRINT)
 
 # which sources should be compiled for kmyirc
-kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp
+kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h

Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile.in	6 May 2003 07:49:20 -0000	1.14
+++ Makefile.in	2 Jun 2003 08:44:04 -0000	1.15
@@ -264,9 +264,9 @@
 kmyirc_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT)
 
 # which sources should be compiled for kmyirc
-#>- kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp
+#>- kmyirc_SOURCES = main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmyirciface.skel ircservercfg.ui kmiircservercfg.cpp kmiircservercfg.h groupdlg.ui kmigroupdlg.cpp kmigroupdlg.h serverdlg.ui kmiserverdlg.cpp kmiserverdlg.h avatardlg.ui kmiavatardlg.cpp kmiavatardlg.h nickname.ui kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h
 #>+ 1
-kmyirc_SOURCES=main.cpp kmyirc.cpp kmyircview.cpp pref.cpp   kmiircservercfg.cpp kmiircservercfg.h  kmigroupdlg.cpp kmigroupdlg.h  kmiserverdlg.cpp kmiserverdlg.h  kmiavatardlg.cpp kmiavatardlg.h  kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp
+kmyirc_SOURCES=main.cpp kmyirc.cpp kmyircview.cpp pref.cpp   kmiircservercfg.cpp kmiircservercfg.h  kmigroupdlg.cpp kmigroupdlg.h  kmiserverdlg.cpp kmiserverdlg.h  kmiavatardlg.cpp kmiavatardlg.h  kminickdlg.cpp kminickdlg.h kmiircmessage.h kmiircmessage.cpp kmiircsocket.h kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp  kmiircdefault.cpp kmiircdefault.h kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h
@@ -299,16 +299,18 @@
 	pref.$(OBJEXT) kmiircservercfg.$(OBJEXT) kmigroupdlg.$(OBJEXT) \
 	kmiserverdlg.$(OBJEXT) kmiavatardlg.$(OBJEXT) \
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
-	kmiircsocket.$(OBJEXT)
+	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
+	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT)
 #>- kmyirc_OBJECTS = $(am_kmyirc_OBJECTS)
-#>+ 9
+#>+ 10
 kmyirc_final_OBJECTS = kmyirc.all_cpp.o 
 kmyirc_nofinal_OBJECTS = main.$(OBJEXT) kmyirc.$(OBJEXT) kmyircview.$(OBJEXT) \
 	pref.$(OBJEXT) kmiircservercfg.$(OBJEXT) kmigroupdlg.$(OBJEXT) \
 	kmiserverdlg.$(OBJEXT) kmiavatardlg.$(OBJEXT) \
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
-	kmiircsocket.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT)\
-kmiircsocket.moc.o kmiircmessage.moc.o 
+	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
+	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(OBJEXT)\
+kmiircsocket.moc.o kmigeneralcfg.moc.o 
 @KDE_USE_FINAL_FALSE@kmyirc_OBJECTS = $(kmyirc_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kmyirc_OBJECTS = $(kmyirc_final_OBJECTS)
 kmyirc_DEPENDENCIES =
@@ -326,34 +328,43 @@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircsocket.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kminickdlg.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po ./$(DEPDIR)/kmyirc.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kmyirc_client.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmisocket.Po ./$(DEPDIR)/kmisystray.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/pref.Po
-#>+ 21
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmiircmessage.moc.P  $(DEPDIR)/kmyirc.all_cpp.P $(DEPDIR)/kmyirc_client.all_cpp.P  ./$(DEPDIR)/kmiavatardlg.Po \
+#>+ 27
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  $(DEPDIR)/kmyirc.all_cpp.P $(DEPDIR)/kmyirc_client.all_cpp.P  ./$(DEPDIR)/kmiavatardlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircsocket.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kminickdlg.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po ./$(DEPDIR)/kmyirc.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyirc_client.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmisocket.Po ./$(DEPDIR)/kmisystray.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/pref.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmiircmessage.moc.P  ./$(DEPDIR)/kmiavatardlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/kmyirciface_skel.P $(DEPDIR)/ircservercfg.P $(DEPDIR)/groupdlg.P $(DEPDIR)/serverdlg.P $(DEPDIR)/avatardlg.P $(DEPDIR)/nickname.P $(DEPDIR)/ircdefault.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  ./$(DEPDIR)/kmiavatardlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircdefault.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircmessage.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircservercfg.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiircsocket.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kminickdlg.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po ./$(DEPDIR)/kmyirc.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyirc_client.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiserverdlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmisocket.Po ./$(DEPDIR)/kmisystray.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/pref.Po
 
@@ -450,12 +461,16 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiavatardlg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmigeneralcfg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmigroupdlg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircdefault.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircmessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircservercfg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiircsocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kminickdlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiserverdlg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmisocket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmisystray.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmyirc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmyirc_client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmyircview.Po@am__quote@
@@ -567,7 +582,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=kmyirc.desktop hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h groupdlg.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm nickname.ui 
+KDE_DIST=kmyirc.desktop kmigeneralcfg.h hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui groupdlg.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -648,9 +663,7 @@
 
 info-am:
 
-#>- install-data-am: install-kdelnkDATA install-rcDATA
-#>+ 1
-install-data-am: install-kde-icons  install-kdelnkDATA install-rcDATA
+install-data-am: install-kdelnkDATA install-rcDATA
 
 install-exec-am: install-binPROGRAMS
 
@@ -669,10 +682,7 @@
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
-#>- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-#>- 	uninstall-kdelnkDATA uninstall-rcDATA
-#>+ 2
-uninstall-am: uninstall-kde-icons  uninstall-binPROGRAMS uninstall-info-am \
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
 	uninstall-kdelnkDATA uninstall-rcDATA
 
 .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
@@ -701,7 +711,7 @@
 kmyirciface_skel.cpp: kmyirciface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmyirciface.kidl
 
-#>+ 66
+#>+ 79
 ircservercfg.cpp: $(srcdir)/ircservercfg.ui ircservercfg.h ircservercfg.moc
 	rm -f ircservercfg.cpp
 	echo '#include <klocale.h>' > ircservercfg.cpp
@@ -767,6 +777,23 @@
 
 nickname.moc: nickname.h
 	$(MOC) nickname.h -o nickname.moc
+ircdefault.cpp: $(srcdir)/ircdefault.ui ircdefault.h ircdefault.moc
+	rm -f ircdefault.cpp
+	echo '#include <klocale.h>' > ircdefault.cpp
+	$(UIC) -tr ${UIC_TR} -i ircdefault.h $(srcdir)/ircdefault.ui > ircdefault.cpp.temp ; ret=$$?; \
+	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" ircdefault.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_ircdefault,g" >> ircdefault.cpp ;\
+	rm -f ircdefault.cpp.temp ;\
+	if test "$$ret" = 0; then echo '#include "ircdefault.moc"' >> ircdefault.cpp; else rm -f ircdefault.cpp ; exit $$ret ; fi
+
+ircdefault.h: $(srcdir)/ircdefault.ui
+	$(UIC) -o ircdefault.h $(srcdir)/ircdefault.ui
+
+ircdefault.moc: ircdefault.h
+	$(MOC) ircdefault.h -o ircdefault.moc
+
+#>+ 3
+kmiircdefault.moc: $(srcdir)/kmiircdefault.h
+	$(MOC) $(srcdir)/kmiircdefault.h -o kmiircdefault.moc
 
 #>+ 3
 kmyircview.moc: $(srcdir)/kmyircview.h
@@ -781,14 +808,22 @@
 	$(MOC) $(srcdir)/kmiircsocket.h -o kmiircsocket.moc.cpp
 
 #>+ 3
-kmigroupdlg.moc: $(srcdir)/kmigroupdlg.h
-	$(MOC) $(srcdir)/kmigroupdlg.h -o kmigroupdlg.moc
+kmigeneralcfg.moc.cpp: $(srcdir)/kmigeneralcfg.h
+	$(MOC) $(srcdir)/kmigeneralcfg.h -o kmigeneralcfg.moc.cpp
 
 #>+ 3
 pref.moc: $(srcdir)/pref.h
 	$(MOC) $(srcdir)/pref.h -o pref.moc
 
 #>+ 3
+kmigroupdlg.moc: $(srcdir)/kmigroupdlg.h
+	$(MOC) $(srcdir)/kmigroupdlg.h -o kmigroupdlg.moc
+
+#>+ 3
+kmisystray.moc: $(srcdir)/kmisystray.h
+	$(MOC) $(srcdir)/kmisystray.h -o kmisystray.moc
+
+#>+ 3
 kmiserverdlg.moc: $(srcdir)/kmiserverdlg.h
 	$(MOC) $(srcdir)/kmiserverdlg.h -o kmiserverdlg.moc
 
@@ -797,49 +832,43 @@
 	$(MOC) $(srcdir)/kminickdlg.h -o kminickdlg.moc
 
 #>+ 3
-kmiircservercfg.moc: $(srcdir)/kmiircservercfg.h
-	$(MOC) $(srcdir)/kmiircservercfg.h -o kmiircservercfg.moc
+kmisocket.moc: $(srcdir)/kmisocket.h
+	$(MOC) $(srcdir)/kmisocket.h -o kmisocket.moc
 
 #>+ 3
 kmiavatardlg.moc: $(srcdir)/kmiavatardlg.h
 	$(MOC) $(srcdir)/kmiavatardlg.h -o kmiavatardlg.moc
 
 #>+ 3
-kmiircmessage.moc.cpp: $(srcdir)/kmiircmessage.h
-	$(MOC) $(srcdir)/kmiircmessage.h -o kmiircmessage.moc.cpp
+kmiircservercfg.moc: $(srcdir)/kmiircservercfg.h
+	$(MOC) $(srcdir)/kmiircservercfg.h -o kmiircservercfg.moc
+
+#>+ 3
+kmiircmessage.moc: $(srcdir)/kmiircmessage.h
+	$(MOC) $(srcdir)/kmiircmessage.h -o kmiircmessage.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigroupdlg.moc pref.moc kmiserverdlg.moc kminickdlg.moc kmiircservercfg.moc kmiavatardlg.moc kmiircmessage.moc.cpp
+	-rm -f  kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp pref.moc kmigroupdlg.moc kmisystray.moc kmiserverdlg.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
 
 #>+ 4
 clean-idl:
 	-rm -f \
 	kmyirciface_skel.cpp kmyirciface_skel.h kmyirciface.kidl 
 
-#>+ 8
+#>+ 9
 clean-ui:
 	-rm -f \
 	ircservercfg.cpp ircservercfg.h ircservercfg.moc \
 	groupdlg.cpp groupdlg.h groupdlg.moc \
 	serverdlg.cpp serverdlg.h serverdlg.moc \
 	avatardlg.cpp avatardlg.h avatardlg.moc \
-	nickname.cpp nickname.h nickname.moc 
+	nickname.cpp nickname.h nickname.moc \
+	ircdefault.cpp ircdefault.h ircdefault.moc 
 
 #>+ 2
 docs-am:
 
-#>+ 10
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmyirc.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmyirc.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmyirc.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmyirc.png
-
 #>+ 6
 force-reedit:
 		cd $(top_srcdir) && \
@@ -858,11 +887,11 @@
 	test ! -s bchecktest.cc.oldclass || test ! -s bchecktest.cc.class || cmp -s bchecktest.cc.oldclass bchecktest.cc.class
 
 #>+ 11
-kmyirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmyirc.cpp $(srcdir)/kmyircview.cpp $(srcdir)/pref.cpp $(srcdir)/kmiircservercfg.cpp $(srcdir)/kmigroupdlg.cpp $(srcdir)/kmiserverdlg.cpp $(srcdir)/kmiavatardlg.cpp $(srcdir)/kminickdlg.cpp $(srcdir)/kmiircmessage.cpp $(srcdir)/kmiircsocket.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp kmiircsocket.moc.cpp kmiircmessage.moc.cpp  kmyirc.moc kmyircview.moc avatardlg.moc nickname.moc groupdlg.moc pref.moc kmigroupdlg.moc kmiserverdlg.moc kminickdlg.moc kmiavatardlg.moc kmiircservercfg.moc ircservercfg.moc serverdlg.moc
+kmyirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmyirc.cpp $(srcdir)/kmyircview.cpp $(srcdir)/pref.cpp $(srcdir)/kmiircservercfg.cpp $(srcdir)/kmigroupdlg.cpp $(srcdir)/kmiserverdlg.cpp $(srcdir)/kmiavatardlg.cpp $(srcdir)/kminickdlg.cpp $(srcdir)/kmiircmessage.cpp $(srcdir)/kmiircsocket.cpp $(srcdir)/kmisystray.cpp $(srcdir)/kmisocket.cpp $(srcdir)/kmigeneralcfg.cpp $(srcdir)/kmiircdefault.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp  kmyirc.moc kmyircview.moc ircdefault.moc kmigroupdlg.moc kmiserverdlg.moc kmiircmessage.moc ircservercfg.moc serverdlg.moc kmiircdefault.moc avatardlg.moc nickname.moc groupdlg.moc pref.moc kmisystray.moc kminickdlg.moc kmisocket.moc kmiircservercfg.moc kmiavatardlg.moc
 	@echo 'creating kmyirc.all_cpp.cpp ...'; \
 	rm -f kmyirc.all_cpp.files kmyirc.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kmyirc.all_cpp.final; \
-	for file in main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmiircservercfg.cpp kmigroupdlg.cpp kmiserverdlg.cpp kmiavatardlg.cpp kminickdlg.cpp kmiircmessage.cpp kmiircsocket.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp kmiircsocket.moc.cpp kmiircmessage.moc.cpp ; do \
+	for file in main.cpp kmyirc.cpp kmyircview.cpp pref.cpp kmiircservercfg.cpp kmigroupdlg.cpp kmiserverdlg.cpp kmiavatardlg.cpp kminickdlg.cpp kmiircmessage.cpp kmiircsocket.cpp kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp kmiircdefault.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp ; do \
 	  echo "#include \"$$file\"" >> kmyirc.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmyirc.all_cpp.final; \
 	done; \
@@ -870,11 +899,11 @@
 	rm -f kmyirc.all_cpp.final kmyirc.all_cpp.files
 
 #>+ 11
-kmyirc_client.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmyirc_client.cpp kmiircsocket.moc.cpp kmiircmessage.moc.cpp 
+kmyirc_client.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmyirc_client.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp 
 	@echo 'creating kmyirc_client.all_cpp.cpp ...'; \
 	rm -f kmyirc_client.all_cpp.files kmyirc_client.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kmyirc_client.all_cpp.final; \
-	for file in kmyirc_client.cpp kmiircsocket.moc.cpp kmiircmessage.moc.cpp ; do \
+	for file in kmyirc_client.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp ; do \
 	  echo "#include \"$$file\"" >> kmyirc_client.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmyirc_client.all_cpp.final; \
 	done; \
@@ -905,40 +934,53 @@
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 37
+#>+ 50
 kmyircview.o: kmyircview.moc 
-$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+kmiircdefault.o: kmiircdefault.moc 
+$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+kmisocket.o: kmisocket.moc 
 kmigroupdlg.lo: kmigroupdlg.moc 
-$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmiircdefault.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 kmiircservercfg.o: kmiircservercfg.moc 
+kmisystray.lo: kmisystray.moc 
+kmisystray.o: kmisystray.moc 
 kmiserverdlg.o: kmiserverdlg.moc 
 nmcheck-am: nmcheck
-$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 pref.lo: pref.moc 
 kmiserverdlg.lo: kmiserverdlg.moc 
+$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 kmyirc.lo: kmyirc.moc 
-$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+kmiircmessage.o: kmiircmessage.moc 
 kminickdlg.lo: kminickdlg.moc 
-$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 kminickdlg.o: kminickdlg.moc 
+$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 kmiircservercfg.lo: kmiircservercfg.moc 
 kmiavatardlg.o: kmiavatardlg.moc 
 kmyircview.lo: kmyircview.moc 
-$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmisocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+kmisocket.lo: kmisocket.moc 
+$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 nmcheck: 
-$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
-$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+$(srcdir)/kmiircdefault.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
+$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 kmyirc.o: kmyirc.moc 
-$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h 
+kmiircdefault.lo: kmiircdefault.moc 
+$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h 
 pref.o: pref.moc 
+kmiircmessage.lo: kmiircmessage.moc 
 kmiavatardlg.lo: kmiavatardlg.moc 
 kmigroupdlg.o: kmigroupdlg.moc 

Index: avatardlg.ui
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/avatardlg.ui,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- avatardlg.ui	29 Apr 2003 08:43:34 -0000	1.4
+++ avatardlg.ui	2 Jun 2003 08:44:04 -0000	1.5
@@ -219,38 +219,6 @@
                     <property name="title">
                         <string>Personal Output Options</string>
                     </property>
-                    <widget class="QCheckBox">
-                        <property name="name">
-                            <cstring>cb_enableDateTime</cstring>
-                        </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>112</x>
-                                <y>31</y>
-                                <width>61</width>
-                                <height>19</height>
-                            </rect>
-                        </property>
-                        <property name="text">
-                            <string>enable</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox">
-                        <property name="name">
-                            <cstring>cb_dateTime</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="geometry">
-                            <rect>
-                                <x>11</x>
-                                <y>56</y>
-                                <width>162</width>
-                                <height>21</height>
-                            </rect>
-                        </property>
-                    </widget>
                     <widget class="QLabel">
                         <property name="name">
                             <cstring>textLabel4</cstring>
@@ -421,6 +389,38 @@
                         </property>
                         <property name="text">
                             <string>...</string>
+                        </property>
+                    </widget>
+                    <widget class="QCheckBox">
+                        <property name="name">
+                            <cstring>cb_enableDateTime</cstring>
+                        </property>
+                        <property name="geometry">
+                            <rect>
+                                <x>112</x>
+                                <y>31</y>
+                                <width>61</width>
+                                <height>19</height>
+                            </rect>
+                        </property>
+                        <property name="text">
+                            <string>enable</string>
+                        </property>
+                    </widget>
+                    <widget class="QComboBox">
+                        <property name="name">
+                            <cstring>cb_dateTime</cstring>
+                        </property>
+                        <property name="enabled">
+                            <bool>false</bool>
+                        </property>
+                        <property name="geometry">
+                            <rect>
+                                <x>10</x>
+                                <y>60</y>
+                                <width>162</width>
+                                <height>21</height>
+                            </rect>
                         </property>
                     </widget>
                 </widget>

Index: kmiavatardlg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiavatardlg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kmiavatardlg.cpp	29 Apr 2003 15:22:55 -0000	1.5
+++ kmiavatardlg.cpp	2 Jun 2003 08:44:04 -0000	1.6
@@ -18,6 +18,9 @@
 KMIAvatarDlg::KMIAvatarDlg(QWidget* parent, const char* name)
 : AvatarDlg(parent,name)
 {
+	cb_dateTime->insertItem("MM-DD-YYYY");
+	cb_dateTime->insertItem("DD.MM.YYYY");
+	cb_dateTime->insertItem("DD/MM/YYYY");
 }
 
 KMIAvatarDlg::~KMIAvatarDlg()

Index: kmigeneralcfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmigeneralcfg.cpp	18 May 2003 13:31:15 -0000	1.1
+++ kmigeneralcfg.cpp	2 Jun 2003 08:44:04 -0000	1.2
@@ -42,4 +42,10 @@
     // no need to delete child widgets, Qt does it all for us
 }
 
+bool KMIGeneralCfg::isSystray() {
+	return systrayBtn->isChecked();
+}
+void KMIGeneralCfg::setSystray(bool enable) {
+	systrayBtn->setChecked(enable);
+}
 

Index: kmigeneralcfg.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmigeneralcfg.h	18 May 2003 13:32:37 -0000	1.2
+++ kmigeneralcfg.h	2 Jun 2003 08:44:04 -0000	1.3
@@ -19,7 +19,9 @@
 public:
     KMIGeneralCfg( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~KMIGeneralCfg();
-
+    bool isSystray();
+    void setSystray(bool enable=false);
+private:
     QCheckBox* systrayBtn;
     QLabel* systrayLabel;
 

Index: kmiircservercfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircservercfg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kmiircservercfg.cpp	6 May 2003 07:49:20 -0000	1.10
+++ kmiircservercfg.cpp	2 Jun 2003 08:44:04 -0000	1.11
@@ -35,6 +35,32 @@
 void KMIIRCServerCfg::slotEditAvatar()
 {
    KMIAvatarDlg *dlg=new KMIAvatarDlg(this);
+   KGlobal::config()->setGroup("Server: "+lv_ircServerList->currentItem()->text(1)+":"+lv_ircServerList->currentItem()->text(2));
+   if (KGlobal::config()->hasKey("IRCNickname")) {
+   	dlg->setNickname(KGlobal::config()->readEntry("IRCNickname",""));
+	dlg->setUserName(KGlobal::config()->readEntry("IRCUsername",""));
+	dlg->setInvisible(KGlobal::config()->readBoolEntry("Invisible",false));
+	dlg->setWallOps(KGlobal::config()->readBoolEntry("WallOps",false));
+	dlg->setAltNickList(KGlobal::config()->readListEntry("AlternativeNicknames"));
+	dlg->setDateTime(KGlobal::config()->readNumEntry("DateTime",-1));
+	if (KGlobal::config()->readNumEntry("DateTime",-1)!=-1)  {
+		dlg->setEnableDateTime(true);
+	} else {
+		dlg->setEnableDateTime(false);
+	}
+	dlg->seturlLogfile(KGlobal::config()->readEntry("URLLogfile",""));
+	if (KGlobal::config()->readEntry("URLLogfile","").isEmpty()) {
+		dlg->setEnableURLLogFile(false);
+	} else {
+		dlg->setEnableURLLogFile(true);
+	}
+	dlg->setChannelLogFile(KGlobal::config()->readEntry("ChannelLogfile",""));
+	if (KGlobal::config()->readEntry("ChannelLogfile","").isEmpty()) {
+		dlg->setEnableChannelLogFile(false);
+	} else {
+		dlg->setEnableChannelLogFile(true);
+	}
+   }
    if (dlg->exec()) {
 	   KGlobal::config()->setGroup("Server: "+lv_ircServerList->currentItem()->text(1)+":"+lv_ircServerList->currentItem()->text(2));
 		KGlobal::config()->writeEntry("IRCNickname",dlg->nickName());

Index: kmyirc.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kmyirc.cpp	17 May 2003 21:19:45 -0000	1.4
+++ kmyirc.cpp	2 Jun 2003 08:44:04 -0000	1.5
@@ -111,9 +111,13 @@
     KAction *custom = new KAction(i18n("&Connect"), 0,
                                   this, SLOT(slotServerConnect()),
                                   actionCollection(), "connect");
-#ifdef DEBUG
-#warning "You must set your development path here to get the kmyircui.rc file"
-    createGUI("/home/stampede/kmyirc/kmyirc-ng/src/kmyircui.rc");
+#ifdef DEBUG 
+#ifdef STAMPEDE
+	#warning "You must set your development path here to get the kmyircui.rc file"
+	createGUI("/home/stampede/kmyirc/kmyirc-ng/src/kmyircui.rc");
+#else
+	createGUI("/home/sh/projekte/kmyirc-ng/src/kmyircui.rc");
+#endif
 #else
 	createGUI();
 #endif

Index: main.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/main.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.cpp	18 May 2003 00:52:26 -0000	1.3
+++ main.cpp	2 Jun 2003 08:44:04 -0000	1.4
@@ -9,6 +9,8 @@
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
+#include <kglobal.h>
+#include <kconfig.h>
 
 static const char *description =
     I18N_NOOP("A native IRC client for KDE");
@@ -46,9 +48,13 @@
         if (args->count() == 0)
         {
             KMyIRC *widget = new KMyIRC;
-	    KMISystray *systray = new KMISystray(widget);
+	    KGlobal::config()->setGroup("General Settings");
+	    if (KGlobal::config()->readBoolEntry("Enable Systray",false)) {
+	    	
+	    	KMISystray *systray = new KMISystray(widget);
+		systray->show();
+	    }
 	    widget->show();
-	    systray->show();
         }
         else
         {

Index: pref.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pref.cpp	18 May 2003 13:31:15 -0000	1.5
+++ pref.cpp	2 Jun 2003 08:44:04 -0000	1.6
@@ -8,7 +8,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-
+#include <kconfig.h>
 #include <qlayout.h>
 #include <qlabel.h>
 
@@ -24,15 +24,48 @@
 	frame = addPage(i18n("General"), i18n("General Options"),
 		KGlobal::iconLoader()->loadIcon("kmyirc", KIcon::MainToolbar, 32) );
 	m_pageOne = new KMIGeneralCfg(frame);
+	KGlobal::config()->setGroup("General Settings");
+	m_pageOne->setSystray(KGlobal::config()->readBoolEntry("Enable Systray",false));
 	frame = addPage(i18n("IRC Server List"), i18n("IRC Server List"),
 		KGlobal::iconLoader()->loadIcon("network", KIcon::MainToolbar, 32) );
 	m_pageTwo = new KMIIRCServerCfg(frame,"ircServerCfg");
 	m_pageTwo->show();
+	frame = addPage(i18n("Default"),i18n("Default IRC Settings"),
+		KGlobal::iconLoader()->loadIcon("default",KIcon::MainToolbar,32));
+	m_pageThree=new KMIIrcDefault(frame,"avatarDlg");
+	//
+	// Filling in default irc settings
+	//
+	KGlobal::config()->setGroup("Default IRC Settings");
+	m_pageThree->setDefaultNickname(KGlobal::config()->readEntry("Default Nickname","KMyIRCUser"));
+	m_pageThree->setDefaultAltNickname(KGlobal::config()->readEntry("Default Alternative Nickname","KMyIRCUser_"));
+	m_pageThree->setDefaultUsername(KGlobal::config()->readEntry("Default Username","kmyirc"));
+	
+	m_pageThree->show();
 	frame->setMinimumSize(m_pageTwo->sizeHint());
 	resize(frame->sizeHint());
 }
 KMyIRCPreferences::~ KMyIRCPreferences()
 {
+}
+
+void KMyIRCPreferences::slotOk() {
+	if (m_pageOne->isSystray()) {
+		KGlobal::config()->setGroup("General Settings");
+		KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
+	} else {
+		KGlobal::config()->setGroup("General Settings");
+		KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
+	}
+	//
+	// Writing default irc settings to global configuration file
+	//
+	KGlobal::config()->setGroup("Default IRC Settings");
+	KGlobal::config()->writeEntry("Default Nickname",m_pageThree->defaultNickname());
+	KGlobal::config()->writeEntry("Default Alternative Nickname",m_pageThree->defaultAltNickname());
+	KGlobal::config()->writeEntry("Default Username",m_pageThree->defaultUsername());
+	
+	KDialogBase::slotOk();
 }
 
 #include "pref.moc"

Index: pref.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pref.h	18 May 2003 13:31:15 -0000	1.4
+++ pref.h	2 Jun 2003 08:44:04 -0000	1.5
@@ -9,6 +9,7 @@
 #include <qframe.h>
 #include "kmiircservercfg.h"
 #include "kmigeneralcfg.h"
+#include "kmiircdefault.h"
 
 /**
  * This is the main configuration class.
@@ -36,6 +37,14 @@
 private:
     KMIGeneralCfg   *m_pageOne;
     KMIIRCServerCfg *m_pageTwo;
+
+
+
+    private: KMIIrcDefault * m_pageThree;
+    
+protected slots: 
+	virtual void slotOk();
+
 };
 
 #endif // _KMYIRCPREF_H_