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

diff --git a/data/css/images/header-background.png b/data/css/images/header-background.png
new file mode 100644 (file)
index 0000000..6209dc5
Binary files /dev/null and b/data/css/images/header-background.png differ

diff --git a/data/css/images/header-background.xcf b/data/css/images/header-background.xcf
new file mode 100644 (file)
index 0000000..158d845
Binary files /dev/null and b/data/css/images/header-background.xcf differ

diff --git a/data/css/images/header-border.png b/data/css/images/header-border.png
new file mode 100644 (file)
index 0000000..dfb92f2
Binary files /dev/null and b/data/css/images/header-border.png differ

diff --git a/data/css/images/header-border.xcf b/data/css/images/header-border.xcf
new file mode 100644 (file)
index 0000000..5515f28
Binary files /dev/null and b/data/css/images/header-border.xcf differ

diff --git a/data/css/images/key-background.png b/data/css/images/key-background.png
new file mode 100644 (file)
index 0000000..4f32dd2
Binary files /dev/null and b/data/css/images/key-background.png differ

diff --git a/data/css/images/key-background.xcf b/data/css/images/key-background.xcf
new file mode 100644 (file)
index 0000000..7264399
Binary files /dev/null and b/data/css/images/key-background.xcf differ

diff --git a/data/css/images/shadow-grey-bg.png b/data/css/images/shadow-grey-bg.png
new file mode 100644 (file)
index 0000000..062aba7
Binary files /dev/null and b/data/css/images/shadow-grey-bg.png differ

diff --git a/data/css/images/shadow-grey-bg.xcf b/data/css/images/shadow-grey-bg.xcf
new file mode 100644 (file)
index 0000000..2de7518
Binary files /dev/null and b/data/css/images/shadow-grey-bg.xcf differ

diff --git a/data/css/images/shadow-white-bg.png b/data/css/images/shadow-white-bg.png
new file mode 100644 (file)
index 0000000..a2d3b53
Binary files /dev/null and b/data/css/images/shadow-white-bg.png differ

diff --git a/data/css/images/shadow-white-bg.xcf b/data/css/images/shadow-white-bg.xcf
new file mode 100644 (file)
index 0000000..8e8a72c
Binary files /dev/null and b/data/css/images/shadow-white-bg.xcf differ

diff --git a/data/css/images/tab-background.png b/data/css/images/tab-background.png
new file mode 100644 (file)
index 0000000..8a65250
Binary files /dev/null and b/data/css/images/tab-background.png differ

diff --git a/data/css/images/tab-background.xcf b/data/css/images/tab-background.xcf
new file mode 100644 (file)
index 0000000..fc8c10a
Binary files /dev/null and b/data/css/images/tab-background.xcf differ

diff --git a/data/css/style.css b/data/css/style.css
new file mode 100644 (file)
index 0000000..5f03e05
--- /dev/null
+++ b/data/css/style.css
@@ -0,0 +1,81 @@
+body, html, body *, html * {
+       margin                  : 0px;
+       padding                 : 0px;
+       color                   : #eee;
+       font-size               : 10pt;
+       font-family             : Tahoma, Helvetica, Arial, Arial, sans-serif;
+} 
+body {
+       background-color        : black;
+}
+
+div.tab {
+       display                 : block;
+       margin                  : 4px;
+       margin-top              : 8px;
+       padding                 : 2px;
+       padding-bottom          : 0px;
+        background-color       : #333;
+       border-radius           : 5px;
+       border                  : 1px solid #555;
+       background-image        : url("images/tab-background.png");
+       background-repeat       : repeat-y;
+       -webkit-box-reflect     : below 5px -webkit-gradient(linear, 0% 0%, 0% 150%, from(transparent), color-stop(0.3, transparent), to(white));
+}
+
+div.dict {
+       margin                  : 0px 0px 5px 5px;
+       padding                 : 0px;
+       background-color        : transparent;
+
+       border                  : solid transparent;
+       border-width            : 13px 13px 13px 13px;
+       -webkit-border-image    : url("images/shadow-grey-bg.png") 13 13 13 13;
+}
+
+div.info {
+       font-weight             : bold;
+       text-align              : center;
+       padding                 : 3px;
+       background-color        : #444;
+       color                   : #dcbba0;
+
+       border                  : solid transparent;
+       border-width            : 5px 5px 5px 5px;
+       -webkit-border-image    : url("images/header-border.png") 5 5 5 5;
+
+       background-image        : url("images/header-background.png");
+       background-repeat       : repeat-y;
+       background-position     : -3 0;
+}
+
+
+div.key {
+       text-align              : center;
+       color                   : #9c9;
+
+       background-image        : url("images/key-background.png");
+       background-repeat       : no-repeat;
+       background-position     : center;
+
+       border-radius           : 10px 10px 40px 40px;
+       border-width            : 1px 1px 1px 1px;
+       border-style            : solid;
+       border-color            : #1f1f1f;
+
+       margin-top              : 5px;
+}
+
+div.cell {
+       padding                 : 0px 0px 0px 10px;
+}
+
+span.i {
+       font-style              : italic;
+}
+span.b {
+       font-weight             : bold;
+}
+span.u {
+       text-decoration         : underline;
+}

diff --git a/data/gui.qrc b/data/gui.qrc
index 18cf9df..6133b0d 100644 (file)
--- a/data/gui.qrc
+++ b/data/gui.qrc
@@ -8,10 +8,8 @@
         <file>icons/16x16/staron.png</file>
         <file>icons/16x16/staroff.png</file>
         <file>config/mdictionary.config</file>
-        <file>xsl/style.css</file>
         <file>xsl/xsl.xsl</file>
         <file>translations/en_US.qm</file>
         <file>translations/pl_PL.qm</file>
-        <file>xsl/mask.png</file>
     </qresource>
 </RCC>

diff --git a/data/xsl/mask.png b/data/xsl/mask.png
deleted file mode 100644 (file)
index f3f986a..0000000
Binary files a/data/xsl/mask.png and /dev/null differ

diff --git a/data/xsl/style.css b/data/xsl/style.css
deleted file mode 100644 (file)
index e4289dd..0000000
--- a/data/xsl/style.css
+++ /dev/null
@@ -1,93 +0,0 @@
-body {
-background-color: #000000 
-    
- } 
-
-div.tab {
-       -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0px 3px 10px;
-        background-color: #D6E4FF;
-       border-bottom-left-radius: 8px 8px;
-       border-bottom-right-radius: 8px 8px;
-       border-top-left-radius: 8px 8px;
-       border-top-right-radius: 8px 8px;
-       color: black;
-       font-family: 'Lucida Sans MS', 'Lucida Grande', Helvetica, sans-serif;
-       font-size: 10pt;
-       padding: 10px 10px;
-       padding-left: 5px;
-       padding-right: 5px;
-       -webkit-box-reflect:below 5px -webkit-gradient(linear, 0% 0%, 0% 190%, from(transparent), color-stop(0.3, transparent), to(white));
-}
-
-div.dict {
-       -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0px 3px 10px;
-       background: -webkit-gradient(linear, 50% 0%, 50% 100%, from(#FFFFFA), color-stop(0.3, #FED), color-stop(0.8, #FED), to(#FFFFFA));
-       border-bottom-left-radius: 8px 8px;
-       border-bottom-right-radius: 8px 8px;
-       border-top-left-radius: 8px 8px;
-       border-top-right-radius: 8px 8px;
-       color: black;
-       font-family: 'Lucida Sans MS', 'Lucida Grande', Helvetica, sans-serif;
-       font-size: 10pt;
-       margin-bottom: 10px;
-       padding: 10px 18px;
-       padding-left: 5px;
-       padding-right: 5px;
-}
-
-
-div.info {
-        font-weight            : bold;
-        text-align             : center;
-    
-       background: -webkit-gradient(
-    linear,
-    left top,
-    left bottom,
-    color-stop(0.05, rgb(255,190,245)),
-    color-stop(0.85, rgb(255,49,61)));
-       
-       padding-bottom: 5px;
-       padding-left: 5px;
-       padding-right: 5px;
-       padding-top: 5px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-
-div.key {
-       font-weight             : bold;
-       text-align              : center;
-       background: -webkit-gradient(
-    linear,
-    left top,
-    left bottom,
-    color-stop(0.01, rgb(88,190,245)),
-    color-stop(0.95, rgb(0,49,61)));
-       padding-bottom: 5px;
-       padding-left: 5px;
-       padding-right: 5px;
-       padding-top: 5px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-
-div.cell {
-       background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fffcca), to(#FFFFFA));
-       padding-top: 5px;
-       padding-left: 25px;
-       padding-right: 25px;
-       -webkit-mask-box-image: url(mask.png) 0 100 0 100 stretch stretch;
-}
-span.i {
-        font-style             : italic;
-}
-
-span.b {
-         font-weight           : bold;
-}
-
-span.u {
-            text-decoration    : underline;
-}
-
-
-

diff --git a/debian/changelog b/debian/changelog
index 6880238..56fe512 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mdictionary (2.0.0) stable; urgency=low
-  * initial release
-  * mdictionary 2.0.0 is a qt version of mdictionary
+mdictionary (2.0.0beta) stable; urgency=low
+  * beta release
+  * mdictionary 2.0.0 beta is a qt version of mdictionary
  -- Mateusz Półrola <mateusz.polrola@comarch.pl>  Tue, 07 Sep 2010 12:19:18 +0200

diff --git a/debian/control b/debian/control
index 1a68d86..a3673fc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: mdictionary
 Section: user/education
 Priority: optional
-Maintainer: Jakub Jaszczyński <jakub.jaszczynski@comarch.pl>, Piotr Pilarczyk <piotr.pilarczyk@comarch.pl>, Mateusz Półrola <mateusz.polrola@comarch.pl>, Bartosz Szatkowski <bartosz.szatkowski@comarch.pl>
+Maintainer: Dariusz Wiechecki <dariusz.wiechecki@comarch.pl>
 Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen
 Standards-Version: 3.8.0
 
@@ -12,18 +12,266 @@ Section: user/education
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Multilanguage dictionary
+XB-Maemo-Icon-26:
+ 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
+ n3yfyBHbivPuAAAAAElFTkSuQmCC
 
 Package: mdictionary-google-plugin
 Section: user/education
 Architecture: any
 Depends: mdictionary, libqt4-network (>= 4.6)
 Description: Google plugin for mDictionary
+XB-Maemo-Icon-26:
+ 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
+ QmCC
 
 Package: mdictionary-homescreen-widget
 Section: user/education
 Architecture: any
 Depends: mdictionary, qt4-homescreen-loader
 Description: home screen widget for mDictionary
+XB-Maemo-Icon-26:
+ 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
+ n3yfyBHbivPuAAAAAElFTkSuQmCC
+
 
 Package: mdictionary-dev
 Section: devel

diff --git a/debian/mdictionary.install b/debian/mdictionary.install
index d211746..9dc5e8a 100644 (file)
--- a/debian/mdictionary.install
+++ b/debian/mdictionary.install
@@ -1,10 +1,10 @@
 usr/share/dbus-1/
 usr/share/icons/
 usr/share/mdictionary/staron.png
-usr/share/mdictionary/mask.png
 usr/bin/mdictionary
 usr/lib/mdictionary/plugins/libxdxf.so
 usr/lib/mdictionary/plugins/eng-us.xdxf
 usr/lib/mdictionary/plugins/eng-thai.xdxf
 usr/share/mdictionary/xdxf.png
 usr/share/applications/hildon/mdictionary.desktop
+usr/share/mdictionary/css/

diff --git a/debian/mdictionary.png b/debian/mdictionary.png
old mode 100644 (file)
new mode 100755 (executable)
index 8b83a3b..4a7ff08
Binary files a/debian/mdictionary.png and b/debian/mdictionary.png differ

diff --git a/src/desktopWidget/desktopWidget.pro b/src/desktopWidget/desktopWidget.pro
index 1d792b1..794f143 100644 (file)
--- a/src/desktopWidget/desktopWidget.pro
+++ b/src/desktopWidget/desktopWidget.pro
@@ -18,8 +18,11 @@ HEADERS += \
     MainWidget.h
 
 RESOURCES += \
-    ../../data/gui.qrc
+    ../../data/gui.qrc \
+    desktopWidget.qrc
 
+TRANSLATIONS += pl_PL.ts \
+                en_US.ts
 
 unix {
         target.path = $$INSTALL_PREFIX/lib/hildon-desktop

diff --git a/src/desktopWidget/desktopWidget.qrc b/src/desktopWidget/desktopWidget.qrc
new file mode 100644 (file)
index 0000000..8315db8
--- /dev/null
+++ b/src/desktopWidget/desktopWidget.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/desktopWidget">
+        <file>translations/en_US.qm</file>
+        <file>translations/pl_PL.qm</file>
+    </qresource>
+</RCC>

diff --git a/src/desktopWidget/main.cpp b/src/desktopWidget/main.cpp
index 2f9b15d..cfe07d6 100644 (file)
--- a/src/desktopWidget/main.cpp
+++ b/src/desktopWidget/main.cpp
@@ -35,6 +35,17 @@ int main(int argc, char *argv[]) {
     }
 
     QApplication a(dpy, argc, argv);
+
+    QString locale = QLocale::system().name();
+
+    QTranslator translator;
+
+    if(!translator.load("://desktopWidget/translations/" + locale)) {
+        translator.load("://desktopWidget/translations/en_US");
+    }
+
+    QCoreApplication::installTranslator(&translator);
+
     QApplication::setOrganizationName("Comarch S.A.");
     QApplication::setOrganizationDomain("comarch.com");
     QApplication::setApplicationName("mDictionaryWidget");

diff --git a/src/desktopWidget/translations/en_US.qm b/src/desktopWidget/translations/en_US.qm
new file mode 100644 (file)
index 0000000..be651ee
--- /dev/null
+++ b/src/desktopWidget/translations/en_US.qm
@@ -0,0 +1 @@
+<¸d\18Êï\9c\95Í!\1c¿`¡½Ý
\ No newline at end of file

diff --git a/src/desktopWidget/translations/pl_PL.qm b/src/desktopWidget/translations/pl_PL.qm
new file mode 100644 (file)
index 0000000..07f6827
Binary files /dev/null and b/src/desktopWidget/translations/pl_PL.qm differ

diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index 23ec569..9fd0297 100644 (file)
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -81,7 +81,7 @@ void Backbone::init() {
 
    //Install default config files
    ConfigGenerator confGen;
-   confGen.generateCss(_dir + "style.css");
+   ///confGen.generateCss(_dir + "style.css");
    confGen.generateDefaultConfig(_configPath);
 
    loadPrefs(_configPath);

diff --git a/src/mdictionary/gui/TranslationWidget.cpp b/src/mdictionary/gui/TranslationWidget.cpp
index 18604d6..404ca2f 100644 (file)
--- a/src/mdictionary/gui/TranslationWidget.cpp
+++ b/src/mdictionary/gui/TranslationWidget.cpp
@@ -88,7 +88,7 @@ void TranslationWidget::show(QStringList translations) {
 
     QString head = "<html><head>";
     head += "<link rel=\"stylesheet\" type=\"text/css\" " ;
-    head += "href=\"" + QDir::homePath() + "/.mdictionary/style.css";
+    head += "href=\"/usr/share/mdictionary/css/" "style.css";
     head += "\" /></head><body ondragstart=\"return false\">";
     trans = head + trans;
 
@@ -96,8 +96,6 @@ void TranslationWidget::show(QStringList translations) {
     trans.replace("$STAR$", "/usr/share/mdictionary/staron.png");
 
     webkit->setHtml(trans, QUrl().fromLocalFile("/"));
-
-
     //webkit->repaint(this->rect());
     //update(this->rect());
 

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 91bb85b..096f288 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -93,10 +93,21 @@ unix {
     shared.files += ../../data/icons/16x16/staron.png
     shared.files += ../../data/xsl/mask.png
 
+    css.path = $$DATA_DIR/css
+    css.files += ../../data/css/style.css
+
+    css_images.path = $$DATA_DIR/css/images
+    css_images.files += ../../data/css/images/header-background.png
+    css_images.files += ../../data/css/images/header-border.png
+    css_images.files += ../../data/css/images/shadow-grey-bg.png
+    css_images.files += ../../data/css/images/shadow-white-bg.png
+    css_images.files += ../../data/css/images/tab-background.png
+    css_images.files += ../../data/css/images/key-background.png
+
        service.path = $$SHARE_DIR/dbus-1/services
        service.files += ../../data/other/com.comarch.mdictionary.service
        
-    INSTALLS += desktop icon64 shared service
+    INSTALLS += desktop icon64 shared service css css_images
 }
 
 

diff --git a/src/plugins/xdxf/XdxfCachingDialog.cpp b/src/plugins/xdxf/XdxfCachingDialog.cpp
index ac23b2d..29a8d18 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.cpp
+++ b/src/plugins/xdxf/XdxfCachingDialog.cpp
@@ -28,7 +28,7 @@
 #include <QDebug>
 
 
-XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
+XdxfCachingDialog::XdxfCachingDialog(QWidget *parent): QDialog(parent) {
     verticalLayout = new QVBoxLayout(this);
     setLayout(verticalLayout);
 
@@ -52,13 +52,9 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
     connect(cancelButton, SIGNAL(clicked()),
             this, SIGNAL(cancelCaching()));
 
-    connect(parent, SIGNAL(updateCachingProgress(int, int)),
-       this, SLOT(updateCachingProgress(int, int)));
     time.start();
 
-    #ifndef Q_WS_MAEMO_5
-        setModal(true);
-    #endif
+    setModal(true);
 }
 
 

diff --git a/src/plugins/xdxf/XdxfCachingDialog.h b/src/plugins/xdxf/XdxfCachingDialog.h
index aacb56d..5632bd9 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.h
+++ b/src/plugins/xdxf/XdxfCachingDialog.h
@@ -41,7 +41,7 @@ class XdxfCachingDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit XdxfCachingDialog(XdxfPlugin *parent = 0);
+    explicit XdxfCachingDialog(QWidget *parent = 0);
 
 public Q_SLOTS:
     void reject();

diff --git a/src/plugins/xdxf/XdxfDictDialog.cpp b/src/plugins/xdxf/XdxfDictDialog.cpp
index 9baf951..07b7b31 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDialog.cpp
+++ b/src/plugins/xdxf/XdxfDictDialog.cpp
@@ -31,11 +31,18 @@
 XdxfDictDialog::XdxfDictDialog(XdxfPlugin *plugin, QObject *parent) :
     DictDialog(parent) {
     this->plugin = plugin;
+    _lastDialogParent=0;
+}
+
+QWidget* XdxfDictDialog::lastDialogParent() {
+    return _lastDialogParent;
 }
 
 Settings* XdxfDictDialog::addNewDictionary(QWidget *parent) {
     XdxfDialog d(0, XdxfDialog::New, parent);
 
+    _lastDialogParent = parent;
+
     connect(&d, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
@@ -48,6 +55,8 @@ Settings* XdxfDictDialog::addNewDictionary(QWidget *parent) {
 void XdxfDictDialog::changeSettings(QWidget * parent) {
     XdxfDialog d(plugin, XdxfDialog::Change, parent);
 
+    _lastDialogParent = parent;
+
     connect(&d, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 

diff --git a/src/plugins/xdxf/XdxfDictDialog.h b/src/plugins/xdxf/XdxfDictDialog.h
index 2dd0854..1fdbb46 100644 (file)
--- a/src/plugins/xdxf/XdxfDictDialog.h
+++ b/src/plugins/xdxf/XdxfDictDialog.h
@@ -47,8 +47,11 @@ public:
       */
     void changeSettings(QWidget *parent);
 
+    QWidget* lastDialogParent();
+
 private:
     XdxfPlugin* plugin;
+    QWidget* _lastDialogParent;
 };
 
 #endif // XDXFDICTDIALOG_H

diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index 6bd0215..e44e0ea 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -35,18 +35,12 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
     connect(_dictDialog, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
-    cachingDialog = new XdxfCachingDialog(this);
-
 
     _settings->setValue("type","xdxf");
     _icon = QIcon("/usr/share/mdictionary/xdxf.png");
     _wordsCount = -1;
     stopped = false;
 
-    connect(cachingDialog, SIGNAL(cancelCaching()),
-            this, SLOT(stop()));
-    connect(this, SIGNAL(updateCachingProgress(int,int)),
-            cachingDialog, SLOT(updateCachingProgress(int,int)));
     initAccents();
 }
 
@@ -64,7 +58,6 @@ void XdxfPlugin::retranslate() {
 
 XdxfPlugin::~XdxfPlugin() {
     delete _settings;
-    delete cachingDialog;
     delete _dictDialog;
 }
 
@@ -486,11 +479,17 @@ int XdxfPlugin::countWords() {
 
 
 bool XdxfPlugin::makeCache(QString) {
-    #ifdef Q_WS_MAEMO_5
-        cachingDialog->setVisible(true);
-    #else
-        cachingDialog->show();
-    #endif
+
+    XdxfCachingDialog d(_dictDialog->lastDialogParent());
+
+    connect(&d, SIGNAL(cancelCaching()),
+            this, SLOT(stop()));
+
+    connect(this, SIGNAL(updateCachingProgress(int,int)),
+            &d, SLOT(updateCachingProgress(int,int)));
+
+    d.show();
+
     QCoreApplication::processEvents();
     QFileInfo dictFileN(_settings->value("path"));
     QString cachePathN;
@@ -550,6 +549,7 @@ bool XdxfPlugin::makeCache(QString) {
 
     /*add all words to db*/
     while (!reader.atEnd() && !stopped) {
+
         QCoreApplication::processEvents();
         reader.readNext();
         if(reader.tokenType() == QXmlStreamReader::StartElement) {
@@ -590,7 +590,7 @@ bool XdxfPlugin::makeCache(QString) {
             cur.exec();
             counter++;
             int prog = counter*100/_wordsCount;
-            if(prog % 5 == 0 && lastProg != prog) {
+            if(prog % 2 == 0 && lastProg != prog) {
                 Q_EMIT updateCachingProgress(prog,timer.restart());
                 lastProg = prog;
             }
@@ -598,7 +598,6 @@ bool XdxfPlugin::makeCache(QString) {
     }
     cur.exec("END;");
     cur.exec("select count(*) from dict");
-    //cachingDialog->hide();
 
     /*checke errors (wrong number of added words)*/
     countWords();
@@ -613,6 +612,13 @@ bool XdxfPlugin::makeCache(QString) {
     _settings->setValue("cache_path", cachePathN);
     _settings->setValue("cached", "true");
 
+
+    disconnect(&d, SIGNAL(cancelCaching()),
+            this, SLOT(stop()));
+
+    disconnect(this, SIGNAL(updateCachingProgress(int,int)),
+            &d, SLOT(updateCachingProgress(int,int)));
+
     db.close();
     return true;
 }