From: Pino Toscano Date: Tue, 13 Jun 2006 12:33:28 +0000 (+0000) Subject: Port to the new KDialog API X-Git-Tag: v3.80.2~70 X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=20ce2f870b8889614be67d324e4c0e8b22de0f3a;p=libqmvoc.git Port to the new KDialog API svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=551005 --- diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp index 725ee83..b0c30dd 100644 --- a/kdeeduui/kdeeduglossary.cpp +++ b/kdeeduui/kdeeduglossary.cpp @@ -194,40 +194,45 @@ QList Glossary::readItems( QDomDocument &itemDocument ) } GlossaryDialog::GlossaryDialog( bool folded, QWidget *parent ) - : KDialogBase( Plain, i18n( "Glossary" ), Close, NoDefault, parent, "glossary-dialog", false ) + : KDialog( parent ) { + setCaption( i18n( "Glossary" ) ); + setButtons( Close ); + //this string will be used for all items. If a backgroundpicture should //be used call Glossary::setBackgroundPicture(). m_htmlbasestring = "" ; m_folded = folded; - QVBoxLayout *vbox = new QVBoxLayout( plainPage() ); + QWidget *main = new QWidget( this ); + setMainWidget( main ); + QVBoxLayout *vbox = new QVBoxLayout( main ); vbox->setMargin( 0 ); - vbox->setSpacing( KDialog::spacingHint() ); + vbox->setSpacing( spacingHint() ); vbox->activate(); QHBoxLayout *hbox = new QHBoxLayout(); hbox->setMargin( 0 ); - hbox->setSpacing( KDialog::spacingHint() ); + hbox->setSpacing( spacingHint() ); hbox->activate(); - QToolButton *clear = new QToolButton( plainPage() ); + QToolButton *clear = new QToolButton( main ); clear->setIcon( SmallIcon( "locationbar_erase" ) ); clear->setToolTip( i18n( "Clear filter" ) ); hbox->addWidget( clear ); - QLabel *lbl = new QLabel( plainPage() ); + QLabel *lbl = new QLabel( main ); lbl->setText( i18n( "Search:" ) ); hbox->addWidget( lbl ); - m_search = new K3ListViewSearchLine( plainPage(), 0L ); + m_search = new K3ListViewSearchLine( main, 0L ); m_search->setObjectName( "search-line" ); hbox->addWidget( m_search ); vbox->addLayout( hbox ); setFocusProxy(m_search); - QSplitter *vs = new QSplitter( plainPage() ); + QSplitter *vs = new QSplitter( main ); vbox->addWidget( vs ); m_glosstree = new K3ListView( vs ); @@ -257,7 +262,7 @@ void GlossaryDialog::keyPressEvent(QKeyEvent* e) if (e->key() == Qt::Key_Return) { e->ignore(); } - KDialogBase::keyPressEvent(e); + KDialog::keyPressEvent(e); } void GlossaryDialog::displayItem( const KUrl& url, const KParts::URLArgs& ) diff --git a/kdeeduui/kdeeduglossary.h b/kdeeduui/kdeeduglossary.h index 9afdbac..f8127a3 100644 --- a/kdeeduui/kdeeduglossary.h +++ b/kdeeduui/kdeeduglossary.h @@ -18,7 +18,7 @@ #include #include -#include +#include class QChar; class QDomDocument; @@ -242,7 +242,7 @@ class EDUUI_EXPORT GlossaryItem * @author Pino Toscano * @author Carsten Niehaus */ -class EDUUI_EXPORT GlossaryDialog : public KDialogBase +class EDUUI_EXPORT GlossaryDialog : public KDialog { Q_OBJECT