Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http

Conflicts:
	src/plugins/xdxf/xdxf.pro

diff --cc src/plugins/xdxf/xdxf.pro
index 3b32087,025ed82..d6b64cf
--- 1/src/plugins/xdxf/xdxf.pro
--- 2/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@@ -4,25 -3,14 +3,21 @@@ include(../plugin.pri
  QT = core \
      gui \
      xml \
 -    sql
 +    sql \
 +    network
 +
  maemo5:QT += maemo5
- 
- SOURCES +=  \
-     xdxfplugin.cpp \
+ SOURCES += xdxfplugin.cpp \
      TranslationXdxf.cpp \
      XdxfDictDialog.cpp \
      XdxfCachingDialog.cpp \
 -    XdxfDialog.cpp
 +    XdxfDialog.cpp \
 +    XdxfDictDownloader.cpp \
 +    XdxfDictSelectDialog.cpp \
 +    XdxfDictDownloadProgressDialog.cpp
 +
 +
- HEADERS += \
-     xdxfplugin.h \
+ HEADERS += xdxfplugin.h \
      TranslationXdxf.h \
      ../../include/DictDialog.h \
      XdxfDictDialog.h \
@@@ -31,26 -19,20 +26,25 @@@
      ../../include/CommonDictInterface.h \
      XdxfCachingDialog.h \
      XdxfDialog.h \
 -    ../DownloadDict.h \
 +    XdxfDictDownloader.h \
 +    XdxfDictSelectDialog.h \
-     XdxfDictDownloadProgressDialog.h
- 
++    XdxfDictDownloadProgressDialog.h \ 
+     DownloadDict.h
 -RESOURCES += xdxf.qrc
++      
 +RESOURCES += \
 +    xdxf.qrc
 +
  TRANSLATIONS += pl_PL.ts \
-                 en_US.ts
-     
- unix {
-   INSTALLS += dicts plugin-icon
- 
-   dicts.path = $$PLUGINS_DIR
-   dicts.files += ../../../data/dicts/eng-us.xdxf
-   dicts.files += ../../../data/dicts/eng-thai.xdxf
- 
-   plugin-icon.path = $$DATA_DIR
-   plugin-icon.files += xdxf.png
+     en_US.ts
+ unix { 
+     INSTALLS += dicts \
+         plugin-icon
+     dicts.path = $$PLUGINS_DIR
+     dicts.files += ../../../data/dicts/eng-us.xdxf
+     dicts.files += ../../../data/dicts/eng-thai.xdxf
+     plugin-icon.path = $$DATA_DIR
+     plugin-icon.files += xdxf.png
  }
- 
- check.commands = echo 'No check here'
+ check.commands = echo \
+     'No check here'
  QMAKE_EXTRA_TARGETS += check

diff --cc src/plugins/xdxf/xdxfplugin.cpp
index 8237bc6,a0f49f0..f46c5ff
--- 1/src/plugins/xdxf/xdxfplugin.cpp
--- 2/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@@ -26,12 -26,14 +26,17 @@@
  #include "xdxfplugin.h"
  #include <QDebug>
  #include "../../include/Notify.h"
+ #include "DownloadDict.h"
  
 +
 +XdxfDictDownloader XdxfPlugin::dictDownloader;
 +
  XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                      _langFrom(""), _langTo(""),_name(""), _infoNote("") {
+ 
+     //DownloadDict a("<tr><td><img src=\"buf/comn_sdict05_bulg_comp/icon16.png\" alt=\"icon\" /></td><td align=\"center\">English-Bulgarian computer dictionary</td><td align=\"center\"><a href=\"http://downloads.sourceforge.net/xdxf/comn_sdict05_bulg_comp.tar.bz2\" target=\"_blank\">comn_sdict05_bulg_comp.tar.bz2</a></td><td align=\"right\">13,889</td><td align=\"right\">55,094</td><td align=\"right\">523</td><td align=\"center\">English</td><td align=\"center\">Bulgarian</td><td align=\"center\"><a href=\"http://xdxf.revdanica.com/\">Common XDXF</a></td><td align=\"center\">2006-04-23 23:34:40</td></tr>");
+ 
+ 
      _settings = new Settings();
      _dictDialog = new XdxfDictDialog(this, this);