aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2007-01-26 03:54:22 +0000
committerGravatar Szymon Tomasz Stefanek2007-01-26 03:54:22 +0000
commit1a8a7e6f145613c34ff0604b95370995fc625ef2 (patch)
tree79b63ab083ae2eecfbf98170e9d50731f6bb4d67 /src/modules/options
parentfix win compilation and update win projects (diff)
downloadKVIrc-1a8a7e6f145613c34ff0604b95370995fc625ef2.tar.gz
KVIrc-1a8a7e6f145613c34ff0604b95370995fc625ef2.tar.bz2
KVIrc-1a8a7e6f145613c34ff0604b95370995fc625ef2.zip
More Qt 4.x port and the torrent module by Alexander Stillich
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@255 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/dialog.cpp22
-rw-r--r--src/modules/options/dialog.h16
-rw-r--r--src/modules/options/optw_ircoutput.h2
-rw-r--r--src/modules/options/optw_mediatypes.cpp10
-rw-r--r--src/modules/options/optw_mediatypes.h10
-rw-r--r--src/modules/options/optw_messages.cpp52
-rw-r--r--src/modules/options/optw_messages.h26
-rw-r--r--src/modules/options/optw_nickserv.cpp16
-rw-r--r--src/modules/options/optw_nickserv.h4
-rw-r--r--src/modules/options/optw_proxy.cpp22
-rw-r--r--src/modules/options/optw_proxy.h12
-rw-r--r--src/modules/options/optw_servers.cpp50
-rw-r--r--src/modules/options/optw_servers.h16
-rw-r--r--src/modules/options/optw_transport.h2
14 files changed, 131 insertions, 129 deletions
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 79af2b671..7a938f665 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -75,8 +75,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
-KviOptionsListViewItem::KviOptionsListViewItem(QListView *parent,KviOptionsWidgetInstanceEntry * e)
-:QListViewItem(parent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
{
m_pInstanceEntry = e;
m_pOptionsWidget = 0;
@@ -84,8 +84,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(QListView *parent,KviOptionsWidge
setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
}
-KviOptionsListViewItem::KviOptionsListViewItem(QListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
-:QListViewItem(parent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
{
m_pInstanceEntry = e;
m_pOptionsWidget = 0;
@@ -105,9 +105,9 @@ void KviOptionsListViewItem::paintCell(QPainter * p,const QColorGroup & cg,int c
tmp.setColor(QColorGroup::Base,Qt::red);
tmp.setColor(QColorGroup::Background,Qt::red);
tmp.setColor(QColorGroup::Text,Qt::yellow);
- QListViewItem::paintCell(p,tmp,column,width,align);
+ KviTalListViewItem::paintCell(p,tmp,column,width,align);
} else {
- QListViewItem::paintCell(p,cg,column,width,align);
+ KviTalListViewItem::paintCell(p,cg,column,width,align);
}
}
@@ -189,12 +189,12 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
vbox->setMargin(0);
// Controlling list view
- m_pListView = new QListView(vbox);
+ m_pListView = new KviTalListView(vbox);
m_pListView->addColumn("");
m_pListView->header()->hide();
m_pListView->setRootIsDecorated(true);
m_pListView->setSorting(-1);
- connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(listViewItemSelectionChanged(QListViewItem *)));
+ connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
KviTalHBox * hbox = new KviTalHBox(vbox);
vbox->setSpacing(2);
@@ -460,7 +460,7 @@ void KviOptionsDialog::searchClicked()
search(szTxt);
}
-void KviOptionsDialog::fillListView(QListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void KviOptionsDialog::fillListView(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
{
if(!l)return;
@@ -516,12 +516,12 @@ void KviOptionsDialog::fillListView(QListViewItem * p,KviPtrList<KviOptionsWidge
}
}
-void KviOptionsDialog::listViewItemSelectionChanged(QListViewItem *it)
+void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
{
if(it)
{
QString str = it->text(0);
- QListViewItem * par = it->parent();
+ KviTalListViewItem * par = it->parent();
while(par)
{
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 2263f829e..52867fbe2 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -27,7 +27,7 @@
#include <qdialog.h>
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#include <qstringlist.h>
#include "kvi_optionswidget.h"
@@ -47,11 +47,11 @@ public:
~KviGeneralOptionsFrontWidget();
};
-class KviOptionsListViewItem : public QListViewItem
+class KviOptionsListViewItem : public KviTalListViewItem
{
public:
- KviOptionsListViewItem(QListView *parent,KviOptionsWidgetInstanceEntry * e);
- KviOptionsListViewItem(QListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
+ KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e);
+ KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
~KviOptionsListViewItem();
public:
KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
@@ -70,7 +70,7 @@ public:
KviOptionsDialog(QWidget * par,const QString &szGroup);
~KviOptionsDialog();
private:
- QListView * m_pListView;
+ KviTalListView * m_pListView;
QLabel * m_pCategoryLabel;
KviTalWidgetStack * m_pWidgetStack;
KviGeneralOptionsFrontWidget* m_pFrontWidget;
@@ -79,11 +79,11 @@ private:
QToolButton * m_pSearchButton;
private:
void recursiveCommit(KviOptionsListViewItem *it);
- void fillListView(QListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
- //KviOptionsListViewItem * showHiddenChildren(QListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l);
+ void fillListView(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+ //KviOptionsListViewItem * showHiddenChildren(KviTalListViewItem * p,KviPtrList<KviOptionsWidgetInstanceEntry> * l);
KviOptionsListViewItem * findItemByPage(KviOptionsListViewItem *it,KviOptionsWidget * pPage);
private slots:
- void listViewItemSelectionChanged(QListViewItem *it);
+ void listViewItemSelectionChanged(KviTalListViewItem *it);
void applyClicked();
void okClicked();
void cancelClicked();
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index 567bacf73..41575950a 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -24,7 +24,7 @@
//
#include "kvi_optionswidget.h"
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
class QComboBox;
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index b876bbb90..b00bb9fd6 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -44,8 +44,8 @@ static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
dst->szIcon = src->szIcon;
}
-KviMediaTypeListViewItem::KviMediaTypeListViewItem(QListView * w,KviMediaType * t)
-: QListViewItem(w)
+KviMediaTypeListViewItem::KviMediaTypeListViewItem(KviTalListView * w,KviMediaType * t)
+: KviTalListViewItem(w)
{
copyData(t);
}
@@ -67,7 +67,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
{
createLayout(11,3);
- m_pListView = new QListView(this);
+ m_pListView = new KviTalListView(this);
m_pListView->addColumn(__tr2qs_ctx("Pattern","options"));
m_pListView->addColumn(__tr2qs_ctx("MIME Type","options"));
m_pListView->addColumn(__tr2qs_ctx("Description","options"));
@@ -75,7 +75,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
- connect(m_pListView,SIGNAL(currentChanged(QListViewItem *)),this,SLOT(currentItemChanged(QListViewItem *)));
+ connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentItemChanged(KviTalListViewItem *)));
layout()->addMultiCellWidget(m_pListView,0,0,0,2);
@@ -212,7 +212,7 @@ void KviMediaTypesOptionsWidget::setLineEdits()
m_pIcon->setText(m_pLastItem ? m_pLastItem->data()->szIcon.ptr() : "");
}
-void KviMediaTypesOptionsWidget::currentItemChanged(QListViewItem *it)
+void KviMediaTypesOptionsWidget::currentItemChanged(KviTalListViewItem *it)
{
saveLastItem();
m_pLastItem = (KviMediaTypeListViewItem *)it;
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 30b3aed87..35fd41b9c 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -24,16 +24,16 @@
//
#include "kvi_optionswidget.h"
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#include <qlineedit.h>
#include <qpushbutton.h>
#include "kvi_mediatype.h"
-class KviMediaTypeListViewItem : public QListViewItem
+class KviMediaTypeListViewItem : public KviTalListViewItem
{
public:
- KviMediaTypeListViewItem(QListView * w,KviMediaType * t);
+ KviMediaTypeListViewItem(KviTalListView * w,KviMediaType * t);
~KviMediaTypeListViewItem();
private:
KviMediaType m_data;
@@ -56,7 +56,7 @@ public:
KviMediaTypesOptionsWidget(QWidget * parent);
~KviMediaTypesOptionsWidget();
private:
- QListView * m_pListView;
+ KviTalListView * m_pListView;
QLineEdit * m_pDescription;
QLineEdit * m_pIanaType;
QLineEdit * m_pFileMask;
@@ -73,7 +73,7 @@ private:
void enableOrDisable();
void setLineEdits();
private slots:
- void currentItemChanged(QListViewItem *it);
+ void currentItemChanged(KviTalListViewItem *it);
void newMediaType();
void delMediaType();
public:
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 4c7fb0090..316aa18a1 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -192,7 +192,7 @@ KviStandardColorsOptionsWidget::~KviStandardColorsOptionsWidget()
KviMessageListView::KviMessageListView(QWidget * par)
-: QListView(par)
+: KviTalListView(par)
{
setItemMargin(2);
}
@@ -228,7 +228,7 @@ void KviMessageListView::paintEmptyAreaInternal(QPainter * p,const QRect &viewpo
void KviMessageListView::paintEmptyArea(QPainter * p,const QRect &rct)
{
paintEmptyAreaInternal(p,rct,rct);
- QListView::paintEmptyArea(p,rct);
+ KviTalListView::paintEmptyArea(p,rct);
}
@@ -236,8 +236,8 @@ void KviMessageListView::paintEmptyArea(QPainter * p,const QRect &rct)
-KviMessageListViewItem::KviMessageListViewItem(QListView * l,int optId)
-: QListViewItem(l)
+KviMessageListViewItem::KviMessageListViewItem(KviTalListView * l,int optId)
+: KviTalListViewItem(l)
{
m_iOptId = optId;
setText(0,"WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW");
@@ -297,8 +297,8 @@ void KviMessageListViewItem::paintCell(QPainter * p,const QColorGroup &,int,int
}
-KviMessageColorListBoxItem::KviMessageColorListBoxItem(QListBox * b,const QColor &clr,int idx)
-: QListBoxText(b,QString::null)
+KviMessageColorListBoxItem::KviMessageColorListBoxItem(KviTalListBox * b,const QColor &clr,int idx)
+: KviTalListBoxText(b,QString::null)
{
m_clr = clr;
m_iClrIdx = idx;
@@ -313,13 +313,15 @@ void KviMessageColorListBoxItem::paint(QPainter * p)
{
QColor clr;
+ const KviTalListBox * lb = (const KviTalListBox *)listBox();
+
if((m_iClrIdx >= 0) && (m_iClrIdx <= 15))
{
- clr = listBox()->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : Qt::gray;
- p->fillRect(0,0,width(listBox()),height(listBox()),clr);
+ clr = lb->isEnabled() ? KVI_OPTION_MIRCCOLOR(m_iClrIdx) : Qt::gray;
+ p->fillRect(0,0,width(lb),height(lb),clr);
} else {
clr = listBox()->colorGroup().background();
- QListBoxText::paint(p);
+ KviTalListBoxText::paint(p);
}
#if QT_VERSION >= 300
if(isSelected())
@@ -327,13 +329,13 @@ void KviMessageColorListBoxItem::paint(QPainter * p)
if(selected())
#endif
{
- p->drawWinFocusRect(0,0,width(listBox()),height(listBox()),clr);
- p->drawWinFocusRect(1,1,width(listBox()) - 2,height(listBox()) - 2,clr);
- p->drawWinFocusRect(2,2,width(listBox()) - 4,height(listBox()) - 4,clr);
+ p->drawWinFocusRect(0,0,width(lb),height(lb),clr);
+ p->drawWinFocusRect(1,1,width(lb) - 2,height(lb) - 2,clr);
+ p->drawWinFocusRect(2,2,width(lb) - 4,height(lb) - 4,clr);
}
}
/*
-int KviMessageColorListBoxItem::width(const QListBox * lb) const
+int KviMessageColorListBoxItem::width(const KviTalListBox * lb) const
{
int w = lb->width();
if(w < 30)w = 30;
@@ -341,7 +343,7 @@ int KviMessageColorListBoxItem::width(const QListBox * lb) const
return w;
}
-int KviMessageColorListBoxItem::height(const QListBox *) const
+int KviMessageColorListBoxItem::height(const KviTalListBox *) const
{
return 30;
}
@@ -374,7 +376,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
m_pListView = new KviMessageListView(this);
m_pListView->addColumn(__tr2qs_ctx("Message Type","options"));
m_pListView->setAllColumnsShowFocus(true);
- m_pListView->setSelectionMode(QListView::Single);
+ m_pListView->setSelectionMode(KviTalListView::Single);
m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
m_pListView->setStaticBackground(true);
m_pListView->viewport()->setBackgroundMode(QWidget::NoBackground);
@@ -386,7 +388,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
QLabel * l = new QLabel(__tr2qs_ctx("Background:","options"),box);
- m_pBackListBox = new QListBox(box);
+ m_pBackListBox = new KviTalListBox(box);
m_pBackItems[16] = new KviMessageColorListBoxItem(m_pBackListBox,Qt::gray,KVI_TRANSPARENT);
for(i=0;i<16;i++)
{
@@ -395,7 +397,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
l = new QLabel(__tr2qs_ctx("Foreground:","options"),box);
- m_pForeListBox = new QListBox(box);
+ m_pForeListBox = new KviTalListBox(box);
for(i=0;i<16;i++)
{
m_pForeItems[i] = new KviMessageColorListBoxItem(m_pForeListBox,KVI_OPTION_MIRCCOLOR(i),i);
@@ -403,13 +405,13 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
l = new QLabel(__tr2qs_ctx("Alert level:","options"),box);
- m_pLevelListBox = new QListBox(box);
- QListBoxText * lbt;
+ m_pLevelListBox = new KviTalListBox(box);
+ KviTalListBoxText * lbt;
for(i=0;i<6;i++)
{
QString tmpn;
tmpn.setNum(i);
- lbt = new QListBoxText(m_pLevelListBox,tmpn);
+ lbt = new KviTalListBoxText(m_pLevelListBox,tmpn);
}
m_pIconButton = new KviStyledToolButton(box);
@@ -441,9 +443,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
layout()->setRowStretch(0,1);
layout()->setColStretch(0,1);
- connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(itemChanged(QListViewItem *)));
- connect(m_pForeListBox,SIGNAL(selectionChanged(QListBoxItem *)),this,SLOT(colorChanged(QListBoxItem *)));
- connect(m_pBackListBox,SIGNAL(selectionChanged(QListBoxItem *)),this,SLOT(colorChanged(QListBoxItem *)));
+ connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),this,SLOT(itemChanged(KviTalListViewItem *)));
+ connect(m_pForeListBox,SIGNAL(selectionChanged(KviTalListBoxItem *)),this,SLOT(colorChanged(KviTalListBoxItem *)));
+ connect(m_pBackListBox,SIGNAL(selectionChanged(KviTalListBoxItem *)),this,SLOT(colorChanged(KviTalListBoxItem *)));
itemChanged(0);
}
@@ -487,7 +489,7 @@ void KviMessageColorsOptionsWidget::saveLastItem()
m_pListView->repaintItem(m_pLastItem);
}
-void KviMessageColorsOptionsWidget::itemChanged(QListViewItem * it)
+void KviMessageColorsOptionsWidget::itemChanged(KviTalListViewItem * it)
{
//debug("Item changed","options");
if(m_pLastItem)saveLastItem();
@@ -524,7 +526,7 @@ void KviMessageColorsOptionsWidget::itemChanged(QListViewItem * it)
}
-void KviMessageColorsOptionsWidget::colorChanged(QListBoxItem *)
+void KviMessageColorsOptionsWidget::colorChanged(KviTalListBoxItem *)
{
if(m_pLastItem)saveLastItem();
}
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 4f6d59652..0219d74cd 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -27,8 +27,8 @@
#include "kvi_msgtype.h"
-#include <qlistview.h>
-#include <qlistbox.h>
+#include "kvi_tal_listview.h"
+#include "kvi_tal_listbox.h"
#include <qcheckbox.h>
#include <qtoolbutton.h>
#include "kvi_tal_popupmenu.h"
@@ -76,7 +76,7 @@ protected slots:
#define KVI_OPTIONS_WIDGET_PARENT_KviMessageColorsOptionsWidget KviMessageOptionsWidget
#define KVI_OPTIONS_WIDGET_PRIORITY_KviMessageColorsOptionsWidget 30
-class KviMessageListView : public QListView
+class KviMessageListView : public KviTalListView
{
Q_OBJECT
public:
@@ -89,10 +89,10 @@ public:
};
-class KviMessageListViewItem : public QListViewItem
+class KviMessageListViewItem : public KviTalListViewItem
{
public:
- KviMessageListViewItem(QListView * l,int optId);
+ KviMessageListViewItem(KviTalListView * l,int optId);
~KviMessageListViewItem();
private:
int m_iOptId;
@@ -104,17 +104,17 @@ public:
};
-class KviMessageColorListBoxItem : public QListBoxText
+class KviMessageColorListBoxItem : public KviTalListBoxText
{
public:
- KviMessageColorListBoxItem(QListBox * b,const QColor & clr,int idx);
+ KviMessageColorListBoxItem(KviTalListBox * b,const QColor & clr,int idx);
~KviMessageColorListBoxItem();
public:
int m_iClrIdx;
QColor m_clr;
public:
virtual void paint(QPainter * p);
- virtual int width(const QListBox * lv) const { return 120; };
+ virtual int width(const KviTalListBox * lv) const { return 120; };
};
@@ -128,9 +128,9 @@ public:
~KviMessageColorsOptionsWidget();
public:
KviMessageListView * m_pListView;
- QListBox * m_pForeListBox;
- QListBox * m_pBackListBox;
- QListBox * m_pLevelListBox;
+ KviTalListBox * m_pForeListBox;
+ KviTalListBox * m_pBackListBox;
+ KviTalListBox * m_pLevelListBox;
KviMessageColorListBoxItem * m_pForeItems[16];
KviMessageColorListBoxItem * m_pBackItems[17];
KviMessageListViewItem * m_pLastItem;
@@ -140,8 +140,8 @@ public:
public:
void saveLastItem();
protected slots:
- void itemChanged(QListViewItem * it);
- void colorChanged(QListBoxItem *);
+ void itemChanged(KviTalListViewItem * it);
+ void colorChanged(KviTalListBoxItem *);
void iconButtonClicked();
void newIconSelected(int iconId);
virtual void commit();
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index c7e6ce7a9..41f2a6d38 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -26,7 +26,7 @@
#include <qlayout.h>
#include <qtooltip.h>
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qcheckbox.h>
@@ -249,8 +249,8 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
#endif
m_pNickServCheck->setChecked(bNickServEnabled);
- m_pNickServListView = new QListView(this);
- m_pNickServListView->setSelectionMode(QListView::Single);
+ m_pNickServListView = new KviTalListView(this);
+ m_pNickServListView->setSelectionMode(KviTalListView::Single);
m_pNickServListView->setAllColumnsShowFocus(true);
m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("Server mask","options"));
@@ -292,7 +292,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
KviPtrList<KviNickServRule> * ll = rs->rules();
for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
{
- (void)new QListViewItem(m_pNickServListView,rule->registeredNick(),rule->serverMask(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
+ (void)new KviTalListViewItem(m_pNickServListView,rule->registeredNick(),rule->serverMask(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
}
}
@@ -309,7 +309,7 @@ KviNickServOptionsWidget::~KviNickServOptionsWidget()
void KviNickServOptionsWidget::editNickServRule()
{
- QListViewItem * it = m_pNickServListView->currentItem();
+ KviTalListViewItem * it = m_pNickServListView->currentItem();
if(!it)return;
KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1));
KviNickServRuleEditor ed(this,true);
@@ -328,12 +328,12 @@ void KviNickServOptionsWidget::addNickServRule()
KviNickServRule r;
KviNickServRuleEditor ed(this,true);
if(ed.editRule(&r))
- (void)new QListViewItem(m_pNickServListView,r.registeredNick(),r.serverMask(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
+ (void)new KviTalListViewItem(m_pNickServListView,r.registeredNick(),r.serverMask(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
}
void KviNickServOptionsWidget::delNickServRule()
{
- QListViewItem * it = m_pNickServListView->currentItem();
+ KviTalListViewItem * it = m_pNickServListView->currentItem();
if(!it)return;
delete it;
enableDisableNickServControls();
@@ -355,7 +355,7 @@ void KviNickServOptionsWidget::commit()
if(m_pNickServListView->childCount() > 0)
{
g_pNickServRuleSet->setEnabled(m_pNickServCheck->isChecked());
- QListViewItem * it = m_pNickServListView->firstChild();
+ KviTalListViewItem * it = m_pNickServListView->firstChild();
while(it)
{
g_pNickServRuleSet->addRule(KviNickServRule::createInstance(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1)));
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index a0b1c4780..346955c4c 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -41,7 +41,7 @@
class QLineEdit;
class QPushButton;
class KviNickServRule;
-class QListView;
+class KviTalListView;
class QCheckBox;
class KviNickServRuleEditor : public QDialog
@@ -72,7 +72,7 @@ public:
KviNickServOptionsWidget(QWidget * parent);
~KviNickServOptionsWidget();
protected:
- QListView * m_pNickServListView;
+ KviTalListView * m_pNickServListView;
QCheckBox * m_pNickServCheck;
QPushButton * m_pAddRuleButton;
QPushButton * m_pDelRuleButton;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 9af3b7d6f..3aeb8dfc9 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -41,8 +41,8 @@
#include <qtoolbutton.h>
-KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(QListView *parent,const QPixmap &pm,KviProxy * prx)
-: QListViewItem(parent,prx->m_szHostname.ptr())
+KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,KviProxy * prx)
+: KviTalListViewItem(parent,prx->m_szHostname.ptr())
{
setPixmap(0,pm);
m_pProxyData = new KviProxy(*prx);
@@ -60,17 +60,17 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
addBoolSelector(0,0,1,0,__tr2qs_ctx("Use proxy","options"),KviOption_boolUseProxyHost);
- m_pListView = new QListView(this);
+ m_pListView = new KviTalListView(this);
addWidgetToLayout(m_pListView,0,1,0,1);
m_pListView->addColumn(__tr2qs_ctx("Proxy","options"));
m_pListView->setRootIsDecorated(true);
m_pListView->setAllColumnsShowFocus(true);
- m_pListView->setSelectionMode(QListView::Single);
+ m_pListView->setSelectionMode(KviTalListView::Single);
- connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),
- this,SLOT(listViewItemSelectionChanged(QListViewItem *)));
- connect(m_pListView,SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
- this,SLOT(listViewRightButtonPressed(QListViewItem *,const QPoint &,int)));
+ connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),
+ this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+ connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
+ this,SLOT(listViewRightButtonPressed(KviTalListViewItem *,const QPoint &,int)));
#ifdef COMPILE_INFO_TIPS
QString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \
@@ -183,7 +183,7 @@ void KviProxyOptionsWidget::fillProxyList()
if(!(g_pProxyDataBase->currentProxy()))listViewItemSelectionChanged(0);
}
-void KviProxyOptionsWidget::listViewItemSelectionChanged(QListViewItem *it)
+void KviProxyOptionsWidget::listViewItemSelectionChanged(KviTalListViewItem *it)
{
if(m_pLastEditedItem)saveLastItem();
m_pLastEditedItem = (KviProxyOptionsListViewItem *)it;
@@ -330,7 +330,7 @@ void KviProxyOptionsWidget::commit()
KviOptionsWidget::commit();
}
-void KviProxyOptionsWidget::listViewRightButtonPressed(QListViewItem *it,const QPoint &pnt,int col)
+void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
{
m_pContextPopup->clear();
m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
@@ -353,7 +353,7 @@ void KviProxyOptionsWidget::removeCurrent()
{
delete m_pLastEditedItem;
m_pLastEditedItem = 0;
- QListViewItem * it = m_pListView->firstChild();
+ KviTalListViewItem * it = m_pListView->firstChild();
if(it)
{
m_pListView->setSelected(it,true);
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index fe188869b..e39c31b2f 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -24,7 +24,7 @@
//
#include "kvi_optionswidget.h"
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
class KviProxy;
@@ -32,10 +32,10 @@ class KviProxyDataBase;
extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
-class KviProxyOptionsListViewItem : public QListViewItem
+class KviProxyOptionsListViewItem : public KviTalListViewItem
{
public:
- KviProxyOptionsListViewItem(QListView *parent,const QPixmap &pm,KviProxy * prx);
+ KviProxyOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,KviProxy * prx);
~KviProxyOptionsListViewItem();
public:
KviProxy * m_pProxyData;
@@ -61,7 +61,7 @@ public:
KviProxyOptionsWidget(QWidget * parent);
~KviProxyOptionsWidget();
protected:
- QListView * m_pListView;
+ KviTalListView * m_pListView;
QLabel * m_pProxyLabel;
QLineEdit * m_pProxyEdit;
QLabel * m_pIpLabel;
@@ -82,8 +82,8 @@ private:
void fillProxyList();
void saveLastItem();
protected slots:
- void listViewItemSelectionChanged(QListViewItem *it);
- void listViewRightButtonPressed(QListViewItem *it,const QPoint &pnt,int col);
+ void listViewItemSelectionChanged(KviTalListViewItem *it);
+ void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
void newProxy();
void removeCurrent();
void ipV6CheckToggled(bool bEnabled);
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 11ca4ac6e..c2ffae5e8 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -270,8 +270,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
#endif
m_pNickServCheck->setChecked(bNickServEnabled);
- m_pNickServListView = new QListView(tab);
- m_pNickServListView->setSelectionMode(QListView::Single);
+ m_pNickServListView = new KviTalListView(tab);
+ m_pNickServListView->setSelectionMode(KviTalListView::Single);
m_pNickServListView->setAllColumnsShowFocus(true);
m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options"));
m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
@@ -310,7 +310,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
KviPtrList<KviNickServRule> * ll = rs->rules();
for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
{
- (void)new QListViewItem(m_pNickServListView,rule->registeredNick(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
+ (void)new KviTalListViewItem(m_pNickServListView,rule->registeredNick(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand());
}
}
@@ -348,7 +348,7 @@ KviNetworkDetailsWidget::~KviNetworkDetailsWidget()
void KviNetworkDetailsWidget::editNickServRule()
{
- QListViewItem * it = m_pNickServListView->currentItem();
+ KviTalListViewItem * it = m_pNickServListView->currentItem();
if(!it)return;
KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3));
KviNickServRuleEditor ed(this,false);
@@ -366,12 +366,12 @@ void KviNetworkDetailsWidget::addNickServRule()
KviNickServRule r;
KviNickServRuleEditor ed(this,false);
if(ed.editRule(&r))
- (void)new QListViewItem(m_pNickServListView,r.registeredNick(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
+ (void)new KviTalListViewItem(m_pNickServListView,r.registeredNick(),r.nickServMask(),r.messageRegexp(),r.identifyCommand());
}
void KviNetworkDetailsWidget::delNickServRule()
{
- QListViewItem * it = m_pNickServListView->currentItem();
+ KviTalListViewItem * it = m_pNickServListView->currentItem();
if(!it)return;
delete it;
enableDisableNickServControls();
@@ -411,7 +411,7 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
{
KviNickServRuleSet * rs = KviNickServRuleSet::createInstance();
rs->setEnabled(m_pNickServCheck->isChecked());
- QListViewItem * it = m_pNickServListView->firstChild();
+ KviTalListViewItem * it = m_pNickServListView->firstChild();
while(it)
{
rs->addRule(KviNickServRule::createInstance(it->text(0),it->text(1),it->text(2),it->text(3)));
@@ -973,8 +973,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
// kvi_app.cpp
extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(QListView *parent,const QPixmap &pm,const KviIrcNetwork *n)
- : QListViewItem(parent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,const KviIrcNetwork *n)
+ : KviTalListViewItem(parent)
{
setPixmap(0,pm);
m_pServerData = 0;
@@ -983,8 +983,8 @@ KviServerOptionsListViewItem::KviServerOptionsListViewItem(QListView *parent,con
setText(1,n->description());
}
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(QListViewItem *parent,const QPixmap &pm,const KviIrcServer *s)
- : QListViewItem(parent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *parent,const QPixmap &pm,const KviIrcServer *s)
+ : KviTalListViewItem(parent)
{
setPixmap(0,pm);
m_pServerData = new KviIrcServer(*s);
@@ -1036,18 +1036,18 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
m_pNetworkDetailsDialog = 0;
m_pImportFilter = 0;
- m_pListView = new QListView(this);
+ m_pListView = new KviTalListView(this);
addWidgetToLayout(m_pListView,0,0,0,0);
m_pListView->addColumn(__tr2qs_ctx("Server","options"));
m_pListView->addColumn(__tr2qs_ctx("Description","options"));
m_pListView->setRootIsDecorated(true);
m_pListView->setAllColumnsShowFocus(true);
- m_pListView->setSelectionMode(QListView::Single);
- connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),
- this,SLOT(listViewItemSelectionChanged(QListViewItem *)));
- connect(m_pListView,SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
- this,SLOT(listViewRightButtonPressed(QListViewItem *,const QPoint &,int)));
- connect(m_pListView,SIGNAL(doubleClicked(QListViewItem*, const QPoint&, int )),
+ m_pListView->setSelectionMode(KviTalListView::Single);
+ connect(m_pListView,SIGNAL(selectionChanged(KviTalListViewItem *)),
+ this,SLOT(listViewItemSelectionChanged(KviTalListViewItem *)));
+ connect(m_pListView,SIGNAL(rightButtonPressed(KviTalListViewItem *,const QPoint &,int)),
+ this,SLOT(listViewRightButtonPressed(KviTalListViewItem *,const QPoint &,int)));
+ connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem*, const QPoint&, int )),
this,SLOT(detailsClicked()));
#ifdef COMPILE_INFO_TIPS
@@ -1232,12 +1232,12 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id)
kvi_u32_t uPort = port.toUInt(&bOk);
// we have the port too
- QListViewItem * pFoundNet = 0;
- QListViewItem * pFoundSrv = 0;
+ KviTalListViewItem * pFoundNet = 0;
+ KviTalListViewItem * pFoundSrv = 0;
- for(QListViewItem * net = m_pListView->firstChild();net;net = net->nextSibling())
+ for(KviTalListViewItem * net = m_pListView->firstChild();net;net = net->nextSibling())
{
- for(QListViewItem * srv = net->firstChild();srv;srv = srv->nextSibling())
+ for(KviTalListViewItem * srv = net->firstChild();srv;srv = srv->nextSibling())
{
KviStr tmp = ((KviServerOptionsListViewItem *)srv)->m_pServerData->hostName();
if(kvi_strEqualCI(tmp.ptr(),data.ptr()))
@@ -1311,7 +1311,7 @@ void KviServerOptionsWidget::fillServerList()
if(cur)m_pListView->ensureItemVisible(cur);
}
-void KviServerOptionsWidget::listViewItemSelectionChanged(QListViewItem *it)
+void KviServerOptionsWidget::listViewItemSelectionChanged(KviTalListViewItem *it)
{
saveLastItem();
m_pLastEditedItem = (KviServerOptionsListViewItem *)it;
@@ -1421,7 +1421,7 @@ void KviServerOptionsWidget::commit()
KviOptionsWidget::commit();
}
-void KviServerOptionsWidget::listViewRightButtonPressed(QListViewItem *it,const QPoint &pnt,int col)
+void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col)
{
int id;
bool bServer = (it && ((KviServerOptionsListViewItem *)it)->m_pServerData);
@@ -1626,7 +1626,7 @@ void KviServerOptionsWidget::removeCurrent()
{
if(m_pLastEditedItem)
{
- QListViewItem * it = m_pLastEditedItem->itemAbove();
+ KviTalListViewItem * it = m_pLastEditedItem->itemAbove();
if(!it)it = m_pLastEditedItem->firstChild() ? m_pLastEditedItem->nextSibling() : m_pLastEditedItem->itemBelow();
delete m_pLastEditedItem;
m_pLastEditedItem = 0;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 17595b938..7fc996249 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -26,7 +26,7 @@
//=============================================================================
#include "kvi_optionswidget.h"
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#include <qdialog.h>
#include <qbuttongroup.h>
#include <qtabwidget.h>
@@ -38,11 +38,11 @@ class KviMexServerImport;
-class KviServerOptionsListViewItem : public QListViewItem
+class KviServerOptionsListViewItem : public KviTalListViewItem
{
public:
- KviServerOptionsListViewItem(QListView *parent,const QPixmap &pm,const KviIrcNetwork *n);
- KviServerOptionsListViewItem(QListViewItem *parent,const QPixmap &pm,const KviIrcServer *s);
+ KviServerOptionsListViewItem(KviTalListView *parent,const QPixmap &pm,const KviIrcNetwork *n);
+ KviServerOptionsListViewItem(KviTalListViewItem *parent,const QPixmap &pm,const KviIrcServer *s);
~KviServerOptionsListViewItem();
public:
KviIrcServer * m_pServerData;
@@ -85,7 +85,7 @@ protected:
QCheckBox * m_pAutoConnectCheck;
- QListView * m_pNickServListView;
+ KviTalListView * m_pNickServListView;
QCheckBox * m_pNickServCheck;
QPushButton * m_pAddRuleButton;
QPushButton * m_pDelRuleButton;
@@ -158,7 +158,7 @@ public:
KviServerOptionsWidget(QWidget * parent);
~KviServerOptionsWidget();
protected:
- QListView * m_pListView;
+ KviTalListView * m_pListView;
QLabel * m_pSrvNetLabel;
QLineEdit * m_pSrvNetEdit;
//QLabel * m_pPortLabel;
@@ -190,8 +190,8 @@ protected slots:
void importerDead();
void importServer(const KviIrcServer & s,const char * network);
void importPopupAboutToShow();
- void listViewItemSelectionChanged(QListViewItem *it);
- void listViewRightButtonPressed(QListViewItem *it,const QPoint &pnt,int col);
+ void listViewItemSelectionChanged(KviTalListViewItem *it);
+ void listViewRightButtonPressed(KviTalListViewItem *it,const QPoint &pnt,int col);
void newNetwork();
void removeCurrent();
void newServer();
diff --git a/src/modules/options/optw_transport.h b/src/modules/options/optw_transport.h
index 9e5c20d5c..d0b17210b 100644
--- a/src/modules/options/optw_transport.h
+++ b/src/modules/options/optw_transport.h
@@ -24,6 +24,6 @@
//
#include "kvi_optionswidget.h"
-#include <qlistview.h>
+#include "kvi_tal_listview.h"
#endif //!_OPTW_TRANSPORT_H_