Merge branch 'xdxf' into gui

[mdictionary] / trunk / src / plugins / xdxf / src / XdxfPlugin / xdxfplugin.cpp

diff --git a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 466b7a6..b06bca5 100644 (file)
--- a/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@ -4,12 +4,15 @@
 #include <QXmlStreamReader>
 #include <QtPlugin>
 #include "TranslationXdxf.h"
+#include "../../../../includes/settings.h"
 
 XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                     _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
                     _type(tr("xdxf")), _infoNote(tr("")) {
     path="dict.xdxf";
     stopped = false;
+    _settings = new Settings();
+    _dictDialog = new XdxfDictDialog(this);
 }
 
 QString XdxfPlugin::langFrom() const {
@@ -113,13 +116,10 @@ void XdxfPlugin::stop() {
     stopped=true;
 }
 
-QDialog* XdxfPlugin::loadDialog() {
-     path="dict.xdxf";
+DictDialog* XdxfPlugin::dictDialog() {
+     return _dictDialog;
 }
 
-QDialog* XdxfPlugin::settingsDialog() {
-    path="dict.xdxf";
-}
 
 CommonDictInterface* XdxfPlugin::getNew(const Settings*) const {
   return new XdxfPlugin();
@@ -139,4 +139,8 @@ uint XdxfPlugin::hash() const
    return _hash;
 }
 
+Settings* XdxfPlugin::settings() {
+    return _settings;
+}
+
 Q_EXPORT_PLUGIN2(xdxf, XdxfPlugin)