From dc55f48d7612461d63be04b4eb97d2d92eec63ff Mon Sep 17 00:00:00 2001 From: Noldor Date: Sat, 17 May 2008 09:56:16 +0000 Subject: addmulticellwidget QT4 port (wip) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1804 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/kvirc/ui/kvi_cryptcontroller.cpp | 19 ++++--------- src/kvirc/ui/kvi_htmldialog.cpp | 7 ++--- src/kvirc/ui/kvi_imagedialog.cpp | 3 --- src/kvirc/ui/kvi_ircviewtools.cpp | 24 +++++++++++------ src/kvirc/ui/kvi_maskeditor.cpp | 5 ---- src/kvirc/ui/kvi_modeeditor.cpp | 3 --- src/modules/dcc/send.cpp | 3 ++- src/modules/logview/logviewmdiwindow.cpp | 18 ++++++++----- src/modules/options/optw_identity.cpp | 25 +++++++++++------ src/modules/options/optw_mediatypes.cpp | 30 ++++++++++++++------- src/modules/options/optw_nickserv.cpp | 24 +++++++++++------ src/modules/options/optw_servers.cpp | 46 +++++++++++++++++++++----------- src/modules/options/optw_texticons.cpp | 3 ++- 13 files changed, 122 insertions(+), 88 deletions(-) diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 7eede6d71..276c8a18c 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -85,38 +85,31 @@ g->addWidget(l,0,0); l = new QLabel(__tr2qs("Cryptography/text transformation"),this); g->addWidget(l,0,1,1,3); -// g->addMultiCellWidget(l,0,0,1,3); QFrame * frm = new QFrame(this); frm->setFrameStyle(QFrame::HLine | QFrame::Sunken); g->addWidget(frm,1,0,1,4); -// g->addMultiCellWidget(frm,1,1,0,3); m_pEnableCheck = new KviStyledCheckBox(__tr2qs("Use the crypt engine"),this); g->addWidget(m_pEnableCheck,2,0,1,4); - // g->addMultiCellWidget(m_pEnableCheck,2,2,0,3); connect(m_pEnableCheck,SIGNAL(toggled(bool)),this,SLOT(enableCheckToggled(bool))); m_pListBox = new KviTalListBox(this); connect(m_pListBox,SIGNAL(highlighted(KviTalListBoxItem *)),this,SLOT(engineHighlighted(KviTalListBoxItem *))); g->addWidget(m_pListBox,3,0,6,1); - // g->addMultiCellWidget(m_pListBox,3,8,0,0); - + m_pDescriptionLabel = new QLabel(this); m_pDescriptionLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft); g->addWidget(m_pDescriptionLabel,3,1,1,3); - // g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3); - + m_pAuthorLabel = new QLabel(this); m_pAuthorLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); g->addWidget(m_pAuthorLabel,4,1,1,3); - //g->addMultiCellWidget(m_pAuthorLabel,4,4,1,3); - + m_pEnableEncrypt = new KviStyledCheckBox(__tr2qs("Enable encryption"),this); g->addWidget(m_pEnableEncrypt,5,1,1,3); - // g->addMultiCellWidget(m_pEnableEncrypt,5,5,1,3); - + m_pEncryptKeyLabel = new QLabel(__tr2qs("Encrypt key:"),this); g->addWidget(m_pEncryptKeyLabel,6,1); @@ -128,8 +121,7 @@ m_pEnableDecrypt = new KviStyledCheckBox(__tr2qs("Enable decryption"),this); g->addWidget(m_pEnableDecrypt,7,1,1,3); - // g->addMultiCellWidget(m_pEnableDecrypt,7,7,1,3); - + m_pDecryptKeyLabel = new QLabel(__tr2qs("Decrypt key:"),this); g->addWidget(m_pDecryptKeyLabel,8,1); @@ -141,7 +133,6 @@ m_pOkButton = new QPushButton(__tr2qs("OK"),this); g->addWidget(m_pOkButton,9,0,1,4); - // g->addMultiCellWidget(m_pOkButton,9,9,0,3); connect(m_pOkButton,SIGNAL(clicked()),this,SLOT(okClicked())); g->setRowStretch(3,1); diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 03ebbc8ad..a6af295a6 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -59,7 +59,6 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) l = new QLabel(this); l->setText(pData->szUpperLabelText); g->addWidget(l,0,0,1,3); - // g->addMultiCellWidget(l,0,0,0,2); iUp = 1; } @@ -67,9 +66,8 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) { l = new QLabel(this); l->setText(pData->szLowerLabelText); - g->addWidget(l,2,2,1,3); -// g->addMultiCellWidget(l,2,2,0,2); - iDown = 1; + g->addWidget(l,2,0,1,3); + iDown = 1; } te = new QTextBrowser(this); @@ -81,7 +79,6 @@ KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData) //te->setReadOnly(true); g->addWidget(te,iUp,0,iDown-iUp+1,3); -// g->addMultiCellWidget(te,iUp,iDown,0,2); int iButtons = pData->szButton3Text.isEmpty() ? (pData->szButton2Text.isEmpty() ? 1 : 2) : 3; if(pData->iCancelButton > iButtons)pData->iCancelButton = iButtons; diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index adc793572..c8f63c0ed 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -111,7 +111,6 @@ KviImageDialog::KviImageDialog(QWidget * par, m_pTypeComboBox = new QComboBox(this); g->addWidget(m_pTypeComboBox,0,0,1,3); -// g->addMultiCellWidget(m_pTypeComboBox,0,0,0,2); m_pTypeList = new KviValueList; @@ -140,7 +139,6 @@ KviImageDialog::KviImageDialog(QWidget * par, QWidget * l = new QWidget(this); g->addWidget(l,1,0,1,3); -// g->addMultiCellWidget(l,1,1,0,2); m_pListBox = new KviTalListBox(this); @@ -150,7 +148,6 @@ KviImageDialog::KviImageDialog(QWidget * par, m_pTip = new KviDynamicToolTip(m_pListBox->viewport()); g->addWidget(m_pListBox,2,0,1,3); -// g->addMultiCellWidget(m_pListBox,2,2,0,2); QPushButton * b = new QPushButton(__tr2qs("Cancel"),this); connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked())); diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index 0f267a693..8a3d4e705 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -121,19 +121,23 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) QGridLayout * g = new QGridLayout(w); m_pStringToFind = new QLineEdit(w); - g->addMultiCellWidget(m_pStringToFind,0,0,0,2); + g->addWidget(m_pStringToFind,0,0,1,3); +// g->addMultiCellWidget(m_pStringToFind,0,0,0,2); connect(m_pStringToFind,SIGNAL(returnPressed()),this,SLOT(findNext())); m_pRegExp = new KviStyledCheckBox(__tr2qs("&Regular expression"),w); - g->addMultiCellWidget(m_pRegExp,1,1,0,2); + g->addWidget(m_pRegExp,1,0,1,3); +// g->addMultiCellWidget(m_pRegExp,1,1,0,2); m_pExtendedRegExp = new QCheckBox(__tr2qs("E&xtended regexp."),w); - g->addMultiCellWidget(m_pExtendedRegExp,2,2,0,2); + g->addWidget(m_pExtendedRegExp,2,0,1,3); +// g->addMultiCellWidget(m_pExtendedRegExp,2,2,0,2); m_pExtendedRegExp->setEnabled(false); connect(m_pRegExp,SIGNAL(toggled(bool)),m_pExtendedRegExp,SLOT(setEnabled(bool))); m_pCaseSensitive = new QCheckBox(__tr2qs("C&ase sensitive"),w); - g->addMultiCellWidget(m_pCaseSensitive,3,3,0,2); + g->addWidget(m_pCaseSensitive,3,0,1,3); +// g->addMultiCellWidget(m_pCaseSensitive,3,3,0,2); QPushButton * pb = new QPushButton(__tr2qs("Find &Prev."),w); connect(pb,SIGNAL(clicked()),this,SLOT(findPrev())); @@ -142,11 +146,13 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) pb = new QPushButton(__tr2qs("&Find Next"),w); pb->setDefault(true); connect(pb,SIGNAL(clicked()),this,SLOT(findNext())); - g->addMultiCellWidget(pb,4,4,1,2); + g->addWidget(pb,4,1,0,2); +// g->addMultiCellWidget(pb,4,4,1,2); m_pFindResult = new QLabel(w); m_pFindResult->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); - g->addMultiCellWidget(m_pFindResult,5,5,0,2); + g->addWidget(m_pFindResult,5,0,1,3); +// g->addMultiCellWidget(m_pFindResult,5,5,0,2); //g->setResizeMode(QGridLayout::Fixed); @@ -166,7 +172,8 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pFilterView->header()->hide(); m_pFilterView->setMinimumSize(QSize(10,10)); - g->addMultiCellWidget(m_pFilterView,0,4,0,0); + g->addWidget(m_pFilterView,0,0,5,1); +// g->addMultiCellWidget(m_pFilterView,0,4,0,0); m_pFilterItems = (KviIrcMessageCheckListItem **)kvi_malloc(KVI_NUM_MSGTYPE_OPTIONS * sizeof(KviIrcMessageCheckListItem *)); @@ -194,7 +201,8 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) tw->addTab(w1,__tr2qs("Filter")); - gl->addMultiCellWidget(tw,1,1,0,1); + gl->addWidget(tw,1,0,1,2); +// gl->addMultiCellWidget(tw,1,1,0,1); gl->setResizeMode(QGridLayout::Fixed); m_pStringToFind->setFocus(); diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 27bbb6f87..55993529a 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -75,11 +75,9 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi QLabel * tl = new QLabel(__tr2qs("New mask must match an *!*@* expression"),this); g->addWidget(tl,0,0,1,4); -// g->addMultiCellWidget(tl,0,0,0,3); m_pEdit=new QLineEdit(szMask,this); g->addWidget(m_pEdit,1,0,1,4); -// g->addMultiCellWidget(m_pEdit,1,1,0,3); m_pOkButton= new QPushButton(__tr2qs("Ok"),this); connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept())); @@ -175,7 +173,6 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo KviTalHBox * hb = new KviTalHBox(this); g->addWidget(hb,1,0,1,2); -// g->addMultiCellWidget(hb,1,1,0,1); new QLabel(__tr2qs("Filter:"),hb); m_pSearch = new QLineEdit(hb); @@ -184,7 +181,6 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo l = new QLabel(__tr2qs("Use doubleclick to edit item"),this); g->addWidget(l,1,1); g->addWidget(l,2,0,1,2); -// g->addMultiCellWidget(l,2,2,0,1); //FIX ME m_pMaskBox = new KviTalTreeWidget(this); @@ -200,7 +196,6 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo m_pMaskBox->setSortingEnabled(true); connect(m_pMaskBox,SIGNAL(doubleClicked ( KviTalTreeWidgetItem * )),this,SLOT(listViewDoubleClicked( KviTalTreeWidgetItem * ))); g->addWidget(m_pMaskBox,3,0,1,2); -// g->addMultiCellWidget(m_pMaskBox,3,3,0,1); m_pRemoveMask = new QPushButton(__tr2qs("Re&move"),this); m_pRemoveMask->setEnabled(isEnabled); diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 196335bf3..0a9b859e2 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -93,12 +93,10 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const l = new QLabel(__tr2qs("Channel Modes"),pBackground); g->addWidget(l,0,1,1,1); -// g->addMultiCellWidget(l,0,0,1,2); QFrame * f = new QFrame(pBackground); f->setFrameStyle(QFrame::HLine | QFrame::Sunken); g->addWidget(f,1,0,1,3); -// g->addMultiCellWidget(f,1,1,0,2); int i = 1; QString tmp; @@ -122,7 +120,6 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const cb->setChecked(m_szMode.contains((char)ccc.unicode())); i++; g->addWidget(cb,i,0,1,3); - // g->addMultiCellWidget(cb,i,i,0,2); } KviQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l'))); diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index a1980a646..3888084a7 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1831,7 +1831,8 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * p m_pLimitBox = new QSpinBox(0,MAX_DCC_BANDWIDTH_LIMIT-1,1,this); m_pLimitBox->setEnabled((iVal >= 0) && (iVal < MAX_DCC_BANDWIDTH_LIMIT)); connect(m_pEnableLimitCheck,SIGNAL(toggled(bool)),m_pLimitBox,SLOT(setEnabled(bool))); - g->addMultiCellWidget(m_pLimitBox,0,0,1,2); + g->addWidget(m_pLimitBox,0,1,1,2); +// g->addMultiCellWidget(m_pLimitBox,0,0,1,2); szText = " "; szText += __tr2qs_ctx("bytes/sec","dcc"); diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index c032fc0c9..5ea33dcf2 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -88,27 +88,33 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab); m_pShowChannelsCheck->setChecked(true); - layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); + layout->addWidget(m_pShowChannelsCheck,0,0,1,2); +// layout->addMultiCellWidget(m_pShowChannelsCheck,0,0,0,1); m_pShowQueryesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab); m_pShowQueryesCheck->setChecked(true); - layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); + layout->addWidget(m_pShowQueryesCheck,1,0,1,2); +// layout->addMultiCellWidget(m_pShowQueryesCheck,1,1,0,1); m_pShowConsolesCheck = new KviStyledCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab); m_pShowConsolesCheck->setChecked(true); - layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); + layout->addWidget(m_pShowConsolesCheck,2,0,1,2); +// layout->addMultiCellWidget(m_pShowConsolesCheck,2,2,0,1); m_pShowDccChatCheck = new KviStyledCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab); m_pShowDccChatCheck->setChecked(true); - layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); + layout->addWidget(m_pShowDccChatCheck,3,0,1,2); +// layout->addMultiCellWidget(m_pShowDccChatCheck,3,3,0,1); m_pShowOtherCheck = new KviStyledCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab); m_pShowOtherCheck->setChecked(true); - layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); + layout->addWidget(m_pShowOtherCheck,4,0,1,2); +// layout->addMultiCellWidget(m_pShowOtherCheck,4,4,0,1); QLabel *l; l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab); - layout->addMultiCellWidget(l,5,5,0,1); + layout->addWidget(l,5,0,1,2); +// layout->addMultiCellWidget(l,5,5,0,1); l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab); m_pFileNameMask = new QLineEdit(m_pSearchTab); diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 0db31aa33..649663da6 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -61,27 +61,31 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString "alternative 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")); - g->addMultiCellWidget(l,0,0,0,2); + g->addWidget(l,0,0,1,3); +// g->addMultiCellWidget(l,0,0,0,2); l = new QLabel(this); l->setText(__tr2qs_ctx("Alt. Nickname 1:","options")); g->addWidget(l,1,0); m_pNickEdit1 = new QLineEdit(this); - g->addMultiCellWidget(m_pNickEdit1,1,1,1,2); + g->addWidget(m_pNickEdit1,1,1,1,2); +// g->addMultiCellWidget(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); m_pNickEdit2 = new QLineEdit(this); - g->addMultiCellWidget(m_pNickEdit2,2,2,1,2); + g->addWidget(m_pNickEdit2,2,1,1,2); +// g->addMultiCellWidget(m_pNickEdit2,2,2,1,2); m_pNickEdit2->setText(n2); l = new QLabel(this); l->setText(__tr2qs_ctx("Alt. Nickname 3:","options")); g->addWidget(l,3,0); m_pNickEdit3 = new QLineEdit(this); - g->addMultiCellWidget(m_pNickEdit3,3,3,1,2); + g->addWidget(m_pNickEdit3,3,1,1,2); +// g->addMultiCellWidget(m_pNickEdit3,3,3,1,2); m_pNickEdit3->setText(n3); KviTalHBox * h = new KviTalHBox(this); h->setSpacing(8); @@ -122,7 +126,8 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz QGridLayout * g = new QGridLayout(this); m_pOutput = new QLabel(__tr2qs_ctx("
Please wait while the avatar is being downloaded
","options"),this); - g->addMultiCellWidget(m_pOutput,0,0,0,1); + g->addWidget(m_pOutput,0,0,1,2); +// g->addMultiCellWidget(m_pOutput,0,0,0,1); QPushButton * b = new QPushButton(__tr2qs_ctx("Abort","options"),this); g->addWidget(b,1,1); @@ -214,18 +219,22 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString & QLabel * l = new QLabel(msg,this); l->setMinimumWidth(250); - g->addMultiCellWidget(l,0,0,0,2); + g->addWidget(l,0,0,1,3); +// g->addMultiCellWidget(l,0,0,0,2); m_pLineEdit = new QLineEdit(this); m_pLineEdit->setText(szInitialPath); m_pLineEdit->setMinimumWidth(180); - g->addMultiCellWidget(m_pLineEdit,1,1,0,1); + g->addWidget(m_pLineEdit,1,0,1,2); +// g->addMultiCellWidget(m_pLineEdit,1,1,0,1); QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options"),this); connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked())); g->addWidget(b,1,2); - KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2); + KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8); + g->addWidget(h,2,1,1,2); +// g->addMultiCellWidget(h,2,2,1,2); b = new QPushButton(__tr2qs_ctx("&OK","options"),h); b->setMinimumWidth(80); b->setDefault(true); diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index df3ec84d6..94c4e1da0 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -75,55 +75,65 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent) connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentItemChanged(KviTalListViewItem *))); - layout()->addMultiCellWidget(m_pListView,0,0,0,2); + layout()->addWidget(m_pListView,0,0,1,3); +// layout()->addMultiCellWidget(m_pListView,0,0,0,2); QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this); layout()->addWidget(l,1,0); m_pDescription = new QLineEdit(this); - layout()->addMultiCellWidget(m_pDescription,1,1,1,2); + layout()->addWidget(m_pDescription,1,1,1,2); +// layout()->addMultiCellWidget(m_pDescription,1,1,1,2); l = new QLabel(__tr2qs_ctx("MIME type:","options"),this); layout()->addWidget(l,2,0); m_pIanaType = new QLineEdit(this); - layout()->addMultiCellWidget(m_pIanaType,2,2,1,2); + layout()->addWidget(m_pIanaType,2,1,1,2); +// layout()->addMultiCellWidget(m_pIanaType,2,2,1,2); l = new QLabel(__tr2qs_ctx("File pattern:","options"),this); layout()->addWidget(l,3,0); m_pFileMask = new QLineEdit(this); - layout()->addMultiCellWidget(m_pFileMask,3,3,1,2); + layout()->addWidget(m_pFileMask,3,1,1,2); +// layout()->addMultiCellWidget(m_pFileMask,3,3,1,2); l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this); layout()->addWidget(l,4,0); m_pMagicBytes = new QLineEdit(this); - layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); + layout()->addWidget(m_pMagicBytes,4,1,1,2); +// layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2); l = new QLabel(__tr2qs_ctx("Save path:","options"),this); layout()->addWidget(l,5,0); m_pSavePath = new QLineEdit(this); - layout()->addMultiCellWidget(m_pSavePath,5,5,1,2); + layout()->addWidget(m_pSavePath,5,1,1,2); +// layout()->addMultiCellWidget(m_pSavePath,5,5,1,2); l = new QLabel(__tr2qs_ctx("Local open command:","options"),this); layout()->addWidget(l,6,0); m_pCommandline = new QLineEdit(this); - layout()->addMultiCellWidget(m_pCommandline,6,6,1,2); + layout()->addWidget(m_pCommandline,6,1,1,2); +// layout()->addMultiCellWidget(m_pCommandline,6,6,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); m_pRemoteExecCommandline = new QLineEdit(this); - layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2); + layout()->addWidget(m_pRemoteExecCommandline,7,1,1,2); +// layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,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); m_pIcon = new QLineEdit(this); - layout()->addMultiCellWidget(m_pIcon,8,8,1,2); + layout()->addWidget(m_pIcon,8,1,1,2); +// layout()->addMultiCellWidget(m_pIcon,8,8,1,2); QFrame * f = new QFrame(this); f->setFrameStyle(QFrame::Sunken | QFrame::HLine); - layout()->addMultiCellWidget(f,9,9,0,2); + layout()->addWidget(f,9,0,1,3); +// layout()->addMultiCellWidget(f,9,9,0,2); QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this); connect(b,SIGNAL(clicked()),this,SLOT(newMediaType())); diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 29f7f7545..2dc87d151 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -58,7 +58,8 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi m_pRegisteredNickEdit = new QLineEdit(this); KviTalToolTip::add(m_pRegisteredNickEdit,html_center_begin + __tr2qs_ctx("Put here the nickname that you have registered with NickServ","options") + html_center_end); - gl->addMultiCellWidget(m_pRegisteredNickEdit,0,0,1,3); + 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); @@ -70,13 +71,15 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi "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") + html_center_end); - gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3); + 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->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3); + gl->addWidget(m_pMessageRegexpEdit,2,2,1,3); +// gl->addMultiCellWidget(m_pMessageRegexpEdit,2,2,1,3); KviTalToolTip::add(m_pMessageRegexpEdit, html_center_begin + __tr2qs_ctx("This is the simple regular expression that the identification request message " \ @@ -94,7 +97,8 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi "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") + html_center_end); - gl->addMultiCellWidget(m_pIdentifyCommandEdit,3,3,1,3); + gl->addWidget(m_pIdentifyCommandEdit,3,1,1,3); +// gl->addMultiCellWidget(m_pIdentifyCommandEdit,3,3,1,3); int iNextLine = 4; @@ -107,7 +111,8 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi KviTalToolTip::add(m_pServerMaskEdit, html_center_begin + __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") + html_center_end); - gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3); + gl->addWidget(m_pServerMaskEdit,4,1,1,3); +// gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3); iNextLine++; } else { m_pServerMaskEdit = 0; @@ -116,7 +121,8 @@ KviNickServRuleEditor::KviNickServRuleEditor(QWidget * par,bool bUseServerMaskFi l = new QLabel(html_center_begin + __tr2qs_ctx("Hint: Move the mouse cursor over the fields to get help","options") + html_center_end,this); l->setMargin(10); - gl->addMultiCellWidget(l,iNextLine,iNextLine,0,3); + gl->addWidget(l,iNextLine,0,1,4); +// gl->addMultiCellWidget(l,iNextLine,iNextLine,0,3); iNextLine++; @@ -224,7 +230,8 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),this); - gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); + 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); @@ -239,7 +246,8 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent) m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options")); connect(m_pNickServListView,SIGNAL(selectionChanged()),this,SLOT(enableDisableNickServControls())); - gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); + gl->addWidget(m_pNickServListView,1,0,1,3); +// gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); KviTalToolTip::add(m_pNickServListView, __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.
" \ diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 48efd89e5..41362e8b9 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -102,26 +102,30 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); l->setAlignment(Qt::AlignCenter); l->setMargin(10); - g->addMultiCellWidget(l,0,0,0,3); + g->addWidget(l,0,0,1,4); +// g->addMultiCellWidget(l,0,0,0,3); l->setMinimumWidth(200); l = new QLabel(__tr2qs_ctx("Description:","options"),this); g->addWidget(l,1,0); m_pDescEditor = new QLineEdit(this); - g->addMultiCellWidget(m_pDescEditor,1,1,1,3); + g->addWidget(m_pDescEditor,1,1,1,3); +// g->addMultiCellWidget(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")); // Identity tab QTabWidget * tw = new QTabWidget(this); - g->addMultiCellWidget(tw,2,2,0,3); + g->addWidget(tw,2,0,1,4); +// g->addMultiCellWidget(tw,2,2,0,3); QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab); KviTalGroupBox *gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab); - gl->addMultiCellWidget(gbox,0,0,0,1); + gl->addWidget(gbox,0,0,1,2); +// gl->addMultiCellWidget(gbox,0,0,0,1); l = new QLabel(__tr2qs_ctx("Username:","options"),gbox); m_pUserEditor = new QLineEdit(gbox); @@ -173,7 +177,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pAutoConnectCheck = new KviStyledCheckBox(__tr2qs_ctx("Connect to this network at startup","options"),tab); m_pAutoConnectCheck->setChecked(n->autoConnect()); - gl->addMultiCellWidget(m_pAutoConnectCheck,2,2,0,1); + gl->addWidget(m_pAutoConnectCheck,2,0,1,2); +// gl->addMultiCellWidget(m_pAutoConnectCheck,2,2,0,1); KviTalToolTip::add(m_pAutoConnectCheck,__tr2qs_ctx("
This option will cause KVIrc to automatically connect to this network at startup
","options")); @@ -246,7 +251,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab); - gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); + 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); @@ -259,8 +265,8 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options")); connect(m_pNickServListView,SIGNAL(selectionChanged()),this,SLOT(enableDisableNickServControls())); - - gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); + gl->addWidget(m_pNickServListView,1,0,1,3); +//// gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); KviTalToolTip::add(m_pNickServListView, __tr2qs_ctx("
This is a list of NickServ identification rules. " \ "KVIrc will use them to model its automatic interaction with NickServ on this network.
" \ @@ -425,13 +431,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); m_pHeaderLabel->setAlignment(Qt::AlignCenter); m_pHeaderLabel->setMargin(10); - g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3); + g->addWidget(m_pHeaderLabel,0,0,1,4); +// g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3); m_pHeaderLabel->setMinimumWidth(200); QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this); g->addWidget(l,1,0); m_pDescEditor = new QLineEdit(this); - g->addMultiCellWidget(m_pDescEditor,1,1,1,3); + g->addWidget(m_pDescEditor,1,1,1,3); +// g->addMultiCellWidget(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")); @@ -439,7 +447,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) // Identity tab QTabWidget * tw = new QTabWidget(this); - g->addMultiCellWidget(tw,2,2,0,3); + g->addWidget(tw,2,0,1,4); +// g->addMultiCellWidget(tw,2,2,0,3); QWidget * tab = new QWidget(tw); QGridLayout * gl = new QGridLayout(tab); @@ -550,7 +559,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) } m_pCacheIpCheck = new KviStyledCheckBox(__tr2qs_ctx("Cache IP address","options"),tab); - gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1); + gl->addWidget(m_pCacheIpCheck,2,0,1,2); +// gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1); 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.

" \ @@ -561,7 +571,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pUseIPV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),tab); - gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1); + gl->addWidget(m_pUseIPV6Check,3,0,1,2); +// gl->addMultiCellWidget(m_pUseIPV6Check,3,3,0,1); #ifdef COMPILE_IPV6_SUPPORT m_pUseIPV6Check->setChecked(s->isIpV6()); #else @@ -573,7 +584,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) "(thus your OS must have a working IPv6 stack and you must have an IPv6 connection).
","options")); m_pUseSSLCheck = new KviStyledCheckBox(__tr2qs_ctx("Use SSL protocol","options"),tab); - gl->addMultiCellWidget(m_pUseSSLCheck,4,4,0,1); + gl->addWidget(m_pUseSSLCheck,4,0,1,2); +// gl->addMultiCellWidget(m_pUseSSLCheck,4,4,0,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")); #ifndef COMPILE_SSL_SUPPORT @@ -585,7 +597,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pUseAutoConnect = new KviStyledCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); m_pUseAutoConnect->setChecked(s->autoConnect()); - gl->addMultiCellWidget(m_pUseAutoConnect,5,5,0,1); + gl->addWidget(m_pUseAutoConnect,5,0,1,2); + // gl->addMultiCellWidget(m_pUseAutoConnect,5,5,0,1); KviTalToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("
This option will cause KVIrc to connect to the IRC server when it is started.
","options")); l = new QLabel(__tr2qs_ctx("Encoding:","options"),tab); @@ -678,7 +691,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) l = new QLabel("",tab); - gl->addMultiCellWidget(l,10,10,0,1); + gl->addWidget(l,10,0,1,2); +// gl->addMultiCellWidget(l,10,10,0,1); gl->setRowStretch(10,1); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 671329eb3..de660d94b 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -97,7 +97,8 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent) ++it; } - layout()->addMultiCellWidget(m_pTable,0,0,0,1); + layout()->addWidget(m_pTable,0,0,1,2); +// layout()->addMultiCellWidget(m_pTable,0,0,0,1); m_pAdd = new QPushButton(__tr2qs_ctx("Add","options"),this); layout()->addWidget(m_pAdd,1,0); -- cgit v1.3.1-10-gc9f91