]> Git trees. - libqmvoc.git/commitdiff
GIT / libqmvoc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b0f6d6)
Port to the new KDialog API
authorPino Toscano <pino@kde.org>
Tue, 13 Jun 2006 12:33:28 +0000 (12:33 +0000)
committerPino Toscano <pino@kde.org>
Tue, 13 Jun 2006 12:33:28 +0000 (12:33 +0000)
svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=551005

kdeeduui/kdeeduglossary.cpp patch | blob | history
kdeeduui/kdeeduglossary.h patch | blob | history

diff --git a/kdeeduui/kdeeduglossary.cpp b/kdeeduui/kdeeduglossary.cpp
index 725ee83b337dbab9cca2b241ea1f09f53de21ae0..b0c30ddfe00fe53d7fad1ad5a025662670edc707 100644 (file)
--- a/kdeeduui/kdeeduglossary.cpp
+++ b/kdeeduui/kdeeduglossary.cpp
@@ -194,40 +194,45 @@ QList<GlossaryItem*> 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 = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><body%1>" ;
 
        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 9afdbacd6fd9f4a0d9a31337373096cbd94cea2f..f8127a3e899b7587acf9d03e065ee15678e1b8e8 100644 (file)
--- a/kdeeduui/kdeeduglossary.h
+++ b/kdeeduui/kdeeduglossary.h
@@ -18,7 +18,7 @@
 #include <libkdeedu_ui_export.h>
 
 #include <khtml_part.h>
-#include <kdialogbase.h>
+#include <kdialog.h>
 
 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
 
QT Vocable Trainer kvtml library