Fixed some bugs

diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index e94295a..f48a573 100644 (file)
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -575,8 +575,11 @@ void MainWindow::removeBookmarks() {
         par = this;
     #endif
     if(QMessageBox::question(par, tr("Delete all bookmarks"),
-             tr("Do you want to delete all bookmarks? (This action cannot be revoked)"),
+             tr("Do you want to delete all bookmarks? (This action cannot be revoked, and will clear current word list)"),
              QMessageBox::Yes, QMessageBox::Cancel) == QMessageBox::Yes) {
         backbone->removeAllBookmarks();
+        ((WordListWidget*)wordListWidget)->clear();
     }
+
+
 }

diff --git a/src/mdictionary/gui/WordListWidget.h b/src/mdictionary/gui/WordListWidget.h
index f06d889..b854730 100644 (file)
--- a/src/mdictionary/gui/WordListWidget.h
+++ b/src/mdictionary/gui/WordListWidget.h
@@ -70,6 +70,9 @@ public Q_SLOTS:
     //! Unlocks words list
     void unlockList();
 
+    //! clears list
+    void clear();
+
 protected:
     //! Reimplemented standard mouseReleaseEvent to check if user clicked on
     //! word or on its star to emit suitable signal
@@ -79,6 +82,8 @@ protected:
     //! side next to scroll bar
     void resizeEvent(QResizeEvent *event);
 
+
+
 private Q_SLOTS:
     //! Emits signal to show translation of clicked item. Signal is emitted
     //! only when word was clicked.
@@ -88,8 +93,7 @@ private Q_SLOTS:
     //! Signal is emitted only when star was clicked.
     void wordChecked(QModelIndex index);
 
-    //! clears list
-    void clear();
+
 
 private:
     //! Adds word to model. Row is row in the model

diff --git a/src/plugins/xdxf/XdxfCachingDialog.cpp b/src/plugins/xdxf/XdxfCachingDialog.cpp
index 29496d6..ac23b2d 100644 (file)
--- a/src/plugins/xdxf/XdxfCachingDialog.cpp
+++ b/src/plugins/xdxf/XdxfCachingDialog.cpp
@@ -56,7 +56,9 @@ XdxfCachingDialog::XdxfCachingDialog(XdxfPlugin *parent) {
        this, SLOT(updateCachingProgress(int, int)));
     time.start();
 
-    setModal(true);
+    #ifndef Q_WS_MAEMO_5
+        setModal(true);
+    #endif
 }
 
 

diff --git a/src/plugins/xdxf/XdxfDialog.cpp b/src/plugins/xdxf/XdxfDialog.cpp
index ef18a4b..dfb1c79 100644 (file)
--- a/src/plugins/xdxf/XdxfDialog.cpp
+++ b/src/plugins/xdxf/XdxfDialog.cpp
@@ -169,6 +169,8 @@ void XdxfDialog::initializeUI() {
 
     #ifndef Q_WS_MAEMO_5
         setMinimumSize(400,200);
+    #else
+        setMinimumHeight(350);
     #endif
 
     scrollArea->setLineWidth(0);

diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index ad0a0bb..6bd0215 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -486,7 +486,11 @@ int XdxfPlugin::countWords() {
 
 
 bool XdxfPlugin::makeCache(QString) {
-    cachingDialog->show();
+    #ifdef Q_WS_MAEMO_5
+        cachingDialog->setVisible(true);
+    #else
+        cachingDialog->show();
+    #endif
     QCoreApplication::processEvents();
     QFileInfo dictFileN(_settings->value("path"));
     QString cachePathN;