From 00b5a0ecb557ac3e335a445ca4480e59658980f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mateusz=20P=C3=B3=C5=82rola?= Date: Wed, 11 Aug 2010 14:19:28 +0200 Subject: [PATCH] Added icon to xdxf plugin and commonDictInterface --- trunk/src/base/gui/DictManagerWidget.cpp | 1 + trunk/src/includes/CommonDictInterface.h | 3 +++ trunk/src/plugins/xdxf/src/src.pro | 3 ++- trunk/src/plugins/xdxf/src/xdxfplugin.cpp | 8 +++++--- trunk/src/plugins/xdxf/src/xdxfplugin.h | 4 ++++ .../mDictionaryTests/CommonDictInterfaceMock.h | 1 + 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/trunk/src/base/gui/DictManagerWidget.cpp b/trunk/src/base/gui/DictManagerWidget.cpp index d99c4fc..136dc56 100644 --- a/trunk/src/base/gui/DictManagerWidget.cpp +++ b/trunk/src/base/gui/DictManagerWidget.cpp @@ -99,6 +99,7 @@ void DictManagerWidget::refreshDictsList() { else { item->setCheckState(Qt::Unchecked); } + item->setIcon(i.key()->icon()); dictListWidget->addItem(item); dictsHash.insert(item, i.key()); diff --git a/trunk/src/includes/CommonDictInterface.h b/trunk/src/includes/CommonDictInterface.h index e55be96..fa094ce 100644 --- a/trunk/src/includes/CommonDictInterface.h +++ b/trunk/src/includes/CommonDictInterface.h @@ -78,6 +78,9 @@ class CommonDictInterface : public QObject { //! returns current plugin settings virtual Settings* settings() = 0; + //! returns plugin icon + virtual QIcon icon() = 0; + public Q_SLOTS: /*! performs search in dictionary \param word word to search in dictionary diff --git a/trunk/src/plugins/xdxf/src/src.pro b/trunk/src/plugins/xdxf/src/src.pro index 1fd50e6..bcde306 100644 --- a/trunk/src/plugins/xdxf/src/src.pro +++ b/trunk/src/plugins/xdxf/src/src.pro @@ -71,4 +71,5 @@ unix { dicts.files += ../../../../../data/dicts/en-fin.xdxf } -RESOURCES += +RESOURCES += \ + xdxf.qrc diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp index 7ad6965..058e95b 100644 --- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp +++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp @@ -42,9 +42,7 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent), stopped = false; - QIcon(":/icons/mdictionary.png"); - - + _icon = QIcon(":/icons/xdxf.png"); } QString XdxfPlugin::langFrom() const { @@ -271,4 +269,8 @@ QString XdxfPlugin::removeAccents(QString string) { return normalized; } +QIcon XdxfPlugin::icon() { + return _icon; +} + Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin) diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.h b/trunk/src/plugins/xdxf/src/xdxfplugin.h index 4c9c286..7d0cd93 100644 --- a/trunk/src/plugins/xdxf/src/xdxfplugin.h +++ b/trunk/src/plugins/xdxf/src/xdxfplugin.h @@ -83,6 +83,9 @@ public: //! Sets new settings void setSettings(Settings*); + //! returns plugin icon + virtual QIcon icon(); + public Q_SLOTS: /*! performs search in dictionary \param word word to search in dictionary @@ -124,6 +127,7 @@ private: //! path to dictionary file QString path; uint _hash; + QIcon _icon; //! number of words in dicrionary long _wordsCount; diff --git a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h index ad2fbbc..418ffaa 100644 --- a/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h +++ b/trunk/tests/mDictionaryTests/CommonDictInterfaceMock.h @@ -51,6 +51,7 @@ public: uint hash() const { return _hash;} void setHash(uint h) {_hash = h;} void stop() {stopped = 1;} + QIcon icon(){return QIcon();} QString search(QString key) {return "";} QList searchWordList(QString word, int limit) { qDebug() << "search " << this->thread()->currentThreadId(); -- 1.7.9.5