kmyirc-cvs Mailing List for KMyIRC
Status: Alpha
Brought to you by:
shermann
Menu
▾
▴
kmyirc-cvs — KMyIRC CVS Development Adds/Changes/Removes etc.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(11) |
Oct
(20) |
Nov
(2) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(3) |
Feb
(144) |
Mar
|
Apr
(55) |
May
(24) |
Jun
(12) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <she...@us...> - 2003-07-03 08:57:08
|
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&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>&Ok</string>
</property>
</widget>
<widget class="KPushButton">
<property name="name">
<cstring>kPushButton2</cstring>
</property>
<property name="text">
<string>&Cancel</string>
</property>
</widget>
<widget class="KPushButton">
<property name="name">
<cstring>kPushButton3</cstring>
</property>
<property name="text">
<string>&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);
}
|
|
From: <she...@us...> - 2003-07-03 08:57:08
|
Update of /cvsroot/kmyirc/kmyirc-ng/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv795/autom4te.cache
Modified Files:
requests
Log Message:
see changelog for changes
Index: requests
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/autom4te.cache/requests,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- requests 2 Jun 2003 08:44:02 -0000 1.11
+++ requests 3 Jul 2003 08:57:04 -0000 1.12
@@ -16,19 +16,19 @@
],
{
'm4_pattern_forbid' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_STRUCT_TM' => 1,
+ 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
- 'AC_TYPE_MODE_T' => 1,
+ 'AC_STRUCT_TM' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
@@ -51,10 +51,10 @@
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
- 'AC_FUNC_VPRINTF' => 1,
+ 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
@@ -79,29 +79,29 @@
'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
- 'AC_C_CONST' => 1,
- 'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
|
|
From: <she...@us...> - 2003-07-03 08:57:08
|
Update of /cvsroot/kmyirc/kmyirc-ng
In directory sc8-pr-cvs1:/tmp/cvs-serv795
Modified Files:
ChangeLog Makefile.in kmyirc.kdevelop kmyirc.kdevses
Log Message:
see changelog for changes
Index: ChangeLog
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog 4 Jun 2003 13:07:07 -0000 1.15
+++ ChangeLog 3 Jul 2003 08:57:03 -0000 1.16
@@ -1,5 +1,15 @@
Version: 0.3.0.1
+ 2003-07-02 Stephan Hermann <sh...@so...>
+ * Added new Constructor for KMISocket
+ * Implement KMISocket::readLine()
+ * Added UI Change in KMIIrcServerCfg: if systryBtn is clicked, information messagebox will appear to inform the userName
+
+ 2003-06-27 Stephan Hermann <sh...@so...>
+ * Added connectDlg UI
+ * Added KMIConnectDlg class
+
+
2003-06-03 Stephan Hermann <sh...@so...>
* Changed UI settings in ircChannel.ui
* Added a QTabWidget to KMyIRCView
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.in 4 Jun 2003 13:07:07 -0000 1.16
+++ Makefile.in 3 Jul 2003 08:57:04 -0000 1.17
@@ -433,7 +433,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=stamp-h.in subdirs configure.files kmyirc.kdevses kmyirc.kdevelop Makefile.cvs
+KDE_DIST=stamp-h.in subdirs configure.files kmyirc-0.3.0.1.tar.gz kmyirc.kdevses kmyirc.kdevelop Makefile.cvs
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
Index: kmyirc.kdevelop
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevelop,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- kmyirc.kdevelop 4 Jun 2003 13:07:07 -0000 1.8
+++ kmyirc.kdevelop 3 Jul 2003 08:57:04 -0000 1.9
@@ -53,6 +53,8 @@
<subclass uifile="/src/ircdefault.ui" sourcefile="/src/kmiircdefault.h" />
<subclass uifile="/src/ircchannel.ui" sourcefile="/src/kmiircchannel.cpp" />
<subclass uifile="/src/ircchannel.ui" sourcefile="/src/kmiircchannel.h" />
+ <subclass uifile="/src/connectdlg.ui" sourcefile="/src/kmiconnectdlg.cpp" />
+ <subclass uifile="/src/connectdlg.ui" sourcefile="/src/kmiconnectdlg.h" />
</subclassing>
<configurations>
<default>
Index: kmyirc.kdevses
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevses,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kmyirc.kdevses 4 Jun 2003 13:07:07 -0000 1.14
+++ kmyirc.kdevses 3 Jul 2003 08:57:04 -0000 1.15
@@ -1,46 +1,93 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="7" >
- <Doc0 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/ChangeLog" >
- <View0 line="5" Type="???" >
+ <DocsAndViews NumberOfDocuments="16" >
+ <Doc0 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.h" >
+ <View0 line="14" Type="???" >
<AdditionalSettings/>
</View0>
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircview.cpp" >
- <View0 line="45" Type="???" >
+ <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.cpp" >
+ <View0 line="20" Type="???" >
<AdditionalSettings/>
</View0>
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircui.rc" >
- <View0 line="8" Type="???" >
+ <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.h" >
+ <View0 line="37" Type="???" >
<AdditionalSettings/>
</View0>
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.cpp" >
- <View0 line="335" Type="???" >
+ <Doc3 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiconnectdlg.cpp" >
+ <View0 line="7" Type="???" >
<AdditionalSettings/>
</View0>
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.h" >
- <View0 line="98" Type="???" >
+ <Doc4 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiconnectdlg.h" >
+ <View0 line="7" Type="???" >
<AdditionalSettings/>
</View0>
</Doc4>
- <Doc5 context="ctx_qt" NumberOfViews="1" URL="file:/usr/lib/qt-3.1/doc/html/qtabwidget.html#tabPosition-prop" >
- <View0 Type="???" >
+ <Doc5 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.cpp" >
+ <View0 line="338" Type="???" >
<AdditionalSettings/>
</View0>
</Doc5>
- <Doc6 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircview.h" >
- <View0 line="77" Type="???" >
+ <Doc6 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmisocket.cpp" >
+ <View0 line="63" Type="???" >
<AdditionalSettings/>
</View0>
</Doc6>
+ <Doc7 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/share/doc/HTML/en/kdelibs-3.1-apidocs/kdeui/html/classKMessageBox.html" >
+ <View0 Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc7>
+ <Doc8 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmisocket.h" >
+ <View0 line="23" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc8>
+ <Doc9 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/ChangeLog" >
+ <View0 line="6" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc9>
+ <Doc10 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/main.cpp" >
+ <View0 line="73" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc10>
+ <Doc11 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.cpp" >
+ <View0 line="0" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc11>
+ <Doc12 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.h" >
+ <View0 line="34" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc12>
+ <Doc13 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircchannel.h" >
+ <View0 line="6" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc13>
+ <Doc14 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircchannel.cpp" >
+ <View0 line="4" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc14>
+ <Doc15 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircview.cpp" >
+ <View0 line="26" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc15>
</DocsAndViews>
<pluginList>
<kdevdebugger>
- <breakpointList/>
+ <breakpointList>
+ <breakpoint0 lineNum="89" dbgId="-1" fileName="/home/sh/projekte/kmyirc-ng/src/kmiconnectdlg.cpp" condition="" enabled="1" />
+ </breakpointList>
</kdevdebugger>
</pluginList>
</KDevPrjSession>
|
|
From: <she...@us...> - 2003-07-03 08:57:08
|
Update of /cvsroot/kmyirc/kmyirc-ng/po In directory sc8-pr-cvs1:/tmp/cvs-serv795/po Modified Files: Makefile.in Log Message: see changelog for changes Index: Makefile.in =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/po/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 |
|
From: <she...@us...> - 2003-07-03 08:57:08
|
Update of /cvsroot/kmyirc/kmyirc-ng/doc/en In directory sc8-pr-cvs1:/tmp/cvs-serv795/doc/en Modified Files: Makefile.in Log Message: see changelog for changes Index: Makefile.in =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/doc/en/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 |
|
From: <she...@us...> - 2003-06-18 08:19:09
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14833
Modified Files:
Makefile.in kmyircview.h
Log Message:
changed
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.in 18 Jun 2003 00:27:52 -0000 1.17
+++ Makefile.in 18 Jun 2003 08:19:05 -0000 1.18
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.3 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,71 +14,100 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_alias = @build_alias@
build_triplet = @build@
+host_alias = @host_alias@
host_triplet = @host@
+target_alias = @target_alias@
target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
AMTAR = @AMTAR@
ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
+AS = @AS@
AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
CONF_FILES = @CONF_FILES@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
DCOPIDL = @DCOPIDL@
DCOPIDL2CPP = @DCOPIDL2CPP@
DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOXYGEN = @DOXYGEN@
+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
+DPMSINC = @DPMSINC@
+DPMSLIB = @DPMSLIB@
ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
+GLINC = @GLINC@
+GLLIB = @GLLIB@
GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+IDL = @IDL@
+IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JAR = @JAR@
+JAVAC = @JAVAC@
+JAVAH = @JAVAH@
+JVMLIBS = @JVMLIBS@
KDECONFIG = @KDECONFIG@
KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
+KDE_HAVE_DOT = @KDE_HAVE_DOT@
KDE_INCLUDES = @KDE_INCLUDES@
KDE_LDFLAGS = @KDE_LDFLAGS@
KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
@@ -93,22 +122,32 @@
KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBBZ2 = @LIBBZ2@
LIBCOMPAT = @LIBCOMPAT@
LIBCRYPT = @LIBCRYPT@
LIBDL = @LIBDL@
+LIBGEN = @LIBGEN@
LIBJPEG = @LIBJPEG@
+LIBMICO = @LIBMICO@
LIBOBJS = @LIBOBJS@
LIBPNG = @LIBPNG@
LIBPTHREAD = @LIBPTHREAD@
+LIBPYTHON = @LIBPYTHON@
+LIBQIMGIO = @LIBQIMGIO@
LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
+LIBSHADOW = @LIBSHADOW@
LIBSM = @LIBSM@
LIBSOCKET = @LIBSOCKET@
+LIBSSL = @LIBSSL@
+LIBTIFF = @LIBTIFF@
LIBTOOL = @LIBTOOL@
LIBUCB = @LIBUCB@
LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
+LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@
@@ -117,6 +156,7 @@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
+LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@
LIB_KSPELL = @LIB_KSPELL@
@@ -124,32 +164,38 @@
LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@
+LIB_QTOPIA = @LIB_QTOPIA@
LIB_SMB = @LIB_SMB@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
+MICO_INCLUDES = @MICO_INCLUDES@
+MICO_LDFLAGS = @MICO_LDFLAGS@
MOC = @MOC@
MSGFMT = @MSGFMT@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJEXT = @OBJEXT@
+OBJC = @OBJC@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+PAMLIBS = @PAMLIBS@
+PASSWDLIBS = @PASSWDLIBS@
+PYTHONINC = @PYTHONINC@
+PYTHONLIB = @PYTHONLIB@
+PYTHONMODDIR = @PYTHONMODDIR@
+QTDOCDIR = @QTDOCDIR@
QTE_NORTTI = @QTE_NORTTI@
+QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
QT_INCLUDES = @QT_INCLUDES@
QT_LDFLAGS = @QT_LDFLAGS@
RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
+RC = @RC@
+SETUIDFLAGS = @SETUIDFLAGS@
+SSL_INCLUDES = @SSL_INCLUDES@
+SSL_LDFLAGS = @SSL_LDFLAGS@
STRIP = @STRIP@
TOPSUBDIRS = @TOPSUBDIRS@
UIC = @UIC@
@@ -162,39 +208,19 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
+XPMINC = @XPMINC@
+XPMLIB = @XPMLIB@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_INCLUDES = @X_INCLUDES@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
-am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
+idldir = @idldir@
install_sh = @install_sh@
+jni_includes = @jni_includes@
kde_appsdir = @kde_appsdir@
kde_bindir = @kde_bindir@
kde_confdir = @kde_confdir@
@@ -216,23 +242,9 @@
kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
+micodir = @micodir@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
@@ -310,7 +322,11 @@
kmyirc_client_OBJECTS = kmyirc_client.$(OBJEXT)
kmyirc_client_DEPENDENCIES =
+DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
@@ -375,6 +391,8 @@
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXFLAGS = @CXXFLAGS@
+CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -416,7 +434,7 @@
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
else :; fi; \
done
@@ -469,37 +487,23 @@
-rm -rf ./$(DEPDIR)
.cpp.o:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@ fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@ fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
.cpp.lo:
-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@ fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CXXDEPMODE = @CXXDEPMODE@
mostlyclean-libtool:
-rm -f *.lo
@@ -550,9 +554,6 @@
ETAGS = etags
ETAGSFLAGS =
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -578,31 +579,16 @@
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -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 ircchannel.ui kmyircui.rc avatardlg.ui hi22-app-kmyirc.png hi64-app-kmyirc.png hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h
+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
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -611,13 +597,7 @@
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -689,9 +669,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
@@ -710,22 +688,11 @@
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- 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: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags distclean distclean-compile \
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool distclean distclean-compile \
distclean-depend distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-binPROGRAMS install-data install-data-am \
@@ -733,9 +700,9 @@
install-kdelnkDATA install-man install-rcDATA install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-info-am uninstall-kdelnkDATA uninstall-rcDATA
+ mostlyclean-generic mostlyclean-libtool tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+ uninstall-kdelnkDATA uninstall-rcDATA
messages: rc.cpp
@@ -864,22 +831,22 @@
$(MOC) $(srcdir)/kmigeneralcfg.h -o kmigeneralcfg.moc.cpp
#>+ 3
-kmigroupdlg.moc: $(srcdir)/kmigroupdlg.h
- $(MOC) $(srcdir)/kmigroupdlg.h -o kmigroupdlg.moc
-
-#>+ 3
pref.moc: $(srcdir)/pref.h
$(MOC) $(srcdir)/pref.h -o pref.moc
#>+ 3
-kmiserverdlg.moc: $(srcdir)/kmiserverdlg.h
- $(MOC) $(srcdir)/kmiserverdlg.h -o kmiserverdlg.moc
+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
+
+#>+ 3
kmiircchannel.moc: $(srcdir)/kmiircchannel.h
$(MOC) $(srcdir)/kmiircchannel.h -o kmiircchannel.moc
@@ -905,7 +872,7 @@
#>+ 3
clean-metasources:
- -rm -f kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp kmigroupdlg.moc pref.moc kmiserverdlg.moc kmisystray.moc kmiircchannel.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
+ -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
#>+ 4
clean-idl:
@@ -925,29 +892,6 @@
#>+ 2
docs-am:
-
-#>+ 22
-install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- $(INSTALL_DATA) $(srcdir)/hi22-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmyirc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- $(INSTALL_DATA) $(srcdir)/hi48-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmyirc.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- $(INSTALL_DATA) $(srcdir)/hi128-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/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
- $(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/64x64/apps
- $(INSTALL_DATA) $(srcdir)/hi64-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmyirc.png
-
-uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmyirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmyirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmyirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmyirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmyirc.png
- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmyirc.png
#>+ 6
force-reedit:
Index: kmyircview.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyircview.h 4 Jun 2003 13:07:08 -0000 1.2
+++ kmyircview.h 18 Jun 2003 08:19:05 -0000 1.3
@@ -75,7 +75,7 @@
private:
KParts::ReadOnlyPart *m_html;
- QTabWidet *tabChannelBar;
+ QTabWidget *tabChannelBar;
};
#endif // _KMYIRCVIEW_H_
|
|
From: <sta...@us...> - 2003-06-18 00:27:58
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18477
Modified Files:
Makefile.in hi16-app-kmyirc.png hi32-app-kmyirc.png
kmyircui.rc
Added Files:
hi128-app-kmyirc.png hi22-app-kmyirc.png hi48-app-kmyirc.png
hi64-app-kmyirc.png hi96-app-kmyirc.png
Log Message:
* Added the new icon
--- NEW FILE: hi128-app-kmyirc.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: hi22-app-kmyirc.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: hi48-app-kmyirc.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: hi64-app-kmyirc.png ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: hi96-app-kmyirc.png ---
(This appears to be a binary file; contents omitted.)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.in 4 Jun 2003 13:07:08 -0000 1.16
+++ Makefile.in 18 Jun 2003 00:27:52 -0000 1.17
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.7.3 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,100 +14,71 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_alias = @build_alias@
build_triplet = @build@
-host_alias = @host_alias@
host_triplet = @host@
-target_alias = @target_alias@
target_triplet = @target@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
ARTSCCONFIG = @ARTSCCONFIG@
-AS = @AS@
+AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CONF_FILES = @CONF_FILES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DCOPIDL = @DCOPIDL@
DCOPIDL2CPP = @DCOPIDL2CPP@
DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-DPMSINC = @DPMSINC@
-DPMSLIB = @DPMSLIB@
ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
-GLINC = @GLINC@
-GLLIB = @GLLIB@
GMSGFMT = @GMSGFMT@
-IDL = @IDL@
-IDL_DEPENDENCIES = @IDL_DEPENDENCIES@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JVMLIBS = @JVMLIBS@
KDECONFIG = @KDECONFIG@
KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-KDE_HAVE_DOT = @KDE_HAVE_DOT@
KDE_INCLUDES = @KDE_INCLUDES@
KDE_LDFLAGS = @KDE_LDFLAGS@
KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
@@ -122,32 +93,22 @@
KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBBZ2 = @LIBBZ2@
+LDFLAGS = @LDFLAGS@
LIBCOMPAT = @LIBCOMPAT@
LIBCRYPT = @LIBCRYPT@
LIBDL = @LIBDL@
-LIBGEN = @LIBGEN@
LIBJPEG = @LIBJPEG@
-LIBMICO = @LIBMICO@
LIBOBJS = @LIBOBJS@
LIBPNG = @LIBPNG@
LIBPTHREAD = @LIBPTHREAD@
-LIBPYTHON = @LIBPYTHON@
-LIBQIMGIO = @LIBQIMGIO@
LIBRESOLV = @LIBRESOLV@
-LIBSHADOW = @LIBSHADOW@
+LIBS = @LIBS@
LIBSM = @LIBSM@
LIBSOCKET = @LIBSOCKET@
-LIBSSL = @LIBSSL@
-LIBTIFF = @LIBTIFF@
LIBTOOL = @LIBTOOL@
LIBUCB = @LIBUCB@
LIBUTIL = @LIBUTIL@
LIBZ = @LIBZ@
-LIB_JASPER = @LIB_JASPER@
LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@
@@ -156,7 +117,6 @@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
-LIB_KIMGIO = @LIB_KIMGIO@
LIB_KIO = @LIB_KIO@
LIB_KPARTS = @LIB_KPARTS@
LIB_KSPELL = @LIB_KSPELL@
@@ -164,38 +124,32 @@
LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@
LIB_QT = @LIB_QT@
-LIB_QTOPIA = @LIB_QTOPIA@
LIB_SMB = @LIB_SMB@
LIB_X11 = @LIB_X11@
LIB_XEXT = @LIB_XEXT@
LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
-MICO_INCLUDES = @MICO_INCLUDES@
-MICO_LDFLAGS = @MICO_LDFLAGS@
MOC = @MOC@
MSGFMT = @MSGFMT@
NOOPT_CFLAGS = @NOOPT_CFLAGS@
NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-OBJC = @OBJC@
-OBJCFLAGS = @OBJCFLAGS@
-OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PAMLIBS = @PAMLIBS@
-PASSWDLIBS = @PASSWDLIBS@
-PYTHONINC = @PYTHONINC@
-PYTHONLIB = @PYTHONLIB@
-PYTHONMODDIR = @PYTHONMODDIR@
-QTDOCDIR = @QTDOCDIR@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
QTE_NORTTI = @QTE_NORTTI@
-QTOPIA_INCLUDES = @QTOPIA_INCLUDES@
QT_INCLUDES = @QT_INCLUDES@
QT_LDFLAGS = @QT_LDFLAGS@
RANLIB = @RANLIB@
-RC = @RC@
-SETUIDFLAGS = @SETUIDFLAGS@
-SSL_INCLUDES = @SSL_INCLUDES@
-SSL_LDFLAGS = @SSL_LDFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
STRIP = @STRIP@
TOPSUBDIRS = @TOPSUBDIRS@
UIC = @UIC@
@@ -208,19 +162,39 @@
VERSION = @VERSION@
WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
XGETTEXT = @XGETTEXT@
-XPMINC = @XPMINC@
-XPMLIB = @XPMLIB@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_INCLUDES = @X_INCLUDES@
X_LDFLAGS = @X_LDFLAGS@
X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-idldir = @idldir@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
-jni_includes = @jni_includes@
kde_appsdir = @kde_appsdir@
kde_bindir = @kde_bindir@
kde_confdir = @kde_confdir@
@@ -242,9 +216,23 @@
kde_templatesdir = @kde_templatesdir@
kde_wallpaperdir = @kde_wallpaperdir@
kde_widgetdir = @kde_widgetdir@
-micodir = @micodir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
qt_includes = @qt_includes@
qt_libraries = @qt_libraries@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
@@ -322,11 +310,7 @@
kmyirc_client_OBJECTS = kmyirc_client.$(OBJEXT)
kmyirc_client_DEPENDENCIES =
-DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
@@ -391,8 +375,6 @@
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -434,7 +416,7 @@
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
@@ -487,23 +469,37 @@
-rm -rf ./$(DEPDIR)
.cpp.o:
-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
.cpp.obj:
-@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(CXXCOMPILE) -c -o $@ `cygpath -w $<`
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.cpp.lo:
-@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+@am__fastdepCXX_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool:
-rm -f *.lo
@@ -554,6 +550,9 @@
ETAGS = etags
ETAGSFLAGS =
+CTAGS = ctags
+CTAGSFLAGS =
+
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -579,16 +578,31 @@
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kmyirc.desktop kmigeneralcfg.h hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui groupdlg.ui ircchannel.ui kmyircui.rc avatardlg.ui hi32-app-kmyirc.png kmyirc.lsm nickname.ui kmisocket.h
+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 ircchannel.ui kmyircui.rc 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)
@@ -597,7 +611,13 @@
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -669,7 +689,9 @@
info-am:
-install-data-am: install-kdelnkDATA install-rcDATA
+#>- install-data-am: install-kdelnkDATA install-rcDATA
+#>+ 1
+install-data-am: install-kde-icons install-kdelnkDATA install-rcDATA
install-exec-am: install-binPROGRAMS
@@ -688,11 +710,22 @@
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+#>- uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+#>- uninstall-kdelnkDATA uninstall-rcDATA
+#>+ 2
+uninstall-am: uninstall-kde-icons uninstall-binPROGRAMS uninstall-info-am \
uninstall-kdelnkDATA uninstall-rcDATA
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool distclean distclean-compile \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
distclean-depend distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-binPROGRAMS install-data install-data-am \
@@ -700,9 +733,9 @@
install-kdelnkDATA install-man install-rcDATA install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool tags uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
- uninstall-kdelnkDATA uninstall-rcDATA
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-info-am uninstall-kdelnkDATA uninstall-rcDATA
messages: rc.cpp
@@ -831,22 +864,22 @@
$(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
+pref.moc: $(srcdir)/pref.h
+ $(MOC) $(srcdir)/pref.h -o pref.moc
#>+ 3
kmiserverdlg.moc: $(srcdir)/kmiserverdlg.h
$(MOC) $(srcdir)/kmiserverdlg.h -o kmiserverdlg.moc
#>+ 3
+kmisystray.moc: $(srcdir)/kmisystray.h
+ $(MOC) $(srcdir)/kmisystray.h -o kmisystray.moc
+
+#>+ 3
kmiircchannel.moc: $(srcdir)/kmiircchannel.h
$(MOC) $(srcdir)/kmiircchannel.h -o kmiircchannel.moc
@@ -872,7 +905,7 @@
#>+ 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 kmiircdefault.moc kmyircview.moc kmyirc.moc kmiircsocket.moc.cpp kmigeneralcfg.moc.cpp kmigroupdlg.moc pref.moc kmiserverdlg.moc kmisystray.moc kmiircchannel.moc kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
#>+ 4
clean-idl:
@@ -892,6 +925,29 @@
#>+ 2
docs-am:
+
+#>+ 22
+install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmyirc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/hi48-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmyirc.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/hi128-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/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
+ $(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/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/hi64-app-kmyirc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmyirc.png
+
+uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmyirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmyirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kmyirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmyirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmyirc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kmyirc.png
#>+ 6
force-reedit:
Index: hi16-app-kmyirc.png
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/hi16-app-kmyirc.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvswTISQd and /tmp/cvs8Ya6sh differ
Index: hi32-app-kmyirc.png
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/hi32-app-kmyirc.png,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsREhqVe and /tmp/cvsuhWkEj differ
Index: kmyircui.rc
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircui.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmyircui.rc 4 Jun 2003 13:07:08 -0000 1.3
+++ kmyircui.rc 18 Jun 2003 00:27:52 -0000 1.4
@@ -9,4 +9,11 @@
</Menu>
</MenuBar>
+
+<ToolBar name="mainToolBar" fullWidth="false" newline="false">
+
+ <Action name="connect" />
+
+</ToolBar>
+
</kpartgui>
|
|
From: <sta...@us...> - 2003-06-04 13:25:02
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9537
Modified Files:
kmigeneralcfg.cpp
Log Message:
* Modified Layout
Index: kmigeneralcfg.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmigeneralcfg.cpp 2 Jun 2003 08:44:04 -0000 1.2
+++ kmigeneralcfg.cpp 4 Jun 2003 13:24:58 -0000 1.3
@@ -11,6 +11,7 @@
#include <qlayout.h>
#include <qimage.h>
#include <qpixmap.h>
+#include <qlayout.h>
/*
* Constructs a KMIGeneralCfg as a child of 'parent', with the
@@ -22,14 +23,17 @@
if ( !name )
setName( "KMIGeneralCfg" );
+ QVBoxLayout *layout = new QVBoxLayout(this);
systrayBtn = new QCheckBox( this, "systrayBtn" );
- systrayBtn->setGeometry( QRect( 9, 13, 170, 20 ) );
systrayBtn->setText( i18n( "Enable System Tray Icon" ) );
+ layout->addWidget( systrayBtn );
systrayLabel = new QLabel( this, "systrayLabel" );
- systrayLabel->setGeometry( QRect( 10, 30, 480, 50 ) );
- systrayLabel->setMargin( 0 );
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>" ) );
+ layout->addWidget( systrayLabel );
+
+ QSpacerItem *spacer = new QSpacerItem( 10, 10, QSizePolicy::Minimum, QSizePolicy::Expanding );
+ layout->addItem( spacer );
resize( QSize(523, 410).expandedTo(minimumSizeHint()) );
}
|
|
From: <she...@us...> - 2003-06-04 13:07:11
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29519/src
Modified Files:
Makefile.am Makefile.in kmyirc.cpp kmyirc.h kmyircui.rc
kmyircview.cpp kmyircview.h pref.cpp
Added Files:
ircchannel.ui kmiircchannel.cpp kmiircchannel.h
Log Message:
Changed UI settings in ircChannel.ui
Added a QTabWidget to KMyIRCView
Added ircChannel UI
Added KMIIrcChannel Class
--- NEW FILE: ircchannel.ui ---
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>ircChannel</class>
<widget class="QWidget">
<property name="name">
<cstring>ircChannel</cstring>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>597</width>
<height>480</height>
</rect>
</property>
<property name="caption">
<string>ircChannel</string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout5</cstring>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="KLineEdit" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>le_inputText</cstring>
</property>
</widget>
<widget class="KTextEdit" row="0" column="0">
<property name="name">
<cstring>te_output</cstring>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="KListBox" row="0" column="1">
<property name="name">
<cstring>lb_channelUsers</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</grid>
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QToolButton">
<property name="name">
<cstring>toolButton1</cstring>
</property>
<property name="text">
<string>T</string>
</property>
</widget>
<widget class="QToolButton">
<property name="name">
<cstring>toolButton2</cstring>
</property>
<property name="text">
<string>A</string>
</property>
</widget>
<widget class="QToolButton">
<property name="name">
<cstring>toolButton3</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>B</string>
</property>
</widget>
</hbox>
</widget>
<spacer row="0" column="1">
<property name="name">
<cstring>spacer1</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
</property>
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>490</width>
<height>16</height>
</size>
</property>
</spacer>
</grid>
</widget>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
<includehint>ktextedit.h</includehint>
<includehint>klistbox.h</includehint>
</includehints>
</UI>
--- NEW FILE: kmiircchannel.cpp ---
#include "kmiircchannel.h"
KMIIrcChannel::KMIIrcChannel(QWidget* parent, const char* name)
: ircChannel(parent,name)
{
}
KMIIrcChannel::~KMIIrcChannel()
{
}
/*$SPECIALIZATION$*/
#include "kmiircchannel.moc"
--- NEW FILE: kmiircchannel.h ---
#ifndef KMIIRCCHANNEL_H
#define KMIIRCCHANNEL_H
#include "ircchannel.h"
class KMIIrcChannel : public ircChannel
{
Q_OBJECT
public:
KMIIrcChannel(QWidget* parent = 0, const char* name = 0 );
~KMIIrcChannel();
/*$PUBLIC_FUNCTIONS$*/
public slots:
/*$PUBLIC_SLOTS$*/
protected:
/*$PROTECTED_FUNCTIONS$*/
protected slots:
/*$PROTECTED_SLOTS$*/
};
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am 2 Jun 2003 08:44:03 -0000 1.11
+++ Makefile.am 4 Jun 2003 13:07:08 -0000 1.12
@@ -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
+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
# 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.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.in 2 Jun 2003 08:44:04 -0000 1.15
+++ Makefile.in 4 Jun 2003 13:07:08 -0000 1.16
@@ -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
+#>- 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
#>+ 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 kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.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 kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.cpp
# these are the headers for your project
noinst_HEADERS = kmyirc.h kmyircview.h pref.h
@@ -300,16 +300,18 @@
kmiserverdlg.$(OBJEXT) kmiavatardlg.$(OBJEXT) \
kminickdlg.$(OBJEXT) kmiircmessage.$(OBJEXT) \
kmiircsocket.$(OBJEXT) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
- kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT)
+ kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) \
+ kmiircchannel.$(OBJEXT)
#>- kmyirc_OBJECTS = $(am_kmyirc_OBJECTS)
-#>+ 10
+#>+ 11
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) kmisystray.$(OBJEXT) kmisocket.$(OBJEXT) \
- kmigeneralcfg.$(OBJEXT) kmiircdefault.$(OBJEXT) kmyirciface_skel.$(OBJEXT) ircservercfg.$(OBJEXT) groupdlg.$(OBJEXT) serverdlg.$(OBJEXT) avatardlg.$(OBJEXT) nickname.$(OBJEXT) ircdefault.$(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
@KDE_USE_FINAL_FALSE@kmyirc_OBJECTS = $(kmyirc_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@kmyirc_OBJECTS = $(kmyirc_final_OBJECTS)
@@ -330,6 +332,7 @@
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmiavatardlg.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmigeneralcfg.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmigroupdlg.Po \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiircchannel.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiircdefault.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiircmessage.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiircservercfg.Po \
@@ -340,10 +343,11 @@
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmyirc.Po ./$(DEPDIR)/kmyirc_client.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmyircview.Po ./$(DEPDIR)/main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/pref.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 \
+#>+ 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 \
@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 \
@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 \
@@ -354,9 +358,10 @@
@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)/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)/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)/kmiircchannel.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 \
@@ -463,6 +468,7 @@
@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)/kmiircchannel.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@
@@ -582,7 +588,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-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
+KDE_DIST=kmyirc.desktop kmigeneralcfg.h hi16-app-kmyirc.png ircservercfg.ui serverdlg.ui kmyirciface.h kmisystray.h ircdefault.ui groupdlg.ui ircchannel.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)
@@ -711,7 +717,7 @@
kmyirciface_skel.cpp: kmyirciface.kidl
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kmyirciface.kidl
-#>+ 79
+#>+ 92
ircservercfg.cpp: $(srcdir)/ircservercfg.ui ircservercfg.h ircservercfg.moc
rm -f ircservercfg.cpp
echo '#include <klocale.h>' > ircservercfg.cpp
@@ -790,6 +796,19 @@
ircdefault.moc: ircdefault.h
$(MOC) ircdefault.h -o ircdefault.moc
+ircchannel.cpp: $(srcdir)/ircchannel.ui ircchannel.h ircchannel.moc
+ rm -f ircchannel.cpp
+ echo '#include <klocale.h>' > ircchannel.cpp
+ $(UIC) -tr ${UIC_TR} -i ircchannel.h $(srcdir)/ircchannel.ui > ircchannel.cpp.temp ; ret=$$?; \
+ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" ircchannel.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_ircchannel,g" >> ircchannel.cpp ;\
+ rm -f ircchannel.cpp.temp ;\
+ if test "$$ret" = 0; then echo '#include "ircchannel.moc"' >> ircchannel.cpp; else rm -f ircchannel.cpp ; exit $$ret ; fi
+
+ircchannel.h: $(srcdir)/ircchannel.ui
+ $(UIC) -o ircchannel.h $(srcdir)/ircchannel.ui
+
+ircchannel.moc: ircchannel.h
+ $(MOC) ircchannel.h -o ircchannel.moc
#>+ 3
kmiircdefault.moc: $(srcdir)/kmiircdefault.h
@@ -828,6 +847,10 @@
$(MOC) $(srcdir)/kmiserverdlg.h -o kmiserverdlg.moc
#>+ 3
+kmiircchannel.moc: $(srcdir)/kmiircchannel.h
+ $(MOC) $(srcdir)/kmiircchannel.h -o kmiircchannel.moc
+
+#>+ 3
kminickdlg.moc: $(srcdir)/kminickdlg.h
$(MOC) $(srcdir)/kminickdlg.h -o kminickdlg.moc
@@ -849,14 +872,14 @@
#>+ 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 kminickdlg.moc kmisocket.moc kmiavatardlg.moc kmiircservercfg.moc kmiircmessage.moc
+ -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
#>+ 4
clean-idl:
-rm -f \
kmyirciface_skel.cpp kmyirciface_skel.h kmyirciface.kidl
-#>+ 9
+#>+ 10
clean-ui:
-rm -f \
ircservercfg.cpp ircservercfg.h ircservercfg.moc \
@@ -864,7 +887,8 @@
serverdlg.cpp serverdlg.h serverdlg.moc \
avatardlg.cpp avatardlg.h avatardlg.moc \
nickname.cpp nickname.h nickname.moc \
- ircdefault.cpp ircdefault.h ircdefault.moc
+ ircdefault.cpp ircdefault.h ircdefault.moc \
+ ircchannel.cpp ircchannel.h ircchannel.moc
#>+ 2
docs-am:
@@ -887,11 +911,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 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
+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
@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 kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.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 kmyirciface_skel.cpp ircservercfg.cpp groupdlg.cpp serverdlg.cpp avatardlg.cpp nickname.cpp ircdefault.cpp ircchannel.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; \
@@ -934,53 +958,57 @@
kde-rpo-clean:
-rm -f *.rpo
-#>+ 50
+#>+ 54
kmyircview.o: kmyircview.moc
-$(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
+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
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
+$(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
kmisocket.o: kmisocket.moc
kmigroupdlg.lo: kmigroupdlg.moc
-$(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
+$(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
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
+$(srcdir)/kminickdlg.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
pref.lo: pref.moc
kmiserverdlg.lo: kmiserverdlg.moc
-$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h
+$(srcdir)/kmigeneralcfg.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
kmyirc.lo: kmyirc.moc
-$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h
+$(srcdir)/kmiircmessage.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
kmiircmessage.o: kmiircmessage.moc
kminickdlg.lo: kminickdlg.moc
-$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h
+$(srcdir)/kmiircsocket.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
kminickdlg.o: kminickdlg.moc
-$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h
+$(srcdir)/kmisystray.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.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
+$(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
kmisocket.lo: kmisocket.moc
-$(srcdir)/kmyircview.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h
nmcheck:
-$(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
+$(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
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
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
+$(srcdir)/kmiircchannel.cpp: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
kmiavatardlg.lo: kmiavatardlg.moc
+$(srcdir)/kmiircchannel.h: ircservercfg.h groupdlg.h serverdlg.h avatardlg.h nickname.h ircdefault.h ircchannel.h
kmigroupdlg.o: kmigroupdlg.moc
Index: kmyirc.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kmyirc.cpp 2 Jun 2003 08:44:04 -0000 1.5
+++ kmyirc.cpp 4 Jun 2003 13:07:08 -0000 1.6
@@ -108,12 +108,18 @@
// this doesn't do anything useful. it's just here to illustrate
// how to insert a custom menu and menu item
- KAction *custom = new KAction(i18n("&Connect"), 0,
- this, SLOT(slotServerConnect()),
- actionCollection(), "connect");
+ KAction *custom = new KAction(i18n("&Connect"), 0,
+ this, SLOT(slotServerConnect()),
+ actionCollection(), "connect");
+ KAction *channel_add=new KAction(i18n("&Add Channel"),0,
+ this,SLOT(slotAddChannel()),
+ actionCollection(),"channel_add");
+
#ifdef DEBUG
#ifdef STAMPEDE
#warning "You must set your development path here to get the kmyircui.rc file"
+ #warning "define in preprocessor: #define STAMPEDE 1 to get your default directory where kmyircui.rc is"
+
createGUI("/home/stampede/kmyirc/kmyirc-ng/src/kmyircui.rc");
#else
createGUI("/home/sh/projekte/kmyirc-ng/src/kmyircui.rc");
@@ -323,6 +329,10 @@
void KMyIRC::slotServerConnect()
{
#warning "not implemented yet!!"
+}
+
+void KMyIRC::slotAddChannel() {
+#warning "not implemened yet !!"
}
#include "kmyirc.moc"
Index: kmyirc.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyirc.h 24 Apr 2003 07:52:06 -0000 1.2
+++ kmyirc.h 4 Jun 2003 13:07:08 -0000 1.3
@@ -13,6 +13,7 @@
#include <kmainwindow.h>
#include "kmyircview.h"
+#include "kmiircchannel.h"
class KPrinter;
class KToggleAction;
@@ -89,12 +90,13 @@
private:
KMyIRCView *m_view;
-
+ KMIIrcChannel *m_view1;
KPrinter *m_printer;
KToggleAction *m_toolbarAction;
KToggleAction *m_statusbarAction;
protected slots: virtual void slotServerConnect();
+ protected slots: virtual void slotAddChannel();
};
#endif // _KMYIRC_H_
Index: kmyircui.rc
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircui.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmyircui.rc 24 Apr 2003 07:52:07 -0000 1.2
+++ kmyircui.rc 4 Jun 2003 13:07:08 -0000 1.3
@@ -2,7 +2,11 @@
<kpartgui name="kmyirc" version="1">
<MenuBar>
<Menu name="server"><text>&Server</text>
- <Action name="connect" />
- </Menu>
+ <Action name="connect" />
+ </Menu>
+ <Menu name="channel"><text>&Channels</text>
+ <Action name="channel_add" />
+
+ </Menu>
</MenuBar>
</kpartgui>
Index: kmyircview.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kmyircview.cpp 23 Apr 2003 11:18:43 -0000 1.1.1.1
+++ kmyircview.cpp 4 Jun 2003 13:07:08 -0000 1.2
@@ -6,6 +6,7 @@
#include <qpainter.h>
#include <qlayout.h>
+#include <qtabwidget.h>
#include <kurl.h>
@@ -15,61 +16,17 @@
#include <krun.h>
#include <klocale.h>
+#include "kmiircchannel.h"
+
KMyIRCView::KMyIRCView(QWidget *parent)
: QWidget(parent),
DCOPObject("KMyIRCIface")
{
// setup our layout manager to automatically add our widgets
QHBoxLayout *top_layout = new QHBoxLayout(this);
- top_layout->setAutoAdd(true);
-
- // we want to look for all components that satisfy our needs. the
- // trader will actually search through *all* registered KDE
- // applications and components -- not just KParts. So we have to
- // specify two things: a service type and a constraint
- //
- // the service type is like a mime type. we say that we want all
- // applications and components that can handle HTML -- 'text/html'
- //
- // however, by itself, this will return such things as Netscape..
- // not what we wanted. so we constrain it by saying that the
- // string 'KParts/ReadOnlyPart' must be found in the ServiceTypes
- // field. with this, only components of the type we want will be
- // returned.
- KTrader::OfferList offers = KTrader::self()->query("text/html", "'KParts/ReadOnlyPart' in ServiceTypes");
-
- KLibFactory *factory = 0;
- // in theory, we only care about the first one.. but let's try all
- // offers just in case the first can't be loaded for some reason
- KTrader::OfferList::Iterator it(offers.begin());
- for( ; it != offers.end(); ++it)
- {
- KService::Ptr ptr = (*it);
-
- // we now know that our offer can handle HTML and is a part.
- // since it is a part, it must also have a library... let's try to
- // load that now
- factory = KLibLoader::self()->factory( ptr->library() );
- if (factory)
- {
- m_html = static_cast<KParts::ReadOnlyPart *>(factory->create(this, ptr->name(), "KParts::ReadOnlyPart"));
- break;
- }
- }
-
- // if our factory is invalid, then we never found our component
- // and we might as well just exit now
- if (!factory)
- {
- KMessageBox::error(this, i18n("Could not find a suitable HTML component"));
- return;
- }
-
- connect(m_html, SIGNAL(setWindowCaption(const QString&)),
- this, SLOT(slotSetTitle(const QString&)));
- connect(m_html, SIGNAL(setStatusBarText(const QString&)),
- this, SLOT(slotOnURL(const QString&)));
-
+ top_layout->setAutoAdd(false);
+ tabChannelBar=new QTabWidget(this,"channelTabBar");
+ tabChannelBar->setTabPosition(QTabWidget::Bottom);
}
KMyIRCView::~KMyIRCView()
Index: kmyircview.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyircview.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- kmyircview.h 23 Apr 2003 11:18:43 -0000 1.1.1.1
+++ kmyircview.h 4 Jun 2003 13:07:08 -0000 1.2
@@ -11,6 +11,7 @@
class QPainter;
class KURL;
+class QTabWidget;
/**
* This is the main view class for KMyIRC. Most of the non-menu,
@@ -74,6 +75,7 @@
private:
KParts::ReadOnlyPart *m_html;
+ QTabWidet *tabChannelBar;
};
#endif // _KMYIRCVIEW_H_
Index: pref.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pref.cpp 2 Jun 2003 08:44:04 -0000 1.6
+++ pref.cpp 4 Jun 2003 13:07:08 -0000 1.7
@@ -50,13 +50,11 @@
}
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 systray setting to global configuration file
+ //
+ KGlobal::config()->setGroup("General Settings");
+ KGlobal::config()->writeEntry("Enable Systray",m_pageOne->isSystray());
//
// Writing default irc settings to global configuration file
//
|
|
From: <she...@us...> - 2003-06-04 13:07:11
|
Update of /cvsroot/kmyirc/kmyirc-ng
In directory sc8-pr-cvs1:/tmp/cvs-serv29519
Modified Files:
ChangeLog Makefile.in kmyirc.kdevelop kmyirc.kdevses
Log Message:
Changed UI settings in ircChannel.ui
Added a QTabWidget to KMyIRCView
Added ircChannel UI
Added KMIIrcChannel Class
Index: ChangeLog
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog 2 Jun 2003 08:39:03 -0000 1.14
+++ ChangeLog 4 Jun 2003 13:07:07 -0000 1.15
@@ -1,5 +1,13 @@
Version: 0.3.0.1
+ 2003-06-03 Stephan Hermann <sh...@so...>
+ * Changed UI settings in ircChannel.ui
+ * Added a QTabWidget to KMyIRCView
+
+ 2003-06-02 Stephan Hermann <sh...@so...>
+ * Added ircChannel UI
+ * Added KMIIrcChannel Class
+
2003-06-02 Stephan Hermann <sh...@so...>
* Added KMIIrcDefault Configuration Widget
* Changed systrayBtn and systrayLabel to private in KMIGeneralCfg
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
Index: kmyirc.kdevelop
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevelop,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kmyirc.kdevelop 2 Jun 2003 08:39:04 -0000 1.7
+++ kmyirc.kdevelop 4 Jun 2003 13:07:07 -0000 1.8
@@ -51,6 +51,8 @@
<subclass uifile="/src/nickname.ui" sourcefile="/src/kminickdlg.h" />
<subclass uifile="/src/ircdefault.ui" sourcefile="/src/kmiircdefault.cpp" />
<subclass uifile="/src/ircdefault.ui" sourcefile="/src/kmiircdefault.h" />
+ <subclass uifile="/src/ircchannel.ui" sourcefile="/src/kmiircchannel.cpp" />
+ <subclass uifile="/src/ircchannel.ui" sourcefile="/src/kmiircchannel.h" />
</subclassing>
<configurations>
<default>
Index: kmyirc.kdevses
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevses,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kmyirc.kdevses 2 Jun 2003 08:39:04 -0000 1.13
+++ kmyirc.kdevses 4 Jun 2003 13:07:07 -0000 1.14
@@ -1,62 +1,42 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="11" >
+ <DocsAndViews NumberOfDocuments="7" >
<Doc0 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/ChangeLog" >
- <View0 line="15" Type="???" >
+ <View0 line="5" Type="???" >
<AdditionalSettings/>
</View0>
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.cpp" >
- <View0 line="65" Type="???" >
+ <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircview.cpp" >
+ <View0 line="45" Type="???" >
<AdditionalSettings/>
</View0>
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiavatardlg.h" >
- <View0 line="7" Type="???" >
+ <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircui.rc" >
+ <View0 line="8" Type="???" >
<AdditionalSettings/>
</View0>
</Doc2>
- <Doc3 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.h" >
- <View0 line="44" Type="???" >
+ <Doc3 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.cpp" >
+ <View0 line="335" Type="???" >
<AdditionalSettings/>
</View0>
</Doc3>
- <Doc4 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircdefault.cpp" >
- <View0 line="3" Type="???" >
+ <Doc4 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.h" >
+ <View0 line="98" Type="???" >
<AdditionalSettings/>
</View0>
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircdefault.h" >
- <View0 line="19" Type="???" >
+ <Doc5 context="ctx_qt" NumberOfViews="1" URL="file:/usr/lib/qt-3.1/doc/html/qtabwidget.html#tabPosition-prop" >
+ <View0 Type="???" >
<AdditionalSettings/>
</View0>
</Doc5>
- <Doc6 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/share/doc/HTML/en/kdelibs-3.1-apidocs/kdeui/html/classKDialogBase.html" >
- <View0 Type="???" >
+ <Doc6 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyircview.h" >
+ <View0 line="77" Type="???" >
<AdditionalSettings/>
</View0>
</Doc6>
- <Doc7 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.cpp" >
- <View0 line="49" Type="???" >
- <AdditionalSettings/>
- </View0>
- </Doc7>
- <Doc8 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.cpp" >
- <View0 line="23" Type="???" >
- <AdditionalSettings/>
- </View0>
- </Doc8>
- <Doc9 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/main.cpp" >
- <View0 line="54" Type="???" >
- <AdditionalSettings/>
- </View0>
- </Doc9>
- <Doc10 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.h" >
- <View0 line="23" Type="???" >
- <AdditionalSettings/>
- </View0>
- </Doc10>
</DocsAndViews>
<pluginList>
<kdevdebugger>
|
|
From: <she...@us...> - 2003-06-04 13:07:11
|
Update of /cvsroot/kmyirc/kmyirc-ng/po In directory sc8-pr-cvs1:/tmp/cvs-serv29519/po Modified Files: Makefile.in Log Message: Changed UI settings in ircChannel.ui Added a QTabWidget to KMyIRCView Added ircChannel UI Added KMIIrcChannel Class Index: Makefile.in =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/po/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 |
|
From: <she...@us...> - 2003-06-04 13:07:11
|
Update of /cvsroot/kmyirc/kmyirc-ng/doc/en In directory sc8-pr-cvs1:/tmp/cvs-serv29519/doc/en Modified Files: Makefile.in Log Message: Changed UI settings in ircChannel.ui Added a QTabWidget to KMyIRCView Added ircChannel UI Added KMIIrcChannel Class Index: Makefile.in =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/doc/en/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 |
|
From: <she...@us...> - 2003-06-02 08:44:35
|
Update of /cvsroot/kmyirc/kmyirc-ng/doc/en In directory sc8-pr-cvs1:/tmp/cvs-serv8137/doc/en Modified Files: Makefile.in Log Message: see comment before Index: Makefile.in =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/doc/en/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 |
|
From: <she...@us...> - 2003-06-02 08:44:35
|
Update of /cvsroot/kmyirc/kmyirc-ng/autom4te.cache In directory sc8-pr-cvs1:/tmp/cvs-serv8137/autom4te.cache Modified Files: requests Log Message: see comment before Index: requests =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/autom4te.cache/requests,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- requests 6 May 2003 07:49:19 -0000 1.10 +++ requests 2 Jun 2003 08:44:02 -0000 1.11 @@ -1,4 +1,4 @@ -# This file was created by autom4te-2.57. +# This file was created by autom4te. # It contains the lists of macros which have been traced. # It can be safely removed. |
|
From: <she...@us...> - 2003-06-02 08:44:09
|
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 &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 &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&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_
|
|
From: <she...@us...> - 2003-06-02 08:44:09
|
Update of /cvsroot/kmyirc/kmyirc-ng/po
In directory sc8-pr-cvs1:/tmp/cvs-serv8137/po
Modified Files:
Makefile.in
Log Message:
see comment before
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/po/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.in 6 May 2003 07:49:19 -0000 1.2
+++ Makefile.in 2 Jun 2003 08:44:03 -0000 1.3
@@ -249,10 +249,7 @@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
-#>- POFILES = AUTO
-#>+ 2
-POFILES = de.po
-GMOFILES = de.gmo
+POFILES = AUTO
subdir = po
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
@@ -261,7 +258,7 @@
DIST_COMMON = Makefile.am Makefile.in
#>- all: all-am
#>+ 1
-all: all-nls docs-am all-am
+all: docs-am all-am
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -286,21 +283,12 @@
tags: TAGS
TAGS:
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 4
-KDE_DIST=de.po
-
-#>- DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-#>+ 1
-DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-#>- distdir: $(DISTFILES)
-#>+ 1
-distdir: distdir-nls $(DISTFILES)
+distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -330,9 +318,7 @@
install: install-am
install-exec: install-exec-am
install-data: install-data-am
-#>- uninstall: uninstall-am
-#>+ 1
-uninstall: uninstall-nls uninstall-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
@@ -371,9 +357,7 @@
info-am:
-#>- install-data-am:
-#>+ 1
-install-data-am: install-nls
+install-data-am:
install-exec-am:
@@ -383,9 +367,7 @@
installcheck-am:
-#>- maintainer-clean: maintainer-clean-am
-#>+ 1
-maintainer-clean: clean-nls maintainer-clean-am
+maintainer-clean: maintainer-clean-am
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -407,47 +389,6 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-
-#>+ 4
-de.gmo: de.po
- rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po
- test ! -f de.gmo || touch de.gmo
-
-#>+ 3
-clean-nls:
- -rm -f de.gmo
-
-#>+ 10
-install-nls:
- @for base in de ; do \
- echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
- $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
- if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
- elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
- fi ;\
- done
-
-
-#>+ 3
-uninstall-nls:
- rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo
-
-#>+ 2
-all-nls: $(GMOFILES)
-
-#>+ 8
-distdir-nls:$(GMOFILES)
- for file in $(POFILES); do \
- cp $(srcdir)/$$file $(distdir); \
- done
- for file in $(GMOFILES); do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-#>+ 4
-merge:
- $(MAKE) -f $(top_srcdir)/admin/Makefile.common package-merge POFILES="${POFILES}" PACKAGE=${PACKAGE}
-
#>+ 2
docs-am:
|
|
From: <she...@us...> - 2003-06-02 08:39:10
|
Update of /cvsroot/kmyirc/kmyirc-ng
In directory sc8-pr-cvs1:/tmp/cvs-serv6084
Modified Files:
ChangeLog Makefile.in kmyirc.kdevelop kmyirc.kdevses
Log Message:
Added KMIIrcDefault Configuration Widget
Changed systrayBtn and systrayLabel to private in KMIGeneralCfg
Added KMIGeneralCfg::setSystray(bool)
Added bool KMIGeneralCfg::isSystray();
Added QString KMIIRCDefault::defaultNickname()
Added QString KMIIRCDefault::defaultAltNickname()
Added QString KMIIRCDefault::defaultUsername()
Added void KMIIRCDefault::setDefaultNickname(const QString &)
Added void KMIIRCDefault::setDefaultAltNickname(const QString &)
Added void KMIIRCDefault::setDefaultUsername(const QString &)
Added protected slot virtual void KMyIRCPreferences::slotOk()
Changed in main.cpp the systray display depending on configuration settings
Index: ChangeLog
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog 7 May 2003 20:01:11 -0000 1.13
+++ ChangeLog 2 Jun 2003 08:39:03 -0000 1.14
@@ -1,5 +1,24 @@
Version: 0.3.0.1
+ 2003-06-02 Stephan Hermann <sh...@so...>
+ * Added KMIIrcDefault Configuration Widget
+ * Changed systrayBtn and systrayLabel to private in KMIGeneralCfg
+ * Added KMIGeneralCfg::setSystray(bool)
+ * Added bool KMIGeneralCfg::isSystray();
+ * Added QString KMIIRCDefault::defaultNickname()
+ * Added QString KMIIRCDefault::defaultAltNickname()
+ * Added QString KMIIRCDefault::defaultUsername()
+ * Added void KMIIRCDefault::setDefaultNickname(const QString &)
+ * Added void KMIIRCDefault::setDefaultAltNickname(const QString &)
+ * Added void KMIIRCDefault::setDefaultUsername(const QString &)
+ * Added protected slot virtual void KMyIRCPreferences::slotOk()
+ * Changed in main.cpp the systray display depending on configuration settings
+
+
+ 2003-05-26 Stephan Hermann <sh...@so...>
+ * Added edit avatar functions, now you can edit your settings you set before.
+ * Added some time/date stamps in KMIAvatarDlg
+
2003-05-07 Henrique Pinto <sta...@co...>
* Added KMINetworkClient
@@ -54,24 +73,24 @@
2003-04-28 Stephan Hermann <sh...@so...>
* Added KMIAvatarDlg (can someoine check the UI settings,pls)
- * Added slot void KMIAvatarDlg::slotEnableChannelLogFile(bool toggle)
- * Added slot void KMIAvatarDlg::slotEnableURLLogFile(bool toggle)
- * Added slot void KMIAvatarDlg::slotEnableDateTime(bool toggle)
- * Added private attribute QString str_urlLogFile
- * Added private attribute QString str_channelLogFile
- * Added slot void KMIAvatarDlg::slotChooseURLLogFile()
- * Added slot void KMIAvatarDlg::slotChooseChannelLogFile()
- * Added KMINickDlg and nickdlg.ui
- * Added public void KMINickDlg::setNickName(const QString &value)
- * Added public QString KMINickDlg::getNickName()
- * Added protected slot void KMIAvatarDlg::slotAltNickAdd()
+ * Added slot void KMIAvatarDlg::slotEnableChannelLogFile(bool toggle)
+ * Added slot void KMIAvatarDlg::slotEnableURLLogFile(bool toggle)
+ * Added slot void KMIAvatarDlg::slotEnableDateTime(bool toggle)
+ * Added private attribute QString str_urlLogFile
+ * Added private attribute QString str_channelLogFile
+ * Added slot void KMIAvatarDlg::slotChooseURLLogFile()
+ * Added slot void KMIAvatarDlg::slotChooseChannelLogFile()
+ * Added KMINickDlg and nickdlg.ui
+ * Added public void KMINickDlg::setNickName(const QString &value)
+ * Added public QString KMINickDlg::getNickName()
+ * Added protected slot void KMIAvatarDlg::slotAltNickAdd()
2003-04-25 Stephan Hermann <sh...@so...>
- * Added functions to set server settings in KGlobal::config() (KMIIRCServerCfg::slotAddServer())
+ * Added functions to set server settings in KGlobal::config() (KMIIRCServerCfg::slotAddServer())
Format for Servergroups and Serversettings:
- [Group: Groupname]
- ServerName=<portNo>;(isSSL;"Yes";"No");"<description>"
+ [Group: Groupname]
+ ServerName=<portNo>;(isSSL;"Yes";"No");"<description>"
Format for Avatarsettings per server:
[Group: ServerName:PortNo]
IRCNick=<nickname>
@@ -82,7 +101,7 @@
* Added slot void KMIIRCServerCfg::slotEditServer()
* Added slot void KMIIRCServerCfg::slotDeleteServer()
* Added functions to add, change and delete server entries out of KGlobal::config()
- * Added AvatarDlg UI
+ * Added AvatarDlg UI
Index: Makefile.in
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/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:18 -0000 1.14
+++ Makefile.in 2 Jun 2003 08:39:03 -0000 1.15
@@ -433,7 +433,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=stamp-h.in subdirs configure.files kmyirc.kdevses kmyirc.kdevelop Makefile.cvs Doxyfile
+KDE_DIST=stamp-h.in subdirs configure.files kmyirc.kdevses kmyirc.kdevelop Makefile.cvs
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
Index: kmyirc.kdevelop
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevelop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kmyirc.kdevelop 29 Apr 2003 15:22:53 -0000 1.6
+++ kmyirc.kdevelop 2 Jun 2003 08:39:04 -0000 1.7
@@ -49,6 +49,8 @@
<subclass uifile="/src/avatardlg.ui" sourcefile="/src/kmiavatardlg.h" />
<subclass uifile="/src/nickname.ui" sourcefile="/src/kminickdlg.cpp" />
<subclass uifile="/src/nickname.ui" sourcefile="/src/kminickdlg.h" />
+ <subclass uifile="/src/ircdefault.ui" sourcefile="/src/kmiircdefault.cpp" />
+ <subclass uifile="/src/ircdefault.ui" sourcefile="/src/kmiircdefault.h" />
</subclassing>
<configurations>
<default>
Index: kmyirc.kdevses
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/kmyirc.kdevses,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- kmyirc.kdevses 6 May 2003 07:49:18 -0000 1.12
+++ kmyirc.kdevses 2 Jun 2003 08:39:04 -0000 1.13
@@ -1,58 +1,66 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="9" >
+ <DocsAndViews NumberOfDocuments="11" >
<Doc0 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/ChangeLog" >
- <View0 line="7" Type="???" >
+ <View0 line="15" Type="???" >
<AdditionalSettings/>
</View0>
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircservercfg.cpp" >
- <View0 line="58" Type="???" >
+ <Doc1 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.cpp" >
+ <View0 line="65" Type="???" >
<AdditionalSettings/>
</View0>
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircservercfg.h" >
- <View0 line="41" Type="???" >
+ <Doc2 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiavatardlg.h" >
+ <View0 line="7" Type="???" >
<AdditionalSettings/>
</View0>
</Doc2>
- <Doc3 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/kde/3.1/share/doc/HTML/en/kdelibs-apidocs/kdecore/html/classKSocket.html" >
- <View0 Type="???" >
+ <Doc3 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/pref.h" >
+ <View0 line="44" Type="???" >
<AdditionalSettings/>
</View0>
</Doc3>
- <Doc4 context="ctx_qt" NumberOfViews="1" URL="file:/usr/qt/3/doc/html/clientserver-example.html#x716" >
- <View0 Type="???" >
+ <Doc4 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircdefault.cpp" >
+ <View0 line="3" Type="???" >
<AdditionalSettings/>
</View0>
</Doc4>
- <Doc5 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircmessage.h" >
- <View0 line="32" Type="???" >
+ <Doc5 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircdefault.h" >
+ <View0 line="19" Type="???" >
<AdditionalSettings/>
</View0>
</Doc5>
- <Doc6 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircmessage.cpp" >
- <View0 line="148" Type="???" >
+ <Doc6 context="ctx_doxygen" NumberOfViews="1" URL="file:/usr/share/doc/HTML/en/kdelibs-3.1-apidocs/kdeui/html/classKDialogBase.html" >
+ <View0 Type="???" >
<AdditionalSettings/>
</View0>
</Doc6>
- <Doc7 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircsocket.h" >
- <View0 line="0" Type="???" >
+ <Doc7 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.cpp" >
+ <View0 line="49" Type="???" >
<AdditionalSettings/>
</View0>
</Doc7>
- <Doc8 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmiircsocket.cpp" >
- <View0 line="31" Type="???" >
+ <Doc8 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmyirc.cpp" >
+ <View0 line="23" Type="???" >
<AdditionalSettings/>
</View0>
</Doc8>
+ <Doc9 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/main.cpp" >
+ <View0 line="54" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc9>
+ <Doc10 NumberOfViews="1" URL="file:/home/sh/projekte/kmyirc-ng/src/kmigeneralcfg.h" >
+ <View0 line="23" Type="???" >
+ <AdditionalSettings/>
+ </View0>
+ </Doc10>
</DocsAndViews>
<pluginList>
<kdevdebugger>
- <breakpointList>
- <breakpoint0 lineNum="360" dbgId="-1" fileName="/home/sh/projekte/kmyirc-ng/src/kmiircservercfg.cpp" condition="" enabled="1" />
- </breakpointList>
+ <breakpointList/>
</kdevdebugger>
</pluginList>
</KDevPrjSession>
|
|
From: <sta...@us...> - 2003-05-18 13:32:40
|
Update of /cvsroot/kmyirc/kmyirc-ng/src In directory sc8-pr-cvs1:/tmp/cvs-serv19492 Modified Files: kmigeneralcfg.h Log Message: * Stupid Bug Removed Index: kmigeneralcfg.h =================================================================== RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmigeneralcfg.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- kmigeneralcfg.h 18 May 2003 13:31:15 -0000 1.1 +++ kmigeneralcfg.h 18 May 2003 13:32:37 -0000 1.2 @@ -1,12 +1,3 @@ -/**************************************************************************** -** Form interface generated from reading ui file 'generalcfg.ui' -** -** Created: Dom Mai 18 08:12:51 2003 -** by: The User Interface Compiler ($Id$) -** -** WARNING! All changes made in this file will be lost! -****************************************************************************/ - #ifndef GENERALCFG_H #define GENERALCFG_H |
|
From: <sta...@us...> - 2003-05-18 13:31:18
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18597
Modified Files:
Makefile.am pref.cpp pref.h
Added Files:
kmigeneralcfg.cpp kmigeneralcfg.h
Log Message:
* System Tray Icon configuration option skeleton
--- NEW FILE: kmigeneralcfg.cpp ---
#include "kmigeneralcfg.h"
#include <kglobal.h>
#include <klocale.h>
#include <kicontheme.h>
#include <kiconloader.h>
#include <qvariant.h>
#include <qcheckbox.h>
#include <qframe.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qimage.h>
#include <qpixmap.h>
/*
* Constructs a KMIGeneralCfg as a child of 'parent', with the
* name 'name' and widget flags set to 'f'.
*/
KMIGeneralCfg::KMIGeneralCfg( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
if ( !name )
setName( "KMIGeneralCfg" );
systrayBtn = new QCheckBox( this, "systrayBtn" );
systrayBtn->setGeometry( QRect( 9, 13, 170, 20 ) );
systrayBtn->setText( i18n( "Enable System Tray Icon" ) );
systrayLabel = new QLabel( this, "systrayLabel" );
systrayLabel->setGeometry( QRect( 10, 30, 480, 50 ) );
systrayLabel->setMargin( 0 );
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>" ) );
resize( QSize(523, 410).expandedTo(minimumSizeHint()) );
}
/*
* Destroys the object and frees any allocated resources
*/
KMIGeneralCfg::~KMIGeneralCfg()
{
// no need to delete child widgets, Qt does it all for us
}
--- NEW FILE: kmigeneralcfg.h ---
/****************************************************************************
** Form interface generated from reading ui file 'generalcfg.ui'
**
** Created: Dom Mai 18 08:12:51 2003
** by: The User Interface Compiler ($Id: kmigeneralcfg.h,v 1.1 2003/05/18 13:31:15 stampede_br Exp $)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
#ifndef GENERALCFG_H
#define GENERALCFG_H
#include <qvariant.h>
#include <qpixmap.h>
#include <qwidget.h>
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QCheckBox;
class QFrame;
class QLabel;
class KMIGeneralCfg : public QWidget
{
Q_OBJECT
public:
KMIGeneralCfg( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~KMIGeneralCfg();
QCheckBox* systrayBtn;
QLabel* systrayLabel;
protected:
};
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 11 May 2003 20:09:14 -0000 1.9
+++ Makefile.am 18 May 2003 13:31:14 -0000 1.10
@@ -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
+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
# these are the headers for your project
noinst_HEADERS = kmyirc.h kmyircview.h pref.h
Index: pref.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pref.cpp 29 Apr 2003 15:22:55 -0000 1.4
+++ pref.cpp 18 May 2003 13:31:15 -0000 1.5
@@ -5,46 +5,34 @@
#include "pref.h"
#include <klocale.h>
+#include <kglobal.h>
+#include <kiconloader.h>
+#include <kicontheme.h>
#include <qlayout.h>
#include <qlabel.h>
KMyIRCPreferences::KMyIRCPreferences()
- : KDialogBase(TreeList, i18n("KMyIRC Preferences"),
+ : KDialogBase(IconList, i18n("KMyIRC Preferences"),
Help|Default|Ok|Cancel, Ok)
{
// this is the base class for your preferences dialog. it is now
// a Treelist dialog.. but there are a number of other
// possibilities (including Tab, Swallow, and just Plain)
setMinimumSize(600,400);
- QFrame *frame;
- frame = addPage(i18n("IRC Server List"), i18n("IRC Server List"));
- m_pageOne = new KMIIRCServerCfg(frame,"ircServerCfg");
- m_pageOne->show();
- frame->setMinimumSize(m_pageOne->sizeHint());
+ QFrame *frame;
+ frame = addPage(i18n("General"), i18n("General Options"),
+ KGlobal::iconLoader()->loadIcon("kmyirc", KIcon::MainToolbar, 32) );
+ m_pageOne = new KMIGeneralCfg(frame);
+ 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->setMinimumSize(m_pageTwo->sizeHint());
resize(frame->sizeHint());
- // frame = addPage(i18n("Second Page"), i18n("Page Two Options"));
- // m_pageTwo = new KMyIRCPrefPageTwo(frame);
}
KMyIRCPreferences::~ KMyIRCPreferences()
{
}
-KMyIRCPrefPageOne::KMyIRCPrefPageOne(QWidget *parent)
- : QFrame(parent)
-{
- QHBoxLayout *layout = new QHBoxLayout(this);
- layout->setAutoAdd(true);
-
- new QLabel(i18n("Add something here"), this);
-}
-
-KMyIRCPrefPageTwo::KMyIRCPrefPageTwo(QWidget *parent)
- : QFrame(parent)
-{
- QHBoxLayout *layout = new QHBoxLayout(this);
- layout->setAutoAdd(true);
-
- new QLabel(i18n("Add something here"), this);
-}
#include "pref.moc"
Index: pref.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/pref.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pref.h 29 Apr 2003 15:22:55 -0000 1.3
+++ pref.h 18 May 2003 13:31:15 -0000 1.4
@@ -8,9 +8,8 @@
#include <kdialogbase.h>
#include <qframe.h>
#include "kmiircservercfg.h"
+#include "kmigeneralcfg.h"
-class KMyIRCPrefPageOne;
-class KMyIRCPrefPageTwo;
/**
* This is the main configuration class.
* In this class you call all other configuration dialogs.
@@ -35,22 +34,8 @@
~KMyIRCPreferences();
private:
- KMIIRCServerCfg *m_pageOne;
- KMyIRCPrefPageTwo *m_pageTwo;
-};
-
-class KMyIRCPrefPageOne : public QFrame
-{
- Q_OBJECT
-public:
- KMyIRCPrefPageOne(QWidget *parent = 0);
-};
-
-class KMyIRCPrefPageTwo : public QFrame
-{
- Q_OBJECT
-public:
- KMyIRCPrefPageTwo(QWidget *parent = 0);
+ KMIGeneralCfg *m_pageOne;
+ KMIIRCServerCfg *m_pageTwo;
};
#endif // _KMYIRCPREF_H_
|
|
From: <sta...@us...> - 2003-05-18 00:52:29
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5102
Modified Files:
kmisystray.cpp main.cpp
Log Message:
* Corrected a typo in main.cpp
* Corrected a small bug in kmisystray.cpp, icon is loaded correctly now
Index: kmisystray.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisystray.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmisystray.cpp 11 May 2003 19:28:43 -0000 1.2
+++ kmisystray.cpp 18 May 2003 00:52:26 -0000 1.3
@@ -10,12 +10,14 @@
#include "kmisystray.h"
#include <qpixmap.h>
+#include <kglobal.h>
+#include <kiconloader.h>
+#include <kicontheme.h>
KMISystray::KMISystray(QWidget* parent)
: KSystemTray(parent)
{
- QPixmap pmap( locate("icon","kmyirc.png") );
- setPixmap( pmap );
+ setPixmap( KGlobal::iconLoader()->loadIcon("kmyirc", KIcon::Toolbar) );
}
KMISystray::~KMISystray()
Index: main.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- main.cpp 17 May 2003 21:19:45 -0000 1.2
+++ main.cpp 18 May 2003 00:52:26 -0000 1.3
@@ -11,7 +11,7 @@
#include <klocale.h>
static const char *description =
- I18N_NOOP("An native IRC client for KDE");
+ I18N_NOOP("A native IRC client for KDE");
static const char *version = "0.3.0.1";
|
|
From: <sta...@us...> - 2003-05-17 21:19:54
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30444/src
Modified Files:
kmiircmessage.cpp kmiircmessage.h kmisocket.cpp kmisocket.h
kmyirc.cpp main.cpp
Log Message:
* Small modifications in kmiircmessage (for compiling)
* System Tray Icon support (right now the icon only shows/hides the
main window and quits the application )
Index: kmiircmessage.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircmessage.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmiircmessage.cpp 6 May 2003 07:49:20 -0000 1.1
+++ kmiircmessage.cpp 17 May 2003 21:19:45 -0000 1.2
@@ -8,6 +8,7 @@
* (at your option) any later version. *
***************************************************************************/
#include "kmiircmessage.h"
+#include <kdebug.h>
KMIIrcMessage::KMIIrcMessage(QObject *parent, const char *name)
: QObject(parent, name)
@@ -19,14 +20,9 @@
{
}
-/*!
- \fn KMIIrcMessage::parseMessage(const QString &inLine="")
- */
-void KMIIrcMessage::parseMessage(const QString &inLine="")
+void KMIIrcMessage::parseMessage(const QString &inLine)
{
-#ifdef DEBUG
- qWarning("KMIIrcMessage::parseMessage: Entering virtual method\n");
-#endif
+ kdDebug() << "KMIIrcMessage::parseMessage: Entering virtual method" << endl;
// Portions (C) by konversation developers
// Thx guys :)
QString trailing="";
@@ -36,13 +32,14 @@
// Find the end of middle line parameter
int endOfMiddleLineParameter=newLine.find(" :");
// Do we hit ?
+ int pos;
if (endOfMiddleLineParameter!=-1) {
// Copy trailing parameters
trailing=newLine.mid(pos+2);
newLine=newLine.left(pos);
}
// Remove all unneccessary whitespaces from line to make parsing easier
- QString parseLine=newline.simplifyWhiteSpace();
+ QString parseLine=newLine.simplifyWhiteSpace();
QString prefix="";
// Do we have a prefix ?
if (parseLine[0]==':') {
@@ -67,16 +64,12 @@
}
// Server command if no "!" was found in prefix
if (prefix.find('!')==-1) {
-#ifdef DEBUG
- qWarning("KMIIrcMessage::parseMessage: command is a ServerCommand\n");
- qWarning("KMIIrcMessage::parseMessage: Command: "+command+"\n");
-#endif
+ kdDebug() << "KMIIrcMessage::parseMessage: command is a ServerCommand" << endl;
+ kdDebug() << "KMIIrcMessage::parseMessage: Command: " << command << endl;
userCommand=false;
ircCommand=command;
} else {
-#ifdef DEBUG
- qWarning("KMIIrcMessage::parseMessage: command is a UserCommand\n");
-#endif
+ kdDebug() << "KMIIrcMessage::parseMessage: command is a UserCommand" << endl;
userCommand=true;
// Get nickname
nickName=prefix.mid(0,prefix.find("!"));
@@ -89,16 +82,12 @@
// get hostMask
hostMask=prefix;
ircCommand=command;
-#ifdef DEBUG
- qWarning("KMIIrcMessage::parseMessage: nickName="+nickName+"\n");
- qWarning("KMIIrcMessage::parseMessage: userName="+userName+"\n");
- qWarning("KMIIrcMessage::parseMessage: hostMask="+hostMask+"\n");
- qWarning("KMIIrcMessage::parseMessage: command="+command+"\n");
-#endif
+ kdDebug() << "KMIIrcMessage::parseMessage: nickName=" << nickName << endl;
+ kdDebug() << "KMIIrcMessage::parseMessage: userName=" << userName << endl;
+ kdDebug() << "KMIIrcMessage::parseMessage: hostMask=" << hostMask << endl;
+ kdDebug() << "KMIIrcMessage::parseMessage: command=" << command << endl;
}
-#ifdef DEBUG
- qWarning("KMIIrcMessage::parseMessage: Leaving virtual method\n");
-#endif
+ kdDebug() << "KMIIrcMessage::parseMessage: Leaving virtual method" << endl;
}
/*!
@@ -155,9 +144,10 @@
QString KMIIrcMessage::getNickUserHost()
{
#warning "not implemented yet!!"
+ return QString::null;
}
-
+#include "kmiircmessage.moc"
Index: kmiircmessage.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmiircmessage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmiircmessage.h 6 May 2003 07:49:20 -0000 1.1
+++ kmiircmessage.h 17 May 2003 21:19:45 -0000 1.2
@@ -11,6 +11,8 @@
#define KMIIRCMESSAGE_H
#include <qobject.h>
+#include <qstringlist.h>
+#include <qstring.h>
/**
@author St. Hermann
@@ -31,7 +33,8 @@
private: bool userCommand;
private: QStringList ircParameterList;
- public slots: virtual void parseMessage(const QString &inLine="");
+ public slots:
+ virtual void parseMessage(const QString &inLine="");
public: QString getHostMask();
public: QString getIrcCommand();
Index: kmisocket.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmisocket.cpp 11 May 2003 20:22:08 -0000 1.2
+++ kmisocket.cpp 17 May 2003 21:19:45 -0000 1.3
@@ -19,4 +19,10 @@
{
}
+QString KMISocket::readLine()
+{
+ //Not implemented yet
+ return QString::null;
+}
+
#include "kmisocket.moc"
Index: kmisocket.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kmisocket.h 11 May 2003 20:22:09 -0000 1.2
+++ kmisocket.h 17 May 2003 21:19:45 -0000 1.3
@@ -20,6 +20,7 @@
public:
KMISocket( );
~KMISocket( );
+ virtual QString readLine();
};
#endif
Index: kmyirc.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmyirc.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kmyirc.cpp 25 Apr 2003 15:27:58 -0000 1.3
+++ kmyirc.cpp 17 May 2003 21:19:45 -0000 1.4
@@ -113,7 +113,7 @@
actionCollection(), "connect");
#ifdef DEBUG
#warning "You must set your development path here to get the kmyircui.rc file"
- createGUI("/home/sh/projekte/kmyirc-ng/src/kmyircui.rc");
+ createGUI("/home/stampede/kmyirc/kmyirc-ng/src/kmyircui.rc");
#else
createGUI();
#endif
Index: main.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/main.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- main.cpp 23 Apr 2003 11:18:43 -0000 1.1.1.1
+++ main.cpp 17 May 2003 21:19:45 -0000 1.2
@@ -3,6 +3,7 @@
*/
#include "kmyirc.h"
+#include "kmisystray.h"
#include <kapplication.h>
#include <dcopclient.h>
#include <kaboutdata.h>
@@ -45,7 +46,9 @@
if (args->count() == 0)
{
KMyIRC *widget = new KMyIRC;
- widget->show();
+ KMISystray *systray = new KMISystray(widget);
+ widget->show();
+ systray->show();
}
else
{
|
|
From: <sta...@us...> - 2003-05-11 20:22:14
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15367
Modified Files:
kmisocket.cpp kmisocket.h
Log Message:
* Removed readLine() (using QIODevice's one now)
Index: kmisocket.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmisocket.cpp 11 May 2003 20:09:14 -0000 1.1
+++ kmisocket.cpp 11 May 2003 20:22:08 -0000 1.2
@@ -19,10 +19,4 @@
{
}
-QString KMISocket::readLine()
-{
- //Not implemented yet
- return QString::null;
-}
-
#include "kmisocket.moc"
Index: kmisocket.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisocket.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmisocket.h 11 May 2003 20:09:14 -0000 1.1
+++ kmisocket.h 11 May 2003 20:22:09 -0000 1.2
@@ -20,7 +20,6 @@
public:
KMISocket( );
~KMISocket( );
- virtual QString readLine();
};
#endif
|
|
From: <sta...@us...> - 2003-05-11 20:09:17
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11215
Modified Files:
Makefile.am
Added Files:
kmisocket.cpp kmisocket.h
Log Message:
* Initial Skeleton for KMISocket
readLine() still needs to be implemented
--- NEW FILE: kmisocket.cpp ---
/***************************************************************************
* Copyright (C) 2003 by Henrique Pinto *
* sta...@co... *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "kmisocket.h"
KMISocket::KMISocket()
: KExtendedSocket()
{
}
KMISocket::~KMISocket()
{
}
QString KMISocket::readLine()
{
//Not implemented yet
return QString::null;
}
#include "kmisocket.moc"
--- NEW FILE: kmisocket.h ---
/***************************************************************************
* Copyright (C) 2003 by Henrique Pinto *
* sta...@co... *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#ifndef KMISOCKET_H
#define KMISOCKET_H
#include <kextsock.h>
class KMISocket : public KExtendedSocket
{
Q_OBJECT
public:
KMISocket( );
~KMISocket( );
virtual QString readLine();
};
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 11 May 2003 19:02:29 -0000 1.8
+++ Makefile.am 11 May 2003 20:09:14 -0000 1.9
@@ -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
+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
# these are the headers for your project
noinst_HEADERS = kmyirc.h kmyircview.h pref.h
|
|
From: <sta...@us...> - 2003-05-11 19:28:46
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30865/src
Modified Files:
kmisystray.cpp kmisystray.h
Log Message:
* stupid bugs removed, it now compiles ok
Index: kmisystray.cpp
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisystray.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmisystray.cpp 11 May 2003 19:02:30 -0000 1.1
+++ kmisystray.cpp 11 May 2003 19:28:43 -0000 1.2
@@ -9,13 +9,17 @@
***************************************************************************/
#include "kmisystray.h"
+#include <qpixmap.h>
KMISystray::KMISystray(QWidget* parent)
: KSystemTray(parent)
{
- setPixmap( locate("icon","kmyirc.png" ) );
+ QPixmap pmap( locate("icon","kmyirc.png") );
+ setPixmap( pmap );
}
KMISystray::~KMISystray()
{
}
+
+#include "kmisystray.moc"
Index: kmisystray.h
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/kmisystray.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kmisystray.h 11 May 2003 19:02:30 -0000 1.1
+++ kmisystray.h 11 May 2003 19:28:43 -0000 1.2
@@ -23,6 +23,8 @@
*/
class KMISystray: public KSystemTray
{
+ Q_OBJECT
+
public:
/**
* Constructor
@@ -33,6 +35,6 @@
* Destructor
*/
~KMISystray();
-}
+};
#endif
|
|
From: <sta...@us...> - 2003-05-11 19:02:33
|
Update of /cvsroot/kmyirc/kmyirc-ng/src
In directory sc8-pr-cvs1:/tmp/cvs-serv20379
Modified Files:
Makefile.am
Added Files:
kmisystray.cpp kmisystray.h
Log Message:
* Initial Support for System Tray Icon
--- NEW FILE: kmisystray.cpp ---
/***************************************************************************
* Copyright (C) 2003 by Henrique Pinto *
* sta...@co... *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#include "kmisystray.h"
KMISystray::KMISystray(QWidget* parent)
: KSystemTray(parent)
{
setPixmap( locate("icon","kmyirc.png" ) );
}
KMISystray::~KMISystray()
{
}
--- NEW FILE: kmisystray.h ---
/***************************************************************************
* Copyright (C) 2003 by Henrique Pinto *
* sta...@co... *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#ifndef KMISYSTRAY_H
#define KMISYSTRAY_H
#include <qwidget.h>
#include <ksystemtray.h>
#include <kstandarddirs.h>
/**
* System Tray Icon for KMyIRC
*
* @author Henrique Pinto <sta...@co...>
*/
class KMISystray: public KSystemTray
{
public:
/**
* Constructor
*/
KMISystray(QWidget* parent);
/**
* Destructor
*/
~KMISystray();
}
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kmyirc/kmyirc-ng/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am 11 May 2003 18:57:26 -0000 1.7
+++ Makefile.am 11 May 2003 19:02:29 -0000 1.8
@@ -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
+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
# these are the headers for your project
noinst_HEADERS = kmyirc.h kmyircview.h pref.h
|