[Kmyirc-cvs] kmyirc-ng/src connectdlg.ui,NONE,1.1 kmiconnectdlg.cpp,NONE,1.1 kmiconnectdlg.h,NONE,1.1 Makefile.am,1.12,1.13 Makefile.in,1.18,1.19 hi16-app-kmyirc.png,1.2,1.3 kmigeneralcfg.cpp,1.3,1.4 kmigeneralcfg.h,1.3,1.4 kmiircservercfg.cpp,1.11,1.12 kmisocket.cpp,1.4,1.5 kmisocket.h,1.4,1.5 kmyirc.cpp,1.6,1.7 kmyirc.h,1.3,1.4 kmyircview.cpp,1.2,1.3

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

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

Modified Files:
	Makefile.am Makefile.in hi16-app-kmyirc.png kmigeneralcfg.cpp 
	kmigeneralcfg.h kmiircservercfg.cpp kmisocket.cpp kmisocket.h 
	kmyirc.cpp kmyirc.h kmyircview.cpp 
Added Files:
	connectdlg.ui kmiconnectdlg.cpp kmiconnectdlg.h 
Log Message:
see changelog for changes



--- NEW FILE: connectdlg.ui ---
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>connectDlg</class>
<widget class="QDialog">
    <property name="name">
        <cstring>connectDlg</cstring>
    </property>
    <property name="geometry">
        <rect>
            <x>0</x>
            <y>0</y>
            <width>544</width>
            <height>260</height>
        </rect>
    </property>
    <property name="caption">
        <string>Connect to IRC Server</string>
    </property>
    <grid>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <widget class="QLayoutWidget" row="0" column="0" rowspan="2" colspan="1">
            <property name="name">
                <cstring>layout2</cstring>
            </property>
            <vbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="QLabel">
                    <property name="name">
                        <cstring>textLabel1</cstring>
                    </property>
                    <property name="text">
                        <string>Co&amp;nnect to:</string>
                    </property>
                    <property name="buddy" stdset="0">
                        <cstring>lvIRCServerList</cstring>
                    </property>
                </widget>
                <widget class="KListView">
                    <column>
                        <property name="text">
                            <string>Group</string>
                        </property>
                        <property name="clickable">
                            <bool>true</bool>
                        </property>
                        <property name="resizable">
                            <bool>true</bool>
                        </property>
                    </column>
                    <column>
                        <property name="text">
                            <string>Server</string>
                        </property>
                        <property name="clickable">
                            <bool>true</bool>
                        </property>
                        <property name="resizable">
                            <bool>true</bool>
                        </property>
                    </column>
                    <property name="name">
                        <cstring>lvIRCServerList</cstring>
                    </property>
                    <property name="allColumnsShowFocus">
                        <bool>true</bool>
                    </property>
                    <property name="rootIsDecorated">
                        <bool>true</bool>
                    </property>
                </widget>
            </vbox>
        </widget>
        <widget class="QLayoutWidget" row="0" column="1">
            <property name="name">
                <cstring>layout3</cstring>
            </property>
            <vbox>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="KPushButton">
                    <property name="name">
                        <cstring>kPushButton1</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Ok</string>
                    </property>
                </widget>
                <widget class="KPushButton">
                    <property name="name">
                        <cstring>kPushButton2</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Cancel</string>
                    </property>
                </widget>
                <widget class="KPushButton">
                    <property name="name">
                        <cstring>kPushButton3</cstring>
                    </property>
                    <property name="text">
                        <string>&amp;Help</string>
                    </property>
                </widget>
            </vbox>
        </widget>
        <spacer row="1" column="1">
            <property name="name">
                <cstring>spacer1</cstring>
            </property>
            <property name="orientation">
                <enum>Vertical</enum>
            </property>
            <property name="sizeType">
                <enum>Expanding</enum>
            </property>
            <property name="sizeHint">
                <size>
                    <width>11</width>
                    <height>96</height>
                </size>
            </property>
        </spacer>
    </grid>
</widget>
<connections>
    <connection>
        <sender>kPushButton1</sender>
        <signal>clicked()</signal>
        <receiver>connectDlg</receiver>
        <slot>accept()</slot>
    </connection>
    <connection>
        <sender>kPushButton2</sender>
        <signal>clicked()</signal>
        <receiver>connectDlg</receiver>
        <slot>reject()</slot>
    </connection>
    <connection>
        <sender>kPushButton3</sender>
        <signal>clicked()</signal>
        <receiver>connectDlg</receiver>
        <slot>slotBtnHelp()</slot>
    </connection>
    <connection>
        <sender>lvIRCServerList</sender>
        <signal>selectionChanged(QListViewItem*)</signal>
        <receiver>connectDlg</receiver>
        <slot>slotItemChanged(QListViewItem*)</slot>
    </connection>
</connections>
<slots>
    <slot access="protected">slotBtnHelp()</slot>
    <slot>slotItemChanged(QListViewItem *)</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
    <includehint>klistview.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
</includehints>
</UI>

--- NEW FILE: kmiconnectdlg.cpp ---

#include <qstringlist.h>

#include <kglobal.h>
#include <klistview.h>
#include <kconfig.h>
#include <klocale.h>
#include <kpushbutton.h>
#include "kmiconnectdlg.h"


KMIConnectDlg::KMIConnectDlg(QWidget* parent, const char* name, bool modal, WFlags fl)
: connectDlg(parent,name, modal,fl)
{
	kPushButton1->setEnabled(false);
	loadSettings();
}

KMIConnectDlg::~KMIConnectDlg()
{
}

/*$SPECIALIZATION$*/
void KMIConnectDlg::slotBtnHelp()
{
}

void KMIConnectDlg::loadSettings()
{
	QStringList groups=KGlobal::config()->groupList();
	// Reading IRC Server Groups
	for (QStringList::Iterator it=groups.begin();it!=groups.end();++it) {
		if ((*it).contains("Group: ")) {
			QString groupName="";
			uint len=QString("Group: ").length();
			QString temp=QString(*it);
			groupName=temp.mid(len,temp.length()-len);
			KListViewItem *item=new KListViewItem(lvIRCServerList,groupName);
			// Insert Servers
			QMap<QString,QString> entries=KGlobal::config()->entryMap(*it);
			QMap<QString,QString>::Iterator it1;
			for (it1=entries.begin();it1!=entries.end();++it1) {
				// Fill in all server entries

				KListViewItem *item1=new KListViewItem(item,QString::null,it1.key());

			}
		}
	}

}

/*!
    \fn KMIConnectDlg::selectedServerName()
 */
QString KMIConnectDlg::selectedServerName()
{
	return lvIRCServerList->currentItem()->text(1);
}

/*!
    \fn KMIConnectDlg::selectedServerPort()
 */
int KMIConnectDlg::selectedServerPort()
{
	KGlobal::config()->setGroup("Group: "+lvIRCServerList->currentItem()->parent()->text(0));
	// read entry and get the port...
	
	QString temp=KGlobal::config()->readEntry(lvIRCServerList->currentItem()->text(1));
	QString port=temp.left(temp.find(";"));
	return port.toInt();
	
}

/*!
    \fn KMIConnectDlg::slotItemChanged(QListViewItem *)
 */
void KMIConnectDlg::slotItemChanged(QListViewItem *item)
{
	if (item->parent()!=0) {
		kPushButton1->setEnabled(true);
	} else {
		kPushButton1->setEnabled(false);
	}
}





#include "kmiconnectdlg.moc"


--- NEW FILE: kmiconnectdlg.h ---

#ifndef KMICONNECTDLG_H
#define KMICONNECTDLG_H

#include "connectdlg.h"

class KListViewItem;
class QListViewItem;

class KMIConnectDlg : public connectDlg
{
  Q_OBJECT

public:
  KMIConnectDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
  ~KMIConnectDlg();
  /*$PUBLIC_FUNCTIONS$*/

public slots:
  /*$PUBLIC_SLOTS$*/

protected:
  /*$PROTECTED_FUNCTIONS$*/

protected slots:
  /*$PROTECTED_SLOTS$*/
  virtual void          slotBtnHelp();
  
  private: void loadSettings();
  private: void parseServerEntry(KListViewItem *, const QString &);


    public: QString selectedServerName();
    public: int selectedServerPort();

    protected slots: void slotItemChanged(QListViewItem *);
};

#endif


Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile.am	4 Jun 2003 13:07:08 -0000	1.12
+++ Makefile.am	3 Jul 2003 08:57:04 -0000	1.13
@@ -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 ircdefault.ui kmiircdefault.cpp kmiircdefault.h ircchannel.ui kmiircchannel.cpp kmiircchannel.h
+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 ircchannel.ui kmiircchannel.cpp kmiircchannel.h connectdlg.ui kmiconnectdlg.cpp kmiconnectdlg.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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.in	18 Jun 2003 08:19:05 -0000	1.18
+++ Makefile.in	3 Jul 2003 08:57:04 -0000	1.19
@@ -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 kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp ircdefault.ui kmiircdefault.cpp kmiircdefault.h ircchannel.ui kmiircchannel.cpp kmiircchannel.h
+#>- 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 ircchannel.ui kmiircchannel.cpp kmiircchannel.h connectdlg.ui kmiconnectdlg.cpp kmiconnectdlg.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 kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp  kmiircdefault.cpp kmiircdefault.h  kmiircchannel.cpp kmiircchannel.h kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.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  kmiircchannel.cpp kmiircchannel.h  kmiconnectdlg.cpp kmiconnectdlg.h kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp connectdlg.cpp
 
 # these are the headers for your project
 noinst_HEADERS = kmyirc.h kmyircview.h pref.h
@@ -301,7 +301,7 @@
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
 	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
 	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) \
-	kmiircchannel.$(OBJEXT)
+	kmiircchannel.$(OBJEXT) kmiconnectdlg.$(OBJEXT)
 #>- kmyirc_OBJECTS = $(am_kmyirc_OBJECTS)
 #>+ 11
 kmyirc_final_OBJECTS = kmyirc.all_cpp.o 
@@ -311,8 +311,8 @@
 	kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
 	kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
 	kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) \
-	kmiircchannel.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(OBJEXT) ircchannel.$(OBJEXT)\
-kmiircsocket.moc.o kmigeneralcfg.moc.o 
+	kmiircchannel.$(OBJEXT) kmiconnectdlg.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(OBJEXT) ircchannel.$(OBJEXT) connectdlg.$(OBJEXT)\
+kmigeneralcfg.moc.o kmiircsocket.moc.o 
 @KDE_USE_FINAL_FALSE@kmyirc_OBJECTS = $(kmyirc_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kmyirc_OBJECTS = $(kmyirc_final_OBJECTS)
 kmyirc_DEPENDENCIES =
@@ -330,6 +330,7 @@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmiconnectdlg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmigeneralcfg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmigroupdlg.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmiircchannel.Po \
@@ -343,8 +344,9 @@
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
 #>- @AMDEP_TRUE@	./$(DEPDIR)/pref.Po
-#>+ 29
-@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)/ircchannel.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.moc.P  $(DEPDIR)/kmyirc.all_cpp.P $(DEPDIR)/kmyirc_client.all_cpp.P  ./$(DEPDIR)/kmiavatardlg.Po \
+#>+ 31
+@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)/ircchannel.P $(DEPDIR)/connectdlg.P $(DEPDIR)/kmigeneralcfg.moc.P $(DEPDIR)/kmiircsocket.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)/kmiconnectdlg.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)/kmiircchannel.Po \
@@ -358,7 +360,8 @@
 @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)/ircdefault.P $(DEPDIR)/ircchannel.P $(DEPDIR)/kmiircsocket.moc.P $(DEPDIR)/kmigeneralcfg.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)/ircchannel.P $(DEPDIR)/connectdlg.P $(DEPDIR)/kmigeneralcfg.moc.P $(DEPDIR)/kmiircsocket.moc.P  ./$(DEPDIR)/kmiavatardlg.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmiconnectdlg.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)/kmiircchannel.Po \
@@ -466,6 +469,7 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiavatardlg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmiconnectdlg.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)/kmiircchannel.Po@am__quote@
@@ -588,7 +592,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=kmyirc.desktop hi48-app-kmyirc.png kmigeneralcfg.h hi16-app-kmyirc.png hi96-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui hi128-app-kmyirc.png groupdlg.ui cr32-app-kmyirc.png ircchannel.ui kmyircui.rc avatardlg.ui hi22-app-kmyirc.png hi64-app-kmyirc.png cr16-app-kmyirc.png hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h 
+KDE_DIST=kmyirc.desktop hi48-app-kmyirc.png connectdlg.ui kmigeneralcfg.h hi16-app-kmyirc.png hi96-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui hi128-app-kmyirc.png groupdlg.ui kmyircui.rc ircchannel.ui avatardlg.ui hi22-app-kmyirc.png hi64-app-kmyirc.png hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -717,7 +721,7 @@
 kmyirciface_skel.cpp: kmyirciface.kidl
 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmyirciface.kidl
 
-#>+ 92
+#>+ 105
 ircservercfg.cpp: $(srcdir)/ircservercfg.ui ircservercfg.h ircservercfg.moc
 	rm -f ircservercfg.cpp
 	echo '#include <klocale.h>' > ircservercfg.cpp
@@ -809,10 +813,19 @@
 
 ircchannel.moc: ircchannel.h
 	$(MOC) ircchannel.h -o ircchannel.moc
+connectdlg.cpp: $(srcdir)/connectdlg.ui connectdlg.h connectdlg.moc
+	rm -f connectdlg.cpp
+	echo '#include <klocale.h>' > connectdlg.cpp
+	$(UIC) -tr ${UIC_TR} -i connectdlg.h $(srcdir)/connectdlg.ui > connectdlg.cpp.temp ; ret=$$?; \
+	sed -e "s,${UIC_TR}( \"\" ),QString::null,g" connectdlg.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_connectdlg,g" >> connectdlg.cpp ;\
+	rm -f connectdlg.cpp.temp ;\
+	if test "$$ret" = 0; then echo '#include "connectdlg.moc"' >> connectdlg.cpp; else rm -f connectdlg.cpp ; exit $$ret ; fi
 
-#>+ 3
-kmiircdefault.moc: $(srcdir)/kmiircdefault.h
-	$(MOC) $(srcdir)/kmiircdefault.h -o kmiircdefault.moc
+connectdlg.h: $(srcdir)/connectdlg.ui
+	$(UIC) -o connectdlg.h $(srcdir)/connectdlg.ui
+
+connectdlg.moc: connectdlg.h
+	$(MOC) connectdlg.h -o connectdlg.moc
 
 #>+ 3
 kmyircview.moc: $(srcdir)/kmyircview.h
@@ -823,26 +836,14 @@
 	$(MOC) $(srcdir)/kmyirc.h -o kmyirc.moc
 
 #>+ 3
-kmiircsocket.moc.cpp: $(srcdir)/kmiircsocket.h
-	$(MOC) $(srcdir)/kmiircsocket.h -o kmiircsocket.moc.cpp
-
-#>+ 3
 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
 
@@ -851,6 +852,30 @@
 	$(MOC) $(srcdir)/kmiircchannel.h -o kmiircchannel.moc
 
 #>+ 3
+kmiconnectdlg.moc: $(srcdir)/kmiconnectdlg.h
+	$(MOC) $(srcdir)/kmiconnectdlg.h -o kmiconnectdlg.moc
+
+#>+ 3
+kmiircmessage.moc: $(srcdir)/kmiircmessage.h
+	$(MOC) $(srcdir)/kmiircmessage.h -o kmiircmessage.moc
+
+#>+ 3
+kmiircdefault.moc: $(srcdir)/kmiircdefault.h
+	$(MOC) $(srcdir)/kmiircdefault.h -o kmiircdefault.moc
+
+#>+ 3
+kmiircsocket.moc.cpp: $(srcdir)/kmiircsocket.h
+	$(MOC) $(srcdir)/kmiircsocket.h -o kmiircsocket.moc.cpp
+
+#>+ 3
+pref.moc: $(srcdir)/pref.h
+	$(MOC) $(srcdir)/pref.h -o pref.moc
+
+#>+ 3
+kmisystray.moc: $(srcdir)/kmisystray.h
+	$(MOC) $(srcdir)/kmisystray.h -o kmisystray.moc
+
+#>+ 3
 kminickdlg.moc: $(srcdir)/kminickdlg.h
 	$(MOC) $(srcdir)/kminickdlg.h -o kminickdlg.moc
 
@@ -859,27 +884,23 @@
 	$(MOC) $(srcdir)/kmisocket.h -o kmisocket.moc
 
 #>+ 3
-kmiavatardlg.moc: $(srcdir)/kmiavatardlg.h
-	$(MOC) $(srcdir)/kmiavatardlg.h -o kmiavatardlg.moc
-
-#>+ 3
 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
+kmiavatardlg.moc: $(srcdir)/kmiavatardlg.h
+	$(MOC) $(srcdir)/kmiavatardlg.h -o kmiavatardlg.moc
 
 #>+ 3
 clean-metasources:
-	-rm -f  kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp pref.moc kmigroupdlg.moc kmisystray.moc kmiserverdlg.moc kmiircchannel.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
+	-rm -f  kmyircview.moc kmyirc.moc kmigeneralcfg.moc.cpp kmigroupdlg.moc kmiserverdlg.moc kmiircchannel.moc kmiconnectdlg.moc kmiircmessage.moc kmiircdefault.moc kmiircsocket.moc.cpp pref.moc kmisystray.moc kminickdlg.moc kmisocket.moc kmiircservercfg.moc kmiavatardlg.moc
 
 #>+ 4
 clean-idl:
 	-rm -f \
 	kmyirciface_skel.cpp kmyirciface_skel.h kmyirciface.kidl 
 
-#>+ 10
+#>+ 11
 clean-ui:
 	-rm -f \
 	ircservercfg.cpp ircservercfg.h ircservercfg.moc \
@@ -888,7 +909,8 @@
 	avatardlg.cpp avatardlg.h avatardlg.moc \
 	nickname.cpp nickname.h nickname.moc \
 	ircdefault.cpp ircdefault.h ircdefault.moc \
-	ircchannel.cpp ircchannel.h ircchannel.moc 
+	ircchannel.cpp ircchannel.h ircchannel.moc \
+	connectdlg.cpp connectdlg.h connectdlg.moc 
 
 #>+ 2
 docs-am:
@@ -911,11 +933,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 $(srcdir)/kmisystray.cpp $(srcdir)/kmisocket.cpp $(srcdir)/kmigeneralcfg.cpp $(srcdir)/kmiircdefault.cpp $(srcdir)/kmiircchannel.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp  kmyirc.moc kmyircview.moc ircdefault.moc ircchannel.moc kmigroupdlg.moc kmiserverdlg.moc kmiircchannel.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
+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 $(srcdir)/kmiircchannel.cpp $(srcdir)/kmiconnectdlg.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp connectdlg.cpp kmigeneralcfg.moc.cpp kmiircsocket.moc.cpp  kmyirc.moc kmyircview.moc ircdefault.moc ircchannel.moc kmigroupdlg.moc kmiserverdlg.moc kmiircchannel.moc connectdlg.moc kmiconnectdlg.moc kmiircmessage.moc ircservercfg.moc serverdlg.moc kmiircdefault.moc avatardlg.moc nickname.moc groupdlg.moc pref.moc kmisystray.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.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 kmisystray.cpp kmisocket.cpp kmigeneralcfg.cpp kmiircdefault.cpp kmiircchannel.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp kmigeneralcfg.moc.cpp kmiircsocket.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 kmiircchannel.cpp kmiconnectdlg.cpp kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp connectdlg.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; \
@@ -958,57 +980,61 @@
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 54
+#>+ 58
 kmyircview.o: kmyircview.moc 
 kmiircchannel.lo: kmiircchannel.moc 
-$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiavatardlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kminickdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiircservercfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/main.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmigroupdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiserverdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmiircdefault.o: kmiircdefault.moc 
-$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+kmiconnectdlg.lo: kmiconnectdlg.moc 
+$(srcdir)/kmiircsocket.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmigroupdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiavatardlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiserverdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmisocket.o: kmisocket.moc 
 kmigroupdlg.lo: kmigroupdlg.moc 
-$(srcdir)/kmiircdefault.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircdefault.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiircservercfg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiconnectdlg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.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 ircdefault.h ircchannel.h 
+$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 pref.lo: pref.moc 
 kmiserverdlg.lo: kmiserverdlg.moc 
-$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmyirc.lo: kmyirc.moc 
-$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-kmiircmessage.o: kmiircmessage.moc 
+$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kminickdlg.lo: kminickdlg.moc 
-$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+kmiircmessage.o: kmiircmessage.moc 
+$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+kmiconnectdlg.o: kmiconnectdlg.moc 
 kminickdlg.o: kminickdlg.moc 
-$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmiircservercfg.lo: kmiircservercfg.moc 
 kmiavatardlg.o: kmiavatardlg.moc 
 kmyircview.lo: kmyircview.moc 
-$(srcdir)/kmisocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmisocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmisocket.lo: kmisocket.moc 
 nmcheck: 
-$(srcdir)/kmiircdefault.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircdefault.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/pref.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiircmessage.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
+$(srcdir)/kmiconnectdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmyirc.o: kmyirc.moc 
-$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
-kmiircchannel.o: kmiircchannel.moc 
+$(srcdir)/kmyirc.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmiircdefault.lo: kmiircdefault.moc 
+kmiircchannel.o: kmiircchannel.moc 
 pref.o: pref.moc 
 kmiircmessage.lo: kmiircmessage.moc 
-$(srcdir)/kmiircchannel.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircchannel.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmiavatardlg.lo: kmiavatardlg.moc 
-$(srcdir)/kmiircchannel.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h 
+$(srcdir)/kmiircchannel.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h connectdlg.h 
 kmigroupdlg.o: kmigroupdlg.moc 

Index: hi16-app-kmyirc.png
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/hi16-app-kmyirc.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsz3sHoq and /tmp/cvsMY5qxG differ

Index: kmigeneralcfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmigeneralcfg.cpp	4 Jun 2003 13:24:58 -0000	1.3
+++ kmigeneralcfg.cpp	3 Jul 2003 08:57:05 -0000	1.4
@@ -4,6 +4,7 @@
 #include <klocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
+#include <kmessagebox.h>
 #include <qvariant.h>
 #include <qcheckbox.h>
 #include <qframe.h>
@@ -26,7 +27,9 @@
     QVBoxLayout *layout = new QVBoxLayout(this);
     systrayBtn = new QCheckBox( this, "systrayBtn" );
     systrayBtn->setText( i18n( "Enable System Tray Icon" ) );
+    QObject::connect(systrayBtn,SIGNAL(clicked()),this,SLOT(sysTrayBtnToggled()));
     layout->addWidget( systrayBtn );
+    
 
     systrayLabel = new QLabel( this, "systrayLabel" );
     systrayLabel->setText( i18n( "<font size=\"-1\">A System Tray Icon gives you quick access to common action, such as connecting to a server, or quitting KMyIRC.</font>" ) );
@@ -52,4 +55,13 @@
 void KMIGeneralCfg::setSystray(bool enable) {
 	systrayBtn->setChecked(enable);
 }
+
+/*!
+    \fn KMIGeneralCfg::sysTrayBtnToggled(bool)
+ */
+void KMIGeneralCfg::sysTrayBtnToggled()
+{
+	KMessageBox::information(this,i18n("This setting will be set after you restart the KMyIRC-Application !"),i18n("Information"));
+}
+
 

Index: kmigeneralcfg.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmigeneralcfg.h	2 Jun 2003 08:44:04 -0000	1.3
+++ kmigeneralcfg.h	3 Jul 2003 08:57:05 -0000	1.4
@@ -27,6 +27,8 @@
 
 protected:
 
+
+    protected slots: void sysTrayBtnToggled();
 };
 
 #endif

Index: kmiircservercfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircservercfg.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kmiircservercfg.cpp	2 Jun 2003 08:44:04 -0000	1.11
+++ kmiircservercfg.cpp	3 Jul 2003 08:57:05 -0000	1.12
@@ -367,6 +367,8 @@
 
 				KListViewItem *item1=new KListViewItem(item,QString::null,it1.key());
 
+				// 
+				
 				// Split values from key
 				// ParseServerEntry(it1.data());
 				parseServerEntry(item1,it1.data());

Index: kmisocket.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kmisocket.cpp	3 Jun 2003 21:19:20 -0000	1.4
+++ kmisocket.cpp	3 Jul 2003 08:57:05 -0000	1.5
@@ -18,6 +18,14 @@
 	QObject::connect( this, SIGNAL( readyRead() ), this, SLOT( slotRead() ) );
 }
 
+KMISocket::KMISocket(const QString &hostName,const int portNo)
+	: KExtendedSocket(hostName,portNo)
+{
+	host=hostName;
+	port=portNo;
+	QObject::connect(this,SIGNAL(readyRead()),this,SLOT(slotRead()));
+}
+
 KMISocket::~KMISocket()
 {
 }
@@ -25,7 +33,14 @@
 QString KMISocket::readLine()
 {
 	//Not implemented yet
-	return QString::null;
+	char *buffer;
+	if (bytesAvailable()!=0) {
+		readBlock(buffer,bytesAvailable());
+		data=QString(buffer);
+	} else {
+		data=QString::null;
+	}
+	return data;
 }
 
 void KMISocket::slotRead()
@@ -42,6 +57,24 @@
 		emit messageReceived(message);
 	}
 }
+
+/*!
+    \fn KMISocket::setPortNo(const int &portNo=0)
+ */
+void KMISocket::setPortNo(const int &portNo)
+{
+	port=portNo;
+}
+
+/*!
+    \fn KMISocket::setHostName(const QString &hostName="")
+ */
+void KMISocket::setHostName(const QString &hostName)
+{
+	host=hostName;
+}
+
+
 
 #include "kmisocket.moc"
 

Index: kmisocket.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kmisocket.h	3 Jun 2003 21:19:20 -0000	1.4
+++ kmisocket.h	3 Jul 2003 08:57:05 -0000	1.5
@@ -20,7 +20,8 @@
 	Q_OBJECT
 
 	public:
-		KMISocket( );
+		KMISocket();
+		KMISocket(const QString &hostName="",const int portNo=0);
 		~KMISocket( );
 		virtual QString readLine();
 	private slots:
@@ -28,6 +29,14 @@
 	signals:
 		void messageReceived(QString& msg);
 	
+
+    private: int port;
+    private: QString host;
+
+    public: void setPortNo(const int &portNo=0);
+    public: void setHostName(const QString &hostName="");
+
+    private: QString data;
 };
 
 #endif

Index: kmyirc.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kmyirc.cpp	4 Jun 2003 13:07:08 -0000	1.6
+++ kmyirc.cpp	3 Jul 2003 08:57:05 -0000	1.7
@@ -328,7 +328,18 @@
  */
 void KMyIRC::slotServerConnect()
 {
-#warning "not implemented yet!!"
+	KMIConnectDlg *dlg;
+	dlg=new KMIConnectDlg(this,"connectDlg",true);
+	if (dlg->exec()) {
+#ifdef DEBUG
+	qWarning("Servername: "+dlg->selectedServerName()+"\n");
+	qWarning("Serverport: %d",dlg->selectedServerPort());
+#endif
+		KMIIrcChannel *channel=new KMIIrcChannel(m_view);
+		
+		
+	}
+	delete dlg;
 }
 
 void KMyIRC::slotAddChannel() {

Index: kmyirc.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmyirc.h	4 Jun 2003 13:07:08 -0000	1.3
+++ kmyirc.h	3 Jul 2003 08:57:05 -0000	1.4
@@ -14,6 +14,7 @@
 
 #include "kmyircview.h"
 #include "kmiircchannel.h"
+#include "kmiconnectdlg.h"
 
 class KPrinter;
 class KToggleAction;

Index: kmyircview.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyircview.cpp	4 Jun 2003 13:07:08 -0000	1.2
+++ kmyircview.cpp	3 Jul 2003 08:57:05 -0000	1.3
@@ -24,7 +24,7 @@
 {
     // setup our layout manager to automatically add our widgets
     QHBoxLayout *top_layout = new QHBoxLayout(this);
-    top_layout->setAutoAdd(false);
+    top_layout->setAutoAdd(true);
     tabChannelBar=new QTabWidget(this,"channelTabBar");
     tabChannelBar->setTabPosition(QTabWidget::Bottom);
 }