From 690dd7a33ddc90678367d73adf313533536e10f2 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Fri, 29 Apr 2016 23:57:30 +0100 Subject: Apply clang-format --- src/modules/reguser/RegisteredUserEntryDialog.cpp | 380 ++++++------- src/modules/reguser/RegisteredUserEntryDialog.h | 70 +-- src/modules/reguser/RegisteredUsersDialog.cpp | 617 ++++++++++++---------- src/modules/reguser/RegisteredUsersDialog.h | 74 +-- src/modules/reguser/RegistrationWizard.cpp | 232 ++++---- src/modules/reguser/RegistrationWizard.h | 55 +- src/modules/reguser/libkvireguser.cpp | 332 ++++++------ 7 files changed, 949 insertions(+), 811 deletions(-) (limited to 'src/modules/reguser') diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp index 9c7775cb9..1eb24c37d 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.cpp +++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp @@ -66,60 +66,59 @@ extern RegisteredUsersDialog * g_pRegisteredUsersDialog; KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy! - -RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPointerHashTable * dict) -: QDialog(p) +RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p, KviPointerHashTable * dict) + : QDialog(p) { setObjectName("property_editor"); setWindowModality(Qt::WindowModal); m_pPropertyDict = dict; - setWindowTitle(__tr2qs_ctx("Property Editor - KVIrc","register")); + setWindowTitle(__tr2qs_ctx("Property Editor - KVIrc", "register")); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); QGridLayout * g = new QGridLayout(this); m_pTable = new QTableWidget(this); //g->addMultiCellWidget(m_pTable,0,1,0,1); - g->addWidget(m_pTable,0,0); + g->addWidget(m_pTable, 0, 0); m_pTable->setColumnCount(2); m_pTable->setSelectionMode(QAbstractItemView::SingleSelection); m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows); QStringList header; - header.append(__tr2qs_ctx("Property","register")); - header.append(__tr2qs_ctx("Value","register")); + header.append(__tr2qs_ctx("Property", "register")); + header.append(__tr2qs_ctx("Value", "register")); m_pTable->setHorizontalHeaderLabels(header); - m_pTable->setMinimumSize(250,250); + m_pTable->setMinimumSize(250, 250); //connect(m_pTable,SIGNAL(valueChanged(int,int)),this,SLOT(propertyValueChanged(int,int))); KviTalVBox * vb = new KviTalVBox(this); vb->setSpacing(4); - g->addWidget(vb,0,1,0,3); + g->addWidget(vb, 0, 1, 0, 3); - m_pAddButton = new QPushButton(__tr2qs_ctx("&New","register"),vb); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); + m_pAddButton = new QPushButton(__tr2qs_ctx("&New", "register"), vb); + connect(m_pAddButton, SIGNAL(clicked()), this, SLOT(addClicked())); m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); - m_pDelButton = new QPushButton(__tr2qs_ctx("&Remove","register"),vb); - connect(m_pDelButton,SIGNAL(clicked()),this,SLOT(delClicked())); + m_pDelButton = new QPushButton(__tr2qs_ctx("&Remove", "register"), vb); + connect(m_pDelButton, SIGNAL(clicked()), this, SLOT(delClicked())); m_pDelButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); KviTalHBox * b = new KviTalHBox(this); b->setSpacing(4); //g->addMultiCellWidget(b,2,2,1,2); - g->addWidget(b,1,1); - QPushButton * pb = new QPushButton(__tr2qs_ctx("&OK","register"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); + g->addWidget(b, 1, 1); + QPushButton * pb = new QPushButton(__tr2qs_ctx("&OK", "register"), b); + connect(pb, SIGNAL(clicked()), this, SLOT(okClicked())); pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); - pb = new QPushButton(__tr2qs_ctx("Cancel","register"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + pb = new QPushButton(__tr2qs_ctx("Cancel", "register"), b); + connect(pb, SIGNAL(clicked()), this, SLOT(reject())); pb->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); - g->setRowStretch(1,1); - g->setColumnStretch(0,1); + g->setRowStretch(1, 1); + g->setColumnStretch(0, 1); fillData(); } @@ -128,7 +127,7 @@ RegisteredUserPropertiesDialog::~RegisteredUserPropertiesDialog() { } -void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent *e) +void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent * e) { e->accept(); //delete this; @@ -137,22 +136,23 @@ void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent *e) void RegisteredUserPropertiesDialog::fillData() { m_pTable->setRowCount(m_pPropertyDict->count()); - KviPointerHashTableIterator it(*m_pPropertyDict); + KviPointerHashTableIterator it(*m_pPropertyDict); int row = 0; while(it.current()) { - QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem(it.currentKey(),QTableWidgetItem::Type); + QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem(it.currentKey(), QTableWidgetItem::Type); m_pTableItem1->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable); - QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem(*(it.current()),QTableWidgetItem::Type); + QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem(*(it.current()), QTableWidgetItem::Type); m_pTableItem2->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable); - m_pTable->setItem(row,0,m_pTableItem1); - m_pTable->setItem(row,1,m_pTableItem2); + m_pTable->setItem(row, 0, m_pTableItem1); + m_pTable->setItem(row, 1, m_pTableItem2); ++row; ++it; } - if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false); + if(m_pTable->rowCount() == 0) + m_pDelButton->setEnabled(false); } void RegisteredUserPropertiesDialog::okClicked() @@ -160,13 +160,13 @@ void RegisteredUserPropertiesDialog::okClicked() m_pPropertyDict->clear(); int n = m_pTable->rowCount(); - for(int i=0;iitem(i,0)->text(); - QString szValue = m_pTable->item(i,1)->text(); + QString szName = m_pTable->item(i, 0)->text(); + QString szValue = m_pTable->item(i, 1)->text(); if((!szName.isEmpty()) && (!szValue.isEmpty())) { - m_pPropertyDict->replace(szName,new QString(szValue)); + m_pPropertyDict->replace(szName, new QString(szValue)); } } @@ -177,14 +177,14 @@ void RegisteredUserPropertiesDialog::addClicked() { m_pTable->setRowCount(m_pTable->rowCount() + 1); - QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem("",QTableWidgetItem::Type); + QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem("", QTableWidgetItem::Type); m_pTableItem1->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable); - QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem("",QTableWidgetItem::Type); + QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem("", QTableWidgetItem::Type); m_pTableItem2->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable); - m_pTable->setItem(m_pTable->rowCount() - 1,0,m_pTableItem1); - m_pTable->setItem(m_pTable->rowCount() - 1,1,m_pTableItem2); + m_pTable->setItem(m_pTable->rowCount() - 1, 0, m_pTableItem1); + m_pTable->setItem(m_pTable->rowCount() - 1, 1, m_pTableItem2); m_pDelButton->setEnabled(true); } @@ -196,74 +196,74 @@ void RegisteredUserPropertiesDialog::delClicked() { // remove row i m_pTable->removeRow(i); - if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false); + if(m_pTable->rowCount() == 0) + m_pDelButton->setEnabled(false); } } - -RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m) -: QDialog(p) +RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p, KviIrcMask * m) + : QDialog(p) { setObjectName("reguser_mask_editor"); setWindowModality(Qt::WindowModal); m_pMask = m; - setWindowTitle(__tr2qs_ctx("Mask Editor - KVIrc","register")); + setWindowTitle(__tr2qs_ctx("Mask Editor - KVIrc", "register")); QGridLayout * g = new QGridLayout(this); - QLabel * l = new QLabel(__tr2qs_ctx("Insert a mask for this user.
It can contain the wildcard characters '*' and '?'.","register"),this); + QLabel * l = new QLabel(__tr2qs_ctx("Insert a mask for this user.
It can contain the wildcard characters '*' and '?'.", "register"), this); //l->setAlignment(Qt::AlignCenter); - g->addWidget(l,0,0,1,2); + g->addWidget(l, 0, 0, 1, 2); KviTalHBox * b = new KviTalHBox(this); - g->addWidget(b,1,0,1,2); + g->addWidget(b, 1, 0, 1, 2); m_pNickEdit = new QLineEdit(b); //m_pNickEdit->setMinimumWidth(120); m_pNickEdit->setAlignment(Qt::AlignRight); - m_pNickEdit->setToolTip(__tr2qs_ctx("This is the nickname that will match this user, default value is the registered name.","register")); + m_pNickEdit->setToolTip(__tr2qs_ctx("This is the nickname that will match this user, default value is the registered name.", "register")); - l = new QLabel("!",b); + l = new QLabel("!", b); l->setAlignment(Qt::AlignCenter); //l->setMinimumWidth(40); m_pUserEdit = new QLineEdit(b); //m_pUserEdit->setMinimumWidth(120); m_pUserEdit->setAlignment(Qt::AlignCenter); - m_pUserEdit->setToolTip(__tr2qs_ctx("This is the username that will match this user. * will match any username.","register")); + m_pUserEdit->setToolTip(__tr2qs_ctx("This is the username that will match this user. * will match any username.", "register")); - l = new QLabel("@",b); + l = new QLabel("@", b); l->setAlignment(Qt::AlignCenter); //l->setMinimumWidth(40); m_pHostEdit = new QLineEdit(b); //m_pHostEdit->setMinimumWidth(120); m_pHostEdit->setAlignment(Qt::AlignLeft); - m_pHostEdit->setToolTip(__tr2qs_ctx("This is the hostname that will match this user. * will match any hostname.","register")); + m_pHostEdit->setToolTip(__tr2qs_ctx("This is the hostname that will match this user. * will match any hostname.", "register")); // just a spacer -// l = new QLabel(" ",this); -// g->addMultiCellWidget(l,2,2,0,1); + // l = new QLabel(" ",this); + // g->addMultiCellWidget(l,2,2,0,1); -// QFrame * f = new QFrame(this); -// f->setFrameStyle(QFrame::HLine | QFrame::Sunken); -// g->addMultiCellWidget(f,3,3,0,1); + // QFrame * f = new QFrame(this); + // f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + // g->addMultiCellWidget(f,3,3,0,1); b = new KviTalHBox(this); b->setSpacing(4); - g->addWidget(b,2,1); + g->addWidget(b, 2, 1); - QPushButton * pb = new QPushButton(__tr2qs_ctx("&OK","register"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); + QPushButton * pb = new QPushButton(__tr2qs_ctx("&OK", "register"), b); + connect(pb, SIGNAL(clicked()), this, SLOT(okClicked())); //pb->setMinimumWidth(120); - pb = new QPushButton(__tr2qs_ctx("Cancel","register"),b); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + pb = new QPushButton(__tr2qs_ctx("Cancel", "register"), b); + connect(pb, SIGNAL(clicked()), this, SLOT(reject())); //pb->setMinimumWidth(120); - g->setColumnStretch(0,1); - g->setRowStretch(0,1); + g->setColumnStretch(0, 1); + g->setRowStretch(0, 1); m_pNickEdit->setText(m->nick()); m_pUserEdit->setText(m->user()); @@ -274,7 +274,7 @@ RegisteredUserMaskDialog::~RegisteredUserMaskDialog() { } -void RegisteredUserMaskDialog::closeEvent(QCloseEvent *e) +void RegisteredUserMaskDialog::closeEvent(QCloseEvent * e) { e->accept(); //delete this; @@ -283,116 +283,116 @@ void RegisteredUserMaskDialog::closeEvent(QCloseEvent *e) void RegisteredUserMaskDialog::okClicked() { KviCString szTmp = m_pNickEdit->text(); - if(szTmp.isEmpty())szTmp = "*"; + if(szTmp.isEmpty()) + szTmp = "*"; m_pMask->setNick(szTmp.ptr()); szTmp = m_pUserEdit->text(); - if(szTmp.isEmpty())szTmp = "*"; + if(szTmp.isEmpty()) + szTmp = "*"; m_pMask->setUsername(szTmp.ptr()); szTmp = m_pHostEdit->text(); - if(szTmp.isEmpty())szTmp = "*"; + if(szTmp.isEmpty()) + szTmp = "*"; m_pMask->setHost(szTmp.ptr()); accept(); } - -RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal) -: KviTalTabDialog(p,"reguser_entry_editor",bModal) +RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget * p, KviRegisteredUser * r, bool bModal) + : KviTalTabDialog(p, "reguser_entry_editor", bModal) { m_pUser = r; m_pCustomColor = new QColor(); if(r) { - QString col=r->getProperty("customColor"); - KviStringConversion::fromString(col,(*m_pCustomColor)); + QString col = r->getProperty("customColor"); + KviStringConversion::fromString(col, (*m_pCustomColor)); } - m_pPropertyDict = new KviPointerHashTable(17,false); + m_pPropertyDict = new KviPointerHashTable(17, false); m_pPropertyDict->setAutoDelete(true); //setMinimumSize(400,450); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); - setWindowTitle(__tr2qs_ctx("Registered User Entry - KVIrc","register")); + setWindowTitle(__tr2qs_ctx("Registered User Entry - KVIrc", "register")); QWidget * p1 = new QWidget(this); QGridLayout * g = new QGridLayout(p1); - QLabel * l = new QLabel(__tr2qs_ctx("Name:","register"),p1); - g->addWidget(l,0,0); + QLabel * l = new QLabel(__tr2qs_ctx("Name:", "register"), p1); + g->addWidget(l, 0, 0); m_pNameEdit = new QLineEdit(p1); - g->addWidget(m_pNameEdit,0,1); + g->addWidget(m_pNameEdit, 0, 1); - l = new QLabel(__tr2qs_ctx("Comment:","register"),p1); - g->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("Comment:", "register"), p1); + g->addWidget(l, 1, 0); m_pCommentEdit = new QLineEdit(p1); - g->addWidget(m_pCommentEdit,1,1); + g->addWidget(m_pCommentEdit, 1, 1); QFrame * f = new QFrame(p1); - g->addWidget(f,2,0,1,2); + g->addWidget(f, 2, 0, 1, 2); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); - l = new QLabel(__tr2qs_ctx("Masks:","register"),p1); - g->addWidget(l,3,0,1,2); + l = new QLabel(__tr2qs_ctx("Masks:", "register"), p1); + g->addWidget(l, 3, 0, 1, 2); m_pMaskListBox = new QListWidget(p1); - connect(m_pMaskListBox,SIGNAL(itemSelectionChanged()),this,SLOT(maskCurrentChanged())); - m_pMaskListBox->setMinimumSize(300,200); + connect(m_pMaskListBox, SIGNAL(itemSelectionChanged()), this, SLOT(maskCurrentChanged())); + m_pMaskListBox->setMinimumSize(300, 200); - g->addWidget(m_pMaskListBox,4,0,1,2); + g->addWidget(m_pMaskListBox, 4, 0, 1, 2); KviTalHBox * b = new KviTalHBox(p1); - g->addWidget(b,5,0,1,2); + g->addWidget(b, 5, 0, 1, 2); b->setSpacing(4); - m_pAddMaskButton = new QPushButton(__tr2qs_ctx("&Add...","register"),b); - connect(m_pAddMaskButton,SIGNAL(clicked()),this,SLOT(addMaskClicked())); + m_pAddMaskButton = new QPushButton(__tr2qs_ctx("&Add...", "register"), b); + connect(m_pAddMaskButton, SIGNAL(clicked()), this, SLOT(addMaskClicked())); m_pAddMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); - m_pDelMaskButton = new QPushButton(__tr2qs_ctx("Re&move","register"),b); + m_pDelMaskButton = new QPushButton(__tr2qs_ctx("Re&move", "register"), b); m_pDelMaskButton->setEnabled(false); - connect(m_pDelMaskButton,SIGNAL(clicked()),this,SLOT(delMaskClicked())); + connect(m_pDelMaskButton, SIGNAL(clicked()), this, SLOT(delMaskClicked())); m_pDelMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); - m_pEditMaskButton = new QPushButton(__tr2qs_ctx("&Edit","register"),b); + m_pEditMaskButton = new QPushButton(__tr2qs_ctx("&Edit", "register"), b); m_pEditMaskButton->setEnabled(false); - connect(m_pEditMaskButton,SIGNAL(clicked()),this,SLOT(editMaskClicked())); + connect(m_pEditMaskButton, SIGNAL(clicked()), this, SLOT(editMaskClicked())); m_pEditMaskButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EditItem))); - g->setRowStretch(4,1); - g->setColumnStretch(1,1); + g->setRowStretch(4, 1); + g->setColumnStretch(1, 1); - addTab(p1,__tr2qs_ctx("Identity","register")); + addTab(p1, __tr2qs_ctx("Identity", "register")); QWidget * p2 = new QWidget(this); g = new QGridLayout(p2); - m_pNotifyCheck = new QCheckBox(__tr2qs_ctx("Notify when user is online","register"),p2); - g->addWidget(m_pNotifyCheck,0,0,1,3); + m_pNotifyCheck = new QCheckBox(__tr2qs_ctx("Notify when user is online", "register"), p2); + g->addWidget(m_pNotifyCheck, 0, 0, 1, 3); - m_pNotifyLabel = new QLabel(__tr2qs_ctx("Notify nicknames:","register"),p2); + m_pNotifyLabel = new QLabel(__tr2qs_ctx("Notify nicknames:", "register"), p2); m_pNotifyLabel->setEnabled(m_pNotifyCheck->isChecked()); - g->addWidget(m_pNotifyLabel,1,0); - m_pNotifyCheck->setToolTip(__tr2qs_ctx("You can enter a space separated list of nicknames.","register")); - + g->addWidget(m_pNotifyLabel, 1, 0); + m_pNotifyCheck->setToolTip(__tr2qs_ctx("You can enter a space separated list of nicknames.", "register")); m_pNotifyNick = new QLineEdit(p2); m_pNotifyNick->setEnabled(false); - g->addWidget(m_pNotifyNick,1,1,1,2); - connect(m_pNotifyCheck,SIGNAL(toggled(bool)),this,SLOT(notifyCheckClicked(bool))); - + g->addWidget(m_pNotifyNick, 1, 1, 1, 2); + connect(m_pNotifyCheck, SIGNAL(toggled(bool)), this, SLOT(notifyCheckClicked(bool))); f = new QFrame(p2); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); - g->addWidget(f,2,0,1,3); + g->addWidget(f, 2, 0, 1, 3); m_pAvatar = 0; if(r) @@ -403,81 +403,82 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse m_pAvatar = new KviPixmap(av.toUtf8().data()); } } - if(!m_pAvatar)m_pAvatar = new KviPixmap(); + if(!m_pAvatar) + m_pAvatar = new KviPixmap(); - m_pAvatarSelector = new KviPixmapSelector(p2,__tr2qs_ctx("Avatar:","register"),m_pAvatar,true); - g->addWidget(m_pAvatarSelector,3,0,1,3); + m_pAvatarSelector = new KviPixmapSelector(p2, __tr2qs_ctx("Avatar:", "register"), m_pAvatar, true); + g->addWidget(m_pAvatarSelector, 3, 0, 1, 3); f = new QFrame(p2); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); - g->addWidget(f,4,0,1,3); + g->addWidget(f, 4, 0, 1, 3); - m_pCustomColorCheck = new QCheckBox(__tr2qs_ctx("Use custom color in userlist","register"),p2); + m_pCustomColorCheck = new QCheckBox(__tr2qs_ctx("Use custom color in userlist", "register"), p2); if(r) m_pCustomColorCheck->setChecked(r->getBoolProperty("useCustomColor")); - g->addWidget(m_pCustomColorCheck,5,0,1,2); + g->addWidget(m_pCustomColorCheck, 5, 0, 1, 2); - m_pCustomColorSelector = new KviColorSelector(p2,QString(),m_pCustomColor,1); - g->addWidget(m_pCustomColorSelector,5,2); + m_pCustomColorSelector = new KviColorSelector(p2, QString(), m_pCustomColor, 1); + g->addWidget(m_pCustomColorSelector, 5, 2); - QPushButton * pb = new QPushButton(__tr2qs_ctx("All Properties...","register"),p2); - connect(pb,SIGNAL(clicked()),this,SLOT(editAllPropertiesClicked())); - g->addWidget(pb,6,2); + QPushButton * pb = new QPushButton(__tr2qs_ctx("All Properties...", "register"), p2); + connect(pb, SIGNAL(clicked()), this, SLOT(editAllPropertiesClicked())); + g->addWidget(pb, 6, 2); - g->setColumnStretch(1,1); - g->setRowStretch(3,1); + g->setColumnStretch(1, 1); + g->setRowStretch(3, 1); - addTab(p2,__tr2qs_ctx("Properties","register")); + addTab(p2, __tr2qs_ctx("Properties", "register")); // Ignore TAB KviTalVBox * vb = new KviTalVBox(this); vb->setMargin(10); - m_pIgnoreEnabled = new QCheckBox(__tr2qs_ctx("Enable ignore for this user","register"),vb); + m_pIgnoreEnabled = new QCheckBox(__tr2qs_ctx("Enable ignore for this user", "register"), vb); - QGroupBox * gb = new QGroupBox(__tr2qs_ctx("Ignore Features","register"),vb); - connect(m_pIgnoreEnabled,SIGNAL(toggled(bool)),gb,SLOT(setEnabled(bool))); + QGroupBox * gb = new QGroupBox(__tr2qs_ctx("Ignore Features", "register"), vb); + connect(m_pIgnoreEnabled, SIGNAL(toggled(bool)), gb, SLOT(setEnabled(bool))); QVBoxLayout * layout = new QVBoxLayout(gb); layout->setMargin(20); layout->setSpacing(3); - m_pIgnoreQuery = new QCheckBox(__tr2qs_ctx("Ignore query messages","register"),gb); + m_pIgnoreQuery = new QCheckBox(__tr2qs_ctx("Ignore query messages", "register"), gb); layout->addWidget(m_pIgnoreQuery); - m_pIgnoreChannel = new QCheckBox(__tr2qs_ctx("Ignore channel messages","register"),gb); + m_pIgnoreChannel = new QCheckBox(__tr2qs_ctx("Ignore channel messages", "register"), gb); layout->addWidget(m_pIgnoreChannel); - m_pIgnoreNotice = new QCheckBox(__tr2qs_ctx("Ignore notice messages","register"),gb); + m_pIgnoreNotice = new QCheckBox(__tr2qs_ctx("Ignore notice messages", "register"), gb); layout->addWidget(m_pIgnoreNotice); - m_pIgnoreCtcp = new QCheckBox(__tr2qs_ctx("Ignore CTCP messages","register"),gb); + m_pIgnoreCtcp = new QCheckBox(__tr2qs_ctx("Ignore CTCP messages", "register"), gb); layout->addWidget(m_pIgnoreCtcp); - m_pIgnoreInvite = new QCheckBox(__tr2qs_ctx("Ignore invites","register"),gb); + m_pIgnoreInvite = new QCheckBox(__tr2qs_ctx("Ignore invites", "register"), gb); layout->addWidget(m_pIgnoreInvite); - m_pIgnoreDcc = new QCheckBox(__tr2qs_ctx("Ignore DCCs","register"),gb); + m_pIgnoreDcc = new QCheckBox(__tr2qs_ctx("Ignore DCCs", "register"), gb); layout->addWidget(m_pIgnoreDcc); - m_pIgnoreHighlight = new QCheckBox(__tr2qs_ctx("Ignore highlights","register"),gb); + m_pIgnoreHighlight = new QCheckBox(__tr2qs_ctx("Ignore highlights", "register"), gb); layout->addWidget(m_pIgnoreHighlight); - QWidget *w = new QWidget(vb); - w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); + QWidget * w = new QWidget(vb); + w->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored); - addTab(vb,__tr2qs_ctx("Ignore","register")); + addTab(vb, __tr2qs_ctx("Ignore", "register")); - setCancelButton(__tr2qs_ctx("Cancel","register")); - setOkButton(__tr2qs_ctx("&OK","register")); - connect(this,SIGNAL(applyButtonPressed()),this,SLOT(okClicked())); - connect(this,SIGNAL(cancelButtonPressed()),this,SLOT(reject())); + setCancelButton(__tr2qs_ctx("Cancel", "register")); + setOkButton(__tr2qs_ctx("&OK", "register")); + connect(this, SIGNAL(applyButtonPressed()), this, SLOT(okClicked())); + connect(this, SIGNAL(cancelButtonPressed()), this, SLOT(reject())); if(r) { m_pNameEdit->setText(r->name()); m_pCommentEdit->setText(r->getProperty("comment")); - for(KviIrcMask * m = r->maskList()->first();m;m = r->maskList()->next()) + for(KviIrcMask * m = r->maskList()->first(); m; m = r->maskList()->next()) { QString mk = m->nick(); mk += QChar('!'); @@ -497,10 +498,10 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse if(r->propertyDict()) { - KviPointerHashTableIterator it(*(r->propertyDict())); - while(QString *s = it.current()) + KviPointerHashTableIterator it(*(r->propertyDict())); + while(QString * s = it.current()) { - m_pPropertyDict->insert(it.currentKey(),new QString(*s)); + m_pPropertyDict->insert(it.currentKey(), new QString(*s)); ++it; } } @@ -516,7 +517,9 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse m_pIgnoreInvite->setChecked(r->ignoreFlags() & KviRegisteredUser::Invite); m_pIgnoreDcc->setChecked(r->ignoreFlags() & KviRegisteredUser::Dcc); m_pIgnoreHighlight->setChecked(r->ignoreFlags() & KviRegisteredUser::Highlight); - } else { + } + else + { // default values if(!m_pIgnoreEnabled->isChecked()) { @@ -525,7 +528,7 @@ RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUse } } -void RegisteredUserEntryDialog::closeEvent(QCloseEvent *e) +void RegisteredUserEntryDialog::closeEvent(QCloseEvent * e) { e->accept(); okClicked(); @@ -548,12 +551,13 @@ void RegisteredUserEntryDialog::notifyCheckClicked(bool bChecked) QString szMask; if(m_pUser) { - for(KviIrcMask * m = m_pUser->maskList()->first();m;m = m_pUser->maskList()->next()) + for(KviIrcMask * m = m_pUser->maskList()->first(); m; m = m_pUser->maskList()->next()) { QString tmp = m->nick(); if((tmp.indexOf('*') == -1) && (tmp.indexOf('?') == -1) && (!tmp.isEmpty())) { - if(!szMask.isEmpty())szMask.append(' '); + if(!szMask.isEmpty()) + szMask.append(' '); szMask.append(tmp); } } @@ -561,10 +565,10 @@ void RegisteredUserEntryDialog::notifyCheckClicked(bool bChecked) if(szMask.isEmpty()) { szMask = m_pUser->name(); - szMask.replace(" ",""); - szMask.replace("'",""); - szMask.replace("&",""); - szMask.replace(",",""); + szMask.replace(" ", ""); + szMask.replace("'", ""); + szMask.replace("&", ""); + szMask.replace(",", ""); } m_pNotifyNick->setText(szMask); } @@ -584,13 +588,14 @@ void RegisteredUserEntryDialog::okClicked() QString szGroup; if(m_pUser) { - szGroup=m_pUser->group(); + szGroup = m_pUser->group(); g_pLocalRegisteredUserDataBase->removeUser(m_pUser->name()); } QString name = m_pNameEdit->text(); - if(name.isEmpty())name = "user"; + if(name.isEmpty()) + name = "user"; KviRegisteredUser * u; @@ -598,7 +603,8 @@ void RegisteredUserEntryDialog::okClicked() int idx = 1; - do { + do + { u = g_pLocalRegisteredUserDataBase->findUserByName(szNameOk); if(u) { @@ -607,7 +613,6 @@ void RegisteredUserEntryDialog::okClicked() } } while(u); - u = g_pLocalRegisteredUserDataBase->addUser(szNameOk); u->setGroup(szGroup); @@ -627,18 +632,18 @@ void RegisteredUserEntryDialog::okClicked() QString mask = m_pMaskListBox->item(idx)->text(); KviIrcMask * mk = new KviIrcMask(mask); g_pLocalRegisteredUserDataBase->removeMask(*mk); - g_pLocalRegisteredUserDataBase->addMask(u,mk); + g_pLocalRegisteredUserDataBase->addMask(u, mk); cnt--; idx++; } - u->setProperty("comment",m_pCommentEdit->text()); + u->setProperty("comment", m_pCommentEdit->text()); m_pAvatarSelector->commit(); if(!m_pAvatar->isNull()) { QString szPath = m_pAvatar->path(); - u->setProperty("avatar",szPath); + u->setProperty("avatar", szPath); } if(m_pNotifyCheck->isChecked()) @@ -647,33 +652,36 @@ void RegisteredUserEntryDialog::okClicked() if(szNicks.isEmpty()) { - u->setProperty("notify",QString("")); - } else { - u->setProperty("notify",szNicks); + u->setProperty("notify", QString("")); + } + else + { + u->setProperty("notify", szNicks); } - } else { - u->setProperty("notify",QString("")); + } + else + { + u->setProperty("notify", QString("")); } m_pPropertyDict->remove("comment"); m_pPropertyDict->remove("notify"); m_pPropertyDict->remove("avatar"); - KviPointerHashTableIterator it(*m_pPropertyDict); - while(QString *s = it.current()) + KviPointerHashTableIterator it(*m_pPropertyDict); + while(QString * s = it.current()) { - u->setProperty(it.currentKey(),*s); + u->setProperty(it.currentKey(), *s); ++it; } - u->setProperty("useCustomColor",m_pCustomColorCheck->isChecked()); + u->setProperty("useCustomColor", m_pCustomColorCheck->isChecked()); QString col; - KviStringConversion::toString(m_pCustomColorSelector->getColor(),col); - u->setProperty("customColor",col); + KviStringConversion::toString(m_pCustomColorSelector->getColor(), col); + u->setProperty("customColor", col); - - int iIgnoreFlags=0; + int iIgnoreFlags = 0; u->setIgnoreEnabled(m_pIgnoreEnabled->isChecked()); if(m_pIgnoreQuery->isChecked()) iIgnoreFlags |= KviRegisteredUser::Query; @@ -698,7 +706,7 @@ void RegisteredUserEntryDialog::okClicked() void RegisteredUserEntryDialog::addMaskClicked() { KviIrcMask mk; - RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk); + RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this, &mk); if(dlg->exec() == QDialog::Accepted) { QString m = mk.nick(); @@ -713,19 +721,22 @@ void RegisteredUserEntryDialog::addMaskClicked() void RegisteredUserEntryDialog::delMaskClicked() { - if(m_pMaskListBox->currentItem()) { + if(m_pMaskListBox->currentItem()) + { delete m_pMaskListBox->currentItem(); } } void RegisteredUserEntryDialog::editMaskClicked() { - if(!m_pMaskListBox->currentItem())return; + if(!m_pMaskListBox->currentItem()) + return; QString szM = m_pMaskListBox->currentItem()->text(); - if(szM.isEmpty())return; + if(szM.isEmpty()) + return; KviIrcMask mk(szM); - RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk); + RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this, &mk); if(dlg->exec() == QDialog::Accepted) { QString m = mk.nick(); @@ -745,10 +756,14 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked() if(m_pAvatar->isNull()) { m_pPropertyDict->remove("avatar"); - } else { + } + else + { KviCString szPath = m_pAvatar->path(); - if(szPath.isEmpty())m_pPropertyDict->remove("avatar"); - else m_pPropertyDict->replace("avatar",new QString(szPath)); + if(szPath.isEmpty()) + m_pPropertyDict->remove("avatar"); + else + m_pPropertyDict->replace("avatar", new QString(szPath)); } if(m_pNotifyCheck->isChecked()) @@ -757,16 +772,19 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked() if(!szNicks.isEmpty()) { - m_pPropertyDict->replace("notify",new QString(szNicks)); - } else { + m_pPropertyDict->replace("notify", new QString(szNicks)); + } + else + { m_pPropertyDict->remove("notify"); } - } else { + } + else + { m_pPropertyDict->remove("notify"); } - - RegisteredUserPropertiesDialog * dlg = new RegisteredUserPropertiesDialog(this,m_pPropertyDict); + RegisteredUserPropertiesDialog * dlg = new RegisteredUserPropertiesDialog(this, m_pPropertyDict); if(dlg->exec() != QDialog::Accepted) { delete dlg; @@ -786,7 +804,8 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked() } m_pNotifyCheck->setChecked(bGotIt); m_pNotifyNick->setEnabled(bGotIt); - if(!bGotIt)m_pNotifyNick->setText(""); + if(!bGotIt) + m_pNotifyNick->setText(""); QString * avatar = m_pPropertyDict->find("avatar"); bGotIt = false; @@ -795,5 +814,4 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked() if(!avatar->isEmpty()) m_pAvatarSelector->setImagePath(*avatar); } - } diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h index 8d32f133b..36dd0d640 100644 --- a/src/modules/reguser/RegisteredUserEntryDialog.h +++ b/src/modules/reguser/RegisteredUserEntryDialog.h @@ -42,21 +42,23 @@ class KviRegisteredUser; #ifndef _EDITUSER_CPP_ - extern KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; +extern KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; #endif class RegisteredUserPropertiesDialog : public QDialog { Q_OBJECT public: - RegisteredUserPropertiesDialog(QWidget *p,KviPointerHashTable * dict); + RegisteredUserPropertiesDialog(QWidget * p, KviPointerHashTable * dict); ~RegisteredUserPropertiesDialog(); + protected: - QTableWidget *m_pTable; + QTableWidget * m_pTable; + + KviPointerHashTable * m_pPropertyDict; + QPushButton * m_pDelButton; + QPushButton * m_pAddButton; - KviPointerHashTable * m_pPropertyDict; - QPushButton * m_pDelButton; - QPushButton * m_pAddButton; protected: void fillData(); virtual void closeEvent(QCloseEvent *); @@ -66,13 +68,13 @@ protected slots: void delClicked(); }; - class RegisteredUserMaskDialog : public QDialog { Q_OBJECT public: - RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m); + RegisteredUserMaskDialog(QWidget * p, KviIrcMask * m); ~RegisteredUserMaskDialog(); + protected: KviIrcMask * m_pMask; @@ -85,47 +87,47 @@ protected slots: void okClicked(); }; - class RegisteredUserEntryDialog : public KviTalTabDialog { Q_OBJECT public: - RegisteredUserEntryDialog(QWidget * p,KviRegisteredUser * r,bool bModal = true); + RegisteredUserEntryDialog(QWidget * p, KviRegisteredUser * r, bool bModal = true); virtual ~RegisteredUserEntryDialog(); + protected: - KviRegisteredUser * m_pUser; + KviRegisteredUser * m_pUser; - QLineEdit * m_pNameEdit; - QLineEdit * m_pCommentEdit; + QLineEdit * m_pNameEdit; + QLineEdit * m_pCommentEdit; - QListWidget * m_pMaskListBox; + QListWidget * m_pMaskListBox; - QPushButton * m_pDelMaskButton; - QPushButton * m_pEditMaskButton; - QPushButton * m_pAddMaskButton; + QPushButton * m_pDelMaskButton; + QPushButton * m_pEditMaskButton; + QPushButton * m_pAddMaskButton; - QCheckBox * m_pNotifyCheck; - QLineEdit * m_pNotifyNick; - QLabel * m_pNotifyLabel; + QCheckBox * m_pNotifyCheck; + QLineEdit * m_pNotifyNick; + QLabel * m_pNotifyLabel; - KviPixmap * m_pAvatar; - KviPixmapSelector * m_pAvatarSelector; + KviPixmap * m_pAvatar; + KviPixmapSelector * m_pAvatarSelector; - KviPointerHashTable * m_pPropertyDict; + KviPointerHashTable * m_pPropertyDict; - QCheckBox * m_pCustomColorCheck; - QColor * m_pCustomColor; - KviColorSelector * m_pCustomColorSelector; + QCheckBox * m_pCustomColorCheck; + QColor * m_pCustomColor; + KviColorSelector * m_pCustomColorSelector; //Ignore TAB - QCheckBox * m_pIgnoreEnabled; - QCheckBox * m_pIgnoreQuery; - QCheckBox * m_pIgnoreChannel; - QCheckBox * m_pIgnoreNotice; - QCheckBox * m_pIgnoreCtcp; - QCheckBox * m_pIgnoreInvite; - QCheckBox * m_pIgnoreDcc; - QCheckBox * m_pIgnoreHighlight; + QCheckBox * m_pIgnoreEnabled; + QCheckBox * m_pIgnoreQuery; + QCheckBox * m_pIgnoreChannel; + QCheckBox * m_pIgnoreNotice; + QCheckBox * m_pIgnoreCtcp; + QCheckBox * m_pIgnoreInvite; + QCheckBox * m_pIgnoreDcc; + QCheckBox * m_pIgnoreHighlight; virtual void closeEvent(QCloseEvent *); protected slots: diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp index b3d29d679..30b5860b1 100644 --- a/src/modules/reguser/RegisteredUsersDialog.cpp +++ b/src/modules/reguser/RegisteredUsersDialog.cpp @@ -71,19 +71,18 @@ #define LVI_MINIMUM_TEXT_WIDTH 300 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER) - extern RegisteredUsersDialog * g_pRegisteredUsersDialog; KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par) -: QTreeWidget(par) + : QTreeWidget(par) { setColumnCount(2); QStringList labels; - labels << __tr2qs_ctx("Name","register") << __tr2qs_ctx("Flags","register"); + labels << __tr2qs_ctx("Name", "register") << __tr2qs_ctx("Flags", "register"); setHeaderLabels(labels); - setColumnWidth(0,360); - setColumnWidth(1,20); + setColumnWidth(0, 360); + setColumnWidth(1, 20); setAllColumnsShowFocus(true); @@ -92,25 +91,27 @@ KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par) setRootIsDecorated(true); setSortingEnabled(true); - setToolTip(__tr2qs_ctx("This is the list of registered users. " \ - "KVIrc can automatically recognize and associate properties to them.
" \ - "Use the buttons on the right to add, edit and remove entries. " \ - "The \"notify\" column allows you to quickly add users to the notify list. " \ - "Notify list fine-tuning can be performed by editing the entry properties.","register")); + setToolTip(__tr2qs_ctx("This is the list of registered users. " + "KVIrc can automatically recognize and associate properties to them.
" + "Use the buttons on the right to add, edit and remove entries. " + "The \"notify\" column allows you to quickly add users to the notify list. " + "Notify list fine-tuning can be performed by editing the entry properties.", + "register")); } -void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e) +void KviRegisteredUsersListView::mousePressEvent(QMouseEvent * e) { - if (e->button() == Qt::RightButton) + if(e->button() == Qt::RightButton) { - QTreeWidgetItem *i= itemAt(e->pos()); - if (i) emit rightButtonPressed(i,QCursor::pos()); + QTreeWidgetItem * i = itemAt(e->pos()); + if(i) + emit rightButtonPressed(i, QCursor::pos()); } QTreeWidget::mousePressEvent(e); } -RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u) -: RegisteredUsersDialogItemBase(User,par), m_pUser(u) +RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par, KviRegisteredUser * u) + : RegisteredUsersDialogItemBase(User, par), m_pUser(u) { QString szTmp; QString t = ""; @@ -119,102 +120,111 @@ RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRe szTmp = m_pUser->getProperty("notify"); if(szTmp.isEmpty()) { - t += __tr2qs_ctx("Notify disabled","register"); - } else { - t += __tr2qs_ctx("Notify as:","register"); + t += __tr2qs_ctx("Notify disabled", "register"); + } + else + { + t += __tr2qs_ctx("Notify as:", "register"); t += " "; t += szTmp; - } t += "]"; t += "
"; szTmp = m_pUser->getProperty("comment"); if(szTmp.isEmpty()) { - t += __tr2qs_ctx("No comment set","register"); - } else { - t += __tr2qs_ctx("Comment:","register"); + t += __tr2qs_ctx("No comment set", "register"); + } + else + { + t += __tr2qs_ctx("Comment:", "register"); t += " "; t += m_pUser->getProperty("comment"); } t += ""; m_pText.setHtml(t); m_pText.setTextWidth(-1); -// setText(0,t); + // setText(0,t); } RegisteredUsersDialogItem::~RegisteredUsersDialogItem() { } -QString RegisteredUsersDialogItem::key(int,bool) const +QString RegisteredUsersDialogItem::key(int, bool) const { return m_pUser->name(); } -void RegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const +void RegisteredUsersDialogItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index) const { - RegisteredUsersDialogItemBase *item=static_cast(index.internalPointer()); + RegisteredUsersDialogItemBase * item = static_cast(index.internalPointer()); - if(item->type()==RegisteredUsersDialogItemBase::Group) + if(item->type() == RegisteredUsersDialogItemBase::Group) { //groups QStyledItemDelegate::paint(p, option, index); - } else { + } + else + { QStyleOptionViewItemV4 opt = option; initStyleOption(&opt, index); - if (opt.state & QStyle::State_Selected) - QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem,&opt, p); + if(opt.state & QStyle::State_Selected) + QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, p); - RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item; + RegisteredUsersDialogItem * it = (RegisteredUsersDialogItem *)item; - if(index.column()==0) + if(index.column() == 0) { - QPoint pt=opt.rect.topLeft(); - pt.setX(pt.x()+LVI_BORDER); - pt.setY(pt.y()+LVI_BORDER); + QPoint pt = opt.rect.topLeft(); + pt.setX(pt.x() + LVI_BORDER); + pt.setY(pt.y() + LVI_BORDER); p->drawPixmap(pt, *(g_pIconManager->getBigIcon(KVI_BIGICON_REGUSERS))); - QRect cliprect=QRect(QPoint(0,0),QSize(opt.rect.width()-(LVI_ICON_SIZE+LVI_SPACING+LVI_BORDER),opt.rect.height())); + QRect cliprect = QRect(QPoint(0, 0), QSize(opt.rect.width() - (LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER), opt.rect.height())); p->save(); - p->translate(opt.rect.x()+LVI_ICON_SIZE+LVI_SPACING, opt.rect.y()); + p->translate(opt.rect.x() + LVI_ICON_SIZE + LVI_SPACING, opt.rect.y()); it->m_pText.drawContents(p, cliprect); p->restore(); - } else { + } + else + { if(it->user()) { if(!it->user()->getProperty("notify").isEmpty()) - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOnLine))); + p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + LVI_BORDER, *(g_pIconManager->getSmallIcon(KviIconManager::NotifyOnLine))); else - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+LVI_BORDER,*(g_pIconManager->getSmallIcon(KviIconManager::NotifyOffLine))); + p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + LVI_BORDER, *(g_pIconManager->getSmallIcon(KviIconManager::NotifyOffLine))); if(it->user()->ignoreEnabled()) - p->drawPixmap(opt.rect.topLeft().x()+LVI_BORDER,opt.rect.topLeft().y()+2*LVI_BORDER+16,*(g_pIconManager->getSmallIcon(KviIconManager::Ignore))); + p->drawPixmap(opt.rect.topLeft().x() + LVI_BORDER, opt.rect.topLeft().y() + 2 * LVI_BORDER + 16, *(g_pIconManager->getSmallIcon(KviIconManager::Ignore))); } } } } -QSize RegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const +QSize RegisteredUsersDialogItemDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const { - RegisteredUsersDialogItemBase *item=static_cast(index.internalPointer()); + RegisteredUsersDialogItemBase * item = static_cast(index.internalPointer()); - if(item->type()==RegisteredUsersDialogItemBase::Group) + if(item->type() == RegisteredUsersDialogItemBase::Group) { //groups return QStyledItemDelegate::sizeHint(option, index); - } else { + } + else + { //users -// RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item; + // RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item; - return QSize(300, LVI_ICON_SIZE+2*LVI_BORDER); + return QSize(300, LVI_ICON_SIZE + 2 * LVI_BORDER); } } RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) -: QWidget(par) + : QWidget(par) { g_pRegisteredUsersDialog = this; @@ -222,96 +232,90 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) g_pLocalRegisteredUserDataBase->copyFrom(g_pRegisteredUserDataBase); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::RegUsers))); - setWindowTitle(__tr2qs_ctx("Registered Users and Configuration - KVIrc","register")); + setWindowTitle(__tr2qs_ctx("Registered Users and Configuration - KVIrc", "register")); QGridLayout * g = new QGridLayout(this); - m_pListView = new KviRegisteredUsersListView(this); m_pListView->setItemDelegate(new RegisteredUsersDialogItemDelegate()); - connect(m_pListView,SIGNAL(itemPressed(QTreeWidgetItem *,int)),this,SLOT(itemPressed(QTreeWidgetItem *,int))); - connect(m_pListView,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int))); + connect(m_pListView, SIGNAL(itemPressed(QTreeWidgetItem *, int)), this, SLOT(itemPressed(QTreeWidgetItem *, int))); + connect(m_pListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem *, int))); - g->addWidget(m_pListView,0,0,2,2); + g->addWidget(m_pListView, 0, 0, 2, 2); KviTalVBox * vbox = new KviTalVBox(this); vbox->setSpacing(4); - g->addWidget(vbox,0,2); + g->addWidget(vbox, 0, 2); - m_pWizardAddButton = new QPushButton(__tr2qs_ctx("Add Wizard...","register"),vbox); - connect(m_pWizardAddButton,SIGNAL(clicked()),this,SLOT(addWizardClicked())); - m_pWizardAddButton->setToolTip(__tr2qs_ctx("Add a registered user by means of a user-friendly wizard.","register")); + m_pWizardAddButton = new QPushButton(__tr2qs_ctx("Add Wizard...", "register"), vbox); + connect(m_pWizardAddButton, SIGNAL(clicked()), this, SLOT(addWizardClicked())); + m_pWizardAddButton->setToolTip(__tr2qs_ctx("Add a registered user by means of a user-friendly wizard.", "register")); //m_pWizardAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItemByWizard))); - - m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...","register"),vbox); - connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); - m_pAddButton->setToolTip(__tr2qs_ctx("Open the edit dialog to create a new user entry.","register")); + m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...", "register"), vbox); + connect(m_pAddButton, SIGNAL(clicked()), this, SLOT(addClicked())); + m_pAddButton->setToolTip(__tr2qs_ctx("Open the edit dialog to create a new user entry.", "register")); //m_pAddButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); - m_pAddGroupButton = new QPushButton(__tr2qs_ctx("&Add Group...","register"),vbox); - connect(m_pAddGroupButton,SIGNAL(clicked()),this,SLOT(addGroupClicked())); - m_pAddGroupButton->setToolTip(__tr2qs_ctx("Adds a new group","register")); + m_pAddGroupButton = new QPushButton(__tr2qs_ctx("&Add Group...", "register"), vbox); + connect(m_pAddGroupButton, SIGNAL(clicked()), this, SLOT(addGroupClicked())); + m_pAddGroupButton->setToolTip(__tr2qs_ctx("Adds a new group", "register")); //m_pAddGroupButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewItem))); - m_pRemoveButton = new QPushButton(__tr2qs_ctx("Re&move","register"),vbox); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); + m_pRemoveButton = new QPushButton(__tr2qs_ctx("Re&move", "register"), vbox); + connect(m_pRemoveButton, SIGNAL(clicked()), this, SLOT(removeClicked())); m_pRemoveButton->setEnabled(false); - m_pRemoveButton->setToolTip(__tr2qs_ctx("Remove the currently selected entries.","register")); + m_pRemoveButton->setToolTip(__tr2qs_ctx("Remove the currently selected entries.", "register")); //m_pRemoveButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::DeleteItem))); - - m_pEditButton = new QPushButton(__tr2qs_ctx("&Edit...","register"),vbox); - connect(m_pEditButton,SIGNAL(clicked()),this,SLOT(editClicked())); + m_pEditButton = new QPushButton(__tr2qs_ctx("&Edit...", "register"), vbox); + connect(m_pEditButton, SIGNAL(clicked()), this, SLOT(editClicked())); m_pEditButton->setEnabled(false); - m_pEditButton->setToolTip(__tr2qs_ctx("Edit the first selected entry.","register")); + m_pEditButton->setToolTip(__tr2qs_ctx("Edit the first selected entry.", "register")); //m_pEditButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::EditItem))); QFrame * f = new QFrame(vbox); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); - m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select All","register"),vbox); - connect(m_pSelectAllButton,SIGNAL(clicked()),this,SLOT(selectAllClicked())); - m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries","register")); + m_pSelectAllButton = new QPushButton(__tr2qs_ctx("Select All", "register"), vbox); + connect(m_pSelectAllButton, SIGNAL(clicked()), this, SLOT(selectAllClicked())); + m_pSelectAllButton->setToolTip(__tr2qs_ctx("Select all the entries", "register")); //m_pSelectAllButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Plus))); - m_pExportButton = new QPushButton(__tr2qs_ctx("Export to...","register"),vbox); + m_pExportButton = new QPushButton(__tr2qs_ctx("Export to...", "register"), vbox); m_pExportButton->setEnabled(false); - connect(m_pExportButton,SIGNAL(clicked()),this,SLOT(exportClicked())); - m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.
All the data associated with the selected registered users will be exported.
You (or anyone else) can later import the entries by using the \"Import\" button.","register")); + connect(m_pExportButton, SIGNAL(clicked()), this, SLOT(exportClicked())); + m_pExportButton->setToolTip(__tr2qs_ctx("Export the selected entries to a file.
All the data associated with the selected registered users will be exported.
You (or anyone else) can later import the entries by using the \"Import\" button.", "register")); //m_pExportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Save))); - - m_pImportButton = new QPushButton(__tr2qs_ctx("Import from...","register"),vbox); - connect(m_pImportButton,SIGNAL(clicked()),this,SLOT(importClicked())); - m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.","register")); + m_pImportButton = new QPushButton(__tr2qs_ctx("Import from...", "register"), vbox); + connect(m_pImportButton, SIGNAL(clicked()), this, SLOT(importClicked())); + m_pImportButton->setToolTip(__tr2qs_ctx("Import entries from a file exported earlier by the \"export\" function of this dialog.", "register")); //m_pImportButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Folder))); - KviTalHBox * hbox = new KviTalHBox(this); hbox->setSpacing(4); - g->addWidget(hbox,3,1,1,2); + g->addWidget(hbox, 3, 1, 1, 2); QPushButton * b; - - b = new QPushButton(__tr2qs_ctx("&OK","register"),hbox); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + b = new QPushButton(__tr2qs_ctx("&OK", "register"), hbox); + connect(b, SIGNAL(clicked()), this, SLOT(okClicked())); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); //b->setMinimumWidth(120); - b = new QPushButton(__tr2qs_ctx("Cancel","register"),hbox); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + b = new QPushButton(__tr2qs_ctx("Cancel", "register"), hbox); + connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked())); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); //b->setMinimumWidth(120); g->addItem(new QSpacerItem(0, 15), 2, 0); - g->setColumnStretch(0,1); - g->setRowStretch(1,1); + g->setColumnStretch(0, 1); + g->setRowStretch(1, 1); - connect(m_pListView,SIGNAL(itemSelectionChanged()),this,SLOT(selectionChanged())); - connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)),this,SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint))); + connect(m_pListView, SIGNAL(itemSelectionChanged()), this, SLOT(selectionChanged())); + connect(m_pListView, SIGNAL(rightButtonPressed(QTreeWidgetItem *, QPoint)), this, SLOT(rightButtonPressed(QTreeWidgetItem *, QPoint))); new QShortcut(Qt::Key_Escape, this, SLOT(cancelClicked())); @@ -320,24 +324,26 @@ RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par) if(!parent()) { if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5) - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).setY(5); + KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) + .setY(5); //setGeometry(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry)); resize(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width(), - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height()); + KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height()); QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow); - move(rect.x() + ((rect.width() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width())/2),rect.y() + ((rect.height() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height())/2)); - + move(rect.x() + ((rect.width() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).width()) / 2), rect.y() + ((rect.height() - KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).height()) / 2)); } } RegisteredUsersDialog::~RegisteredUsersDialog() { #ifndef COMPILE_ON_MAC - if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height()); + if(!parent()) + KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(), pos().y(), size().width(), size().height()); #else - if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry(); + if(!parent()) + KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry(); #endif g_pRegisteredUsersDialog = 0; @@ -346,13 +352,14 @@ RegisteredUsersDialog::~RegisteredUsersDialog() g_pLocalRegisteredUserDataBase = 0; } -void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c) +void RegisteredUsersDialog::itemPressed(QTreeWidgetItem * it, int c) { - if(!it)return; - RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it; - if(b->type()==RegisteredUsersDialogItemBase::User) + if(!it) + return; + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)it; + if(b->type() == RegisteredUsersDialogItemBase::User) { - RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)it; + RegisteredUsersDialogItem * i = (RegisteredUsersDialogItem *)it; QRect r = m_pListView->visualItemRect(i); int daw = m_pListView->columnWidth(0); @@ -367,12 +374,13 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c) // try to find the nicknames to be notified QString szMask; - for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next()) + for(KviIrcMask * m = i->user()->maskList()->first(); m; m = i->user()->maskList()->next()) { QString tmp = m->nick(); if((tmp.indexOf('*') == -1) && (tmp.indexOf('?') == -1) && (!tmp.isEmpty())) { - if(!szMask.isEmpty())szMask.append(' '); + if(!szMask.isEmpty()) + szMask.append(' '); szMask.append(tmp); } } @@ -380,15 +388,17 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c) if(szMask.isEmpty()) { szMask = i->user()->name(); - szMask.replace(" ",""); - szMask.replace("'",""); - szMask.replace("&",""); - szMask.replace(",",""); + szMask.replace(" ", ""); + szMask.replace("'", ""); + szMask.replace("&", ""); + szMask.replace(",", ""); } - i->user()->setProperty("notify",szMask); - } else { - i->user()->setProperty("notify",QString("")); // kill that + i->user()->setProperty("notify", szMask); + } + else + { + i->user()->setProperty("notify", QString("")); // kill that } m_pListView->repaint(r); @@ -396,15 +406,18 @@ void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c) } } -void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int) +void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem * it, int) { - if(!it)return; - RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it; - if(b->type()==RegisteredUsersDialogItemBase::User) + if(!it) + return; + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)it; + if(b->type() == RegisteredUsersDialogItemBase::User) { editItem((RegisteredUsersDialogItem *)it); - } else { - RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b; + } + else + { + RegisteredUsersGroupItem * i = (RegisteredUsersGroupItem *)b; editGroup(i->group()); } } @@ -412,45 +425,47 @@ void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int) void RegisteredUsersDialog::addGroupClicked() { bool ok; - QString text = QInputDialog::getText( this, - "KVIrc", __tr2qs_ctx("Group name:","register"), QLineEdit::Normal, - QString(), &ok ); - if ( ok && !text.isEmpty() ) { + QString text = QInputDialog::getText(this, + "KVIrc", __tr2qs_ctx("Group name:", "register"), QLineEdit::Normal, + QString(), &ok); + if(ok && !text.isEmpty()) + { g_pLocalRegisteredUserDataBase->addGroup(text); fillList(); } } -void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group) +void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup * group) { bool ok; - QString text = QInputDialog::getText( this, - "KVIrc", __tr2qs_ctx("Group name:","register"), QLineEdit::Normal, - group->name(), &ok ); - if ( ok && !text.isEmpty() ) { - QString szOldGroup=group->name(); + QString text = QInputDialog::getText(this, + "KVIrc", __tr2qs_ctx("Group name:", "register"), QLineEdit::Normal, + group->name(), &ok); + if(ok && !text.isEmpty()) + { + QString szOldGroup = group->name(); g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(0); g_pLocalRegisteredUserDataBase->groupDict()->remove(szOldGroup); g_pLocalRegisteredUserDataBase->groupDict()->setAutoDelete(1); group->setName(text); - g_pLocalRegisteredUserDataBase->groupDict()->insert(text,group); + g_pLocalRegisteredUserDataBase->groupDict()->insert(text, group); - KviPointerHashTable * d = g_pLocalRegisteredUserDataBase->userDict(); + KviPointerHashTable * d = g_pLocalRegisteredUserDataBase->userDict(); - for(KviRegisteredUser * u = d->first();u;u = d->next()) + for(KviRegisteredUser * u = d->first(); u; u = d->next()) { - if(u->group()==szOldGroup) + if(u->group() == szOldGroup) u->setGroup(text); } fillList(); // select the last edited item - for(int c=0;ctopLevelItemCount();c++) + for(int c = 0; c < m_pListView->topLevelItemCount(); c++) { QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c); - if(KviQString::equalCI(pGroup->text(0),text)) + if(KviQString::equalCI(pGroup->text(0), text)) { pGroup->setSelected(true); m_pListView->setCurrentItem(pGroup); @@ -460,41 +475,40 @@ void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group) } } - -void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt) +void RegisteredUsersDialog::rightButtonPressed(QTreeWidgetItem * pItem, QPoint pnt) { if(pItem) { - RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)pItem; - if(b->type()==RegisteredUsersDialogItemBase::User) + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)pItem; + if(b->type() == RegisteredUsersDialogItemBase::User) { - QMenu *groups = new QMenu; + QMenu * groups = new QMenu; - KviPointerHashTable * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); - for(KviPointerHashTableEntry * g = pGroups->firstEntry();g;g = pGroups->nextEntry()) + KviPointerHashTable * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); + for(KviPointerHashTableEntry * g = pGroups->firstEntry(); g; g = pGroups->nextEntry()) { - groups->addAction(g->key()) - ->setData(g->data()->name()); + groups->addAction(g->key()) + ->setData(g->data()->name()); } - connect(groups,SIGNAL(triggered(QAction *)),this,SLOT(moveToGroupMenuClicked(QAction *))); + connect(groups, SIGNAL(triggered(QAction *)), this, SLOT(moveToGroupMenuClicked(QAction *))); - QMenu *mainPopup = new QMenu; - mainPopup->addAction(__tr2qs_ctx("Move to Group","register"))->setMenu(groups); + QMenu * mainPopup = new QMenu; + mainPopup->addAction(__tr2qs_ctx("Move to Group", "register"))->setMenu(groups); mainPopup->exec(pnt); } } } -void RegisteredUsersDialog::moveToGroupMenuClicked(QAction *pAction) +void RegisteredUsersDialog::moveToGroupMenuClicked(QAction * pAction) { - QString szGroup=pAction->data().toString(); + QString szGroup = pAction->data().toString(); - QList list = m_pListView->selectedItems(); - for(int i=0; i list = m_pListView->selectedItems(); + for(int i = 0; i < list.count(); i++) { - RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i)); - if(b->type()==RegisteredUsersDialogItemBase::User) + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(list.at(i)); + if(b->type() == RegisteredUsersDialogItemBase::User) { ((RegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup); } @@ -505,34 +519,38 @@ void RegisteredUsersDialog::moveToGroupMenuClicked(QAction *pAction) void RegisteredUsersDialog::fillList() { m_pListView->clear(); - KviPointerHashTable groupItems(5,false); + KviPointerHashTable groupItems(5, false); groupItems.setAutoDelete(false); - KviPointerHashTable * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); - for(KviRegisteredUserGroup * g = pGroups->first();g;g = pGroups->next()) + KviPointerHashTable * pGroups = g_pLocalRegisteredUserDataBase->groupDict(); + for(KviRegisteredUserGroup * g = pGroups->first(); g; g = pGroups->next()) { - RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,g); - groupItems.insert(g->name(),pCur); + RegisteredUsersGroupItem * pCur = new RegisteredUsersGroupItem(m_pListView, g); + groupItems.insert(g->name(), pCur); pCur->setExpanded(true); } - KviPointerHashTable * d = g_pLocalRegisteredUserDataBase->userDict(); + KviPointerHashTable * d = g_pLocalRegisteredUserDataBase->userDict(); RegisteredUsersDialogItem * item; Q_UNUSED(item); - for(KviRegisteredUser * u = d->first();u;u = d->next()) + for(KviRegisteredUser * u = d->first(); u; u = d->next()) { if(u->group().isEmpty()) - u->setGroup(__tr2qs_ctx("Default","register")); + u->setGroup(__tr2qs_ctx("Default", "register")); if(groupItems.find(u->group())) { - item = new RegisteredUsersDialogItem(groupItems.find(u->group()),u); - } else if(groupItems.find(__tr2qs_ctx("Default","register"))) { - item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u); - } else { //should never be called - KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default","register")); - RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,pGroup); - groupItems.insert(__tr2qs_ctx("Default","register"),pCur); - item = new RegisteredUsersDialogItem(pCur,u); + item = new RegisteredUsersDialogItem(groupItems.find(u->group()), u); + } + else if(groupItems.find(__tr2qs_ctx("Default", "register"))) + { + item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default", "register")), u); + } + else + { //should never be called + KviRegisteredUserGroup * pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default", "register")); + RegisteredUsersGroupItem * pCur = new RegisteredUsersGroupItem(m_pListView, pGroup); + groupItems.insert(__tr2qs_ctx("Default", "register"), pCur); + item = new RegisteredUsersDialogItem(pCur, u); } } if(m_pListView->topLevelItem(0)) @@ -542,7 +560,7 @@ void RegisteredUsersDialog::fillList() } } -void RegisteredUsersDialog::closeEvent(QCloseEvent *e) +void RegisteredUsersDialog::closeEvent(QCloseEvent * e) { m_pListView->clear(); e->accept(); @@ -566,11 +584,12 @@ void RegisteredUsersDialog::cancelClicked() void RegisteredUsersDialog::addClicked() { - RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,0); + RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, 0); int ret = dlg->exec(); delete dlg; - if(!g_pRegisteredUsersDialog)return; // we have been deleted! + if(!g_pRegisteredUsersDialog) + return; // we have been deleted! if(ret == QDialog::Accepted) { @@ -580,10 +599,11 @@ void RegisteredUsersDialog::addClicked() void RegisteredUsersDialog::addWizardClicked() { - RegistrationWizard * w = new RegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true); + RegistrationWizard * w = new RegistrationWizard("", g_pLocalRegisteredUserDataBase, this, true); int ret = w->exec(); delete w; - if(!g_pRegisteredUsersDialog)return; // we have been deleted! + if(!g_pRegisteredUsersDialog) + return; // we have been deleted! if(ret == QDialog::Accepted) { fillList(); @@ -593,49 +613,54 @@ void RegisteredUsersDialog::addWizardClicked() void RegisteredUsersDialog::removeClicked() { QList list = m_pListView->selectedItems(); - for(int i=0; itype()==RegisteredUsersDialogItemBase::User) + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(list.at(i)); + if(b->type() == RegisteredUsersDialogItemBase::User) { g_pLocalRegisteredUserDataBase->removeUser(((RegisteredUsersDialogItem *)list.at(i))->user()->name()); - } else { + } + else + { g_pLocalRegisteredUserDataBase->removeGroup(((RegisteredUsersGroupItem *)list.at(i))->group()->name()); } } fillList(); -// RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild(); -// RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it; -// if(b->type()==RegisteredUsersDialogItemBase::User) -// { -// KviPointerList l; -// l.setAutoDelete(false); -// while(it) -// { -// if(it->isSelected())l.append(it); -// it = (RegisteredUsersDialogItem *)it->nextSibling(); -// } -// -// for(RegisteredUsersDialogItem * i = l.first();i;i = l.next()) -// { -// //g_pLocalRegisteredUserDataBase->removeUser(i->user()->name()); -// delete i; -// } -// } else { -// -// } + // RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild(); + // RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it; + // if(b->type()==RegisteredUsersDialogItemBase::User) + // { + // KviPointerList l; + // l.setAutoDelete(false); + // while(it) + // { + // if(it->isSelected())l.append(it); + // it = (RegisteredUsersDialogItem *)it->nextSibling(); + // } + // + // for(RegisteredUsersDialogItem * i = l.first();i;i = l.next()) + // { + // //g_pLocalRegisteredUserDataBase->removeUser(i->user()->name()); + // delete i; + // } + // } else { + // + // } } void RegisteredUsersDialog::editClicked() { - RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(m_pListView->currentItem()); - if(!b)return; - if(b->type()==RegisteredUsersDialogItemBase::User) + RegisteredUsersDialogItemBase * b = (RegisteredUsersDialogItemBase *)(m_pListView->currentItem()); + if(!b) + return; + if(b->type() == RegisteredUsersDialogItemBase::User) { - RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)b; + RegisteredUsersDialogItem * i = (RegisteredUsersDialogItem *)b; editItem(i); - } else { - RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b; + } + else + { + RegisteredUsersGroupItem * i = (RegisteredUsersGroupItem *)b; editGroup(i->group()); } } @@ -648,24 +673,25 @@ void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i) QString szName = u->name(); - RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,u); + RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this, u); int res = dlg->exec(); delete dlg; - if(!g_pRegisteredUsersDialog)return; // we have been deleted! + if(!g_pRegisteredUsersDialog) + return; // we have been deleted! if(res == QDialog::Accepted) { fillList(); // select the last edited item - for(int c=0;ctopLevelItemCount();c++) + for(int c = 0; c < m_pListView->topLevelItemCount(); c++) { QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c); - for(int d=0;dchildCount();d++) + for(int d = 0; d < pGroup->childCount(); d++) { - RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem*) pGroup->child(d); - if(KviQString::equalCI(pUser->user()->name(),szName)) + RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem *)pGroup->child(d); + if(KviQString::equalCI(pUser->user()->name(), szName)) { pUser->setSelected(true); m_pListView->setCurrentItem(pUser); @@ -690,7 +716,6 @@ void RegisteredUsersDialog::selectionChanged() m_pExportButton->setEnabled(bHaveSelected); } - #define KVI_REGUSER_DB_FILE_MAGIC 0x5334DBDB #define KVI_REGUSER_DB_FILE_VERSION 1 @@ -708,7 +733,7 @@ void RegisteredUsersDialog::exportClicked() QList list = m_pListView->selectedItems(); //only "user" entries matters, discard groups from count - for(int i=0; itype() == RegisteredUsersDialogItemBase::User) nEntries++; @@ -716,20 +741,22 @@ void RegisteredUsersDialog::exportClicked() if(nEntries < 1) { - KviMessageBox::warning(__tr2qs_ctx("No entries selected.","register")); + KviMessageBox::warning(__tr2qs_ctx("No entries selected.", "register")); return; } QString buffer; - if(!KviFileDialog::askForSaveFileName(buffer,__tr2qs_ctx("Enter a Filename - KVIrc","register"),0,0,true,true,true,this))return; + if(!KviFileDialog::askForSaveFileName(buffer, __tr2qs_ctx("Enter a Filename - KVIrc", "register"), 0, 0, true, true, true, this)) + return; - if(!g_pRegisteredUsersDialog)return; // we have been deleted! + if(!g_pRegisteredUsersDialog) + return; // we have been deleted! KviFile f(buffer); if(!f.open(QIODevice::WriteOnly | QIODevice::Truncate)) { - KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for writing.","register"),&buffer); + KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for writing.", "register"), &buffer); return; } @@ -738,76 +765,99 @@ void RegisteredUsersDialog::exportClicked() hf.version = KVI_REGUSER_DB_FILE_VERSION; hf.nentries = nEntries; - if(f.write((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error; + if(f.write((const char *)&hf, sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader)) + goto write_error; - for(int i=0; itype()!=RegisteredUsersDialogItemBase::User) + RegisteredUsersDialogItemBase * pBase = (RegisteredUsersDialogItemBase *)list.at(i); + if(pBase->type() != RegisteredUsersDialogItemBase::User) continue; KviRegisteredUser * u = ((RegisteredUsersDialogItem *)list.at(i))->user(); if(u) { - if(!f.save(u->name()))goto write_error; - KviPointerHashTable * pd = u->propertyDict(); + if(!f.save(u->name())) + goto write_error; + KviPointerHashTable * pd = u->propertyDict(); if(pd) { - if(!f.save(pd->count()))goto write_error; - for(KviPointerHashTableEntry * pCur = pd->firstEntry();pCur;pCur = pd->nextEntry()) + if(!f.save(pd->count())) + goto write_error; + for(KviPointerHashTableEntry * pCur = pd->firstEntry(); pCur; pCur = pd->nextEntry()) { QString key = pCur->key(); - if(!f.save(key))goto write_error; - if(!f.save(*(pCur->data())))goto write_error; + if(!f.save(key)) + goto write_error; + if(!f.save(*(pCur->data()))) + goto write_error; } - } else { - if(!f.save(0))goto write_error; + } + else + { + if(!f.save(0)) + goto write_error; } KviPointerList * ml = u->maskList(); if(ml) { - if(!f.save(ml->count()))goto write_error; - for(KviIrcMask * m = ml->first();m;m = ml->next()) + if(!f.save(ml->count())) + goto write_error; + for(KviIrcMask * m = ml->first(); m; m = ml->next()) { QString fullMask; - m->mask(fullMask,KviIrcMask::NickUserHost); - if(!f.save(fullMask))goto write_error; + m->mask(fullMask, KviIrcMask::NickUserHost); + if(!f.save(fullMask)) + goto write_error; } - } else { - if(!f.save(0))goto write_error; + } + else + { + if(!f.save(0)) + goto write_error; } QString avatar; - if(u->getProperty("avatar",avatar)) + if(u->getProperty("avatar", avatar)) { - KviAvatar * av = g_pIconManager->getAvatar(QString(),avatar); + KviAvatar * av = g_pIconManager->getAvatar(QString(), avatar); if(av) { if(!av->pixmap()->isNull()) { - if(!f.save(1))goto write_error; + if(!f.save(1)) + goto write_error; QImageWriter io; io.setDevice(&f); io.setFormat("PNG"); - if(!io.write(av->pixmap()->toImage()))goto write_error; - } else { - if(!f.save(0))goto write_error; + if(!io.write(av->pixmap()->toImage())) + goto write_error; + } + else + { + if(!f.save(0)) + goto write_error; } - } else { - if(!f.save(0))goto write_error; } - } else { - if(!f.save(0))goto write_error; + else + { + if(!f.save(0)) + goto write_error; + } + } + else + { + if(!f.save(0)) + goto write_error; } } } goto succesfull_export; - write_error: - KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: write error.","register")); + KviMessageBox::warning(__tr2qs_ctx("Can't export the registered users database: write error.", "register")); f.close(); return; @@ -826,63 +876,74 @@ void RegisteredUsersDialog::importClicked() //KviCString buffer; QString buffer; - if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs_ctx("Select a File - KVIrc","register"),QString(),QString(),false,true,this))return; + if(!KviFileDialog::askForOpenFileName(buffer, __tr2qs_ctx("Select a File - KVIrc", "register"), QString(), QString(), false, true, this)) + return; - if(!g_pRegisteredUsersDialog)return; // we have been deleted! + if(!g_pRegisteredUsersDialog) + return; // we have been deleted! KviFile f(buffer); if(!f.open(QIODevice::ReadOnly)) { - KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for reading.","register"),&buffer); + KviMessageBox::warning(__tr2qs_ctx("Can't open file %Q for reading.", "register"), &buffer); return; } KviReguserDbFileHeader hf; unsigned int idx; - if(f.read((char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto read_error; + if(f.read((char *)&hf, sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader)) + goto read_error; if(hf.magic != KVI_REGUSER_DB_FILE_MAGIC) { - KviMessageBox::warning(__tr2qs_ctx("The file %Q doesn't appear to be a valid registered users database.","register"),&buffer); + KviMessageBox::warning(__tr2qs_ctx("The file %Q doesn't appear to be a valid registered users database.", "register"), &buffer); f.close(); return; } if(hf.version != KVI_REGUSER_DB_FILE_VERSION) { - KviMessageBox::warning(__tr2qs_ctx("The file %Q contains an invalid registered users database version.","register"),&buffer); + KviMessageBox::warning(__tr2qs_ctx("The file %Q contains an invalid registered users database version.", "register"), &buffer); f.close(); return; } - for(idx = 0;idx < hf.nentries;idx++) + for(idx = 0; idx < hf.nentries; idx++) { QString szName; - if(!f.load(szName))goto read_error; + if(!f.load(szName)) + goto read_error; KviRegisteredUser * u = g_pLocalRegisteredUserDataBase->getUser(szName); - if(!u) goto read_error; + if(!u) + goto read_error; unsigned int count = 0; - if(!f.load(count))goto read_error; - for(unsigned int up = 0;up < count;up++) + if(!f.load(count)) + goto read_error; + for(unsigned int up = 0; up < count; up++) { - QString szKey,szValue; - if(!f.load(szKey))goto read_error; - if(!f.load(szValue))goto read_error; - u->setProperty(szKey,szValue); + QString szKey, szValue; + if(!f.load(szKey)) + goto read_error; + if(!f.load(szValue)) + goto read_error; + u->setProperty(szKey, szValue); } - if(!f.load(count))goto read_error; - for(unsigned int um = 0;um < count;um++) + if(!f.load(count)) + goto read_error; + for(unsigned int um = 0; um < count; um++) { QString szMask; - if(!f.load(szMask))goto read_error; + if(!f.load(szMask)) + goto read_error; if(!szMask.isEmpty()) { KviIrcMask * m = new KviIrcMask(szMask); - g_pLocalRegisteredUserDataBase->addMask(u,m); + g_pLocalRegisteredUserDataBase->addMask(u, m); } } - if(!f.load(count))goto read_error; + if(!f.load(count)) + goto read_error; if(count) { // there is an avatar @@ -890,37 +951,39 @@ void RegisteredUsersDialog::importClicked() QImageReader io; io.setDevice(&f); io.setFormat("PNG"); - img=io.read(); -// if(io.read())goto read_error; + img = io.read(); + // if(io.read())goto read_error; - if(img.isNull())qDebug("Oops! Read a null image?"); + if(img.isNull()) + qDebug("Oops! Read a null image?"); QString fName = u->name(); KviFileUtils::adjustFilePath(fName); QString fPath; - int rnm = 0 ; + int rnm = 0; do { - g_pApp->getLocalKvircDirectory(fPath,KviApplication::Avatars,fName); + g_pApp->getLocalKvircDirectory(fPath, KviApplication::Avatars, fName); fPath.append(QString("%1.png").arg(rnm)); rnm++; } while(KviFileUtils::fileExists(fPath)); - if(!img.save(fPath,"PNG")) + if(!img.save(fPath, "PNG")) { - qDebug("Can't save image %s",fPath.toUtf8().data()); - } else { - u->setProperty("avatar",fPath); + qDebug("Can't save image %s", fPath.toUtf8().data()); + } + else + { + u->setProperty("avatar", fPath); } } } goto succesfull_import; - read_error: - KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: read error.","register")); + KviMessageBox::warning(__tr2qs_ctx("Can't import the registered users database: read error.", "register")); f.close(); return; diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h index 119e45ea4..6fadf08b3 100644 --- a/src/modules/reguser/RegisteredUsersDialog.h +++ b/src/modules/reguser/RegisteredUsersDialog.h @@ -38,48 +38,48 @@ #include #include -class KviRegisteredUsersListView : public QTreeWidget +class KviRegisteredUsersListView : public QTreeWidget { Q_OBJECT public: - KviRegisteredUsersListView(QWidget*); + KviRegisteredUsersListView(QWidget *); ~KviRegisteredUsersListView(){}; + protected: - void mousePressEvent (QMouseEvent *e); + void mousePressEvent(QMouseEvent * e); signals: - void rightButtonPressed(QTreeWidgetItem *,QPoint); + void rightButtonPressed(QTreeWidgetItem *, QPoint); }; class RegisteredUsersDialogItemDelegate : public QStyledItemDelegate { public: - RegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget=0) - : QStyledItemDelegate(pWidget) {}; + RegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget = 0) + : QStyledItemDelegate(pWidget){}; ~RegisteredUsersDialogItemDelegate(){}; - QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const; - void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const; - + QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const; + void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const; }; class RegisteredUsersDialogItemBase : public QTreeWidgetItem { public: - enum Types { User,Group }; -protected: - RegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par) - :QTreeWidgetItem(par),m_iType(type) - { - }; - RegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par) - :QTreeWidgetItem(par),m_iType(type) - { - }; - ~RegisteredUsersDialogItemBase() + enum Types { + User, + Group }; +protected: + RegisteredUsersDialogItemBase(Types type, KviRegisteredUsersListView * par) + : QTreeWidgetItem(par), m_iType(type){}; + RegisteredUsersDialogItemBase(Types type, QTreeWidgetItem * par) + : QTreeWidgetItem(par), m_iType(type){}; + ~RegisteredUsersDialogItemBase(){}; + private: RegisteredUsersDialogItemBase::Types m_iType; + public: RegisteredUsersDialogItemBase::Types type() { return m_iType; }; }; @@ -88,11 +88,12 @@ class RegisteredUsersGroupItem : public RegisteredUsersDialogItemBase { protected: KviRegisteredUserGroup * m_pGroup; + public: - RegisteredUsersGroupItem(KviRegisteredUsersListView * par,KviRegisteredUserGroup * g) - :RegisteredUsersDialogItemBase(Group,par), m_pGroup(g) + RegisteredUsersGroupItem(KviRegisteredUsersListView * par, KviRegisteredUserGroup * g) + : RegisteredUsersDialogItemBase(Group, par), m_pGroup(g) { - setText(0,m_pGroup->name()); + setText(0, m_pGroup->name()); } ~RegisteredUsersGroupItem() { @@ -103,16 +104,19 @@ public: class RegisteredUsersDialogItem : public RegisteredUsersDialogItemBase { friend class RegisteredUsersDialogItemDelegate; + protected: KviRegisteredUser * m_pUser; - QTextDocument m_pText; + QTextDocument m_pText; + public: - RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u); + RegisteredUsersDialogItem(QTreeWidgetItem * par, KviRegisteredUser * u); ~RegisteredUsersDialogItem(); + public: - KviRegisteredUser * user(){ return m_pUser; }; - void setUser(KviRegisteredUser * u){ m_pUser = u; }; - virtual QString key(int,bool) const; + KviRegisteredUser * user() { return m_pUser; }; + void setUser(KviRegisteredUser * u) { m_pUser = u; }; + virtual QString key(int, bool) const; }; class RegisteredUsersDialog : public QWidget @@ -121,8 +125,9 @@ class RegisteredUsersDialog : public QWidget public: RegisteredUsersDialog(QWidget * par = 0); ~RegisteredUsersDialog(); + public: - KviRegisteredUsersListView * m_pListView; + KviRegisteredUsersListView * m_pListView; QPushButton * m_pAddButton; QPushButton * m_pWizardAddButton; QPushButton * m_pRemoveButton; @@ -131,10 +136,11 @@ public: QPushButton * m_pExportButton; QPushButton * m_pAddGroupButton; QPushButton * m_pSelectAllButton; + protected: void fillList(); void editItem(RegisteredUsersDialogItem * i); - void editGroup(KviRegisteredUserGroup* group); + void editGroup(KviRegisteredUserGroup * group); virtual void closeEvent(QCloseEvent *); protected slots: void cancelClicked(); @@ -148,10 +154,10 @@ protected slots: void addWizardClicked(); void addGroupClicked(); void selectAllClicked(); - void itemPressed(QTreeWidgetItem *it,int c); - void itemDoubleClicked(QTreeWidgetItem *it, int); - void rightButtonPressed ( QTreeWidgetItem *, QPoint); - void moveToGroupMenuClicked(QAction *pAction); + void itemPressed(QTreeWidgetItem * it, int c); + void itemDoubleClicked(QTreeWidgetItem * it, int); + void rightButtonPressed(QTreeWidgetItem *, QPoint); + void moveToGroupMenuClicked(QAction * pAction); }; #endif diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp index 0dfabd350..7cd29fea4 100644 --- a/src/modules/reguser/RegistrationWizard.cpp +++ b/src/modules/reguser/RegistrationWizard.cpp @@ -22,7 +22,6 @@ // //============================================================================= - #include "RegistrationWizard.h" #include "KviLocale.h" @@ -43,12 +42,11 @@ #include #include - extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; extern KviPointerList * g_pRegistrationWizardList; -RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal) -: KviTalWizard(par) +RegistrationWizard::RegistrationWizard(const QString & startMask, KviRegisteredUserDataBase * db, QWidget * par, bool bModal) + : KviTalWizard(par) { m_pDb = db; @@ -60,21 +58,21 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse g_pRegistrationWizardList->append(this); - QGridLayout* m_pPage1Layout; - QGridLayout* m_pPage2Layout; - QGridLayout* m_pPage3Layout; - QGridLayout* m_pPage4Layout; - QGridLayout* m_pPage5Layout; + QGridLayout * m_pPage1Layout; + QGridLayout * m_pPage2Layout; + QGridLayout * m_pPage3Layout; + QGridLayout * m_pPage4Layout; + QGridLayout * m_pPage5Layout; - QLabel* TextLabel10_2; - QLabel* TextLabel10; - QLabel* TextLabel10_3; - QLabel* TextLabel10_3_2; + QLabel * TextLabel10_2; + QLabel * TextLabel10; + QLabel * TextLabel10_3; + QLabel * TextLabel10_3_2; QFrame * f; -// resize( 490, 456 ); - setWindowTitle(__tr2qs_ctx("User Registration Wizard - KVIrc","register")); + // resize( 490, 456 ); + setWindowTitle(__tr2qs_ctx("User Registration Wizard - KVIrc", "register")); setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux))); setSizeGripEnabled(true); @@ -85,26 +83,27 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pPage1Layout->setMargin(8); m_pLabel1 = new QLabel(m_pPage1); - m_pLabel1->setText(__tr2qs_ctx("

Welcome to the user registration wizard.
This process allows you to add an IRC user to the database and set properties for that user. KVIrc will be (hopefully) able to recognize the user, add him to the notify list, and display the associated avatar.

First of all, you must insert an entry name or real name for the user you're going to register. The name will be used to identify the database entry and has no specific requirements, it can be a given name, nickname, or just some text to remind you of the real person.
Examples: \"George W Bush\", \"Dubya\".\n

","register")); + m_pLabel1->setText(__tr2qs_ctx("

Welcome to the user registration wizard.
This process allows you to add an IRC user to the database and set properties for that user. KVIrc will be (hopefully) able to recognize the user, add him to the notify list, and display the associated avatar.

First of all, you must insert an entry name or real name for the user you're going to register. The name will be used to identify the database entry and has no specific requirements, it can be a given name, nickname, or just some text to remind you of the real person.
Examples: \"George W Bush\", \"Dubya\".\n

", "register")); m_pLabel1->setWordWrap(true); - m_pPage1Layout->addWidget(m_pLabel1,0,0,1,2); + m_pPage1Layout->addWidget(m_pLabel1, 0, 0, 1, 2); m_pEditRealName = new QLineEdit(m_pPage1); //m_pEditRealName->setAlignment(int(QLineEdit::AlignHCenter)); - m_pPage1Layout->addWidget(m_pEditRealName,3,1); + m_pPage1Layout->addWidget(m_pEditRealName, 3, 1); m_pEntryNameLabel = new QLabel(m_pPage1); - m_pEntryNameLabel->setText(__tr2qs_ctx("Entry name:","register")); - m_pPage1Layout->addWidget(m_pEntryNameLabel,3,0); - m_pPage1Layout->setRowStretch(1,1); + m_pEntryNameLabel->setText(__tr2qs_ctx("Entry name:", "register")); + m_pPage1Layout->addWidget(m_pEntryNameLabel, 3, 0); + m_pPage1Layout->setRowStretch(1, 1); - addPage( m_pPage1,__tr2qs_ctx("Step 1: Entry Name","register")); + addPage(m_pPage1, __tr2qs_ctx("Step 1: Entry Name", "register")); - if(mask.nick() != "*")m_pEditRealName->setText(mask.nick()); + if(mask.nick() != "*") + m_pEditRealName->setText(mask.nick()); - connect(m_pEditRealName,SIGNAL(textChanged(const QString &)),this,SLOT(realNameChanged(const QString &))); + connect(m_pEditRealName, SIGNAL(textChanged(const QString &)), this, SLOT(realNameChanged(const QString &))); // PAGE 2 @@ -113,11 +112,11 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pPage2Layout->setSpacing(4); m_pPage2Layout->setMargin(8); - m_pLabel2 = new QLabel( m_pPage2); - m_pLabel2->setText(__tr2qs_ctx("

A registered user is identified by one or more IRC masks.
A mask must be in the following form:
nickname!username@hostname
and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.

You can enter at most two masks here, if you wish to add more masks, use the \"Edit\" button in the Registered Users dialog. You must enter at least one mask.

","register")); + m_pLabel2 = new QLabel(m_pPage2); + m_pLabel2->setText(__tr2qs_ctx("

A registered user is identified by one or more IRC masks.
A mask must be in the following form:
nickname!username@hostname
and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.

You can enter at most two masks here, if you wish to add more masks, use the \"Edit\" button in the Registered Users dialog. You must enter at least one mask.

", "register")); m_pLabel2->setWordWrap(true); - m_pPage2Layout->addWidget(m_pLabel2,0,0,1,5); + m_pPage2Layout->addWidget(m_pLabel2, 0, 0, 1, 5); //KviCString szMask; @@ -127,54 +126,57 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pNicknameEdit1 = new QLineEdit(m_pPage2); m_pNicknameEdit1->setAlignment(Qt::AlignRight); - if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick()); - connect(m_pNicknameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &))); - m_pPage2Layout->addWidget( m_pNicknameEdit1,3,0); + if(mask.nick() != "*") + m_pNicknameEdit1->setText(mask.nick()); + connect(m_pNicknameEdit1, SIGNAL(textChanged(const QString &)), this, SLOT(maskChanged(const QString &))); + m_pPage2Layout->addWidget(m_pNicknameEdit1, 3, 0); m_pUsernameEdit1 = new QLineEdit(m_pPage2); m_pUsernameEdit1->setAlignment(Qt::AlignHCenter); - if(mask.hasUser())m_pUsernameEdit1->setText(mask.user()); - connect(m_pUsernameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &))); - m_pPage2Layout->addWidget(m_pUsernameEdit1,3,2); + if(mask.hasUser()) + m_pUsernameEdit1->setText(mask.user()); + connect(m_pUsernameEdit1, SIGNAL(textChanged(const QString &)), this, SLOT(maskChanged(const QString &))); + m_pPage2Layout->addWidget(m_pUsernameEdit1, 3, 2); m_pHostEdit1 = new QLineEdit(m_pPage2); - if(mask.hasHost())m_pHostEdit1->setText(mask.host()); - connect(m_pHostEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &))); - m_pPage2Layout->addWidget(m_pHostEdit1,3,4); + if(mask.hasHost()) + m_pHostEdit1->setText(mask.host()); + connect(m_pHostEdit1, SIGNAL(textChanged(const QString &)), this, SLOT(maskChanged(const QString &))); + m_pPage2Layout->addWidget(m_pHostEdit1, 3, 4); m_pNicknameEdit2 = new QLineEdit(m_pPage2); m_pNicknameEdit2->setAlignment(Qt::AlignRight); - m_pPage2Layout->addWidget(m_pNicknameEdit2,4,0); + m_pPage2Layout->addWidget(m_pNicknameEdit2, 4, 0); m_pUsernameEdit2 = new QLineEdit(m_pPage2); m_pUsernameEdit2->setAlignment(Qt::AlignHCenter); - m_pPage2Layout->addWidget(m_pUsernameEdit2,4,2); + m_pPage2Layout->addWidget(m_pUsernameEdit2, 4, 2); m_pHostEdit2 = new QLineEdit(m_pPage2); - m_pPage2Layout->addWidget(m_pHostEdit2,4,4); + m_pPage2Layout->addWidget(m_pHostEdit2, 4, 4); TextLabel10_2 = new QLabel(m_pPage2); TextLabel10_2->setText("!"); TextLabel10_2->setAlignment(Qt::AlignCenter); - m_pPage2Layout->addWidget(TextLabel10_2,4,1); + m_pPage2Layout->addWidget(TextLabel10_2, 4, 1); TextLabel10 = new QLabel(m_pPage2); TextLabel10->setText("!"); TextLabel10->setAlignment(Qt::AlignCenter); - m_pPage2Layout->addWidget(TextLabel10,3,1); + m_pPage2Layout->addWidget(TextLabel10, 3, 1); TextLabel10_3 = new QLabel(m_pPage2); TextLabel10_3->setText("@"); TextLabel10_3->setAlignment(Qt::AlignCenter); - m_pPage2Layout->addWidget(TextLabel10_3,3,3); + m_pPage2Layout->addWidget(TextLabel10_3, 3, 3); TextLabel10_3_2 = new QLabel(m_pPage2); TextLabel10_3_2->setText("@"); TextLabel10_3_2->setAlignment(Qt::AlignCenter); - m_pPage2Layout->addWidget(TextLabel10_3_2,4,3); - m_pPage2Layout->setRowStretch(1,1); + m_pPage2Layout->addWidget(TextLabel10_3_2, 4, 3); + m_pPage2Layout->setRowStretch(1, 1); - addPage(m_pPage2,__tr2qs_ctx("Step 2: Mask Selection","register")); + addPage(m_pPage2, __tr2qs_ctx("Step 2: Mask Selection", "register")); // PAGE 3 @@ -184,20 +186,20 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pPage3Layout->setMargin(8); m_pLabel3 = new QLabel(m_pPage3); - m_pLabel3->setText(__tr2qs_ctx("

If you want to store an avatar image for this user, you can set it here. KVIrc will show the avatar in the userlist next to the user's nickname.
An avatar can be in any supported image format (PNG is recommended). Keep in mind that KVIrc stores avatars in memory and has to resize them to fit in the userlist, thus it's better to use small, low-resolution images.

","register")); + m_pLabel3->setText(__tr2qs_ctx("

If you want to store an avatar image for this user, you can set it here. KVIrc will show the avatar in the userlist next to the user's nickname.
An avatar can be in any supported image format (PNG is recommended). Keep in mind that KVIrc stores avatars in memory and has to resize them to fit in the userlist, thus it's better to use small, low-resolution images.

", "register")); m_pLabel3->setWordWrap(true); - m_pPage3Layout->addWidget(m_pLabel3,0,0); + m_pPage3Layout->addWidget(m_pLabel3, 0, 0); f = new QFrame(m_pPage3); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); - m_pPage3Layout->addWidget(f,1,0); + m_pPage3Layout->addWidget(f, 1, 0); m_pAvatar = new KviPixmap(); - m_pAvatarSelector = new KviPixmapSelector(m_pPage3,__tr2qs_ctx("Store an avatar for this user:","register"),m_pAvatar,true); - m_pPage3Layout->addWidget(m_pAvatarSelector,2,0); - m_pPage3Layout->setRowStretch(2,1); + m_pAvatarSelector = new KviPixmapSelector(m_pPage3, __tr2qs_ctx("Store an avatar for this user:", "register"), m_pAvatar, true); + m_pPage3Layout->addWidget(m_pAvatarSelector, 2, 0); + m_pPage3Layout->setRowStretch(2, 1); - addPage(m_pPage3,__tr2qs_ctx("Step 3: Avatar Selection","register")); + addPage(m_pPage3, __tr2qs_ctx("Step 3: Avatar Selection", "register")); // PAGE 4 @@ -207,35 +209,36 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pPage4Layout->setMargin(8); m_pLabel4 = new QLabel(m_pPage4); - m_pLabel4->setText(__tr2qs_ctx("

If you want to be notified when this user is online or goes offline, you must specify the list of nicknames that KVIrc will look for.

You can enter at most two nicknames here, if you wish to add more nicknames, use the \"Edit\" button in the \"Registered Users\" dialog.

","register")); + m_pLabel4->setText(__tr2qs_ctx("

If you want to be notified when this user is online or goes offline, you must specify the list of nicknames that KVIrc will look for.

You can enter at most two nicknames here, if you wish to add more nicknames, use the \"Edit\" button in the \"Registered Users\" dialog.

", "register")); m_pLabel4->setWordWrap(true); - m_pPage4Layout->addWidget(m_pLabel4,0,0,1,5); + m_pPage4Layout->addWidget(m_pLabel4, 0, 0, 1, 5); m_pNotifyCheck = new QCheckBox(m_pPage4); - m_pNotifyCheck->setText(__tr2qs_ctx("Add this user to the notify list","register")); + m_pNotifyCheck->setText(__tr2qs_ctx("Add this user to the notify list", "register")); m_pNotifyCheck->setChecked(false); - connect(m_pNotifyCheck,SIGNAL(toggled(bool)),this,SLOT(notifyCheckToggled(bool))); - m_pPage4Layout->addWidget(m_pNotifyCheck,3,0,1,2); + connect(m_pNotifyCheck, SIGNAL(toggled(bool)), this, SLOT(notifyCheckToggled(bool))); + m_pPage4Layout->addWidget(m_pNotifyCheck, 3, 0, 1, 2); m_pNotifyNickLabel1 = new QLabel(m_pPage4); - m_pNotifyNickLabel1->setText(__tr2qs_ctx("Nickname:","register")); - m_pPage4Layout->addWidget(m_pNotifyNickLabel1,4,0); + m_pNotifyNickLabel1->setText(__tr2qs_ctx("Nickname:", "register")); + m_pPage4Layout->addWidget(m_pNotifyNickLabel1, 4, 0); m_pNotifyNickLabel2 = new QLabel(m_pPage4); - m_pNotifyNickLabel2->setText(__tr2qs_ctx("Nickname 2:","register")); - m_pPage4Layout->addWidget(m_pNotifyNickLabel2,5,0); + m_pNotifyNickLabel2->setText(__tr2qs_ctx("Nickname 2:", "register")); + m_pPage4Layout->addWidget(m_pNotifyNickLabel2, 5, 0); m_pNotifyNickEdit1 = new QLineEdit(m_pPage4); - if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick()); - connect(m_pNotifyNickEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(notifyNickChanged(const QString &))); - m_pPage4Layout->addWidget(m_pNotifyNickEdit1,4,1); + if(mask.nick() != "*") + m_pNotifyNickEdit1->setText(mask.nick()); + connect(m_pNotifyNickEdit1, SIGNAL(textChanged(const QString &)), this, SLOT(notifyNickChanged(const QString &))); + m_pPage4Layout->addWidget(m_pNotifyNickEdit1, 4, 1); m_pNotifyNickEdit2 = new QLineEdit(m_pPage4); - connect(m_pNotifyNickEdit2,SIGNAL(textChanged(const QString &)),this,SLOT(notifyNickChanged(const QString &))); - m_pPage4Layout->addWidget(m_pNotifyNickEdit2,5,1); - m_pPage4Layout->setRowStretch(1,1); + connect(m_pNotifyNickEdit2, SIGNAL(textChanged(const QString &)), this, SLOT(notifyNickChanged(const QString &))); + m_pPage4Layout->addWidget(m_pNotifyNickEdit2, 5, 1); + m_pPage4Layout->setRowStretch(1, 1); - addPage(m_pPage4,__tr2qs_ctx("Step 4: Notify List","register")); + addPage(m_pPage4, __tr2qs_ctx("Step 4: Notify List", "register")); // PAGE 5 @@ -245,20 +248,20 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse m_pPage5Layout->setMargin(8); m_pTextLabel5 = new QLabel(m_pPage5); - m_pTextLabel5->setText(__tr2qs_ctx("

That's it. The user registration has been completed.

Click \"Finish\" to close this dialog.

","register")); + m_pTextLabel5->setText(__tr2qs_ctx("

That's it. The user registration has been completed.

Click \"Finish\" to close this dialog.

", "register")); m_pTextLabel5->setWordWrap(true); - m_pPage5Layout->addWidget(m_pTextLabel5,0,0); - m_pPage5Layout->setRowStretch(1,1); + m_pPage5Layout->addWidget(m_pTextLabel5, 0, 0); + m_pPage5Layout->setRowStretch(1, 1); - addPage(m_pPage5,__tr2qs_ctx("Registration Complete","register")); + addPage(m_pPage5, __tr2qs_ctx("Registration Complete", "register")); - setFinishEnabled(m_pPage5,true); + setFinishEnabled(m_pPage5, true); QString dummy; maskChanged(dummy); realNameChanged(dummy); notifyCheckToggled(false); - setMinimumSize(QSize(350,420)); + setMinimumSize(QSize(350, 420)); // signals and slots connections } @@ -274,9 +277,10 @@ RegistrationWizard::~RegistrationWizard() void RegistrationWizard::reject() { KviTalWizard::reject(); - if(!m_bModal)delete this; -// hide(); -// g_pApp->collectGarbage(this); + if(!m_bModal) + delete this; + // hide(); + // g_pApp->collectGarbage(this); } void RegistrationWizard::accept() @@ -291,16 +295,17 @@ void RegistrationWizard::accept() QString szName = m_pEditRealName->text(); KviRegisteredUser * u; - if(bLocalDb) { - if(szName.isEmpty()) szName = "user"; + if(szName.isEmpty()) + szName = "user"; QString szNameOk = szName; int idx = 1; - do { + do + { u = m_pDb->findUserByName(szNameOk); if(u) { @@ -310,10 +315,12 @@ void RegistrationWizard::accept() } while(u); u = m_pDb->addUser(szNameOk); - - } else { + } + else + { u = m_pDb->findUserByName(szName); - if(!u)u = m_pDb->addUser(szName); + if(!u) + u = m_pDb->addUser(szName); } if(!u) @@ -331,9 +338,9 @@ void RegistrationWizard::accept() QString m3 = m_pHostEdit1->text(); if(!(m1.isEmpty() && m2.isEmpty() && m3.isEmpty())) { - mk = new KviIrcMask(m1,m2,m3); + mk = new KviIrcMask(m1, m2, m3); m_pDb->removeMask(*mk); - m_pDb->addMask(u,mk); + m_pDb->addMask(u, mk); } m1 = m_pNicknameEdit2->text(); @@ -341,12 +348,15 @@ void RegistrationWizard::accept() m3 = m_pHostEdit2->text(); if(!(m1.isEmpty() && m2.isEmpty() && m3.isEmpty())) { - if(m1.isEmpty())m1 = "*"; - if(m2.isEmpty())m2 = "*"; - if(m3.isEmpty())m3 = "*"; - mk = new KviIrcMask(m1,m2,m3); + if(m1.isEmpty()) + m1 = "*"; + if(m2.isEmpty()) + m2 = "*"; + if(m3.isEmpty()) + m3 = "*"; + mk = new KviIrcMask(m1, m2, m3); m_pDb->removeMask(*mk); - m_pDb->addMask(u,mk); + m_pDb->addMask(u, mk); } m_pAvatarSelector->commit(); @@ -356,7 +366,7 @@ void RegistrationWizard::accept() if(!m_pAvatar->isNull()) { QString szPath = m_pAvatar->path(); - u->setProperty("avatar",szPath); + u->setProperty("avatar", szPath); bSetAvatar = true; } @@ -373,8 +383,9 @@ void RegistrationWizard::accept() if(!m1.isEmpty()) { - u->setProperty("notify",m1); - if(!bLocalDb)g_pApp->restartNotifyLists(); + u->setProperty("notify", m1); + if(!bLocalDb) + g_pApp->restartNotifyLists(); } } @@ -383,18 +394,18 @@ void RegistrationWizard::accept() KviTalWizard::accept(); -// if(!m_bModal)delete this; -// hide(); -// g_pApp->collectGarbage(this); + // if(!m_bModal)delete this; + // hide(); + // g_pApp->collectGarbage(this); } - -void RegistrationWizard::showEvent(QShowEvent *e) +void RegistrationWizard::showEvent(QShowEvent * e) { - if(height() < 420)resize(width(),420); + if(height() < 420) + resize(width(), 420); QRect rect = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen()); - move((rect.width() - width())/2,(rect.height() - height())/2); + move((rect.width() - width()) / 2, (rect.height() - height()) / 2); KviTalWizard::showEvent(e); } @@ -406,33 +417,33 @@ void RegistrationWizard::maskChanged(const QString &) if(tmp1.isEmpty()) { - setNextEnabled(m_pPage2,false); + setNextEnabled(m_pPage2, false); return; } if(tmp2.isEmpty()) { - setNextEnabled(m_pPage2,false); + setNextEnabled(m_pPage2, false); return; } if(tmp3.isEmpty()) { - setNextEnabled(m_pPage2,false); + setNextEnabled(m_pPage2, false); return; } - KviCString mask(KviCString::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr()); + KviCString mask(KviCString::Format, "%s!%s@%s", tmp1.ptr(), tmp2.ptr(), tmp3.ptr()); //KviIrcMask m(mask.ptr()); - setNextEnabled(m_pPage2,mask!="*!*@*"); + setNextEnabled(m_pPage2, mask != "*!*@*"); } void RegistrationWizard::realNameChanged(const QString &) { QString tmp = m_pEditRealName->text(); - setNextEnabled(m_pPage1,!(tmp.isEmpty() || tmp.isNull())); + setNextEnabled(m_pPage1, !(tmp.isEmpty() || tmp.isNull())); } void RegistrationWizard::notifyNickChanged(const QString &) @@ -446,13 +457,16 @@ void RegistrationWizard::notifyNickChanged(const QString &) if(tmp.hasData()) { bYes = true; - } else { + } + else + { tmp = m_pNotifyNickEdit2->text(); - if(tmp.hasData())bYes = true; + if(tmp.hasData()) + bYes = true; } } - setNextEnabled(m_pPage4,bYes); + setNextEnabled(m_pPage4, bYes); } void RegistrationWizard::notifyCheckToggled(bool) diff --git a/src/modules/reguser/RegistrationWizard.h b/src/modules/reguser/RegistrationWizard.h index ded14e67c..b41ac6a06 100644 --- a/src/modules/reguser/RegistrationWizard.h +++ b/src/modules/reguser/RegistrationWizard.h @@ -43,7 +43,7 @@ class RegistrationWizard : public KviTalWizard { Q_OBJECT public: - RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false); + RegistrationWizard(const QString & startMask, KviRegisteredUserDataBase * db = 0, QWidget * par = 0, bool bModal = false); ~RegistrationWizard(); KviRegisteredUserDataBase * m_pDb; @@ -52,39 +52,40 @@ public: bool m_bModal; - QWidget* m_pPage1; - QLabel* m_pLabel1; - QLabel* m_pEntryNameLabel; - QLineEdit* m_pEditRealName; - QWidget* m_pPage2; - QLabel* m_pLabel2; - QLineEdit* m_pNicknameEdit1; - QLineEdit* m_pNicknameEdit2; - QLineEdit* m_pHostEdit1; - QLineEdit* m_pHostEdit2; - QLineEdit* m_pUsernameEdit1; - QLineEdit* m_pUsernameEdit2; - QWidget* m_pPage3; - QLabel* m_pLabel3; + QWidget * m_pPage1; + QLabel * m_pLabel1; + QLabel * m_pEntryNameLabel; + QLineEdit * m_pEditRealName; + QWidget * m_pPage2; + QLabel * m_pLabel2; + QLineEdit * m_pNicknameEdit1; + QLineEdit * m_pNicknameEdit2; + QLineEdit * m_pHostEdit1; + QLineEdit * m_pHostEdit2; + QLineEdit * m_pUsernameEdit1; + QLineEdit * m_pUsernameEdit2; + QWidget * m_pPage3; + QLabel * m_pLabel3; KviPixmapSelector * m_pAvatarSelector; - QWidget* m_pPage4; - QCheckBox* m_pNotifyCheck; - QLabel* m_pNotifyNickLabel1; - QLabel* m_pNotifyNickLabel2; - QLabel* m_pLabel4; - QLineEdit* m_pNotifyNickEdit1; - QLineEdit* m_pNotifyNickEdit2; - QWidget* m_pPage5; - QLabel* m_pTextLabel5; + QWidget * m_pPage4; + QCheckBox * m_pNotifyCheck; + QLabel * m_pNotifyNickLabel1; + QLabel * m_pNotifyNickLabel2; + QLabel * m_pLabel4; + QLineEdit * m_pNotifyNickEdit1; + QLineEdit * m_pNotifyNickEdit2; + QWidget * m_pPage5; + QLabel * m_pTextLabel5; KviPixmap * m_pAvatar; + protected: - virtual void showEvent(QShowEvent *e); + virtual void showEvent(QShowEvent * e); virtual void accept(); virtual void reject(); protected slots: - void realNameChanged(const QString &str); - void maskChanged(const QString &str); + void realNameChanged(const QString & str); + void maskChanged(const QString & str); void notifyNickChanged(const QString &); void notifyCheckToggled(bool); }; diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp index 817a41055..16ac88c82 100644 --- a/src/modules/reguser/libkvireguser.cpp +++ b/src/modules/reguser/libkvireguser.cpp @@ -48,7 +48,6 @@ // KviApplication.cpp - extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; KviPointerList * g_pRegistrationWizardList = 0; @@ -112,23 +111,29 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c) { if(g_pRegisteredUsersDialog) { - if(c->hasSwitch('t',"toplevel")) + if(c->hasSwitch('t', "toplevel")) { if(g_pRegisteredUsersDialog->parent()) { g_pRegisteredUsersDialog->setParent(0); } - } else { + } + else + { if(g_pRegisteredUsersDialog->parent() != g_pMainWindow->splitter()) { g_pRegisteredUsersDialog->setParent(g_pMainWindow->splitter()); } } - } else { - if(c->hasSwitch('t',"toplevel")) + } + else + { + if(c->hasSwitch('t', "toplevel")) { g_pRegisteredUsersDialog = new RegisteredUsersDialog(0); - } else { + } + else + { g_pRegisteredUsersDialog = new RegisteredUsersDialog(g_pMainWindow->splitter()); } } @@ -180,45 +185,49 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c) QString szName; QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("mask", KVS_PT_STRING, 0, szMask) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No name specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } - if(c->hasSwitch('r',"replace"))g_pRegisteredUserDataBase->removeUser(szName); - + if(c->hasSwitch('r', "replace")) + g_pRegisteredUserDataBase->removeUser(szName); KviRegisteredUser * u = g_pRegisteredUserDataBase->addUser(szName); QString group; - if(c->hasSwitch('g',"group")) + if(c->hasSwitch('g', "group")) { - c->switches()->getAsStringIfExisting('g',"group",group); + c->switches()->getAsStringIfExisting('g', "group", group); u->setGroup(group); } if(u == 0) { - if(c->hasSwitch('f',"force")) + if(c->hasSwitch('f', "force")) { u = g_pRegisteredUserDataBase->findUserByName(szName); - } else { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("User already registered: found exact name match","register")); + } + else + { + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("User already registered: found exact name match", "register")); } } - if(u) { if(!szMask.isEmpty()) { KviIrcMask * m = new KviIrcMask(szMask); - u = g_pRegisteredUserDataBase->addMask(u,m); + u = g_pRegisteredUserDataBase->addMask(u, m); if(u != 0) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("Mask %Q is already used to identify user %s","register"),&szMask,u->name().toUtf8().data()); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("Mask %Q is already used to identify user %s", "register"), &szMask, u->name().toUtf8().data()); } } } @@ -260,20 +269,24 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No name specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } if(!(g_pRegisteredUserDataBase->removeUser(szName))) { - c->warning(__tr2qs_ctx("User not found (%Q)","register"),&szName); - } else { - if(c->hasSwitch('n',"restartnotifylists"))g_pApp->restartNotifyLists(); + c->warning(__tr2qs_ctx("User not found (%Q)", "register"), &szName); + } + else + { + if(c->hasSwitch('n', "restartnotifylists")) + g_pApp->restartNotifyLists(); } return true; } @@ -322,36 +335,38 @@ static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c) QString szName; QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("mask", KVS_PT_STRING, 0, szMask) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - c->warning(__tr2qs_ctx("No name specified","register")); + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } if(szMask.isEmpty()) { - c->warning(__tr2qs_ctx("No mask specified","register")); + c->warning(__tr2qs_ctx("No mask specified", "register")); return true; } KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(!u) { - c->warning(__tr2qs_ctx("User %Q not found","register"),&szName); + c->warning(__tr2qs_ctx("User %Q not found", "register"), &szName); return true; } KviIrcMask * mk = new KviIrcMask(szMask); - if(c->hasSwitch('f',"force"))g_pRegisteredUserDataBase->removeMask(*mk); + if(c->hasSwitch('f', "force")) + g_pRegisteredUserDataBase->removeMask(*mk); - u = g_pRegisteredUserDataBase->addMask(u,mk); + u = g_pRegisteredUserDataBase->addMask(u, mk); - if(u != 0)c->warning(__tr2qs_ctx("Mask %Q already used to identify user %Q","register"),&szMask,&(u->name())); + if(u != 0) + c->warning(__tr2qs_ctx("Mask %Q already used to identify user %Q", "register"), &szMask, &(u->name())); return true; } @@ -394,19 +409,19 @@ static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c) { QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("mask", KVS_PT_STRING, 0, szMask) KVSM_PARAMETERS_END(c) if(szMask.isEmpty()) { - c->warning(__tr2qs_ctx("No mask specified","register")); + c->warning(__tr2qs_ctx("No mask specified", "register")); return true; } KviIrcMask mk(szMask); if(!g_pRegisteredUserDataBase->removeMask(mk)) { - c->warning(__tr2qs_ctx("Mask %Q not found","register"),&szMask); + c->warning(__tr2qs_ctx("Mask %Q not found", "register"), &szMask); } return true; @@ -442,27 +457,30 @@ static bool reguser_kvs_cmd_setIgnoreEnabled(KviKvsModuleCommandCall * c) QString szName; bool bEnabled; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("isEnabled",KVS_PT_BOOL,0,bEnabled) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("isEnabled", KVS_PT_BOOL, 0, bEnabled) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No name specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(!u) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("User %Q not found","register"),&szName); - } else { + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("User %Q not found", "register"), &szName); + } + else + { u->setIgnoreEnabled(bEnabled); } return true; } - /* @doc: reguser.setIgnoreFlags @type: @@ -510,34 +528,38 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No name specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(!u) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("User %Q not found","register"),&szName); - } else { - int iIgnoreFlags=0; - if(c->hasSwitch('p',"query")) + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("User %Q not found", "register"), &szName); + } + else + { + int iIgnoreFlags = 0; + if(c->hasSwitch('p', "query")) iIgnoreFlags |= KviRegisteredUser::Query; - if(c->hasSwitch('c',"channel")) + if(c->hasSwitch('c', "channel")) iIgnoreFlags |= KviRegisteredUser::Channel; - if(c->hasSwitch('n',"notice")) + if(c->hasSwitch('n', "notice")) iIgnoreFlags |= KviRegisteredUser::Notice; - if(c->hasSwitch('t',"ctcp")) + if(c->hasSwitch('t', "ctcp")) iIgnoreFlags |= KviRegisteredUser::Ctcp; - if(c->hasSwitch('i',"invite")) + if(c->hasSwitch('i', "invite")) iIgnoreFlags |= KviRegisteredUser::Invite; - if(c->hasSwitch('d',"dcc")) + if(c->hasSwitch('d', "dcc")) iIgnoreFlags |= KviRegisteredUser::Dcc; - if(c->hasSwitch('h',"highlight")) + if(c->hasSwitch('h', "highlight")) iIgnoreFlags |= KviRegisteredUser::Highlight; u->setIgnoreFlags(iIgnoreFlags); } @@ -580,28 +602,27 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c) QString szName; QString szFlags; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) KVSM_PARAMETERS_END(c) KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(u) { if(u->ignoreFlags() & KviRegisteredUser::Query) - szFlags+='q'; + szFlags += 'q'; if(u->ignoreFlags() & KviRegisteredUser::Channel) - szFlags+='c'; + szFlags += 'c'; if(u->ignoreFlags() & KviRegisteredUser::Notice) - szFlags+='n'; + szFlags += 'n'; if(u->ignoreFlags() & KviRegisteredUser::Ctcp) - szFlags+='t'; + szFlags += 't'; if(u->ignoreFlags() & KviRegisteredUser::Invite) - szFlags+='i'; + szFlags += 'i'; if(u->ignoreFlags() & KviRegisteredUser::Dcc) - szFlags+='d'; + szFlags += 'd'; if(u->ignoreFlags() & KviRegisteredUser::Highlight) - szFlags+='h'; + szFlags += 'h'; c->returnValue()->setString(szFlags); - } return true; } @@ -634,14 +655,13 @@ static bool reguser_kvs_fnc_isIgnoreEnabled(KviKvsModuleFunctionCall * c) { QString szName; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) KVSM_PARAMETERS_END(c) KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(u) { c->returnValue()->setBoolean(u->ignoreEnabled()); - } return true; } @@ -687,31 +707,38 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c) QString szProperty; QString szValue; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("mask",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty) - KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) + KVSM_PARAMETER("mask", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("property", KVS_PT_STRING, 0, szProperty) + KVSM_PARAMETER("value", KVS_PT_STRING, KVS_PF_OPTIONAL, szValue) KVSM_PARAMETERS_END(c) if(szName.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No name specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No name specified", "register")); return true; } if(szProperty.isEmpty()) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No property specified","register")); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("No property specified", "register")); return true; } KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(!u) { - if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("User %Q not found","register"),&szName); - } else { - u->setProperty(szProperty,szValue); - if(c->hasSwitch('n',"restartnotifylists"))g_pApp->restartNotifyLists(); - if(c->hasSwitch('a',"resetavatar"))g_pApp->resetAvatarForMatchingUsers(u); + if(!c->hasSwitch('q', "quiet")) + c->warning(__tr2qs_ctx("User %Q not found", "register"), &szName); + } + else + { + u->setProperty(szProperty, szValue); + if(c->hasSwitch('n', "restartnotifylists")) + g_pApp->restartNotifyLists(); + if(c->hasSwitch('a', "resetavatar")) + g_pApp->resetAvatarForMatchingUsers(u); } return true; } @@ -746,22 +773,22 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c) QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("user_mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) + KVSM_PARAMETER("user_mask", KVS_PT_STRING, KVS_PF_OPTIONAL, szMask) KVSM_PARAMETERS_END(c) KviIrcMask mask(szMask); - KviKvsArray* pArray = new KviKvsArray(); - int aid=0; + KviKvsArray * pArray = new KviKvsArray(); + int aid = 0; - KviPointerHashTable * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator it(*d); + KviPointerHashTable * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator it(*d); while(KviRegisteredUser * u = it.current()) { KviPointerList * ml = u->maskList(); if(u->matches(mask) || (ml->count() == 0)) { - pArray->set(aid,new KviKvsVariant(u->name())); + pArray->set(aid, new KviKvsVariant(u->name())); aid++; } ++it; @@ -801,55 +828,57 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c) { QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) + KVSM_PARAMETER("mask", KVS_PT_STRING, KVS_PF_OPTIONAL, szMask) KVSM_PARAMETERS_END(c) KviIrcMask mask(szMask); - c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Registered users database dump:","register")); + c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Registered users database dump:", "register")); int count = 0; - KviPointerHashTable * d = g_pRegisteredUserDataBase->userDict(); - KviPointerHashTableIterator it(*d); + KviPointerHashTable * d = g_pRegisteredUserDataBase->userDict(); + KviPointerHashTableIterator it(*d); while(KviRegisteredUser * u = it.current()) { KviPointerList * ml = u->maskList(); if(u->matches(mask) || (ml->count() == 0)) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("User: %c%Q","register"),KviControlCodes::Bold,&(u->name())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("User: %c%Q", "register"), KviControlCodes::Bold, &(u->name())); if(ml->count() == 0) { - c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Warning: this user has no registration masks","register")); - } else { - for(KviIrcMask * m = ml->first();m;m = ml->next()) + c->window()->output(KVI_OUT_SYSTEMWARNING, __tr2qs_ctx("Warning: this user has no registration masks", "register")); + } + else + { + for(KviIrcMask * m = ml->first(); m; m = ml->next()) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Mask: %Q!%Q@%Q","register"),&(m->nick()),&(m->user()),&(m->host())); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Mask: %Q!%Q@%Q", "register"), &(m->nick()), &(m->user()), &(m->host())); } } - KviPointerHashTable * pd = u->propertyDict(); + KviPointerHashTable * pd = u->propertyDict(); if(pd) { - KviPointerHashTableIterator pdit(*pd); + KviPointerHashTableIterator pdit(*pd); while(pdit.current()) { QString key = pdit.currentKey(); - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Property: %Q=%Q","register"),&(key),pdit.current()); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Property: %Q=%Q", "register"), &(key), pdit.current()); ++pdit; } - } else c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("No properties","register")); + } + else + c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("No properties", "register")); count++; } ++it; } - c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Total: %d matching users (of %d in the database)","register"),count,d->count()); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs_ctx("Total: %d matching users (of %d in the database)", "register"), count, d->count()); return true; } - - /* @doc: reguser.match @type: @@ -878,13 +907,14 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c) QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("user_mask", KVS_PT_STRING, 0, szMask) KVSM_PARAMETERS_END(c) KviIrcMask mask(szMask); //FIXME: it crashes kvirc //KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host()); - KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host()); - if(u) c->returnValue()->setString(u->name()); + KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(), mask.user(), mask.host()); + if(u) + c->returnValue()->setString(u->name()); return true; } @@ -916,11 +946,12 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c) QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask) + KVSM_PARAMETER("user_mask", KVS_PT_STRING, 0, szMask) KVSM_PARAMETERS_END(c) KviIrcMask mask(szMask); KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(mask); - if(u) c->returnValue()->setString(u->name()); + if(u) + c->returnValue()->setString(u->name()); return true; } @@ -976,7 +1007,6 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c) // return c->leaveStackFrame(); //} - /* @doc: reguser.mask @type: @@ -1016,11 +1046,11 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c) QString szName; QString szN; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("N",KVS_PT_STRING,KVS_PF_OPTIONAL,szN) + KVSM_PARAMETER("name", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("N", KVS_PT_STRING, KVS_PF_OPTIONAL, szN) KVSM_PARAMETERS_END(c) - KviKvsArray* pArray = new KviKvsArray(); + KviKvsArray * pArray = new KviKvsArray(); KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(u) { @@ -1028,13 +1058,16 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c) if(n.hasData() && n.isUnsignedNum()) { KviIrcMask * m = u->maskList()->at(n.toInt()); - if(m) c->returnValue()->setString(m->nick()+"!"+m->user()+"@"+m->host()); - } else { - int aid=0; + if(m) + c->returnValue()->setString(m->nick() + "!" + m->user() + "@" + m->host()); + } + else + { + int aid = 0; - for(KviIrcMask * m = u->maskList()->first();m;m = u->maskList()->next()) + for(KviIrcMask * m = u->maskList()->first(); m; m = u->maskList()->next()) { - pArray->set(aid,new KviKvsVariant(QString(m->nick()+"!"+m->user()+"@"+m->host()))); + pArray->set(aid, new KviKvsVariant(QString(m->nick() + "!" + m->user() + "@" + m->host()))); aid++; } c->returnValue()->setArray(pArray); @@ -1079,15 +1112,15 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c) QString szName; QString szProperty; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("user_name",KVS_PT_STRING,0,szName) - KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty) + KVSM_PARAMETER("user_name", KVS_PT_STRING, 0, szName) + KVSM_PARAMETER("property_name", KVS_PT_STRING, KVS_PF_OPTIONAL, szProperty) KVSM_PARAMETERS_END(c) KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserByName(szName); if(u) { QString tmp; - u->getProperty(szProperty,tmp); + u->getProperty(szProperty, tmp); c->returnValue()->setString(tmp); } return true; @@ -1132,18 +1165,18 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c) QString szMask; QString szProperty; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask) - KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty) + KVSM_PARAMETER("user_mask", KVS_PT_STRING, 0, szMask) + KVSM_PARAMETER("property_name", KVS_PT_STRING, KVS_PF_OPTIONAL, szProperty) KVSM_PARAMETERS_END(c) KviIrcMask mask(szMask); //FIXME: it crashes kvirc //KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host()); - KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host()); + KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(), mask.user(), mask.host()); if(u) { QString tmp; - u->getProperty(szProperty,tmp); + u->getProperty(szProperty, tmp); c->returnValue()->setString(tmp); } return true; @@ -1174,7 +1207,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c) { QString szMask; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) + KVSM_PARAMETER("mask", KVS_PT_STRING, KVS_PF_OPTIONAL, szMask) KVSM_PARAMETERS_END(c) RegistrationWizard * w = new RegistrationWizard(szMask); @@ -1188,35 +1221,37 @@ static bool reguser_module_init(KviModule * m) g_pRegistrationWizardList = new KviPointerList; g_pRegistrationWizardList->setAutoDelete(true); - KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add); - KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",reguser_kvs_cmd_remove); - KVSM_REGISTER_SIMPLE_COMMAND(m,"addmask",reguser_kvs_cmd_addmask); - KVSM_REGISTER_SIMPLE_COMMAND(m,"delmask",reguser_kvs_cmd_delmask); - KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",reguser_kvs_cmd_edit); - KVSM_REGISTER_SIMPLE_COMMAND(m,"showlist",reguser_kvs_cmd_showlist); - KVSM_REGISTER_SIMPLE_COMMAND(m,"setproperty",reguser_kvs_cmd_setproperty); - KVSM_REGISTER_SIMPLE_COMMAND(m,"wizard",reguser_kvs_cmd_wizard); - KVSM_REGISTER_SIMPLE_COMMAND(m,"setIgnoreEnabled",reguser_kvs_cmd_setIgnoreEnabled); - KVSM_REGISTER_SIMPLE_COMMAND(m,"setIgnoreFlags",reguser_kvs_cmd_setIgnoreFlags); - - KVSM_REGISTER_FUNCTION(m,"match",reguser_kvs_fnc_match); - KVSM_REGISTER_FUNCTION(m,"list",reguser_kvs_fnc_list); - KVSM_REGISTER_FUNCTION(m,"exactMatch",reguser_kvs_fnc_exactMatch); - KVSM_REGISTER_FUNCTION(m,"mask",reguser_kvs_fnc_mask); - KVSM_REGISTER_FUNCTION(m,"property",reguser_kvs_fnc_property); - KVSM_REGISTER_FUNCTION(m,"matchProperty",reguser_kvs_fnc_matchProperty); - KVSM_REGISTER_FUNCTION(m,"getIgnoreFlags",reguser_kvs_fnc_getIgnoreFlags); - KVSM_REGISTER_FUNCTION(m,"isIgnoreEnabled",reguser_kvs_fnc_isIgnoreEnabled); + KVSM_REGISTER_SIMPLE_COMMAND(m, "add", reguser_kvs_cmd_add); + KVSM_REGISTER_SIMPLE_COMMAND(m, "remove", reguser_kvs_cmd_remove); + KVSM_REGISTER_SIMPLE_COMMAND(m, "addmask", reguser_kvs_cmd_addmask); + KVSM_REGISTER_SIMPLE_COMMAND(m, "delmask", reguser_kvs_cmd_delmask); + KVSM_REGISTER_SIMPLE_COMMAND(m, "edit", reguser_kvs_cmd_edit); + KVSM_REGISTER_SIMPLE_COMMAND(m, "showlist", reguser_kvs_cmd_showlist); + KVSM_REGISTER_SIMPLE_COMMAND(m, "setproperty", reguser_kvs_cmd_setproperty); + KVSM_REGISTER_SIMPLE_COMMAND(m, "wizard", reguser_kvs_cmd_wizard); + KVSM_REGISTER_SIMPLE_COMMAND(m, "setIgnoreEnabled", reguser_kvs_cmd_setIgnoreEnabled); + KVSM_REGISTER_SIMPLE_COMMAND(m, "setIgnoreFlags", reguser_kvs_cmd_setIgnoreFlags); + + KVSM_REGISTER_FUNCTION(m, "match", reguser_kvs_fnc_match); + KVSM_REGISTER_FUNCTION(m, "list", reguser_kvs_fnc_list); + KVSM_REGISTER_FUNCTION(m, "exactMatch", reguser_kvs_fnc_exactMatch); + KVSM_REGISTER_FUNCTION(m, "mask", reguser_kvs_fnc_mask); + KVSM_REGISTER_FUNCTION(m, "property", reguser_kvs_fnc_property); + KVSM_REGISTER_FUNCTION(m, "matchProperty", reguser_kvs_fnc_matchProperty); + KVSM_REGISTER_FUNCTION(m, "getIgnoreFlags", reguser_kvs_fnc_getIgnoreFlags); + KVSM_REGISTER_FUNCTION(m, "isIgnoreEnabled", reguser_kvs_fnc_isIgnoreEnabled); return true; } static bool reguser_module_cleanup(KviModule *) { - if(g_pRegisteredUsersDialog)delete g_pRegisteredUsersDialog; + if(g_pRegisteredUsersDialog) + delete g_pRegisteredUsersDialog; g_pRegisteredUsersDialog = 0; - while(RegistrationWizard * w = g_pRegistrationWizardList->first())delete w; + while(RegistrationWizard * w = g_pRegistrationWizardList->first()) + delete w; delete g_pRegistrationWizardList; g_pRegistrationWizardList = 0; @@ -1230,13 +1265,12 @@ static bool reguser_module_can_unload(KviModule *) } KVIRC_MODULE( - "Reguser", // module name - "4.0.0", // module version - "Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) - "Script interface to the registered users database", - reguser_module_init, - reguser_module_can_unload, - 0, - reguser_module_cleanup, - "register" -) + "Reguser", // module name + "4.0.0", // module version + "Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) + "Script interface to the registered users database", + reguser_module_init, + reguser_module_can_unload, + 0, + reguser_module_cleanup, + "register") -- cgit v1.3.1-10-gc9f91