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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/dict
From:       Marco Martin <notmart () gmail ! com>
Date:       2008-11-22 12:16:36
Message-ID: 1227356196.150211.4693.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 887538 by mart:

be a popupapplet, look good in panels


 M  +14 -5     dict.cpp  
 M  +4 -3      dict.h  


--- trunk/KDE/kdeplasma-addons/applets/dict/dict.cpp #887537:887538
@@ -70,8 +70,9 @@
 
 
 DictApplet::DictApplet(QObject *parent, const QVariantList &args)
-    : Plasma::Applet(parent, args)
+    : Plasma::PopupApplet(parent, args)
     , m_dictsModel(0)
+    , m_graphicsWidget(0)
       //m_flash(0)
 {
     const char* dataEngines[]={"dict","qstardict"};
@@ -80,8 +81,8 @@
     m_dataEngine=dataEngines[int(engineChoice)];
 
     setHasConfigurationInterface(engineChoice);
-    setAspectRatioMode(Plasma::IgnoreAspectRatio);
-    resize(500,200);
+    setPopupIcon("accessories-dictionary");
+    setMinimumSize(500,200);
 }
 
 DictApplet::~DictApplet()
@@ -89,8 +90,12 @@
     m_defBrowser->deleteLater();
 }
 
-void DictApplet::init()
+QGraphicsWidget *DictApplet::graphicsWidget()
 {
+    if (m_graphicsWidget) {
+        return m_graphicsWidget;
+    }
+
     m_wordEdit = new LineEdit(this);
     m_wordEdit->nativeWidget()->setClearButtonShown( true );
     m_wordEdit->nativeWidget()->setClickMessage(i18n("Enter word to define here"));
@@ -127,7 +132,6 @@
     m_layout = new QGraphicsLinearLayout(Qt::Vertical);
     m_layout->addItem(m_horLayout);
     m_layout->addItem(m_defBrowserProxy);
-    setLayout(m_layout);
 
     m_source.clear();
     dataEngine(m_dataEngine)->connectSource(m_source, this);
@@ -158,6 +162,11 @@
     QStringList activeDictNames = cg.readEntry("ActiveDictionaries", QStringList());
     for (QStringList::const_iterator i = m_dicts.constBegin(); i != m_dicts.constEnd(); ++i)
         m_activeDicts[*i]=activeDictNames.contains(*i);
+
+    m_graphicsWidget = new QGraphicsWidget(this);
+    m_graphicsWidget->setLayout(m_layout);
+    m_graphicsWidget->setPreferredSize(500, 200);
+    return m_graphicsWidget;
 }
 
 
--- trunk/KDE/kdeplasma-addons/applets/dict/dict.h #887537:887538
@@ -21,7 +21,7 @@
 #ifndef DICT_H
 #define DICT_H
 
-#include <Plasma/Applet>
+#include <Plasma/PopupApplet>
 #include <Plasma/DataEngine>
 
 class QTimer;
@@ -38,14 +38,14 @@
     class LineEdit;
 }
 
-class DictApplet: public Plasma::Applet
+class DictApplet: public Plasma::PopupApplet
 {
     Q_OBJECT
     public:
         DictApplet(QObject *parent, const QVariantList &args);
         ~DictApplet();
 
-    void init();
+        QGraphicsWidget *graphicsWidget();
         void setPath(const QString&);
 
     public slots:
@@ -65,6 +65,7 @@
         QTimer* m_timer;
         QString m_dataEngine;
         //QGraphicsPixmapItem *m_graphicsIcon;
+        QGraphicsWidget *m_graphicsWidget;
         QGraphicsLinearLayout *m_layout;
         QGraphicsLinearLayout *m_horLayout;
         Plasma::LineEdit *m_wordEdit;
[prev in list] [next in list] [prev in thread] [next in thread]