[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/dict
From:       Davide Bettio <davide.bettio () kdemail ! net>
Date:       2009-03-30 14:04:53
Message-ID: 1238421893.229963.4510.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 946912 by bettio:

Replacing KTextBrowser + ProxyWidget with Plasma::TextBrowser.


 M  +11 -14    dict.cpp  
 M  +2 -2      dict.h  


--- trunk/KDE/kdeplasma-addons/applets/dict/dict.cpp #946911:946912
@@ -20,11 +20,8 @@
 
 #include "dict.h"
 
-#include <QGraphicsProxyWidget>
 #include <QGraphicsLinearLayout>
 #include <QTimer>
-// #include <QWebView>
-// #include <QTextBrowser>
 
 #include <KTextBrowser>
 #include <KDebug>
@@ -42,6 +39,7 @@
 #include <Plasma/Animator>
 #include <Plasma/IconWidget>
 #include <Plasma/LineEdit>
+#include <Plasma/TextBrowser>
 
 #define AUTO_DEFINE_TIMEOUT 500
 
@@ -105,13 +103,12 @@
     m_wordEdit->show();
     Plasma::Animator::self()->animateItem(m_wordEdit, Plasma::Animator::AppearAnimation);
 
-    m_defBrowser = new KTextBrowser();
-    m_defBrowser->setNotifyClick(true);
-    connect(m_defBrowser,SIGNAL(urlClick(QString)),this,SLOT(linkDefine(QString)));
-    m_defBrowser->document()->setDefaultStyleSheet(QLatin1String(translationCSS));
-    m_defBrowserProxy = new QGraphicsProxyWidget(this);
-    m_defBrowserProxy->setWidget(m_defBrowser);
-    m_defBrowserProxy->hide();
+    m_defBrowser = new Plasma::TextBrowser();
+    m_defBrowser->nativeWidget()->setNotifyClick(true);
+    connect(m_defBrowser->nativeWidget(),SIGNAL(urlClick(QString)),this,SLOT(linkDefine(QString)));
+    m_defBrowser->nativeWidget()->document()->setDefaultStyleSheet(QLatin1String(translationCSS));
+    m_defBrowser->hide();
+
 //  Icon in upper-left corner
     m_icon = new Plasma::IconWidget(this);
     m_icon->setSvg(KStandardDirs::locate("icon", "oxygen/scalable/apps/accessories-dictionary.svgz"));
@@ -134,7 +131,7 @@
     m_horLayout->addItem(m_wordEdit);
     m_layout = new QGraphicsLinearLayout(Qt::Vertical);
     m_layout->addItem(m_horLayout);
-    m_layout->addItem(m_defBrowserProxy);
+    m_layout->addItem(m_defBrowser);
 
     m_source.clear();
     dataEngine(m_dataEngine)->connectSource(m_source, this);
@@ -216,11 +213,11 @@
         m_flash->kill();
     }*/
     if (!m_source.isEmpty()) {
-        m_defBrowserProxy->show();
+        m_defBrowser->show();
         // TODO Phase::self()->animateItem(m_defBrowserProxy, Phase::Appear);
     }
     if (data.contains("text"))
-        m_defBrowser->setHtml(data[QString("text")].toString());
+        m_defBrowser->nativeWidget()->setHtml(data[QString("text")].toString());
     updateGeometry();
 }
 
@@ -252,7 +249,7 @@
     else
     {    //make the definition box disappear
         // TODO Phase::self()->animateItem(m_defBrowserProxy, Phase::Disappear);
-        m_defBrowserProxy->hide();
+        m_defBrowser->hide();
     }
 
     updateConstraints();
--- trunk/KDE/kdeplasma-addons/applets/dict/dict.h #946911:946912
@@ -36,6 +36,7 @@
 {
     class IconWidget;
     class LineEdit;
+    class TextBrowser;
 }
 
 class DictApplet: public Plasma::PopupApplet
@@ -72,8 +73,7 @@
         Plasma::LineEdit *m_wordEdit;
         //Plasma::Flash *m_flash;
 //         QTextBrowser* m_defBrowser;
-        KTextBrowser* m_defBrowser;
-        QGraphicsProxyWidget *m_defBrowserProxy;
+        Plasma::TextBrowser* m_defBrowser;
         Plasma::IconWidget *m_icon;
 
 //         QList< QPair<QString, bool> > m_dicts;
[prev in list] [next in list] [prev in thread] [next in thread]