Fixed xdxf caching dialog to not allow reject only cancel

diff --git a/data/other/mdictionarywidget.desktop b/data/other/mdictionarywidget.desktop
index 826b54f..14f34fc 100644 (file)
--- a/data/other/mdictionarywidget.desktop
+++ b/data/other/mdictionarywidget.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=mDictionary
 Type=qt
-X-Path=/usr/lib/hildon-desktop/mdictionarywidget
+X-Path=mdictionarywidget
 X-Multiple-Instances=false

diff --git a/debian/changelog b/debian/changelog
index 850c361..6880238 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
-mdictionary (1.0.0-2) unstable; urgency=low
-  * first version of maemo mDictionary
- -- Mateusz Półrola <mateusz.polrola@comarch.pl>  Fri, 06 Aug 2010 08:02:53 +0200
+mdictionary (2.0.0) stable; urgency=low
+  * initial release
+  * mdictionary 2.0.0 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 a8254ed..1a68d86 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Jakub Jaszczyński <jakub.jaszczynski@comarch.pl>, Piotr Pilarczyk <
 Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen
 Standards-Version: 3.8.0
 
+
+
 Package: mdictionary
 Section: user/education
 Architecture: any
@@ -14,19 +16,19 @@ Description: Multilanguage dictionary
 Package: mdictionary-google-plugin
 Section: user/education
 Architecture: any
-Depends: mdictionary
+Depends: mdictionary, libqt4-network (>= 4.6)
 Description: Google plugin for mDictionary
 
 Package: mdictionary-homescreen-widget
 Section: user/education
 Architecture: any
-Depends: mdictionary
-Description: home sreen widget for mDictionary
+Depends: mdictionary, qt4-homescreen-loader
+Description: home screen widget for mDictionary
 
 Package: mdictionary-dev
 Section: devel
 Architecture: any
-Depends: libqt4-dev (>= 4.6)
+Depends: libqt4-dev (>= 4.6), libqt4-core (>= 4.6), libqt4-gui (>= 4.6), libqt4-xml (>= 4.6), libqt4-xmlpatterns (>= 4.6), libqt4-sql (>= 4.6), libqt4-sql-sqlite (>= 4.6), libqt4-dbus (>= 4.6), libqt4-wegbkit (>= 4.6),
 Description: mDictionary development files
 
 Package: mdictionary-doc

diff --git a/mdictionary.pri b/mdictionary.pri
index 7973f09..3a5aeeb 100644 (file)
--- a/mdictionary.pri
+++ b/mdictionary.pri
@@ -1,18 +1,6 @@
 PROJECTNAME = mdictionary
 VERSION = 0.1
 
-QT = \
-       core \
-       gui \
-       sql \
-       xml \
-       xmlpatterns \
-       webkit \
-    dbus \
-    network
-
-maemo5:QT += maemo5
-
 CONFIG += \
        qt \
     release

diff --git a/src/desktopWidget/desktopWidget.pro b/src/desktopWidget/desktopWidget.pro
index 64820d8..1d792b1 100644 (file)
--- a/src/desktopWidget/desktopWidget.pro
+++ b/src/desktopWidget/desktopWidget.pro
@@ -6,6 +6,10 @@ TEMPLATE = app
 
 include(../../mdictionary.pri)
 
+QT = core \
+    gui \
+    dbus
+
 SOURCES += \
     main.cpp \
     MainWidget.cpp

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index afa7f87..b1d7a32 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -3,6 +3,15 @@ TEMPLATE = app
 
 include(../../mdictionary.pri)
 
+QT = core \
+    gui \
+    xml \
+    xmlpatterns \
+    sql \
+    dbus \
+    webkit
+
+maemo5:QT += maemo5
 
 SOURCES += gui/main.cpp \
     backbone/ConfigGenerator.cpp \

diff --git a/src/plugins/google/google.pro b/src/plugins/google/google.pro
index 48633dc..444472c 100644 (file)
--- a/src/plugins/google/google.pro
+++ b/src/plugins/google/google.pro
@@ -2,6 +2,12 @@ TARGET = google
 
 include(../plugin.pri)
 
+QT = core \
+    gui \
+    network
+
+maemo5:QT += maemo5
+
 SOURCES +=  \
     GooglePlugin.cpp \
     TranslationGoogle.cpp \

diff --git a/src/plugins/xdxf/XdxfCachingDialog.cpp b/src/plugins/xdxf/XdxfCachingDialog.cpp
index 3e0a2d6..7471f15 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.cpp
+++ b/src/plugins/xdxf/XdxfCachingDialog.cpp
@@ -57,6 +57,11 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
     time.start();
 }
 
+
+void XdxfCachingDialog::reject() {
+    return;
+}
+
 void XdxfCachingDialog::updateCachingProgress(int progress, int time) {
     cachingProgressBar->setValue(progress);
 
@@ -68,5 +73,5 @@ void XdxfCachingDialog::updateCachingProgress(int progress, int time) {
     cachingLabel->setText(tr("Estimated time left: ") +
                           tr("%n second(s)", "", seconds));
     if(progress >= 100)
-        this->hide();
+        this->accept();
 }

diff --git a/src/plugins/xdxf/XdxfCachingDialog.h b/src/plugins/xdxf/XdxfCachingDialog.h
index 3bbb2ee..aacb56d 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.h
+++ b/src/plugins/xdxf/XdxfCachingDialog.h
@@ -43,6 +43,9 @@ class XdxfCachingDialog : public QDialog
 public:
     explicit XdxfCachingDialog(XdxfPlugin *parent = 0);
 
+public Q_SLOTS:
+    void reject();
+
 Q_SIGNALS:
     //! signal emitted when user cancels caching of a dictionary
     void cancelCaching();

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index d609a39..ef29877 100644 (file)
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -2,6 +2,13 @@ TARGET = xdxf
 
 include(../plugin.pri)
 
+QT = core \
+    gui \
+    xml \
+    sql
+
+maemo5:QT += maemo5
+
 SOURCES +=  \
     xdxfplugin.cpp \
     TranslationXdxf.cpp \