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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/dict
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-21 0:38:05
Message-ID: 20100521003805.DA7F3AC8BD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1129006 by aseigo:

allow showing of config; include a configChanged() to address that issue while we're in here
BUG:201663


 M  +12 -7     dict.cpp  
 M  +1 -0      dict.h  


--- trunk/KDE/kdeplasma-addons/applets/dict/dict.cpp #1129005:1129006
@@ -70,7 +70,6 @@
     bool engineChoice = dataEngine(dataEngines[1])->isValid();
 //     bool engineChoice = false; //for testing
     m_dataEngine = dataEngines[int(engineChoice)];
-    setHasConfigurationInterface(engineChoice);
 
     // tooltip stuff
     Plasma::ToolTipContent toolTipData;
@@ -166,12 +165,7 @@
     m_flash->setPos(25,-10);
     m_flash->resize(QSize(200,20));*/
 
-    KConfigGroup cg = config();
-    m_dicts = cg.readEntry("KnownDictionaries", QStringList());
-    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);
-    }
+    configChanged();
 
     m_graphicsWidget = new QGraphicsWidget(this);
     m_graphicsWidget->setLayout(m_layout);
@@ -187,6 +181,15 @@
     return m_graphicsWidget;
 }
 
+void DictApplet::configChanged()
+{
+    KConfigGroup cg = config();
+    m_dicts = cg.readEntry("KnownDictionaries", QStringList());
+    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);
+    }
+}
 
 void DictApplet::linkDefine(const QString &text)
 {
@@ -331,6 +334,7 @@
 
 void DictApplet::createConfigurationInterface(KConfigDialog *parent)
 {
+    if (dataEngine("qstardict")->isValid()) {
     QTreeView* widget=new QTreeView(parent);
     widget->setDragEnabled(true);
     widget->setAcceptDrops(true);
@@ -349,6 +353,7 @@
     connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
     connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted()));
 }
+}
 
 void DictApplet::popupEvent(bool shown)
 {
--- trunk/KDE/kdeplasma-addons/applets/dict/dict.h #1129005:1129006
@@ -52,6 +52,7 @@
         void dataUpdated(const QString &name, const Plasma::DataEngine::Data &data);
         void autoDefine(const QString &word);
         void linkDefine(const QString &word);
+        void configChanged();
 
     protected slots:
         void define();
[prev in list] [next in list] [prev in thread] [next in thread]