[Kmyirc-cvs] kmyirc-ng/src Makefile.in,1.9,1.10 kmiircservercfg.cpp,1.5,1.6 kmiircservercfg.h,1.1,1.2

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

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

Modified Files:
	Makefile.in kmiircservercfg.cpp kmiircservercfg.h 
Log Message:
Added in KMIIRCServerCfg::slotEditServer() code to change the avatar config settings per server



Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	29 Apr 2003 15:22:54 -0000	1.9
+++ Makefile.in	30 Apr 2003 09:29:31 -0000	1.10
@@ -556,7 +556,7 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=kmyirc.desktop groupdlg.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h nickname.ui 
+KDE_DIST=kmyirc.desktop kmyirc_client hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h avatardlg.h kmyirc groupdlg.ui kmyircui.rc serverdlg.h avatardlg.ui kmyirciface.kidl groupdlg.h hi32-app-kmyirc.png kmyirc.lsm ircservercfg.h nickname.h nickname.ui 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -839,7 +839,7 @@
 	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 kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.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)/kmyirciface_skel.cpp $(srcdir)/ircservercfg.cpp $(srcdir)/groupdlg.cpp $(srcdir)/serverdlg.cpp $(srcdir)/avatardlg.cpp $(srcdir)/nickname.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
 	@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; \

Index: kmiircservercfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircservercfg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kmiircservercfg.cpp	29 Apr 2003 15:22:55 -0000	1.5
+++ kmiircservercfg.cpp	30 Apr 2003 09:29:31 -0000	1.6
@@ -21,7 +21,7 @@
 	btnEditServer->setEnabled(false);
 	btnDeleteServer->setEnabled(false);
 	btnEditAvatar->setEnabled(false);
-
+	loadSettings();
 }
 
 KMIIRCServerCfg::~KMIIRCServerCfg()
@@ -186,11 +186,13 @@
 			KGlobal::config()->setGroup("Group :"+lv_ircServerList->currentItem()->parent()->text(0));
 
 			// Getting old server entry
-			QString oldServer=lv_ircServerList->currentItem()->parent()->text(0);
+			QString oldServer=lv_ircServerList->currentItem()->text(1);
+
+			// Getting old port entry
+			QString oldPort=lv_ircServerList->currentItem()->text(2);
 
 			// Delete old server entry from group server map in KGlobal::config()
 			KGlobal::config()->deleteEntry(oldServer);
-
 			// Changing Settings in lv_ircServerList
 			lv_ircServerList->currentItem()->setText(1,dlg->serverName());
 			lv_ircServerList->currentItem()->setText(2,QString("%1").arg(dlg->port()));
@@ -205,6 +207,23 @@
 
 			// Generating new server entry in current server group in KGlobal::config()
 			KGlobal::config()->writeEntry(dlg->serverName(),QString("%1").arg(dlg->port())+";"+temp+";\""+dlg->description()+"\"");
+			// Changing avatar server entry to new avatar server entry
+	   KGlobal::config()->setGroup("Server: "+oldServer+":"+oldPort);
+			KGlobal::config()->writeEntry("IRCNickname",KGlobal::config()->readEntry("IRCNickname",""));
+			KGlobal::config()->writeEntry("IRCUsername",KGlobal::config()->readEntry("IRCUsername",""));
+			KGlobal::config()->writeEntry("Invisible",KGlobal::config()->readBoolEntry("Invisible",false));
+			KGlobal::config()->writeEntry("WallOps",KGlobal::config()->readBoolEntry("WallOps",false));
+			if (KGlobal::config()->readNumEntry("DateTime",-1)!=-1) {
+				KGobal::config()->writeEntry("DateTime",KGlobal::config()->readNumEntry("DateTime",-1));
+			}
+			if (!KGlobal::config()->readEntry("URLLogfile","").isEmpty()) {
+				KGlobal::config()->writeEntry("URLLogfile",KGlobal::config()->readEntry("URLLogfile",""));
+			}
+			if (!KGlobal::config()->readEntry("ChannelLogfile","").isEmpty()) {
+				KGlobal::config()->writeEntry("ChannelLogfile",KGlobal::config()->readEntry("ChannelLogfile",""));
+			}
+			KGlobal::config()->writeEntry("AlternativeNicknames",KGlobal::config()->readListEntry("AlternativeNicknames"));
+
 			}
 			delete dlg;
 		}
@@ -243,7 +262,7 @@
 				}
 				// Setting group and group entries to KGlobal::config() file
 				// So we're avoiding additional configuration data structures
-				KGlobal::config()->writeEntry(dlg->serverName(),QString("%1").arg(dlg->port())+";"+temp+";"+i18n("No")+"\""+dlg->description()+"\"");
+				KGlobal::config()->writeEntry(dlg->serverName(),QString("%1").arg(dlg->port())+";"+temp+";"+No+";\""+dlg->description()+"\"");
 			//}
 			delete dlg;
 		}
@@ -292,3 +311,29 @@
 }
 
 #include "kmiircservercfg.moc"
+
+
+/*!
+    \fn KMIIRCServerCfg::loadSettings()
+ */
+void KMIIRCServerCfg::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(lv_ircServerList,groupName);
+			// Insert Servers
+			QMap<QString,QString> entries=KGlobal::config()->entryMap(*it);
+			QMap<QString,QString>::Iterator it1;
+			for (it1=entries.begin();it!=entries.end();++it1) {
+				// Fill in all server entries
+
+			}
+		}
+	}
+}

Index: kmiircservercfg.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircservercfg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmiircservercfg.h	24 Apr 2003 07:52:06 -0000	1.1
+++ kmiircservercfg.h	30 Apr 2003 09:29:31 -0000	1.2
@@ -32,6 +32,8 @@
 
 
     protected slots: virtual void slotOnItem(QListViewItem *);
+
+    public: void loadSettings();
 };
 
 #endif