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/options/OptionsDialog.cpp | 314 +- src/modules/options/OptionsDialog.h | 49 +- src/modules/options/OptionsInstanceManager.cpp | 5309 ++++++++++---------- src/modules/options/OptionsInstanceManager.h | 33 +- src/modules/options/OptionsWidgetContainer.cpp | 44 +- src/modules/options/OptionsWidgetContainer.h | 13 +- .../OptionsWidget_alertsAndHighlighting.cpp | 85 +- .../options/OptionsWidget_alertsAndHighlighting.h | 5 +- src/modules/options/OptionsWidget_antiSpam.cpp | 18 +- src/modules/options/OptionsWidget_antiSpam.h | 2 +- src/modules/options/OptionsWidget_avatar.cpp | 142 +- src/modules/options/OptionsWidget_avatar.h | 1 - src/modules/options/OptionsWidget_away.cpp | 26 +- src/modules/options/OptionsWidget_away.h | 11 +- src/modules/options/OptionsWidget_channel.cpp | 153 +- src/modules/options/OptionsWidget_channel.h | 2 + src/modules/options/OptionsWidget_connection.cpp | 271 +- src/modules/options/OptionsWidget_connection.h | 2 +- src/modules/options/OptionsWidget_ctcp.cpp | 43 +- src/modules/options/OptionsWidget_ctcp.h | 1 - .../options/OptionsWidget_ctcpFloodProtection.cpp | 48 +- .../options/OptionsWidget_ctcpFloodProtection.h | 2 +- src/modules/options/OptionsWidget_dcc.cpp | 486 +- src/modules/options/OptionsWidget_general.cpp | 12 +- src/modules/options/OptionsWidget_identity.cpp | 640 +-- src/modules/options/OptionsWidget_identity.h | 112 +- src/modules/options/OptionsWidget_ignore.cpp | 19 +- src/modules/options/OptionsWidget_ignore.h | 1 + src/modules/options/OptionsWidget_input.cpp | 120 +- src/modules/options/OptionsWidget_input.h | 6 +- .../options/OptionsWidget_interfaceFeatures.cpp | 37 +- src/modules/options/OptionsWidget_irc.cpp | 41 +- src/modules/options/OptionsWidget_irc.h | 1 - src/modules/options/OptionsWidget_ircOutput.cpp | 73 +- src/modules/options/OptionsWidget_ircOutput.h | 3 +- src/modules/options/OptionsWidget_ircView.cpp | 144 +- src/modules/options/OptionsWidget_ircView.h | 4 +- src/modules/options/OptionsWidget_lag.cpp | 54 +- src/modules/options/OptionsWidget_logging.cpp | 44 +- src/modules/options/OptionsWidget_mediaTypes.cpp | 158 +- src/modules/options/OptionsWidget_mediaTypes.h | 30 +- src/modules/options/OptionsWidget_message.cpp | 405 +- src/modules/options/OptionsWidget_message.h | 53 +- src/modules/options/OptionsWidget_nickserv.cpp | 277 +- src/modules/options/OptionsWidget_nickserv.h | 26 +- src/modules/options/OptionsWidget_notifier.cpp | 176 +- src/modules/options/OptionsWidget_notifier.h | 6 +- src/modules/options/OptionsWidget_notify.cpp | 58 +- src/modules/options/OptionsWidget_protection.cpp | 2 +- src/modules/options/OptionsWidget_proxy.cpp | 146 +- src/modules/options/OptionsWidget_proxy.h | 42 +- src/modules/options/OptionsWidget_query.cpp | 124 +- src/modules/options/OptionsWidget_servers.cpp | 1263 ++--- src/modules/options/OptionsWidget_servers.h | 195 +- src/modules/options/OptionsWidget_sound.cpp | 118 +- src/modules/options/OptionsWidget_sound.h | 5 +- src/modules/options/OptionsWidget_textEncoding.cpp | 111 +- src/modules/options/OptionsWidget_textEncoding.h | 4 +- src/modules/options/OptionsWidget_textIcons.cpp | 140 +- src/modules/options/OptionsWidget_textIcons.h | 27 +- src/modules/options/OptionsWidget_theme.cpp | 188 +- src/modules/options/OptionsWidget_theme.h | 12 +- src/modules/options/OptionsWidget_tools.cpp | 10 +- src/modules/options/OptionsWidget_topicLabel.cpp | 11 +- src/modules/options/OptionsWidget_topicLabel.h | 1 - src/modules/options/OptionsWidget_tray.cpp | 46 +- src/modules/options/OptionsWidget_tray.h | 1 + src/modules/options/OptionsWidget_uparser.cpp | 47 +- src/modules/options/OptionsWidget_urlHandlers.cpp | 122 +- src/modules/options/OptionsWidget_urlHandlers.h | 1 + src/modules/options/OptionsWidget_userList.cpp | 172 +- src/modules/options/OptionsWidget_userList.h | 11 +- src/modules/options/OptionsWidget_windowList.cpp | 189 +- src/modules/options/OptionsWidget_windowList.h | 7 +- src/modules/options/libkvioptions.cpp | 113 +- 75 files changed, 6465 insertions(+), 6203 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index e924bfa93..e8e349c36 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -52,46 +52,44 @@ //FIXME: some headers must be hidden - //extern KviModule * g_pOptionsModule; -extern KviPointerHashTable * g_pOptionsDialogDict; +extern KviPointerHashTable * g_pOptionsDialogDict; extern KVIRC_API KviApplication * g_pApp; extern OptionsInstanceManager * g_pOptionsInstanceManager; -OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget *parent,const QString &szText) - :KviOptionsWidget(parent) +OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget * parent, const QString & szText) + : KviOptionsWidget(parent) { setObjectName("general_options_front_widget"); createLayout(); - QLabel * l = new QLabel(szText,this); + QLabel * l = new QLabel(szText, this); l->setWordWrap(true); l->setAlignment(Qt::AlignTop); - layout()->addWidget(l,0,0); + layout()->addWidget(l, 0, 0); } OptionsDialogFrontWidget::~OptionsDialogFrontWidget() { } - -OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e) -:QTreeWidgetItem() +OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget * parent, OptionsWidgetInstanceEntry * e) + : QTreeWidgetItem() { m_pInstanceEntry = e; m_pOptionsWidget = 0; - setText(0,e->szName); - setIcon(0,*(g_pIconManager->getSmallIcon(e->eIcon))); + setText(0, e->szName); + setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertTopLevelItem(0, this); } -OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e) -:QTreeWidgetItem() +OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem * parent, OptionsWidgetInstanceEntry * e) + : QTreeWidgetItem() { m_pInstanceEntry = e; m_pOptionsWidget = 0; - setText(0,e->szName); - setIcon(0,*(g_pIconManager->getSmallIcon(e->eIcon))); + setText(0, e->szName); + setIcon(0, *(g_pIconManager->getSmallIcon(e->eIcon))); parent->insertChild(0, this); } @@ -99,8 +97,8 @@ OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem() { } -OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) -: QDialog(par) +OptionsDialog::OptionsDialog(QWidget * par, const QString & szGroup, bool bModal) + : QDialog(par) { setObjectName("general_options_dialog"); @@ -110,29 +108,34 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) QString szDialogTitle; - if(szGroup.isEmpty() || KviQString::equalCI(szGroup,"general")) + if(szGroup.isEmpty() || KviQString::equalCI(szGroup, "general")) { - szDialogTitle = __tr2qs_ctx("General Preferences","options"); - } else if(KviQString::equalCI(szGroup,"theme")) + szDialogTitle = __tr2qs_ctx("General Preferences", "options"); + } + else if(KviQString::equalCI(szGroup, "theme")) { - szDialogTitle = __tr2qs_ctx("Theme Preferences","options"); - } else { - szDialogTitle = __tr2qs_ctx("KVIrc Preferences","options"); + szDialogTitle = __tr2qs_ctx("Theme Preferences", "options"); + } + else + { + szDialogTitle = __tr2qs_ctx("KVIrc Preferences", "options"); } - QString szDialog = __tr2qs_ctx("This dialog contains a set of KVIrc settings.
Use the icons " \ - "on the left to navigate through the option pages. The text box in the " \ - "bottom left corner is a small search engine. It will highlight the " \ - "pages that contain options related to the search term you have entered.","options"); - + QString szDialog = __tr2qs_ctx("This dialog contains a set of KVIrc settings.
Use the icons " + "on the left to navigate through the option pages. The text box in the " + "bottom left corner is a small search engine. It will highlight the " + "pages that contain options related to the search term you have entered.", + "options"); QString szInfoTips; - szInfoTips = __tr2qs_ctx("Many settings have tooltips that can be shown by holding " \ - "the cursor over their label for a few seconds.","options"); + szInfoTips = __tr2qs_ctx("Many settings have tooltips that can be shown by holding " + "the cursor over their label for a few seconds.", + "options"); - QString szOkCancelButtons = __tr2qs_ctx("When you have finished, click \"OK\" to accept your changes " \ - "or \"Cancel\" to discard them. Clicking \"Apply\" will commit your " \ - "changes without closing the window.","options"); + QString szOkCancelButtons = __tr2qs_ctx("When you have finished, click \"OK\" to accept your changes " + "or \"Cancel\" to discard them. Clicking \"Apply\" will commit your " + "changes without closing the window.", + "options"); // clang-format off QString szFrontText = QString( @@ -165,10 +168,10 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) setWindowTitle(szCaption); QGridLayout * g1 = new QGridLayout(this); - QSplitter * spl = new QSplitter(Qt::Horizontal,this); + QSplitter * spl = new QSplitter(Qt::Horizontal, this); spl->setChildrenCollapsible(false); - g1->addWidget(spl,0,0,1,5); + g1->addWidget(spl, 0, 0, 1, 5); KviTalVBox * vbox = new KviTalVBox(spl); vbox->setSpacing(2); @@ -180,37 +183,38 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) m_pTreeWidget->header()->hide(); m_pTreeWidget->setRootIsDecorated(true); m_pTreeWidget->setSortingEnabled(false); - m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding); + m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_pTreeWidget->setCurrentItem(NULL); - connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem *)),this,SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(treeWidgetItemSelectionChanged(QTreeWidgetItem *, QTreeWidgetItem *))); KviTalHBox * hbox = new KviTalHBox(vbox); hbox->setSpacing(2); hbox->setMargin(3); m_pSearchLineEdit = new QLineEdit(hbox); - connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked())); + connect(m_pSearchLineEdit, SIGNAL(returnPressed()), this, SLOT(searchClicked())); m_pSearchButton = new QToolButton(hbox); - m_pSearchButton->setIconSize(QSize(16,16)); + m_pSearchButton->setIconSize(QSize(16, 16)); m_pSearchButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Search))); - connect(m_pSearchButton,SIGNAL(clicked()),this,SLOT(searchClicked())); - connect(m_pSearchLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(searchLineEditTextChanged(const QString &))); - - QString szTip = __tr2qs_ctx("

This is the search tool for this options dialog.

" \ - "

You can enter a search term either in your native " \ - "language or in English and press the button on the right. " \ - "The pages that contain some options related to the " \ - "search term will be highlighted and you will be able " \ - "to quickly find them.

Try \"nickname\" for example.

","options"); - KviTalToolTip::add(m_pSearchLineEdit,szTip); - KviTalToolTip::add(m_pSearchButton,szTip); + connect(m_pSearchButton, SIGNAL(clicked()), this, SLOT(searchClicked())); + connect(m_pSearchLineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(searchLineEditTextChanged(const QString &))); + + QString szTip = __tr2qs_ctx("

This is the search tool for this options dialog.

" + "

You can enter a search term either in your native " + "language or in English and press the button on the right. " + "The pages that contain some options related to the " + "search term will be highlighted and you will be able " + "to quickly find them.

Try \"nickname\" for example.

", + "options"); + KviTalToolTip::add(m_pSearchLineEdit, szTip); + KviTalToolTip::add(m_pSearchButton, szTip); vbox = new KviTalVBox(spl); vbox->setSpacing(2); vbox->setMargin(3); - m_pCategoryLabel = new QLabel(" ",vbox); + m_pCategoryLabel = new QLabel(" ", vbox); m_pCategoryLabel->setObjectName("labgeneraloptions"); QFrame * f = new QFrame(vbox); @@ -218,59 +222,59 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) // Widget stack m_pWidgetStack = new QStackedWidget(vbox); - vbox->setStretchFactor(m_pWidgetStack,1); + vbox->setStretchFactor(m_pWidgetStack, 1); // First widget visible - m_pFrontWidget = new OptionsDialogFrontWidget(m_pWidgetStack,szFrontText); + m_pFrontWidget = new OptionsDialogFrontWidget(m_pWidgetStack, szFrontText); m_pWidgetStack->addWidget(m_pFrontWidget); int idx = m_pWidgetStack->indexOf(m_pFrontWidget); m_pWidgetStack->widget(idx)->raise(); // Ok,Cancel,Help - QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); + QPushButton * b = new QPushButton(__tr2qs_ctx("&OK", "options"), this); b->setObjectName("btnok"); - KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + KviTalToolTip::add(b, __tr2qs_ctx("Close this dialog, accepting all changes.", "options")); + connect(b, SIGNAL(clicked()), this, SLOT(okClicked())); //b->setMinimumWidth(whatIsThisWidth); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); - g1->addWidget(b,1,2); + g1->addWidget(b, 1, 2); - b = new QPushButton(__tr2qs_ctx("&Apply","options"),this); + b = new QPushButton(__tr2qs_ctx("&Apply", "options"), this); b->setObjectName("btnapply"); - KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options")); - connect(b,SIGNAL(clicked()),this,SLOT(applyClicked())); + KviTalToolTip::add(b, __tr2qs_ctx("Commit all changes immediately.", "options")); + connect(b, SIGNAL(clicked()), this, SLOT(applyClicked())); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); - g1->addWidget(b,1,3); + g1->addWidget(b, 1, 3); - b = new QPushButton(__tr2qs_ctx("Cancel","options"),this); + b = new QPushButton(__tr2qs_ctx("Cancel", "options"), this); b->setObjectName("btncancel"); - KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); + KviTalToolTip::add(b, __tr2qs_ctx("Close this dialog, discarding all changes.", "options")); b->setDefault(true); //b->setMinimumWidth(whatIsThisWidth); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked())); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); - g1->addWidget(b,1,4); - - g1->setRowStretch(0,1); - g1->setColumnStretch(1,1); + g1->addWidget(b, 1, 4); + g1->setRowStretch(0, 1); + g1->setColumnStretch(1, 1); - fillTreeWidget(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup); + fillTreeWidget(0, g_pOptionsInstanceManager->instanceEntryTree(), szGroup); if(!parent()) { if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5) - KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).setY(5); + KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) + .setY(5); //setGeometry(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry)); resize(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).width(), - KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).height()); + KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).height()); move(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).x(), - KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y()); + KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y()); } - new QShortcut(Qt::Key_Escape,this,SLOT(close())); + new QShortcut(Qt::Key_Escape, this, SLOT(close())); if(bModal) setWindowModality(par ? Qt::WindowModal : Qt::ApplicationModal); @@ -279,12 +283,12 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal) OptionsDialog::~OptionsDialog() { if(!parent()) - KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height()); + KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(), pos().y(), size().width(), size().height()); if(g_pOptionsDialogDict) g_pOptionsDialogDict->remove(m_szGroup); } -void OptionsDialog::showEvent(QShowEvent *e) +void OptionsDialog::showEvent(QShowEvent * e) { // setup a minimum size and move to the screen the main kvirc window is QRect r = g_pApp->desktop()->screenGeometry(g_pMainWindow); @@ -298,12 +302,16 @@ void OptionsDialog::showEvent(QShowEvent *e) if(w < 800) { // 640x480 - if(ww < 630)ww = 630; - } else { - if(ww < 770)ww = 770; + if(ww < 630) + ww = 630; + } + else + { + if(ww < 770) + ww = 770; } - setGeometry(r.x() + ((w - ww) / 2),r.y() + ((h - wh) / 2),ww,wh); + setGeometry(r.x() + ((w - ww) / 2), r.y() + ((h - wh) / 2), ww, wh); QWidget::showEvent(e); } @@ -313,26 +321,27 @@ void OptionsDialog::searchLineEditTextChanged(const QString &) QString txt = m_pSearchLineEdit->text().trimmed(); m_pSearchButton->setEnabled(txt.length() > 0); } -bool OptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords) +bool OptionsDialog::searchInSelectors(KviOptionsWidget * pOptionsWidget, const QStringList & lKeywords) { - KviPointerList *selectors=pOptionsWidget->selectors(); - bool bFoundSomethingHere=false; - if(selectors->count()>0) + KviPointerList * selectors = pOptionsWidget->selectors(); + bool bFoundSomethingHere = false; + if(selectors->count() > 0) { - for(unsigned int i=0;icount();i++) + for(unsigned int i = 0; i < selectors->count(); i++) { - QString szText=selectors->at(i)->textForSearch(); - QWidget* pWidget=selectors->at(i)->widgetToHighlight(); - if (!pWidget) continue; - QString szTmp=pWidget->toolTip(); - szTmp=szTmp.replace(QRegExp("<[^<>]+>"),""); + QString szText = selectors->at(i)->textForSearch(); + QWidget * pWidget = selectors->at(i)->widgetToHighlight(); + if(!pWidget) + continue; + QString szTmp = pWidget->toolTip(); + szTmp = szTmp.replace(QRegExp("<[^<>]+>"), ""); szText.append(szTmp); if(!szText.isEmpty()) { bool bOk = true; - for(int j=0;jm_pOptionsWidget) { - pItem->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(pItem->m_pInstanceEntry,m_pWidgetStack); + pItem->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(pItem->m_pInstanceEntry, m_pWidgetStack); m_pWidgetStack->addWidget(pItem->m_pOptionsWidget); } bool bFoundSomethingHere = false; - KviOptionsWidget *pOptionsWidget=pItem->m_pOptionsWidget; - QTabWidget *pTab= pOptionsWidget->tabWidget(); - if (pTab) + KviOptionsWidget * pOptionsWidget = pItem->m_pOptionsWidget; + QTabWidget * pTab = pOptionsWidget->tabWidget(); + if(pTab) { - for(int i=0;icount();i++) + for(int i = 0; i < pTab->count(); i++) { QString szTxt = pTab->tabText(i); - if(KviQString::equalCIN(szTxt,">>> ",4)) + if(KviQString::equalCIN(szTxt, ">>> ", 4)) { - szTxt.replace(">>> ",""); - szTxt.replace(" <<<",""); + szTxt.replace(">>> ", ""); + szTxt.replace(" <<<", ""); } - if (searchInSelectors((KviOptionsWidget*)pTab->widget(i),lKeywords)) + if(searchInSelectors((KviOptionsWidget *)pTab->widget(i), lKeywords)) { bFoundSomethingHere = true; - szTxt.insert(0,">>> "); + szTxt.insert(0, ">>> "); szTxt += QString(" <<<"); } - pTab->setTabText(i,szTxt); + pTab->setTabText(i, szTxt); } } else { - if (searchInSelectors(pOptionsWidget,lKeywords)) + if(searchInSelectors(pOptionsWidget, lKeywords)) bFoundSomethingHere = true; } @@ -393,16 +403,18 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS // debug all the "search keywords" for each entry in the options tree // qDebug("OPT %s",pItem->m_pInstanceEntry->szKeywords.toUtf8().data()); - for(int i=0;isetForeground(0, Qt::yellow); pItem->setBackground(0, Qt::red); - } else { + } + else + { pItem->setForeground(0, Qt::black); pItem->setBackground(0, Qt::transparent); } @@ -411,11 +423,12 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS int ccount = pItem->childCount(); if(ccount > 0) { - for(int j=0;jchild(j); - bool bRet = recursiveSearch(pChild,lKeywords); - if(bRet)bFoundSomethingInside = true; + bool bRet = recursiveSearch(pChild, lKeywords); + if(bRet) + bFoundSomethingInside = true; } } @@ -424,23 +437,23 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS return (bFoundSomethingInside || bFoundSomethingHere); } -void OptionsDialog::search(const QStringList &lKeywords) +void OptionsDialog::search(const QStringList & lKeywords) { m_pTreeWidget->setUpdatesEnabled(false); - int count=m_pTreeWidget->topLevelItemCount(); - for (int i=0;itopLevelItemCount(); + for(int i = 0; i < count; i++) { OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); - recursiveSearch(pChild,lKeywords); + recursiveSearch(pChild, lKeywords); } m_pTreeWidget->setUpdatesEnabled(true); m_pTreeWidget->update(); } -void OptionsDialog::search(const QString &szKeywords) +void OptionsDialog::search(const QString & szKeywords) { - QStringList lKeywords = szKeywords.split(" ",QString::SkipEmptyParts); + QStringList lKeywords = szKeywords.split(" ", QString::SkipEmptyParts); search(lKeywords); } @@ -451,9 +464,10 @@ void OptionsDialog::searchClicked() search(szTxt); } -void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList * l,const QString &szGroup,bool bNotContainedOnly) +void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p, KviPointerList * l, const QString & szGroup, bool bNotContainedOnly) { - if(!l)return; + if(!l) + return; OptionsDialogTreeWidgetItem * it; OptionsWidgetInstanceEntry * e; @@ -461,37 +475,41 @@ void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList tmp; tmp.setAutoDelete(false); - - for(e = l->first();e;e = l->next()) + for(e = l->first(); e; e = l->next()) { // must be in the correct group // if we want only containers then well.. must be one - e->bDoInsert = KviQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained); + e->bDoInsert = KviQString::equalCI(szGroup, e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained); OptionsWidgetInstanceEntry * ee = tmp.first(); int idx = 0; while(ee) { - if(ee->iPriority >= e->iPriority)break; + if(ee->iPriority >= e->iPriority) + break; idx++; ee = tmp.next(); } - tmp.insert(idx,e); + tmp.insert(idx, e); } - for(e = tmp.first();e;e = tmp.next()) + for(e = tmp.first(); e; e = tmp.next()) { if(e->bDoInsert) { - if(p)it = new OptionsDialogTreeWidgetItem(p,e); - else it = new OptionsDialogTreeWidgetItem(m_pTreeWidget,e); + if(p) + it = new OptionsDialogTreeWidgetItem(p, e); + else + it = new OptionsDialogTreeWidgetItem(m_pTreeWidget, e); if(!it->m_pOptionsWidget) { - it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry,m_pWidgetStack); + it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry, m_pWidgetStack); if(it->m_pOptionsWidget) m_pWidgetStack->addWidget(it->m_pOptionsWidget); } - } else { + } + else + { it = (OptionsDialogTreeWidgetItem *)p; } @@ -500,16 +518,18 @@ void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerListbIsContainer) { // it's a container: add only eventual not contained children (containers or explicitly marked as not contained) - fillTreeWidget(it,e->pChildList,szGroup,true); - } else { + fillTreeWidget(it, e->pChildList, szGroup, true); + } + else + { // it's not a container, add any children - fillTreeWidget(it,e->pChildList,szGroup,false); + fillTreeWidget(it, e->pChildList, szGroup, false); } } } } -void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *) +void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem * it, QTreeWidgetItem *) { if(it) { @@ -525,10 +545,10 @@ void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWid str.prepend(""); str += ""; - OptionsDialogTreeWidgetItem *i = (OptionsDialogTreeWidgetItem *)it; + OptionsDialogTreeWidgetItem * i = (OptionsDialogTreeWidgetItem *)it; if(!i->m_pOptionsWidget) { - i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry,m_pWidgetStack); + i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry, m_pWidgetStack); m_pWidgetStack->addWidget(i->m_pOptionsWidget); } @@ -586,8 +606,8 @@ void OptionsDialog::applyClicked() void OptionsDialog::apply(bool bDialogAboutToClose) { - int count=m_pTreeWidget->topLevelItemCount(); - int curTab=-1; + int count = m_pTreeWidget->topLevelItemCount(); + int curTab = -1; OptionsDialogTreeWidgetItem * it; if(!bDialogAboutToClose) @@ -601,7 +621,7 @@ void OptionsDialog::apply(bool bDialogAboutToClose) curTab = it->m_pOptionsWidget->tabWidget()->currentIndex(); } - for (int i=0;itopLevelItem(i); recursiveCommit(it); @@ -621,7 +641,6 @@ void OptionsDialog::apply(bool bDialogAboutToClose) } g_pApp->saveConfiguration(); - } void OptionsDialog::okClicked() @@ -635,18 +654,19 @@ void OptionsDialog::cancelClicked() deleteLater(); } -void OptionsDialog::closeEvent(QCloseEvent *e) +void OptionsDialog::closeEvent(QCloseEvent * e) { e->ignore(); deleteLater(); } -void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem *it) +void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem * it) { // First commit the children - if(!it) return; - int count=it->childCount(); - for (int i=0;ichildCount(); + for(int i = 0; i < count; i++) { OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)it->child(i); recursiveCommit(pChild); @@ -662,9 +682,9 @@ void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem *it) //refreshTreeWidget(); // <-- this tends to jump into infinite recursion } -void OptionsDialog::keyPressEvent( QKeyEvent * e ) +void OptionsDialog::keyPressEvent(QKeyEvent * e) { - if(e->key()==Qt::Key_Return) + if(e->key() == Qt::Key_Return) e->accept(); else e->ignore(); diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h index db30dbee9..1d2cc912b 100644 --- a/src/modules/options/OptionsDialog.h +++ b/src/modules/options/OptionsDialog.h @@ -45,60 +45,63 @@ class OptionsDialogFrontWidget : public KviOptionsWidget { Q_OBJECT public: - OptionsDialogFrontWidget(QWidget *parent,const QString &szText); + OptionsDialogFrontWidget(QWidget * parent, const QString & szText); ~OptionsDialogFrontWidget(); }; class OptionsDialogTreeWidgetItem : public QTreeWidgetItem { public: - OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e); - OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e); + OptionsDialogTreeWidgetItem(QTreeWidget * parent, OptionsWidgetInstanceEntry * e); + OptionsDialogTreeWidgetItem(QTreeWidgetItem * parent, OptionsWidgetInstanceEntry * e); ~OptionsDialogTreeWidgetItem(); + public: OptionsWidgetInstanceEntry * m_pInstanceEntry; - KviOptionsWidget * m_pOptionsWidget; + KviOptionsWidget * m_pOptionsWidget; }; class OptionsDialog : public QDialog { Q_OBJECT public: - OptionsDialog(QWidget * par,const QString &szGroup,bool bModal); + OptionsDialog(QWidget * par, const QString & szGroup, bool bModal); ~OptionsDialog(); + private: - QTreeWidget * m_pTreeWidget; - QLabel * m_pCategoryLabel; - QStackedWidget * m_pWidgetStack; - OptionsDialogFrontWidget * m_pFrontWidget; - QString m_szGroup; - QLineEdit * m_pSearchLineEdit; - QToolButton * m_pSearchButton; + QTreeWidget * m_pTreeWidget; + QLabel * m_pCategoryLabel; + QStackedWidget * m_pWidgetStack; + OptionsDialogFrontWidget * m_pFrontWidget; + QString m_szGroup; + QLineEdit * m_pSearchLineEdit; + QToolButton * m_pSearchButton; + private: - void recursiveCommit(OptionsDialogTreeWidgetItem *it); - void fillTreeWidget(QTreeWidgetItem * p,KviPointerList * l,const QString &szGroup,bool bNotContainedOnly = false); + void recursiveCommit(OptionsDialogTreeWidgetItem * it); + void fillTreeWidget(QTreeWidgetItem * p, KviPointerList * l, const QString & szGroup, bool bNotContainedOnly = false); //OptionsDialogTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList * l); //OptionsDialogTreeWidgetItem * findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage); private slots: - void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev); + void treeWidgetItemSelectionChanged(QTreeWidgetItem * it, QTreeWidgetItem * prev); void applyClicked(); void okClicked(); void cancelClicked(); void pageWantsToSwitchToAdvancedPage(KviOptionsWidget * pPage); void searchClicked(); void searchLineEditTextChanged(const QString &); + protected: void apply(bool bDialogAboutToClose); - virtual void closeEvent(QCloseEvent *e); - virtual void keyPressEvent( QKeyEvent * e ); - virtual void showEvent(QShowEvent *e); - bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords); - bool searchInSelectors(KviOptionsWidget *pWidget,const QStringList &lKeywords); + virtual void closeEvent(QCloseEvent * e); + virtual void keyPressEvent(QKeyEvent * e); + virtual void showEvent(QShowEvent * e); + bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem, const QStringList & lKeywords); + bool searchInSelectors(KviOptionsWidget * pWidget, const QStringList & lKeywords); public: - void search(const QString &szKeywords); - void search(const QStringList &lKeywords); + void search(const QString & szKeywords); + void search(const QStringList & lKeywords); }; - #endif //_DIALOG_H_ diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index 25720fe84..2ed928724 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -485,8 +485,6 @@ KviOptionsWidget * classOptionsWidget_windowListClassic_createInstanceProc(QWidg return new OptionsWidget_windowListClassic(parent); } - - static const char * g_szName_OptionsWidget_alertsAndHighlighting = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting; static const char * g_szClassName_OptionsWidget_alertsAndHighlighting = "OptionsWidget_alertsAndHighlighting"; static const char * g_szName_OptionsWidget_highlighting = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting; @@ -653,7 +651,7 @@ static const char * g_szName_OptionsWidget_windowListClassic = KVI_OPTIONS_WIDGE static const char * g_szClassName_OptionsWidget_windowListClassic = "OptionsWidget_windowListClassic"; OptionsInstanceManager::OptionsInstanceManager() -: QObject(0) + : QObject(0) { //qDebug("Instantiating"); @@ -661,1029 +659,1028 @@ OptionsInstanceManager::OptionsInstanceManager() m_pInstanceTree = new KviPointerList; m_pInstanceTree->setAutoDelete(true); - OptionsWidgetInstanceEntry * e0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_connection_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_connection; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connection; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connection; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connection +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connection e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connection; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connection; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connection +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connection e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connection; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connection +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connection e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connection; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connection +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connection e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connection; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_connection; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connection,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connection, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - OptionsWidgetInstanceEntry * e1; - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionAdvanced - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionAdvanced; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionAdvanced - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionAdvanced; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionAdvanced - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionAdvanced; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_connectionAdvanced; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionAdvanced,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - OptionsWidgetInstanceEntry * e2; - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_connectionSsl; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSsl - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSsl "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSsl; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSsl; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSsl - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSsl; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSsl - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSsl; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSsl - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSsl; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_connectionSsl; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSsl,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_connectionSocket; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSocket - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSocket; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSocket - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSocket; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSocket - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSocket; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSocket - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSocket; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_connectionSocket; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSocket,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_identService_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_identService; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identService - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identService "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identService; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identService; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identService - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identService; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identService - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identService; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identService - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identService; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_identService; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identService,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_proxy_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_proxy; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_proxy - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_proxy; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_proxy - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_proxy; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_proxy - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_proxy; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_proxy; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_proxy,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + OptionsWidgetInstanceEntry * e1; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_connectionAdvanced_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_connectionAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionAdvanced; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionAdvanced + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionAdvanced; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionAdvanced; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionAdvanced + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionAdvanced; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionAdvanced; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionAdvanced + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionAdvanced; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_connectionAdvanced; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionAdvanced, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + OptionsWidgetInstanceEntry * e2; + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_connectionSsl_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_connectionSsl; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSsl; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSsl; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSsl + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSsl "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSsl; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSsl; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSsl + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSsl; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSsl + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSsl; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSsl + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSsl; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_connectionSsl; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSsl, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_connectionSocket_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_connectionSocket; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_connectionSocket; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_connectionSocket; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSocket + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_connectionSocket; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_connectionSocket; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSocket + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_connectionSocket; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSocket + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_connectionSocket; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSocket + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_connectionSocket; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_connectionSocket; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_connectionSocket, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_identService_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_identService; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identService; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identService; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identService + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identService "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identService; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identService; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identService + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identService; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identService + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identService; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identService + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identService; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_identService; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identService, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_proxy_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_proxy; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_proxy; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_proxy; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_proxy + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_proxy; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_proxy + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_proxy; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_proxy + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_proxy; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_proxy; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_proxy, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_dcc_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_dcc; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dcc; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dcc; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dcc +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dcc e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dcc "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dcc; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dcc; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dcc +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dcc e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dcc; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dcc +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dcc e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dcc; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dcc +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dcc e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dcc; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_dcc; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dcc,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dcc, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_dccGeneral; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccGeneral - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccGeneral; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccGeneral - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccGeneral; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccGeneral - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccGeneral; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccGeneral - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccGeneral; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_dccGeneral; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccGeneral,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccAdvanced - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccAdvanced; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccAdvanced - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccAdvanced; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccAdvanced - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccAdvanced; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccAdvanced - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccAdvanced; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_dccAdvanced; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccAdvanced,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_dccSend_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_dccSend; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSend - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSend; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSend - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSend; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSend - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSend; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_dccSend; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSend,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendGeneral - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendGeneral; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendGeneral - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendGeneral; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendGeneral - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendGeneral; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendGeneral - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendGeneral; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_dccSendGeneral; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendGeneral,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendAdvanced - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendAdvanced; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendAdvanced - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendAdvanced; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendAdvanced - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendAdvanced; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendAdvanced - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendAdvanced; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_dccSendAdvanced; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendAdvanced,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_dccChat_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_dccChat; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccChat - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccChat; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccChat - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccChat; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccChat - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccChat; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_dccChat; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccChat,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_dccVoice; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccVoice - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccVoice "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccVoice; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccVoice; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccVoice - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccVoice; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccVoice - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccVoice; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccVoice - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccVoice; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_dccVoice; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccVoice,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_dccGeneral_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_dccGeneral; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccGeneral; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccGeneral; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccGeneral + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccGeneral; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccGeneral; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccGeneral + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccGeneral; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccGeneral + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccGeneral; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccGeneral + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccGeneral; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_dccGeneral; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccGeneral, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_dccAdvanced_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_dccAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccAdvanced; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccAdvanced + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccAdvanced; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccAdvanced; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccAdvanced + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccAdvanced; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccAdvanced + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccAdvanced; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccAdvanced + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccAdvanced; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_dccAdvanced; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccAdvanced, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_dccSend_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_dccSend; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSend; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSend; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSend + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSend; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSend; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSend + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSend; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSend; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSend + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSend; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_dccSend; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSend, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_dccSendGeneral_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_dccSendGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendGeneral; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendGeneral; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendGeneral + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendGeneral; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendGeneral; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendGeneral + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendGeneral; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendGeneral + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendGeneral; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendGeneral + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendGeneral; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_dccSendGeneral; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendGeneral, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_dccSendAdvanced_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_dccSendAdvanced; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccSendAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccSendAdvanced; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendAdvanced + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccSendAdvanced; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccSendAdvanced; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendAdvanced + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccSendAdvanced; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendAdvanced + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccSendAdvanced; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendAdvanced + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccSendAdvanced; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_dccSendAdvanced; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccSendAdvanced, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_dccChat_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_dccChat; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccChat; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccChat; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccChat + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccChat; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccChat; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccChat + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccChat; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccChat + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccChat; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccChat; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_dccChat; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccChat, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_dccVoice_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_dccVoice; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_dccVoice; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_dccVoice; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccVoice + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccVoice "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_dccVoice; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_dccVoice; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccVoice + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_dccVoice; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccVoice + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_dccVoice; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccVoice + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_dccVoice; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_dccVoice; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_dccVoice, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_general_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_general; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_general; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_general; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_general +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_general e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_general; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_general; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_general +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_general e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_general; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_general +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_general e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_general; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_general +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_general e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_general; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_general; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_general,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_general, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_mediaTypes; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_mediaTypes - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_mediaTypes; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_mediaTypes - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_mediaTypes; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_mediaTypes - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_mediaTypes; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_mediaTypes; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_mediaTypes,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_sound_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_sound; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sound - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sound "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sound; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sound; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sound - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sound; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sound - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sound; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_sound; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sound,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_soundGeneral; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_soundGeneral - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_soundGeneral; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_soundGeneral - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_soundGeneral; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_soundGeneral - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_soundGeneral; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_soundGeneral; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_soundGeneral,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_sounds_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_sounds; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sounds - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sounds; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sounds - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sounds; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sounds - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sounds; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_sounds; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sounds,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_textEncoding; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textEncoding - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textEncoding; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textEncoding - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textEncoding; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textEncoding - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textEncoding; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_textEncoding; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textEncoding,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_uparser_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_uparser; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_uparser - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_uparser; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_uparser - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_uparser; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_uparser - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_uparser; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_uparser; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_uparser,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_urlHandlers; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_urlHandlers - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_urlHandlers; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_urlHandlers - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_urlHandlers; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_urlHandlers - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_urlHandlers; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_urlHandlers; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_urlHandlers,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_mediaTypes_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_mediaTypes; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_mediaTypes; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_mediaTypes; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_mediaTypes; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_mediaTypes + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_mediaTypes; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_mediaTypes + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_mediaTypes; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_mediaTypes + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_mediaTypes; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_mediaTypes; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_mediaTypes, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_sound_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_sound; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sound; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sound; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sound + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sound "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sound; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sound; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sound + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sound; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sound + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sound; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_sound; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sound, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_soundGeneral_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_soundGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_soundGeneral; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_soundGeneral; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_soundGeneral; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_soundGeneral; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_soundGeneral + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_soundGeneral; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_soundGeneral + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_soundGeneral; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_soundGeneral + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_soundGeneral; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_soundGeneral; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_soundGeneral, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_sounds_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_sounds; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_sounds; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_sounds; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_sounds; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_sounds; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sounds + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_sounds; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sounds + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sounds; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sounds + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_sounds; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_sounds; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_sounds, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_textEncoding_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_textEncoding; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textEncoding; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textEncoding; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textEncoding; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textEncoding; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textEncoding + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textEncoding; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textEncoding + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textEncoding; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textEncoding + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textEncoding; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_textEncoding; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textEncoding, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_uparser_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_uparser; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_uparser; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_uparser; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_uparser; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_uparser; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_uparser + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_uparser; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_uparser + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_uparser; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_uparser + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_uparser; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_uparser; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_uparser, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_urlHandlers_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_urlHandlers; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_urlHandlers; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_urlHandlers; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_urlHandlers; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_urlHandlers; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_urlHandlers + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_urlHandlers; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_urlHandlers + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_urlHandlers; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_urlHandlers + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_urlHandlers; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_urlHandlers; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_urlHandlers, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_identity_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_identity; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identity +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identity e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identity; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identity +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identity e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identity; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identity +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identity e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identity; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_identity; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identity,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identity, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget "," KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_identityAvatar; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAvatar - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAvatar; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAvatar - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAvatar; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAvatar - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAvatar; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAvatar - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAvatar; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_identityAvatar; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAvatar,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAdvanced - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAdvanced; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAdvanced - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAdvanced; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAdvanced - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAdvanced; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAdvanced - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAdvanced; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_identityAdvanced; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAdvanced,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_identityProfile; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityProfile - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityProfile; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityProfile - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityProfile; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityProfile - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityProfile; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityProfile - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityProfile; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_identityProfile; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityProfile,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classKviIdentityGeneralOptionsWidget_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_KviIdentityGeneralOptionsWidget; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget "," KVI_OPTIONS_WIDGET_KEYWORDS_KviIdentityGeneralOptionsWidget; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_KviIdentityGeneralOptionsWidget; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_KviIdentityGeneralOptionsWidget; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_KviIdentityGeneralOptionsWidget; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_KviIdentityGeneralOptionsWidget; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_KviIdentityGeneralOptionsWidget, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_identityAvatar_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_identityAvatar; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAvatar + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAvatar; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAvatar + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAvatar; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAvatar + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAvatar; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAvatar + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAvatar; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_identityAvatar; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAvatar, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_identityAdvanced_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_identityAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAdvanced + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityAdvanced; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAdvanced + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityAdvanced; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAdvanced + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityAdvanced; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAdvanced + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityAdvanced; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_identityAdvanced; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityAdvanced, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_identityProfile_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_identityProfile; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityProfile + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_identityProfile; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityProfile + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_identityProfile; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityProfile + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identityProfile; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityProfile + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_identityProfile; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_identityProfile; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_identityProfile, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_inputLook_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_inputLook; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputLook; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputLook +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputLook e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputLook; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputLook +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputLook e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputLook; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputLook +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputLook e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputLook; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_inputLook; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputLook,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputLook, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -1692,1383 +1689,1383 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_interfaceFeatures; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_interfaceFeatures; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_interfaceFeatures; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_interfaceFeatures +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_interfaceFeatures e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_interfaceFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_interfaceFeatures; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_interfaceFeatures; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_interfaceFeatures +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_interfaceFeatures e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_interfaceFeatures; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_interfaceFeatures +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_interfaceFeatures e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_interfaceFeatures; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_interfaceFeatures +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_interfaceFeatures e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_interfaceFeatures; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_interfaceFeatures; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_interfaceFeatures,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_interfaceFeatures, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_inputFeatures; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputFeatures - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputFeatures; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputFeatures; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputFeatures - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputFeatures; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputFeatures - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputFeatures; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputFeatures - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputFeatures; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_inputFeatures; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputFeatures,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_notifier_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_notifier; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifier - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifier; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifier - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifier; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifier - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifier; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_notifier; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifier,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_tray_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_tray; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tray - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tray; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tray - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tray; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tray - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tray; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_tray; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tray,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_inputFeatures_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_inputFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputFeatures; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_inputFeatures; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputFeatures + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputFeatures; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputFeatures; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputFeatures + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_inputFeatures; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputFeatures + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_inputFeatures; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputFeatures + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_inputFeatures; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_inputFeatures; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_inputFeatures, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_notifier_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_notifier; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifier; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifier; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifier; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifier; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifier + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifier; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifier + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifier; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifier + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifier; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_notifier; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifier, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_tray_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_tray; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tray; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tray; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tray; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tray; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tray + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tray; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tray + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tray; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tray + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tray; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_tray; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tray, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_irc_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_irc; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_irc; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_irc; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_irc +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_irc e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_irc "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_irc; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_irc; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_irc +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_irc e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_irc; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_irc +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_irc e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_irc; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_irc +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_irc e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_irc; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_irc; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_irc,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_irc, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_channel_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_channel; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channel - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channel "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channel; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channel; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channel - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channel; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channel - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channel; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channel - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channel; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_channel; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channel,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_channelGeneral; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelGeneral - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelGeneral; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelGeneral; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelGeneral - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelGeneral; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelGeneral - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelGeneral; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelGeneral - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelGeneral; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_channelGeneral; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelGeneral,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelAdvanced - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelAdvanced; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelAdvanced - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelAdvanced; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelAdvanced - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelAdvanced; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelAdvanced - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelAdvanced; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_channelAdvanced; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelAdvanced,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircGeneral; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircGeneral - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircGeneral; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircGeneral; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircGeneral - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircGeneral; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircGeneral - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircGeneral; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircGeneral - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircGeneral; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircGeneral; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircGeneral,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircAdvanced - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircAdvanced; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircAdvanced - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircAdvanced; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircAdvanced - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircAdvanced; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircAdvanced - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircAdvanced; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircAdvanced; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircAdvanced,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircOutput; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircOutput - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircOutput; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircOutput - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircOutput; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircOutput - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircOutput; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircOutput; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircOutput,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_protection_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_protection; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_protection - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_protection; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_protection - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_protection; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_protection - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_protection; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_protection; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_protection,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_antispam_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_antispam; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_antispam - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_antispam "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_antispam; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_antispam; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_antispam - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_antispam; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_antispam - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_antispam; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_antispam - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_antispam; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_antispam; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_antispam,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcpFloodProtection - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcpFloodProtection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcpFloodProtection; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcpFloodProtection; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcpFloodProtection - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcpFloodProtection; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcpFloodProtection - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcpFloodProtection; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcpFloodProtection - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcpFloodProtection; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_ctcpFloodProtection; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcpFloodProtection,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_ignore_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_ignore; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ignore - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ignore; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ignore - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ignore; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ignore - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ignore; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_ignore; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ignore,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_query_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_query; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_query - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_query; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_query - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_query; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_query - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_query; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_query; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_query,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_tools_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_tools; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tools - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tools; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tools - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tools; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tools - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tools; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tools - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tools; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_tools; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tools,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alertsAndHighlighting - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alertsAndHighlighting; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alertsAndHighlighting - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alertsAndHighlighting; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alertsAndHighlighting - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alertsAndHighlighting; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_alertsAndHighlighting; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alertsAndHighlighting,"options"); - e1->pChildList->append(e2); - - e2->pChildList = new KviPointerList; - e2->pChildList->setAutoDelete(true); - - OptionsWidgetInstanceEntry * e3; - e3 = new OptionsWidgetInstanceEntry; - e3->createProc = &classOptionsWidget_highlighting_createInstanceProc; - e3->pWidget = 0; - e3->szClassName = g_szClassName_OptionsWidget_highlighting; - e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting - e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting; - #else - e3->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_highlighting - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_highlighting; - #else - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting; - #endif - e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_highlighting - e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_highlighting; - #else - e3->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_highlighting - e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_highlighting; - #else - e3->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_highlighting - e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_highlighting; - #else - e3->bIsNotContained = false; - #endif - e3->szNameNoLocale = g_szName_OptionsWidget_highlighting; - e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_highlighting,"options"); - e2->pChildList->append(e3); - e3->pChildList = 0; - - e3 = new OptionsWidgetInstanceEntry; - e3->createProc = &classOptionsWidget_alerts_createInstanceProc; - e3->pWidget = 0; - e3->szClassName = g_szClassName_OptionsWidget_alerts; - e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts - e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts; - #else - e3->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alerts - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alerts; - #else - e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts; - #endif - e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alerts - e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alerts; - #else - e3->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alerts - e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alerts; - #else - e3->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alerts - e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alerts; - #else - e3->bIsNotContained = false; - #endif - e3->szNameNoLocale = g_szName_OptionsWidget_alerts; - e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alerts,"options"); - e2->pChildList->append(e3); - e3->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_avatar_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_avatar; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_avatar - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_avatar; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_avatar - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_avatar; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_avatar - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_avatar; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_avatar - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_avatar; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_avatar; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_avatar,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_away_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_away; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_away - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_away "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_away; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_away; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_away - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_away; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_away - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_away; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_away - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_away; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_away; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_away,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_ctcp_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_ctcp; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcp - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcp "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcp; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcp; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcp - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcp; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcp - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcp; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcp - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcp; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_ctcp; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcp,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_lag_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_lag; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_lag - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_lag; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_lag - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_lag; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_lag - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_lag; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_lag; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_lag,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_logging_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_logging; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_logging - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_logging; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_logging - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_logging; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_logging - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_logging; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_logging; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_logging,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_nickServ_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_nickServ; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_nickServ - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_nickServ; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_nickServ - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_nickServ; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_nickServ - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_nickServ; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_nickServ; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_nickServ,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_notify_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_notify; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notify - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notify; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notify - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notify; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notify - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notify; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_notify; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notify,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_textIcons_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_textIcons; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textIcons - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textIcons; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textIcons - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textIcons; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textIcons - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textIcons; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_textIcons; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textIcons,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_channel_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_channel; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channel; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channel; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channel + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channel "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channel; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channel; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channel + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channel; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channel + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channel; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channel + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channel; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_channel; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channel, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_channelGeneral_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_channelGeneral; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelGeneral; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelGeneral; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelGeneral + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelGeneral; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelGeneral; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelGeneral + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelGeneral; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelGeneral + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelGeneral; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelGeneral + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelGeneral; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_channelGeneral; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelGeneral, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_channelAdvanced_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_channelAdvanced; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_channelAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_channelAdvanced; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelAdvanced + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_channelAdvanced; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_channelAdvanced; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelAdvanced + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_channelAdvanced; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelAdvanced + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_channelAdvanced; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelAdvanced + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_channelAdvanced; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_channelAdvanced; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_channelAdvanced, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircGeneral_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircGeneral; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircGeneral; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircGeneral; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircGeneral + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircGeneral "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircGeneral; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircGeneral; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircGeneral + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircGeneral; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircGeneral + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircGeneral; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircGeneral + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircGeneral; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircGeneral; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircGeneral, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircAdvanced_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircAdvanced; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircAdvanced; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircAdvanced + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircAdvanced; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircAdvanced + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircAdvanced; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircAdvanced + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircAdvanced; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircAdvanced + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircAdvanced; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircAdvanced; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircAdvanced, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircOutput_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircOutput; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircOutput; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircOutput; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircOutput; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircOutput + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircOutput; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircOutput + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircOutput; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircOutput + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircOutput; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircOutput; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircOutput, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_protection_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_protection; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_protection; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_protection; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_protection; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_protection; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_protection + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_protection; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_protection + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_protection; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_protection + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_protection; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_protection; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_protection, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_antispam_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_antispam; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_antispam; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_antispam; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_antispam + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_antispam "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_antispam; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_antispam; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_antispam + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_antispam; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_antispam + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_antispam; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_antispam + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_antispam; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_antispam; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_antispam, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_ctcpFloodProtection_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_ctcpFloodProtection; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcpFloodProtection; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcpFloodProtection; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcpFloodProtection + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcpFloodProtection "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcpFloodProtection; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcpFloodProtection; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcpFloodProtection + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcpFloodProtection; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcpFloodProtection + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcpFloodProtection; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcpFloodProtection + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcpFloodProtection; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_ctcpFloodProtection; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcpFloodProtection, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_ignore_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_ignore; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ignore; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ignore; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ignore; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ignore; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ignore + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ignore; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ignore + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ignore; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ignore + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ignore; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_ignore; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ignore, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_query_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_query; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_query; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_query; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_query; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_query; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_query + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_query; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_query + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_query; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_query + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_query; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_query; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_query, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_tools_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_tools; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_tools; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_tools; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tools + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_tools; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_tools; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tools + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_tools; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tools + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_tools; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tools + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_tools; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_tools; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_tools, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_alertsAndHighlighting_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_alertsAndHighlighting; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alertsAndHighlighting; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alertsAndHighlighting; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alertsAndHighlighting + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alertsAndHighlighting; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alertsAndHighlighting; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alertsAndHighlighting + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alertsAndHighlighting; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alertsAndHighlighting; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alertsAndHighlighting + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alertsAndHighlighting; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_alertsAndHighlighting; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alertsAndHighlighting, "options"); + e1->pChildList->append(e2); + + e2->pChildList = new KviPointerList; + e2->pChildList->setAutoDelete(true); + + OptionsWidgetInstanceEntry * e3; + e3 = new OptionsWidgetInstanceEntry; + e3->createProc = &classOptionsWidget_highlighting_createInstanceProc; + e3->pWidget = 0; + e3->szClassName = g_szClassName_OptionsWidget_highlighting; + e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting + e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_highlighting; +#else + e3->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_highlighting + e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_highlighting; +#else + e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting; +#endif + e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_highlighting + e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_highlighting; +#else + e3->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_highlighting + e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_highlighting; +#else + e3->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_highlighting + e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_highlighting; +#else + e3->bIsNotContained = false; +#endif + e3->szNameNoLocale = g_szName_OptionsWidget_highlighting; + e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_highlighting, "options"); + e2->pChildList->append(e3); + e3->pChildList = 0; + + e3 = new OptionsWidgetInstanceEntry; + e3->createProc = &classOptionsWidget_alerts_createInstanceProc; + e3->pWidget = 0; + e3->szClassName = g_szClassName_OptionsWidget_alerts; + e3->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts + e3->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_alerts; +#else + e3->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alerts + e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_alerts; +#else + e3->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts; +#endif + e3->szKeywords = __tr2qs_ctx_no_xgettext(e3->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alerts + e3->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_alerts; +#else + e3->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alerts + e3->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_alerts; +#else + e3->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alerts + e3->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_alerts; +#else + e3->bIsNotContained = false; +#endif + e3->szNameNoLocale = g_szName_OptionsWidget_alerts; + e3->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_alerts, "options"); + e2->pChildList->append(e3); + e3->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_avatar_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_avatar; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_avatar; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_avatar + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_avatar; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_avatar + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_avatar; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_avatar + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_avatar; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_avatar + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_avatar; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_avatar; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_avatar, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_away_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_away; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_away; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_away; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_away + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_away "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_away; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_away; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_away + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_away; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_away + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_away; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_away + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_away; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_away; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_away, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_ctcp_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_ctcp; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ctcp; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ctcp; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcp + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcp "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ctcp; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ctcp; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcp + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ctcp; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcp + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ctcp; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcp + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ctcp; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_ctcp; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ctcp, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_lag_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_lag; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_lag; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_lag; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_lag; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_lag; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_lag + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_lag; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_lag + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_lag; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_lag + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_lag; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_lag; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_lag, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_logging_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_logging; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_logging; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_logging; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_logging; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_logging; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_logging + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_logging; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_logging + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_logging; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_logging + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_logging; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_logging; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_logging, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_nickServ_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_nickServ; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_nickServ; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_nickServ; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_nickServ; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_nickServ; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_nickServ + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_nickServ; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_nickServ + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_nickServ; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_nickServ + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_nickServ; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_nickServ; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_nickServ, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_notify_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_notify; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notify; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notify; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notify; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notify; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notify + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notify; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notify + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notify; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notify + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notify; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_notify; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notify, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_textIcons_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_textIcons; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_textIcons; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_textIcons; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_textIcons; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_textIcons; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textIcons + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_textIcons; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textIcons + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_textIcons; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textIcons + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_textIcons; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_textIcons; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_textIcons, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_ircViewTheme_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_ircViewTheme; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewTheme; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewTheme; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewTheme; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewTheme; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewTheme +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewTheme e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewTheme; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewTheme +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewTheme e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewTheme; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewTheme +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewTheme e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewTheme; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_ircViewTheme; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewTheme,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewTheme, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircViewLook; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewLook - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewLook; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewLook - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewLook; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewLook - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewLook; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircViewLook; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewLook,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewFeatures - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewFeatures; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewFeatures; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewFeatures - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewFeatures; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewFeatures - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewFeatures; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewFeatures - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewFeatures; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircViewFeatures; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewFeatures,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewMarker - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewMarker "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewMarker; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewMarker; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewMarker - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewMarker; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewMarker - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewMarker; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewMarker - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewMarker; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_ircViewMarker; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewMarker,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircViewLook_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircViewLook; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewLook; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewLook; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewLook; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewLook; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewLook + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewLook; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewLook + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewLook; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewLook + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewLook; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircViewLook; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewLook, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircViewFeatures_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircViewFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewFeatures; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewFeatures; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewFeatures + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewFeatures; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewFeatures; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewFeatures + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewFeatures; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewFeatures + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewFeatures; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewFeatures + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewFeatures; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircViewFeatures; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewFeatures, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_ircViewMarker_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_ircViewMarker; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircViewMarker; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_ircViewMarker; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewMarker + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewMarker "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_ircViewMarker; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircViewMarker; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewMarker + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_ircViewMarker; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewMarker + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_ircViewMarker; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewMarker + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_ircViewMarker; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_ircViewMarker; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_ircViewMarker, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_message_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_message; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_message; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_message; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_message; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_message +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_message e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_message; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_message +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_message e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_message; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_message +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_message e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_message; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_message; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_message,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_message, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_privmsg_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_privmsg; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_privmsg - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_privmsg; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_privmsg - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_privmsg; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_privmsg - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_privmsg; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_privmsg; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_privmsg,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_timestamp_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_timestamp; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_timestamp - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_timestamp; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_timestamp - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_timestamp; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_timestamp - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_timestamp; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_timestamp; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_timestamp,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_messageColors_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_messageColors; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_messageColors - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_messageColors; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_messageColors - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_messageColors; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_messageColors - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_messageColors; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_messageColors; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_messageColors,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_standardColors_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_standardColors; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_standardColors - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_standardColors; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_standardColors - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_standardColors; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_standardColors - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_standardColors; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_standardColors; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_standardColors,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_privmsg_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_privmsg; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_privmsg; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_privmsg; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_privmsg + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_privmsg; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_privmsg + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_privmsg; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_privmsg + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_privmsg; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_privmsg; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_privmsg, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_timestamp_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_timestamp; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_timestamp; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_timestamp; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_timestamp; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_timestamp; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_timestamp + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_timestamp; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_timestamp + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_timestamp; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_timestamp + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_timestamp; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_timestamp; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_timestamp, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_messageColors_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_messageColors; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_messageColors; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_messageColors; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_messageColors; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_messageColors; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_messageColors + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_messageColors; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_messageColors + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_messageColors; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_messageColors + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_messageColors; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_messageColors; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_messageColors, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_standardColors_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_standardColors; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_standardColors; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_standardColors; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_standardColors; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_standardColors; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_standardColors + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_standardColors; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_standardColors + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_standardColors; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_standardColors + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_standardColors; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_standardColors; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_standardColors, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_notifierLook_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_notifierLook; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_notifierLook; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_notifierLook; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_notifierLook; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_notifierLook; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifierLook +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifierLook e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_notifierLook; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifierLook +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifierLook e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_notifierLook; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifierLook +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifierLook e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_notifierLook; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_notifierLook; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifierLook,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_notifierLook, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3077,34 +3074,34 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_servers; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_servers; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_servers +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_servers e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_servers; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_servers +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_servers e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_servers; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_servers +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_servers e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_servers; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_servers; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_servers,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_servers, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3113,34 +3110,34 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_theme; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_theme; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_theme +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_theme e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_theme; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_theme +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_theme e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_theme; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_theme +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_theme e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_theme; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_theme; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_theme,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_theme, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3149,34 +3146,34 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_themeTransparency; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeTransparency; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeTransparency; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeTransparency; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeTransparency; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeTransparency +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeTransparency e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeTransparency; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeTransparency +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeTransparency e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeTransparency; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeTransparency +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeTransparency e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeTransparency; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_themeTransparency; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeTransparency,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeTransparency, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3185,34 +3182,34 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_themeToolBarApplets; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_themeToolBarApplets; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_themeToolBarApplets; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_themeToolBarApplets; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_themeToolBarApplets; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeToolBarApplets +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeToolBarApplets e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_themeToolBarApplets; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeToolBarApplets +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeToolBarApplets e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_themeToolBarApplets; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeToolBarApplets +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeToolBarApplets e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_themeToolBarApplets; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_themeToolBarApplets; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeToolBarApplets,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_themeToolBarApplets, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3221,34 +3218,34 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_topicLabel; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_topicLabel; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_topicLabel; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_topicLabel; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_topicLabel +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_topicLabel e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_topicLabel; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_topicLabel +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_topicLabel e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_topicLabel; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_topicLabel +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_topicLabel e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_topicLabel; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_topicLabel; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_topicLabel,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_topicLabel, "options"); m_pInstanceTree->append(e0); e0->pChildList = 0; @@ -3257,403 +3254,402 @@ OptionsInstanceManager::OptionsInstanceManager() e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_userList; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userList; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userList; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userList; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userList; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userList +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userList e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userList; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userList +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userList e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userList; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userList +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userList e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userList; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_userList; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userList,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userList, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_userListBackground; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListBackground - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListBackground; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListBackground - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListBackground; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_userListBackground; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListBackground,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_userListForeground; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListForeground - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListForeground; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListForeground - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListForeground; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListForeground - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListForeground; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_userListForeground; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListForeground,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_userListGrid; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListGrid - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListGrid; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListGrid - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListGrid; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListGrid - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListGrid; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_userListGrid; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListGrid,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_userListFeatures; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListFeatures - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListFeatures; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListFeatures - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListFeatures; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListFeatures - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListFeatures; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_userListFeatures; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListFeatures,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_userListBackground_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_userListBackground; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListBackground; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListBackground; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListBackground; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListBackground; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListBackground + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListBackground; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListBackground + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListBackground; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_userListBackground; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListBackground, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_userListForeground_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_userListForeground; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListForeground; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListForeground; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListForeground; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListForeground + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListForeground; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListForeground + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListForeground; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListForeground + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListForeground; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_userListForeground; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListForeground, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_userListGrid_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_userListGrid; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListGrid; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListGrid; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListGrid; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListGrid + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListGrid; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListGrid + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListGrid; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListGrid + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListGrid; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_userListGrid; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListGrid, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_userListFeatures_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_userListFeatures; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_userListFeatures; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListFeatures; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_userListFeatures; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_userListFeatures; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListFeatures + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_userListFeatures; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListFeatures + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_userListFeatures; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListFeatures + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_userListFeatures; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_userListFeatures; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_userListFeatures, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; e0 = new OptionsWidgetInstanceEntry; e0->createProc = &classOptionsWidget_windowList_createInstanceProc; e0->pWidget = 0; e0->szClassName = g_szClassName_OptionsWidget_windowList; e0->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList e0->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowList; - #else +#else e0->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowList; - #else +#else e0->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList; - #endif - e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowList +#endif + e0->szKeywords = __tr2qs_ctx_no_xgettext(e0->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowList e0->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowList; - #else +#else e0->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowList +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowList e0->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowList; - #else +#else e0->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowList +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowList e0->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowList; - #else +#else e0->bIsNotContained = false; - #endif +#endif e0->szNameNoLocale = g_szName_OptionsWidget_windowList; - e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowList,"options"); + e0->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowList, "options"); m_pInstanceTree->append(e0); e0->pChildList = new KviPointerList; e0->pChildList->setAutoDelete(true); - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_windowListTree; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTree - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTree; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTree - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTree; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTree - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTree; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_windowListTree; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTree,"options"); - e0->pChildList->append(e1); - - e1->pChildList = new KviPointerList; - e1->pChildList->setAutoDelete(true); - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeForeground - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeForeground; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeForeground - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeForeground; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeForeground - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeForeground; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeForeground - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeForeground; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeForeground; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeForeground,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeBackground - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeBackground; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeBackground - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeBackground; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeBackground - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeBackground; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeBackground - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeBackground; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeBackground; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeBackground,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e2 = new OptionsWidgetInstanceEntry; - e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc; - e2->pWidget = 0; - e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures; - e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures - e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures; - #else - e2->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeFeatures - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeFeatures; - #else - e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeFeatures; - #endif - e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeFeatures - e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeFeatures; - #else - e2->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeFeatures - e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeFeatures; - #else - e2->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeFeatures - e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeFeatures; - #else - e2->bIsNotContained = false; - #endif - e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeFeatures; - e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeFeatures,"options"); - e1->pChildList->append(e2); - e2->pChildList = 0; - - e1 = new OptionsWidgetInstanceEntry; - e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc; - e1->pWidget = 0; - e1->szClassName = g_szClassName_OptionsWidget_windowListClassic; - e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic; - #ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic - e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic; - #else - e1->iPriority = 0; - #endif - #ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic; - #else - e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic; - #endif - e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(),"options"); - #ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListClassic - e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListClassic; - #else - e1->szGroup = "general"; - #endif - #ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListClassic - e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListClassic; - #else - e1->bIsContainer = false; - #endif - #ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListClassic - e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListClassic; - #else - e1->bIsNotContained = false; - #endif - e1->szNameNoLocale = g_szName_OptionsWidget_windowListClassic; - e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListClassic,"options"); - e0->pChildList->append(e1); - e1->pChildList = 0; - + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_windowListTree_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_windowListTree; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTree; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTree; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTree; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTree; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTree + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTree; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTree + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTree; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTree + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTree; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_windowListTree; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTree, "options"); + e0->pChildList->append(e1); + + e1->pChildList = new KviPointerList; + e1->pChildList->setAutoDelete(true); + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_windowListTreeForeground_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_windowListTreeForeground; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeForeground; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeForeground; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeForeground + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeForeground; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeForeground; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeForeground + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeForeground; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeForeground + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeForeground; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeForeground + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeForeground; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeForeground; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeForeground, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_windowListTreeBackground_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_windowListTreeBackground; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeBackground; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeBackground; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeBackground + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeBackground; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeBackground; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeBackground + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeBackground; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeBackground + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeBackground; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeBackground + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeBackground; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeBackground; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeBackground, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e2 = new OptionsWidgetInstanceEntry; + e2->createProc = &classOptionsWidget_windowListTreeFeatures_createInstanceProc; + e2->pWidget = 0; + e2->szClassName = g_szClassName_OptionsWidget_windowListTreeFeatures; + e2->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListTreeFeatures; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures + e2->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListTreeFeatures; +#else + e2->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeFeatures + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeFeatures "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListTreeFeatures; +#else + e2->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListTreeFeatures; +#endif + e2->szKeywords = __tr2qs_ctx_no_xgettext(e2->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeFeatures + e2->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListTreeFeatures; +#else + e2->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeFeatures + e2->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListTreeFeatures; +#else + e2->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeFeatures + e2->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListTreeFeatures; +#else + e2->bIsNotContained = false; +#endif + e2->szNameNoLocale = g_szName_OptionsWidget_windowListTreeFeatures; + e2->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListTreeFeatures, "options"); + e1->pChildList->append(e2); + e2->pChildList = 0; + + e1 = new OptionsWidgetInstanceEntry; + e1->createProc = &classOptionsWidget_windowListClassic_createInstanceProc; + e1->pWidget = 0; + e1->szClassName = g_szClassName_OptionsWidget_windowListClassic; + e1->eIcon = KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowListClassic; +#ifdef KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic + e1->iPriority = KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_windowListClassic; +#else + e1->iPriority = 0; +#endif +#ifdef KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic "," KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_windowListClassic; +#else + e1->szKeywordsNoLocale = KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowListClassic; +#endif + e1->szKeywords = __tr2qs_ctx_no_xgettext(e1->szKeywordsNoLocale.toUtf8().data(), "options"); +#ifdef KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListClassic + e1->szGroup = KVI_OPTIONS_WIDGET_GROUP_OptionsWidget_windowListClassic; +#else + e1->szGroup = "general"; +#endif +#ifdef KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListClassic + e1->bIsContainer = KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_windowListClassic; +#else + e1->bIsContainer = false; +#endif +#ifdef KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListClassic + e1->bIsNotContained = KVI_OPTIONS_WIDGET_NOTCONTAINED_OptionsWidget_windowListClassic; +#else + e1->bIsNotContained = false; +#endif + e1->szNameNoLocale = g_szName_OptionsWidget_windowListClassic; + e1->szName = __tr2qs_ctx_no_xgettext(g_szName_OptionsWidget_windowListClassic, "options"); + e0->pChildList->append(e1); + e1->pChildList = 0; } void OptionsInstanceManager::deleteInstanceTree(KviPointerList * pList) @@ -3666,10 +3662,12 @@ void OptionsInstanceManager::deleteInstanceTree(KviPointerListpWidget->parent()->inherits("OptionsWidgetContainer")) { - disconnect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + disconnect(pEntry->pWidget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed())); delete pEntry->pWidget->parent(); - pEntry->pWidget = 0; - } else { + pEntry->pWidget = 0; + } + else + { qDebug("Ops...i have deleted the options dialog ?"); } } //else qDebug("Class %s has no widget",e->szName); @@ -3694,12 +3692,11 @@ void OptionsInstanceManager::cleanup(KviModule *) void OptionsInstanceManager::widgetDestroyed() { - OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(),m_pInstanceTree); + OptionsWidgetInstanceEntry * pEntry = findInstanceEntry(sender(), m_pInstanceTree); if(pEntry) pEntry->pWidget = 0; if(g_iOptionWidgetInstances > 0) g_iOptionWidgetInstances--; - } KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar) @@ -3724,7 +3721,7 @@ KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntr { pEntry->pWidget = pEntry->createProc(pPar); g_iOptionWidgetInstances++; - connect(pEntry->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + connect(pEntry->pWidget, SIGNAL(destroyed()), this, SLOT(widgetDestroyed())); } if(pEntry->pWidget->parent() != pPar) @@ -3759,14 +3756,14 @@ KviOptionsWidget * OptionsInstanceManager::getInstance(OptionsWidgetInstanceEntr iIdx++; pEntry3 = tmpList.next(); } - tmpList.insert(iIdx,pEntry2); + tmpList.insert(iIdx, pEntry2); } } for(OptionsWidgetInstanceEntry * pEntry4 = tmpList.last(); pEntry4; pEntry4 = tmpList.prev()) { - KviOptionsWidget * pOpt = getInstance(pEntry4,pEntry->pWidget->tabWidget()); - pEntry->pWidget->addOptionsWidget(pEntry4->szName,*(g_pIconManager->getSmallIcon(pEntry4->eIcon)),pOpt); + KviOptionsWidget * pOpt = getInstance(pEntry4, pEntry->pWidget->tabWidget()); + pEntry->pWidget->addOptionsWidget(pEntry4->szName, *(g_pIconManager->getSmallIcon(pEntry4->eIcon)), pOpt); } } } @@ -3783,7 +3780,7 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const QOb return pEntry; if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pObj,pEntry->pChildList); + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pObj, pEntry->pChildList); if(pEntry2) return pEntry2; } @@ -3798,11 +3795,11 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha { for(OptionsWidgetInstanceEntry * pEntry = pList->first(); pEntry; pEntry = pList->next()) { - if(kvi_strEqualCI(pEntry->szClassName,pcName)) + if(kvi_strEqualCI(pEntry->szClassName, pcName)) return pEntry; if(pEntry->pChildList) { - OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pcName,pEntry->pChildList); + OptionsWidgetInstanceEntry * pEntry2 = findInstanceEntry(pcName, pEntry->pChildList); if(pEntry2) return pEntry2; } @@ -3813,5 +3810,5 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const char * pcName) { - return findInstanceEntry(pcName,m_pInstanceTree); + return findInstanceEntry(pcName, m_pInstanceTree); } diff --git a/src/modules/options/OptionsInstanceManager.h b/src/modules/options/OptionsInstanceManager.h index 7b68c333b..6f52d928d 100644 --- a/src/modules/options/OptionsInstanceManager.h +++ b/src/modules/options/OptionsInstanceManager.h @@ -41,39 +41,40 @@ typedef struct _OptionsWidgetInstanceEntry OptionsWidgetInstanceEntry; - typedef struct _OptionsWidgetInstanceEntry { - KviOptionsWidget * (*createProc)(QWidget *); - KviOptionsWidget * pWidget; // singleton - KviIconManager::SmallIcon eIcon; - QString szName; - QString szNameNoLocale; - const char * szClassName; - int iPriority; - QString szKeywords; - QString szKeywordsNoLocale; - QString szGroup; - bool bIsContainer; - bool bIsNotContained; + KviOptionsWidget * (*createProc)(QWidget *); + KviOptionsWidget * pWidget; // singleton + KviIconManager::SmallIcon eIcon; + QString szName; + QString szNameNoLocale; + const char * szClassName; + int iPriority; + QString szKeywords; + QString szKeywordsNoLocale; + QString szGroup; + bool bIsContainer; + bool bIsNotContained; KviPointerList * pChildList; - bool bDoInsert; // a helper for OptionsDialog::fillListView() + bool bDoInsert; // a helper for OptionsDialog::fillListView() } OptionsWidgetInstanceEntry; - class OptionsInstanceManager : public QObject { Q_OBJECT public: OptionsInstanceManager(); virtual ~OptionsInstanceManager(); + protected: KviPointerList * m_pInstanceTree; + public: - KviPointerList * instanceEntryTree(){ return m_pInstanceTree; }; + KviPointerList * instanceEntryTree() { return m_pInstanceTree; }; KviOptionsWidget * getInstance(OptionsWidgetInstanceEntry * pEntry, QWidget * pPar); OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName); void cleanup(KviModule *); + protected: OptionsWidgetInstanceEntry * findInstanceEntry(const char * pcName, KviPointerList * pList); OptionsWidgetInstanceEntry * findInstanceEntry(const QObject * pObj, KviPointerList * pList); diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 68cdd96bf..5b891fb8e 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -39,11 +39,10 @@ #include #include - extern OptionsInstanceManager * g_pOptionsInstanceManager; -OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par,bool bModal) -: QDialog(par) +OptionsWidgetContainer::OptionsWidgetContainer(QWidget * par, bool bModal) + : QDialog(par) { m_pLayout = new QGridLayout(this); @@ -65,14 +64,14 @@ void OptionsWidgetContainer::setLeftCornerWidget(QWidget * pWidget) { if(!pWidget) return; - m_pLayout->addWidget(pWidget,1,0); + m_pLayout->addWidget(pWidget, 1, 0); } void OptionsWidgetContainer::setNextToLeft(QWidget * pWidget) { if(!pWidget) return; - m_pLayout->addWidget(pWidget,2,0); + m_pLayout->addWidget(pWidget, 2, 0); } void OptionsWidgetContainer::optionsWidgetDestroyed() @@ -89,7 +88,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e) { if(e->child() == static_cast(m_pOptionsWidget)) { - QObject::disconnect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed())); + QObject::disconnect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed())); m_pOptionsWidget = NULL; } } @@ -100,28 +99,27 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e) void OptionsWidgetContainer::setup(KviOptionsWidget * w) { if(m_pOptionsWidget) - QObject::disconnect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed())); + QObject::disconnect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed())); - m_pLayout->addWidget(w,0,0,1,3); + m_pLayout->addWidget(w, 0, 0, 1, 3); //g->addMultiCellWidget(w,0,0,0,2); - QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); - KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); + QPushButton * b = new QPushButton(__tr2qs_ctx("&OK", "options"), this); + KviTalToolTip::add(b, __tr2qs_ctx("Close this dialog, accepting all changes.", "options")); //b->setMinimumWidth(m_pCancel->sizeHint().width()); - m_pLayout->addWidget(b,1,1); + m_pLayout->addWidget(b, 1, 1); b->setDefault(true); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + connect(b, SIGNAL(clicked()), this, SLOT(okClicked())); b->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Accept))); - m_pCancel = new QPushButton(__tr2qs_ctx("Cancel","options"),this); - KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); - m_pLayout->addWidget(m_pCancel,1,2); - connect(m_pCancel,SIGNAL(clicked()),this,SLOT(cancelClicked())); + m_pCancel = new QPushButton(__tr2qs_ctx("Cancel", "options"), this); + KviTalToolTip::add(m_pCancel, __tr2qs_ctx("Close this dialog, discarding all changes.", "options")); + m_pLayout->addWidget(m_pCancel, 1, 2); + connect(m_pCancel, SIGNAL(clicked()), this, SLOT(cancelClicked())); m_pCancel->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Discard))); - - m_pLayout->setRowStretch(0,1); - m_pLayout->setColumnStretch(0,1); + m_pLayout->setRowStretch(0, 1); + m_pLayout->setColumnStretch(0, 1); OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className()); if(e) @@ -133,21 +131,21 @@ void OptionsWidgetContainer::setup(KviOptionsWidget * w) m_pOptionsWidget = w; if(m_pOptionsWidget) - QObject::connect(m_pOptionsWidget,SIGNAL(destroyed()),this,SLOT(optionsWidgetDestroyed())); + QObject::connect(m_pOptionsWidget, SIGNAL(destroyed()), this, SLOT(optionsWidgetDestroyed())); } -void OptionsWidgetContainer::closeEvent(QCloseEvent *e) +void OptionsWidgetContainer::closeEvent(QCloseEvent * e) { e->ignore(); cancelClicked(); } -void OptionsWidgetContainer::showEvent(QShowEvent *e) +void OptionsWidgetContainer::showEvent(QShowEvent * e) { if(!parent()) { QRect rect = g_pApp->desktop()->screenGeometry(g_pMainWindow); - move(rect.x() + ((rect.width() - width())/2),rect.y() + ((rect.height() - height())/2)); + move(rect.x() + ((rect.width() - width()) / 2), rect.y() + ((rect.height() - height()) / 2)); } QWidget::showEvent(e); diff --git a/src/modules/options/OptionsWidgetContainer.h b/src/modules/options/OptionsWidgetContainer.h index d733a9b23..5f26c2f5d 100644 --- a/src/modules/options/OptionsWidgetContainer.h +++ b/src/modules/options/OptionsWidgetContainer.h @@ -35,19 +35,22 @@ class OptionsWidgetContainer : public QDialog { Q_OBJECT public: - OptionsWidgetContainer(QWidget * par,bool bModal = false); + OptionsWidgetContainer(QWidget * par, bool bModal = false); ~OptionsWidgetContainer(); + protected: KviOptionsWidget * m_pOptionsWidget; - QPushButton * m_pCancel; - QGridLayout * m_pLayout; + QPushButton * m_pCancel; + QGridLayout * m_pLayout; + public: void setup(KviOptionsWidget * w); void setLeftCornerWidget(QWidget * pWidget); void setNextToLeft(QWidget * pWidget); + protected: - virtual void closeEvent(QCloseEvent *e); - virtual void showEvent(QShowEvent *e); + virtual void closeEvent(QCloseEvent * e); + virtual void showEvent(QShowEvent * e); virtual void childEvent(QChildEvent * e); virtual void reject(); protected slots: diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp index 0c03bf209..2d69b9c71 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp @@ -35,7 +35,7 @@ #include "KviTalToolTip.h" OptionsWidget_alertsAndHighlighting::OptionsWidget_alertsAndHighlighting(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("highlighting_options_widget"); } @@ -44,58 +44,57 @@ OptionsWidget_alertsAndHighlighting::~OptionsWidget_alertsAndHighlighting() { } - OptionsWidget_highlighting::OptionsWidget_highlighting(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("highlighting_options_widget"); createLayout(); - KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable word highlighting","options"),KviOption_boolUseWordHighlighting); - KviStringListSelector * sl = addStringListSelector(0,1,0,1,__tr2qs_ctx("Words to Highlight","options"),KviOption_stringlistHighlightWords,KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)); + KviBoolSelector * b = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable word highlighting", "options"), KviOption_boolUseWordHighlighting); + KviStringListSelector * sl = addStringListSelector(0, 1, 0, 1, __tr2qs_ctx("Words to Highlight", "options"), KviOption_stringlistHighlightWords, KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)); - connect(b,SIGNAL(toggled(bool)),sl,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), sl, SLOT(setEnabled(bool))); // This can be used even without Word highlighting - b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick); - mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will highlight any user message containing your current nickname","options")); + b = addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Highlight messages containing my nickname", "options"), KviOption_boolAlwaysHighlightNick); + mergeTip(b, __tr2qs_ctx("If this option is enabled, KVIrc will highlight any user message containing your current nickname", "options")); - b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Words/Nick matching is case sensitive ","options"),KviOption_boolCaseSensitiveHighlighting); - mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will match your nick and/or the words you specified in a case sensitive manner","options")); + b = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Words/Nick matching is case sensitive ", "options"), KviOption_boolCaseSensitiveHighlighting); + mergeTip(b, __tr2qs_ctx("If this option is enabled, KVIrc will match your nick and/or the words you specified in a case sensitive manner", "options")); - KviTalGroupBox * gbox = addGroupBox(0,4,0,4,Qt::Horizontal,__tr2qs_ctx("Highlighting Method","options")); + KviTalGroupBox * gbox = addGroupBox(0, 4, 0, 4, Qt::Horizontal, __tr2qs_ctx("Highlighting Method", "options")); // note: KviTalGroupBox automatically deletes its previous layout on setLayout() // note2: every QWidget will take ownership of its layout. QGridLayout * g = new QGridLayout(); gbox->setLayout(g); - m_pHighlightAllOccurencesRadioButton = new QRadioButton(__tr2qs_ctx("Highlight every occurrence of a word inside text","options"),gbox); - g->addWidget(m_pHighlightAllOccurencesRadioButton,0,0,1,2); + m_pHighlightAllOccurencesRadioButton = new QRadioButton(__tr2qs_ctx("Highlight every occurrence of a word inside text", "options"), gbox); + g->addWidget(m_pHighlightAllOccurencesRadioButton, 0, 0, 1, 2); m_pHighlightAllOccurencesRadioButton->setChecked(KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)); - KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton,__tr2qs_ctx("This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (e.g. if your nickname is Mark then Markus will be highlighted too).","options")); + KviTalToolTip::add(m_pHighlightAllOccurencesRadioButton, __tr2qs_ctx("This selection will cause KVIrc to search for the highlighted words or nicknames inside the whole text. This will also highlight parts of words (e.g. if your nickname is Mark then Markus will be highlighted too).", "options")); - m_pHighlightWholeWordsOnlyRadioButton = new QRadioButton(__tr2qs_ctx("Highlight only whole words splitting on space and on:","options"),gbox); - g->addWidget(m_pHighlightWholeWordsOnlyRadioButton,1,0,1,1); + m_pHighlightWholeWordsOnlyRadioButton = new QRadioButton(__tr2qs_ctx("Highlight only whole words splitting on space and on:", "options"), gbox); + g->addWidget(m_pHighlightWholeWordsOnlyRadioButton, 1, 0, 1, 1); m_pHighlightWholeWordsOnlyRadioButton->setChecked(!KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)); - KviTalToolTip::add(m_pHighlightWholeWordsOnlyRadioButton,__tr2qs_ctx("This selection will first split the string on the specified boundaries (including space) and then will compare all the parts with the highlighted words.","options")); + KviTalToolTip::add(m_pHighlightWholeWordsOnlyRadioButton, __tr2qs_ctx("This selection will first split the string on the specified boundaries (including space) and then will compare all the parts with the highlighted words.", "options")); m_pWordSplitterCharactersEdit = new QLineEdit(gbox); m_pWordSplitterCharactersEdit->setText(KVI_OPTION_STRING(KviOption_stringWordSplitters)); m_pWordSplitterCharactersEdit->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseFullWordHighlighting)); - g->addWidget(m_pWordSplitterCharactersEdit,1,1,1,1); + g->addWidget(m_pWordSplitterCharactersEdit, 1, 1, 1, 1); - connect(m_pHighlightWholeWordsOnlyRadioButton,SIGNAL(toggled(bool)),m_pWordSplitterCharactersEdit,SLOT(setEnabled(bool))); + connect(m_pHighlightWholeWordsOnlyRadioButton, SIGNAL(toggled(bool)), m_pWordSplitterCharactersEdit, SLOT(setEnabled(bool))); - gbox = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Alert Options","options")); + gbox = addGroupBox(0, 5, 0, 5, Qt::Horizontal, __tr2qs_ctx("Alert Options", "options")); - b = addBoolSelector(gbox,__tr2qs_ctx("Flash the system taskbar entry on highlighted messages","options"),KviOption_boolFlashWindowOnHighlightedMessages); - mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will (attempt to) flash the system taskbar entry when a highlighted message is printed and KVIrc is not the active window","options")); - b = addBoolSelector(gbox,__tr2qs_ctx("Popup the notifier window on highlighted messages","options"),KviOption_boolPopupNotifierOnHighlightedMessages); - mergeTip(b,__tr2qs_ctx("If this option is enabled, KVIrc will popup a little notifier window in the low right corner of your desktop when a highlighted message is printed and KVIrc is not the active window","options")); + b = addBoolSelector(gbox, __tr2qs_ctx("Flash the system taskbar entry on highlighted messages", "options"), KviOption_boolFlashWindowOnHighlightedMessages); + mergeTip(b, __tr2qs_ctx("If this option is enabled, KVIrc will (attempt to) flash the system taskbar entry when a highlighted message is printed and KVIrc is not the active window", "options")); + b = addBoolSelector(gbox, __tr2qs_ctx("Popup the notifier window on highlighted messages", "options"), KviOption_boolPopupNotifierOnHighlightedMessages); + mergeTip(b, __tr2qs_ctx("If this option is enabled, KVIrc will popup a little notifier window in the low right corner of your desktop when a highlighted message is printed and KVIrc is not the active window", "options")); - addRowSpacer(0,6,0,6); + addRowSpacer(0, 6, 0, 6); } OptionsWidget_highlighting::~OptionsWidget_highlighting() @@ -110,42 +109,38 @@ void OptionsWidget_highlighting::commit() KviOptionsWidget::commit(); } - - OptionsWidget_alerts::OptionsWidget_alerts(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("highlighting_options_widget"); createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Alert Restrictions","options")); - KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg); - mergeTip(b3, __tr2qs_ctx("If this option is enabled, KVIrc will alert in the window list only if a normal message is received in a channel.
Actions like joins, parts and mode changes will be ignored.
This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.","options")); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Alert Restrictions", "options")); + KviBoolSelector * b3 = addBoolSelector(g, __tr2qs_ctx("Restrict alert", "options"), KviOption_boolHighlightOnlyNormalMsg); + mergeTip(b3, __tr2qs_ctx("If this option is enabled, KVIrc will alert in the window list only if a normal message is received in a channel.
Actions like joins, parts and mode changes will be ignored.
This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.", "options")); - KviBoolSelector * b4 = addBoolSelector(g,__tr2qs_ctx("Alert for highlighted words","options"),KviOption_boolHighlightOnlyNormalMsgHighlightInChanToo,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg)); - mergeTip(b4, __tr2qs_ctx("If this option is enabled, the window list will also alert for messages which contain a word from the highlighted words list above.","options")); + KviBoolSelector * b4 = addBoolSelector(g, __tr2qs_ctx("Alert for highlighted words", "options"), KviOption_boolHighlightOnlyNormalMsgHighlightInChanToo, KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg)); + mergeTip(b4, __tr2qs_ctx("If this option is enabled, the window list will also alert for messages which contain a word from the highlighted words list above.", "options")); - KviBoolSelector * b5 = addBoolSelector(g,__tr2qs_ctx("Alert for query messages","options"),KviOption_boolHighlightOnlyNormalMsgQueryToo,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg)); - mergeTip(b5, __tr2qs_ctx("If this option is enabled, the window list will also alert for messages which are shown in queries.","options")); - connect(b3,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool))); - connect(b3,SIGNAL(toggled(bool)),b5,SLOT(setEnabled(bool))); + KviBoolSelector * b5 = addBoolSelector(g, __tr2qs_ctx("Alert for query messages", "options"), KviOption_boolHighlightOnlyNormalMsgQueryToo, KVI_OPTION_BOOL(KviOption_boolHighlightOnlyNormalMsg)); + mergeTip(b5, __tr2qs_ctx("If this option is enabled, the window list will also alert for messages which are shown in queries.", "options")); + connect(b3, SIGNAL(toggled(bool)), b4, SLOT(setEnabled(bool))); + connect(b3, SIGNAL(toggled(bool)), b5, SLOT(setEnabled(bool))); - KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel); - mergeTip(b6, __tr2qs_ctx("If this option is enabled, KVIrc will alert in the window list only if the specified alert level is reached.","options")); + KviBoolSelector * b6 = addBoolSelector(g, __tr2qs_ctx("Use custom alert level", "options"), KviOption_boolHighlightOnlyAtCostumHighlightLevel); + mergeTip(b6, __tr2qs_ctx("If this option is enabled, KVIrc will alert in the window list only if the specified alert level is reached.", "options")); - KviUIntSelector * b7 = addUIntSelector(g,__tr2qs_ctx("Minimum alert level:","options"),KviOption_uintMinHighlightLevel,1,KVI_MSGTYPE_MAXLEVEL,KVI_MSGTYPE_MAXLEVEL,KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel)); + KviUIntSelector * b7 = addUIntSelector(g, __tr2qs_ctx("Minimum alert level:", "options"), KviOption_uintMinHighlightLevel, 1, KVI_MSGTYPE_MAXLEVEL, KVI_MSGTYPE_MAXLEVEL, KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel)); b7->setEnabled(KVI_OPTION_BOOL(KviOption_boolHighlightOnlyAtCostumHighlightLevel)); - mergeTip(b7, __tr2qs_ctx("This option sets the minimum alert level for the window list.","options")); - connect(b6,SIGNAL(toggled(bool)),b7,SLOT(setEnabled(bool))); + mergeTip(b7, __tr2qs_ctx("This option sets the minimum alert level for the window list.", "options")); + connect(b6, SIGNAL(toggled(bool)), b7, SLOT(setEnabled(bool))); - addRowSpacer(0,1,0,1); + addRowSpacer(0, 1, 0, 1); } OptionsWidget_alerts::~OptionsWidget_alerts() { } - - #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h index c7e45a724..12b581acc 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.h +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h @@ -42,7 +42,6 @@ public: ~OptionsWidget_alertsAndHighlighting(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_highlighting KviIconManager::QueryTrace #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_highlighting __tr2qs_no_lookup("Highlight") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_highlighting OptionsWidget_alertsAndHighlighting @@ -53,6 +52,7 @@ class OptionsWidget_highlighting : public KviOptionsWidget public: OptionsWidget_highlighting(QWidget * parent); ~OptionsWidget_highlighting(); + private: QRadioButton * m_pHighlightAllOccurencesRadioButton; QRadioButton * m_pHighlightWholeWordsOnlyRadioButton; @@ -60,10 +60,8 @@ private: protected: virtual void commit(); - }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_alerts KviIconManager::Warning #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_alerts __tr2qs_no_lookup("Window List Alert") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_alerts OptionsWidget_alertsAndHighlighting @@ -76,5 +74,4 @@ public: ~OptionsWidget_alerts(); }; - #endif //_OPTW_HIGHLIGHTING_H_ diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp index 57decd756..8ce261fe4 100644 --- a/src/modules/options/OptionsWidget_antiSpam.cpp +++ b/src/modules/options/OptionsWidget_antiSpam.cpp @@ -31,23 +31,23 @@ #include OptionsWidget_antispam::OptionsWidget_antispam(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("antispam_options_widget"); createLayout(); - KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Enable Anti-spam for","options")); - m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg); - connect(m_b1,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool))); - m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice); - connect(m_b2,SIGNAL(toggled(bool)),this,SLOT(reenableStuff(bool))); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Enable Anti-spam for", "options")); + m_b1 = addBoolSelector(g, __tr2qs_ctx("Private messages", "options"), KviOption_boolUseAntiSpamOnPrivmsg); + connect(m_b1, SIGNAL(toggled(bool)), this, SLOT(reenableStuff(bool))); + m_b2 = addBoolSelector(g, __tr2qs_ctx("Private notices", "options"), KviOption_boolUseAntiSpamOnNotice); + connect(m_b2, SIGNAL(toggled(bool)), this, SLOT(reenableStuff(bool))); - m_b3 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Silent anti-spam (no warnings)","options"),KviOption_boolSilentAntiSpam); - m_sl = addStringListSelector(0,2,0,2,__tr2qs_ctx("Words considered spam:","options"),KviOption_stringlistSpamWords); + m_b3 = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Silent anti-spam (no warnings)", "options"), KviOption_boolSilentAntiSpam); + m_sl = addStringListSelector(0, 2, 0, 2, __tr2qs_ctx("Words considered spam:", "options"), KviOption_stringlistSpamWords); reenableStuff(true); - layout()->setRowStretch(2,1); + layout()->setRowStretch(2, 1); } OptionsWidget_antispam::~OptionsWidget_antispam() diff --git a/src/modules/options/OptionsWidget_antiSpam.h b/src/modules/options/OptionsWidget_antiSpam.h index 51a65c695..04817690a 100644 --- a/src/modules/options/OptionsWidget_antiSpam.h +++ b/src/modules/options/OptionsWidget_antiSpam.h @@ -36,6 +36,7 @@ class OptionsWidget_antispam : public KviOptionsWidget public: OptionsWidget_antispam(QWidget * parent); ~OptionsWidget_antispam(); + protected: KviBoolSelector * m_b1; KviBoolSelector * m_b2; @@ -45,5 +46,4 @@ protected slots: void reenableStuff(bool); }; - #endif //_OPTW_ANTISPAM_H_ diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp index c3865c72a..3766e6498 100644 --- a/src/modules/options/OptionsWidget_avatar.cpp +++ b/src/modules/options/OptionsWidget_avatar.cpp @@ -29,9 +29,8 @@ #include "KviOptions.h" #include "KviTalToolTip.h" - OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("avatar_advanced_options_widget"); createLayout(); @@ -39,72 +38,79 @@ OptionsWidget_avatar::OptionsWidget_avatar(QWidget * parent) KviTalGroupBox * g; KviBoolSelector * b; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Scaling in Userlist","options")); - b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images in userlist (recommended)","options"),KviOption_boolScaleAvatars); - mergeTip(b,__tr2qs_ctx("This option will force KVIrc to scale avatars" \ - " shown in the userlist.
" \ - "Avatars will be scaled to fit the " \ - "constraints set below. Better keep this option on.","options")); - - addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotUpscaleAvatars); - - KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Scaling on Load and in User Tooltips","options")); - b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad); - - u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - KviTalGroupBox *gs = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Request CTCP","options")); - KviBoolSelector * bs = addBoolSelector(g,__tr2qs_ctx("Request missing avatars","options"),KviOption_boolRequestMissingAvatars); - mergeTip(bs,__tr2qs_ctx("This option will cause KVIrc to send a DCC GET request " \ - "when someone sets an avatar and there is no cached copy available.","options")); - - KviUIntSelector * us = addUIntSelector(g,__tr2qs_ctx("Maximum requested file size:","options"),KviOption_uintMaximumRequestedAvatarSize,0,1048576,102400, - KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars)); - us->setSuffix(__tr2qs_ctx(" bytes","options")); - mergeTip(us,__tr2qs_ctx("This is the maximum size for avatar images that " \ - "will be automatically requested.
" \ - "A reasonable value might be 102400 bytes (100 K).","options")); - - connect(bs,SIGNAL(toggled(bool)),us,SLOT(setEnabled(bool))); - - bs = addBoolSelector(gs,__tr2qs_ctx("Automatically accept incoming avatars","options"),KviOption_boolAutoAcceptIncomingAvatars); - mergeTip(bs,__tr2qs_ctx("This option will cause KVIrc to auto-accept " \ - "DCC SEND requests for incoming avatars.
" \ - "If you're using the \"Request missing avatars\" option " \ - "above, enabling this may by useful.
" \ - "Avatars will be saved in the local KVIrc directory.","options")); - - bs = addBoolSelector(gs,__tr2qs_ctx("Remember avatars for registered users","options"),KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers); - mergeTip(bs,__tr2qs_ctx("Use a user's last known avatar by default " \ - "(only for users that are registered).","options")); - - us = addUIntSelector(gs,__tr2qs_ctx("Avatar offer timeout:","options"),KviOption_uintAvatarOfferTimeoutInSecs,1,99999,60); - us->setSuffix(__tr2qs_ctx(" sec","options")); - mergeTip(us,__tr2qs_ctx("This is the amount of time to make an avatar available for transfer when requested.
" \ - "When someone sends a CTCP AVATAR request, " \ - "KVIrc will reply with a CTCP AVATAR message containing the name and size " \ - "of your avatar image.
" \ - "A time-limited file offer is added for the image file " \ - "to the requesting user.","options")); - - bs = addBoolSelector(gs,__tr2qs_ctx("Ignore requests if no avatar is set","options"),KviOption_boolIgnoreChannelAvatarRequestsWhenNoAvatarSet); - mergeTip(bs,__tr2qs_ctx("This option will cause KVIrc to ignore channel CTCP AVATAR requests " \ - "when you have no avatar set. This is usually a good practice since " \ - "it helps in reducing traffic by not sending a reply that would be empty.","options")); - - addRowSpacer(0,3,0,3); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Scaling in Userlist", "options")); + b = addBoolSelector(g, __tr2qs_ctx("Scale avatar images in userlist (recommended)", "options"), KviOption_boolScaleAvatars); + mergeTip(b, __tr2qs_ctx("This option will force KVIrc to scale avatars" + " shown in the userlist.
" + "Avatars will be scaled to fit the " + "constraints set below. Better keep this option on.", + "options")); + + addBoolSelector(g, __tr2qs_ctx("Do not scale avatar if it is less than required size", "options"), KviOption_boolDoNotUpscaleAvatars); + + KviUIntSelector * u = addUIntSelector(g, __tr2qs_ctx("Image width:", "options"), KviOption_uintAvatarScaleWidth, 0, 512, 80, KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + u = addUIntSelector(g, __tr2qs_ctx("Image height:", "options"), KviOption_uintAvatarScaleHeight, 0, 512, 80, KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Scaling on Load and in User Tooltips", "options")); + b = addBoolSelector(g, __tr2qs_ctx("Scale avatar images on image load", "options"), KviOption_boolScaleAvatarsOnLoad); + + u = addUIntSelector(g, __tr2qs_ctx("Image width:", "options"), KviOption_uintScaleAvatarsOnLoadWidth, 0, 1280, 80, KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + u = addUIntSelector(g, __tr2qs_ctx("Image height:", "options"), KviOption_uintScaleAvatarsOnLoadHeight, 0, 1280, 80, KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + KviTalGroupBox * gs = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Request CTCP", "options")); + KviBoolSelector * bs = addBoolSelector(g, __tr2qs_ctx("Request missing avatars", "options"), KviOption_boolRequestMissingAvatars); + mergeTip(bs, __tr2qs_ctx("This option will cause KVIrc to send a DCC GET request " + "when someone sets an avatar and there is no cached copy available.", + "options")); + + KviUIntSelector * us = addUIntSelector(g, __tr2qs_ctx("Maximum requested file size:", "options"), KviOption_uintMaximumRequestedAvatarSize, 0, 1048576, 102400, + KVI_OPTION_BOOL(KviOption_boolRequestMissingAvatars)); + us->setSuffix(__tr2qs_ctx(" bytes", "options")); + mergeTip(us, __tr2qs_ctx("This is the maximum size for avatar images that " + "will be automatically requested.
" + "A reasonable value might be 102400 bytes (100 K).", + "options")); + + connect(bs, SIGNAL(toggled(bool)), us, SLOT(setEnabled(bool))); + + bs = addBoolSelector(gs, __tr2qs_ctx("Automatically accept incoming avatars", "options"), KviOption_boolAutoAcceptIncomingAvatars); + mergeTip(bs, __tr2qs_ctx("This option will cause KVIrc to auto-accept " + "DCC SEND requests for incoming avatars.
" + "If you're using the \"Request missing avatars\" option " + "above, enabling this may by useful.
" + "Avatars will be saved in the local KVIrc directory.", + "options")); + + bs = addBoolSelector(gs, __tr2qs_ctx("Remember avatars for registered users", "options"), KviOption_boolSetLastAvatarAsDefaultForRegisteredUsers); + mergeTip(bs, __tr2qs_ctx("Use a user's last known avatar by default " + "(only for users that are registered).", + "options")); + + us = addUIntSelector(gs, __tr2qs_ctx("Avatar offer timeout:", "options"), KviOption_uintAvatarOfferTimeoutInSecs, 1, 99999, 60); + us->setSuffix(__tr2qs_ctx(" sec", "options")); + mergeTip(us, __tr2qs_ctx("This is the amount of time to make an avatar available for transfer when requested.
" + "When someone sends a CTCP AVATAR request, " + "KVIrc will reply with a CTCP AVATAR message containing the name and size " + "of your avatar image.
" + "A time-limited file offer is added for the image file " + "to the requesting user.", + "options")); + + bs = addBoolSelector(gs, __tr2qs_ctx("Ignore requests if no avatar is set", "options"), KviOption_boolIgnoreChannelAvatarRequestsWhenNoAvatarSet); + mergeTip(bs, __tr2qs_ctx("This option will cause KVIrc to ignore channel CTCP AVATAR requests " + "when you have no avatar set. This is usually a good practice since " + "it helps in reducing traffic by not sending a reply that would be empty.", + "options")); + + addRowSpacer(0, 3, 0, 3); } OptionsWidget_avatar::~OptionsWidget_avatar() diff --git a/src/modules/options/OptionsWidget_avatar.h b/src/modules/options/OptionsWidget_avatar.h index a5360a366..e0fabffca 100644 --- a/src/modules/options/OptionsWidget_avatar.h +++ b/src/modules/options/OptionsWidget_avatar.h @@ -27,7 +27,6 @@ #include "KviOptionsWidget.h" - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_avatar KviIconManager::Avatar #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_avatar __tr2qs_no_lookup("Avatars") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_avatar OptionsWidget_tools diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp index 3f9cc9b67..8f1879d12 100644 --- a/src/modules/options/OptionsWidget_away.cpp +++ b/src/modules/options/OptionsWidget_away.cpp @@ -30,29 +30,29 @@ #include OptionsWidget_away::OptionsWidget_away(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("away_options_widget"); createLayout(); - m_pEnableAwayMessage = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable default away message","options"), KviOption_boolUseAwayMessage); - connect(m_pEnableAwayMessage,SIGNAL(toggled(bool)),this,SLOT(enableAwayMessage(bool))); - m_pAwayMessage = addStringSelector(0,1,0,1, __tr2qs_ctx("Default away message:","options"), KviOption_stringAwayMessage, KVI_OPTION_BOOL(KviOption_boolUseAwayMessage)); + m_pEnableAwayMessage = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable default away message", "options"), KviOption_boolUseAwayMessage); + connect(m_pEnableAwayMessage, SIGNAL(toggled(bool)), this, SLOT(enableAwayMessage(bool))); + m_pAwayMessage = addStringSelector(0, 1, 0, 1, __tr2qs_ctx("Default away message:", "options"), KviOption_stringAwayMessage, KVI_OPTION_BOOL(KviOption_boolUseAwayMessage)); - addBoolSelector(0,2,0,2, __tr2qs_ctx("User input exits away mode","options"), KviOption_boolExitAwayOnInput); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("User input exits away mode", "options"), KviOption_boolExitAwayOnInput); - KviTalGroupBox *g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Away Nickname","options")); - m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); - connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); + KviTalGroupBox * g = addGroupBox(0, 3, 0, 3, Qt::Horizontal, __tr2qs_ctx("Away Nickname", "options")); + m_pEnableAwayNick = addBoolSelector(g, __tr2qs_ctx("Change nickname on away", "options"), KviOption_boolChangeNickAway); + connect(m_pEnableAwayNick, SIGNAL(toggled(bool)), this, SLOT(enableCustomAwayText(bool))); - m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway)); - connect(m_pEnableAwayNick,SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,SLOT(setEnabled(bool))); - connect(m_pEnableCustomAwayNick,SIGNAL(toggled(bool)),this,SLOT(enableCustomAwayText(bool))); + m_pEnableCustomAwayNick = addBoolSelector(g, __tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)", "options"), KviOption_boolAutoGeneratedAwayNick, KVI_OPTION_BOOL(KviOption_boolChangeNickAway)); + connect(m_pEnableAwayNick, SIGNAL(toggled(bool)), m_pEnableCustomAwayNick, SLOT(setEnabled(bool))); + connect(m_pEnableCustomAwayNick, SIGNAL(toggled(bool)), this, SLOT(enableCustomAwayText(bool))); - m_pCustomAwayNick = addStringSelector(g,__tr2qs_ctx("Custom nickname (%%nick%% means a current nick):","options"),KviOption_stringCustomAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick))); + m_pCustomAwayNick = addStringSelector(g, __tr2qs_ctx("Custom nickname (%%nick%% means a current nick):", "options"), KviOption_stringCustomAwayNick, KVI_OPTION_BOOL(KviOption_boolChangeNickAway) && !(KVI_OPTION_BOOL(KviOption_boolAutoGeneratedAwayNick))); - addRowSpacer(0,4,0,4); + addRowSpacer(0, 4, 0, 4); } OptionsWidget_away::~OptionsWidget_away() diff --git a/src/modules/options/OptionsWidget_away.h b/src/modules/options/OptionsWidget_away.h index 966165771..47de1d098 100644 --- a/src/modules/options/OptionsWidget_away.h +++ b/src/modules/options/OptionsWidget_away.h @@ -36,12 +36,13 @@ class OptionsWidget_away : public KviOptionsWidget public: OptionsWidget_away(QWidget * parent); ~OptionsWidget_away(); + protected: - KviBoolSelector * m_pEnableAwayMessage; - KviStringSelector * m_pAwayMessage; - KviBoolSelector * m_pEnableAwayNick; - KviStringSelector * m_pCustomAwayNick; - KviBoolSelector * m_pEnableCustomAwayNick; + KviBoolSelector * m_pEnableAwayMessage; + KviStringSelector * m_pAwayMessage; + KviBoolSelector * m_pEnableAwayNick; + KviStringSelector * m_pCustomAwayNick; + KviBoolSelector * m_pEnableCustomAwayNick; public slots: void enableCustomAwayText(bool); void enableAwayMessage(bool); diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index a521cb221..22da578b1 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -26,7 +26,6 @@ // //============================================================================= - #include "OptionsWidget_channel.h" #include "KviOptions.h" @@ -36,9 +35,8 @@ #include - OptionsWidget_channel::OptionsWidget_channel(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { } @@ -47,52 +45,56 @@ OptionsWidget_channel::~OptionsWidget_channel() } OptionsWidget_channelGeneral::OptionsWidget_channelGeneral(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { createLayout(); KviTalGroupBox * g; KviBoolSelector * b; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Channel Kick","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Rejoin channel","options"),KviOption_boolRejoinChannelOnKick); - mergeTip(b,__tr2qs_ctx("This option will cause KVIrc to attempt " \ - "to rejoin a channel after being kicked.","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnKick); - mergeTip(b,__tr2qs_ctx("This option will cause KVIrc to keep " \ - "the channel window open after being kicked.
" \ - "It might be a good idea to also enable the " \ - "\"Rejoin channel\" option.","options")); - - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Channel Part","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Keep channel open","options"),KviOption_boolKeepChannelOpenOnPart); - mergeTip(b,__tr2qs_ctx("This option will cause KVIrc to keep " \ - "the channel window open after leaving it.","options")); - - b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Automatically join channel on invite","options"),KviOption_boolAutoJoinOnInvite); - mergeTip(b,__tr2qs_ctx("This option will cause KVIrc to automatically " \ - "join a channel when an INVITE message for that channel is received.
" \ - "Warning: this may help spammers harass you.","options")); - - b = addBoolSelector(0,3,0,3, __tr2qs_ctx("Open channel windows without focus","options"),KviOption_boolCreateMinimizedChannels); - mergeTip(b,__tr2qs_ctx("This option prevents newly created " \ - "channel windows from diverting application focus.
" \ - "Enable this if you don't like channels " \ - "popping up while you're typing something in a channel.","options")); - - addRowSpacer(0,4,0,4); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("On Channel Kick", "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Rejoin channel", "options"), KviOption_boolRejoinChannelOnKick); + mergeTip(b, __tr2qs_ctx("This option will cause KVIrc to attempt " + "to rejoin a channel after being kicked.", + "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Keep channel open", "options"), KviOption_boolKeepChannelOpenOnKick); + mergeTip(b, __tr2qs_ctx("This option will cause KVIrc to keep " + "the channel window open after being kicked.
" + "It might be a good idea to also enable the " + "\"Rejoin channel\" option.", + "options")); + + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("On Channel Part", "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Keep channel open", "options"), KviOption_boolKeepChannelOpenOnPart); + mergeTip(b, __tr2qs_ctx("This option will cause KVIrc to keep " + "the channel window open after leaving it.", + "options")); + + b = addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Automatically join channel on invite", "options"), KviOption_boolAutoJoinOnInvite); + mergeTip(b, __tr2qs_ctx("This option will cause KVIrc to automatically " + "join a channel when an INVITE message for that channel is received.
" + "Warning: this may help spammers harass you.", + "options")); + + b = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Open channel windows without focus", "options"), KviOption_boolCreateMinimizedChannels); + mergeTip(b, __tr2qs_ctx("This option prevents newly created " + "channel windows from diverting application focus.
" + "Enable this if you don't like channels " + "popping up while you're typing something in a channel.", + "options")); + + addRowSpacer(0, 4, 0, 4); } OptionsWidget_channelGeneral::~OptionsWidget_channelGeneral() { } - OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { createLayout(); @@ -100,64 +102,66 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent) KviTalGroupBox * g; KviUIntSelector * u; - b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory); + b = addBoolSelector(0, 0, 4, 0, __tr2qs_ctx("Log joined channels history", "options"), KviOption_boolLogChannelHistory); - addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options")); + addLabel(0, 1, 0, 1, __tr2qs_ctx("Default ban mask:", "options")); m_pBanTypeCombo = new QComboBox(this); - addWidgetToLayout(m_pBanTypeCombo,1,1,4,1); + addWidgetToLayout(m_pBanTypeCombo, 1, 1, 4, 1); KviIrcMask hostmask("nick!user@machine.host.top"); KviIrcMask ipmask("nick!user@192.168.1.2"); QString tmp1; QString tmp2; - for(int i=0;i<=26;i++) + for(int i = 0; i <= 26; i++) { - hostmask.mask(tmp1,(KviIrcMask::MaskType)i); - ipmask.mask(tmp2,(KviIrcMask::MaskType)i); - m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1, tmp2)); + hostmask.mask(tmp1, (KviIrcMask::MaskType)i); + ipmask.mask(tmp2, (KviIrcMask::MaskType)i); + m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(), QString("%1 (%2)").arg(tmp1, tmp2)); } m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType)); - g = addGroupBox(0,2,4,2,Qt::Horizontal,__tr2qs_ctx("On Channel Join","options")); - u = addUIntSelector(g,__tr2qs_ctx("Minimum delay between two channel requests:","options"),KviOption_uintOnJoinRequestsDelay,0,10,1); - u->setSuffix(__tr2qs_ctx(" sec","options")); - mergeTip(u,__tr2qs_ctx("This is an artificial delay for the channel requests made on join.
" \ - "You may increase it if your server complains about flooding when joining " \ - "many channels at once.
Minimum value: 0 secs
Maximum value: 10 secs","options")); + g = addGroupBox(0, 2, 4, 2, Qt::Horizontal, __tr2qs_ctx("On Channel Join", "options")); + u = addUIntSelector(g, __tr2qs_ctx("Minimum delay between two channel requests:", "options"), KviOption_uintOnJoinRequestsDelay, 0, 10, 1); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + mergeTip(u, __tr2qs_ctx("This is an artificial delay for the channel requests made on join.
" + "You may increase it if your server complains about flooding when joining " + "many channels at once.
Minimum value: 0 secs
Maximum value: 10 secs", + "options")); - addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin); - addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin); - addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin); - addBoolSelector(g,__tr2qs_ctx("Do not request invite list","options"),KviOption_boolDisableInviteListRequestOnJoin); - addBoolSelector(g,__tr2qs_ctx("Do not request quiet ban list","options"),KviOption_boolDisableQuietBanListRequestOnJoin); - addBoolSelector(g,__tr2qs_ctx("Echo channel topic","options"),KviOption_boolEchoNumericTopic); - addBoolSelector(g,__tr2qs_ctx("Show channel sync time","options"),KviOption_boolShowChannelSyncTime); + addBoolSelector(g, __tr2qs_ctx("Do not send /WHO request", "options"), KviOption_boolDisableWhoRequestOnJoin); + addBoolSelector(g, __tr2qs_ctx("Do not request ban list", "options"), KviOption_boolDisableBanListRequestOnJoin); + addBoolSelector(g, __tr2qs_ctx("Do not request ban exception list", "options"), KviOption_boolDisableBanExceptionListRequestOnJoin); + addBoolSelector(g, __tr2qs_ctx("Do not request invite list", "options"), KviOption_boolDisableInviteListRequestOnJoin); + addBoolSelector(g, __tr2qs_ctx("Do not request quiet ban list", "options"), KviOption_boolDisableQuietBanListRequestOnJoin); + addBoolSelector(g, __tr2qs_ctx("Echo channel topic", "options"), KviOption_boolEchoNumericTopic); + addBoolSelector(g, __tr2qs_ctx("Show channel sync time", "options"), KviOption_boolShowChannelSyncTime); - b = addBoolSelector(g,__tr2qs_ctx("Paste last channel log","options"),KviOption_boolPasteLastLogOnChannelJoin); + b = addBoolSelector(g, __tr2qs_ctx("Paste last channel log", "options"), KviOption_boolPasteLastLogOnChannelJoin); KviTalHBox * box = new KviTalHBox(g); - u = addUIntSelector(box,__tr2qs_ctx("Paste up to:","options"),KviOption_uintLinesToPasteOnChannelJoin,0,50,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin)); - u->setSuffix(__tr2qs_ctx(" lines","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 lines
Maximum value: 50 lines","options")); - - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - u = addUIntSelector(box,__tr2qs_ctx("Interval:","options"),KviOption_uintDaysIntervalToPasteOnChannelJoin,1,10,10,KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin)); - u->setSuffix(__tr2qs_ctx(" days","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 days
Maximum value: 10 days","options")); + u = addUIntSelector(box, __tr2qs_ctx("Paste up to:", "options"), KviOption_uintLinesToPasteOnChannelJoin, 0, 50, 10, KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin)); + u->setSuffix(__tr2qs_ctx(" lines", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 lines
Maximum value: 50 lines", "options")); + + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + u = addUIntSelector(box, __tr2qs_ctx("Interval:", "options"), KviOption_uintDaysIntervalToPasteOnChannelJoin, 1, 10, 10, KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnChannelJoin)); + u->setSuffix(__tr2qs_ctx(" days", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 days
Maximum value: 10 days", "options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - b = addBoolSelector(0,3,4,3,__tr2qs_ctx("Keep away list updated","options"),KviOption_boolEnableAwayListUpdates); - mergeTip(b,__tr2qs_ctx("KVIrc sends out a channel /WHO message every now and then to keep the channel away list in sync. " \ - "Use this option to disable this feature (and to save your IRC bandwidth).
" \ - "If the server supports IRCv3.1's away-notify extension, it will be used instead of WHO requests.","options")); + b = addBoolSelector(0, 3, 4, 3, __tr2qs_ctx("Keep away list updated", "options"), KviOption_boolEnableAwayListUpdates); + mergeTip(b, __tr2qs_ctx("KVIrc sends out a channel /WHO message every now and then to keep the channel away list in sync. " + "Use this option to disable this feature (and to save your IRC bandwidth).
" + "If the server supports IRCv3.1's away-notify extension, it will be used instead of WHO requests.", + "options")); - addRowSpacer(0,5,4,5); + addRowSpacer(0, 5, 4, 5); } OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced() @@ -166,7 +170,8 @@ OptionsWidget_channelAdvanced::~OptionsWidget_channelAdvanced() void OptionsWidget_channelAdvanced::commit() { - KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex(); - if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7; + KVI_OPTION_UINT(KviOption_uintDefaultBanType) = m_pBanTypeCombo->currentIndex(); + if((KVI_OPTION_UINT(KviOption_uintDefaultBanType) > 26)) + KVI_OPTION_UINT(KviOption_uintDefaultBanType) = 7; KviOptionsWidget::commit(); } diff --git a/src/modules/options/OptionsWidget_channel.h b/src/modules/options/OptionsWidget_channel.h index 54d5532ab..09d2c61e2 100644 --- a/src/modules/options/OptionsWidget_channel.h +++ b/src/modules/options/OptionsWidget_channel.h @@ -69,8 +69,10 @@ class OptionsWidget_channelAdvanced : public KviOptionsWidget public: OptionsWidget_channelAdvanced(QWidget * parent); ~OptionsWidget_channelAdvanced(); + public: virtual void commit(); + protected: QComboBox * m_pBanTypeCombo; }; diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp index 80377a618..8f3335d76 100644 --- a/src/modules/options/OptionsWidget_connection.cpp +++ b/src/modules/options/OptionsWidget_connection.cpp @@ -32,9 +32,8 @@ #include - OptionsWidget_connection::OptionsWidget_connection(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("connection_options_widget"); createLayout(); @@ -42,62 +41,62 @@ OptionsWidget_connection::OptionsWidget_connection(QWidget * parent) KviBoolSelector * b1; KviBoolSelector * b; - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Disconnect","options")); + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("On Disconnect", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnDisconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to keep channels open after disconnect.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Keep channels open", "options"), KviOption_boolKeepChannelsOpenOnDisconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to keep channels open after disconnect.", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep queries open","options"),KviOption_boolKeepQueriesOpenOnDisconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to keep queries open after disconnect.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Keep queries open", "options"), KviOption_boolKeepQueriesOpenOnDisconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to keep queries open after disconnect.", "options")); - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Unexpected Disconnect","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("On Unexpected Disconnect", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to keep channels open after an unexpected disconnect.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Keep channels open", "options"), KviOption_boolKeepChannelsOpenOnUnexpectedDisconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to keep channels open after an unexpected disconnect.", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep queries open","options"),KviOption_boolKeepQueriesOpenOnUnexpectedDisconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to keep queries open after an unexpected disconnect.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Keep queries open", "options"), KviOption_boolKeepQueriesOpenOnUnexpectedDisconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to keep queries open after an unexpected disconnect.", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Rejoin channels after reconnect","options"),KviOption_boolRejoinChannelsAfterReconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to rejoin channels after a successful reconnect attempt.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Rejoin channels after reconnect", "options"), KviOption_boolRejoinChannelsAfterReconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to rejoin channels after a successful reconnect attempt.", "options")); - b1 = addBoolSelector(gbox,__tr2qs_ctx("Reopen queries after reconnect","options"),KviOption_boolReopenQueriesAfterReconnect,true); - mergeTip(b1,__tr2qs_ctx("This option will cause KVIrc to reopen query windows after a successful reconnect attempt.","options")); + b1 = addBoolSelector(gbox, __tr2qs_ctx("Reopen queries after reconnect", "options"), KviOption_boolReopenQueriesAfterReconnect, true); + mergeTip(b1, __tr2qs_ctx("This option will cause KVIrc to reopen query windows after a successful reconnect attempt.", "options")); - b = addBoolSelector(gbox,__tr2qs_ctx("Automatically reconnect","options"),KviOption_boolAutoReconnectOnUnexpectedDisconnect); - mergeTip(b,__tr2qs_ctx("This option will enable auto-reconnecting after an unexpected disconnect. " \ - "An unexpected disconnect is the termination of a fully connected IRC session " \ - "that was not requested by the user by the means of the QUIT message." \ - "

Warning: If you use /RAW to send a QUIT message to the server, " \ - "this option will not behave correctly, since does not detect the outgoing " \ - "QUIT message and will attempt to reconnect after the server has closed the connection. " \ - "For this reason, always use the /QUIT command to close your connections. " \ - "This option may also behave incorrectly with bouncers that support " \ - "detaching, in this case a solution could be to prepare an alias that sends the " \ - "bouncer \"detach\" command immediately before the \"quit\" command.
" \ - "alias(bncdetach){ raw bouncer detach; quit; }

","options")); + b = addBoolSelector(gbox, __tr2qs_ctx("Automatically reconnect", "options"), KviOption_boolAutoReconnectOnUnexpectedDisconnect); + mergeTip(b, __tr2qs_ctx("This option will enable auto-reconnecting after an unexpected disconnect. " + "An unexpected disconnect is the termination of a fully connected IRC session " + "that was not requested by the user by the means of the QUIT message." + "

Warning: If you use /RAW to send a QUIT message to the server, " + "this option will not behave correctly, since does not detect the outgoing " + "QUIT message and will attempt to reconnect after the server has closed the connection. " + "For this reason, always use the /QUIT command to close your connections. " + "This option may also behave incorrectly with bouncers that support " + "detaching, in this case a solution could be to prepare an alias that sends the " + "bouncer \"detach\" command immediately before the \"quit\" command.
" + "alias(bncdetach){ raw bouncer detach; quit; }

", + "options")); - KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Maximum attempts (0: unlimited):","options"), - KviOption_uintMaxAutoReconnectAttempts,0,100,5,KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + KviUIntSelector * u = addUIntSelector(gbox, __tr2qs_ctx("Maximum attempts (0: unlimited):", "options"), + KviOption_uintMaxAutoReconnectAttempts, 0, 100, 5, KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(gbox,__tr2qs_ctx("Delay between attempts:","options"),KviOption_uintAutoReconnectDelay,0,86400,5, - KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); - u->setSuffix(__tr2qs_ctx(" sec","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + u = addUIntSelector(gbox, __tr2qs_ctx("Delay between attempts:", "options"), KviOption_uintAutoReconnectDelay, 0, 86400, 5, + KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 sec
Maximum value: 86400 sec","options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 sec
Maximum value: 86400 sec", "options")); - addRowSpacer(0,3,4,3); + addRowSpacer(0, 3, 4, 3); } OptionsWidget_connection::~OptionsWidget_connection() { } - OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ssl_options_widget"); createLayout(); @@ -108,33 +107,33 @@ OptionsWidget_connectionSsl::OptionsWidget_connectionSsl(QWidget * parent) KviFileSelector * f; KviPasswordSelector * p; - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Certificate","options")); + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Certificate", "options")); - b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL certificate (PEM format only)","options"), - &(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true); + b = addBoolSelector(gbox, __tr2qs_ctx("Use SSL certificate (PEM format only)", "options"), + &(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)), true); - f = addFileSelector(gbox,__tr2qs_ctx("Certificate location:","options"),&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath)), - KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); - connect(b,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool))); + f = addFileSelector(gbox, __tr2qs_ctx("Certificate location:", "options"), &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath)), + KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); + connect(b, SIGNAL(toggled(bool)), f, SLOT(setEnabled(bool))); - p = new KviPasswordSelector(gbox,__tr2qs_ctx("Certificate password:","options"),&(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)), - KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); - connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool))); + p = new KviPasswordSelector(gbox, __tr2qs_ctx("Certificate password:", "options"), &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)), + KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); + connect(b, SIGNAL(toggled(bool)), p, SLOT(setEnabled(bool))); - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Private Key","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Private Key", "options")); - b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"),&(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true); - f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"),&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath)), - KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); - connect(b,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool))); + b = addBoolSelector(gbox, __tr2qs_ctx("Use SSL private key", "options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)), true); + f = addFileSelector(gbox, __tr2qs_ctx("Private key location:", "options"), &(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath)), + KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); + connect(b, SIGNAL(toggled(bool)), f, SLOT(setEnabled(bool))); - p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"),&(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)), - KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); - connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool))); + p = addPasswordSelector(gbox, __tr2qs_ctx("Private key password:", "options"), &(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)), + KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); + connect(b, SIGNAL(toggled(bool)), p, SLOT(setEnabled(bool))); - addRowSpacer(0,3,0,3); + addRowSpacer(0, 3, 0, 3); #else - addLabel(0,0,0,0,__tr2qs_ctx("This executable has no SSL support.","options")); + addLabel(0, 0, 0, 0, __tr2qs_ctx("This executable has no SSL support.", "options")); #endif } @@ -142,9 +141,8 @@ OptionsWidget_connectionSsl::~OptionsWidget_connectionSsl() { } - OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("transport_options_widget"); createLayout(); @@ -154,76 +152,76 @@ OptionsWidget_connectionSocket::OptionsWidget_connectionSocket(QWidget * parent) KviBoolSelector * b; KviStringSelector * s; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Timeout Values","options")); - u = addUIntSelector(g,__tr2qs_ctx("Connect timeout:","options"),KviOption_uintIrcSocketTimeout,5,6000,60); - u->setSuffix(__tr2qs_ctx(" sec","options")); - u = addUIntSelector(g,__tr2qs_ctx("Outgoing data queue flush timeout:","options"),KviOption_uintSocketQueueFlushTimeout,100,2000,500); - u->setSuffix(__tr2qs_ctx(" msec","options")); - b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Limit outgoing traffic per connection","options"),KviOption_boolLimitOutgoingTraffic); - u = addUIntSelector(0,2,0,2,__tr2qs_ctx("Limit to 1 message every:","options"), - KviOption_uintOutgoingTrafficLimitUSeconds,10000,2000000,10000001,KVI_OPTION_BOOL(KviOption_boolLimitOutgoingTraffic)); - u->setSuffix(__tr2qs_ctx(" usec","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 10000 usec
Maximum value: 10000000 usec","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress); - s = addStringSelector(g,"",KviOption_stringIPv4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress)); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Timeout Values", "options")); + u = addUIntSelector(g, __tr2qs_ctx("Connect timeout:", "options"), KviOption_uintIrcSocketTimeout, 5, 6000, 60); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + u = addUIntSelector(g, __tr2qs_ctx("Outgoing data queue flush timeout:", "options"), KviOption_uintSocketQueueFlushTimeout, 100, 2000, 500); + u->setSuffix(__tr2qs_ctx(" msec", "options")); + b = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Limit outgoing traffic per connection", "options"), KviOption_boolLimitOutgoingTraffic); + u = addUIntSelector(0, 2, 0, 2, __tr2qs_ctx("Limit to 1 message every:", "options"), + KviOption_uintOutgoingTrafficLimitUSeconds, 10000, 2000000, 10000001, KVI_OPTION_BOOL(KviOption_boolLimitOutgoingTraffic)); + u->setSuffix(__tr2qs_ctx(" usec", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 10000 usec
Maximum value: 10000000 usec", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + g = addGroupBox(0, 3, 0, 3, Qt::Horizontal, __tr2qs_ctx("Network Interfaces", "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Bind IPv4 connections to:", "options"), KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress); + s = addStringSelector(g, "", KviOption_stringIPv4ConnectionBindAddress, KVI_OPTION_BOOL(KviOption_boolBindIrcIPv4ConnectionsToSpecifiedAddress)); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); #ifdef COMPILE_IPV6_SUPPORT - b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress); - s = addStringSelector(g,"",KviOption_stringIPv6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress)); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Bind IPv6 connections to:", "options"), KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress); + s = addStringSelector(g, "", KviOption_stringIPv6ConnectionBindAddress, KVI_OPTION_BOOL(KviOption_boolBindIrcIPv6ConnectionsToSpecifiedAddress)); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); #endif //!COMPILE_IPV6_SUPPORT - b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Pick random IP address for round-robin servers","options"),KviOption_boolPickRandomIpAddressForRoundRobinServers); - mergeTip(b,__tr2qs_ctx("This option will cause the KVIrc networking stack to pick up " \ - "a random entry when multiple IP address are retrieved for a server " \ - "DNS lookup. This is harmless and can fix some problems with caching " \ - "DNS servers that do not properly rotate the records as the authoritative " \ - "ones would do. On the other hand, you might want to disable it if " \ - "you want to rely on the DNS server to provide the best choice.","options")); + b = addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Pick random IP address for round-robin servers", "options"), KviOption_boolPickRandomIpAddressForRoundRobinServers); + mergeTip(b, __tr2qs_ctx("This option will cause the KVIrc networking stack to pick up " + "a random entry when multiple IP address are retrieved for a server " + "DNS lookup. This is harmless and can fix some problems with caching " + "DNS servers that do not properly rotate the records as the authoritative " + "ones would do. On the other hand, you might want to disable it if " + "you want to rely on the DNS server to provide the best choice.", + "options")); - addRowSpacer(0,5,0,5); + addRowSpacer(0, 5, 0, 5); } OptionsWidget_connectionSocket::~OptionsWidget_connectionSocket() { } - OptionsWidget_identService::OptionsWidget_identService(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ident_options_widget"); createLayout(); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable Ident service","options"),KviOption_boolUseIdentService); + m_pEnableIdent = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable Ident service", "options"), KviOption_boolUseIdentService); #else - m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable Ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService); + m_pEnableIdent = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable Ident service (bad practice on UNIX!)", "options"), KviOption_boolUseIdentService); #endif - connect(m_pEnableIdent,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool))); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), this, SLOT(enableIpv4InIpv6(bool))); - KviTalGroupBox * gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Output Verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool))); + KviTalGroupBox * gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Output Verbosity", "options"), KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), gbox, SLOT(setEnabled(bool))); - addLabel(gbox,__tr2qs_ctx("Output Ident service messages to:","options")); + addLabel(gbox, __tr2qs_ctx("Output Ident service messages to:", "options")); - m_pActiveRadio = new QRadioButton(__tr2qs_ctx("Active window","options"),gbox); - m_pConsoleRadio = new QRadioButton(__tr2qs_ctx("Console","options"),gbox); - m_pQuietRadio = new QRadioButton(__tr2qs_ctx("Do not show any Ident service messages","options"),gbox); + m_pActiveRadio = new QRadioButton(__tr2qs_ctx("Active window", "options"), gbox); + m_pConsoleRadio = new QRadioButton(__tr2qs_ctx("Console", "options"), gbox); + m_pQuietRadio = new QRadioButton(__tr2qs_ctx("Do not show any Ident service messages", "options"), gbox); switch(KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)) { - case KviIdentdOutputMode::Quiet : + case KviIdentdOutputMode::Quiet: m_pQuietRadio->setChecked(true); break; - case KviIdentdOutputMode::ToConsole : + case KviIdentdOutputMode::ToConsole: m_pConsoleRadio->setChecked(true); break; - case KviIdentdOutputMode::ToActiveWindow : + case KviIdentdOutputMode::ToActiveWindow: m_pActiveRadio->setChecked(true); break; } @@ -232,49 +230,51 @@ OptionsWidget_identService::OptionsWidget_identService(QWidget * parent) KviStringSelector * s; KviUIntSelector * u; - gbox = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + gbox = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Configuration", "options"), KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - b = addBoolSelector(gbox,__tr2qs_ctx("Enable Ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(gbox, __tr2qs_ctx("Enable Ident service only while connecting to server", "options"), KviOption_boolUseIdentServiceOnlyOnConnect); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"),KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + s = addStringSelector(gbox, __tr2qs_ctx("Ident username:", "options"), KviOption_stringIdentdUser, KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); - u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"),KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool))); + u = addUIntSelector(gbox, __tr2qs_ctx("Service port:", "options"), KviOption_uintIdentdPort, 0, 65535, 113, KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), gbox, SLOT(setEnabled(bool))); - gbox = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + gbox = addGroupBox(0, 3, 0, 3, Qt::Horizontal, __tr2qs_ctx("IPv6 Settings", "options"), KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"),KviOption_boolIdentdEnableIPv6, - KVI_OPTION_BOOL(KviOption_boolUseIdentService)); + m_pEnableIpv6 = addBoolSelector(gbox, __tr2qs_ctx("Enable service for IPv6", "options"), KviOption_boolIdentdEnableIPv6, + KVI_OPTION_BOOL(KviOption_boolUseIdentService)); #ifdef COMPILE_IPV6_SUPPORT - connect(m_pEnableIdent,SIGNAL(toggled(bool)),m_pEnableIpv6,SLOT(setEnabled(bool))); - connect(m_pEnableIpv6,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool))); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), m_pEnableIpv6, SLOT(setEnabled(bool))); + connect(m_pEnableIpv6, SIGNAL(toggled(bool)), this, SLOT(enableIpv4InIpv6(bool))); #else m_pEnableIpv6->setEnabled(false); #endif - m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"),KviOption_boolIdentdIPv6ContainsIPv4, - KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6)); - connect(m_pEnableIdent,SIGNAL(toggled(bool)),gbox,SLOT(setEnabled(bool))); + m_pIpv4InIpv6 = addBoolSelector(gbox, __tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace", "options"), KviOption_boolIdentdIPv6ContainsIPv4, + KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIPv6)); + connect(m_pEnableIdent, SIGNAL(toggled(bool)), gbox, SLOT(setEnabled(bool))); - addLabel(0,4,0,4, + addLabel(0, 4, 0, 4, #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - __tr2qs_ctx("

Warning:
" \ - "This is a non RFC 1413 compliant Ident daemon that implements " \ - "only a limited subset of the Identification Protocol specifications. If it is possible, install a " \ - "real Ident daemon.

","options") + __tr2qs_ctx("

Warning:
" + "This is a non RFC 1413 compliant Ident daemon that implements " + "only a limited subset of the Identification Protocol specifications. If it is possible, install a " + "real Ident daemon.

", + "options") #else - __tr2qs_ctx("

Warning:
" \ - "This is a non RFC 1413 compliant Ident daemon that implements " \ - "only a limited subset of the Identification Protocol specifications.
" \ - "On UNIX, you may also need root privileges to bind to the auth port (113).
" \ - "It is highly recommended that a real system-wide Ident daemon be used instead, "\ - "or none at all if Ident is not required.

","options") + __tr2qs_ctx("

Warning:
" + "This is a non RFC 1413 compliant Ident daemon that implements " + "only a limited subset of the Identification Protocol specifications.
" + "On UNIX, you may also need root privileges to bind to the auth port (113).
" + "It is highly recommended that a real system-wide Ident daemon be used instead, " + "or none at all if Ident is not required.

", + "options") #endif - ); + ); - addRowSpacer(0,5,0,5); + addRowSpacer(0, 5, 0, 5); } OptionsWidget_identService::~OptionsWidget_identService() @@ -285,11 +285,11 @@ void OptionsWidget_identService::commit() { KviOptionsWidget::commit(); if(m_pConsoleRadio->isChecked()) - KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::ToConsole; + KVI_OPTION_UINT(KviOption_uintIdentdOutputMode) = KviIdentdOutputMode::ToConsole; if(m_pActiveRadio->isChecked()) - KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::ToActiveWindow; + KVI_OPTION_UINT(KviOption_uintIdentdOutputMode) = KviIdentdOutputMode::ToActiveWindow; if(m_pQuietRadio->isChecked()) - KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::Quiet; + KVI_OPTION_UINT(KviOption_uintIdentdOutputMode) = KviIdentdOutputMode::Quiet; } void OptionsWidget_identService::enableIpv4InIpv6(bool) @@ -299,9 +299,8 @@ void OptionsWidget_identService::enableIpv4InIpv6(bool) #endif } - OptionsWidget_connectionAdvanced::OptionsWidget_connectionAdvanced(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("connection_advanced_options_widget"); } diff --git a/src/modules/options/OptionsWidget_connection.h b/src/modules/options/OptionsWidget_connection.h index 60d29c810..96908ead0 100644 --- a/src/modules/options/OptionsWidget_connection.h +++ b/src/modules/options/OptionsWidget_connection.h @@ -93,6 +93,7 @@ public: ~OptionsWidget_identService(); virtual void commit(); + protected: KviBoolSelector * m_pEnableIdent; KviBoolSelector * m_pEnableIpv6; @@ -105,5 +106,4 @@ public slots: void enableIpv4InIpv6(bool); }; - #endif //_OPTW_CONNECTION_H_ diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp index 2363be882..634551ad8 100644 --- a/src/modules/options/OptionsWidget_ctcp.cpp +++ b/src/modules/options/OptionsWidget_ctcp.cpp @@ -28,54 +28,51 @@ #include "KviLocale.h" #include "KviOptions.h" - OptionsWidget_ctcp::OptionsWidget_ctcp(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ctcp_options_widget"); createLayout(); - addLabel(0,0,0,0,__tr2qs_ctx("

The Client-to-client protocol (CTCP) " \ - "is used to transmit special control messages over an IRC connection. " \ - "These messages can request information from clients or negotiate file transfers." \ - "

","options")); - + addLabel(0, 0, 0, 0, __tr2qs_ctx("

The Client-to-client protocol (CTCP) " + "is used to transmit special control messages over an IRC connection. " + "These messages can request information from clients or negotiate file transfers." + "

", + "options")); - KviTalGroupBox *gs = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("CTCP Replies","options")); - KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:","options"),KviOption_stringCtcpVersionPostfix); + KviTalGroupBox * gs = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("CTCP Replies", "options")); + KviStringSelector * s = addStringSelector(gs, __tr2qs_ctx("Append to VERSION reply:", "options"), KviOption_stringCtcpVersionPostfix); s->setMinimumLabelWidth(200); mergeTip(s, - __tr2qs_ctx("This text will be appended to the CTCP VERSION reply.
For example, you can place a script name here.","options")); + __tr2qs_ctx("This text will be appended to the CTCP VERSION reply.
For example, you can place a script name here.", "options")); - s = addStringSelector(gs, __tr2qs_ctx("Append to SOURCE reply:","options"),KviOption_stringCtcpSourcePostfix); + s = addStringSelector(gs, __tr2qs_ctx("Append to SOURCE reply:", "options"), KviOption_stringCtcpSourcePostfix); s->setMinimumLabelWidth(200); mergeTip(s, - __tr2qs_ctx("This text will be appended to the CTCP SOURCE reply.
For example, you can place the source URL for a script here.","options")); + __tr2qs_ctx("This text will be appended to the CTCP SOURCE reply.
For example, you can place the source URL for a script here.", "options")); -// s = addStringSelector(gs, __tr2qs_ctx("USERINFO reply:","options"),KviOption_stringCtcpUserinfoReply); + // s = addStringSelector(gs, __tr2qs_ctx("USERINFO reply:","options"),KviOption_stringCtcpUserinfoReply); -// mergeTip(s, -// __tr2qs_ctx("This is the CTCP USERINFO reply.
It can contain some information about yourself.","options")); + // mergeTip(s, + // __tr2qs_ctx("This is the CTCP USERINFO reply.
It can contain some information about yourself.","options")); - s = addStringSelector(gs, __tr2qs_ctx("PAGE reply:","options"),KviOption_stringCtcpPageReply); + s = addStringSelector(gs, __tr2qs_ctx("PAGE reply:", "options"), KviOption_stringCtcpPageReply); s->setMinimumLabelWidth(200); mergeTip(s, - __tr2qs_ctx("This is the CTCP PAGE reply.
It should contain some sort of acknowledgment for CTCP PAGE messages.","options")); + __tr2qs_ctx("This is the CTCP PAGE reply.
It should contain some sort of acknowledgment for CTCP PAGE messages.", "options")); - addBoolSelector(gs,__tr2qs_ctx("Show the CTCP replies in the active window","options"),KviOption_boolCtcpRepliesToActiveWindow); + addBoolSelector(gs, __tr2qs_ctx("Show the CTCP replies in the active window", "options"), KviOption_boolCtcpRepliesToActiveWindow); - addBoolSelector(gs,__tr2qs_ctx("Show dialog for CTCP page requests","options"),KviOption_boolShowDialogOnCtcpPage); - addBoolSelector(gs,__tr2qs_ctx("Show dialog for channel CTCP page requests","options"),KviOption_boolShowDialogOnChannelCtcpPage); - - addRowSpacer(0,3,0,3); + addBoolSelector(gs, __tr2qs_ctx("Show dialog for CTCP page requests", "options"), KviOption_boolShowDialogOnCtcpPage); + addBoolSelector(gs, __tr2qs_ctx("Show dialog for channel CTCP page requests", "options"), KviOption_boolShowDialogOnChannelCtcpPage); + addRowSpacer(0, 3, 0, 3); } - OptionsWidget_ctcp::~OptionsWidget_ctcp() { } diff --git a/src/modules/options/OptionsWidget_ctcp.h b/src/modules/options/OptionsWidget_ctcp.h index 82c483921..4d1d377da 100644 --- a/src/modules/options/OptionsWidget_ctcp.h +++ b/src/modules/options/OptionsWidget_ctcp.h @@ -39,5 +39,4 @@ public: ~OptionsWidget_ctcp(); }; - #endif //_OPTW_CTCP_H_ diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp index 0de4254cd..d4972b4ca 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp @@ -30,7 +30,6 @@ #include #include - /* @doc: ctcpfloodprotectionoptions @type: @@ -72,40 +71,39 @@ see the [widget:ctcpavatarprotooptions]CTCP AVATAR protocol options[/widget] and [widget:ctcpdccprotooptions]CTCP DCC protocol options[/widget].[br] */ - OptionsWidget_ctcpFloodProtection::OptionsWidget_ctcpFloodProtection(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ctcpfloodprotection_options_widget"); createLayout(); - KviBoolSelector * b = addBoolSelector(0,0,1,0,__tr2qs_ctx("Use flood protection for CTCP requests (recommended)","options"),KviOption_boolUseCtcpFloodProtection); - mergeTip(b,__tr2qs_ctx("This option makes KVIrc only respond to a limited number of CTCP requests within a specified time interval, to prevent \"flooding\" CTCP messages.","options")); + KviBoolSelector * b = addBoolSelector(0, 0, 1, 0, __tr2qs_ctx("Use flood protection for CTCP requests (recommended)", "options"), KviOption_boolUseCtcpFloodProtection); + mergeTip(b, __tr2qs_ctx("This option makes KVIrc only respond to a limited number of CTCP requests within a specified time interval, to prevent \"flooding\" CTCP messages.", "options")); - KviUIntSelector * u = addUIntSelector(0,1,0,1,__tr2qs_ctx("Allow up to:","options"),KviOption_uintMaxCtcpRequests,0,10000,3,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); - u->setSuffix(__tr2qs_ctx(" requests","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 requests
Maximum value: 10000 requests","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + KviUIntSelector * u = addUIntSelector(0, 1, 0, 1, __tr2qs_ctx("Allow up to:", "options"), KviOption_uintMaxCtcpRequests, 0, 10000, 3, KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); + u->setSuffix(__tr2qs_ctx(" requests", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 requests
Maximum value: 10000 requests", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); - u->setSuffix(__tr2qs_ctx(" sec","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 1 sec
Maximum value: 3600 sec","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + u = addUIntSelector(1, 1, 1, 1, __tr2qs_ctx("within:", "options"), KviOption_uintCtcpFloodCheckInterval, 1, 3600, 6, KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 1 sec
Maximum value: 3600 sec", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - KviTalGroupBox * g = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Ignored CTCP Requests","options")); - addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing); - addBoolSelector(g,__tr2qs_ctx("FINGER","options"),KviOption_boolIgnoreCtcpFinger); - addBoolSelector(g,__tr2qs_ctx("CLIENTINFO","options"),KviOption_boolIgnoreCtcpClientinfo); - addBoolSelector(g,__tr2qs_ctx("USERINFO","options"),KviOption_boolIgnoreCtcpUserinfo); - addBoolSelector(g,__tr2qs_ctx("VERSION","options"),KviOption_boolIgnoreCtcpVersion); - addBoolSelector(g,__tr2qs_ctx("SOURCE","options"),KviOption_boolIgnoreCtcpSource); - addBoolSelector(g,__tr2qs_ctx("TIME","options"),KviOption_boolIgnoreCtcpTime); - addBoolSelector(g,__tr2qs_ctx("PAGE","options"),KviOption_boolIgnoreCtcpPage); - addBoolSelector(g,__tr2qs_ctx("AVATAR","options"),KviOption_boolIgnoreCtcpAvatar); - addBoolSelector(g,__tr2qs_ctx("DCC/TDCC","options"),KviOption_boolIgnoreCtcpDcc); + KviTalGroupBox * g = addGroupBox(0, 2, 1, 2, Qt::Horizontal, __tr2qs_ctx("Ignored CTCP Requests", "options")); + addBoolSelector(g, __tr2qs_ctx("PING", "options"), KviOption_boolIgnoreCtcpPing); + addBoolSelector(g, __tr2qs_ctx("FINGER", "options"), KviOption_boolIgnoreCtcpFinger); + addBoolSelector(g, __tr2qs_ctx("CLIENTINFO", "options"), KviOption_boolIgnoreCtcpClientinfo); + addBoolSelector(g, __tr2qs_ctx("USERINFO", "options"), KviOption_boolIgnoreCtcpUserinfo); + addBoolSelector(g, __tr2qs_ctx("VERSION", "options"), KviOption_boolIgnoreCtcpVersion); + addBoolSelector(g, __tr2qs_ctx("SOURCE", "options"), KviOption_boolIgnoreCtcpSource); + addBoolSelector(g, __tr2qs_ctx("TIME", "options"), KviOption_boolIgnoreCtcpTime); + addBoolSelector(g, __tr2qs_ctx("PAGE", "options"), KviOption_boolIgnoreCtcpPage); + addBoolSelector(g, __tr2qs_ctx("AVATAR", "options"), KviOption_boolIgnoreCtcpAvatar); + addBoolSelector(g, __tr2qs_ctx("DCC/TDCC", "options"), KviOption_boolIgnoreCtcpDcc); - addRowSpacer(0,3,1,3); + addRowSpacer(0, 3, 1, 3); } OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection() diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.h b/src/modules/options/OptionsWidget_ctcpFloodProtection.h index 751746de6..174361ac8 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.h +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.h @@ -33,7 +33,7 @@ class OptionsWidget_ctcpFloodProtection : public KviOptionsWidget { Q_OBJECT -// Q_CLASSINFO("help","ctcpfloodprotectionoptions") + // Q_CLASSINFO("help","ctcpfloodprotectionoptions") public: OptionsWidget_ctcpFloodProtection(QWidget * parent); ~OptionsWidget_ctcpFloodProtection(); diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp index 4c2d863a0..0f4773476 100644 --- a/src/modules/options/OptionsWidget_dcc.cpp +++ b/src/modules/options/OptionsWidget_dcc.cpp @@ -29,9 +29,8 @@ #include - OptionsWidget_dcc::OptionsWidget_dcc(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { } @@ -39,28 +38,27 @@ OptionsWidget_dcc::~OptionsWidget_dcc() { } - OptionsWidget_dccGeneral::OptionsWidget_dccGeneral(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccgeneral_options_widget"); createLayout(); - KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use workaround for firewall","options"),KviOption_boolCantAcceptIncomingDccConnections); - mergeTip(b,__tr2qs_ctx("Enable this option if you can't accept incoming connections.
" \ - "KVIrc will try to use different methods to send and receive files.
" \ - "Please note that these methods may NOT work when communicating with a non-KVIrc client.","options")); + KviBoolSelector * b = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Use workaround for firewall", "options"), KviOption_boolCantAcceptIncomingDccConnections); + mergeTip(b, __tr2qs_ctx("Enable this option if you can't accept incoming connections.
" + "KVIrc will try to use different methods to send and receive files.
" + "Please note that these methods may NOT work when communicating with a non-KVIrc client.", + "options")); - addRowSpacer(0,1,0,1); + addRowSpacer(0, 1, 0, 1); } OptionsWidget_dccGeneral::~OptionsWidget_dccGeneral() { } - OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccgeneral_options_widget"); createLayout(); @@ -71,90 +69,97 @@ OptionsWidget_dccAdvanced::OptionsWidget_dccAdvanced(QWidget * parent) KviStringSelector * s; KviUIntSelector * u; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Network Properties","options")); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Network Properties", "options")); - b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault); - mergeTip(b,__tr2qs_ctx("Enable this option if you are on a multihost machine and want " \ - "to force one of the available IP addresses to be used for outgoing DCCs.
This is especially useful " \ - "when you use IPv6 and IPv4 addresses.
You can force KVIrc to always choose the IPv4 interface.","options")); + b = addBoolSelector(g, __tr2qs_ctx("Use user-defined address or network interface", "options"), KviOption_boolDccListenOnSpecifiedInterfaceByDefault); + mergeTip(b, __tr2qs_ctx("Enable this option if you are on a multihost machine and want " + "to force one of the available IP addresses to be used for outgoing DCCs.
This is especially useful " + "when you use IPv6 and IPv4 addresses.
You can force KVIrc to always choose the IPv4 interface.", + "options")); - s = addStringSelector(g,__tr2qs_ctx("Listen on address/interface:","options"),KviOption_stringDccListenDefaultInterface, - KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault)); - mergeTip(s,__tr2qs_ctx("This is the IP address or name of the interface to use by default for outgoing DCC transfers.
" \ - "On UNIX systems that support it, you can also specify IPv4 interface names (such as ppp0).
" \ - "If you set it to 0.0.0.0, KVIrc will try to use the first available IPv4 interface","options")); + s = addStringSelector(g, __tr2qs_ctx("Listen on address/interface:", "options"), KviOption_stringDccListenDefaultInterface, + KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault)); + mergeTip(s, __tr2qs_ctx("This is the IP address or name of the interface to use by default for outgoing DCC transfers.
" + "On UNIX systems that support it, you can also specify IPv4 interface names (such as ppp0).
" + "If you set it to 0.0.0.0, KVIrc will try to use the first available IPv4 interface", + "options")); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange); - mergeTip(b,__tr2qs_ctx("Enable this option if you want specify a local port range for DCC.","options")); + b = addBoolSelector(g, __tr2qs_ctx("Use user-defined port range", "options"), KviOption_boolUserDefinedPortRange); + mergeTip(b, __tr2qs_ctx("Enable this option if you want specify a local port range for DCC.", "options")); KviTalHBox * hb = new KviTalHBox(g); hb->setSpacing(4); - u = addUIntSelector(hb,__tr2qs_ctx("Lowest port:","options"),KviOption_uintDccMinPort,1,65535,5000, - KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - u = addUIntSelector(hb,__tr2qs_ctx("Highest port:","options"),KviOption_uintDccMaxPort,1,65535,30000, - KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault); - mergeTip(b,__tr2qs_ctx("Enable this option if you want to always send a fake IP address in your DCC requests.
" \ - "This might be useful if you're behind a router with a static address that does network address " \ - "translation (NAT) and forwards all or a range of ports.","options")); - - s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress, - KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); - mergeTip(s,__tr2qs_ctx("This is the fixed address that will be sent with all DCC requests if you enable the option above.","options")); - - b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"),KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable, - !KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); - - connect(b,SIGNAL(toggled(bool)),b2,SLOT(setNotEnabled(bool))); - - mergeTip(b2,__tr2qs_ctx("You can enable this option if you are behind a router that forwards all or a range of ports.
" \ - "KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \ - "by the IRC server you're connected to.
This method is an exclusive alternative to the \"fixed address\" above.
" \ - "It might guess the correct address automatically if certain conditions are met (e.g. the IRC server doesn't mask hostnames).","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),KviOption_boolDccBrokenBouncerHack, - KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable)); - mergeTip(b,__tr2qs_ctx("When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \ - "you can use a bug in the bouncer to force KVIrc to bind the DCC connections to the dialup router's address.
" \ - "It's an ugly hack - use it only if nothing else works.","options")); - - connect(b2,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); - - b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),KviOption_boolNotifyFailedDccHandshakes); - mergeTip(b,__tr2qs_ctx("If you enable this option, when a DCC request from a remote " \ - "user can't be satisfied KVIrc will notify him by a CTCP ERRMSG. This is " \ - "a nice feature so it is a good idea to leave it on unless for some reason " \ - "you have deactivated the anti-flood system: in this case turning off this option " \ - "might help if you often get attacked by CTCP floods.","options")); - - u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions:","options"),KviOption_uintMaxDccSlots,0,1000,64); - mergeTip(u,__tr2qs_ctx("This is the maximum number of concurrent DCC sessions " \ - "and it includes all the DCC types (send, chat, recv...). " \ - "KVIrc will refuse the requests when this limit is reached.","options")); - - u = addUIntSelector(0,3,1,3,__tr2qs_ctx("DCC socket timeout:","options"),KviOption_uintDccSocketTimeout,10,65536,180); - u->setSuffix(__tr2qs_ctx(" sec","options")); - mergeTip(u,__tr2qs_ctx("This is the amount of time that KVIrc will wait for a response before assuming that a DCC has failed " \ - "because the remote client was unable to connect to our listening socket.","options")); - - addRowSpacer(0,4,1,4); + u = addUIntSelector(hb, __tr2qs_ctx("Lowest port:", "options"), KviOption_uintDccMinPort, 1, 65535, 5000, + KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + u = addUIntSelector(hb, __tr2qs_ctx("Highest port:", "options"), KviOption_uintDccMaxPort, 1, 65535, 30000, + KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + b = addBoolSelector(g, __tr2qs_ctx("Send a fixed address in requests", "options"), KviOption_boolDccSendFakeAddressByDefault); + mergeTip(b, __tr2qs_ctx("Enable this option if you want to always send a fake IP address in your DCC requests.
" + "This might be useful if you're behind a router with a static address that does network address " + "translation (NAT) and forwards all or a range of ports.", + "options")); + + s = addStringSelector(g, __tr2qs_ctx("Send address/interface:", "options"), KviOption_stringDefaultDccFakeAddress, + KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); + mergeTip(s, __tr2qs_ctx("This is the fixed address that will be sent with all DCC requests if you enable the option above.", "options")); + + b2 = addBoolSelector(g, __tr2qs_ctx("Guess address from IRC server if unroutable", "options"), KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable, + !KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); + + connect(b, SIGNAL(toggled(bool)), b2, SLOT(setNotEnabled(bool))); + + mergeTip(b2, __tr2qs_ctx("You can enable this option if you are behind a router that forwards all or a range of ports.
" + "KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " + "by the IRC server you're connected to.
This method is an exclusive alternative to the \"fixed address\" above.
" + "It might guess the correct address automatically if certain conditions are met (e.g. the IRC server doesn't mask hostnames).", + "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Use \"broken bouncer hack\" to detect address", "options"), KviOption_boolDccBrokenBouncerHack, + KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable)); + mergeTip(b, __tr2qs_ctx("When you're behind a dialup router and also tunneling through a psyBNC bouncer, " + "you can use a bug in the bouncer to force KVIrc to bind the DCC connections to the dialup router's address.
" + "It's an ugly hack - use it only if nothing else works.", + "options")); + + connect(b2, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); + + b = addBoolSelector(0, 1, 1, 1, __tr2qs_ctx("Notify failed DCC handshakes to the remote end", "options"), KviOption_boolNotifyFailedDccHandshakes); + mergeTip(b, __tr2qs_ctx("If you enable this option, when a DCC request from a remote " + "user can't be satisfied KVIrc will notify him by a CTCP ERRMSG. This is " + "a nice feature so it is a good idea to leave it on unless for some reason " + "you have deactivated the anti-flood system: in this case turning off this option " + "might help if you often get attacked by CTCP floods.", + "options")); + + u = addUIntSelector(0, 2, 1, 2, __tr2qs_ctx("Maximum number of DCC sessions:", "options"), KviOption_uintMaxDccSlots, 0, 1000, 64); + mergeTip(u, __tr2qs_ctx("This is the maximum number of concurrent DCC sessions " + "and it includes all the DCC types (send, chat, recv...). " + "KVIrc will refuse the requests when this limit is reached.", + "options")); + + u = addUIntSelector(0, 3, 1, 3, __tr2qs_ctx("DCC socket timeout:", "options"), KviOption_uintDccSocketTimeout, 10, 65536, 180); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + mergeTip(u, __tr2qs_ctx("This is the amount of time that KVIrc will wait for a response before assuming that a DCC has failed " + "because the remote client was unable to connect to our listening socket.", + "options")); + + addRowSpacer(0, 4, 1, 4); } OptionsWidget_dccAdvanced::~OptionsWidget_dccAdvanced() { } - OptionsWidget_dccSend::OptionsWidget_dccSend(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccsend_options_widget"); } @@ -163,9 +168,8 @@ OptionsWidget_dccSend::~OptionsWidget_dccSend() { } - OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccsend_options_widget"); createLayout(); @@ -177,51 +181,53 @@ OptionsWidget_dccSendGeneral::OptionsWidget_dccSendGeneral(QWidget * parent) KviBoolSelector * b1; KviTalGroupBox * g; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Incoming File","options")); - b2 = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccSend); - b3 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted transfer window without focus","options"),KviOption_boolCreateMinimizedDccSendWhenAutoAccepted, - !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend)); - mergeTip(b3,__tr2qs_ctx("This option prevents the transfer window " \ - "from opening and diverting application focus.
" \ - "Enable this if you don't like the transfer window " \ - "popping up while you're typing something in a channel.","options")); - - b4 = addBoolSelector(g,__tr2qs_ctx("Automatically resume when auto-accepted","options"),KviOption_boolAutoResumeDccSendWhenAutoAccepted, - KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend)); - - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Save Location","options")); - - addDirectorySelector(g,__tr2qs_ctx("Download folder:","options"),KviOption_stringIncomingPath); - addBoolSelector(g,__tr2qs_ctx("Sort saved files by nicknames (create subfolders)","options"),KviOption_boolSortReceivedByDccFilesByNicks); - addBoolSelector(g,__tr2qs_ctx("Guess save path from media type","options"),KviOption_boolUseIncomingDccMediaTypeSavePath); - - g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("On Download Completion","options")); - - addBoolSelector(g,__tr2qs_ctx("Notify completion in console","options"),KviOption_boolNotifyDccSendSuccessInConsole); - addBoolSelector(g,__tr2qs_ctx("Notify completion in notifier","options"),KviOption_boolNotifyDccSendSuccessInNotifier); - b = addBoolSelector(g,__tr2qs_ctx("Automatically clear transfer","options"),KviOption_boolAutoCloseDccSendOnSuccess); - mergeTip(b,__tr2qs_ctx("This option will cause successfully terminated transfers " \ - "to be automatically removed from the transfer window.","options")); - - b1 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Open transfer window without focus","options"), KviOption_boolCreateMinimizedDccSend); - mergeTip(b1,__tr2qs_ctx("This option prevents the transfer window " \ - "from opening and diverting application focus.
" \ - "Enable this if you don't like the transfer window " \ - "popping up while you're typing something in a channel.","options")); - - connect(b1,SIGNAL(toggled(bool)),b3,SLOT(setNotEnabled(bool))); - connect(b2,SIGNAL(toggled(bool)),b4,SLOT(setEnabled(bool))); - - addRowSpacer(0,4,0,4); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("On Incoming File", "options")); + b2 = addBoolSelector(g, __tr2qs_ctx("Automatically accept", "options"), KviOption_boolAutoAcceptDccSend); + b3 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted transfer window without focus", "options"), KviOption_boolCreateMinimizedDccSendWhenAutoAccepted, + !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccSend)); + mergeTip(b3, __tr2qs_ctx("This option prevents the transfer window " + "from opening and diverting application focus.
" + "Enable this if you don't like the transfer window " + "popping up while you're typing something in a channel.", + "options")); + + b4 = addBoolSelector(g, __tr2qs_ctx("Automatically resume when auto-accepted", "options"), KviOption_boolAutoResumeDccSendWhenAutoAccepted, + KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend)); + + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Save Location", "options")); + + addDirectorySelector(g, __tr2qs_ctx("Download folder:", "options"), KviOption_stringIncomingPath); + addBoolSelector(g, __tr2qs_ctx("Sort saved files by nicknames (create subfolders)", "options"), KviOption_boolSortReceivedByDccFilesByNicks); + addBoolSelector(g, __tr2qs_ctx("Guess save path from media type", "options"), KviOption_boolUseIncomingDccMediaTypeSavePath); + + g = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("On Download Completion", "options")); + + addBoolSelector(g, __tr2qs_ctx("Notify completion in console", "options"), KviOption_boolNotifyDccSendSuccessInConsole); + addBoolSelector(g, __tr2qs_ctx("Notify completion in notifier", "options"), KviOption_boolNotifyDccSendSuccessInNotifier); + b = addBoolSelector(g, __tr2qs_ctx("Automatically clear transfer", "options"), KviOption_boolAutoCloseDccSendOnSuccess); + mergeTip(b, __tr2qs_ctx("This option will cause successfully terminated transfers " + "to be automatically removed from the transfer window.", + "options")); + + b1 = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Open transfer window without focus", "options"), KviOption_boolCreateMinimizedDccSend); + mergeTip(b1, __tr2qs_ctx("This option prevents the transfer window " + "from opening and diverting application focus.
" + "Enable this if you don't like the transfer window " + "popping up while you're typing something in a channel.", + "options")); + + connect(b1, SIGNAL(toggled(bool)), b3, SLOT(setNotEnabled(bool))); + connect(b2, SIGNAL(toggled(bool)), b4, SLOT(setEnabled(bool))); + + addRowSpacer(0, 4, 0, 4); } OptionsWidget_dccSendGeneral::~OptionsWidget_dccSendGeneral() { } - OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccsend_advanced_options_widget"); createLayout(); @@ -229,93 +235,102 @@ OptionsWidget_dccSendAdvanced::OptionsWidget_dccSendAdvanced(QWidget * parent) KviBoolSelector * b; KviTalGroupBox * g; KviUIntSelector * u; - - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Bug Compatibility","options")); - b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv); - mergeTip(b,__tr2qs_ctx("This option causes KVIrc to send a zero-byte acknowledge to kick-start " \ - "the DCC transfer with some buggy IRC clients.
" \ - "Use it only if your DCC transfers stall just after establishing a connection without sending any data.","options")); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Bug Compatibility", "options")); - b = addBoolSelector(g,__tr2qs_ctx("Accept RESUME requests with broken filename (mIRC file.ext)","options"),KviOption_boolAcceptBrokenFileNameDccResumeRequests); - mergeTip(b,__tr2qs_ctx("This option causes KVIrc to accept RESUME requests with invalid filenames.
" \ - "Use it if KVIrc fails to accept RESUME requests from other clients (e.g. some versions of mIRC).","options")); + b = addBoolSelector(g, __tr2qs_ctx("Send ACK for byte 0", "options"), KviOption_boolSendZeroAckInDccRecv); + mergeTip(b, __tr2qs_ctx("This option causes KVIrc to send a zero-byte acknowledge to kick-start " + "the DCC transfer with some buggy IRC clients.
" + "Use it only if your DCC transfers stall just after establishing a connection without sending any data.", + "options")); - b = addBoolSelector(g,__tr2qs_ctx("Accept RESUME requests with mismatched ports","options"),KviOption_boolAcceptMismatchedPortDccResumeRequests); - mergeTip(b,__tr2qs_ctx("This option causes KVIrc to accept RESUME requests with mismatched ports.
" \ - "Use it if some router on the path between you and the receiver remaps the ports in DCC SEND " \ - "but not in DCC RESUME requests.
Please note that this option may misbehave in certain usage " \ - "patterns since KVIrc must differentiate between transfers only by looking at the filename. Be careful.","options")); + b = addBoolSelector(g, __tr2qs_ctx("Accept RESUME requests with broken filename (mIRC file.ext)", "options"), KviOption_boolAcceptBrokenFileNameDccResumeRequests); + mergeTip(b, __tr2qs_ctx("This option causes KVIrc to accept RESUME requests with invalid filenames.
" + "Use it if KVIrc fails to accept RESUME requests from other clients (e.g. some versions of mIRC).", + "options")); - b = addBoolSelector(g,__tr2qs_ctx("Replace spaces with underscores in outgoing filenames","options"),KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores); - mergeTip(b,__tr2qs_ctx("This option causes KVIrc to replace spaces with underscores in filenames " \ - "for all the outgoing file transfers. This will fix filename handling with some buggy clients (e.g. some versions of mIRC).","options")); + b = addBoolSelector(g, __tr2qs_ctx("Accept RESUME requests with mismatched ports", "options"), KviOption_boolAcceptMismatchedPortDccResumeRequests); + mergeTip(b, __tr2qs_ctx("This option causes KVIrc to accept RESUME requests with mismatched ports.
" + "Use it if some router on the path between you and the receiver remaps the ports in DCC SEND " + "but not in DCC RESUME requests.
Please note that this option may misbehave in certain usage " + "patterns since KVIrc must differentiate between transfers only by looking at the filename. Be careful.", + "options")); - b = addBoolSelector(g,__tr2qs_ctx("Send 64-bit ACKs for files larger than 4GiB","options"),KviOption_boolSend64BitAckInDccRecv); - mergeTip(b,__tr2qs_ctx("This option causes KVIrc to send ACKs as 64-bit integers instead of 32-bit integers
" \ - "Use this to fix DCC RECEIVE transfers where the other client is using the mIRC ACK standard.","options")); + b = addBoolSelector(g, __tr2qs_ctx("Replace spaces with underscores in outgoing filenames", "options"), KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores); + mergeTip(b, __tr2qs_ctx("This option causes KVIrc to replace spaces with underscores in filenames " + "for all the outgoing file transfers. This will fix filename handling with some buggy clients (e.g. some versions of mIRC).", + "options")); - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Limits","options")); + b = addBoolSelector(g, __tr2qs_ctx("Send 64-bit ACKs for files larger than 4GiB", "options"), KviOption_boolSend64BitAckInDccRecv); + mergeTip(b, __tr2qs_ctx("This option causes KVIrc to send ACKs as 64-bit integers instead of 32-bit integers
" + "Use this to fix DCC RECEIVE transfers where the other client is using the mIRC ACK standard.", + "options")); + + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Limits", "options")); KviTalHBox * hb = new KviTalHBox(g); - b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to:","options"),KviOption_boolLimitDccSendSpeed); - u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed)); - u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + b = addBoolSelector(hb, __tr2qs_ctx("Limit upload bandwidth to:", "options"), KviOption_boolLimitDccSendSpeed); + u = addUIntSelector(hb, "", KviOption_uintMaxDccSendSpeed, 0, 0xffffff1, 1024, KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed)); + u->setSuffix(" " + __tr2qs_ctx("bytes/sec", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); hb = new KviTalHBox(g); - b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to:","options"),KviOption_boolLimitDccRecvSpeed); - u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed)); - u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + b = addBoolSelector(hb, __tr2qs_ctx("Limit download bandwidth to:", "options"), KviOption_boolLimitDccRecvSpeed); + u = addUIntSelector(hb, "", KviOption_uintMaxDccRecvSpeed, 0, 0xffffff1, 1024, KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed)); + u->setSuffix(" " + __tr2qs_ctx("bytes/sec", "options")); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers:","options"),KviOption_uintMaxDccSendTransfers,0,1000,10); - mergeTip(u,__tr2qs_ctx("This is the maximum number of concurrent DCC transfers. " \ - "KVIrc will refuse the requests when this limit is reached.","options")); + u = addUIntSelector(g, __tr2qs_ctx("Maximum number of DCC transfers:", "options"), KviOption_uintMaxDccSendTransfers, 0, 1000, 10); + mergeTip(u, __tr2qs_ctx("This is the maximum number of concurrent DCC transfers. " + "KVIrc will refuse the requests when this limit is reached.", + "options")); - g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Tweaks","options")); + g = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Tweaks", "options")); - b = addBoolSelector(g,__tr2qs_ctx("Use fast send (send ahead)","options"),KviOption_boolUseFastDccSend); - mergeTip(b,__tr2qs_ctx("The \"send ahead\" DCC method allows data to be sent faster by breaking " \ - "some of the rules of the original DCC SEND protocol specification.
" \ - "Most clients can handle this kind of optimisation so disable it only if you have problems.","options")); + b = addBoolSelector(g, __tr2qs_ctx("Use fast send (send ahead)", "options"), KviOption_boolUseFastDccSend); + mergeTip(b, __tr2qs_ctx("The \"send ahead\" DCC method allows data to be sent faster by breaking " + "some of the rules of the original DCC SEND protocol specification.
" + "Most clients can handle this kind of optimisation so disable it only if you have problems.", + "options")); hb = new KviTalHBox(g); - b = addBoolSelector(hb,__tr2qs_ctx("Force idle step:","options"),KviOption_boolDccSendForceIdleStep); - mergeTip(b,__tr2qs_ctx("Enable this option when the DCC file transfers " \ - "tend to block your computer by consuming too much CPU time. " \ - "When this option is enabled the idle interval below will be " \ - "forcibly inserted between each sent/received data packet.","options")); - - u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep)); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - u->setSuffix(__tr2qs_ctx(" msec","options")); - - mergeTip(u,__tr2qs_ctx("This parameter controls the average delay between two packets sent or received.
" \ - "A smaller interval will cause you to send data faster but will also " \ - "add load to your CPU, disk and network interface.
" \ - "Reasonable values are from 5 to 50 milliseconds.","options")); - - u = addUIntSelector(g,__tr2qs_ctx("Packet size:","options"),KviOption_uintDccSendPacketSize,16,65536,1024); - u->setSuffix(__tr2qs_ctx(" bytes","options")); - mergeTip(u,__tr2qs_ctx("This parameter controls the packet size used for DCC SEND.
" \ - "With bigger packets you will be probably send data faster, but " \ - "you will also saturate your bandwidth and in some cases " \ - "cause more disk activity.
" \ - "Reasonable values are from 512 to 4096 bytes.","options")); - - addRowSpacer(0,3,0,4); + b = addBoolSelector(hb, __tr2qs_ctx("Force idle step:", "options"), KviOption_boolDccSendForceIdleStep); + mergeTip(b, __tr2qs_ctx("Enable this option when the DCC file transfers " + "tend to block your computer by consuming too much CPU time. " + "When this option is enabled the idle interval below will be " + "forcibly inserted between each sent/received data packet.", + "options")); + + u = addUIntSelector(hb, "", KviOption_uintDccSendIdleStepInMSec, 1, 65536, 30, KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep)); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + u->setSuffix(__tr2qs_ctx(" msec", "options")); + + mergeTip(u, __tr2qs_ctx("This parameter controls the average delay between two packets sent or received.
" + "A smaller interval will cause you to send data faster but will also " + "add load to your CPU, disk and network interface.
" + "Reasonable values are from 5 to 50 milliseconds.", + "options")); + + u = addUIntSelector(g, __tr2qs_ctx("Packet size:", "options"), KviOption_uintDccSendPacketSize, 16, 65536, 1024); + u->setSuffix(__tr2qs_ctx(" bytes", "options")); + mergeTip(u, __tr2qs_ctx("This parameter controls the packet size used for DCC SEND.
" + "With bigger packets you will be probably send data faster, but " + "you will also saturate your bandwidth and in some cases " + "cause more disk activity.
" + "Reasonable values are from 512 to 4096 bytes.", + "options")); + + addRowSpacer(0, 3, 0, 4); } OptionsWidget_dccSendAdvanced::~OptionsWidget_dccSendAdvanced() { } - OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("dccchat_options_widget"); createLayout(); @@ -324,78 +339,83 @@ OptionsWidget_dccChat::OptionsWidget_dccChat(QWidget * parent) KviBoolSelector * b2; KviTalGroupBox * g; - g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options")); - addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat); - - b1 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC chat windows without focus","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted, - !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); - mergeTip(b1,__tr2qs_ctx("This option prevents incoming " \ - "auto-accepted DCC chat windows from diverting application focus.
" \ - "Enable this if you don't like DCC chat windows " \ - "popping up while you're typing something in a channel.","options")); - - b2 = addBoolSelector(0,1,0,1, __tr2qs_ctx("Open DCC chat windows without focus","options"),KviOption_boolCreateMinimizedDccChat); - mergeTip(b2,__tr2qs_ctx("This option prevents incoming " \ - "DCC chat windows from diverting application focus.
" \ - "Enable this if you don't like DCC chat windows " \ - "popping up while you're typing something in a channel.","options")); - - connect(b2,SIGNAL(toggled(bool)),b1,SLOT(setNotEnabled(bool))); - -#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) - b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Flash system taskbar on new DCC chat message","options"),KviOption_boolFlashDccChatWindowOnNewMessages); - mergeTip(b2,__tr2qs_ctx("This option causes the system taskbar entry for KVIrc to flash when a new DCC chat message " \ - "is received and the KVIrc window is not the active.","options")); + g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("On Chat Request", "options")); + addBoolSelector(g, __tr2qs_ctx("Automatically accept", "options"), KviOption_boolAutoAcceptDccChat); + + b1 = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC chat windows without focus", "options"), KviOption_boolCreateMinimizedDccChatWhenAutoAccepted, + !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat)); + mergeTip(b1, __tr2qs_ctx("This option prevents incoming " + "auto-accepted DCC chat windows from diverting application focus.
" + "Enable this if you don't like DCC chat windows " + "popping up while you're typing something in a channel.", + "options")); + + b2 = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Open DCC chat windows without focus", "options"), KviOption_boolCreateMinimizedDccChat); + mergeTip(b2, __tr2qs_ctx("This option prevents incoming " + "DCC chat windows from diverting application focus.
" + "Enable this if you don't like DCC chat windows " + "popping up while you're typing something in a channel.", + "options")); + + connect(b2, SIGNAL(toggled(bool)), b1, SLOT(setNotEnabled(bool))); + +#if(defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) + b2 = addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Flash system taskbar on new DCC chat message", "options"), KviOption_boolFlashDccChatWindowOnNewMessages); + mergeTip(b2, __tr2qs_ctx("This option causes the system taskbar entry for KVIrc to flash when a new DCC chat message " + "is received and the KVIrc window is not the active.", + "options")); #endif - b2 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Popup notifier on new DCC chat message","options"),KviOption_boolPopupNotifierOnNewDccChatMessages); - mergeTip(b2,__tr2qs_ctx("This option causes a small notifier window to pop up " \ - "in the low right corner of the screen when a new message is received " \ - "and the KVIrc window is not active.","options")); + b2 = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Popup notifier on new DCC chat message", "options"), KviOption_boolPopupNotifierOnNewDccChatMessages); + mergeTip(b2, __tr2qs_ctx("This option causes a small notifier window to pop up " + "in the low right corner of the screen when a new message is received " + "and the KVIrc window is not active.", + "options")); - addRowSpacer(0,4,0,4); + addRowSpacer(0, 4, 0, 4); } OptionsWidget_dccChat::~OptionsWidget_dccChat() { } - -OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget *p):KviOptionsWidget(p) +OptionsWidget_dccVoice::OptionsWidget_dccVoice(QWidget * p) : KviOptionsWidget(p) { createLayout(); - + KviBoolSelector * b1; KviBoolSelector * b; KviTalGroupBox * g; KviUIntSelector * u; - b1 = addBoolSelector(0,0,0,0, __tr2qs_ctx("Open all DCC voice windows without focus","options"),KviOption_boolCreateMinimizedDccVoice); - mergeTip(b1,__tr2qs_ctx("This option prevents all incoming " \ - "DCC voice windows from diverting application focus.
" \ - "Enable this if you don't like DCC voice windows " \ - "popping up while you're typing something in a channel.","options")); + b1 = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Open all DCC voice windows without focus", "options"), KviOption_boolCreateMinimizedDccVoice); + mergeTip(b1, __tr2qs_ctx("This option prevents all incoming " + "DCC voice windows from diverting application focus.
" + "Enable this if you don't like DCC voice windows " + "popping up while you're typing something in a channel.", + "options")); - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("On Voice Request","options")); - b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice); - b = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC voice windows without focus","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted, - !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice)); - mergeTip(b,__tr2qs_ctx("This option prevents incoming " \ - "auto-accepted DCC voice windows from diverting application focus.
" \ - "Enable this if you don't like DCC voice windows " \ - "popping up while you're typing something in a channel.","options")); + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("On Voice Request", "options")); + b = addBoolSelector(g, __tr2qs_ctx("Automatically accept", "options"), KviOption_boolAutoAcceptDccVoice); + b = addBoolSelector(g, __tr2qs_ctx("Open auto-accepted DCC voice windows without focus", "options"), KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted, + !KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice)); + mergeTip(b, __tr2qs_ctx("This option prevents incoming " + "auto-accepted DCC voice windows from diverting application focus.
" + "Enable this if you don't like DCC voice windows " + "popping up while you're typing something in a channel.", + "options")); - connect(b1,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool))); + connect(b1, SIGNAL(toggled(bool)), b, SLOT(setNotEnabled(bool))); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Volume slider controls PCM, not Master","options"), KviOption_boolDccVoiceVolumeSliderControlsPCM); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Force half-duplex mode on sound device", "options"), KviOption_boolDccVoiceForceHalfDuplex); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Volume slider controls PCM, not Master", "options"), KviOption_boolDccVoiceVolumeSliderControlsPCM); - addStringSelector(0,4,0,4,__tr2qs_ctx("Sound device:","options"), KviOption_stringDccVoiceSoundDevice)->setMinimumLabelWidth(150); - addStringSelector(0,5,0,5,__tr2qs_ctx("Mixer device:","options"), KviOption_stringDccVoiceMixerDevice)->setMinimumLabelWidth(150); + addStringSelector(0, 4, 0, 4, __tr2qs_ctx("Sound device:", "options"), KviOption_stringDccVoiceSoundDevice)->setMinimumLabelWidth(150); + addStringSelector(0, 5, 0, 5, __tr2qs_ctx("Mixer device:", "options"), KviOption_stringDccVoiceMixerDevice)->setMinimumLabelWidth(150); - u = addUIntSelector(0,6,0,6,__tr2qs_ctx("Pre-buffer size:","options"), KviOption_uintDccVoicePreBufferSize, 2048, 65536, 32000); + u = addUIntSelector(0, 6, 0, 6, __tr2qs_ctx("Pre-buffer size:", "options"), KviOption_uintDccVoicePreBufferSize, 2048, 65536, 32000); u->setSuffix(" bytes"); - addRowSpacer(0,7,0,7); + addRowSpacer(0, 7, 0, 7); } OptionsWidget_dccVoice::~OptionsWidget_dccVoice() diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp index afa7dffb9..1ead7ce6d 100644 --- a/src/modules/options/OptionsWidget_general.cpp +++ b/src/modules/options/OptionsWidget_general.cpp @@ -28,18 +28,18 @@ #include "KviLocale.h" #include "KviOptions.h" - OptionsWidget_general::OptionsWidget_general(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("generalopt_options_widget"); createLayout(); - addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options "\ - "like sound, mediafiles, URL handlers etc... " \ - "","options")); + addLabel(0, 0, 4, 0, __tr2qs_ctx("This section contains the general client options " + "like sound, mediafiles, URL handlers etc... " + "", + "options")); - addRowSpacer(0,1,0,1); + addRowSpacer(0, 1, 0, 1); //addAdvancedButton(4,1,4,1); } diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index 0eff678ea..62159e7fb 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -53,92 +53,92 @@ #include #include -NickAlternativesDialog::NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3) -: QDialog(par) +NickAlternativesDialog::NickAlternativesDialog(QWidget * par, const QString & n1, const QString & n2, const QString & n3) + : QDialog(par) { QGridLayout * g = new QGridLayout(this); - setWindowTitle(__tr2qs_ctx("Nickname Alternatives - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Nickname Alternatives - KVIrc", "options")); QLabel * l = new QLabel(this); - l->setText(__tr2qs_ctx("Here you can choose up to three nickname " \ - "alternatives to the primary one. KVIrc will use the alternatives " \ - "if the primary nick is already used by someone else on a particular " \ - "IRC network.","options")); + l->setText(__tr2qs_ctx("Here you can choose up to three nickname " + "alternatives to the primary one. KVIrc will use the alternatives " + "if the primary nick is already used by someone else on a particular " + "IRC network.", + "options")); l->setWordWrap(true); - g->addWidget(l,0,0,1,3); + g->addWidget(l, 0, 0, 1, 3); l = new QLabel(this); - l->setText(__tr2qs_ctx("Alt. nickname 1:","options")); - g->addWidget(l,1,0); + l->setText(__tr2qs_ctx("Alt. nickname 1:", "options")); + g->addWidget(l, 1, 0); m_pNickEdit1 = new QLineEdit(this); - g->addWidget(m_pNickEdit1,1,1,1,2); + g->addWidget(m_pNickEdit1, 1, 1, 1, 2); m_pNickEdit1->setText(n1); l = new QLabel(this); - l->setText(__tr2qs_ctx("Alt. nickname 2:","options")); - g->addWidget(l,2,0); + l->setText(__tr2qs_ctx("Alt. nickname 2:", "options")); + g->addWidget(l, 2, 0); m_pNickEdit2 = new QLineEdit(this); - g->addWidget(m_pNickEdit2,2,1,1,2); + g->addWidget(m_pNickEdit2, 2, 1, 1, 2); m_pNickEdit2->setText(n2); l = new QLabel(this); - l->setText(__tr2qs_ctx("Alt. nickname 3:","options")); - g->addWidget(l,3,0); + l->setText(__tr2qs_ctx("Alt. nickname 3:", "options")); + g->addWidget(l, 3, 0); m_pNickEdit3 = new QLineEdit(this); - g->addWidget(m_pNickEdit3,3,1,1,2); + g->addWidget(m_pNickEdit3, 3, 1, 1, 2); m_pNickEdit3->setText(n3); KviTalHBox * h = new KviTalHBox(this); h->setSpacing(8); - g->addWidget(h,4,2); + g->addWidget(h, 4, 2); - QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel","options"),h); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel", "options"), h); + connect(pb, SIGNAL(clicked()), this, SLOT(reject())); - pb = new QPushButton(__tr2qs_ctx("OK","options"),h); + pb = new QPushButton(__tr2qs_ctx("OK", "options"), h); pb->setDefault(true); - connect(pb,SIGNAL(clicked()),this,SLOT(accept())); + connect(pb, SIGNAL(clicked()), this, SLOT(accept())); - g->setColumnStretch(0,1); + g->setColumnStretch(0, 1); } NickAlternativesDialog::~NickAlternativesDialog() { } -void NickAlternativesDialog::fill(QString &n1,QString &n2,QString &n3) +void NickAlternativesDialog::fill(QString & n1, QString & n2, QString & n3) { n1 = m_pNickEdit1->text(); n2 = m_pNickEdit2->text(); n3 = m_pNickEdit3->text(); } - -AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par,const QString &szUrl) -: QDialog(par) +AvatarDownloadDialog::AvatarDownloadDialog(QWidget * par, const QString & szUrl) + : QDialog(par) { - setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Avatar Download - KVIrc", "options")); m_szUrl = szUrl; QGridLayout * g = new QGridLayout(this); - m_pOutput = new QLabel(__tr2qs_ctx("Please wait while the avatar is being downloaded","options"),this); - g->addWidget(m_pOutput,0,0,1,2); + m_pOutput = new QLabel(__tr2qs_ctx("Please wait while the avatar is being downloaded", "options"), this); + g->addWidget(m_pOutput, 0, 0, 1, 2); - QPushButton * b = new QPushButton(__tr2qs_ctx("Abort","options"),this); - g->addWidget(b,1,1); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + QPushButton * b = new QPushButton(__tr2qs_ctx("Abort", "options"), this); + g->addWidget(b, 1, 1); + connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked())); m_pRequest = new KviHttpRequest(); - QTimer::singleShot(0,this,SLOT(startDownload())); + QTimer::singleShot(0, this, SLOT(startDownload())); - g->setRowStretch(0,1); - g->setColumnStretch(0,1); + g->setRowStretch(0, 1); + g->setColumnStretch(0, 1); - setMinimumSize(250,120); + setMinimumSize(250, 120); } AvatarDownloadDialog::~AvatarDownloadDialog() @@ -148,35 +148,35 @@ AvatarDownloadDialog::~AvatarDownloadDialog() void AvatarDownloadDialog::startDownload() { - connect(m_pRequest,SIGNAL(terminated(bool)),this,SLOT(downloadTerminated(bool))); - connect(m_pRequest,SIGNAL(status(const QString &)),this,SLOT(downloadMessage(const QString &))); + connect(m_pRequest, SIGNAL(terminated(bool)), this, SLOT(downloadTerminated(bool))); + connect(m_pRequest, SIGNAL(status(const QString &)), this, SLOT(downloadMessage(const QString &))); QString tmp = m_szUrl; g_pIconManager->urlToCachedFileName(tmp); - g_pApp->getLocalKvircDirectory(m_szLocalFileName,KviApplication::Avatars,tmp); + g_pApp->getLocalKvircDirectory(m_szLocalFileName, KviApplication::Avatars, tmp); m_pRequest->setExistingFileAction(KviHttpRequest::RenameExisting); - if(!m_pRequest->get(KviUrl(m_szUrl),KviHttpRequest::StoreToFile,m_szLocalFileName.toUtf8().data())) + if(!m_pRequest->get(KviUrl(m_szUrl), KviHttpRequest::StoreToFile, m_szLocalFileName.toUtf8().data())) { - m_szErrorMessage = __tr2qs_ctx("Failed to start the download","options"); + m_szErrorMessage = __tr2qs_ctx("Failed to start the download", "options"); reject(); } } void AvatarDownloadDialog::closeEvent(QCloseEvent * e) { - m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options"); + m_szErrorMessage = __tr2qs_ctx("Download aborted by user", "options"); e->ignore(); reject(); } void AvatarDownloadDialog::cancelClicked() { - m_szErrorMessage = __tr2qs_ctx("Download aborted by user","options"); + m_szErrorMessage = __tr2qs_ctx("Download aborted by user", "options"); reject(); } -void AvatarDownloadDialog::downloadMessage(const QString &szMsg) +void AvatarDownloadDialog::downloadMessage(const QString & szMsg) { if(!szMsg.isEmpty()) { @@ -190,23 +190,26 @@ void AvatarDownloadDialog::downloadTerminated(bool bSuccess) if(bSuccess) { accept(); - } else { + } + else + { m_szErrorMessage = m_pRequest->lastError(); reject(); } } -AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInitialPath) -: QDialog(par) +AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par, const QString & szInitialPath) + : QDialog(par) { - setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc", "options")); QVBoxLayout * layout = new QVBoxLayout(this); - QString msg = __tr2qs_ctx("Please select an avatar image.\n\n" \ - "The full path to a local file or an image on the Web can be used.\n" \ - "If you wish to use a local image file, click the \"Browse\" button to select the desired file.\n\n" \ - "The full URL for an image (including http:// or https://) can also be entered manually.","options"); + QString msg = __tr2qs_ctx("Please select an avatar image.\n\n" + "The full path to a local file or an image on the Web can be used.\n" + "If you wish to use a local image file, click the \"Browse\" button to select the desired file.\n\n" + "The full URL for an image (including http:// or https://) can also be entered manually.", + "options"); QLabel * l = new QLabel(msg); l->setMinimumWidth(250); @@ -221,12 +224,12 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit QHBoxLayout * pLineEditLayout = new QHBoxLayout; - pLineEditLayout->addWidget(m_pLineEdit,1); + pLineEditLayout->addWidget(m_pLineEdit, 1); - QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options")); + QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...", "options")); b->setFixedWidth(80); - connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked())); - pLineEditLayout->addWidget(b,1); + connect(b, SIGNAL(clicked()), this, SLOT(chooseFileClicked())); + pLineEditLayout->addWidget(b, 1); layout->addLayout(pLineEditLayout); @@ -234,15 +237,15 @@ AvatarSelectionDialog::AvatarSelectionDialog(QWidget * par,const QString &szInit h->setAlignment(Qt::AlignRight); layout->addLayout(h); - b = new QPushButton(__tr2qs_ctx("&OK","options")); + b = new QPushButton(__tr2qs_ctx("&OK", "options")); b->setFixedWidth(80); b->setDefault(true); - connect(b,SIGNAL(clicked()),this,SLOT(okClicked())); + connect(b, SIGNAL(clicked()), this, SLOT(okClicked())); h->addWidget(b); - b = new QPushButton(__tr2qs_ctx("Cancel","options")); + b = new QPushButton(__tr2qs_ctx("Cancel", "options")); b->setFixedWidth(80); - connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); + connect(b, SIGNAL(clicked()), this, SLOT(cancelClicked())); h->addWidget(b); } @@ -264,7 +267,7 @@ void AvatarSelectionDialog::cancelClicked() void AvatarSelectionDialog::chooseFileClicked() { QString tmp; - if(KviFileDialog::askForOpenFileName(tmp,__tr2qs_ctx("Select a File - KVIrc","options"),QString(),KVI_FILTER_IMAGE,false,true,this)) + if(KviFileDialog::askForOpenFileName(tmp, __tr2qs_ctx("Select a File - KVIrc", "options"), QString(), KVI_FILTER_IMAGE, false, true, this)) { m_pLineEdit->setText(tmp); } @@ -276,9 +279,8 @@ void AvatarSelectionDialog::closeEvent(QCloseEvent * e) reject(); } - OptionsWidget_identity::OptionsWidget_identity(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { } @@ -286,121 +288,128 @@ OptionsWidget_identity::~OptionsWidget_identity() { } - KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2); m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3); m_szAltNicknames[2] = KVI_OPTION_STRING(KviOption_stringNickname4); - createLayout(); layout()->setMargin(10); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options")); + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Basic Properties", "options")); KviTalHBox * hb = new KviTalHBox(gbox); - KviStringSelector * sel = addStringSelector(hb,__tr2qs_ctx("Nickname:","options"),KviOption_stringNickname1); + KviStringSelector * sel = addStringSelector(hb, __tr2qs_ctx("Nickname:", "options"), KviOption_stringNickname1); sel->setMinimumLabelWidth(120); - mergeTip(sel,__tr2qs_ctx("Your nickname is your primary form of identification on IRC.
" \ - "Since servers cannot accept multiple users sharing the same nickname " \ - "(case insensitive), you can provide alternative nicknames to be used in case "\ - "the server refuses to accept the default one.","options")); + mergeTip(sel, __tr2qs_ctx("Your nickname is your primary form of identification on IRC.
" + "Since servers cannot accept multiple users sharing the same nickname " + "(case insensitive), you can provide alternative nicknames to be used in case " + "the server refuses to accept the default one.", + "options")); - QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),hb); + QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"), hb); sel->setValidator(v); - QPushButton * pb = new QPushButton(__tr2qs_ctx("Alternatives...","options"),hb); - connect(pb,SIGNAL(clicked()),this,SLOT(setNickAlternatives())); + QPushButton * pb = new QPushButton(__tr2qs_ctx("Alternatives...", "options"), hb); + connect(pb, SIGNAL(clicked()), this, SLOT(setNickAlternatives())); - sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername); + sel = addStringSelector(gbox, __tr2qs_ctx("Username:", "options"), KviOption_stringUsername); sel->setMinimumLabelWidth(120); - mergeTip(sel,__tr2qs_ctx("This is the username that you will use to connect to the server.
" \ - "In the past, it was used as a form of authentication, but it normally has no special use now.
" \ - "In addition to your nickname, you are identified on IRC by your username@hostname.
" \ - "Basically, you can enter any word you like here.","options")); + mergeTip(sel, __tr2qs_ctx("This is the username that you will use to connect to the server.
" + "In the past, it was used as a form of authentication, but it normally has no special use now.
" + "In addition to your nickname, you are identified on IRC by your username@hostname.
" + "Basically, you can enter any word you like here.", + "options")); - sel = addStringSelector(gbox,__tr2qs_ctx("Real name:","options"),KviOption_stringRealname); + sel = addStringSelector(gbox, __tr2qs_ctx("Real name:", "options"), KviOption_stringRealname); sel->setMinimumLabelWidth(120); - mergeTip(sel,__tr2qs_ctx("This text will appear when someone does a /WHOIS on you.
" \ - "It is intended to be your real name, but people tend to put random quotes and phrases here too.","options")); - + mergeTip(sel, __tr2qs_ctx("This text will appear when someone does a /WHOIS on you.
" + "It is intended to be your real name, but people tend to put random quotes and phrases here too.", + "options")); - QString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.","options"); + QString szOptionalCtcpUserInfo = __tr2qs_ctx("This field is optional and will appear as part of the CTCP USERINFO reply.", "options"); QString szTrailing = "

" + szOptionalCtcpUserInfo; - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Profile","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Profile", "options")); hb = new KviTalHBox(gbox); - QLabel * l = new QLabel(__tr2qs_ctx("Age:","options"),hb); + QLabel * l = new QLabel(__tr2qs_ctx("Age:", "options"), hb); l->setMinimumWidth(120); m_pAgeCombo = new QComboBox(hb); - QString szTip1 = __tr2qs_ctx("Here you can specify your age.","options") + szTrailing; - KviTalToolTip::add(l,szTip1); - KviTalToolTip::add(m_pAgeCombo,szTip1); - m_pAgeCombo->addItem(__tr2qs_ctx("Unspecified","options")); + QString szTip1 = __tr2qs_ctx("Here you can specify your age.", "options") + szTrailing; + KviTalToolTip::add(l, szTip1); + KviTalToolTip::add(m_pAgeCombo, szTip1); + m_pAgeCombo->addItem(__tr2qs_ctx("Unspecified", "options")); unsigned int i; - for(i=1;i<120;i++) + for(i = 1; i < 120; i++) { QString tmp; tmp.setNum(i); - m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp); + m_pAgeCombo->insertItem(m_pAgeCombo->count(), tmp); } bool bOk; i = KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).toUInt(&bOk); - if(!bOk)i = 0; - if(i > 120)i = 120; + if(!bOk) + i = 0; + if(i > 120) + i = 120; m_pAgeCombo->setCurrentIndex(i); - hb->setStretchFactor(m_pAgeCombo,1); - + hb->setStretchFactor(m_pAgeCombo, 1); hb = new KviTalHBox(gbox); - l = new QLabel(__tr2qs_ctx("Gender:","options"),hb); + l = new QLabel(__tr2qs_ctx("Gender:", "options"), hb); l->setMinimumWidth(120); m_pGenderCombo = new QComboBox(hb); - QString szTip2 = __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing; - KviTalToolTip::add(l,szTip2); - KviTalToolTip::add(m_pGenderCombo,szTip2); - m_pGenderCombo->addItem(__tr2qs_ctx("Unspecified","options")); - m_pGenderCombo->addItem(__tr2qs_ctx("Female","options")); - m_pGenderCombo->addItem(__tr2qs_ctx("Male","options")); - - if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male")) + QString szTip2 = __tr2qs_ctx("Here you can specify your gender.", "options") + szTrailing; + KviTalToolTip::add(l, szTip2); + KviTalToolTip::add(m_pGenderCombo, szTip2); + m_pGenderCombo->addItem(__tr2qs_ctx("Unspecified", "options")); + m_pGenderCombo->addItem(__tr2qs_ctx("Female", "options")); + m_pGenderCombo->addItem(__tr2qs_ctx("Male", "options")); + + if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender), "Male")) m_pGenderCombo->setCurrentIndex(2); - else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female")) + else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender), "Female")) m_pGenderCombo->setCurrentIndex(1); else m_pGenderCombo->setCurrentIndex(0); - hb->setStretchFactor(m_pGenderCombo,1); + hb->setStretchFactor(m_pGenderCombo, 1); - sel = addStringSelector(gbox,__tr2qs_ctx("Location:","options"),KviOption_stringCtcpUserInfoLocation); + sel = addStringSelector(gbox, __tr2qs_ctx("Location:", "options"), KviOption_stringCtcpUserInfoLocation); sel->setMinimumLabelWidth(120); - mergeTip(sel, __tr2qs_ctx("You can describe here your approximate physical location. " \ - "Something like \"Region, Country\" will be OK. Please note that this information will be viewable " \ - "by anyone so putting more data (like the exact address), generally, is not a good idea.","options") + szTrailing); + mergeTip(sel, __tr2qs_ctx("You can describe here your approximate physical location. " + "Something like \"Region, Country\" will be OK. Please note that this information will be viewable " + "by anyone so putting more data (like the exact address), generally, is not a good idea.", + "options") + + szTrailing); - sel = addStringSelector(gbox,__tr2qs_ctx("Languages:","options"),KviOption_stringCtcpUserInfoLanguages); + sel = addStringSelector(gbox, __tr2qs_ctx("Languages:", "options"), KviOption_stringCtcpUserInfoLanguages); sel->setMinimumLabelWidth(120); - mergeTip(sel, __tr2qs_ctx("You can put here the short names of the languages you can speak. " \ - "An example might be \"EN, IT\" that would mean that you speak both Italian and English.","options") + szTrailing); + mergeTip(sel, __tr2qs_ctx("You can put here the short names of the languages you can speak. " + "An example might be \"EN, IT\" that would mean that you speak both Italian and English.", + "options") + + szTrailing); - sel = addStringSelector(gbox,__tr2qs_ctx("Other:","options"),KviOption_stringCtcpUserInfoOther); + sel = addStringSelector(gbox, __tr2qs_ctx("Other:", "options"), KviOption_stringCtcpUserInfoOther); sel->setMinimumLabelWidth(120); - mergeTip(sel, __tr2qs_ctx("You can put here some additional personal data. " \ - "It might be a funny quote or your homepage URL... " \ - "Please note that this information will be viewable " \ - "by anyone so don't put any sensible data (passwords, telephone or credit card numbers).","options") + szTrailing); + mergeTip(sel, __tr2qs_ctx("You can put here some additional personal data. " + "It might be a funny quote or your homepage URL... " + "Please note that this information will be viewable " + "by anyone so don't put any sensible data (passwords, telephone or credit card numbers).", + "options") + + szTrailing); - addRowSpacer(0,2,0,2); + addRowSpacer(0, 2, 0, 2); } KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget() @@ -409,9 +418,10 @@ KviIdentityGeneralOptionsWidget::~KviIdentityGeneralOptionsWidget() void KviIdentityGeneralOptionsWidget::setNickAlternatives() { - NickAlternativesDialog * dlg = new NickAlternativesDialog(this,m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]); - if(dlg->exec() != QDialog::Accepted)return; - dlg->fill(m_szAltNicknames[0],m_szAltNicknames[1],m_szAltNicknames[2]); + NickAlternativesDialog * dlg = new NickAlternativesDialog(this, m_szAltNicknames[0], m_szAltNicknames[1], m_szAltNicknames[2]); + if(dlg->exec() != QDialog::Accepted) + return; + dlg->fill(m_szAltNicknames[0], m_szAltNicknames[1], m_szAltNicknames[2]); delete dlg; } @@ -419,39 +429,44 @@ void KviIdentityGeneralOptionsWidget::commit() { KviOptionsWidget::commit(); - if(KVI_OPTION_STRING(KviOption_stringRealname).isEmpty()) KVI_OPTION_STRING(KviOption_stringRealname)=KVI_DEFAULT_REALNAME; - if(KVI_OPTION_STRING(KviOption_stringUsername).isEmpty()) KVI_OPTION_STRING(KviOption_stringUsername)=KVI_DEFAULT_USERNAME; + if(KVI_OPTION_STRING(KviOption_stringRealname).isEmpty()) + KVI_OPTION_STRING(KviOption_stringRealname) = KVI_DEFAULT_REALNAME; + if(KVI_OPTION_STRING(KviOption_stringUsername).isEmpty()) + KVI_OPTION_STRING(KviOption_stringUsername) = KVI_DEFAULT_USERNAME; KVI_OPTION_STRING(KviOption_stringNickname2) = m_szAltNicknames[0]; KVI_OPTION_STRING(KviOption_stringNickname3) = m_szAltNicknames[1]; KVI_OPTION_STRING(KviOption_stringNickname4) = m_szAltNicknames[2]; - int i = m_pAgeCombo->currentIndex(); - if(i < 0)i = 0; - if(i > 120)i = 120; - if(i <= 0)KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = ""; - else KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).setNum(i); + if(i < 0) + i = 0; + if(i > 120) + i = 120; + if(i <= 0) + KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = ""; + else + KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) + .setNum(i); switch(m_pGenderCombo->currentIndex()) { case 1: // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Female"; - break; + break; case 2: // this should be in English KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = "Male"; - break; + break; default: KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender) = ""; - break; + break; } } - OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { createLayout(); layout()->setMargin(10); @@ -460,42 +475,43 @@ OptionsWidget_identityAvatar::OptionsWidget_identityAvatar(QWidget * parent) bool bHaveAvatar = (!KVI_OPTION_STRING(KviOption_stringMyAvatar).isEmpty()) && m_pLocalAvatar->pixmap(); - QString szTip = __tr2qs_ctx("Here you can choose your avatar image.
" \ - "It will be visible by other people that request it.
" \ - "Choose a nice image of yourself, possibly avoiding obscenity and offending images.
" \ - "A good idea is to choose a relatively small file of around 150 Kb max, because " \ - "most clients have a limit on the size of avatars being downloaded.
" \ - "The image also should be smaller than 800x600 pixels since it will have to be viewable in everyone's monitor.","options"); + QString szTip = __tr2qs_ctx("Here you can choose your avatar image.
" + "It will be visible by other people that request it.
" + "Choose a nice image of yourself, possibly avoiding obscenity and offending images.
" + "A good idea is to choose a relatively small file of around 150 Kb max, because " + "most clients have a limit on the size of avatars being downloaded.
" + "The image also should be smaller than 800x600 pixels since it will have to be viewable in everyone's monitor.", + "options"); - m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar:","options"),this); - addWidgetToLayout(m_pUseAvatarCheck,0,0,0,0); + m_pUseAvatarCheck = new QCheckBox(__tr2qs_ctx("Use avatar:", "options"), this); + addWidgetToLayout(m_pUseAvatarCheck, 0, 0, 0, 0); m_pUseAvatarCheck->setChecked(bHaveAvatar); - mergeTip(m_pUseAvatarCheck,szTip); + mergeTip(m_pUseAvatarCheck, szTip); m_pAvatarPreview = new KviPixmapPreview(this); - addWidgetToLayout(m_pAvatarPreview,0,1,0,1); + addWidgetToLayout(m_pAvatarPreview, 0, 1, 0, 1); m_pAvatarPreview->setPixmap(m_pLocalAvatar); m_pAvatarPreview->setEnabled(bHaveAvatar); - connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarPreview,SLOT(setEnabled(bool))); - mergeTip(m_pAvatarPreview,szTip); + connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pAvatarPreview, SLOT(setEnabled(bool))); + mergeTip(m_pAvatarPreview, szTip); KviTalHBox * hb = new KviTalHBox(this); hb->setSpacing(4); - addWidgetToLayout(hb,0,2,0,2); + addWidgetToLayout(hb, 0, 2, 0, 2); m_pAvatarNameEdit = new QLineEdit(hb); m_pAvatarNameEdit->setReadOnly(true); m_pAvatarNameEdit->setEnabled(bHaveAvatar); m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar)); - connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pAvatarNameEdit,SLOT(setEnabled(bool))); + connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pAvatarNameEdit, SLOT(setEnabled(bool))); - m_pChooseAvatarButton = new QPushButton(__tr2qs_ctx("Choose...","options"),hb); + m_pChooseAvatarButton = new QPushButton(__tr2qs_ctx("Choose...", "options"), hb); m_pChooseAvatarButton->setEnabled(bHaveAvatar); - connect(m_pUseAvatarCheck,SIGNAL(toggled(bool)),m_pChooseAvatarButton,SLOT(setEnabled(bool))); + connect(m_pUseAvatarCheck, SIGNAL(toggled(bool)), m_pChooseAvatarButton, SLOT(setEnabled(bool))); - connect(m_pChooseAvatarButton,SIGNAL(clicked()),this,SLOT(chooseAvatar())); + connect(m_pChooseAvatarButton, SIGNAL(clicked()), this, SLOT(chooseAvatar())); - layout()->setRowStretch(1,2); + layout()->setRowStretch(1, 2); } OptionsWidget_identityAvatar::~OptionsWidget_identityAvatar() @@ -513,7 +529,9 @@ void OptionsWidget_identityAvatar::commit(void) { KVI_OPTION_STRING(KviOption_stringMyAvatar) = szAvatarName; KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar) = *m_pLocalAvatar; - } else { + } + else + { KVI_OPTION_STRING(KviOption_stringMyAvatar) = ""; KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar) = KviPixmap(); } @@ -524,20 +542,21 @@ void OptionsWidget_identityAvatar::chooseAvatar() { QString szCurrent = m_pAvatarNameEdit->text(); - AvatarSelectionDialog dlg(this,szCurrent); - if(dlg.exec() != QDialog::Accepted)return; + AvatarSelectionDialog dlg(this, szCurrent); + if(dlg.exec() != QDialog::Accepted) + return; szCurrent = dlg.avatarName().trimmed(); - if(KviQString::equalCIN(szCurrent,"http://",7) || KviQString::equalCIN(szCurrent,"https://",8)) + if(KviQString::equalCIN(szCurrent, "http://", 7) || KviQString::equalCIN(szCurrent, "https://", 8)) { // this is a url // first check if we have it in the cache - KviAvatar * a = g_pIconManager->getAvatar(QString(),szCurrent); + KviAvatar * a = g_pIconManager->getAvatar(QString(), szCurrent); if(!a) { // no cache... try downloading - AvatarDownloadDialog dlg(this,szCurrent); + AvatarDownloadDialog dlg(this, szCurrent); if(dlg.exec() == QDialog::Accepted) { // downloaded! @@ -546,25 +565,35 @@ void OptionsWidget_identityAvatar::chooseAvatar() { // unloadable szCurrent = ""; - QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"), - __tr2qs_ctx("Failed to load the avatar image.
" \ - "It may be an inaccessible file or an " \ - "unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton); + QMessageBox::warning(this, __tr2qs_ctx("Failed to Load Avatar - KVIrc", "options"), + __tr2qs_ctx("Failed to load the avatar image.
" + "It may be an inaccessible file or an " + "unsupported image format.", + "options"), + QMessageBox::Ok, QMessageBox::NoButton); } // else loaded! - } else { + } + else + { // unloadable - QString szTmp = QString(__tr2qs_ctx("Failed to download the avatar image.
" \ - "%1","options")).arg(dlg.errorMessage()); - QMessageBox::warning(this,__tr2qs_ctx("Avatar Download Failed - KVIrc","options"),szTmp,QMessageBox::Ok,QMessageBox::NoButton); + QString szTmp = QString(__tr2qs_ctx("Failed to download the avatar image.
" + "%1", + "options")) + .arg(dlg.errorMessage()); + QMessageBox::warning(this, __tr2qs_ctx("Avatar Download Failed - KVIrc", "options"), szTmp, QMessageBox::Ok, QMessageBox::NoButton); szCurrent = ""; m_pLocalAvatar->setNull(); } - } else { + } + else + { // else OK.. got it in the cache - m_pLocalAvatar->set(*(a->pixmap()),a->localPath()); + m_pLocalAvatar->set(*(a->pixmap()), a->localPath()); delete a; } - } else { + } + else + { // this is a local path if(m_pLocalAvatar->load(szCurrent)) { @@ -582,12 +611,16 @@ void OptionsWidget_identityAvatar::chooseAvatar() szCurrent = tmp.right(tmp.length() - (idx + 1)); tmp = szCurrent; } - } else { + } + else + { // unloadable - QMessageBox::warning(this,__tr2qs_ctx("Failed to Load Avatar - KVIrc","options"), - __tr2qs_ctx("Failed to load the avatar image.
" \ - "It may be an inaccessible file or an " \ - "unsupported image format.","options"),QMessageBox::Ok,QMessageBox::NoButton); + QMessageBox::warning(this, __tr2qs_ctx("Failed to Load Avatar - KVIrc", "options"), + __tr2qs_ctx("Failed to load the avatar image.
" + "It may be an inaccessible file or an " + "unsupported image format.", + "options"), + QMessageBox::Ok, QMessageBox::NoButton); szCurrent = ""; } } @@ -597,32 +630,30 @@ void OptionsWidget_identityAvatar::chooseAvatar() if((m_pLocalAvatar->pixmap()->width() > 1024) || (m_pLocalAvatar->pixmap()->height() > 768)) { QMessageBox::warning( - this, - __tr2qs_ctx("File Dimensions - KVIrc","options"), - __tr2qs_ctx( - "The avatar you have chosen is bigger than 1024x768 pixels.
" \ - "Such a big image will not be seen on all the user monitors
" \ - "and will probably be scaled by the remote clients with poor quality
" \ - "algorithms to improve performance. You *should* scale it manually
" \ - "to a sane size (like 800x600) or choose a different image.", - "options" - ) - ); - } else { + this, + __tr2qs_ctx("File Dimensions - KVIrc", "options"), + __tr2qs_ctx( + "The avatar you have chosen is bigger than 1024x768 pixels.
" + "Such a big image will not be seen on all the user monitors
" + "and will probably be scaled by the remote clients with poor quality
" + "algorithms to improve performance. You *should* scale it manually
" + "to a sane size (like 800x600) or choose a different image.", + "options")); + } + else + { QFileInfo inf(m_pLocalAvatar->path()); if(inf.size() > 524288) { QMessageBox::warning( - this, - __tr2qs_ctx("File Size - KVIrc","options"), - __tr2qs_ctx( - "The avatar you have chosen is bigger than 500 KiB
" \ - "and most clients will refuse to download it.
" \ - "You *should* either scale it, use a different storage
" \ - "format or choose a different image.", - "options" - ) - ); + this, + __tr2qs_ctx("File Size - KVIrc", "options"), + __tr2qs_ctx( + "The avatar you have chosen is bigger than 500 KiB
" + "and most clients will refuse to download it.
" + "You *should* either scale it, use a different storage
" + "format or choose a different image.", + "options")); } } } @@ -631,13 +662,12 @@ void OptionsWidget_identityAvatar::chooseAvatar() m_pAvatarPreview->setPixmap(m_pLocalAvatar); } - OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { - m_pISelector=0; - m_pWSelector=0; - m_pSSelector=0; + m_pISelector = 0; + m_pWSelector = 0; + m_pSSelector = 0; m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode); m_bI = m_sModeStr.contains('i'); @@ -647,25 +677,27 @@ OptionsWidget_identityAdvanced::OptionsWidget_identityAdvanced(QWidget * parent) createLayout(); layout()->setMargin(10); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("User Mode","options")); - m_pISelector = addBoolSelector(gbox,__tr2qs_ctx("Invisible (+i)","options"),&m_bI); - m_pSSelector = addBoolSelector(gbox,__tr2qs_ctx("Server notices (+s)","options"),&m_bS); - m_pWSelector = addBoolSelector(gbox,__tr2qs_ctx("WALLOPS (+w)","options"),&m_bW); + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("User Mode", "options")); + m_pISelector = addBoolSelector(gbox, __tr2qs_ctx("Invisible (+i)", "options"), &m_bI); + m_pSSelector = addBoolSelector(gbox, __tr2qs_ctx("Server notices (+s)", "options"), &m_bS); + m_pWSelector = addBoolSelector(gbox, __tr2qs_ctx("WALLOPS (+w)", "options"), &m_bW); - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Default Messages","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Default Messages", "options")); - KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:","options"),KviOption_stringPartMessage); + KviStringSelector * sel = addStringSelector(gbox, __tr2qs_ctx("Part message:", "options"), KviOption_stringPartMessage); sel->setMinimumLabelWidth(120); - mergeTip(sel,__tr2qs_ctx("This is the default part message that will be used when you " \ - "leave a channel by closing a channel window.","options")); + mergeTip(sel, __tr2qs_ctx("This is the default part message that will be used when you " + "leave a channel by closing a channel window.", + "options")); - sel = addStringSelector(gbox, __tr2qs_ctx("Quit message:","options"),KviOption_stringQuitMessage); + sel = addStringSelector(gbox, __tr2qs_ctx("Quit message:", "options"), KviOption_stringQuitMessage); sel->setMinimumLabelWidth(120); - mergeTip(sel,__tr2qs_ctx("This is the default quit message that will be used when you " \ - "quit your IRC session by closing the console window or disconnecting by pressing the disconnect button.","options")); + mergeTip(sel, __tr2qs_ctx("This is the default quit message that will be used when you " + "quit your IRC session by closing the console window or disconnecting by pressing the disconnect button.", + "options")); - addRowSpacer(0,2,0,2); + addRowSpacer(0, 2, 0, 2); } OptionsWidget_identityAdvanced::~OptionsWidget_identityAdvanced() @@ -677,14 +709,16 @@ void OptionsWidget_identityAdvanced::commit() KviOptionsWidget::commit(); m_sModeStr = m_bI ? "i" : ""; - if(m_bS)m_sModeStr += "s"; - if(m_bW)m_sModeStr += "w"; + if(m_bS) + m_sModeStr += "s"; + if(m_bW) + m_sModeStr += "w"; KVI_OPTION_STRING(KviOption_stringDefaultUserMode) = m_sModeStr.ptr(); } OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { setObjectName("identity_profiles_option_widget"); m_pEditor = 0; @@ -696,11 +730,11 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) KviIdentityProfileSet * pSet = KviIdentityProfileSet::instance(); bool bEnabled = pSet ? (pSet->isEnabled() && !pSet->isEmpty()) : false; - m_pProfilesCheck = new QCheckBox(__tr2qs_ctx("Enable network profiles","options"),this); - KviTalToolTip::add(m_pProfilesCheck,__tr2qs_ctx("This check enables the use of network profiles","options")); + m_pProfilesCheck = new QCheckBox(__tr2qs_ctx("Enable network profiles", "options"), this); + KviTalToolTip::add(m_pProfilesCheck, __tr2qs_ctx("This check enables the use of network profiles", "options")); m_pProfilesCheck->setChecked(bEnabled); - pLayout->addWidget(m_pProfilesCheck,0,0,1,3); - connect(m_pProfilesCheck,SIGNAL(toggled(bool)),this,SLOT(toggleControls())); + pLayout->addWidget(m_pProfilesCheck, 0, 0, 1, 3); + connect(m_pProfilesCheck, SIGNAL(toggled(bool)), this, SLOT(toggleControls())); // Profiles list m_pTreeWidget = new QTreeWidget(this); @@ -708,36 +742,37 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) m_pTreeWidget->setAllColumnsShowFocus(true); QStringList labels; - labels.append(__tr2qs_ctx("Name","options")); - labels.append(__tr2qs_ctx("Network","options")); - labels.append(__tr2qs_ctx("Nickname","options")); - labels.append(__tr2qs_ctx("Alt. nickname","options")); - labels.append(__tr2qs_ctx("Username","options")); - labels.append(__tr2qs_ctx("Real name","options")); + labels.append(__tr2qs_ctx("Name", "options")); + labels.append(__tr2qs_ctx("Network", "options")); + labels.append(__tr2qs_ctx("Nickname", "options")); + labels.append(__tr2qs_ctx("Alt. nickname", "options")); + labels.append(__tr2qs_ctx("Username", "options")); + labels.append(__tr2qs_ctx("Real name", "options")); m_pTreeWidget->setHeaderLabels(labels); - KviTalToolTip::add(m_pTreeWidget, \ - __tr2qs_ctx("This is a set of rules to use profiles.
" \ - "KVIrc will use them to handle the user connection " \ - "data before the data is sent to the IRC server.
" \ - "This is useful if a user wants to use different data " \ - "on different networks without changing them at every " \ - "connection attempt.","options")); - pLayout->addWidget(m_pTreeWidget,1,0,1,3); - connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(toggleControls())); + KviTalToolTip::add(m_pTreeWidget, + __tr2qs_ctx("This is a set of rules to use profiles.
" + "KVIrc will use them to handle the user connection " + "data before the data is sent to the IRC server.
" + "This is useful if a user wants to use different data " + "on different networks without changing them at every " + "connection attempt.", + "options")); + pLayout->addWidget(m_pTreeWidget, 1, 0, 1, 3); + connect(m_pTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(toggleControls())); // Buttons box KviTalHBox * pBtnBox = new KviTalHBox(this); - pLayout->addWidget(pBtnBox,2,0,1,3); + pLayout->addWidget(pBtnBox, 2, 0, 1, 3); - m_pBtnAddProfile = new QPushButton(__tr2qs_ctx("Add Profile","options"),pBtnBox); - connect(m_pBtnAddProfile,SIGNAL(clicked()),this,SLOT(addProfileEntry())); + m_pBtnAddProfile = new QPushButton(__tr2qs_ctx("Add Profile", "options"), pBtnBox); + connect(m_pBtnAddProfile, SIGNAL(clicked()), this, SLOT(addProfileEntry())); - m_pBtnEditProfile = new QPushButton(__tr2qs_ctx("Edit Profile","options"),pBtnBox); - connect(m_pBtnEditProfile,SIGNAL(clicked()),this,SLOT(editProfileEntry())); + m_pBtnEditProfile = new QPushButton(__tr2qs_ctx("Edit Profile", "options"), pBtnBox); + connect(m_pBtnEditProfile, SIGNAL(clicked()), this, SLOT(editProfileEntry())); - m_pBtnDelProfile = new QPushButton(__tr2qs_ctx("Delete Profile","options"),pBtnBox); - connect(m_pBtnDelProfile,SIGNAL(clicked()),this,SLOT(delProfileEntry())); + m_pBtnDelProfile = new QPushButton(__tr2qs_ctx("Delete Profile", "options"), pBtnBox); + connect(m_pBtnDelProfile, SIGNAL(clicked()), this, SLOT(delProfileEntry())); // Fill in the treewidget if(pSet && pSet->profiles()) @@ -747,12 +782,12 @@ OptionsWidget_identityProfile::OptionsWidget_identityProfile(QWidget * pParent) for(KviIdentityProfile * pProfile = pList->first(); pProfile; pProfile = pList->next()) { pItem = new QTreeWidgetItem(m_pTreeWidget); - pItem->setText(0,pProfile->name()); - pItem->setText(1,pProfile->network()); - pItem->setText(2,pProfile->nick()); - pItem->setText(3,pProfile->altNick()); - pItem->setText(4,pProfile->userName()); - pItem->setText(5,pProfile->realName()); + pItem->setText(0, pProfile->name()); + pItem->setText(1, pProfile->network()); + pItem->setText(2, pProfile->nick()); + pItem->setText(3, pProfile->altNick()); + pItem->setText(4, pProfile->userName()); + pItem->setText(5, pProfile->realName()); } } @@ -786,12 +821,12 @@ void OptionsWidget_identityProfile::addProfileEntry() if(m_pEditor->editProfile(&profile)) { QTreeWidgetItem * pItem = new QTreeWidgetItem(m_pTreeWidget); - pItem->setText(0,profile.name()); - pItem->setText(1,profile.network()); - pItem->setText(2,profile.nick()); - pItem->setText(3,profile.altNick()); - pItem->setText(4,profile.userName()); - pItem->setText(5,profile.realName()); + pItem->setText(0, profile.name()); + pItem->setText(1, profile.network()); + pItem->setText(2, profile.nick()); + pItem->setText(3, profile.altNick()); + pItem->setText(4, profile.userName()); + pItem->setText(5, profile.realName()); } } @@ -810,29 +845,29 @@ void OptionsWidget_identityProfile::editProfileEntry() profile.setUserName(pItem->text(4)); profile.setRealName(pItem->text(5)); - m_iCurrentEditedProfile=m_pTreeWidget->indexOfTopLevelItem(pItem); + m_iCurrentEditedProfile = m_pTreeWidget->indexOfTopLevelItem(pItem); if(m_pEditor) delete m_pEditor; m_pEditor = new IdentityProfileEditor(this); if(m_pEditor->editProfile(&profile)) { - pItem->setText(0,profile.name()); - pItem->setText(1,profile.network()); - pItem->setText(2,profile.nick()); - pItem->setText(3,profile.altNick()); - pItem->setText(4,profile.userName()); - pItem->setText(5,profile.realName()); + pItem->setText(0, profile.name()); + pItem->setText(1, profile.network()); + pItem->setText(2, profile.nick()); + pItem->setText(3, profile.altNick()); + pItem->setText(4, profile.userName()); + pItem->setText(5, profile.realName()); } } void OptionsWidget_identityProfile::editProfileOkPressed() { - for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - if(m_pEditor->m_pNameEdit->text() == m_pTreeWidget->topLevelItem(i)->text(0) && i!=m_iCurrentEditedProfile) + if(m_pEditor->m_pNameEdit->text() == m_pTreeWidget->topLevelItem(i)->text(0) && i != m_iCurrentEditedProfile) { - QMessageBox::warning(this,__tr2qs_ctx("Invalid Profile Rule - KVIrc","options"),__tr2qs_ctx("There is already a profile with that name","options"),__tr2qs_ctx("OK","options")); + QMessageBox::warning(this, __tr2qs_ctx("Invalid Profile Rule - KVIrc", "options"), __tr2qs_ctx("There is already a profile with that name", "options"), __tr2qs_ctx("OK", "options")); return; } } @@ -857,7 +892,7 @@ void OptionsWidget_identityProfile::commit() { KviIdentityProfileSet::instance()->setEnabled(m_pProfilesCheck->isChecked()); QTreeWidgetItem * pItem; - for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { pItem = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); @@ -877,69 +912,69 @@ void OptionsWidget_identityProfile::commit() } IdentityProfileEditor::IdentityProfileEditor(QWidget * pParent) -: QDialog(pParent) + : QDialog(pParent) { setObjectName("identity_profile_editor"); - setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Profile Editor - KVIrc", "options")); QGridLayout * pLayout = new QGridLayout(this); - QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:","options"),this); - pLayout->addWidget(pLabel,0,0); + QLabel * pLabel = new QLabel(__tr2qs_ctx("Profile name:", "options"), this); + pLayout->addWidget(pLabel, 0, 0); m_pNameEdit = new QLineEdit(this); - KviTalToolTip::add(m_pNameEdit,__tr2qs_ctx("Put here the name of the profile","options")); - pLayout->addWidget(m_pNameEdit,0,1,1,2); - connect(m_pNameEdit,SIGNAL(textChanged(const QString &)),this,SLOT(toggleButton())); + KviTalToolTip::add(m_pNameEdit, __tr2qs_ctx("Put here the name of the profile", "options")); + pLayout->addWidget(m_pNameEdit, 0, 1, 1, 2); + connect(m_pNameEdit, SIGNAL(textChanged(const QString &)), this, SLOT(toggleButton())); - pLabel = new QLabel(__tr2qs_ctx("Network name:","options"),this); - pLayout->addWidget(pLabel,1,0); + pLabel = new QLabel(__tr2qs_ctx("Network name:", "options"), this); + pLayout->addWidget(pLabel, 1, 0); m_pNetworkEdit = new QLineEdit(this); - KviTalToolTip::add(m_pNetworkEdit,__tr2qs_ctx("Put here the name of the network","options")); - pLayout->addWidget(m_pNetworkEdit,1,1,1,2); + KviTalToolTip::add(m_pNetworkEdit, __tr2qs_ctx("Put here the name of the network", "options")); + pLayout->addWidget(m_pNetworkEdit, 1, 1, 1, 2); - pLabel = new QLabel(__tr2qs_ctx("Nickname:","options"),this); - pLayout->addWidget(pLabel,2,0); + pLabel = new QLabel(__tr2qs_ctx("Nickname:", "options"), this); + pLayout->addWidget(pLabel, 2, 0); m_pNickEdit = new QLineEdit(this); - KviTalToolTip::add(m_pNickEdit,__tr2qs_ctx("Put here the nickname you want to use","options")); - pLayout->addWidget(m_pNickEdit,2,1,1,2); + KviTalToolTip::add(m_pNickEdit, __tr2qs_ctx("Put here the nickname you want to use", "options")); + pLayout->addWidget(m_pNickEdit, 2, 1, 1, 2); - pLabel = new QLabel(__tr2qs_ctx("Alt. nickname:","options"),this); - pLayout->addWidget(pLabel,3,0); + pLabel = new QLabel(__tr2qs_ctx("Alt. nickname:", "options"), this); + pLayout->addWidget(pLabel, 3, 0); m_pAltNickEdit = new QLineEdit(this); - KviTalToolTip::add(m_pAltNickEdit,__tr2qs_ctx("Put here the alternative nickname you want to use","options")); - pLayout->addWidget(m_pAltNickEdit,3,1,1,2); + KviTalToolTip::add(m_pAltNickEdit, __tr2qs_ctx("Put here the alternative nickname you want to use", "options")); + pLayout->addWidget(m_pAltNickEdit, 3, 1, 1, 2); - pLabel = new QLabel(__tr2qs_ctx("Username:","options"),this); - pLayout->addWidget(pLabel,4,0); + pLabel = new QLabel(__tr2qs_ctx("Username:", "options"), this); + pLayout->addWidget(pLabel, 4, 0); m_pUserNameEdit = new QLineEdit(this); - KviTalToolTip::add(m_pUserNameEdit,__tr2qs_ctx("Put here the username you want to use","options")); - pLayout->addWidget(m_pUserNameEdit,4,1,1,2); + KviTalToolTip::add(m_pUserNameEdit, __tr2qs_ctx("Put here the username you want to use", "options")); + pLayout->addWidget(m_pUserNameEdit, 4, 1, 1, 2); - pLabel = new QLabel(__tr2qs_ctx("Real name:","options"),this); - pLayout->addWidget(pLabel,5,0); + pLabel = new QLabel(__tr2qs_ctx("Real name:", "options"), this); + pLayout->addWidget(pLabel, 5, 0); m_pRealNameEdit = new QLineEdit(this); - KviTalToolTip::add(m_pRealNameEdit,__tr2qs_ctx("Put here the real name you want to use","options")); - pLayout->addWidget(m_pRealNameEdit,5,1,1,2); + KviTalToolTip::add(m_pRealNameEdit, __tr2qs_ctx("Put here the real name you want to use", "options")); + pLayout->addWidget(m_pRealNameEdit, 5, 1, 1, 2); KviTalHBox * pBox = new KviTalHBox(this); pBox->setAlignment(Qt::AlignRight); - pLayout->addWidget(pBox,6,1,1,2); + pLayout->addWidget(pBox, 6, 1, 1, 2); - QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel","options"),pBox); + QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel", "options"), pBox); //p->setMinimumWidth(100); - connect(p,SIGNAL(clicked()),this,SLOT(reject())); + connect(p, SIGNAL(clicked()), this, SLOT(reject())); - m_pBtnOk = new QPushButton(__tr2qs_ctx("OK","options"),pBox); + m_pBtnOk = new QPushButton(__tr2qs_ctx("OK", "options"), pBox); m_pBtnOk->setEnabled(false); - connect(m_pBtnOk,SIGNAL(clicked()),pParent,SLOT(editProfileOkPressed())); + connect(m_pBtnOk, SIGNAL(clicked()), pParent, SLOT(editProfileOkPressed())); - pLayout->setColumnStretch(1,1); + pLayout->setColumnStretch(1, 1); setMinimumWidth(250); @@ -964,7 +999,8 @@ bool IdentityProfileEditor::editProfile(KviIdentityProfile * pProfile) m_pNameEdit->selectAll(); // Show the dialog - if(exec() != QDialog::Accepted) return false; + if(exec() != QDialog::Accepted) + return false; // Store data in the object pProfile->setName(m_pNameEdit->text()); diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h index 86820871d..9e63450f1 100644 --- a/src/modules/options/OptionsWidget_identity.h +++ b/src/modules/options/OptionsWidget_identity.h @@ -26,7 +26,6 @@ // //============================================================================= - #include "KviOptionsWidget.h" #include "kvi_settings.h" #include "KviSelectors.h" @@ -47,14 +46,16 @@ class NickAlternativesDialog : public QDialog friend class KviIdentityGeneralOptionsWidget; Q_OBJECT protected: - NickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3); + NickAlternativesDialog(QWidget * par, const QString & n1, const QString & n2, const QString & n3); ~NickAlternativesDialog(); + protected: QLineEdit * m_pNickEdit1; QLineEdit * m_pNickEdit2; QLineEdit * m_pNickEdit3; + protected: - void fill(QString &n1,QString &n2,QString &n3); + void fill(QString & n1, QString & n2, QString & n3); }; class AvatarSelectionDialog : public QDialog @@ -62,48 +63,48 @@ class AvatarSelectionDialog : public QDialog friend class OptionsWidget_identityAvatar; Q_OBJECT public: - AvatarSelectionDialog(QWidget * par,const QString &szInitialPath); + AvatarSelectionDialog(QWidget * par, const QString & szInitialPath); ~AvatarSelectionDialog(); + protected: - QLineEdit * m_pLineEdit; - QString m_szAvatarName; + QLineEdit * m_pLineEdit; + QString m_szAvatarName; + protected: virtual void closeEvent(QCloseEvent * e); - const QString &avatarName(){ return m_szAvatarName; }; + const QString & avatarName() { return m_szAvatarName; }; protected slots: void okClicked(); void cancelClicked(); void chooseFileClicked(); }; - class AvatarDownloadDialog : public QDialog { friend class OptionsWidget_identityAvatar; Q_OBJECT public: - AvatarDownloadDialog(QWidget * par,const QString &szUrl); + AvatarDownloadDialog(QWidget * par, const QString & szUrl); ~AvatarDownloadDialog(); + protected: KviHttpRequest * m_pRequest; - QLabel * m_pOutput; - QString m_szErrorMessage; - QString m_szLocalFileName; - QString m_szUrl; + QLabel * m_pOutput; + QString m_szErrorMessage; + QString m_szLocalFileName; + QString m_szUrl; + protected: virtual void closeEvent(QCloseEvent * e); - const QString & localFileName(){ return m_szLocalFileName; }; - const QString & errorMessage(){ return m_szErrorMessage; }; + const QString & localFileName() { return m_szLocalFileName; }; + const QString & errorMessage() { return m_szErrorMessage; }; protected slots: void startDownload(); void cancelClicked(); void downloadTerminated(bool bSuccess); - void downloadMessage(const QString &szMsg); + void downloadMessage(const QString & szMsg); }; - - - class IdentityProfileEditor : public QDialog { friend class OptionsWidget_identityProfile; @@ -111,28 +112,27 @@ class IdentityProfileEditor : public QDialog public: IdentityProfileEditor(QWidget * pParent); ~IdentityProfileEditor(); + protected: - QLineEdit * m_pNameEdit; - QLineEdit * m_pNetworkEdit; - QLineEdit * m_pNickEdit; - QLineEdit * m_pAltNickEdit; - QLineEdit * m_pUserNameEdit; - QLineEdit * m_pRealNameEdit; + QLineEdit * m_pNameEdit; + QLineEdit * m_pNetworkEdit; + QLineEdit * m_pNickEdit; + QLineEdit * m_pAltNickEdit; + QLineEdit * m_pUserNameEdit; + QLineEdit * m_pRealNameEdit; QPushButton * m_pBtnOk; + public: bool editProfile(KviIdentityProfile * pProfile); protected slots: void toggleButton(); }; - - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identity KviIconManager::Ident #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identity __tr2qs_no_lookup("Identity") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identity 99998 #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_identity true - class OptionsWidget_identity : public KviOptionsWidget { Q_OBJECT @@ -141,82 +141,80 @@ public: ~OptionsWidget_identity(); }; - - #define KVI_OPTIONS_WIDGET_ICON_KviIdentityGeneralOptionsWidget KviIconManager::Ident #define KVI_OPTIONS_WIDGET_NAME_KviIdentityGeneralOptionsWidget __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_PRIORITY_KviIdentityGeneralOptionsWidget 90000 #define KVI_OPTIONS_WIDGET_PARENT_KviIdentityGeneralOptionsWidget OptionsWidget_identity - class KviIdentityGeneralOptionsWidget : public KviOptionsWidget { Q_OBJECT public: KviIdentityGeneralOptionsWidget(QWidget * pParent); ~KviIdentityGeneralOptionsWidget(); + protected: - QString m_szAltNicknames[3]; + QString m_szAltNicknames[3]; - QComboBox * m_pAgeCombo; - QComboBox * m_pGenderCombo; + QComboBox * m_pAgeCombo; + QComboBox * m_pGenderCombo; protected slots: void setNickAlternatives(); + protected: virtual void commit(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar KviIconManager::Avatar #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAvatar __tr2qs_no_lookup("Avatar") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAvatar 80000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityAvatar OptionsWidget_identity - class OptionsWidget_identityAvatar : public KviOptionsWidget { Q_OBJECT public: OptionsWidget_identityAvatar(QWidget * pParent); ~OptionsWidget_identityAvatar(); + protected: - QCheckBox * m_pUseAvatarCheck; - QLineEdit * m_pAvatarNameEdit; - QPushButton * m_pChooseAvatarButton; - KviPixmap * m_pLocalAvatar; + QCheckBox * m_pUseAvatarCheck; + QLineEdit * m_pAvatarNameEdit; + QPushButton * m_pChooseAvatarButton; + KviPixmap * m_pLocalAvatar; KviPixmapPreview * m_pAvatarPreview; protected slots: void chooseAvatar(); + protected: virtual void commit(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityAdvanced 70000 #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_identityAdvanced OptionsWidget_identity - class OptionsWidget_identityAdvanced : public KviOptionsWidget { Q_OBJECT public: OptionsWidget_identityAdvanced(QWidget * pParent); ~OptionsWidget_identityAdvanced(); + protected: - bool m_bI; - bool m_bW; - bool m_bS; - KviCString m_sModeStr; - KviBoolSelector * m_pISelector; - KviBoolSelector * m_pWSelector; - KviBoolSelector * m_pSSelector; + bool m_bI; + bool m_bW; + bool m_bS; + KviCString m_sModeStr; + KviBoolSelector * m_pISelector; + KviBoolSelector * m_pWSelector; + KviBoolSelector * m_pSSelector; + protected: virtual void commit(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityProfile KviIconManager::UserWindow #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_identityProfile __tr2qs_no_lookup("Profiles") #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_identityProfile 60000 @@ -228,14 +226,16 @@ class OptionsWidget_identityProfile : public KviOptionsWidget public: OptionsWidget_identityProfile(QWidget * pParent); ~OptionsWidget_identityProfile(); + protected: - QTreeWidget * m_pTreeWidget; - QCheckBox * m_pProfilesCheck; - QPushButton * m_pBtnAddProfile; - QPushButton * m_pBtnEditProfile; - QPushButton * m_pBtnDelProfile; + QTreeWidget * m_pTreeWidget; + QCheckBox * m_pProfilesCheck; + QPushButton * m_pBtnAddProfile; + QPushButton * m_pBtnEditProfile; + QPushButton * m_pBtnDelProfile; IdentityProfileEditor * m_pEditor; - int m_iCurrentEditedProfile; + int m_iCurrentEditedProfile; + public: virtual void commit(); protected slots: diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp index 85bd4a068..4715426a1 100644 --- a/src/modules/options/OptionsWidget_ignore.cpp +++ b/src/modules/options/OptionsWidget_ignore.cpp @@ -30,24 +30,23 @@ #include - OptionsWidget_ignore::OptionsWidget_ignore(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ignore_options_widget"); createLayout(); - KviTalGroupBox *g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Enable Ignore for","options")); - m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/Channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg); - m_pIgnoreNotice = addBoolSelector(g,__tr2qs_ctx("Private/Channel notices","options"),KviOption_boolEnableIgnoreOnNotice); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Enable Ignore for", "options")); + m_pIgnorePrivmsg = addBoolSelector(g, __tr2qs_ctx("Private/Channel messages", "options"), KviOption_boolEnableIgnoreOnPrivMsg); + m_pIgnoreNotice = addBoolSelector(g, __tr2qs_ctx("Private/Channel notices", "options"), KviOption_boolEnableIgnoreOnNotice); - connect(m_pIgnorePrivmsg,SIGNAL(toggled(bool)),this,SLOT(enableVerbose(bool))); + connect(m_pIgnorePrivmsg, SIGNAL(toggled(bool)), this, SLOT(enableVerbose(bool))); - m_pVerboseIgnore = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use verbose ignore (show messages in console)","options"), - KviOption_boolVerboseIgnore, - KVI_OPTION_BOOL(KviOption_boolEnableIgnoreOnPrivMsg) || KVI_OPTION_BOOL(KviOption_boolEnableIgnoreOnNotice)); + m_pVerboseIgnore = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Use verbose ignore (show messages in console)", "options"), + KviOption_boolVerboseIgnore, + KVI_OPTION_BOOL(KviOption_boolEnableIgnoreOnPrivMsg) || KVI_OPTION_BOOL(KviOption_boolEnableIgnoreOnNotice)); - addRowSpacer(0,2,0,2); + addRowSpacer(0, 2, 0, 2); } OptionsWidget_ignore::~OptionsWidget_ignore() diff --git a/src/modules/options/OptionsWidget_ignore.h b/src/modules/options/OptionsWidget_ignore.h index 55669aa10..ff4083909 100644 --- a/src/modules/options/OptionsWidget_ignore.h +++ b/src/modules/options/OptionsWidget_ignore.h @@ -39,6 +39,7 @@ class OptionsWidget_ignore : public KviOptionsWidget public: OptionsWidget_ignore(QWidget * parent); ~OptionsWidget_ignore(); + public: KviBoolSelector * m_pIgnorePrivmsg; KviBoolSelector * m_pIgnoreNotice; diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp index 2b1c57bf4..c4431b68a 100644 --- a/src/modules/options/OptionsWidget_input.cpp +++ b/src/modules/options/OptionsWidget_input.cpp @@ -30,40 +30,40 @@ #include OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("inputlook_options_widget"); createLayout(); - addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontInput); - addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorInputBackground); - addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorInputForeground); - addColorSelector(0,3,1,3,__tr2qs_ctx("Selection background color:","options"),KviOption_colorInputSelectionBackground); - addColorSelector(0,4,1,4,__tr2qs_ctx("Selection foreground color:","options"),KviOption_colorInputSelectionForeground); - addColorSelector(0,5,1,5,__tr2qs_ctx("Control char color:","options"),KviOption_colorInputControl); - addColorSelector(0,6,1,6,__tr2qs_ctx("Cursor color:","options"),KviOption_colorInputCursor); + addFontSelector(0, 0, 1, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontInput); + addColorSelector(0, 1, 1, 1, __tr2qs_ctx("Background color:", "options"), KviOption_colorInputBackground); + addColorSelector(0, 2, 1, 2, __tr2qs_ctx("Foreground color:", "options"), KviOption_colorInputForeground); + addColorSelector(0, 3, 1, 3, __tr2qs_ctx("Selection background color:", "options"), KviOption_colorInputSelectionBackground); + addColorSelector(0, 4, 1, 4, __tr2qs_ctx("Selection foreground color:", "options"), KviOption_colorInputSelectionForeground); + addColorSelector(0, 5, 1, 5, __tr2qs_ctx("Control char color:", "options"), KviOption_colorInputControl); + addColorSelector(0, 6, 1, 6, __tr2qs_ctx("Cursor color:", "options"), KviOption_colorInputCursor); - addPixmapSelector(0,7,1,7,__tr2qs_ctx("Background image:","options"),KviOption_pixmapInputBackground); + addPixmapSelector(0, 7, 1, 7, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapInputBackground); - addLabel(0,8,0,8,__tr2qs_ctx("Horizontal align:","options")); - m_pHorizontalAlign=new QComboBox(this); - addWidgetToLayout(m_pHorizontalAlign,1,8,1,8); + addLabel(0, 8, 0, 8, __tr2qs_ctx("Horizontal align:", "options")); + m_pHorizontalAlign = new QComboBox(this); + addWidgetToLayout(m_pHorizontalAlign, 1, 8, 1, 8); - addLabel(0,9,0,9,__tr2qs_ctx("Vertical align:","options")); - m_pVerticalAlign=new QComboBox(this); - addWidgetToLayout(m_pVerticalAlign,1,9,1,9); + addLabel(0, 9, 0, 9, __tr2qs_ctx("Vertical align:", "options")); + m_pVerticalAlign = new QComboBox(this); + addWidgetToLayout(m_pVerticalAlign, 1, 9, 1, 9); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Left", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Right", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Center", "options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Top", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Center", "options")); - switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask) + switch(KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: m_pHorizontalAlign->setCurrentIndex(1); @@ -78,7 +78,7 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent) m_pHorizontalAlign->setCurrentIndex(0); } - switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask) + switch(KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: m_pVerticalAlign->setCurrentIndex(1); @@ -93,8 +93,7 @@ OptionsWidget_inputLook::OptionsWidget_inputLook(QWidget * parent) m_pVerticalAlign->setCurrentIndex(0); } - - layout()->setRowStretch(7,1); + layout()->setRowStretch(7, 1); } OptionsWidget_inputLook::~OptionsWidget_inputLook() @@ -103,68 +102,67 @@ OptionsWidget_inputLook::~OptionsWidget_inputLook() void OptionsWidget_inputLook::commit() { - int iFlags=0; + int iFlags = 0; switch(m_pHorizontalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignLeft; + iFlags |= Qt::AlignLeft; break; case 2: - iFlags|=Qt::AlignRight; + iFlags |= Qt::AlignRight; break; case 3: - iFlags|=Qt::AlignHCenter; + iFlags |= Qt::AlignHCenter; break; } switch(m_pVerticalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignTop; + iFlags |= Qt::AlignTop; break; case 2: - iFlags|=Qt::AlignBottom; + iFlags |= Qt::AlignBottom; break; case 3: - iFlags|=Qt::AlignVCenter; + iFlags |= Qt::AlignVCenter; break; } - KVI_OPTION_UINT(KviOption_uintInputPixmapAlign)=iFlags; + KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) = iFlags; KviOptionsWidget::commit(); } - OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ircviewfeatures_options_widget"); createLayout(); KviUIntSelector * u; - - addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Enable the input history logging","options"),KviOption_boolEnableInputHistory); //G&N 2005 - addBoolSelector(0,2,0,2,__tr2qs_ctx("Hide input tool buttons by default","options"),KviOption_boolHideInputToolButtons); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Show warning about pasting multiple lines","options"),KviOption_boolWarnAboutPastingMultipleLines); - addBoolSelector(0,4,0,4,__tr2qs_ctx("Commandline in user-friendly mode by default","options"),KviOption_boolCommandlineInUserFriendlyModeByDefault); - u = addUIntSelector(0,5,0,5,__tr2qs_ctx("Expand tabulations in input using:","options"),KviOption_uintSpacesToExpandTabulationInput,1,24,8,true); - u->setSuffix(__tr2qs_ctx(" spaces","options")); - - KviTalGroupBox * g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Nick Completion","options")); - KviBoolSelector * b, *c; - b = addBoolSelector(g,__tr2qs_ctx("Use bash-like nick completion","options"),KviOption_boolBashLikeNickCompletion,!KVI_OPTION_BOOL(KviOption_boolZshLikeNickCompletion)); - c = addBoolSelector(g,__tr2qs_ctx("Use zsh-like nick completion","options"),KviOption_boolZshLikeNickCompletion,!KVI_OPTION_BOOL(KviOption_boolBashLikeNickCompletion)); - connect(b,SIGNAL(toggled(bool)),c,SLOT(setDisabled(bool))); - connect(c,SIGNAL(toggled(bool)),b,SLOT(setDisabled(bool))); - - addStringSelector(g,__tr2qs_ctx("Nick completion postfix string:","options"),KviOption_stringNickCompletionPostfix); - addBoolSelector(g,__tr2qs_ctx("Use the completion postfix string for the first word only","options"),KviOption_boolUseNickCompletionPostfixForFirstWordOnly); - - KviBoolSelector *d = addBoolSelector(0,7,0,7,__tr2qs_ctx("Use a custom cursor width","options"),KviOption_boolEnableCustomCursorWidth); - KviUIntSelector *f = addUIntSelector(0,8,0,8,__tr2qs_ctx("Custom cursor width:","options"),KviOption_uintCustomCursorWidth,1,24,8,KVI_OPTION_BOOL(KviOption_boolEnableCustomCursorWidth)); - f->setSuffix(__tr2qs_ctx(" pixels","options")); - connect(d,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool))); - addRowSpacer(0,9,0,9); + + addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Warp cursor at the end of line when browsing history", "options"), KviOption_boolInputHistoryCursorAtEnd); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Enable the input history logging", "options"), KviOption_boolEnableInputHistory); //G&N 2005 + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Hide input tool buttons by default", "options"), KviOption_boolHideInputToolButtons); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Show warning about pasting multiple lines", "options"), KviOption_boolWarnAboutPastingMultipleLines); + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Commandline in user-friendly mode by default", "options"), KviOption_boolCommandlineInUserFriendlyModeByDefault); + u = addUIntSelector(0, 5, 0, 5, __tr2qs_ctx("Expand tabulations in input using:", "options"), KviOption_uintSpacesToExpandTabulationInput, 1, 24, 8, true); + u->setSuffix(__tr2qs_ctx(" spaces", "options")); + + KviTalGroupBox * g = addGroupBox(0, 6, 0, 6, Qt::Horizontal, __tr2qs_ctx("Nick Completion", "options")); + KviBoolSelector *b, *c; + b = addBoolSelector(g, __tr2qs_ctx("Use bash-like nick completion", "options"), KviOption_boolBashLikeNickCompletion, !KVI_OPTION_BOOL(KviOption_boolZshLikeNickCompletion)); + c = addBoolSelector(g, __tr2qs_ctx("Use zsh-like nick completion", "options"), KviOption_boolZshLikeNickCompletion, !KVI_OPTION_BOOL(KviOption_boolBashLikeNickCompletion)); + connect(b, SIGNAL(toggled(bool)), c, SLOT(setDisabled(bool))); + connect(c, SIGNAL(toggled(bool)), b, SLOT(setDisabled(bool))); + + addStringSelector(g, __tr2qs_ctx("Nick completion postfix string:", "options"), KviOption_stringNickCompletionPostfix); + addBoolSelector(g, __tr2qs_ctx("Use the completion postfix string for the first word only", "options"), KviOption_boolUseNickCompletionPostfixForFirstWordOnly); + + KviBoolSelector * d = addBoolSelector(0, 7, 0, 7, __tr2qs_ctx("Use a custom cursor width", "options"), KviOption_boolEnableCustomCursorWidth); + KviUIntSelector * f = addUIntSelector(0, 8, 0, 8, __tr2qs_ctx("Custom cursor width:", "options"), KviOption_uintCustomCursorWidth, 1, 24, 8, KVI_OPTION_BOOL(KviOption_boolEnableCustomCursorWidth)); + f->setSuffix(__tr2qs_ctx(" pixels", "options")); + connect(d, SIGNAL(toggled(bool)), f, SLOT(setEnabled(bool))); + addRowSpacer(0, 9, 0, 9); } OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures() diff --git a/src/modules/options/OptionsWidget_input.h b/src/modules/options/OptionsWidget_input.h index e8224216b..19b3fb6ad 100644 --- a/src/modules/options/OptionsWidget_input.h +++ b/src/modules/options/OptionsWidget_input.h @@ -29,7 +29,6 @@ #include - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_inputLook KviIconManager::Input #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_inputLook __tr2qs_no_lookup("Input") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_inputLook __tr2qs_no_lookup("theme,colors,text") @@ -39,8 +38,9 @@ class OptionsWidget_inputLook : public KviOptionsWidget { Q_OBJECT private: - QComboBox* m_pHorizontalAlign; - QComboBox* m_pVerticalAlign; + QComboBox * m_pHorizontalAlign; + QComboBox * m_pVerticalAlign; + public: OptionsWidget_inputLook(QWidget * parent); ~OptionsWidget_inputLook(); diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp index 1e6b6f223..e486ed284 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp +++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp @@ -34,41 +34,40 @@ #include - OptionsWidget_interfaceFeatures::OptionsWidget_interfaceFeatures(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("interfacefeatures_options_widget"); createLayout(); KviTalGroupBox * g; - addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize application on startup","options"),KviOption_boolStartupMinimized); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Confirm quit with active connections","options"),KviOption_boolConfirmCloseWhenThereAreConnections); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Remember window properties","options"),KviOption_boolWindowsRememberProperties); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable visual effects","options"),KviOption_boolEnableVisualEffects); - addBoolSelector(0,4,0,4,__tr2qs_ctx("Hide channel window tool buttons by default","options"),KviOption_boolHideWindowToolButtons); + addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Minimize application on startup", "options"), KviOption_boolStartupMinimized); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Confirm quit with active connections", "options"), KviOption_boolConfirmCloseWhenThereAreConnections); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Remember window properties", "options"), KviOption_boolWindowsRememberProperties); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Enable visual effects", "options"), KviOption_boolEnableVisualEffects); + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Hide channel window tool buttons by default", "options"), KviOption_boolHideWindowToolButtons); #ifdef COMPILE_ON_MAC - addBoolSelector(0,5,0,5,__tr2qs_ctx("Require ⌘ to be held down to copy text","options"),KviOption_boolRequireControlToCopy); + addBoolSelector(0, 5, 0, 5, __tr2qs_ctx("Require ⌘ to be held down to copy text", "options"), KviOption_boolRequireControlToCopy); #else - addBoolSelector(0,5,0,5,__tr2qs_ctx("Require Ctrl to be held down to copy text","options"),KviOption_boolRequireControlToCopy); + addBoolSelector(0, 5, 0, 5, __tr2qs_ctx("Require Ctrl to be held down to copy text", "options"), KviOption_boolRequireControlToCopy); #endif #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - addBoolSelector(0,6,0,6,__tr2qs_ctx("Show taskbar button (change requires restart)","options"),KviOption_boolShowTaskBarButton); - g = addGroupBox(0,7,0,7,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window for","options")); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Show taskbar button (change requires restart)", "options"), KviOption_boolShowTaskBarButton); + g = addGroupBox(0, 7, 0, 7, Qt::Horizontal, __tr2qs_ctx("Open Dialog Window for", "options")); #else - g = addGroupBox(0,6,0,6,Qt::Horizontal,__tr2qs_ctx("Open Dialog Window for","options")); + g = addGroupBox(0, 6, 0, 6, Qt::Horizontal, __tr2qs_ctx("Open Dialog Window for", "options")); #endif - addBoolSelector(g,__tr2qs_ctx("Preferences","options"),KviOption_boolShowGeneralOptionsDialogAsToplevel); - addBoolSelector(g,__tr2qs_ctx("Registered users","options"),KviOption_boolShowRegisteredUsersDialogAsToplevel); - addBoolSelector(g,__tr2qs_ctx("Identity","options"),KviOption_boolShowIdentityDialogAsToplevel); - addBoolSelector(g,__tr2qs_ctx("Servers","options"),KviOption_boolShowServersConnectDialogAsToplevel); - addBoolSelector(g,__tr2qs_ctx("Join channels","options"),KviOption_boolShowChannelsJoinDialogAsToplevel); + addBoolSelector(g, __tr2qs_ctx("Preferences", "options"), KviOption_boolShowGeneralOptionsDialogAsToplevel); + addBoolSelector(g, __tr2qs_ctx("Registered users", "options"), KviOption_boolShowRegisteredUsersDialogAsToplevel); + addBoolSelector(g, __tr2qs_ctx("Identity", "options"), KviOption_boolShowIdentityDialogAsToplevel); + addBoolSelector(g, __tr2qs_ctx("Servers", "options"), KviOption_boolShowServersConnectDialogAsToplevel); + addBoolSelector(g, __tr2qs_ctx("Join channels", "options"), KviOption_boolShowChannelsJoinDialogAsToplevel); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - addRowSpacer(0,8,0,8); + addRowSpacer(0, 8, 0, 8); #else - addRowSpacer(0,7,0,7); + addRowSpacer(0, 7, 0, 7); #endif } diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp index 07e7a0976..7f68bb442 100644 --- a/src/modules/options/OptionsWidget_irc.cpp +++ b/src/modules/options/OptionsWidget_irc.cpp @@ -29,9 +29,8 @@ #include "KviOptions.h" #include "KviIrcMask.h" - OptionsWidget_irc::OptionsWidget_irc(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("irc_options_widget"); } @@ -40,41 +39,41 @@ OptionsWidget_irc::~OptionsWidget_irc() { } - OptionsWidget_ircGeneral::OptionsWidget_ircGeneral(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("irc_options_widget"); createLayout(); - KviBoolSelector * b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show network name in console window list entry","options"),KviOption_boolShowNetworkNameForConsoleWindowListEntry); - mergeTip(b,__tr2qs_ctx("This option will cause KVIrc to show the network name as the console window list entry instead of the server name. This is nice to keep on unless your servers are not organized in networks or you often connect to two servers of the same network.","options")); - addRowSpacer(0,2,0,2); + KviBoolSelector * b = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Show network name in console window list entry", "options"), KviOption_boolShowNetworkNameForConsoleWindowListEntry); + mergeTip(b, __tr2qs_ctx("This option will cause KVIrc to show the network name as the console window list entry instead of the server name. This is nice to keep on unless your servers are not organized in networks or you often connect to two servers of the same network.", "options")); + addRowSpacer(0, 2, 0, 2); } OptionsWidget_ircGeneral::~OptionsWidget_ircGeneral() { } - OptionsWidget_ircAdvanced::OptionsWidget_ircAdvanced(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("irc_advanced_options_widget"); createLayout(); - KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit); + KviBoolSelector * b = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Force immediate quit", "options"), KviOption_boolForceBrutalQuit); mergeTip(b, - __tr2qs_ctx("This option causes KVIrc to close " \ - "the connection immediately after sending the QUIT message.
" \ - "When this option is disabled, KVIrc will wait for the server " \ - "to close the connection.
" \ - "Note that if you use this, your QUIT message may be not displayed.","options")); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Prepend gender info to real name","options"),KviOption_boolPrependGenderInfoToRealname); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Prepend avatar info to real name","options"),KviOption_boolPrependAvatarInfoToRealname); - b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Prepend smart nick color info to real name","options"),KviOption_boolPrependNickColorInfoToRealname); + __tr2qs_ctx("This option causes KVIrc to close " + "the connection immediately after sending the QUIT message.
" + "When this option is disabled, KVIrc will wait for the server " + "to close the connection.
" + "Note that if you use this, your QUIT message may be not displayed.", + "options")); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Prepend gender info to real name", "options"), KviOption_boolPrependGenderInfoToRealname); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Prepend avatar info to real name", "options"), KviOption_boolPrependAvatarInfoToRealname); + b = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Prepend smart nick color info to real name", "options"), KviOption_boolPrependNickColorInfoToRealname); mergeTip(b, - __tr2qs_ctx("This feature will not work if you have chosen your " \ - "nick background color to be transparent.","options")); - addRowSpacer(0,4,0,4); + __tr2qs_ctx("This feature will not work if you have chosen your " + "nick background color to be transparent.", + "options")); + addRowSpacer(0, 4, 0, 4); } OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced() diff --git a/src/modules/options/OptionsWidget_irc.h b/src/modules/options/OptionsWidget_irc.h index 9ec41d709..eeb710a0b 100644 --- a/src/modules/options/OptionsWidget_irc.h +++ b/src/modules/options/OptionsWidget_irc.h @@ -52,7 +52,6 @@ public: ~OptionsWidget_ircGeneral(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircAdvanced KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_ircAdvanced __tr2qs_no_lookup("Advanced") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_ircAdvanced OptionsWidget_irc diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index 577f749b5..9cff3d256 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -33,60 +33,59 @@ #include #include - OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { setObjectName("ircoutput_options_widget"); createLayout(); - QLabel * pLabel = new QLabel(__tr2qs_ctx("Output verbosity:","options"),this); - addWidgetToLayout(pLabel,0,0,0,0); + QLabel * pLabel = new QLabel(__tr2qs_ctx("Output verbosity:", "options"), this); + addWidgetToLayout(pLabel, 0, 0, 0, 0); m_pVerbosityCombo = new QComboBox(this); - m_pVerbosityCombo->addItem(__tr2qs_ctx("Mute","options")); - m_pVerbosityCombo->addItem(__tr2qs_ctx("Quiet","options")); - m_pVerbosityCombo->addItem(__tr2qs_ctx("Normal","options")); - m_pVerbosityCombo->addItem(__tr2qs_ctx("Verbose","options")); - m_pVerbosityCombo->addItem(__tr2qs_ctx("Paranoic","options")); - addWidgetToLayout(m_pVerbosityCombo,1,0,1,0); + m_pVerbosityCombo->addItem(__tr2qs_ctx("Mute", "options")); + m_pVerbosityCombo->addItem(__tr2qs_ctx("Quiet", "options")); + m_pVerbosityCombo->addItem(__tr2qs_ctx("Normal", "options")); + m_pVerbosityCombo->addItem(__tr2qs_ctx("Verbose", "options")); + m_pVerbosityCombo->addItem(__tr2qs_ctx("Paranoic", "options")); + addWidgetToLayout(m_pVerbosityCombo, 1, 0, 1, 0); if(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) > KVI_VERBOSITY_LEVEL_PARANOIC) KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL; m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel)); - pLabel = new QLabel(__tr2qs_ctx("DateTime format:","options"),this); - addWidgetToLayout(pLabel,0,1,0,1); + pLabel = new QLabel(__tr2qs_ctx("DateTime format:", "options"), this); + addWidgetToLayout(pLabel, 0, 1, 0, 1); m_pDatetimeCombo = new QComboBox(this); - m_pDatetimeCombo->addItem(__tr2qs_ctx("Classic format","options")); - m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format","options")); - m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format","options")); - addWidgetToLayout(m_pDatetimeCombo,1,1,1,1); + m_pDatetimeCombo->addItem(__tr2qs_ctx("Classic format", "options")); + m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format", "options")); + m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format", "options")); + addWidgetToLayout(m_pDatetimeCombo, 1, 1, 1, 1); m_pDatetimeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat)); - KviTalGroupBox * pGroup = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Show in Active Window","options")); - addBoolSelector(pGroup,__tr2qs_ctx("External messages","options"),KviOption_boolExternalMessagesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("External CTCP replies","options"),KviOption_boolCtcpRepliesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("WHOIS replies","options"),KviOption_boolWhoisRepliesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("WHO replies","options"),KviOption_boolWhoRepliesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("ChanServ and NickServ notices","options"),KviOption_boolServicesNoticesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("Invite messages","options"),KviOption_boolInvitesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("Server replies","options"),KviOption_boolServerRepliesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("Server notices","options"),KviOption_boolServerNoticesToActiveWindow); - addBoolSelector(pGroup,__tr2qs_ctx("Broadcast and WALLOPS messages","options"),KviOption_boolOperatorMessagesToActiveWindow); -// if(KVI_OPTION_UINT(KviOption_uintUserExperienceLevel)>=2) -// { - addBoolSelector(0,3,1,3,__tr2qs_ctx("Show extended server information","options"),KviOption_boolShowExtendedServerInfo); - addBoolSelector(0,4,1,4,__tr2qs_ctx("Show server pings","options"),KviOption_boolShowPingPong); - addBoolSelector(0,5,1,5,__tr2qs_ctx("Show own parts in the console","options"),KviOption_boolShowOwnParts); - addBoolSelector(0,6,1,6,__tr2qs_ctx("Show compact mode changes","options"),KviOption_boolShowCompactModeChanges); - - addRowSpacer(0,7,1,7); -// } else { -// addRowSpacer(0,2,1,2); -// } + KviTalGroupBox * pGroup = addGroupBox(0, 2, 1, 2, Qt::Horizontal, __tr2qs_ctx("Show in Active Window", "options")); + addBoolSelector(pGroup, __tr2qs_ctx("External messages", "options"), KviOption_boolExternalMessagesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("External CTCP replies", "options"), KviOption_boolCtcpRepliesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("WHOIS replies", "options"), KviOption_boolWhoisRepliesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("WHO replies", "options"), KviOption_boolWhoRepliesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("ChanServ and NickServ notices", "options"), KviOption_boolServicesNoticesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("Invite messages", "options"), KviOption_boolInvitesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("Server replies", "options"), KviOption_boolServerRepliesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("Server notices", "options"), KviOption_boolServerNoticesToActiveWindow); + addBoolSelector(pGroup, __tr2qs_ctx("Broadcast and WALLOPS messages", "options"), KviOption_boolOperatorMessagesToActiveWindow); + // if(KVI_OPTION_UINT(KviOption_uintUserExperienceLevel)>=2) + // { + addBoolSelector(0, 3, 1, 3, __tr2qs_ctx("Show extended server information", "options"), KviOption_boolShowExtendedServerInfo); + addBoolSelector(0, 4, 1, 4, __tr2qs_ctx("Show server pings", "options"), KviOption_boolShowPingPong); + addBoolSelector(0, 5, 1, 5, __tr2qs_ctx("Show own parts in the console", "options"), KviOption_boolShowOwnParts); + addBoolSelector(0, 6, 1, 6, __tr2qs_ctx("Show compact mode changes", "options"), KviOption_boolShowCompactModeChanges); + + addRowSpacer(0, 7, 1, 7); + // } else { + // addRowSpacer(0,2,1,2); + // } } OptionsWidget_ircOutput::~OptionsWidget_ircOutput() diff --git a/src/modules/options/OptionsWidget_ircOutput.h b/src/modules/options/OptionsWidget_ircOutput.h index 3cd0d5134..ea42b35df 100644 --- a/src/modules/options/OptionsWidget_ircOutput.h +++ b/src/modules/options/OptionsWidget_ircOutput.h @@ -26,7 +26,6 @@ #include "KviOptionsWidget.h" - class QComboBox; #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_ircOutput KviIconManager::Raw @@ -41,9 +40,11 @@ class OptionsWidget_ircOutput : public KviOptionsWidget public: OptionsWidget_ircOutput(QWidget * parent); ~OptionsWidget_ircOutput(); + protected: QComboBox * m_pVerbosityCombo; QComboBox * m_pDatetimeCombo; + protected: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp index c9f1d3f43..deb2461a1 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -30,9 +30,8 @@ #include - OptionsWidget_ircViewTheme::OptionsWidget_ircViewTheme(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { } @@ -40,37 +39,36 @@ OptionsWidget_ircViewTheme::~OptionsWidget_ircViewTheme() { } - OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ircviewlook_options_widget"); createLayout(); - - addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontIrcView); - addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorIrcViewBackground); - addPixmapSelector(0,2,1,2,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcViewBackground); + addFontSelector(0, 0, 1, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontIrcView); + addColorSelector(0, 1, 1, 1, __tr2qs_ctx("Background color:", "options"), KviOption_colorIrcViewBackground); + + addPixmapSelector(0, 2, 1, 2, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapIrcViewBackground); - addLabel(0,3,0,3,__tr2qs_ctx("Horizontal align:","options")); - m_pHorizontalAlign=new QComboBox(this); - addWidgetToLayout(m_pHorizontalAlign,1,3,1,3); + addLabel(0, 3, 0, 3, __tr2qs_ctx("Horizontal align:", "options")); + m_pHorizontalAlign = new QComboBox(this); + addWidgetToLayout(m_pHorizontalAlign, 1, 3, 1, 3); - addLabel(0,4,0,4,__tr2qs_ctx("Vertical align:","options")); - m_pVerticalAlign=new QComboBox(this); - addWidgetToLayout(m_pVerticalAlign,1,4,1,4); + addLabel(0, 4, 0, 4, __tr2qs_ctx("Vertical align:", "options")); + m_pVerticalAlign = new QComboBox(this); + addWidgetToLayout(m_pVerticalAlign, 1, 4, 1, 4); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Left", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Right", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Center", "options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Top", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Center", "options")); - switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignHorizontal_Mask) + switch(KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: m_pHorizontalAlign->setCurrentIndex(1); @@ -85,7 +83,7 @@ OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent) m_pHorizontalAlign->setCurrentIndex(0); } - switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignVertical_Mask) + switch(KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: m_pVerticalAlign->setCurrentIndex(1); @@ -100,117 +98,111 @@ OptionsWidget_ircViewLook::OptionsWidget_ircViewLook(QWidget * parent) m_pVerticalAlign->setCurrentIndex(0); } - layout()->setRowStretch(2,1); + layout()->setRowStretch(2, 1); } - OptionsWidget_ircViewLook::~OptionsWidget_ircViewLook() { } - void OptionsWidget_ircViewLook::commit() { - int iFlags=0; + int iFlags = 0; switch(m_pHorizontalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignLeft; + iFlags |= Qt::AlignLeft; break; case 2: - iFlags|=Qt::AlignRight; + iFlags |= Qt::AlignRight; break; case 3: - iFlags|=Qt::AlignHCenter; + iFlags |= Qt::AlignHCenter; break; } switch(m_pVerticalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignTop; + iFlags |= Qt::AlignTop; break; case 2: - iFlags|=Qt::AlignBottom; + iFlags |= Qt::AlignBottom; break; case 3: - iFlags|=Qt::AlignVCenter; + iFlags |= Qt::AlignVCenter; break; } - KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign)=iFlags; + KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) = iFlags; KviOptionsWidget::commit(); } - OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ircviewfeatures_options_widget"); createLayout(); - addBoolSelector(0,7,0,7,__tr2qs_ctx("Enable URL highlighting","options"),KviOption_boolIrcViewUrlHighlighting); - addBoolSelector(0,8,0,8,__tr2qs_ctx("Use line wrap margin","options"),KviOption_boolIrcViewWrapMargin); - KviUIntSelector * s = addUIntSelector(0,9,0,9,__tr2qs_ctx("Maximum buffer size:","options"),KviOption_uintIrcViewMaxBufferSize,32,32767,2048); - s->setSuffix(__tr2qs_ctx(" lines","options")); - s = addUIntSelector(0,10,0,10,__tr2qs_ctx("Link tooltip show delay:","options"),KviOption_uintIrcViewToolTipTimeoutInMsec,256,10000,1800); - s->setSuffix(__tr2qs_ctx(" msec","options")); - s = addUIntSelector(0,11,0,11,__tr2qs_ctx("Link tooltip hide delay:","options"),KviOption_uintIrcViewToolTipHideTimeoutInMsec,256,10000,12000); - s->setSuffix(__tr2qs_ctx(" msec","options")); - addBoolSelector(0,12,0,12,__tr2qs_ctx("Enable animated smiles","options"),KviOption_boolEnableAnimatedSmiles); - - KviTalGroupBox * pGroup = addGroupBox(0,13,0,13,Qt::Horizontal,__tr2qs_ctx("Enable Tooltips for","options")); - addBoolSelector(pGroup,__tr2qs_ctx("URL links","options"),KviOption_boolEnableUrlLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Host links","options"),KviOption_boolEnableHostLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Server links","options"),KviOption_boolEnableServerLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Mode links","options"),KviOption_boolEnableModeLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Nick links","options"),KviOption_boolEnableNickLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Channel links","options"),KviOption_boolEnableChannelLinkToolTip); - addBoolSelector(pGroup,__tr2qs_ctx("Escape sequences","options"),KviOption_boolEnableEscapeLinkToolTip); - - addRowSpacer(0,14,0,14); + addBoolSelector(0, 7, 0, 7, __tr2qs_ctx("Enable URL highlighting", "options"), KviOption_boolIrcViewUrlHighlighting); + addBoolSelector(0, 8, 0, 8, __tr2qs_ctx("Use line wrap margin", "options"), KviOption_boolIrcViewWrapMargin); + KviUIntSelector * s = addUIntSelector(0, 9, 0, 9, __tr2qs_ctx("Maximum buffer size:", "options"), KviOption_uintIrcViewMaxBufferSize, 32, 32767, 2048); + s->setSuffix(__tr2qs_ctx(" lines", "options")); + s = addUIntSelector(0, 10, 0, 10, __tr2qs_ctx("Link tooltip show delay:", "options"), KviOption_uintIrcViewToolTipTimeoutInMsec, 256, 10000, 1800); + s->setSuffix(__tr2qs_ctx(" msec", "options")); + s = addUIntSelector(0, 11, 0, 11, __tr2qs_ctx("Link tooltip hide delay:", "options"), KviOption_uintIrcViewToolTipHideTimeoutInMsec, 256, 10000, 12000); + s->setSuffix(__tr2qs_ctx(" msec", "options")); + addBoolSelector(0, 12, 0, 12, __tr2qs_ctx("Enable animated smiles", "options"), KviOption_boolEnableAnimatedSmiles); + + KviTalGroupBox * pGroup = addGroupBox(0, 13, 0, 13, Qt::Horizontal, __tr2qs_ctx("Enable Tooltips for", "options")); + addBoolSelector(pGroup, __tr2qs_ctx("URL links", "options"), KviOption_boolEnableUrlLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Host links", "options"), KviOption_boolEnableHostLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Server links", "options"), KviOption_boolEnableServerLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Mode links", "options"), KviOption_boolEnableModeLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Nick links", "options"), KviOption_boolEnableNickLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Channel links", "options"), KviOption_boolEnableChannelLinkToolTip); + addBoolSelector(pGroup, __tr2qs_ctx("Escape sequences", "options"), KviOption_boolEnableEscapeLinkToolTip); + + addRowSpacer(0, 14, 0, 14); } OptionsWidget_ircViewFeatures::~OptionsWidget_ircViewFeatures() { } - OptionsWidget_ircViewMarker::OptionsWidget_ircViewMarker(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("ircviewmarker_options_widget"); createLayout(); - addBoolSelector(0,0,1,0,__tr2qs_ctx("Track last read text line","options"),KviOption_boolTrackLastReadTextViewLine); - addColorSelector(0,1,1,1,__tr2qs_ctx("Marker color:","options"),KviOption_colorIrcViewMarkLine); + addBoolSelector(0, 0, 1, 0, __tr2qs_ctx("Track last read text line", "options"), KviOption_boolTrackLastReadTextViewLine); + addColorSelector(0, 1, 1, 1, __tr2qs_ctx("Marker color:", "options"), KviOption_colorIrcViewMarkLine); - KviUIntSelector * s = addUIntSelector(0,2,1,2,__tr2qs_ctx("Marker size:","options"),KviOption_uintIrcViewMarkerSize,1,5,1); - s->setSuffix(__tr2qs_ctx(" pixels","options")); + KviUIntSelector * s = addUIntSelector(0, 2, 1, 2, __tr2qs_ctx("Marker size:", "options"), KviOption_uintIrcViewMarkerSize, 1, 5, 1); + s->setSuffix(__tr2qs_ctx(" pixels", "options")); - addLabel(0,3,0,3,__tr2qs_ctx("Marker style:","options")); - m_pMarkerStyle=new QComboBox(this); - addWidgetToLayout(m_pMarkerStyle,1,3,1,3); + addLabel(0, 3, 0, 3, __tr2qs_ctx("Marker style:", "options")); + m_pMarkerStyle = new QComboBox(this); + addWidgetToLayout(m_pMarkerStyle, 1, 3, 1, 3); - addRowSpacer(0,4,0,4); + addRowSpacer(0, 4, 0, 4); - m_pMarkerStyle->addItem(__tr2qs_ctx("DotLine","options")); - m_pMarkerStyle->addItem(__tr2qs_ctx("DashLine","options")); - m_pMarkerStyle->addItem(__tr2qs_ctx("SolidLine","options")); - m_pMarkerStyle->addItem(__tr2qs_ctx("DashDotLine","options")); - m_pMarkerStyle->addItem(__tr2qs_ctx("DashDotDotLine","options")); + m_pMarkerStyle->addItem(__tr2qs_ctx("DotLine", "options")); + m_pMarkerStyle->addItem(__tr2qs_ctx("DashLine", "options")); + m_pMarkerStyle->addItem(__tr2qs_ctx("SolidLine", "options")); + m_pMarkerStyle->addItem(__tr2qs_ctx("DashDotLine", "options")); + m_pMarkerStyle->addItem(__tr2qs_ctx("DashDotDotLine", "options")); - unsigned int uStyle=KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle); + unsigned int uStyle = KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle); m_pMarkerStyle->setCurrentIndex(uStyle < 5 ? uStyle : 0); } - OptionsWidget_ircViewMarker::~OptionsWidget_ircViewMarker() { } - void OptionsWidget_ircViewMarker::commit() { - KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle)=m_pMarkerStyle->currentIndex(); + KVI_OPTION_UINT(KviOption_uintIrcViewMarkerStyle) = m_pMarkerStyle->currentIndex(); KviOptionsWidget::commit(); } diff --git a/src/modules/options/OptionsWidget_ircView.h b/src/modules/options/OptionsWidget_ircView.h index 1ca1796aa..ccbd67aca 100644 --- a/src/modules/options/OptionsWidget_ircView.h +++ b/src/modules/options/OptionsWidget_ircView.h @@ -26,7 +26,6 @@ // //============================================================================= - #include "KviOptionsWidget.h" #include @@ -58,9 +57,11 @@ class OptionsWidget_ircViewLook : public KviOptionsWidget private: QComboBox * m_pHorizontalAlign; QComboBox * m_pVerticalAlign; + public: OptionsWidget_ircViewLook(QWidget * parent); ~OptionsWidget_ircViewLook(); + public: virtual void commit(); }; @@ -92,6 +93,7 @@ public: OptionsWidget_ircViewMarker(QWidget * pParent); ~OptionsWidget_ircViewMarker(); virtual void commit(); + private: QComboBox * m_pMarkerStyle; }; diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp index 567c5f3e3..6bb33548c 100644 --- a/src/modules/options/OptionsWidget_lag.cpp +++ b/src/modules/options/OptionsWidget_lag.cpp @@ -31,43 +31,43 @@ #include - OptionsWidget_lag::OptionsWidget_lag(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("lag_options_widget"); createLayout(); - KviBoolSelector * pUse = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable lag meter","options"), KviOption_boolUseLagMeterEngine); - mergeTip(pUse,__tr2qs_ctx("This enables the lag meter engine, which checks at regular intervals how much latency the server has.","options")); - KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); - KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); - pInterval->setSuffix(__tr2qs_ctx(" msec","options")); + KviBoolSelector * pUse = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable lag meter", "options"), KviOption_boolUseLagMeterEngine); + mergeTip(pUse, __tr2qs_ctx("This enables the lag meter engine, which checks at regular intervals how much latency the server has.", "options")); + KviTalGroupBox * g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Configuration", "options"), KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:", "options"), KviOption_uintLagMeterHeartbeat, 2000, 10000, 5000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + pInterval->setSuffix(__tr2qs_ctx(" msec", "options")); mergeTip(pInterval, - __tr2qs_ctx("This option allows you to set the lag meter heartbeat interval.
" \ - "The lower the heartbeat interval the higher will be the accuracy of the lag check " \ - "but also higher CPU usage and data traffic to the server.
" \ - "Please note that this is NOT the interval between pings sent to the server: " \ - "the pings (if any) will be sent really less often. " \ - "5000 is a reasonable value.","options")); - connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool))); - - KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); - pAlarm->setSuffix(__tr2qs_ctx(" msec","options")); - mergeTip(pAlarm,__tr2qs_ctx("This option controls the threshold for the " \ - "OnLagAlarmTimeUp and OnLagAlarmTimeDown events. When the lag goes above " \ - "the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \ - "back below the threshold then OnLagAlarmTimeDown will be triggered","options")); - connect(pUse,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool))); + __tr2qs_ctx("This option allows you to set the lag meter heartbeat interval.
" + "The lower the heartbeat interval the higher will be the accuracy of the lag check " + "but also higher CPU usage and data traffic to the server.
" + "Please note that this is NOT the interval between pings sent to the server: " + "the pings (if any) will be sent really less often. " + "5000 is a reasonable value.", + "options")); + connect(pUse, SIGNAL(toggled(bool)), pInterval, SLOT(setEnabled(bool))); - KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); - mergeTip(pShow,__tr2qs_ctx("This makes the IRC context display applet show the current lag after the user's nickname (in seconds)","options")); + KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:", "options"), KviOption_uintLagAlarmTime, 5000, 1000000, 30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + pAlarm->setSuffix(__tr2qs_ctx(" msec", "options")); + mergeTip(pAlarm, __tr2qs_ctx("This option controls the threshold for the " + "OnLagAlarmTimeUp and OnLagAlarmTimeDown events. When the lag goes above " + "the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " + "back below the threshold then OnLagAlarmTimeDown will be triggered", + "options")); + connect(pUse, SIGNAL(toggled(bool)), pAlarm, SLOT(setEnabled(bool))); - connect(pUse,SIGNAL(toggled(bool)),pShow,SLOT(setEnabled(bool))); - connect(pUse,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); + KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display", "options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); + mergeTip(pShow, __tr2qs_ctx("This makes the IRC context display applet show the current lag after the user's nickname (in seconds)", "options")); - addRowSpacer(0,2,0,2); + connect(pUse, SIGNAL(toggled(bool)), pShow, SLOT(setEnabled(bool))); + connect(pUse, SIGNAL(toggled(bool)), g, SLOT(setEnabled(bool))); + addRowSpacer(0, 2, 0, 2); } OptionsWidget_lag::~OptionsWidget_lag() diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index 49f2a9fff..ab372b4ee 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -29,41 +29,43 @@ #include - OptionsWidget_logging::OptionsWidget_logging(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("logging_options_widget"); createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Automatically Log","options")); - addBoolSelector(g,__tr2qs_ctx("Query windows","options"),KviOption_boolAutoLogQueries); - addBoolSelector(g,__tr2qs_ctx("Channel windows","options"),KviOption_boolAutoLogChannels); - addBoolSelector(g,__tr2qs_ctx("DCC chat windows","options"),KviOption_boolAutoLogDccChat); - addBoolSelector(g,__tr2qs_ctx("Console windows","options"),KviOption_boolAutoLogConsole); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Automatically Log", "options")); + addBoolSelector(g, __tr2qs_ctx("Query windows", "options"), KviOption_boolAutoLogQueries); + addBoolSelector(g, __tr2qs_ctx("Channel windows", "options"), KviOption_boolAutoLogChannels); + addBoolSelector(g, __tr2qs_ctx("DCC chat windows", "options"), KviOption_boolAutoLogDccChat); + addBoolSelector(g, __tr2qs_ctx("Console windows", "options"), KviOption_boolAutoLogConsole); - QWidget * w = addDirectorySelector(0,1,0,1,__tr2qs_ctx("Save logs to folder:","options"),KviOption_stringLogsPath); - mergeTip(w, __tr2qs_ctx("This is the base log directory:
" \ - "all the log files will be saved inside this directory","options")); + QWidget * w = addDirectorySelector(0, 1, 0, 1, __tr2qs_ctx("Save logs to folder:", "options"), KviOption_stringLogsPath); + mergeTip(w, __tr2qs_ctx("This is the base log directory:
" + "all the log files will be saved inside this directory", + "options")); - w = addStringSelector(0,2,0,2,__tr2qs_ctx("Dynamic subfolder:","options"),KviOption_stringLogsDynamicPath); - mergeTip(w, __tr2qs_ctx("You can specify a subdirectory where log files will be saved: " \ - "use kvs code to create dynamic subfolders.","options")); + w = addStringSelector(0, 2, 0, 2, __tr2qs_ctx("Dynamic subfolder:", "options"), KviOption_stringLogsDynamicPath); + mergeTip(w, __tr2qs_ctx("You can specify a subdirectory where log files will be saved: " + "use kvs code to create dynamic subfolders.", + "options")); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Strip message type numbers in logs","options"),KviOption_boolStripMsgTypeInLogs); - addBoolSelector(0,4,0,4,__tr2qs_ctx("Strip colors in logs","options"),KviOption_boolStripControlCodesInLogs); - KviUIntSelector* us = addUIntSelector(0,5,0,5,__tr2qs_ctx("Auto flush logs every:","options"),KviOption_uintAutoFlushLogs,0,99999,0); - us->setSuffix(__tr2qs_ctx(" min","options")); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Strip message type numbers in logs", "options"), KviOption_boolStripMsgTypeInLogs); + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Strip colors in logs", "options"), KviOption_boolStripControlCodesInLogs); + KviUIntSelector * us = addUIntSelector(0, 5, 0, 5, __tr2qs_ctx("Auto flush logs every:", "options"), KviOption_uintAutoFlushLogs, 0, 99999, 0); + us->setSuffix(__tr2qs_ctx(" min", "options")); mergeTip(us, - __tr2qs_ctx("Save logs with the current interval.
" \ - "Set to 0 to disable this feature","options")); + __tr2qs_ctx("Save logs with the current interval.
" + "Set to 0 to disable this feature", + "options")); #ifdef COMPILE_ZLIB_SUPPORT - addBoolSelector(0,6,0,6,__tr2qs_ctx("Compress logs","options"),KviOption_boolGzipLogs); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Compress logs", "options"), KviOption_boolGzipLogs); #endif - addRowSpacer(0,7,0,7); + addRowSpacer(0, 7, 0, 7); } OptionsWidget_logging::~OptionsWidget_logging() diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp index 42141ae5c..19fe5dd5c 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.cpp +++ b/src/modules/options/OptionsWidget_mediaTypes.cpp @@ -34,20 +34,20 @@ // KviApplication.cpp extern KVIRC_API KviMediaManager * g_pMediaManager; -static void copyMediaType(KviMediaType * dst,const KviMediaType * src) +static void copyMediaType(KviMediaType * dst, const KviMediaType * src) { - dst->szFileMask = src->szFileMask; - dst->szIanaType = src->szIanaType; - dst->szDescription = src->szDescription; - dst->szMagicBytes = src->szMagicBytes; - dst->szSavePath = src->szSavePath; - dst->szCommandline = src->szCommandline; + dst->szFileMask = src->szFileMask; + dst->szIanaType = src->szIanaType; + dst->szDescription = src->szDescription; + dst->szMagicBytes = src->szMagicBytes; + dst->szSavePath = src->szSavePath; + dst->szCommandline = src->szCommandline; dst->szRemoteExecCommandline = src->szRemoteExecCommandline; - dst->szIcon = src->szIcon; + dst->szIcon = src->szIcon; } -MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t) -: QTreeWidgetItem(w) +MediaTypeTreeWidgetItem::MediaTypeTreeWidgetItem(QTreeWidget * w, KviMediaType * t) + : QTreeWidgetItem(w) { copyData(t); } @@ -58,14 +58,14 @@ MediaTypeTreeWidgetItem::~MediaTypeTreeWidgetItem() void MediaTypeTreeWidgetItem::copyData(KviMediaType * t) { - copyMediaType(&m_data,t); - setText(0,m_data.szFileMask.ptr()); - setText(1,m_data.szIanaType.ptr()); - setText(2,m_data.szDescription.ptr()); + copyMediaType(&m_data, t); + setText(0, m_data.szFileMask.ptr()); + setText(1, m_data.szIanaType.ptr()); + setText(2, m_data.szDescription.ptr()); } OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("mediatypes_options_widget"); @@ -74,75 +74,77 @@ OptionsWidget_mediaTypes::OptionsWidget_mediaTypes(QWidget * parent) m_pTreeWidget = new QTreeWidget(this); m_pTreeWidget->setColumnCount(3); QStringList columnLabels; - columnLabels.append(__tr2qs_ctx("Pattern","options")); - columnLabels.append(__tr2qs_ctx("MIME Type","options")); - columnLabels.append(__tr2qs_ctx("Description","options")); + columnLabels.append(__tr2qs_ctx("Pattern", "options")); + columnLabels.append(__tr2qs_ctx("MIME Type", "options")); + columnLabels.append(__tr2qs_ctx("Description", "options")); m_pTreeWidget->setHeaderLabels(columnLabels); m_pTreeWidget->setAllColumnsShowFocus(true); m_pTreeWidget->setRootIsDecorated(false); - connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); + connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); - layout()->addWidget(m_pTreeWidget,0,0,1,3); + layout()->addWidget(m_pTreeWidget, 0, 0, 1, 3); - QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this); - layout()->addWidget(l,1,0); + QLabel * l = new QLabel(__tr2qs_ctx("Description:", "options"), this); + layout()->addWidget(l, 1, 0); m_pDescription = new QLineEdit(this); - layout()->addWidget(m_pDescription,1,1,1,2); + layout()->addWidget(m_pDescription, 1, 1, 1, 2); - l = new QLabel(__tr2qs_ctx("MIME type:","options"),this); - layout()->addWidget(l,2,0); + l = new QLabel(__tr2qs_ctx("MIME type:", "options"), this); + layout()->addWidget(l, 2, 0); m_pIanaType = new QLineEdit(this); - layout()->addWidget(m_pIanaType,2,1,1,2); + layout()->addWidget(m_pIanaType, 2, 1, 1, 2); - l = new QLabel(__tr2qs_ctx("File pattern:","options"),this); - layout()->addWidget(l,3,0); + l = new QLabel(__tr2qs_ctx("File pattern:", "options"), this); + layout()->addWidget(l, 3, 0); m_pFileMask = new QLineEdit(this); - layout()->addWidget(m_pFileMask,3,1,1,2); + layout()->addWidget(m_pFileMask, 3, 1, 1, 2); - l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this); - layout()->addWidget(l,4,0); + l = new QLabel(__tr2qs_ctx("Magic bytes:", "options"), this); + layout()->addWidget(l, 4, 0); m_pMagicBytes = new QLineEdit(this); - layout()->addWidget(m_pMagicBytes,4,1,1,2); + layout()->addWidget(m_pMagicBytes, 4, 1, 1, 2); - l = new QLabel(__tr2qs_ctx("Save path:","options"),this); - layout()->addWidget(l,5,0); + l = new QLabel(__tr2qs_ctx("Save path:", "options"), this); + layout()->addWidget(l, 5, 0); m_pSavePath = new QLineEdit(this); - layout()->addWidget(m_pSavePath,5,1,1,2); + layout()->addWidget(m_pSavePath, 5, 1, 1, 2); - l = new QLabel(__tr2qs_ctx("Local open command:","options"),this); - layout()->addWidget(l,6,0); + l = new QLabel(__tr2qs_ctx("Local open command:", "options"), this); + layout()->addWidget(l, 6, 0); m_pCommandline = new QLineEdit(this); - layout()->addWidget(m_pCommandline,6,1,1,2); - mergeTip(m_pCommandline,__tr2qs_ctx("This field contains the command to execute to open a local file.
" \ - "$0 is used in place of the filename","options")); + layout()->addWidget(m_pCommandline, 6, 1, 1, 2); + mergeTip(m_pCommandline, __tr2qs_ctx("This field contains the command to execute to open a local file.
" + "$0 is used in place of the filename", + "options")); - l = new QLabel(__tr2qs_ctx("Remote open command:","options"),this); - layout()->addWidget(l,7,0); + l = new QLabel(__tr2qs_ctx("Remote open command:", "options"), this); + layout()->addWidget(l, 7, 0); m_pRemoteExecCommandline = new QLineEdit(this); - layout()->addWidget(m_pRemoteExecCommandline,7,1,1,2); - mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("This field contains the command to execute when automatically opening a received file.
" \ - "$0 is used in place of the filename","options")); + layout()->addWidget(m_pRemoteExecCommandline, 7, 1, 1, 2); + mergeTip(m_pRemoteExecCommandline, __tr2qs_ctx("This field contains the command to execute when automatically opening a received file.
" + "$0 is used in place of the filename", + "options")); - l = new QLabel(__tr2qs_ctx("Icon:","options"),this); - layout()->addWidget(l,8,0); + l = new QLabel(__tr2qs_ctx("Icon:", "options"), this); + layout()->addWidget(l, 8, 0); m_pIcon = new QLineEdit(this); - layout()->addWidget(m_pIcon,8,1,1,2); + layout()->addWidget(m_pIcon, 8, 1, 1, 2); QFrame * f = new QFrame(this); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); - layout()->addWidget(f,9,0,1,3); + layout()->addWidget(f, 9, 0, 1, 3); - QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this); - connect(b,SIGNAL(clicked()),this,SLOT(newMediaType())); - layout()->addWidget(b,10,1); + QPushButton * b = new QPushButton(__tr2qs_ctx("&New", "options"), this); + connect(b, SIGNAL(clicked()), this, SLOT(newMediaType())); + layout()->addWidget(b, 10, 1); - m_pDelete = new QPushButton(__tr2qs_ctx("Re&move","options"),this); - connect(m_pDelete,SIGNAL(clicked()),this,SLOT(delMediaType())); - layout()->addWidget(m_pDelete,10,2); + m_pDelete = new QPushButton(__tr2qs_ctx("Re&move", "options"), this); + connect(m_pDelete, SIGNAL(clicked()), this, SLOT(delMediaType())); + layout()->addWidget(m_pDelete, 10, 2); - layout()->setColumnStretch(1,1); - layout()->setColumnStretch(2,1); - layout()->setRowStretch(0,1); + layout()->setColumnStretch(1, 1); + layout()->setColumnStretch(2, 1); + layout()->setRowStretch(0, 1); m_pLastItem = 0; @@ -159,8 +161,8 @@ void OptionsWidget_mediaTypes::fillTreeWidget() g_pMediaManager->lock(); KviPointerList * l = g_pMediaManager->mediaTypeList(); - for(KviMediaType * t = l->first();t;t = l->next()) - new MediaTypeTreeWidgetItem(m_pTreeWidget,t); + for(KviMediaType * t = l->first(); t; t = l->next()) + new MediaTypeTreeWidgetItem(m_pTreeWidget, t); g_pMediaManager->unlock(); enableOrDisable(); @@ -171,16 +173,17 @@ void OptionsWidget_mediaTypes::saveLastItem() if(m_pLastItem) { KviMediaType t; - t.szDescription = m_pDescription->text(); - t.szIanaType = m_pIanaType->text(); - t.szFileMask = m_pFileMask->text(); - t.szSavePath = m_pSavePath->text(); - t.szCommandline = m_pCommandline->text(); - t.szMagicBytes = m_pMagicBytes->text(); + t.szDescription = m_pDescription->text(); + t.szIanaType = m_pIanaType->text(); + t.szFileMask = m_pFileMask->text(); + t.szSavePath = m_pSavePath->text(); + t.szCommandline = m_pCommandline->text(); + t.szMagicBytes = m_pMagicBytes->text(); t.szRemoteExecCommandline = m_pRemoteExecCommandline->text(); - t.szIcon = m_pIcon->text(); + t.szIcon = m_pIcon->text(); - if(t.szDescription.isEmpty())t.szDescription = __tr2qs_ctx("[Unknown Media Type]","options"); + if(t.szDescription.isEmpty()) + t.szDescription = __tr2qs_ctx("[Unknown Media Type]", "options"); m_pLastItem->copyData(&t); } @@ -211,13 +214,14 @@ void OptionsWidget_mediaTypes::setLineEdits() m_pIcon->setText(m_pLastItem ? m_pLastItem->mydata()->szIcon.ptr() : ""); } -void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) +void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) { saveLastItem(); m_pLastItem = (MediaTypeTreeWidgetItem *)it; if(it) { - if(!it->isSelected())it->setSelected(true); + if(!it->isSelected()) + it->setSelected(true); } setLineEdits(); enableOrDisable(); @@ -226,8 +230,8 @@ void OptionsWidget_mediaTypes::currentItemChanged(QTreeWidgetItem *it,QTreeWidge void OptionsWidget_mediaTypes::newMediaType() { KviMediaType empty; - empty.szDescription = __tr2qs_ctx("New media type","options"); - MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget,&empty); + empty.szDescription = __tr2qs_ctx("New media type", "options"); + MediaTypeTreeWidgetItem * it = new MediaTypeTreeWidgetItem(m_pTreeWidget, &empty); m_pTreeWidget->setCurrentItem(it); it->setSelected(true); } @@ -245,17 +249,17 @@ void OptionsWidget_mediaTypes::delMediaType() void OptionsWidget_mediaTypes::commit() { saveLastItem(); - MediaTypeTreeWidgetItem * it;// = (MediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild(); + MediaTypeTreeWidgetItem * it; // = (MediaTypeTreeWidgetItem *)m_pTreeWidget->firstChild(); g_pMediaManager->lock(); g_pMediaManager->clear(); //while(it) - for(int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - it=(MediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + it = (MediaTypeTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); KviMediaType * t = new KviMediaType; - copyMediaType(t,it->mydata()); + copyMediaType(t, it->mydata()); g_pMediaManager->insertMediaType(t); - // it = (MediaTypeTreeWidgetItem *)it->nextSibling(); + // it = (MediaTypeTreeWidgetItem *)it->nextSibling(); } g_pMediaManager->unlock(); } diff --git a/src/modules/options/OptionsWidget_mediaTypes.h b/src/modules/options/OptionsWidget_mediaTypes.h index 785922df4..5f9af85b6 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.h +++ b/src/modules/options/OptionsWidget_mediaTypes.h @@ -31,17 +31,18 @@ #include #include - class MediaTypeTreeWidgetItem : public QTreeWidgetItem { public: - MediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t); + MediaTypeTreeWidgetItem(QTreeWidget * w, KviMediaType * t); ~MediaTypeTreeWidgetItem(); + private: KviMediaType m_data; + public: void copyData(KviMediaType * t); - const KviMediaType * mydata(){ return &m_data; }; + const KviMediaType * mydata() { return &m_data; }; }; #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_mediaTypes KviIconManager::File @@ -57,27 +58,30 @@ class OptionsWidget_mediaTypes : public KviOptionsWidget public: OptionsWidget_mediaTypes(QWidget * parent); ~OptionsWidget_mediaTypes(); + private: - QTreeWidget * m_pTreeWidget; - QLineEdit * m_pDescription; - QLineEdit * m_pIanaType; - QLineEdit * m_pFileMask; - QLineEdit * m_pSavePath; - QLineEdit * m_pCommandline; - QLineEdit * m_pMagicBytes; - QLineEdit * m_pRemoteExecCommandline; - QLineEdit * m_pIcon; + QTreeWidget * m_pTreeWidget; + QLineEdit * m_pDescription; + QLineEdit * m_pIanaType; + QLineEdit * m_pFileMask; + QLineEdit * m_pSavePath; + QLineEdit * m_pCommandline; + QLineEdit * m_pMagicBytes; + QLineEdit * m_pRemoteExecCommandline; + QLineEdit * m_pIcon; QPushButton * m_pDelete; MediaTypeTreeWidgetItem * m_pLastItem; + private: void fillTreeWidget(); void saveLastItem(); void enableOrDisable(); void setLineEdits(); private slots: - void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev); + void currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem * prev); void newMediaType(); void delMediaType(); + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index a54ab0bf8..881700613 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -42,17 +42,15 @@ #include #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) - #include // symlink() +#include // symlink() #endif - #ifdef COMPILE_PSEUDO_TRANSPARENCY - extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground; +extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground; #endif - OptionsWidget_message::OptionsWidget_message(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { } @@ -63,60 +61,60 @@ OptionsWidget_message::~OptionsWidget_message() //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// OptionsWidget_privmsg::OptionsWidget_privmsg(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("privmsg_options_widget"); createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("General","options")); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("General", "options")); - addBoolSelector(g,__tr2qs_ctx("Show message icons","options"),KviOption_boolIrcViewShowImages); - addBoolSelector(g,__tr2qs_ctx("Draw some emoticons (smileys) as pictures","options"),KviOption_boolDrawEmoticons); - addBoolSelector(g,__tr2qs_ctx("Don't show colors in user messages","options"),KviOption_boolStripMircColorsInUserMessages); + addBoolSelector(g, __tr2qs_ctx("Show message icons", "options"), KviOption_boolIrcViewShowImages); + addBoolSelector(g, __tr2qs_ctx("Draw some emoticons (smileys) as pictures", "options"), KviOption_boolDrawEmoticons); + addBoolSelector(g, __tr2qs_ctx("Don't show colors in user messages", "options"), KviOption_boolStripMircColorsInUserMessages); - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Nicknames","options")); + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Nicknames", "options")); - m_pUseSmartColorSelector = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks); + m_pUseSmartColorSelector = addBoolSelector(g, __tr2qs_ctx("\"Smart\" nickname colors", "options"), KviOption_boolColorNicks); KviTalHBox * hb = new KviTalHBox(g); hb->setSpacing(4); - m_pSpecialSmartColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use specified colors for own nick:","options"),KviOption_boolUseSpecifiedSmartColorForOwnNick,KVI_OPTION_BOOL(KviOption_boolColorNicks)); + m_pSpecialSmartColorSelector = addBoolSelector(hb, __tr2qs_ctx("Use specified colors for own nick:", "options"), KviOption_boolUseSpecifiedSmartColorForOwnNick, KVI_OPTION_BOOL(KviOption_boolColorNicks)); - m_pSmartColorSelector = addMircTextColorSelector(hb,"",KviOption_uintUserIrcViewOwnForeground,KviOption_uintUserIrcViewOwnBackground,KVI_OPTION_BOOL(KviOption_boolColorNicks) && KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick)); + m_pSmartColorSelector = addMircTextColorSelector(hb, "", KviOption_uintUserIrcViewOwnForeground, KviOption_uintUserIrcViewOwnBackground, KVI_OPTION_BOOL(KviOption_boolColorNicks) && KVI_OPTION_BOOL(KviOption_boolUseSpecifiedSmartColorForOwnNick)); - connect(m_pSpecialSmartColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableSmartColorSelector(bool))); - connect(m_pUseSmartColorSelector,SIGNAL(toggled(bool)),m_pSpecialSmartColorSelector,SLOT(setEnabled(bool))); + connect(m_pSpecialSmartColorSelector, SIGNAL(toggled(bool)), this, SLOT(enableDisableSmartColorSelector(bool))); + connect(m_pUseSmartColorSelector, SIGNAL(toggled(bool)), m_pSpecialSmartColorSelector, SLOT(setEnabled(bool))); - KviBoolSelector * b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks)); - connect(m_pUseSmartColorSelector,SIGNAL(toggled(bool)),b2,SLOT(setNotEnabled(bool))); + KviBoolSelector * b2 = addBoolSelector(g, __tr2qs_ctx("Use same colors as in the userlist", "options"), KviOption_boolUseUserListColorsAsNickColors, !KVI_OPTION_BOOL(KviOption_boolColorNicks)); + connect(m_pUseSmartColorSelector, SIGNAL(toggled(bool)), b2, SLOT(setNotEnabled(bool))); - addBoolSelector(g,__tr2qs_ctx("Show nicknames in bold","options"),KviOption_boolBoldedNicks); - addBoolSelector(g,__tr2qs_ctx("Show user and host","options"),KviOption_boolShowUserAndHostInPrivmsgView); - addBoolSelector(g,__tr2qs_ctx("Show channel mode prefix","options"),KviOption_boolShowChannelUserFlagInPrivmsgView); - KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("User-defined prefix and postfix","options"),KviOption_boolUseExtendedPrivmsgView); + addBoolSelector(g, __tr2qs_ctx("Show nicknames in bold", "options"), KviOption_boolBoldedNicks); + addBoolSelector(g, __tr2qs_ctx("Show user and host", "options"), KviOption_boolShowUserAndHostInPrivmsgView); + addBoolSelector(g, __tr2qs_ctx("Show channel mode prefix", "options"), KviOption_boolShowChannelUserFlagInPrivmsgView); + KviBoolSelector * b = addBoolSelector(g, __tr2qs_ctx("User-defined prefix and postfix", "options"), KviOption_boolUseExtendedPrivmsgView); - QLabel * l = addLabel(g,__tr2qs_ctx("[PREFIX]nickname[!user@host][POSTFIX] message","options")); + QLabel * l = addLabel(g, __tr2qs_ctx("[PREFIX]nickname[!user@host][POSTFIX] message", "options")); l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)); connect(b, - SIGNAL(toggled(bool)), - l, - SLOT(setEnabled(bool))); + SIGNAL(toggled(bool)), + l, + SLOT(setEnabled(bool))); KviTalVBox * vb = new KviTalVBox(g); vb->setSpacing(5); connect( - b, - SIGNAL(toggled(bool)), - addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), - SLOT(setEnabled(bool))); + b, + SIGNAL(toggled(bool)), + addStringSelector(vb, __tr2qs_ctx("Prefix:", "options"), KviOption_stringExtendedPrivmsgPrefix, KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), + SLOT(setEnabled(bool))); connect( - b, - SIGNAL(toggled(bool)), - addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), - SLOT(setEnabled(bool))); - addRowSpacer(0,3,0,3); + b, + SIGNAL(toggled(bool)), + addStringSelector(vb, __tr2qs_ctx("Postfix:", "options"), KviOption_stringExtendedPrivmsgPostfix, KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), + SLOT(setEnabled(bool))); + addRowSpacer(0, 3, 0, 3); } void OptionsWidget_privmsg::enableDisableSmartColorSelector(bool) @@ -129,30 +127,30 @@ OptionsWidget_privmsg::~OptionsWidget_privmsg() } OptionsWidget_timestamp::OptionsWidget_timestamp(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { createLayout(); - m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp); + m_pUseTimestampSelector = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Show timestamp", "options"), KviOption_boolIrcViewTimestamp); - connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool))); - KviBoolSelector* b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); + connect(m_pUseTimestampSelector, SIGNAL(toggled(bool)), this, SLOT(enableDisableTimestampSelector(bool))); + KviBoolSelector * b = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Use UTC time for timestamp", "options"), KviOption_boolIrcViewTimestampUTC, KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); - connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + connect(m_pUseTimestampSelector, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - KviTalHBox *hb = new KviTalHBox(this); - addWidgetToLayout(hb,0,2,0,2); + KviTalHBox * hb = new KviTalHBox(this); + addWidgetToLayout(hb, 0, 2, 0, 2); - m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps:","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); - connect(m_pSpecialTimestampColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool))); - connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool))); + m_pSpecialTimestampColorSelector = addBoolSelector(hb, __tr2qs_ctx("Use special color for timestamps:", "options"), KviOption_boolUseSpecialColorForTimestamp, KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); + connect(m_pSpecialTimestampColorSelector, SIGNAL(toggled(bool)), this, SLOT(enableDisableTimestampSelector(bool))); + connect(m_pUseTimestampSelector, SIGNAL(toggled(bool)), m_pSpecialTimestampColorSelector, SLOT(setEnabled(bool))); - m_pTimestampColorSelector = addMircTextColorSelector(hb,"",KviOption_uintTimeStampForeground,KviOption_uintTimeStampBackground,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp)); + m_pTimestampColorSelector = addMircTextColorSelector(hb, "", KviOption_uintTimeStampForeground, KviOption_uintTimeStampBackground, KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp)); - KviStringSelector * st=addStringSelector(0,3,0,3,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat); - connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),st,SLOT(setEnabled(bool))); + KviStringSelector * st = addStringSelector(0, 3, 0, 3, __tr2qs_ctx("Timestamp format:", "options"), KviOption_stringIrcViewTimestampFormat); + connect(m_pUseTimestampSelector, SIGNAL(toggled(bool)), st, SLOT(setEnabled(bool))); - connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,SLOT(setEnabled(bool))); - addRowSpacer(0,4,0,4); + connect(m_pUseTimestampSelector, SIGNAL(toggled(bool)), m_pSpecialTimestampColorSelector, SLOT(setEnabled(bool))); + addRowSpacer(0, 4, 0, 4); } OptionsWidget_timestamp::~OptionsWidget_timestamp() @@ -167,31 +165,29 @@ void OptionsWidget_timestamp::enableDisableTimestampSelector(bool) ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// OptionsWidget_standardColors::OptionsWidget_standardColors(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("stdcolors"); createLayout(); - for(int i=0;i<16;i++) - m_pColorSelector[i] = addColorSelector(i%4,i/4,i%4,i/4,QString("%1:").arg(i),&(KVI_OPTION_MIRCCOLOR(i))); - - QLabel * l = addLabel(0,4,3,4,__tr2qs_ctx( - "Please note that this is a set of standard IRC colors. " \ - "You can adjust them a bit, make them darker or lighter but you " \ - "shouldn't change their fundamental tint. " \ - "Black should stay black, dark green should still remain a green darker than the light one.", - "options" - ) - ); + for(int i = 0; i < 16; i++) + m_pColorSelector[i] = addColorSelector(i % 4, i / 4, i % 4, i / 4, QString("%1:").arg(i), &(KVI_OPTION_MIRCCOLOR(i))); + + QLabel * l = addLabel(0, 4, 3, 4, __tr2qs_ctx( + "Please note that this is a set of standard IRC colors. " + "You can adjust them a bit, make them darker or lighter but you " + "shouldn't change their fundamental tint. " + "Black should stay black, dark green should still remain a green darker than the light one.", + "options")); l->setAlignment(Qt::AlignLeft); - addRowSpacer(0,5,3,5); + addRowSpacer(0, 5, 3, 5); - layout()->setRowStretch(5,1); + layout()->setRowStretch(5, 1); - QPushButton * pReset = addPushButton(3,6,3,6,__tr2qs_ctx("Reset to Default","options")); + QPushButton * pReset = addPushButton(3, 6, 3, 6, __tr2qs_ctx("Reset to Default", "options")); - QObject::connect(pReset,SIGNAL(clicked()),this,SLOT(resetToDefaults())); + QObject::connect(pReset, SIGNAL(clicked()), this, SLOT(resetToDefaults())); } OptionsWidget_standardColors::~OptionsWidget_standardColors() @@ -200,33 +196,33 @@ OptionsWidget_standardColors::~OptionsWidget_standardColors() void OptionsWidget_standardColors::resetToDefaults() { - m_pColorSelector[0]->forceColor(QColor(255,255,255)); - m_pColorSelector[1]->forceColor(QColor(0,0,0)); - m_pColorSelector[2]->forceColor(QColor(0,0,140)); - m_pColorSelector[3]->forceColor(QColor(0,100,0)); - m_pColorSelector[4]->forceColor(QColor(230,0,0)); - m_pColorSelector[5]->forceColor(QColor(150,0,0)); - m_pColorSelector[6]->forceColor(QColor(80,0,80)); - m_pColorSelector[7]->forceColor(QColor(255,90,0)); - m_pColorSelector[8]->forceColor(QColor(255,255,0)); - m_pColorSelector[9]->forceColor(QColor(0,255,0)); - m_pColorSelector[10]->forceColor(QColor(0,150,180)); - m_pColorSelector[11]->forceColor(QColor(170,170,255)); - m_pColorSelector[12]->forceColor(QColor(15,15,255)); - m_pColorSelector[13]->forceColor(QColor(200,0,200)); - m_pColorSelector[14]->forceColor(QColor(80,80,80)); - m_pColorSelector[15]->forceColor(QColor(170,170,170)); + m_pColorSelector[0]->forceColor(QColor(255, 255, 255)); + m_pColorSelector[1]->forceColor(QColor(0, 0, 0)); + m_pColorSelector[2]->forceColor(QColor(0, 0, 140)); + m_pColorSelector[3]->forceColor(QColor(0, 100, 0)); + m_pColorSelector[4]->forceColor(QColor(230, 0, 0)); + m_pColorSelector[5]->forceColor(QColor(150, 0, 0)); + m_pColorSelector[6]->forceColor(QColor(80, 0, 80)); + m_pColorSelector[7]->forceColor(QColor(255, 90, 0)); + m_pColorSelector[8]->forceColor(QColor(255, 255, 0)); + m_pColorSelector[9]->forceColor(QColor(0, 255, 0)); + m_pColorSelector[10]->forceColor(QColor(0, 150, 180)); + m_pColorSelector[11]->forceColor(QColor(170, 170, 255)); + m_pColorSelector[12]->forceColor(QColor(15, 15, 255)); + m_pColorSelector[13]->forceColor(QColor(200, 0, 200)); + m_pColorSelector[14]->forceColor(QColor(80, 80, 80)); + m_pColorSelector[15]->forceColor(QColor(170, 170, 170)); } -MessageListWidgetItem::MessageListWidgetItem(MessageListWidget* l,int optId) -: KviTalListWidgetItem(l) +MessageListWidgetItem::MessageListWidgetItem(MessageListWidget * l, int optId) + : KviTalListWidgetItem(l) { m_iOptId = optId; m_pMsgType = new KviMessageTypeSettings(KVI_OPTION_MSGTYPE(optId)); QString txt = g_msgtypeOptionsTable[m_iOptId].name; // skip the msgtype prefix - txt.remove(0,KVI_MSGTYPE_OPTIONS_PREFIX_LEN); + txt.remove(0, KVI_MSGTYPE_OPTIONS_PREFIX_LEN); txt += " ("; txt += __tr2qs_no_xgettext(m_pMsgType->type()); txt += ")"; @@ -243,40 +239,45 @@ MessageListWidgetItem::~MessageListWidgetItem() void MessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const { - const KviTalListWidget *tb = (const KviTalListWidget *)parent(); - MessageListWidgetItem *it = static_cast(index.internalPointer()); + const KviTalListWidget * tb = (const KviTalListWidget *)parent(); + MessageListWidgetItem * it = static_cast(index.internalPointer()); #ifdef COMPILE_PSEUDO_TRANSPARENCY if(KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency) && g_pApp->supportsCompositing()) { p->save(); p->setCompositionMode(QPainter::CompositionMode_Source); - QColor col=KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade); + QColor col = KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade); col.setAlphaF((float)((float)KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) / (float)100)); p->fillRect(opt.rect, col); p->restore(); - } else if(g_pShadedChildGlobalDesktopBackground) + } + else if(g_pShadedChildGlobalDesktopBackground) { QPoint pnt = tb->viewport()->mapToGlobal(opt.rect.topLeft()); - p->drawTiledPixmap(opt.rect,*g_pShadedChildGlobalDesktopBackground, pnt); - } else { + p->drawTiledPixmap(opt.rect, *g_pShadedChildGlobalDesktopBackground, pnt); + } + else + { #endif QPixmap * pix = KVI_OPTION_PIXMAP(KviOption_pixmapIrcViewBackground).pixmap(); if(pix) { QPoint pnt = tb->viewport()->mapToGlobal(opt.rect.topLeft()); - p->drawTiledPixmap(opt.rect,*pix,pnt); - } else { - p->fillRect(opt.rect,KVI_OPTION_COLOR(KviOption_colorIrcViewBackground)); + p->drawTiledPixmap(opt.rect, *pix, pnt); + } + else + { + p->fillRect(opt.rect, KVI_OPTION_COLOR(KviOption_colorIrcViewBackground)); } #ifdef COMPILE_PSEUDO_TRANSPARENCY } #endif - QString szText=index.data(Qt::DisplayRole).toString(); + QString szText = index.data(Qt::DisplayRole).toString(); QPoint pt = opt.rect.topLeft(); pt.setX(pt.x() + 4); - p->drawPixmap(pt,*(g_pIconManager->getSmallIcon(it->msgType()->pixId()))); + p->drawPixmap(pt, *(g_pIconManager->getSmallIcon(it->msgType()->pixId()))); pt.setX(pt.x() + 18); // draw the background if(it->msgType()->back() < 16) @@ -285,38 +286,40 @@ void MessageListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionViewIt p->fillRect(pt.x(), pt.y(), opt.rect.width() - pt.x(), opt.rect.height(), bColor); } unsigned char ucFore = it->msgType()->fore(); - if(ucFore > 15)ucFore = 0; + if(ucFore > 15) + ucFore = 0; p->setPen(QPen(KVI_OPTION_MIRCCOLOR(ucFore))); pt.setX(pt.x() + 2); - p->drawText(pt.x(), pt.y(), opt.rect.width() - pt.x(), opt.rect.height(),Qt::AlignLeft | Qt::AlignVCenter,szText); + p->drawText(pt.x(), pt.y(), opt.rect.width() - pt.x(), opt.rect.height(), Qt::AlignLeft | Qt::AlignVCenter, szText); if(opt.state & QStyle::State_Selected) { QPen pen(Qt::white); p->setPen(pen); - p->drawRect(opt.rect.adjusted(0,0,-1,-1)); - p->drawRect(opt.rect.adjusted (1,1,-2,-2)); + p->drawRect(opt.rect.adjusted(0, 0, -1, -1)); + p->drawRect(opt.rect.adjusted(1, 1, -2, -2)); pen.setColor(Qt::black); pen.setStyle(Qt::DashLine); p->setPen(pen); - p->drawRect(opt.rect.adjusted(0,0,-1,-1)); - p->drawRect(opt.rect.adjusted (1,1,-2,-2)); + p->drawRect(opt.rect.adjusted(0, 0, -1, -1)); + p->drawRect(opt.rect.adjusted(1, 1, -2, -2)); } } - -MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b,int idx) -: KviTalListWidgetText(b,QString()) +MessageColorListWidgetItem::MessageColorListWidgetItem(KviTalListWidget * b, int idx) + : KviTalListWidgetText(b, QString()) { m_iClrIdx = idx; if((idx < 0) || (idx > 15)) { - setText(__tr2qs_ctx("Transparent","options")); + setText(__tr2qs_ctx("Transparent", "options")); setBackground(listWidget()->isEnabled() ? Qt::transparent : Qt::gray); - } else { + } + else + { setBackground(QColor(KVI_OPTION_MIRCCOLOR(m_iClrIdx))); setText(" "); } @@ -332,33 +335,37 @@ void MessageColorListWidgetItemDelegate::paint(QPainter * p, const QStyleOptionV if(opt.state & QStyle::State_Selected) { QColor clr; - const KviTalListWidget *lb = (const KviTalListWidget *)parent(); - MessageColorListWidgetItem *it = static_cast(index.internalPointer()); + const KviTalListWidget * lb = (const KviTalListWidget *)parent(); + MessageColorListWidgetItem * it = static_cast(index.internalPointer()); if((it->clrIdx() >= 0) && (it->clrIdx() <= 15)) { clr = KVI_OPTION_MIRCCOLOR(it->clrIdx()); - } else { - clr =lb->palette().color(QPalette::Window); + } + else + { + clr = lb->palette().color(QPalette::Window); } QStyleOptionViewItem optz(opt); optz.state = opt.state ^ QStyle::State_Selected; QItemDelegate::paint(p, optz, index); - QPen pen(QColor(255-clr.red(), 255-clr.green(), 255-clr.blue())); + QPen pen(QColor(255 - clr.red(), 255 - clr.green(), 255 - clr.blue())); pen.setStyle(Qt::DashLine); p->setPen(pen); - p->drawRect(opt.rect.adjusted(0,0,-1,-1)); - p->drawRect(opt.rect.adjusted (1,1,-2,-2)); - p->drawRect(opt.rect.adjusted (2,2,-3,-3)); - } else { + p->drawRect(opt.rect.adjusted(0, 0, -1, -1)); + p->drawRect(opt.rect.adjusted(1, 1, -2, -2)); + p->drawRect(opt.rect.adjusted(2, 2, -3, -3)); + } + else + { QItemDelegate::paint(p, opt, index); } } OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("messages"); @@ -374,78 +381,77 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) m_pListView->setFont(KVI_OPTION_FONT(KviOption_fontIrcView)); m_pListView->viewport()->setAutoFillBackground(false); - addWidgetToLayout(m_pListView,0,0,2,0); + addWidgetToLayout(m_pListView, 0, 0, 2, 0); KviTalVBox * box = new KviTalVBox(this); - addWidgetToLayout(box,3,0,3,0); + addWidgetToLayout(box, 3, 0, 3, 0); - new QLabel(__tr2qs_ctx("Background:","options"),box); + new QLabel(__tr2qs_ctx("Background:", "options"), box); m_pBackListWidget = new KviTalListWidget(box); m_pBackListWidget->setMaximumWidth(150); m_pBackListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pBackListWidget); m_pBackListWidget->setItemDelegate(m_pBackListWidgetDelegate); - m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget,KviControlCodes::Transparent); - for(i=0;i<16;i++) + m_pBackItems[16] = new MessageColorListWidgetItem(m_pBackListWidget, KviControlCodes::Transparent); + for(i = 0; i < 16; i++) { - m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget,i); + m_pBackItems[i] = new MessageColorListWidgetItem(m_pBackListWidget, i); } - new QLabel(__tr2qs_ctx("Foreground:","options"),box); + new QLabel(__tr2qs_ctx("Foreground:", "options"), box); m_pForeListWidget = new KviTalListWidget(box); m_pForeListWidget->setMaximumWidth(150); m_pForeListWidgetDelegate = new MessageColorListWidgetItemDelegate(m_pForeListWidget); m_pForeListWidget->setItemDelegate(m_pForeListWidgetDelegate); - for(i=0;i<16;i++) + for(i = 0; i < 16; i++) { - m_pForeItems[i] = new MessageColorListWidgetItem(m_pForeListWidget,i); + m_pForeItems[i] = new MessageColorListWidgetItem(m_pForeListWidget, i); } - new QLabel(__tr2qs_ctx("Alert level:","options"),box); + new QLabel(__tr2qs_ctx("Alert level:", "options"), box); m_pLevelListWidget = new KviTalListWidget(box); m_pLevelListWidget->setMaximumWidth(150); - for(i=0;i<6;i++) + for(i = 0; i < 6; i++) { QString tmpn; tmpn.setNum(i); - new KviTalListWidgetText(m_pLevelListWidget,tmpn); + new KviTalListWidgetText(m_pLevelListWidget, tmpn); } m_pIconButton = new QToolButton(box); - connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); + connect(m_pIconButton, SIGNAL(clicked()), this, SLOT(iconButtonClicked())); - m_pIconPopup = new QMenu(this); + m_pIconPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pIconPopup); - connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(newIconSelected(KviIconManager::SmallIcon))); + connect(iw, SIGNAL(selected(KviIconManager::SmallIcon)), this, SLOT(newIconSelected(KviIconManager::SmallIcon))); QWidgetAction * pWaction = new QWidgetAction(m_pIconPopup); pWaction->setDefaultWidget(iw); m_pIconPopup->addAction(pWaction); - m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this","options"),box); + m_pEnableLogging = new QCheckBox(__tr2qs_ctx("Log this", "options"), box); KviTalHBox * h = new KviTalHBox(this); - addWidgetToLayout(h,0,1,3,1); - QPushButton * b = new QPushButton(__tr2qs_ctx("Load from...","options"),h); - connect(b,SIGNAL(clicked()),this,SLOT(load())); - b = new QPushButton(__tr2qs_ctx("Save As...","options"),h); - connect(b,SIGNAL(clicked()),this,SLOT(save())); - + addWidgetToLayout(h, 0, 1, 3, 1); + QPushButton * b = new QPushButton(__tr2qs_ctx("Load from...", "options"), h); + connect(b, SIGNAL(clicked()), this, SLOT(load())); + b = new QPushButton(__tr2qs_ctx("Save As...", "options"), h); + connect(b, SIGNAL(clicked()), this, SLOT(save())); - for(i=0;isetRowStretch(0,1); - layout()->setColumnStretch(0,1); + layout()->setRowStretch(0, 1); + layout()->setColumnStretch(0, 1); - connect(m_pListView,SIGNAL(itemSelectionChanged ()),this,SLOT(itemChanged())); - connect(m_pForeListWidget,SIGNAL(itemSelectionChanged ()),this,SLOT(colorChanged())); - connect(m_pBackListWidget,SIGNAL(itemSelectionChanged ()),this,SLOT(colorChanged())); + connect(m_pListView, SIGNAL(itemSelectionChanged()), this, SLOT(itemChanged())); + connect(m_pForeListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(colorChanged())); + connect(m_pBackListWidget, SIGNAL(itemSelectionChanged()), this, SLOT(colorChanged())); itemChanged(); } @@ -453,11 +459,11 @@ OptionsWidget_messageColors::OptionsWidget_messageColors(QWidget * parent) OptionsWidget_messageColors::~OptionsWidget_messageColors() { int i; - for(i=15;i>=0;i--) + for(i = 15; i >= 0; i--) { delete m_pForeItems[i]; } - for(i=16;i>=0;i--) + for(i = 16; i >= 0; i--) { delete m_pBackItems[i]; } @@ -473,7 +479,8 @@ OptionsWidget_messageColors::~OptionsWidget_messageColors() void OptionsWidget_messageColors::newIconSelected(KviIconManager::SmallIcon eIcon) { - if(!m_pLastItem)return; + if(!m_pLastItem) + return; if(eIcon >= KviIconManager::IconCount) return; m_pLastItem->msgType()->setPixId(eIcon); @@ -492,27 +499,31 @@ void OptionsWidget_messageColors::saveLastItem() //qDebug("Setting fore %d",curIt); MessageColorListWidgetItem * fore = (MessageColorListWidgetItem *)m_pForeListWidget->item(curIt); //qDebug("And is %d",fore); - if(fore)m_pLastItem->msgType()->setFore(fore->m_iClrIdx); + if(fore) + m_pLastItem->msgType()->setFore(fore->m_iClrIdx); } curIt = m_pBackListWidget->currentRow(); if(curIt >= 0) //quite useless { MessageColorListWidgetItem * back = (MessageColorListWidgetItem *)m_pBackListWidget->item(curIt); - if(back)m_pLastItem->msgType()->setBack(back->m_iClrIdx); + if(back) + m_pLastItem->msgType()->setBack(back->m_iClrIdx); } m_pLastItem->msgType()->enableLogging(m_pEnableLogging->isChecked()); //qDebug("Updating","options"); curIt = m_pLevelListWidget->currentRow(); - if(curIt < 0 || curIt > 5)curIt = 1; + if(curIt < 0 || curIt > 5) + curIt = 1; m_pLastItem->msgType()->setLevel(curIt); m_pListView->repaint(m_pListView->visualItemRect(m_pLastItem)); } void OptionsWidget_messageColors::itemChanged() { - KviTalListWidgetItem * it = (KviTalListWidgetItem*)m_pListView->currentItem(); + KviTalListWidgetItem * it = (KviTalListWidgetItem *)m_pListView->currentItem(); //qDebug("Item changed","options"); - if(m_pLastItem)saveLastItem(); + if(m_pLastItem) + saveLastItem(); m_pLastItem = 0; // do NOT save in this routine @@ -533,7 +544,9 @@ void OptionsWidget_messageColors::itemChanged() if(back >= 0 && back <= 15) { m_pBackListWidget->setCurrentItem(m_pBackItems[back]); - } else { + } + else + { m_pBackListWidget->setCurrentItem(m_pBackItems[16]); } m_pLevelListWidget->setCurrentRow(((MessageListWidgetItem *)it)->msgType()->level()); @@ -547,7 +560,8 @@ void OptionsWidget_messageColors::itemChanged() void OptionsWidget_messageColors::colorChanged() { - if(m_pLastItem)saveLastItem(); + if(m_pLastItem) + saveLastItem(); } void OptionsWidget_messageColors::iconButtonClicked() @@ -562,9 +576,9 @@ void OptionsWidget_messageColors::commit() mergeResetFlag(KviOption_resetUpdateGui); int count = m_pListView->count(); - for(int i=0; iitem(i); + MessageListWidgetItem * it = (MessageListWidgetItem *)m_pListView->item(i); KVI_OPTION_MSGTYPE(it->optionId()) = *(it->msgType()); } @@ -575,36 +589,35 @@ void OptionsWidget_messageColors::save() { QString szName; QString szInit; - g_pApp->getLocalKvircDirectory(szInit,KviApplication::MsgColors); + g_pApp->getLocalKvircDirectory(szInit, KviApplication::MsgColors); - if(KviFileDialog::askForSaveFileName(szName,__tr2qs_ctx("Enter a Filename - KVIrc","options"),szInit,QString(),false,false,true,this)) + if(KviFileDialog::askForSaveFileName(szName, __tr2qs_ctx("Enter a Filename - KVIrc", "options"), szInit, QString(), false, false, true, this)) { - if(m_pLastItem)saveLastItem(); + if(m_pLastItem) + saveLastItem(); - KviConfigurationFile cfg(szName,KviConfigurationFile::Write); + KviConfigurationFile cfg(szName, KviConfigurationFile::Write); cfg.setGroup("Messages"); KviCString tmp; - int count = m_pListView->count(); - for(int i=0; iitem(i); - - tmp.sprintf("Fore%d",it->optionId()); - cfg.writeEntry(tmp.ptr(),it->msgType()->fore()); - tmp.sprintf("Back%d",it->optionId()); - cfg.writeEntry(tmp.ptr(),it->msgType()->back()); - tmp.sprintf("Icon%d",it->optionId()); - cfg.writeEntry(tmp.ptr(),it->msgType()->pixId()); - tmp.sprintf("Log%d",it->optionId()); - cfg.writeEntry(tmp.ptr(),it->msgType()->logEnabled()); - tmp.sprintf("Level%d",it->optionId()); - cfg.writeEntry(tmp.ptr(),it->msgType()->level()); + MessageListWidgetItem * it = (MessageListWidgetItem *)m_pListView->item(i); + + tmp.sprintf("Fore%d", it->optionId()); + cfg.writeEntry(tmp.ptr(), it->msgType()->fore()); + tmp.sprintf("Back%d", it->optionId()); + cfg.writeEntry(tmp.ptr(), it->msgType()->back()); + tmp.sprintf("Icon%d", it->optionId()); + cfg.writeEntry(tmp.ptr(), it->msgType()->pixId()); + tmp.sprintf("Log%d", it->optionId()); + cfg.writeEntry(tmp.ptr(), it->msgType()->logEnabled()); + tmp.sprintf("Level%d", it->optionId()); + cfg.writeEntry(tmp.ptr(), it->msgType()->level()); } - } } @@ -615,28 +628,28 @@ void OptionsWidget_messageColors::load() QString szName; QString szInit; - g_pApp->getLocalKvircDirectory(szInit,KviApplication::MsgColors); + g_pApp->getLocalKvircDirectory(szInit, KviApplication::MsgColors); #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW) // symlink local to global QString szGlobal; - g_pApp->getGlobalKvircDirectory(szGlobal,KviApplication::MsgColors); + g_pApp->getGlobalKvircDirectory(szGlobal, KviApplication::MsgColors); QString szLocal; - g_pApp->getLocalKvircDirectory(szLocal,KviApplication::MsgColors,"presets"); + g_pApp->getLocalKvircDirectory(szLocal, KviApplication::MsgColors, "presets"); //qDebug("SYMLINKING %s to %s",szGlobal.ptr(),szLocal.ptr()); //qDebug("SYMLINK RETURNS %d (%d)",::symlink(szGlobal.ptr(),szLocal.ptr())); //qDebug("ERRNO (%d)",errno); int dummy; // make gcc happy - dummy = symlink(szGlobal.toLocal8Bit().data(),szLocal.toLocal8Bit().data()); + dummy = symlink(szGlobal.toLocal8Bit().data(), szLocal.toLocal8Bit().data()); Q_UNUSED(dummy); - // FIXME: Do it also on windows... +// FIXME: Do it also on windows... #endif - if(KviFileDialog::askForOpenFileName(szName,__tr2qs_ctx("Select a File - KVIrc","options"),szInit,QString(),false,true,this)) + if(KviFileDialog::askForOpenFileName(szName, __tr2qs_ctx("Select a File - KVIrc", "options"), szInit, QString(), false, true, this)) { itemChanged(); - KviConfigurationFile cfg(szName,KviConfigurationFile::Read); + KviConfigurationFile cfg(szName, KviConfigurationFile::Read); cfg.setGroup("Messages"); @@ -644,34 +657,34 @@ void OptionsWidget_messageColors::load() QString tmp; int count = m_pListView->count(); - for(int i=0; iitem(i); + MessageListWidgetItem * it = (MessageListWidgetItem *)m_pListView->item(i); - tmp.sprintf("Fore%d",it->optionId()); - int fore = cfg.readIntEntry(tmp,it->msgType()->fore()); + tmp.sprintf("Fore%d", it->optionId()); + int fore = cfg.readIntEntry(tmp, it->msgType()->fore()); if(fore < 0 || fore > 15) fore = 0; it->msgType()->setFore(fore); - tmp.sprintf("Back%d",it->optionId()); - int back = cfg.readIntEntry(tmp,it->msgType()->back()); + tmp.sprintf("Back%d", it->optionId()); + int back = cfg.readIntEntry(tmp, it->msgType()->back()); if(back < 0 || back > 15) back = KviControlCodes::Transparent; it->msgType()->setBack(back); - tmp.sprintf("Icon%d",it->optionId()); - int ico = cfg.readIntEntry(tmp,it->msgType()->pixId()); + tmp.sprintf("Icon%d", it->optionId()); + int ico = cfg.readIntEntry(tmp, it->msgType()->pixId()); if(ico < 0 || ico >= KviIconManager::IconCount) ico = 0; it->msgType()->setPixId(ico); - tmp.sprintf("Log%d",it->optionId()); - bool bLog = cfg.readBoolEntry(tmp,it->msgType()->logEnabled()); + tmp.sprintf("Log%d", it->optionId()); + bool bLog = cfg.readBoolEntry(tmp, it->msgType()->logEnabled()); it->msgType()->enableLogging(bLog); - tmp.sprintf("Level%d",it->optionId()); - int iLevel = cfg.readIntEntry(tmp,it->msgType()->level()); + tmp.sprintf("Level%d", it->optionId()); + int iLevel = cfg.readIntEntry(tmp, it->msgType()->level()); it->msgType()->setLevel(iLevel); m_pListView->repaint(m_pListView->visualItemRect(it)); diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index d2385c8c1..dbd02a42d 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -49,7 +49,6 @@ public: ~OptionsWidget_message(); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_privmsg KviIconManager::Raw #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_privmsg __tr2qs_no_lookup("Message Style") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_privmsg OptionsWidget_message @@ -63,6 +62,7 @@ class OptionsWidget_privmsg : public KviOptionsWidget public: OptionsWidget_privmsg(QWidget * parent); ~OptionsWidget_privmsg(); + public: KviBoolSelector * m_pUseSmartColorSelector; KviBoolSelector * m_pSpecialSmartColorSelector; @@ -84,6 +84,7 @@ class OptionsWidget_timestamp : public KviOptionsWidget public: OptionsWidget_timestamp(QWidget * parent); ~OptionsWidget_timestamp(); + public: KviBoolSelector * m_pUseTimestampSelector; KviBoolSelector * m_pSpecialTimestampColorSelector; @@ -103,16 +104,16 @@ class MessageListWidget : public KviTalListWidget { Q_OBJECT public: - MessageListWidget(QWidget * par): KviTalListWidget(par) {}; - ~MessageListWidget() {}; + MessageListWidget(QWidget * par) : KviTalListWidget(par){}; + ~MessageListWidget(){}; }; -class MessageListWidgetItemDelegate : public QItemDelegate +class MessageListWidgetItemDelegate : public QItemDelegate { Q_OBJECT public: - MessageListWidgetItemDelegate(QAbstractItemView * pWidget=0) - : QItemDelegate(pWidget) {}; + MessageListWidgetItemDelegate(QAbstractItemView * pWidget = 0) + : QItemDelegate(pWidget){}; ~MessageListWidgetItemDelegate(){}; void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const; }; @@ -120,34 +121,37 @@ public: class MessageListWidgetItem : public KviTalListWidgetItem { public: - MessageListWidgetItem(MessageListWidget* l,int optId); + MessageListWidgetItem(MessageListWidget * l, int optId); ~MessageListWidgetItem(); + private: - int m_iOptId; + int m_iOptId; KviMessageTypeSettings * m_pMsgType; + public: - inline int optionId(){ return m_iOptId; }; - inline KviMessageTypeSettings * msgType(){ return m_pMsgType; }; + inline int optionId() { return m_iOptId; }; + inline KviMessageTypeSettings * msgType() { return m_pMsgType; }; }; - class MessageColorListWidgetItem : public KviTalListWidgetText { public: MessageColorListWidgetItem(KviTalListWidget * b, int idx); ~MessageColorListWidgetItem(); + public: int m_iClrIdx; + public: inline int clrIdx() { return m_iClrIdx; }; }; -class MessageColorListWidgetItemDelegate : public QItemDelegate +class MessageColorListWidgetItemDelegate : public QItemDelegate { Q_OBJECT public: - MessageColorListWidgetItemDelegate(QAbstractItemView * pWidget=0) - : QItemDelegate(pWidget) {}; + MessageColorListWidgetItemDelegate(QAbstractItemView * pWidget = 0) + : QItemDelegate(pWidget){}; ~MessageColorListWidgetItemDelegate(){}; void paint(QPainter * p, const QStyleOptionViewItem & opt, const QModelIndex & index) const; }; @@ -156,23 +160,26 @@ class OptionsWidget_messageColors : public KviOptionsWidget { Q_OBJECT friend class KviTalListWidget; + public: OptionsWidget_messageColors(QWidget * parent); ~OptionsWidget_messageColors(); + public: - MessageListWidget * m_pListView; + MessageListWidget * m_pListView; MessageListWidgetItemDelegate * m_pListViewItemDelegate; - KviTalListWidget * m_pForeListWidget; + KviTalListWidget * m_pForeListWidget; MessageColorListWidgetItemDelegate * m_pForeListWidgetDelegate; - KviTalListWidget * m_pBackListWidget; + KviTalListWidget * m_pBackListWidget; MessageColorListWidgetItemDelegate * m_pBackListWidgetDelegate; - KviTalListWidget * m_pLevelListWidget; + KviTalListWidget * m_pLevelListWidget; MessageColorListWidgetItem * m_pForeItems[16]; MessageColorListWidgetItem * m_pBackItems[17]; - MessageListWidgetItem * m_pLastItem; - QCheckBox * m_pEnableLogging; - QToolButton * m_pIconButton; - QMenu * m_pIconPopup; + MessageListWidgetItem * m_pLastItem; + QCheckBox * m_pEnableLogging; + QToolButton * m_pIconButton; + QMenu * m_pIconPopup; + public: void saveLastItem(); protected slots: @@ -198,11 +205,11 @@ class OptionsWidget_standardColors : public KviOptionsWidget public: OptionsWidget_standardColors(QWidget * par); ~OptionsWidget_standardColors(); + private: KviColorSelector * m_pColorSelector[16]; private slots: void resetToDefaults(); }; - #endif //!_OPTW_MESSAGES_H_ diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp index dc30fb823..ebffe0fc5 100644 --- a/src/modules/options/OptionsWidget_nickserv.cpp +++ b/src/modules/options/OptionsWidget_nickserv.cpp @@ -37,104 +37,107 @@ #include #include - // KviApplication.cpp extern KVIRC_API KviNickServRuleSet * g_pNickServRuleSet; - -NickServRuleEditor::NickServRuleEditor(QWidget * par,bool bUseServerMaskField) -: QDialog(par) +NickServRuleEditor::NickServRuleEditor(QWidget * par, bool bUseServerMaskField) + : QDialog(par) { - setWindowTitle(__tr2qs_ctx("NickServ Authentication Rule - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("NickServ Authentication Rule - KVIrc", "options")); - QGridLayout * gl = new QGridLayout(this);//,bUseServerMaskField ? 7 : 6,4,10,5); + QGridLayout * gl = new QGridLayout(this); //,bUseServerMaskField ? 7 : 6,4,10,5); - QLabel * l = new QLabel(__tr2qs_ctx("Registered nickname:","options"),this); - gl->addWidget(l,0,0); + QLabel * l = new QLabel(__tr2qs_ctx("Registered nickname:", "options"), this); + gl->addWidget(l, 0, 0); m_pRegisteredNickEdit = new QLineEdit(this); - KviTalToolTip::add(m_pRegisteredNickEdit, __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options")); - gl->addWidget(m_pRegisteredNickEdit,0,1,1,3); -// gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3); + KviTalToolTip::add(m_pRegisteredNickEdit, __tr2qs_ctx("Put here the nickname that you have registered with NickServ", "options")); + gl->addWidget(m_pRegisteredNickEdit, 0, 1, 1, 3); + // gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3); - l = new QLabel(__tr2qs_ctx("NickServ mask:","options"),this); - gl->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("NickServ mask:", "options"), this); + gl->addWidget(l, 1, 0); m_pNickServMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pNickServMaskEdit, - __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. " \ - "This usually will be something like NickServ!service@services.dalnet.
" \ - "You can use wildcards for this field, but generally it is a security flaw. " \ - "If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " \ - "the mask NickServ!*@* may be safe to use in this field.","options")); - gl->addWidget(m_pNickServMaskEdit,1,1,1,3); -// gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); - - l = new QLabel(__tr2qs_ctx("Message regexp:","options"),this); - gl->addWidget(l,2,0); + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. " + "This usually will be something like NickServ!service@services.dalnet.
" + "You can use wildcards for this field, but generally it is a security flaw. " + "If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " + "the mask NickServ!*@* may be safe to use in this field.", + "options")); + gl->addWidget(m_pNickServMaskEdit, 1, 1, 1, 3); + // gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); + + l = new QLabel(__tr2qs_ctx("Message regexp:", "options"), this); + gl->addWidget(l, 2, 0); m_pMessageRegexpEdit = new QLineEdit(this); - gl->addWidget(m_pMessageRegexpEdit,2,1,1,3); -// gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3); + gl->addWidget(m_pMessageRegexpEdit, 2, 1, 1, 3); + // gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3); KviTalToolTip::add(m_pMessageRegexpEdit, - __tr2qs_ctx("This is the simple regular expression that the identification request message " \ - "from NickServ must match in order to be correctly recognized.
" \ - "The message is usually something like \"To identify yourself please use /ns IDENTIFY password\" " \ - "and it is sent when the NickServ wants you to authenticate yourself. " \ - "You can use the * and ? wildcards.","options")); - l = new QLabel(__tr2qs_ctx("Identify command:","options"),this); - gl->addWidget(l,3,0); + __tr2qs_ctx("This is the simple regular expression that the identification request message " + "from NickServ must match in order to be correctly recognized.
" + "The message is usually something like \"To identify yourself please use /ns IDENTIFY password\" " + "and it is sent when the NickServ wants you to authenticate yourself. " + "You can use the * and ? wildcards.", + "options")); + l = new QLabel(__tr2qs_ctx("Identify command:", "options"), this); + gl->addWidget(l, 3, 0); m_pIdentifyCommandEdit = new QLineEdit(this); KviTalToolTip::add(m_pIdentifyCommandEdit, - __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \ - "for the nickname described in this rule (if the both server and NickServ mask are matched). " \ - "This usually will be something like msg NickServ identify <yourpassword>.
" \ - "You can use msg -q if you don't want the password echoed on the screen. " \ - "Please note that there is no leading slash in this command.","options")); - gl->addWidget(m_pIdentifyCommandEdit,3,1,1,3); -// gl->addMultiCellWidget(m_pIdentifyCommandEdit,3,3,1,3); + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " + "for the nickname described in this rule (if the both server and NickServ mask are matched). " + "This usually will be something like msg NickServ identify <yourpassword>.
" + "You can use msg -q if you don't want the password echoed on the screen. " + "Please note that there is no leading slash in this command.", + "options")); + gl->addWidget(m_pIdentifyCommandEdit, 3, 1, 1, 3); + // gl->addMultiCellWidget(m_pIdentifyCommandEdit,3,3,1,3); int iNextLine = 4; if(bUseServerMaskField) { - l = new QLabel(__tr2qs_ctx("Server mask:","options"),this); - gl->addWidget(l,4,0); + l = new QLabel(__tr2qs_ctx("Server mask:", "options"), this); + gl->addWidget(l, 4, 0); m_pServerMaskEdit = new QLineEdit(this); KviTalToolTip::add(m_pServerMaskEdit, - __tr2qs_ctx("This is the mask that the current server must match in order " \ - "for this rule to apply. It can contain * and ? wildcards.
Do NOT use simply \"*\" here...","options")); - gl->addWidget(m_pServerMaskEdit,4,1,1,3); -// gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3); + __tr2qs_ctx("This is the mask that the current server must match in order " + "for this rule to apply. It can contain * and ? wildcards.
Do NOT use simply \"*\" here...", + "options")); + gl->addWidget(m_pServerMaskEdit, 4, 1, 1, 3); + // gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3); iNextLine++; - } else { + } + else + { m_pServerMaskEdit = 0; } - - l = new QLabel(__tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help","options"),this); + l = new QLabel(__tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help", "options"), this); l->setMargin(10); - gl->addWidget(l,iNextLine,0,1,4); -// gl->addMultiCellWidget(l,iNextLine,iNextLine,0,3); + gl->addWidget(l, iNextLine, 0, 1, 4); + // gl->addMultiCellWidget(l,iNextLine,iNextLine,0,3); iNextLine++; - QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel","options"),this); + QPushButton * p = new QPushButton(__tr2qs_ctx("Cancel", "options"), this); p->setMinimumWidth(100); - connect(p,SIGNAL(clicked()),this,SLOT(reject())); - gl->addWidget(p,iNextLine,2); + connect(p, SIGNAL(clicked()), this, SLOT(reject())); + gl->addWidget(p, iNextLine, 2); - m_pOkButton = new QPushButton(__tr2qs_ctx("OK","options"),this); + m_pOkButton = new QPushButton(__tr2qs_ctx("OK", "options"), this); m_pOkButton->setMinimumWidth(100); m_pOkButton->setDefault(true); - connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okPressed())); - gl->addWidget(m_pOkButton,iNextLine,3); + connect(m_pOkButton, SIGNAL(clicked()), this, SLOT(okPressed())); + gl->addWidget(m_pOkButton, iNextLine, 3); - gl->setColumnStretch(1,1); - gl->setRowStretch(bUseServerMaskField ? 5 : 4,1); + gl->setColumnStretch(1, 1); + gl->setRowStretch(bUseServerMaskField ? 5 : 4, 1); setMinimumWidth(250); } @@ -147,18 +150,18 @@ bool NickServRuleEditor::validate() { QString s = m_pRegisteredNickEdit->text(); - QString m = __tr2qs_ctx("Invalid NickServ Rule - KVIrc","options"); - QString o = __tr2qs_ctx("OK","options"); + QString m = __tr2qs_ctx("Invalid NickServ Rule - KVIrc", "options"); + QString o = __tr2qs_ctx("OK", "options"); if(s.isEmpty()) { - QMessageBox::warning(this,m,__tr2qs_ctx("The nickname field can't be empty!","options"),o); + QMessageBox::warning(this, m, __tr2qs_ctx("The nickname field can't be empty!", "options"), o); return false; } if(s.indexOf(QChar(' ')) != -1) { - QMessageBox::warning(this,m,__tr2qs_ctx("The nickname field can't contain spaces!","options"),o); + QMessageBox::warning(this, m, __tr2qs_ctx("The nickname field can't contain spaces!", "options"), o); return false; } @@ -166,7 +169,7 @@ bool NickServRuleEditor::validate() if(s.isEmpty()) { - QMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!
You must put at least * there.","options"),o); + QMessageBox::warning(this, m, __tr2qs_ctx("The NickServ mask can't be empty!
You must put at least * there.", "options"), o); return false; } @@ -174,7 +177,7 @@ bool NickServRuleEditor::validate() if(s.isEmpty()) { - QMessageBox::warning(this,m,__tr2qs_ctx("The message regexp can't be empty!
You must put at least * there.","options"),o); + QMessageBox::warning(this, m, __tr2qs_ctx("The message regexp can't be empty!
You must put at least * there.", "options"), o); return false; } @@ -182,7 +185,7 @@ bool NickServRuleEditor::validate() if(s.isEmpty()) { - QMessageBox::warning(this,m,__tr2qs_ctx("The IDENTIFY command can't be empty!","options"),o); + QMessageBox::warning(this, m, __tr2qs_ctx("The IDENTIFY command can't be empty!", "options"), o); return false; } @@ -191,7 +194,8 @@ bool NickServRuleEditor::validate() void NickServRuleEditor::okPressed() { - if(!validate())return; + if(!validate()) + return; accept(); } @@ -204,7 +208,8 @@ bool NickServRuleEditor::editRule(KviNickServRule * r) if(m_pServerMaskEdit) m_pServerMaskEdit->setText(r->serverMask().isEmpty() ? QString("irc.yourserver.org") : r->serverMask()); m_pRegisteredNickEdit->selectAll(); - if(exec() != QDialog::Accepted)return false; + if(exec() != QDialog::Accepted) + return false; r->setRegisteredNick(m_pRegisteredNickEdit->text()); r->setNickServMask(m_pNickServMaskEdit->text()); r->setMessageRegexp(m_pMessageRegexpEdit->text()); @@ -214,9 +219,8 @@ bool NickServRuleEditor::editRule(KviNickServRule * r) return true; } - OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { createLayout(); setObjectName("nickserv_options_widget"); @@ -226,10 +230,10 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent) KviNickServRuleSet * rs = g_pNickServRuleSet; bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; - m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ identification","options"),this); - gl->addWidget(m_pNickServCheck,0,0,1,3); -// gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); - KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options")); + m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ identification", "options"), this); + gl->addWidget(m_pNickServCheck, 0, 0, 1, 3); + // gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); + KviTalToolTip::add(m_pNickServCheck, __tr2qs_ctx("This check enables the automatic identification with NickServ", "options")); m_pNickServCheck->setChecked(bNickServEnabled); m_pNickServTreeWidget = new QTreeWidget(this); @@ -237,59 +241,60 @@ OptionsWidget_nickServ::OptionsWidget_nickServ(QWidget * parent) m_pNickServTreeWidget->setAllColumnsShowFocus(true); QStringList columnLabels; - columnLabels.append(__tr2qs_ctx("Nickname","options")); - columnLabels.append(__tr2qs_ctx("Server Mask","options")); - columnLabels.append(__tr2qs_ctx("NickServ Mask","options")); - columnLabels.append(__tr2qs_ctx("NickServ Request Mask","options")); - columnLabels.append(__tr2qs_ctx("Identify Command","options")); + columnLabels.append(__tr2qs_ctx("Nickname", "options")); + columnLabels.append(__tr2qs_ctx("Server Mask", "options")); + columnLabels.append(__tr2qs_ctx("NickServ Mask", "options")); + columnLabels.append(__tr2qs_ctx("NickServ Request Mask", "options")); + columnLabels.append(__tr2qs_ctx("Identify Command", "options")); m_pNickServTreeWidget->setHeaderLabels(columnLabels); - connect(m_pNickServTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(enableDisableNickServControls())); - - gl->addWidget(m_pNickServTreeWidget,1,0,1,3); -// gl->addMultiCellWidget(m_pNickServTreeWidget,1,1,0,2); - KviTalToolTip::add(m_pNickServTreeWidget,\ - __tr2qs_ctx("This is a list of NickServ identification rules. " \ - "KVIrc will use them to model its automatic interaction with NickServ on all the networks.
" \ - "Please be aware that this feature can cause your NickServ passwords to be stolen " \ - "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
" \ - "In other words, be sure to know what you're doing.
" \ - "Also note that the password that you provide is stored as PLAIN TEXT.
" \ - "KVIrc supports also per-network NickServ authentication rules that can be " \ - "created in the \"Advanced...\" network options (accessible from the servers dialog)." - "","options")); - - m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule","options"),this); - connect(m_pAddRuleButton,SIGNAL(clicked()),this,SLOT(addNickServRule())); - gl->addWidget(m_pAddRuleButton,2,0); - - m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule","options"),this); - connect(m_pEditRuleButton,SIGNAL(clicked()),this,SLOT(editNickServRule())); - gl->addWidget(m_pEditRuleButton,2,1); - - m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule","options"),this); - connect(m_pDelRuleButton,SIGNAL(clicked()),this,SLOT(delNickServRule())); - gl->addWidget(m_pDelRuleButton,2,2); - - connect(m_pNickServCheck,SIGNAL(toggled(bool)),this,SLOT(enableDisableNickServControls())); + connect(m_pNickServTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableDisableNickServControls())); + + gl->addWidget(m_pNickServTreeWidget, 1, 0, 1, 3); + // gl->addMultiCellWidget(m_pNickServTreeWidget,1,1,0,2); + KviTalToolTip::add(m_pNickServTreeWidget, + __tr2qs_ctx("This is a list of NickServ identification rules. " + "KVIrc will use them to model its automatic interaction with NickServ on all the networks.
" + "Please be aware that this feature can cause your NickServ passwords to be stolen " + "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
" + "In other words, be sure to know what you're doing.
" + "Also note that the password that you provide is stored as PLAIN TEXT.
" + "KVIrc supports also per-network NickServ authentication rules that can be " + "created in the \"Advanced...\" network options (accessible from the servers dialog)." + "", + "options")); + + m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule", "options"), this); + connect(m_pAddRuleButton, SIGNAL(clicked()), this, SLOT(addNickServRule())); + gl->addWidget(m_pAddRuleButton, 2, 0); + + m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule", "options"), this); + connect(m_pEditRuleButton, SIGNAL(clicked()), this, SLOT(editNickServRule())); + gl->addWidget(m_pEditRuleButton, 2, 1); + + m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule", "options"), this); + connect(m_pDelRuleButton, SIGNAL(clicked()), this, SLOT(delNickServRule())); + gl->addWidget(m_pDelRuleButton, 2, 2); + + connect(m_pNickServCheck, SIGNAL(toggled(bool)), this, SLOT(enableDisableNickServControls())); if(rs && rs->rules()) { - QTreeWidgetItem *it; + QTreeWidgetItem * it; KviPointerList * ll = rs->rules(); - for(KviNickServRule * rule = ll->first();rule;rule = ll->next()) + for(KviNickServRule * rule = ll->first(); rule; rule = ll->next()) { it = new QTreeWidgetItem(m_pNickServTreeWidget); - it->setText(0,rule->registeredNick()); - it->setText(1,rule->serverMask()); - it->setText(2,rule->nickServMask()); - it->setText(3,rule->messageRegexp()); - it->setText(4,rule->identifyCommand()); + it->setText(0, rule->registeredNick()); + it->setText(1, rule->serverMask()); + it->setText(2, rule->nickServMask()); + it->setText(3, rule->messageRegexp()); + it->setText(4, rule->identifyCommand()); } } enableDisableNickServControls(); - gl->setRowStretch(1,1); + gl->setRowStretch(1, 1); } OptionsWidget_nickServ::~OptionsWidget_nickServ() @@ -299,38 +304,40 @@ OptionsWidget_nickServ::~OptionsWidget_nickServ() void OptionsWidget_nickServ::editNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); - if(!it)return; - KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1)); - NickServRuleEditor ed(this,true); + if(!it) + return; + KviNickServRule r(it->text(0), it->text(2), it->text(3), it->text(4), it->text(1)); + NickServRuleEditor ed(this, true); if(ed.editRule(&r)) { - it->setText(0,r.registeredNick()); - it->setText(1,r.serverMask()); - it->setText(2,r.nickServMask()); - it->setText(3,r.messageRegexp()); - it->setText(4,r.identifyCommand()); + it->setText(0, r.registeredNick()); + it->setText(1, r.serverMask()); + it->setText(2, r.nickServMask()); + it->setText(3, r.messageRegexp()); + it->setText(4, r.identifyCommand()); } } void OptionsWidget_nickServ::addNickServRule() { KviNickServRule r; - NickServRuleEditor ed(this,true); + NickServRuleEditor ed(this, true); if(ed.editRule(&r)) { - QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget); - it->setText(0,r.registeredNick()); - it->setText(1,r.serverMask()); - it->setText(2,r.nickServMask()); - it->setText(3,r.messageRegexp()); - it->setText(4,r.identifyCommand()); + QTreeWidgetItem * it = new QTreeWidgetItem(m_pNickServTreeWidget); + it->setText(0, r.registeredNick()); + it->setText(1, r.serverMask()); + it->setText(2, r.nickServMask()); + it->setText(3, r.messageRegexp()); + it->setText(4, r.identifyCommand()); } } void OptionsWidget_nickServ::delNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); - if(!it)return; + if(!it) + return; delete it; enableDisableNickServControls(); } @@ -351,12 +358,12 @@ void OptionsWidget_nickServ::commit() if(m_pNickServTreeWidget->topLevelItemCount()) { g_pNickServRuleSet->setEnabled(m_pNickServCheck->isChecked()); - QTreeWidgetItem * it;// = m_pNickServTreeWidget->firstChild(); - for (int i=0;itopLevelItemCount();i++) -// while(it) + QTreeWidgetItem * it; // = m_pNickServTreeWidget->firstChild(); + for(int i = 0; i < m_pNickServTreeWidget->topLevelItemCount(); i++) + // while(it) { - it=(QTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i); - g_pNickServRuleSet->addRule(KviNickServRule::createInstance(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1))); + it = (QTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i); + g_pNickServRuleSet->addRule(KviNickServRule::createInstance(it->text(0), it->text(2), it->text(3), it->text(4), it->text(1))); //it = it->nextSibling(); } } diff --git a/src/modules/options/OptionsWidget_nickserv.h b/src/modules/options/OptionsWidget_nickserv.h index fc0658cdd..d1b82cfa6 100644 --- a/src/modules/options/OptionsWidget_nickserv.h +++ b/src/modules/options/OptionsWidget_nickserv.h @@ -25,7 +25,6 @@ // //============================================================================= - #include "kvi_settings.h" #include "KviOptionsWidget.h" @@ -48,17 +47,20 @@ class NickServRuleEditor : public QDialog { Q_OBJECT public: - NickServRuleEditor(QWidget * par,bool bUseServerMaskField = false); + NickServRuleEditor(QWidget * par, bool bUseServerMaskField = false); ~NickServRuleEditor(); + protected: - QLineEdit * m_pRegisteredNickEdit; - QLineEdit * m_pNickServMaskEdit; - QLineEdit * m_pMessageRegexpEdit; - QLineEdit * m_pIdentifyCommandEdit; - QLineEdit * m_pServerMaskEdit; + QLineEdit * m_pRegisteredNickEdit; + QLineEdit * m_pNickServMaskEdit; + QLineEdit * m_pMessageRegexpEdit; + QLineEdit * m_pIdentifyCommandEdit; + QLineEdit * m_pServerMaskEdit; QPushButton * m_pOkButton; + public: bool editRule(KviNickServRule * r); + protected: bool validate(); protected slots: @@ -71,17 +73,19 @@ class OptionsWidget_nickServ : public KviOptionsWidget public: OptionsWidget_nickServ(QWidget * parent); ~OptionsWidget_nickServ(); + protected: QTreeWidget * m_pNickServTreeWidget; - QCheckBox * m_pNickServCheck; - QPushButton * m_pAddRuleButton; - QPushButton * m_pDelRuleButton; - QPushButton * m_pEditRuleButton; + QCheckBox * m_pNickServCheck; + QPushButton * m_pAddRuleButton; + QPushButton * m_pDelRuleButton; + QPushButton * m_pEditRuleButton; protected slots: void enableDisableNickServControls(); void addNickServRule(); void delNickServRule(); void editNickServRule(); + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index dd0d67e6d..70caf034f 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -30,38 +30,38 @@ #include OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("notifierlook_options_widget"); createLayout(); - addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontNotifier); - addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorNotifierBackground); - addColorSelector(0,2,1,2,__tr2qs_ctx("Foreground color:","options"),KviOption_colorNotifierForeground); - addFontSelector(0,3,1,3,__tr2qs_ctx("Title font:","options"),KviOption_fontNotifierTitle); - addColorSelector(0,4,1,4,__tr2qs_ctx("Title foreground color:","options"),KviOption_colorNotifierTitleForeground); + addFontSelector(0, 0, 1, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontNotifier); + addColorSelector(0, 1, 1, 1, __tr2qs_ctx("Background color:", "options"), KviOption_colorNotifierBackground); + addColorSelector(0, 2, 1, 2, __tr2qs_ctx("Foreground color:", "options"), KviOption_colorNotifierForeground); + addFontSelector(0, 3, 1, 3, __tr2qs_ctx("Title font:", "options"), KviOption_fontNotifierTitle); + addColorSelector(0, 4, 1, 4, __tr2qs_ctx("Title foreground color:", "options"), KviOption_colorNotifierTitleForeground); - addPixmapSelector(0,5,1,5,__tr2qs_ctx("Background image:","options"),KviOption_pixmapNotifierBackground); + addPixmapSelector(0, 5, 1, 5, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapNotifierBackground); - addLabel(0,6,0,6,__tr2qs_ctx("Horizontal align:","options")); - m_pHorizontalAlign=new QComboBox(this); - addWidgetToLayout(m_pHorizontalAlign,1,6,1,6); + addLabel(0, 6, 0, 6, __tr2qs_ctx("Horizontal align:", "options")); + m_pHorizontalAlign = new QComboBox(this); + addWidgetToLayout(m_pHorizontalAlign, 1, 6, 1, 6); - addLabel(0,7,0,7,__tr2qs_ctx("Vertical align:","options")); - m_pVerticalAlign=new QComboBox(this); - addWidgetToLayout(m_pVerticalAlign,1,7,1,7); + addLabel(0, 7, 0, 7, __tr2qs_ctx("Vertical align:", "options")); + m_pVerticalAlign = new QComboBox(this); + addWidgetToLayout(m_pVerticalAlign, 1, 7, 1, 7); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Left", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Right", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Center", "options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Top", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Center", "options")); - switch( KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign) & Qt::AlignHorizontal_Mask) + switch(KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: m_pHorizontalAlign->setCurrentIndex(1); @@ -76,7 +76,7 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent) m_pHorizontalAlign->setCurrentIndex(0); } - switch( KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign) & Qt::AlignVertical_Mask) + switch(KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: m_pVerticalAlign->setCurrentIndex(1); @@ -91,7 +91,7 @@ OptionsWidget_notifierLook::OptionsWidget_notifierLook(QWidget * parent) m_pVerticalAlign->setCurrentIndex(0); } - layout()->setRowStretch(5,1); + layout()->setRowStretch(5, 1); } OptionsWidget_notifierLook::~OptionsWidget_notifierLook() @@ -100,40 +100,38 @@ OptionsWidget_notifierLook::~OptionsWidget_notifierLook() void OptionsWidget_notifierLook::commit() { - int iFlags=0; + int iFlags = 0; switch(m_pHorizontalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignLeft; + iFlags |= Qt::AlignLeft; break; case 2: - iFlags|=Qt::AlignRight; + iFlags |= Qt::AlignRight; break; case 3: - iFlags|=Qt::AlignHCenter; + iFlags |= Qt::AlignHCenter; break; } switch(m_pVerticalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignTop; + iFlags |= Qt::AlignTop; break; case 2: - iFlags|=Qt::AlignBottom; + iFlags |= Qt::AlignBottom; break; case 3: - iFlags|=Qt::AlignVCenter; + iFlags |= Qt::AlignVCenter; break; } - KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign)=iFlags; + KVI_OPTION_UINT(KviOption_uintNotifierPixmapAlign) = iFlags; KviOptionsWidget::commit(); } - - OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("notifier_options_widget"); @@ -141,50 +139,53 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) int iRow = 0; - KviBoolSelector * b = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable the notifier","options"),KviOption_boolEnableNotifier); - QString szTip = __tr2qs_ctx("This is an option for the impatient: it allows one to forcibly and permanently disable " \ - "the notifier window. Please note that if this option is not activated then " \ - "the notifier will NOT popup even if all the other options around specify " \ - "to use it in response to particular events. Also note that this option " \ - "will make all the /notifier.* commands fail silently.","options"); - mergeTip(b,szTip); + KviBoolSelector * b = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Enable the notifier", "options"), KviOption_boolEnableNotifier); + QString szTip = __tr2qs_ctx("This is an option for the impatient: it allows one to forcibly and permanently disable " + "the notifier window. Please note that if this option is not activated then " + "the notifier will NOT popup even if all the other options around specify " + "to use it in response to particular events. Also note that this option " + "will make all the /notifier.* commands fail silently.", + "options"); + mergeTip(b, szTip); iRow++; KviBoolSelector * b2; #ifdef COMPILE_KDE_SUPPORT - m_pKdeNotifier = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Use the KDE notifier","options"),KviOption_boolUseKDENotifier); - szTip += __tr2qs_ctx("This option uses the KDE notification system " \ - "instead of KVIrc one.
" \ - "This is cool if you want to better integrate KVIrc inside KDE. " \ - "Note that KDE's notifier isn't flexible and \"tabbed\" like KVIrc's","options"); - mergeTip(m_pKdeNotifier,szTip); + m_pKdeNotifier = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Use the KDE notifier", "options"), KviOption_boolUseKDENotifier); + szTip += __tr2qs_ctx("This option uses the KDE notification system " + "instead of KVIrc one.
" + "This is cool if you want to better integrate KVIrc inside KDE. " + "Note that KDE's notifier isn't flexible and \"tabbed\" like KVIrc's", + "options"); + mergeTip(m_pKdeNotifier, szTip); m_pKdeNotifier->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); - connect(b,SIGNAL(toggled(bool)),m_pKdeNotifier,SLOT(setEnabled(bool))); - connect(m_pKdeNotifier,SIGNAL(toggled(bool)),this,SLOT(toggleNotifierProtocol(bool))); + connect(b, SIGNAL(toggled(bool)), m_pKdeNotifier, SLOT(setEnabled(bool))); + connect(m_pKdeNotifier, SIGNAL(toggled(bool)), this, SLOT(toggleNotifierProtocol(bool))); iRow++; #endif // COMPILE_KDE_SUPPORT #ifdef COMPILE_DBUS_SUPPORT - m_pDBusNotifier = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Use the D-Bus-based notifiers","options"),KviOption_boolUseDBusNotifier); - szTip += __tr2qs_ctx("This option uses the D-Bus-based notifier instead of " \ - "KVIrc one.
" \ - "This is cool if you want to better integrate KVIrc inside your " \ - "desktop environment. " \ - "Note that this notifier isn't flexible and \"tabbed\" like KVIrc's","options"); - mergeTip(m_pDBusNotifier,szTip); + m_pDBusNotifier = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Use the D-Bus-based notifiers", "options"), KviOption_boolUseDBusNotifier); + szTip += __tr2qs_ctx("This option uses the D-Bus-based notifier instead of " + "KVIrc one.
" + "This is cool if you want to better integrate KVIrc inside your " + "desktop environment. " + "Note that this notifier isn't flexible and \"tabbed\" like KVIrc's", + "options"); + mergeTip(m_pDBusNotifier, szTip); m_pDBusNotifier->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); #ifdef COMPILE_KDE_SUPPORT m_pDBusNotifier->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseKDENotifier)); #endif // COMPILE_KDE_SUPPORT - connect(b,SIGNAL(toggled(bool)),m_pDBusNotifier,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), m_pDBusNotifier, SLOT(setEnabled(bool))); #ifdef COMPILE_KDE_SUPPORT - connect(m_pDBusNotifier,SIGNAL(toggled(bool)),this,SLOT(toggleNotifierProtocol(bool))); + connect(m_pDBusNotifier, SIGNAL(toggled(bool)), this, SLOT(toggleNotifierProtocol(bool))); #endif iRow++; @@ -192,61 +193,62 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent) #if defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Don't show notifier when there is an active fullscreen window","options"),KviOption_boolDontShowNotifierIfActiveWindowIsFullScreen); + b2 = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Don't show notifier when there is an active fullscreen window", "options"), KviOption_boolDontShowNotifierIfActiveWindowIsFullScreen); - szTip += __tr2qs_ctx("This option stops the notifier from being displayed when there is an active fullscreen window. " \ - "This is useful for gaming sessions where you may be distracted by the notifier or it may even switch " \ - "your game from fullscreen to window mode.","options"); - mergeTip(b2,szTip); + szTip += __tr2qs_ctx("This option stops the notifier from being displayed when there is an active fullscreen window. " + "This is useful for gaming sessions where you may be distracted by the notifier or it may even switch " + "your game from fullscreen to window mode.", + "options"); + mergeTip(b2, szTip); b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); - QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); + QObject::connect(b, SIGNAL(toggled(bool)), b2, SLOT(setEnabled(bool))); iRow++; #endif //COMPILE_KDE_SUPPORT || COMPILE_ON_WINDOWS || COMPILE_ON_MINGW - b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable notifier window flashing","options"),KviOption_boolNotifierFlashing); + b2 = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Enable notifier window flashing", "options"), KviOption_boolNotifierFlashing); b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); - QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); + QObject::connect(b, SIGNAL(toggled(bool)), b2, SLOT(setEnabled(bool))); iRow++; - b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading); + b2 = addBoolSelector(0, iRow, 0, iRow, __tr2qs_ctx("Enable notifier window fade effect", "options"), KviOption_boolNotifierFading); b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier)); - QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool))); + QObject::connect(b, SIGNAL(toggled(bool)), b2, SLOT(setEnabled(bool))); iRow++; - KviTalGroupBox * g = addGroupBox(0,iRow,0,iRow,Qt::Horizontal,__tr2qs_ctx("Advanced Configuration","options")); - connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); + KviTalGroupBox * g = addGroupBox(0, iRow, 0, iRow, Qt::Horizontal, __tr2qs_ctx("Advanced Configuration", "options")); + connect(b, SIGNAL(toggled(bool)), g, SLOT(setEnabled(bool))); connect(b, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("Default auto hiding time for messages (0 to disable):","options"), - KviOption_uintNotifierAutoHideTime, - 0,86400,30,KVI_OPTION_BOOL(KviOption_boolEnableNotifier)), - SLOT(setEnabled(bool))); + SIGNAL(toggled(bool)), + addUIntSelector(g, __tr2qs_ctx("Default auto hiding time for messages (0 to disable):", "options"), + KviOption_uintNotifierAutoHideTime, + 0, 86400, 30, KVI_OPTION_BOOL(KviOption_boolEnableNotifier)), + SLOT(setEnabled(bool))); connect(b2, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while active (mouseover):","options"), - KviOption_uintNotifierActiveTransparency, - 0,100,90,KVI_OPTION_BOOL(KviOption_boolNotifierFading)), - SLOT(setEnabled(bool))); + SIGNAL(toggled(bool)), + addUIntSelector(g, __tr2qs_ctx("Notifier window opacity while active (mouseover):", "options"), + KviOption_uintNotifierActiveTransparency, + 0, 100, 90, KVI_OPTION_BOOL(KviOption_boolNotifierFading)), + SLOT(setEnabled(bool))); connect(b2, - SIGNAL(toggled(bool)), - addUIntSelector(g,__tr2qs_ctx("Notifier window opacity while inactive:","options"), - KviOption_uintNotifierInactiveTransparency, - 0,100,40,KVI_OPTION_BOOL(KviOption_boolNotifierFading)), - SLOT(setEnabled(bool))); + SIGNAL(toggled(bool)), + addUIntSelector(g, __tr2qs_ctx("Notifier window opacity while inactive:", "options"), + KviOption_uintNotifierInactiveTransparency, + 0, 100, 40, KVI_OPTION_BOOL(KviOption_boolNotifierFading)), + SLOT(setEnabled(bool))); iRow++; - addRowSpacer(0,iRow,0,iRow); + addRowSpacer(0, iRow, 0, iRow); } OptionsWidget_notifier::~OptionsWidget_notifier() diff --git a/src/modules/options/OptionsWidget_notifier.h b/src/modules/options/OptionsWidget_notifier.h index ce350e4c2..00eb5758c 100644 --- a/src/modules/options/OptionsWidget_notifier.h +++ b/src/modules/options/OptionsWidget_notifier.h @@ -38,8 +38,9 @@ class OptionsWidget_notifierLook : public KviOptionsWidget { Q_OBJECT private: - QComboBox* m_pHorizontalAlign; - QComboBox* m_pVerticalAlign; + QComboBox * m_pHorizontalAlign; + QComboBox * m_pVerticalAlign; + public: OptionsWidget_notifierLook(QWidget * parent); ~OptionsWidget_notifierLook(); @@ -58,6 +59,7 @@ class OptionsWidget_notifier : public KviOptionsWidget public: OptionsWidget_notifier(QWidget * parent); ~OptionsWidget_notifier(); + private: #ifdef COMPILE_KDE_SUPPORT KviBoolSelector * m_pKdeNotifier; diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp index d14a98743..461632fe6 100644 --- a/src/modules/options/OptionsWidget_notify.cpp +++ b/src/modules/options/OptionsWidget_notify.cpp @@ -31,7 +31,7 @@ #include OptionsWidget_notify::OptionsWidget_notify(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("notify_options_widget"); createLayout(); @@ -40,48 +40,48 @@ OptionsWidget_notify::OptionsWidget_notify(QWidget * parent) KviTalGroupBox * g; KviUIntSelector * u; - KviBoolSelector* notifyEnableBox = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); + KviBoolSelector * notifyEnableBox = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Use online notify list", "options"), KviOption_boolUseNotifyList); b = notifyEnableBox; - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options")); - connect(b,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Configuration", "options")); + connect(b, SIGNAL(toggled(bool)), g, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"),KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Show notifications in active window", "options"), KviOption_boolNotifyListChangesToActiveWindow, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"),KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Flash window when users are going online", "options"), KviOption_boolFlashWindowOnNotifyOnLine, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"),KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Popup notifier when users are going online", "options"), KviOption_boolPopupNotifierOnNotifyOnLine, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Advanced Configuration","options")); - connect(notifyEnableBox,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool))); + g = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Advanced Configuration", "options")); + connect(notifyEnableBox, SIGNAL(toggled(bool)), g, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"),KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Check USERHOST for online users", "options"), KviOption_boolNotifyListSendUserhostForOnlineUsers, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"),KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Use \"smart\" notify list manager", "options"), KviOption_boolUseIntelligentNotifyListManager, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - b = addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"),KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - connect(notifyEnableBox,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool))); + b = addBoolSelector(g, __tr2qs_ctx("Use the WATCH method if available", "options"), KviOption_boolUseWatchListIfAvailable, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + connect(notifyEnableBox, SIGNAL(toggled(bool)), b, SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("Check interval:","options"),KviOption_uintNotifyListCheckTimeInSecs,5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - u->setSuffix(__tr2qs_ctx(" sec","options")); - connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + u = addUIntSelector(g, __tr2qs_ctx("Check interval:", "options"), KviOption_uintNotifyListCheckTimeInSecs, 5, 3600, 180, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + connect(notifyEnableBox, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("ISON delay:","options"),KviOption_uintNotifyListIsOnDelayTimeInSecs,5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - u->setSuffix(__tr2qs_ctx(" sec","options")); - connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + u = addUIntSelector(g, __tr2qs_ctx("ISON delay:", "options"), KviOption_uintNotifyListIsOnDelayTimeInSecs, 5, 180, 6, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + connect(notifyEnableBox, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(g,__tr2qs_ctx("USERHOST delay:","options"),KviOption_uintNotifyListUserhostDelayTimeInSecs,5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); - u->setSuffix(__tr2qs_ctx(" sec","options")); - connect(notifyEnableBox,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + u = addUIntSelector(g, __tr2qs_ctx("USERHOST delay:", "options"), KviOption_uintNotifyListUserhostDelayTimeInSecs, 5, 180, 6, KVI_OPTION_BOOL(KviOption_boolUseNotifyList)); + u->setSuffix(__tr2qs_ctx(" sec", "options")); + connect(notifyEnableBox, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - addLabel(0,3,0,3,__tr2qs_ctx("

Note:
The notify list is managed using the \"Registered Users\" settings.

","options")); + addLabel(0, 3, 0, 3, __tr2qs_ctx("

Note:
The notify list is managed using the \"Registered Users\" settings.

", "options")); - addRowSpacer(0,4,0,4); + addRowSpacer(0, 4, 0, 4); } OptionsWidget_notify::~OptionsWidget_notify() diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp index 2376de59a..ce325813a 100644 --- a/src/modules/options/OptionsWidget_protection.cpp +++ b/src/modules/options/OptionsWidget_protection.cpp @@ -31,7 +31,7 @@ #include OptionsWidget_protection::OptionsWidget_protection(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("protection_options_widget"); diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index f140a4b9a..8bebd95f2 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -43,13 +43,12 @@ #include #include - -ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx) -: QTreeWidgetItem(parent) +ProxyOptionsTreeWidgetItem::ProxyOptionsTreeWidgetItem(QTreeWidget * parent, const QPixmap & pm, KviProxy * prx) + : QTreeWidgetItem(parent) { qDebug("Creating item"); - setText(0,prx->m_szHostname); - setIcon(0,QIcon(pm)); + setText(0, prx->m_szHostname); + setIcon(0, QIcon(pm)); m_pProxyData = new KviProxy(*prx); } @@ -60,67 +59,69 @@ ProxyOptionsTreeWidgetItem::~ProxyOptionsTreeWidgetItem() } OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) -: KviOptionsWidget(parent,"proxy_options_widget") + : KviOptionsWidget(parent, "proxy_options_widget") { createLayout(); - m_pUseProxySelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Use proxy for all connections","options"),KviOption_boolUseProxyHost); - QString szTip = __tr2qs_ctx("When enabled, the selected proxy will be used as the default for all connections.
" \ - "An alternative option to define a specific per-server proxy, is also located " \ - "in the advanced server dialog in the connection tab.","options"); + m_pUseProxySelector = addBoolSelector(0, 0, 1, 0, __tr2qs_ctx("Use proxy for all connections", "options"), KviOption_boolUseProxyHost); + QString szTip = __tr2qs_ctx("When enabled, the selected proxy will be used as the default for all connections.
" + "An alternative option to define a specific per-server proxy, is also located " + "in the advanced server dialog in the connection tab.", + "options"); - mergeTip(m_pUseProxySelector,szTip); + mergeTip(m_pUseProxySelector, szTip); m_pTreeWidget = new QTreeWidget(this); - addWidgetToLayout(m_pTreeWidget,0,1,0,1); - m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Proxy","options")); + addWidgetToLayout(m_pTreeWidget, 0, 1, 0, 1); + m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Proxy", "options")); m_pTreeWidget->setRootIsDecorated(true); m_pTreeWidget->setAllColumnsShowFocus(true); m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); - connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)), - this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); + connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), + this, SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu); - connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)), - this,SLOT(customContextMenuRequested(const QPoint &))); + connect(m_pTreeWidget, SIGNAL(customContextMenuRequested(const QPoint &)), + this, SLOT(customContextMenuRequested(const QPoint &))); - QString tiptxt = __tr2qs_ctx("This is the list of available proxy servers.
" \ - "Right-click on the list to add or remove proxies.","options"); + QString tiptxt = __tr2qs_ctx("This is the list of available proxy servers.
" + "Right-click on the list to add or remove proxies.", + "options"); - mergeTip(m_pTreeWidget,tiptxt); - mergeTip(m_pTreeWidget->viewport(),tiptxt); + mergeTip(m_pTreeWidget, tiptxt); + mergeTip(m_pTreeWidget->viewport(), tiptxt); KviTalVBox * vbox = new KviTalVBox(this); - addWidgetToLayout(vbox,1,1,1,1); + addWidgetToLayout(vbox, 1, 1, 1, 1); QToolButton * tb = new QToolButton(vbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewProxy)))); tb->setAutoRaise(true); - connect(tb,SIGNAL(clicked()),this,SLOT(newProxy())); - mergeTip(tb,__tr2qs_ctx("New proxy","options")); + connect(tb, SIGNAL(clicked()), this, SLOT(newProxy())); + mergeTip(tb, __tr2qs_ctx("New proxy", "options")); tb = new QToolButton(vbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)))); tb->setAutoRaise(true); - connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent())); - mergeTip(tb,__tr2qs_ctx("Remove proxy","options")); + connect(tb, SIGNAL(clicked()), this, SLOT(removeCurrent())); + mergeTip(tb, __tr2qs_ctx("Remove proxy", "options")); QFrame * lll = new QFrame(vbox); - vbox->setStretchFactor(lll,100); + vbox->setStretchFactor(lll, 100); - KviTalGroupBox * gbox = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Configuration","options")); + KviTalGroupBox * gbox = addGroupBox(0, 2, 1, 2, Qt::Horizontal, __tr2qs_ctx("Configuration", "options")); - m_pProxyLabel = new QLabel(__tr2qs_ctx("Proxy:","options"),gbox); + m_pProxyLabel = new QLabel(__tr2qs_ctx("Proxy:", "options"), gbox); m_pProxyEdit = new QLineEdit(gbox); - m_pPortLabel = new QLabel(__tr2qs_ctx("Port:","options"),gbox); + m_pPortLabel = new QLabel(__tr2qs_ctx("Port:", "options"), gbox); m_pPortEdit = new QLineEdit(gbox); - m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:","options"),gbox); - m_pIpEditor = new KviIpEditor(gbox,KviIpEditor::IPv4); - m_pUserLabel = new QLabel(__tr2qs_ctx("Username:","options"),gbox); + m_pIpLabel = new QLabel(__tr2qs_ctx("IP address:", "options"), gbox); + m_pIpEditor = new KviIpEditor(gbox, KviIpEditor::IPv4); + m_pUserLabel = new QLabel(__tr2qs_ctx("Username:", "options"), gbox); m_pUserEdit = new QLineEdit(gbox); - m_pPassLabel = new QLabel(__tr2qs_ctx("Password:","options"),gbox); + m_pPassLabel = new QLabel(__tr2qs_ctx("Password:", "options"), gbox); m_pPassEdit = new QLineEdit(gbox); - m_pProtocolLabel = new QLabel(__tr2qs_ctx("Protocol:","options"),gbox); + m_pProtocolLabel = new QLabel(__tr2qs_ctx("Protocol:", "options"), gbox); m_pProtocolBox = new QComboBox(gbox); QStringList l; @@ -128,8 +129,8 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) m_pProtocolBox->addItems(l); - m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); - connect(m_pIPv6Check,SIGNAL(toggled(bool)),this,SLOT(ipV6CheckToggled(bool))); + m_pIPv6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol", "options"), gbox); + connect(m_pIPv6Check, SIGNAL(toggled(bool)), this, SLOT(ipV6CheckToggled(bool))); #ifndef COMPILE_IPV6_SUPPORT m_pIPv6Check->setEnabled(false); #endif @@ -137,8 +138,8 @@ OptionsWidget_proxy::OptionsWidget_proxy(QWidget * parent) fillProxyList(); - layout()->setRowStretch(0,1); - layout()->setColumnStretch(0,1); + layout()->setRowStretch(0, 1); + layout()->setColumnStretch(0, 1); m_pContextPopup = new QMenu(this); } @@ -165,9 +166,9 @@ void OptionsWidget_proxy::fillProxyList() KviPointerList * l = g_pProxyDataBase->proxyList(); - for(KviProxy * p = l->first();p;p = l->next()) + for(KviProxy * p = l->first(); p; p = l->next()) { - prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),p); + prx = new ProxyOptionsTreeWidgetItem(m_pTreeWidget, *(g_pIconManager->getSmallIcon(KviIconManager::Proxy)), p); if(p == g_pProxyDataBase->currentProxy()) { prx->setSelected(true); @@ -176,14 +177,15 @@ void OptionsWidget_proxy::fillProxyList() } } if(!(g_pProxyDataBase->currentProxy())) - currentItemChanged(0,0); + currentItemChanged(0, 0); enableDisableUseProxySelector(); } -void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) +void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) { - if(m_pLastEditedItem)saveLastItem(); + if(m_pLastEditedItem) + saveLastItem(); m_pLastEditedItem = (ProxyOptionsTreeWidgetItem *)it; m_pProxyLabel->setEnabled(m_pLastEditedItem); @@ -208,10 +210,10 @@ void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem { m_pProxyEdit->setText(m_pLastEditedItem->m_pProxyData->m_szHostname); - for(int i=0;icount();i++) + for(int i = 0; i < m_pProtocolBox->count(); i++) { KviCString txt = m_pProtocolBox->itemText(i); - if(kvi_strEqualCI(m_pLastEditedItem->m_pProxyData->protocolName().toUtf8().data(),txt.ptr())) + if(kvi_strEqualCI(m_pLastEditedItem->m_pProxyData->protocolName().toUtf8().data(), txt.ptr())) { m_pProtocolBox->setCurrentIndex(i); break; @@ -236,9 +238,11 @@ void OptionsWidget_proxy::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem m_pUserEdit->setText(m_pLastEditedItem->m_pProxyData->m_szUser); m_pPassEdit->setText(m_pLastEditedItem->m_pProxyData->m_szPass); - KviCString tmp(KviCString::Format,"%u",m_pLastEditedItem->m_pProxyData->m_uPort); + KviCString tmp(KviCString::Format, "%u", m_pLastEditedItem->m_pProxyData->m_uPort); m_pPortEdit->setText(tmp.ptr()); - } else { + } + else + { m_pProxyEdit->setText(""); m_pUserEdit->setText(""); m_pPassEdit->setText(""); @@ -257,7 +261,7 @@ void OptionsWidget_proxy::saveLastItem() if(tmp.isEmpty()) tmp = "irc.unknown.net"; - m_pLastEditedItem->setText(0,tmp.ptr()); + m_pLastEditedItem->setText(0, tmp.ptr()); m_pLastEditedItem->m_pProxyData->m_szHostname = tmp; #ifdef COMPILE_IPV6_SUPPORT m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = m_pIPv6Check->isChecked(); @@ -273,15 +277,15 @@ void OptionsWidget_proxy::saveLastItem() #ifdef COMPILE_IPV6_SUPPORT if(m_pIPv6Check->isChecked()) { - if((!KviQString::equalCI(tmpAddr,"0:0:0:0:0:0:0:0")) && - KviNetUtils::isValidStringIPv6(tmpAddr)) + if((!KviQString::equalCI(tmpAddr, "0:0:0:0:0:0:0:0")) && KviNetUtils::isValidStringIPv6(tmpAddr)) { m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr; } - } else { + } + else + { #endif - if((!KviQString::equalCI(tmpAddr,"0.0.0.0")) && - KviNetUtils::isValidStringIp(tmpAddr)) + if((!KviQString::equalCI(tmpAddr, "0.0.0.0")) && KviNetUtils::isValidStringIp(tmpAddr)) { m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr; } @@ -294,10 +298,11 @@ void OptionsWidget_proxy::saveLastItem() tmp = m_pPortEdit->text(); bool bOk; kvi_u32_t uPort = tmp.toUInt(&bOk); - if(!bOk)uPort = 1080; - m_pLastEditedItem->m_pProxyData->m_uPort = uPort; - tmp = m_pProtocolBox->currentText(); - m_pLastEditedItem->m_pProxyData->setNamedProtocol(tmp.ptr()); + if(!bOk) + uPort = 1080; + m_pLastEditedItem->m_pProxyData->m_uPort = uPort; + tmp = m_pProtocolBox->currentText(); + m_pLastEditedItem->m_pProxyData->setNamedProtocol(tmp.ptr()); } } @@ -308,16 +313,17 @@ void OptionsWidget_proxy::commit() ProxyOptionsTreeWidgetItem * it; - for(int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - it=(ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + it = (ProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); QString tmp = it->text(0); if(!tmp.isEmpty()) { KviProxy * prx = new KviProxy(*(it->m_pProxyData)); g_pProxyDataBase->insertProxy(prx); - if(it == m_pLastEditedItem)g_pProxyDataBase->setCurrentProxy(prx); + if(it == m_pLastEditedItem) + g_pProxyDataBase->setCurrentProxy(prx); } } @@ -327,20 +333,20 @@ void OptionsWidget_proxy::commit() KviOptionsWidget::commit(); } -void OptionsWidget_proxy::customContextMenuRequested(const QPoint &pos) +void OptionsWidget_proxy::customContextMenuRequested(const QPoint & pos) { - QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos); + QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->itemAt(pos); m_pContextPopup->clear(); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewProxy)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy())); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())) - ->setEnabled(it); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewProxy)), __tr2qs_ctx("&New Proxy", "options"), this, SLOT(newProxy())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)), __tr2qs_ctx("Re&move Proxy", "options"), this, SLOT(removeCurrent())) + ->setEnabled(it); m_pContextPopup->popup(QCursor::pos()); } void OptionsWidget_proxy::newProxy() { KviProxy prx; - ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::Proxy)),&prx); + ProxyOptionsTreeWidgetItem * it = new ProxyOptionsTreeWidgetItem(m_pTreeWidget, *(g_pIconManager->getSmallIcon(KviIconManager::Proxy)), &prx); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); m_pTreeWidget->scrollToItem(it); @@ -358,8 +364,10 @@ void OptionsWidget_proxy::removeCurrent() if(it) { it->setSelected(true); - } else { - currentItemChanged(0,0); + } + else + { + currentItemChanged(0, 0); } } } diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h index 64a2fd2b4..3b7b1f3f2 100644 --- a/src/modules/options/OptionsWidget_proxy.h +++ b/src/modules/options/OptionsWidget_proxy.h @@ -44,13 +44,13 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase; class ProxyOptionsTreeWidgetItem : public QTreeWidgetItem { public: - ProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx); + ProxyOptionsTreeWidgetItem(QTreeWidget * parent, const QPixmap & pm, KviProxy * prx); ~ProxyOptionsTreeWidgetItem(); + public: KviProxy * m_pProxyData; }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_proxy KviIconManager::Proxy #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_proxy __tr2qs_no_lookup("Proxy Hosts") #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_proxy OptionsWidget_connection @@ -63,35 +63,37 @@ class OptionsWidget_proxy : public KviOptionsWidget public: OptionsWidget_proxy(QWidget * parent); ~OptionsWidget_proxy(); + protected: - QTreeWidget * m_pTreeWidget; - QLabel * m_pProxyLabel; - QLineEdit * m_pProxyEdit; - QLabel * m_pIpLabel; - KviIpEditor * m_pIpEditor; - QLabel * m_pUserLabel; - QLineEdit * m_pUserEdit; - QLabel * m_pPassLabel; - QLineEdit * m_pPassEdit; - QLabel * m_pPortLabel; - QLineEdit * m_pPortEdit; - QLabel * m_pProtocolLabel; - QComboBox * m_pProtocolBox; - QMenu * m_pContextPopup; - QCheckBox * m_pIPv6Check; + QTreeWidget * m_pTreeWidget; + QLabel * m_pProxyLabel; + QLineEdit * m_pProxyEdit; + QLabel * m_pIpLabel; + KviIpEditor * m_pIpEditor; + QLabel * m_pUserLabel; + QLineEdit * m_pUserEdit; + QLabel * m_pPassLabel; + QLineEdit * m_pPassEdit; + QLabel * m_pPortLabel; + QLineEdit * m_pPortEdit; + QLabel * m_pProtocolLabel; + QComboBox * m_pProtocolBox; + QMenu * m_pContextPopup; + QCheckBox * m_pIPv6Check; KviBoolSelector * m_pUseProxySelector; ProxyOptionsTreeWidgetItem * m_pLastEditedItem; -private: +private: void fillProxyList(); void saveLastItem(); void enableDisableUseProxySelector(); protected slots: - void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *prev); - void customContextMenuRequested(const QPoint &pnt); + void currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem * prev); + void customContextMenuRequested(const QPoint & pnt); void newProxy(); void removeCurrent(); void ipV6CheckToggled(bool bEnabled); + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp index 91b727aaa..1174184d2 100644 --- a/src/modules/options/OptionsWidget_query.cpp +++ b/src/modules/options/OptionsWidget_query.cpp @@ -22,7 +22,6 @@ // //============================================================================= - #include "OptionsWidget_query.h" #include "KviOptions.h" @@ -31,9 +30,8 @@ #include - OptionsWidget_query::OptionsWidget_query(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("query_options_widget"); createLayout(); @@ -41,72 +39,80 @@ OptionsWidget_query::OptionsWidget_query(QWidget * parent) KviBoolSelector * b; KviTalGroupBox * g; - g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Open Query for","options")); - b = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg); - mergeTip(b,__tr2qs_ctx("This option enables query window creation " \ - "when a private message (PRIVMSG) is received.
" \ - "If you disable this, private messages will " \ - "be shown in the active window or a common channel.","options")); - - b = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolCreateQueryOnNotice); - mergeTip(b,__tr2qs_ctx("This option enables query window creation " \ - "when a private notice (NOTICE) is received.
" \ - "If you disable this, private notices will " \ - "be shown in the active window or a common channel.","options")); - - b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Open incoming query windows without focus","options"),KviOption_boolCreateIncomingQueriesAsMinimized); - mergeTip(b,__tr2qs_ctx("This option prevents incoming " \ - "query windows from diverting application focus.
" \ - "Enable this if you don't like queries " \ - "popping up while you're typing something in a channel.","options")); - - b = addBoolSelector(0,2,1,2, __tr2qs_ctx("Enable target user tracking","options"),KviOption_boolEnableQueryTracing); - mergeTip(b,__tr2qs_ctx("This option will enable target user tracking.
" \ - "Some actions of the target user (e.g. joins and parts) " \ - "will be displayed in the window.","options")); - -#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) - b = addBoolSelector(0,3,1,3,__tr2qs_ctx("Flash system taskbar on new query message","options"),KviOption_boolFlashQueryWindowOnNewMessages); - mergeTip(b,__tr2qs_ctx("This option causes the system taskbar entry for KVIrc to flash when a new query message " \ - "is received and the KVIrc window is not the active.","options")); + g = addGroupBox(0, 0, 1, 0, Qt::Horizontal, __tr2qs_ctx("Open Query for", "options")); + b = addBoolSelector(g, __tr2qs_ctx("Private messages", "options"), KviOption_boolCreateQueryOnPrivmsg); + mergeTip(b, __tr2qs_ctx("This option enables query window creation " + "when a private message (PRIVMSG) is received.
" + "If you disable this, private messages will " + "be shown in the active window or a common channel.", + "options")); + + b = addBoolSelector(g, __tr2qs_ctx("Private notices", "options"), KviOption_boolCreateQueryOnNotice); + mergeTip(b, __tr2qs_ctx("This option enables query window creation " + "when a private notice (NOTICE) is received.
" + "If you disable this, private notices will " + "be shown in the active window or a common channel.", + "options")); + + b = addBoolSelector(0, 1, 1, 1, __tr2qs_ctx("Open incoming query windows without focus", "options"), KviOption_boolCreateIncomingQueriesAsMinimized); + mergeTip(b, __tr2qs_ctx("This option prevents incoming " + "query windows from diverting application focus.
" + "Enable this if you don't like queries " + "popping up while you're typing something in a channel.", + "options")); + + b = addBoolSelector(0, 2, 1, 2, __tr2qs_ctx("Enable target user tracking", "options"), KviOption_boolEnableQueryTracing); + mergeTip(b, __tr2qs_ctx("This option will enable target user tracking.
" + "Some actions of the target user (e.g. joins and parts) " + "will be displayed in the window.", + "options")); + +#if(defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW)) + b = addBoolSelector(0, 3, 1, 3, __tr2qs_ctx("Flash system taskbar on new query message", "options"), KviOption_boolFlashQueryWindowOnNewMessages); + mergeTip(b, __tr2qs_ctx("This option causes the system taskbar entry for KVIrc to flash when a new query message " + "is received and the KVIrc window is not the active.", + "options")); #endif - b = addBoolSelector(0,4,1,4, __tr2qs_ctx("Popup notifier on new query message","options"),KviOption_boolPopupNotifierOnNewQueryMessages); - mergeTip(b,__tr2qs_ctx("This option causes a small notifier window to pop up " \ - "in the lower right corner of the screen when a new message is received " \ - "and the KVIrc window is not active.","options")); - - b = addBoolSelector(0,5,1,5, __tr2qs_ctx("Popup notifier on new notice","options"),KviOption_boolPopupNotifierOnNewNotices); - mergeTip(b,__tr2qs_ctx("This option causes a small notifier window to pop up " \ - "in the lower right corner of the screen when a new notice is received " \ - "and the KVIrc window is not active.","options")); - - b = addBoolSelector(0,6,1,6, __tr2qs_ctx("Show information about query target at the top of the query","options"),KviOption_boolShowExtendedInfoInQueryLabel); - mergeTip(b,__tr2qs_ctx("This option enables query window information " \ - "label. It can show you known information about query target at the top of the window.
" \ - "Uncheck if you think,that it wastes your query space","options")); - - b = addBoolSelector(0,7,1,7,__tr2qs_ctx("Paste last query log","options"),KviOption_boolPasteLastLogOnQueryJoin); + b = addBoolSelector(0, 4, 1, 4, __tr2qs_ctx("Popup notifier on new query message", "options"), KviOption_boolPopupNotifierOnNewQueryMessages); + mergeTip(b, __tr2qs_ctx("This option causes a small notifier window to pop up " + "in the lower right corner of the screen when a new message is received " + "and the KVIrc window is not active.", + "options")); + + b = addBoolSelector(0, 5, 1, 5, __tr2qs_ctx("Popup notifier on new notice", "options"), KviOption_boolPopupNotifierOnNewNotices); + mergeTip(b, __tr2qs_ctx("This option causes a small notifier window to pop up " + "in the lower right corner of the screen when a new notice is received " + "and the KVIrc window is not active.", + "options")); + + b = addBoolSelector(0, 6, 1, 6, __tr2qs_ctx("Show information about query target at the top of the query", "options"), KviOption_boolShowExtendedInfoInQueryLabel); + mergeTip(b, __tr2qs_ctx("This option enables query window information " + "label. It can show you known information about query target at the top of the window.
" + "Uncheck if you think,that it wastes your query space", + "options")); + + b = addBoolSelector(0, 7, 1, 7, __tr2qs_ctx("Paste last query log", "options"), KviOption_boolPasteLastLogOnQueryJoin); KviTalHBox * box = new KviTalHBox(this); - addWidgetToLayout(box,0,8,1,8); + addWidgetToLayout(box, 0, 8, 1, 8); KviUIntSelector * u; - u = addUIntSelector(box,__tr2qs_ctx("Paste up to:","options"),KviOption_uintLinesToPasteOnQueryJoin,0,50,10, - KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin)); - u->setSuffix(__tr2qs_ctx(" lines","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 lines
Maximum value: 50 lines","options")); + u = addUIntSelector(box, __tr2qs_ctx("Paste up to:", "options"), KviOption_uintLinesToPasteOnQueryJoin, 0, 50, 10, + KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin)); + u->setSuffix(__tr2qs_ctx(" lines", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 lines
Maximum value: 50 lines", "options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(box,__tr2qs_ctx("Interval:","options"),KviOption_uintDaysIntervalToPasteOnQueryJoin,1,10,10, - KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin)); - u->setSuffix(__tr2qs_ctx(" days","options")); - mergeTip(u,__tr2qs_ctx("Minimum value: 0 days
Maximum value: 10 days","options")); + u = addUIntSelector(box, __tr2qs_ctx("Interval:", "options"), KviOption_uintDaysIntervalToPasteOnQueryJoin, 1, 10, 10, + KVI_OPTION_BOOL(KviOption_boolPasteLastLogOnQueryJoin)); + u->setSuffix(__tr2qs_ctx(" days", "options")); + mergeTip(u, __tr2qs_ctx("Minimum value: 0 days
Maximum value: 10 days", "options")); - connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - addRowSpacer(0,9,1,9); + addRowSpacer(0, 9, 1, 9); } OptionsWidget_query::~OptionsWidget_query() diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 134911c71..11b85ba22 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -68,11 +68,11 @@ #include #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) - #include +#include #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW -IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n) - : QDialog(par) +IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork * n) + : QDialog(par) { setModal(true); setObjectName("network_details"); @@ -102,130 +102,134 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n QGridLayout * g = new QGridLayout(this); - setWindowTitle(__tr2qs_ctx("Network Details and Configuration - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Network Details and Configuration - KVIrc", "options")); setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::World)))); QString szTmp = ""; szTmp += n->name(); szTmp += ""; - QLabel * l = new QLabel(szTmp,this); + QLabel * l = new QLabel(szTmp, this); l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); l->setAlignment(Qt::AlignCenter); - g->addWidget(l,0,0,1,4); + g->addWidget(l, 0, 0, 1, 4); l->setMinimumWidth(200); - l = new QLabel(__tr2qs_ctx("Description:","options"),this); - g->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("Description:", "options"), this); + g->addWidget(l, 1, 0); m_pDescEditor = new QLineEdit(this); - g->addWidget(m_pDescEditor,1,1,1,3); + g->addWidget(m_pDescEditor, 1, 1, 1, 3); m_pDescEditor->setText(n->description()); - KviTalToolTip::add(m_pDescEditor,__tr2qs_ctx("Put here a brief description of the network.","options")); - + KviTalToolTip::add(m_pDescEditor, __tr2qs_ctx("Put here a brief description of the network.", "options")); QTabWidget * tw = new QTabWidget(this); - g->addWidget(tw,2,0,1,4); + g->addWidget(tw, 2, 0, 1, 4); QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab); - KviTalGroupBox *gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab); - gl->addWidget(gbox,0,0,1,2); + KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal, __tr2qs_ctx("Properties", "options"), tab); + gl->addWidget(gbox, 0, 0, 1, 2); QGridLayout * pPropertiesBoxLayout = new QGridLayout(); gbox->setLayout(pPropertiesBoxLayout); - l = new QLabel(__tr2qs_ctx("Username:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,0,0); + l = new QLabel(__tr2qs_ctx("Username:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 0, 0); m_pUserEditor = new QLineEdit(gbox); m_pUserEditor->setText(n->userName()); - pPropertiesBoxLayout->addWidget(m_pUserEditor,0,1); + pPropertiesBoxLayout->addWidget(m_pUserEditor, 0, 1); - KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("This is the username that KVIrc will use to login to servers on this network.\n" \ - "If this field is left empty (most common case), KVIrc will use the default username " \ - "specified in the \"Identity\" options tab.","options")); + KviTalToolTip::add(m_pUserEditor, __tr2qs_ctx("This is the username that KVIrc will use to login to servers on this network.\n" + "If this field is left empty (most common case), KVIrc will use the default username " + "specified in the \"Identity\" options tab.", + "options")); - l = new QLabel(__tr2qs_ctx("Password:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("Password:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 1, 0); m_pPassEditor = new KviPasswordLineEdit(gbox); m_pPassEditor->setText(n->password()); - pPropertiesBoxLayout->addWidget(m_pPassEditor,1,1); + pPropertiesBoxLayout->addWidget(m_pPassEditor, 1, 1); - KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("If this network requires a password, put it in this field, otherwise leave it empty.","options")); + KviTalToolTip::add(m_pPassEditor, __tr2qs_ctx("If this network requires a password, put it in this field, otherwise leave it empty.", "options")); - l = new QLabel(__tr2qs_ctx("Nickname:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,2,0); + l = new QLabel(__tr2qs_ctx("Nickname:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 2, 0); m_pNickEditor = new QLineEdit(gbox); - QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*",Qt::CaseSensitive),gbox); + QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*", Qt::CaseSensitive), gbox); m_pNickEditor->setValidator(v); m_pNickEditor->setText(n->nickName()); - pPropertiesBoxLayout->addWidget(m_pNickEditor,2,1); - + pPropertiesBoxLayout->addWidget(m_pNickEditor, 2, 1); - KviTalToolTip::add(m_pNickEditor,__tr2qs_ctx("You can specify a \"special\" nickname that will be used to log in to the servers on this network.
" \ - "If this field is left empty (most common case), the default nickname (specified in the \"Identity\" settings) will be used.","options")); + KviTalToolTip::add(m_pNickEditor, __tr2qs_ctx("You can specify a \"special\" nickname that will be used to log in to the servers on this network.
" + "If this field is left empty (most common case), the default nickname (specified in the \"Identity\" settings) will be used.", + "options")); - l = new QLabel(__tr2qs_ctx("Alt. nickname:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,3,0); + l = new QLabel(__tr2qs_ctx("Alt. nickname:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 3, 0); m_pAlternativeNickEditor = new QLineEdit(gbox); - v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*",Qt::CaseSensitive),gbox); + v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*", Qt::CaseSensitive), gbox); m_pAlternativeNickEditor->setValidator(v); m_pAlternativeNickEditor->setText(n->alternativeNickName()); - pPropertiesBoxLayout->addWidget(m_pAlternativeNickEditor,3,1); + pPropertiesBoxLayout->addWidget(m_pAlternativeNickEditor, 3, 1); - KviTalToolTip::add(m_pAlternativeNickEditor,__tr2qs_ctx("This nickname will be tried if the primary nickname for this network is already in use.
" \ - "If you leave it empty then the default nicknames specified in the identity options will be tried instead.","options")); + KviTalToolTip::add(m_pAlternativeNickEditor, __tr2qs_ctx("This nickname will be tried if the primary nickname for this network is already in use.
" + "If you leave it empty then the default nicknames specified in the identity options will be tried instead.", + "options")); - l = new QLabel(__tr2qs_ctx("Real name:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,4,0); + l = new QLabel(__tr2qs_ctx("Real name:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 4, 0); m_pRealEditor = new QLineEdit(gbox); m_pRealEditor->setText(n->realName()); - pPropertiesBoxLayout->addWidget(m_pRealEditor,4,1); + pPropertiesBoxLayout->addWidget(m_pRealEditor, 4, 1); - KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("You can specify a \"special\" real name that will be used to login with the servers on this network." \ - "If you leave this field empty (most common case), the default \"real name\" (specified in the \"Identity\" settings) will be used.","options")); + KviTalToolTip::add(m_pRealEditor, __tr2qs_ctx("You can specify a \"special\" real name that will be used to login with the servers on this network." + "If you leave this field empty (most common case), the default \"real name\" (specified in the \"Identity\" settings) will be used.", + "options")); - l = new QLabel(__tr2qs_ctx("Server encoding:","options"),tab); - gl->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("Server encoding:", "options"), tab); + gl->addWidget(l, 1, 0); m_pEncodingEditor = new QComboBox(tab); m_pEncodingEditor->setDuplicatesEnabled(false); - gl->addWidget(m_pEncodingEditor,1,1); - KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("This box allows you to choose the preferred encoding for the servers in this network. " \ - "This encoding will be used for server specific needs, like referencing nicknames and channel names.
" \ - "If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \ - "value that you choose in the \"Encoding\" page of the options dialog.","options")); - - l = new QLabel(__tr2qs_ctx("Text encoding:","options"),tab); - gl->addWidget(l,2,0); + gl->addWidget(m_pEncodingEditor, 1, 1); + KviTalToolTip::add(m_pEncodingEditor, __tr2qs_ctx("This box allows you to choose the preferred encoding for the servers in this network. " + "This encoding will be used for server specific needs, like referencing nicknames and channel names.
" + "If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " + "value that you choose in the \"Encoding\" page of the options dialog.", + "options")); + + l = new QLabel(__tr2qs_ctx("Text encoding:", "options"), tab); + gl->addWidget(l, 2, 0); m_pTextEncodingEditor = new QComboBox(tab); m_pTextEncodingEditor->setDuplicatesEnabled(false); - gl->addWidget(m_pTextEncodingEditor,2,1); - KviTalToolTip::add(m_pTextEncodingEditor,__tr2qs_ctx("This box allows you to choose the preferred encoding for the servers in this network. " \ - "This encoding will be used as the default for text messages.
" \ - "If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " \ - "value that you choose in the \"Encoding\" page of the options dialog.","options")); + gl->addWidget(m_pTextEncodingEditor, 2, 1); + KviTalToolTip::add(m_pTextEncodingEditor, __tr2qs_ctx("This box allows you to choose the preferred encoding for the servers in this network. " + "This encoding will be used as the default for text messages.
" + "If you choose \"Use System Encoding\" then the encoding will be set to the system-wide " + "value that you choose in the \"Encoding\" page of the options dialog.", + "options")); int i = 0; - int srvcurrent = 0, txtcurrent=0; + int srvcurrent = 0, txtcurrent = 0; KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(i); QString tmp; - m_pEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding","options")); - m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding","options")); + m_pEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding", "options")); + m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use System Encoding", "options")); while(d->pcName) { - tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription); - m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); - m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); - if(KviQString::equalCI(d->pcName,n->encoding())) + tmp = QString("%1 (%2)").arg(d->pcName, d->pcDescription); + m_pEncodingEditor->insertItem(m_pEncodingEditor->count(), tmp); + m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(), tmp); + if(KviQString::equalCI(d->pcName, n->encoding())) srvcurrent = i + 1; - if(KviQString::equalCI(d->pcName,n->textEncoding())) + if(KviQString::equalCI(d->pcName, n->textEncoding())) txtcurrent = i + 1; i = i + 1; d = KviLocale::instance()->encodingDescription(i); @@ -234,19 +238,19 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pEncodingEditor->setCurrentIndex(srvcurrent); m_pTextEncodingEditor->setCurrentIndex(txtcurrent); - m_pAutoConnectCheck = new QCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab); + m_pAutoConnectCheck = new QCheckBox(__tr2qs_ctx("Connect to this network at startup", "options"), tab); m_pAutoConnectCheck->setChecked(n->autoConnect()); - gl->addWidget(m_pAutoConnectCheck,3,0,1,2); + gl->addWidget(m_pAutoConnectCheck, 3, 0, 1, 2); - KviTalToolTip::add(m_pAutoConnectCheck,__tr2qs_ctx("This option will cause KVIrc to automatically connect to this network at startup","options")); + KviTalToolTip::add(m_pAutoConnectCheck, __tr2qs_ctx("This option will cause KVIrc to automatically connect to this network at startup", "options")); - l = new QLabel("",tab); - gl->addWidget(l,4,0); + l = new QLabel("", tab); + gl->addWidget(l, 4, 0); - gl->setRowStretch(4,1); - gl->setColumnStretch(1,1); + gl->setRowStretch(4, 1); + gl->setColumnStretch(1, 1); - tw->addTab(tab,__tr2qs_ctx("General","options")); + tw->addTab(tab, __tr2qs_ctx("General", "options")); tab = new QWidget(tw); @@ -254,45 +258,48 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n if(n->autoJoinChannelList()) m_lstChannels = *(n->autoJoinChannelList()); - m_pChannelListSelector = new KviChannelListSelector(tab,__tr2qs_ctx("Channels to Join Automatically upon Connect","options"),&m_lstChannels,true); + m_pChannelListSelector = new KviChannelListSelector(tab, __tr2qs_ctx("Channels to Join Automatically upon Connect", "options"), &m_lstChannels, true); - KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("Here you can set a list of channels to be joined automatically " \ - "after a connection to a server in this network has been established. To add a channel, type its name in the " \ - "text input below and click \"Add\".","options")); + KviTalToolTip::add(m_pChannelListSelector, __tr2qs_ctx("Here you can set a list of channels to be joined automatically " + "after a connection to a server in this network has been established. To add a channel, type its name in the " + "text input below and click \"Add\".", + "options")); - gl->addWidget(m_pChannelListSelector,0,0); + gl->addWidget(m_pChannelListSelector, 0, 0); - tw->addTab(tab,__tr2qs_ctx("Join Channels","options")); + tw->addTab(tab, __tr2qs_ctx("Join Channels", "options")); // after connect execute tab = new QWidget(tw); gl = new QGridLayout(tab); m_pOnConnectEditor = KviScriptEditor::createInstance(tab); - gl->addWidget(m_pOnConnectEditor,0,0); + gl->addWidget(m_pOnConnectEditor, 0, 0); m_pOnConnectEditor->setText(n->onConnectCommand()); m_pOnConnectEditor->setMinimumHeight(150); - KviTalToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("The following commands will be executed after a connection to a server in this network has been established.
" \ - "Important: Enter commands without a preceding slash (e.g. quote pass secret instead of /quote pass secret).
"\ - "KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " \ - "command sequence.","options")); + KviTalToolTip::add(m_pOnConnectEditor, __tr2qs_ctx("The following commands will be executed after a connection to a server in this network has been established.
" + "Important: Enter commands without a preceding slash (e.g. quote pass secret instead of /quote pass secret).
" + "KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " + "command sequence.", + "options")); - tw->addTab(tab,__tr2qs_ctx("On Connect","options")); + tw->addTab(tab, __tr2qs_ctx("On Connect", "options")); tab = new QWidget(tw); gl = new QGridLayout(tab); m_pOnLoginEditor = KviScriptEditor::createInstance(tab); - gl->addWidget(m_pOnLoginEditor,0,0); + gl->addWidget(m_pOnLoginEditor, 0, 0); m_pOnLoginEditor->setText(n->onLoginCommand()); m_pOnLoginEditor->setMinimumHeight(150); - KviTalToolTip::add(m_pOnLoginEditor,__tr2qs_ctx("The following commands will be executed after a successful login to a server in this network.
" \ - "Important: Enter commands without a preceding slash (e.g. quote privatelog instead of /quote privatelog).
" - "This is useful for automatically opening queries, setting variables, etc.","options")); + KviTalToolTip::add(m_pOnLoginEditor, __tr2qs_ctx("The following commands will be executed after a successful login to a server in this network.
" + "Important: Enter commands without a preceding slash (e.g. quote privatelog instead of /quote privatelog).
" + "This is useful for automatically opening queries, setting variables, etc.", + "options")); - tw->addTab(tab,__tr2qs_ctx("On Login","options")); + tw->addTab(tab, __tr2qs_ctx("On Login", "options")); tab = new QWidget(tw); gl = new QGridLayout(tab); @@ -300,10 +307,10 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n KviNickServRuleSet * rs = n->nickServRuleSet(); bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; - m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ identification","options"),tab); - gl->addWidget(m_pNickServCheck,0,0,1,3); + m_pNickServCheck = new QCheckBox(__tr2qs_ctx("Enable NickServ identification", "options"), tab); + gl->addWidget(m_pNickServCheck, 0, 0, 1, 3); - KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options")); + KviTalToolTip::add(m_pNickServCheck, __tr2qs_ctx("This check enables the automatic identification with NickServ", "options")); m_pNickServCheck->setChecked(bNickServEnabled); m_pNickServTreeWidget = new QTreeWidget(tab); @@ -311,111 +318,115 @@ IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pNickServTreeWidget->setAllColumnsShowFocus(true); m_pNickServTreeWidget->setColumnCount(4); QStringList columnLabels; - columnLabels.append(__tr2qs_ctx("Nickname","options")); - columnLabels.append(__tr2qs_ctx("NickServ Mask","options")); - columnLabels.append(__tr2qs_ctx("NickServ Request Mask","options")); - columnLabels.append(__tr2qs_ctx("Identify Command","options")); + columnLabels.append(__tr2qs_ctx("Nickname", "options")); + columnLabels.append(__tr2qs_ctx("NickServ Mask", "options")); + columnLabels.append(__tr2qs_ctx("NickServ Request Mask", "options")); + columnLabels.append(__tr2qs_ctx("Identify Command", "options")); m_pNickServTreeWidget->setHeaderLabels(columnLabels); - connect(m_pNickServTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(enableDisableNickServControls())); - gl->addWidget(m_pNickServTreeWidget,1,0,1,3); + connect(m_pNickServTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(enableDisableNickServControls())); + gl->addWidget(m_pNickServTreeWidget, 1, 0, 1, 3); - KviTalToolTip::add(m_pNickServTreeWidget,__tr2qs_ctx("This is a list of NickServ identification rules. " \ - "KVIrc will use them to model its automatic interaction with NickServ on this network.
" \ - "Please be aware that this feature can cause your NickServ passwords to be stolen " \ - "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
" \ - "In other words, be sure to know what you're doing.
" \ - "Also note that the password that you provide is stored as PLAIN TEXT.","options")); + KviTalToolTip::add(m_pNickServTreeWidget, __tr2qs_ctx("This is a list of NickServ identification rules. " + "KVIrc will use them to model its automatic interaction with NickServ on this network.
" + "Please be aware that this feature can cause your NickServ passwords to be stolen " + "if used improperly. Make sure that you fully understand the NickServ authentication protocol.
" + "In other words, be sure to know what you're doing.
" + "Also note that the password that you provide is stored as PLAIN TEXT.", + "options")); - m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule","options"),tab); - connect(m_pAddRuleButton,SIGNAL(clicked()),this,SLOT(addNickServRule())); - gl->addWidget(m_pAddRuleButton,2,0); + m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule", "options"), tab); + connect(m_pAddRuleButton, SIGNAL(clicked()), this, SLOT(addNickServRule())); + gl->addWidget(m_pAddRuleButton, 2, 0); - m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule","options"),tab); - connect(m_pEditRuleButton,SIGNAL(clicked()),this,SLOT(editNickServRule())); - gl->addWidget(m_pEditRuleButton,2,1); + m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule", "options"), tab); + connect(m_pEditRuleButton, SIGNAL(clicked()), this, SLOT(editNickServRule())); + gl->addWidget(m_pEditRuleButton, 2, 1); - m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule","options"),tab); - connect(m_pDelRuleButton,SIGNAL(clicked()),this,SLOT(delNickServRule())); - gl->addWidget(m_pDelRuleButton,2,2); + m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule", "options"), tab); + connect(m_pDelRuleButton, SIGNAL(clicked()), this, SLOT(delNickServRule())); + gl->addWidget(m_pDelRuleButton, 2, 2); - connect(m_pNickServCheck,SIGNAL(toggled(bool)),this,SLOT(enableDisableNickServControls())); + connect(m_pNickServCheck, SIGNAL(toggled(bool)), this, SLOT(enableDisableNickServControls())); if(rs && rs->rules()) { KviPointerList * ll = rs->rules(); - for(KviNickServRule * rule = ll->first();rule;rule = ll->next()) + for(KviNickServRule * rule = ll->first(); rule; rule = ll->next()) { - QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget); - it->setText(0,rule->registeredNick()); - it->setText(1,rule->nickServMask()); - it->setText(2,rule->messageRegexp()); - it->setText(3,rule->identifyCommand()); + QTreeWidgetItem * it = new QTreeWidgetItem(m_pNickServTreeWidget); + it->setText(0, rule->registeredNick()); + it->setText(1, rule->nickServMask()); + it->setText(2, rule->messageRegexp()); + it->setText(3, rule->identifyCommand()); } } enableDisableNickServControls(); - gl->setRowStretch(1,1); + gl->setRowStretch(1, 1); - tw->addTab(tab,__tr2qs_ctx("NickServ","options")); + tw->addTab(tab, __tr2qs_ctx("NickServ", "options")); - QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); + QPushButton * b = new QPushButton(__tr2qs_ctx("&OK", "options"), this); b->setMinimumWidth(80); - g->addWidget(b,3,2); + g->addWidget(b, 3, 2); b->setDefault(true); - connect(b,SIGNAL(clicked()),this,SLOT(accept())); + connect(b, SIGNAL(clicked()), this, SLOT(accept())); - b = new QPushButton(__tr2qs_ctx("Cancel","options"),this); - g->addWidget(b,3,3); + b = new QPushButton(__tr2qs_ctx("Cancel", "options"), this); + g->addWidget(b, 3, 3); b->setMinimumWidth(80); - connect(b,SIGNAL(clicked()),this,SLOT(reject())); + connect(b, SIGNAL(clicked()), this, SLOT(reject())); - g->setRowStretch(2,1); - g->setColumnStretch(1,1); + g->setRowStretch(2, 1); + g->setColumnStretch(1, 1); tw->setMinimumWidth(375); } - IrcNetworkDetailsWidget::~IrcNetworkDetailsWidget() { - if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); - if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); + if(m_pOnConnectEditor) + KviScriptEditor::destroyInstance(m_pOnConnectEditor); + if(m_pOnLoginEditor) + KviScriptEditor::destroyInstance(m_pOnLoginEditor); } void IrcNetworkDetailsWidget::editNickServRule() { - QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem(); - if(!it)return; - KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3)); - NickServRuleEditor ed(this,false); + QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); + if(!it) + return; + KviNickServRule r(it->text(0), it->text(1), it->text(2), it->text(3)); + NickServRuleEditor ed(this, false); if(ed.editRule(&r)) { - it->setText(0,r.registeredNick()); - it->setText(1,r.nickServMask()); - it->setText(2,r.messageRegexp()); - it->setText(3,r.identifyCommand()); + it->setText(0, r.registeredNick()); + it->setText(1, r.nickServMask()); + it->setText(2, r.messageRegexp()); + it->setText(3, r.identifyCommand()); } } void IrcNetworkDetailsWidget::addNickServRule() { KviNickServRule r; - NickServRuleEditor ed(this,false); + NickServRuleEditor ed(this, false); if(ed.editRule(&r)) { - QTreeWidgetItem *it = new QTreeWidgetItem(m_pNickServTreeWidget); - it->setText(0,r.registeredNick()); - it->setText(1,r.nickServMask()); - it->setText(2,r.messageRegexp()); - it->setText(3,r.identifyCommand()); + QTreeWidgetItem * it = new QTreeWidgetItem(m_pNickServTreeWidget); + it->setText(0, r.registeredNick()); + it->setText(1, r.nickServMask()); + it->setText(2, r.messageRegexp()); + it->setText(3, r.identifyCommand()); } } void IrcNetworkDetailsWidget::delNickServRule() { QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem(); - if(!it)return; + if(!it) + return; delete it; enableDisableNickServControls(); } @@ -446,7 +457,9 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) if(m_pEncodingEditor->currentIndex() <= 0) { n->setEncoding(QString()); - } else { + } + else + { KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(m_pEncodingEditor->currentIndex() - 1); n->setEncoding(d->pcName); } @@ -457,7 +470,9 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) if(m_pTextEncodingEditor->currentIndex() <= 0) { n->setTextEncoding(QString()); - } else { + } + else + { KviLocale::EncodingDescription * dd = KviLocale::instance()->encodingDescription(m_pTextEncodingEditor->currentIndex() - 1); n->setTextEncoding(dd->pcName); } @@ -466,8 +481,10 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) if(m_pChannelListSelector) m_pChannelListSelector->commit(); - if(m_lstChannels.isEmpty())n->setAutoJoinChannelList(0); - else n->setAutoJoinChannelList(new QStringList(m_lstChannels)); + if(m_lstChannels.isEmpty()) + n->setAutoJoinChannelList(0); + else + n->setAutoJoinChannelList(new QStringList(m_lstChannels)); if(m_pNickServTreeWidget) { @@ -476,13 +493,15 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) KviNickServRuleSet * rs = KviNickServRuleSet::createInstance(); rs->setEnabled(m_pNickServCheck->isChecked()); QTreeWidgetItem * it; - for (int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pNickServTreeWidget->topLevelItemCount(); i++) { - it=(QTreeWidgetItem *) m_pNickServTreeWidget->topLevelItem(i); - rs->addRule(KviNickServRule::createInstance(it->text(0),it->text(1),it->text(2),it->text(3))); + it = (QTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i); + rs->addRule(KviNickServRule::createInstance(it->text(0), it->text(1), it->text(2), it->text(3))); } n->setNickServRuleSet(rs); - } else n->setNickServRuleSet(0); + } + else + n->setNickServRuleSet(0); } if(m_pOnConnectEditor) @@ -500,9 +519,8 @@ void IrcNetworkDetailsWidget::fillData(KviIrcNetwork * n) } } - -IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) -: QDialog(par) +IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par, KviIrcServer * s) + : QDialog(par) { setModal(true); setObjectName("server_details"); @@ -510,150 +528,157 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) m_szHostname = s->hostName(); QGridLayout * g = new QGridLayout(this); - setWindowTitle(__tr2qs_ctx("Server Details and Configuration - KVIrc","options")); + setWindowTitle(__tr2qs_ctx("Server Details and Configuration - KVIrc", "options")); setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Server)))); - m_pHeaderLabel = new QLabel("",this); // the text will be set later + m_pHeaderLabel = new QLabel("", this); // the text will be set later m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); m_pHeaderLabel->setAlignment(Qt::AlignCenter); - g->addWidget(m_pHeaderLabel,0,0,1,4); + g->addWidget(m_pHeaderLabel, 0, 0, 1, 4); m_pHeaderLabel->setMinimumWidth(200); - QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this); - g->addWidget(l,1,0); + QLabel * l = new QLabel(__tr2qs_ctx("Description:", "options"), this); + g->addWidget(l, 1, 0); m_pDescEditor = new QLineEdit(this); - g->addWidget(m_pDescEditor,1,1,1,3); + g->addWidget(m_pDescEditor, 1, 1, 1, 3); m_pDescEditor->setText(s->description()); - KviTalToolTip::add(m_pDescEditor,__tr2qs_ctx("This is a brief description of this server. " \ - "This field has no restrictions but many server lists use it to describe the server's physical location","options")); + KviTalToolTip::add(m_pDescEditor, __tr2qs_ctx("This is a brief description of this server. " + "This field has no restrictions but many server lists use it to describe the server's physical location", + "options")); QTabWidget * tw = new QTabWidget(this); - g->addWidget(tw,2,0,1,4); + g->addWidget(tw, 2, 0, 1, 4); QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab); - KviTalGroupBox *gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab); - gl->addWidget(gbox,0,0); + KviTalGroupBox * gbox = new KviTalGroupBox(Qt::Horizontal, __tr2qs_ctx("Properties", "options"), tab); + gl->addWidget(gbox, 0, 0); QGridLayout * pPropertiesBoxLayout = new QGridLayout(); gbox->setLayout(pPropertiesBoxLayout); - l = new QLabel(__tr2qs_ctx("Username:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,0,0); + l = new QLabel(__tr2qs_ctx("Username:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 0, 0); m_pUserEditor = new QLineEdit(gbox); m_pUserEditor->setText(s->userName()); - pPropertiesBoxLayout->addWidget(m_pUserEditor,0,1); + pPropertiesBoxLayout->addWidget(m_pUserEditor, 0, 1); - KviTalToolTip::add(m_pUserEditor,__tr2qs_ctx("This is the username that KVIrc will use to login to this server.\n" \ - "If this field is left empty (most common case), KVIrc will first look if a username is specified " \ - "for the network that this server belongs to, and if that is empty then KVIrc will use the default username " \ - "specified in the \"Identity\" options tab.","options")); + KviTalToolTip::add(m_pUserEditor, __tr2qs_ctx("This is the username that KVIrc will use to login to this server.\n" + "If this field is left empty (most common case), KVIrc will first look if a username is specified " + "for the network that this server belongs to, and if that is empty then KVIrc will use the default username " + "specified in the \"Identity\" options tab.", + "options")); - l = new QLabel(__tr2qs_ctx("Password:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("Password:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 1, 0); m_pPassEditor = new KviPasswordLineEdit(gbox); m_pPassEditor->setText(s->password()); - pPropertiesBoxLayout->addWidget(m_pPassEditor,1,1); + pPropertiesBoxLayout->addWidget(m_pPassEditor, 1, 1); - KviTalToolTip::add(m_pPassEditor,__tr2qs_ctx("If this server requires a password, put it in this field, otherwise leave it empty.","options")); + KviTalToolTip::add(m_pPassEditor, __tr2qs_ctx("If this server requires a password, put it in this field, otherwise leave it empty.", "options")); - l = new QLabel(__tr2qs_ctx("Nickname:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,2,0); + l = new QLabel(__tr2qs_ctx("Nickname:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 2, 0); m_pNickEditor = new QLineEdit(gbox); - QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),gbox); + QValidator * v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"), gbox); m_pNickEditor->setValidator(v); m_pNickEditor->setText(s->nickName()); - pPropertiesBoxLayout->addWidget(m_pNickEditor,2,1); + pPropertiesBoxLayout->addWidget(m_pNickEditor, 2, 1); - KviTalToolTip::add(m_pNickEditor,__tr2qs_ctx("You can specify a \"special\" nickname that will be used to log in to this server.
" \ - "If this field is left empty (most common case), KVIrc will first look if a nickname is specified " \ - "for the network that this server belongs to, and if that is empty then the default nickname (specified in the \"Identity\" settings) will be used.","options")); + KviTalToolTip::add(m_pNickEditor, __tr2qs_ctx("You can specify a \"special\" nickname that will be used to log in to this server.
" + "If this field is left empty (most common case), KVIrc will first look if a nickname is specified " + "for the network that this server belongs to, and if that is empty then the default nickname (specified in the \"Identity\" settings) will be used.", + "options")); - l = new QLabel(__tr2qs_ctx("Alt. nickname:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,3,0); + l = new QLabel(__tr2qs_ctx("Alt. nickname:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 3, 0); m_pAlternativeNickEditor = new QLineEdit(gbox); - v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"),gbox); + v = new QRegExpValidator(QRegExp("[^-0-9 ][^ ]*"), gbox); m_pAlternativeNickEditor->setValidator(v); m_pAlternativeNickEditor->setText(s->alternativeNickName()); - pPropertiesBoxLayout->addWidget(m_pAlternativeNickEditor,3,1); + pPropertiesBoxLayout->addWidget(m_pAlternativeNickEditor, 3, 1); - KviTalToolTip::add(m_pAlternativeNickEditor,__tr2qs_ctx("This nickname will be tried if the primary nickname for this server is already in use.
" \ - "If you leave it empty then the default nicknames specified in the identity options will be tried instead.","options")); + KviTalToolTip::add(m_pAlternativeNickEditor, __tr2qs_ctx("This nickname will be tried if the primary nickname for this server is already in use.
" + "If you leave it empty then the default nicknames specified in the identity options will be tried instead.", + "options")); - l = new QLabel(__tr2qs_ctx("Real name:","options"),gbox); - pPropertiesBoxLayout->addWidget(l,4,0); + l = new QLabel(__tr2qs_ctx("Real name:", "options"), gbox); + pPropertiesBoxLayout->addWidget(l, 4, 0); m_pRealEditor = new QLineEdit(gbox); m_pRealEditor->setText(s->realName()); - pPropertiesBoxLayout->addWidget(m_pRealEditor,4,1); + pPropertiesBoxLayout->addWidget(m_pRealEditor, 4, 1); - KviTalToolTip::add(m_pRealEditor,__tr2qs_ctx("You can specify a \"special\" real name that will be used to login with this server.
" \ - "If you leave this field empty (most common case), KVIrc will first look if a real name is specified " \ - "for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.","options")); + KviTalToolTip::add(m_pRealEditor, __tr2qs_ctx("You can specify a \"special\" real name that will be used to login with this server.
" + "If you leave this field empty (most common case), KVIrc will first look if a real name is specified " + "for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.", + "options")); - gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("User Mode","options"),tab); - gl->addWidget(gbox,1,0); + gbox = new KviTalGroupBox(Qt::Horizontal, __tr2qs_ctx("User Mode", "options"), tab); + gl->addWidget(gbox, 1, 0); - m_pUseDefaultInitUMode = new QCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); - KviTalToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("If this is enabled, the global initial user mode (configured from" \ - " the identity dialog) will be used. If disabled, you can configure an initial user mode for this server","options")); + m_pUseDefaultInitUMode = new QCheckBox(__tr2qs_ctx("Use default user mode", "options"), gbox); + KviTalToolTip::add(m_pUseDefaultInitUMode, __tr2qs_ctx("If this is enabled, the global initial user mode (configured from" + " the identity dialog) will be used. If disabled, you can configure an initial user mode for this server", + "options")); bool bHasUmode = !(s->initUMode().isEmpty()); KviCString szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode); m_pUseDefaultInitUMode->setChecked(!bHasUmode); - connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool))); + connect(m_pUseDefaultInitUMode, SIGNAL(toggled(bool)), this, SLOT(useDefaultInitUModeToggled(bool))); - m_pIMode = new QCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox); + m_pIMode = new QCheckBox(__tr2qs_ctx("Invisible (+i)", "options"), gbox); m_pIMode->setEnabled(bHasUmode); - m_pIMode->setChecked(bHasUmode ? bool(s->initUMode().contains('i',Qt::CaseInsensitive)) : bool(szDefUMode.contains('i',Qt::CaseInsensitive))); + m_pIMode->setChecked(bHasUmode ? bool(s->initUMode().contains('i', Qt::CaseInsensitive)) : bool(szDefUMode.contains('i', Qt::CaseInsensitive))); - m_pSMode = new QCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox); + m_pSMode = new QCheckBox(__tr2qs_ctx("Server notices (+s)", "options"), gbox); m_pSMode->setEnabled(bHasUmode); - m_pSMode->setChecked(bHasUmode ? bool(s->initUMode().contains('s',Qt::CaseInsensitive)) : bool(szDefUMode.contains('s',Qt::CaseInsensitive))); + m_pSMode->setChecked(bHasUmode ? bool(s->initUMode().contains('s', Qt::CaseInsensitive)) : bool(szDefUMode.contains('s', Qt::CaseInsensitive))); - m_pWMode = new QCheckBox(__tr2qs_ctx("WALLOPS (+w)","options"),gbox); + m_pWMode = new QCheckBox(__tr2qs_ctx("WALLOPS (+w)", "options"), gbox); m_pWMode->setEnabled(bHasUmode); - m_pWMode->setChecked(bHasUmode ? bool(s->initUMode().contains('w',Qt::CaseInsensitive)) : bool(szDefUMode.contains('w',Qt::CaseInsensitive))); + m_pWMode->setChecked(bHasUmode ? bool(s->initUMode().contains('w', Qt::CaseInsensitive)) : bool(szDefUMode.contains('w', Qt::CaseInsensitive))); - l = new QLabel("",tab); - gl->addWidget(l,2,0); + l = new QLabel("", tab); + gl->addWidget(l, 2, 0); - gl->setRowStretch(2,1); + gl->setRowStretch(2, 1); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Ident)),__tr2qs_ctx("Identity","options")); + tw->addTab(tab, *(g_pIconManager->getSmallIcon(KviIconManager::Ident)), __tr2qs_ctx("Identity", "options")); int iRow = 0; tab = new QWidget(tw); gl = new QGridLayout(tab); - l = new QLabel(__tr2qs_ctx("Port:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("Port:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pPortEditor = new QLineEdit(tab); - gl->addWidget(m_pPortEditor,iRow,1); + gl->addWidget(m_pPortEditor, iRow, 1); QString tmpz; tmpz.setNum(s->port()); m_pPortEditor->setText(tmpz); - KviTalToolTip::add(m_pPortEditor,__tr2qs_ctx("This is the default port that this server will be contacted on.
Usually 6667 is OK.","options")); - connect(m_pPortEditor,SIGNAL(textChanged(const QString &)),this,SLOT(portEditorTextChanged(const QString &))); + KviTalToolTip::add(m_pPortEditor, __tr2qs_ctx("This is the default port that this server will be contacted on.
Usually 6667 is OK.", "options")); + connect(m_pPortEditor, SIGNAL(textChanged(const QString &)), this, SLOT(portEditorTextChanged(const QString &))); iRow++; - l = new QLabel(__tr2qs_ctx("IP address:","options"),tab); - gl->addWidget(l,iRow,0); - m_pIpEditor = new KviIpEditor(tab,KviIpEditor::IPv4); - gl->addWidget(m_pIpEditor,iRow,1); - KviTalToolTip::add(m_pIpEditor,__tr2qs_ctx("This is the IP address of this server, it is here for caching purposes.
" \ - "If you leave this field empty, KVIrc will fill it in the first time it connects to the server. " \ - "If you enable the \"cache IP address\" option below, KVIrc will use it as a \"cached result\" " \ - "and avoid looking it up again.","options")); + l = new QLabel(__tr2qs_ctx("IP address:", "options"), tab); + gl->addWidget(l, iRow, 0); + m_pIpEditor = new KviIpEditor(tab, KviIpEditor::IPv4); + gl->addWidget(m_pIpEditor, iRow, 1); + KviTalToolTip::add(m_pIpEditor, __tr2qs_ctx("This is the IP address of this server, it is here for caching purposes.
" + "If you leave this field empty, KVIrc will fill it in the first time it connects to the server. " + "If you enable the \"cache IP address\" option below, KVIrc will use it as a \"cached result\" " + "and avoid looking it up again.", + "options")); #ifdef COMPILE_IPV6_SUPPORT m_pIpEditor->setAddressType(s->isIPv6() ? KviIpEditor::IPv6 : KviIpEditor::IPv4); #else @@ -672,89 +697,94 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) iRow++; QGridLayout * pCheckBoxLayout = new QGridLayout(); - gl->addLayout(pCheckBoxLayout,iRow,0,1,2); + gl->addLayout(pCheckBoxLayout, iRow, 0, 1, 2); - m_pCacheIpCheck = new QCheckBox(__tr2qs_ctx("Cache IP address","options"),tab); - pCheckBoxLayout->addWidget(m_pCacheIpCheck,0,0); + m_pCacheIpCheck = new QCheckBox(__tr2qs_ctx("Cache IP address", "options"), tab); + pCheckBoxLayout->addWidget(m_pCacheIpCheck, 0, 0); - KviTalToolTip::add(m_pCacheIpCheck,__tr2qs_ctx("This check will enable IP address caching for this server:
" \ - "DNS lookups can be time-consuming and might be blocking on some platforms; " \ - "this option will cause KVIrc to look up the server hostname only once.

" \ - "Advanced: you can also use this option to force a certain server name to resolve " \ - "to a fixed IP address when either the DNS for that server is temporarily " \ - "unreachable or you want to avoid the round-robin lookups.","options")); + KviTalToolTip::add(m_pCacheIpCheck, __tr2qs_ctx("This check will enable IP address caching for this server:
" + "DNS lookups can be time-consuming and might be blocking on some platforms; " + "this option will cause KVIrc to look up the server hostname only once.

" + "Advanced: you can also use this option to force a certain server name to resolve " + "to a fixed IP address when either the DNS for that server is temporarily " + "unreachable or you want to avoid the round-robin lookups.", + "options")); m_pCacheIpCheck->setChecked(s->cacheIp()); - m_pUseAutoConnect = new QCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); + m_pUseAutoConnect = new QCheckBox(__tr2qs_ctx("Connect to this server at startup", "options"), tab); m_pUseAutoConnect->setChecked(s->autoConnect()); - pCheckBoxLayout->addWidget(m_pUseAutoConnect,0,1); + pCheckBoxLayout->addWidget(m_pUseAutoConnect, 0, 1); - KviTalToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("This option will cause KVIrc to connect to the IRC server when it is started.","options")); + KviTalToolTip::add(m_pUseAutoConnect, __tr2qs_ctx("This option will cause KVIrc to connect to the IRC server when it is started.", "options")); - m_pUseIPV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab); - pCheckBoxLayout->addWidget(m_pUseIPV6Check,1,0); + m_pUseIPV6Check = new QCheckBox(__tr2qs_ctx("Use IPv6 protocol", "options"), tab); + pCheckBoxLayout->addWidget(m_pUseIPV6Check, 1, 0); #ifdef COMPILE_IPV6_SUPPORT m_pUseIPV6Check->setChecked(s->isIPv6()); - connect(m_pUseIPV6Check,SIGNAL(toggled(bool)),this,SLOT(useIPV6CheckToggled(bool))); + connect(m_pUseIPV6Check, SIGNAL(toggled(bool)), this, SLOT(useIPV6CheckToggled(bool))); #else m_pUseIPV6Check->setEnabled(false); #endif - KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("This check identifies IPv6 servers.
If enabled, KVIrc will attempt to use the IPv6 protocol " \ - "(thus your OS must have a working IPv6 stack and you must have an IPv6 connection).","options")); + KviTalToolTip::add(m_pUseIPV6Check, __tr2qs_ctx("This check identifies IPv6 servers.
If enabled, KVIrc will attempt to use the IPv6 protocol " + "(thus your OS must have a working IPv6 stack and you must have an IPv6 connection).", + "options")); - m_pUseSSLCheck = new QCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab); - pCheckBoxLayout->addWidget(m_pUseSSLCheck,1,1); + m_pUseSSLCheck = new QCheckBox(__tr2qs_ctx("Use SSL protocol", "options"), tab); + pCheckBoxLayout->addWidget(m_pUseSSLCheck, 1, 1); - KviTalToolTip::add(m_pUseSSLCheck,__tr2qs_ctx("This check will cause the connection to use the Secure Socket Layer " \ - "encryption support. Obviously, this server must have support for this, too. :)","options")); + KviTalToolTip::add(m_pUseSSLCheck, __tr2qs_ctx("This check will cause the connection to use the Secure Socket Layer " + "encryption support. Obviously, this server must have support for this, too. :)", + "options")); #ifdef COMPILE_SSL_SUPPORT m_pUseSSLCheck->setChecked(s->useSSL()); - connect(m_pUseSSLCheck,SIGNAL(toggled(bool)),this,SLOT(useSSLCheckToggled(bool))); + connect(m_pUseSSLCheck, SIGNAL(toggled(bool)), this, SLOT(useSSLCheckToggled(bool))); #else m_pUseSSLCheck->setEnabled(false); #endif iRow++; - l = new QLabel(__tr2qs_ctx("Protocol encoding:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("Protocol encoding:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pEncodingEditor = new QComboBox(tab); m_pEncodingEditor->setDuplicatesEnabled(false); - gl->addWidget(m_pEncodingEditor,iRow,1); - KviTalToolTip::add(m_pEncodingEditor,__tr2qs_ctx("This box allows you to choose the preferred encoding for this server. " \ - "This encoding will be used for server specific needs, like referencing nicknames and channel names.
" \ - "If you choose \"Use Network Encoding\" then the encoding will be inherited from the " \ - "network that this server belongs to.","options")); + gl->addWidget(m_pEncodingEditor, iRow, 1); + KviTalToolTip::add(m_pEncodingEditor, __tr2qs_ctx("This box allows you to choose the preferred encoding for this server. " + "This encoding will be used for server specific needs, like referencing nicknames and channel names.
" + "If you choose \"Use Network Encoding\" then the encoding will be inherited from the " + "network that this server belongs to.", + "options")); iRow++; - l = new QLabel(__tr2qs_ctx("Text encoding:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("Text encoding:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pTextEncodingEditor = new QComboBox(tab); m_pTextEncodingEditor->setDuplicatesEnabled(false); - gl->addWidget(m_pTextEncodingEditor,iRow,1); - KviTalToolTip::add(m_pTextEncodingEditor,__tr2qs_ctx("This box allows you to choose the preferred encoding for this server. " \ - "This will be used as the default encoding for all text messages.
" \ - "If you choose \"Use Network Encoding\" then the encoding will be inherited from the " \ - "network that this server belongs to.","options")); + gl->addWidget(m_pTextEncodingEditor, iRow, 1); + KviTalToolTip::add(m_pTextEncodingEditor, __tr2qs_ctx("This box allows you to choose the preferred encoding for this server. " + "This will be used as the default encoding for all text messages.
" + "If you choose \"Use Network Encoding\" then the encoding will be inherited from the " + "network that this server belongs to.", + "options")); int i = 0; - int srvcurrent = 0, txtcurrent=0; + int srvcurrent = 0, txtcurrent = 0; KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(i); QString tmp; - m_pEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding","options")); - m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding","options")); + m_pEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding", "options")); + m_pTextEncodingEditor->addItem(__tr2qs_ctx("Use Network Encoding", "options")); while(d->pcName) { - tmp = QString("%1 (%2)").arg(d->pcName,d->pcDescription); - m_pEncodingEditor->insertItem(m_pEncodingEditor->count(),tmp); - m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(),tmp); - if(KviQString::equalCI(d->pcName,s->encoding())) + tmp = QString("%1 (%2)").arg(d->pcName, d->pcDescription); + m_pEncodingEditor->insertItem(m_pEncodingEditor->count(), tmp); + m_pTextEncodingEditor->insertItem(m_pTextEncodingEditor->count(), tmp); + if(KviQString::equalCI(d->pcName, s->encoding())) srvcurrent = i + 1; - if(KviQString::equalCI(d->pcName,s->textEncoding())) + if(KviQString::equalCI(d->pcName, s->textEncoding())) txtcurrent = i + 1; i = i + 1; d = KviLocale::instance()->encodingDescription(i); @@ -765,36 +795,37 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) iRow++; - l = new QLabel(__tr2qs_ctx("Proxy server:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("Proxy server:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pProxyEditor = new QComboBox(tab); - gl->addWidget(m_pProxyEditor,iRow,1); - KviTalToolTip::add(m_pProxyEditor,__tr2qs_ctx("Defines the connection type that KVIrc should use to connect to this server.
" \ - "When it's set to *Default* KVIrc will use the global proxy settings, when it's set to *Direct Connection* " \ - "KVIrc will connect directly without using a proxy, or select a desired proxy you have previously added
" \ - "You can define or edit new proxy servers in *General Preferences* / *Connection* tab' \"Proxy hosts\" dialog.","options")); + gl->addWidget(m_pProxyEditor, iRow, 1); + KviTalToolTip::add(m_pProxyEditor, __tr2qs_ctx("Defines the connection type that KVIrc should use to connect to this server.
" + "When it's set to *Default* KVIrc will use the global proxy settings, when it's set to *Direct Connection* " + "KVIrc will connect directly without using a proxy, or select a desired proxy you have previously added
" + "You can define or edit new proxy servers in *General Preferences* / *Connection* tab' \"Proxy hosts\" dialog.", + "options")); - m_pProxyEditor->addItem(__tr2qs_ctx("Default","options")); - m_pProxyEditor->addItem(__tr2qs_ctx("Direct Connection","options")); + m_pProxyEditor->addItem(__tr2qs_ctx("Default", "options")); + m_pProxyEditor->addItem(__tr2qs_ctx("Direct Connection", "options")); KviPointerList * proxylist = g_pProxyDataBase->proxyList(); - for(KviProxy * p = proxylist->first();p;p = proxylist->next()) + for(KviProxy * p = proxylist->first(); p; p = proxylist->next()) { - m_pProxyEditor->insertItem(m_pProxyEditor->count(),QString("%1:%2").arg(p->hostName()).arg(p->port())); + m_pProxyEditor->insertItem(m_pProxyEditor->count(), QString("%1:%2").arg(p->hostName()).arg(p->port())); } - if(m_pProxyEditor->count() > (s->proxy()+2)) - m_pProxyEditor->setCurrentIndex(s->proxy()+2); + if(m_pProxyEditor->count() > (s->proxy() + 2)) + m_pProxyEditor->setCurrentIndex(s->proxy() + 2); iRow++; - l = new QLabel("",tab); - gl->addWidget(l,iRow,0,1,2); + l = new QLabel("", tab); + gl->addWidget(l, iRow, 0, 1, 2); - gl->setRowStretch(iRow,1); + gl->setRowStretch(iRow, 1); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Socket)),__tr2qs_ctx("Connection","options")); + tw->addTab(tab, *(g_pIconManager->getSmallIcon(KviIconManager::Socket)), __tr2qs_ctx("Connection", "options")); tab = new QWidget(tw); @@ -802,55 +833,59 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) if(s->autoJoinChannelList()) m_lstChannels = *(s->autoJoinChannelList()); - m_pChannelListSelector = new KviChannelListSelector(tab,__tr2qs_ctx("Channels to Join Automatically upon Connect","options"),&m_lstChannels,true); - KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("Here you can set a list of channels to be joined automatically " \ - "after a connection to this server has been established. To add a channel, type its name in the " \ - "text input below and click \"Add\".","options")); + m_pChannelListSelector = new KviChannelListSelector(tab, __tr2qs_ctx("Channels to Join Automatically upon Connect", "options"), &m_lstChannels, true); + KviTalToolTip::add(m_pChannelListSelector, __tr2qs_ctx("Here you can set a list of channels to be joined automatically " + "after a connection to this server has been established. To add a channel, type its name in the " + "text input below and click \"Add\".", + "options")); - gl->addWidget(m_pChannelListSelector,0,0); + gl->addWidget(m_pChannelListSelector, 0, 0); - tw->addTab(tab,*(g_pIconManager->getSmallIcon(KviIconManager::Channel)),__tr2qs_ctx("Join Channels","options")); + tw->addTab(tab, *(g_pIconManager->getSmallIcon(KviIconManager::Channel)), __tr2qs_ctx("Join Channels", "options")); tab = new QWidget(tw); gl = new QGridLayout(tab); m_pOnConnectEditor = KviScriptEditor::createInstance(tab); - gl->addWidget(m_pOnConnectEditor,0,0); + gl->addWidget(m_pOnConnectEditor, 0, 0); m_pOnConnectEditor->setText(s->onConnectCommand()); m_pOnConnectEditor->setMinimumHeight(150); - KviTalToolTip::add(m_pOnConnectEditor,__tr2qs_ctx("The following commands will be executed after a connection has been established.
" \ - "Important: Enter commands without a preceding slash (e.g. quote pass secret instead of /quote pass secret).
"\ - "KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " \ - "command sequence.
This is particularly useful for IRC bouncers that require login commands.","options")); + KviTalToolTip::add(m_pOnConnectEditor, __tr2qs_ctx("The following commands will be executed after a connection has been established.
" + "Important: Enter commands without a preceding slash (e.g. quote pass secret instead of /quote pass secret).
" + "KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " + "command sequence.
This is particularly useful for IRC bouncers that require login commands.", + "options")); - tw->addTab(tab,__tr2qs_ctx("On Connect","options")); + tw->addTab(tab, __tr2qs_ctx("On Connect", "options")); tab = new QWidget(tw); gl = new QGridLayout(tab); m_pOnLoginEditor = KviScriptEditor::createInstance(tab); - gl->addWidget(m_pOnLoginEditor,0,0); + gl->addWidget(m_pOnLoginEditor, 0, 0); m_pOnLoginEditor->setText(s->onLoginCommand()); m_pOnLoginEditor->setMinimumHeight(150); - KviTalToolTip::add(m_pOnLoginEditor,__tr2qs_ctx("The following commands will be executed after a successful login to this server.
" \ - "Important: Enter commands without a preceding slash (e.g. quote privatelog instead of /quote privatelog).
" - "This is useful for automatically opening queries, setting variables, etc.","options")); + KviTalToolTip::add(m_pOnLoginEditor, __tr2qs_ctx("The following commands will be executed after a successful login to this server.
" + "Important: Enter commands without a preceding slash (e.g. quote privatelog instead of /quote privatelog).
" + "This is useful for automatically opening queries, setting variables, etc.", + "options")); - tw->addTab(tab,__tr2qs_ctx("On Login","options")); + tw->addTab(tab, __tr2qs_ctx("On Login", "options")); tab = new QWidget(tw); gl = new QGridLayout(tab); iRow = 0; - m_pEnableSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Switch to SSL/TLS by using the STARTTLS extension","options"),tab); - gl->addWidget(m_pEnableSTARTTLSCheck,iRow,0,1,2); - KviTalToolTip::add(m_pEnableSTARTTLSCheck,__tr2qs_ctx("This check enables the use of the Transport Layer Security " \ - "protocol. If you enable the Extended Capabilities below then the TLS protocol support will be detected by using " \ - "a CAP LS command. Without \"Extended Capabilities\" the STARTTLS command will be forcibly sent at the beginning of the " \ - "connection.","options")); + m_pEnableSTARTTLSCheck = new QCheckBox(__tr2qs_ctx("Switch to SSL/TLS by using the STARTTLS extension", "options"), tab); + gl->addWidget(m_pEnableSTARTTLSCheck, iRow, 0, 1, 2); + KviTalToolTip::add(m_pEnableSTARTTLSCheck, __tr2qs_ctx("This check enables the use of the Transport Layer Security " + "protocol. If you enable the Extended Capabilities below then the TLS protocol support will be detected by using " + "a CAP LS command. Without \"Extended Capabilities\" the STARTTLS command will be forcibly sent at the beginning of the " + "connection.", + "options")); #ifndef COMPILE_SSL_SUPPORT m_pEnableSTARTTLSCheck->setEnabled(false); #endif @@ -858,56 +893,57 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) iRow++; - QGroupBox * pCapGroup = new QGroupBox(__tr2qs_ctx("Extended Capabilities","options"),tab); - gl->addWidget(pCapGroup,iRow,0,1,2); + QGroupBox * pCapGroup = new QGroupBox(__tr2qs_ctx("Extended Capabilities", "options"), tab); + gl->addWidget(pCapGroup, iRow, 0, 1, 2); QGridLayout * pCapLayout = new QGridLayout(); pCapGroup->setLayout(pCapLayout); - m_pEnableCAPCheck = new QCheckBox(__tr2qs_ctx("Query extended capabilities on connect","options"),tab); - pCapLayout->addWidget(m_pEnableCAPCheck,0,0); + m_pEnableCAPCheck = new QCheckBox(__tr2qs_ctx("Query extended capabilities on connect", "options"), tab); + pCapLayout->addWidget(m_pEnableCAPCheck, 0, 0); - KviTalToolTip::add(m_pEnableCAPCheck,__tr2qs_ctx("This check will cause the connection to use the Extended Capability support.","options")); + KviTalToolTip::add(m_pEnableCAPCheck, __tr2qs_ctx("This check will cause the connection to use the Extended Capability support.", "options")); m_pEnableCAPCheck->setChecked(s->enabledCAP()); - QGroupBox * pSASLGroup = new QGroupBox(__tr2qs_ctx("SASL Authentication","options"),tab); - pCapLayout->addWidget(pSASLGroup,2,0); + QGroupBox * pSASLGroup = new QGroupBox(__tr2qs_ctx("SASL Authentication", "options"), tab); + pCapLayout->addWidget(pSASLGroup, 2, 0); QGridLayout * pSASLLayout = new QGridLayout(pSASLGroup); - m_pEnableSASLCheck = new QCheckBox(__tr2qs_ctx("Authenticate via SASL extension","options"),pSASLGroup); - pSASLLayout->addWidget(m_pEnableSASLCheck,0,0,1,2); - KviTalToolTip::add(m_pEnableSASLCheck,__tr2qs_ctx("This check enables the use of the SASL authentication protocol " \ - "If you enable the proper global option in the Connection/SSL tab and fill the SASL nickname and SASL " \ - "password fields in this page, the SASL protocol will be used for this server if available.","options")); + m_pEnableSASLCheck = new QCheckBox(__tr2qs_ctx("Authenticate via SASL extension", "options"), pSASLGroup); + pSASLLayout->addWidget(m_pEnableSASLCheck, 0, 0, 1, 2); + KviTalToolTip::add(m_pEnableSASLCheck, __tr2qs_ctx("This check enables the use of the SASL authentication protocol " + "If you enable the proper global option in the Connection/SSL tab and fill the SASL nickname and SASL " + "password fields in this page, the SASL protocol will be used for this server if available.", + "options")); m_pEnableSASLCheck->setChecked(s->enabledSASL()); - l = new QLabel(__tr2qs_ctx("SASL nickname:","options"),pSASLGroup); - pSASLLayout->addWidget(l,1,0); + l = new QLabel(__tr2qs_ctx("SASL nickname:", "options"), pSASLGroup); + pSASLLayout->addWidget(l, 1, 0); m_pSaslNickEditor = new QLineEdit(pSASLGroup); m_pSaslNickEditor->setText(s->saslNick()); - KviTalToolTip::add(m_pSaslNickEditor,__tr2qs_ctx("If you want to enable SASL authentication, insert your nickname here.","options")); - pSASLLayout->addWidget(m_pSaslNickEditor,1,1); + KviTalToolTip::add(m_pSaslNickEditor, __tr2qs_ctx("If you want to enable SASL authentication, insert your nickname here.", "options")); + pSASLLayout->addWidget(m_pSaslNickEditor, 1, 1); - l = new QLabel(__tr2qs_ctx("SASL password:","options"),pSASLGroup); - pSASLLayout->addWidget(l,2,0); + l = new QLabel(__tr2qs_ctx("SASL password:", "options"), pSASLGroup); + pSASLLayout->addWidget(l, 2, 0); m_pSaslPassEditor = new KviPasswordLineEdit(pSASLGroup); // <---- ????? m_pSaslPassEditor->setText(s->saslPass()); - KviTalToolTip::add(m_pSaslPassEditor,__tr2qs_ctx("If you want to enable SASL authentication, insert your password here.","options")); - pSASLLayout->addWidget(m_pSaslPassEditor,2,1); + KviTalToolTip::add(m_pSaslPassEditor, __tr2qs_ctx("If you want to enable SASL authentication, insert your password here.", "options")); + pSASLLayout->addWidget(m_pSaslPassEditor, 2, 1); pSASLGroup->setEnabled(s->enabledCAP()); - connect(m_pEnableCAPCheck,SIGNAL(toggled(bool)),pSASLGroup,SLOT(setEnabled(bool))); + connect(m_pEnableCAPCheck, SIGNAL(toggled(bool)), pSASLGroup, SLOT(setEnabled(bool))); iRow++; - l = new QLabel(__tr2qs_ctx("Link filter:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("Link filter:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pLinkFilterEditor = new QComboBox(tab); m_pLinkFilterEditor->setEditable(true); m_pLinkFilterEditor->setDuplicatesEnabled(false); - gl->addWidget(m_pLinkFilterEditor,iRow,1); + gl->addWidget(m_pLinkFilterEditor, iRow, 1); m_pLinkFilterEditor->addItem(""); @@ -916,9 +952,11 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) if(mexl) { - for(KviModuleExtensionDescriptor * d = mexl->first();d;d = mexl->next()) + for(KviModuleExtensionDescriptor * d = mexl->first(); d; d = mexl->next()) m_pLinkFilterEditor->addItem(d->name().ptr()); - } else { + } + else + { if(!s->linkFilter().isEmpty()) m_pLinkFilterEditor->addItem(s->linkFilter()); } @@ -926,7 +964,7 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) if(!s->linkFilter().isEmpty()) { int i = m_pLinkFilterEditor->findText(s->linkFilter()); - if (i != -1) + if(i != -1) m_pLinkFilterEditor->setCurrentIndex(i); else m_pLinkFilterEditor->setEditText(s->linkFilter()); @@ -934,50 +972,55 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) else m_pLinkFilterEditor->setCurrentIndex(0); - KviTalToolTip::add(m_pLinkFilterEditor,__tr2qs_ctx("This field specifies the name of a module that exports a link filter for this type of server.
" \ - "For plain IRC connections, you don't need any link filters; this is used for incompatible protocols.","options")); + KviTalToolTip::add(m_pLinkFilterEditor, __tr2qs_ctx("This field specifies the name of a module that exports a link filter for this type of server.
" + "For plain IRC connections, you don't need any link filters; this is used for incompatible protocols.", + "options")); iRow++; - l = new QLabel(__tr2qs_ctx("ID:","options"),tab); - gl->addWidget(l,iRow,0); + l = new QLabel(__tr2qs_ctx("ID:", "options"), tab); + gl->addWidget(l, iRow, 0); m_pIdEditor = new QLineEdit(tab); - if(s->id().isEmpty())s->generateUniqueId(); + if(s->id().isEmpty()) + s->generateUniqueId(); m_pIdEditor->setText(s->id()); - gl->addWidget(m_pIdEditor,iRow,1); + gl->addWidget(m_pIdEditor, iRow, 1); - KviTalToolTip::add(m_pIdEditor,__tr2qs_ctx("This field allows you to specify a really unique ID for this server. " \ - "You will then be able to use /server -x <this_id> to make the connection. This is especially " \ - "useful when you have multiple server entries with the same hostname and port in different networks (bouncers?)","options")); + KviTalToolTip::add(m_pIdEditor, __tr2qs_ctx("This field allows you to specify a really unique ID for this server. " + "You will then be able to use /server -x <this_id> to make the connection. This is especially " + "useful when you have multiple server entries with the same hostname and port in different networks (bouncers?)", + "options")); iRow++; - tw->addTab(tab,__tr2qs_ctx("Advanced","options")); + tw->addTab(tab, __tr2qs_ctx("Advanced", "options")); // Placeholder for NickServ options (text with redirect to network settings) tab = new QWidget(tw); gl = new QGridLayout(tab); iRow = 0; - l = new QLabel(__tr2qs_ctx("NickServ settings are available only for the whole IRC network, not for specific servers.\n" \ - "To open network settings choose a network (with a globe) in list of networks and servers and click Advanced.","options"),tab); - gl->addWidget(l,iRow,0); - gl->setRowStretch(1,1); + l = new QLabel(__tr2qs_ctx("NickServ settings are available only for the whole IRC network, not for specific servers.\n" + "To open network settings choose a network (with a globe) in list of networks and servers and click Advanced.", + "options"), + tab); + gl->addWidget(l, iRow, 0); + gl->setRowStretch(1, 1); - tw->addTab(tab,__tr2qs_ctx("NickServ","options")); + tw->addTab(tab, __tr2qs_ctx("NickServ", "options")); - QPushButton * b = new QPushButton(__tr2qs_ctx("OK","options"),this); + QPushButton * b = new QPushButton(__tr2qs_ctx("OK", "options"), this); b->setMinimumWidth(80); - g->addWidget(b,3,2); + g->addWidget(b, 3, 2); b->setDefault(true); - connect(b,SIGNAL(clicked()),this,SLOT(accept())); + connect(b, SIGNAL(clicked()), this, SLOT(accept())); - b = new QPushButton(__tr2qs_ctx("Cancel","options"),this); - g->addWidget(b,3,3); + b = new QPushButton(__tr2qs_ctx("Cancel", "options"), this); + g->addWidget(b, 3, 3); b->setMinimumWidth(80); - connect(b,SIGNAL(clicked()),this,SLOT(reject())); + connect(b, SIGNAL(clicked()), this, SLOT(reject())); - g->setRowStretch(2,1); - g->setColumnStretch(1,1); + g->setRowStretch(2, 1); + g->setColumnStretch(1, 1); tw->setMinimumWidth(390); @@ -986,8 +1029,10 @@ IrcServerDetailsWidget::IrcServerDetailsWidget(QWidget * par,KviIrcServer * s) IrcServerDetailsWidget::~IrcServerDetailsWidget() { - if(m_pOnConnectEditor) KviScriptEditor::destroyInstance(m_pOnConnectEditor); - if(m_pOnLoginEditor) KviScriptEditor::destroyInstance(m_pOnLoginEditor); + if(m_pOnConnectEditor) + KviScriptEditor::destroyInstance(m_pOnConnectEditor); + if(m_pOnLoginEditor) + KviScriptEditor::destroyInstance(m_pOnLoginEditor); } void IrcServerDetailsWidget::useIPV6CheckToggled(bool) @@ -1013,8 +1058,10 @@ void IrcServerDetailsWidget::portEditorTextChanged(const QString &) void IrcServerDetailsWidget::setHeaderLabelText() { QString szTmp = "irc"; - if(m_pUseSSLCheck->isChecked())szTmp += "s"; - if(m_pUseIPV6Check->isChecked())szTmp += "6"; + if(m_pUseSSLCheck->isChecked()) + szTmp += "s"; + if(m_pUseIPV6Check->isChecked()) + szTmp += "6"; szTmp += "://"; szTmp += m_szHostname; szTmp += ":"; @@ -1023,7 +1070,8 @@ void IrcServerDetailsWidget::setHeaderLabelText() QString num = m_pPortEditor->text(); unsigned int uPort = num.toUInt(&bOk); - if(!bOk)uPort = 6667; + if(!bOk) + uPort = 6667; num.setNum(uPort); szTmp += num; szTmp += ""; @@ -1049,7 +1097,9 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) if(m_pEncodingEditor->currentIndex() <= 0) { s->setEncoding(QString()); - } else { + } + else + { KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(m_pEncodingEditor->currentIndex() - 1); s->setEncoding(d->pcName); } @@ -1060,7 +1110,9 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) if(m_pTextEncodingEditor->currentIndex() <= 0) { s->setTextEncoding(QString()); - } else { + } + else + { KviLocale::EncodingDescription * dd = KviLocale::instance()->encodingDescription(m_pTextEncodingEditor->currentIndex() - 1); s->setTextEncoding(dd->pcName); } @@ -1082,21 +1134,23 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) s->setSaslNick(m_pSaslNickEditor->text()); s->setSaslPass(m_pSaslPassEditor->text()); if(m_pEnableSASLCheck) - s->setEnabledSASL( m_pEnableSASLCheck->isChecked() && - !m_pSaslNickEditor->text().isEmpty() && - !m_pSaslPassEditor->text().isEmpty()); + s->setEnabledSASL(m_pEnableSASLCheck->isChecked() && !m_pSaslNickEditor->text().isEmpty() && !m_pSaslPassEditor->text().isEmpty()); if(m_pIdEditor) s->setId(m_pIdEditor->text()); - if(s->id().isEmpty())s->generateUniqueId(); + if(s->id().isEmpty()) + s->generateUniqueId(); if(m_pUseDefaultInitUMode) { KviCString szUMode; if(!m_pUseDefaultInitUMode->isChecked()) { - if(m_pIMode->isChecked())szUMode.append('i'); - if(m_pWMode->isChecked())szUMode.append('w'); - if(m_pSMode->isChecked())szUMode.append('s'); + if(m_pIMode->isChecked()) + szUMode.append('i'); + if(m_pWMode->isChecked()) + szUMode.append('w'); + if(m_pSMode->isChecked()) + szUMode.append('s'); } s->setInitUMode(szUMode.ptr()); } @@ -1104,7 +1158,8 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) QString tmp = m_pPortEditor->text(); bool bOk; kvi_u32_t uPort = tmp.toUInt(&bOk); - if(!bOk)uPort = 6667; + if(!bOk) + uPort = 6667; s->setPort(uPort); #ifdef COMPILE_IPV6_SUPPORT s->setIPv6(m_pUseIPV6Check->isChecked()); @@ -1121,26 +1176,34 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) #ifdef COMPILE_IPV6_SUPPORT if(s->isIPv6()) { - if((!KviQString::equalCI(tmpAddr,"0:0:0:0:0:0:0:0")) && KviNetUtils::isValidStringIp(tmpAddr)) + if((!KviQString::equalCI(tmpAddr, "0:0:0:0:0:0:0:0")) && KviNetUtils::isValidStringIp(tmpAddr)) { s->setIp(tmpAddr); - } else { + } + else + { s->setCacheIp(false); s->setIp(""); } - } else { + } + else + { #endif - if((!KviQString::equalCI(tmpAddr,"0.0.0.0")) && KviNetUtils::isValidStringIp(tmpAddr)) + if((!KviQString::equalCI(tmpAddr, "0.0.0.0")) && KviNetUtils::isValidStringIp(tmpAddr)) { s->setIp(tmpAddr); - } else { + } + else + { s->setCacheIp(false); s->setIp(""); } #ifdef COMPILE_IPV6_SUPPORT } #endif - } else { + } + else + { s->setCacheIp(false); s->setIp(""); } @@ -1161,14 +1224,16 @@ void IrcServerDetailsWidget::fillData(KviIrcServer * s) if(m_pChannelListSelector) m_pChannelListSelector->commit(); - if(m_lstChannels.isEmpty())s->setAutoJoinChannelList(0); - else s->setAutoJoinChannelList(new QStringList(m_lstChannels)); + if(m_lstChannels.isEmpty()) + s->setAutoJoinChannelList(0); + else + s->setAutoJoinChannelList(new QStringList(m_lstChannels)); if(m_pUseAutoConnect) s->setAutoConnect(m_pUseAutoConnect->isChecked()); if(m_pProxyEditor) - s->setProxy(m_pProxyEditor->currentIndex()-2); + s->setProxy(m_pProxyEditor->currentIndex() - 2); } void IrcServerDetailsWidget::useDefaultInitUModeToggled(bool b) @@ -1181,51 +1246,52 @@ void IrcServerDetailsWidget::useDefaultInitUModeToggled(bool b) // KviApplication.cpp extern KVIRC_API KviIrcServerDataBase * g_pServerDataBase; -IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n) +IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidget * parent, const QPixmap & pm, const KviIrcNetwork * n) : QTreeWidgetItem(parent) { - setIcon(0,QIcon(pm)); + setIcon(0, QIcon(pm)); m_pServerData = 0; m_pNetworkData = new KviIrcNetwork(*n); - setText(0,n->name()); - setText(1,n->description()); + setText(0, n->name()); + setText(1, n->description()); } -IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s) +IrcServerOptionsTreeWidgetItem::IrcServerOptionsTreeWidgetItem(QTreeWidgetItem * parent, const QPixmap & pm, const KviIrcServer * s) : QTreeWidgetItem(parent) { - setIcon(0,QIcon(pm)); + setIcon(0, QIcon(pm)); m_pServerData = new KviIrcServer(*s); - setText(0,s->hostName()); - setText(1,s->description()); + setText(0, s->hostName()); + setText(1, s->description()); m_pNetworkData = 0; } IrcServerOptionsTreeWidgetItem::~IrcServerOptionsTreeWidgetItem() { - if(m_pServerData)delete m_pServerData; - if(m_pNetworkData)delete m_pNetworkData; + if(m_pServerData) + delete m_pServerData; + if(m_pNetworkData) + delete m_pNetworkData; } void IrcServerOptionsTreeWidgetItem::updateVisibleStrings() { if(m_pNetworkData) { - setText(0,m_pNetworkData->name()); - setText(1,m_pNetworkData->description()); + setText(0, m_pNetworkData->name()); + setText(1, m_pNetworkData->description()); return; } if(m_pServerData) { - setText(0,m_pServerData->hostName()); - setText(1,m_pServerData->description()); + setText(0, m_pServerData->hostName()); + setText(1, m_pServerData->description()); } } - OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("server_options_widget"); @@ -1234,64 +1300,65 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) m_pContextPopup = new QMenu(this); m_pImportPopup = new QMenu(this); - connect(m_pImportPopup,SIGNAL(aboutToShow()),this,SLOT(importPopupAboutToShow())); - connect(m_pImportPopup,SIGNAL(triggered(QAction *)),this,SLOT(importPopupActivated(QAction *))); + connect(m_pImportPopup, SIGNAL(aboutToShow()), this, SLOT(importPopupAboutToShow())); + connect(m_pImportPopup, SIGNAL(triggered(QAction *)), this, SLOT(importPopupActivated(QAction *))); m_pServerDetailsDialog = 0; m_pNetworkDetailsDialog = 0; m_pImportFilter = 0; - m_pFilterLabel = new QLabel(__tr2qs_ctx("Filter:","options"),this); - addWidgetToLayout(m_pFilterLabel,0,0,0,0); + m_pFilterLabel = new QLabel(__tr2qs_ctx("Filter:", "options"), this); + addWidgetToLayout(m_pFilterLabel, 0, 0, 0, 0); m_pFilterEdit = new QLineEdit(this); - connect(m_pFilterEdit,SIGNAL(textEdited(const QString &)),this,SLOT(filterTextEdited(const QString &))); - KviTalToolTip::add(m_pFilterEdit,__tr2qs_ctx("If you are searching for a specific server or network, you can insert its name to filter the servers in the list","options")); - addWidgetToLayout(m_pFilterEdit,1,0,1,0); + connect(m_pFilterEdit, SIGNAL(textEdited(const QString &)), this, SLOT(filterTextEdited(const QString &))); + KviTalToolTip::add(m_pFilterEdit, __tr2qs_ctx("If you are searching for a specific server or network, you can insert its name to filter the servers in the list", "options")); + addWidgetToLayout(m_pFilterEdit, 1, 0, 1, 0); m_pShowFavoritesOnlyButton = new QToolButton(this); m_pShowFavoritesOnlyButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FavoriteOff))); m_pShowFavoritesOnlyButton->setCheckable(true); m_pShowFavoritesOnlyButton->setChecked(KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly)); - KviTalToolTip::add(m_pShowFavoritesOnlyButton,__tr2qs_ctx("If this option is enabled, only servers you have favorited will be displayed","options")); - addWidgetToLayout(m_pShowFavoritesOnlyButton,3,0,3,0); - connect(m_pShowFavoritesOnlyButton,SIGNAL(toggled(bool)),this,SLOT(updateFavoritesFilter(bool))); // Sets the server to a favorite + KviTalToolTip::add(m_pShowFavoritesOnlyButton, __tr2qs_ctx("If this option is enabled, only servers you have favorited will be displayed", "options")); + addWidgetToLayout(m_pShowFavoritesOnlyButton, 3, 0, 3, 0); + connect(m_pShowFavoritesOnlyButton, SIGNAL(toggled(bool)), this, SLOT(updateFavoritesFilter(bool))); // Sets the server to a favorite m_pTreeWidget = new QTreeWidget(this); - addWidgetToLayout(m_pTreeWidget,0,1,1,1); + addWidgetToLayout(m_pTreeWidget, 0, 1, 1, 1); m_pTreeWidget->setColumnCount(2); QStringList columLabels; - columLabels.append(__tr2qs_ctx("Server","options")); - columLabels.append(__tr2qs_ctx("Description","options")); - m_pTreeWidget->setColumnWidth(0,250); - m_pTreeWidget->setColumnWidth(1,250); + columLabels.append(__tr2qs_ctx("Server", "options")); + columLabels.append(__tr2qs_ctx("Description", "options")); + m_pTreeWidget->setColumnWidth(0, 250); + m_pTreeWidget->setColumnWidth(1, 250); m_pTreeWidget->setSortingEnabled(true); - m_pTreeWidget->sortByColumn(0,Qt::AscendingOrder); + m_pTreeWidget->sortByColumn(0, Qt::AscendingOrder); m_pTreeWidget->setHeaderLabels(columLabels); m_pTreeWidget->setRootIsDecorated(true); m_pTreeWidget->setAllColumnsShowFocus(true); m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); m_pTreeWidget->setContextMenuPolicy(Qt::CustomContextMenu); - connect(m_pTreeWidget,SIGNAL(customContextMenuRequested(const QPoint &)),this,SLOT(customContextMenuRequested(const QPoint &))); - connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *))); - connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int )),this,SLOT(itemDoubleClicked(QTreeWidgetItem*, int ))); + connect(m_pTreeWidget, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(customContextMenuRequested(const QPoint &))); + connect(m_pTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *))); + connect(m_pTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(itemDoubleClicked(QTreeWidgetItem *, int))); - QString tiptxt = __tr2qs_ctx("This is the list of available IRC servers.
" \ - "Right-click on the list to add or remove servers and perform other actions.
"\ - "Double-click on a item for advanced options.","options"); - KviTalToolTip::add(m_pTreeWidget,tiptxt); - KviTalToolTip::add(m_pTreeWidget->viewport(),tiptxt); + QString tiptxt = __tr2qs_ctx("This is the list of available IRC servers.
" + "Right-click on the list to add or remove servers and perform other actions.
" + "Double-click on a item for advanced options.", + "options"); + KviTalToolTip::add(m_pTreeWidget, tiptxt); + KviTalToolTip::add(m_pTreeWidget->viewport(), tiptxt); KviTalVBox * vbox = new KviTalVBox(this); vbox->setSpacing(0); - addWidgetToLayout(vbox,3,1,3,1); + addWidgetToLayout(vbox, 3, 1, 3, 1); m_pNewNetworkButton = new QToolButton(vbox); m_pNewNetworkButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewNetwork)))); m_pNewNetworkButton->setAutoRaise(true); - connect(m_pNewNetworkButton,SIGNAL(clicked()),this,SLOT(newNetwork())); - KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New network","options")); + connect(m_pNewNetworkButton, SIGNAL(clicked()), this, SLOT(newNetwork())); + KviTalToolTip::add(m_pNewNetworkButton, __tr2qs_ctx("New network", "options")); QFrame * f = new QFrame(vbox); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); @@ -1299,35 +1366,35 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) m_pNewServerButton = new QToolButton(vbox); m_pNewServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::NewServer)))); m_pNewServerButton->setAutoRaise(true); - connect(m_pNewServerButton,SIGNAL(clicked()),this,SLOT(newServer())); - KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New server","options")); + connect(m_pNewServerButton, SIGNAL(clicked()), this, SLOT(newServer())); + KviTalToolTip::add(m_pNewServerButton, __tr2qs_ctx("New server", "options")); m_pFavoriteServerButton = new QToolButton(vbox); m_pFavoriteServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::ServerFavorite)))); m_pFavoriteServerButton->setAutoRaise(true); - connect(m_pFavoriteServerButton,SIGNAL(clicked()),this,SLOT(favoriteServer())); - KviTalToolTip::add(m_pFavoriteServerButton,__tr2qs_ctx("Favorite/Unfavorite server","options")); + connect(m_pFavoriteServerButton, SIGNAL(clicked()), this, SLOT(favoriteServer())); + KviTalToolTip::add(m_pFavoriteServerButton, __tr2qs_ctx("Favorite/Unfavorite server", "options")); m_pRemoveButton = new QToolButton(vbox); m_pRemoveButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)))); m_pRemoveButton->setEnabled(false); m_pRemoveButton->setAutoRaise(true); - connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeCurrent())); - KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove network/server","options")); + connect(m_pRemoveButton, SIGNAL(clicked()), this, SLOT(removeCurrent())); + KviTalToolTip::add(m_pRemoveButton, __tr2qs_ctx("Remove network/server", "options")); m_pCopyServerButton = new QToolButton(vbox); m_pCopyServerButton->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)))); m_pCopyServerButton->setEnabled(false); m_pCopyServerButton->setAutoRaise(true); - connect(m_pCopyServerButton,SIGNAL(clicked()),this,SLOT(copyServer())); - KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy server","options")); + connect(m_pCopyServerButton, SIGNAL(clicked()), this, SLOT(copyServer())); + KviTalToolTip::add(m_pCopyServerButton, __tr2qs_ctx("Copy server", "options")); m_pPasteServerButton = new QToolButton(vbox); m_pPasteServerButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Paste))); m_pPasteServerButton->setEnabled(false); m_pPasteServerButton->setAutoRaise(true); - connect(m_pPasteServerButton,SIGNAL(clicked()),this,SLOT(pasteServer())); - KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste server","options")); + connect(m_pPasteServerButton, SIGNAL(clicked()), this, SLOT(pasteServer())); + KviTalToolTip::add(m_pPasteServerButton, __tr2qs_ctx("Paste server", "options")); f = new QFrame(vbox); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); @@ -1338,25 +1405,25 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) m_pImportButton->setMenu(m_pImportPopup); m_pImportButton->setPopupMode(QToolButton::InstantPopup); - KviTalToolTip::add(m_pImportButton,__tr2qs_ctx("Import server list","options")); + KviTalToolTip::add(m_pImportButton, __tr2qs_ctx("Import server list", "options")); QFrame * lll = new QFrame(vbox); - vbox->setStretchFactor(lll,100); + vbox->setStretchFactor(lll, 100); - KviTalGroupBox *gbox = addGroupBox(0,2,3,2,Qt::Vertical,__tr2qs_ctx("Active Configuration","options")); - m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:","options"),gbox); + KviTalGroupBox * gbox = addGroupBox(0, 2, 3, 2, Qt::Vertical, __tr2qs_ctx("Active Configuration", "options")); + m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:", "options"), gbox); m_pSrvNetEdit = new QLineEdit(gbox); - connect(m_pSrvNetEdit,SIGNAL(textEdited(const QString &)),this,SLOT(serverNetworkEditTextEdited(const QString &))); - KviTalToolTip::add(m_pSrvNetEdit,__tr2qs_ctx("This is the name of the currently selected server or network","options")); + connect(m_pSrvNetEdit, SIGNAL(textEdited(const QString &)), this, SLOT(serverNetworkEditTextEdited(const QString &))); + KviTalToolTip::add(m_pSrvNetEdit, __tr2qs_ctx("This is the name of the currently selected server or network", "options")); - m_pDetailsButton = new QPushButton(__tr2qs_ctx("Advanced...","options"),gbox); - connect(m_pDetailsButton,SIGNAL(clicked()),this,SLOT(detailsClicked())); - KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("Click here to edit advanced options for this entry","options")); + m_pDetailsButton = new QPushButton(__tr2qs_ctx("Advanced...", "options"), gbox); + connect(m_pDetailsButton, SIGNAL(clicked()), this, SLOT(detailsClicked())); + KviTalToolTip::add(m_pDetailsButton, __tr2qs_ctx("Click here to edit advanced options for this entry", "options")); m_pRecentPopup = new QMenu(gbox); - connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow())); - connect(m_pRecentPopup,SIGNAL(triggered(QAction *)),this,SLOT(recentServersPopupClicked(QAction *))); + connect(m_pRecentPopup, SIGNAL(aboutToShow()), this, SLOT(recentServersPopupAboutToShow())); + connect(m_pRecentPopup, SIGNAL(triggered(QAction *)), this, SLOT(recentServersPopupClicked(QAction *))); QToolButton * tb = new QToolButton(gbox); tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KviIconManager::History)))); @@ -1364,33 +1431,33 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) tb->setAutoRaise(true); tb->setPopupMode(QToolButton::InstantPopup); - KviTalToolTip::add(tb,__tr2qs_ctx("This button shows a list of recently used servers.
It allows you to quickly find them in the list.","options")); + KviTalToolTip::add(tb, __tr2qs_ctx("This button shows a list of recently used servers.
It allows you to quickly find them in the list.", "options")); m_pShowThisDialogAtStartupSelector = NULL; // The "Show this dialog at startup" option is shown only when the server options widget is shown as standalone dialog if(parent->inherits("OptionsWidgetContainer")) { - m_pConnectCurrent = new QPushButton(__tr2qs_ctx("Connect &Now","options"),this); - addWidgetToLayout(m_pConnectCurrent,0,3,3,3); - connect(m_pConnectCurrent,SIGNAL(clicked()),this,SLOT(connectCurrentClicked())); + m_pConnectCurrent = new QPushButton(__tr2qs_ctx("Connect &Now", "options"), this); + addWidgetToLayout(m_pConnectCurrent, 0, 3, 3, 3); + connect(m_pConnectCurrent, SIGNAL(clicked()), this, SLOT(connectCurrentClicked())); - QPalette pal(QColor(0,0,0)); + QPalette pal(QColor(0, 0, 0)); /* QPalette::active defines the colors of the button/text when the KVIrc window has focus Keep button/text color in a spectrum that indicates a connect action is possible */ - pal.setColor(QPalette::Active,QPalette::Button,QColor(0,135,0)); - pal.setColor(QPalette::Active,QPalette::ButtonText,QColor(245,245,245)); + pal.setColor(QPalette::Active, QPalette::Button, QColor(0, 135, 0)); + pal.setColor(QPalette::Active, QPalette::ButtonText, QColor(245, 245, 245)); /* QPalette::Inactive defines the colors of the button/text when the KVIrc window looses focus Keep button/text color the same as QPalette::Active but use different shades */ - pal.setColor(QPalette::Inactive,QPalette::Button,QColor(50,135,50)); - pal.setColor(QPalette::Inactive,QPalette::ButtonText,QColor(225,225,225)); + pal.setColor(QPalette::Inactive, QPalette::Button, QColor(50, 135, 50)); + pal.setColor(QPalette::Inactive, QPalette::ButtonText, QColor(225, 225, 225)); /* QPalette::Disabled defines the colors of the button/text when for instance network is selected Keep button/text color in a spectrum that indicates no possible action is possible */ - pal.setColor(QPalette::Disabled,QPalette::Button,QColor(100,100,100)); - pal.setColor(QPalette::Disabled,QPalette::ButtonText,QColor(180,180,180)); + pal.setColor(QPalette::Disabled, QPalette::Button, QColor(100, 100, 100)); + pal.setColor(QPalette::Disabled, QPalette::ButtonText, QColor(180, 180, 180)); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) // Kill the WindowXP/Mac style which does not honor palette @@ -1413,22 +1480,24 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) fnt.setBold(true); m_pConnectCurrent->setFont(fnt); - KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("Hit this button to connect to the currently selected server.","options")); + KviTalToolTip::add(m_pConnectCurrent, __tr2qs_ctx("Hit this button to connect to the currently selected server.", "options")); OptionsWidgetContainer * pContainer = dynamic_cast(parent); if(pContainer) { - m_pShowThisDialogAtStartupSelector = addBoolSelector(pContainer,__tr2qs_ctx("Show this dialog at startup","options"),KviOption_boolShowServersConnectDialogOnStart); + m_pShowThisDialogAtStartupSelector = addBoolSelector(pContainer, __tr2qs_ctx("Show this dialog at startup", "options"), KviOption_boolShowServersConnectDialogOnStart); pContainer->setLeftCornerWidget(m_pShowThisDialogAtStartupSelector); // This selector can be destroyed upon reparenting: make sure it's removed from the selector list // (or we'll get a crash at commit() time...). - connect(m_pShowThisDialogAtStartupSelector,SIGNAL(destroyed()),this,SLOT(slotShowThisDialogAtStartupSelectorDestroyed())); - KviTalToolTip::add(m_pShowThisDialogAtStartupSelector,__tr2qs_ctx("If this option is enabled, the servers dialog will appear every time you start KVIrc","options")); + connect(m_pShowThisDialogAtStartupSelector, SIGNAL(destroyed()), this, SLOT(slotShowThisDialogAtStartupSelectorDestroyed())); + KviTalToolTip::add(m_pShowThisDialogAtStartupSelector, __tr2qs_ctx("If this option is enabled, the servers dialog will appear every time you start KVIrc", "options")); } new QShortcut(Qt::Key_Escape, parent, SLOT(close())); - } else { + } + else + { m_pConnectCurrent = NULL; } @@ -1441,8 +1510,8 @@ OptionsWidget_servers::OptionsWidget_servers(QWidget * parent) fillServerList(); updateFavoritesFilter(KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly)); - layout()->setRowStretch(1,1); - layout()->setColumnStretch(1,1); + layout()->setRowStretch(1, 1); + layout()->setColumnStretch(1, 1); setMinimumWidth(600); } @@ -1450,7 +1519,7 @@ OptionsWidget_servers::~OptionsWidget_servers() { if(m_pImportFilter) { - disconnect(m_pImportFilter,0,this,0); + disconnect(m_pImportFilter, 0, this, 0); m_pImportFilter->die(); m_pImportFilter = 0; } @@ -1478,10 +1547,10 @@ void OptionsWidget_servers::recentServersPopupAboutToShow() g_pApp->fillRecentServersPopup(m_pRecentPopup); m_pRecentPopup->addSeparator(); - m_pRecentPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs("Clear Recent Servers List")); + m_pRecentPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)), __tr2qs("Clear Recent Servers List")); } -void OptionsWidget_servers::recentServersPopupClicked(QAction *pAction) +void OptionsWidget_servers::recentServersPopupClicked(QAction * pAction) { if(!g_pActiveWindow) return; // doh @@ -1497,21 +1566,21 @@ void OptionsWidget_servers::recentServersPopupClicked(QAction *pAction) if(szItemText == __tr2qs("Clear Recent Servers List")) { - KviKvsScript::run("option stringlistRecentServers",c); + KviKvsScript::run("option stringlistRecentServers", c); return; } selectBestServerByUrl(szItemText); } -void OptionsWidget_servers::selectBestServerByUrl(const QString &szUrl) +void OptionsWidget_servers::selectBestServerByUrl(const QString & szUrl) { if(szUrl.isEmpty()) return; KviIrcUrlParts oParts; - KviIrcUrl::split(szUrl,oParts); + KviIrcUrl::split(szUrl, oParts); int uCount = m_pTreeWidget->topLevelItemCount(); int uIdx = 0; @@ -1565,7 +1634,7 @@ void OptionsWidget_servers::selectBestServerByUrl(const QString &szUrl) { // exact match uIdx = uCount; // break the outer loop - break; // break the inner loop + break; // break the inner loop } } } @@ -1573,7 +1642,6 @@ void OptionsWidget_servers::selectBestServerByUrl(const QString &szUrl) if(pBestCandidate) m_pTreeWidget->setCurrentItem(pBestCandidate); - } void OptionsWidget_servers::connectCurrentClicked() @@ -1581,8 +1649,9 @@ void OptionsWidget_servers::connectCurrentClicked() saveLastItem(); commit(); KviCString szServer = m_pSrvNetEdit->text(); - if(szServer.isEmpty())return; - KviKvsScript::run("server -u",g_pApp->activeConsole()); + if(szServer.isEmpty()) + return; + KviKvsScript::run("server -u", g_pApp->activeConsole()); } void OptionsWidget_servers::fillServerList() @@ -1591,22 +1660,22 @@ void OptionsWidget_servers::fillServerList() IrcServerOptionsTreeWidgetItem * srv; IrcServerOptionsTreeWidgetItem * cur = 0; - KviPointerHashTableIterator it(*(g_pServerDataBase->recordDict())); + KviPointerHashTableIterator it(*(g_pServerDataBase->recordDict())); if(m_pConnectCurrent) m_pConnectCurrent->setEnabled(false); while(KviIrcNetwork * r = it.current()) { - net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),r); + net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget, *(g_pIconManager->getSmallIcon(KviIconManager::World)), r); KviPointerList * sl = r->serverList(); bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data(); net->setExpanded(bCurrent); - for(KviIrcServer * s = sl->first();s;s = sl->next()) + for(KviIrcServer * s = sl->first(); s; s = sl->next()) { unsigned icon = s->favorite() ? KviIconManager::ServerFavorite : KviIconManager::Server; - srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(icon)),s); + srv = new IrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(icon)), s); if((s == r->currentServer()) && bCurrent) { @@ -1626,12 +1695,12 @@ void OptionsWidget_servers::fillServerList() } } -void OptionsWidget_servers::itemDoubleClicked(QTreeWidgetItem*, int ) +void OptionsWidget_servers::itemDoubleClicked(QTreeWidgetItem *, int) { detailsClicked(); } -void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *) +void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem * it, QTreeWidgetItem *) { saveLastItem(); m_pLastEditedItem = (IrcServerOptionsTreeWidgetItem *)it; @@ -1650,13 +1719,17 @@ void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt if(m_pLastEditedItem->m_pServerData) { - m_pSrvNetLabel->setText(__tr2qs_ctx("Server:","options")); + m_pSrvNetLabel->setText(__tr2qs_ctx("Server:", "options")); m_pSrvNetEdit->setText(m_pLastEditedItem->m_pServerData->hostName()); - } else { - m_pSrvNetLabel->setText(__tr2qs_ctx("Network:","options")); + } + else + { + m_pSrvNetLabel->setText(__tr2qs_ctx("Network:", "options")); m_pSrvNetEdit->setText(it->text(0)); } - } else { + } + else + { m_pRemoveButton->setEnabled(false); m_pCopyServerButton->setEnabled(true); m_pFavoriteServerButton->setEnabled(true); @@ -1666,7 +1739,7 @@ void OptionsWidget_servers::currentItemChanged(QTreeWidgetItem *it,QTreeWidgetIt m_pSrvNetLabel->setEnabled(false); m_pSrvNetEdit->setEnabled(false); - m_pSrvNetEdit->setText(__tr2qs_ctx("No selection","options")); + m_pSrvNetEdit->setText(__tr2qs_ctx("No selection", "options")); m_pDetailsButton->setEnabled(false); } } @@ -1680,41 +1753,41 @@ void OptionsWidget_servers::serverNetworkEditTextEdited(const QString &) // make sure the current item is currently visible (if it still exists) if(m_pLastEditedItem) - m_pTreeWidget->scrollToItem(m_pLastEditedItem,QTreeWidget::EnsureVisible); + m_pTreeWidget->scrollToItem(m_pLastEditedItem, QTreeWidget::EnsureVisible); } void OptionsWidget_servers::filterTextEdited(const QString &) { - QString szFilter=m_pFilterEdit->text().trimmed(); + QString szFilter = m_pFilterEdit->text().trimmed(); IrcServerOptionsTreeWidgetItem * network; - for (int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - network = (IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); - if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || - network->m_pNetworkData->description().contains(szFilter, Qt::CaseInsensitive)) + network = (IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || network->m_pNetworkData->description().contains(szFilter, Qt::CaseInsensitive)) { network->setHidden(false); // if the net matches, we always show all its servers IrcServerOptionsTreeWidgetItem * ch; - for (int j=0;jchildCount();j++) + for(int j = 0; j < network->childCount(); j++) { - ch=(IrcServerOptionsTreeWidgetItem *)network->child(j); + ch = (IrcServerOptionsTreeWidgetItem *)network->child(j); ch->setHidden(false); } - } else { - uint uServers=0; + } + else + { + uint uServers = 0; IrcServerOptionsTreeWidgetItem * ch; - for (int j=0;jchildCount();j++) + for(int j = 0; j < network->childCount(); j++) { - bool bHidden=true; - ch=(IrcServerOptionsTreeWidgetItem *)network->child(j); + bool bHidden = true; + ch = (IrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { - if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || - ch->m_pServerData->description().contains(szFilter, Qt::CaseInsensitive)) - bHidden=false; + if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || ch->m_pServerData->description().contains(szFilter, Qt::CaseInsensitive)) + bHidden = false; } if(!bHidden) @@ -1740,11 +1813,12 @@ void OptionsWidget_servers::saveLastItem() m_pLastEditedItem->m_pServerData->setHostName(tmp); m_pLastEditedItem->updateVisibleStrings(); - } else if(m_pLastEditedItem->m_pNetworkData) + } + else if(m_pLastEditedItem->m_pNetworkData) { QString tmp = m_pSrvNetEdit->text(); if(tmp.isEmpty()) - tmp = __tr2qs_ctx("UnknownNet","options"); + tmp = __tr2qs_ctx("UnknownNet", "options"); m_pLastEditedItem->m_pNetworkData->setName(tmp); m_pLastEditedItem->updateVisibleStrings(); @@ -1758,28 +1832,31 @@ void OptionsWidget_servers::commit() g_pServerDataBase->clear(); IrcServerOptionsTreeWidgetItem * network; - for (int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - network=(IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i); + network = (IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); QString tmp = network->m_pNetworkData->name(); KviIrcNetwork * pNetwork = g_pServerDataBase->findNetwork(tmp); if(pNetwork) { pNetwork->copyFrom(*(network->m_pNetworkData)); - } else { + } + else + { pNetwork = new KviIrcNetwork(tmp); pNetwork->copyFrom(*(network->m_pNetworkData)); g_pServerDataBase->addNetwork(pNetwork); } - if(network == m_pLastEditedItem)g_pServerDataBase->setCurrentNetwork(pNetwork->name()); + if(network == m_pLastEditedItem) + g_pServerDataBase->setCurrentNetwork(pNetwork->name()); IrcServerOptionsTreeWidgetItem * ch; - for (int j=0;jchildCount();j++) + for(int j = 0; j < network->childCount(); j++) { - KviIrcServer *srv; - ch=(IrcServerOptionsTreeWidgetItem *)network->child(j); + KviIrcServer * srv; + ch = (IrcServerOptionsTreeWidgetItem *)network->child(j); if(ch->m_pServerData) { @@ -1791,8 +1868,11 @@ void OptionsWidget_servers::commit() { srv = new KviIrcServer(*(ch->m_pServerData)); pNetwork->insertServer(srv); - } else *srv = *(ch->m_pServerData); - if(srv->id().isEmpty())srv->generateUniqueId(); + } + else + *srv = *(ch->m_pServerData); + if(srv->id().isEmpty()) + srv->generateUniqueId(); if(ch == m_pLastEditedItem) { @@ -1802,7 +1882,6 @@ void OptionsWidget_servers::commit() } } } - } KVI_OPTION_BOOL(KviOption_boolShowFavoriteServersOnly) = m_pShowFavoritesOnlyButton->isChecked(); @@ -1810,36 +1889,35 @@ void OptionsWidget_servers::commit() KviOptionsWidget::commit(); g_pApp->saveIrcServerDataBase(); // Ensure saving of the server DB - } -void OptionsWidget_servers::customContextMenuRequested(const QPoint &pnt) +void OptionsWidget_servers::customContextMenuRequested(const QPoint & pnt) { - QTreeWidgetItem *it = static_cast(m_pTreeWidget->itemAt(pnt)); + QTreeWidgetItem * it = static_cast(m_pTreeWidget->itemAt(pnt)); bool bServer = (it && static_cast(it)->m_pServerData); bool bFavorite = (bServer && static_cast(it)->m_pServerData->favorite()); m_pContextPopup->clear(); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewNetwork)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork())); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Remove Network","options"),this,SLOT(removeCurrent())) - ->setEnabled(!bServer); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewNetwork)), __tr2qs_ctx("New Network", "options"), this, SLOT(newNetwork())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)), __tr2qs_ctx("Remove Network", "options"), this, SLOT(removeCurrent())) + ->setEnabled(!bServer); m_pContextPopup->addSeparator(); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewServer)),__tr2qs_ctx("&New Server","options"),this,SLOT(newServer())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::NewServer)), __tr2qs_ctx("&New Server", "options"), this, SLOT(newServer())); m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerFavorite)), - __tr2qs_ctx(bFavorite?"Unfavorite Server":"Favorite Server","options"),this,SLOT(favoriteServer())); + __tr2qs_ctx(bFavorite ? "Unfavorite Server" : "Favorite Server", "options"), this, SLOT(favoriteServer())); m_pContextPopup->setEnabled(bServer); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Re&move Server","options"),this,SLOT(removeCurrent())) - ->setEnabled(bServer); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)),__tr2qs_ctx("&Copy Server","options"),this,SLOT(copyServer())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)), __tr2qs_ctx("Re&move Server", "options"), this, SLOT(removeCurrent())) + ->setEnabled(bServer); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Copy)), __tr2qs_ctx("&Copy Server", "options"), this, SLOT(copyServer())); m_pContextPopup->setEnabled(bServer); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)),__tr2qs_ctx("&Paste Server","options"),this,SLOT(pasteServer())) - ->setEnabled(m_pClipboard); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Paste)), __tr2qs_ctx("&Paste Server", "options"), this, SLOT(pasteServer())) + ->setEnabled(m_pClipboard); m_pContextPopup->addSeparator(); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)),__tr2qs_ctx("Import Server List","options"))->setMenu(m_pImportPopup); - m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)),__tr2qs_ctx("Clear Server List","options"),this,SLOT(clearList())); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Folder)), __tr2qs_ctx("Import Server List", "options"))->setMenu(m_pImportPopup); + m_pContextPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Remove)), __tr2qs_ctx("Clear Server List", "options"), this, SLOT(clearList())); m_pContextPopup->popup(QCursor::pos()); } @@ -1850,21 +1928,22 @@ void OptionsWidget_servers::importPopupAboutToShow() KviModuleExtensionDescriptorList * l = KviModuleExtensionManager::instance()->getExtensionList("serverimport"); - if(!l)return; + if(!l) + return; - QAction *pAction; + QAction * pAction; - for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next()) + for(KviModuleExtensionDescriptor * d = l->first(); d; d = l->next()) { if(d->icon()) - pAction = m_pImportPopup->addAction(*(d->icon()),d->visibleName()); + pAction = m_pImportPopup->addAction(*(d->icon()), d->visibleName()); else pAction = m_pImportPopup->addAction(d->visibleName()); pAction->setData(d->id()); } } -void OptionsWidget_servers::importPopupActivated(QAction *pAction) +void OptionsWidget_servers::importPopupActivated(QAction * pAction) { // ensure that we have all the modules : they could have been unloaded while the popup was displayed g_pModuleManager->loadModulesByCaps("serverimport"); @@ -1876,32 +1955,32 @@ void OptionsWidget_servers::importPopupActivated(QAction *pAction) // Oops! Internal error: I thought to have a module capable of importing servers // but actually it's not the case.. something weird happened (in the best case // the user has just unloaded the module and removed it from disk?) - KviMessageBox::warning(__tr2qs_ctx("Oops! Something weird happened:
Can't find any module capable of importing servers.","options")); + KviMessageBox::warning(__tr2qs_ctx("Oops! Something weird happened:
Can't find any module capable of importing servers.", "options")); return; } if(m_pImportFilter) { - disconnect(m_pImportFilter,0,this,0); + disconnect(m_pImportFilter, 0, this, 0); m_pImportFilter->die(); m_pImportFilter = 0; } - bool bOk=false; + bool bOk = false; int id = pAction->data().toInt(&bOk); if(!bOk) - return; + return; - m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport",id,0); + m_pImportFilter = (KviMexServerImport *)KviModuleExtensionManager::instance()->allocateExtension("serverimport", id, 0); if(!m_pImportFilter) { - KviMessageBox::warning(__tr2qs_ctx("Oops! Something weird happened:
Can't find the module that was capable of this import action. :(","options")); + KviMessageBox::warning(__tr2qs_ctx("Oops! Something weird happened:
Can't find the module that was capable of this import action. :(", "options")); return; } - connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&))); - connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead())); + connect(m_pImportFilter, SIGNAL(server(const KviIrcServer &, const QString &)), this, SLOT(importServer(const KviIrcServer &, const QString &))); + connect(m_pImportFilter, SIGNAL(destroyed()), this, SLOT(importerDead())); m_pImportFilter->start(); } @@ -1911,32 +1990,35 @@ void OptionsWidget_servers::importerDead() m_pImportFilter = 0; } -void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &network) +void OptionsWidget_servers::importServer(const KviIrcServer & s, const QString & network) { IrcServerOptionsTreeWidgetItem * net = findNetItem(network); if(!net) { KviIrcNetwork d(network); - net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),&d); + net = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget, *(g_pIconManager->getSmallIcon(KviIconManager::World)), &d); net->setExpanded(true); } - IrcServerOptionsTreeWidgetItem * srv ; - for(int i=0;ichildCount();i++) + IrcServerOptionsTreeWidgetItem * srv; + for(int i = 0; i < net->childCount(); i++) { - srv=(IrcServerOptionsTreeWidgetItem *) net->child(i); + srv = (IrcServerOptionsTreeWidgetItem *)net->child(i); if((srv)->m_pServerData->useSSL() == s.useSSL()) { if(srv->m_pServerData->isIPv6() == s.isIPv6()) { - if(KviQString::equalCI(srv->m_pServerData->hostName(),s.hostName())) + if(KviQString::equalCI(srv->m_pServerData->hostName(), s.hostName())) { // update the port srv->m_pServerData->setPort(s.port()); - if(!s.ip().isEmpty())srv->m_pServerData->setIp(s.ip()); - if(!s.password().isEmpty())srv->m_pServerData->setPassword(s.password()); - if(!s.nickName().isEmpty())srv->m_pServerData->setNickName(s.nickName()); + if(!s.ip().isEmpty()) + srv->m_pServerData->setIp(s.ip()); + if(!s.password().isEmpty()) + srv->m_pServerData->setPassword(s.password()); + if(!s.nickName().isEmpty()) + srv->m_pServerData->setNickName(s.nickName()); m_pTreeWidget->setCurrentItem(srv); m_pTreeWidget->scrollToItem(srv); return; @@ -1946,15 +2028,15 @@ void OptionsWidget_servers::importServer(const KviIrcServer &s,const QString &ne } // not found : add it! - IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),&s); + IrcServerOptionsTreeWidgetItem * newServer = new IrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(KviIconManager::Server)), &s); m_pTreeWidget->setCurrentItem(newServer); m_pTreeWidget->scrollToItem(newServer); } void OptionsWidget_servers::newNetwork() { - KviIrcNetwork d(__tr2qs_ctx("New Network","options")); - IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KviIconManager::World)),&d); + KviIrcNetwork d(__tr2qs_ctx("New Network", "options")); + IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(m_pTreeWidget, *(g_pIconManager->getSmallIcon(KviIconManager::World)), &d); it->setExpanded(true); it->setSelected(true); m_pTreeWidget->setCurrentItem(it); @@ -1970,16 +2052,18 @@ void OptionsWidget_servers::newServer() if(m_pLastEditedItem->m_pServerData) { net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); - if(!net)return; + if(!net) + return; } - else net = m_pLastEditedItem; + else + net = m_pLastEditedItem; KviIrcServer tmp; - tmp.setHostName(__tr2qs_ctx("irc.unknown.net","options")); + tmp.setHostName(__tr2qs_ctx("irc.unknown.net", "options")); tmp.setCacheIp(false); tmp.generateUniqueId(); - IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),&tmp); + IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(KviIconManager::Server)), &tmp); net->setExpanded(true); @@ -2000,7 +2084,7 @@ void OptionsWidget_servers::favoriteServer() m_pLastEditedItem->m_pServerData->setFavorite(true); unsigned icon = m_pLastEditedItem->m_pServerData->favorite() ? KviIconManager::ServerFavorite : KviIconManager::Server; - m_pLastEditedItem->setIcon(0,*(g_pIconManager->getSmallIcon(icon))); + m_pLastEditedItem->setIcon(0, *(g_pIconManager->getSmallIcon(icon))); if(m_bShowingFavoritesOnly) updateFavoritesFilter(true); @@ -2016,7 +2100,7 @@ void OptionsWidget_servers::updateFavoritesFilter(bool bSet) uint uServers = 0; IrcServerOptionsTreeWidgetItem * ch; - for (int j = 0; j < network->childCount(); j++) + for(int j = 0; j < network->childCount(); j++) { bool bHidden = bSet ? true : false; ch = static_cast(network->child(j)); @@ -2041,7 +2125,8 @@ void OptionsWidget_servers::copyServer() { if(m_pLastEditedItem->m_pServerData) { - if(!m_pClipboard)m_pClipboard = new KviIrcServer(); + if(!m_pClipboard) + m_pClipboard = new KviIrcServer(); *m_pClipboard = *(m_pLastEditedItem->m_pServerData); m_pPasteServerButton->setEnabled(true); } @@ -2058,11 +2143,13 @@ void OptionsWidget_servers::pasteServer() if(m_pLastEditedItem->m_pServerData) { net = (IrcServerOptionsTreeWidgetItem *)m_pLastEditedItem->parent(); - if(!net)return; + if(!net) + return; } - else net = m_pLastEditedItem; + else + net = m_pLastEditedItem; - IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),m_pClipboard); + IrcServerOptionsTreeWidgetItem * it = new IrcServerOptionsTreeWidgetItem(net, *(g_pIconManager->getSmallIcon(KviIconManager::Server)), m_pClipboard); it->m_pServerData->generateUniqueId(); // FIXME: This isn't necessarily unique... @@ -2086,13 +2173,17 @@ void OptionsWidget_servers::removeCurrent() { // top level item m_pTreeWidget->takeTopLevelItem(m_pTreeWidget->indexOfTopLevelItem(m_pLastEditedItem)); - } else { + } + else + { QTreeWidgetItem * tmp = m_pLastEditedItem->parent(); index = tmp->indexOfChild(m_pLastEditedItem); - if(index > -1) tmp->takeChild(index); + if(index > -1) + tmp->takeChild(index); } - if(!it)it = m_pTreeWidget->topLevelItem(0); + if(!it) + it = m_pTreeWidget->topLevelItem(0); if(it) { it->setSelected(true); @@ -2102,14 +2193,15 @@ void OptionsWidget_servers::removeCurrent() } } -IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QString &netname) +IrcServerOptionsTreeWidgetItem * OptionsWidget_servers::findNetItem(const QString & netname) { IrcServerOptionsTreeWidgetItem * it; - for(int i=0;itopLevelItemCount();i++) + for(int i = 0; i < m_pTreeWidget->topLevelItemCount(); i++) { - it=(IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); - if(KviQString::equalCI(it->text(0),netname))return it; + it = (IrcServerOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i); + if(KviQString::equalCI(it->text(0), netname)) + return it; } return 0; } @@ -2118,27 +2210,30 @@ void OptionsWidget_servers::clearList() { QString txt = "

"; txt += __tr2qs_ctx("If you click Yes, all of your saved networks, servers, settings, and passwords will be lost.
" - "Would you like to continue?","options"); + "Would you like to continue?", + "options"); txt += "

"; if(QMessageBox::question(this, - __tr2qs_ctx("Confirm Clearing Server List - KVIrc","options"),txt, - __tr2qs_ctx("Yes","options"), __tr2qs_ctx("No","options"),0,1 - ) != 0) return; + __tr2qs_ctx("Confirm Clearing Server List - KVIrc", "options"), txt, + __tr2qs_ctx("Yes", "options"), __tr2qs_ctx("No", "options"), 0, 1) + != 0) + return; m_pTreeWidget->clear(); m_pLastEditedItem = 0; - currentItemChanged(0,0); + currentItemChanged(0, 0); } void OptionsWidget_servers::detailsClicked() { - if(!m_pLastEditedItem)return; + if(!m_pLastEditedItem) + return; if(m_pLastEditedItem->m_pServerData) { saveLastItem(); - m_pServerDetailsDialog = new IrcServerDetailsWidget(this,m_pLastEditedItem->m_pServerData); + m_pServerDetailsDialog = new IrcServerDetailsWidget(this, m_pLastEditedItem->m_pServerData); int retCode = m_pServerDetailsDialog->exec(); if(retCode == QDialog::Accepted) @@ -2161,7 +2256,7 @@ void OptionsWidget_servers::detailsClicked() { saveLastItem(); - m_pNetworkDetailsDialog = new IrcNetworkDetailsWidget(this,m_pLastEditedItem->m_pNetworkData); + m_pNetworkDetailsDialog = new IrcNetworkDetailsWidget(this, m_pLastEditedItem->m_pNetworkData); int retCode = m_pNetworkDetailsDialog->exec(); if(retCode == QDialog::Accepted) diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h index 2b41dc206..1f8868a8d 100644 --- a/src/modules/options/OptionsWidget_servers.h +++ b/src/modules/options/OptionsWidget_servers.h @@ -49,16 +49,17 @@ class KviIrcNetwork; class KviIrcNetworkData; class KviMexServerImport; - class IrcServerOptionsTreeWidgetItem : public QTreeWidgetItem { public: - IrcServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n); - IrcServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s); + IrcServerOptionsTreeWidgetItem(QTreeWidget * parent, const QPixmap & pm, const KviIrcNetwork * n); + IrcServerOptionsTreeWidgetItem(QTreeWidgetItem * parent, const QPixmap & pm, const KviIrcServer * s); ~IrcServerOptionsTreeWidgetItem(); + public: KviIrcServer * m_pServerData; KviIrcNetwork * m_pNetworkData; + public: KviIrcServer * serverData() const { @@ -69,41 +70,43 @@ public: { return m_pNetworkData; } + public: void updateVisibleStrings(); }; - class IrcNetworkDetailsWidget : public QDialog { Q_OBJECT public: - IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d); + IrcNetworkDetailsWidget(QWidget * par, KviIrcNetwork * d); ~IrcNetworkDetailsWidget(); + protected: - KviScriptEditor * m_pOnConnectEditor; - KviScriptEditor * m_pOnLoginEditor; + KviScriptEditor * m_pOnConnectEditor; + KviScriptEditor * m_pOnLoginEditor; - QLineEdit * m_pUserEditor; - KviPasswordLineEdit * m_pPassEditor; - QLineEdit * m_pNickEditor; - QLineEdit * m_pAlternativeNickEditor; - QLineEdit * m_pRealEditor; - QLineEdit * m_pDescEditor; + QLineEdit * m_pUserEditor; + KviPasswordLineEdit * m_pPassEditor; + QLineEdit * m_pNickEditor; + QLineEdit * m_pAlternativeNickEditor; + QLineEdit * m_pRealEditor; + QLineEdit * m_pDescEditor; - QComboBox * m_pEncodingEditor; - QComboBox * m_pTextEncodingEditor; + QComboBox * m_pEncodingEditor; + QComboBox * m_pTextEncodingEditor; - QCheckBox * m_pAutoConnectCheck; + QCheckBox * m_pAutoConnectCheck; - QTreeWidget * m_pNickServTreeWidget; - QCheckBox * m_pNickServCheck; - QPushButton * m_pAddRuleButton; - QPushButton * m_pDelRuleButton; - QPushButton * m_pEditRuleButton; + QTreeWidget * m_pNickServTreeWidget; + QCheckBox * m_pNickServCheck; + QPushButton * m_pAddRuleButton; + QPushButton * m_pDelRuleButton; + QPushButton * m_pEditRuleButton; - QStringList m_lstChannels; + QStringList m_lstChannels; KviChannelListSelector * m_pChannelListSelector; + public: void fillData(KviIrcNetwork * d); protected slots: @@ -117,53 +120,54 @@ class IrcServerDetailsWidget : public QDialog { Q_OBJECT public: - IrcServerDetailsWidget(QWidget * par,KviIrcServer * s); + IrcServerDetailsWidget(QWidget * par, KviIrcServer * s); ~IrcServerDetailsWidget(); + protected: - QString m_szHostname; - QLabel * m_pHeaderLabel; - KviScriptEditor * m_pOnConnectEditor; - KviScriptEditor * m_pOnLoginEditor; - QLineEdit * m_pUserEditor; - KviPasswordLineEdit * m_pPassEditor; - KviPasswordLineEdit * m_pSaslPassEditor; - QLineEdit * m_pNickEditor; - QLineEdit * m_pAlternativeNickEditor; - QLineEdit * m_pSaslNickEditor; - QLineEdit * m_pRealEditor; - QLineEdit * m_pDescEditor; - QLineEdit * m_pIdEditor; - QComboBox * m_pLinkFilterEditor; - QComboBox * m_pEncodingEditor; - QComboBox * m_pTextEncodingEditor; - KviIpEditor * m_pIpEditor; - QCheckBox * m_pCacheIpCheck; - QCheckBox * m_pUseSSLCheck; - QCheckBox * m_pEnableCAPCheck; - QCheckBox * m_pEnableSTARTTLSCheck; - QCheckBox * m_pEnableSASLCheck; - QCheckBox * m_pUseDefaultInitUMode; - QCheckBox * m_pIMode; - QCheckBox * m_pWMode; - QCheckBox * m_pSMode; - QCheckBox * m_pUseAutoConnect; - QCheckBox * m_pUseIPV6Check; - QLineEdit * m_pPortEditor; - QStringList m_lstChannels; + QString m_szHostname; + QLabel * m_pHeaderLabel; + KviScriptEditor * m_pOnConnectEditor; + KviScriptEditor * m_pOnLoginEditor; + QLineEdit * m_pUserEditor; + KviPasswordLineEdit * m_pPassEditor; + KviPasswordLineEdit * m_pSaslPassEditor; + QLineEdit * m_pNickEditor; + QLineEdit * m_pAlternativeNickEditor; + QLineEdit * m_pSaslNickEditor; + QLineEdit * m_pRealEditor; + QLineEdit * m_pDescEditor; + QLineEdit * m_pIdEditor; + QComboBox * m_pLinkFilterEditor; + QComboBox * m_pEncodingEditor; + QComboBox * m_pTextEncodingEditor; + KviIpEditor * m_pIpEditor; + QCheckBox * m_pCacheIpCheck; + QCheckBox * m_pUseSSLCheck; + QCheckBox * m_pEnableCAPCheck; + QCheckBox * m_pEnableSTARTTLSCheck; + QCheckBox * m_pEnableSASLCheck; + QCheckBox * m_pUseDefaultInitUMode; + QCheckBox * m_pIMode; + QCheckBox * m_pWMode; + QCheckBox * m_pSMode; + QCheckBox * m_pUseAutoConnect; + QCheckBox * m_pUseIPV6Check; + QLineEdit * m_pPortEditor; + QStringList m_lstChannels; KviChannelListSelector * m_pChannelListSelector; - QComboBox * m_pProxyEditor; + QComboBox * m_pProxyEditor; protected slots: void useDefaultInitUModeToggled(bool); void portEditorTextChanged(const QString &); void useIPV6CheckToggled(bool); void useSSLCheckToggled(bool); + public: void setHeaderLabelText(); - void fillData(KviIrcServer *s); + void fillData(KviIrcServer * s); }; - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_servers KviIconManager::ServerConfiguration #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_servers __tr2qs_no_lookup("Servers and Configuration") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_servers __tr2qs_no_lookup("connection") @@ -176,48 +180,50 @@ class OptionsWidget_servers : public KviOptionsWidget public: OptionsWidget_servers(QWidget * parent); ~OptionsWidget_servers(); + protected: - QTreeWidget * m_pTreeWidget; - QLabel * m_pSrvNetLabel; - QLineEdit * m_pSrvNetEdit; - QLabel * m_pFilterLabel; - QLineEdit * m_pFilterEdit; - QPushButton * m_pDetailsButton; - QMenu * m_pRecentPopup; - QMenu * m_pContextPopup; - QMenu * m_pImportPopup; - KviIrcServer * m_pClipboard; - QPushButton * m_pConnectCurrent; - QPushButton * m_pConnectNew; + QTreeWidget * m_pTreeWidget; + QLabel * m_pSrvNetLabel; + QLineEdit * m_pSrvNetEdit; + QLabel * m_pFilterLabel; + QLineEdit * m_pFilterEdit; + QPushButton * m_pDetailsButton; + QMenu * m_pRecentPopup; + QMenu * m_pContextPopup; + QMenu * m_pImportPopup; + KviIrcServer * m_pClipboard; + QPushButton * m_pConnectCurrent; + QPushButton * m_pConnectNew; IrcServerOptionsTreeWidgetItem * m_pLastEditedItem; - IrcServerDetailsWidget * m_pServerDetailsDialog; - IrcNetworkDetailsWidget * m_pNetworkDetailsDialog; - KviMexServerImport * m_pImportFilter; - KviBoolSelector * m_pShowThisDialogAtStartupSelector; - KviBoolSelector * m_pShowFavoritesOnly; - - QToolButton * m_pNewServerButton; - QToolButton * m_pNewNetworkButton; - QToolButton * m_pRemoveButton; - QToolButton * m_pFavoriteServer; - QToolButton * m_pCopyServerButton; - QToolButton * m_pPasteServerButton; - QToolButton * m_pImportButton; - QToolButton * m_pFavoriteServerButton; - bool m_bShowingFavoritesOnly; - QToolButton * m_pShowFavoritesOnlyButton; + IrcServerDetailsWidget * m_pServerDetailsDialog; + IrcNetworkDetailsWidget * m_pNetworkDetailsDialog; + KviMexServerImport * m_pImportFilter; + KviBoolSelector * m_pShowThisDialogAtStartupSelector; + KviBoolSelector * m_pShowFavoritesOnly; + + QToolButton * m_pNewServerButton; + QToolButton * m_pNewNetworkButton; + QToolButton * m_pRemoveButton; + QToolButton * m_pFavoriteServer; + QToolButton * m_pCopyServerButton; + QToolButton * m_pPasteServerButton; + QToolButton * m_pImportButton; + QToolButton * m_pFavoriteServerButton; + bool m_bShowingFavoritesOnly; + QToolButton * m_pShowFavoritesOnlyButton; + private: void fillServerList(); void saveLastItem(); - IrcServerOptionsTreeWidgetItem * findNetItem(const QString &netname); - void selectBestServerByUrl(const QString &szUrl); + IrcServerOptionsTreeWidgetItem * findNetItem(const QString & netname); + void selectBestServerByUrl(const QString & szUrl); protected slots: void slotShowThisDialogAtStartupSelectorDestroyed(); void importerDead(); - void importServer(const KviIrcServer & s,const QString &network); + void importServer(const KviIrcServer & s, const QString & network); void importPopupAboutToShow(); - void currentItemChanged(QTreeWidgetItem *cur,QTreeWidgetItem *prev); - void customContextMenuRequested(const QPoint &pnt); + void currentItemChanged(QTreeWidgetItem * cur, QTreeWidgetItem * prev); + void customContextMenuRequested(const QPoint & pnt); void newNetwork(); void removeCurrent(); void newServer(); @@ -226,14 +232,15 @@ protected slots: void copyServer(); void pasteServer(); void clearList(); - void itemDoubleClicked(QTreeWidgetItem*, int ); + void itemDoubleClicked(QTreeWidgetItem *, int); void detailsClicked(); void connectCurrentClicked(); void recentServersPopupAboutToShow(); - void recentServersPopupClicked(QAction *pAction); - void importPopupActivated(QAction *pAction); - void serverNetworkEditTextEdited(const QString &szNewText); - void filterTextEdited(const QString &szNewText); + void recentServersPopupClicked(QAction * pAction); + void importPopupActivated(QAction * pAction); + void serverNetworkEditTextEdited(const QString & szNewText); + void filterTextEdited(const QString & szNewText); + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index 6ec1f1c96..e22cdbf7f 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -37,13 +37,10 @@ #include #include - // FIXME: This module doesn't ???? properly when auto-detection is performed! - - OptionsWidget_sound::OptionsWidget_sound(QWidget * pParent) -: KviOptionsWidget(pParent) + : KviOptionsWidget(pParent) { } @@ -51,54 +48,54 @@ OptionsWidget_sound::~OptionsWidget_sound() { } - OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { m_bFirstShow = true; setObjectName("sound_system_options_widget"); createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Sound System","options"),true); + KviTalGroupBox * g = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Sound System", "options"), true); - KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options")); + KviTalToolTip::add(g, __tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.", "options")); KviTalHBox * h = new KviTalHBox(g); m_pSoundSystemBox = new QComboBox(h); - m_pSoundAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h); - connect(m_pSoundAutoDetectButton,SIGNAL(clicked()),this,SLOT(soundAutoDetect())); + m_pSoundAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect", "options"), h); + connect(m_pSoundAutoDetectButton, SIGNAL(clicked()), this, SLOT(soundAutoDetect())); - m_pSoundTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h); - connect(m_pSoundTestButton,SIGNAL(clicked()),this,SLOT(soundTest())); + m_pSoundTestButton = new QPushButton(__tr2qs_ctx("Test", "options"), h); + connect(m_pSoundTestButton, SIGNAL(clicked()), this, SLOT(soundTest())); - g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Media Player","options"),true); + g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Media Player", "options"), true); - KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \ - "the mediaplayer.* module commands and functions.","options")); + KviTalToolTip::add(g, __tr2qs_ctx("This allows you to select the preferred media player to be used with " + "the mediaplayer.* module commands and functions.", + "options")); h = new KviTalHBox(g); m_pMediaPlayerBox = new QComboBox(h); - m_pMediaAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h); - connect(m_pMediaAutoDetectButton,SIGNAL(clicked()),this,SLOT(mediaAutoDetect())); + m_pMediaAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect", "options"), h); + connect(m_pMediaAutoDetectButton, SIGNAL(clicked()), this, SLOT(mediaAutoDetect())); - m_pMediaTestButton = new QPushButton(__tr2qs_ctx("Test","options"),h); - connect(m_pMediaTestButton,SIGNAL(clicked()),this,SLOT(mediaTest())); + m_pMediaTestButton = new QPushButton(__tr2qs_ctx("Test", "options"), h); + connect(m_pMediaTestButton, SIGNAL(clicked()), this, SLOT(mediaTest())); m_pMediaTestButton->setEnabled(false); - g = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("ID3 Tags Encoding","options"),true); + g = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("ID3 Tags Encoding", "options"), true); - KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options")); + KviTalToolTip::add(g, __tr2qs_ctx("This allows you to select encoding of mp3 tags.", "options")); h = new KviTalHBox(g); m_pTagsEncodingCombo = new QComboBox(h); - m_pTagsEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); + m_pTagsEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding", "options")); int i = 0; int iMatch = 0; @@ -106,45 +103,44 @@ OptionsWidget_soundGeneral::OptionsWidget_soundGeneral(QWidget * parent) KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(i); while(d->pcName) { - if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding))) + if(KviQString::equalCI(d->pcName, KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding))) iMatch = i + 1; - m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->pcName); + m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(), d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } m_pTagsEncodingCombo->setCurrentIndex(iMatch); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Winamp messages encoding","options"),true); + g = addGroupBox(0, 3, 0, 3, Qt::Horizontal, __tr2qs_ctx("Winamp messages encoding", "options"), true); - KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options")); + KviTalToolTip::add(g, __tr2qs_ctx("This allows you to select encoding of winamp messages.", "options")); h = new KviTalHBox(g); m_pWinampEncodingCombo = new QComboBox(h); - m_pWinampEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); + m_pWinampEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding", "options")); i = 0; iMatch = 0; d = KviLocale::instance()->encodingDescription(i); while(d->pcName) { - if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding))) + if(KviQString::equalCI(d->pcName, KVI_OPTION_STRING(KviOption_stringWinampTextEncoding))) iMatch = i + 1; - m_pWinampEncodingCombo->insertItem(m_pWinampEncodingCombo->count(),d->pcName); + m_pWinampEncodingCombo->insertItem(m_pWinampEncodingCombo->count(), d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } m_pWinampEncodingCombo->setCurrentIndex(iMatch); - addRowSpacer(0,4,0,4); + addRowSpacer(0, 4, 0, 4); #else - addRowSpacer(0,3,0,3); + addRowSpacer(0, 3, 0, 3); #endif } - OptionsWidget_soundGeneral::~OptionsWidget_soundGeneral() { } @@ -178,13 +174,13 @@ void OptionsWidget_soundGeneral::soundTest() QString szFileName; - if(!g_pApp->findAudioFile(szFileName,QString::fromUtf8("jingle.wav"))) + if(!g_pApp->findAudioFile(szFileName, QString::fromUtf8("jingle.wav"))) { qDebug("Can't find the jingle.wav file: was it shipped with your KVIrc installation?"); return; } - m->ctrl("play",&szFileName); + m->ctrl("play", &szFileName); KVI_OPTION_STRING(KviOption_stringSoundSystem) = szSavedSoundSystem; } @@ -201,7 +197,7 @@ void OptionsWidget_soundGeneral::soundAutoDetect() g_pApp->setOverrideCursor(Qt::WaitCursor); - m->ctrl("detectSoundSystem",0); + m->ctrl("detectSoundSystem", 0); soundFillBox(); g_pApp->restoreOverrideCursor(); @@ -215,7 +211,7 @@ void OptionsWidget_soundGeneral::mediaAutoDetect() g_pApp->setOverrideCursor(Qt::WaitCursor); - m->ctrl("detectMediaPlayer",0); + m->ctrl("detectMediaPlayer", 0); mediaFillBox(); g_pApp->restoreOverrideCursor(); @@ -232,21 +228,21 @@ void OptionsWidget_soundGeneral::soundFillBox() if(!m) goto disable; - if(!m->ctrl("getAvailableSoundSystems",&l)) + if(!m->ctrl("getAvailableSoundSystems", &l)) goto disable; m_pSoundSystemBox->clear(); - for ( it = l.begin(); it != l.end(); ++it ) + for(it = l.begin(); it != l.end(); ++it) { m_pSoundSystemBox->addItem(*it); } cnt = m_pSoundSystemBox->count(); - for(i=0;iitemText(i); - if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem))) + if(KviQString::equalCI(t, KVI_OPTION_STRING(KviOption_stringSoundSystem))) { m_pSoundSystemBox->setCurrentIndex(i); break; @@ -269,19 +265,21 @@ void OptionsWidget_soundGeneral::mediaFillBox() int i; KviModule * m = g_pModuleManager->getModule("mediaplayer"); - if(!m)goto disable; - if(!m->ctrl("getAvailableMediaPlayers",&l))goto disable; + if(!m) + goto disable; + if(!m->ctrl("getAvailableMediaPlayers", &l)) + goto disable; m_pMediaPlayerBox->clear(); - for ( it = l.begin(); it != l.end(); ++it ) + for(it = l.begin(); it != l.end(); ++it) { m_pMediaPlayerBox->addItem(*it); } cnt = m_pMediaPlayerBox->count(); - for(i=0;iitemText(i); - if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer))) + if(KviQString::equalCI(t, KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer))) { m_pMediaPlayerBox->setCurrentIndex(i); break; @@ -311,42 +309,44 @@ void OptionsWidget_soundGeneral::commit() { // guess from locale KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding) = ""; - } else { + } + else + { KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding) = m_pTagsEncodingCombo->itemText(idx); } - #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) idx = m_pWinampEncodingCombo->currentIndex(); if(idx <= 0) { // guess from locale KVI_OPTION_STRING(KviOption_stringWinampTextEncoding) = ""; - } else { + } + else + { KVI_OPTION_STRING(KviOption_stringWinampTextEncoding) = m_pWinampEncodingCombo->itemText(idx); } #endif } OptionsWidget_sounds::OptionsWidget_sounds(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("sound_options_widget"); createLayout(); - addLabel(0,0,0,0,__tr2qs_ctx("New query opened:","options")); - addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound); - - addLabel(0,1,0,1,__tr2qs_ctx("New message in inactive query:","options")); - addSoundSelector(1,1,1,1,"",KviOption_stringOnQueryMessageSound); + addLabel(0, 0, 0, 0, __tr2qs_ctx("New query opened:", "options")); + addSoundSelector(1, 0, 1, 0, "", KviOption_stringOnNewQueryOpenedSound); - addLabel(0,2,0,2,__tr2qs_ctx("Highlighted message in inactive window:","options")); - addSoundSelector(1,2,1,2,"",KviOption_stringOnHighlightedMessageSound); + addLabel(0, 1, 0, 1, __tr2qs_ctx("New message in inactive query:", "options")); + addSoundSelector(1, 1, 1, 1, "", KviOption_stringOnQueryMessageSound); - addLabel(0,3,0,3,__tr2qs_ctx("When I am kicked:","options")); - addSoundSelector(1,3,1,3,"",KviOption_stringOnMeKickedSound); + addLabel(0, 2, 0, 2, __tr2qs_ctx("Highlighted message in inactive window:", "options")); + addSoundSelector(1, 2, 1, 2, "", KviOption_stringOnHighlightedMessageSound); - addRowSpacer(0,4,1,4); + addLabel(0, 3, 0, 3, __tr2qs_ctx("When I am kicked:", "options")); + addSoundSelector(1, 3, 1, 3, "", KviOption_stringOnMeKickedSound); + addRowSpacer(0, 4, 1, 4); } OptionsWidget_sounds::~OptionsWidget_sounds() diff --git a/src/modules/options/OptionsWidget_sound.h b/src/modules/options/OptionsWidget_sound.h index 9fe90d5f9..06f7c2920 100644 --- a/src/modules/options/OptionsWidget_sound.h +++ b/src/modules/options/OptionsWidget_sound.h @@ -34,7 +34,6 @@ #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_sound OptionsWidget_general #define KVI_OPTIONS_WIDGET_CONTAINER_OptionsWidget_sound true - class OptionsWidget_sound : public KviOptionsWidget { Q_OBJECT @@ -55,6 +54,7 @@ class OptionsWidget_soundGeneral : public KviOptionsWidget public: OptionsWidget_soundGeneral(QWidget * parent); ~OptionsWidget_soundGeneral(); + protected: QComboBox * m_pSoundSystemBox; QPushButton * m_pSoundTestButton; @@ -68,11 +68,12 @@ protected: #endif QComboBox * m_pTagsEncodingCombo; bool m_bFirstShow; + protected: void soundFillBox(); void mediaFillBox(); virtual void commit(); - virtual void showEvent(QShowEvent *e); + virtual void showEvent(QShowEvent * e); protected slots: void soundTest(); void soundAutoDetect(); diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index e006383c1..f0084e6e3 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -39,44 +39,44 @@ QString g_szPrevSettedLocale; OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("textencoding_options_widget"); createLayout(); - KviTalGroupBox* gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Encoding","options")); - QGridLayout* grid = new QGridLayout; + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Encoding", "options")); + QGridLayout * grid = new QGridLayout; gbox->setLayout(grid); //server encoding - grid->addWidget(addLabel(gbox,__tr2qs_ctx("Default server encoding:","options")),0,0); + grid->addWidget(addLabel(gbox, __tr2qs_ctx("Default server encoding:", "options")), 0, 0); m_pSrvEncodingCombo = new QComboBox(gbox); - grid->addWidget(m_pSrvEncodingCombo,0,1); + grid->addWidget(m_pSrvEncodingCombo, 0, 1); - m_pSrvEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); + m_pSrvEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding", "options")); //text encoding - grid->addWidget(addLabel(gbox,__tr2qs_ctx("Default text encoding:","options")),1,0); + grid->addWidget(addLabel(gbox, __tr2qs_ctx("Default text encoding:", "options")), 1, 0); m_pTextEncodingCombo = new QComboBox(gbox); - grid->addWidget(m_pTextEncodingCombo,1,1); + grid->addWidget(m_pTextEncodingCombo, 1, 1); - m_pTextEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options")); + m_pTextEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding", "options")); //common between text and server encoding int i = 0; - int iTextMatch = 0, iSrvMatch=0; + int iTextMatch = 0, iSrvMatch = 0; KviLocale::EncodingDescription * d = KviLocale::instance()->encodingDescription(i); while(d->pcName) { - if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding))) + if(KviQString::equalCI(d->pcName, KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding))) iTextMatch = i + 1; - if(KviQString::equalCI(d->pcName,KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding))) + if(KviQString::equalCI(d->pcName, KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding))) iSrvMatch = i + 1; - m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->pcName); - m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(),d->pcName); + m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(), d->pcName); + m_pSrvEncodingCombo->insertItem(m_pSrvEncodingCombo->count(), d->pcName); i++; d = KviLocale::instance()->encodingDescription(i); } @@ -84,23 +84,23 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) m_pTextEncodingCombo->setCurrentIndex(iTextMatch); m_pSrvEncodingCombo->setCurrentIndex(iSrvMatch); - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Language","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Language", "options")); grid = new QGridLayout; gbox->setLayout(grid); - grid->addWidget(addLabel(gbox,__tr2qs_ctx("Force language:","options")),0,0); + grid->addWidget(addLabel(gbox, __tr2qs_ctx("Force language:", "options")), 0, 0); m_pForcedLocaleCombo = new QComboBox(gbox); - grid->addWidget(m_pForcedLocaleCombo,0,1); + grid->addWidget(m_pForcedLocaleCombo, 0, 1); - grid->addWidget(addLabel(gbox,__tr2qs_ctx("Note: You must restart KVIrc to apply any language changes","options")),1,0,1,2); + grid->addWidget(addLabel(gbox, __tr2qs_ctx("Note: You must restart KVIrc to apply any language changes", "options")), 1, 0, 1, 2); - m_pForcedLocaleCombo->addItem(__tr2qs_ctx("Automatic detection","options")); - m_pForcedLocaleCombo->addItem(__tr2qs_ctx("en","options")); + m_pForcedLocaleCombo->addItem(__tr2qs_ctx("Automatic detection", "options")); + m_pForcedLocaleCombo->addItem(__tr2qs_ctx("en", "options")); QString szLangFile; - g_pApp->getLocalKvircDirectory(szLangFile,KviApplication::None,KVI_FORCE_LOCALE_FILE_NAME); + g_pApp->getLocalKvircDirectory(szLangFile, KviApplication::None, KVI_FORCE_LOCALE_FILE_NAME); bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile); //We Have setted locale, but not restarted kvirc @@ -110,40 +110,41 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) m_szLanguage = KviLocale::instance()->localeName(); QString szLocaleDir; - g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApplication::Locale); + g_pApp->getGlobalKvircDirectory(szLocaleDir, KviApplication::Locale); - QStringList list=QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"),QDir::Files); + QStringList list = QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"), QDir::Files); i = 0; int iMatch = 0; for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) { - QString szTmp=*it; - szTmp.replace("kvirc_",""); - szTmp.replace(".mo",""); - m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp); - if(KviQString::equalCI(szTmp,m_szLanguage)) + QString szTmp = *it; + szTmp.replace("kvirc_", ""); + szTmp.replace(".mo", ""); + m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(), szTmp); + if(KviQString::equalCI(szTmp, m_szLanguage)) iMatch = i + 2; i++; } if(bIsDefaultLocale) m_pForcedLocaleCombo->setCurrentIndex(0); - else if(KviQString::equalCI(m_szLanguage,"en")) + else if(KviQString::equalCI(m_szLanguage, "en")) m_pForcedLocaleCombo->setCurrentIndex(1); else m_pForcedLocaleCombo->setCurrentIndex(iMatch); #ifdef COMPILE_ENCHANT_SUPPORT { - gbox = addGroupBox(0,2,0,2,Qt::Horizontal,__tr2qs_ctx("Spell Checker Dictionaries","options")); + gbox = addGroupBox(0, 2, 0, 2, Qt::Horizontal, __tr2qs_ctx("Spell Checker Dictionaries", "options")); KviKvsVariant availableDictionaries; KviKvsScript::evaluate("$spellchecker.availableDictionaries", NULL, NULL, &availableDictionaries); - const KviPointerHashTable* hashTable = availableDictionaries.hash()->dict(); + const KviPointerHashTable * hashTable = availableDictionaries.hash()->dict(); KviPointerHashTableIterator iter(*hashTable); QMap dictMap; - for (bool b = iter.moveFirst(); b; b = iter.moveNext()) { + for(bool b = iter.moveFirst(); b; b = iter.moveNext()) + { QString szDescription; iter.current()->asString(szDescription); dictMap[iter.currentKey()] = szDescription; @@ -162,22 +163,23 @@ OptionsWidget_textEncoding::OptionsWidget_textEncoding(QWidget * parent) m_pSpellCheckerDictionaries->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); int row = 0; - for (QMap::iterator it = dictMap.begin(); it != dictMap.end(); ++it, ++row) { - QTableWidgetItem* itemLang = new QTableWidgetItem(it.key()); + for(QMap::iterator it = dictMap.begin(); it != dictMap.end(); ++it, ++row) + { + QTableWidgetItem * itemLang = new QTableWidgetItem(it.key()); itemLang->setCheckState(KVI_OPTION_STRINGLIST(KviOption_stringlistSpellCheckerDictionaries).contains(it.key()) ? Qt::Checked : Qt::Unchecked); itemLang->setFlags(itemLang->flags() & ~Qt::ItemIsEditable); - m_pSpellCheckerDictionaries->setItem(row,0,itemLang); + m_pSpellCheckerDictionaries->setItem(row, 0, itemLang); - QTableWidgetItem* itemDesc = new QTableWidgetItem(it.value()); + QTableWidgetItem * itemDesc = new QTableWidgetItem(it.value()); itemDesc->setFlags(itemDesc->flags() & ~Qt::ItemIsEditable); - m_pSpellCheckerDictionaries->setItem(row,1,itemDesc); + m_pSpellCheckerDictionaries->setItem(row, 1, itemDesc); } m_pSpellCheckerDictionaries->resizeColumnsToContents(); m_pSpellCheckerDictionaries->resizeRowsToContents(); } #else - addRowSpacer(0,2,0,2); + addRowSpacer(0, 2, 0, 2); #endif } @@ -192,7 +194,9 @@ void OptionsWidget_textEncoding::commit() { // guess from locale KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding) = ""; - } else { + } + else + { KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding) = m_pTextEncodingCombo->itemText(idx); } @@ -201,21 +205,26 @@ void OptionsWidget_textEncoding::commit() { // guess from locale KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding) = ""; - } else { + } + else + { KVI_OPTION_STRING(KviOption_stringDefaultSrvEncoding) = m_pSrvEncodingCombo->itemText(idx); } - idx=m_pForcedLocaleCombo->currentIndex(); + idx = m_pForcedLocaleCombo->currentIndex(); QString szLangFile; - g_pApp->getLocalKvircDirectory(szLangFile,KviApplication::None,KVI_FORCE_LOCALE_FILE_NAME); - if(idx==0) { + g_pApp->getLocalKvircDirectory(szLangFile, KviApplication::None, KVI_FORCE_LOCALE_FILE_NAME); + if(idx == 0) + { if(KviFileUtils::fileExists(szLangFile)) KviFileUtils::removeFile(szLangFile); - } else { - g_szPrevSettedLocale=m_pForcedLocaleCombo->itemText(idx); - if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->itemText(idx))) + } + else + { + g_szPrevSettedLocale = m_pForcedLocaleCombo->itemText(idx); + if(!KviFileUtils::writeFile(szLangFile, m_pForcedLocaleCombo->itemText(idx))) { - QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("OK","options")); + QMessageBox::critical(this, "KVIrc", __tr2qs_ctx("Unable to write language information to", "options") + "\n" + szLangFile, __tr2qs_ctx("OK", "options")); } } /* if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage)) @@ -223,9 +232,11 @@ void OptionsWidget_textEncoding::commit() #ifdef COMPILE_ENCHANT_SUPPORT QStringList wantedDictionaries; - for (int i = 0; i < m_pSpellCheckerDictionaries->rowCount(); ++i) { - if (m_pSpellCheckerDictionaries->item(i,0)->checkState() == Qt::Checked) { - wantedDictionaries << m_pSpellCheckerDictionaries->item(i,0)->text(); + for(int i = 0; i < m_pSpellCheckerDictionaries->rowCount(); ++i) + { + if(m_pSpellCheckerDictionaries->item(i, 0)->checkState() == Qt::Checked) + { + wantedDictionaries << m_pSpellCheckerDictionaries->item(i, 0)->text(); } } KVI_OPTION_STRINGLIST(KviOption_stringlistSpellCheckerDictionaries) = wantedDictionaries; diff --git a/src/modules/options/OptionsWidget_textEncoding.h b/src/modules/options/OptionsWidget_textEncoding.h index e6fa7cae1..e5aa1f3e4 100644 --- a/src/modules/options/OptionsWidget_textEncoding.h +++ b/src/modules/options/OptionsWidget_textEncoding.h @@ -41,12 +41,14 @@ class OptionsWidget_textEncoding : public KviOptionsWidget public: OptionsWidget_textEncoding(QWidget * parent); ~OptionsWidget_textEncoding(); + protected: - QString m_szLanguage; + QString m_szLanguage; QComboBox * m_pTextEncodingCombo; QComboBox * m_pSrvEncodingCombo; QComboBox * m_pForcedLocaleCombo; QTableWidget * m_pSpellCheckerDictionaries; + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index c55fef5bf..e07d6923e 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -42,36 +42,36 @@ #include #include -TextIconTableItem::TextIconTableItem(QTableWidget *,KviTextIcon * icon) -: QTableWidgetItem(QString(),Qt::ItemIsEditable) +TextIconTableItem::TextIconTableItem(QTableWidget *, KviTextIcon * icon) + : QTableWidgetItem(QString(), Qt::ItemIsEditable) { if(icon) - m_pIcon=icon; + m_pIcon = icon; else - m_pIcon=new KviTextIcon(KviIconManager::None); - QPixmap* pix=m_pIcon->pixmap(); - if(pix) setIcon(QIcon(*pix)); + m_pIcon = new KviTextIcon(KviIconManager::None); + QPixmap * pix = m_pIcon->pixmap(); + if(pix) + setIcon(QIcon(*pix)); } TextIconTableItem::~TextIconTableItem() { delete m_pIcon; - } void TextIconTableItem::setId(int id) { m_pIcon->setId(id); - QPixmap* pix=m_pIcon->pixmap(); - if(pix) setIcon(QIcon(*pix)); + QPixmap * pix = m_pIcon->pixmap(); + if(pix) + setIcon(QIcon(*pix)); } - OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { - m_pPopup=0; - m_iLastEditedRow=-1; + m_pPopup = 0; + m_iLastEditedRow = -1; m_pCurrentIconButton = 0; setObjectName("texticons_options_widget"); createLayout(); @@ -79,33 +79,34 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) m_pTable = new QTableWidget(this); m_pTable->setColumnCount(2); - m_pTable->setColumnWidth(0,300); + m_pTable->setColumnWidth(0, 300); m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); m_pTable->horizontalHeader()->stretchLastSection(); m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows); m_pTable->setSelectionMode(QAbstractItemView::SingleSelection); m_pTable->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - mergeTip(m_pTable->viewport(),__tr2qs_ctx("This table contains the text icon associations.
" \ - "KVirc will use them to display the CTRL+I escape sequences and eventually the " \ - "emoticons.","options")); + mergeTip(m_pTable->viewport(), __tr2qs_ctx("This table contains the text icon associations.
" + "KVirc will use them to display the CTRL+I escape sequences and eventually the " + "emoticons.", + "options")); - layout()->addWidget(m_pTable,0,0,1,3); + layout()->addWidget(m_pTable, 0, 0, 1, 3); - m_pAdd = new QPushButton(__tr2qs_ctx("Add","options"),this); - layout()->addWidget(m_pAdd,1,0); - connect(m_pAdd,SIGNAL(clicked()),this,SLOT(addClicked())); + m_pAdd = new QPushButton(__tr2qs_ctx("Add", "options"), this); + layout()->addWidget(m_pAdd, 1, 0); + connect(m_pAdd, SIGNAL(clicked()), this, SLOT(addClicked())); - m_pDel = new QPushButton(__tr2qs_ctx("Delete","options"),this); - layout()->addWidget(m_pDel,1,1); - connect(m_pDel,SIGNAL(clicked()),this,SLOT(delClicked())); + m_pDel = new QPushButton(__tr2qs_ctx("Delete", "options"), this); + layout()->addWidget(m_pDel, 1, 1); + connect(m_pDel, SIGNAL(clicked()), this, SLOT(delClicked())); - m_pRestore = new QPushButton(__tr2qs_ctx("Restore","options"),this); - layout()->addWidget(m_pRestore,1,2); - connect(m_pRestore,SIGNAL(clicked()),this,SLOT(restoreClicked())); + m_pRestore = new QPushButton(__tr2qs_ctx("Restore", "options"), this); + layout()->addWidget(m_pRestore, 1, 2); + connect(m_pRestore, SIGNAL(clicked()), this, SLOT(restoreClicked())); - connect(m_pTable,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged())); - connect(m_pTable,SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)),this,SLOT(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *))); + connect(m_pTable, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged())); + connect(m_pTable, SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)), this, SLOT(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *))); fillTable(); } @@ -116,7 +117,7 @@ OptionsWidget_textIcons::~OptionsWidget_textIcons() void OptionsWidget_textIcons::fillTable() { - KviPointerHashTableIterator it(*(g_pTextIconManager->textIconDict())); + KviPointerHashTableIterator it(*(g_pTextIconManager->textIconDict())); m_pTable->clear(); QStringList header; @@ -126,20 +127,20 @@ void OptionsWidget_textIcons::fillTable() m_pTable->setRowCount(g_pTextIconManager->textIconDict()->count()); int idx = 0; - QTableWidgetItem *item0; - TextIconTableItem *item1; + QTableWidgetItem * item0; + TextIconTableItem * item1; while(KviTextIcon * i = it.current()) { - if(!m_pTable->item(idx,0)) + if(!m_pTable->item(idx, 0)) { item0 = new QTableWidgetItem(it.currentKey()); - m_pTable->setItem(idx,0,item0); + m_pTable->setItem(idx, 0, item0); } - item1 = new TextIconTableItem(m_pTable,new KviTextIcon(i)); + item1 = new TextIconTableItem(m_pTable, new KviTextIcon(i)); //remove from the item the ability to be edited as text item1->setFlags(item1->flags() ^ Qt::ItemIsEditable); - m_pTable->setItem(idx,1,item1); + m_pTable->setItem(idx, 1, item1); ++idx; ++it; @@ -153,9 +154,9 @@ void OptionsWidget_textIcons::doPopup() { if(!m_pPopup) { - m_pPopup = new QMenu(this); + m_pPopup = new QMenu(this); KviIconWidget * iw = new KviIconWidget(m_pPopup); - connect(iw,SIGNAL(selected(KviIconManager::SmallIcon)),this,SLOT(iconSelected(KviIconManager::SmallIcon))); + connect(iw, SIGNAL(selected(KviIconManager::SmallIcon)), this, SLOT(iconSelected(KviIconManager::SmallIcon))); QWidgetAction * pWaction = new QWidgetAction(m_pPopup); pWaction->setDefaultWidget(iw); m_pPopup->addAction(pWaction); @@ -168,26 +169,26 @@ void OptionsWidget_textIcons::iconSelected(KviIconManager::SmallIcon eIcon) m_pCurrentItem->icon()->setId(eIcon); m_pCurrentItem->setIcon(QIcon(*m_pCurrentItem->icon()->pixmap())); - KviTalHBox * pBox=new KviTalHBox(0); + KviTalHBox * pBox = new KviTalHBox(0); pBox->setSpacing(0); pBox->setMargin(0); m_pCurrentIconButton = new QToolButton(pBox); m_pCurrentIconButton->setMinimumWidth(150); m_pCurrentIconButton->setIcon(QIcon(*m_pCurrentItem->icon()->pixmap())); - connect(m_pCurrentIconButton,SIGNAL(clicked()),this,SLOT(doPopup())); + connect(m_pCurrentIconButton, SIGNAL(clicked()), this, SLOT(doPopup())); - QToolButton * pBrowseButton=new QToolButton(pBox); + QToolButton * pBrowseButton = new QToolButton(pBox); pBrowseButton->setText("..."); - connect(pBrowseButton,SIGNAL(clicked()),this,SLOT(chooseFromFile())); + connect(pBrowseButton, SIGNAL(clicked()), this, SLOT(chooseFromFile())); - m_pTable->setCellWidget(m_pCurrentItem->row(),1,pBox); + m_pTable->setCellWidget(m_pCurrentItem->row(), 1, pBox); } void OptionsWidget_textIcons::chooseFromFile() { QString szFile; - KviFileDialog::askForOpenFileName(szFile,__tr2qs_ctx("Select a File - KVIrc","options"),QString(),KVI_FILTER_IMAGE,false,true,this); + KviFileDialog::askForOpenFileName(szFile, __tr2qs_ctx("Select a File - KVIrc", "options"), QString(), KVI_FILTER_IMAGE, false, true, this); if(szFile.isEmpty()) return; @@ -199,18 +200,18 @@ void OptionsWidget_textIcons::chooseFromFile() QString szFileName = info.fileName(); QString szCurrentThemePath; - g_pApp->getLocalKvircDirectory(szCurrentThemePath,KviApplication::Themes,KVI_OPTION_STRING(KviOption_stringIconThemeSubdir)); + g_pApp->getLocalKvircDirectory(szCurrentThemePath, KviApplication::Themes, KVI_OPTION_STRING(KviOption_stringIconThemeSubdir)); szCurrentThemePath += KVI_PATH_SEPARATOR_CHAR; if(!KviFileUtils::directoryExists(szCurrentThemePath)) KviFileUtils::makeDir(szCurrentThemePath); - KviFileUtils::copyFile(szFile,szCurrentThemePath+szFileName); + KviFileUtils::copyFile(szFile, szCurrentThemePath + szFileName); m_pCurrentItem->icon()->setFilename(szFileName); - QPixmap *p = m_pCurrentItem->icon()->pixmap(); + QPixmap * p = m_pCurrentItem->icon()->pixmap(); m_pCurrentItem->setIcon(QIcon(*p)); if(m_pCurrentIconButton) @@ -223,13 +224,13 @@ void OptionsWidget_textIcons::itemSelectionChanged() m_pDel->setEnabled(i >= 0 && i < m_pTable->rowCount()); } -void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem *cur, QTableWidgetItem *prev) +void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem * cur, QTableWidgetItem * prev) { if(prev) { - QWidget * pOldWidget = m_pTable->cellWidget(prev->row(),1); + QWidget * pOldWidget = m_pTable->cellWidget(prev->row(), 1); if(pOldWidget) - m_pTable->setCellWidget(prev->row(),1,NULL); + m_pTable->setCellWidget(prev->row(), 1, NULL); } m_pCurrentItem = NULL; @@ -238,34 +239,34 @@ void OptionsWidget_textIcons::currentItemChanged(QTableWidgetItem *cur, QTableWi return; if(cur->column() != 1) return; - if(m_iLastEditedRow==cur->row() || cur == prev) + if(m_iLastEditedRow == cur->row() || cur == prev) return; m_pCurrentItem = (TextIconTableItem *)cur; - KviTalHBox * pBox=new KviTalHBox(0); + KviTalHBox * pBox = new KviTalHBox(0); pBox->setSpacing(0); pBox->setMargin(0); - m_pCurrentIconButton=new QToolButton(pBox); + m_pCurrentIconButton = new QToolButton(pBox); m_pCurrentIconButton->setMinimumWidth(150); m_pCurrentIconButton->setIcon(QIcon(cur->icon())); - connect(m_pCurrentIconButton,SIGNAL(clicked()),this,SLOT(doPopup())); + connect(m_pCurrentIconButton, SIGNAL(clicked()), this, SLOT(doPopup())); // FIXME: this does not work currently! - QToolButton * pBrowseButton=new QToolButton(pBox); + QToolButton * pBrowseButton = new QToolButton(pBox); pBrowseButton->setText("..."); - connect(pBrowseButton,SIGNAL(clicked()),this,SLOT(chooseFromFile())); + connect(pBrowseButton, SIGNAL(clicked()), this, SLOT(chooseFromFile())); - m_pTable->setCellWidget(cur->row(),1,pBox); - m_iLastEditedRow=cur->row(); + m_pTable->setCellWidget(cur->row(), 1, pBox); + m_iLastEditedRow = cur->row(); } void OptionsWidget_textIcons::addClicked() { m_pTable->setRowCount(m_pTable->rowCount() + 1); - m_pTable->setItem(m_pTable->rowCount() - 1,0,new QTableWidgetItem(__tr2qs_ctx("unnamed","options"))); - m_pTable->setItem(m_pTable->rowCount() - 1,1,new TextIconTableItem(m_pTable,0)); + m_pTable->setItem(m_pTable->rowCount() - 1, 0, new QTableWidgetItem(__tr2qs_ctx("unnamed", "options"))); + m_pTable->setItem(m_pTable->rowCount() - 1, 1, new TextIconTableItem(m_pTable, 0)); m_pTable->scrollToBottom(); m_pDel->setEnabled(true); } @@ -283,7 +284,8 @@ void OptionsWidget_textIcons::delClicked() if((i > -1) && (i < m_pTable->rowCount())) { m_pTable->removeRow(i); - if(m_pTable->rowCount() == 0) m_pDel->setEnabled(false); + if(m_pTable->rowCount() == 0) + m_pDel->setEnabled(false); } } @@ -292,26 +294,26 @@ void OptionsWidget_textIcons::commit() KviOptionsWidget::commit(); g_pTextIconManager->clear(); int n = m_pTable->rowCount(); - for(int i=0;i < n;i++) + for(int i = 0; i < n; i++) { - QString szVal = m_pTable->item(i,0)->text(); + QString szVal = m_pTable->item(i, 0)->text(); if(!szVal.isEmpty()) { - TextIconTableItem * it = (TextIconTableItem *)m_pTable->item(i,1); + TextIconTableItem * it = (TextIconTableItem *)m_pTable->item(i, 1); if(it) { - g_pTextIconManager->insert(szVal,*(it->icon())); + g_pTextIconManager->insert(szVal, *(it->icon())); } } } g_pTextIconManager->save(); - for(int i=0; icolumnCount(); j++) + for(int j = 0; j < m_pTable->columnCount(); j++) { - if(m_pTable->item(i,j)) - m_pTable->takeItem(i,j); + if(m_pTable->item(i, j)) + m_pTable->takeItem(i, j); } } } diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h index 23885a3af..e1b78f2ba 100644 --- a/src/modules/options/OptionsWidget_textIcons.h +++ b/src/modules/options/OptionsWidget_textIcons.h @@ -41,16 +41,20 @@ class TextIconTableItem; class TextIconTableItem : public QTableWidgetItem { friend class OptionsWidget_textIcons; + public: - TextIconTableItem(QTableWidget * t,KviTextIcon * icon); + TextIconTableItem(QTableWidget * t, KviTextIcon * icon); ~TextIconTableItem(); + protected: KviTextIcon * m_pIcon; + public: - KviTextIcon * icon() { - return m_pIcon; }; + KviTextIcon * icon() + { + return m_pIcon; + }; void setId(int id); - }; class OptionsWidget_textIcons : public KviOptionsWidget @@ -59,22 +63,25 @@ class OptionsWidget_textIcons : public KviOptionsWidget public: OptionsWidget_textIcons(QWidget * parent); ~OptionsWidget_textIcons(); + protected: QTableWidget * m_pTable; int m_iLastEditedRow; - TextIconTableItem *m_pCurrentItem; - QPushButton * m_pAdd; - QPushButton * m_pDel; - QPushButton * m_pRestore; + TextIconTableItem * m_pCurrentItem; + QPushButton * m_pAdd; + QPushButton * m_pDel; + QPushButton * m_pRestore; QToolButton * m_pCurrentIconButton; - QMenu *m_pPopup; + QMenu * m_pPopup; + private: void fillTable(); + public: virtual void commit(); protected slots: void itemSelectionChanged(); - void currentItemChanged(QTableWidgetItem *cur, QTableWidgetItem *prev); + void currentItemChanged(QTableWidgetItem * cur, QTableWidgetItem * prev); void addClicked(); void delClicked(); void restoreClicked(); diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp index 7ac5c5e50..41dfbf985 100644 --- a/src/modules/options/OptionsWidget_theme.cpp +++ b/src/modules/options/OptionsWidget_theme.cpp @@ -32,109 +32,112 @@ #include - OptionsWidget_theme::OptionsWidget_theme(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { createLayout(); - KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont); - KviTalToolTip::add(b,__tr2qs_ctx("This option will force a static font for every widget that has no specific font setting","options")); - addBoolSelector(0,0,1,0,__tr2qs_ctx("Show icons in popup menus","options"),KviOption_boolShowIconsInPopupMenus); - KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication, - KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont)); - connect(b,SIGNAL(toggled(bool)),f,SLOT(setEnabled(bool))); + KviBoolSelector * b = addBoolSelector(0, 1, 1, 1, __tr2qs_ctx("Use global application font", "options"), KviOption_boolUseGlobalApplicationFont); + KviTalToolTip::add(b, __tr2qs_ctx("This option will force a static font for every widget that has no specific font setting", "options")); + addBoolSelector(0, 0, 1, 0, __tr2qs_ctx("Show icons in popup menus", "options"), KviOption_boolShowIconsInPopupMenus); + KviFontSelector * f = addFontSelector(0, 2, 1, 2, __tr2qs_ctx("Global application font:", "options"), KviOption_fontApplication, + KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont)); + connect(b, SIGNAL(toggled(bool)), f, SLOT(setEnabled(bool))); - addRowSpacer(0,3,1,3); + addRowSpacer(0, 3, 1, 3); } OptionsWidget_theme::~OptionsWidget_theme() { } - OptionsWidget_themeTransparency::OptionsWidget_themeTransparency(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { #ifdef COMPILE_PSEUDO_TRANSPARENCY createLayout(); - KviUIntSelector * u = addUIntSelector(0,0,1,0,__tr2qs_ctx("Global window opacity:","options"),KviOption_uintGlobalWindowOpacityPercent,50,100,100, true); + KviUIntSelector * u = addUIntSelector(0, 0, 1, 0, __tr2qs_ctx("Global window opacity:", "options"), KviOption_uintGlobalWindowOpacityPercent, 50, 100, 100, true); u->setSuffix("%"); - m_pUseTransparencyBoolSelector = addBoolSelector(0,1,1,1,__tr2qs_ctx("Enable transparency","options"),KviOption_boolUseGlobalPseudoTransparency); - #ifdef COMPILE_X11_SUPPORT - mergeTip(m_pUseTransparencyBoolSelector, - __tr2qs_ctx("This option makes all KVIrc windows look " \ - "transparent.
You must choose a blending " \ - "background image below or check the " \ - "\"Use compositing for real transparency\" option.","options")); - #elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - mergeTip(m_pUseTransparencyBoolSelector, - __tr2qs_ctx("This option makes all KVIrc windows look " \ - "transparent.
You must choose a blending " \ - "background image below or check the " \ - "\"Use desktop background for transparency\" option.","options")); - #else - mergeTip(m_pUseTransparencyBoolSelector, - __tr2qs_ctx("This option makes all KVIrc windows look " \ - "like transparent.
You must choose a blending " \ - "background image below.","options")); - #endif - - u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor,0,100,35, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + m_pUseTransparencyBoolSelector = addBoolSelector(0, 1, 1, 1, __tr2qs_ctx("Enable transparency", "options"), KviOption_boolUseGlobalPseudoTransparency); +#ifdef COMPILE_X11_SUPPORT + mergeTip(m_pUseTransparencyBoolSelector, + __tr2qs_ctx("This option makes all KVIrc windows look " + "transparent.
You must choose a blending " + "background image below or check the " + "\"Use compositing for real transparency\" option.", + "options")); +#elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + mergeTip(m_pUseTransparencyBoolSelector, + __tr2qs_ctx("This option makes all KVIrc windows look " + "transparent.
You must choose a blending " + "background image below or check the " + "\"Use desktop background for transparency\" option.", + "options")); +#else + mergeTip(m_pUseTransparencyBoolSelector, + __tr2qs_ctx("This option makes all KVIrc windows look " + "like transparent.
You must choose a blending " + "background image below.", + "options")); +#endif + + u = addUIntSelector(0, 2, 1, 2, __tr2qs_ctx("Child window opacity:", "options"), KviOption_uintGlobalTransparencyChildFadeFactor, 0, 100, 35, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); u->setSuffix("%"); - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); - u = addUIntSelector(0,3,1,3,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor,0,100,10, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + u = addUIntSelector(0, 3, 1, 3, __tr2qs_ctx("Parent window opacity:", "options"), KviOption_uintGlobalTransparencyParentFadeFactor, 0, 100, 10, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); u->setSuffix("%"); - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool))); - - KviColorSelector * c = addColorSelector(0,4,1,4,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),c,SLOT(setEnabled(bool))); - - #ifdef COMPILE_X11_SUPPORT - m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Use compositing for real transparency","options"),KviOption_boolUseCompositingForTransparency, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - - m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency)); - layout()->setRowStretch(6,1); - - if(g_pApp->supportsCompositing()) - { - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseCompositingForTransparencyBoolSelector,SLOT(setEnabled(bool))); - connect(m_pUseCompositingForTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool))); - } else { - m_pUseCompositingForTransparencyBoolSelector->setEnabled(false); - m_pUseCompositingForTransparencyBoolSelector->setChecked(false); - enableGlobalBackgroundPixmapSelector(true); - } - - #elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Use desktop background for transparency","options"),KviOption_boolUseWindowsDesktopForTransparency, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - - m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency)); - layout()->setRowStretch(6,1); - - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),m_pUseWindowsFakeDesktopTransparencyBoolSelector,SLOT(setEnabled(bool))); - connect(m_pUseWindowsFakeDesktopTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool))); - #else - m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,5,1,5,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, - KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - layout()->setRowStretch(5,1); - #endif //!COMPILE_X11_SUPPORT - - connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool))); + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), u, SLOT(setEnabled(bool))); + + KviColorSelector * c = addColorSelector(0, 4, 1, 4, __tr2qs_ctx("Blend color:", "options"), KviOption_colorGlobalTransparencyFade, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), c, SLOT(setEnabled(bool))); + +#ifdef COMPILE_X11_SUPPORT + m_pUseCompositingForTransparencyBoolSelector = addBoolSelector(0, 5, 1, 5, __tr2qs_ctx("Use compositing for real transparency", "options"), KviOption_boolUseCompositingForTransparency, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + + m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0, 6, 1, 6, __tr2qs_ctx("Transparency blend image:", "options"), KviOption_pixmapGlobalTransparencyBackground, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency)); + layout()->setRowStretch(6, 1); + + if(g_pApp->supportsCompositing()) + { + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), m_pUseCompositingForTransparencyBoolSelector, SLOT(setEnabled(bool))); + connect(m_pUseCompositingForTransparencyBoolSelector, SIGNAL(toggled(bool)), this, SLOT(enableGlobalBackgroundPixmapSelector(bool))); + } + else + { + m_pUseCompositingForTransparencyBoolSelector->setEnabled(false); + m_pUseCompositingForTransparencyBoolSelector->setChecked(false); + enableGlobalBackgroundPixmapSelector(true); + } + +#elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + m_pUseWindowsFakeDesktopTransparencyBoolSelector = addBoolSelector(0, 5, 1, 5, __tr2qs_ctx("Use desktop background for transparency", "options"), KviOption_boolUseWindowsDesktopForTransparency, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + + m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0, 6, 1, 6, __tr2qs_ctx("Transparency blend image:", "options"), KviOption_pixmapGlobalTransparencyBackground, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolUseCompositingForTransparency)); + layout()->setRowStretch(6, 1); + + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), m_pUseWindowsFakeDesktopTransparencyBoolSelector, SLOT(setEnabled(bool))); + connect(m_pUseWindowsFakeDesktopTransparencyBoolSelector, SIGNAL(toggled(bool)), this, SLOT(enableGlobalBackgroundPixmapSelector(bool))); +#else + m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0, 5, 1, 5, __tr2qs_ctx("Transparency blend image:", "options"), KviOption_pixmapGlobalTransparencyBackground, + KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); + layout()->setRowStretch(5, 1); +#endif //!COMPILE_X11_SUPPORT + + connect(m_pUseTransparencyBoolSelector, SIGNAL(toggled(bool)), this, SLOT(enableGlobalBackgroundPixmapSelector(bool))); #else //!COMPILE_PSEUDO_TRANSPARENCY createLayout(); - addRowSpacer(0,0,0,0); + addRowSpacer(0, 0, 0, 0); #endif } @@ -145,29 +148,28 @@ OptionsWidget_themeTransparency::~OptionsWidget_themeTransparency() void OptionsWidget_themeTransparency::enableGlobalBackgroundPixmapSelector(bool) { #ifdef COMPILE_PSEUDO_TRANSPARENCY - #ifdef COMPILE_X11_SUPPORT - m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pUseCompositingForTransparencyBoolSelector->isChecked())); - #elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pUseWindowsFakeDesktopTransparencyBoolSelector->isChecked())); - #else - m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked()); - #endif +#ifdef COMPILE_X11_SUPPORT + m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pUseCompositingForTransparencyBoolSelector->isChecked())); +#elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked() && !(m_pUseWindowsFakeDesktopTransparencyBoolSelector->isChecked())); +#else + m_pGlobalBackgroundPixmapSelector->setEnabled(m_pUseTransparencyBoolSelector->isChecked()); +#endif #endif } - OptionsWidget_themeToolBarApplets::OptionsWidget_themeToolBarApplets(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { createLayout(); - addColorSelector(0,0,0,0,__tr2qs_ctx("Background color:","options"),KviOption_colorIrcToolBarAppletBackground); - addColorSelector(0,1,0,1,__tr2qs_ctx("Border color:","options"),KviOption_colorIrcToolBarAppletBorder); - addColorSelector(0,2,0,2,__tr2qs_ctx("Font color:","options"),KviOption_colorIrcToolBarAppletFont); + addColorSelector(0, 0, 0, 0, __tr2qs_ctx("Background color:", "options"), KviOption_colorIrcToolBarAppletBackground); + addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Border color:", "options"), KviOption_colorIrcToolBarAppletBorder); + addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Font color:", "options"), KviOption_colorIrcToolBarAppletFont); - addPixmapSelector(0,3,0,3,__tr2qs_ctx("Background image:","options"),KviOption_pixmapIrcToolBarAppletBackground); + addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapIrcToolBarAppletBackground); - layout()->setRowStretch(3,1); + layout()->setRowStretch(3, 1); } OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets() diff --git a/src/modules/options/OptionsWidget_theme.h b/src/modules/options/OptionsWidget_theme.h index 491b72f29..ab3546f7f 100644 --- a/src/modules/options/OptionsWidget_theme.h +++ b/src/modules/options/OptionsWidget_theme.h @@ -28,7 +28,6 @@ #include "KviOptionsWidget.h" #include "KviSelectors.h" - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_theme KviIconManager::Gui #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_theme __tr2qs_no_lookup("General") #define KVI_OPTIONS_WIDGET_KEYWORDS_OptionsWidget_theme __tr2qs_no_lookup("theme") @@ -53,15 +52,16 @@ class OptionsWidget_themeTransparency : public KviOptionsWidget public: OptionsWidget_themeTransparency(QWidget * parent); ~OptionsWidget_themeTransparency(); + protected: #ifdef COMPILE_PSEUDO_TRANSPARENCY KviPixmapSelector * m_pGlobalBackgroundPixmapSelector; KviBoolSelector * m_pUseTransparencyBoolSelector; - #ifdef COMPILE_X11_SUPPORT - KviBoolSelector * m_pUseCompositingForTransparencyBoolSelector; - #elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - KviBoolSelector * m_pUseWindowsFakeDesktopTransparencyBoolSelector; - #endif +#ifdef COMPILE_X11_SUPPORT + KviBoolSelector * m_pUseCompositingForTransparencyBoolSelector; +#elif defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) + KviBoolSelector * m_pUseWindowsFakeDesktopTransparencyBoolSelector; +#endif #endif protected slots: void enableGlobalBackgroundPixmapSelector(bool); diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp index 924402655..9717b7c77 100644 --- a/src/modules/options/OptionsWidget_tools.cpp +++ b/src/modules/options/OptionsWidget_tools.cpp @@ -31,16 +31,16 @@ #include OptionsWidget_tools::OptionsWidget_tools(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("tools_options_widget"); createLayout(); - addLabel(0,0,0,0,__tr2qs_ctx("This section contains IRC tools "\ - "like away, lag and logging system. ","options")); - - addRowSpacer(0,1,0,1); + addLabel(0, 0, 0, 0, __tr2qs_ctx("This section contains IRC tools " + "like away, lag and logging system. ", + "options")); + addRowSpacer(0, 1, 0, 1); } OptionsWidget_tools::~OptionsWidget_tools() diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp index 7385b5094..137a3c252 100644 --- a/src/modules/options/OptionsWidget_topicLabel.cpp +++ b/src/modules/options/OptionsWidget_topicLabel.cpp @@ -28,15 +28,14 @@ #include "KviOptions.h" #include "KviLocale.h" - -OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget") +OptionsWidget_topicLabel::OptionsWidget_topicLabel(QWidget * p) : KviOptionsWidget(p, "topic_label_look_options_widget") { createLayout(); - addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:","options"), KviOption_fontLabel); - addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color:","options"), KviOption_colorLabelForeground); - addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color:","options"), KviOption_colorLabelBackground); - addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image:","options"), KviOption_pixmapLabelBackground); + addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontLabel); + addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color:", "options"), KviOption_colorLabelForeground); + addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Background color:", "options"), KviOption_colorLabelBackground); + addPixmapSelector(0, 3, 0, 3, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapLabelBackground); layout()->setRowStretch(3, 1); } diff --git a/src/modules/options/OptionsWidget_topicLabel.h b/src/modules/options/OptionsWidget_topicLabel.h index 5c24fcde5..47e92197a 100644 --- a/src/modules/options/OptionsWidget_topicLabel.h +++ b/src/modules/options/OptionsWidget_topicLabel.h @@ -25,7 +25,6 @@ // //============================================================================= - #include "KviOptionsWidget.h" #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_topicLabel KviIconManager::Topic diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp index 5012d6774..30dc4b660 100644 --- a/src/modules/options/OptionsWidget_tray.cpp +++ b/src/modules/options/OptionsWidget_tray.cpp @@ -32,43 +32,43 @@ #include - OptionsWidget_tray::OptionsWidget_tray(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("tray_options_widget"); createLayout(); - m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension); + m_pEnable = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Enable tray icon", "options"), KviOption_boolShowDockExtension); #ifndef COMPILE_ON_MAC - m_pMinimizeInTray = addBoolSelector(0,1,0,1,__tr2qs_ctx("Minimize in tray","options"),KviOption_boolMinimizeInTray); + m_pMinimizeInTray = addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Minimize in tray", "options"), KviOption_boolMinimizeInTray); #ifdef COMPILE_KDE_SUPPORT - QString szTip = __tr2qs_ctx("Take into account that if you're using KDE, this won't work if " \ - "you've set \"Keep window thumbnails\" as \"Always\" at \"Desktop Effects\" " \ - "advanced settings.","options"); - mergeTip(m_pMinimizeInTray,szTip); + QString szTip = __tr2qs_ctx("Take into account that if you're using KDE, this won't work if " + "you've set \"Keep window thumbnails\" as \"Always\" at \"Desktop Effects\" " + "advanced settings.", + "options"); + mergeTip(m_pMinimizeInTray, szTip); #endif #endif - m_pCloseInTray = addBoolSelector(0,2,0,2,__tr2qs_ctx("Close in tray","options"),KviOption_boolCloseInTray); + m_pCloseInTray = addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Close in tray", "options"), KviOption_boolCloseInTray); - m_pEnableFlashing = addBoolSelector(0,3,0,3,__tr2qs_ctx("Enable tray icon flashing","options"),KviOption_boolEnableTrayIconFlashing); - m_pLevelBasedNotify = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable level-based message notification (not a message-type based)","options"),KviOption_boolUseLevelBasedTrayNotification); + m_pEnableFlashing = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Enable tray icon flashing", "options"), KviOption_boolEnableTrayIconFlashing); + m_pLevelBasedNotify = addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Enable level-based message notification (not a message-type based)", "options"), KviOption_boolUseLevelBasedTrayNotification); - m_pLevelsGroup = addGroupBox(0,5,0,5,Qt::Horizontal,__tr2qs_ctx("Select Message Levels to Notify","options")); + m_pLevelsGroup = addGroupBox(0, 5, 0, 5, Qt::Horizontal, __tr2qs_ctx("Select Message Levels to Notify", "options")); - addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for low-priority messages:","options"), - KviOption_uintMinTrayLowLevelMessage, - 1,5,1,true); + addUIntSelector(m_pLevelsGroup, __tr2qs_ctx("Minimum level for low-priority messages:", "options"), + KviOption_uintMinTrayLowLevelMessage, + 1, 5, 1, true); - addUIntSelector(m_pLevelsGroup,__tr2qs_ctx("Minimum level for high-priority message:","options"), - KviOption_uintMinTrayHighLevelMessage, - 1,5,4,true); + addUIntSelector(m_pLevelsGroup, __tr2qs_ctx("Minimum level for high-priority message:", "options"), + KviOption_uintMinTrayHighLevelMessage, + 1, 5, 4, true); - addRowSpacer(0,6,0,6); + addRowSpacer(0, 6, 0, 6); - connect(m_pEnable,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool))); - connect(m_pLevelBasedNotify,SIGNAL(toggled(bool)),this,SLOT(setEnabled(bool))); + connect(m_pEnable, SIGNAL(toggled(bool)), this, SLOT(setEnabled(bool))); + connect(m_pLevelBasedNotify, SIGNAL(toggled(bool)), this, SLOT(setEnabled(bool))); setEnabled(true); } @@ -89,7 +89,9 @@ void OptionsWidget_tray::setEnabled(bool) m_pLevelsGroup->setEnabled(false); g_pMainWindow->executeInternalCommand(KVI_INTERNALCOMMAND_TRAYICON_SHOW); - } else { + } + else + { m_pCloseInTray->setEnabled(false); m_pEnableFlashing->setEnabled(false); m_pLevelBasedNotify->setEnabled(false); diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h index 46111b7ff..49c46cac8 100644 --- a/src/modules/options/OptionsWidget_tray.h +++ b/src/modules/options/OptionsWidget_tray.h @@ -39,6 +39,7 @@ class OptionsWidget_tray : public KviOptionsWidget public: OptionsWidget_tray(QWidget * parent); ~OptionsWidget_tray(); + protected: KviBoolSelector * m_pEnable; KviBoolSelector * m_pEnableFlashing; diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp index f84baa08d..ad71fec76 100644 --- a/src/modules/options/OptionsWidget_uparser.cpp +++ b/src/modules/options/OptionsWidget_uparser.cpp @@ -30,41 +30,42 @@ #include #include - OptionsWidget_uparser::OptionsWidget_uparser(QWidget * parent) -: KviOptionsWidget(parent,"uparser_options_widget") + : KviOptionsWidget(parent, "uparser_options_widget") { createLayout(); KviBoolSelector * b; KviBoolSelector * b1; - addBoolSelector(0,0,0,0,__tr2qs_ctx("Disable parser warnings","options"),KviOption_boolAvoidParserWarnings); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable broken event handlers","options"),KviOption_boolDisableBrokenEventHandlers); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Kill broken timers","options"),KviOption_boolKillBrokenTimers); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Send unknown commands as /RAW","options"),KviOption_boolSendUnknownCommandsAsRaw); + addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Disable parser warnings", "options"), KviOption_boolAvoidParserWarnings); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Disable broken event handlers", "options"), KviOption_boolDisableBrokenEventHandlers); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Kill broken timers", "options"), KviOption_boolKillBrokenTimers); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Send unknown commands as /RAW", "options"), KviOption_boolSendUnknownCommandsAsRaw); + + addSeparator(0, 4, 0, 4); - addSeparator(0,4,0,4); + addBoolSelector(0, 5, 0, 5, __tr2qs_ctx("Automatically unload unused modules", "options"), KviOption_boolCleanupUnusedModules); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Ignore module versions (dangerous)", "options"), KviOption_boolIgnoreModuleVersions); - addBoolSelector(0,5,0,5,__tr2qs_ctx("Automatically unload unused modules","options"),KviOption_boolCleanupUnusedModules); - addBoolSelector(0,6,0,6,__tr2qs_ctx("Ignore module versions (dangerous)","options"),KviOption_boolIgnoreModuleVersions); + addSeparator(0, 7, 0, 7); - addSeparator(0,7,0,7); + b = addBoolSelector(0, 8, 0, 8, __tr2qs_ctx("Relay errors and warnings to debug window", "options"), KviOption_boolScriptErrorsToDebugWindow); + mergeTip(b, __tr2qs_ctx("This option will show the script errors and warnings " + "also in the special debug window. This makes tracking of scripts that might " + "be running in several windows far easier. The messages in the debug window " + "also contain a deeper call stack which will help you identifying the " + "scripting problems.", + "options")); - b = addBoolSelector(0,8,0,8,__tr2qs_ctx("Relay errors and warnings to debug window","options"),KviOption_boolScriptErrorsToDebugWindow); - mergeTip(b, __tr2qs_ctx("This option will show the script errors and warnings " \ - "also in the special debug window. This makes tracking of scripts that might " \ - "be running in several windows far easier. The messages in the debug window " \ - "also contain a deeper call stack which will help you identifying the " \ - "scripting problems.","options")); - - b1 = addBoolSelector(0,9,0,9,__tr2qs_ctx("Create debug window without focus","options"),KviOption_boolShowMinimizedDebugWindow); - mergeTip(b1, __tr2qs_ctx("This option prevents the debug window " \ - "from opening and diverting application focus.
" \ - "Enable this if you don't like the debug window " \ - "popping up while you're typing something in a channel.","options")); + b1 = addBoolSelector(0, 9, 0, 9, __tr2qs_ctx("Create debug window without focus", "options"), KviOption_boolShowMinimizedDebugWindow); + mergeTip(b1, __tr2qs_ctx("This option prevents the debug window " + "from opening and diverting application focus.
" + "Enable this if you don't like the debug window " + "popping up while you're typing something in a channel.", + "options")); - addRowSpacer(0,10,0,10); + addRowSpacer(0, 10, 0, 10); } OptionsWidget_uparser::~OptionsWidget_uparser() diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp index 56f421fdf..fdc87f9f5 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.cpp +++ b/src/modules/options/OptionsWidget_urlHandlers.cpp @@ -33,25 +33,24 @@ #include #include - OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - #define START_ROW 2 +#define START_ROW 2 #else - #define START_ROW 1 +#define START_ROW 1 #endif setObjectName("urlhandlers_options_widget"); createLayout(); - KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Mouse Handler","options")); + KviTalGroupBox * gbox = addGroupBox(0, 0, 0, 0, Qt::Horizontal, __tr2qs_ctx("Mouse Handler", "options")); - addLabel(gbox,__tr2qs_ctx("How many clicks to open links?","options")); + addLabel(gbox, __tr2qs_ctx("How many clicks to open links?", "options")); - m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single-click","options"),gbox); - m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double-click","options"),gbox); + m_pClickRadio = new QRadioButton(__tr2qs_ctx("Single-click", "options"), gbox); + m_pDoubleClickRadio = new QRadioButton(__tr2qs_ctx("Double-click", "options"), gbox); switch(KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum)) { @@ -63,23 +62,23 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent) break; } - gbox = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Protocol Handler","options")); + gbox = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Protocol Handler", "options")); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Use system URL handlers","options"),KviOption_boolUseSystemUrlHandlers); + KviBoolSelector * b = addBoolSelector(gbox, __tr2qs_ctx("Use system URL handlers", "options"), KviOption_boolUseSystemUrlHandlers); #endif - m_pHttpHandler=addStringSelector(gbox,__tr2qs_ctx("http:// handler command:","options"),KviOption_stringUrlHttpCommand); + m_pHttpHandler = addStringSelector(gbox, __tr2qs_ctx("http:// handler command:", "options"), KviOption_stringUrlHttpCommand); m_pHttpHandler->setMinimumLabelWidth(225); - m_pHttpsHandler=addStringSelector(gbox,__tr2qs_ctx("https:// handler command:","options"),KviOption_stringUrlHttpsCommand); + m_pHttpsHandler = addStringSelector(gbox, __tr2qs_ctx("https:// handler command:", "options"), KviOption_stringUrlHttpsCommand); m_pHttpsHandler->setMinimumLabelWidth(225); - m_pFtpHandler=addStringSelector(gbox,__tr2qs_ctx("ftp:// handler command:","options"),KviOption_stringUrlFtpCommand); + m_pFtpHandler = addStringSelector(gbox, __tr2qs_ctx("ftp:// handler command:", "options"), KviOption_stringUrlFtpCommand); m_pFtpHandler->setMinimumLabelWidth(225); - m_pMailtoHandler=addStringSelector(gbox,__tr2qs_ctx("mailto: handler command:","options"),KviOption_stringUrlMailtoCommand); + m_pMailtoHandler = addStringSelector(gbox, __tr2qs_ctx("mailto: handler command:", "options"), KviOption_stringUrlMailtoCommand); m_pMailtoHandler->setMinimumLabelWidth(225); - m_pFileHandler=addStringSelector(gbox,__tr2qs_ctx("file:// handler command:","options"),KviOption_stringUrlFileCommand); + m_pFileHandler = addStringSelector(gbox, __tr2qs_ctx("file:// handler command:", "options"), KviOption_stringUrlFileCommand); m_pFileHandler->setMinimumLabelWidth(225); - m_pOtherHandler=addStringSelector(gbox,__tr2qs_ctx("Unknown protocol handler command:","options"),KviOption_stringUrlUnknownCommand); + m_pOtherHandler = addStringSelector(gbox, __tr2qs_ctx("Unknown protocol handler command:", "options"), KviOption_stringUrlUnknownCommand); m_pOtherHandler->setMinimumLabelWidth(225); #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) @@ -89,10 +88,10 @@ OptionsWidget_urlHandlers::OptionsWidget_urlHandlers(QWidget * parent) m_pFileHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); m_pMailtoHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); m_pOtherHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); - connect(b,SIGNAL(toggled(bool)),this,SLOT(toggleEditors(bool))); + connect(b, SIGNAL(toggled(bool)), this, SLOT(toggleEditors(bool))); #endif - addRowSpacer(0,START_ROW+6,0,START_ROW+6); + addRowSpacer(0, START_ROW + 6, 0, START_ROW + 6); } OptionsWidget_urlHandlers::~OptionsWidget_urlHandlers() @@ -114,44 +113,67 @@ void OptionsWidget_urlHandlers::commit() KviOptionsWidget::commit(); if(m_pClickRadio->isChecked()) - KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum)=1; + KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum) = 1; if(m_pDoubleClickRadio->isChecked()) - KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum)=2; + KVI_OPTION_UINT(KviOption_uintUrlMouseClickNum) = 2; #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("@MAGIC@","\\\\"); - - KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("@MAGIC@","\\\\"); - - KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("@MAGIC@","\\\\"); - - KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("@MAGIC@","\\\\"); - - KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("@MAGIC@","\\\\"); - - KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@"); - KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\"); - KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlHttpCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlHttpCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlHttpCommand) + .replace("@MAGIC@", "\\\\"); + + KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand) + .replace("@MAGIC@", "\\\\"); + + KVI_OPTION_STRING(KviOption_stringUrlFtpCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlFtpCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlFtpCommand) + .replace("@MAGIC@", "\\\\"); + + KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand) + .replace("@MAGIC@", "\\\\"); + + KVI_OPTION_STRING(KviOption_stringUrlFileCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlFileCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlFileCommand) + .replace("@MAGIC@", "\\\\"); + + KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand) + .replace("\\\\", "@MAGIC@"); + KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand) + .replace("\\", "\\\\"); + KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand) + .replace("@MAGIC@", "\\\\"); //Check for escaped " in url handler ( \" ) - KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\""); - KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\""); - KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\\"","\\\""); - KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\\"","\\\""); - KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\\"","\\\""); - KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\\"","\\\""); + KVI_OPTION_STRING(KviOption_stringUrlHttpCommand) + .replace("\\\\\"", "\\\""); + KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand) + .replace("\\\\\"", "\\\""); + KVI_OPTION_STRING(KviOption_stringUrlFtpCommand) + .replace("\\\\\"", "\\\""); + KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand) + .replace("\\\\\"", "\\\""); + KVI_OPTION_STRING(KviOption_stringUrlFileCommand) + .replace("\\\\\"", "\\\""); + KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand) + .replace("\\\\\"", "\\\""); #endif } - #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h index c797c6f8e..44f1debed 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.h +++ b/src/modules/options/OptionsWidget_urlHandlers.h @@ -42,6 +42,7 @@ public: ~OptionsWidget_urlHandlers(); virtual void commit(); + protected: QRadioButton * m_pClickRadio; QRadioButton * m_pDoubleClickRadio; diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp index 819279821..47bb8e81f 100644 --- a/src/modules/options/OptionsWidget_userList.cpp +++ b/src/modules/options/OptionsWidget_userList.cpp @@ -31,9 +31,8 @@ #include - OptionsWidget_userList::OptionsWidget_userList(QWidget * parent) -: KviOptionsWidget(parent,"userlistlook_options_widget") + : KviOptionsWidget(parent, "userlistlook_options_widget") { } @@ -41,123 +40,118 @@ OptionsWidget_userList::~OptionsWidget_userList() { } - OptionsWidget_userListForeground::OptionsWidget_userListForeground(QWidget * parent) -: KviOptionsWidget(parent,"userlistlook_foreground_options_widget") + : KviOptionsWidget(parent, "userlistlook_foreground_options_widget") { createLayout(); - addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontUserListView); + addFontSelector(0, 0, 1, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontUserListView); - KviTalGroupBox * g = addGroupBox(0,1,1,1,Qt::Horizontal,__tr2qs_ctx("Nickname Colors","options")); - addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewNormalForeground); - addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionForeground); - addColorSelector(g,__tr2qs_ctx("IRC Op:","options"),KviOption_colorUserListViewIrcOpForeground); - addColorSelector(g,__tr2qs_ctx("Channel owner:","options"),KviOption_colorUserListViewChanOwnerForeground); - addColorSelector(g,__tr2qs_ctx("Channel admin:","options"),KviOption_colorUserListViewChanAdminForeground); - addColorSelector(g,__tr2qs_ctx("Op:","options"),KviOption_colorUserListViewOpForeground); - addColorSelector(g,__tr2qs_ctx("Half-op:","options"),KviOption_colorUserListViewHalfOpForeground); - addColorSelector(g,__tr2qs_ctx("Voice:","options"),KviOption_colorUserListViewVoiceForeground); - addColorSelector(g,__tr2qs_ctx("User-op:","options"),KviOption_colorUserListViewUserOpForeground); + KviTalGroupBox * g = addGroupBox(0, 1, 1, 1, Qt::Horizontal, __tr2qs_ctx("Nickname Colors", "options")); + addColorSelector(g, __tr2qs_ctx("Normal:", "options"), KviOption_colorUserListViewNormalForeground); + addColorSelector(g, __tr2qs_ctx("Selected:", "options"), KviOption_colorUserListViewSelectionForeground); + addColorSelector(g, __tr2qs_ctx("IRC Op:", "options"), KviOption_colorUserListViewIrcOpForeground); + addColorSelector(g, __tr2qs_ctx("Channel owner:", "options"), KviOption_colorUserListViewChanOwnerForeground); + addColorSelector(g, __tr2qs_ctx("Channel admin:", "options"), KviOption_colorUserListViewChanAdminForeground); + addColorSelector(g, __tr2qs_ctx("Op:", "options"), KviOption_colorUserListViewOpForeground); + addColorSelector(g, __tr2qs_ctx("Half-op:", "options"), KviOption_colorUserListViewHalfOpForeground); + addColorSelector(g, __tr2qs_ctx("Voice:", "options"), KviOption_colorUserListViewVoiceForeground); + addColorSelector(g, __tr2qs_ctx("User-op:", "options"), KviOption_colorUserListViewUserOpForeground); KviTalHBox * ahb = new KviTalHBox(g); ahb->setSpacing(4); - KviBoolSelector * ab = addBoolSelector(ahb,__tr2qs_ctx("Away (blend color):","options"),KviOption_boolUserListViewUseAwayColor); - QString szTip = __tr2qs("The color selected, will be blended with the user rank foreground color.
" \ - "You should also consider your theme's style, color and the userlist background selected color for optimum visibility.
" \ - "If no color is selected respective user rank color specified will be used instead."); + KviBoolSelector * ab = addBoolSelector(ahb, __tr2qs_ctx("Away (blend color):", "options"), KviOption_boolUserListViewUseAwayColor); + QString szTip = __tr2qs("The color selected, will be blended with the user rank foreground color.
" + "You should also consider your theme's style, color and the userlist background selected color for optimum visibility.
" + "If no color is selected respective user rank color specified will be used instead."); - KviColorSelector * as = addColorSelector(ahb,QString(),KviOption_colorUserListViewAwayForeground); - connect(ab,SIGNAL(toggled(bool)),as,SLOT(setEnabled(bool))); + KviColorSelector * as = addColorSelector(ahb, QString(), KviOption_colorUserListViewAwayForeground); + connect(ab, SIGNAL(toggled(bool)), as, SLOT(setEnabled(bool))); mergeTip(ab, szTip); KviTalHBox * hb = new KviTalHBox(g); hb->setSpacing(4); - KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick); - KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick)); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + KviBoolSelector * b = addBoolSelector(hb, __tr2qs_ctx("Use different color for own nick:", "options"), KviOption_boolUseDifferentColorForOwnNick); + KviColorSelector * s = addColorSelector(hb, "", KviOption_colorUserListViewOwnForeground, KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick)); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); - addRowSpacer(0,3,0,3); + addRowSpacer(0, 3, 0, 3); } OptionsWidget_userListForeground::~OptionsWidget_userListForeground() { } - OptionsWidget_userListGrid::OptionsWidget_userListGrid(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { createLayout(); - KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid); + KviBoolSelector * b = addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Draw nickname grid", "options"), KviOption_boolUserListViewDrawGrid); - KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool))); + KviColorSelector * s = addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Grid color:", "options"), KviOption_colorUserListViewGrid, KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); + connect(b, SIGNAL(toggled(bool)), s, SLOT(setEnabled(bool))); - KviTalHBox* hb = new KviTalHBox(this); - addWidgetToLayout(hb,0,2,0,2); + KviTalHBox * hb = new KviTalHBox(this); + addWidgetToLayout(hb, 0, 2, 0, 2); hb->setSpacing(4); - QLabel * l = new QLabel(__tr2qs_ctx("Grid type:","options"),hb); + QLabel * l = new QLabel(__tr2qs_ctx("Grid type:", "options"), hb); l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,SIGNAL(toggled(bool)),l,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), l, SLOT(setEnabled(bool))); m_pGridTypeCombo = new QComboBox(hb); - m_pGridTypeCombo->addItem(__tr2qs_ctx("3D Grid","options")); - m_pGridTypeCombo->addItem(__tr2qs_ctx("3D Buttons","options")); - m_pGridTypeCombo->addItem(__tr2qs_ctx("Plain Grid","options")); - m_pGridTypeCombo->addItem(__tr2qs_ctx("Dotted Grid","options")); + m_pGridTypeCombo->addItem(__tr2qs_ctx("3D Grid", "options")); + m_pGridTypeCombo->addItem(__tr2qs_ctx("3D Buttons", "options")); + m_pGridTypeCombo->addItem(__tr2qs_ctx("Plain Grid", "options")); + m_pGridTypeCombo->addItem(__tr2qs_ctx("Dotted Grid", "options")); m_pGridTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintUserListViewGridType)); m_pGridTypeCombo->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,SIGNAL(toggled(bool)),m_pGridTypeCombo,SLOT(setEnabled(bool))); + connect(b, SIGNAL(toggled(bool)), m_pGridTypeCombo, SLOT(setEnabled(bool))); - addRowSpacer(0,3,0,3); + addRowSpacer(0, 3, 0, 3); } OptionsWidget_userListGrid::~OptionsWidget_userListGrid() { } - void OptionsWidget_userListGrid::commit() { KviOptionsWidget::commit(); KVI_OPTION_UINT(KviOption_uintUserListViewGridType) = m_pGridTypeCombo->currentIndex(); if(KVI_OPTION_UINT(KviOption_uintUserListViewGridType) > KVI_USERLISTVIEW_GRIDTYPE_MAXIMUM) KVI_OPTION_UINT(KviOption_uintUserListViewGridType) = KVI_USERLISTVIEW_GRIDTYPE_DEFAULT; - } - OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * parent) -: KviOptionsWidget(parent,"userlistlook_background_options_widget") + : KviOptionsWidget(parent, "userlistlook_background_options_widget") { createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); - addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewBackground); - addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorUserListViewSelectionBackground); + KviTalGroupBox * g = addGroupBox(0, 0, 1, 0, Qt::Horizontal, __tr2qs_ctx("Background Colors", "options")); + addColorSelector(g, __tr2qs_ctx("Normal:", "options"), KviOption_colorUserListViewBackground); + addColorSelector(g, __tr2qs_ctx("Selected:", "options"), KviOption_colorUserListViewSelectionBackground); - addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapUserListViewBackground); + addPixmapSelector(0, 1, 1, 1, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapUserListViewBackground); - addLabel(0,2,0,2,__tr2qs_ctx("Horizontal alignment:","options")); - m_pHorizontalAlign=new QComboBox(this); - addWidgetToLayout(m_pHorizontalAlign,1,2,1,2); + addLabel(0, 2, 0, 2, __tr2qs_ctx("Horizontal alignment:", "options")); + m_pHorizontalAlign = new QComboBox(this); + addWidgetToLayout(m_pHorizontalAlign, 1, 2, 1, 2); - addLabel(0,3,0,3,__tr2qs_ctx("Vertical alignment:","options")); - m_pVerticalAlign=new QComboBox(this); - addWidgetToLayout(m_pVerticalAlign,1,3,1,3); + addLabel(0, 3, 0, 3, __tr2qs_ctx("Vertical alignment:", "options")); + m_pVerticalAlign = new QComboBox(this); + addWidgetToLayout(m_pVerticalAlign, 1, 3, 1, 3); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Left", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Right", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Center", "options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Top", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Center", "options")); - switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignHorizontal_Mask) + switch(KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: m_pHorizontalAlign->setCurrentIndex(1); @@ -172,7 +166,7 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par m_pHorizontalAlign->setCurrentIndex(0); } - switch( KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignVertical_Mask) + switch(KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: m_pVerticalAlign->setCurrentIndex(1); @@ -186,7 +180,7 @@ OptionsWidget_userListBackground::OptionsWidget_userListBackground(QWidget * par default: m_pVerticalAlign->setCurrentIndex(0); } - layout()->setRowStretch(1,1); + layout()->setRowStretch(1, 1); } OptionsWidget_userListBackground::~OptionsWidget_userListBackground() @@ -197,55 +191,55 @@ void OptionsWidget_userListBackground::commit() { KviOptionsWidget::commit(); - int iFlags=0; + int iFlags = 0; switch(m_pHorizontalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignLeft; + iFlags |= Qt::AlignLeft; break; case 2: - iFlags|=Qt::AlignRight; + iFlags |= Qt::AlignRight; break; case 3: - iFlags|=Qt::AlignHCenter; + iFlags |= Qt::AlignHCenter; break; } switch(m_pVerticalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignTop; + iFlags |= Qt::AlignTop; break; case 2: - iFlags|=Qt::AlignBottom; + iFlags |= Qt::AlignBottom; break; case 3: - iFlags|=Qt::AlignVCenter; + iFlags |= Qt::AlignVCenter; break; } - KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign)=iFlags; + KVI_OPTION_UINT(KviOption_uintUserListPixmapAlign) = iFlags; } - OptionsWidget_userListFeatures::OptionsWidget_userListFeatures(QWidget * parent) -: KviOptionsWidget(parent,"userlistfeatures_options_widget") + : KviOptionsWidget(parent, "userlistfeatures_options_widget") { createLayout(); - addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user rank channel icons","options"),KviOption_boolShowUserChannelIcons); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel); - addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltip","options"),KviOption_boolShowUserListViewToolTips); - addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist); - addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars); - KviBoolSelector * b = addBoolSelector(0,7,0,7,__tr2qs_ctx("Place nicks starting with non-alpha characters (such as _COOL_BOY_) last","options"),KviOption_boolPlaceNickWithNonAlphaCharsAtEnd); - mergeTip(b,__tr2qs_ctx("All nicknames which include characters such as [ ] ^ _ < > | etc. " \ - "will be sorted last in userlist after all regular nicknames.
" \ - "Select this option if you prefer to see regular nicknames sorted topmost " \ - "on userlist.

Note: " \ - "Changes to this option requires KVIrc restart.","options")); - addRowSpacer(0,8,0,8); + addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Show gender icons", "options"), KviOption_boolDrawGenderIcons); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Show user rank channel icons", "options"), KviOption_boolShowUserChannelIcons); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Show user channel activity indicator", "options"), KviOption_boolShowUserChannelState); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Show label with userlist stats", "options"), KviOption_boolShowUserListStatisticLabel); + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Enable user tooltip", "options"), KviOption_boolShowUserListViewToolTips); + addBoolSelector(0, 5, 0, 5, __tr2qs_ctx("Show avatars in userlist", "options"), KviOption_boolShowAvatarsInUserlist); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Enable animated avatars", "options"), KviOption_boolEnableAnimatedAvatars); + KviBoolSelector * b = addBoolSelector(0, 7, 0, 7, __tr2qs_ctx("Place nicks starting with non-alpha characters (such as _COOL_BOY_) last", "options"), KviOption_boolPlaceNickWithNonAlphaCharsAtEnd); + mergeTip(b, __tr2qs_ctx("All nicknames which include characters such as [ ] ^ _ < > | etc. " + "will be sorted last in userlist after all regular nicknames.
" + "Select this option if you prefer to see regular nicknames sorted topmost " + "on userlist.

Note: " + "Changes to this option requires KVIrc restart.", + "options")); + addRowSpacer(0, 8, 0, 8); } OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures() diff --git a/src/modules/options/OptionsWidget_userList.h b/src/modules/options/OptionsWidget_userList.h index 1a4bd8e3e..5a42b704b 100644 --- a/src/modules/options/OptionsWidget_userList.h +++ b/src/modules/options/OptionsWidget_userList.h @@ -49,16 +49,17 @@ public: #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_userListBackground OptionsWidget_userList #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListBackground 30 - class OptionsWidget_userListBackground : public KviOptionsWidget { Q_OBJECT public: OptionsWidget_userListBackground(QWidget * parent); ~OptionsWidget_userListBackground(); + protected: - QComboBox* m_pHorizontalAlign; - QComboBox* m_pVerticalAlign; + QComboBox * m_pHorizontalAlign; + QComboBox * m_pVerticalAlign; + public: virtual void commit(); }; @@ -70,7 +71,6 @@ public: #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_userListForeground OptionsWidget_userList #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListForeground 20 - class OptionsWidget_userListForeground : public KviOptionsWidget { Q_OBJECT @@ -86,15 +86,16 @@ public: #define KVI_OPTIONS_WIDGET_PARENT_OptionsWidget_userListGrid OptionsWidget_userList #define KVI_OPTIONS_WIDGET_PRIORITY_OptionsWidget_userListGrid 30 - class OptionsWidget_userListGrid : public KviOptionsWidget { Q_OBJECT public: OptionsWidget_userListGrid(QWidget * parent); ~OptionsWidget_userListGrid(); + protected: QComboBox * m_pGridTypeCombo; + public: virtual void commit(); }; diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp index 7ea461fb5..41e76b7dd 100644 --- a/src/modules/options/OptionsWidget_windowList.cpp +++ b/src/modules/options/OptionsWidget_windowList.cpp @@ -28,41 +28,39 @@ #include "KviLocale.h" #include "KviOptions.h" - OptionsWidget_windowList::OptionsWidget_windowList(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("windowlist_options_widget"); createLayout(); - addBoolSelector(0,0,0,0,__tr2qs_ctx("Use tree window list","options"),KviOption_boolUseTreeWindowListWindowList); - addBoolSelector(0,1,0,1,__tr2qs_ctx("Sort windows by name","options"),KviOption_boolSortWindowListItemsByName); - addBoolSelector(0,2,0,2,__tr2qs_ctx("Show window icons in window list","options"),KviOption_boolUseWindowListIcons); - KviBoolSelector * b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show activity meter in window list","options"),KviOption_boolUseWindowListActivityMeter); - mergeTip(b,__tr2qs_ctx("This option enables the usage of the window list activity meter. " \ - "Each window entry will have a small indicator of the activity that is going on in that window. " \ - "The indicator is a small square that changes colors, dark colors mean low activity, " \ - "while bright colors signal high activity. KVIrc also uses some heuristics to determine " \ - "whether the activity is somewhat \"human\" or it is generated by automated entities (such as bots " \ - "or IRC servers). \"Human\" activity causes the indicator to be shaded red while automated " \ - "activity causes the indicator to be shaded blue.","options")); - - addBoolSelector(0,4,0,4,__tr2qs_ctx("Show IRC context indicator in window list","options"),KviOption_boolUseWindowListIrcContextIndicator); - addBoolSelector(0,5,0,5,__tr2qs_ctx("Enable window tooltips","options"),KviOption_boolShowWindowListToolTips); - addBoolSelector(0,6,0,6,__tr2qs_ctx("Allow the window list to be moved","options"),KviOption_boolShowTreeWindowListHandle); - addBoolSelector(0,7,0,7,__tr2qs_ctx("Show user flag for channels","options"),KviOption_boolShowUserFlagForChannelsInWindowList); - - addRowSpacer(0,8,0,8); + addBoolSelector(0, 0, 0, 0, __tr2qs_ctx("Use tree window list", "options"), KviOption_boolUseTreeWindowListWindowList); + addBoolSelector(0, 1, 0, 1, __tr2qs_ctx("Sort windows by name", "options"), KviOption_boolSortWindowListItemsByName); + addBoolSelector(0, 2, 0, 2, __tr2qs_ctx("Show window icons in window list", "options"), KviOption_boolUseWindowListIcons); + KviBoolSelector * b = addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Show activity meter in window list", "options"), KviOption_boolUseWindowListActivityMeter); + mergeTip(b, __tr2qs_ctx("This option enables the usage of the window list activity meter. " + "Each window entry will have a small indicator of the activity that is going on in that window. " + "The indicator is a small square that changes colors, dark colors mean low activity, " + "while bright colors signal high activity. KVIrc also uses some heuristics to determine " + "whether the activity is somewhat \"human\" or it is generated by automated entities (such as bots " + "or IRC servers). \"Human\" activity causes the indicator to be shaded red while automated " + "activity causes the indicator to be shaded blue.", + "options")); + + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Show IRC context indicator in window list", "options"), KviOption_boolUseWindowListIrcContextIndicator); + addBoolSelector(0, 5, 0, 5, __tr2qs_ctx("Enable window tooltips", "options"), KviOption_boolShowWindowListToolTips); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Allow the window list to be moved", "options"), KviOption_boolShowTreeWindowListHandle); + addBoolSelector(0, 7, 0, 7, __tr2qs_ctx("Show user flag for channels", "options"), KviOption_boolShowUserFlagForChannelsInWindowList); + + addRowSpacer(0, 8, 0, 8); } - OptionsWidget_windowList::~OptionsWidget_windowList() { } - OptionsWidget_windowListTree::OptionsWidget_windowListTree(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("treewindowlist_options_widget"); } @@ -71,68 +69,65 @@ OptionsWidget_windowListTree::~OptionsWidget_windowListTree() { } - OptionsWidget_windowListTreeForeground::OptionsWidget_windowListTreeForeground(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("treewindowlist_options_widget"); createLayout(); - addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTreeWindowList); + addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontTreeWindowList); - KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); + KviTalGroupBox * g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Text/Alert Colors", "options")); - addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListForeground); - addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveForeground); - addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorTreeWindowListHighlight1Foreground); - addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorTreeWindowListHighlight2Foreground); - addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorTreeWindowListHighlight3Foreground); - addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorTreeWindowListHighlight4Foreground); - addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorTreeWindowListHighlight5Foreground); + addColorSelector(g, __tr2qs_ctx("Normal:", "options"), KviOption_colorTreeWindowListForeground); + addColorSelector(g, __tr2qs_ctx("Selected:", "options"), KviOption_colorTreeWindowListActiveForeground); + addColorSelector(g, __tr2qs_ctx("Alert level 1:", "options"), KviOption_colorTreeWindowListHighlight1Foreground); + addColorSelector(g, __tr2qs_ctx("Alert level 2:", "options"), KviOption_colorTreeWindowListHighlight2Foreground); + addColorSelector(g, __tr2qs_ctx("Alert level 3:", "options"), KviOption_colorTreeWindowListHighlight3Foreground); + addColorSelector(g, __tr2qs_ctx("Alert level 4:", "options"), KviOption_colorTreeWindowListHighlight4Foreground); + addColorSelector(g, __tr2qs_ctx("Alert level 5:", "options"), KviOption_colorTreeWindowListHighlight5Foreground); - addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorTreeWindowListProgress); + addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Progress bar color:", "options"), KviOption_colorTreeWindowListProgress); - addRowSpacer(0,3,0,3); + addRowSpacer(0, 3, 0, 3); } - OptionsWidget_windowListTreeForeground::~OptionsWidget_windowListTreeForeground() { } - OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("treewindowlist_options_widget"); createLayout(); - KviTalGroupBox * g = addGroupBox(0,0,1,0,Qt::Horizontal,__tr2qs_ctx("Background Colors","options")); - addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeWindowListBackground); - addColorSelector(g,__tr2qs_ctx("Selected:","options"),KviOption_colorTreeWindowListActiveBackground); + KviTalGroupBox * g = addGroupBox(0, 0, 1, 0, Qt::Horizontal, __tr2qs_ctx("Background Colors", "options")); + addColorSelector(g, __tr2qs_ctx("Normal:", "options"), KviOption_colorTreeWindowListBackground); + addColorSelector(g, __tr2qs_ctx("Selected:", "options"), KviOption_colorTreeWindowListActiveBackground); - addPixmapSelector(0,1,1,1,__tr2qs_ctx("Background image:","options"),KviOption_pixmapTreeWindowListBackground); + addPixmapSelector(0, 1, 1, 1, __tr2qs_ctx("Background image:", "options"), KviOption_pixmapTreeWindowListBackground); - addLabel(0,2,0,2,__tr2qs_ctx("Horizontal align:","options")); - m_pHorizontalAlign=new QComboBox(this); - addWidgetToLayout(m_pHorizontalAlign,1,2,1,2); + addLabel(0, 2, 0, 2, __tr2qs_ctx("Horizontal align:", "options")); + m_pHorizontalAlign = new QComboBox(this); + addWidgetToLayout(m_pHorizontalAlign, 1, 2, 1, 2); - addLabel(0,3,0,3,__tr2qs_ctx("Vertical align:","options")); - m_pVerticalAlign=new QComboBox(this); - addWidgetToLayout(m_pVerticalAlign,1,3,1,3); + addLabel(0, 3, 0, 3, __tr2qs_ctx("Vertical align:", "options")); + m_pVerticalAlign = new QComboBox(this); + addWidgetToLayout(m_pVerticalAlign, 1, 3, 1, 3); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options")); - m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Left", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Right", "options")); + m_pHorizontalAlign->addItem(__tr2qs_ctx("Center", "options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options")); - m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Tile", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Top", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom", "options")); + m_pVerticalAlign->addItem(__tr2qs_ctx("Center", "options")); - switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignHorizontal_Mask) + switch(KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignHorizontal_Mask) { case Qt::AlignLeft: m_pHorizontalAlign->setCurrentIndex(1); @@ -147,7 +142,7 @@ OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(Q m_pHorizontalAlign->setCurrentIndex(0); } - switch( KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignVertical_Mask) + switch(KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) & Qt::AlignVertical_Mask) { case Qt::AlignTop: m_pVerticalAlign->setCurrentIndex(1); @@ -162,100 +157,94 @@ OptionsWidget_windowListTreeBackground::OptionsWidget_windowListTreeBackground(Q m_pVerticalAlign->setCurrentIndex(0); } - layout()->setRowStretch(1,1); + layout()->setRowStretch(1, 1); } - OptionsWidget_windowListTreeBackground::~OptionsWidget_windowListTreeBackground() { } - void OptionsWidget_windowListTreeBackground::commit() { KviOptionsWidget::commit(); - int iFlags=0; + int iFlags = 0; switch(m_pHorizontalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignLeft; + iFlags |= Qt::AlignLeft; break; case 2: - iFlags|=Qt::AlignRight; + iFlags |= Qt::AlignRight; break; case 3: - iFlags|=Qt::AlignHCenter; + iFlags |= Qt::AlignHCenter; break; } switch(m_pVerticalAlign->currentIndex()) { case 1: - iFlags|=Qt::AlignTop; + iFlags |= Qt::AlignTop; break; case 2: - iFlags|=Qt::AlignBottom; + iFlags |= Qt::AlignBottom; break; case 3: - iFlags|=Qt::AlignVCenter; + iFlags |= Qt::AlignVCenter; break; } - KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign)=iFlags; + KVI_OPTION_UINT(KviOption_uintTreeWindowListPixmapAlign) = iFlags; } - OptionsWidget_windowListTreeFeatures::OptionsWidget_windowListTreeFeatures(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("treewindowlist_options_widget"); createLayout(); KviUIntSelector * u; - - u = addUIntSelector(0,1,0,1,__tr2qs_ctx("Minimum width:","options"),KviOption_uintTreeWindowListMinimumWidth,24,1024,125); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - addBoolSelector(0,3,0,3,__tr2qs_ctx("Mouse wheel changes the active window instead of scrolling the scrollbar","options"),KviOption_boolWheelScrollsWindowsList); - addRowSpacer(0,4,0,4); -} + u = addUIntSelector(0, 1, 0, 1, __tr2qs_ctx("Minimum width:", "options"), KviOption_uintTreeWindowListMinimumWidth, 24, 1024, 125); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + addBoolSelector(0, 3, 0, 3, __tr2qs_ctx("Mouse wheel changes the active window instead of scrolling the scrollbar", "options"), KviOption_boolWheelScrollsWindowsList); + addRowSpacer(0, 4, 0, 4); +} OptionsWidget_windowListTreeFeatures::~OptionsWidget_windowListTreeFeatures() { } - OptionsWidget_windowListClassic::OptionsWidget_windowListClassic(QWidget * parent) -: KviOptionsWidget(parent) + : KviOptionsWidget(parent) { setObjectName("classicwindowlist_options_widget"); createLayout(); KviUIntSelector * u; - addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontWindowList); - KviTalGroupBox *g = addGroupBox(0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options")); - addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorWindowListNormalText); - addColorSelector(g,__tr2qs_ctx("Minimized:","options"), KviOption_colorWindowListMinimizedText); - addColorSelector(g,__tr2qs_ctx("Alert level 1:","options"),KviOption_colorWindowListHighlight1Text); - addColorSelector(g,__tr2qs_ctx("Alert level 2:","options"),KviOption_colorWindowListHighlight2Text); - addColorSelector(g,__tr2qs_ctx("Alert level 3:","options"),KviOption_colorWindowListHighlight3Text); - addColorSelector(g,__tr2qs_ctx("Alert level 4:","options"),KviOption_colorWindowListHighlight4Text); - addColorSelector(g,__tr2qs_ctx("Alert level 5:","options"),KviOption_colorWindowListHighlight5Text); - - addColorSelector(0,2,0,2,__tr2qs_ctx("Progress bar color:","options"),KviOption_colorWindowListProgressBar); - u = addUIntSelector(0,3,0,3,__tr2qs_ctx("Minimum width of buttons:","options"),KviOption_uintWindowListButtonMinWidth,24,9999,100); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - addBoolSelector(0,4,0,4,__tr2qs_ctx("Set maximum button width","options"),KviOption_boolClassicWindowListSetMaximumButtonWidth); - u = addUIntSelector(0,5,0,5,__tr2qs_ctx("Maximum width of buttons:","options"),KviOption_uintClassicWindowListMaximumButtonWidth,24,9999,100); - u->setSuffix(__tr2qs_ctx(" pixels","options")); - addBoolSelector(0,6,0,6,__tr2qs_ctx("Use flat buttons","options"),KviOption_boolUseFlatClassicWindowListButtons); - - addRowSpacer(0,7,0,7); + addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font:", "options"), KviOption_fontWindowList); + KviTalGroupBox * g = addGroupBox(0, 1, 0, 1, Qt::Horizontal, __tr2qs_ctx("Text/Alert Colors", "options")); + addColorSelector(g, __tr2qs_ctx("Normal:", "options"), KviOption_colorWindowListNormalText); + addColorSelector(g, __tr2qs_ctx("Minimized:", "options"), KviOption_colorWindowListMinimizedText); + addColorSelector(g, __tr2qs_ctx("Alert level 1:", "options"), KviOption_colorWindowListHighlight1Text); + addColorSelector(g, __tr2qs_ctx("Alert level 2:", "options"), KviOption_colorWindowListHighlight2Text); + addColorSelector(g, __tr2qs_ctx("Alert level 3:", "options"), KviOption_colorWindowListHighlight3Text); + addColorSelector(g, __tr2qs_ctx("Alert level 4:", "options"), KviOption_colorWindowListHighlight4Text); + addColorSelector(g, __tr2qs_ctx("Alert level 5:", "options"), KviOption_colorWindowListHighlight5Text); + + addColorSelector(0, 2, 0, 2, __tr2qs_ctx("Progress bar color:", "options"), KviOption_colorWindowListProgressBar); + u = addUIntSelector(0, 3, 0, 3, __tr2qs_ctx("Minimum width of buttons:", "options"), KviOption_uintWindowListButtonMinWidth, 24, 9999, 100); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + addBoolSelector(0, 4, 0, 4, __tr2qs_ctx("Set maximum button width", "options"), KviOption_boolClassicWindowListSetMaximumButtonWidth); + u = addUIntSelector(0, 5, 0, 5, __tr2qs_ctx("Maximum width of buttons:", "options"), KviOption_uintClassicWindowListMaximumButtonWidth, 24, 9999, 100); + u->setSuffix(__tr2qs_ctx(" pixels", "options")); + addBoolSelector(0, 6, 0, 6, __tr2qs_ctx("Use flat buttons", "options"), KviOption_boolUseFlatClassicWindowListButtons); + + addRowSpacer(0, 7, 0, 7); } - OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic() { } diff --git a/src/modules/options/OptionsWidget_windowList.h b/src/modules/options/OptionsWidget_windowList.h index 0a6dcfd3c..a062273c7 100644 --- a/src/modules/options/OptionsWidget_windowList.h +++ b/src/modules/options/OptionsWidget_windowList.h @@ -25,12 +25,10 @@ // //=============================================================================== - #include "KviOptionsWidget.h" #include - #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_windowList KviIconManager::ClassicWindowList #define KVI_OPTIONS_WIDGET_NAME_OptionsWidget_windowList __tr2qs_no_lookup("Window List") #define KVI_OPTIONS_WIDGET_MINIMAL_USER_EXPERIENCE_LEVEL_OptionsWidget_windowList 2 @@ -84,8 +82,9 @@ class OptionsWidget_windowListTreeBackground : public KviOptionsWidget { Q_OBJECT private: - QComboBox* m_pHorizontalAlign; - QComboBox* m_pVerticalAlign; + QComboBox * m_pHorizontalAlign; + QComboBox * m_pVerticalAlign; + public: OptionsWidget_windowListTreeBackground(QWidget * parent); ~OptionsWidget_windowListTreeBackground(); diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 9cb3ad246..ff958f594 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -38,7 +38,7 @@ #include -KviPointerHashTable * g_pOptionsDialogDict = 0; +KviPointerHashTable * g_pOptionsDialogDict = 0; OptionsInstanceManager * g_pOptionsInstanceManager = 0; @@ -70,7 +70,6 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall *) return true; } - /* @doc: options.dialog @type: @@ -92,45 +91,51 @@ static bool options_kvs_cmd_save(KviKvsModuleCommandCall *) [fnc]$options.isDialog[/fnc] */ - static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) { QString szGroup; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup) + KVSM_PARAMETER("options_group", KVS_PT_STRING, KVS_PF_OPTIONAL, szGroup) KVSM_PARAMETERS_END(c) - if(szGroup.isEmpty())szGroup = "general"; + if(szGroup.isEmpty()) + szGroup = "general"; if(szGroup != "general" && szGroup != "theme") { - c->warning(__tr2qs_ctx("No such options_group %Q","options"),&szGroup); + c->warning(__tr2qs_ctx("No such options_group %Q", "options"), &szGroup); return true; } OptionsDialog * d = g_pOptionsDialogDict->find(szGroup); if(d) { - if(c->hasSwitch('t',"toplevel")) + if(c->hasSwitch('t', "toplevel")) { if(d->parent()) { d->setParent(0); - d->setGeometry(0,0,d->width(),d->height()); + d->setGeometry(0, 0, d->width(), d->height()); } - } else { + } + else + { if(d->parent() != g_pMainWindow->splitter()) { d->setParent(g_pMainWindow->splitter()); - d->setGeometry(0,0,d->width(),d->height()); + d->setGeometry(0, 0, d->width(), d->height()); d->show(); } } - } else { - if(c->hasSwitch('t',"toplevel")) + } + else + { + if(c->hasSwitch('t', "toplevel")) + { + d = new OptionsDialog(g_pMainWindow, szGroup, true); + } + else { - d = new OptionsDialog(g_pMainWindow,szGroup,true); - } else { - d = new OptionsDialog(g_pMainWindow->splitter(),szGroup,false); + d = new OptionsDialog(g_pMainWindow->splitter(), szGroup, false); } - g_pOptionsDialogDict->insert(szGroup,d); + g_pOptionsDialogDict->insert(szGroup, d); } d->raise(); d->show(); @@ -153,17 +158,16 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c) @seealso: */ - -static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c,OptionsWidgetInstanceEntry * e,const char * prefix) +static void options_kvs_module_print_pages(KviKvsModuleCommandCall * c, OptionsWidgetInstanceEntry * e, const char * prefix) { - c->window()->output(KVI_OUT_SYSTEMMESSAGE,"%s%c%s%c (%Q)",prefix,KviControlCodes::Bold,e->szClassName,KviControlCodes::Bold,&(e->szName)); + c->window()->output(KVI_OUT_SYSTEMMESSAGE, "%s%c%s%c (%Q)", prefix, KviControlCodes::Bold, e->szClassName, KviControlCodes::Bold, &(e->szName)); KviCString szPre = prefix; szPre.append(" "); if(e->pChildList) { - for(OptionsWidgetInstanceEntry * ex = e->pChildList->first();ex;ex = e->pChildList->next()) + for(OptionsWidgetInstanceEntry * ex = e->pChildList->first(); ex; ex = e->pChildList->next()) { - options_kvs_module_print_pages(c,ex,szPre.ptr()); + options_kvs_module_print_pages(c, ex, szPre.ptr()); } } } @@ -172,9 +176,9 @@ static bool options_kvs_cmd_pages(KviKvsModuleCommandCall * c) { KviPointerList * l = g_pOptionsInstanceManager->instanceEntryTree(); - for(OptionsWidgetInstanceEntry * e = l->first();e;e = l->next()) + for(OptionsWidgetInstanceEntry * e = l->first(); e; e = l->next()) { - options_kvs_module_print_pages(c,e,""); + options_kvs_module_print_pages(c, e, ""); } return true; @@ -201,13 +205,13 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) { QString szOption; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("option",KVS_PT_STRING,0,szOption) + KVSM_PARAMETER("option", KVS_PT_STRING, 0, szOption) KVSM_PARAMETERS_END(c) OptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(szOption.toUtf8().data()); if(!e) { - c->warning(__tr2qs_ctx("No such options page class name %Q","options"),&szOption); + c->warning(__tr2qs_ctx("No such options page class name %Q", "options"), &szOption); return true; } @@ -220,11 +224,10 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) } OptionsWidgetContainer * wc = new OptionsWidgetContainer( - g_pMainWindow, - !c->hasSwitch('n',"non-modal") - ); + g_pMainWindow, + !c->hasSwitch('n', "non-modal")); - wc->setup(g_pOptionsInstanceManager->getInstance(e,wc)); + wc->setup(g_pOptionsInstanceManager->getInstance(e, wc)); //wc->setModal(true); @@ -256,14 +259,14 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c) { QString szGroup; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup) + KVSM_PARAMETER("options_group", KVS_PT_STRING, KVS_PF_OPTIONAL, szGroup) KVSM_PARAMETERS_END(c) - if(szGroup.isEmpty())szGroup = "general"; + if(szGroup.isEmpty()) + szGroup = "general"; c->returnValue()->setBoolean(g_pOptionsDialogDict->find(szGroup)); return true; } - /* @doc: options.close @type: @@ -283,12 +286,11 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c) [fnc]$options.isDialog[/fnc] */ - static bool options_kvs_cmd_close(KviKvsModuleCommandCall * c) { QString szGroup; KVSM_PARAMETERS_BEGIN(c) - KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup) + KVSM_PARAMETER("options_group", KVS_PT_STRING, KVS_PF_OPTIONAL, szGroup) KVSM_PARAMETERS_END(c) if(szGroup.isEmpty()) szGroup = "general"; @@ -316,36 +318,36 @@ static bool options_kvs_cmd_close(KviKvsModuleCommandCall * c) return true; } - static bool options_module_init(KviModule * m) { g_pOptionsInstanceManager = new OptionsInstanceManager(); - KVSM_REGISTER_SIMPLE_COMMAND(m,"dialog",options_kvs_cmd_dialog); - KVSM_REGISTER_SIMPLE_COMMAND(m,"close",options_kvs_cmd_close); - KVSM_REGISTER_SIMPLE_COMMAND(m,"save",options_kvs_cmd_save); - KVSM_REGISTER_SIMPLE_COMMAND(m,"pages",options_kvs_cmd_pages); - KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",options_kvs_cmd_edit); - KVSM_REGISTER_FUNCTION(m,"isDialog",options_kvs_fnc_isdialog); + KVSM_REGISTER_SIMPLE_COMMAND(m, "dialog", options_kvs_cmd_dialog); + KVSM_REGISTER_SIMPLE_COMMAND(m, "close", options_kvs_cmd_close); + KVSM_REGISTER_SIMPLE_COMMAND(m, "save", options_kvs_cmd_save); + KVSM_REGISTER_SIMPLE_COMMAND(m, "pages", options_kvs_cmd_pages); + KVSM_REGISTER_SIMPLE_COMMAND(m, "edit", options_kvs_cmd_edit); + KVSM_REGISTER_FUNCTION(m, "isDialog", options_kvs_fnc_isdialog); - g_pOptionsDialogDict = new KviPointerHashTable; + g_pOptionsDialogDict = new KviPointerHashTable; g_pOptionsDialogDict->setAutoDelete(false); return true; } -static bool options_module_cleanup(KviModule *m) +static bool options_module_cleanup(KviModule * m) { - KviPointerHashTableIterator it(*g_pOptionsDialogDict); + KviPointerHashTableIterator it(*g_pOptionsDialogDict); KviPointerList l; l.setAutoDelete(false); OptionsDialog * d; - while( (d = it.current()) ) + while((d = it.current())) { l.append(d); ++it; } - for(d = l.first();d;d = l.next())delete d; + for(d = l.first(); d; d = l.next()) + delete d; delete g_pOptionsDialogDict; g_pOptionsDialogDict = 0; @@ -362,13 +364,12 @@ static bool options_module_can_unload(KviModule *) } KVIRC_MODULE( - "Options", // module name - "4.0.0", // module version - "Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) - "Options Dialog", - options_module_init, - options_module_can_unload, - 0, - options_module_cleanup, - "options" -) + "Options", // module name + "4.0.0", // module version + "Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) + "Options Dialog", + options_module_init, + options_module_can_unload, + 0, + options_module_cleanup, + "options") -- cgit v1.3.1-10-gc9f91